fixup

cyrealtype · Jun 12, 2023 · c11db34 · c11db34
1 parent d5a9f63
commit c11db34
Show file tree

Hide file tree

Showing 24 changed files with 53 additions and 46 deletions.
diff --git a/fonts/otf/Lora-Bold.otf b/fonts/otf/Lora-Bold.otf
diff --git a/fonts/otf/Lora-BoldItalic.otf b/fonts/otf/Lora-BoldItalic.otf
diff --git a/fonts/otf/Lora-Italic.otf b/fonts/otf/Lora-Italic.otf
diff --git a/fonts/otf/Lora-Medium.otf b/fonts/otf/Lora-Medium.otf
diff --git a/fonts/otf/Lora-MediumItalic.otf b/fonts/otf/Lora-MediumItalic.otf
diff --git a/fonts/otf/Lora-Regular.otf b/fonts/otf/Lora-Regular.otf
diff --git a/fonts/otf/Lora-SemiBold.otf b/fonts/otf/Lora-SemiBold.otf
diff --git a/fonts/otf/Lora-SemiBoldItalic.otf b/fonts/otf/Lora-SemiBoldItalic.otf
diff --git a/fonts/variable/Lora-Italic[wght].ttf b/fonts/variable/Lora-Italic[wght].ttf
diff --git a/fonts/variable/Lora-Italic[wght].woff2 b/fonts/variable/Lora-Italic[wght].woff2
diff --git a/fonts/variable/Lora[wght].ttf b/fonts/variable/Lora[wght].ttf
diff --git a/fonts/variable/Lora[wght].woff2 b/fonts/variable/Lora[wght].woff2
diff --git a/fonts/webfonts/Lora-Bold.woff2 b/fonts/webfonts/Lora-Bold.woff2
diff --git a/fonts/webfonts/Lora-BoldItalic.woff2 b/fonts/webfonts/Lora-BoldItalic.woff2
diff --git a/fonts/webfonts/Lora-Italic.woff2 b/fonts/webfonts/Lora-Italic.woff2
diff --git a/fonts/webfonts/Lora-Italic[wght].woff2 b/fonts/webfonts/Lora-Italic[wght].woff2
diff --git a/fonts/webfonts/Lora-Medium.woff2 b/fonts/webfonts/Lora-Medium.woff2
diff --git a/fonts/webfonts/Lora-MediumItalic.woff2 b/fonts/webfonts/Lora-MediumItalic.woff2
diff --git a/fonts/webfonts/Lora-Regular.woff2 b/fonts/webfonts/Lora-Regular.woff2
diff --git a/fonts/webfonts/Lora-SemiBold.woff2 b/fonts/webfonts/Lora-SemiBold.woff2
diff --git a/fonts/webfonts/Lora-SemiBoldItalic.woff2 b/fonts/webfonts/Lora-SemiBoldItalic.woff2
diff --git a/fonts/webfonts/Lora[wght].woff2 b/fonts/webfonts/Lora[wght].woff2
diff --git a/sources/Lora-Italic.glyphs b/sources/Lora-Italic.glyphs
@@ -123,46 +123,6 @@ name = aalt;
 },
 {
 automatic = 1;
-code = "lookup ccmp_DFLT_1 {
-	lookupflag 0;
-	sub brevecomb acutecomb by brevecomb_acutecomb;
-	sub brevecomb gravecomb by brevecomb_gravecomb;
-	sub brevecomb hookabovecomb by brevecomb_hookabovecomb;
-	sub brevecomb tildecomb by brevecomb_tildecomb;
-	sub circumflexcomb acutecomb by circumflexcomb_acutecomb;
-	sub circumflexcomb gravecomb by circumflexcomb_gravecomb;
-	sub circumflexcomb hookabovecomb by circumflexcomb_hookabovecomb;
-	sub circumflexcomb tildecomb by circumflexcomb_tildecomb;
-} ccmp_DFLT_1;
-
-lookup ccmp_Other_1 {
-	@CombiningTopAccents = [acutecomb brevecomb caroncomb circumflexcomb commaturnedabovecomb dieresiscomb dotaccentcomb gravecomb hookabovecomb hungarumlautcomb macroncomb ringcomb tildecomb];
-	@CombiningNonTopAccents = [cedillacomb dotbelowcomb ogonekcomb horncomb strokelongcomb strokeshortcomb];
-	sub [i j]' @CombiningTopAccents by [idotless jdotless];
-	sub [i j]' @CombiningNonTopAccents @CombiningTopAccents by [idotless jdotless];
-	@Markscomb = [brevecomb-cy dieresiscomb gravecomb acutecomb hungarumlautcomb circumflexcomb circumflexcomb_gravecomb circumflexcomb_acutecomb circumflexcomb_tildecomb circumflexcomb_hookabovecomb caroncomb brevecomb brevecomb_gravecomb brevecomb_acutecomb brevecomb_tildecomb brevecomb_hookabovecomb ringcomb tildecomb cedillacomb hungarumlaut circumflex];
-	@MarkscombCase = [brevecomb-cy.case dieresiscomb.case gravecomb.case acutecomb.case hungarumlautcomb.case circumflexcomb.case circumflexcomb_gravecomb.case circumflexcomb_acutecomb.case circumflexcomb_tildecomb.case circumflexcomb_hookabovecomb.case caroncomb.case brevecomb.case brevecomb_gravecomb.case brevecomb_acutecomb.case brevecomb_tildecomb.case brevecomb_hookabovecomb.case ringcomb.case tildecomb.case cedillacomb.case hungarumlaut.case circumflex.case];
-	sub @Markscomb @Markscomb' by @MarkscombCase;
-	sub @Uppercase @Markscomb' by @MarkscombCase;
-} ccmp_Other_1;
-
-lookup ccmp_Other_2 {
-	sub @Markscomb' @MarkscombCase by @MarkscombCase;
-	sub @MarkscombCase @Markscomb' by @MarkscombCase;
-} ccmp_Other_2;
-
-lookup ccmp_latn_1 {
-	sub fi by f i;
-	sub fl by f l;
-} ccmp_latn_1;
-
-script latn;
-lookup ccmp_latn_1;
-";
-name = ccmp;
-},
-{
-automatic = 1;
 code = "script latn;
 language AZE;
 lookup locl_latn_0 {
@@ -248,6 +208,45 @@ lookup locl_cyrl_4 {
 name = locl;
 },
 {
+code = "lookup ccmp_DFLT_1 {
+	lookupflag 0;
+	sub brevecomb acutecomb by brevecomb_acutecomb;
+	sub brevecomb gravecomb by brevecomb_gravecomb;
+	sub brevecomb hookabovecomb by brevecomb_hookabovecomb;
+	sub brevecomb tildecomb by brevecomb_tildecomb;
+	sub circumflexcomb acutecomb by circumflexcomb_acutecomb;
+	sub circumflexcomb gravecomb by circumflexcomb_gravecomb;
+	sub circumflexcomb hookabovecomb by circumflexcomb_hookabovecomb;
+	sub circumflexcomb tildecomb by circumflexcomb_tildecomb;
+} ccmp_DFLT_1;
+
+lookup ccmp_Other_1 {
+	@CombiningTopAccents = [acutecomb brevecomb caroncomb circumflexcomb commaturnedabovecomb dieresiscomb dotaccentcomb gravecomb hookabovecomb hungarumlautcomb macroncomb ringcomb tildecomb];
+	@CombiningNonTopAccents = [cedillacomb dotbelowcomb ogonekcomb horncomb strokelongcomb strokeshortcomb];
+	sub [i j idotbelow iogonek i-cy je-cy]' @CombiningTopAccents by [idotless jdotless idotless jdotless idotless jdotless];
+	sub [i j idotbelow iogonek i-cy je-cy]' @CombiningNonTopAccents @CombiningTopAccents by [idotless jdotless idotless jdotless idotless jdotless];
+	@Markscomb = [brevecomb-cy dieresiscomb gravecomb acutecomb hungarumlautcomb circumflexcomb circumflexcomb_gravecomb circumflexcomb_acutecomb circumflexcomb_tildecomb circumflexcomb_hookabovecomb caroncomb brevecomb brevecomb_gravecomb brevecomb_acutecomb brevecomb_tildecomb brevecomb_hookabovecomb ringcomb tildecomb cedillacomb];
+	@MarkscombCase = [brevecomb-cy.case dieresiscomb.case gravecomb.case acutecomb.case hungarumlautcomb.case circumflexcomb.case circumflexcomb_gravecomb.case circumflexcomb_acutecomb.case circumflexcomb_tildecomb.case circumflexcomb_hookabovecomb.case caroncomb.case brevecomb.case brevecomb_gravecomb.case brevecomb_acutecomb.case brevecomb_tildecomb.case brevecomb_hookabovecomb.case ringcomb.case tildecomb.case cedillacomb.case];
+	sub @Markscomb @Markscomb' by @MarkscombCase;
+	sub @Uppercase @Markscomb' by @MarkscombCase;
+} ccmp_Other_1;
+
+lookup ccmp_Other_2 {
+	sub @Markscomb' @MarkscombCase by @MarkscombCase;
+	sub @MarkscombCase @Markscomb' by @MarkscombCase;
+} ccmp_Other_2;
+
+lookup ccmp_latn_1 {
+	sub fi by f i;
+	sub fl by f l;
+} ccmp_latn_1;
+
+script latn;
+lookup ccmp_latn_1;
+";
+name = ccmp;
+},
+{
 automatic = 1;
 code = "sub one by onesuperior;
 sub two by twosuperior;
@@ -419,7 +418,6 @@ alignmentZones = (
 "{744, 16}",
 "{700, 16}",
 "{500, 16}",
-"{500, 16}",
 "{0, -16}",
 "{-16, 16}"
 );

diff --git a/sources/Lora.glyphs b/sources/Lora.glyphs
@@ -1,9 +1,10 @@
 {
 .appVersion = "3185";
 DisplayStrings = (
-"%/percent.tf \012/one.tf/percent.tf/space 2%\0123/percent.tf/space 2/percent.tf \0123%/space 2%\012",
+"%/percent.tf/space/acutecomb \012/one.tf/percent.tf/space 2%\0123/percent.tf/space 2/percent.tf \0123%/space 2%\012",
 "i/commaaccentcomb/dotaccentcomb/space i/commaaccentcomb/ringcomb/space i/commaaccentcomb/hungarumlautcomb/space i/commaaccentcomb/caroncomb/space i/commaaccentcomb/commaturnedabovecomb/space j/commaaccentcomb/gravecomb/space j/commaaccentcomb/acutecomb/space j/commaaccentcomb/tildecomb/space j/commaaccentcomb/macroncomb/space j/commaaccentcomb/brevecomb/space j/commaaccentcomb/dotaccentcomb/space j/commaaccentcomb/dieresiscomb/space j/commaaccentcomb/hookabovecomb/space j/commaaccentcomb/ringcomb/space j/commaaccentcomb/hungarumlautcomb \012/space/space/space/space/space/space/space/space/space/space j/commaaccentcomb/caroncomb/space j/commaaccentcomb/commaturnedabovecomb/space/iogonek/brevecomb/space/iogonek/dotaccentcomb/space/iogonek/dieresiscomb",
-""
+"",
+"/idotbelow"
 );
 classes = (
 {
@@ -123,7 +124,15 @@ feature calt;
 name = aalt;
 },
 {
-automatic = 1;
+code = "lookup ccmp_soft_dotted {
+    @CombiningTopAccents = [acutecomb brevecomb caroncomb circumflexcomb dieresiscomb dotaccentcomb gravecomb macroncomb ringcomb tildecomb];
+    lookupflag UseMarkFilteringSet @CombiningTopAccents;
+    sub [i j idotbelow iogonek i-cy je-cy]' @CombiningTopAccents by [idotless jdotless idotless jdotless idotless jdotless];
+} ccmp_soft_dotted;";
+disabled = 1;
+name = ccmp;
+},
+{
 code = "lookup ccmp_DFLT_1 {
 	lookupflag 0;
 	sub brevecomb acutecomb by brevecomb_acutecomb;
@@ -139,8 +148,8 @@ code = "lookup ccmp_DFLT_1 {
 lookup ccmp_Other_1 {
 	@CombiningTopAccents = [acutecomb brevecomb caroncomb circumflexcomb commaturnedabovecomb dieresiscomb dotaccentcomb gravecomb hookabovecomb hungarumlautcomb macroncomb ringcomb tildecomb];
 	@CombiningNonTopAccents = [cedillacomb dotbelowcomb ogonekcomb horncomb strokelongcomb strokeshortcomb];
-	sub [i j]' @CombiningTopAccents by [idotless jdotless];
-	sub [i j]' @CombiningNonTopAccents @CombiningTopAccents by [idotless jdotless];
+	sub [i j idotbelow iogonek i-cy je-cy]' @CombiningTopAccents by [idotless jdotless idotless jdotless idotless jdotless];
+	sub [i j idotbelow iogonek i-cy je-cy]' @CombiningNonTopAccents @CombiningTopAccents by [idotless jdotless idotless jdotless idotless jdotless];
 	@Markscomb = [brevecomb-cy dieresiscomb gravecomb acutecomb hungarumlautcomb circumflexcomb circumflexcomb_gravecomb circumflexcomb_acutecomb circumflexcomb_tildecomb circumflexcomb_hookabovecomb caroncomb brevecomb brevecomb_gravecomb brevecomb_acutecomb brevecomb_tildecomb brevecomb_hookabovecomb ringcomb tildecomb cedillacomb];
 	@MarkscombCase = [brevecomb-cy.case dieresiscomb.case gravecomb.case acutecomb.case hungarumlautcomb.case circumflexcomb.case circumflexcomb_gravecomb.case circumflexcomb_acutecomb.case circumflexcomb_tildecomb.case circumflexcomb_hookabovecomb.case caroncomb.case brevecomb.case brevecomb_gravecomb.case brevecomb_acutecomb.case brevecomb_tildecomb.case brevecomb_hookabovecomb.case ringcomb.case tildecomb.case cedillacomb.case];
 	sub @Markscomb @Markscomb' by @MarkscombCase;