diff --git a/src/FreetypeRenderer.cc b/src/FreetypeRenderer.cc index d5b6dc31..3ff77be6 100644 --- a/src/FreetypeRenderer.cc +++ b/src/FreetypeRenderer.cc @@ -40,6 +40,8 @@ #include FT_OUTLINE_H +#define SCRIPT_UNTAG(tag) ((uint8_t)((tag)>>24)) % ((uint8_t)((tag)>>16)) % ((uint8_t)((tag)>>8)) % ((uint8_t)(tag)) + static inline Vector2d get_scaled_vector(const FT_Vector *ft_vector, double scale) { return Vector2d(ft_vector->x / scale, ft_vector->y / scale); } @@ -122,6 +124,75 @@ double FreetypeRenderer::calc_y_offset(std::string valign, double ascend, double } } +hb_direction_t FreetypeRenderer::get_direction(const FreetypeRenderer::Params ¶ms, const hb_script_t script) const +{ + hb_direction_t param_direction = hb_direction_from_string(params.direction.c_str(), -1); + if (param_direction != HB_DIRECTION_INVALID) { + return param_direction; + } + + hb_direction_t direction = hb_script_get_horizontal_direction(script); + PRINTDB("Detected direction '%s' for %s", hb_direction_to_string(direction) % params.text.c_str()); + return direction; +} + +bool FreetypeRenderer::is_ignored_script(const hb_script_t script) const +{ + switch (script) { + case HB_SCRIPT_COMMON: + case HB_SCRIPT_INHERITED: + case HB_SCRIPT_UNKNOWN: + case HB_SCRIPT_INVALID: + return true; + default: + return false; + } +} + +hb_script_t FreetypeRenderer::get_script(const FreetypeRenderer::Params ¶ms, hb_glyph_info_t *glyph_info, unsigned int glyph_count) const +{ + hb_script_t param_script = hb_script_from_string(params.script.c_str(), -1); + if (param_script != HB_SCRIPT_INVALID) { + return param_script; + } + + hb_script_t script = HB_SCRIPT_INVALID; + for (unsigned int idx = 0;idx < glyph_count;idx++) { + hb_codepoint_t cp = glyph_info[idx].codepoint; + hb_script_t s = hb_unicode_script(hb_unicode_funcs_get_default(), cp); + if (!is_ignored_script(s)) { + if (script == HB_SCRIPT_INVALID) { + script = s; + } else if ((script != s) && (script != HB_SCRIPT_UNKNOWN)) { + script = HB_SCRIPT_UNKNOWN; + } + } + } + PRINTDB("Detected script '%c%c%c%c' for %s", SCRIPT_UNTAG(script) % params.text.c_str()); + return script; +} + +void FreetypeRenderer::detect_properties(FreetypeRenderer::Params ¶ms) const +{ + hb_buffer_t *hb_buf = hb_buffer_create(); + hb_buffer_add_utf8(hb_buf, params.text.c_str(), strlen(params.text.c_str()), 0, strlen(params.text.c_str())); + + unsigned int glyph_count; + hb_glyph_info_t *glyph_info = hb_buffer_get_glyph_infos(hb_buf, &glyph_count); + + hb_script_t script = get_script(params, glyph_info, glyph_count); + hb_buffer_destroy(hb_buf); + + if (!is_ignored_script(script)) { + char script_buf[5] = { 0, }; + hb_tag_to_string(hb_script_to_iso15924_tag(script), script_buf); + params.set_script(script_buf); + } + + hb_direction_t direction = get_direction(params, script); + params.set_direction(hb_direction_to_string(direction)); +} + std::vector FreetypeRenderer::render(const FreetypeRenderer::Params ¶ms) const { FT_Face face; @@ -180,8 +251,8 @@ std::vector FreetypeRenderer::render(const FreetypeRenderer::P unsigned int glyph_count; hb_glyph_info_t *glyph_info = hb_buffer_get_glyph_infos(hb_buf, &glyph_count); - hb_glyph_position_t *glyph_pos = hb_buffer_get_glyph_positions(hb_buf, &glyph_count); - + hb_glyph_position_t *glyph_pos = hb_buffer_get_glyph_positions(hb_buf, &glyph_count); + GlyphArray glyph_array; for (unsigned int idx = 0;idx < glyph_count;idx++) { FT_UInt glyph_index = glyph_info[idx].codepoint; diff --git a/src/FreetypeRenderer.h b/src/FreetypeRenderer.h index 5bb4bff0..37c60706 100644 --- a/src/FreetypeRenderer.h +++ b/src/FreetypeRenderer.h @@ -85,7 +85,7 @@ public: << ", font = \"" << params.font << "\", direction = \"" << params.direction << "\", language = \"" << params.language - << "\", script = \"" << params.script + << (params.script.empty() ? "" : "\", script = \"") << params.script << "\", halign = \"" << params.halign << "\", valign = \"" << params.valign << "\", $fn = " << params.fn @@ -102,6 +102,7 @@ public: FreetypeRenderer(); virtual ~FreetypeRenderer(); + void detect_properties(FreetypeRenderer::Params ¶ms) const; std::vector render(const FreetypeRenderer::Params ¶ms) const; private: const static double scale; @@ -136,6 +137,10 @@ private: } }; + bool is_ignored_script(const hb_script_t script) const; + hb_script_t get_script(const FreetypeRenderer::Params ¶ms, hb_glyph_info_t *glyph_info, unsigned int glyph_count) const; + hb_direction_t get_direction(const FreetypeRenderer::Params ¶ms, const hb_script_t script) const; + double calc_x_offset(std::string halign, double width) const; double calc_y_offset(std::string valign, double ascend, double descend) const; diff --git a/src/text.cc b/src/text.cc index 87372fc0..8deba760 100644 --- a/src/text.cc +++ b/src/text.cc @@ -75,12 +75,15 @@ AbstractNode *TextModule::instantiate(const Context *ctx, const ModuleInstantiat node->params.set_text(lookup_string_variable_with_default(c, "text", "")); node->params.set_spacing(lookup_double_variable_with_default(c, "spacing", 1.0)); node->params.set_font(lookup_string_variable_with_default(c, "font", "")); - node->params.set_direction(lookup_string_variable_with_default(c, "direction", "ltr")); + node->params.set_direction(lookup_string_variable_with_default(c, "direction", "")); node->params.set_language(lookup_string_variable_with_default(c, "language", "en")); - node->params.set_script(lookup_string_variable_with_default(c, "script", "latin")); + node->params.set_script(lookup_string_variable_with_default(c, "script", "")); node->params.set_halign(lookup_string_variable_with_default(c, "halign", "left")); node->params.set_valign(lookup_string_variable_with_default(c, "valign", "baseline")); + FreetypeRenderer renderer; + renderer.detect_properties(node->params); + return node; } diff --git a/tests/regression/dumptest-examples/GEB-expected.csg b/tests/regression/dumptest-examples/GEB-expected.csg index 40694ed1..7d5ad0f0 100644 --- a/tests/regression/dumptest-examples/GEB-expected.csg +++ b/tests/regression/dumptest-examples/GEB-expected.csg @@ -5,7 +5,7 @@ group() { linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) { group() { offset(r = 0.5, $fn = 64, $fa = 12, $fs = 2) { - text(text = "B", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); + text(text = "B", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); } } } @@ -13,7 +13,7 @@ group() { linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) { group() { offset(r = 0.3, $fn = 64, $fa = 12, $fs = 2) { - text(text = "E", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); + text(text = "E", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); } } } @@ -22,7 +22,7 @@ group() { linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) { group() { offset(r = 0.3, $fn = 64, $fa = 12, $fs = 2) { - text(text = "G", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); + text(text = "G", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); } } } @@ -41,7 +41,7 @@ group() { linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) { group() { offset(r = 0.5, $fn = 64, $fa = 12, $fs = 2) { - text(text = "B", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); + text(text = "B", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); } } } @@ -49,7 +49,7 @@ group() { linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) { group() { offset(r = 0.3, $fn = 64, $fa = 12, $fs = 2) { - text(text = "E", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); + text(text = "E", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); } } } @@ -58,7 +58,7 @@ group() { linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) { group() { offset(r = 0.3, $fn = 64, $fa = 12, $fs = 2) { - text(text = "G", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); + text(text = "G", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); } } } @@ -85,7 +85,7 @@ group() { linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) { group() { offset(r = 0.5, $fn = 64, $fa = 12, $fs = 2) { - text(text = "B", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); + text(text = "B", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); } } } @@ -93,7 +93,7 @@ group() { linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) { group() { offset(r = 0.3, $fn = 64, $fa = 12, $fs = 2) { - text(text = "E", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); + text(text = "E", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); } } } @@ -102,7 +102,7 @@ group() { linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) { group() { offset(r = 0.3, $fn = 64, $fa = 12, $fs = 2) { - text(text = "G", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); + text(text = "G", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); } } } @@ -131,7 +131,7 @@ group() { linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) { group() { offset(r = 0.5, $fn = 64, $fa = 12, $fs = 2) { - text(text = "B", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); + text(text = "B", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); } } } @@ -139,7 +139,7 @@ group() { linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) { group() { offset(r = 0.3, $fn = 64, $fa = 12, $fs = 2) { - text(text = "E", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); + text(text = "E", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); } } } @@ -148,7 +148,7 @@ group() { linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) { group() { offset(r = 0.3, $fn = 64, $fa = 12, $fs = 2) { - text(text = "G", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); + text(text = "G", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2); } } } diff --git a/tests/regression/dumptest-examples/LetterBlock-expected.csg b/tests/regression/dumptest-examples/LetterBlock-expected.csg index bcbccd4b..a1a20393 100644 --- a/tests/regression/dumptest-examples/LetterBlock-expected.csg +++ b/tests/regression/dumptest-examples/LetterBlock-expected.csg @@ -6,7 +6,7 @@ group() { } multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 5], [0, 0, 0, 1]]) { linear_extrude(height = 30, center = false, convexity = 4, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "M", size = 22, spacing = 1, font = "Bitstream Vera Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 0, $fa = 12, $fs = 2); + text(text = "M", size = 22, spacing = 1, font = "Bitstream Vera Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 0, $fa = 12, $fs = 2); } } } diff --git a/tests/regression/dumptest-examples/children-expected.csg b/tests/regression/dumptest-examples/children-expected.csg index 88653af4..b28450c7 100644 --- a/tests/regression/dumptest-examples/children-expected.csg +++ b/tests/regression/dumptest-examples/children-expected.csg @@ -185,7 +185,7 @@ group() { multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 12], [0, 0, 0, 1]]) { multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) { linear_extrude(height = 2, center = true, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "SCAD", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "SCAD", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } } @@ -205,7 +205,7 @@ group() { multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 12], [0, 0, 0, 1]]) { multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) { linear_extrude(height = 2, center = true, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "SCAD", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "SCAD", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } } @@ -225,7 +225,7 @@ group() { multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 12], [0, 0, 0, 1]]) { multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) { linear_extrude(height = 2, center = true, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "SCAD", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "SCAD", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } } @@ -245,7 +245,7 @@ group() { multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 12], [0, 0, 0, 1]]) { multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) { linear_extrude(height = 2, center = true, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "SCAD", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "SCAD", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } } diff --git a/tests/regression/dumptest-examples/children_indexed-expected.csg b/tests/regression/dumptest-examples/children_indexed-expected.csg index d75a71ca..42e045ad 100644 --- a/tests/regression/dumptest-examples/children_indexed-expected.csg +++ b/tests/regression/dumptest-examples/children_indexed-expected.csg @@ -4,7 +4,7 @@ group() { group() { group() { linear_extrude(height = 1, center = true, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "Nothing...", size = 6, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "Nothing...", size = 6, spacing = 1, font = "", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } } @@ -15,7 +15,7 @@ group() { group() { group() { linear_extrude(height = 1, center = true, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "one object", size = 6, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "one object", size = 6, spacing = 1, font = "", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } group() { group() { @@ -35,7 +35,7 @@ group() { group() { group() { linear_extrude(height = 1, center = true, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "2 objects ", size = 6, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "2 objects ", size = 6, spacing = 1, font = "", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } group() { group() { @@ -72,7 +72,7 @@ group() { group() { group() { linear_extrude(height = 1, center = true, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "3 objects ", size = 6, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "3 objects ", size = 6, spacing = 1, font = "", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } group() { group() { diff --git a/tests/regression/dumptest-examples/logo_and_text-expected.csg b/tests/regression/dumptest-examples/logo_and_text-expected.csg index ba26a71d..3344d151 100644 --- a/tests/regression/dumptest-examples/logo_and_text-expected.csg +++ b/tests/regression/dumptest-examples/logo_and_text-expected.csg @@ -23,7 +23,7 @@ group() { group() { multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) { linear_extrude(height = 1, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "Open", size = 42, spacing = 1, font = "Liberation Sans:style=Bold", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 16, $fa = 12, $fs = 2); + text(text = "Open", size = 42, spacing = 1, font = "Liberation Sans:style=Bold", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 16, $fa = 12, $fs = 2); } } } @@ -38,7 +38,7 @@ group() { group() { multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) { linear_extrude(height = 1, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "SCAD", size = 42, spacing = 1, font = "Liberation Sans:style=Bold", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 16, $fa = 12, $fs = 2); + text(text = "SCAD", size = 42, spacing = 1, font = "Liberation Sans:style=Bold", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 16, $fa = 12, $fs = 2); } } } @@ -53,7 +53,7 @@ group() { group() { multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) { linear_extrude(height = 1, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "The Programmers", size = 18, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 16, $fa = 12, $fs = 2); + text(text = "The Programmers", size = 18, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 16, $fa = 12, $fs = 2); } } } @@ -68,7 +68,7 @@ group() { group() { multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) { linear_extrude(height = 1, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "Solid 3D CAD Modeller", size = 18, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 16, $fa = 12, $fs = 2); + text(text = "Solid 3D CAD Modeller", size = 18, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 16, $fa = 12, $fs = 2); } } } diff --git a/tests/regression/dumptest-examples/polygon_areas-expected.csg b/tests/regression/dumptest-examples/polygon_areas-expected.csg index 902c5513..8892bee1 100644 --- a/tests/regression/dumptest-examples/polygon_areas-expected.csg +++ b/tests/regression/dumptest-examples/polygon_areas-expected.csg @@ -1,7 +1,7 @@ group() { multmatrix([[1, 0, 0, 0], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) { color([1, 0, 0, 1]) { - text(text = "Areas:", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "Areas:", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } multmatrix([[1, 0, 0, -44], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { @@ -9,7 +9,7 @@ group() { polygon(points = [[10, 0], [-5, 8.66025403784], [-5, -8.66025403784]], paths = undef, convexity = 1); multmatrix([[1, 0, 0, 0], [0, 1, 0, -20], [0, 0, 1, 0], [0, 0, 0, 1]]) { color([0, 1, 1, 1]) { - text(text = "130", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "130", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } } @@ -19,7 +19,7 @@ group() { polygon(points = [[10, 0], [0, 10], [-10, 0], [0, -10]], paths = undef, convexity = 1); multmatrix([[1, 0, 0, 0], [0, 1, 0, -20], [0, 0, 1, 0], [0, 0, 0, 1]]) { color([0, 1, 1, 1]) { - text(text = "200", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "200", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } } @@ -29,7 +29,7 @@ group() { polygon(points = [[10, 0], [5, 8.66025403784], [-5, 8.66025403784], [-10, 0], [-5, -8.66025403784], [5, -8.66025403784]], paths = undef, convexity = 1); multmatrix([[1, 0, 0, 0], [0, 1, 0, -20], [0, 0, 1, 0], [0, 0, 0, 1]]) { color([0, 1, 1, 1]) { - text(text = "260", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "260", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } } @@ -39,7 +39,7 @@ group() { polygon(points = [[10, 0], [8.09016994374, 5.87785252292], [3.09016994374, 9.51056516295], [-3.09016994374, 9.51056516295], [-8.09016994374, 5.87785252292], [-10, 0], [-8.09016994374, -5.87785252292], [-3.09016994374, -9.51056516295], [3.09016994374, -9.51056516295], [8.09016994374, -5.87785252292]], paths = undef, convexity = 1); multmatrix([[1, 0, 0, 0], [0, 1, 0, -20], [0, 0, 1, 0], [0, 0, 0, 1]]) { color([0, 1, 1, 1]) { - text(text = "294", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "294", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } } @@ -49,7 +49,7 @@ group() { polygon(points = [[10, 0], [9.99847695156, 0.17452406437], [9.99390827019, 0.34899496702], [9.98629534754, 0.52335956242], [9.97564050259, 0.69756473744], [9.96194698091, 0.87155742747], [9.94521895368, 1.04528463267], [9.92546151641, 1.21869343405], [9.90268068741, 1.3917310096], [9.87688340595, 1.5643446504], [9.84807753012, 1.73648177666], [9.81627183447, 1.90808995376], [9.78147600733, 2.07911690817], [9.74370064785, 2.24951054343], [9.70295726276, 2.41921895599], [9.65925826289, 2.58819045102], [9.61261695938, 2.75637355817], [9.56304755963, 2.92371704722], [9.51056516295, 3.09016994374], [9.45518575599, 3.25568154457], [9.39692620785, 3.42020143325], [9.33580426497, 3.58367949545], [9.27183854566, 3.74606593415], [9.20504853452, 3.90731128489], [9.13545457642, 4.06736643075], [9.06307787036, 4.2261826174], [8.98794046299, 4.38371146789], [8.91006524188, 4.53990499739], [8.82947592858, 4.69471562785], [8.74619707139, 4.84809620246], [8.66025403784, 5], [8.57167300702, 5.1503807491], [8.48048096156, 5.29919264233], [8.38670567945, 5.44639035015], [8.29037572555, 5.5919290347], [8.19152044289, 5.73576436351], [8.09016994374, 5.87785252292], [7.98635510047, 6.01815023152], [7.88010753606, 6.15661475325], [7.77145961457, 6.29320391049], [7.66044443119, 6.42787609686], [7.54709580222, 6.5605902899], [7.43144825477, 6.69130606358], [7.31353701619, 6.81998360062], [7.19339800338, 6.94658370459], [7.07106781186, 7.07106781186], [6.94658370459, 7.19339800338], [6.81998360062, 7.31353701619], [6.69130606358, 7.43144825477], [6.5605902899, 7.54709580222], [6.42787609686, 7.66044443119], [6.29320391049, 7.77145961457], [6.15661475325, 7.88010753606], [6.01815023152, 7.98635510047], [5.87785252292, 8.09016994374], [5.73576436351, 8.19152044289], [5.5919290347, 8.29037572555], [5.44639035015, 8.38670567945], [5.29919264233, 8.48048096156], [5.1503807491, 8.57167300702], [5, 8.66025403784], [4.84809620246, 8.74619707139], [4.69471562785, 8.82947592858], [4.53990499739, 8.91006524188], [4.38371146789, 8.98794046299], [4.2261826174, 9.06307787036], [4.06736643075, 9.13545457642], [3.90731128489, 9.20504853452], [3.74606593415, 9.27183854566], [3.58367949545, 9.33580426497], [3.42020143325, 9.39692620785], [3.25568154457, 9.45518575599], [3.09016994374, 9.51056516295], [2.92371704722, 9.56304755963], [2.75637355817, 9.61261695938], [2.58819045102, 9.65925826289], [2.41921895599, 9.70295726276], [2.24951054343, 9.74370064785], [2.07911690817, 9.78147600733], [1.90808995376, 9.81627183447], [1.73648177666, 9.84807753012], [1.5643446504, 9.87688340595], [1.3917310096, 9.90268068741], [1.21869343405, 9.92546151641], [1.04528463267, 9.94521895368], [0.87155742747, 9.96194698091], [0.69756473744, 9.97564050259], [0.52335956242, 9.98629534754], [0.34899496702, 9.99390827019], [0.17452406437, 9.99847695156], [0, 10], [-0.17452406437, 9.99847695156], [-0.34899496702, 9.99390827019], [-0.52335956242, 9.98629534754], [-0.69756473744, 9.97564050259], [-0.87155742747, 9.96194698091], [-1.04528463267, 9.94521895368], [-1.21869343405, 9.92546151641], [-1.3917310096, 9.90268068741], [-1.5643446504, 9.87688340595], [-1.73648177666, 9.84807753012], [-1.90808995376, 9.81627183447], [-2.07911690817, 9.78147600733], [-2.24951054343, 9.74370064785], [-2.41921895599, 9.70295726276], [-2.58819045102, 9.65925826289], [-2.75637355817, 9.61261695938], [-2.92371704722, 9.56304755963], [-3.09016994374, 9.51056516295], [-3.25568154457, 9.45518575599], [-3.42020143325, 9.39692620785], [-3.58367949545, 9.33580426497], [-3.74606593415, 9.27183854566], [-3.90731128489, 9.20504853452], [-4.06736643075, 9.13545457642], [-4.2261826174, 9.06307787036], [-4.38371146789, 8.98794046299], [-4.53990499739, 8.91006524188], [-4.69471562785, 8.82947592858], [-4.84809620246, 8.74619707139], [-5, 8.66025403784], [-5.1503807491, 8.57167300702], [-5.29919264233, 8.48048096156], [-5.44639035015, 8.38670567945], [-5.5919290347, 8.29037572555], [-5.73576436351, 8.19152044289], [-5.87785252292, 8.09016994374], [-6.01815023152, 7.98635510047], [-6.15661475325, 7.88010753606], [-6.29320391049, 7.77145961457], [-6.42787609686, 7.66044443119], [-6.5605902899, 7.54709580222], [-6.69130606358, 7.43144825477], [-6.81998360062, 7.31353701619], [-6.94658370459, 7.19339800338], [-7.07106781186, 7.07106781186], [-7.19339800338, 6.94658370459], [-7.31353701619, 6.81998360062], [-7.43144825477, 6.69130606358], [-7.54709580222, 6.5605902899], [-7.66044443119, 6.42787609686], [-7.77145961457, 6.29320391049], [-7.88010753606, 6.15661475325], [-7.98635510047, 6.01815023152], [-8.09016994374, 5.87785252292], [-8.19152044289, 5.73576436351], [-8.29037572555, 5.5919290347], [-8.38670567945, 5.44639035015], [-8.48048096156, 5.29919264233], [-8.57167300702, 5.1503807491], [-8.66025403784, 5], [-8.74619707139, 4.84809620246], [-8.82947592858, 4.69471562785], [-8.91006524188, 4.53990499739], [-8.98794046299, 4.38371146789], [-9.06307787036, 4.2261826174], [-9.13545457642, 4.06736643075], [-9.20504853452, 3.90731128489], [-9.27183854566, 3.74606593415], [-9.33580426497, 3.58367949545], [-9.39692620785, 3.42020143325], [-9.45518575599, 3.25568154457], [-9.51056516295, 3.09016994374], [-9.56304755963, 2.92371704722], [-9.61261695938, 2.75637355817], [-9.65925826289, 2.58819045102], [-9.70295726276, 2.41921895599], [-9.74370064785, 2.24951054343], [-9.78147600733, 2.07911690817], [-9.81627183447, 1.90808995376], [-9.84807753012, 1.73648177666], [-9.87688340595, 1.5643446504], [-9.90268068741, 1.3917310096], [-9.92546151641, 1.21869343405], [-9.94521895368, 1.04528463267], [-9.96194698091, 0.87155742747], [-9.97564050259, 0.69756473744], [-9.98629534754, 0.52335956242], [-9.99390827019, 0.34899496702], [-9.99847695156, 0.17452406437], [-10, 0], [-9.99847695156, -0.17452406437], [-9.99390827019, -0.34899496702], [-9.98629534754, -0.52335956242], [-9.97564050259, -0.69756473744], [-9.96194698091, -0.87155742747], [-9.94521895368, -1.04528463267], [-9.92546151641, -1.21869343405], [-9.90268068741, -1.3917310096], [-9.87688340595, -1.5643446504], [-9.84807753012, -1.73648177666], [-9.81627183447, -1.90808995376], [-9.78147600733, -2.07911690817], [-9.74370064785, -2.24951054343], [-9.70295726276, -2.41921895599], [-9.65925826289, -2.58819045102], [-9.61261695938, -2.75637355817], [-9.56304755963, -2.92371704722], [-9.51056516295, -3.09016994374], [-9.45518575599, -3.25568154457], [-9.39692620785, -3.42020143325], [-9.33580426497, -3.58367949545], [-9.27183854566, -3.74606593415], [-9.20504853452, -3.90731128489], [-9.13545457642, -4.06736643075], [-9.06307787036, -4.2261826174], [-8.98794046299, -4.38371146789], [-8.91006524188, -4.53990499739], [-8.82947592858, -4.69471562785], [-8.74619707139, -4.84809620246], [-8.66025403784, -5], [-8.57167300702, -5.1503807491], [-8.48048096156, -5.29919264233], [-8.38670567945, -5.44639035015], [-8.29037572555, -5.5919290347], [-8.19152044289, -5.73576436351], [-8.09016994374, -5.87785252292], [-7.98635510047, -6.01815023152], [-7.88010753606, -6.15661475325], [-7.77145961457, -6.29320391049], [-7.66044443119, -6.42787609686], [-7.54709580222, -6.5605902899], [-7.43144825477, -6.69130606358], [-7.31353701619, -6.81998360062], [-7.19339800338, -6.94658370459], [-7.07106781186, -7.07106781186], [-6.94658370459, -7.19339800338], [-6.81998360062, -7.31353701619], [-6.69130606358, -7.43144825477], [-6.5605902899, -7.54709580222], [-6.42787609686, -7.66044443119], [-6.29320391049, -7.77145961457], [-6.15661475325, -7.88010753606], [-6.01815023152, -7.98635510047], [-5.87785252292, -8.09016994374], [-5.73576436351, -8.19152044289], [-5.5919290347, -8.29037572555], [-5.44639035015, -8.38670567945], [-5.29919264233, -8.48048096156], [-5.1503807491, -8.57167300702], [-5, -8.66025403784], [-4.84809620246, -8.74619707139], [-4.69471562785, -8.82947592858], [-4.53990499739, -8.91006524188], [-4.38371146789, -8.98794046299], [-4.2261826174, -9.06307787036], [-4.06736643075, -9.13545457642], [-3.90731128489, -9.20504853452], [-3.74606593415, -9.27183854566], [-3.58367949545, -9.33580426497], [-3.42020143325, -9.39692620785], [-3.25568154457, -9.45518575599], [-3.09016994374, -9.51056516295], [-2.92371704722, -9.56304755963], [-2.75637355817, -9.61261695938], [-2.58819045102, -9.65925826289], [-2.41921895599, -9.70295726276], [-2.24951054343, -9.74370064785], [-2.07911690817, -9.78147600733], [-1.90808995376, -9.81627183447], [-1.73648177666, -9.84807753012], [-1.5643446504, -9.87688340595], [-1.3917310096, -9.90268068741], [-1.21869343405, -9.92546151641], [-1.04528463267, -9.94521895368], [-0.87155742747, -9.96194698091], [-0.69756473744, -9.97564050259], [-0.52335956242, -9.98629534754], [-0.34899496702, -9.99390827019], [-0.17452406437, -9.99847695156], [0, -10], [0.17452406437, -9.99847695156], [0.34899496702, -9.99390827019], [0.52335956242, -9.98629534754], [0.69756473744, -9.97564050259], [0.87155742747, -9.96194698091], [1.04528463267, -9.94521895368], [1.21869343405, -9.92546151641], [1.3917310096, -9.90268068741], [1.5643446504, -9.87688340595], [1.73648177666, -9.84807753012], [1.90808995376, -9.81627183447], [2.07911690817, -9.78147600733], [2.24951054343, -9.74370064785], [2.41921895599, -9.70295726276], [2.58819045102, -9.65925826289], [2.75637355817, -9.61261695938], [2.92371704722, -9.56304755963], [3.09016994374, -9.51056516295], [3.25568154457, -9.45518575599], [3.42020143325, -9.39692620785], [3.58367949545, -9.33580426497], [3.74606593415, -9.27183854566], [3.90731128489, -9.20504853452], [4.06736643075, -9.13545457642], [4.2261826174, -9.06307787036], [4.38371146789, -8.98794046299], [4.53990499739, -8.91006524188], [4.69471562785, -8.82947592858], [4.84809620246, -8.74619707139], [5, -8.66025403784], [5.1503807491, -8.57167300702], [5.29919264233, -8.48048096156], [5.44639035015, -8.38670567945], [5.5919290347, -8.29037572555], [5.73576436351, -8.19152044289], [5.87785252292, -8.09016994374], [6.01815023152, -7.98635510047], [6.15661475325, -7.88010753606], [6.29320391049, -7.77145961457], [6.42787609686, -7.66044443119], [6.5605902899, -7.54709580222], [6.69130606358, -7.43144825477], [6.81998360062, -7.31353701619], [6.94658370459, -7.19339800338], [7.07106781186, -7.07106781186], [7.19339800338, -6.94658370459], [7.31353701619, -6.81998360062], [7.43144825477, -6.69130606358], [7.54709580222, -6.5605902899], [7.66044443119, -6.42787609686], [7.77145961457, -6.29320391049], [7.88010753606, -6.15661475325], [7.98635510047, -6.01815023152], [8.09016994374, -5.87785252292], [8.19152044289, -5.73576436351], [8.29037572555, -5.5919290347], [8.38670567945, -5.44639035015], [8.48048096156, -5.29919264233], [8.57167300702, -5.1503807491], [8.66025403784, -5], [8.74619707139, -4.84809620246], [8.82947592858, -4.69471562785], [8.91006524188, -4.53990499739], [8.98794046299, -4.38371146789], [9.06307787036, -4.2261826174], [9.13545457642, -4.06736643075], [9.20504853452, -3.90731128489], [9.27183854566, -3.74606593415], [9.33580426497, -3.58367949545], [9.39692620785, -3.42020143325], [9.45518575599, -3.25568154457], [9.51056516295, -3.09016994374], [9.56304755963, -2.92371704722], [9.61261695938, -2.75637355817], [9.65925826289, -2.58819045102], [9.70295726276, -2.41921895599], [9.74370064785, -2.24951054343], [9.78147600733, -2.07911690817], [9.81627183447, -1.90808995376], [9.84807753012, -1.73648177666], [9.87688340595, -1.5643446504], [9.90268068741, -1.3917310096], [9.92546151641, -1.21869343405], [9.94521895368, -1.04528463267], [9.96194698091, -0.87155742747], [9.97564050259, -0.69756473744], [9.98629534754, -0.52335956242], [9.99390827019, -0.34899496702], [9.99847695156, -0.17452406437]], paths = undef, convexity = 1); multmatrix([[1, 0, 0, 0], [0, 1, 0, -20], [0, 0, 1, 0], [0, 0, 0, 1]]) { color([0, 1, 1, 1]) { - text(text = "314", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "314", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } } diff --git a/tests/regression/dumptest-examples/recursion-expected.csg b/tests/regression/dumptest-examples/recursion-expected.csg index a1d57099..c32e63fc 100644 --- a/tests/regression/dumptest-examples/recursion-expected.csg +++ b/tests/regression/dumptest-examples/recursion-expected.csg @@ -1,6 +1,6 @@ group() { color([0, 1, 1, 1]) { - text(text = "6! = 720", size = 10, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "6! = 720", size = 10, spacing = 1, font = "", direction = "ltr", language = "en", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } group(); } diff --git a/tests/regression/dumptest-examples/rotate_extrude-expected.csg b/tests/regression/dumptest-examples/rotate_extrude-expected.csg index 2adf1df5..8e648c76 100644 --- a/tests/regression/dumptest-examples/rotate_extrude-expected.csg +++ b/tests/regression/dumptest-examples/rotate_extrude-expected.csg @@ -10,7 +10,7 @@ group() { color([0, 1, 1, 1]) { multmatrix([[1, 0, 0, 40], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { rotate_extrude(convexity = 2, $fn = 80, $fa = 12, $fs = 2) { - text(text = " J", size = 10, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 80, $fa = 12, $fs = 2); + text(text = " J", size = 10, spacing = 1, font = "", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 80, $fa = 12, $fs = 2); } } } diff --git a/tests/regression/dumptest-examples/text_on_cube-expected.csg b/tests/regression/dumptest-examples/text_on_cube-expected.csg index a5bbed7c..ecaff32b 100644 --- a/tests/regression/dumptest-examples/text_on_cube-expected.csg +++ b/tests/regression/dumptest-examples/text_on_cube-expected.csg @@ -9,7 +9,7 @@ group() { multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) { group() { linear_extrude(height = 5, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "C", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 16, $fa = 12, $fs = 2); + text(text = "C", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 16, $fa = 12, $fs = 2); } } } @@ -18,7 +18,7 @@ group() { multmatrix([[0, 0, 1, 0], [1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) { group() { linear_extrude(height = 5, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "U", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 16, $fa = 12, $fs = 2); + text(text = "U", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 16, $fa = 12, $fs = 2); } } } @@ -27,7 +27,7 @@ group() { multmatrix([[-1, 0, 0, 0], [0, 0, 1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) { group() { linear_extrude(height = 5, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "B", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 16, $fa = 12, $fs = 2); + text(text = "B", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 16, $fa = 12, $fs = 2); } } } @@ -36,7 +36,7 @@ group() { multmatrix([[0, 0, -1, 0], [-1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) { group() { linear_extrude(height = 5, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "E", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 16, $fa = 12, $fs = 2); + text(text = "E", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 16, $fa = 12, $fs = 2); } } } @@ -45,14 +45,14 @@ group() { multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 27.5], [0, 0, 0, 1]]) { group() { linear_extrude(height = 5, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "☺", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 16, $fa = 12, $fs = 2); + text(text = "☺", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", halign = "center", valign = "center", $fn = 16, $fa = 12, $fs = 2); } } } multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -32.5], [0, 0, 0, 1]]) { group() { linear_extrude(height = 5, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { - text(text = "☼", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 16, $fa = 12, $fs = 2); + text(text = "☼", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", halign = "center", valign = "center", $fn = 16, $fa = 12, $fs = 2); } } } diff --git a/tests/regression/dumptest/allmodules-expected.csg b/tests/regression/dumptest/allmodules-expected.csg index 64bb2921..ef8a1d8f 100644 --- a/tests/regression/dumptest/allmodules-expected.csg +++ b/tests/regression/dumptest/allmodules-expected.csg @@ -40,5 +40,5 @@ group() { multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]); color([-1, -1, -1, 1]); offset(r = 1, $fn = 0, $fa = 12, $fs = 2); - text(text = "", size = 10, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "", size = 10, spacing = 1, font = "", direction = "ltr", language = "en", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } diff --git a/tests/regression/dumptest/tessellation-text-test-expected.csg b/tests/regression/dumptest/tessellation-text-test-expected.csg index bee0d15b..55dee27b 100644 --- a/tests/regression/dumptest/tessellation-text-test-expected.csg +++ b/tests/regression/dumptest/tessellation-text-test-expected.csg @@ -1,21 +1,21 @@ group() { linear_extrude(height = 10, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { group() { - text(text = "C", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 8, $fa = 12, $fs = 2); + text(text = "C", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 8, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, 50], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { group() { - text(text = "C", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 16, $fa = 12, $fs = 2); + text(text = "C", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 16, $fa = 12, $fs = 2); } } multmatrix([[1, 0, 0, 0], [0, 1, 0, 50], [0, 0, 1, 0], [0, 0, 0, 1]]) { group() { - text(text = "C", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 24, $fa = 12, $fs = 2); + text(text = "C", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 24, $fa = 12, $fs = 2); } } multmatrix([[1, 0, 0, 50], [0, 1, 0, 50], [0, 0, 1, 0], [0, 0, 0, 1]]) { group() { - text(text = "C", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 32, $fa = 12, $fs = 2); + text(text = "C", size = 50, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 32, $fa = 12, $fs = 2); } } } diff --git a/tests/regression/dumptest/text-empty-tests-expected.csg b/tests/regression/dumptest/text-empty-tests-expected.csg index 96a15653..30c4bbd6 100644 --- a/tests/regression/dumptest/text-empty-tests-expected.csg +++ b/tests/regression/dumptest/text-empty-tests-expected.csg @@ -1,4 +1,4 @@ group() { - text(text = "", size = 10, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); - text(text = "", size = 10, spacing = 1, font = "", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "", size = 10, spacing = 1, font = "", direction = "ltr", language = "en", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "", size = 10, spacing = 1, font = "", direction = "ltr", language = "en", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } diff --git a/tests/regression/dumptest/text-font-alignment-tests-expected.csg b/tests/regression/dumptest/text-font-alignment-tests-expected.csg index 960a63a6..8cbb5d0b 100644 --- a/tests/regression/dumptest/text-font-alignment-tests-expected.csg +++ b/tests/regression/dumptest/text-font-alignment-tests-expected.csg @@ -7,7 +7,7 @@ group() { color([0, 0, 1, 1]) { square(size = [0.5, 20], center = false); } - text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "top", $fn = 0, $fa = 12, $fs = 2); + text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "top", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, 10], [0, 1, 0, 40], [0, 0, 1, 0], [0, 0, 0, 1]]) { color([1, 0, 0, 1]) { @@ -16,7 +16,7 @@ group() { color([0, 0, 1, 1]) { square(size = [0.5, 20], center = false); } - text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "center", $fn = 0, $fa = 12, $fs = 2); + text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "center", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, 10], [0, 1, 0, 70], [0, 0, 1, 0], [0, 0, 0, 1]]) { color([1, 0, 0, 1]) { @@ -25,7 +25,7 @@ group() { color([0, 0, 1, 1]) { square(size = [0.5, 20], center = false); } - text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, 10], [0, 1, 0, 100], [0, 0, 1, 0], [0, 0, 0, 1]]) { color([1, 0, 0, 1]) { @@ -34,7 +34,7 @@ group() { color([0, 0, 1, 1]) { square(size = [0.5, 20], center = false); } - text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "bottom", $fn = 0, $fa = 12, $fs = 2); + text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "bottom", $fn = 0, $fa = 12, $fs = 2); } } group() { @@ -45,7 +45,7 @@ group() { color([0, 0, 1, 1]) { square(size = [0.5, 20], center = false); } - text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, 249.2], [0, 1, 0, 40], [0, 0, 1, 0], [0, 0, 0, 1]]) { color([1, 0, 0, 1]) { @@ -54,7 +54,7 @@ group() { color([0, 0, 1, 1]) { square(size = [0.5, 20], center = false); } - text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, 316.1], [0, 1, 0, 70], [0, 0, 1, 0], [0, 0, 0, 1]]) { color([1, 0, 0, 1]) { @@ -63,7 +63,7 @@ group() { color([0, 0, 1, 1]) { square(size = [0.5, 20], center = false); } - text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "latin", halign = "right", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "Latn", halign = "right", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } } diff --git a/tests/regression/dumptest/text-font-composition-expected.csg b/tests/regression/dumptest/text-font-composition-expected.csg index 77019c18..d4aa5e2b 100644 --- a/tests/regression/dumptest/text-font-composition-expected.csg +++ b/tests/regression/dumptest/text-font-composition-expected.csg @@ -1,3 +1,3 @@ group() { - text(text = "Å", size = 40, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "Å", size = 40, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } diff --git a/tests/regression/dumptest/text-font-direction-tests-expected.csg b/tests/regression/dumptest/text-font-direction-tests-expected.csg index d4f1eaac..07f990e0 100644 --- a/tests/regression/dumptest/text-font-direction-tests-expected.csg +++ b/tests/regression/dumptest/text-font-direction-tests-expected.csg @@ -7,7 +7,7 @@ group() { color([0, 0, 1, 1]) { square(size = [0.5, 20], center = false); } - text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltl", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, 90], [0, 1, 0, 60], [0, 0, 1, 0], [0, 0, 0, 1]]) { color([1, 0, 0, 1]) { @@ -16,7 +16,7 @@ group() { color([0, 0, 1, 1]) { square(size = [0.5, 20], center = false); } - text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "rtl", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "rtl", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, 10], [0, 1, 0, 160], [0, 0, 1, 0], [0, 0, 0, 1]]) { color([1, 0, 0, 1]) { @@ -25,7 +25,7 @@ group() { color([0, 0, 1, 1]) { square(size = [0.5, 20], center = false); } - text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ttb", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ttb", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, 60], [0, 1, 0, 140], [0, 0, 1, 0], [0, 0, 0, 1]]) { color([1, 0, 0, 1]) { @@ -34,7 +34,7 @@ group() { color([0, 0, 1, 1]) { square(size = [0.5, 20], center = false); } - text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "btt", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "btt", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } } diff --git a/tests/regression/dumptest/text-font-simple-tests-expected.csg b/tests/regression/dumptest/text-font-simple-tests-expected.csg index 790bfbff..7afd4e2c 100644 --- a/tests/regression/dumptest/text-font-simple-tests-expected.csg +++ b/tests/regression/dumptest/text-font-simple-tests-expected.csg @@ -1,3 +1,3 @@ group() { - text(text = "T-X-U", size = 40, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 2, $fa = 12, $fs = 2); + text(text = "T-X-U", size = 40, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 2, $fa = 12, $fs = 2); } diff --git a/tests/regression/dumptest/text-font-symbol-expected.csg b/tests/regression/dumptest/text-font-symbol-expected.csg index 14199379..062b370e 100644 --- a/tests/regression/dumptest/text-font-symbol-expected.csg +++ b/tests/regression/dumptest/text-font-symbol-expected.csg @@ -2,35 +2,35 @@ group() { group() { group() { multmatrix([[1, 0, 0, -180], [0, 1, 0, 10], [0, 0, 1, 0], [0, 0, 0, 1]]) { - text(text = "0123", size = 40, spacing = 1, font = "MarVoSym", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "0123", size = 40, spacing = 1, font = "MarVoSym", direction = "ltr", language = "en", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, -180], [0, 1, 0, 70], [0, 0, 1, 0], [0, 0, 0, 1]]) { - text(text = "ABCD", size = 40, spacing = 1, font = "MarVoSym", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "ABCD", size = 40, spacing = 1, font = "MarVoSym", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, -180], [0, 1, 0, 130], [0, 0, 1, 0], [0, 0, 0, 1]]) { - text(text = "abcd", size = 40, spacing = 1, font = "MarVoSym", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "abcd", size = 40, spacing = 1, font = "MarVoSym", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } group() { multmatrix([[1, 0, 0, 0], [0, 1, 0, 10], [0, 0, 1, 0], [0, 0, 0, 1]]) { - text(text = "0123", size = 40, spacing = 1, font = "Amiri", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "0123", size = 40, spacing = 1, font = "Amiri", direction = "ltr", language = "en", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, 0], [0, 1, 0, 70], [0, 0, 1, 0], [0, 0, 0, 1]]) { - text(text = "ABCD", size = 40, spacing = 1, font = "Amiri", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "ABCD", size = 40, spacing = 1, font = "Amiri", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, 0], [0, 1, 0, 130], [0, 0, 1, 0], [0, 0, 0, 1]]) { - text(text = "abcd", size = 40, spacing = 1, font = "Amiri", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "abcd", size = 40, spacing = 1, font = "Amiri", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } group() { multmatrix([[1, 0, 0, 180], [0, 1, 0, 10], [0, 0, 1, 0], [0, 0, 0, 1]]) { - text(text = "0123", size = 40, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "0123", size = 40, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, 180], [0, 1, 0, 70], [0, 0, 1, 0], [0, 0, 0, 1]]) { - text(text = "ABCD", size = 40, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "ABCD", size = 40, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, 180], [0, 1, 0, 130], [0, 0, 1, 0], [0, 0, 0, 1]]) { - text(text = "abcd", size = 40, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "abcd", size = 40, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } } diff --git a/tests/regression/dumptest/text-font-tests-expected.csg b/tests/regression/dumptest/text-font-tests-expected.csg index 394ec103..30e57f15 100644 --- a/tests/regression/dumptest/text-font-tests-expected.csg +++ b/tests/regression/dumptest/text-font-tests-expected.csg @@ -1,20 +1,20 @@ group() { multmatrix([[0.70710678118, 0.5, -0.5, 0], [-0.70710678118, 0.5, -0.5, 0], [0, 0.70710678118, 0.70710678118, 0], [0, 0, 0, 1]]) { multmatrix([[1, 0, 0, 0], [0, 1, 0, 80], [0, 0, 1, 0], [0, 0, 0, 1]]) { - text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "OpenSCAD", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, 0], [0, 1, 0, 40], [0, 0, 1, 0], [0, 0, 0, 1]]) { - text(text = "الخط الأميري", size = 20, spacing = 1, font = "Amiri:style=Regular", direction = "rtl", language = "ar", script = "arabic", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "الخط الأميري", size = 20, spacing = 1, font = "Amiri:style=Regular", direction = "rtl", language = "ar", script = "Arab", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } - text(text = "الخط الأميري", size = 20, spacing = 1, font = "Amiri:style=Regular", direction = "rtl", language = "ar", script = "arabic", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "الخط الأميري", size = 20, spacing = 1, font = "Amiri:style=Regular", direction = "rtl", language = "ar", script = "Arab", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); multmatrix([[1, 0, 0, 0], [0, 1, 0, -40], [0, 0, 1, 0], [0, 0, 0, 1]]) { - text(text = "типографика", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "ru", script = "latin", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "типографика", size = 20, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "ru", script = "Cyrl", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, 0], [0, 1, 0, -80], [0, 0, 1, 0], [0, 0, 0, 1]]) { - text(text = "positional", size = 30, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "positional", size = 30, spacing = 1, font = "Liberation Sans:style=Regular", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } multmatrix([[1, 0, 0, 0], [0, 1, 0, -100], [0, 0, 1, 0], [0, 0, 0, 1]]) { - text(text = "parameters", size = 12, spacing = 1, font = "Amiri:style=Regular", direction = "ltr", language = "en", script = "latin", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); + text(text = "parameters", size = 12, spacing = 1, font = "Amiri:style=Regular", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 0, $fa = 12, $fs = 2); } } }