Changeset 548

Timestamp:

01/30/12 09:19:05 (4 months ago)

Author:

tal

Message:

Make the automatic group rename mapping available.

Files:

• branches/ufo3k/Lib/ufoLib/__init__.py (modified) (3 diffs)
• branches/ufo3k/Lib/ufoLib/converters.py (modified) (2 diffs)

branches/ufo3k/Lib/ufoLib/__init__.py

@@ -147 +147 @@
-                        )
-                        # convert kerning and groups
-
+, conversionMaps
-                                self._upConvertedKerningData["originalKerning"],
-                                deepcopy(self._upConvertedKerningData["originalGroups"])
@@ -154 +154 @@
-                        self._upConvertedKerningData["kerning"] = kerning
-                        self._upConvertedKerningData["groups"] = groups
+                        self._upConvertedKerningData["groupRenameMaps"] = conversionMaps
-
-        # support methods
@@ -269 +270 @@
-                        raise UFOLibError(message)
-                return groups
+
+        def getKerningGroupConversionRenameMaps(self):
+                """
+                Get maps defining the renaming that was done during any
+                needed kerning group conversion. This method returns a
+                dictionary of this form:
+
+                        {
+                                "side1" : {"old group name" : "new group name"},
+                                "side2" : {"old group name" : "new group name"}
+                        }
+
+                When no conversion has been performed, the side1 and side2
+                dictionaries will be empty.
+                """
+                if self._formatVersion >= 3:
+                        return dict(side1={}, side2={})
+                # use the public group reader to force the load and
+                # conversion of the data if it hasn't happened yet.
+                self.readGroups()
+                return self._upConvertedKerningData["groupRenameMaps"]
-
-        # fontinfo.plist

branches/ufo3k/Lib/ufoLib/converters.py

@@ -55 +55 @@
-        groups[newName] = group
-    # Return the kerning and the groups.
-
+, dict(side1=firstRenamedGroups, side2=secondRenamedGroups)
-
-def makeUniqueGroupName(name, groupNames, counter=0):
@@ -95 +95 @@
-    ...     "DGroup" : ["D"],
-    ... }
-
+, maps
-    ...     testKerning, testGroups)
-    >>> expected = {