Delete processed layer when --write-default-layer option is used

Fixes #171
adobe-type-tools · Jun 3, 2019 · 9ca5a58 · 9ca5a58
1 parent a280535
commit 9ca5a58
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/python/psautohint/ufoFont.py b/python/psautohint/ufoFont.py
@@ -435,7 +435,12 @@ def save(self, path):
 
         # 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()

diff --git a/tests/integration/data b/tests/integration/data
+0 −33		dummy/hashmap_dflt_layer_rehinted.ufo/glyphs.com.adobe.type.processedglyphs/a.glif
+0 −33		dummy/hashmap_dflt_layer_rehinted.ufo/glyphs.com.adobe.type.processedglyphs/after.glif
+0 −33		dummy/hashmap_dflt_layer_rehinted.ufo/glyphs.com.adobe.type.processedglyphs/before.glif
+0 −12		dummy/hashmap_dflt_layer_rehinted.ufo/glyphs.com.adobe.type.processedglyphs/contents.plist
+0 −4		dummy/hashmap_dflt_layer_rehinted.ufo/layercontents.plist