Merge remote-tracking branch 'origin/master' into otdata-colr

This commit is contained in:
Cosimo Lupo 2020-03-12 17:42:56 +00:00
commit d2bbfdb610
No known key found for this signature in database
GPG Key ID: 179A8F0895A02F4F
180 changed files with 235 additions and 215 deletions

View File

@ -4,6 +4,6 @@ from fontTools.misc.loggingTools import configLogger
log = logging.getLogger(__name__)
version = __version__ = "4.4.2.dev0"
version = __version__ = "4.4.3.dev0"
__all__ = ["version", "log", "configLogger"]

View File

@ -417,7 +417,6 @@ class SimpleT2Decompiler(object):
self.numRegions = self.private.getNumRegions()
numBlends = self.pop()
numOps = numBlends * (self.numRegions + 1)
blendArgs = self.operandStack[-numOps:]
del self.operandStack[-(numOps-numBlends):] # Leave the default operands on the stack.
def op_vsindex(self, index):

View File

@ -1592,6 +1592,19 @@ class VarDataValue(BaseConverter):
def xmlRead(self, attrs, content, font):
return safeEval(attrs["value"])
class LookupFlag(UShort):
def xmlWrite(self, xmlWriter, font, value, name, attrs):
xmlWriter.simpletag(name, attrs + [("value", value)])
flags = []
if value & 0x01: flags.append("rightToLeft")
if value & 0x02: flags.append("ignoreBaseGlyphs")
if value & 0x04: flags.append("ignoreLigatures")
if value & 0x08: flags.append("ignoreMarks")
if value & 0x10: flags.append("useMarkFilteringSet")
if value & 0xff00: flags.append("markAttachmentType[%i]" % (value >> 8))
if flags:
xmlWriter.comment(" ".join(flags))
xmlWriter.newline()
def _issubclass_namedtuple(x):
return (
@ -1723,6 +1736,7 @@ converterMapping = {
"DeltaValue": DeltaValue,
"VarIdxMapValue": VarIdxMapValue,
"VarDataValue": VarDataValue,
"LookupFlag": LookupFlag,
"ExtendMode": ExtendMode,
# AAT

View File

@ -87,7 +87,7 @@ otData = [
('Lookup', [
('uint16', 'LookupType', None, None, 'Different enumerations for GSUB and GPOS'),
('uint16', 'LookupFlag', None, None, 'Lookup qualifiers'),
('LookupFlag', 'LookupFlag', None, None, 'Lookup qualifiers'),
('uint16', 'SubTableCount', None, None, 'Number of SubTables for this lookup'),
('Offset', 'SubTable', 'SubTableCount', 0, 'Array of offsets to SubTables-from beginning of Lookup table'),
('uint16', 'MarkFilteringSet', None, 'LookupFlag & 0x0010', 'If set, indicates that the lookup table structure is followed by a MarkFilteringSet field. The layout engine skips over all mark glyphs not in the mark filtering set indicated.'),

View File

@ -1,3 +1,10 @@
4.4.2 (released 2020-03-12)
---------------------------
- [ttx] Annotate ``LookupFlag`` in XML dump with comment explaining what bits
are set and what they mean (#1850).
- [feaLib] Added more descriptive message to ``IncludedFeaNotFound`` error (#1842).
4.4.1 (released 2020-02-26)
---------------------------

View File

@ -91,7 +91,7 @@
<!-- LookupCount=22 -->
<Lookup index="0">
<LookupType value="1"/>
<LookupFlag value="1"/>
<LookupFlag value="1"/><!-- rightToLeft -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -103,7 +103,7 @@
</Lookup>
<Lookup index="1">
<LookupType value="1"/>
<LookupFlag value="2"/>
<LookupFlag value="2"/><!-- ignoreBaseGlyphs -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -115,7 +115,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="1"/>
<LookupFlag value="4"/>
<LookupFlag value="4"/><!-- ignoreLigatures -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -127,7 +127,7 @@
</Lookup>
<Lookup index="3">
<LookupType value="1"/>
<LookupFlag value="7"/>
<LookupFlag value="7"/><!-- rightToLeft ignoreBaseGlyphs ignoreLigatures -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -139,7 +139,7 @@
</Lookup>
<Lookup index="4">
<LookupType value="1"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -151,7 +151,7 @@
</Lookup>
<Lookup index="5">
<LookupType value="1"/>
<LookupFlag value="256"/>
<LookupFlag value="256"/><!-- markAttachmentType[1] -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -163,7 +163,7 @@
</Lookup>
<Lookup index="6">
<LookupType value="1"/>
<LookupFlag value="512"/>
<LookupFlag value="512"/><!-- markAttachmentType[2] -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -175,7 +175,7 @@
</Lookup>
<Lookup index="7">
<LookupType value="1"/>
<LookupFlag value="260"/>
<LookupFlag value="260"/><!-- ignoreLigatures markAttachmentType[1] -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -187,7 +187,7 @@
</Lookup>
<Lookup index="8">
<LookupType value="1"/>
<LookupFlag value="16"/>
<LookupFlag value="16"/><!-- useMarkFilteringSet -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -200,7 +200,7 @@
</Lookup>
<Lookup index="9">
<LookupType value="1"/>
<LookupFlag value="16"/>
<LookupFlag value="16"/><!-- useMarkFilteringSet -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -213,7 +213,7 @@
</Lookup>
<Lookup index="10">
<LookupType value="1"/>
<LookupFlag value="20"/>
<LookupFlag value="20"/><!-- ignoreLigatures useMarkFilteringSet -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -238,7 +238,7 @@
</Lookup>
<Lookup index="12">
<LookupType value="1"/>
<LookupFlag value="16"/>
<LookupFlag value="16"/><!-- useMarkFilteringSet -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -251,7 +251,7 @@
</Lookup>
<Lookup index="13">
<LookupType value="1"/>
<LookupFlag value="768"/>
<LookupFlag value="768"/><!-- markAttachmentType[3] -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -263,7 +263,7 @@
</Lookup>
<Lookup index="14">
<LookupType value="1"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -275,7 +275,7 @@
</Lookup>
<Lookup index="15">
<LookupType value="1"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -311,7 +311,7 @@
</Lookup>
<Lookup index="18">
<LookupType value="1"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -323,7 +323,7 @@
</Lookup>
<Lookup index="19">
<LookupType value="1"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
@ -347,7 +347,7 @@
</Lookup>
<Lookup index="21">
<LookupType value="1"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>

View File

@ -31,7 +31,7 @@
<!-- LookupCount=2 -->
<Lookup index="0">
<LookupType value="6"/>
<LookupFlag value="7"/>
<LookupFlag value="7"/><!-- rightToLeft ignoreBaseGlyphs ignoreLigatures -->
<!-- SubTableCount=1 -->
<ChainContextSubst index="0" Format="3">
<!-- BacktrackGlyphCount=1 -->
@ -54,7 +54,7 @@
</Lookup>
<Lookup index="1">
<LookupType value="1"/>
<LookupFlag value="7"/>
<LookupFlag value="7"/><!-- rightToLeft ignoreBaseGlyphs ignoreLigatures -->
<!-- SubTableCount=1 -->
<SingleSubst index="0">
<Substitution in="d" out="d.alt"/>

View File

@ -5,7 +5,7 @@
<!-- LookupCount=2 -->
<Lookup index="0">
<LookupType value="8"/>
<LookupFlag value="512"/>
<LookupFlag value="512"/><!-- markAttachmentType[2] -->
<!-- SubTableCount=1 -->
<ChainContextPos index="0" Format="1">
<Coverage Format="1">

View File

@ -5,7 +5,7 @@
<!-- LookupCount=2 -->
<Lookup index="0">
<LookupType value="6"/>
<LookupFlag value="512"/>
<LookupFlag value="512"/><!-- markAttachmentType[2] -->
<!-- SubTableCount=1 -->
<ChainContextSubst index="0" Format="1">
<Coverage Format="1">

View File

@ -5,7 +5,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="8"/>
<LookupFlag value="9"/>
<LookupFlag value="9"/><!-- rightToLeft ignoreMarks -->
<!-- SubTableCount=3 -->
<ReverseChainSingleSubst index="0" Format="1">
<Coverage Format="2">

View File

@ -470,7 +470,7 @@ class BuilderTest(object):
assert getXML(lookup.toXML) == [
"<Lookup>",
' <LookupType value="1"/>',
' <LookupFlag value="7"/>',
' <LookupFlag value="7"/><!-- rightToLeft ignoreBaseGlyphs ignoreLigatures -->',
" <!-- SubTableCount=2 -->",
' <SingleSubst index="0">',
' <Substitution in="one" out="two"/>',
@ -524,7 +524,7 @@ class BuilderTest(object):
assert getXML(lookup.toXML) == [
"<Lookup>",
' <LookupType value="1"/>',
' <LookupFlag value="17"/>',
' <LookupFlag value="17"/><!-- rightToLeft useMarkFilteringSet -->',
" <!-- SubTableCount=1 -->",
' <SingleSubst index="0">',
' <Substitution in="one" out="two"/>',

View File

@ -105,7 +105,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="4"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<LigatureSubst index="0" Format="1">
<LigatureSet glyph="g21">

View File

@ -105,7 +105,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="4"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<LigatureSubst index="0" Format="1">
<LigatureSet glyph="g21">

View File

@ -31,7 +31,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="1"/>
<LookupFlag value="2"/>
<LookupFlag value="2"/><!-- ignoreBaseGlyphs -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage Format="1">

View File

@ -31,7 +31,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="1"/>
<LookupFlag value="2"/>
<LookupFlag value="2"/><!-- ignoreBaseGlyphs -->
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="2">
<Coverage Format="1">

View File

@ -31,7 +31,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="2"/>
<LookupFlag value="2"/>
<LookupFlag value="2"/><!-- ignoreBaseGlyphs -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -31,7 +31,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="2"/>
<LookupFlag value="2"/>
<LookupFlag value="2"/><!-- ignoreBaseGlyphs -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -31,7 +31,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="2"/>
<LookupFlag value="2"/>
<LookupFlag value="2"/><!-- ignoreBaseGlyphs -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="2">
<Coverage Format="1">

View File

@ -31,7 +31,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="2"/>
<LookupFlag value="2"/>
<LookupFlag value="2"/><!-- ignoreBaseGlyphs -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="2">
<Coverage Format="1">

View File

@ -31,7 +31,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="3"/>
<LookupFlag value="2"/>
<LookupFlag value="2"/><!-- ignoreBaseGlyphs -->
<!-- SubTableCount=1 -->
<CursivePos index="0" Format="1">
<Coverage Format="1">

View File

@ -31,7 +31,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="3"/>
<LookupFlag value="2"/>
<LookupFlag value="2"/><!-- ignoreBaseGlyphs -->
<!-- SubTableCount=1 -->
<CursivePos index="0" Format="1">
<Coverage Format="1">

View File

@ -31,7 +31,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="4"/>
<LookupFlag value="2"/>
<LookupFlag value="2"/><!-- ignoreBaseGlyphs -->
<!-- SubTableCount=1 -->
<MarkBasePos index="0" Format="1">
<MarkCoverage Format="1">

View File

@ -31,7 +31,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="4"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<MarkBasePos index="0" Format="1">
<MarkCoverage Format="1">

View File

@ -31,7 +31,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="4"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<LigatureSubst index="0" Format="1">
<LigatureSet glyph="g30">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">
@ -97,7 +97,7 @@
</Lookup>
<Lookup index="4">
<LookupType value="8"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<ChainContextPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">
@ -97,7 +97,7 @@
</Lookup>
<Lookup index="4">
<LookupType value="8"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<ChainContextPos index="0" Format="2">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">
@ -97,7 +97,7 @@
</Lookup>
<Lookup index="4">
<LookupType value="8"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<ChainContextPos index="0" Format="3">
<!-- BacktrackGlyphCount=2 -->

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">
@ -97,7 +97,7 @@
</Lookup>
<Lookup index="4">
<LookupType value="7"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<ContextPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">
@ -97,7 +97,7 @@
</Lookup>
<Lookup index="4">
<LookupType value="7"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<ContextPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">
@ -97,7 +97,7 @@
</Lookup>
<Lookup index="4">
<LookupType value="7"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<ContextPos index="0" Format="2">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">
@ -97,7 +97,7 @@
</Lookup>
<Lookup index="4">
<LookupType value="7"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<ContextPos index="0" Format="2">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">
@ -97,7 +97,7 @@
</Lookup>
<Lookup index="4">
<LookupType value="7"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<ContextPos index="0" Format="3">
<!-- GlyphCount=3 -->

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">
@ -97,7 +97,7 @@
</Lookup>
<Lookup index="4">
<LookupType value="7"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<ContextPos index="0" Format="3">
<!-- GlyphCount=3 -->

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -72,7 +72,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="2"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage Format="1">

View File

@ -31,7 +31,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="1"/>
<LookupFlag value="2"/>
<LookupFlag value="2"/><!-- ignoreBaseGlyphs -->
<!-- SubTableCount=1 -->
<SingleSubst index="0" Format="1">
<Substitution in="g18" out="g23"/>

View File

@ -31,7 +31,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="1"/>
<LookupFlag value="2"/>
<LookupFlag value="2"/><!-- ignoreBaseGlyphs -->
<!-- SubTableCount=1 -->
<SingleSubst index="0" Format="2">
<Substitution in="g18" out="g22"/>

View File

@ -31,7 +31,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="2"/>
<LookupFlag value="2"/>
<LookupFlag value="2"/><!-- ignoreBaseGlyphs -->
<!-- SubTableCount=1 -->
<MultipleSubst index="0" Format="1">
<Substitution in="g18" out="g20,g21"/>

View File

@ -31,7 +31,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="3"/>
<LookupFlag value="2"/>
<LookupFlag value="2"/><!-- ignoreBaseGlyphs -->
<!-- SubTableCount=1 -->
<AlternateSubst index="0" Format="1">
<AlternateSet glyph="g18">

View File

@ -31,7 +31,7 @@
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="4"/>
<LookupFlag value="2"/>
<LookupFlag value="2"/><!-- ignoreBaseGlyphs -->
<!-- SubTableCount=1 -->
<LigatureSubst index="0" Format="1">
<LigatureSet glyph="g18">

View File

@ -58,7 +58,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="4"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<LigatureSubst index="0" Format="1">
<LigatureSet glyph="g21">

View File

@ -58,7 +58,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="4"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<LigatureSubst index="0" Format="1">
<LigatureSet glyph="g21">

View File

@ -58,7 +58,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="4"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<LigatureSubst index="0" Format="1">
<LigatureSet glyph="g21">

View File

@ -58,7 +58,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="4"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<LigatureSubst index="0" Format="1">
<LigatureSet glyph="g21">

View File

@ -58,7 +58,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="4"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<LigatureSubst index="0" Format="1">
<LigatureSet glyph="g21">
@ -76,7 +76,7 @@
</Lookup>
<Lookup index="4">
<LookupType value="6"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<ChainContextSubst index="0" Format="1">
<Coverage Format="1">

View File

@ -58,7 +58,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="4"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<LigatureSubst index="0" Format="1">
<LigatureSet glyph="g21">

View File

@ -58,7 +58,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="4"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<LigatureSubst index="0" Format="1">
<LigatureSet glyph="g21">

View File

@ -58,7 +58,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="4"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<LigatureSubst index="0" Format="1">
<LigatureSet glyph="g21">

View File

@ -58,7 +58,7 @@
</Lookup>
<Lookup index="2">
<LookupType value="4"/>
<LookupFlag value="8"/>
<LookupFlag value="8"/><!-- ignoreMarks -->
<!-- SubTableCount=1 -->
<LigatureSubst index="0" Format="1">
<LigatureSet glyph="g21">

Some files were not shown because too many files have changed in this diff Show More