Changeset 184

Timestamp:

04/12/08 10:19:56 (2 years ago)

Author:

tal

Message:

Added support for lookupflag.

Files:

• packages/feaTools/trunk/Lib/feaTools/parser.py (modified) (3 diffs)
• packages/feaTools/trunk/Lib/feaTools/test.py (modified) (9 diffs)
• packages/feaTools/trunk/Lib/feaTools/writers/baseWriter.py (modified) (1 diff)
• packages/feaTools/trunk/Lib/feaTools/writers/fdkSyntaxWriter.py (modified) (1 diff)

packages/feaTools/trunk/Lib/feaTools/parser.py

@@ -246 +246 @@
-        )
-
-
+
+
+
+
+
+
+
-
-def _parseUnknown(writer, text):
@@ -378 +384 @@
-        text = _executeSimpleSlice(precedingMark, text, lookupReferenceRE, writer)
-        writer.lookupReference(lookupName)
-
+
+
+
+
+
+
-    subtables = subtableRE.findall(text)
-    for precedingMark in subtables:
@@ -516 +527 @@
-    writer.gposType2(target, value)
-
+def _parseLookupFlag(writer, values):
+    values = values.replace(",", " ")
+    values = [i for i in values.split(" ") if i]
+    # lookupflag format B is not supported except for value 0
+    if len(values) == 1:
+        try:
+            v = int(values[0])
+            if v != 0:
+                raise FeaToolsParserSyntaxError("lookupflag format B is not supported for any value other than 0")
+            else:
+                writer.lookupFlag()
+                return
+        except ValueError:
+            pass
+    rightToLeft = False
+    ignoreBaseGlyphs = False
+    ignoreLigatures = False
+    ignoreMarks = False
+    possibleValues = ["RightToLeft", "IgnoreBaseGlyphs", "IgnoreLigatures", "IgnoreMarks"]
+    for value in values:
+        if value not in possibleValues:
+            raise FeaToolsParserSyntaxError("Unknown lookupflag value: %s" % value)
+        if value == "RightToLeft":
+            rightToLeft = True
+        elif value == "IgnoreBaseGlyphs":
+            ignoreBaseGlyphs = True
+        elif value == "IgnoreLigatures":
+            ignoreLigatures = True
+        elif value == "IgnoreMarks":
+            ignoreMarks = True
+    writer.lookupFlag(rightToLeft=rightToLeft, ignoreBaseGlyphs=ignoreBaseGlyphs, ignoreLigatures=ignoreLigatures, ignoreMarks=ignoreMarks)
+
-def parseFeatures(writer, text):
-    # strip the strings.

packages/feaTools/trunk/Lib/feaTools/test.py

@@ -31 +31 @@
-        self._instructions.append(("class", (name, contents)))
-
+    def lookupFlag(self, rightToLeft=False, ignoreBaseGlyphs=False, ignoreLigatures=False, ignoreMarks=False):
+        self._instructions.append(("lookup flag", (rightToLeft, ignoreBaseGlyphs, ignoreLigatures, ignoreMarks)))
+
-    def gsubType1(self, target, replacement):
-        self._instructions.append(("gsub type 1", (target, replacement)))
@@ -62 +65 @@
-
-    def subtableBreak(self):
-B
+ b
-
-    def lookupReference(self, name):
-R
+ r
-
-    def featureReference(self, name):
-R
+ r
-
-
@@ -230 +233 @@
-        result = writer.getData()
-        expected = []
+        self.assertEqual(result, expected)
+
+    def testLookupFlag(self):
+        test = """lookupflag RightToLeft;"""
+        writer = TestFeatureWriter()
+        parseFeatures(writer, test)
+        result = writer.getData()
+        expected = [
+                ("lookup flag", (True, False, False, False))
+                ]
+        self.assertEqual(result, expected)
+        #
+        test = """lookupflag IgnoreBaseGlyphs;"""
+        writer = TestFeatureWriter()
+        parseFeatures(writer, test)
+        result = writer.getData()
+        expected = [
+                ("lookup flag", (False, True, False, False))
+                ]
+        self.assertEqual(result, expected)
+        #
+        test = """lookupflag IgnoreLigatures;"""
+        writer = TestFeatureWriter()
+        parseFeatures(writer, test)
+        result = writer.getData()
+        expected = [
+                ("lookup flag", (False, False, True, False))
+                ]
+        self.assertEqual(result, expected)
+        #
+        test = """lookupflag IgnoreMarks;"""
+        writer = TestFeatureWriter()
+        parseFeatures(writer, test)
+        result = writer.getData()
+        expected = [
+                ("lookup flag", (False, False, False, True))
+                ]
+        self.assertEqual(result, expected)
+        #
+        test = """lookupflag RightToLeft, IgnoreBaseGlyphs, IgnoreLigatures, IgnoreMarks;"""
+        writer = TestFeatureWriter()
+        parseFeatures(writer, test)
+        result = writer.getData()
+        expected = [
+                ("lookup flag", (True, True, True, True))
+                ]
+        self.assertEqual(result, expected)
+        #
+        test = """lookupflag 0;"""
+        writer = TestFeatureWriter()
+        parseFeatures(writer, test)
+        result = writer.getData()
+        expected = [
+                ("lookup flag", (False, False, False, False))
+                ]
-        self.assertEqual(result, expected)
-
@@ -691 +749 @@
-        result = writer.getData()
-        expected = [
-B
+ b
-                ]
-        self.assertEqual(result, expected)
@@ -700 +758 @@
-        result = writer.getData()
-        expected = [
-B
-B
+ b
+ b
-                ]
-        self.assertEqual(result, expected)
@@ -711 +769 @@
-        result = writer.getData()
-        expected = [
-R
+ r
-                ]
-        self.assertEqual(result, expected)
@@ -719 +777 @@
-        parseFeatures(writer, test)
-        result = writer.getData()
-R
+ r
-        self.assertEqual(result, expected)
-
@@ -728 +786 @@
-        result = writer.getData()
-        expected = [
-R
+ r
-                ]
-        self.assertEqual(result, expected)
@@ -736 +794 @@
-        parseFeatures(writer, test)
-        result = writer.getData()
-R
+ r
-        self.assertEqual(result, expected)
-

packages/feaTools/trunk/Lib/feaTools/writers/baseWriter.py

@@ -14 +14 @@
-
-    def classDefinition(self, name, contents):
+        pass
+
+    def lookupFlag(self, rightToLeft=False, ignoreBaseGlyphs=False, ignoreLigatures=False, ignoreMarks=False):
-        pass
-

packages/feaTools/trunk/Lib/feaTools/writers/fdkSyntaxWriter.py

@@ -76 +76 @@
-    def classDefinition(self, name, contents):
-        t = "%s = [%s];" % (name, self._list2String(contents))
+        self._instructions.append(t)
+
+    def lookupFlag(self, rightToLeft=False, ignoreBaseGlyphs=False, ignoreLigatures=False, ignoreMarks=False):
+        values = []
+        if rightToLeft:
+            values.append("RightToLeft")
+        if ignoreBaseGlyphs:
+            values.append("IgnoreBaseGlyphs")
+        if ignoreLigatures:
+            values.append("IgnoreLigatures")
+        if ignoreMarks:
+            values.append("IgnoreMarks")
+        if not values:
+            values = "0"
+        values = ", ".join(values)
+        t = "lookupflag %s;" % values
-        self._instructions.append(t)
-