Skip to content
This repository has been archived by the owner on Apr 7, 2024. It is now read-only.

Commit

Permalink
Merge pull request #379 from googlefonts/fix-looped-manual-mkmk
Browse files Browse the repository at this point in the history
Place mark feature before mkmk. Fixes #377
  • Loading branch information
marekjez86 authored May 31, 2021
2 parents 9b9c33a + c0771f8 commit cfe13f8
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/NotoLoopedLao.glyphs
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ code = "lookup shortDescender { ### lift the tail of ngoNgu when there's somethi
name = calt;
},
{
code = "# Automatic Code End\012";
name = mark;
},
{
code = "# Automatic Code End\012\012lookup squishTripleMarks {\012 pos maiEk-lao.small' maiCatawa-lao.small <0 -20 0 0>;\012 } squishTripleMarks;\012 \012lookup adjustMaiTiOnFoFai {\012 lookupflag UseMarkFilteringSet @laoAboveMarks;\012 pos foFai-lao maiTi-lao' <-90 0 0 0>;\012 } adjustMaiTiOnFoFai;\012 \012";
name = mkmk;
},
Expand Down
4 changes: 4 additions & 0 deletions src/NotoLoopedLaoUI.glyphs
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,10 @@ code = "lookup flatBelowMarks1 { ### UI: force those to use use the very flat co
name = calt;
},
{
code = "# Automatic Code End\012";
name = mark;
},
{
code = "# Automatic Code End\012\012lookup squishTripleMarks {\012 pos maiEk-lao.small' maiCatawa-lao.small <0 -20 0 0>;\012 } squishTripleMarks;\012 \012lookup adjustMaiTiOnFoFai {\012 lookupflag UseMarkFilteringSet @laoAboveMarks;\012 pos foFai-lao maiTi-lao' <-90 0 0 0>;\012 } adjustMaiTiOnFoFai;\012 \012";
name = mkmk;
},
Expand Down
4 changes: 4 additions & 0 deletions src/NotoLoopedThai.glyphs
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,10 @@ code = "lookup ThaiSuperscriptNumbers {\012sub zero-thai by zero-thai.sups;\012s
name = sups;
},
{
code = "# Automatic Code End\012";
name = mark;
},
{
code = "# Automatic Code End\012\012lookup combinewithdoublemacron { ### These distances are optimised for the regular weight; Glyphs currently won't let us replace the values in different instances, but we will put in different values in each instance when this becomes possible in the replaceFeature custom parameter###\012 ### move doubleMacron up if preceded by Thai marks above\012 pos @ThaiAboveMarks [doublemacroncomb doublemacroncomb.wide]' <0 250 0 0>;\012 ### move Thai marks up if preceded by double macron\012 pos [doublemacroncomb doublemacroncomb.wide] @ThaiAboveMarks' <0 175 0 0>;\012 ### move Thai marks up when double macron precedes the base\012 pos [doublemacroncomb doublemacroncomb.wide] @ThaiBases @ThaiAboveMarks' <0 175 0 0>;\012 pos [doublemacroncomb doublemacroncomb.wide] @ThaiBases @ThaiBelowMarks @ThaiAboveMarks' <0 175 0 0>;\012 } combinewithdoublemacron ;\012 \012lookup ContextualMarkPositions { ### Tonemarks are shifted slightly left when followed by ascending vowel signs;\012 lookupflag UseMarkFilteringSet @ThaiAboveMarks;\012 pos maiEk-thai' @ThaiAscendingVowels <-30 0 0 0>;\012 pos maiTho-thai' @ThaiAscendingVowels <-60 0 0 0>;\012 pos maiTri-thai' @ThaiAscendingVowels <-80 0 0 0>;\012 pos thanthakhat-thai' @ThaiAscendingVowels <-60 0 0 0>;\012 \012 ### This is an alternative solution, but we prefer the above;\012 ### pos maiTri-thai @ThaiAscendingVowels' <60 0 60 0>;\012 \012 } ContextualMarkPositions;\012 \012lookup workaroundShapingError {\012# for combinations that don't have precomposed glyphs, shaping engines normalise macronbelow at the end of the sequence, when they should be between bases and marks below. Here we manually move marks further down so they appear below macronbelow.\012 lookupflag UseMarkFilteringSet @ThaiBelowMarks;\012 pos @ThaiBelowMarks' macronbelowcomb <0 -200 0 0>; ### for Firefox and Chrome;\012 pos macronbelowcomb @ThaiBelowMarks' <0 -200 0 0>; ### for Safari;\012 } workaroundShapingError;\012 \012lookup ShiftSaraUe { ### SaraUe appears too far left on certain consonants, here we make adjustments;\012 pos @SpecialConsonants saraUe-thai' <15 0 0 0>;\012 pos [thoThong-thai roRua-thai] saraUe-thai' <30 0 0 0>;\012 } ShiftSaraUe;";
name = mkmk;
},
Expand Down
4 changes: 4 additions & 0 deletions src/NotoLoopedThaiUI.glyphs
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,10 @@ code = "lookup ThaiDescenders {\012 sub @ThaiDescenders' @ThaiBelowMarks by @Tha
name = calt;
},
{
code = "# Automatic Code End\012";
name = mark;
},
{
code = "# Automatic Code End\012 \012lookup ContextualMarkPositions { ### Tonemarks are shifted slightly left when followed by ascending vowel signs;\012 lookupflag UseMarkFilteringSet @ThaiAboveMarks;\012 pos maiEk-thai' @ThaiAscendingVowels <-30 0 0 0>;\012 pos maiTho-thai' @ThaiAscendingVowels <-60 0 0 0>;\012 pos maiTri-thai' @ThaiAscendingVowels <-80 0 0 0>;\012 pos thanthakhat-thai' @ThaiAscendingVowels <-60 0 0 0>;\012 \012 ### This is an alternative solution, but we prefer the above;\012 ### pos maiTri-thai @ThaiAscendingVowels' <60 0 60 0>;\012 \012 } ContextualMarkPositions;\012 \012lookup ShiftSaraUe { ### SaraUe appears too far left on certain consonants, here we make adjustments;\012 pos @SpecialConsonants saraUe-thai' <15 0 0 0>;\012 pos [thoThong-thai roRua-thai] saraUe-thai' <30 0 0 0>;\012 } ShiftSaraUe;";
name = mkmk;
},
Expand Down

0 comments on commit cfe13f8

Please sign in to comment.