From 074ff5644854c12cd27fbc45adc70d22553fe1ec Mon Sep 17 00:00:00 2001 From: Claudine Peyrat <88194877+claudinepeyrat06@users.noreply.github.com> Date: Sun, 3 Sep 2023 13:50:16 +0200 Subject: tt_masters font update (#2476) * small correction in lettering_force_lock_stitches template * update tt_masters --- fonts/tt_masters/LICENSE | 13 + fonts/tt_masters/README_en.md | 13 - fonts/tt_masters/font.json | 178 +- "fonts/tt_masters/\342\206\222.svg" | 6069 +++++++++++++++++++++------ templates/lettering_force_lock_stitches.xml | 2 +- 5 files changed, 4948 insertions(+), 1327 deletions(-) create mode 100644 fonts/tt_masters/LICENSE delete mode 100644 fonts/tt_masters/README_en.md diff --git a/fonts/tt_masters/LICENSE b/fonts/tt_masters/LICENSE new file mode 100644 index 00000000..1941e46f --- /dev/null +++ b/fonts/tt_masters/LICENSE @@ -0,0 +1,13 @@ +Font origin and licence for TT_Masters + +www.free-fonts-download.com/Script/tt-masters-font +Font's name: TT Masters Font +Font's license: Public domain / GPL / OFL +Zip File size: 532 kb +Designed by: Jovanny Lemonad +Designer web: http://typetype.ru/ + +Font is traced and converted to suit Inkstitch embroidery lettering format. + + + diff --git a/fonts/tt_masters/README_en.md b/fonts/tt_masters/README_en.md deleted file mode 100644 index 1941e46f..00000000 --- a/fonts/tt_masters/README_en.md +++ /dev/null @@ -1,13 +0,0 @@ -Font origin and licence for TT_Masters - -www.free-fonts-download.com/Script/tt-masters-font -Font's name: TT Masters Font -Font's license: Public domain / GPL / OFL -Zip File size: 532 kb -Designed by: Jovanny Lemonad -Designer web: http://typetype.ru/ - -Font is traced and converted to suit Inkstitch embroidery lettering format. - - - diff --git a/fonts/tt_masters/font.json b/fonts/tt_masters/font.json index 7fc322db..3fe69395 100644 --- a/fonts/tt_masters/font.json +++ b/fonts/tt_masters/font.json @@ -4,47 +4,75 @@ "keywords": [ "sans_serif", "display" - ], + ], "leading": 100, - "auto_satin": true, - "reversible": true, - "default_glyph": "?", - "min_scale": 1.0, - "max_scale": 3.0, + "auto_satin": false, + "letter_case": "upper", + "reversible": false, + "default_glyph": "�", + "min_scale": 0.5, + "max_scale": 1.5, "size": 18.5, "horiz_adv_x_default": 63, - "horiz_adv_x_space": 22, + "horiz_adv_x_space": 28, "units_per_em": 100, "horiz_adv_x": { "D": 62, "E": 54, + "È": 54, + "É": 54, + "Ê": 54, + "Ë": 54, "F": 54, "G": 60, "H": 67, "I": 32, + "Í": 32, + "Ì": 32, + "Î": 32, + "Ï": 32, "J": 60, "K": 65, "L": 50, "M": 81, "N": 61, + "Ñ": 61, + "Æ": 95, + "Œ": 100, "O": 61, + "Ó": 61, + "Ö": 61, + "Ô": 61, + "Ò": 61, + "Õ": 61, + "Ø": 61, + "Ō": 61, "P": 56, "Q": 60, "R": 58, "S": 53, "T": 58, "U": 65, + "Ú": 65, + "Ù": 65, + "Û": 65, + "Ü": 65, + "Ū": 65, "W": 76, "X": 59, "Y": 57, + "Ÿ": 57, "Z": 58, - " ": 22, + "`": 28, "!": 33, + "¡": 33, "\"": 36, "#": 78, "$": 54, "%": 70, "'": 21, + "‘": 22, + "´": 21, "(": 34, ")": 36, "*": 31, @@ -68,8 +96,10 @@ "<": 46, ">": 46, "?": 53, + "¿": 53, "@": 78, "C": 58, + "Ç": 58, "[": 45, "\\": 56, "]": 45, @@ -137,9 +167,12 @@ "‰": 92, "‹": 31, "_": 41, - "`": 28, "A": 59, - "‘": 22, + "Á": 59, + "Ā": 59, + "Â": 59, + "À": 59, + "Ä": 59, "’": 22, "‚": 22, "…": 68, @@ -222,7 +255,8 @@ "ј": 60, "ѕ": 53, "ї": 32, - "B": 58 + "B": 58, + "Β": 58 }, "kerning_pairs": { "GZ": 2, @@ -499,6 +533,7 @@ "0", "§", "!", + "¡", "+", "\"", "^", @@ -526,75 +561,78 @@ "&", "%", "'", - "A", - "a", - "S", - "s", - "D", - "d", - "F", - "f", - "G", - "g", - "H", - "h", - "J", - "j", - "K", - "k", - "L", - "l", - "Ö", - "ö", - "Ä", - "ä", - "Q", - "q", - "W", - "w", - "E", - "e", - "R", - "r", - "T", - "t", - "Y", - "y", - "U", - "u", - "I", - "i", - "O", - "o", - "P", - "p", - "Z", - "z", - "X", - "x", - "C", - "c", - "V", - "v", - "B", - "b", - "N", - "n", - "M", - "m", "?", + "¿", "_", "‰", "~", "©", - "«", "»", + "«", "±", "°", "®", + "‘", + "'", "´", + "`", + "’", + "�", + "Z", + "Y", + "Ÿ", + "X", + "W", + "V", "Ü", - "ü", - "�" + "Û", + "U", + "Ú", + "Ù", + "T", + "S", + "R", + "Q", + "P", + "Ò", + "Õ", + "Ø", + "Ō", + "O", + "Ó", + "Ö", + "Ô", + "N", + "Ñ", + "M", + "L", + "K", + "J", + "I", + "Í", + "Ì", + "Î", + "Ï", + "H", + "G", + "F", + "E", + "É", + "È", + "Ê", + "Ë", + "Æ", + "Œ", + "D", + "C", + "Ç", + "B", + "Ä", + "À", + "Â", + "A", + "Ā", + "Å", + "Á" ] } \ No newline at end of file diff --git "a/fonts/tt_masters/\342\206\222.svg" "b/fonts/tt_masters/\342\206\222.svg" index 107b6adf..485cfc76 100644 --- "a/fonts/tt_masters/\342\206\222.svg" +++ "b/fonts/tt_masters/\342\206\222.svg" @@ -1,12 +1,12 @@ @@ -73,14 +73,14 @@ @@ -93,7 +93,35 @@ inkscape:color="rgb(0,0,255)" /> + id="defs25054"> + + + + + @@ -102,7 +130,6 @@ image/svg+xml - @@ -135,38 +162,52 @@ id="collapse_len_mm9866">3 1 -