Changeset 51 for trunk/robofab/Lib/robofab

Timestamp:

02/25/08 11:35:12 (5 years ago)

Author:

erik

Message:

This adds support for glyph.psHints in objectsFL.RGlyph. The psHints object is in this case a wrapper for FontLab?'s glyph hint objects. Hints are represented as simple [position, width] pairs, but they're converted to FL Hint objects when writing back to the font. Some changes to the way the hints are written to the font.lib upon export to UFO: hints used to be written as a list of {"position":100, "width":20} dicts. This is now just a list of lists [[100, 20], ]. The names of the entries now match the robofabInterCapSpellingRule, so hHint and vHint rather than hhint and vhint. This also applies to hLink, vLink and replaceTable.

File:

• trunk/robofab/Lib/robofab/objects/objectsFL.py (modified) (12 diffs)

trunk/robofab/Lib/robofab/objects/objectsFL.py

@@ -10 +10 @@
                 MOVE, LINE, CORNER, CURVE, QCURVE, OFFCURVE,\
                 relativeBCPIn, relativeBCPOut, absoluteBCPIn, absoluteBCPOut,\
-                BasePostScriptFontHintValues, postScriptHintDataLibKey
+                BasePostScriptFontHintValues, postScriptHintDataLibKey, BasePostScriptGlyphHintValues
 from fontTools.misc import arrayTools
 from robofab.pens.flPen import FLPointPen
