' . $html . '
'); + + return array_values(unpack('N*', mb_convert_encoding($mpdf->drawnText[0], 'UTF-32BE', 'UTF-8'))); + } + + public function dataRuns() + { + return [ + 'the first rule, with two positions either side' => [ + [self::ALEF, self::BEH, self::ALEF, self::LOW_ALEF, self::LOW_ALEF], + [self::LOW_ALEF, self::LOW_ALEF, self::ALEF_FINAL, self::BEH, self::ALEF], + ], + 'the second rule, where the first rule\'s second backtrack position does not hold' => [ + [self::BEH, self::BEH, self::LOW_ALEF, self::LOW_ALEF], + [self::LOW_ALEF, self::LOW_ALEF, self::DOTLESS_BEH_FINAL, self::BEH], + ], + 'the second rule, where the first rule\'s second lookahead position does not hold' => [ + [self::ALEF, self::BEH, self::BEH, self::LOW_ALEF], + [self::LOW_ALEF, self::DOTLESS_BEH_FINAL, self::BEH, self::ALEF], + ], + ]; + } + + /** + * @dataProvider dataRuns + */ + public function testEachRuleMatchesItsOwnPositions($codepoints, $expected) + { + $this->assertSame($expected, $this->drawn($codepoints)); + } + +} diff --git a/tests/Mpdf/Fonts/GsubArrayTest.php b/tests/Mpdf/Fonts/GsubArrayTest.php index 860d1b06d..8fbaaf8d2 100644 --- a/tests/Mpdf/Fonts/GsubArrayTest.php +++ b/tests/Mpdf/Fonts/GsubArrayTest.php @@ -9,8 +9,7 @@ use Mpdf\TTFontFile; /** - * The GSUB walk the parser and the dump share, where the two part ways on purpose and no font in - * tests/data/ttf shows it. + * The GSUB walk the parser and the dump share, over rule sets no font in tests/data/ttf has. * * The lookups are built by hand, in the shape readGSUBrules() leaves them: lookup 0 is a class-based * chained context (Type 6 Format 2) whose two rules name first two backtrack positions, then one, and @@ -20,21 +19,21 @@ class GsubArrayTest extends \Yoast\PHPUnitPolyfills\TestCases\TestCase { /** - * The parser keeps the first rule's second backtrack position into the second rule (#170). + * The second rule matches the one backtrack position it names, not the first rule's second as + * well (#170). */ - public function testTheParserKeepsAnEarlierClassRulesExtraPositions() + public function testTheParserReadsEachClassRuleWithItsOwnPositions() { $parser = $this->withGdef(new TTFontFile($this->cache(), 'win')); $volt = $parser->_getGSUBarray($this->chainedClassRules(), [0 => 'ccmp'], 'latn'); - $this->assertSame([2, 2], [$volt[0]['nBacktrack'], $volt[1]['nBacktrack']]); - $this->assertSame('(00043)() (00043)() ', $volt[1]['matchback']); + $this->assertSame([2, 1], [$volt[0]['nBacktrack'], $volt[1]['nBacktrack']]); + $this->assertSame('(00043)() ', $volt[1]['matchback']); } /** - * The dump reads each rule's positions fresh, so it reports the second rule with the one - * backtrack position it names. + * So does the dump, which reports the second rule with the one backtrack position it names. */ public function testTheDumpReportsEachClassRuleWithItsOwnPositions() { @@ -56,8 +55,7 @@ public function testTheDumpReportsEachClassRuleWithItsOwnPositions() /** * A Type 5 rule has no backtrack or lookahead, yet where it belongs to an Arabic joining form the - * parser hands the shaper the sequences of the chained rule it read last. Kept as it was by the - * walk the two share; see #189. + * parser hands the shaper the sequences of the chained rule it read last (#189). */ public function testAPlainContextRuleOfAnArabicFormCarriesTheLastChainedRulesSequences() { @@ -80,7 +78,7 @@ public function testAPlainContextRuleOfAnArabicFormCarriesTheLastChainedRulesSeq $volt = $parser->_getGSUBarray($Lookup, [0 => 'init', 2 => 'init'], 'arab'); - $this->assertSame(['match' => '00041', 'replace' => '00044', 'tag' => 'init', 'prel' => ['00043', '00043'], 'postl' => [], 'ignore' => '()'], end($volt)); + $this->assertSame(['match' => '00041', 'replace' => '00044', 'tag' => 'init', 'prel' => ['00043'], 'postl' => [], 'ignore' => '()'], end($volt)); } private function chainedClassRules() diff --git a/tests/data/fontcache/NotoSansArabic-GSUB62Positions-Synthetic.json b/tests/data/fontcache/NotoSansArabic-GSUB62Positions-Synthetic.json new file mode 100644 index 000000000..a3bac07e4 --- /dev/null +++ b/tests/data/fontcache/NotoSansArabic-GSUB62Positions-Synthetic.json @@ -0,0 +1,226 @@ +{ + "_": "Generated by composer fontcache:update. See tests/Mpdf/Fonts/ParserGoldenMaster.php.", + "fullName": "NotoSansArabicGSUB62PositionsSynthetic-Regular", + "mtx": { + "GSUBScriptLang": { + "DFLT": "DFLT ", + "arab": "DFLT " + }, + "GSUBFeatures": { + "DFLT": { + "DFLT": { + "fina": [ + 0 + ] + } + }, + "arab": { + "DFLT": { + "fina": [ + 0 + ] + } + } + }, + "GSUBLookups": [ + { + "Type": 6, + "Flag": 0, + "SubtableCount": 1, + "Subtables": [ + 64 + ], + "MarkFilteringSet": "" + }, + { + "Type": 1, + "Flag": 0, + "SubtableCount": 1, + "Subtables": [ + 174 + ], + "MarkFilteringSet": "" + } + ], + "GPOSScriptLang": { + "DFLT": "DFLT ", + "arab": "DFLT ", + "cyrl": "DFLT ", + "dev2": "DFLT ", + "grek": "DFLT ", + "latn": "DFLT " + }, + "GPOSFeatures": { + "DFLT": { + "DFLT": { + "mark": [ + 0 + ], + "mkmk": [ + 1 + ] + } + }, + "arab": { + "DFLT": { + "mark": [ + 0 + ], + "mkmk": [ + 1 + ] + } + }, + "cyrl": { + "DFLT": { + "mark": [ + 0 + ], + "mkmk": [ + 1 + ] + } + }, + "dev2": { + "DFLT": { + "mark": [ + 0 + ], + "mkmk": [ + 1 + ] + } + }, + "grek": { + "DFLT": { + "mark": [ + 0 + ], + "mkmk": [ + 1 + ] + } + }, + "latn": { + "DFLT": { + "mark": [ + 0 + ], + "mkmk": [ + 1 + ] + } + } + }, + "GPOSLookups": [ + { + "Type": 4, + "Flag": 0, + "SubtableCount": 1, + "Subtables": [ + 102 + ], + "MarkFilteringSet": "" + }, + { + "Type": 6, + "Flag": 16, + "SubtableCount": 1, + "Subtables": [ + 194 + ], + "MarkFilteringSet": 0 + } + ], + "MarkGlyphSets": [ + " 0E005" + ], + "rtlPUAstr": "\\x{0E000}\\x{0E002}", + "haskernGPOS": false, + "hassmallcapsGSUB": false + }, + "cache": { + "GDEFdata.json": { + "GlyphClassBases": " 00020| 00627| 008AD| 0E000| 0E001| 0E002| 0E003| 0E004", + "GlyphClassMarks": " 0E005", + "GlyphClassLigatures": "", + "GlyphClassComponents": "", + "MarkGlyphSets": [ + " 0E005" + ], + "MarkAttachmentType": [] + }, + "GPOS.dat": "234 bytes, sha256 0f363351c5ea276d72ca75127977045024304d1f2b19b04e8cfded715c737a13", + "GPOSdata.json": [ + [ + { + "57349": 0 + } + ], + [ + { + "57349": 0 + } + ] + ], + "GSUB.arab.DFLT.json": { + "rtlSUB": { + "00627": { + "1": "0E000", + "prel": { + "1": [ + "00628", + "00627" + ] + }, + "postl": { + "1": [ + "008AD", + "008AD" + ] + }, + "ignore": { + "1": "()" + } + }, + "00628": { + "1": "0E002", + "prel": { + "1": [ + "00628" + ] + }, + "postl": { + "1": [ + "008AD" + ] + }, + "ignore": { + "1": "()" + } + } + }, + "finals": "0E000 0E002 ", + "rphf": [], + "half": [], + "pref": [], + "blwf": [], + "pstf": [] + }, + "GSUB.dat": "192 bytes, sha256 7da285b0e28dc3dc7c919987056d9b0e39edcf78f337ef45ec3b10f9d8fc07ac", + "GSUBdata.json": [ + [ + { + "1575": 0, + "1576": 1 + } + ], + [ + { + "1575": 0, + "1576": 1 + } + ] + ] + } +} diff --git a/tests/data/otldump/NotoSansArabic-GSUB62Positions-Synthetic.txt b/tests/data/otldump/NotoSansArabic-GSUB62Positions-Synthetic.txt new file mode 100644 index 000000000..cd09e743a --- /dev/null +++ b/tests/data/otldump/NotoSansArabic-GSUB62Positions-Synthetic.txt @@ -0,0 +1,27 @@ +