Merge pull request #172 from adobe-type-tools/hash-dflt-layer

Hashing with --write-default-layer option

python/psautohint/ufoFont.py

@@ -429,17 +429,18 @@ def save(self, path):
 
         writer = UFOWriter(path, self._reader.formatVersion, validate=False)
 
-        if self.hashMapChanged:
-            self.writeHashMap(writer)
-        self.hashMapChanged = False
-
         layer = PROCESSED_LAYER_NAME
         if self.writeToDefaultLayer:
             layer = None
 
         # Write layer contents.
         layers = writer.layerContents.copy()
-        if self.processedLayerGlyphMap or not self.writeToDefaultLayer:
+        if self.writeToDefaultLayer and PROCESSED_LAYER_NAME in layers:
+            # Delete processed glyphs directory
+            writer.deleteGlyphSet(PROCESSED_LAYER_NAME)
+            # Remove entry from 'layercontents.plist' file
+            del layers[PROCESSED_LAYER_NAME]
+        elif self.processedLayerGlyphMap or not self.writeToDefaultLayer:
             layers[PROCESSED_LAYER_NAME] = PROCESSED_GLYPHS_DIRNAME
         writer.layerContents.update(layers)
         writer.writeLayerContents()
@@ -451,10 +452,17 @@ def save(self, path):
             if not self.writeToDefaultLayer and \
                     name in self.processedLayerGlyphMap:
                 filename = self.processedLayerGlyphMap[name]
+            # Recalculate glyph hashes
+            if self.writeToDefaultLayer:
+                self.recalcHashEntry(name, glyph)
             glyphset.contents[name] = filename
             glyphset.writeGlyph(name, glyph, glyph.drawPoints)
         glyphset.writeContents()
 
+        # Write hashmap
+        if self.hashMapChanged:
+            self.writeHashMap(writer)
+
     @property
     def hashMap(self):
         if self._hashmap is None:
@@ -486,10 +494,8 @@ def writeHashMap(self, writer):
         if not hashMap:
             return  # no glyphs were processed.
 
-        hasMapKeys = hashMap.keys()
-        hasMapKeys = sorted(hasMapKeys)
         data = ["{"]
-        for gName in hasMapKeys:
+        for gName in sorted(hashMap.keys()):
             data.append("'%s': %s," % (gName, hashMap[gName]))
         data.append("}")
         data.append("")
@@ -508,6 +514,17 @@ def updateHashEntry(self, glyphName):
         if AUTOHINT_NAME not in historyList:
             historyList.append(AUTOHINT_NAME)
 
+    def recalcHashEntry(self, glyphName, glyph):
+        hashBefore, historyList = self.hashMap[glyphName]
+
+        hash_pen = HashPointPen(glyph)
+        glyph.drawPoints(hash_pen)
+        hashAfter = hash_pen.getHash()
+
+        if hashAfter != hashBefore:
+            self.hashMap[glyphName] = [tostr(hashAfter), historyList]
+            self.hashMapChanged = True
+
     def checkSkipGlyph(self, glyphName, newSrcHash, doAll):
         skip = False
         if self.log_only:

tests/integration/test_hint.py

@@ -314,6 +314,32 @@ def test_hashmap_advance(tmpdir):
     assert differ([path, out])
 
 
+def test_hashmap_dflt_layer(tmpdir):
+    path = "%s/dummy/hashmap_dflt_layer.ufo" % DATA_DIR
+    rslt = "%s/dummy/hashmap_dflt_layer_hinted.ufo" % DATA_DIR
+    out = str(tmpdir / basename(path)) + ".out"
+    options = Options(path, out)
+    options.writeToDefaultLayer = True
+
+    hintFiles(options)
+
+    assert differ([rslt, out])
+
+
+def test_hashmap_dflt_layer_rehint(tmpdir):
+    path = "%s/dummy/hashmap_dflt_layer.ufo" % DATA_DIR
+    rslt = "%s/dummy/hashmap_dflt_layer_rehinted.ufo" % DATA_DIR
+    out = str(tmpdir / basename(path)) + ".out"
+    options = Options(path, out)
+    options.writeToDefaultLayer = False
+    hintFiles(options)
+    options2 = Options(out, out)
+    options2.writeToDefaultLayer = True
+    hintFiles(options2)
+
+    assert differ([rslt, out])
+
+
 def test_hashmap_transform(tmpdir):
     path = "%s/dummy/hashmap_transform.ufo" % DATA_DIR
     out = str(tmpdir / basename(path)) + ".out"