@@ -67 +67 @@
 """
 
-        FontLab implementation of psHints object
+        FontLab implementation of psHints objects
         
         Most of the FL methods relating to ps hints return a list of 16 items.
@@ -223 +223 @@
         hStems = property(_getHStems, _setHStems, doc="postscript hints: horizontal stem values")
         
-                
-
-def getPostScriptHintDataFromLib(aFont, fontLib):
+        
+def getPostScriptFontHintDataFromLib(aFont, fontLib):
         hintData = fontLib.get(postScriptHintDataLibKey)
         psh = PostScriptFontHintValues(aFont)
         psh.fromDict(hintData)
+
+
+class PostScriptGlyphHintValues(BasePostScriptGlyphHintValues):
+        """     Wrapper for glyph-level PostScript hinting information for FontLab.
+                vStems, hStems
+        """
+        def __init__(self, glyph=None):
+                self._object = glyph.naked()
+
+        def copy(self):
+                from robofab.objects.objectsRF import PostScriptGlyphHintValues as _PostScriptGlyphHintValues
+                return _PostScriptGlyphHintValues(data=self.asDict())
+
+        def _hintObjectsToList(self, item):
+                data = []
+                done = []
+                for hint in item:
+                        p = (hint.position, hint.width)
+                        if p in done:
+                                continue
+                        data.append(p)
+                        done.append(p)
+                data.sort()
+                return data
+                
+        def _listToHintObjects(self, item):
+                hints = []
+                done = []
+                for pos, width in item:
+                        if (pos, width) in done:
+                                # we don't want to set duplicates
+                                continue
+                        hints.append(Hint(pos, width))
+                        done.append((pos,width))
+                return hints
+
+        def _getVHints(self):
+                return self._hintObjectsToList(self._object.vhints)
+
+        def _setVHints(self, values):
+                # 1 = horizontal hints and links,
+                # 2 = vertical hints and links
+                # 3 = all hints and links
+                self._object.RemoveHints(2)
+                values.sort()
+                for hint in self._listToHintObjects(values):
+                        self._object.vhints.append(hint)
+
+        def _getHHints(self):
+                return self._hintObjectsToList(self._object.hhints)
+
+        def _setHHints(self, values):
+                # 1 = horizontal hints and links,
+                # 2 = vertical hints and links
+                # 3 = all hints and links
+                self._object.RemoveHints(1)
+                values.sort()
+                for hint in self._listToHintObjects(values):
+                        self._object.hhints.append(hint)
+
+        vHints = property(_getVHints, _setVHints, doc="postscript hints: vertical hint zones")
+        hHints = property(_getHHints, _setHHints, doc="postscript hints: horizontal hint zones")
+
 
 
@@ -238 +300 @@
         # glyph.hhints and glyph.vhints returns a list of Hint objects.
         # Hint objects have position and width attributes.
-        data['hhints'] = []
+        data['hHints'] = []
         for index in xrange(len(glyph.hhints)):
                 hint = glyph.hhints[index]
-                d = {   'position' : hint.position,
-                        'width' : hint.width,
-                        }
-                data['hhints'].append(d)
-        if not data['hhints']:
-                del data['hhints']
-        data['vhints'] = []
+                data['hHints'].append((hint.position, hint.width))
+        if not data['hHints']:
+                del data['hHints']
+        data['vHints'] = []
         for index in xrange(len(glyph.vhints)):
                 hint = glyph.vhints[index]
-                d = {   'position' : hint.position,
-                        'width' : hint.width,
-                        }
-                data['vhints'].append(d)
-        if not data['vhints']:
-                del data['vhints']
+                data['vHints'].append((hint.position, hint.width))
+        if not data['vHints']:
+                del data['vHints']
         ##
         ## horizontal and vertical links
@@ -261 +317 @@
         # glyph.hlinks and glyph.vlinks returns a list of Link objects.
         # Link objects have node1 and node2 attributes.
-        data['hlinks'] = []
+        data['hLinks'] = []
         for index in xrange(len(glyph.hlinks)):
                 link = glyph.hlinks[index]
@@ -267 +323 @@
                         'node2' : link.node2,
                         }
-                data['hlinks'].append(d)
-        if not data['hlinks']:
-                del data['hlinks']
-        data['vlinks'] = []
+                data['hLinks'].append(d)
+        if not data['hLinks']:
+                del data['hLinks']
+        data['vLinks'] = []
         for index in xrange(len(glyph.vlinks)):
                 link = glyph.vlinks[index]
@@ -276 +332 @@
                         'node2' : link.node2,
                         }
-                data['vlinks'].append(d)
-        if not data['vlinks']:
-                del data['vlinks']
+                data['vLinks'].append(d)
+        if not data['vLinks']:
+                del data['vLinks']
         ##
         ## replacement table
@@ -284 +340 @@
         # glyph.replace_table returns a list of Replace objects.
         # Replace objects have type and index attributes.
-        data['replace_table'] = []
+        data['replaceTable'] = []
         for index in xrange(len(glyph.replace_table)):
                 replace = glyph.replace_table[index]
@@ -290 +346 @@
                         'index' : replace.index,
                         }
-                data['replace_table'].append(d)
-        if not data['replace_table']:
-                del data['replace_table']
+                data['replaceTable'].append(d)
+        if not data['replaceTable']:
+                del data['replaceTable']
         # XXX
         # need to support glyph.instructions and glyph.hdmx?
@@ -310 +366 @@
         ## horizontal and vertical hints
         ##
-        if aDict.has_key('hhints'):
-                for d in aDict['hhints']:
+        if aDict.has_key('hHints'):
+                for d in aDict['hHints']:
                         glyph.hhints.append(Hint(d['position'], d['width']))
-        if aDict.has_key('vhints'):
-                for d in aDict['vhints']:
+        if aDict.has_key('vHints'):
+                for d in aDict['vHints']:
                         glyph.vhints.append(Hint(d['position'], d['width']))
         ##
         ## horizontal and vertical links
         ##
-        if aDict.has_key('hlinks'):
-                for d in aDict['hlinks']:
+        if aDict.has_key('hLinks'):
+                for d in aDict['hLinks']:
                         glyph.hlinks.append(Link(d['node1'], d['node2']))
-        if aDict.has_key('vlinks'):
-                for d in aDict['vlinks']:
+        if aDict.has_key('vLinks'):
+                for d in aDict['vLinks']:
                         glyph.vlinks.append(Link(d['node1'], d['node2']))
         ##
         ## replacement table
         ##
-        if aDict.has_key('replace_table'):
-                for d in aDict['replace_table']:
+        if aDict.has_key('replaceTable'):
+                for d in aDict['replaceTable']:
                         glyph.replace_table.append(Replace(d['type'], d['index']))
         
@@ -1113 +1169 @@
                                 count = count + 1
                         # import postscript font hint data
-                        getPostScriptHintDataFromLib(self, fontLib)
+                        getPostScriptFontHintDataFromLib(self, fontLib)
                         self.kerning.clear()
                         self.kerning.update(u.readKerning())
@@ -1260 +1316 @@
         note = property(_get_note, _set_note, doc="note")
         
-        #def _get_psHints(self):
-        #       # get an object representing the postscript zone information
-        #       # thes
-        #       raise NotImplementedError
-                
-        #psHints = property(_get_psHints, doc="postscript hint data")
+        def _get_psHints(self):
+                # get an object representing the postscript zone information
+                return PostScriptGlyphHintValues(self)
+                
+        psHints = property(_get_psHints, doc="postscript hint data")
         
         #