From 5c21c71b2bc2155c08fb88bbd6d25ec59bde5d0f Mon Sep 17 00:00:00 2001 From: iwsfutcmd Date: Fri, 15 Nov 2024 01:39:29 -0600 Subject: [PATCH 1/2] fixed om shaping to only allow the correct order of marks and not delete the dotted circle --- qa/shaping_tests/javanese.json | 12 ++++++++++++ sources/NotoSansJavanese.glyphs | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/qa/shaping_tests/javanese.json b/qa/shaping_tests/javanese.json index 9294427..576a004 100644 --- a/qa/shaping_tests/javanese.json +++ b/qa/shaping_tests/javanese.json @@ -443,6 +443,18 @@ "expectation": "pa_cakra=0+1221|cecaktelu.ns_cecak.ns=0@-156,10+0", "note": "googlefonts/noto-fonts#2332", "only": "NotoSansJavanese-Regular.ttf" + }, + { + "input": "ꦎꦴꦀ", + "expectation": "okara=0+967|panyangga.ns=0@15,10+0|uni25CC=0+594|tarung=0+413", + "note": "googlefonts/javanese#32", + "only": "NotoSansJavanese-Regular.ttf" + }, + { + "input": "ꦎꦀꦴ", + "expectation": "okara=0+967|panyangga.ns=0@15,10+0|uni25CC=0+594|tarung=0+413", + "note": "googlefonts/javanese#32", + "only": "NotoSansJavanese-Regular.ttf" } ] } diff --git a/sources/NotoSansJavanese.glyphs b/sources/NotoSansJavanese.glyphs index f0a58cb..7d768fa 100644 --- a/sources/NotoSansJavanese.glyphs +++ b/sources/NotoSansJavanese.glyphs @@ -703,7 +703,7 @@ code = "lookup CakraPasLigature2 {\012 sub pa.pas_cakra u.ns by pa.pas_cakra_ name = pres; }, { -code = "\012# [('java', 'dflt')]\012 lookup ChainedContextualGSUB19;\012\012# Use alternate below marks on all pasangans; see #6\012sub @class79 [u.ns uu.ns keret.ns pengkal]' lookup SingleSubstitution28;\012\012# [('java', 'dflt')]\012 lookup ContextualGSUB20;\012\012# [('java', 'dflt')]\012 lookup ChainedContextualGSUB33;\012\012lookup OmLigature {\012 lookupflag MarkAttachmentType @abovemarks;\012 sub okara panyangga.ns uni25CC tarung by om_javanese;\012 sub okara panyangga.ns tarung by om_javanese;\012 sub okara tarung panyangga.ns by om_javanese;\012} OmLigature;\012"; +code = "\012# [('java', 'dflt')]\012 lookup ChainedContextualGSUB19;\012\012# Use alternate below marks on all pasangans; see #6\012sub @class79 [u.ns uu.ns keret.ns pengkal]' lookup SingleSubstitution28;\012\012# [('java', 'dflt')]\012 lookup ContextualGSUB20;\012\012# [('java', 'dflt')]\012 lookup ChainedContextualGSUB33;\012\012lookup OmLigature {\012 lookupflag MarkAttachmentType @abovemarks;\012 sub okara tarung panyangga.ns by om_javanese;\012} OmLigature;\012"; name = psts; }, { From e49b5e9dc2d7020c24a22f022a6f00e59fa3cd0c Mon Sep 17 00:00:00 2001 From: iwsfutcmd Date: Fri, 15 Nov 2024 01:53:25 -0600 Subject: [PATCH 2/2] fixed test --- qa/shaping_tests/javanese.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/shaping_tests/javanese.json b/qa/shaping_tests/javanese.json index 576a004..a3586aa 100644 --- a/qa/shaping_tests/javanese.json +++ b/qa/shaping_tests/javanese.json @@ -446,7 +446,7 @@ }, { "input": "ꦎꦴꦀ", - "expectation": "okara=0+967|panyangga.ns=0@15,10+0|uni25CC=0+594|tarung=0+413", + "expectation": "om_javanese=0+1367", "note": "googlefonts/javanese#32", "only": "NotoSansJavanese-Regular.ttf" },