diff --git a/images/cs-block-armenian.dark.svg b/images/cs-block-armenian.dark.svg index 816214fdb..975fff707 100644 --- a/images/cs-block-armenian.dark.svg +++ b/images/cs-block-armenian.dark.svg @@ -78,7 +78,7 @@ - + diff --git a/images/cs-block-armenian.light.svg b/images/cs-block-armenian.light.svg index b6709bf02..cb0ae303a 100644 --- a/images/cs-block-armenian.light.svg +++ b/images/cs-block-armenian.light.svg @@ -78,7 +78,7 @@ - + diff --git a/images/cs-block-cyrillic-extended-b.dark.svg b/images/cs-block-cyrillic-extended-b.dark.svg index 864b84a3b..1334abb03 100644 --- a/images/cs-block-cyrillic-extended-b.dark.svg +++ b/images/cs-block-cyrillic-extended-b.dark.svg @@ -103,7 +103,7 @@ - + diff --git a/images/cs-block-cyrillic-extended-b.light.svg b/images/cs-block-cyrillic-extended-b.light.svg index 7df950f77..1b575d58f 100644 --- a/images/cs-block-cyrillic-extended-b.light.svg +++ b/images/cs-block-cyrillic-extended-b.light.svg @@ -103,7 +103,7 @@ - + diff --git a/images/cs-block-cyrillic-extended-d.dark.svg b/images/cs-block-cyrillic-extended-d.dark.svg index 66a615147..faf4b7d08 100644 --- a/images/cs-block-cyrillic-extended-d.dark.svg +++ b/images/cs-block-cyrillic-extended-d.dark.svg @@ -37,7 +37,7 @@ - + @@ -67,7 +67,7 @@ - + diff --git a/images/cs-block-cyrillic-extended-d.light.svg b/images/cs-block-cyrillic-extended-d.light.svg index d098b3f08..27d505c22 100644 --- a/images/cs-block-cyrillic-extended-d.light.svg +++ b/images/cs-block-cyrillic-extended-d.light.svg @@ -37,7 +37,7 @@ - + @@ -67,7 +67,7 @@ - + diff --git a/images/cs-block-cyrillic.dark.svg b/images/cs-block-cyrillic.dark.svg index fd18fc50b..9c8d79294 100644 --- a/images/cs-block-cyrillic.dark.svg +++ b/images/cs-block-cyrillic.dark.svg @@ -87,7 +87,7 @@ - + diff --git a/images/cs-block-cyrillic.light.svg b/images/cs-block-cyrillic.light.svg index 5d748e759..058ff6472 100644 --- a/images/cs-block-cyrillic.light.svg +++ b/images/cs-block-cyrillic.light.svg @@ -87,7 +87,7 @@ - + diff --git a/images/cs-block-dingbats.dark.svg b/images/cs-block-dingbats.dark.svg index 8652849b6..d721a8a26 100644 --- a/images/cs-block-dingbats.dark.svg +++ b/images/cs-block-dingbats.dark.svg @@ -71,12 +71,12 @@ - - - - - - + + + + + + diff --git a/images/cs-block-dingbats.light.svg b/images/cs-block-dingbats.light.svg index 51a049bb7..a2cf6f4e2 100644 --- a/images/cs-block-dingbats.light.svg +++ b/images/cs-block-dingbats.light.svg @@ -71,12 +71,12 @@ - - - - - - + + + + + + diff --git a/images/cs-block-greek-and-coptic.dark.svg b/images/cs-block-greek-and-coptic.dark.svg index c5c19573c..2cf85e324 100644 --- a/images/cs-block-greek-and-coptic.dark.svg +++ b/images/cs-block-greek-and-coptic.dark.svg @@ -112,7 +112,7 @@ - + diff --git a/images/cs-block-greek-and-coptic.light.svg b/images/cs-block-greek-and-coptic.light.svg index e836f5131..dfe632326 100644 --- a/images/cs-block-greek-and-coptic.light.svg +++ b/images/cs-block-greek-and-coptic.light.svg @@ -112,7 +112,7 @@ - + diff --git a/images/cs-block-ipa-extensions.dark.svg b/images/cs-block-ipa-extensions.dark.svg index b77acdfe4..aaaee7570 100644 --- a/images/cs-block-ipa-extensions.dark.svg +++ b/images/cs-block-ipa-extensions.dark.svg @@ -59,7 +59,7 @@ - + diff --git a/images/cs-block-ipa-extensions.light.svg b/images/cs-block-ipa-extensions.light.svg index e8b20e94a..132149105 100644 --- a/images/cs-block-ipa-extensions.light.svg +++ b/images/cs-block-ipa-extensions.light.svg @@ -59,7 +59,7 @@ - + diff --git a/images/cs-block-mathematical-alphanumeric-symbols.dark.svg b/images/cs-block-mathematical-alphanumeric-symbols.dark.svg index ca72c2108..bc9b9ab46 100644 --- a/images/cs-block-mathematical-alphanumeric-symbols.dark.svg +++ b/images/cs-block-mathematical-alphanumeric-symbols.dark.svg @@ -432,7 +432,7 @@ - + @@ -474,7 +474,7 @@ - + @@ -517,7 +517,7 @@ - + diff --git a/images/cs-block-mathematical-alphanumeric-symbols.light.svg b/images/cs-block-mathematical-alphanumeric-symbols.light.svg index a26fa1e63..0593103fd 100644 --- a/images/cs-block-mathematical-alphanumeric-symbols.light.svg +++ b/images/cs-block-mathematical-alphanumeric-symbols.light.svg @@ -432,7 +432,7 @@ - + @@ -474,7 +474,7 @@ - + @@ -517,7 +517,7 @@ - + diff --git a/images/cs-block-miscellaneous-mathematical-symbols-b.dark.svg b/images/cs-block-miscellaneous-mathematical-symbols-b.dark.svg index b3ea3b805..c02c8f9be 100644 --- a/images/cs-block-miscellaneous-mathematical-symbols-b.dark.svg +++ b/images/cs-block-miscellaneous-mathematical-symbols-b.dark.svg @@ -30,7 +30,7 @@ - + @@ -66,10 +66,10 @@ - - - - + + + + diff --git a/images/cs-block-miscellaneous-mathematical-symbols-b.light.svg b/images/cs-block-miscellaneous-mathematical-symbols-b.light.svg index d9d6cd885..acc108edd 100644 --- a/images/cs-block-miscellaneous-mathematical-symbols-b.light.svg +++ b/images/cs-block-miscellaneous-mathematical-symbols-b.light.svg @@ -30,7 +30,7 @@ - + @@ -66,10 +66,10 @@ - - - - + + + + diff --git a/images/cs-block-phonetic-extensions-supplement.dark.svg b/images/cs-block-phonetic-extensions-supplement.dark.svg index ad1650054..168c9acd5 100644 --- a/images/cs-block-phonetic-extensions-supplement.dark.svg +++ b/images/cs-block-phonetic-extensions-supplement.dark.svg @@ -69,7 +69,7 @@ - + diff --git a/images/cs-block-phonetic-extensions-supplement.light.svg b/images/cs-block-phonetic-extensions-supplement.light.svg index 68141fb4a..0c348ff99 100644 --- a/images/cs-block-phonetic-extensions-supplement.light.svg +++ b/images/cs-block-phonetic-extensions-supplement.light.svg @@ -69,7 +69,7 @@ - + diff --git a/images/cs-block-symbols-for-legacy-computing-supplement.dark.svg b/images/cs-block-symbols-for-legacy-computing-supplement.dark.svg index fae52325d..2a586c6cf 100644 --- a/images/cs-block-symbols-for-legacy-computing-supplement.dark.svg +++ b/images/cs-block-symbols-for-legacy-computing-supplement.dark.svg @@ -1,5 +1,5 @@ - + @@ -28,8 +28,8 @@ - - + + @@ -632,6 +632,7 @@ + @@ -4626,4 +4627,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/cs-block-symbols-for-legacy-computing-supplement.light.svg b/images/cs-block-symbols-for-legacy-computing-supplement.light.svg index 087d465b0..c6c8c7a46 100644 --- a/images/cs-block-symbols-for-legacy-computing-supplement.light.svg +++ b/images/cs-block-symbols-for-legacy-computing-supplement.light.svg @@ -1,5 +1,5 @@ - + @@ -28,8 +28,8 @@ - - + + @@ -632,6 +632,7 @@ + @@ -4626,4 +4627,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/cv-cyrl-ef-cursive.dark.svg b/images/cv-cyrl-ef-cursive.dark.svg index afcd7fdf6..cd49fb979 100644 --- a/images/cv-cyrl-ef-cursive.dark.svg +++ b/images/cv-cyrl-ef-cursive.dark.svg @@ -1,7 +1,7 @@ - + diff --git a/images/cv-cyrl-ef-cursive.light.svg b/images/cv-cyrl-ef-cursive.light.svg index 85b723b8b..f7dfc3703 100644 --- a/images/cv-cyrl-ef-cursive.light.svg +++ b/images/cv-cyrl-ef-cursive.light.svg @@ -1,7 +1,7 @@ - + diff --git a/images/cv-cyrl-ef-diagonal-tailed-cursive.dark.svg b/images/cv-cyrl-ef-diagonal-tailed-cursive.dark.svg index fd568f858..56e0a563a 100644 --- a/images/cv-cyrl-ef-diagonal-tailed-cursive.dark.svg +++ b/images/cv-cyrl-ef-diagonal-tailed-cursive.dark.svg @@ -1,7 +1,7 @@ - + diff --git a/images/cv-cyrl-ef-diagonal-tailed-cursive.light.svg b/images/cv-cyrl-ef-diagonal-tailed-cursive.light.svg index 9e446b3ae..879de33cf 100644 --- a/images/cv-cyrl-ef-diagonal-tailed-cursive.light.svg +++ b/images/cv-cyrl-ef-diagonal-tailed-cursive.light.svg @@ -1,7 +1,7 @@ - + diff --git a/images/cv-cyrl-ef-serifed.dark.svg b/images/cv-cyrl-ef-serifed.dark.svg index 53ddc7198..e8d41ec0e 100644 --- a/images/cv-cyrl-ef-serifed.dark.svg +++ b/images/cv-cyrl-ef-serifed.dark.svg @@ -1,7 +1,7 @@ - + diff --git a/images/cv-cyrl-ef-serifed.light.svg b/images/cv-cyrl-ef-serifed.light.svg index 4231a69e9..a73208489 100644 --- a/images/cv-cyrl-ef-serifed.light.svg +++ b/images/cv-cyrl-ef-serifed.light.svg @@ -1,7 +1,7 @@ - + diff --git a/images/cv-cyrl-ef-serifless.dark.svg b/images/cv-cyrl-ef-serifless.dark.svg index 002bd6942..e1c833873 100644 --- a/images/cv-cyrl-ef-serifless.dark.svg +++ b/images/cv-cyrl-ef-serifless.dark.svg @@ -1,7 +1,7 @@ - + diff --git a/images/cv-cyrl-ef-serifless.light.svg b/images/cv-cyrl-ef-serifless.light.svg index 700b88cd0..a7e3fb6ef 100644 --- a/images/cv-cyrl-ef-serifless.light.svg +++ b/images/cv-cyrl-ef-serifless.light.svg @@ -1,7 +1,7 @@ - + diff --git a/images/cv-cyrl-ef-top-serifed.dark.svg b/images/cv-cyrl-ef-top-serifed.dark.svg index 03e4896df..2dd4c012e 100644 --- a/images/cv-cyrl-ef-top-serifed.dark.svg +++ b/images/cv-cyrl-ef-top-serifed.dark.svg @@ -1,7 +1,7 @@ - + diff --git a/images/cv-cyrl-ef-top-serifed.light.svg b/images/cv-cyrl-ef-top-serifed.light.svg index 7a19c5541..7a8f65931 100644 --- a/images/cv-cyrl-ef-top-serifed.light.svg +++ b/images/cv-cyrl-ef-top-serifed.light.svg @@ -1,7 +1,7 @@ - + diff --git a/images/cv-decorative-angle-brackets-middle.dark.svg b/images/cv-decorative-angle-brackets-middle.dark.svg new file mode 100644 index 000000000..2af7bab43 --- /dev/null +++ b/images/cv-decorative-angle-brackets-middle.dark.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/cv-decorative-angle-brackets-middle.light.svg b/images/cv-decorative-angle-brackets-middle.light.svg new file mode 100644 index 000000000..7427add60 --- /dev/null +++ b/images/cv-decorative-angle-brackets-middle.light.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/cv-decorative-angle-brackets-short.dark.svg b/images/cv-decorative-angle-brackets-short.dark.svg new file mode 100644 index 000000000..32afe24ae --- /dev/null +++ b/images/cv-decorative-angle-brackets-short.dark.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/cv-decorative-angle-brackets-short.light.svg b/images/cv-decorative-angle-brackets-short.light.svg new file mode 100644 index 000000000..ff7165036 --- /dev/null +++ b/images/cv-decorative-angle-brackets-short.light.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/cv-decorative-angle-brackets-tall.dark.svg b/images/cv-decorative-angle-brackets-tall.dark.svg new file mode 100644 index 000000000..419f39a01 --- /dev/null +++ b/images/cv-decorative-angle-brackets-tall.dark.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/cv-decorative-angle-brackets-tall.light.svg b/images/cv-decorative-angle-brackets-tall.light.svg new file mode 100644 index 000000000..9da08008f --- /dev/null +++ b/images/cv-decorative-angle-brackets-tall.light.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/cv-lower-phi-neo-hellenic.dark.svg b/images/cv-lower-phi-neo-hellenic.dark.svg index ff14162d6..3a80e0a77 100644 --- a/images/cv-lower-phi-neo-hellenic.dark.svg +++ b/images/cv-lower-phi-neo-hellenic.dark.svg @@ -1,7 +1,7 @@ - + diff --git a/images/cv-lower-phi-neo-hellenic.light.svg b/images/cv-lower-phi-neo-hellenic.light.svg index 5554274c2..b5650276d 100644 --- a/images/cv-lower-phi-neo-hellenic.light.svg +++ b/images/cv-lower-phi-neo-hellenic.light.svg @@ -1,7 +1,7 @@ - + diff --git a/images/cv-lower-phi-straight.dark.svg b/images/cv-lower-phi-straight.dark.svg index b5ef24c02..f18a9a324 100644 --- a/images/cv-lower-phi-straight.dark.svg +++ b/images/cv-lower-phi-straight.dark.svg @@ -1,7 +1,7 @@ - + diff --git a/images/cv-lower-phi-straight.light.svg b/images/cv-lower-phi-straight.light.svg index 48ddcca7c..11a690c37 100644 --- a/images/cv-lower-phi-straight.light.svg +++ b/images/cv-lower-phi-straight.light.svg @@ -1,7 +1,7 @@ - + diff --git a/images/languages.dark.svg b/images/languages.dark.svg index c1b4ea408..6d0abdc5f 100644 --- a/images/languages.dark.svg +++ b/images/languages.dark.svg @@ -100,7 +100,7 @@ - + @@ -143,7 +143,7 @@ - + diff --git a/images/languages.light.svg b/images/languages.light.svg index a088c285f..51965e413 100644 --- a/images/languages.light.svg +++ b/images/languages.light.svg @@ -100,7 +100,7 @@ - + @@ -143,7 +143,7 @@ - + diff --git a/images/package-sample-Iosevka.dark.svg b/images/package-sample-Iosevka.dark.svg index e2442b69b..937a349b0 100644 --- a/images/package-sample-Iosevka.dark.svg +++ b/images/package-sample-Iosevka.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-Iosevka.light.svg b/images/package-sample-Iosevka.light.svg index 5302f8b96..6e6cebe74 100644 --- a/images/package-sample-Iosevka.light.svg +++ b/images/package-sample-Iosevka.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaCurly.dark.svg b/images/package-sample-IosevkaCurly.dark.svg index 1ccdd337d..28f802a00 100644 --- a/images/package-sample-IosevkaCurly.dark.svg +++ b/images/package-sample-IosevkaCurly.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaCurly.light.svg b/images/package-sample-IosevkaCurly.light.svg index 3eb973ee1..2c722803b 100644 --- a/images/package-sample-IosevkaCurly.light.svg +++ b/images/package-sample-IosevkaCurly.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaCurlySlab.dark.svg b/images/package-sample-IosevkaCurlySlab.dark.svg index 903d00125..662776cc2 100644 --- a/images/package-sample-IosevkaCurlySlab.dark.svg +++ b/images/package-sample-IosevkaCurlySlab.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaCurlySlab.light.svg b/images/package-sample-IosevkaCurlySlab.light.svg index a8df78842..9bd5047f3 100644 --- a/images/package-sample-IosevkaCurlySlab.light.svg +++ b/images/package-sample-IosevkaCurlySlab.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaFixed.dark.svg b/images/package-sample-IosevkaFixed.dark.svg index e2442b69b..937a349b0 100644 --- a/images/package-sample-IosevkaFixed.dark.svg +++ b/images/package-sample-IosevkaFixed.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaFixed.light.svg b/images/package-sample-IosevkaFixed.light.svg index 5302f8b96..6e6cebe74 100644 --- a/images/package-sample-IosevkaFixed.light.svg +++ b/images/package-sample-IosevkaFixed.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaFixedCurly.dark.svg b/images/package-sample-IosevkaFixedCurly.dark.svg index 1ccdd337d..28f802a00 100644 --- a/images/package-sample-IosevkaFixedCurly.dark.svg +++ b/images/package-sample-IosevkaFixedCurly.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaFixedCurly.light.svg b/images/package-sample-IosevkaFixedCurly.light.svg index 3eb973ee1..2c722803b 100644 --- a/images/package-sample-IosevkaFixedCurly.light.svg +++ b/images/package-sample-IosevkaFixedCurly.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaFixedCurlySlab.dark.svg b/images/package-sample-IosevkaFixedCurlySlab.dark.svg index 903d00125..662776cc2 100644 --- a/images/package-sample-IosevkaFixedCurlySlab.dark.svg +++ b/images/package-sample-IosevkaFixedCurlySlab.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaFixedCurlySlab.light.svg b/images/package-sample-IosevkaFixedCurlySlab.light.svg index a8df78842..9bd5047f3 100644 --- a/images/package-sample-IosevkaFixedCurlySlab.light.svg +++ b/images/package-sample-IosevkaFixedCurlySlab.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS01.dark.svg b/images/package-sample-IosevkaFixedSS01.dark.svg index 1c21d1ac9..dadcac9b6 100644 --- a/images/package-sample-IosevkaFixedSS01.dark.svg +++ b/images/package-sample-IosevkaFixedSS01.dark.svg @@ -128,7 +128,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS01.light.svg b/images/package-sample-IosevkaFixedSS01.light.svg index f66880e03..af52419cb 100644 --- a/images/package-sample-IosevkaFixedSS01.light.svg +++ b/images/package-sample-IosevkaFixedSS01.light.svg @@ -128,7 +128,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS03.dark.svg b/images/package-sample-IosevkaFixedSS03.dark.svg index 9e5b487be..84d8b5197 100644 --- a/images/package-sample-IosevkaFixedSS03.dark.svg +++ b/images/package-sample-IosevkaFixedSS03.dark.svg @@ -129,7 +129,7 @@ - + @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS03.light.svg b/images/package-sample-IosevkaFixedSS03.light.svg index 5fad676e9..05dee92f0 100644 --- a/images/package-sample-IosevkaFixedSS03.light.svg +++ b/images/package-sample-IosevkaFixedSS03.light.svg @@ -129,7 +129,7 @@ - + @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS04.dark.svg b/images/package-sample-IosevkaFixedSS04.dark.svg index f52746f78..fbcf17c04 100644 --- a/images/package-sample-IosevkaFixedSS04.dark.svg +++ b/images/package-sample-IosevkaFixedSS04.dark.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS04.light.svg b/images/package-sample-IosevkaFixedSS04.light.svg index 871044c9d..e13722586 100644 --- a/images/package-sample-IosevkaFixedSS04.light.svg +++ b/images/package-sample-IosevkaFixedSS04.light.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS06.dark.svg b/images/package-sample-IosevkaFixedSS06.dark.svg index 844def99b..2e76803e2 100644 --- a/images/package-sample-IosevkaFixedSS06.dark.svg +++ b/images/package-sample-IosevkaFixedSS06.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS06.light.svg b/images/package-sample-IosevkaFixedSS06.light.svg index 2af6857e9..b149a2307 100644 --- a/images/package-sample-IosevkaFixedSS06.light.svg +++ b/images/package-sample-IosevkaFixedSS06.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS07.dark.svg b/images/package-sample-IosevkaFixedSS07.dark.svg index 9bb9ac943..1632fa667 100644 --- a/images/package-sample-IosevkaFixedSS07.dark.svg +++ b/images/package-sample-IosevkaFixedSS07.dark.svg @@ -147,7 +147,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS07.light.svg b/images/package-sample-IosevkaFixedSS07.light.svg index b77213542..bbb15c6d8 100644 --- a/images/package-sample-IosevkaFixedSS07.light.svg +++ b/images/package-sample-IosevkaFixedSS07.light.svg @@ -147,7 +147,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS08.dark.svg b/images/package-sample-IosevkaFixedSS08.dark.svg index d6305f48b..65f768cf4 100644 --- a/images/package-sample-IosevkaFixedSS08.dark.svg +++ b/images/package-sample-IosevkaFixedSS08.dark.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS08.light.svg b/images/package-sample-IosevkaFixedSS08.light.svg index 759265a89..f931933c1 100644 --- a/images/package-sample-IosevkaFixedSS08.light.svg +++ b/images/package-sample-IosevkaFixedSS08.light.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS09.dark.svg b/images/package-sample-IosevkaFixedSS09.dark.svg index a3e247289..1033bed3d 100644 --- a/images/package-sample-IosevkaFixedSS09.dark.svg +++ b/images/package-sample-IosevkaFixedSS09.dark.svg @@ -129,7 +129,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS09.light.svg b/images/package-sample-IosevkaFixedSS09.light.svg index d2e20ebf1..eff7dc592 100644 --- a/images/package-sample-IosevkaFixedSS09.light.svg +++ b/images/package-sample-IosevkaFixedSS09.light.svg @@ -129,7 +129,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS10.dark.svg b/images/package-sample-IosevkaFixedSS10.dark.svg index 2279160d5..3d53342a1 100644 --- a/images/package-sample-IosevkaFixedSS10.dark.svg +++ b/images/package-sample-IosevkaFixedSS10.dark.svg @@ -147,7 +147,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS10.light.svg b/images/package-sample-IosevkaFixedSS10.light.svg index d6a274e7a..c58b676f9 100644 --- a/images/package-sample-IosevkaFixedSS10.light.svg +++ b/images/package-sample-IosevkaFixedSS10.light.svg @@ -147,7 +147,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS11.dark.svg b/images/package-sample-IosevkaFixedSS11.dark.svg index 60d96de88..a747bbfd4 100644 --- a/images/package-sample-IosevkaFixedSS11.dark.svg +++ b/images/package-sample-IosevkaFixedSS11.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS11.light.svg b/images/package-sample-IosevkaFixedSS11.light.svg index 425eb1bb2..5c361785d 100644 --- a/images/package-sample-IosevkaFixedSS11.light.svg +++ b/images/package-sample-IosevkaFixedSS11.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS12.dark.svg b/images/package-sample-IosevkaFixedSS12.dark.svg index 436e03820..59af9794c 100644 --- a/images/package-sample-IosevkaFixedSS12.dark.svg +++ b/images/package-sample-IosevkaFixedSS12.dark.svg @@ -128,7 +128,7 @@ - + @@ -145,7 +145,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS12.light.svg b/images/package-sample-IosevkaFixedSS12.light.svg index 0075ac973..695266cb1 100644 --- a/images/package-sample-IosevkaFixedSS12.light.svg +++ b/images/package-sample-IosevkaFixedSS12.light.svg @@ -128,7 +128,7 @@ - + @@ -145,7 +145,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS13.dark.svg b/images/package-sample-IosevkaFixedSS13.dark.svg index fb29bf6f8..1dbfd877d 100644 --- a/images/package-sample-IosevkaFixedSS13.dark.svg +++ b/images/package-sample-IosevkaFixedSS13.dark.svg @@ -129,7 +129,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS13.light.svg b/images/package-sample-IosevkaFixedSS13.light.svg index 1ac70f777..1cb2ab065 100644 --- a/images/package-sample-IosevkaFixedSS13.light.svg +++ b/images/package-sample-IosevkaFixedSS13.light.svg @@ -129,7 +129,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS14.dark.svg b/images/package-sample-IosevkaFixedSS14.dark.svg index 2d839a627..caba52593 100644 --- a/images/package-sample-IosevkaFixedSS14.dark.svg +++ b/images/package-sample-IosevkaFixedSS14.dark.svg @@ -142,7 +142,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS14.light.svg b/images/package-sample-IosevkaFixedSS14.light.svg index d635623c7..6d19afbb8 100644 --- a/images/package-sample-IosevkaFixedSS14.light.svg +++ b/images/package-sample-IosevkaFixedSS14.light.svg @@ -142,7 +142,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS17.dark.svg b/images/package-sample-IosevkaFixedSS17.dark.svg index 7870d9fd0..cec72b48f 100644 --- a/images/package-sample-IosevkaFixedSS17.dark.svg +++ b/images/package-sample-IosevkaFixedSS17.dark.svg @@ -145,7 +145,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS17.light.svg b/images/package-sample-IosevkaFixedSS17.light.svg index 601bcb385..f63af3650 100644 --- a/images/package-sample-IosevkaFixedSS17.light.svg +++ b/images/package-sample-IosevkaFixedSS17.light.svg @@ -145,7 +145,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS18.dark.svg b/images/package-sample-IosevkaFixedSS18.dark.svg index 4876faf8c..2cf496e24 100644 --- a/images/package-sample-IosevkaFixedSS18.dark.svg +++ b/images/package-sample-IosevkaFixedSS18.dark.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSS18.light.svg b/images/package-sample-IosevkaFixedSS18.light.svg index 675207d98..d9cecd813 100644 --- a/images/package-sample-IosevkaFixedSS18.light.svg +++ b/images/package-sample-IosevkaFixedSS18.light.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSlab.dark.svg b/images/package-sample-IosevkaFixedSlab.dark.svg index 724c7c73c..ec09249e9 100644 --- a/images/package-sample-IosevkaFixedSlab.dark.svg +++ b/images/package-sample-IosevkaFixedSlab.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaFixedSlab.light.svg b/images/package-sample-IosevkaFixedSlab.light.svg index 7118a0875..091bd9751 100644 --- a/images/package-sample-IosevkaFixedSlab.light.svg +++ b/images/package-sample-IosevkaFixedSlab.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaSS01.dark.svg b/images/package-sample-IosevkaSS01.dark.svg index 1c21d1ac9..dadcac9b6 100644 --- a/images/package-sample-IosevkaSS01.dark.svg +++ b/images/package-sample-IosevkaSS01.dark.svg @@ -128,7 +128,7 @@ - + diff --git a/images/package-sample-IosevkaSS01.light.svg b/images/package-sample-IosevkaSS01.light.svg index f66880e03..af52419cb 100644 --- a/images/package-sample-IosevkaSS01.light.svg +++ b/images/package-sample-IosevkaSS01.light.svg @@ -128,7 +128,7 @@ - + diff --git a/images/package-sample-IosevkaSS03.dark.svg b/images/package-sample-IosevkaSS03.dark.svg index 9e5b487be..84d8b5197 100644 --- a/images/package-sample-IosevkaSS03.dark.svg +++ b/images/package-sample-IosevkaSS03.dark.svg @@ -129,7 +129,7 @@ - + @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaSS03.light.svg b/images/package-sample-IosevkaSS03.light.svg index 5fad676e9..05dee92f0 100644 --- a/images/package-sample-IosevkaSS03.light.svg +++ b/images/package-sample-IosevkaSS03.light.svg @@ -129,7 +129,7 @@ - + @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaSS04.dark.svg b/images/package-sample-IosevkaSS04.dark.svg index f52746f78..fbcf17c04 100644 --- a/images/package-sample-IosevkaSS04.dark.svg +++ b/images/package-sample-IosevkaSS04.dark.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaSS04.light.svg b/images/package-sample-IosevkaSS04.light.svg index 871044c9d..e13722586 100644 --- a/images/package-sample-IosevkaSS04.light.svg +++ b/images/package-sample-IosevkaSS04.light.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaSS06.dark.svg b/images/package-sample-IosevkaSS06.dark.svg index 844def99b..2e76803e2 100644 --- a/images/package-sample-IosevkaSS06.dark.svg +++ b/images/package-sample-IosevkaSS06.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaSS06.light.svg b/images/package-sample-IosevkaSS06.light.svg index 2af6857e9..b149a2307 100644 --- a/images/package-sample-IosevkaSS06.light.svg +++ b/images/package-sample-IosevkaSS06.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaSS07.dark.svg b/images/package-sample-IosevkaSS07.dark.svg index 9bb9ac943..1632fa667 100644 --- a/images/package-sample-IosevkaSS07.dark.svg +++ b/images/package-sample-IosevkaSS07.dark.svg @@ -147,7 +147,7 @@ - + diff --git a/images/package-sample-IosevkaSS07.light.svg b/images/package-sample-IosevkaSS07.light.svg index b77213542..bbb15c6d8 100644 --- a/images/package-sample-IosevkaSS07.light.svg +++ b/images/package-sample-IosevkaSS07.light.svg @@ -147,7 +147,7 @@ - + diff --git a/images/package-sample-IosevkaSS08.dark.svg b/images/package-sample-IosevkaSS08.dark.svg index d6305f48b..65f768cf4 100644 --- a/images/package-sample-IosevkaSS08.dark.svg +++ b/images/package-sample-IosevkaSS08.dark.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaSS08.light.svg b/images/package-sample-IosevkaSS08.light.svg index 759265a89..f931933c1 100644 --- a/images/package-sample-IosevkaSS08.light.svg +++ b/images/package-sample-IosevkaSS08.light.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaSS09.dark.svg b/images/package-sample-IosevkaSS09.dark.svg index a3e247289..1033bed3d 100644 --- a/images/package-sample-IosevkaSS09.dark.svg +++ b/images/package-sample-IosevkaSS09.dark.svg @@ -129,7 +129,7 @@ - + diff --git a/images/package-sample-IosevkaSS09.light.svg b/images/package-sample-IosevkaSS09.light.svg index d2e20ebf1..eff7dc592 100644 --- a/images/package-sample-IosevkaSS09.light.svg +++ b/images/package-sample-IosevkaSS09.light.svg @@ -129,7 +129,7 @@ - + diff --git a/images/package-sample-IosevkaSS10.dark.svg b/images/package-sample-IosevkaSS10.dark.svg index 2279160d5..3d53342a1 100644 --- a/images/package-sample-IosevkaSS10.dark.svg +++ b/images/package-sample-IosevkaSS10.dark.svg @@ -147,7 +147,7 @@ - + diff --git a/images/package-sample-IosevkaSS10.light.svg b/images/package-sample-IosevkaSS10.light.svg index d6a274e7a..c58b676f9 100644 --- a/images/package-sample-IosevkaSS10.light.svg +++ b/images/package-sample-IosevkaSS10.light.svg @@ -147,7 +147,7 @@ - + diff --git a/images/package-sample-IosevkaSS11.dark.svg b/images/package-sample-IosevkaSS11.dark.svg index 60d96de88..a747bbfd4 100644 --- a/images/package-sample-IosevkaSS11.dark.svg +++ b/images/package-sample-IosevkaSS11.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaSS11.light.svg b/images/package-sample-IosevkaSS11.light.svg index 425eb1bb2..5c361785d 100644 --- a/images/package-sample-IosevkaSS11.light.svg +++ b/images/package-sample-IosevkaSS11.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaSS12.dark.svg b/images/package-sample-IosevkaSS12.dark.svg index 436e03820..59af9794c 100644 --- a/images/package-sample-IosevkaSS12.dark.svg +++ b/images/package-sample-IosevkaSS12.dark.svg @@ -128,7 +128,7 @@ - + @@ -145,7 +145,7 @@ - + diff --git a/images/package-sample-IosevkaSS12.light.svg b/images/package-sample-IosevkaSS12.light.svg index 0075ac973..695266cb1 100644 --- a/images/package-sample-IosevkaSS12.light.svg +++ b/images/package-sample-IosevkaSS12.light.svg @@ -128,7 +128,7 @@ - + @@ -145,7 +145,7 @@ - + diff --git a/images/package-sample-IosevkaSS13.dark.svg b/images/package-sample-IosevkaSS13.dark.svg index fb29bf6f8..1dbfd877d 100644 --- a/images/package-sample-IosevkaSS13.dark.svg +++ b/images/package-sample-IosevkaSS13.dark.svg @@ -129,7 +129,7 @@ - + diff --git a/images/package-sample-IosevkaSS13.light.svg b/images/package-sample-IosevkaSS13.light.svg index 1ac70f777..1cb2ab065 100644 --- a/images/package-sample-IosevkaSS13.light.svg +++ b/images/package-sample-IosevkaSS13.light.svg @@ -129,7 +129,7 @@ - + diff --git a/images/package-sample-IosevkaSS14.dark.svg b/images/package-sample-IosevkaSS14.dark.svg index 2d839a627..caba52593 100644 --- a/images/package-sample-IosevkaSS14.dark.svg +++ b/images/package-sample-IosevkaSS14.dark.svg @@ -142,7 +142,7 @@ - + diff --git a/images/package-sample-IosevkaSS14.light.svg b/images/package-sample-IosevkaSS14.light.svg index d635623c7..6d19afbb8 100644 --- a/images/package-sample-IosevkaSS14.light.svg +++ b/images/package-sample-IosevkaSS14.light.svg @@ -142,7 +142,7 @@ - + diff --git a/images/package-sample-IosevkaSS17.dark.svg b/images/package-sample-IosevkaSS17.dark.svg index 7870d9fd0..cec72b48f 100644 --- a/images/package-sample-IosevkaSS17.dark.svg +++ b/images/package-sample-IosevkaSS17.dark.svg @@ -145,7 +145,7 @@ - + diff --git a/images/package-sample-IosevkaSS17.light.svg b/images/package-sample-IosevkaSS17.light.svg index 601bcb385..f63af3650 100644 --- a/images/package-sample-IosevkaSS17.light.svg +++ b/images/package-sample-IosevkaSS17.light.svg @@ -145,7 +145,7 @@ - + diff --git a/images/package-sample-IosevkaSS18.dark.svg b/images/package-sample-IosevkaSS18.dark.svg index 4876faf8c..2cf496e24 100644 --- a/images/package-sample-IosevkaSS18.dark.svg +++ b/images/package-sample-IosevkaSS18.dark.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaSS18.light.svg b/images/package-sample-IosevkaSS18.light.svg index 675207d98..d9cecd813 100644 --- a/images/package-sample-IosevkaSS18.light.svg +++ b/images/package-sample-IosevkaSS18.light.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaSlab.dark.svg b/images/package-sample-IosevkaSlab.dark.svg index 724c7c73c..ec09249e9 100644 --- a/images/package-sample-IosevkaSlab.dark.svg +++ b/images/package-sample-IosevkaSlab.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaSlab.light.svg b/images/package-sample-IosevkaSlab.light.svg index 7118a0875..091bd9751 100644 --- a/images/package-sample-IosevkaSlab.light.svg +++ b/images/package-sample-IosevkaSlab.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaTerm.dark.svg b/images/package-sample-IosevkaTerm.dark.svg index e2442b69b..937a349b0 100644 --- a/images/package-sample-IosevkaTerm.dark.svg +++ b/images/package-sample-IosevkaTerm.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaTerm.light.svg b/images/package-sample-IosevkaTerm.light.svg index 5302f8b96..6e6cebe74 100644 --- a/images/package-sample-IosevkaTerm.light.svg +++ b/images/package-sample-IosevkaTerm.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaTermCurly.dark.svg b/images/package-sample-IosevkaTermCurly.dark.svg index 1ccdd337d..28f802a00 100644 --- a/images/package-sample-IosevkaTermCurly.dark.svg +++ b/images/package-sample-IosevkaTermCurly.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaTermCurly.light.svg b/images/package-sample-IosevkaTermCurly.light.svg index 3eb973ee1..2c722803b 100644 --- a/images/package-sample-IosevkaTermCurly.light.svg +++ b/images/package-sample-IosevkaTermCurly.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaTermCurlySlab.dark.svg b/images/package-sample-IosevkaTermCurlySlab.dark.svg index 903d00125..662776cc2 100644 --- a/images/package-sample-IosevkaTermCurlySlab.dark.svg +++ b/images/package-sample-IosevkaTermCurlySlab.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaTermCurlySlab.light.svg b/images/package-sample-IosevkaTermCurlySlab.light.svg index a8df78842..9bd5047f3 100644 --- a/images/package-sample-IosevkaTermCurlySlab.light.svg +++ b/images/package-sample-IosevkaTermCurlySlab.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS01.dark.svg b/images/package-sample-IosevkaTermSS01.dark.svg index 1c21d1ac9..dadcac9b6 100644 --- a/images/package-sample-IosevkaTermSS01.dark.svg +++ b/images/package-sample-IosevkaTermSS01.dark.svg @@ -128,7 +128,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS01.light.svg b/images/package-sample-IosevkaTermSS01.light.svg index f66880e03..af52419cb 100644 --- a/images/package-sample-IosevkaTermSS01.light.svg +++ b/images/package-sample-IosevkaTermSS01.light.svg @@ -128,7 +128,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS03.dark.svg b/images/package-sample-IosevkaTermSS03.dark.svg index 9e5b487be..84d8b5197 100644 --- a/images/package-sample-IosevkaTermSS03.dark.svg +++ b/images/package-sample-IosevkaTermSS03.dark.svg @@ -129,7 +129,7 @@ - + @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS03.light.svg b/images/package-sample-IosevkaTermSS03.light.svg index 5fad676e9..05dee92f0 100644 --- a/images/package-sample-IosevkaTermSS03.light.svg +++ b/images/package-sample-IosevkaTermSS03.light.svg @@ -129,7 +129,7 @@ - + @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS04.dark.svg b/images/package-sample-IosevkaTermSS04.dark.svg index f52746f78..fbcf17c04 100644 --- a/images/package-sample-IosevkaTermSS04.dark.svg +++ b/images/package-sample-IosevkaTermSS04.dark.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS04.light.svg b/images/package-sample-IosevkaTermSS04.light.svg index 871044c9d..e13722586 100644 --- a/images/package-sample-IosevkaTermSS04.light.svg +++ b/images/package-sample-IosevkaTermSS04.light.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS06.dark.svg b/images/package-sample-IosevkaTermSS06.dark.svg index 844def99b..2e76803e2 100644 --- a/images/package-sample-IosevkaTermSS06.dark.svg +++ b/images/package-sample-IosevkaTermSS06.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS06.light.svg b/images/package-sample-IosevkaTermSS06.light.svg index 2af6857e9..b149a2307 100644 --- a/images/package-sample-IosevkaTermSS06.light.svg +++ b/images/package-sample-IosevkaTermSS06.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS07.dark.svg b/images/package-sample-IosevkaTermSS07.dark.svg index 9bb9ac943..1632fa667 100644 --- a/images/package-sample-IosevkaTermSS07.dark.svg +++ b/images/package-sample-IosevkaTermSS07.dark.svg @@ -147,7 +147,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS07.light.svg b/images/package-sample-IosevkaTermSS07.light.svg index b77213542..bbb15c6d8 100644 --- a/images/package-sample-IosevkaTermSS07.light.svg +++ b/images/package-sample-IosevkaTermSS07.light.svg @@ -147,7 +147,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS08.dark.svg b/images/package-sample-IosevkaTermSS08.dark.svg index d6305f48b..65f768cf4 100644 --- a/images/package-sample-IosevkaTermSS08.dark.svg +++ b/images/package-sample-IosevkaTermSS08.dark.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS08.light.svg b/images/package-sample-IosevkaTermSS08.light.svg index 759265a89..f931933c1 100644 --- a/images/package-sample-IosevkaTermSS08.light.svg +++ b/images/package-sample-IosevkaTermSS08.light.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS09.dark.svg b/images/package-sample-IosevkaTermSS09.dark.svg index a3e247289..1033bed3d 100644 --- a/images/package-sample-IosevkaTermSS09.dark.svg +++ b/images/package-sample-IosevkaTermSS09.dark.svg @@ -129,7 +129,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS09.light.svg b/images/package-sample-IosevkaTermSS09.light.svg index d2e20ebf1..eff7dc592 100644 --- a/images/package-sample-IosevkaTermSS09.light.svg +++ b/images/package-sample-IosevkaTermSS09.light.svg @@ -129,7 +129,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS10.dark.svg b/images/package-sample-IosevkaTermSS10.dark.svg index 2279160d5..3d53342a1 100644 --- a/images/package-sample-IosevkaTermSS10.dark.svg +++ b/images/package-sample-IosevkaTermSS10.dark.svg @@ -147,7 +147,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS10.light.svg b/images/package-sample-IosevkaTermSS10.light.svg index d6a274e7a..c58b676f9 100644 --- a/images/package-sample-IosevkaTermSS10.light.svg +++ b/images/package-sample-IosevkaTermSS10.light.svg @@ -147,7 +147,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS11.dark.svg b/images/package-sample-IosevkaTermSS11.dark.svg index 60d96de88..a747bbfd4 100644 --- a/images/package-sample-IosevkaTermSS11.dark.svg +++ b/images/package-sample-IosevkaTermSS11.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS11.light.svg b/images/package-sample-IosevkaTermSS11.light.svg index 425eb1bb2..5c361785d 100644 --- a/images/package-sample-IosevkaTermSS11.light.svg +++ b/images/package-sample-IosevkaTermSS11.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS12.dark.svg b/images/package-sample-IosevkaTermSS12.dark.svg index 436e03820..59af9794c 100644 --- a/images/package-sample-IosevkaTermSS12.dark.svg +++ b/images/package-sample-IosevkaTermSS12.dark.svg @@ -128,7 +128,7 @@ - + @@ -145,7 +145,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS12.light.svg b/images/package-sample-IosevkaTermSS12.light.svg index 0075ac973..695266cb1 100644 --- a/images/package-sample-IosevkaTermSS12.light.svg +++ b/images/package-sample-IosevkaTermSS12.light.svg @@ -128,7 +128,7 @@ - + @@ -145,7 +145,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS13.dark.svg b/images/package-sample-IosevkaTermSS13.dark.svg index fb29bf6f8..1dbfd877d 100644 --- a/images/package-sample-IosevkaTermSS13.dark.svg +++ b/images/package-sample-IosevkaTermSS13.dark.svg @@ -129,7 +129,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS13.light.svg b/images/package-sample-IosevkaTermSS13.light.svg index 1ac70f777..1cb2ab065 100644 --- a/images/package-sample-IosevkaTermSS13.light.svg +++ b/images/package-sample-IosevkaTermSS13.light.svg @@ -129,7 +129,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS14.dark.svg b/images/package-sample-IosevkaTermSS14.dark.svg index 2d839a627..caba52593 100644 --- a/images/package-sample-IosevkaTermSS14.dark.svg +++ b/images/package-sample-IosevkaTermSS14.dark.svg @@ -142,7 +142,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS14.light.svg b/images/package-sample-IosevkaTermSS14.light.svg index d635623c7..6d19afbb8 100644 --- a/images/package-sample-IosevkaTermSS14.light.svg +++ b/images/package-sample-IosevkaTermSS14.light.svg @@ -142,7 +142,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS17.dark.svg b/images/package-sample-IosevkaTermSS17.dark.svg index 7870d9fd0..cec72b48f 100644 --- a/images/package-sample-IosevkaTermSS17.dark.svg +++ b/images/package-sample-IosevkaTermSS17.dark.svg @@ -145,7 +145,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS17.light.svg b/images/package-sample-IosevkaTermSS17.light.svg index 601bcb385..f63af3650 100644 --- a/images/package-sample-IosevkaTermSS17.light.svg +++ b/images/package-sample-IosevkaTermSS17.light.svg @@ -145,7 +145,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS18.dark.svg b/images/package-sample-IosevkaTermSS18.dark.svg index 4876faf8c..2cf496e24 100644 --- a/images/package-sample-IosevkaTermSS18.dark.svg +++ b/images/package-sample-IosevkaTermSS18.dark.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaTermSS18.light.svg b/images/package-sample-IosevkaTermSS18.light.svg index 675207d98..d9cecd813 100644 --- a/images/package-sample-IosevkaTermSS18.light.svg +++ b/images/package-sample-IosevkaTermSS18.light.svg @@ -144,7 +144,7 @@ - + diff --git a/images/package-sample-IosevkaTermSlab.dark.svg b/images/package-sample-IosevkaTermSlab.dark.svg index 724c7c73c..ec09249e9 100644 --- a/images/package-sample-IosevkaTermSlab.dark.svg +++ b/images/package-sample-IosevkaTermSlab.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/package-sample-IosevkaTermSlab.light.svg b/images/package-sample-IosevkaTermSlab.light.svg index 7118a0875..091bd9751 100644 --- a/images/package-sample-IosevkaTermSlab.light.svg +++ b/images/package-sample-IosevkaTermSlab.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/ss-i-off-0.dark.svg b/images/ss-i-off-0.dark.svg index 6f1193fa2..a3ff392d3 100644 --- a/images/ss-i-off-0.dark.svg +++ b/images/ss-i-off-0.dark.svg @@ -145,7 +145,7 @@ - + diff --git a/images/ss-i-off-0.light.svg b/images/ss-i-off-0.light.svg index fa3ca5e7b..4b38e1ebc 100644 --- a/images/ss-i-off-0.light.svg +++ b/images/ss-i-off-0.light.svg @@ -145,7 +145,7 @@ - + diff --git a/images/ss-i-ss01-1.dark.svg b/images/ss-i-ss01-1.dark.svg index e44430b97..d4caa9eda 100644 --- a/images/ss-i-ss01-1.dark.svg +++ b/images/ss-i-ss01-1.dark.svg @@ -128,7 +128,7 @@ - + diff --git a/images/ss-i-ss01-1.light.svg b/images/ss-i-ss01-1.light.svg index a2e0247a0..a4c6f1117 100644 --- a/images/ss-i-ss01-1.light.svg +++ b/images/ss-i-ss01-1.light.svg @@ -128,7 +128,7 @@ - + diff --git a/images/ss-i-ss03-1.dark.svg b/images/ss-i-ss03-1.dark.svg index 3c547134f..a1b25b340 100644 --- a/images/ss-i-ss03-1.dark.svg +++ b/images/ss-i-ss03-1.dark.svg @@ -143,7 +143,7 @@ - + diff --git a/images/ss-i-ss03-1.light.svg b/images/ss-i-ss03-1.light.svg index de16b55e3..c0e825054 100644 --- a/images/ss-i-ss03-1.light.svg +++ b/images/ss-i-ss03-1.light.svg @@ -143,7 +143,7 @@ - + diff --git a/images/ss-i-ss04-1.dark.svg b/images/ss-i-ss04-1.dark.svg index 43f9f8cc6..abc5e6b8e 100644 --- a/images/ss-i-ss04-1.dark.svg +++ b/images/ss-i-ss04-1.dark.svg @@ -144,7 +144,7 @@ - + diff --git a/images/ss-i-ss04-1.light.svg b/images/ss-i-ss04-1.light.svg index 6db48fb69..df1f767db 100644 --- a/images/ss-i-ss04-1.light.svg +++ b/images/ss-i-ss04-1.light.svg @@ -144,7 +144,7 @@ - + diff --git a/images/ss-i-ss06-1.dark.svg b/images/ss-i-ss06-1.dark.svg index 004e46a3c..b08d6b015 100644 --- a/images/ss-i-ss06-1.dark.svg +++ b/images/ss-i-ss06-1.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/ss-i-ss06-1.light.svg b/images/ss-i-ss06-1.light.svg index b1af6bf2b..d8a732826 100644 --- a/images/ss-i-ss06-1.light.svg +++ b/images/ss-i-ss06-1.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/ss-i-ss07-1.dark.svg b/images/ss-i-ss07-1.dark.svg index a2c250727..f25865e13 100644 --- a/images/ss-i-ss07-1.dark.svg +++ b/images/ss-i-ss07-1.dark.svg @@ -147,7 +147,7 @@ - + diff --git a/images/ss-i-ss07-1.light.svg b/images/ss-i-ss07-1.light.svg index 3414757f9..8d91f33a7 100644 --- a/images/ss-i-ss07-1.light.svg +++ b/images/ss-i-ss07-1.light.svg @@ -147,7 +147,7 @@ - + diff --git a/images/ss-i-ss08-1.dark.svg b/images/ss-i-ss08-1.dark.svg index 8cf5664ce..3fec970a5 100644 --- a/images/ss-i-ss08-1.dark.svg +++ b/images/ss-i-ss08-1.dark.svg @@ -144,7 +144,7 @@ - + diff --git a/images/ss-i-ss08-1.light.svg b/images/ss-i-ss08-1.light.svg index f768f3965..ebeec61c2 100644 --- a/images/ss-i-ss08-1.light.svg +++ b/images/ss-i-ss08-1.light.svg @@ -144,7 +144,7 @@ - + diff --git a/images/ss-i-ss09-1.dark.svg b/images/ss-i-ss09-1.dark.svg index 681c67c8d..b84e25e1b 100644 --- a/images/ss-i-ss09-1.dark.svg +++ b/images/ss-i-ss09-1.dark.svg @@ -129,7 +129,7 @@ - + diff --git a/images/ss-i-ss09-1.light.svg b/images/ss-i-ss09-1.light.svg index f944c47aa..fc8f8c61d 100644 --- a/images/ss-i-ss09-1.light.svg +++ b/images/ss-i-ss09-1.light.svg @@ -129,7 +129,7 @@ - + diff --git a/images/ss-i-ss10-1.dark.svg b/images/ss-i-ss10-1.dark.svg index 210b8cf4e..696c83b1b 100644 --- a/images/ss-i-ss10-1.dark.svg +++ b/images/ss-i-ss10-1.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/ss-i-ss10-1.light.svg b/images/ss-i-ss10-1.light.svg index 46cbc55fe..df7a32c6d 100644 --- a/images/ss-i-ss10-1.light.svg +++ b/images/ss-i-ss10-1.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/ss-i-ss11-1.dark.svg b/images/ss-i-ss11-1.dark.svg index 0c1a3d53a..77c2cf2cf 100644 --- a/images/ss-i-ss11-1.dark.svg +++ b/images/ss-i-ss11-1.dark.svg @@ -145,7 +145,7 @@ - + diff --git a/images/ss-i-ss11-1.light.svg b/images/ss-i-ss11-1.light.svg index 2837344c6..18fda380f 100644 --- a/images/ss-i-ss11-1.light.svg +++ b/images/ss-i-ss11-1.light.svg @@ -145,7 +145,7 @@ - + diff --git a/images/ss-i-ss12-1.dark.svg b/images/ss-i-ss12-1.dark.svg index 107a63931..2b367f9e2 100644 --- a/images/ss-i-ss12-1.dark.svg +++ b/images/ss-i-ss12-1.dark.svg @@ -127,7 +127,7 @@ - + @@ -143,7 +143,7 @@ - + diff --git a/images/ss-i-ss12-1.light.svg b/images/ss-i-ss12-1.light.svg index e352da1f5..cbe7f7f0c 100644 --- a/images/ss-i-ss12-1.light.svg +++ b/images/ss-i-ss12-1.light.svg @@ -127,7 +127,7 @@ - + @@ -143,7 +143,7 @@ - + diff --git a/images/ss-i-ss13-1.dark.svg b/images/ss-i-ss13-1.dark.svg index 7104808c8..bd6f5f7f2 100644 --- a/images/ss-i-ss13-1.dark.svg +++ b/images/ss-i-ss13-1.dark.svg @@ -129,7 +129,7 @@ - + diff --git a/images/ss-i-ss13-1.light.svg b/images/ss-i-ss13-1.light.svg index 683f1e1ce..43831e073 100644 --- a/images/ss-i-ss13-1.light.svg +++ b/images/ss-i-ss13-1.light.svg @@ -129,7 +129,7 @@ - + diff --git a/images/ss-i-ss14-1.dark.svg b/images/ss-i-ss14-1.dark.svg index f27197266..7784920d1 100644 --- a/images/ss-i-ss14-1.dark.svg +++ b/images/ss-i-ss14-1.dark.svg @@ -141,7 +141,7 @@ - + diff --git a/images/ss-i-ss14-1.light.svg b/images/ss-i-ss14-1.light.svg index a3157d019..ece24f27d 100644 --- a/images/ss-i-ss14-1.light.svg +++ b/images/ss-i-ss14-1.light.svg @@ -141,7 +141,7 @@ - + diff --git a/images/ss-i-ss17-1.dark.svg b/images/ss-i-ss17-1.dark.svg index 542baa908..3d09765aa 100644 --- a/images/ss-i-ss17-1.dark.svg +++ b/images/ss-i-ss17-1.dark.svg @@ -145,7 +145,7 @@ - + diff --git a/images/ss-i-ss17-1.light.svg b/images/ss-i-ss17-1.light.svg index a5fd8b443..e71aa1243 100644 --- a/images/ss-i-ss17-1.light.svg +++ b/images/ss-i-ss17-1.light.svg @@ -145,7 +145,7 @@ - + diff --git a/images/ss-i-ss18-1.dark.svg b/images/ss-i-ss18-1.dark.svg index 8a14a5526..1a3720ae9 100644 --- a/images/ss-i-ss18-1.dark.svg +++ b/images/ss-i-ss18-1.dark.svg @@ -144,7 +144,7 @@ - + diff --git a/images/ss-i-ss18-1.light.svg b/images/ss-i-ss18-1.light.svg index d6341d2d2..0aab3ac7f 100644 --- a/images/ss-i-ss18-1.light.svg +++ b/images/ss-i-ss18-1.light.svg @@ -144,7 +144,7 @@ - + diff --git a/images/ss-i-ss20-1.dark.svg b/images/ss-i-ss20-1.dark.svg index eeba38e32..3d8042230 100644 --- a/images/ss-i-ss20-1.dark.svg +++ b/images/ss-i-ss20-1.dark.svg @@ -145,7 +145,7 @@ - + diff --git a/images/ss-i-ss20-1.light.svg b/images/ss-i-ss20-1.light.svg index a2430555e..eb130c856 100644 --- a/images/ss-i-ss20-1.light.svg +++ b/images/ss-i-ss20-1.light.svg @@ -145,7 +145,7 @@ - + diff --git a/images/ss-u-off-0.dark.svg b/images/ss-u-off-0.dark.svg index 27714a819..1f51b5fad 100644 --- a/images/ss-u-off-0.dark.svg +++ b/images/ss-u-off-0.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/ss-u-off-0.light.svg b/images/ss-u-off-0.light.svg index 4e92b13d5..ee258dcb2 100644 --- a/images/ss-u-off-0.light.svg +++ b/images/ss-u-off-0.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/ss-u-ss01-1.dark.svg b/images/ss-u-ss01-1.dark.svg index df3a71cda..b113b0edb 100644 --- a/images/ss-u-ss01-1.dark.svg +++ b/images/ss-u-ss01-1.dark.svg @@ -128,7 +128,7 @@ - + diff --git a/images/ss-u-ss01-1.light.svg b/images/ss-u-ss01-1.light.svg index fe5eeb524..765ea1498 100644 --- a/images/ss-u-ss01-1.light.svg +++ b/images/ss-u-ss01-1.light.svg @@ -128,7 +128,7 @@ - + diff --git a/images/ss-u-ss03-1.dark.svg b/images/ss-u-ss03-1.dark.svg index 1fd09d97b..dbbcbd122 100644 --- a/images/ss-u-ss03-1.dark.svg +++ b/images/ss-u-ss03-1.dark.svg @@ -129,7 +129,7 @@ - + @@ -144,7 +144,7 @@ - + diff --git a/images/ss-u-ss03-1.light.svg b/images/ss-u-ss03-1.light.svg index 0127ecf42..4c4ed00f8 100644 --- a/images/ss-u-ss03-1.light.svg +++ b/images/ss-u-ss03-1.light.svg @@ -129,7 +129,7 @@ - + @@ -144,7 +144,7 @@ - + diff --git a/images/ss-u-ss04-1.dark.svg b/images/ss-u-ss04-1.dark.svg index e9ff6fe59..2ac1a451a 100644 --- a/images/ss-u-ss04-1.dark.svg +++ b/images/ss-u-ss04-1.dark.svg @@ -144,7 +144,7 @@ - + diff --git a/images/ss-u-ss04-1.light.svg b/images/ss-u-ss04-1.light.svg index 8970d42ad..6fd02d9ed 100644 --- a/images/ss-u-ss04-1.light.svg +++ b/images/ss-u-ss04-1.light.svg @@ -144,7 +144,7 @@ - + diff --git a/images/ss-u-ss06-1.dark.svg b/images/ss-u-ss06-1.dark.svg index c5c8c4a88..c4d7935e0 100644 --- a/images/ss-u-ss06-1.dark.svg +++ b/images/ss-u-ss06-1.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/ss-u-ss06-1.light.svg b/images/ss-u-ss06-1.light.svg index da2da92d6..b352fbb6a 100644 --- a/images/ss-u-ss06-1.light.svg +++ b/images/ss-u-ss06-1.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/ss-u-ss07-1.dark.svg b/images/ss-u-ss07-1.dark.svg index e045d6a1e..88d41a12e 100644 --- a/images/ss-u-ss07-1.dark.svg +++ b/images/ss-u-ss07-1.dark.svg @@ -147,7 +147,7 @@ - + diff --git a/images/ss-u-ss07-1.light.svg b/images/ss-u-ss07-1.light.svg index 9bfa27b80..69f5d283e 100644 --- a/images/ss-u-ss07-1.light.svg +++ b/images/ss-u-ss07-1.light.svg @@ -147,7 +147,7 @@ - + diff --git a/images/ss-u-ss08-1.dark.svg b/images/ss-u-ss08-1.dark.svg index fccc59ee6..e9c9d27d3 100644 --- a/images/ss-u-ss08-1.dark.svg +++ b/images/ss-u-ss08-1.dark.svg @@ -144,7 +144,7 @@ - + diff --git a/images/ss-u-ss08-1.light.svg b/images/ss-u-ss08-1.light.svg index 77484ec00..a4b807862 100644 --- a/images/ss-u-ss08-1.light.svg +++ b/images/ss-u-ss08-1.light.svg @@ -144,7 +144,7 @@ - + diff --git a/images/ss-u-ss09-1.dark.svg b/images/ss-u-ss09-1.dark.svg index 887f22575..602adff38 100644 --- a/images/ss-u-ss09-1.dark.svg +++ b/images/ss-u-ss09-1.dark.svg @@ -129,7 +129,7 @@ - + diff --git a/images/ss-u-ss09-1.light.svg b/images/ss-u-ss09-1.light.svg index 2880f9461..6b52582fe 100644 --- a/images/ss-u-ss09-1.light.svg +++ b/images/ss-u-ss09-1.light.svg @@ -129,7 +129,7 @@ - + diff --git a/images/ss-u-ss10-1.dark.svg b/images/ss-u-ss10-1.dark.svg index 9f50009e3..c7d074922 100644 --- a/images/ss-u-ss10-1.dark.svg +++ b/images/ss-u-ss10-1.dark.svg @@ -147,7 +147,7 @@ - + diff --git a/images/ss-u-ss10-1.light.svg b/images/ss-u-ss10-1.light.svg index ac8a0ba93..163b310e3 100644 --- a/images/ss-u-ss10-1.light.svg +++ b/images/ss-u-ss10-1.light.svg @@ -147,7 +147,7 @@ - + diff --git a/images/ss-u-ss11-1.dark.svg b/images/ss-u-ss11-1.dark.svg index aad83292c..eb3e88783 100644 --- a/images/ss-u-ss11-1.dark.svg +++ b/images/ss-u-ss11-1.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/ss-u-ss11-1.light.svg b/images/ss-u-ss11-1.light.svg index a249c8c8e..a171c88bd 100644 --- a/images/ss-u-ss11-1.light.svg +++ b/images/ss-u-ss11-1.light.svg @@ -146,7 +146,7 @@ - + diff --git a/images/ss-u-ss12-1.dark.svg b/images/ss-u-ss12-1.dark.svg index 5c019f408..66bd32e44 100644 --- a/images/ss-u-ss12-1.dark.svg +++ b/images/ss-u-ss12-1.dark.svg @@ -128,7 +128,7 @@ - + @@ -145,7 +145,7 @@ - + diff --git a/images/ss-u-ss12-1.light.svg b/images/ss-u-ss12-1.light.svg index 833a671ef..ac1e0318f 100644 --- a/images/ss-u-ss12-1.light.svg +++ b/images/ss-u-ss12-1.light.svg @@ -128,7 +128,7 @@ - + @@ -145,7 +145,7 @@ - + diff --git a/images/ss-u-ss13-1.dark.svg b/images/ss-u-ss13-1.dark.svg index 3b304120c..4d8e426f4 100644 --- a/images/ss-u-ss13-1.dark.svg +++ b/images/ss-u-ss13-1.dark.svg @@ -129,7 +129,7 @@ - + diff --git a/images/ss-u-ss13-1.light.svg b/images/ss-u-ss13-1.light.svg index 3fb7e4882..ff491c542 100644 --- a/images/ss-u-ss13-1.light.svg +++ b/images/ss-u-ss13-1.light.svg @@ -129,7 +129,7 @@ - + diff --git a/images/ss-u-ss14-1.dark.svg b/images/ss-u-ss14-1.dark.svg index e7ea8ed03..65ba9155c 100644 --- a/images/ss-u-ss14-1.dark.svg +++ b/images/ss-u-ss14-1.dark.svg @@ -142,7 +142,7 @@ - + diff --git a/images/ss-u-ss14-1.light.svg b/images/ss-u-ss14-1.light.svg index 47aa6f4bb..170d2d5cf 100644 --- a/images/ss-u-ss14-1.light.svg +++ b/images/ss-u-ss14-1.light.svg @@ -142,7 +142,7 @@ - + diff --git a/images/ss-u-ss17-1.dark.svg b/images/ss-u-ss17-1.dark.svg index 52c733bae..6d2e90da5 100644 --- a/images/ss-u-ss17-1.dark.svg +++ b/images/ss-u-ss17-1.dark.svg @@ -145,7 +145,7 @@ - + diff --git a/images/ss-u-ss17-1.light.svg b/images/ss-u-ss17-1.light.svg index 612590a3f..4682221b6 100644 --- a/images/ss-u-ss17-1.light.svg +++ b/images/ss-u-ss17-1.light.svg @@ -145,7 +145,7 @@ - + diff --git a/images/ss-u-ss18-1.dark.svg b/images/ss-u-ss18-1.dark.svg index ab677f0cd..93b1067df 100644 --- a/images/ss-u-ss18-1.dark.svg +++ b/images/ss-u-ss18-1.dark.svg @@ -144,7 +144,7 @@ - + diff --git a/images/ss-u-ss18-1.light.svg b/images/ss-u-ss18-1.light.svg index 6d523a962..e51139c7d 100644 --- a/images/ss-u-ss18-1.light.svg +++ b/images/ss-u-ss18-1.light.svg @@ -144,7 +144,7 @@ - + diff --git a/images/ss-u-ss20-1.dark.svg b/images/ss-u-ss20-1.dark.svg index 436db46dc..7c4e76457 100644 --- a/images/ss-u-ss20-1.dark.svg +++ b/images/ss-u-ss20-1.dark.svg @@ -146,7 +146,7 @@ - + diff --git a/images/ss-u-ss20-1.light.svg b/images/ss-u-ss20-1.light.svg index b62ec491f..181997950 100644 --- a/images/ss-u-ss20-1.light.svg +++ b/images/ss-u-ss20-1.light.svg @@ -146,7 +146,7 @@ - + diff --git a/packages/font-glyphs/src/auto-build/composite.ptl b/packages/font-glyphs/src/auto-build/composite.ptl index a2095a84c..2413ece7c 100644 --- a/packages/font-glyphs/src/auto-build/composite.ptl +++ b/packages/font-glyphs/src/auto-build/composite.ptl @@ -1348,7 +1348,7 @@ glyph-block Autobuild-Ligatures : begin define [createLigatures prefix _shrink1 _shrinkN wadj1 wadjN kKern demands] : for-width-kinds WideWidth2 local plainLigature : FMosaicWide && para.isQuasiProportional - local ww : if FMosaicWide MosaicWidth (MosaicWidth * para.diversityMM) + local ww : if FMosaicWide MosaicWidth (MosaicWidth * para.advanceScaleMM) local jobs : CollectJobs DECOMPOSABLE NOT-CENTERED ALLOW-PROPORTIONAL prefix MosaicNameSuffix demands local shrink1 : if plainLigature 1 [clamp 0 1 (_shrink1 * [mix Width ww 0.5] / Width)] local shrinkN : if plainLigature 1 [clamp 0 1 (_shrinkN * [mix Width ww 0.5] / Width)] @@ -1439,7 +1439,7 @@ glyph-block Autobuild-Ligatures : begin # Dutch IJ define ijShrink : clamp 0.6 0.75 : StrokeWidthBlend 0.6 0.75 - createLigatures 'compatLigature1' ijShrink ijShrink 1 1 [if (para.diversityI < 1) 0 0.2] : list + createLigatures 'compatLigature1' ijShrink ijShrink 1 1 [if (para.advanceScaleI < 1) 0 0.2] : list list 0x132 { 'I' 'J' } list 0x133 { 'i' 'j' } list 0xEF11 { 'IAcute' 'JAcute' } @@ -1529,8 +1529,8 @@ glyph-block Autobuild-Pnonetic-Ligatures : begin glyph-block-import Autobuild-Enclosure-Shared : CollectJobs CreateDerivedFontFromJobs EnsureComponentGlyphT applyRelations glyph-block-import Autobuild-Transformed-Shared : ToSuperscript ToSubscript - define [createPhoneticLigatures tfm prefix div mockNParts _shrink kKern demands] : begin - local ww0 : Width * div + define [createPhoneticLigatures tfm prefix advs mockNParts _shrink kKern demands] : begin + local ww0 : Width * advs local wwM : ww0 / [fallback tfm.crowdAdjScale 1] local jobs : CollectJobs DECOMPOSABLE NOT-CENTERED ALLOW-PROPORTIONAL prefix "" demands local shrink : clamp 0 1 _shrink @@ -1548,10 +1548,10 @@ glyph-block Autobuild-Pnonetic-Ligatures : begin if [query-glyph gni] : return gni create-glyph gni : glyph-proc set-width aw - if mak : include : [DivFrame div].markSet.(mak) + if mak : include : [DivFrame advs].markSet.(mak) set-base-anchor 'enclosureInner' markPlacement 0 set-base-anchor 'slash' (aw / 2) (Ascender / 2) - include : tfm div + include : tfm advs return gni define [LigaturePartImpl thinFont compress markDist maskPos] : lambda [gidPart] : begin @@ -1566,7 +1566,7 @@ glyph-block Autobuild-Pnonetic-Ligatures : begin include : Scale compress 1 include : Regizmo set-mark-anchor 'enclosureInner' 0 0 markDist 0 - include : tfm div + include : tfm advs return gni define [LigatureImpl job decomposable] : if [not : query-glyph gn] : begin @@ -1623,7 +1623,7 @@ glyph-block Autobuild-Pnonetic-Ligatures : begin list 0xFB01 { 'f/compLigLeft1' 'dotlessi/compLigRight' } null list 0xFB02 { 'f/compLigLeft2' 'l/compLigRight' } null - createPhoneticLigatures ToLetter 'phonetic2' para.diversityMM 2 stdShrink 1 : list + createPhoneticLigatures ToLetter 'phonetic2' para.advanceScaleMM 2 stdShrink 1 : list list 0x02A3 { 'd/phoneticLeft' 'z/phoneticRight' } 'b' list 0x02A4 { 'd/phoneticLeft' 'ezh/phoneticRight' } 'bp' list 0x02A5 { 'd/phoneticLeft' 'zCurlyTail/phoneticRight' } 'b' @@ -1642,11 +1642,11 @@ glyph-block Autobuild-Pnonetic-Ligatures : begin list 0xFB05 { 'longs/compLigLeft' 't/compLigRight' } null list 0xFB06 { 's/compLigLeft' 't/compLigRight' } null - createPhoneticLigatures ToLetter 'phonetic3' para.diversityMM 3 stdShrink 1 : list + createPhoneticLigatures ToLetter 'phonetic3' para.advanceScaleMM 3 stdShrink 1 : list list 0xFB03 { 'f/compLigLeft1' 'f/compLigLeft1' 'dotlessi/compLigRight' } null list 0xFB04 { 'f/compLigLeft3' 'f/compLigLeft2' 'l/compLigRight' } null - createPhoneticLigatures ToLetter 'phoneticSmcp' (para.diversityM * para.diversityMM) 3 1 0.5 : list + createPhoneticLigatures ToLetter 'phoneticSmcp' (para.advanceScaleM * para.advanceScaleMM) 3 1 0.5 : list list 0x2121 { 'smcpT' 'smcpE' 'smcpL' } 'e' list 0x213B { 'smcpF' 'smcpA' 'smcpX' } 'e' @@ -1675,8 +1675,8 @@ glyph-block Autobuild-Double-Emotions : begin glyph-block-import Recursive-Build : Thinner glyph-block-import Autobuild-Enclosure-Shared : CollectJobs CreateDerivedFontFromJobs EnsureComponentGlyphT applyRelations - define [createDoubleEmotions prefix div _shrink1 _shrink2 wadj1 wadj2 demands] : for-width-kinds WideWidth2 - define CWidth : if FMosaicWide MosaicWidth (Width * div) + define [createDoubleEmotions prefix advs _shrink1 _shrink2 wadj1 wadj2 demands] : for-width-kinds WideWidth2 + define CWidth : if FMosaicWide MosaicWidth (Width * advs) define shrink1 : if FMosaicWide 1 _shrink1 define shrink2 : if FMosaicWide 1 _shrink2 define kern : SB * shrink1 + SB * shrink2 + HalfStroke * [mix shrink1 shrink2 0.5] - OX * 2 @@ -1707,7 +1707,7 @@ glyph-block Autobuild-Double-Emotions : begin applyRelations jobs.relApplications define stdShrink : clamp 0.625 0.9 : StrokeWidthBlend 0.625 0.9 - createDoubleEmotions 'doubleemotion' para.diversityM stdShrink stdShrink 1 1 : list + createDoubleEmotions 'doubleemotion' para.advanceScaleM stdShrink stdShrink 1 1 : list list 0x203c { 'exclam' 'zwsp' 'exclam' 'zwsp' } list 0x2047 { 'question/hookPart' 'question/dotPart' 'question/hookPart' 'question/dotPart' } list 0x2048 { 'question/hookPart' 'question/dotPart' 'exclam' 'zwsp' } diff --git a/packages/font-glyphs/src/auto-build/recursive-build.ptl b/packages/font-glyphs/src/auto-build/recursive-build.ptl index 77a2a237f..ce030aec2 100644 --- a/packages/font-glyphs/src/auto-build/recursive-build.ptl +++ b/packages/font-glyphs/src/auto-build/recursive-build.ptl @@ -23,13 +23,13 @@ glyph-block Recursive-Build : begin if forceUpright : begin forkedPara.slopeAngle = 0 if mono : begin - forkedPara.diversityMM = 1 - forkedPara.diversityM = 1 - forkedPara.diversityT = 1 + forkedPara.advanceScaleMM = 1 + forkedPara.advanceScaleM = 1 + forkedPara.advanceScaleT = 1 if mono2 : begin - forkedPara.diversityF = 1 - forkedPara.diversityI = 1 - forkedPara.diversityII = 1 + forkedPara.advanceScaleF = 1 + forkedPara.advanceScaleI = 1 + forkedPara.advanceScaleII = 1 return forkedPara @@ -49,13 +49,13 @@ glyph-block Recursive-Build : begin forkedPara.accentWidth = AccentWidth * p forkedPara.jut = Jut * p forkedPara.longjut = LongJut * p - forkedPara.diversityMM = 1 - forkedPara.diversityM = 1 - forkedPara.diversityT = 1 + forkedPara.advanceScaleMM = 1 + forkedPara.advanceScaleM = 1 + forkedPara.advanceScaleT = 1 if fMono : begin - forkedPara.diversityF = 1 - forkedPara.diversityI = 1 - forkedPara.diversityII = 1 + forkedPara.advanceScaleF = 1 + forkedPara.advanceScaleI = 1 + forkedPara.advanceScaleII = 1 #forkedPara.hookx = HookX * p return : Fork glyphs forkedPara diff --git a/packages/font-glyphs/src/auto-build/transformed.ptl b/packages/font-glyphs/src/auto-build/transformed.ptl index 5eff6229a..1b7713170 100644 --- a/packages/font-glyphs/src/auto-build/transformed.ptl +++ b/packages/font-glyphs/src/auto-build/transformed.ptl @@ -80,8 +80,8 @@ glyph-block Autobuild-Transformed-Shared : begin [query-glyph origDstName].tryBecomeMirrorOf [query-glyph relDstName] rs glyph-block-export ToSuperscript - define [ToSuperscript div] : glyph-proc - local df : DivFrame div + define [ToSuperscript advs] : glyph-proc + local df : DivFrame advs include [Ungizmo] true include [Translate (-df.middle) (-CAP)] true include [Scale ToSuperscript.crowdAdjScale] true @@ -91,8 +91,8 @@ glyph-block Autobuild-Transformed-Shared : begin set ToSuperscript.crowdAdjScale 0.7 glyph-block-export ToSubscript - define [ToSubscript div] : glyph-proc - local df : DivFrame div + define [ToSubscript advs] : glyph-proc + local df : DivFrame advs include [Ungizmo] true include [Translate (-df.middle) 0] true include [Scale ToSubscript.crowdAdjScale] true @@ -295,13 +295,13 @@ glyph-block Autobuild-Transformed-Texture : begin local forkedPara : Object.assign {.} para if (extL + extR > 0) : then : begin - forkedPara.diversityMM = 1 + extL + extR - forkedPara.diversityM = 1 + extL + extR - forkedPara.diversityT = 1 + extL + extR + forkedPara.advanceScaleMM = 1 + extL + extR + forkedPara.advanceScaleM = 1 + extL + extR + forkedPara.advanceScaleT = 1 + extL + extR : else : begin - forkedPara.diversityF = 1 + extL + extR - forkedPara.diversityI = 1 + extL + extR - forkedPara.diversityII = 1 + extL + extR + forkedPara.advanceScaleF = 1 + extL + extR + forkedPara.advanceScaleI = 1 + extL + extR + forkedPara.advanceScaleII = 1 + extL + extR local forked : Fork pendingGlyphs forkedPara foreach {unicode glyphid} [items-of records] : begin diff --git a/packages/font-glyphs/src/letter-like/fraktur/common.ptl b/packages/font-glyphs/src/letter-like/fraktur/common.ptl index 412c37bdb..74efc3735 100644 --- a/packages/font-glyphs/src/letter-like/fraktur/common.ptl +++ b/packages/font-glyphs/src/letter-like/fraktur/common.ptl @@ -114,7 +114,7 @@ glyph-block LetterLike-Fraktur-Common : begin define S : new FrakturPen frakThick (0.875 * frakThin) glyph-block-export M - define M : new FrakturPen [AdviceStroke 3 para.diversityM] (0.875 * frakThin) + define M : new FrakturPen [AdviceStroke 3 para.advanceScaleM] (0.875 * frakThin) glyph-block-export F define F : new FrakturPen frakFine (0.875 * frakThin) @@ -188,10 +188,10 @@ glyph-block LetterLike-Fraktur-Common : begin define PHexBot : 1 - PHexTop glyph-block-export UpperDf - define [UpperDf div m] : DivFrame [fallback div 1] [fallback m 2] [Math.max 1 : DecoSizeX / SB] + define [UpperDf advs m] : DivFrame [fallback advs 1] [fallback m 2] [Math.max 1 : DecoSizeX / SB] glyph-block-export LowerDf - define [LowerDf div m] : DivFrame [fallback div 1] [fallback m 2] [Math.max 1 : (1.75 * DecoSizeX - 0.5 * S.thick) / SB] + define [LowerDf advs m] : DivFrame [fallback advs 1] [fallback m 2] [Math.max 1 : (1.75 * DecoSizeX - 0.5 * S.thick) / SB] glyph-block-export RBDecoration define [RBDecoration cx cy limy] : lift-@ : list diff --git a/packages/font-glyphs/src/letter-like/fraktur/lower-bopvw.ptl b/packages/font-glyphs/src/letter-like/fraktur/lower-bopvw.ptl index 43c47aca4..cbda12b3a 100644 --- a/packages/font-glyphs/src/letter-like/fraktur/lower-bopvw.ptl +++ b/packages/font-glyphs/src/letter-like/fraktur/lower-bopvw.ptl @@ -67,7 +67,7 @@ glyph-block LetterLike-Fraktur-Lower-BOPVW : begin corner [rightStroke.last].x [rightStroke.last].y create-glyph "frak/w" 0x1D534 : glyph-proc - local df : include : LowerDf para.diversityM 3 + local df : include : LowerDf para.advanceScaleM 3 include : df.markSet.e local wBox : M.box XH 0 df.leftSB df.rightSB diff --git a/packages/font-glyphs/src/letter-like/fraktur/lower-ijl.ptl b/packages/font-glyphs/src/letter-like/fraktur/lower-ijl.ptl index 0df71355f..a5a0504a0 100644 --- a/packages/font-glyphs/src/letter-like/fraktur/lower-ijl.ptl +++ b/packages/font-glyphs/src/letter-like/fraktur/lower-ijl.ptl @@ -29,7 +29,7 @@ glyph-block LetterLike-Fraktur-Lower-IJL : begin close create-glyph "frak/dotlessi" : glyph-proc - local df : include : LowerDf para.diversityI + local df : include : LowerDf para.advanceScaleI include : df.markSet.e local box : S.box XH 0 df.leftSB df.rightSB @@ -38,7 +38,7 @@ glyph-block LetterLike-Fraktur-Lower-IJL : begin RBDecoration box.xMid box.bot create-glyph "frak/dotlessj" : glyph-proc - local df : include : LowerDf para.diversityI + local df : include : LowerDf para.advanceScaleI include : df.markSet.p local box : S.box XH Descender df.leftSB df.rightSB @@ -51,7 +51,7 @@ glyph-block LetterLike-Fraktur-Lower-IJL : begin CreateAccentedComposition 'frak/j' 0x1D527 'frak/dotlessj' 'frak/tittleAbove' create-glyph "frak/l" 0x1D529 : glyph-proc - local df : include : LowerDf para.diversityI + local df : include : LowerDf para.advanceScaleI include : df.markSet.b local box : S.box Ascender 0 df.leftSB df.rightSB diff --git a/packages/font-glyphs/src/letter-like/fraktur/lower-mnu.ptl b/packages/font-glyphs/src/letter-like/fraktur/lower-mnu.ptl index a54fe49b5..9dd332ee5 100644 --- a/packages/font-glyphs/src/letter-like/fraktur/lower-mnu.ptl +++ b/packages/font-glyphs/src/letter-like/fraktur/lower-mnu.ptl @@ -14,7 +14,7 @@ glyph-block LetterLike-Fraktur-Lower-MNU : begin glyph-block-import LetterLike-Fraktur-Common : Wave PHexTop PHexBot LTDecoration RBDecoration create-glyph "frak/m" 0x1D52A : glyph-proc - local df : include : LowerDf para.diversityM 3 + local df : include : LowerDf para.advanceScaleM 3 include : df.markSet.e local box : M.box XH 0 df.leftSB df.rightSB diff --git a/packages/font-glyphs/src/letter-like/fraktur/upper-bpvw.ptl b/packages/font-glyphs/src/letter-like/fraktur/upper-bpvw.ptl index 74508181a..e94dd2cca 100644 --- a/packages/font-glyphs/src/letter-like/fraktur/upper-bpvw.ptl +++ b/packages/font-glyphs/src/letter-like/fraktur/upper-bpvw.ptl @@ -95,7 +95,7 @@ glyph-block LetterLike-Fraktur-Upper-BVW : begin corner (body.left - S.thick) (@yT - ArchDepthA) create-glyph 'frak/W' 0x1D51A : glyph-proc - local df : include : UpperDf para.diversityM 3 + local df : include : UpperDf para.advanceScaleM 3 include : df.markSet.capital local box : M.box CAP 0 df.leftSB df.rightSB diff --git a/packages/font-glyphs/src/letter-like/fraktur/upper-mn.ptl b/packages/font-glyphs/src/letter-like/fraktur/upper-mn.ptl index feb109652..9e338d3b7 100644 --- a/packages/font-glyphs/src/letter-like/fraktur/upper-mn.ptl +++ b/packages/font-glyphs/src/letter-like/fraktur/upper-mn.ptl @@ -36,7 +36,7 @@ glyph-block LetterLike-Fraktur-Upper-MNP : begin create-glyph 'frak/M' 0x1D510 : glyph-proc - local df : include : UpperDf para.diversityM 3 + local df : include : UpperDf para.advanceScaleM 3 include : df.markSet.capital local box : M.box CAP 0 df.leftSB df.rightSB diff --git a/packages/font-glyphs/src/letter/armenian/eh-liun-hiun.ptl b/packages/font-glyphs/src/letter/armenian/eh-liun-hiun.ptl index 074c62a36..e9d107ec1 100644 --- a/packages/font-glyphs/src/letter/armenian/eh-liun-hiun.ptl +++ b/packages/font-glyphs/src/letter/armenian/eh-liun-hiun.ptl @@ -28,7 +28,7 @@ glyph-block Letter-Armenian-Eh-Liun-Hiun : begin include : composite-proc sf.lt.full sf.lb.outer create-glyph 'armn/eh' 0x567 : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : df.markSet.b include : VBar.l df.leftSB 0 Ascender df.mvs include : [ArmHBar.short df].base @@ -49,10 +49,10 @@ glyph-block Letter-Armenian-Eh-Liun-Hiun : begin include : composite-proc sf.lt.full sf.lb.outer create-glyph 'armn/liun' 0x56C : glyph-proc - local df : include : DivFrame : if SLAB para.diversityI para.diversityII + local df : include : DivFrame : if SLAB para.advanceScaleI para.advanceScaleII include : df.markSet.p local xMiddle : df.middle - [IBalance2 df] - local longJut : if (df.div < 1) (jut * [if SLAB 1.5 1]) LongJut + local longJut : if (df.advs < 1) (jut * [if SLAB 1.5 1]) LongJut include : VBar.m xMiddle Descender XH df.mvs include : HBar.b xMiddle (xMiddle + longJut) Descender df.mvs if SLAB : include : HSerif.lt xMiddle XH Jut df.mvs @@ -68,7 +68,7 @@ glyph-block Letter-Armenian-Eh-Liun-Hiun : begin include : composite-proc sf.lt.full sf.lb.full create-glyph 'armn/hiun' 0x582 : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : VBar.l df.leftSB 0 XH df.mvs include : [ArmHBar.normal df].base if SLAB : begin diff --git a/packages/font-glyphs/src/letter/armenian/feh.ptl b/packages/font-glyphs/src/letter/armenian/feh.ptl index 79debcafa..c177b6f84 100644 --- a/packages/font-glyphs/src/letter/armenian/feh.ptl +++ b/packages/font-glyphs/src/letter/armenian/feh.ptl @@ -30,9 +30,9 @@ glyph-block Letter-Armenian-Feh : begin g4 (df.leftSB + OX) (0 + hook) create-glyph 'armn/Feh' 0x556 : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital - local sw : Math.min df.mvs : AdviceStroke2 3 3 CAP df.div + local sw : Math.min df.mvs : AdviceStroke2 3 3 CAP df.advs local ada : df.archDepthAOf ArchDepth sw local adb : df.archDepthBOf ArchDepth sw include : FehBody df CAP 0 sw Hook ada adb @@ -42,9 +42,9 @@ glyph-block Letter-Armenian-Feh : begin include sf.mt.right create-glyph 'armn/feh' 0x586 : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.bp - local sw : Math.min df.mvs : AdviceStroke2 3 3 Ascender df.div + local sw : Math.min df.mvs : AdviceStroke2 3 3 Ascender df.advs local ada : df.archDepthAOf SmallArchDepth sw local adb : df.archDepthBOf SmallArchDepth sw include : FehBody df Ascender 0 sw Hook ada adb diff --git a/packages/font-glyphs/src/letter/armenian/hook-group.ptl b/packages/font-glyphs/src/letter/armenian/hook-group.ptl index d5c68848c..322b760f4 100644 --- a/packages/font-glyphs/src/letter/armenian/hook-group.ptl +++ b/packages/font-glyphs/src/letter/armenian/hook-group.ptl @@ -138,7 +138,7 @@ glyph-block Letter-Armenian-Hook-Group : begin do "Peh" create-glyph 'armn/Peh' 0x54A : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : LeftHook df CAP 0 df.mvs Hook df.archDepthA df.archDepthB include : VBar.m df.middle (XH / 2) (CAP - 0.5 * df.mvs) df.mvs diff --git a/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl b/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl index b04dbc542..24493fb75 100644 --- a/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl +++ b/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl @@ -20,7 +20,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin do "Turned Ayb" create-glyph 'armn/aybTurned' 0x560 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e include : SmallMArches df XH 0 0 0 if SLAB : begin @@ -33,7 +33,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin do "Ayb" create-glyph 'armn/ayb' 0x561 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e include : SmallMArches df XH 0 0 0 include : FlipAround df.middle (XH / 2) @@ -131,7 +131,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin do "Xeh" create-glyph 'armn/xeh' 0x56D : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.bp include : uBowl.shape top -- (XH / 2) @@ -261,7 +261,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin do "Peh" create-glyph 'armn/peh' 0x57A : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.p include : SmallMArches df XH 0 0 0 include : FlipAround df.middle (XH / 2) @@ -341,7 +341,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin do "Tiun" create-glyph 'armn/tiun' 0x57F : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e include : uBowl.shape top -- XH @@ -381,7 +381,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin do "P'iur" create-glyph 'armn/piur' 0x583 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.bp include : uBowl.shape top -- XH @@ -406,7 +406,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin do "Ew" create-glyph 'armn/ew' 0x587 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.b include : uBowl.shape top -- Ascender diff --git a/packages/font-glyphs/src/letter/armenian/shared.ptl b/packages/font-glyphs/src/letter/armenian/shared.ptl index e29479bdf..77653849d 100644 --- a/packages/font-glyphs/src/letter/armenian/shared.ptl +++ b/packages/font-glyphs/src/letter/armenian/shared.ptl @@ -28,7 +28,7 @@ glyph-block Letter-Armenian-Shared-Shapes : begin -- df.leftSB define right : match hPos [Just JUT.RIGHT] (df.rightSB + (jut * [if SLAB 1.5 1]) - [HSwToV : 0.5 * df.mvs]) - [Just JUT.SHORT] (df.rightSB - (jut - [HSwToV : 0.5 * df.mvs]) * df.div) + [Just JUT.SHORT] (df.rightSB - (jut - [HSwToV : 0.5 * df.mvs]) * df.advs) [Just JUT.LEFT] df.leftSB -- df.rightSB diff --git a/packages/font-glyphs/src/letter/armenian/upper-xeh.ptl b/packages/font-glyphs/src/letter/armenian/upper-xeh.ptl index 3fdb2ed67..7c2d5d866 100644 --- a/packages/font-glyphs/src/letter/armenian/upper-xeh.ptl +++ b/packages/font-glyphs/src/letter/armenian/upper-xeh.ptl @@ -14,7 +14,7 @@ glyph-block Letter-Armenian-Upper-Xeh : begin do "Xeh" create-glyph 'armn/Xeh' 0x53D : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 local { subDf shift } : SubDfAndShift 1 df include : df.markSet.capital include : VBar.l df.leftSB 0 CAP df.mvs diff --git a/packages/font-glyphs/src/letter/cyrillic/abk-ha.ptl b/packages/font-glyphs/src/letter/cyrillic/abk-ha.ptl index 996877296..ffb4fb6d6 100644 --- a/packages/font-glyphs/src/letter/cyrillic/abk-ha.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/abk-ha.ptl @@ -29,11 +29,11 @@ glyph-block Letter-Cyrillic-Abkhasian-Ha : begin create-glyph 'cyrl/abk/Ha' 0x4A8 : glyph-proc - define df : include : DivFrame para.diversityM 3 + define df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : CyrlAbkHaShape df CAP ArchDepth create-glyph 'cyrl/abk/ha' 0x4A9 : glyph-proc - define df : include : DivFrame para.diversityM 3 + define df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e include : CyrlAbkHaShape df XH SmallArchDepth diff --git a/packages/font-glyphs/src/letter/cyrillic/big-yus.ptl b/packages/font-glyphs/src/letter/cyrillic/big-yus.ptl index 1be44f591..209db8b4f 100644 --- a/packages/font-glyphs/src/letter/cyrillic/big-yus.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/big-yus.ptl @@ -11,7 +11,7 @@ glyph-block Letter-Cyrillic-BigYus : begin glyph-block-import Letter-Cyrillic-Iotified-A : Iotified define [BigYusLegMaskShape df top yp _fine] : begin - local fine : fallback _fine : AdviceStroke 3.3 df.div + local fine : fallback _fine : AdviceStroke 3.3 df.advs local midx : mix df.leftSB df.middle 0.3 local yb : top * yp return : spiro-outline @@ -21,7 +21,7 @@ glyph-block Letter-Cyrillic-BigYus : begin corner midx yb define [CyrBigYusShape df top yp _fine] : glyph-proc - local fine : fallback _fine : AdviceStroke 3.3 df.div + local fine : fallback _fine : AdviceStroke 3.3 df.advs local cor HVContrast local midx : mix df.leftSB df.middle 0.3 local midx2 : Math.min (df.middle - fine * cor) [mix df.leftSB df.middle 0.75] @@ -65,7 +65,7 @@ glyph-block Letter-Cyrillic-BigYus : begin include : tagged 'serifMB' sf.mb.full define [CyrBlendedYusShape df top yp yp2 _fine] : glyph-proc - local fine : fallback _fine : AdviceStroke 3.3 df.div + local fine : fallback _fine : AdviceStroke 3.3 df.advs include : CyrBigYusShape df top yp fine eject-contour 'barM' @@ -76,7 +76,7 @@ glyph-block Letter-Cyrillic-BigYus : begin BigYusLegMaskShape df top yp fine create-glyph 'cyrl/BigYus' 0x46A : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : CyrBigYusShape df CAP 0.575 @@ -86,7 +86,7 @@ glyph-block Letter-Cyrillic-BigYus : begin include : CyrBigYusShape df XH 0.55 create-glyph 'cyrl/BlendedYus' 0xA65A : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : CyrBlendedYusShape df CAP 0.65 (0.65 * 0.65) @@ -101,7 +101,7 @@ glyph-block Letter-Cyrillic-BigYus : begin define dfSub : DivFrame divSub 3 include : CyrBigYusShape dfSub top yp df.mvs eject-contour 'serifRB' - include : Translate (Width * (df.div - divSub)) 0 + include : Translate (Width * (df.advs - divSub)) 0 include : Iotified.outer df top hBarRight -- [mix df.leftSB df.rightSB (2 / 3)] @@ -113,11 +113,11 @@ glyph-block Letter-Cyrillic-BigYus : begin include sf.rb.outer create-glyph 'cyrl/BigYusIotified' 0x46C : glyph-proc - local df : include : DivFrame (para.diversityM ** 2) 4.25 + local df : include : DivFrame (para.advanceScaleM ** 2) 4.25 include : df.markSet.capital include : CyrIotifiedBigYusShape true df CAP 0.575 create-glyph 'cyrl/bigYusIotified' 0x46D : glyph-proc - local df : include : DivFrame para.diversityM 4.25 + local df : include : DivFrame para.advanceScaleM 4.25 include : df.markSet.e include : CyrIotifiedBigYusShape false df XH 0.55 diff --git a/packages/font-glyphs/src/letter/cyrillic/che.ptl b/packages/font-glyphs/src/letter/cyrillic/che.ptl index 48645d2be..82c0fc3c1 100644 --- a/packages/font-glyphs/src/letter/cyrillic/che.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/che.ptl @@ -102,7 +102,7 @@ glyph-block Letter-Cyrillic-Che : begin define [CyrTcheShape] : with-params [df top pyBar bodyType slabType [teSerifs SLAB] [sw : AdviceStroke 2.75] [yBarOffset DToothlessRise]] : glyph-proc local bar : top * [fallback pyBar 0.5] + yBarOffset - local left : [mix df.leftSB df.rightSB : if (df.div > 1) 0.25 0.2] - [HSwToV : 0.25 * sw] + OX + local left : [mix df.leftSB df.rightSB : if (df.advs > 1) 0.25 0.2] - [HSwToV : 0.25 * sw] + OX local right : df.rightSB - OX include : tagged 'strokeR' : match bodyType @@ -155,7 +155,7 @@ glyph-block Letter-Cyrillic-Che : begin CyrDescender.lSideJut (RightSB - [HSwToV Stroke]) 0 (jut -- MidJutSide) create-glyph 'cyrl/Cche' 0xA686 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital include : LeaningAnchor.Below.VBar.r df.rightSB include : CyrCcheShape df CAP [if SLAB 0.45 0.35] BODY.STRAIGHT @@ -167,7 +167,7 @@ glyph-block Letter-Cyrillic-Che : begin foreach { suffix { doST doSB } } [Object.entries TcheConfig] : do create-glyph "cyrl/Tche.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT + local df : include : DivFrame para.advanceScaleT include : df.markSet.capital include : LeaningAnchor.Below.VBar.r df.rightSB include : CyrTcheShape df CAP [if SLAB 0.45 0.35] BODY.STRAIGHT @@ -195,13 +195,13 @@ glyph-block Letter-Cyrillic-Che : begin if SLAB [if para.isItalic slabItalic slabUprightBGR] SERIFS.NONE create-glyph "cyrl/cche.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e include : LeaningAnchor.Below.VBar.r df.rightSB include : CyrCcheShape df XH [if SLAB 0.45 0.4] body if SLAB [if para.isItalic slabItalic slabUpright] SERIFS.NONE - define cyrTcheDf : DivFrame para.diversityT + define cyrTcheDf : DivFrame para.advanceScaleT DefineSelectorGlyph "cyrl/tche" suffix cyrTcheDf 'e' diff --git a/packages/font-glyphs/src/letter/cyrillic/dche.ptl b/packages/font-glyphs/src/letter/cyrillic/dche.ptl index fefc1b280..ac89dab94 100644 --- a/packages/font-glyphs/src/letter/cyrillic/dche.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/dche.ptl @@ -37,7 +37,7 @@ glyph-block Letter-Cyrillic-Dche : begin foreach { suffix { body slabUpright slabUprightBGR slabItalic } } [pairs-of ItalicConfig] : do create-glyph "cyrl/dche.italic.\(suffix)" : glyph-proc - define df : include : DivFrame para.diversityM 3 + define df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e local gap : 0.375 * (df.width - 2 * df.leftSB - 2.5 * df.mvs) - [HSwToV : 0.25 * df.mvs] diff --git a/packages/font-glyphs/src/letter/cyrillic/de.ptl b/packages/font-glyphs/src/letter/cyrillic/de.ptl index b8fa484f2..3aa4731bb 100644 --- a/packages/font-glyphs/src/letter/cyrillic/de.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/de.ptl @@ -63,7 +63,7 @@ glyph-block Letter-Cyrillic-De : begin local sw : fallback _sw Stroke local xm : if SLAB [mix df.leftSB df.rightSB 0.625] + [HSwToV : 0.25 * sw] - mix df.leftSB df.rightSB : if (df.div > 1) (2 / 3) (3 / 4) + mix df.leftSB df.rightSB : if (df.advs > 1) (2 / 3) (3 / 4) local xTopRight : mix df.leftSB xm : StrokeWidthBlend 0.95 0.96 local xTopBarRightEnd : mix df.width df.rightSB : if vSlab 0.25 0.375 @@ -90,13 +90,13 @@ glyph-block Letter-Cyrillic-De : begin include : CyrDeShape XH SB RightSB nothing Descender true create-glyph 'cyrl/DeSoft.serifless' : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : ExtendBelowBaseAnchors BottomExtension include : CyrSoftDeShape df CAP df.mvs nothing false false create-glyph 'cyrl/DeSoft.topRightSerifed' : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : ExtendBelowBaseAnchors BottomExtension include : CyrSoftDeShape df CAP df.mvs nothing false true @@ -104,13 +104,13 @@ glyph-block Letter-Cyrillic-De : begin select-variant 'cyrl/DeSoft' 0xA662 (follow -- 'cyrl/EnGhe/GhePart') create-glyph 'cyrl/deSoft.serifless' : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e include : ExtendBelowBaseAnchors BottomExtension include : CyrSoftDeShape df XH df.mvs nothing true false create-glyph 'cyrl/deSoft.topRightSerifed' : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e include : ExtendBelowBaseAnchors BottomExtension include : CyrSoftDeShape df XH df.mvs nothing true true @@ -178,7 +178,7 @@ glyph-block Letter-Cyrillic-De : begin foreach { suffix { st sb }} [Object.entries EpsilonConfig] : do create-glyph "cyrl/dzze.italic.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.bp local dfLeft : df.slice 3 2 OX diff --git a/packages/font-glyphs/src/letter/cyrillic/dje.ptl b/packages/font-glyphs/src/letter/cyrillic/dje.ptl index b14479dae..c187ba01a 100644 --- a/packages/font-glyphs/src/letter/cyrillic/dje.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/dje.ptl @@ -10,11 +10,11 @@ glyph-block Letter-Cyrillic-Dje : begin glyph-block-import Letter-Shared-Shapes : MidHook create-glyph 'cyrl/Dje' 0x402 : glyph-proc - local df : include : DivFrame para.diversityT + local df : include : DivFrame para.advanceScaleT include : df.markSet.capital local sw : AdviceStroke 2.75 - local left : [mix df.leftSB df.rightSB : if (df.div <= 1) 0.2 : if SLAB 0.3 0.25] + OX + local left : [mix df.leftSB df.rightSB : if (df.advs <= 1) 0.2 : if SLAB 0.3 0.25] + OX local right : df.rightSB - OX local xTopBarLeft : df.leftSB - SideJut diff --git a/packages/font-glyphs/src/letter/cyrillic/dzzhe-zhwe.ptl b/packages/font-glyphs/src/letter/cyrillic/dzzhe-zhwe.ptl index 9a573765d..13ab84d06 100644 --- a/packages/font-glyphs/src/letter/cyrillic/dzzhe-zhwe.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/dzzhe-zhwe.ptl @@ -14,7 +14,7 @@ glyph-block Letter-Cyrillic-Dzzhe-Zhwe : begin local subDf : df.slice 4 keeps _o local subDfFullShift : (df.rightSB - subDf.rightSB) / (4 - keeps) local shift : pShift * subDfFullShift - local sw : AdviceStroke 3.3 [df.slice 4 3 _o].div + local sw : AdviceStroke 3.3 [df.slice 4 3 _o].advs return : object subDf shift sw do "de subglyph" @@ -31,21 +31,21 @@ glyph-block Letter-Cyrillic-Dzzhe-Zhwe : begin include : CyrDeItalicShapeT dispiro subDf sw create-glyph "cyrl/Dzzhe/left" : glyph-proc - define df : include : DivFrame (para.diversityM ** 2) 3.5 + define df : include : DivFrame (para.advanceScaleM ** 2) 3.5 include : df.markSet.capital include : ExtendBelowBaseAnchors (-LongVJut + HalfStroke) set-base-anchor 'cvDecompose' 0 0 include : CyrDzzheDeShape df CAP create-glyph "cyrl/dzzhe.upright/left" : glyph-proc - define df : include : DivFrame (para.diversityM ** 2) 3.5 + define df : include : DivFrame (para.advanceScaleM ** 2) 3.5 include : df.markSet.e include : ExtendBelowBaseAnchors (-LongVJut + HalfStroke) set-base-anchor 'cvDecompose' 0 0 include : CyrDzzheDeShape df XH create-glyph "cyrl/dzzhe.italic/left" : glyph-proc - define df : include : DivFrame (para.diversityM ** 2) 3.5 + define df : include : DivFrame (para.advanceScaleM ** 2) 3.5 include : df.markSet.b set-base-anchor 'cvDecompose' 0 0 include : CyrDzzheDeItalicShape df @@ -65,13 +65,13 @@ glyph-block Letter-Cyrillic-Dzzhe-Zhwe : begin foreach { suffix { slabTop slabBot } } [Object.entries EpsilonConfig] : do create-glyph "cyrl/Zhwe/left.\(suffix)" : glyph-proc - define df : include : DivFrame (para.diversityM ** 2) 3.5 + define df : include : DivFrame (para.advanceScaleM ** 2) 3.5 include : df.markSet.capital set-base-anchor 'cvDecompose' 0 0 include : CyrZhweZeShape slabTop slabBot df CAP Hook create-glyph "cyrl/zhwe/left.\(suffix)" : glyph-proc - define df : include : DivFrame (para.diversityM ** 2) 3.5 + define df : include : DivFrame (para.advanceScaleM ** 2) 3.5 include : df.markSet.e set-base-anchor 'cvDecompose' 0 0 include : CyrZhweZeShape slabTop slabBot df XH SHook @@ -115,28 +115,28 @@ glyph-block Letter-Cyrillic-Dzzhe-Zhwe : begin foreach { suffix { legShape fSlab fMidSlab } } [Object.entries ZheConfig] : do create-glyph "cyrl/Dzzhe/right.\(suffix)" : glyph-proc - define df : include : DivFrame (para.diversityM ** 2) 3.5 + define df : include : DivFrame (para.advanceScaleM ** 2) 3.5 include : df.markSet.capital include : CyrRightZheShape legShape fSlab fMidSlab df CAP : DzzheLeft df create-glyph "cyrl/dzzhe.upright/right.\(suffix)" : glyph-proc - define df : include : DivFrame (para.diversityM ** 2) 3.5 + define df : include : DivFrame (para.advanceScaleM ** 2) 3.5 include : df.markSet.e include : CyrRightZheShape legShape fSlab fMidSlab df XH : DzzheLeft df create-glyph "cyrl/dzzhe.italic/right.\(suffix)" : glyph-proc - define df : include : DivFrame (para.diversityM ** 2) 3.5 + define df : include : DivFrame (para.advanceScaleM ** 2) 3.5 include : df.markSet.e include : DzzheZheItalicShape legShape fSlab fMidSlab df XH create-glyph "cyrl/Zhwe/right.\(suffix)" : glyph-proc - define df : include : DivFrame (para.diversityM ** 2) 3.5 + define df : include : DivFrame (para.advanceScaleM ** 2) 3.5 include : df.markSet.capital set-base-anchor 'cvDecompose' 0 0 include : ZhweZheShape legShape fSlab fMidSlab df CAP Hook create-glyph "cyrl/zhwe/right.\(suffix)" : glyph-proc - define df : include : DivFrame (para.diversityM ** 2) 3.5 + define df : include : DivFrame (para.advanceScaleM ** 2) 3.5 include : df.markSet.e set-base-anchor 'cvDecompose' 0 0 include : ZhweZheShape legShape fSlab fMidSlab df XH SHook diff --git a/packages/font-glyphs/src/letter/cyrillic/e.ptl b/packages/font-glyphs/src/letter/cyrillic/e.ptl index f5d2a0bbe..ee1631ce3 100644 --- a/packages/font-glyphs/src/letter/cyrillic/e.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/e.ptl @@ -47,10 +47,10 @@ glyph-block Letter-Cyrillic-E : begin define dfSub : DivFrame divSub 2 local lf : CLetterForm dfSub sty styBot top 0 - ada -- (ada * 0.7 * df.div) - adb -- (adb * 0.7 * df.div) + ada -- (ada * 0.7 * df.advs) + adb -- (adb * 0.7 * df.advs) sw -- df.mvs - include : with-transform [ApparentTranslate (Width * (df.div - divSub)) 0] : lf.full + include : with-transform [ApparentTranslate (Width * (df.advs - divSub)) 0] : lf.full include : Iotified.full df top hBarRight -- [mix df.leftSB df.rightSB (3 / 4)] @@ -58,12 +58,12 @@ glyph-block Letter-Cyrillic-E : begin fCapital -- fCapital create-glyph "cyrl/EIotified.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : IotifiedEShape true df CAP ArchDepthA ArchDepthB create-glyph "cyrl/eIotified.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e include : IotifiedEShape false df XH SmallArchDepthA SmallArchDepthB diff --git a/packages/font-glyphs/src/letter/cyrillic/el.ptl b/packages/font-glyphs/src/letter/cyrillic/el.ptl index cfea94cf5..90ee31802 100644 --- a/packages/font-glyphs/src/letter/cyrillic/el.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/el.ptl @@ -59,7 +59,7 @@ glyph-block Letter-Cyrillic-El : begin local sw : fallback _sw Stroke local xm : if SLAB [mix df.leftSB df.rightSB 0.625] + [HSwToV : 0.25 * sw] - mix df.leftSB df.rightSB : if (df.div > 1) (2 / 3) (3 / 4) + mix df.leftSB df.rightSB : if (df.advs > 1) (2 / 3) (3 / 4) local xTopBarRightEnd : mix df.width df.rightSB : if vSlab 0.25 0.375 include : CyrElShape df.leftSB xm top bodyType slabType sw @@ -75,7 +75,7 @@ glyph-block Letter-Cyrillic-El : begin include : CyrElShape SB RightSB XH BODY-STRAIGHT : if SLAB SLAB-ALL SLAB-NONE create-glyph 'cyrl/ElMidHook' 0x520 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capDesc local xm : df.middle + [HSwToV : 0.5 * df.mvs] @@ -87,12 +87,12 @@ glyph-block Letter-Cyrillic-El : begin include : MidHook.m df CAP create-glyph 'cyrl/ElSoft.serifless' : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : CyrSoftElShape df CAP BODY-STRAIGHT [if SLAB SLAB-ALL SLAB-NONE] df.mvs false create-glyph 'cyrl/ElSoft.topRightSerifed' : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : CyrSoftElShape df CAP BODY-STRAIGHT [if SLAB SLAB-ALL SLAB-NONE] df.mvs true @@ -112,7 +112,7 @@ glyph-block Letter-Cyrillic-El : begin include : CyrElShape SB RightSB XH body : if SLAB [if para.isItalic slabItalic slabUpright] SLAB-NONE create-glyph "cyrl/elMidHook.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.p local xm : df.middle + [HSwToV : 0.5 * df.mvs] @@ -123,7 +123,7 @@ glyph-block Letter-Cyrillic-El : begin MaskRight [mix xm (df.rightSB - [HSwToV df.mvs]) 0.625] include : MidHook.m df XH - define cyrSoftElDf : DivFrame para.diversityM 3 + define cyrSoftElDf : DivFrame para.advanceScaleM 3 DefineSelectorGlyph "cyrl/elSoft" suffix cyrSoftElDf 'e' @@ -150,7 +150,7 @@ glyph-block Letter-Cyrillic-El : begin derive-composites 'cyrl/elHook' 0x513 'cyrl/el.straight' [PalatalHook.rSideJut RightSB 0] create-glyph 'cyrl/LjeKomi' 0x508 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital local xm : df.middle + [HSwToV : 0.5 * df.mvs] @@ -160,14 +160,14 @@ glyph-block Letter-Cyrillic-El : begin right -- df.rightSB ybegin -- CAP yend -- (CAP / 2) - ada -- (SmallArchDepthA * 0.6 * df.div) - adb -- (SmallArchDepthB * 0.6 * df.div) + ada -- (SmallArchDepthA * 0.6 * df.advs) + adb -- (SmallArchDepthB * 0.6 * df.advs) sw -- df.mvs local sf2 : [SerifFrame.fromDf df (CAP / 2) 0].slice 1 2 if SLAB : include sf2.rt.full create-glyph 'cyrl/ljeKomi' 0x509 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e local xm : df.middle + [HSwToV : 0.5 * df.mvs] @@ -177,8 +177,8 @@ glyph-block Letter-Cyrillic-El : begin right -- df.rightSB ybegin -- XH yend -- (XH / 2) - ada -- (SmallArchDepthA * 0.6 * df.div) - adb -- (SmallArchDepthB * 0.6 * df.div) + ada -- (SmallArchDepthA * 0.6 * df.advs) + adb -- (SmallArchDepthB * 0.6 * df.advs) sw -- df.mvs local sf2 : [SerifFrame.fromDf df (XH / 2) 0].slice 1 2 if SLAB : include sf2.rt.full diff --git a/packages/font-glyphs/src/letter/cyrillic/iotified-a.ptl b/packages/font-glyphs/src/letter/cyrillic/iotified-a.ptl index 3111faa33..646759983 100644 --- a/packages/font-glyphs/src/letter/cyrillic/iotified-a.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/iotified-a.ptl @@ -104,14 +104,14 @@ glyph-block Letter-Cyrillic-Iotified-A : begin foreach { suffix { fStraightBar slabKind } } [Object.entries AConfig] : do create-glyph "cyrl/AIotified.\(suffix)" : glyph-proc - define df : include : DivFrame para.diversityM 3.5 + define df : include : DivFrame para.advanceScaleM 3.5 include : df.markSet.capital local gap : (df.width - 2 * df.leftSB - 3 * df.mvs) / 3 local divSub : (df.width - gap - df.mvs) / Width local subDf : DivFrame divSub 2 (df.leftSB / SB) df.mvs 0 - local shift : Width * (df.div - divSub) + local shift : Width * (df.advs - divSub) local xIotifiedBarRight : df.leftSB + [HSwToV df.mvs] local botGap : Math.max ((df.rightSB - df.leftSB) * 0.08) [AdviceStroke 6] include : difference @@ -130,14 +130,14 @@ glyph-block Letter-Cyrillic-Iotified-A : begin foreach { suffix { body xTrailing hookStyle } } [Object.entries DoubleStoreyConfig] : do create-glyph "cyrl/aIotified.\(suffix)" : glyph-proc - define df : include : DivFrame para.diversityM 3 + define df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e local gap : 0.375 * (df.width - 2 * df.leftSB - 2.5 * df.mvs) - [HSwToV : 0.25 * df.mvs] local divSub : (df.width - gap - df.mvs) / Width local subDf : DivFrame divSub 2 - local shift : Width * (df.div - divSub) + local shift : Width * (df.advs - divSub) include : with-transform [ApparentTranslate shift 0] body subDf hookStyle df.mvs @@ -148,14 +148,14 @@ glyph-block Letter-Cyrillic-Iotified-A : begin foreach { suffix { body bar } } [Object.entries SingleStoreyConfig] : do create-glyph "cyrl/aIotified.\(suffix)" : glyph-proc - define df : include : DivFrame para.diversityM 3 + define df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e local gap : 0.375 * (df.width - 2 * df.leftSB - 2.5 * df.mvs) - [HSwToV : 0.25 * df.mvs] local divSub : (df.width - gap - df.mvs) / Width local subDf : DivFrame divSub 2 - local shift : Width * (df.div - divSub) + local shift : Width * (df.advs - divSub) include : with-transform [ApparentTranslate shift 0] body subDf XH bar df.mvs @@ -172,19 +172,19 @@ glyph-block Letter-Cyrillic-Iotified-A : begin foreach { suffix { body } } [Object.entries Config] : do create-glyph "latn/eIotified.\(suffix)" : glyph-proc - define df : include : DivFrame para.diversityM 3 + define df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e local gap : 0.375 * (df.width - 2 * df.leftSB - 2.5 * df.mvs) - [HSwToV : 0.25 * df.mvs] local divSub : (df.width - gap - df.mvs) / Width local subDf : DivFrame divSub 2 - local shift : Width * (df.div - divSub) + local shift : Width * (df.advs - divSub) include : with-transform [ApparentTranslate shift 0] body subDf XH stroke -- df.mvs - ada -- (SmallArchDepthA * 0.7 * df.div) - adb -- (SmallArchDepthB * 0.7 * df.div) + ada -- (SmallArchDepthA * 0.7 * df.advs) + adb -- (SmallArchDepthB * 0.7 * df.advs) include : Iotified.full df XH (shift + subDf.leftSB + [HSwToV : 0.5 * df.mvs]) (XH / 2) diff --git a/packages/font-glyphs/src/letter/cyrillic/lje.ptl b/packages/font-glyphs/src/letter/cyrillic/lje.ptl index e8bd2e841..3c9db3a24 100644 --- a/packages/font-glyphs/src/letter/cyrillic/lje.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/lje.ptl @@ -17,7 +17,7 @@ glyph-block Letter-Cyrillic-Lje : begin local r : rightSB - 0 local middle : df.width / 2 local xTopLeft : mix l r 0.025 - local jut : Math.min Jut : Jut * 0.75 * df.div + local jut : Math.min Jut : Jut * 0.75 * df.advs include : LegShape ztop -- [Point.fromXY Point.Type.Corner xTopLeft top] zbot -- [Point.fromXY Point.Type.Corner [mix l 0 [if SLAB 1 0.75]] 0] @@ -34,12 +34,12 @@ glyph-block Letter-Cyrillic-Lje : begin foreach { suffix { Uc Lc } } [Object.entries YeriConfig] : do create-glyph "cyrl/Lje.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital include : CyrLjeShape Uc df CAP create-glyph "cyrl/lje.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e include : CyrLjeShape Lc df XH diff --git a/packages/font-glyphs/src/letter/cyrillic/multiocular-o.ptl b/packages/font-glyphs/src/letter/cyrillic/multiocular-o.ptl index 48d03a1ff..9c08cdc4f 100644 --- a/packages/font-glyphs/src/letter/cyrillic/multiocular-o.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/multiocular-o.ptl @@ -13,7 +13,7 @@ glyph-block Letter-Cyrillic-Multiocular-O : begin foreach { suffix { DrawAt kdr } } [Object.entries DotVariants] : do create-glyph "cyrl/multiocularO.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 6 + local df : include : DivFrame para.advanceScaleMM 6 include : df.markSet.bp local subDf : df.slice 5 2 diff --git a/packages/font-glyphs/src/letter/cyrillic/nje.ptl b/packages/font-glyphs/src/letter/cyrillic/nje.ptl index 4c74a63ba..421afb01d 100644 --- a/packages/font-glyphs/src/letter/cyrillic/nje.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/nje.ptl @@ -55,24 +55,24 @@ glyph-block Letter-Cyrillic-Nje : begin foreach { suffix { slabType } } [Object.entries LeftHalfConfig] : do create-glyph "cyrl/Nje/leftHalf.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital include : LeftHalf slabType df CAP create-glyph "cyrl/nje/leftHalf.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e include : LeftHalf slabType df XH foreach { suffix { Uc Lc } } [Object.entries YeriConfig] : do create-glyph "cyrl/Nje/rightHalf.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital include : RightHalf Uc df CAP DependentSelector.set currentGlyph : if (suffix === "corner") 'full' 'reduced' create-glyph "cyrl/nje/rightHalf.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e include : RightHalf Lc df XH DependentSelector.set currentGlyph : if (suffix === "corner") 'full' 'reduced' diff --git a/packages/font-glyphs/src/letter/cyrillic/omega.ptl b/packages/font-glyphs/src/letter/cyrillic/omega.ptl index f6e9d59f7..6f5833361 100644 --- a/packages/font-glyphs/src/letter/cyrillic/omega.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/omega.ptl @@ -11,7 +11,7 @@ glyph-block Letter-Cyrillic-Omega : begin glyph-block-import Letter-Cyrillic-Te-Comb define [CyrlOmegaShape df top p1 p2] : glyph-proc - local fine : AdviceStroke 3 df.div + local fine : AdviceStroke 3 df.advs local mfine : fine * CThin local minHookDepth : Math.min (0.625 * (df.middle - df.leftSB - [HSwToV fine])) ((1 / 3) * (df.rightSB - df.leftSB)) @@ -49,11 +49,11 @@ glyph-block Letter-Cyrillic-Omega : begin curl xMidBarCoLeft y4 [heading Upward] create-glyph 'cyrl/BroadOmega' 0xA64C : glyph-proc - define df : include : DivFrame para.diversityMM 3 - include : [DivFrame df.div].markSet.capital + define df : include : DivFrame para.advanceScaleMM 3 + include : [DivFrame df.advs].markSet.capital include : CyrlOmegaShape df CAP 0.30 0.31 create-glyph 'cyrl/broadOmega' 0xA64D : glyph-proc - define df : include : DivFrame para.diversityM 3 - include : [DivFrame df.div].markSet.e + define df : include : DivFrame para.advanceScaleM 3 + include : [DivFrame df.advs].markSet.e include : CyrlOmegaShape df XH 0.30 0.31 diff --git a/packages/font-glyphs/src/letter/cyrillic/sha.ptl b/packages/font-glyphs/src/letter/cyrillic/sha.ptl index d2f3e970d..223ebd0e6 100644 --- a/packages/font-glyphs/src/letter/cyrillic/sha.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/sha.ptl @@ -33,24 +33,24 @@ glyph-block Letter-Cyrillic-Sha : begin composite-proc sf.lt.outer sf.rt.outer create-glyph 'cyrl/Sha' 0x428 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital include : CyrShaShape df CAP 0 (doSerif -- SLAB) create-glyph 'cyrl/sha.upright' : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e include : CyrShaShape df XH 0 (doSerif -- SLAB) alias 'cyrl/sha/reduced.upright' null 'cyrl/sha.upright' create-glyph 'cyrl/teThreeLeg.upright' : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e include : CyrShaShape df XH 0 (doSerif -- SLAB) (fInv -- true) create-glyph 'smcpMTurned' 0xA7FA : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e include : CyrShaShape df XH 0 (doSerif -- SLAB) @@ -61,12 +61,12 @@ glyph-block Letter-Cyrillic-Sha : begin include : CyrDescender.rSideJut df.rightSB bot (refSw -- cofine) create-glyph 'cyrl/Shcha' 0x429 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital include : CyrShchaShape df CAP 0 (doSerif -- SLAB) create-glyph 'cyrl/shcha.upright' : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e include : CyrShchaShape df XH 0 (doSerif -- SLAB) diff --git a/packages/font-glyphs/src/letter/cyrillic/small-yus.ptl b/packages/font-glyphs/src/letter/cyrillic/small-yus.ptl index 1d0823958..b9f965937 100644 --- a/packages/font-glyphs/src/letter/cyrillic/small-yus.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/small-yus.ptl @@ -13,7 +13,7 @@ glyph-block Letter-Cyrillic-SmallYus : begin glyph-block-import Letter-Cyrillic-Iotified-A : Iotified define [CyrSmallYusShape df top straightBar _fine] : glyph-proc - local fine : fallback _fine : AdviceStroke 3.3 df.div + local fine : fallback _fine : AdviceStroke 3.3 df.advs include : LambdaShape df -- df fBarStraight -- straightBar @@ -33,7 +33,7 @@ glyph-block Letter-Cyrillic-SmallYus : begin include : tagged 'serifMB' sf.mb.full define [CyrClosedSmallYusShape df top straightBar _fine] : glyph-proc - local fine : fallback _fine : AdviceStroke 2.75 df.div + local fine : fallback _fine : AdviceStroke 2.75 df.advs include : DeltaShape df -- df top -- top @@ -50,7 +50,7 @@ glyph-block Letter-Cyrillic-SmallYus : begin include : tagged 'serifRB' sf.rb.outer create-glyph : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital create-forked-glyph 'cyrl/SmallYus.straight' : CyrSmallYusShape df CAP true create-forked-glyph 'cyrl/SmallYus.curly' : CyrSmallYusShape df CAP false @@ -86,7 +86,7 @@ glyph-block Letter-Cyrillic-SmallYus : begin include : CyrClosedSmallYusShape dfSub top straightBar df.mvs include : CyrSmallYusShape dfSub top straightBar df.mvs eject-contour 'serifRB' - include : Translate (Width * (df.div - divSub)) 0 + include : Translate (Width * (df.advs - divSub)) 0 include : Iotified.A df top hBarRight -- [mix df.leftSB df.rightSB (2 / 3)] @@ -98,7 +98,7 @@ glyph-block Letter-Cyrillic-SmallYus : begin include sf.rb.outer create-glyph : glyph-proc - local df : include : DivFrame (para.diversityM ** 2) 4.25 + local df : include : DivFrame (para.advanceScaleM ** 2) 4.25 include : df.markSet.capital create-forked-glyph 'cyrl/SmallYusIotified.straight' CyrIotifiedSmallYusShape false true df CAP true @@ -106,7 +106,7 @@ glyph-block Letter-Cyrillic-SmallYus : begin CyrIotifiedSmallYusShape false true df CAP false create-glyph : glyph-proc - local df : include : DivFrame para.diversityM 4.25 + local df : include : DivFrame para.advanceScaleM 4.25 include : df.markSet.e create-forked-glyph 'cyrl/smallYusIotified.straight' CyrIotifiedSmallYusShape false false df XH true @@ -114,7 +114,7 @@ glyph-block Letter-Cyrillic-SmallYus : begin CyrIotifiedSmallYusShape false false df XH false create-glyph : glyph-proc - local df : include : DivFrame para.diversityM 4.25 + local df : include : DivFrame para.advanceScaleM 4.25 include : df.markSet.capital create-forked-glyph 'cyrl/SmallYusClosedIotified.straight' CyrIotifiedSmallYusShape true true df CAP true @@ -122,7 +122,7 @@ glyph-block Letter-Cyrillic-SmallYus : begin CyrIotifiedSmallYusShape true true df CAP false create-glyph : glyph-proc - local df : include : DivFrame para.diversityM 4.25 + local df : include : DivFrame para.advanceScaleM 4.25 include : df.markSet.e create-forked-glyph 'cyrl/smallYusClosedIotified.straight' CyrIotifiedSmallYusShape true false df XH true diff --git a/packages/font-glyphs/src/letter/cyrillic/te-midhook.ptl b/packages/font-glyphs/src/letter/cyrillic/te-midhook.ptl index 187b4feb4..5f8d7fa0a 100644 --- a/packages/font-glyphs/src/letter/cyrillic/te-midhook.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/te-midhook.ptl @@ -37,14 +37,14 @@ glyph-block Letter-Cyrillic-Te-MidHook : begin MaskLeft : mix (left + [HSwToV sw]) (df.rightSB - [HSwToV sw]) 0.625 HSerif.mb (left + [HSwToV : 0.5 * sw]) 0 Jut - foreach { suffix { div doST doSB } } [Object.entries TConfig] : do + foreach { suffix { advs doST doSB } } [Object.entries TConfig] : do create-glyph "cyrl/TeMidHook.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : df.markSet.capDesc include : Shape df CAP 1 doST doSB create-glyph "cyrl/teMidHook.upright.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : df.markSet.p include : Shape df XH (HBarPos ** 0.3) doST doSB diff --git a/packages/font-glyphs/src/letter/cyrillic/tje.ptl b/packages/font-glyphs/src/letter/cyrillic/tje.ptl index ba6537619..7b43040eb 100644 --- a/packages/font-glyphs/src/letter/cyrillic/tje.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/tje.ptl @@ -41,26 +41,26 @@ glyph-block Letter-Cyrillic-Tje : begin eject-contour 'serifYeriLT' eject-contour 'serifYeriLB' - foreach { suffix { div doST doSB } } [Object.entries TConfig] : do + foreach { suffix { advs doST doSB } } [Object.entries TConfig] : do create-glyph "cyrl/Tje/leftHalf.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT 3 + local df : include : DivFrame para.advanceScaleT 3 include : df.markSet.capital include : LeftHalf df CAP doST doSB create-glyph "cyrl/tje.upright/leftHalf.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT 3 + local df : include : DivFrame para.advanceScaleT 3 include : df.markSet.e include : LeftHalf df XH doST doSB foreach { suffix { Uc Lc } } [Object.entries YeriConfig] : do create-glyph "cyrl/Tje/rightHalf.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT 3 + local df : include : DivFrame para.advanceScaleT 3 include : df.markSet.capital include : RightHalf Uc df CAP DependentSelector.set currentGlyph : if (suffix === "corner") 'full' 'reduced' create-glyph "cyrl/tje.upright/rightHalf.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT 3 + local df : include : DivFrame para.advanceScaleT 3 include : df.markSet.e include : RightHalf Lc df XH DependentSelector.set currentGlyph : if (suffix === "corner") 'full' 'reduced' diff --git a/packages/font-glyphs/src/letter/cyrillic/tse.ptl b/packages/font-glyphs/src/letter/cyrillic/tse.ptl index bb4bf98d7..0273e640c 100644 --- a/packages/font-glyphs/src/letter/cyrillic/tse.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/tse.ptl @@ -44,7 +44,7 @@ glyph-block Letter-Cyrillic-Tse : begin define [CyrTeTseShape df top teSerifs] : glyph-proc local sw : AdviceStroke 2.75 - local left : [mix df.leftSB df.rightSB : if (df.div > 1) 0.25 0.2] - [HSwToV : 0.25 * sw] + OX + local left : [mix df.leftSB df.rightSB : if (df.advs > 1) 0.25 0.2] - [HSwToV : 0.25 * sw] + OX local right : df.rightSB - OX local xTopBarLeft : df.leftSB - SideJut @@ -73,12 +73,12 @@ glyph-block Letter-Cyrillic-Tse : begin foreach { suffix { doST doSB } } [Object.entries TeTseConfig] : do create-glyph "cyrl/TeTse.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT + local df : include : DivFrame para.advanceScaleT include : df.markSet.capital include : CyrTeTseShape df CAP doST create-glyph "cyrl/tetse.upright.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT + local df : include : DivFrame para.advanceScaleT include : df.markSet.e include : CyrTeTseShape df XH doST diff --git a/packages/font-glyphs/src/letter/cyrillic/tshe.ptl b/packages/font-glyphs/src/letter/cyrillic/tshe.ptl index 2048ba899..560723f9d 100644 --- a/packages/font-glyphs/src/letter/cyrillic/tshe.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/tshe.ptl @@ -10,11 +10,11 @@ glyph-block Letter-Cyrillic-Tshe : begin glyph-block-import Letter-Shared-Shapes : nShoulder create-glyph 'cyrl/Tshe' 0x40B : glyph-proc - local df : include : DivFrame para.diversityT + local df : include : DivFrame para.advanceScaleT include : df.markSet.capital local sw : AdviceStroke 2.75 - local left : [mix df.leftSB df.rightSB : if (df.div <= 1) 0.2 : if SLAB 0.3 0.25] + OX + local left : [mix df.leftSB df.rightSB : if (df.advs <= 1) 0.2 : if SLAB 0.3 0.25] + OX local right : df.rightSB - OX local xTopBarLeft : SB - SideJut diff --git a/packages/font-glyphs/src/letter/cyrillic/yat.ptl b/packages/font-glyphs/src/letter/cyrillic/yat.ptl index 6f3c32858..3ed38346f 100644 --- a/packages/font-glyphs/src/letter/cyrillic/yat.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/yat.ptl @@ -51,7 +51,7 @@ glyph-block Letter-Cyrillic-Yat : begin define divSub : (df.width - gap - sw) / Width define dfSub : DivFrame divSub 2 - local shift : Width * (df.div - divSub) + local shift : Width * (df.advs - divSub) include : with-transform [ApparentTranslate shift 0] YatShape dfSub Yeri top pBar -- pBar @@ -65,20 +65,20 @@ glyph-block Letter-Cyrillic-Yat : begin foreach { suffix { Uc Lc } } [pairs-of YeriConfig] : do create-glyph "cyrl/Yat.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT + local df : include : DivFrame para.advanceScaleT include : df.markSet.capital include : YatShape df Uc CAP pBar -- 0.5 create-glyph "cyrl/yat.upright.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT + local df : include : DivFrame para.advanceScaleT include : df.markSet.b include : YatShape df Lc Ascender pBar -- (YeriBarPos * XH / Ascender) fLowerCase -- true create-glyph "cyrl/yatTall.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT + local df : include : DivFrame para.advanceScaleT include : df.markSet.b local asc : Ascender + 0.5 * AccentStackOffset include : ExtendAboveBaseAnchors asc @@ -88,13 +88,13 @@ glyph-block Letter-Cyrillic-Yat : begin yCrossbarOverride -- (Ascender - [if SLAB (0.25 * df.mvs) 0]) create-glyph "cyrl/YatIotified.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : IotifiedYatShape df Uc CAP pBar -- 0.5 create-glyph "cyrl/yatIotified.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.b include : IotifiedYatShape df Lc Ascender pBar -- 0.375 @@ -102,7 +102,7 @@ glyph-block Letter-Cyrillic-Yat : begin # Italic Yat create-glyph "cyrl/yat.italic/yeri.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e local xMidBarLeft : df.middle - [HSwToV : 0.5 * df.mvs] @@ -116,7 +116,7 @@ glyph-block Letter-Cyrillic-Yat : begin DependentSelector.set currentGlyph : if (suffix === "corner") 'full' 'reduced' create-glyph "cyrl/tje.italic/yeri.\(suffix)" : glyph-proc - local df : include : DivFrame [mix 1 para.diversityMM 2] 4 + local df : include : DivFrame [mix 1 para.advanceScaleMM 2] 4 include : df.markSet.e local dfSub : df.slice 4 3 0 diff --git a/packages/font-glyphs/src/letter/cyrillic/yeri.ptl b/packages/font-glyphs/src/letter/cyrillic/yeri.ptl index 976e53e08..6c0d116d5 100644 --- a/packages/font-glyphs/src/letter/cyrillic/yeri.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/yeri.ptl @@ -213,10 +213,10 @@ glyph-block Letter-Cyrillic-Yeri : begin include : VerticalHook.l xLeftBarLeftEdge (top - TailY - 0.5 * stroke) (xTopBarLeftEnd - xLeftBarLeftEdge - 0.5 * stroke) (-TailY) stroke define [CyrYeryShape LeftHalf df top fBackYer fTail] : glyph-proc - local sw : if fBackYer [AdviceStroke 3.25 df.div] df.mvs + local sw : if fBackYer [AdviceStroke 3.25 df.advs] df.mvs local jut : [Math.min 1 : Math.sqrt : sw / Stroke] * Jut - local xm : mix (df.rightSB - [HSwToV sw]) (df.middle + [HSwToV : 0.5 * sw]) : if (fBackYer && df.div > 1) 0.625 0.75 + local xm : mix (df.rightSB - [HSwToV sw]) (df.middle + [HSwToV : 0.5 * sw]) : if (fBackYer && df.advs > 1) 0.625 0.75 include : if fBackYer CyrBackYerShape LeftHalf @@ -303,32 +303,32 @@ glyph-block Letter-Cyrillic-Yeri : begin right -- df.rightSB include : YeriOverlayBar df XH create-glyph "cyrl/Yer.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT + local df : include : DivFrame para.advanceScaleT include : df.markSet.capital include : CyrBackYerShape Uc CAP left -- df.leftSB right -- df.rightSB create-glyph "cyrl/yer.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT + local df : include : DivFrame para.advanceScaleT include : df.markSet.e include : CyrBackYerShape Lc XH left -- df.leftSB right -- df.rightSB create-glyph "cyrl/yerTall.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT + local df : include : DivFrame para.advanceScaleT include : df.markSet.b include : CyrBackYerShape Lc Ascender left -- df.leftSB right -- df.rightSB pBar -- (YeriBarPos * XH / Ascender) create-glyph "cyrl/YerNeutral.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT + local df : include : DivFrame para.advanceScaleT include : df.markSet.capital include : CyrNeutralYerShape Uc CAP left -- df.leftSB right -- df.rightSB create-glyph "cyrl/yerNeutral.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT + local df : include : DivFrame para.advanceScaleT include : df.markSet.e include : CyrNeutralYerShape Lc XH left -- df.leftSB @@ -342,19 +342,19 @@ glyph-block Letter-Cyrillic-Yeri : begin foreach { suffix { Uc Lc fTail } } [Object.entries YeryConfig] : do if [not fTail] : create-glyph "cyrl/Yery.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : CyrYeryShape Uc df CAP false fTail create-glyph "cyrl/yery.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e include : CyrYeryShape Lc df XH false fTail if [not fTail] : create-glyph "cyrl/YeryBack.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital include : CyrYeryShape Uc df CAP true fTail create-glyph "cyrl/yeryBack.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e include : CyrYeryShape Lc df XH true fTail @@ -399,7 +399,7 @@ glyph-block Letter-Cyrillic-Yeri : begin include : RevYeri.Shape CAP create-glyph 'cyrl/DjeKomi' 0x502 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital local xm : df.middle + [HSwToV : 0.5 * df.mvs] @@ -409,8 +409,8 @@ glyph-block Letter-Cyrillic-Yeri : begin right -- df.rightSB ybegin -- CAP yend -- (CAP / 2) - ada -- (SmallArchDepthA * 0.6 * df.div) - adb -- (SmallArchDepthB * 0.6 * df.div) + ada -- (SmallArchDepthA * 0.6 * df.advs) + adb -- (SmallArchDepthB * 0.6 * df.advs) sw -- df.mvs if SLAB : begin include : HSerif.mt df.middle CAP Jut df.mvs diff --git a/packages/font-glyphs/src/letter/cyrillic/yu.ptl b/packages/font-glyphs/src/letter/cyrillic/yu.ptl index b99181208..90977862b 100644 --- a/packages/font-glyphs/src/letter/cyrillic/yu.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/yu.ptl @@ -22,9 +22,9 @@ glyph-block Letter-Cyrillic-Yu : begin local divSub : (df.width - gap - df.mvs) / Width local subDf : DivFrame divSub 2 - local shift : Width * (df.div - divSub) + local shift : Width * (df.advs - divSub) include : with-transform [ApparentTranslate shift 0] - OShape top 0 subDf.leftSB subDf.rightSB df.mvs (ada * 0.7 * df.div) (adb * 0.7 * df.div) + OShape top 0 subDf.leftSB subDf.rightSB df.mvs (ada * 0.7 * df.advs) (adb * 0.7 * df.advs) include : if (slabType === SLAB-BULGARIAN) Iotified.ascender df xtop (shift + subDf.leftSB + [HSwToV : 0.5 * df.mvs]) (top / 2) @@ -36,7 +36,7 @@ glyph-block Letter-Cyrillic-Yu : begin local divSub : (df.width - gap - df.mvs) / Width local subDf : DivFrame divSub 2 - include : OShape top 0 subDf.leftSB subDf.rightSB df.mvs (ada * 0.7 * df.div) (adb * 0.7 * df.div) + include : OShape top 0 subDf.leftSB subDf.rightSB df.mvs (ada * 0.7 * df.advs) (adb * 0.7 * df.advs) local useItalicShape : slabType !== SLAB-ALL && para.isItalic local slabTop : if useItalicShape SLAB-NONE SLAB-FULL @@ -50,17 +50,17 @@ glyph-block Letter-Cyrillic-Yu : begin fTail -- fTail create-glyph 'cyrl/Yu' 0x42E : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : CyrYuShape df SLAB-ALL CAP CAP ArchDepthA ArchDepthB create-glyph 'cyrl/yu' 0x44E : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e include : CyrYuShape df SLAB-LOWER XH XH SmallArchDepthA SmallArchDepthB create-glyph 'cyrl/yu.BGR' : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.b include : CyrYuShape df SLAB-BULGARIAN XH Ascender SmallArchDepthA SmallArchDepthB @@ -70,11 +70,11 @@ glyph-block Letter-Cyrillic-Yu : begin foreach { suffix fTail } [Object.entries YuRevConfig] : do if [not fTail] : create-glyph "cyrl/YuRev.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : CyrRevYuShape df SLAB-ALL CAP CAP ArchDepthA ArchDepthB fTail create-glyph "cyrl/yuRev.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e include : CyrRevYuShape df SLAB-LOWER XH XH SmallArchDepthA SmallArchDepthB fTail diff --git a/packages/font-glyphs/src/letter/cyrillic/zhe.ptl b/packages/font-glyphs/src/letter/cyrillic/zhe.ptl index 0f13a2032..82b5be739 100644 --- a/packages/font-glyphs/src/letter/cyrillic/zhe.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/zhe.ptl @@ -11,10 +11,10 @@ glyph-block Letter-Cyrillic-Zhe : begin glyph-block-export Zhe define Zhe : namespace - define [ZheSw df] : AdviceStroke 3.3 df.div - define [ZheSw2 df] : AdviceStroke 4.0 df.div - define [ZheSw3 df] : AdviceStroke 3.7 df.div - define [Overshoot fSlab df] : if fSlab 0 : O * 3 * df.div + define [ZheSw df] : AdviceStroke 3.3 df.advs + define [ZheSw2 df] : AdviceStroke 4.0 df.advs + define [ZheSw3 df] : AdviceStroke 3.7 df.advs + define [Overshoot fSlab df] : if fSlab 0 : O * 3 * df.advs define [CenterBar fSlab df bot top midTop] : glyph-proc define fine : ZheSw df @@ -80,7 +80,7 @@ glyph-block Letter-Cyrillic-Zhe : begin export : define [CurlyLegs fSlab fHalf df bot top] : begin define fine : ZheSw df define fine2 : ZheSw3 df - define overshoot : if fSlab 0 : 2 * O * df.div + define overshoot : if fSlab 0 : 2 * O * df.advs define attach1X : df.middle - [HSwToV : 0.5 * fine] define attach1Y : mix bot top : if fSlab 0.325 0.375 @@ -152,7 +152,7 @@ glyph-block Letter-Cyrillic-Zhe : begin export : define [CursiveLegs fSlab fHalf df bot top] : begin define fine : ZheSw df - define fine2 : AdviceStroke 4.2 df.div + define fine2 : AdviceStroke 4.2 df.advs define midX : mix df.leftSB (df.middle - [HSwToV : 0.5 * fine]) 0.4 define midY : mix bot top 0.5 define overshoot : Overshoot fSlab df @@ -189,27 +189,27 @@ glyph-block Letter-Cyrillic-Zhe : begin foreach { suffix { legShape fSlab fMidSlab } } [Object.entries ZheConfig] : do create-glyph "cyrl/Zhe.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : Zhe.Shape legShape fSlab fMidSlab df 0 CAP CAP create-glyph "cyrl/ZheDescender.\(suffix)" : glyph-proc - local df : DivFrame para.diversityM 3 + local df : DivFrame para.advanceScaleM 3 include [refer-glyph "cyrl/Zhe.\(suffix)"] AS_BASE ALSO_METRICS include : Zhe.Descender fSlab df create-glyph "cyrl/zhe.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e include : Zhe.Shape legShape fSlab fMidSlab df 0 XH XH create-glyph "cyrl/zheDescender.\(suffix)" : glyph-proc - local df : DivFrame para.diversityM 3 + local df : DivFrame para.advanceScaleM 3 include [refer-glyph "cyrl/zhe.\(suffix)"] AS_BASE ALSO_METRICS include : Zhe.Descender fSlab df create-glyph "cyrl/zhe.BGR.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.b include : Zhe.Shape legShape fSlab fMidSlab df 0 XH Ascender diff --git a/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl b/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl index d8ecc960d..6a996cf33 100644 --- a/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl @@ -265,9 +265,9 @@ glyph-block Letter-Greek-Lower-Epsilon : begin zeNoO.ShapeMask create-glyph "cyrl/zeRhoticHook.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 1 + local df : include : DivFrame para.advanceScaleM 1 include : df.markSet.e - local divSub : Math.min 1 : 0.85 * para.diversityM + local divSub : Math.min 1 : 0.85 * para.advanceScaleM local dfSub : DivFrame divSub 2 local stroke : AdviceStroke2 2 3 XH divSub local ze : CyrZe slabTop slabBot XH 0 @@ -293,7 +293,7 @@ glyph-block Letter-Greek-Lower-Epsilon : begin include : CyrDescender.rSideJut (RightSB - OX * 2) 0 create-glyph "cyrl/ZjeKomi.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital local xm : df.middle + [HSwToV : 0.5 * df.mvs] @@ -309,15 +309,15 @@ glyph-block Letter-Greek-Lower-Epsilon : begin right -- df.rightSB ybegin -- [YSmoothMidR (midy + stroke / 2) 0] yend -- (CAP / 2) - ada -- (ArchDepthA * 0.6 * df.div) - adb -- (ArchDepthB * 0.6 * df.div) + ada -- (ArchDepthA * 0.6 * df.advs) + adb -- (ArchDepthB * 0.6 * df.advs) sw -- stroke include : ze.AutoStartSerifL local sf2 : [SerifFrame.fromDf df (CAP / 2) 0].slice 1 2 if SLAB : include sf2.rt.full create-glyph "cyrl/zjeKomi.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e local xm : df.middle + [HSwToV : 0.5 * df.mvs] @@ -333,8 +333,8 @@ glyph-block Letter-Greek-Lower-Epsilon : begin right -- df.rightSB ybegin -- [YSmoothMidR (midy + stroke / 2) 0] yend -- (XH / 2) - ada -- (SmallArchDepthA * 0.6 * df.div) - adb -- (SmallArchDepthB * 0.6 * df.div) + ada -- (SmallArchDepthA * 0.6 * df.advs) + adb -- (SmallArchDepthB * 0.6 * df.advs) sw -- stroke include : ze.AutoStartSerifL local sf2 : [SerifFrame.fromDf df (XH / 2) 0].slice 1 2 diff --git a/packages/font-glyphs/src/letter/greek/lower-omega.ptl b/packages/font-glyphs/src/letter/greek/lower-omega.ptl index 47b292cda..64ce1bb6d 100644 --- a/packages/font-glyphs/src/letter/greek/lower-omega.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-omega.ptl @@ -9,7 +9,7 @@ glyph-block Letter-Greek-Lower-Omega : begin glyph-block-import Common-Derivatives define [LowerOmegaShape df top p1 p2] : glyph-proc - local fine : AdviceStroke 3 df.div + local fine : AdviceStroke 3 df.advs local mfine : fine * CThin local x0 : mix df.leftSB df.rightSB 0.1 local y0 : top - O @@ -34,12 +34,12 @@ glyph-block Letter-Greek-Lower-Omega : begin curl (df.middle - [HSwToV : mfine - fine / 2]) y4 [heading Upward] create-glyph 'grek/omega' 0x3C9 : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e include : LowerOmegaShape df XH 0.5 0.65 create-glyph 'grek/pomega' 0x3D6 : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e include : union @@ -49,7 +49,7 @@ glyph-block Letter-Greek-Lower-Omega : begin MaskAbove XH create-glyph 'closeomega' 0x277 : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e local fine : AdviceStroke 3 local mfine : fine * CThin @@ -71,7 +71,7 @@ glyph-block Letter-Greek-Lower-Omega : begin curl (df.middle - [HSwToV : mfine - fine / 2]) y4 [heading Upward] create-glyph 'latn/Omega' 0xA7B6 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital include : LowerOmegaShape df CAP 0.5 0.65 diff --git a/packages/font-glyphs/src/letter/greek/phi.ptl b/packages/font-glyphs/src/letter/greek/phi.ptl index dacf3d8a0..28c9dfa36 100644 --- a/packages/font-glyphs/src/letter/greek/phi.ptl +++ b/packages/font-glyphs/src/letter/greek/phi.ptl @@ -60,8 +60,8 @@ glyph-block Letter-Greek-Phi : begin define [CursiveBar df y1 y2 y3 y4 sw] : glyph-proc local hd : FlatHookDepth df - local xCrossLeft : mix 0 df.leftSB : mix 1 df.div 2 - local xCrossRight : mix df.width df.rightSB : mix 1 df.div 2 + local xCrossLeft : mix 0 df.leftSB : mix 1 df.advs 2 + local xCrossRight : mix df.width df.rightSB : mix 1 df.advs 2 local xBarLeft : df.middle - [HSwToV : 0.5 * sw] local xBarRight : df.middle + [HSwToV : 0.5 * sw] @@ -83,7 +83,7 @@ glyph-block Letter-Greek-Phi : begin define [DiagonalTailCursiveBar df y1 y2 y3 y4 sw] : glyph-proc local hd : FlatHookDepth df - local xCrossRight : mix df.width df.rightSB : mix 1 df.div 2 + local xCrossRight : mix df.width df.rightSB : mix 1 df.advs 2 local xBarLeft : df.middle - [HSwToV : 0.5 * sw] include : dispiro @@ -95,7 +95,7 @@ glyph-block Letter-Greek-Phi : begin include : dispiro flat df.middle (y2 - O) [widths.center.heading sw Downward] - DiagTail.L df.middle y1 [DiagTail.StdDepth [DivFrame para.diversityF] sw] sw + DiagTail.L df.middle y1 [DiagTail.StdDepth [DivFrame para.advanceScaleF] sw] sw define [MtSerif df y sw] : tagged 'serifMT' : HSerif.lt df.middle y Jut sw define [MbSerif df y sw] : tagged 'serifMB' : HSerif.mb df.middle y Jut sw @@ -111,17 +111,17 @@ glyph-block Letter-Greek-Phi : begin include : tagged 'serifMB' : HSerif.mb df.middle 0 MidJutSide create-glyph 'grek/Phi' 0x3A6 : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : GrekCapitalPhiImpl false df create-glyph 'cyrl/Ef' 0x424 : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : GrekCapitalPhiImpl true df create-glyph 'cyrl/Ef.BGR' : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital local yExt : Math.max (LongVJut - QuarterStroke) : if SLAB (1.5 * Stroke) 0 @@ -140,24 +140,24 @@ glyph-block Letter-Greek-Phi : begin include : tagged 'serifMB' : HSerif.mb df.middle bot MidJutSide create-glyph 'taillessphi' 0x2C77 : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e include : GrekLowerPhiCursiveRing false df 0 XH df.smallArchDepthA df.smallArchDepthB create-glyph 'grek/phi.cursive' : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.p include : GrekLowerPhiCursiveRing false df 0 XH df.smallArchDepthA df.smallArchDepthB include : VBar.m df.middle Descender (0.2 * df.mvs) create-glyph 'grek/phi.straight' : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.bp include : VarPhiRing false df 0 XH df.smallArchDepthA df.smallArchDepthB include : StraightBar df Descender 0 XH Ascender create-glyph 'grek/phi.neohellenic' : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.p include : VarPhiRing false df 0 XH df.smallArchDepthA df.smallArchDepthB include : VBar.m df.middle Descender (0.2 * df.mvs) @@ -166,7 +166,7 @@ glyph-block Letter-Greek-Phi : begin alias 'grek/varphi' 0x3D5 'grek/phi.straight' create-glyph 'latn/phi' 0x278 : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include [refer-glyph 'grek/varphi'] AS_BASE ALSO_METRICS if SLAB : begin @@ -175,8 +175,8 @@ glyph-block Letter-Greek-Phi : begin define CyrlLowerEfConfig : SuffixCfg.weave object # bowl - "" { VarPhiRing Stroke para.diversityM } - splitBowl { CyrlEfSplitRing nothing para.diversityMM } + "" { VarPhiRing Stroke para.advanceScaleM } + splitBowl { CyrlEfSplitRing nothing para.advanceScaleMM } object # bar serifless { StraightBar nothing nothing } topSerifed { StraightBar MtSerif nothing } @@ -184,9 +184,9 @@ glyph-block Letter-Greek-Phi : begin cursive { CursiveBar nothing nothing } diagonalTailedCursive { DiagonalTailCursiveBar nothing nothing } - foreach { suffix { { Bowl barSw div } { Bar sMT sMB } } } [Object.entries CyrlLowerEfConfig] : do + foreach { suffix { { Bowl barSw advs } { Bar sMT sMB } } } [Object.entries CyrlLowerEfConfig] : do create-glyph "cyrl/ef.\(suffix)" : glyph-proc - local df : include : DivFrame div 3 + local df : include : DivFrame advs 3 include : df.markSet.bp include : Bowl true df 0 XH df.smallArchDepthA df.smallArchDepthB local vs : fallback barSw df.mvs diff --git a/packages/font-glyphs/src/letter/greek/pi.ptl b/packages/font-glyphs/src/letter/greek/pi.ptl index fd416b320..32831dbee 100644 --- a/packages/font-glyphs/src/letter/greek/pi.ptl +++ b/packages/font-glyphs/src/letter/greek/pi.ptl @@ -80,12 +80,12 @@ glyph-block Letter-Greek-Pi : begin include sf.rb.outer create-glyph 'cyrl/PeMidHook' 0x4A6 : glyph-proc - define df : include : DivFrame para.diversityMM 3 + define df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capDesc include : CyrlPeHookShape df CAP create-glyph 'cyrl/peMidHook.upright' : glyph-proc - define df : include : DivFrame para.diversityMM 3 + define df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.p include : CyrlPeHookShape df XH diff --git a/packages/font-glyphs/src/letter/greek/psi.ptl b/packages/font-glyphs/src/letter/greek/psi.ptl index 1abf070f6..37040e691 100644 --- a/packages/font-glyphs/src/letter/greek/psi.ptl +++ b/packages/font-glyphs/src/letter/greek/psi.ptl @@ -14,11 +14,11 @@ glyph-block Letter-Greek-Psi : begin include : dispiro widths.lhs df.mvs flat df.leftSB y3 [heading Downward] - curl df.leftSB (y2 + (ArchDepthB * df.div)) + curl df.leftSB (y2 + (ArchDepthB * df.advs)) arcvh g4 df.middle y2 [heading Rightward] archv - flat df.rightSB (y2 + (ArchDepthA * df.div)) + flat df.rightSB (y2 + (ArchDepthA * df.advs)) curl df.rightSB y3 [heading Upward] include : VBar.m df.middle y2 y4 df.mvs include : VBar.m df.middle y1 (y2 + HalfStroke) @@ -29,14 +29,14 @@ glyph-block Letter-Greek-Psi : begin if doBotSerif : include : tagged 'serifMB' : HSerif.mb df.middle 0 MidJutSide create-glyph 'grek/Psi' 0x3A8 : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : PsiBaseShape df 0 (CAP * 0.3) CAP CAP SLAB (SLAB && (df.width > para.refJut * 7)) SLAB SLAB alias 'cyrl/Psi' 0x470 'grek/Psi' create-glyph 'smcpPsi' 0x1D2A : glyph-proc - local df : include : DivFrame para.diversityT 3 + local df : include : DivFrame para.advanceScaleT 3 include : df.markSet.e include : PsiBaseShape df 0 (XH * 0.3) XH XH SLAB false SLAB SLAB @@ -50,7 +50,7 @@ glyph-block Letter-Greek-Psi : begin foreach { suffix { top slab } } [Object.entries GrekLowerPsiConfig] : do create-glyph "grek/psi.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.[if (top > XH) 'bp' 'p'] include : PsiBaseShape df Descender 0 XH top false false slab false diff --git a/packages/font-glyphs/src/letter/greek/sampi.ptl b/packages/font-glyphs/src/letter/greek/sampi.ptl index f72c46a08..319e0518f 100644 --- a/packages/font-glyphs/src/letter/greek/sampi.ptl +++ b/packages/font-glyphs/src/letter/greek/sampi.ptl @@ -17,12 +17,12 @@ glyph-block Letter-Greek-Arachaic-Sampi : begin if (fDoSerifs && SLAB) : include : HSerif.mb df.middle 0 MidJutSide create-glyph 'grek/SampiArchaic' 0x372 : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : SampiShape df CAP 0 true create-glyph 'grek/sampiArchaic' 0x373 : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.p include : SampiShape df XH Descender false diff --git a/packages/font-glyphs/src/letter/latin-ext/archaic-m.ptl b/packages/font-glyphs/src/letter/latin-ext/archaic-m.ptl index a676fedda..e3767e373 100644 --- a/packages/font-glyphs/src/letter/latin-ext/archaic-m.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/archaic-m.ptl @@ -37,6 +37,6 @@ glyph-block Letter-Latin-Archaic-M : begin include : difference sf.rt.full [MaskLeft : mix cl cr 0.7] create-glyph "ArchaicM" 0xA7FF : glyph-proc - local df : include : DivFrame [mix 1 para.diversityMM 1.5] 4.5 + local df : include : DivFrame [mix 1 para.advanceScaleMM 1.5] 4.5 include : df.markSet.capital include : ArchaicMShape df CAP 0 diff --git a/packages/font-glyphs/src/letter/latin-ext/ezh.ptl b/packages/font-glyphs/src/letter/latin-ext/ezh.ptl index a95744041..0fc4f5276 100644 --- a/packages/font-glyphs/src/letter/latin-ext/ezh.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/ezh.ptl @@ -185,9 +185,9 @@ glyph-block Letter-Latin-Ezh : begin yAttach -- SHook create-glyph "ezhPalatalHook.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 1 + local df : include : DivFrame para.advanceScaleM 1 include : df.markSet.p - local dfSub : DivFrame (0.75 * para.diversityM) 2 + local dfSub : DivFrame (0.75 * para.advanceScaleM) 2 local [object yMidBar] : include : EzhShape dfSub XH Descender isCursive -- isCursive isSerifed -- isSerifed diff --git a/packages/font-glyphs/src/letter/latin-ext/flattened-open-a.ptl b/packages/font-glyphs/src/letter/latin-ext/flattened-open-a.ptl index 688a21a1e..7a0abc14e 100644 --- a/packages/font-glyphs/src/letter/latin-ext/flattened-open-a.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/flattened-open-a.ptl @@ -10,7 +10,7 @@ glyph-block Letter-Latin-Flattened-Open-A : begin glyph-block-import Common-Derivatives create-glyph 'flattenedOpena' : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e local top : 0.5 * XH diff --git a/packages/font-glyphs/src/letter/latin-ext/gha.ptl b/packages/font-glyphs/src/letter/latin-ext/gha.ptl index f90f0c469..58e821159 100644 --- a/packages/font-glyphs/src/letter/latin-ext/gha.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/gha.ptl @@ -21,8 +21,8 @@ glyph-block Letter-Latin-Gha : begin local divSub : (df.width - gap - df.mvs) / Width local subDf : DivFrame divSub 2 - local ada : _ada * 0.7 * df.div - local adb : _adb * 0.7 * df.div + local ada : _ada * 0.7 * df.advs + local adb : _adb * 0.7 * df.advs include : OShape top 0 subDf.leftSB subDf.rightSB df.mvs ada adb include : match terminal [Just TERMINAL-NORMAL] : VBar.r (df.rightSB - O) bot top df.mvs @@ -47,13 +47,13 @@ glyph-block Letter-Latin-Gha : begin foreach { suffix { terminal doSerif } } [Object.entries GhaConfig] : do create-glyph "Gha.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capDesc include : GhaShape df terminal CAP Descender ArchDepthA ArchDepthB doSerif include : LeaningAnchor.Below.VBar.r (df.rightSB - O) create-glyph "gha.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.p include : GhaShape df terminal XH Descender SmallArchDepthA SmallArchDepthB doSerif include : LeaningAnchor.Below.VBar.r (df.rightSB - O) diff --git a/packages/font-glyphs/src/letter/latin-ext/hwair.ptl b/packages/font-glyphs/src/letter/latin-ext/hwair.ptl index 9916c1396..9dd0d5b52 100644 --- a/packages/font-glyphs/src/letter/latin-ext/hwair.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/hwair.ptl @@ -18,18 +18,18 @@ glyph-block Letter-Latin-Hwair : begin foreach { suffix { serifLT serifLB } } [pairs-of Variants] : do create-glyph "hwair.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.b include : LeaningAnchor.Above.VBar.l df.leftSB include : VBar.l df.leftSB 0 Ascender df.mvs include : dispiro - nShoulder.knots (df.leftSB + [HSwToV df.mvs]) (df.middle + [HSwToV : 0.5 * df.mvs]) (df.mvs * 0.4) nothing (XH * 0.51) (SmallArchDepthA * 0.6 * df.div) (SmallArchDepthB * 0.6 * df.div) df.mvs + nShoulder.knots (df.leftSB + [HSwToV df.mvs]) (df.middle + [HSwToV : 0.5 * df.mvs]) (df.mvs * 0.4) nothing (XH * 0.51) (SmallArchDepthA * 0.6 * df.advs) (SmallArchDepthB * 0.6 * df.advs) df.mvs flat (df.middle + [HSwToV : 0.5 * df.mvs]) (XH * 0.5) [heading Downward] - curl (df.middle + [HSwToV : 0.5 * df.mvs]) (SmallArchDepthB * 0.6 * df.div) + curl (df.middle + [HSwToV : 0.5 * df.mvs]) (SmallArchDepthB * 0.6 * df.advs) arcvh g4 [mix (df.middle - [HSwToV : 0.5 * df.mvs]) df.rightSB 0.5] O [widths.heading df.mvs 0 Rightward] archv - flat df.rightSB (SmallArchDepthA * 0.6 * df.div) + flat df.rightSB (SmallArchDepthA * 0.6 * df.advs) curl df.rightSB XH [heading Upward] do "slabs" diff --git a/packages/font-glyphs/src/letter/latin-ext/lower-ae-oe.ptl b/packages/font-glyphs/src/letter/latin-ext/lower-ae-oe.ptl index e063e1496..7ded4cc32 100644 --- a/packages/font-glyphs/src/letter/latin-ext/lower-ae-oe.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/lower-ae-oe.ptl @@ -49,13 +49,13 @@ glyph-block Letter-Latin-Lower-AE-OE : begin foreach { suffix { bodyR hookStyle } } [Object.entries DoubleStoreyConfig] : do create-glyph "ae/a.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e set-base-anchor 'cvDecompose' 0 0 include : AAShape DoubleStorey.ToothlessRounded hookStyle 0 df 0 create-glyph "aa.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e local [left] : AAShape DoubleStorey.ToothlessRounded hookStyle 0 df @@ -85,24 +85,24 @@ glyph-block Letter-Latin-Lower-AE-OE : begin subDf.archDepthBOf ad df.mvs create-glyph 'oe/o' : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e set-base-anchor 'cvDecompose' 0 0 include : oeOPart 0 df XH SmallArchDepth create-glyph 'ao/o' : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 set-mark-anchor 'cvDecompose' 0 0 include : oeOPart 1 df XH SmallArchDepth create-glyph 'OO/left' : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital set-base-anchor 'cvDecompose' 0 0 include : oeOPart 0 df CAP ArchDepth create-glyph 'OO/right' : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 set-mark-anchor 'cvDecompose' 0 0 include : oeOPart 1 df CAP ArchDepth @@ -132,13 +132,13 @@ glyph-block Letter-Latin-Lower-AE-OE : begin foreach { suffix { body revbody } } [Object.entries Config] : do create-glyph "ae/e.\(suffix)" : glyph-proc - local df : DivFrame para.diversityMM 3 + local df : DivFrame para.advanceScaleMM 3 set-width 0 set-mark-anchor 'cvDecompose' 0 0 include : EShape 1 df body create-glyph "aeInvE/right.\(suffix)" : glyph-proc - local df : DivFrame para.diversityMM 3 + local df : DivFrame para.advanceScaleMM 3 set-width 0 set-mark-anchor 'cvDecompose' 0 0 include : InvEShape 1 df revbody @@ -146,7 +146,7 @@ glyph-block Letter-Latin-Lower-AE-OE : begin do "u subglyphs" glyph-block-import Letter-Latin-U : UShapeGroup SmallUConfigT - define df : DivFrame para.diversityMM 3 + define df : DivFrame para.advanceScaleMM 3 define { subDf shift } : SubDfAndShift 1 df 0 define sg : UShapeGroup subDf.smallArchDepthA subDf.smallArchDepthB @@ -194,20 +194,20 @@ glyph-block Letter-Latin-Lower-AE-OE : begin foreach { suffix { sty styBot } } [Object.entries CConfig] : do create-glyph "oeOpenO/left.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e set-base-anchor 'cvDecompose' 0 0 include : openOShape df sty styBot create-glyph "cyrl/este.upright/left.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3.5 + local df : include : DivFrame para.advanceScaleMM 3.5 local subDfLeft : df.slice 3.25 1.875 include : df.markSet.e set-base-anchor 'cvDecompose' 0 0 include : EsTeLeftShape subDfLeft styBot create-glyph "cyrl/este.italic/left.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 4.75 + local df : include : DivFrame para.advanceScaleMM 4.75 local subDfLeft : df.slice 4.5 2 include : df.markSet.e set-base-anchor 'cvDecompose' 0 0 @@ -223,7 +223,7 @@ glyph-block Letter-Latin-Lower-AE-OE : begin if [not fTailed] : begin create-glyph "cyrl/yae/left.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e set-base-anchor 'cvDecompose' 0 0 @@ -247,7 +247,7 @@ glyph-block Letter-Latin-Lower-AE-OE : begin glyph-block-import Letter-Latin-Lower-P : PConfig foreach { suffix { Body {Serifs doTS doBS} }} [Object.entries PConfig] : do create-glyph "cyrl/rha/left.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.p local subDf : df.slice 3 2 set-base-anchor 'cvDecompose' 0 0 @@ -279,7 +279,7 @@ glyph-block Letter-Latin-Lower-AE-OE : begin local stroke1f : if (stroke1 == 3) 4 stroke1 local lf : XLetterForm df top bot stroke1f stroke2 turn tension sw -- df.mvs - swCursiveEnd -- [AdviceStroke 3 df.div] + swCursiveEnd -- [AdviceStroke 3 df.advs] swCursiveCoEnd -- df.mvs swCursiveMid -- df.mvs include : WithSerifOverflowMask fMaskBase top bot df.leftSB df.rightSB : lf.base fMaskBase @@ -292,13 +292,13 @@ glyph-block Letter-Latin-Lower-AE-OE : begin __ : glyph-proc create-glyph "cyrl/rha/right.\(suffix)" : glyph-proc - local df : DivFrame para.diversityM 3 + local df : DivFrame para.advanceScaleM 3 set-width 0 set-mark-anchor 'cvDecompose' 0 0 include : halfLetterShape df XH 0 0.1 0.20 create-glyph "cyrl/lha/right.\(suffix)" : glyph-proc - local df : DivFrame para.diversityM 3.2 + local df : DivFrame para.advanceScaleM 3.2 set-width 0 set-mark-anchor 'cvDecompose' 0 0 @@ -306,7 +306,7 @@ glyph-block Letter-Latin-Lower-AE-OE : begin include : with-transform [ApparentTranslate shift 0] : LhaRightLetterShape subDf XH 0 0.1 0.20 create-glyph "cyrl/Lha/right.\(suffix)" : glyph-proc - local df : DivFrame para.diversityM 3.2 + local df : DivFrame para.advanceScaleM 3.2 set-width 0 set-mark-anchor 'cvDecompose' 0 0 @@ -332,7 +332,7 @@ glyph-block Letter-Latin-Lower-AE-OE : begin foreach { suffix { doST doSB } } [Object.entries TConfig] : do create-glyph "cyrl/este.upright/right.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3.5 + local df : include : DivFrame para.advanceScaleMM 3.5 local subDfLeft : df.slice 3.25 1.875 local subdfRight : df.restCompact 1 subDfLeft 2 @@ -345,7 +345,7 @@ glyph-block Letter-Latin-Lower-AE-OE : begin glyph-block-import Letter-Latin-Lower-M : mShapeBodyImpl SmallMConfig foreach { suffix { {Body earless} {shortLeg} {tailed} {Serifs} } } [pairs-of SmallMConfig] : do create-glyph "cyrl/este.italic/right.\(suffix)" : glyph-proc - local df : DivFrame para.diversityMM 4.75 + local df : DivFrame para.advanceScaleMM 4.75 local subDfLeft : df.slice 4.5 2 local subdfRight : df.restCompact 0.5 subDfLeft 3 set-width 0 @@ -356,14 +356,14 @@ glyph-block Letter-Latin-Lower-AE-OE : begin do "El subglyphs" glyph-block-import Letter-Cyrillic-El : CyrElShape create-glyph 'cyrl/Lha/left' : glyph-proc - local df : include : DivFrame para.diversityM 3.2 + local df : include : DivFrame para.advanceScaleM 3.2 include : df.markSet.capital local { subDf } : SubDfAndShiftEx 6 3 0 df set-base-anchor 'cvDecompose' 0 0 include : CyrElShape subDf.leftSB (subDf.rightSB - [HSwToV : 0.5 * df.mvs]) CAP 0 [if SLAB 4 0] df.mvs create-glyph 'cyrl/lha/left' : glyph-proc - local df : include : DivFrame para.diversityM 3.2 + local df : include : DivFrame para.advanceScaleM 3.2 include : df.markSet.e local { subDf } : SubDfAndShiftEx 6 3 0 df set-base-anchor 'cvDecompose' 0 0 @@ -374,14 +374,14 @@ glyph-block Letter-Latin-Lower-AE-OE : begin create-glyph "rightHalfSlashOverlay" : glyph-proc local fine : 0.375 * OverlayStroke - local df : DivFrame para.diversityMM 3 + local df : DivFrame para.advanceScaleMM 3 local { subDf shift } : SubDfAndShift 1 df OX include : dispiro flat (shift + subDf.leftSB + OX + fine) [mix XH 0 1.05] [widths.center : 2 * fine] curl (shift + subDf.rightSB - OX - fine) [mix 0 XH 1.05] create-glyph "rightHalfBarOverlay" : glyph-proc - local df : DivFrame para.diversityMM 3 + local df : DivFrame para.advanceScaleMM 3 local { subDf shift } : SubDfAndShift 1 df OX include : HBar.m (shift + subDf.leftSB + [HSwToV : 0.5 * df.mvs]) (shift + subDf.rightSB - [HSwToV : 0.5 * df.mvs]) (XH * 0.5) df.mvs @@ -397,12 +397,12 @@ glyph-block Letter-Latin-Lower-AE-OE : begin create-glyph "OODots.\(suffix)" : glyph-proc set-width 0 set-mark-anchor 'slash' 0 0 0 0 - local df : DivFrame para.diversityMM 3 + local df : DivFrame para.advanceScaleMM 3 include : OODots df 2 (DrawAt === DotAt) kdr create-glyph "ooDots.\(suffix)" : glyph-proc set-width 0 set-mark-anchor 'slash' 0 0 0 0 - local df : DivFrame para.diversityMM 3 + local df : DivFrame para.advanceScaleMM 3 include : OODots df 1.5 (DrawAt === DotAt) kdr select-variant "aa" 0xA733 (follow -- 'a/doubleStorey') @@ -437,8 +437,8 @@ glyph-block Letter-Latin-Lower-AE-OE : begin alias 'cyrl/oo' 0xA699 'oo' - CreateTurnedLetter 'turnae' 0x1D02 'ae' HalfAdvance (XH / 2) [DivFrame para.diversityMM 3] - CreateTurnedLetter 'turnoe' 0x1D14 'oe' HalfAdvance (XH / 2) [DivFrame para.diversityMM 3] + CreateTurnedLetter 'turnae' 0x1D02 'ae' HalfAdvance (XH / 2) [DivFrame para.advanceScaleMM 3] + CreateTurnedLetter 'turnoe' 0x1D14 'oe' HalfAdvance (XH / 2) [DivFrame para.advanceScaleMM 3] derive-composites 'turnoeSlashO' 0xAB41 'turnoe' 'rightHalfSlashOverlay' derive-composites 'turnoeBarO' 0xAB42 'turnoe' 'rightHalfBarOverlay' @@ -462,7 +462,7 @@ glyph-block Letter-Latin-Lower-AE-OE : begin glyph-block-export BuildRha define [BuildRha srcs] : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.p local {ra ha} srcs diff --git a/packages/font-glyphs/src/letter/latin-ext/lower-db-qp.ptl b/packages/font-glyphs/src/letter/latin-ext/lower-db-qp.ptl index 0f85c4877..f985e1532 100644 --- a/packages/font-glyphs/src/letter/latin-ext/lower-db-qp.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/lower-db-qp.ptl @@ -28,7 +28,7 @@ glyph-block Letter-Latin-Lower-DB-QP : begin adb -- subDf.smallArchDepthB create-glyph 'db' 0x238 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.b include : DbCenterShape df include : VBar.m df.middle XH Ascender df.mvs @@ -36,7 +36,7 @@ glyph-block Letter-Latin-Lower-DB-QP : begin include : HSerif.lt (df.middle - [HSwToV : 0.5 * df.mvs]) Ascender SideJut create-glyph 'qp' 0x239 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.p include : DbCenterShape df include : FlipAround df.middle (XH / 2) diff --git a/packages/font-glyphs/src/letter/latin-ext/sakha-yat.ptl b/packages/font-glyphs/src/letter/latin-ext/sakha-yat.ptl index a18dbc1cb..48db2ea2b 100644 --- a/packages/font-glyphs/src/letter/latin-ext/sakha-yat.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/sakha-yat.ptl @@ -15,7 +15,7 @@ glyph-block Letter-Latin-Sakha-Yat : begin left -- (df.middle - [HSwToV : 0.5 * df.mvs]) right -- df.rightSB stroke -- df.mvs - jut -- [Math.min Jut : Jut * 0.75 * df.div] + jut -- [Math.min Jut : Jut * 0.75 * df.advs] local fEnoughSpaceForFullSerifs : df.width > 7 * para.refJut if [not fEnoughSpaceForFullSerifs] : eject-contour 'serifYeriLB' @@ -23,7 +23,7 @@ glyph-block Letter-Latin-Sakha-Yat : begin foreach { suffix { Uc Lc } } [Object.entries YeriConfig] : do create-glyph "latn/yatSakha.upright.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e include : SakhaYatShape Lc df XH diff --git a/packages/font-glyphs/src/letter/latin-ext/upper-aa-ao.ptl b/packages/font-glyphs/src/letter/latin-ext/upper-aa-ao.ptl index 32de987ce..abeeeb066 100644 --- a/packages/font-glyphs/src/letter/latin-ext/upper-aa-ao.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/upper-aa-ao.ptl @@ -30,46 +30,46 @@ glyph-block Letter-Latin-Upper-AA-AO : begin define SLAB-RIGHT 4 define ALetters : object - AA { 0xA732 para.diversityMM 'capital' CAP } - smcpAA { null para.diversityM 'e' XH } + AA { 0xA732 para.advanceScaleMM 'capital' CAP } + smcpAA { null para.advanceScaleM 'e' XH } - foreach { prefix { code div mk height } } [Object.entries ALetters] : do + foreach { prefix { code advs mk height } } [Object.entries ALetters] : do foreach { suffix { bodyShape slabKind } } [Object.entries AConfig] : do define skLeft : maskOffBits slabKind SLAB-RIGHT define skRight : maskOffBits slabKind SLAB-LEFT create-glyph "\(prefix)/Left.\(suffix)" : glyph-proc - define df : include : DivFrame div 3.5 + define df : include : DivFrame advs 3.5 include : df.markSet.(mk) set-base-anchor 'cvDecompose' 0 0 include : AHalfShape 0 df height bodyShape skLeft create-glyph "\(prefix)/LeftMask.\(suffix)" : glyph-proc - define df : include : DivFrame div 3.5 + define df : include : DivFrame advs 3.5 include : df.markSet.(mk) set-base-anchor 'cvDecompose' 0 0 include : AHalfShapeMask 0 df height bodyShape skLeft create-glyph "\(prefix)/Right.\(suffix)" : glyph-proc - define df : DivFrame div 3.5 + define df : DivFrame advs 3.5 set-width 0 include : df.markSet.(mk) set-mark-anchor 'cvDecompose' 0 0 0 0 include : AHalfShape 1 df height bodyShape skRight create-glyph "\(prefix)/RightMask.\(suffix)" : glyph-proc - define df : DivFrame div 3.5 + define df : DivFrame advs 3.5 set-width 0 include : df.markSet.(mk) set-mark-anchor 'cvDecompose' 0 0 0 0 include : AHalfShapeMask 1 df height bodyShape skRight create-glyph "\(prefix)/AU/Left.\(suffix)" : glyph-proc - define df : include : DivFrame div 3.5 + define df : include : DivFrame advs 3.5 local { subDf shift } : SubDfAndShift 1 df include : AShape.LetterBottomRightRemoved subDf bodyShape slabKind CAP df.mvs create-glyph "\(prefix)/AU/LeftMask.\(suffix)" : glyph-proc - define df : include : DivFrame div 3.5 + define df : include : DivFrame advs 3.5 local { subDf shift } : SubDfAndShift 1 df include : union MaskAbove : [AShape.BarPos bodyShape slabKind CAP] - df.mvs @@ -84,7 +84,7 @@ glyph-block Letter-Latin-Upper-AA-AO : begin derive-multi-part-glyphs prefix code list "\(prefix)/Left" "\(prefix)/LeftMask" "\(prefix)/Right" "\(prefix)/RightMask" function [srcs gr] : glyph-proc - define df : DivFrame div 3.5 + define df : DivFrame advs 3.5 define topSerifGap : Math.max (0.1 * (df.rightSB - df.leftSB)) : AdviceStroke 6 define { left leftMask right rightMask } srcs @@ -101,7 +101,7 @@ glyph-block Letter-Latin-Upper-AA-AO : begin do "AO" derive-multi-part-glyphs 'AO' 0xA734 {"AA/Left" "AA/LeftMask" "OO/right"} function [srcs gr] : glyph-proc - define df : DivFrame para.diversityMM 3.5 + define df : DivFrame para.advanceScaleMM 3.5 define topSerifGap : Math.max (0.1 * (df.rightSB - df.leftSB)) : AdviceStroke 6 define { left leftMask right } srcs include [refer-glyph left] AS_BASE ALSO_METRICS @@ -111,7 +111,7 @@ glyph-block Letter-Latin-Upper-AA-AO : begin glyph-block-import Letter-Latin-U : CapitalUConfig foreach { suffix { Base {Slabs fLTSlab} } } [Object.entries CapitalUConfig] : do create-glyph "AU/Right.\(suffix)" : glyph-proc - define df : DivFrame para.diversityMM 3.5 + define df : DivFrame para.advanceScaleMM 3.5 local { subDf shift } : SubDfAndShift 1 df include : with-transform [ApparentTranslate shift 0] union [Base subDf CAP df.mvs] [Slabs subDf CAP] @@ -123,7 +123,7 @@ glyph-block Letter-Latin-Upper-AA-AO : begin select-variant 'AA/AU/LeftMask' (follow -- 'A') derive-multi-part-glyphs 'AU' 0xA736 {'AA/AU/Left' 'AA/AU/LeftMask' 'AU/Right'} function [srcs gr] : glyph-proc - define df : include : DivFrame para.diversityMM 3.5 + define df : include : DivFrame para.advanceScaleMM 3.5 local { subDf shift } : SubDfAndShift 1 df include : df.markSet.capital define { left mask right } srcs @@ -142,7 +142,7 @@ glyph-block Letter-Latin-Upper-AA-AO : begin local fSlabBot : slabs && slabs !== PShape.SlabMotion create-glyph "cyrl/Rha/left.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital set-base-anchor 'cvDecompose' 0 0 local subDf : df.sliceFine 3 2 0.575 @@ -163,7 +163,7 @@ glyph-block Letter-Latin-Upper-AA-AO : begin __ : glyph-proc create-glyph "cyrl/Rha/right.\(suffix)" : glyph-proc - local df : DivFrame para.diversityM 3 + local df : DivFrame para.advanceScaleM 3 set-width 0 set-mark-anchor 'cvDecompose' 0 0 include : letterShape df CAP 0 0.1 0.28 diff --git a/packages/font-glyphs/src/letter/latin-ext/upper-ae-oe.ptl b/packages/font-glyphs/src/letter/latin-ext/upper-ae-oe.ptl index 32dcfad51..c621f53d6 100644 --- a/packages/font-glyphs/src/letter/latin-ext/upper-ae-oe.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/upper-ae-oe.ptl @@ -19,10 +19,10 @@ glyph-block Letter-Latin-Upper-AE-OE : begin define SLAB-E-ALL 2 define SLAB-E-CAPPED 3 - define [AESW df top] : Math.min df.mvs : AdviceStroke2 3 3 top df.div + define [AESW df top] : Math.min df.mvs : AdviceStroke2 3 3 top df.advs define [AEAHalfCurly df top eleft sw] : glyph-proc - define fine : AdviceStroke2 3 4 top df.div + define fine : AdviceStroke2 3 4 top df.advs # A half include : dispiro @@ -55,7 +55,7 @@ glyph-block Letter-Latin-Upper-AE-OE : begin define vxStartL : df.leftSB * StraightSbShrink define vxEndL : df.middle - [HSwToV : 0.75 * sw] define dgCor : DiagCor top (df.width / 2) 0 (sw * 2) - define midSW : dgCor * [Math.min [mix sw fine pInktrap] [AdviceStroke 3 df.div]] + define midSW : dgCor * [Math.min [mix sw fine pInktrap] [AdviceStroke 3 df.advs]] include : dispiro widths.rhs (sw * dgCor) @@ -87,7 +87,7 @@ glyph-block Letter-Latin-Upper-AE-OE : begin straight.right.end eleft top [heading Rightward] define [AEAHalfSerifs df top slabKind] : glyph-proc - define sw : Math.min df.mvs : AdviceStroke2 3 3 top df.div + define sw : Math.min df.mvs : AdviceStroke2 3 3 top df.advs define eleft : df.middle - [HSwToV : 0.25 * sw] match slabKind ([Just SLAB-A-BASE] || [Just SLAB-A-TRI]) : begin @@ -141,7 +141,7 @@ glyph-block Letter-Latin-Upper-AE-OE : begin if [not fTailed] : begin create-glyph "cyrl/Yae/left.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital local sw : AESW df CAP local bp : RBarPos CAP fSlabBot @@ -178,24 +178,24 @@ glyph-block Letter-Latin-Upper-AE-OE : begin foreach { suffix { bodyShape slabKind } } [Object.entries AConfig] : do create-glyph "AE/AHalf.\(suffix)" : glyph-proc - define df : include : DivFrame para.diversityMM 3 + define df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital set-base-anchor 'cvDecompose' 0 0 include : AEAHalf df bodyShape CAP slabKind create-glyph "smcpAE/AHalf.\(suffix)" : glyph-proc - define df : include : DivFrame para.diversityM 3 + define df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e set-base-anchor 'cvDecompose' 0 0 include : AEAHalf df bodyShape XH slabKind foreach { suffix { slabKind } } [Object.entries EConfig] : do create-glyph "AE/EHalf.\(suffix)" : glyph-proc - define df : DivFrame para.diversityMM 3 + define df : DivFrame para.advanceScaleMM 3 set-width 0 set-mark-anchor 'cvDecompose' 0 0 include : AEEHalf df CAP slabKind create-glyph "smcpAE/EHalf.\(suffix)" : glyph-proc - define df : DivFrame para.diversityM 3 + define df : DivFrame para.advanceScaleM 3 set-width 0 set-mark-anchor 'cvDecompose' 0 0 include : AEEHalf df XH slabKind @@ -213,7 +213,7 @@ glyph-block Letter-Latin-Upper-AE-OE : begin define [OEShape top df slabKind] : glyph-proc define eBarPos DesignParameters.upperEBarPos - define sw : Math.min df.mvs : AdviceStroke2 3 3 top df.div + define sw : Math.min df.mvs : AdviceStroke2 3 3 top df.advs define eleft : df.middle - [HSwToV : sw * [if SLAB (1 / 3) (1 / 4)]] define swVJut : Math.min sw : (df.rightSB - eleft - [HSwToV sw]) * (4 / 5) @@ -250,11 +250,11 @@ glyph-block Letter-Latin-Upper-AE-OE : begin foreach { suffix { slabKind } } [Object.entries EConfig] : do create-glyph "OE.\(suffix)" : glyph-proc - define df : include : DivFrame para.diversityMM 3 + define df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital include : OEShape CAP df slabKind create-glyph "smcpOE.\(suffix)" : glyph-proc - define df : include : DivFrame para.diversityM 3 + define df : include : DivFrame para.advanceScaleM 3 include : df.markSet.e include : OEShape XH df slabKind diff --git a/packages/font-glyphs/src/letter/latin/c.ptl b/packages/font-glyphs/src/letter/latin/c.ptl index e0a6ee0a9..eaf2a8fcc 100644 --- a/packages/font-glyphs/src/letter/latin/c.ptl +++ b/packages/font-glyphs/src/letter/latin/c.ptl @@ -211,7 +211,7 @@ glyph-block Letter-Latin-C : begin include : Translate 0 (SB / 2) create-glyph "cyrl/esWide.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT 3 + local df : include : DivFrame para.advanceScaleT 3 include : df.markSet.e local desc : (-LongVJut) + QuarterStroke include : ExtendBelowBaseAnchors desc diff --git a/packages/font-glyphs/src/letter/latin/k.ptl b/packages/font-glyphs/src/letter/latin/k.ptl index 1fd1e40f5..ab3ec9ed6 100644 --- a/packages/font-glyphs/src/letter/latin/k.ptl +++ b/packages/font-glyphs/src/letter/latin/k.ptl @@ -450,7 +450,7 @@ glyph-block Letter-Latin-K : begin define [BashkirKaShape df top] : glyph-proc local left : if SLAB [mix df.leftSB df.rightSB 0.35] - [HSwToV : 0.5 * df.mvs] - mix df.leftSB df.rightSB : if (df.div > 1) 0.25 0.2 + mix df.leftSB df.rightSB : if (df.advs > 1) 0.25 0.2 local leftNB : left - [KBalance SLAB straightBar] local xTopBarLeftEnd : mix 0 df.leftSB : if SLAB 0.25 0.375 local sw : AdviceStroke 3 @@ -465,12 +465,12 @@ glyph-block Letter-Latin-K : begin if slabLB : include : UpperKLBSerif top sw left slabLB create-glyph "cyrl/KaBashkir.\(suffix)" : glyph-proc - define df : include : DivFrame para.diversityT + define df : include : DivFrame para.advanceScaleT include : df.markSet.capital include : BashkirKaShape df CAP create-glyph "cyrl/kaBashkir.\(suffix)" : glyph-proc - define df : include : DivFrame para.diversityT + define df : include : DivFrame para.advanceScaleT include : df.markSet.e include : BashkirKaShape df XH diff --git a/packages/font-glyphs/src/letter/latin/lower-a.ptl b/packages/font-glyphs/src/letter/latin/lower-a.ptl index 8ed62f22f..54fdb60a5 100644 --- a/packages/font-glyphs/src/letter/latin/lower-a.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-a.ptl @@ -16,7 +16,7 @@ glyph-block Letter-Latin-Lower-A : begin glyph-block-export DoubleStorey define DoubleStorey : namespace - define [ADoubleStoreyStroke df] : AdviceStroke2 2 3 XH df.div + define [ADoubleStoreyStroke df] : AdviceStroke2 2 3 XH df.advs define [ADoubleStoreySmoothA df] : begin local sw : ADoubleStoreyStroke df return : df.archDepthAOf (ArchDepth * [StrokeWidthBlend 0.9 0.81 sw]) sw diff --git a/packages/font-glyphs/src/letter/latin/lower-d.ptl b/packages/font-glyphs/src/letter/latin/lower-d.ptl index 03004d1d0..e3d74784b 100644 --- a/packages/font-glyphs/src/letter/latin/lower-d.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-d.ptl @@ -124,7 +124,7 @@ glyph-block Letter-Latin-Lower-D : begin include : LeaningAnchor.Above.VBar.r df.rightSB if [not bottomSerif] : create-glyph "cyrl/djeKomi.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.b local dfHalf : df.slice 3 2 diff --git a/packages/font-glyphs/src/letter/latin/lower-e.ptl b/packages/font-glyphs/src/letter/latin/lower-e.ptl index 1585090e4..b82463f0b 100644 --- a/packages/font-glyphs/src/letter/latin/lower-e.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-e.ptl @@ -130,10 +130,10 @@ glyph-block Letter-Latin-Lower-E : begin include : Body subDf top stroke -- stroke barpos -- barpos - ada -- (ada * 0.7 * df.div) - adb -- (adb * 0.7 * df.div) + ada -- (ada * 0.7 * df.advs) + adb -- (adb * 0.7 * df.advs) tailSlab -- tailSlab - define shift : Width * (df.div - divSub) + define shift : Width * (df.advs - divSub) if fDesc : begin local desc : (-LongVJut) + QuarterStroke include : ExtendBelowBaseAnchors desc @@ -236,9 +236,9 @@ glyph-block Letter-Latin-Lower-E : begin include : FlipAround Middle (XH / 2) create-glyph "schwaRhoticHook.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 1 + local df : include : DivFrame para.advanceScaleM 1 include : df.markSet.e - local divSub : Math.min 1 : 0.85 * para.diversityM + local divSub : Math.min 1 : 0.85 * para.advanceScaleM local dfSub : DivFrame divSub 2 local stroke : AdviceStroke2 2 3 XH divSub include : Body dfSub XH @@ -249,9 +249,9 @@ glyph-block Letter-Latin-Lower-E : begin include : RhoticHookShape (dfSub.rightSB - [HSwToV : 1.25 * markFine]) df.width (XH * 0.5) (XH * 0.2) create-glyph "schwaRetroflexHook.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 1 + local df : include : DivFrame para.advanceScaleM 1 include : df.markSet.e - local divSub : Math.min 1 : 0.85 * para.diversityM + local divSub : Math.min 1 : 0.85 * para.advanceScaleM local dfSub : DivFrame divSub 2 local stroke : AdviceStroke2 2 3 XH divSub include : Body dfSub XH @@ -280,7 +280,7 @@ glyph-block Letter-Latin-Lower-E : begin DefineSelectorGlyph "cyrl/Schwa" suffix [DivFrame 1] 'capital' DefineSelectorGlyph "cyrl/schwa" suffix [DivFrame 1] 'e' - define abkCheDf : DivFrame para.diversityM 3 + define abkCheDf : DivFrame para.advanceScaleM 3 DefineSelectorGlyph "cyrl/abk/Che" suffix abkCheDf 'capital' DefineSelectorGlyph "cyrl/abk/che" suffix abkCheDf 'e' diff --git a/packages/font-glyphs/src/letter/latin/lower-f.ptl b/packages/font-glyphs/src/letter/latin/lower-f.ptl index 4dce418ae..5cb00563e 100644 --- a/packages/font-glyphs/src/letter/latin/lower-f.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-f.ptl @@ -24,8 +24,8 @@ glyph-block Letter-Latin-Lower-F : begin set-base-anchor 'palatalHookPos' r 0 define [NarrowBottomSerif df] : glyph-proc - include : HSerif.mb df.middle 0 (LongJut * df.div) - set-base-anchor 'palatalHookPos' (df.middle + LongJut * df.div + HalfStroke * TanSlope) 0 + include : HSerif.mb df.middle 0 (LongJut * df.advs) + set-base-anchor 'palatalHookPos' (df.middle + LongJut * df.advs + HalfStroke * TanSlope) 0 define [StdFShapeT sink df offset barleft sw] : sink widths.lhs sw @@ -134,8 +134,8 @@ glyph-block Letter-Latin-Lower-F : begin define CH-HOOK 3 define CH-DIAGONAL-HOOK 4 - define dfNarrowF : DivFrame para.diversityF - define pNarrowSide : mix 1 para.diversityF 1.5 + define dfNarrowF : DivFrame para.advanceScaleF + define pNarrowSide : mix 1 para.advanceScaleF 1.5 define SmallFConfig : SuffixCfg.weave object # body diff --git a/packages/font-glyphs/src/letter/latin/lower-g.ptl b/packages/font-glyphs/src/letter/latin/lower-g.ptl index 2ae6c43f5..ac0b42a55 100644 --- a/packages/font-glyphs/src/letter/latin/lower-g.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-g.ptl @@ -104,7 +104,7 @@ glyph-block Letter-Latin-Lower-G : begin flat (df.rightSB - hd.x) Descender curl xTerminal Descender export : define [CrossedHook df y0] : begin - local fine : AdviceStroke 3.5 df.div + local fine : AdviceStroke 3.5 df.advs return : dispiro widths.rhs df.mvs flat df.rightSB y0 [heading Downward] @@ -178,10 +178,10 @@ glyph-block Letter-Latin-Lower-G : begin include : hookShape df (CAP - hookStart) create-glyph "gPalatalHook.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 1 + local df : include : DivFrame para.advanceScaleM 1 include : df.markSet.p set-base-anchor 'overlay' Middle (XH / 2) - local dfSub : DivFrame (0.75 * para.diversityM) 2 + local dfSub : DivFrame (0.75 * para.advanceScaleM) 2 include : bodyShape dfSub XH include : hookShape dfSub (XH - hookStart) include : PalatalHook.r diff --git a/packages/font-glyphs/src/letter/latin/lower-il.ptl b/packages/font-glyphs/src/letter/latin/lower-il.ptl index dce165c77..94c640942 100644 --- a/packages/font-glyphs/src/letter/latin/lower-il.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-il.ptl @@ -18,7 +18,7 @@ glyph-block Letter-Latin-Lower-I : begin ########################################################################################### # Implementations - define [TailedDotlessIShift df] : (1 - df.div) * 0.2 + define [TailedDotlessIShift df] : (1 - df.advs) * 0.2 define XMiddle : namespace define [FlatTailedImpl df addTopSerif] : df.middle - [if addTopSerif 0 : IBalance2 df] @@ -51,14 +51,14 @@ glyph-block Letter-Latin-Lower-I : begin export : define [HookyBottom df top xMiddle] : glyph-proc include : VBar.m xMiddle 0 top df.mvs - include : tagged 'serifRB' : HSerif.rb xMiddle 0 (LongJut * df.div) Stroke df.mvs - set-base-anchor 'trailing' (xMiddle + LongJut * df.div) 0 + include : tagged 'serifRB' : HSerif.rb xMiddle 0 (LongJut * df.advs) Stroke df.mvs + set-base-anchor 'trailing' (xMiddle + LongJut * df.advs) 0 export : define [Serifed df top xMiddle] : glyph-proc include : VBar.m xMiddle 0 top df.mvs include : tagged 'serifB' - HSerif.mb df.middle 0 (LongJut * df.div) - set-base-anchor 'trailing' (df.middle + LongJut * df.div) 0 + HSerif.mb df.middle 0 (LongJut * df.advs) + set-base-anchor 'trailing' (df.middle + LongJut * df.advs) 0 export : define [Tailed df top xMiddle] : glyph-proc local fine : AdviceStroke 3 @@ -66,8 +66,8 @@ glyph-block Letter-Latin-Lower-I : begin local left : xMiddle - [HSwToV : 0.5 * df.mvs] local right : mix df.leftSB df.rightSB (1.1 - shift) local rightTerm : Math.max right (left + [HSwToV : df.mvs + 1.1 * fine]) (left + [HSwToV df.mvs] + HookX) - local middle : mix left right (0.55 * df.div) - local hookDepth : Math.max (df.mvs * 0.9) (Hook * [StrokeWidthBlend 0.85 1] * df.div) + local middle : mix left right (0.55 * df.advs) + local hookDepth : Math.max (df.mvs * 0.9) (Hook * [StrokeWidthBlend 0.85 1] * df.advs) include : dispiro widths.lhs df.mvs flat left top [heading Downward] @@ -80,7 +80,7 @@ glyph-block Letter-Latin-Lower-I : begin set-base-anchor 'palatalHookMask' [mix left rightTerm 0.5] (HalfStroke + O) export : define [FlatTailed df top xMiddle] : glyph-proc - local tailLength : LongJut * 1.05 * [mix 1 df.div 0.75] + local tailLength : LongJut * 1.05 * [mix 1 df.advs 0.75] local hd : FlatHookDepth df define xFinal : xMiddle + [Math.max tailLength : hd.x - [HSwToV : 0.5 * df.mvs] + 1] + 0.5 * df.mvs * TanSlope @@ -95,10 +95,10 @@ glyph-block Letter-Latin-Lower-I : begin set-base-anchor 'trailing' xFinal 0 export : define [SemiTailed df top xMiddle] : glyph-proc - local tailLength : LongJut * 1.05 * [mix 1 df.div 0.75] - local hookScaleX : mix 1 df.div 0.5 - local hookScaleY : mix 1 df.div 1.25 - local x0 : mix (0.5 * df.mvs) (0.5 * df.mvs + (Hook - df.mvs + 1) * 0.85 * df.div + [IBalance2 df]) hookScaleX + local tailLength : LongJut * 1.05 * [mix 1 df.advs 0.75] + local hookScaleX : mix 1 df.advs 0.5 + local hookScaleY : mix 1 df.advs 1.25 + local x0 : mix (0.5 * df.mvs) (0.5 * df.mvs + (Hook - df.mvs + 1) * 0.85 * df.advs + [IBalance2 df]) hookScaleX local x1 : mix (0.5 * df.mvs) ([Math.max tailLength : Hook - 0.5 * df.mvs + 1] + [IBalance2 df]) hookScaleX include : dispiro widths.center df.mvs @@ -132,13 +132,13 @@ glyph-block Letter-Latin-Lower-I : begin curl xMiddle Hook arcvh flat (xMiddle + Hook - 0.5 * df.mvs) (0.5 * df.mvs) - curl [Math.max df.rightSB : xMiddle + [Math.max HookX : LongJut * 1.05 * df.div]] (0.5 * df.mvs) [heading Rightward] + curl [Math.max df.rightSB : xMiddle + [Math.max HookX : LongJut * 1.05 * df.advs]] (0.5 * df.mvs) [heading Rightward] define Serifs : namespace - export : define [Hooky df top xMiddle] : HSerif.lt xMiddle top (LongJut * df.div) Stroke df.mvs - export : define [HookyShort df top xMiddle] : HSerif.lt xMiddle top [mix Jut (LongJut * df.div) 0.5] Stroke df.mvs - export : define [Serifed df top xMiddle] : HSerif.lt xMiddle top ((LongJut * df.div) - (xMiddle - df.middle)) Stroke df.mvs - export : define [SerifedShort df top xMiddle] : HSerif.lt xMiddle top [mix Jut ((LongJut * df.div) - (xMiddle - df.middle)) 0.5] Stroke df.mvs + export : define [Hooky df top xMiddle] : HSerif.lt xMiddle top (LongJut * df.advs) Stroke df.mvs + export : define [HookyShort df top xMiddle] : HSerif.lt xMiddle top [mix Jut (LongJut * df.advs) 0.5] Stroke df.mvs + export : define [Serifed df top xMiddle] : HSerif.lt xMiddle top ((LongJut * df.advs) - (xMiddle - df.middle)) Stroke df.mvs + export : define [SerifedShort df top xMiddle] : HSerif.lt xMiddle top [mix Jut ((LongJut * df.advs) - (xMiddle - df.middle)) 0.5] Stroke df.mvs define [calcPhoneticHookPos g] : begin local attach : if g.baseAnchors.trailing @@ -155,35 +155,35 @@ glyph-block Letter-Latin-Lower-I : begin define SmallILConfig : object # Normal - 'serifless' { Body.Serifless null Marks.Serifless XMiddle.Center para.diversityII 0 } - 'hooky' { Body.Serifless Serifs.Hooky Marks.Serifed XMiddle.Hooky para.diversityI 0 } - 'hookyBottom' { Body.HookyBottom null Marks.Serifless XMiddle.HookyBottom para.diversityI Stroke } - 'zshaped' { Body.HookyBottom Serifs.Hooky Marks.Serifed XMiddle.Center para.diversityI Stroke } - 'zshapedAsymmetric' { Body.HookyBottom Serifs.HookyShort Marks.Serifed XMiddle.Center para.diversityI Stroke } - 'serifed' { Body.Serifed Serifs.Serifed Marks.Serifed XMiddle.Serifed para.diversityI Stroke } - 'serifedAsymmetric' { Body.Serifed Serifs.SerifedShort Marks.Serifed XMiddle.Serifed para.diversityI Stroke } - 'tailed' { Body.Tailed null Marks.Serifless XMiddle.Tailed para.diversityI Stroke } - 'tailedSerifed' { Body.Tailed Serifs.Hooky Marks.Serifed XMiddle.TailedSerifed para.diversityI Stroke } - 'flatTailed' { Body.FlatTailed null Marks.Serifless XMiddle.FlatTailed para.diversityI Stroke } - 'serifedFlatTailed' { Body.FlatTailed Serifs.Hooky Marks.Serifed XMiddle.SerifedFlatTailed para.diversityI Stroke } - 'diagonalTailed' { Body.DiagTailed null Marks.Serifless XMiddle.FlatTailed para.diversityI Stroke } - 'serifedDiagonalTailed' { Body.DiagTailed Serifs.Hooky Marks.Serifed XMiddle.SerifedFlatTailed para.diversityI Stroke } - 'semiTailed' { Body.SemiTailed null Marks.Serifless XMiddle.FlatTailed para.diversityI Stroke } - 'serifedSemiTailed' { Body.SemiTailed Serifs.Hooky Marks.Serifed XMiddle.SerifedFlatTailed para.diversityI Stroke } + 'serifless' { Body.Serifless null Marks.Serifless XMiddle.Center para.advanceScaleII 0 } + 'hooky' { Body.Serifless Serifs.Hooky Marks.Serifed XMiddle.Hooky para.advanceScaleI 0 } + 'hookyBottom' { Body.HookyBottom null Marks.Serifless XMiddle.HookyBottom para.advanceScaleI Stroke } + 'zshaped' { Body.HookyBottom Serifs.Hooky Marks.Serifed XMiddle.Center para.advanceScaleI Stroke } + 'zshapedAsymmetric' { Body.HookyBottom Serifs.HookyShort Marks.Serifed XMiddle.Center para.advanceScaleI Stroke } + 'serifed' { Body.Serifed Serifs.Serifed Marks.Serifed XMiddle.Serifed para.advanceScaleI Stroke } + 'serifedAsymmetric' { Body.Serifed Serifs.SerifedShort Marks.Serifed XMiddle.Serifed para.advanceScaleI Stroke } + 'tailed' { Body.Tailed null Marks.Serifless XMiddle.Tailed para.advanceScaleI Stroke } + 'tailedSerifed' { Body.Tailed Serifs.Hooky Marks.Serifed XMiddle.TailedSerifed para.advanceScaleI Stroke } + 'flatTailed' { Body.FlatTailed null Marks.Serifless XMiddle.FlatTailed para.advanceScaleI Stroke } + 'serifedFlatTailed' { Body.FlatTailed Serifs.Hooky Marks.Serifed XMiddle.SerifedFlatTailed para.advanceScaleI Stroke } + 'diagonalTailed' { Body.DiagTailed null Marks.Serifless XMiddle.FlatTailed para.advanceScaleI Stroke } + 'serifedDiagonalTailed' { Body.DiagTailed Serifs.Hooky Marks.Serifed XMiddle.SerifedFlatTailed para.advanceScaleI Stroke } + 'semiTailed' { Body.SemiTailed null Marks.Serifless XMiddle.FlatTailed para.advanceScaleI Stroke } + 'serifedSemiTailed' { Body.SemiTailed Serifs.Hooky Marks.Serifed XMiddle.SerifedFlatTailed para.advanceScaleI Stroke } # Decompressed - 'hookyDec' { Body.Serifless Serifs.Hooky Marks.Serifed XMiddle.Hooky para.diversityI 0 } - 'seriflessDec' { Body.Serifless null Marks.Serifless XMiddle.Center para.diversityI 0 } - 'tailedDec' { Body.Tailed null Marks.Serifless XMiddle.Tailed para.diversityI Stroke } - 'flatTailedDec' { Body.FlatTailed null Marks.Serifless XMiddle.FlatTailed para.diversityI Stroke } - 'diagonalTailedDec' { Body.DiagTailed null Marks.Serifless XMiddle.FlatTailed para.diversityI Stroke } - 'semiTailedDec' { Body.SemiTailed null Marks.Serifless XMiddle.FlatTailed para.diversityI Stroke } - 'hookyBottomDec' { Body.HookyBottom null Marks.Serifless XMiddle.HookyBottom para.diversityI Stroke } + 'hookyDec' { Body.Serifless Serifs.Hooky Marks.Serifed XMiddle.Hooky para.advanceScaleI 0 } + 'seriflessDec' { Body.Serifless null Marks.Serifless XMiddle.Center para.advanceScaleI 0 } + 'tailedDec' { Body.Tailed null Marks.Serifless XMiddle.Tailed para.advanceScaleI Stroke } + 'flatTailedDec' { Body.FlatTailed null Marks.Serifless XMiddle.FlatTailed para.advanceScaleI Stroke } + 'diagonalTailedDec' { Body.DiagTailed null Marks.Serifless XMiddle.FlatTailed para.advanceScaleI Stroke } + 'semiTailedDec' { Body.SemiTailed null Marks.Serifless XMiddle.FlatTailed para.advanceScaleI Stroke } + 'hookyBottomDec' { Body.HookyBottom null Marks.Serifless XMiddle.HookyBottom para.advanceScaleI Stroke } # R Tail - 'hookyRTail' { Body.Serifless Serifs.Hooky Marks.Serifed XMiddle.Center para.diversityI 0 } - 'seriflessRTail' { Body.Serifless null Marks.Serifless XMiddle.HookyBottom para.diversityI 0 } + 'hookyRTail' { Body.Serifless Serifs.Hooky Marks.Serifed XMiddle.Center para.advanceScaleI 0 } + 'seriflessRTail' { Body.Serifless null Marks.Serifless XMiddle.HookyBottom para.advanceScaleI 0 } # R Tail + Decompress - 'hookyRTailDec' { Body.Serifless Serifs.Hooky Marks.Serifed XMiddle.Center para.diversityI 0 } - 'seriflessRTailDec' { Body.Serifless null Marks.Serifless XMiddle.HookyBottom para.diversityI 0 } + 'hookyRTailDec' { Body.Serifless Serifs.Hooky Marks.Serifed XMiddle.Center para.advanceScaleI 0 } + 'seriflessRTailDec' { Body.Serifless null Marks.Serifless XMiddle.HookyBottom para.advanceScaleI 0 } # 'hookyPL' { Body.PhoneticLeft Serifs.Hooky Marks.Serifed XMiddle.PhoneticLeft 1 0 } 'seriflessPL' { Body.PhoneticLeft null Marks.Serifless XMiddle.PhoneticLeft 1 0 } @@ -195,11 +195,11 @@ glyph-block Letter-Latin-Lower-I : begin 'tau/semiTailed' { Body.SemiTailed null Marks.Serifless XMiddle.FlatTailed 1 Stroke } 'tau/shortTailed' { Body.ShortTailed null Marks.Serifless XMiddle.Center 1 Stroke } - do : foreach { suffix { Body Serif Marks xMiddleTMono div y0R } } [Object.entries SmallILConfig] : begin + do : foreach { suffix { Body Serif Marks xMiddleTMono advs y0R } } [Object.entries SmallILConfig] : begin define xMiddleT : if para.isQuasiProportional XMiddle.Center xMiddleTMono create-glyph "dotlessi.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : df.markSet.e local xMiddle : xMiddleT df include : Body df XH xMiddle @@ -207,7 +207,7 @@ glyph-block Letter-Latin-Lower-I : begin if Serif : include : tagged 'serifLT' : Serif df XH xMiddle create-glyph "latn/Iota.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : df.markSet.capital local xMiddle : xMiddleT df include : Body df CAP xMiddle @@ -215,7 +215,7 @@ glyph-block Letter-Latin-Lower-I : begin if Serif : include : tagged 'serifLT' : Serif df CAP xMiddle create-glyph "l.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : df.markSet.b local xMiddle : xMiddleT df include : Body df Ascender xMiddle @@ -223,13 +223,13 @@ glyph-block Letter-Latin-Lower-I : begin if Serif : include : tagged 'serifLT' : Serif df Ascender xMiddle create-glyph "lDotBase.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include [refer-glyph "l.\(suffix)"] AS_BASE include : Translate (-DotRadius / 2) 0 set-base-anchor 'cvDecompose' [Math.max (df.middle + HalfStroke + DotRadius) (df.rightSB - DotRadius)] [mix y0R Ascender 0.5] create-glyph "lRTail.\(suffix)" : glyph-proc - local df : DivFrame div + local df : DivFrame advs include [refer-glyph "l.\(suffix)"] AS_BASE ALSO_METRICS include : RetroflexHook.mExt [xMiddleT df] 0 @@ -266,12 +266,12 @@ glyph-block Letter-Latin-Lower-I : begin maskOut -- [MaskAbove maskY] create-glyph "lHighBar.\(suffix)" : glyph-proc - local df : DivFrame div + local df : DivFrame advs include [refer-glyph "l.\(suffix)"] AS_BASE ALSO_METRICS include : LetterBarOverlay.m.in [xMiddleT df] XH (Ascender - [if Serif Stroke 0]) create-glyph "grek/tau.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : df.markSet.e local xMiddle : xMiddleT df include : Body df XH xMiddle @@ -280,14 +280,14 @@ glyph-block Letter-Latin-Lower-I : begin currentGlyph.deleteBaseAnchor 'trailing' create-glyph "cyrl/Twe/middle.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : Body df CAP [XMiddle.Center df] include : Marks df CAP [XMiddle.Center df] currentGlyph.deleteBaseAnchor 'trailing' set-mark-anchor 'cvDecompose' (df.width / 2) CAP create-glyph "cyrl/twe/middle.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : Body df XH [XMiddle.Center df] include : Marks df XH [XMiddle.Center df] currentGlyph.deleteBaseAnchor 'trailing' @@ -384,19 +384,19 @@ glyph-block Letter-Latin-Lower-I : begin CurlyTail.n fine 0 (m + LongJut) SB 0 create-glyph 'lCurlyTail.serifless' : glyph-proc - local df : include : DivFrame para.diversityI + local df : include : DivFrame para.advanceScaleI include : df.markSet.b include : CurlyTailShape df false create-glyph 'lCurlyTail.hooky' : glyph-proc - local df : include : DivFrame para.diversityI + local df : include : DivFrame para.advanceScaleI include : df.markSet.b include : CurlyTailShape df true select-variant 'lCurlyTail' 0x234 create-glyph 'looprevesh' 0x1AA : glyph-proc - local df : include : DivFrame para.diversityI + local df : include : DivFrame para.advanceScaleI include : df.markSet.bp local fine : AdviceStroke 4 include : dispiro diff --git a/packages/font-glyphs/src/letter/latin/lower-j.ptl b/packages/font-glyphs/src/letter/latin/lower-j.ptl index db72990f1..69811efda 100644 --- a/packages/font-glyphs/src/letter/latin/lower-j.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-j.ptl @@ -22,7 +22,7 @@ glyph-block Letter-Latin-Lower-J : begin bar - hd.x - [Math.max (Stroke / 3) (df.width / 6)] crossLeft - OX * 2 - if serif : include : HSerif.lt barCenter top (LongJut * df.div) + if serif : include : HSerif.lt barCenter top (LongJut * df.advs) include : dispiro widths.lhs flat terminal Descender @@ -38,8 +38,8 @@ glyph-block Letter-Latin-Lower-J : begin export : define [StraightSerifless df] : begin df.middle export : define [StraightSerifed df] : df.middle + [IBalance2 df] export : define [BentHook df] : df.middle + JBalance - export : define [FlatHookSerifless df] : df.middle + 0.25 * JBalance * df.div * [mix 1 df.div 2] - export : define [FlatHookSerifed df] : df.middle + JBalance * df.div + export : define [FlatHookSerifless df] : df.middle + 0.25 * JBalance * df.advs * [mix 1 df.advs 2] + export : define [FlatHookSerifed df] : df.middle + JBalance * df.advs define Body : namespace export : define [BentHook df top xMiddle] : glyph-proc @@ -58,15 +58,15 @@ glyph-block Letter-Latin-Lower-J : begin set-base-anchor "trailing" (xMiddle + [HSwToV HalfStroke]) Descender export : define [FlatHook df top xMiddle] : glyph-proc - local dfHook : DivFrame para.diversityI - local crossLeft : df.middle - (dfHook.middle - [mix 0 dfHook.leftSB : mix 1 dfHook.div 2]) + local dfHook : DivFrame para.advanceScaleI + local crossLeft : df.middle - (dfHook.middle - [mix 0 dfHook.leftSB : mix 1 dfHook.advs 2]) include : FlatHookDotlessJShape df dfHook top crossLeft -- crossLeft barCenter -- xMiddle serif -- false export : define [DiagonalTailed df top xMiddle] : glyph-proc - local dfHook : DivFrame para.diversityI + local dfHook : DivFrame para.advanceScaleI include : dispiro widths.center flat xMiddle top [heading Downward] @@ -75,7 +75,7 @@ glyph-block Letter-Latin-Lower-J : begin define Serifs : namespace export : define [None df top xMiddle] : no-shape - export : define [Long df top xMiddle] : HSerif.lt xMiddle top (LongJut * df.div) + export : define [Long df top xMiddle] : HSerif.lt xMiddle top (LongJut * df.advs) export : define [Short df top xMiddle] : HSerif.lt xMiddle top Jut define Marks : namespace @@ -89,10 +89,10 @@ glyph-block Letter-Latin-Lower-J : begin define Div : namespace export : define BentHook 1 - export : define StraightSerifless para.diversityII - export : define StraightSerifed para.diversityI - export : define FlatHookSerifless para.diversityII - export : define FlatHookSerifed para.diversityI + export : define StraightSerifless para.advanceScaleII + export : define StraightSerifed para.advanceScaleI + export : define FlatHookSerifless para.advanceScaleII + export : define FlatHookSerifed para.advanceScaleI define JConfig : object 'bentHookSerifless' { "BentHook" Serifs.None XMiddle.BentHook Marks.Serifless Div.BentHook } @@ -108,8 +108,8 @@ glyph-block Letter-Latin-Lower-J : begin 'diagonalTailedSerifed' { "DiagonalTailed" Serifs.Long XMiddle.FlatHookSerifed Marks.Serifed Div.FlatHookSerifed } 'diagonalTailedShortSerifed' { "DiagonalTailed" Serifs.Short XMiddle.FlatHookSerifed Marks.Serifed Div.FlatHookSerifed } - foreach { suffix { shapeId Serif xMiddleT Marks div } } [Object.entries JConfig] : do - local df : DivFrame div + foreach { suffix { shapeId Serif xMiddleT Marks advs } } [Object.entries JConfig] : do + local df : DivFrame advs local xMiddle : xMiddleT df create-glyph "dotlessj.\(suffix)" : glyph-proc diff --git a/packages/font-glyphs/src/letter/latin/lower-m.ptl b/packages/font-glyphs/src/letter/latin/lower-m.ptl index 25d3b482f..18b94ca55 100644 --- a/packages/font-glyphs/src/letter/latin/lower-m.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-m.ptl @@ -14,7 +14,7 @@ glyph-block Letter-Latin-Lower-M : begin glyph-block-import Letter-Shared-Shapes : CyrDescender PalatalHook EngHook UpwardHookShape glyph-block-import Letter-Shared-Shapes : SerifFrame - define [SmallMSmooth df] : df.div * (0.5 * SmallArchDepth + 0.375 * Stroke) + define [SmallMSmooth df] : df.advs * (0.5 * SmallArchDepth + 0.375 * Stroke) define [SmallMShoulderSpiro] : with-params [left right top bottom width fine df coBottom] : glyph-proc local fix : TanSlope * [HSwToV Stroke] * width / Stroke local sm : [SmallMSmooth df] + fix / 2 @@ -89,7 +89,7 @@ glyph-block Letter-Latin-Lower-M : begin local sf : SerifFrame.fromDf df top rbot return sf.rb.outer - define [dfM] : DivFrame para.diversityMM 3 + define [dfM] : DivFrame para.advanceScaleMM 3 glyph-block-export MEnoughSpaceForFullSerifs define [MEnoughSpaceForFullSerifs _df _mid] : begin @@ -262,10 +262,10 @@ glyph-block Letter-Latin-Lower-M : begin include : EngHook df.rightSB 0 Descender (sw -- df.mvs) create-glyph "mCrossedTail.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3.25 + local df : include : DivFrame para.advanceScaleMM 3.25 include : df.markSet.e - local fine : AdviceStroke 4.5 df.div + local fine : AdviceStroke 4.5 df.advs local rinner : XH * 0.15 - fine * 0.75 local gap : (df.rightSB - df.leftSB - 3 * [HSwToV df.mvs] - [HSwToV fine]) / 3 local m1 : df.rightSB - [HSwToV df.mvs] @@ -282,7 +282,7 @@ glyph-block Letter-Latin-Lower-M : begin if (Body === SmallMArches && !shortLeg) : begin if (!tailed) : begin create-glyph "cyrl/tjeKomi.italic.\(suffix)" : glyph-proc - local df : include : DivFrame [mix 1 para.diversityMM 2] 4 + local df : include : DivFrame [mix 1 para.advanceScaleMM 2] 4 include : df.markSet.e local subDf : df.slice 4 3 0 include : Body subDf XH 0 0 (XH / 2) @@ -291,8 +291,8 @@ glyph-block Letter-Latin-Lower-M : begin right -- df.rightSB ybegin -- (XH / 2) yend -- (XH / 2) - ada -- (SmallArchDepthA * 0.6 * df.div) - adb -- (SmallArchDepthB * 0.6 * df.div) + ada -- (SmallArchDepthA * 0.6 * df.advs) + adb -- (SmallArchDepthB * 0.6 * df.advs) sw -- subDf.mvs include : Serifs subDf XH 0 0 (XH / 2) true false if SLAB : begin @@ -300,7 +300,7 @@ glyph-block Letter-Latin-Lower-M : begin include sf2.rt.full create-glyph "cyrl/tje.italic/base/corner.\(suffix)" : glyph-proc - local df : include : DivFrame [mix 1 para.diversityMM 2] 4 + local df : include : DivFrame [mix 1 para.advanceScaleMM 2] 4 include : df.markSet.e local subDf : df.slice 4 3 0 include : Body subDf XH 0 0 (XH - SmallArchDepthB - TINY) @@ -311,7 +311,7 @@ glyph-block Letter-Latin-Lower-M : begin eject-contour 'serifRB' create-glyph "cyrl/teMidHook.italic.\(suffix)" : glyph-proc - local df : include : DivFrame [mix 1 para.diversityMM 2] 4 + local df : include : DivFrame [mix 1 para.advanceScaleMM 2] 4 include : df.markSet.e local subDf : df.slice 4 3 0 include : mShapeBody subDf XH @@ -403,7 +403,7 @@ glyph-block Letter-Latin-Lower-M : begin include : LeaningAnchor.Below.VBar.r df.rightSB create-glyph "turnmSideways.\(suffix)" : glyph-proc - local realHeight : XH * para.diversityMM + local realHeight : XH * para.advanceScaleMM local realTop : XH / 2 + realHeight / 2 local realBot : XH / 2 - realHeight / 2 local df : DivFrame (realHeight / Width) 3 (XH * 0.1 / SB) diff --git a/packages/font-glyphs/src/letter/latin/lower-n.ptl b/packages/font-glyphs/src/letter/latin/lower-n.ptl index de88c9602..28704b3b3 100644 --- a/packages/font-glyphs/src/letter/latin/lower-n.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-n.ptl @@ -230,9 +230,9 @@ glyph-block Letter-Latin-Lower-N : begin if sLB : include : sLB [DivFrame 1] 0 if (!tailed) : create-glyph "engPalatalHook.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 1 + local df : include : DivFrame para.advanceScaleM 1 include : df.markSet.p - local dfSub : DivFrame (0.75 * para.diversityM) 2 + local dfSub : DivFrame (0.75 * para.advanceScaleM) 2 include : Body XH dfSub.leftSB dfSub.rightSB 0 dfSub.mvs include : EngHook dfSub.rightSB 0 Descender (sw -- dfSub.mvs) if sLT : include : sLT dfSub XH @@ -261,7 +261,7 @@ glyph-block Letter-Latin-Lower-N : begin if sLT : include : sLT [DivFrame 1] XH create-glyph "cyrl/peMidHook.italic.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.p local dfHalf : df.slice 3 2 @@ -274,7 +274,7 @@ glyph-block Letter-Latin-Lower-N : begin include : MidHook.m df XH if (!tailed) : create-glyph "cyrl/yat.italic/base.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e local dfSub : df.slice 3 2 diff --git a/packages/font-glyphs/src/letter/latin/lower-r.ptl b/packages/font-glyphs/src/letter/latin/lower-r.ptl index 2e778b843..1c7fd8a00 100644 --- a/packages/font-glyphs/src/letter/latin/lower-r.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-r.ptl @@ -14,7 +14,7 @@ glyph-block Letter-Latin-Lower-R : begin glyph-block-import Letter-Blackboard : BBS BBD BBBarRight local dfN : DivFrame 1 - local dfR : DivFrame para.diversityF + local dfR : DivFrame para.advanceScaleF # Modes local rStraight 0 @@ -32,8 +32,8 @@ glyph-block Letter-Latin-Lower-R : begin local { rBalanceMultiplier rHookMultiplier rHookSwMultiplier rSerifLeftExtender hookSuperness } : match mode [Just rStraight] { 1 1 0 0 2.35 } [Just rSerifed] { (4 / 3) (2 / 3) (1 / 4) (1 / 3) 2.35 } - [Just rNarrow] { (2 * (df.div - 0.5)) 1 0 0 2.35 } - [Just rNarrowSerifed] { (2 * (df.div - 0.5)) 1 0 0 2.35 } + [Just rNarrow] { (2 * (df.advs - 0.5)) 1 0 0 2.35 } + [Just rNarrowSerifed] { (2 * (df.advs - 0.5)) 1 0 0 2.35 } [Just rCornerHooked] { (5 / 8) 1 0 0 2.35 } [Just rCornerHookedSerifed] { (4 / 3) (2 / 3) (1 / 4) (1 / 3) 2.35 } [Just rEarless] { 1 1 0 0 2.35 } @@ -57,7 +57,7 @@ glyph-block Letter-Latin-Lower-R : begin export : local xArchMiddle : match mode [Just rStraight] : mix (xBar - fine) rHookX (0.54 + 2 * TanSlope * strokeBar / Width) [Just rSerifed] : mix (xBar - fine) rHookX (0.59 + 2 * TanSlope * strokeBar / Width) - ([Just rNarrow] || [Just rNarrowSerifed]) : mix df.width rHookX : Math.max 1.01 (5 / 4 * [mix 1 dfR.div 2]) + ([Just rNarrow] || [Just rNarrowSerifed]) : mix df.width rHookX : Math.max 1.01 (5 / 4 * [mix 1 dfR.advs 2]) ([Just rCornerHooked] || [Just rCornerHookedSerifed]) : rHookX - [HSwToV : 0.5 * strokeBar] [Just rEarless] : mix (xBar - [HSwToV strokeBar]) rHookX 0.5 local mixpin : match mode @@ -68,7 +68,7 @@ glyph-block Letter-Latin-Lower-R : begin export : local skew : Math.max 0 : (xArchMiddle - rmiddlein) / stroke - TanSlope export : local rHookY : RHook * rHookMultiplier + stroke * rHookSwMultiplier export : local rHookXN : match mode - [Just rNarrowSerifed] : mix df.width rHookX df.div + [Just rNarrowSerifed] : mix df.width rHookX df.advs [Just rNarrow] : xArchMiddle + TINY __ rHookX diff --git a/packages/font-glyphs/src/letter/latin/lower-t.ptl b/packages/font-glyphs/src/letter/latin/lower-t.ptl index a042f6bd0..edaca66dd 100644 --- a/packages/font-glyphs/src/letter/latin/lower-t.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-t.ptl @@ -20,9 +20,9 @@ glyph-block Letter-Latin-Lower-T : begin define SYM-PR-LEFT 2 define SYM-PR-BALANCED 3 - define dfNarrowT : DivFrame para.diversityF - define [xSmallTBarLeftT df] : df.middle - (df.div ** 2) * TBalance - [HSwToV HalfStroke] - define [xSmallTCrossRefT df] : [xSmallTBarLeftT df] + df.div * TBalance2 + [HSwToV HalfStroke] + define dfNarrowT : DivFrame para.advanceScaleF + define [xSmallTBarLeftT df] : df.middle - (df.advs ** 2) * TBalance - [HSwToV HalfStroke] + define [xSmallTCrossRefT df] : [xSmallTBarLeftT df] + df.advs * TBalance2 + [HSwToV HalfStroke] define yCrossBar XH define yShortNeck1 : Math.max [mix XH Ascender 0.5] ([mix XH Ascender 0.875] - Stroke * 0.125) @@ -35,8 +35,8 @@ glyph-block Letter-Latin-Lower-T : begin ([Just SYM-PR-LEFT] || [Just SYM-PR-BALANCED]) : df.middle - [HSwToV HalfStroke] define [xCrossBarPos df sym] : match sym - ([Just SYM-LEFT] || [Just SYM-PR-LEFT]) {([BarLeftPos df sym] + TanSlope * Stroke) ([xSmallTCrossRefT df] + LongJut * [Math.sqrt df.div])} - __ {([xSmallTCrossRefT df] - LongJut * [Math.sqrt df.div]) ([xSmallTCrossRefT df] + LongJut * [Math.sqrt df.div])} + ([Just SYM-LEFT] || [Just SYM-PR-LEFT]) {([BarLeftPos df sym] + TanSlope * Stroke) ([xSmallTCrossRefT df] + LongJut * [Math.sqrt df.advs])} + __ {([xSmallTCrossRefT df] - LongJut * [Math.sqrt df.advs]) ([xSmallTCrossRefT df] + LongJut * [Math.sqrt df.advs])} define [XHookTerminal df sym] : match sym [Just SYM-LEFT] df.rightSB @@ -81,7 +81,7 @@ glyph-block Letter-Latin-Lower-T : begin define DiagonalTailed : namespace define [HookShape df sym top bot sw] : begin local xMid : [BarLeftPos df sym] + [HSwToV HalfStroke] - local hookDepth : [if (sym === SYM-LEFT) 1.375 1] * [DiagTail.StdDepth [DivFrame : Math.sqrt df.div] sw] - [HSwToV HalfStroke] + local hookDepth : [if (sym === SYM-LEFT) 1.375 1] * [DiagTail.StdDepth [DivFrame : Math.sqrt df.advs] sw] - [HSwToV HalfStroke] return : dispiro flat xMid top [widths.center.heading sw Downward] DiagTail.R xMid bot hookDepth sw @@ -107,12 +107,12 @@ glyph-block Letter-Latin-Lower-T : begin define Flat : namespace export : define [xCrossBarPos df sym] : match sym - ([Just SYM-LEFT] || [Just SYM-PR-LEFT]) {([BarLeftPos df sym] + TanSlope * Stroke) [mix df.width df.rightSB : mix 1 df.div 2]} - __ {[mix 0 df.leftSB [mix 1 df.div 2]] [mix df.width df.rightSB : mix 1 df.div 2]} + ([Just SYM-LEFT] || [Just SYM-PR-LEFT]) {([BarLeftPos df sym] + TanSlope * Stroke) [mix df.width df.rightSB : mix 1 df.advs 2]} + __ {[mix 0 df.leftSB [mix 1 df.advs 2]] [mix df.width df.rightSB : mix 1 df.advs 2]} - define [CrossLeft df] : mix 0 df.leftSB [mix 1 df.div 2] - define [CrossRight df] : mix df.width df.rightSB [mix 1 df.div 2] + define [CrossLeft df] : mix 0 df.leftSB [mix 1 df.advs 2] + define [CrossRight df] : mix df.width df.rightSB [mix 1 df.advs 2] define NORMAL 0 define RETROFLEX 1 @@ -179,8 +179,8 @@ glyph-block Letter-Latin-Lower-T : begin __ : df.middle - [HSwToV HalfStroke] define [xCrossBarPos df sym] : match sym - ([Just SYM-LEFT] || [Just SYM-PR-LEFT]) {([BarLeftPos df sym] + TanSlope * Stroke) (df.middle + LongJut * [Math.sqrt df.div])} - __ {(df.middle - LongJut * [Math.sqrt df.div]) (df.middle + LongJut * [Math.sqrt df.div])} + ([Just SYM-LEFT] || [Just SYM-PR-LEFT]) {([BarLeftPos df sym] + TanSlope * Stroke) (df.middle + LongJut * [Math.sqrt df.advs])} + __ {(df.middle - LongJut * [Math.sqrt df.advs]) (df.middle + LongJut * [Math.sqrt df.advs])} export : define [Body df sym top bot] : glyph-proc local xLeft : BarLeftPos df sym diff --git a/packages/font-glyphs/src/letter/latin/o.ptl b/packages/font-glyphs/src/letter/latin/o.ptl index d566e4974..fcfa052bc 100644 --- a/packages/font-glyphs/src/letter/latin/o.ptl +++ b/packages/font-glyphs/src/letter/latin/o.ptl @@ -38,17 +38,17 @@ glyph-block Letter-Latin-O : begin alias 'cyrl/o' 0x43E 'o' create-glyph 'cyrl/Uk/O' : glyph-proc - local df : include : DivFrame para.diversityF 2 + local df : include : DivFrame para.advanceScaleF 2 include : df.markSet.capital include : OShape CAP 0 df.leftSB df.rightSB df.mvs df.archDepthA df.archDepthB create-glyph 'cyrl/uk/o' : glyph-proc - local df : include : DivFrame para.diversityF 2 + local df : include : DivFrame para.advanceScaleF 2 include : df.markSet.e include : OShape XH 0 df.leftSB df.rightSB df.mvs df.smallArchDepthA df.smallArchDepthB create-glyph 'cyrl/oNarrow' 0x1C82 : glyph-proc - local df : include : DivFrame para.diversityF 2 + local df : include : DivFrame para.advanceScaleF 2 include : df.markSet.e local subDf : DivFrame (5 / 6) 2 include : with-transform [ApparentTranslate (0.5 * (df.width - subDf.width)) 0] @@ -56,7 +56,7 @@ glyph-block Letter-Latin-O : begin define rBroadOn : DotRadius * [StrokeWidthBlend 1.625 1] create-glyph 'cyrl/BroadOn' 0x47A : glyph-proc - define df : include : DivFrame para.diversityT 3 + define df : include : DivFrame para.advanceScaleT 3 include : df.markSet.capital local dist : df.rightSB - df.leftSB local gap : Math.min @@ -67,7 +67,7 @@ glyph-block Letter-Latin-O : begin include : DotAt df.middle (CAP - df.mvs / 2 - O) rBroadOn create-glyph 'cyrl/broadOn' 0x47B : glyph-proc - define df : include : DivFrame para.diversityT 3 + define df : include : DivFrame para.advanceScaleT 3 include : df.markSet.e local dist : df.rightSB - df.leftSB local gap : Math.min @@ -176,45 +176,45 @@ glyph-block Letter-Latin-O : begin VBar.m Middle O (XH - O) [Math.min stroke : VSwToH : (RightSB - SB) / 2 - [HSwToV stroke]] create-glyph 'romanThousandCD' 0x2180 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital local dist : df.rightSB - df.leftSB local gap : Math.max (dist / 4) : HSwToV df.mvs - local ada : ArchDepthA * df.div - local adb : ArchDepthB * df.div + local ada : ArchDepthA * df.advs + local adb : ArchDepthB * df.advs include : OShapeFlatTB CAP 0 df.leftSB df.rightSB df.mvs ada adb gap include : VBar.m df.middle (df.mvs / 2) (CAP - df.mvs / 2) df.mvs set-base-anchor 'trailing' Middle 0 create-glyph 'romanTenThousand' 0x2182 : glyph-proc - local df : include : DivFrame para.diversityMM 5 + local df : include : DivFrame para.advanceScaleMM 5 include : df.markSet.capital local dist : df.rightSB - df.leftSB local gap : Math.max (dist / 4) : HSwToV df.mvs local gapInner : Math.max (dist / 8) : HSwToV df.mvs - local ada : ArchDepthA * df.div - local adb : ArchDepthB * df.div + local ada : ArchDepthA * df.advs + local adb : ArchDepthB * df.advs local innerDist : dist - [HSwToV : 5 * df.mvs] local arcXL : df.leftSB + innerDist * (1 / 4) + [HSwToV : 1 * df.mvs] local arcXR : df.leftSB + innerDist * (3 / 4) + [HSwToV : 4 * df.mvs] local heightGap : Math.min (df.mvs + (CAP - df.mvs * 4) / 5) (innerDist / 4 + df.mvs) local heightInner : CAP - 2 * heightGap local smInner : clamp (df.mvs * 1.5) (heightInner / 2 - TINY) (ArchDepth * heightInner / CAP) - local adaInner : [ArchDepthAOf smInner : arcXR - arcXL + df.leftSB * 2] * df.div - local adbInner : [ArchDepthBOf smInner : arcXR - arcXL + df.leftSB * 2] * df.div + local adaInner : [ArchDepthAOf smInner : arcXR - arcXL + df.leftSB * 2] * df.advs + local adbInner : [ArchDepthBOf smInner : arcXR - arcXL + df.leftSB * 2] * df.advs include : OShapeFlatTB CAP 0 df.leftSB df.rightSB df.mvs ada adb gap include : OShapeFlatTB (CAP - heightGap) (0 + heightGap) arcXL arcXR df.mvs adaInner adbInner gapInner include : VBar.m df.middle (df.mvs / 2) (CAP - df.mvs / 2) df.mvs create-glyph 'romanHundredThousand' 0x2188 : glyph-proc - local df : include : DivFrame para.diversityMM 7 + local df : include : DivFrame para.advanceScaleMM 7 include : df.markSet.capital local dist : df.rightSB - df.leftSB local gap : Math.max (dist / 4) : HSwToV df.mvs local gapInner1 : Math.max (dist / 6) : HSwToV df.mvs local gapInner2 : Math.max (dist / 12) : HSwToV df.mvs - local ada : ArchDepthA * df.div - local adb : ArchDepthB * df.div + local ada : ArchDepthA * df.advs + local adb : ArchDepthB * df.advs local innerDist : dist - [HSwToV : 7 * df.mvs] local arcXL1 : df.leftSB + innerDist * (1 / 6) + [HSwToV : 1 * df.mvs] local arcXR1 : df.leftSB + innerDist * (5 / 6) + [HSwToV : 6 * df.mvs] @@ -224,11 +224,11 @@ glyph-block Letter-Latin-O : begin local heightInner1 : CAP - 2 * heightGap local heightInner2 : CAP - 4 * heightGap local smInner1 : clamp (df.mvs * 1.5) (heightInner1 / 2 - TINY) (ArchDepth * heightInner1 / CAP) - local adaInner1 : [ArchDepthAOf smInner1 : arcXR1 - arcXL1 + df.leftSB * 2] * df.div - local adbInner1 : [ArchDepthBOf smInner1 : arcXR1 - arcXL1 + df.leftSB * 2] * df.div + local adaInner1 : [ArchDepthAOf smInner1 : arcXR1 - arcXL1 + df.leftSB * 2] * df.advs + local adbInner1 : [ArchDepthBOf smInner1 : arcXR1 - arcXL1 + df.leftSB * 2] * df.advs local smInner2 : clamp (df.mvs * 1.5) (heightInner2 / 2 - TINY) (ArchDepth * heightInner2 / CAP) - local adaInner2 : [ArchDepthAOf smInner2 : arcXR2 - arcXL2 + df.leftSB * 2] * df.div - local adbInner2 : [ArchDepthBOf smInner2 : arcXR2 - arcXL2 + df.leftSB * 2] * df.div + local adaInner2 : [ArchDepthAOf smInner2 : arcXR2 - arcXL2 + df.leftSB * 2] * df.advs + local adbInner2 : [ArchDepthBOf smInner2 : arcXR2 - arcXL2 + df.leftSB * 2] * df.advs include : OShapeFlatTB CAP 0 df.leftSB df.rightSB df.mvs ada adb gap include : OShapeFlatTB (CAP - heightGap) (0 + heightGap) arcXL1 arcXR1 df.mvs adaInner1 adbInner1 gapInner1 include : OShapeFlatTB (CAP - 2 * heightGap) (0 + 2 * heightGap) arcXL2 arcXR2 df.mvs adaInner2 adbInner2 gapInner2 diff --git a/packages/font-glyphs/src/letter/latin/s.ptl b/packages/font-glyphs/src/letter/latin/s.ptl index 68a86327f..c4fa531e3 100644 --- a/packages/font-glyphs/src/letter/latin/s.ptl +++ b/packages/font-glyphs/src/letter/latin/s.ptl @@ -246,7 +246,7 @@ glyph-block Letter-Latin-S : begin create-glyph "s.\(suffix)" : glyph-proc local df : include DfLower include : df.markSet.e - local sw : AdviceStroke2 2 3 XH df.div + local sw : AdviceStroke2 2 3 XH df.advs include : SmallSStrokeImpl df doTS doBS sw EssLower include : SAutoSlabStart df doTS XH sw Hook include : SAutoSlabEnd df doBS 0 sw Hook @@ -313,7 +313,7 @@ glyph-block Letter-Latin-S : begin if [not doBS] : create-glyph "sCurlyTail.\(suffix)" : glyph-proc local df : include DfLower include : df.markSet.e - local sw : AdviceStroke2 2 3 XH df.div + local sw : AdviceStroke2 2 3 XH df.advs include : SmallSStrokeImpl df doTS CURLY-TAIL sw EssLower include : SAutoSlabStart df doTS XH sw Hook @@ -326,10 +326,10 @@ glyph-block Letter-Latin-S : begin include : SAutoSlabEnd df doBS Descender sw Hook create-glyph "cyrl/dzwe.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityF 2 + local df : include : DivFrame para.advanceScaleF 2 include : df.markSet.bp local subDf : DivFrame (5 / 6) 2 - local sw : AdviceStroke2 2 3 (Ascender - Descender) subDf.div + local sw : AdviceStroke2 2 3 (Ascender - Descender) subDf.advs local shift : 0.5 * (df.width - subDf.width) include : with-transform [ApparentTranslate shift 0] SStrokeImpl subDf Ascender Descender doTS doBS sw EssLower diff --git a/packages/font-glyphs/src/letter/latin/u.ptl b/packages/font-glyphs/src/letter/latin/u.ptl index 08990a734..f18fa8d73 100644 --- a/packages/font-glyphs/src/letter/latin/u.ptl +++ b/packages/font-glyphs/src/letter/latin/u.ptl @@ -296,12 +296,12 @@ glyph-block Letter-Latin-U : begin create-glyph "uDieresisSidewaysBase.\(suffix)" : glyph-proc local df : DivFrame (XH / Width) 2 (XH * 0.1 / SB) include : df.markSet.e - local ww : Width * para.diversityT + local ww : Width * para.advanceScaleT set-width ww set-base-anchor 'cvDecompose' 0 0 include : PointingTo ww XH ww 0 : function [] : glyph-proc - include : Base df (ww - SB - 0.75 * para.diversityT * AccentHeight) Stroke - include : Slabs df (ww - SB - 0.75 * para.diversityT * AccentHeight) + include : Base df (ww - SB - 0.75 * para.advanceScaleT * AccentHeight) Stroke + include : Slabs df (ww - SB - 0.75 * para.advanceScaleT * AccentHeight) include : Translate 0 (SB / 2) select-variant 'U' 'U' @@ -385,7 +385,7 @@ glyph-block Letter-Latin-U : begin # Sideways dieresis for U+1D1E derive-glyphs "uDieresisSidewaysMark" null "dieresisAboveAlwaysUpright" : function [gns] : glyph-proc - local ww : Width * para.diversityT + local ww : Width * para.advanceScaleT set-width 0 set-mark-anchor 'cvDecompose' 0 0 include : PointingTo ww XH ww 0 : function [] : glyph-proc diff --git a/packages/font-glyphs/src/letter/latin/upper-h.ptl b/packages/font-glyphs/src/letter/latin/upper-h.ptl index d518604aa..25aeb0b16 100644 --- a/packages/font-glyphs/src/letter/latin/upper-h.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-h.ptl @@ -76,7 +76,7 @@ glyph-block Letter-Latin-Upper-H : begin local sw : AdviceStroke 2.75 local xm : Math.min (Width - df.leftSB) : if SLAB [mix df.leftSB df.rightSB 0.625] + [HSwToV : 0.25 * df.mvs] - mix df.leftSB df.rightSB : if (df.div > 1) (2 / 3) (3 / 4) + mix df.leftSB df.rightSB : if (df.advs > 1) (2 / 3) (3 / 4) local xTopBarRightEnd : mix df.width df.rightSB : if vSlab 0.25 0.375 include : Body df.leftSB xm top sw @@ -95,8 +95,8 @@ glyph-block Letter-Latin-Upper-H : begin right -- df.rightSB ybegin -- top yend -- yend - ada -- (SmallArchDepthA * 0.6 * df.div) - adb -- (SmallArchDepthB * 0.6 * df.div) + ada -- (SmallArchDepthA * 0.6 * df.advs) + adb -- (SmallArchDepthB * 0.6 * df.advs) sw -- df.mvs include : HSerifs slabType top 0 df.leftSB (df.middle + [HSwToV : 0.5 * df.mvs]) df.mvs @@ -148,7 +148,7 @@ glyph-block Letter-Latin-Upper-H : begin include : HSerifs slabType XH 0 SB RightSB create-glyph "leftHalfH.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : df.markSet.capital include : LeftHalfBody df.leftSB df.rightSB CAP include : HSerifs slabType CAP 0 df.leftSB df.rightSB @@ -156,7 +156,7 @@ glyph-block Letter-Latin-Upper-H : begin eject-contour 'serifRB' create-glyph "rightHalfH.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : df.markSet.capital include : RightHalfBody df.leftSB df.rightSB CAP include : HSerifs slabType CAP 0 df.leftSB df.rightSB @@ -164,7 +164,7 @@ glyph-block Letter-Latin-Upper-H : begin eject-contour 'serifLB' create-glyph "leftHalfSmcpH.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : df.markSet.e include : LeftHalfBody df.leftSB df.rightSB XH include : HSerifs slabType XH 0 df.leftSB df.rightSB @@ -172,14 +172,14 @@ glyph-block Letter-Latin-Upper-H : begin eject-contour 'serifRB' create-glyph "rightHalfSmcpH.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : df.markSet.e include : RightHalfBody df.leftSB df.rightSB XH include : HSerifs slabType XH 0 df.leftSB df.rightSB eject-contour 'serifLT' eject-contour 'serifLB' - define enGheDf : DivFrame para.diversityM 3 + define enGheDf : DivFrame para.advanceScaleM 3 DefineSelectorGlyph "cyrl/EnGhe" suffix enGheDf 'capital' DefineSelectorGlyph "cyrl/enghe" suffix enGheDf 'e' @@ -199,17 +199,17 @@ glyph-block Letter-Latin-Upper-H : begin select-variant "cyrl/enghe.\(suffix)" (follow -- 'cyrl/enghe/ghePart') create-glyph "Hwair.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital include : HwairShape df CAP XH slabType create-glyph "cyrl/NjeKomi.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capital include : HwairShape df CAP (CAP / 2) slabType create-glyph "cyrl/njeKomi.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.e include : HwairShape df XH (XH / 2) slabType @@ -227,7 +227,7 @@ glyph-block Letter-Latin-Upper-H : begin include : OverlayStrokeShape XH slabType create-glyph "cyrl/EnMidHook.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.capDesc local xm : df.middle + [HSwToV : 0.5 * df.mvs] @@ -240,7 +240,7 @@ glyph-block Letter-Latin-Upper-H : begin include : MidHook.m df CAP create-glyph "cyrl/enMidHook.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : df.markSet.p local xm : df.middle + [HSwToV : 0.5 * df.mvs] @@ -273,7 +273,7 @@ glyph-block Letter-Latin-Upper-H : begin alias 'grek/Heta' 0x370 'leftHalfH' create-glyph 'grek/heta' 0x371 : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : df.markSet.e include : LeftHalfBody df.leftSB df.rightSB XH include : HSerifs SLAB-SMALL-HETA XH 0 df.leftSB df.rightSB diff --git a/packages/font-glyphs/src/letter/latin/upper-i.ptl b/packages/font-glyphs/src/letter/latin/upper-i.ptl index 73be3e8a7..ecb4b8521 100644 --- a/packages/font-glyphs/src/letter/latin/upper-i.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-i.ptl @@ -20,17 +20,17 @@ glyph-block Letter-Latin-Upper-I : begin include : HSerif.mt df.middle top jut set-base-anchor 'trailing' (df.middle + jut) bot - define [ISerifShape df top bot jut] : ISerifShapeImpl df top bot (jut * df.div) + define [ISerifShape df top bot jut] : ISerifShapeImpl df top bot (jut * df.advs) define UpperIConfig : object - 'straight' { para.diversityI ISeriflessShape LongJut } - 'serifless' { para.diversityII ISeriflessShape LongJut } - 'serifed' { para.diversityI ISerifShape LongJut } - 'shortSerifed' { para.diversityI ISerifShape MidJutCenter } + 'straight' { para.advanceScaleI ISeriflessShape LongJut } + 'serifless' { para.advanceScaleII ISeriflessShape LongJut } + 'serifed' { para.advanceScaleI ISerifShape LongJut } + 'shortSerifed' { para.advanceScaleI ISerifShape MidJutCenter } - foreach { suffix { div Body jut } } [Object.entries UpperIConfig] : do + foreach { suffix { advs Body jut } } [Object.entries UpperIConfig] : do create-glyph "I.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : df.markSet.capital include : Body df CAP 0 jut @@ -45,7 +45,7 @@ glyph-block Letter-Latin-Upper-I : begin include : ApparentTranslate 0 (0.5 * SB) create-glyph "ILonga.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : df.markSet.capital local top : CAP + Ascender - XH include : ExtendAboveBaseAnchors top @@ -65,7 +65,7 @@ glyph-block Letter-Latin-Upper-I : begin CreateAccentedComposition 'IAcute' 0xCD 'I' 'acuteAbove' create-glyph 'smcpI' 0x26A : glyph-proc - local df : include : DivFrame para.diversityI + local df : include : DivFrame para.advanceScaleI include : df.markSet.e include : ISerifShapeImpl df XH 0 MidJutCenter diff --git a/packages/font-glyphs/src/letter/latin/upper-j.ptl b/packages/font-glyphs/src/letter/latin/upper-j.ptl index f39711bcf..8e71e0aa0 100644 --- a/packages/font-glyphs/src/letter/latin/upper-j.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-j.ptl @@ -94,16 +94,16 @@ glyph-block Letter-Latin-Upper-J : begin set-width df.width include : df.markSet.[if (top > XH) 'capDesc' 'p'] include : FlatHookDotlessJShape df dfHook top - crossLeft -- (df.middle - (dfHook.middle - [mix 0 dfHook.leftSB : mix 1 dfHook.div 2])) - barCenter -- (df.middle + 0.25 * JBalance * df.div * [mix 1 df.div 2]) + crossLeft -- (df.middle - (dfHook.middle - [mix 0 dfHook.leftSB : mix 1 dfHook.advs 2])) + barCenter -- (df.middle + 0.25 * JBalance * df.advs * [mix 1 df.advs 2]) serif -- false define [JDescendingFlatHookSerifedBase df dfHook top] : glyph-proc set-width df.width include : df.markSet.[if (top > XH) 'capDesc' 'p'] include : FlatHookDotlessJShape df df top - crossLeft -- [mix 0 SB : mix 1 df.div 2] - barCenter -- (df.middle + JBalance * df.div) + crossLeft -- [mix 0 SB : mix 1 df.advs 2] + barCenter -- (df.middle + JBalance * df.advs) serif -- true define [JLeftwardSerif df x top] : HSerif.lt x top LongJut @@ -115,8 +115,8 @@ glyph-block Letter-Latin-Upper-J : begin bentHook { JBentHookBase [DivFrame 1] [DivFrame 1] } flatHook { JFlatHookBase [DivFrame 1] [DivFrame 1] } descendingBentHook { JDescendingBentHookBase [DivFrame 1] [DivFrame 1] } - descendingFlatHookSerifless { JDescendingFlatHookSeriflessBase [DivFrame para.diversityI] [DivFrame para.diversityI] } - descendingFlatHookSerifed { JDescendingFlatHookSerifedBase [DivFrame para.diversityI] [DivFrame para.diversityI] } + descendingFlatHookSerifless { JDescendingFlatHookSeriflessBase [DivFrame para.advanceScaleI] [DivFrame para.advanceScaleI] } + descendingFlatHookSerifed { JDescendingFlatHookSerifedBase [DivFrame para.advanceScaleI] [DivFrame para.advanceScaleI] } function [body] : if (body == 'descendingFlatHookSerifless' || body == 'descendingFlatHookSerifed') {."" null} : object serifless null serifed JLeftwardSerif diff --git a/packages/font-glyphs/src/letter/latin/upper-m.ptl b/packages/font-glyphs/src/letter/latin/upper-m.ptl index ec35e1c19..10e01f9be 100644 --- a/packages/font-glyphs/src/letter/latin/upper-m.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-m.ptl @@ -26,7 +26,7 @@ glyph-block Letter-Latin-Upper-M : begin define SLAB-FULL 4 glyph-block-export MShape - define [MShape] : with-params [top df form slabType slanted [kMidHang df.div]] : glyph-proc + define [MShape] : with-params [top df form slabType slanted [kMidHang df.advs]] : glyph-proc local sidesSlope : if slanted 0.04 0 local xLeftTop : df.leftSB + top * sidesSlope local xRightTop : df.rightSB - top * sidesSlope @@ -37,17 +37,17 @@ glyph-block Letter-Latin-Upper-M : begin __ false local swSideBot : match form - [Just FORM-SAN-SMALL] : AdviceStroke 2.5 df.div - [Just FORM-SAN] : AdviceStroke 2.5 df.div - [Just FORM-TURN-W] : AdviceStroke 2.5 df.div - [Just FORM-HANGING] : AdviceStroke 2.5 df.div - __ : AdviceStroke 2.75 df.div + [Just FORM-SAN-SMALL] : AdviceStroke 2.5 df.advs + [Just FORM-SAN] : AdviceStroke 2.5 df.advs + [Just FORM-TURN-W] : AdviceStroke 2.5 df.advs + [Just FORM-HANGING] : AdviceStroke 2.5 df.advs + __ : AdviceStroke 2.75 df.advs local swSideTop : match form - [Just FORM-SAN-SMALL] : AdviceStroke 3 df.div - [Just FORM-SAN] : AdviceStroke 3 df.div - [Just FORM-TURN-W] : AdviceStroke 3 df.div - __ : AdviceStroke 4 df.div - local swMiddle : AdviceStroke 4.5 df.div + [Just FORM-SAN-SMALL] : AdviceStroke 3 df.advs + [Just FORM-SAN] : AdviceStroke 3 df.advs + [Just FORM-TURN-W] : AdviceStroke 3 df.advs + __ : AdviceStroke 4 df.advs + local swMiddle : AdviceStroke 4.5 df.advs local middleY : match form [Just FORM-SAN-SMALL] : top * 0.55 [Just FORM-SAN] : top * 0.55 @@ -58,7 +58,7 @@ glyph-block Letter-Latin-Upper-M : begin [Just FORM-FLAT] 0.75 __ 0.5 local kMidBotStrokeShrink : match form - [Just FORM-FLAT] : mix 1 df.div (-0.5) + [Just FORM-FLAT] : mix 1 df.advs (-0.5) __ 1 local swMiddleShrunk (kMidBotStrokeShrink * swMiddle) @@ -99,13 +99,13 @@ glyph-block Letter-Latin-Upper-M : begin local xTopBarRightEnd : mix df.width df.rightSB : if vSlab 0.25 0.375 local swSideBot : match form - [Just FORM-SAN-SMALL] : AdviceStroke 2.5 subDf.div - [Just FORM-SAN] : AdviceStroke 2.5 subDf.div - [Just FORM-TURN-W] : AdviceStroke 2.5 subDf.div - [Just FORM-HANGING] : AdviceStroke 2.5 subDf.div - __ : AdviceStroke 2.75 subDf.div + [Just FORM-SAN-SMALL] : AdviceStroke 2.5 subDf.advs + [Just FORM-SAN] : AdviceStroke 2.5 subDf.advs + [Just FORM-TURN-W] : AdviceStroke 2.5 subDf.advs + [Just FORM-HANGING] : AdviceStroke 2.5 subDf.advs + __ : AdviceStroke 2.75 subDf.advs - include : MShape top subDf form slabType slanted (kMidHang -- df.div) + include : MShape top subDf form slabType slanted (kMidHang -- df.advs) include : HBar.t xTopRight xTopBarRightEnd top swSideBot if vSlab : include : VSerif.dr xTopBarRightEnd top VJut (VJutStroke * swSideBot / Stroke) @@ -133,30 +133,30 @@ glyph-block Letter-Latin-Upper-M : begin foreach { suffix { slanted form slab } } [Object.entries MConfig] : do create-glyph "M.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capital include : MShape CAP df form slab slanted create-glyph "Meng.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 include : df.markSet.capDesc local ret_M : include : MShape CAP df form slab slanted eject-contour 'serifRB' include : EngHook df.rightSB 0 Descender (sw -- ret_M.swSideBot) create-glyph "smcpM.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT 3 + local df : include : DivFrame para.advanceScaleT 3 include : df.markSet.e include : MShape XH df form slab slanted create-glyph "smcpMWithDescender.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityT 3 + local df : include : DivFrame para.advanceScaleT 3 include : df.markSet.p include : LeaningAnchor.Below.VBar.l df.leftSB include : MShape XH df form slab slanted - define cyrSoftEmDf : DivFrame (para.diversityM * para.diversityM) 4 - define cyrSoftemDf : DivFrame (para.diversityT * para.diversityM) 4 + define cyrSoftEmDf : DivFrame (para.advanceScaleM * para.advanceScaleM) 4 + define cyrSoftemDf : DivFrame (para.advanceScaleT * para.advanceScaleM) 4 DefineSelectorGlyph "cyrl/EmSoft" suffix cyrSoftEmDf 'capital' DefineSelectorGlyph "cyrl/emSoft" suffix cyrSoftemDf 'e' @@ -188,10 +188,10 @@ glyph-block Letter-Latin-Upper-M : begin CreateSelectorVariants 'cyrl/emSoft' 0xA667 [Object.keys MConfig] (follow -- 'cyrl/em') derive-composites 'cyrl/EmTail' 0x4CD 'cyrl/Em' : do - local df : DivFrame para.diversityM 3 + local df : DivFrame para.advanceScaleM 3 CyrTailDescender.rSideJut df.rightSB 0 (sw -- df.mvs) derive-composites 'cyrl/emTail' 0x4CE 'cyrl/em' : do - local df : DivFrame para.diversityT 3 + local df : DivFrame para.advanceScaleT 3 CyrTailDescender.rSideJut df.rightSB 0 (sw -- df.mvs) alias 'grek/San' 0x3FA 'M.grekCapitalSan' diff --git a/packages/font-glyphs/src/letter/latin/upper-t.ptl b/packages/font-glyphs/src/letter/latin/upper-t.ptl index e56443e13..ce34c84db 100644 --- a/packages/font-glyphs/src/letter/latin/upper-t.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-t.ptl @@ -46,8 +46,8 @@ glyph-block Letter-Latin-Upper-T : begin right -- df.rightSB ybegin -- top yend -- (top / 2) - ada -- (SmallArchDepthA * 0.6 * df.div) - adb -- (SmallArchDepthB * 0.6 * df.div) + ada -- (SmallArchDepthA * 0.6 * df.advs) + adb -- (SmallArchDepthB * 0.6 * df.advs) sw -- df.mvs if doTopSerifs : begin @@ -83,18 +83,18 @@ glyph-block Letter-Latin-Upper-T : begin glyph-block-export TConfig define TConfig : object serifless { 1 false false } - motionSerifed { para.diversityT true false } - serifed { para.diversityT true true } + motionSerifed { para.advanceScaleT true false } + serifed { para.advanceScaleT true true } - foreach { suffix { div doST doSB } } [Object.entries TConfig] : do + foreach { suffix { advs doST doSB } } [Object.entries TConfig] : do create-glyph "T.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : df.markSet.capital set-base-anchor 'bottomRight' (df.middle + [HSwToV HalfStroke]) 0 include : TShape df CAP doST doSB create-glyph "cyrl/TeDescender.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : df.markSet.capital set-base-anchor 'bottomRight' (df.middle + [HSwToV HalfStroke]) 0 include : TShape df CAP doST doSB @@ -104,44 +104,44 @@ glyph-block Letter-Latin-Upper-T : begin jut -- [if doSB MidJutCenter Jut] create-glyph "TStroke.\(suffix)" : glyph-proc - local df : DivFrame div + local df : DivFrame advs include [refer-glyph "T.\(suffix)"] AS_BASE ALSO_METRICS include : LetterBarOverlay.m.in df.middle 0 CAP 0.45 create-glyph "Thookleft.\(suffix)" : glyph-proc - local df : DivFrame div + local df : DivFrame advs include [refer-glyph "T.\(suffix)"] AS_BASE ALSO_METRICS eject-contour 'serifLT' eject-contour 'strokeLT' include : LeftHook (df.leftSB + LeftHook.extension) CAP df.middle create-glyph "smcpT.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : df.markSet.e set-base-anchor 'bottomRight' (df.middle + [HSwToV HalfStroke]) 0 include : TShape df XH doST doSB create-glyph "cyrl/Twe/upper.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : df.markSet.capital include : TweUpperShape df CAP doST doSB set-base-anchor 'cvDecompose' (df.width / 2) CAP create-glyph "cyrl/twe/upper.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : df.markSet.e include : TweUpperShape df XH doST doSB set-base-anchor 'cvDecompose' (df.width / 2) XH create-glyph "currency/tengeSign.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : df.markSet.capital local gap : Math.max (CAP * 0.1) : AdviceStroke2 2 6 CAP include : HBar.t [TLeftX df] [TRightX df] CAP OverlayStroke include : TShape df (CAP - gap - OverlayStroke) doST doSB create-glyph "cyrl/teDescender.upright.\(suffix)" : glyph-proc - local df : include : DivFrame div + local df : include : DivFrame advs include : df.markSet.e include : TShape df XH doST doSB include : CyrDescender.rSideJut @@ -150,18 +150,18 @@ glyph-block Letter-Latin-Upper-T : begin jut -- [if doSB MidJutCenter Jut] create-glyph "TRTailBR.\(suffix)" : glyph-proc - local df : DivFrame div + local df : DivFrame advs include [refer-glyph "T.\(suffix)"] AS_BASE ALSO_METRICS include : df.markSet.capital include : RetroflexHook.mExt df.middle 0 create-glyph "cyrl/TjeKomi.\(suffix)" : glyph-proc - local df : include : DivFrame div 3 + local df : include : DivFrame advs 3 include : df.markSet.capital include : TjeShape df CAP doST create-glyph "cyrl/tjeKomi.upright.\(suffix)" : glyph-proc - local df : include : DivFrame div 3 + local df : include : DivFrame advs 3 include : df.markSet.e include : TjeShape df XH doST @@ -203,7 +203,7 @@ glyph-block Letter-Latin-Upper-T : begin CreateAccentedComposition 'TComma' 0x021A 'T' 'commaBelow' create-glyph 'capitalSmcpI' 0xA7AE : glyph-proc - local df : include : DivFrame : if SLAB para.diversityT 1 + local df : include : DivFrame : if SLAB para.advanceScaleT 1 include : df.markSet.capital local l : TLeftX df local r : TRightX df diff --git a/packages/font-glyphs/src/letter/latin/w.ptl b/packages/font-glyphs/src/letter/latin/w.ptl index f7601c277..e0b9062d5 100644 --- a/packages/font-glyphs/src/letter/latin/w.ptl +++ b/packages/font-glyphs/src/letter/latin/w.ptl @@ -49,37 +49,37 @@ glyph-block Letter-Latin-W : begin define [WDim df top bodyType] : begin local strokeOuter : match bodyType - [Just FORM-CURLY] : AdviceStroke CwOuterStrokeCurly : Math.sqrt df.div - [Just FORM-STRAIGHT] : AdviceStroke CwOuterStrokeStraight1 : Math.sqrt df.div - [Just FORM-FLAT-TOP] : AdviceStroke CwOuterStrokeStraight2 : Math.sqrt df.div - [Just FORM-DOUBLE-V] : AdviceStroke CwDoubleV : Math.sqrt df.div - [Just FORM-ASYMMETRIC] : AdviceStroke CwDoubleV : Math.sqrt df.div - [Just FORM-CYRL-OMEGA] : AdviceStroke CwCyrlOmega : Math.sqrt df.div + [Just FORM-CURLY] : AdviceStroke CwOuterStrokeCurly : Math.sqrt df.advs + [Just FORM-STRAIGHT] : AdviceStroke CwOuterStrokeStraight1 : Math.sqrt df.advs + [Just FORM-FLAT-TOP] : AdviceStroke CwOuterStrokeStraight2 : Math.sqrt df.advs + [Just FORM-DOUBLE-V] : AdviceStroke CwDoubleV : Math.sqrt df.advs + [Just FORM-ASYMMETRIC] : AdviceStroke CwDoubleV : Math.sqrt df.advs + [Just FORM-CYRL-OMEGA] : AdviceStroke CwCyrlOmega : Math.sqrt df.advs local fineOuter : match bodyType - [Just FORM-CURLY] : AdviceStroke CwFineOuter df.div - [Just FORM-STRAIGHT] : AdviceStroke CwFineOuterStraight : Math.sqrt df.div - [Just FORM-FLAT-TOP] : AdviceStroke CwFineOuterStraight : Math.sqrt df.div - [Just FORM-DOUBLE-V] : AdviceStroke CwDoubleV : Math.sqrt df.div - [Just FORM-ASYMMETRIC] : AdviceStroke CwDoubleV : Math.sqrt df.div - [Just FORM-CYRL-OMEGA] : AdviceStroke CwCyrlOmega : Math.sqrt df.div + [Just FORM-CURLY] : AdviceStroke CwFineOuter df.advs + [Just FORM-STRAIGHT] : AdviceStroke CwFineOuterStraight : Math.sqrt df.advs + [Just FORM-FLAT-TOP] : AdviceStroke CwFineOuterStraight : Math.sqrt df.advs + [Just FORM-DOUBLE-V] : AdviceStroke CwDoubleV : Math.sqrt df.advs + [Just FORM-ASYMMETRIC] : AdviceStroke CwDoubleV : Math.sqrt df.advs + [Just FORM-CYRL-OMEGA] : AdviceStroke CwCyrlOmega : Math.sqrt df.advs local fineInner : match bodyType - [Just FORM-CURLY] : AdviceStroke CwFineInner df.div - [Just FORM-STRAIGHT] : AdviceStroke CwFineInnerStraight : Math.sqrt df.div - [Just FORM-FLAT-TOP] : AdviceStroke CwFineInnerStraight : Math.sqrt df.div - [Just FORM-DOUBLE-V] : AdviceStroke CwFineInnerDoubleV : Math.sqrt df.div - [Just FORM-ASYMMETRIC] : AdviceStroke CwDoubleV : Math.sqrt df.div - [Just FORM-CYRL-OMEGA] : AdviceStroke CwCyrlOmega : Math.sqrt df.div + [Just FORM-CURLY] : AdviceStroke CwFineInner df.advs + [Just FORM-STRAIGHT] : AdviceStroke CwFineInnerStraight : Math.sqrt df.advs + [Just FORM-FLAT-TOP] : AdviceStroke CwFineInnerStraight : Math.sqrt df.advs + [Just FORM-DOUBLE-V] : AdviceStroke CwFineInnerDoubleV : Math.sqrt df.advs + [Just FORM-ASYMMETRIC] : AdviceStroke CwDoubleV : Math.sqrt df.advs + [Just FORM-CYRL-OMEGA] : AdviceStroke CwCyrlOmega : Math.sqrt df.advs local fineHeight : (fineOuter + fineInner) / 2 local wCo : match bodyType - [Just FORM-CURLY] : AdviceStroke CwWCoCurly df.div - [Just FORM-STRAIGHT] : AdviceStroke CwWCoStraight df.div - [Just FORM-FLAT-TOP] : AdviceStroke CwWCoStraight df.div - [Just FORM-DOUBLE-V] : AdviceStroke CwWCoDoubleV df.div - [Just FORM-ASYMMETRIC] : AdviceStroke CwWCoDoubleV df.div - [Just FORM-CYRL-OMEGA] : AdviceStroke CwWCoDoubleV df.div + [Just FORM-CURLY] : AdviceStroke CwWCoCurly df.advs + [Just FORM-STRAIGHT] : AdviceStroke CwWCoStraight df.advs + [Just FORM-FLAT-TOP] : AdviceStroke CwWCoStraight df.advs + [Just FORM-DOUBLE-V] : AdviceStroke CwWCoDoubleV df.advs + [Just FORM-ASYMMETRIC] : AdviceStroke CwWCoDoubleV df.advs + [Just FORM-CYRL-OMEGA] : AdviceStroke CwWCoDoubleV df.advs local wCo2 : match bodyType - [Just FORM-CYRL-OMEGA] : AdviceStroke CwCyrlOmega df.div + [Just FORM-CYRL-OMEGA] : AdviceStroke CwCyrlOmega df.advs _ wCo local kWCoShrink CThin @@ -266,7 +266,7 @@ glyph-block Letter-Latin-W : begin widths.rhs flat df.rightSB (top - TailY - HalfStroke - O) [heading Downward] curl df.rightSB [Math.min (0.8 * top) (top - TailY - HalfStroke - TINY)] [heading Downward] - straight.down.end df.rightSB 0 [widths.rhs.heading [AdviceStroke 4 df.div] Downward] + straight.down.end df.rightSB 0 [widths.rhs.heading [AdviceStroke 4 df.advs] Downward] include : VerticalHook.r df.rightSB (top - TailY - HalfStroke - O) TailX (-TailY) @@ -297,7 +297,7 @@ glyph-block Letter-Latin-W : begin include : VerticalHook.r df.rightSB (top - TailY - HalfStroke - O) TailX (-TailY) (sw -- df.mvs) define [WCursiveImplImpl fHookTop df top bodyType slabType] : glyph-proc - define fine : AdviceStroke 3.25 df.div + define fine : AdviceStroke 3.25 df.advs define mfine : fine * CThin define x0 : mix df.leftSB df.rightSB 0.1 define y0 : top - O @@ -348,15 +348,15 @@ glyph-block Letter-Latin-W : begin define WConfig : SuffixCfg.weave # Body object - straight { WShapeImpl WHooktopShape FORM-STRAIGHT para.diversityM para.diversityM } - straightAsymmetric { WShapeImpl WHooktopShape FORM-ASYMMETRIC para.diversityM para.diversityM } - straightDoubleV { WShapeImpl WHooktopShape FORM-DOUBLE-V para.diversityM para.diversityM } - straightFlatTop { WShapeImpl WHooktopShape FORM-FLAT-TOP para.diversityMM para.diversityM } - straightVerticalSides { WVertSides WVSHookTopShape FORM-STRAIGHT para.diversityM para.diversityT } - roundedVerticalSides { WRounded WHookTopRounded FORM-CURLY para.diversityMM para.diversityM } - curly { WShapeImpl WHooktopShape FORM-CURLY para.diversityM para.diversityM } - cursive { WCursiveImpl WHookTopCursive FORM-CURLY para.diversityM para.diversityM } - cyrlOmega { WShapeImpl WHooktopShape FORM-CYRL-OMEGA para.diversityMM para.diversityM } + straight { WShapeImpl WHooktopShape FORM-STRAIGHT para.advanceScaleM para.advanceScaleM } + straightAsymmetric { WShapeImpl WHooktopShape FORM-ASYMMETRIC para.advanceScaleM para.advanceScaleM } + straightDoubleV { WShapeImpl WHooktopShape FORM-DOUBLE-V para.advanceScaleM para.advanceScaleM } + straightFlatTop { WShapeImpl WHooktopShape FORM-FLAT-TOP para.advanceScaleMM para.advanceScaleM } + straightVerticalSides { WVertSides WVSHookTopShape FORM-STRAIGHT para.advanceScaleM para.advanceScaleT } + roundedVerticalSides { WRounded WHookTopRounded FORM-CURLY para.advanceScaleMM para.advanceScaleM } + curly { WShapeImpl WHooktopShape FORM-CURLY para.advanceScaleM para.advanceScaleM } + cursive { WCursiveImpl WHookTopCursive FORM-CURLY para.advanceScaleM para.advanceScaleM } + cyrlOmega { WShapeImpl WHooktopShape FORM-CYRL-OMEGA para.advanceScaleMM para.advanceScaleM } # Serifs function [body] : if (body == 'cyrlOmega') @@ -382,7 +382,7 @@ glyph-block Letter-Latin-W : begin include : implT df XH bodyType slabType create-glyph "ww.\(suffix)": glyph-proc - local df : include : DivFrame [if (Ldiv < para.diversityM) para.diversityF 1] 3 + local df : include : DivFrame [if (Ldiv < para.advanceScaleM) para.advanceScaleF 1] 3 include : df.markSet.capital local gap : CAP * 0.05 diff --git a/packages/font-glyphs/src/letter/latin/x.ptl b/packages/font-glyphs/src/letter/latin/x.ptl index cac967a57..41da4e7d4 100644 --- a/packages/font-glyphs/src/letter/latin/x.ptl +++ b/packages/font-glyphs/src/letter/latin/x.ptl @@ -87,8 +87,8 @@ glyph-block Letter-Latin-X : begin ] : glyph-proc local ada : ArchDepthAOf (ArchDepth * 0.8) (Width / 2) local adb : ArchDepthBOf (ArchDepth * 0.8) (Width / 2) - local div : (right - left) / (RightSB - Middle) - local divHook : Math.min div 1 + local advs : (right - left) / (RightSB - Middle) + local divHook : Math.min advs 1 local fineMid : 0.55 * swMid local xMidBarRightEdge : left + [HSwToV swMid] / 2 @@ -111,7 +111,7 @@ glyph-block Letter-Latin-X : begin flat (xMidBarRightEdge - [HSwToV fineMid]) ([mix bottom top 0.5] - O) [widths.lhs fineMid] curl (xMidBarRightEdge - [HSwToV fineMid]) (bottom + [Math.min adb (swMid + rIn)]) arcvh - flat (xMidBarRightEdge + div * (0.5 * swMid + rIn) + 0.25 * TanSlope * (0.5 * swMid + rIn)) bottom [widths.lhs.heading swCoEnd Rightward] + flat (xMidBarRightEdge + advs * (0.5 * swMid + rIn) + 0.25 * TanSlope * (0.5 * swMid + rIn)) bottom [widths.lhs.heading swCoEnd Rightward] curl right bottom dispiro flat (xMidBarRightEdge - [HSwToV : 0.5 * fineMid]) ([mix bottom top 0.5] - O) [widths.center fineMid] diff --git a/packages/font-glyphs/src/letter/shared.ptl b/packages/font-glyphs/src/letter/shared.ptl index ea0751e32..1b5f683fe 100644 --- a/packages/font-glyphs/src/letter/shared.ptl +++ b/packages/font-glyphs/src/letter/shared.ptl @@ -477,8 +477,8 @@ glyph-block Letter-Shared-Shapes : begin glyph-block-export FlatHookDepth define [FlatHookDepth df s] : object - x : [fallback s 1] * [FlatHookDepthImpl [Math.min 1 : Math.sqrt df.div] HVContrast] - y : [fallback s 1] * [FlatHookDepthImpl [Math.min 1 : Math.sqrt df.div] 1] + x : [fallback s 1] * [FlatHookDepthImpl [Math.min 1 : Math.sqrt df.advs] HVContrast] + y : [fallback s 1] * [FlatHookDepthImpl [Math.min 1 : Math.sqrt df.advs] 1] define [FlatHookDepthImpl sHook sStroke] : begin define kFlathook : 15 / 16 return : Math.max @@ -620,7 +620,7 @@ glyph-block Letter-Shared-Shapes : begin export : define DefaultAngle 40 export : define [StdDepth df sw] : Math.max (0.5 * sw) - df.div * para.unitWidthScalar * [Math.hypot HookX Hook] - 0.25 * sw + df.advs * para.unitWidthScalar * [Math.hypot HookX Hook] - 0.25 * sw export : define [DefaultInnerRadius] : Math.max (XH / 32) (0.5 * [AdviceStroke2 24 32 XH]) @@ -690,14 +690,14 @@ glyph-block Letter-Shared-Shapes : begin return : Math.min jut : 0.5 * ink + [Math.max (Stroke * TanSlope) (0.375 * gap)] class CSerifFrame - public [new top bot left right swRef swSerif div hSplit fForceSymmetric] : begin + public [new top bot left right swRef swSerif advs hSplit fForceSymmetric] : begin set this.top top set this.bot bot set this.left left set this.right right set this.swRef swRef set this.swSerif swSerif - set this.div div + set this.advs advs set this.hSplit hSplit set this.fForceSymmetric fForceSymmetric @@ -706,7 +706,7 @@ glyph-block Letter-Shared-Shapes : begin local jutFS MidJutSide - local jut : mix [HSwToV : 0.5 * swRef] Jut : Math.min 1 : div * 2.25 / hSplit + local jut : mix [HSwToV : 0.5 * swRef] Jut : Math.min 1 : advs * 2.25 / hSplit local sideJut : jut - 0.5 * ink local jutIn : if fForceSymmetric jut : JutIn left right jut swRef hSplit @@ -767,7 +767,7 @@ glyph-block Letter-Shared-Shapes : begin local gap : (this.right - this.left - this.hSplit * ink) / (this.hSplit - 1) local l1 : this.left + (ink + gap) * l local r1 : this.left + (ink + gap) * r + ink - return : new CSerifFrame this.top this.bot l1 r1 this.swRef this.swSerif this.div (r - l + 1) + return : new CSerifFrame this.top this.bot l1 r1 this.swRef this.swSerif this.advs (r - l + 1) glyph-block-export SerifFrame define flex-params [SerifFrame] : begin @@ -777,15 +777,15 @@ glyph-block Letter-Shared-Shapes : begin local-parameter : right local-parameter : swRef -- Stroke local-parameter : swSerif -- swRef - local-parameter : div -- 1 + local-parameter : advs -- 1 local-parameter : hSplit -- 2 local-parameter : fForceSymmetric -- false - return : new CSerifFrame top bot left right swRef swSerif div hSplit fForceSymmetric + return : new CSerifFrame top bot left right swRef swSerif advs hSplit fForceSymmetric define SerifFrame.fromDf : function [] : with-params [df top bot [swSerif df.mvs] [fForceSymmetric false]] : begin return : SerifFrame top bot df.leftSB df.rightSB swRef -- df.mvs - div -- df.div + advs -- df.advs hSplit -- [Math.max 2 df.hPack] swSerif -- swSerif fForceSymmetric -- fForceSymmetric diff --git a/packages/font-glyphs/src/marks/above.ptl b/packages/font-glyphs/src/marks/above.ptl index 8d951b746..c1870d169 100644 --- a/packages/font-glyphs/src/marks/above.ptl +++ b/packages/font-glyphs/src/marks/above.ptl @@ -156,10 +156,10 @@ glyph-block Mark-Above : begin curl (markMiddle - 0.875 * markExtend) aboveMarkTop [widths.center : 2 * markStress] create-glyph 'asciiGrave/body/straight' : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : dispiro - flat (df.middle + HalfStroke * 1.1 * asciiMarkZoomX * [Math.sqrt df.div]) [mix aboveMarkMid aboveMarkBot asciiMarkZoomY] [widths.center : Stroke * 0.9] - curl (df.middle - markExtend * asciiMarkZoomX * [Math.sqrt df.div]) [mix aboveMarkMid aboveMarkTop asciiMarkZoomY] [widths.center : Stroke * 1.1] + flat (df.middle + HalfStroke * 1.1 * asciiMarkZoomX * [Math.sqrt df.advs]) [mix aboveMarkMid aboveMarkBot asciiMarkZoomY] [widths.center : Stroke * 0.9] + curl (df.middle - markExtend * asciiMarkZoomX * [Math.sqrt df.advs]) [mix aboveMarkMid aboveMarkTop asciiMarkZoomY] [widths.center : Stroke * 1.1] create-glyph 'acuteAbove' 0x301 : glyph-proc set-width 0 @@ -169,10 +169,10 @@ glyph-block Mark-Above : begin curl (markMiddle + 0.875 * markExtend) aboveMarkTop [widths.center : 2 * markStress] create-glyph 'latin1acute' 0xB4 : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : dispiro - flat (df.middle - HalfStroke * 1.1 * asciiMarkZoomX * [Math.sqrt df.div]) [mix aboveMarkMid aboveMarkBot asciiMarkZoomY] [widths.center : Stroke * 0.9] - curl (df.middle + markExtend * asciiMarkZoomX * [Math.sqrt df.div]) [mix aboveMarkMid aboveMarkTop asciiMarkZoomY] [widths.center : Stroke * 1.1] + flat (df.middle - HalfStroke * 1.1 * asciiMarkZoomX * [Math.sqrt df.advs]) [mix aboveMarkMid aboveMarkBot asciiMarkZoomY] [widths.center : Stroke * 0.9] + curl (df.middle + markExtend * asciiMarkZoomX * [Math.sqrt df.advs]) [mix aboveMarkMid aboveMarkTop asciiMarkZoomY] [widths.center : Stroke * 1.1] glyph-block-export CaretCaronWidth CaretCaronMidSw CaretCaronTerminalSw define CaretCaronWidth : 2 * markExtend + markStress @@ -492,7 +492,7 @@ glyph-block Mark-Above : begin curl (RightSB - Width) aboveMarkMid create-glyph 'cyrl/ghe.SRB/overlineAbove' : glyph-proc - local df : DivFrame para.diversityI + local df : DivFrame para.advanceScaleI set-width 0 set-mark-anchor 'above' markMiddle XH markMiddle aboveMarkStack @@ -522,7 +522,7 @@ glyph-block Mark-Above : begin curl rightEnd aboveMarkMid create-glyph 'cyrl/te.SRB/overlineAbove' : glyph-proc - local df : DivFrame para.diversityMM 3 + local df : DivFrame para.advanceScaleMM 3 set-width 0 set-mark-anchor 'above' markMiddle XH markMiddle aboveMarkStack diff --git a/packages/font-glyphs/src/marks/overlay.ptl b/packages/font-glyphs/src/marks/overlay.ptl index e705fb71d..96f29751e 100644 --- a/packages/font-glyphs/src/marks/overlay.ptl +++ b/packages/font-glyphs/src/marks/overlay.ptl @@ -172,8 +172,8 @@ glyph-block Mark-Overlay : begin include : TildeShape ttop -- XH / 2 + tildeHeight / 2 tbot -- XH / 2 - tildeHeight / 2 - leftEnd -- markMiddle - Width / 2 * para.diversityMM - rightEnd -- markMiddle + Width / 2 * para.diversityMM + leftEnd -- markMiddle - Width / 2 * para.advanceScaleMM + rightEnd -- markMiddle + Width / 2 * para.advanceScaleMM hs -- OverlayStroke / 2 do "Slashes" @@ -425,10 +425,10 @@ glyph-block Mark-Overlay : begin do "Inner dots" glyph-block-export InnerDot - define [InnerDot x y kHeight fRound kdr _space _div] : begin + define [InnerDot x y kHeight fRound kdr _space _advs] : begin local space : fallback _space : InnerDot.spaceOfDf [DivFrame 1] - local div : fallback _div 4 - local halfDotWidth : kdr * [Math.max (DotRadius / 8) : Math.min DotRadius (space / div)] + local advs : fallback _advs 4 + local halfDotWidth : kdr * [Math.max (DotRadius / 8) : Math.min DotRadius (space / advs)] local halfDotHeight : kdr * [Math.max (DotRadius / 8) : Math.min DotRadius (halfDotWidth * kHeight)] if fRound @@ -450,12 +450,12 @@ glyph-block Mark-Overlay : begin define [InnerDot2 kHeight fRound kdr] : glyph-proc local space : InnerDot.spaceOfDf [DivFrame 1] - local div : StrokeWidthBlend 7 5 - local halfDotWidth : kdr * [Math.min DotRadius (space / div)] - local kHeight2 : div / 4 * kHeight + local advs : StrokeWidthBlend 7 5 + local halfDotWidth : kdr * [Math.min DotRadius (space / advs)] + local kHeight2 : advs / 4 * kHeight local offset : (0.5 * space - 2 * halfDotWidth) / 3 + halfDotWidth - include : InnerDot (-offset) 0 kHeight2 fRound kdr space div - include : InnerDot offset 0 kHeight2 fRound kdr space div + include : InnerDot (-offset) 0 kHeight2 fRound kdr space advs + include : InnerDot offset 0 kHeight2 fRound kdr space advs foreach { suffix { DrawAt kdr } } [Object.entries DotVariants] : do create-glyph "innerDot.\(suffix)" : glyph-proc diff --git a/packages/font-glyphs/src/meta/aesthetics.ptl b/packages/font-glyphs/src/meta/aesthetics.ptl index 673d26bd5..136ee3d44 100644 --- a/packages/font-glyphs/src/meta/aesthetics.ptl +++ b/packages/font-glyphs/src/meta/aesthetics.ptl @@ -86,11 +86,11 @@ export : define [calculateMetrics para] : begin local adjustedFillRate : StrokeWeightControlSigmoid nonAdjustedFillRate local strokeWidthScalar : Math.min 1 : mul * adjustedFillRate / nonAdjustedFillRate return : para.stroke * strokeWidthScalar - define [AdviceStroke crowdedness div mul] : begin - local spaceH : Width * [fallback div 1] - SB * 2 + define [AdviceStroke crowdedness advs mul] : begin + local spaceH : Width * [fallback advs 1] - SB * 2 return : AdviceStrokeInSpace spaceH HVContrast crowdedness [fallback mul 1] - define [AdviceStroke2 crwX crwY refH div] : begin - local spaceH : Width * [fallback div 1] - SB * 2 + define [AdviceStroke2 crwX crwY refH advs] : begin + local spaceH : Width * [fallback advs 1] - SB * 2 local spaceV refH return : Math.min AdviceStrokeInSpace spaceH HVContrast crwX 1 @@ -119,8 +119,8 @@ export : define [calculateMetrics para] : begin define SLAB para.slab - define [IBalance df] : df.div * df.div * [fallback para.ibalance (LongJut * 0.04)] # Serifed - define [IBalance2 df] : df.div * [fallback para.ibalance2 (LongJut * 0.14)] # Hooky, Tailed + define [IBalance df] : df.advs * df.advs * [fallback para.ibalance (LongJut * 0.04)] # Serifed + define [IBalance2 df] : df.advs * [fallback para.ibalance2 (LongJut * 0.14)] # Hooky, Tailed define JBalance : fallback para.jbalance 0 define JBalance2 : fallback para.jbalance2 (QuarterStroke + LongJut * 0.04) define TBalance : fallback para.tbalance JBalance @@ -416,25 +416,33 @@ export : define DesignParameters : object squareDotScalar 0.95 export : define [GenDivFrame metrics] : begin + # Implementation class of a division frame, used to model a letter's core X-direction structure class CDivFrame - public [new _div _hPack _sbMul _mvs _ox] : begin - local ox : fallback _ox 0 - local div : fallback _div 1 + # _advs: scale factor of advance width + # _hPack: number of horizontal divisions + # _sbMul: scale factor of sidebearings + # _mvs: desired stroke width + # _ox: overshoot correction + public [new _advs _hPack _sbMul _mvs _ox] : begin + local ox : fallback _ox 0 + local advs : fallback _advs 1 local hPack : Math.max 1 [fallback _hPack 0] - local mvs : fallback _mvs : if _hPack [metrics.AdviceStroke _hPack div] metrics.Stroke - local sbMul : fallback _sbMul : Math.min 1 : (metrics.Width * div - hPack * mvs) / (2 * hPack * metrics.SB) + local mvs : fallback _mvs + if _hPack [metrics.AdviceStroke _hPack advs] metrics.Stroke + local sbMul : fallback _sbMul + Math.min 1 : (metrics.Width * advs - hPack * mvs) / (2 * hPack * metrics.SB) - set this.params : object div hPack sbMul mvs ox - set this.div div + set this.params : object advs hPack sbMul mvs ox + set this.advs advs set this.hPack hPack - set this.width : metrics.Width * div - set this.middle : metrics.Middle * div + set this.width : metrics.Width * advs + set this.middle : metrics.Middle * advs set this.sb : metrics.SB * sbMul set this.leftSB : metrics.SB * sbMul - set this.rightSB : metrics.Width * div - metrics.SB * sbMul + set this.rightSB : metrics.Width * advs - metrics.SB * sbMul set this.mvs mvs set this.shoulderFine : metrics.ShoulderFine * (mvs / metrics.Stroke) - set this.markSet : MarksetDiv div sbMul metrics + set this.markSet : MarksetDiv advs sbMul metrics # No-overshoot metrics -- used for arch depth calculation set this.ox ox @@ -486,11 +494,12 @@ export : define [GenDivFrame metrics] : begin set g.divFrameParams this.params return this - public [adviceStroke c] : metrics.AdviceStroke c this.div - public [adviceStroke2 c d h] : metrics.AdviceStroke2 c d h this.div + public [adviceStroke c] : metrics.AdviceStroke c this.advs + public [adviceStroke2 c d h] : metrics.AdviceStroke2 c d h this.advs - define [F _div _hPack _sbMul _mvs _ox] : begin - return : new CDivFrame _div _hPack _sbMul _mvs _ox + # Factory function for CDivFrame + define [F _advs _hPack _sbMul _mvs _ox] : begin + return : new CDivFrame _advs _hPack _sbMul _mvs _ox set F.fromParams : lambda [params] : begin - return : new CDivFrame params.div params.hPack params.sbMul params.mvs params.ox + return : new CDivFrame params.advs params.hPack params.sbMul params.mvs params.ox return F diff --git a/packages/font-glyphs/src/space/index.ptl b/packages/font-glyphs/src/space/index.ptl index aa82d60d0..c554f5f5a 100644 --- a/packages/font-glyphs/src/space/index.ptl +++ b/packages/font-glyphs/src/space/index.ptl @@ -14,7 +14,7 @@ glyph-block Spaces : begin set currentGlyph.glyphRank (9998) create-glyph 'space' ' ' : glyph-proc - local df : include : DivFrame para.diversityI + local df : include : DivFrame para.advanceScaleI alias 'nbsp' 0xA0 'space' @@ -23,7 +23,7 @@ glyph-block Spaces : begin include : df.markSet.plus create-glyph 'markBaseSpace' 0xEF0D : glyph-proc - local df : include : DivFrame para.diversityI + local df : include : DivFrame para.advanceScaleI include : df.markSet.e create-glyph 'sp1' : glyph-proc @@ -35,7 +35,7 @@ glyph-block Spaces : begin alias 'figureSpace' 0x2007 'sp1' create-glyph 'punctuationSpace' 0x2008 : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF create-glyph 'zwsp' 0x200B : glyph-proc set-width 0 @@ -57,7 +57,7 @@ glyph-block Spaces : begin # The following spaces has explicit em-number. They will follow the em-number # in quasiproportional, and identical to SPACE in monospace define [FractionEmSp name code d] : create-glyph name code : glyph-proc - local df : include : DivFrame : if (para.diversityII < 1) (2 / d) 1 + local df : include : DivFrame : if (para.advanceScaleII < 1) (2 / d) 1 FractionEmSp 'threePerEmSp' 0x2004 3 FractionEmSp 'fourPerEmsp' 0x2005 4 diff --git a/packages/font-glyphs/src/symbol/counting-rod.ptl b/packages/font-glyphs/src/symbol/counting-rod.ptl index f465ca68d..02c934a6a 100644 --- a/packages/font-glyphs/src/symbol/counting-rod.ptl +++ b/packages/font-glyphs/src/symbol/counting-rod.ptl @@ -9,7 +9,7 @@ glyph-block Symbol-Counting-Rod : begin glyph-block-import Common-Derivatives do "Counting Rods" - define rodDiv : Math.min 2 : mix 1 para.diversityMM 3 + define rodDiv : Math.min 2 : mix 1 para.advanceScaleMM 3 define rodDf : DivFrame rodDiv 5 define rodSw rodDf.mvs define hRodSw : AdviceStroke 3 rodDiv @@ -88,10 +88,10 @@ glyph-block Symbol-Counting-Rod : begin include : rodTens 4 1 do "Tally Marks" - define rodDiv : Math.min 2 : mix 1 para.diversityMM 2 + define rodDiv : Math.min 2 : mix 1 para.advanceScaleMM 2 create-glyph 'tallyMarkOne' 0x1D377 : glyph-proc - local df : include : DivFrame : if (para.diversityII < 1) (rodDiv / 4) 1 + local df : include : DivFrame : if (para.advanceScaleII < 1) (rodDiv / 4) 1 include : df.markSet.capital include : VBar.m df.middle 0 CAP df.mvs diff --git a/packages/font-glyphs/src/symbol/letter.ptl b/packages/font-glyphs/src/symbol/letter.ptl index 15f4024fd..cdc2b9f1f 100644 --- a/packages/font-glyphs/src/symbol/letter.ptl +++ b/packages/font-glyphs/src/symbol/letter.ptl @@ -83,7 +83,7 @@ glyph-block Symbol-Currency : begin select-variant 'currency/turkishLiraSign' 0x20BA create-glyph 'currency/sheqelSign' 0x20AA : glyph-proc - local df : include : DivFrame para.diversityM 4 + local df : include : DivFrame para.advanceScaleM 4 include : df.markSet.e define pX 0.7 @@ -109,13 +109,13 @@ glyph-block Symbol-Currency : begin curl df.rightSB XH [heading Upward] create-glyph 'currency/manatSign' 0x20BC : glyph-proc - local df : include : DivFrame para.diversityT 3 + local df : include : DivFrame para.advanceScaleT 3 include : df.markSet.e define pY 0.8 local archTop : mix 0 XH pY - local sw : Math.min df.mvs : AdviceStroke2 3 2 archTop df.div + local sw : Math.min df.mvs : AdviceStroke2 3 2 archTop df.advs local ada : df.archDepthAOf SmallArchDepth sw local adb : df.archDepthBOf SmallArchDepth sw @@ -134,7 +134,7 @@ glyph-block Symbol-Currency : begin include : composite-proc sf.lb.full sf.rb.full create-glyph 'currency/lariSign' 0x20BE : glyph-proc - local df : include : DivFrame para.diversityM 3 + local df : include : DivFrame para.advanceScaleM 3 local gap : df.rightSB - df.leftSB - [HSwToV : 2 * df.mvs] local fine : Math.min OverlayStroke AdviceStrokeInSpace gap HVContrast 3 1 1 @@ -307,7 +307,7 @@ glyph-block Symbol-Letter : begin include : HBar.b SB RightSB 0 create-glyph 'mathGimel' 0x2137 : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF local hd : FlatHookDepth df local xStart : mix df.leftSB df.rightSB 0.1 diff --git a/packages/font-glyphs/src/symbol/math/large-operators.ptl b/packages/font-glyphs/src/symbol/math/large-operators.ptl index fb1235785..4d2971a6d 100644 --- a/packages/font-glyphs/src/symbol/math/large-operators.ptl +++ b/packages/font-glyphs/src/symbol/math/large-operators.ptl @@ -18,8 +18,8 @@ glyph-block Symbol-Math-Large-Operators : for-width-kinds WideWidth1 define MosaicBottom fontMetrics.os2.sTypoDescender define MosaicHeight : MosaicTop - MosaicBottom - define diversityLargeOperators : Math.max para.diversityM (MosaicWidth / Width) - define df : DivFrame diversityLargeOperators 0 [if FMosaicWide diversityLargeOperators 1] + define advanceScaleLargeOperators : Math.max para.advanceScaleM (MosaicWidth / Width) + define df : DivFrame advanceScaleLargeOperators 0 [if FMosaicWide advanceScaleLargeOperators 1] create-glyph [MangleName 'sum'] [MangleUnicode 0x2211] : glyph-proc set-width df.width @@ -66,8 +66,8 @@ glyph-block Symbol-Math-Large-Operators : for-width-kinds WideWidth1 set-width df.width include : UShape df BgOpTop BgOpBot stroke -- OperatorStroke - ada -- [ArchDepthAOf (ArchDepth * [Math.sqrt df.div]) (df.width)] - adb -- [ArchDepthBOf (ArchDepth * [Math.sqrt df.div]) (df.width)] + ada -- [ArchDepthAOf (ArchDepth * [Math.sqrt df.advs]) (df.width)] + adb -- [ArchDepthBOf (ArchDepth * [Math.sqrt df.advs]) (df.width)] turned [MangleName 'Cap'] [MangleUnicode 0x22C2] [MangleName 'Cup'] df.middle SymbolMid diff --git a/packages/font-glyphs/src/symbol/math/logicals.ptl b/packages/font-glyphs/src/symbol/math/logicals.ptl index 92ec4b047..680316cac 100644 --- a/packages/font-glyphs/src/symbol/math/logicals.ptl +++ b/packages/font-glyphs/src/symbol/math/logicals.ptl @@ -116,9 +116,9 @@ glyph-block Symbol-Math-Logicals : begin include : VBar.m Middle (SymbolMid * 2) 0 OperatorStroke create-glyph 'turnedTautologyTautology' 0x27DA : glyph-proc - local df : include : DivFrame para.diversityMM 4 + local df : include : DivFrame para.advanceScaleMM 4 local vs : df.mvs * OperatorStroke / Stroke - local innerSB : Math.min (SB * [Math.min 1 : df.div / 1.5]) df.leftSB + local innerSB : Math.min (SB * [Math.min 1 : df.advs / 1.5]) df.leftSB local l : Math.max (df.middle - innerSB - vs / 2) : mix df.middle df.leftSB (1 / 3) local r : Math.min (df.middle + innerSB + vs / 2) : mix df.middle df.rightSB (1 / 3) local t : mix SymbolMid top (1 / 3) @@ -131,9 +131,9 @@ glyph-block Symbol-Math-Logicals : begin include : HBar.m r df.rightSB b OperatorStroke create-glyph 'dashvvdash' 0x27DB : glyph-proc - local df : include : DivFrame para.diversityMM 4 + local df : include : DivFrame para.advanceScaleMM 4 local vs : df.mvs * OperatorStroke / Stroke - local innerSB : Math.min (SB * [Math.min 1 : df.div / 1.5]) df.leftSB + local innerSB : Math.min (SB * [Math.min 1 : df.advs / 1.5]) df.leftSB local l : Math.max (df.middle - innerSB - vs / 2) : mix df.middle df.leftSB (1 / 3) local r : Math.min (df.middle + innerSB + vs / 2) : mix df.middle df.rightSB (1 / 3) include : VBar.m l top bot vs diff --git a/packages/font-glyphs/src/symbol/math/relation.ptl b/packages/font-glyphs/src/symbol/math/relation.ptl index 1878312b4..4307a6a3c 100644 --- a/packages/font-glyphs/src/symbol/math/relation.ptl +++ b/packages/font-glyphs/src/symbol/math/relation.ptl @@ -230,7 +230,7 @@ glyph-block Symbol-Math-Relation-Addons : begin glyph-block-export lesslessSW muchLessSW lesslessSWO llggHeight define lesslessSW : AdviceStroke 3.5 - define muchLessSW : AdviceStroke 4.5 para.diversityMM + define muchLessSW : AdviceStroke 4.5 para.advanceScaleMM define lesslessSWO : Math.max lesslessSW lessEqDist define llggHeight : dH * 2 + lessEqDist * 2 @@ -637,12 +637,12 @@ glyph-block Symbol-Math-Relation-Inequality : begin include : GreaterShape (SymbolMid + dH) (SymbolMid - dH) (SB + lessEqDist * 2) (RightSB + lessEqDist / 2) lesslessSW create-glyph 'muchLess' 0x22D8 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : LessShape (SymbolMid + dH) (SymbolMid - dH) [mix df.leftSB df.rightSB (0/3)] [mix df.leftSB df.rightSB (1/3)] muchLessSW include : LessShape (SymbolMid + dH) (SymbolMid - dH) [mix df.leftSB df.rightSB (1/3)] [mix df.leftSB df.rightSB (2/3)] muchLessSW include : LessShape (SymbolMid + dH) (SymbolMid - dH) [mix df.leftSB df.rightSB (2/3)] [mix df.leftSB df.rightSB (3/3)] muchLessSW create-glyph 'muchGreater' 0x22D9 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : GreaterShape (SymbolMid + dH) (SymbolMid - dH) [mix df.leftSB df.rightSB (0/3)] [mix df.leftSB df.rightSB (1/3)] muchLessSW include : GreaterShape (SymbolMid + dH) (SymbolMid - dH) [mix df.leftSB df.rightSB (1/3)] [mix df.leftSB df.rightSB (2/3)] muchLessSW include : GreaterShape (SymbolMid + dH) (SymbolMid - dH) [mix df.leftSB df.rightSB (2/3)] [mix df.leftSB df.rightSB (3/3)] muchLessSW diff --git a/packages/font-glyphs/src/symbol/math/v-and-cup.ptl b/packages/font-glyphs/src/symbol/math/v-and-cup.ptl index 171218d27..363191354 100644 --- a/packages/font-glyphs/src/symbol/math/v-and-cup.ptl +++ b/packages/font-glyphs/src/symbol/math/v-and-cup.ptl @@ -271,7 +271,7 @@ glyph-block Symbol-Math-VAndCup : begin turned 'squareCup' 0x2294 'squareCap' Middle SymbolMid create-glyph 'shuffleProduct' 0x29E2 : glyph-proc - local df : include : DivFrame para.diversityMM 3 + local df : include : DivFrame para.advanceScaleMM 3 include : CyrShaShape df OperTop OperBot (fine -- OperatorStroke) (doSerif -- false) create-glyph 'doubleSquareCap' 0x2A4E : glyph-proc diff --git a/packages/font-glyphs/src/symbol/pictograph/faces.ptl b/packages/font-glyphs/src/symbol/pictograph/faces.ptl index 65b247fa5..784915de9 100644 --- a/packages/font-glyphs/src/symbol/pictograph/faces.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/faces.ptl @@ -17,7 +17,7 @@ glyph-block Symbol-Pictograph-Faces : begin width : Math.min (right - left) (top - bottom) midX : mix left right 0.5 - local div : (scaffold.width + SB * 2) / Width + local advs : (scaffold.width + SB * 2) / Width set scaffold.left : scaffold.midX - scaffold.width / 2 set scaffold.right : scaffold.midX + scaffold.width / 2 @@ -25,8 +25,8 @@ glyph-block Symbol-Pictograph-Faces : begin set scaffold.smb : ArchDepthBOf (SmallArchDepth * mosaicWidthScalar * scale) (mosaicWidth * scale) set scaffold.rda : ArchDepthAOf ((top - bottom) / 2) (mosaicWidth * scale) set scaffold.rdb : ArchDepthBOf ((top - bottom) / 2) (mosaicWidth * scale) - set scaffold.stroke : AdviceStroke 5 div - set scaffold.fine : AdviceStroke (6 * [Math.sqrt (mosaicWidthScalar * scale)]) div + set scaffold.stroke : AdviceStroke 5 advs + set scaffold.fine : AdviceStroke (6 * [Math.sqrt (mosaicWidthScalar * scale)]) advs define eyeYPos 0.625 define noseYPos 0.5 diff --git a/packages/font-glyphs/src/symbol/pictograph/suit.ptl b/packages/font-glyphs/src/symbol/pictograph/suit.ptl index 1330da310..9294fc187 100644 --- a/packages/font-glyphs/src/symbol/pictograph/suit.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/suit.ptl @@ -10,7 +10,7 @@ glyph-block Symbol-Pictograph-Suit-Cards : begin glyph-block-import Common-Derivatives glyph-block-import Symbol-Pictograph-Heart : HeartShapeImpl - define df : DivFrame para.diversityM + define df : DivFrame para.advanceScaleM define sw : AdviceStroke 4.25 define suit : new Box mix SymbolMid PictTop 0.75 diff --git a/packages/font-glyphs/src/symbol/punctuation/at.ptl b/packages/font-glyphs/src/symbol/punctuation/at.ptl index 34d4ddbb7..c1b2832d7 100644 --- a/packages/font-glyphs/src/symbol/punctuation/at.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/at.ptl @@ -46,22 +46,22 @@ glyph-block Symbol-Punctuation-At : begin curl (RightSB - HalfStroke + TanSlope * sw) (bot + O) define [FourFoldShape height fSolidInner] : glyph-proc - local df : include : DivFrame para.diversityM [if fSolidInner 3.25 4] + local df : include : DivFrame para.advanceScaleM [if fSolidInner 3.25 4] local top : SymbolMid + height / 2 local bot : SymbolMid - height / 2 local otop : mix bot top 0.75 local obot : mix top bot 0.8 - local sw : AdviceStroke [if fSolidInner 3.25 4] df.div - local swh : AdviceStroke [if fSolidInner 3.25 3.75] df.div + local sw : AdviceStroke [if fSolidInner 3.25 4] df.advs + local swh : AdviceStroke [if fSolidInner 3.25 3.75] df.advs local kM12 : if fSolidInner 0.40 (1 / 3) local kM12Sw : if fSolidInner 0.25 0.5 local m1 : [mix (df.leftSB + [HSwToV (sw / 2)]) (df.rightSB - [HSwToV (sw / 2)]) kM12 ] - [HSwToV (sw * kM12Sw)] local m2 : [mix (df.leftSB + [HSwToV (sw / 2)]) (df.rightSB - [HSwToV (sw / 2)]) (1 - kM12)] + [HSwToV (sw * kM12Sw)] - local ad : ArchDepth * [Math.sqrt df.div] + local ad : ArchDepth * [Math.sqrt df.advs] local ada : ArchDepthAOf ad df.width local adb : ArchDepthBOf ad df.width diff --git a/packages/font-glyphs/src/symbol/punctuation/dashes.ptl b/packages/font-glyphs/src/symbol/punctuation/dashes.ptl index 425cc8f95..d56fbc4a2 100644 --- a/packages/font-glyphs/src/symbol/punctuation/dashes.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/dashes.ptl @@ -48,11 +48,11 @@ glyph-block Symbol-Punctuation-Dashes : begin select-variant 'doubleUnderscore' 0x2017 (follow -- 'underscore') create-glyph 'hyphen' '-' : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : HBar.m df.leftSB df.rightSB SymbolMid create-glyph 'armn/hyphen' 0x58A : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : dispiro widths.center g4 df.leftSB SymbolMid [heading Rightward] @@ -102,6 +102,6 @@ glyph-block Symbol-Punctuation-Dashes : begin clear-anchors create-glyph 'dblHyphen' 0x2E40 : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : HBar.m df.leftSB df.rightSB (SymbolMid + EqualHalfSpace) include : HBar.m df.leftSB df.rightSB (SymbolMid - EqualHalfSpace) diff --git a/packages/font-glyphs/src/symbol/punctuation/ellipsis.ptl b/packages/font-glyphs/src/symbol/punctuation/ellipsis.ptl index c087405a3..2d5e9ca34 100644 --- a/packages/font-glyphs/src/symbol/punctuation/ellipsis.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/ellipsis.ptl @@ -34,13 +34,13 @@ glyph-block Symbol-Punctuation-Ellipsis : begin for-width-kinds WideWidth1 "Ellipsis" foreach { suffix { DrawAt kDotRadius overshoot } } [Object.entries DotVariants] : do create-glyph "\[MangleName 'oneDotLeader'].\(suffix)" : glyph-proc - local width : MosaicWidth * [mix para.diversityF para.diversityII (MosaicWidthScalar - 1)] + local width : MosaicWidth * [mix para.advanceScaleF para.advanceScaleII (MosaicWidthScalar - 1)] set-width width local radius : [EllipsisDotRadius 2 MosaicWidth] * kDotRadius include : DrawAt (width / 2) radius (radius - overshoot) create-glyph "\[MangleName 'twoDotsLeader'].\(suffix)" : glyph-proc - local width : MosaicWidth * [mix 1 para.diversityF (MosaicWidthScalar - 1)] + local width : MosaicWidth * [mix 1 para.advanceScaleF (MosaicWidthScalar - 1)] set-width width local radius : [EllipsisDotRadius 2 MosaicWidth] * kDotRadius local left : mix 0 width (1 / 4) @@ -84,19 +84,19 @@ glyph-block Symbol-Punctuation-Ellipsis : begin define radius : kDotRadius * [EllipsisDotRadius 3 XH] create-glyph "triColon.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : VThreeDotsShape DrawAt radius overshoot 0 df.width 0 0 XH create-glyph "mathTriColon.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : VThreeDotsShape DrawAt radius overshoot 0 df.width 0 (SymbolMid - XH / 2) (SymbolMid + XH / 2) create-glyph "quadColon.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : VFourDotShape DrawAt radius overshoot df.middle (-XH / 6) (XH * 7 / 6) create-glyph "mathQuadColon.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : VFourDotShape DrawAt radius overshoot df.middle (SymbolMid - XH * 2 / 3) (SymbolMid + XH * 2 / 3) create-glyph "vSixDots.\(suffix)" : glyph-proc diff --git a/packages/font-glyphs/src/symbol/punctuation/emotion.ptl b/packages/font-glyphs/src/symbol/punctuation/emotion.ptl index 42bff313b..c74976426 100644 --- a/packages/font-glyphs/src/symbol/punctuation/emotion.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/emotion.ptl @@ -16,7 +16,7 @@ glyph-block Symbol-Punctuation-Emotion : begin foreach { suffix { DrawAt kdr overshoot } } [Object.entries DotVariants] : do local dr : DotRadius * kdr create-glyph "exclam.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : df.markSet.capital include : VBar.m df.middle [clamp 0 (CAP * 0.4) (emotionBottom * 1.18)] CAP include : DrawAt df.middle dr (dr - overshoot) @@ -36,7 +36,7 @@ glyph-block Symbol-Punctuation-Emotion : begin select-variant 'questionDown/dotPart' (follow -- 'punctuationDot') derive-glyphs 'retroflexClickHook' 0x1DF0A 'exclam' : function [src sel] : glyph-proc - local df : DivFrame para.diversityF + local df : DivFrame para.advanceScaleF include : df.markSet.capDesc include : refer-glyph src include : RetroflexHook.m @@ -45,8 +45,8 @@ glyph-block Symbol-Punctuation-Emotion : begin yAttach -- DotRadius alias 'alveolarclick' 0x1C3 'exclam' - turned 'exclamDown' 0xA1 'exclam' [DivFrame para.diversityF].middle (XH / 2) - turned 'alveolarpercussive' null 'exclam' [DivFrame para.diversityF].middle (CAP / 2) + turned 'exclamDown' 0xA1 'exclam' [DivFrame para.advanceScaleF].middle (XH / 2) + turned 'alveolarpercussive' null 'exclam' [DivFrame para.advanceScaleF].middle (CAP / 2) do "Question" local [YConnectT top emotionBottom] : mix emotionBottom (top - HalfStroke) 0.375 diff --git a/packages/font-glyphs/src/symbol/punctuation/interpuncts.ptl b/packages/font-glyphs/src/symbol/punctuation/interpuncts.ptl index 67ce45845..ed496e1b4 100644 --- a/packages/font-glyphs/src/symbol/punctuation/interpuncts.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/interpuncts.ptl @@ -12,7 +12,7 @@ glyph-block Symbol-Punctuation-Interpuncts : begin foreach { suffix { DrawAt kDotRadius overshoot } } [Object.entries DotVariants] : do create-glyph "interpunct.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : DrawAt df.middle SymbolMid (PeriodRadius * kDotRadius - overshoot) select-variant 'interpunct' 0xB7 (follow -- 'punctuationDot') diff --git a/packages/font-glyphs/src/symbol/punctuation/percentages.ptl b/packages/font-glyphs/src/symbol/punctuation/percentages.ptl index 32ea83504..6812aaa7f 100644 --- a/packages/font-glyphs/src/symbol/punctuation/percentages.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/percentages.ptl @@ -37,10 +37,10 @@ glyph-block Symbol-Punctuation-Percentages : begin include : DrawAt (RightSB - r) (0 + r) (r - overshoot) create-glyph 'permille.NWID.dots' : glyph-proc - define df : include : DivFrame para.diversityM + define df : include : DivFrame para.advanceScaleM define slopeDf : DivFrame 1 - define refSw : AdviceStroke 4 df.div + define refSw : AdviceStroke 4 df.advs include : PercentBarShape slopeDf refSw local dotwidth : refSw * 1.5 @@ -52,10 +52,10 @@ glyph-block Symbol-Punctuation-Percentages : begin include : VBar.r df.rightSB 0 [mix 0 CAP 0.3] lowerDotWidth create-glyph 'basepoint.NWID.dots' : glyph-proc - define df : include : DivFrame para.diversityM - define slopeDf : DivFrame : Math.min 1 : para.diversityM * 0.8 + define df : include : DivFrame para.advanceScaleM + define slopeDf : DivFrame : Math.min 1 : para.advanceScaleM * 0.8 - define refSw : AdviceStroke 5 df.div + define refSw : AdviceStroke 5 df.advs include : PercentBarShape slopeDf refSw local dotwidth : refSw * 1.5 @@ -137,16 +137,16 @@ glyph-block Symbol-Punctuation-Percentages : begin curl [mix l r pFine] [mix 0 CAP pFine] [widths.heading (fine * cor) 0 Upward] create-glyph : glyph-proc - local width : Width * para.diversityM + local width : Width * para.advanceScaleM local rightSB : width - SB set-width width local l : SB / 2 local r : width - l local m : mix l r 0.5 - local ada : ArchDepthA * 0.5 * para.diversityM - local adb : ArchDepthB * 0.5 * para.diversityM - local sw : AdviceStroke2 4 5 CAP para.diversityM - local fine : AdviceStroke2 5 5 CAP para.diversityM + local ada : ArchDepthA * 0.5 * para.advanceScaleM + local adb : ArchDepthB * 0.5 * para.advanceScaleM + local sw : AdviceStroke2 4 5 CAP para.advanceScaleM + local fine : AdviceStroke2 5 5 CAP para.advanceScaleM local cor : HSwToV : 1 / [Math.sqrt : 1 - (((r - l - sw) / (CAP - 0)) ** 2)] local pTerm : fine / (2 * [Math.hypot CAP (r - l)]) local pFine : 0.5 - HalfStroke / [Math.hypot CAP (r - l)] @@ -164,26 +164,26 @@ glyph-block Symbol-Punctuation-Percentages : begin create-forked-glyph 'permille.NWID.ringsContinuousSlash' : glyph-proc local l1 : l - O local r2 r - local gap : (SB / 2 - O * 2) * para.diversityM + local gap : (SB / 2 - O * 2) * para.advanceScaleM local fill : ((r2 - l1) - gap) / 2 local r1 : l1 + fill local l2 : r1 + gap - local swp : AdviceStroke2 4 5 CAP para.diversityM + local swp : AdviceStroke2 4 5 CAP para.advanceScaleM include : OShape otop 0 l1 r1 swp ada adb include : OShape otop 0 l2 r2 swp ada adb create-forked-glyph 'basepoint.NWID.ringsContinuousSlash' : glyph-proc local l1 : l - O local r3 r - local gap : (SB / 2 - O) * para.diversityM + local gap : (SB / 2 - O) * para.advanceScaleM local fill : ((r3 - l1) - 2 * gap) / 3 local r1 : l1 + fill local l2 : r1 + gap local r2 : l2 + fill local l3 : r2 + gap - local swp : AdviceStroke2 6 5 CAP para.diversityM - local smap : ArchDepthA * (1/3) * para.diversityM - local smbp : ArchDepthB * (1/3) * para.diversityM + local swp : AdviceStroke2 6 5 CAP para.advanceScaleM + local smap : ArchDepthA * (1/3) * para.advanceScaleM + local smbp : ArchDepthB * (1/3) * para.advanceScaleM include : OShape otop 0 l1 r1 swp smap smbp include : OShape otop 0 l2 r2 swp smap smbp include : OShape otop 0 l3 r3 swp smap smbp diff --git a/packages/font-glyphs/src/symbol/punctuation/quotes-and-primes.ptl b/packages/font-glyphs/src/symbol/punctuation/quotes-and-primes.ptl index f42b03bef..8cb48b4ae 100644 --- a/packages/font-glyphs/src/symbol/punctuation/quotes-and-primes.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/quotes-and-primes.ptl @@ -21,34 +21,34 @@ glyph-block Symbol-Punctuation-Quotes-And-Primes : begin local ratio : Math.min 1 : (quoteTop - quoteBottom) / (PeriodSize - commaLow) derive-glyphs 'lowSingleQuote' 0x201A 'comma' : function [src gr] : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : refer-glyph src include : FlipAround df.middle 0 ratio ratio derive-glyphs 'revLowSingleQuote' null 'revComma' : function [src gr] : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : refer-glyph src include : FlipAround df.middle 0 ratio ratio derive-glyphs 'openSingleQuote' 0x2018 'lowSingleQuote' : function [src gr] : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : refer-glyph src include : FlipAround df.middle [mix [mix PeriodSize commaLow 0.5] yCurlyQuotes 0.5] derive-glyphs 'closeSingleQuote' 0x2019 'openSingleQuote' : function [src gr] : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : refer-glyph src include : FlipAround df.middle yCurlyQuotes derive-glyphs 'revSingleQuote' 0x201B 'revComma' : function [src gr] : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : refer-glyph src include : FlipAround df.middle 0 ratio ratio include : FlipAround df.middle [mix [mix PeriodSize commaLow 0.5] yCurlyQuotes 0.5] include : FlipAround df.middle yCurlyQuotes define [DoubleQuoteProc gn] : glyph-proc - local dfSingle : DivFrame para.diversityF + local dfSingle : DivFrame para.advanceScaleF local dist : Width * 0.225 include : refer-glyph gn include : Translate (-dist * 2) 0 @@ -68,7 +68,7 @@ glyph-block Symbol-Punctuation-Quotes-And-Primes : begin # Primes create-glyph 'prime' 0x2032 : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF local wide : Width * 0.1 include : dispiro widths.center (Stroke * 1.2) @@ -76,7 +76,7 @@ glyph-block Symbol-Punctuation-Quotes-And-Primes : begin curl (df.middle - wide) quoteBottom [widths.heading HalfStroke HalfStroke Downward] create-glyph 'doubleprime' 0x2033 : glyph-proc - local dfSingle : DivFrame para.diversityF + local dfSingle : DivFrame para.advanceScaleF local d : 0.25 * (RightSB - SB) include : refer-glyph "prime" include : Translate (-d * 2) 0 @@ -84,7 +84,7 @@ glyph-block Symbol-Punctuation-Quotes-And-Primes : begin include : Translate (d + Middle - dfSingle.middle) 0 create-glyph 'tripleprime' 0x2034 : glyph-proc - local df : include : DivFrame para.diversityM + local df : include : DivFrame para.advanceScaleM local wide : Width * 0.1 local d : df.width * 0.3 local fine : 0.5 * [AdviceStroke 3.5] @@ -102,7 +102,7 @@ glyph-block Symbol-Punctuation-Quotes-And-Primes : begin curl (df.middle + d - wide) quoteBottom [widths.heading fine fine Downward] create-glyph 'quadPrime' 0x2057 : glyph-proc - local df : include : DivFrame para.diversityM + local df : include : DivFrame para.advanceScaleM local wide : Width * 0.1 local fine : 0.5 * [AdviceStroke 4] local d : df.width * 0.15 - fine / 6 @@ -124,7 +124,7 @@ glyph-block Symbol-Punctuation-Quotes-And-Primes : begin curl (df.middle + 3 * d - wide) quoteBottom [widths.heading fine fine Downward] create-glyph 'revprime' 0x2035 : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF local wide : -Width * 0.1 include : dispiro widths.center (Stroke * 1.2) @@ -132,7 +132,7 @@ glyph-block Symbol-Punctuation-Quotes-And-Primes : begin curl (df.middle - wide) quoteBottom [widths.heading HalfStroke HalfStroke Downward] create-glyph 'revdoubleprime' 0x2036 : glyph-proc - local dfSingle : DivFrame para.diversityF + local dfSingle : DivFrame para.advanceScaleF local d : 0.25 * (RightSB - SB) include : refer-glyph "revprime" include : Translate (-d * 2) 0 @@ -140,7 +140,7 @@ glyph-block Symbol-Punctuation-Quotes-And-Primes : begin include : Translate (d + Middle - dfSingle.middle) 0 create-glyph 'revtripleprime' 0x2037 : glyph-proc - local df : include : DivFrame para.diversityM + local df : include : DivFrame para.advanceScaleM local wide : -Width * 0.1 local d : df.width * 0.3 local fine : 0.5 * [AdviceStroke 3.5] @@ -175,34 +175,34 @@ glyph-block Symbol-Punctuation-Quotes-And-Primes : begin # ASCII quotes create-glyph 'asciiSingleQuote/body/straight' : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : StraightQuoteShape df quoteTop quoteBottom create-glyph 'Saltillo' 0xA78B : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : df.markSet.capital include : StraightQuoteShape df CAP (0.625 * XH) create-glyph 'saltillo' 0xA78C : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : df.markSet.b include : StraightQuoteShape df Ascender XH create-glyph 'asciiGrave/selector.straight' : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF DependentSelector.set currentGlyph 'straight' create-glyph 'asciiGrave/selector.raisedInverseComma' : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF DependentSelector.set currentGlyph 'raisedInverseComma' create-glyph 'asciiGrave/selector.raisedTurnComma' : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF DependentSelector.set currentGlyph 'raisedTurnComma' create-glyph 'asciiSingleQuote/selector.straight' : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF DependentSelector.set currentGlyph 'straight' create-glyph 'asciiSingleQuote/selector.raisedComma' : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF DependentSelector.set currentGlyph 'raisedComma' select-variant 'asciiSingleQuote/selector' (follow -- 'asciiSingleQuote') @@ -218,10 +218,10 @@ glyph-block Symbol-Punctuation-Quotes-And-Primes : begin 'raisedComma' 'closeSingleQuote' alias 'mdfStress' 0x2C8 'asciiSingleQuote/body/straight' - turned 'mdfSecondaryStress' 0x2CC 'asciiSingleQuote/body/straight' [DivFrame para.diversityF].middle (XH / 2) + turned 'mdfSecondaryStress' 0x2CC 'asciiSingleQuote/body/straight' [DivFrame para.advanceScaleF].middle (XH / 2) create-glyph 'asciiDoubleQuote' 0x22 : glyph-proc - local dfSingle : DivFrame para.diversityF + local dfSingle : DivFrame para.advanceScaleF local dist : 0.2 * Width include : refer-glyph "asciiSingleQuote/body/straight" include : Translate (-dist * 2) 0 @@ -245,7 +245,7 @@ glyph-block Symbol-Punctuation-Quotes-And-Primes : begin # Armenian exclamatory create-glyph 'armn/exclam' 0x55C : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF local height : quoteTop - quoteBottom local xLeft : df.middle - height / 2.5 local xRight : df.middle + height / 2.5 @@ -256,7 +256,7 @@ glyph-block Symbol-Punctuation-Quotes-And-Primes : begin g4.up.end xRight quoteTop [widths.lhs.heading sw Upward] create-glyph "armn/questionMark" 0x055E : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF local height : quoteTop - quoteBottom local xLeft : df.middle - height / 2 diff --git a/packages/font-glyphs/src/symbol/punctuation/small.ptl b/packages/font-glyphs/src/symbol/punctuation/small.ptl index db5578200..c52c6841f 100644 --- a/packages/font-glyphs/src/symbol/punctuation/small.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/small.ptl @@ -13,16 +13,16 @@ glyph-block Symbol-Punctuation-Small : begin foreach { suffix { DrawAt kDotRadius overshoot } } [Object.entries DotVariants] : do create-glyph "period.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : DrawAt df.middle (PeriodRadius * kDotRadius) (PeriodRadius * kDotRadius - overshoot) create-glyph "halfXhPeriod.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : DrawAt df.middle (XH / 2) (PeriodRadius * kDotRadius - overshoot) create-glyph "xhPeriod.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : DrawAt df.middle (XH - PeriodRadius * kDotRadius) (PeriodRadius * kDotRadius - overshoot) create-glyph "capPeriod.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : DrawAt df.middle (CAP - PeriodRadius * kDotRadius) (PeriodRadius * kDotRadius - overshoot) create-glyph "smallPeriod.\(suffix)" : DrawAt Middle (DotRadius * kDotRadius) (DotRadius * kDotRadius - overshoot) @@ -40,7 +40,7 @@ glyph-block Symbol-Punctuation-Small : begin include : Translate (mx1) (my1) create-glyph 'comma.round' : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : CommaShapeT df.middle 0 : glyph-proc local r : PeriodRadius + 0 local ro : PeriodRadius - O @@ -73,7 +73,7 @@ glyph-block Symbol-Punctuation-Small : begin g4 (-commaOverflow + Descender * TanSlope) Descender [widths.rhs swEnd] create-glyph 'comma.square' : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : with-transform [Translate df.middle 0] : glyph-proc local r : PeriodRadius * DesignParameters.squareDotScalar + 0 local sw : Math.min [AdviceStroke 4] (PeriodSize * DesignParameters.squareDotScalar * 0.4) @@ -90,7 +90,7 @@ glyph-block Symbol-Punctuation-Small : begin create-glyph 'revComma.round' : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : CommaShapeT df.middle 0 : glyph-proc local r : PeriodRadius + 0 local ro : PeriodRadius - O @@ -123,7 +123,7 @@ glyph-block Symbol-Punctuation-Small : begin g4 (commaOverflow + Descender * TanSlope) Descender [widths.lhs swEnd] create-glyph 'revComma.square' : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF include : with-transform [Translate df.middle 0] : glyph-proc local r : PeriodRadius * DesignParameters.squareDotScalar + 0 local sw : Math.min [AdviceStroke 4] (PeriodSize * DesignParameters.squareDotScalar * 0.4) @@ -142,8 +142,8 @@ glyph-block Symbol-Punctuation-Small : begin select-variant 'comma' ',' (follow -- 'punctuationDot') select-variant 'revComma' 0x2E41 (follow -- 'punctuationDot') - turned "turnComma.round" null "comma.round" [DivFrame para.diversityF].middle PeriodRadius - turned "turnComma.square" null "comma.square" [DivFrame para.diversityF].middle (PeriodRadius * DesignParameters.squareDotScalar) + turned "turnComma.round" null "comma.round" [DivFrame para.advanceScaleF].middle PeriodRadius + turned "turnComma.square" null "comma.square" [DivFrame para.advanceScaleF].middle (PeriodRadius * DesignParameters.squareDotScalar) select-variant 'turnComma' 0x2E32 (follow -- 'punctuationDot') derive-composites 'raisedPeriod.round' null 'period.round' [ApparentTranslate 0 (XH / 2 - PeriodRadius)] @@ -166,14 +166,14 @@ glyph-block Symbol-Punctuation-Small : begin include [refer-glyph "capPeriod.\(suffix)"] create-glyph "modifierLetterColon.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityII + local df : include : DivFrame para.advanceScaleII local k 0.9 local dr : DotRadius * kDotRadius include : DrawAt df.middle [mix dr (XH - dr) k] (dr - overshoot) include : DrawAt df.middle [mix dr (XH - dr) (1 - k)] (dr - overshoot) create-glyph "modifierLetterRaisedColon.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityII + local df : include : DivFrame para.advanceScaleII local k 0.9 local dr : DotRadius * kDotRadius include : DrawAt df.middle (CAP - [mix dr (XH - dr) k]) (dr - overshoot) @@ -297,7 +297,7 @@ glyph-block Symbol-Punctuation-Small : begin alias 'grek/question' 0x37E 'semicolon' alias 'armn/fullstop' 0x589 'colon' - turned 'turnSemiColon' 0x2E35 'semicolon' [DivFrame para.diversityF].middle (XH / 2) + turned 'turnSemiColon' 0x2E35 'semicolon' [DivFrame para.advanceScaleF].middle (XH / 2) # Hollow (no CV) @@ -324,14 +324,14 @@ glyph-block Symbol-Punctuation-Small : begin curl (mx - rad * k2x) (d - rad * k2y) create-glyph 'hollowColon' 0x2982 : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF define sw : AdviceStroke 5 define dotRadius : Math.max PeriodRadius (XH / 8) include : RingStrokeAt df.middle (XH - dotRadius) (dotRadius + sw / 2 - O) sw include : RingStrokeAt df.middle dotRadius (dotRadius + sw / 2 - O) sw create-glyph 'zNotationSchemaComposition' 0x2A1F : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF define sw : AdviceStroke 5 define dotRadius : Math.max PeriodRadius (XH / 8) include : RingStrokeAt df.middle (XH - dotRadius) (dotRadius + sw / 2 - O) sw @@ -340,7 +340,7 @@ glyph-block Symbol-Punctuation-Small : begin RingCommaStroke df.middle dotRadius (dotRadius + sw / 2 - O) sw 0.75 0 1 3 create-glyph 'zNotationRelationalComposition' 0x2A3E : glyph-proc - local df : include : DivFrame para.diversityF + local df : include : DivFrame para.advanceScaleF define sw : AdviceStroke 6.5 define dotRadius : 0.625 * [Math.max PeriodRadius (XH / 8)] include : RingStrokeAt df.middle (0.625 * XH - dotRadius) (dotRadius + sw / 2 - O) sw diff --git a/params/parameters.toml b/params/parameters.toml index 6950afcca..fc8826174 100644 --- a/params/parameters.toml +++ b/params/parameters.toml @@ -77,13 +77,13 @@ slab = 0 # Old style number height onumZeroHeightRatio = 1.145 -# Reset diversity -diversityMM = 1 -diversityM = 1 -diversityT = 1 -diversityF = 1 -diversityI = 1 -diversityII = 1 +# Diversed advance width scale factors, used in quasi-proportional families +advanceScaleMM = 1 # Extra-wide letters +advanceScaleM = 1 # M-like letters +advanceScaleT = 1 # T-like letters +advanceScaleF = 1 # f-like letters +advanceScaleI = 1 # i-like letters (with serifs/tails) +advanceScaleII = 1 # Extra-narrow letters (like i without serifs/tails) # OS/2 and POST fixed metrics @@ -133,22 +133,22 @@ forceMonospace = true [spacing-quasi-proportional] spacing = 3 isQuasiProportional = true -diversityMM = 1.5 # 9/6 -diversityM = 1.3333333333333 # 8/6 -diversityT = 1.1666666666666 # 7/6 -diversityF = 0.8333333333333 # 5/6 -diversityI = 0.6666666666666 # 4/6 -diversityII = 0.5 # 3/6 +advanceScaleMM = 1.5 # 9/6 +advanceScaleM = 1.3333333333333 # 8/6 +advanceScaleT = 1.1666666666666 # 7/6 +advanceScaleF = 0.8333333333333 # 5/6 +advanceScaleI = 0.6666666666666 # 4/6 +advanceScaleII = 0.5 # 3/6 [spacing-quasi-proportional-extension-only] spacing = 3 isQuasiProportional = true -diversityMM = 1.50 # 9/6 -diversityM = 1.3333333333333 # 8/6 -diversityT = 1.1666666666666 # 7/6 -diversityF = 1.00 -diversityI = 1.00 -diversityII = 1.00 +advanceScaleMM = 1.50 # 9/6 +advanceScaleM = 1.3333333333333 # 8/6 +advanceScaleT = 1.1666666666666 # 7/6 +advanceScaleF = 1.00 +advanceScaleI = 1.00 +advanceScaleII = 1.00 ###### Slopes [slope-italic]