Remove ufoLib dependency

Fixes #666
adobe-type-tools · Dec 5, 2018 · 55d04fb · 55d04fb
1 parent 7820ad7
commit 55d04fb
Show file tree

Hide file tree

Showing 86 changed files with 120 additions and 122 deletions.
diff --git a/python/afdko/checkoutlinesufo.py b/python/afdko/checkoutlinesufo.py
@@ -6,7 +6,7 @@
 
 from __future__ import print_function, absolute_import
 
-__version__ = '2.2.1'
+__version__ = '2.2.2'
 
 import argparse
 from functools import cmp_to_key
@@ -20,8 +20,8 @@
 
 import booleanOperations.booleanGlyph
 import defcon
-import ufoLib
 from fontPens.digestPointPen import DigestPointPen
+from fontTools import ufoLib
 
 from afdko import ufotools
 from afdko.ufotools import kProcessedGlyphsLayer as PROCD_GLYPHS_LAYER

diff --git a/python/afdko/ttfcomponentizer.py b/python/afdko/ttfcomponentizer.py
@@ -14,13 +14,13 @@
 import os
 import sys
 
-from fontTools.ttLib import TTFont, getTableModule
 from fontTools.misc.py23 import open
+from fontTools.ttLib import TTFont, getTableModule
+from fontTools.ufoLib.errors import UFOLibError
 from defcon import Font
-from ufoLib import UFOLibError
 
 
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 
 
 PUBLIC_PSNAMES = "public.postscriptNames"

diff --git a/python/afdko/ufotools.py b/python/afdko/ufotools.py
@@ -1,7 +1,8 @@
 # Copyright 2017 Adobe. All rights reserved.
 
-from __future__ import print_function, absolute_import
+from __future__ import print_function, absolute_import, unicode_literals
 
+import ast
 import hashlib
 import os
 import plistlib
@@ -12,12 +13,12 @@
 except ImportError:
     import xml.etree.ElementTree as ET
 
-from fontTools.misc.py23 import open, tobytes, tounicode
+from fontTools.misc.py23 import open, tobytes, tounicode, tostr
 
 from afdko import convertfonttocid, fdkutils
 
 __doc__ = """
-ufotools.py v1.32.0 Nov 1 2018
+ufotools.py v1.32.1 Nov 2 2018
 
 This module supports using the Adobe FDK tools which operate on 'bez'
 files with UFO fonts. It provides low level utilities to manipulate UFO
@@ -329,14 +330,14 @@ def debugMsg(*args):
 kDefaultGlyphsLayerName = "public.default"
 kDefaultGlyphsLayer = "glyphs"
 kProcessedGlyphsLayerName = "com.adobe.type.processedglyphs"
-kProcessedGlyphsLayer = "glyphs." + kProcessedGlyphsLayerName
+kProcessedGlyphsLayer = "glyphs.%s" % kProcessedGlyphsLayerName
 kFontInfoName = "fontinfo.plist"
 kContentsName = "contents.plist"
 kLibName = "lib.plist"
 kPublicGlyphOrderKey = "public.glyphOrder"
 
 kAdobeDomainPrefix = "com.adobe.type"
-kAdobHashMapName = "%s.processedHashMap" % (kAdobeDomainPrefix)
+kAdobHashMapName = "%s.processedHashMap" % kAdobeDomainPrefix
 kAdobHashMapVersionName = "hashMapVersion"
 kAdobHashMapVersion = (1, 0)  # If major version differs, do not use.
 kAutohintName = "autohint"
@@ -379,7 +380,7 @@ class BezParseError(Exception):
 
 class UFOFontData(object):
     def __init__(self, parentPath, useHashMap, programName):
-        self.parentPath = parentPath
+        self.parentPath = tounicode(parentPath, encoding='utf-8')
         self.glyphMap = {}
         self.processedLayerGlyphMap = {}
         self.newGlyphMap = {}
@@ -395,11 +396,12 @@ def __init__(self, parentPath, useHashMap, programName):
         # hash matches hash of current glyph data.
         self.hashMap = {}
         self.fontDict = None
-        self.programName = programName
+        self.programName = tostr(programName)
         self.curSrcDir = None
         self.hashMapChanged = 0
-        self.glyphDefaultDir = os.path.join(parentPath, "glyphs")
-        self.glyphLayerDir = os.path.join(parentPath, kProcessedGlyphsLayer)
+        self.glyphDefaultDir = os.path.join(self.parentPath, "glyphs")
+        self.glyphLayerDir = os.path.join(self.parentPath,
+                                          kProcessedGlyphsLayer)
         self.glyphWriteDir = self.glyphLayerDir
         self.historyList = []
         self.requiredHistory = []  # See documentation above.
@@ -509,7 +511,7 @@ def readHashMap(self):
         if os.path.exists(hashPath):
             with open(hashPath, "r", encoding='utf-8') as fp:
                 data = fp.read()
-            newMap = eval(data)
+            newMap = ast.literal_eval(data)
         else:
             newMap = {kAdobHashMapVersionName: kAdobHashMapVersion}
 
@@ -614,7 +616,7 @@ def updateHashEntry(self, glyphName, changed):
         # and we have just created a new glyph in the processed layer,
         # then reset the history.
         if (not self.useProcessedLayer) and changed:
-            self.hashMap[glyphName] = [srcHash, [self.programName]]
+            self.hashMap[glyphName] = [tostr(srcHash), [self.programName]]
             return
         # If the program is not in the history list, add it.
         elif self.programName not in historyList:
@@ -654,7 +656,8 @@ def checkSkipGlyph(self, glyphName, newSrcHash, doAll):
                 # case for Checkoutlines
                 if not self.useProcessedLayer:
                     self.hashMapChanged = 1
-                    self.hashMap[glyphName] = [newSrcHash, [self.programName]]
+                    self.hashMap[glyphName] = [tostr(newSrcHash),
+                                               [self.programName]]
                     glyphPath = self.getGlyphProcessedPath(glyphName)
                     if glyphPath and os.path.exists(glyphPath):
                         os.remove(glyphPath)
@@ -682,7 +685,7 @@ def checkSkipGlyph(self, glyphName, newSrcHash, doAll):
             # If the source hash has changed, we need to
             # delete the processed layer glyph.
             self.hashMapChanged = 1
-            self.hashMap[glyphName] = [newSrcHash, [self.programName]]
+            self.hashMap[glyphName] = [tostr(newSrcHash), [self.programName]]
             glyphPath = self.getGlyphProcessedPath(glyphName)
             if glyphPath and os.path.exists(glyphPath):
                 os.remove(glyphPath)
@@ -2483,7 +2486,8 @@ def validateLayers(ufoFontPath, doWarning=True):
 
 
 def makeUFOFMNDB(srcFontPath):
-    fontInfoPath = os.path.join(srcFontPath, kFontInfoName)  # default
+    fontInfoPath = os.path.join(tounicode(srcFontPath, encoding='utf-8'),
+                                kFontInfoName)  # default
     fiMap, fiList = parsePList(fontInfoPath)
     psName = "NoFamilyName-Regular"
     familyName = "NoFamilyName"

diff --git a/requirements.txt b/requirements.txt
@@ -1,10 +1,9 @@
-booleanOperations~=0.8.1
-cu2qu[cli]~=1.6.5
-defcon[lxml,pens]~=0.6.0
-fontMath~=0.4.8
-fontTools[ufo,unicode,lxml]~=3.32.0
-mutatorMath~=2.1.2
+booleanOperations==0.8.1
+cu2qu[cli]==1.6.5
+defcon[lxml,pens]==0.6.0
+fontMath==0.4.8
+fontTools[ufo,unicode,lxml]==3.32.0
+mutatorMath==2.1.2
 psautohint==1.8.1
-ufoLib[lxml]==2.3.2
-ufonormalizer~=0.3.5
-ufoProcessor~=1.0.1
+ufonormalizer==0.3.5
+ufoProcessor==1.0.2
diff --git a/...fo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/B_.glif b/...fo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/B_.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="B" format="1">
   <advance width="628"/>
   <unicode hex="0042"/>

diff --git a/...ta/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_caron.glif b/...ta/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_caron.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccaron" format="1">
   <advance width="632"/>
   <unicode hex="010C"/>

diff --git a/.../expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_cedilla.glif b/.../expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_cedilla.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedilla" format="1">
   <advance width="632"/>
   <unicode hex="00C7"/>

diff --git a/...fo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_.glif b/...fo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="H" format="1">
   <advance width="790"/>
   <unicode hex="0048"/>

diff --git a/...data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_bar.glif b/...data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_bar.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hbar" format="1">
   <advance width="790"/>
   <unicode hex="0126"/>

diff --git a/...pected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/I_circumflex.glif b/...pected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/I_circumflex.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Icircumflex" format="1">
   <advance width="370"/>
   <unicode hex="00CE"/>

diff --git a/...fo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_.glif b/...fo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="L" format="1">
   <advance width="597"/>
   <unicode hex="004C"/>

diff --git a/...ected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_commaaccent.glif b/...ected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_commaaccent.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcommaaccent" format="1">
   <advance width="597"/>
   <unicode hex="013B"/>

diff --git a/...data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_dot.glif b/...data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_dot.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldot" format="1">
   <advance width="597"/>
   <unicode hex="013F"/>

diff --git a/...ta/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_slash.glif b/...ta/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_slash.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lslash" format="1">
   <advance width="597"/>
   <unicode hex="0141"/>

diff --git a/...ected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_commaaccent.glif b/...ected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_commaaccent.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ncommaaccent" format="1">
   <advance width="735"/>
   <unicode hex="0145"/>

diff --git a/...ta/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_grave.glif b/...ta/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_grave.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ngrave" format="1">
   <advance width="735"/>
   <unicode hex="01F8"/>

diff --git a/...ta/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slash.glif b/...ta/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slash.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oslash" format="1">
   <advance width="707"/>
   <unicode hex="00D8"/>

diff --git a/...ected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slashmacron.glif b/...ected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slashmacron.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oslashmacron" format="1">
   <advance width="707"/>
   <outline>

diff --git a/...fo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_.glif b/...fo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="S" format="1">
   <advance width="510"/>
   <unicode hex="0053"/>

diff --git a/...ta/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_acute.glif b/...ta/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_acute.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacute" format="1">
   <advance width="510"/>
   <unicode hex="015A"/>

diff --git a/...ta/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_caron.glif b/...ta/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_caron.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scaron" format="1">
   <advance width="510"/>
   <unicode hex="0160"/>

diff --git a/.../expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_cedilla.glif b/.../expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_cedilla.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scedilla" format="1">
   <advance width="510"/>
   <unicode hex="015E"/>

diff --git a/...pected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/caroncmb.cap.glif b/...pected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/caroncmb.cap.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="caroncmb.cap" format="1">
   <outline>
     <contour>

diff --git a/...a/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/ccedilla.glif b/...a/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/ccedilla.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccedilla" format="1">
   <advance width="486"/>
   <unicode hex="00E7"/>

diff --git a/...cted_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/cedillacmb.cap.glif b/...cted_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/cedillacmb.cap.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cedillacmb.cap" format="1">
   <outline>
     <contour>

diff --git a/...ected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/commabelowcmb.glif b/...ected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/commabelowcmb.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="commabelowcmb" format="1">
   <unicode hex="0326"/>
   <outline>

diff --git a/.../expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/contents.plist b/.../expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/contents.plist
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
   <dict>

diff --git a/...ufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/s.glif b/...ufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/s.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="s" format="1">
   <advance width="433"/>
   <unicode hex="0073"/>

diff --git a/...ata/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/sacute.glif b/...ata/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/sacute.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sacute" format="1">
   <advance width="433"/>
   <unicode hex="015B"/>

diff --git a/...ata/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scaron.glif b/...ata/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scaron.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scaron" format="1">
   <advance width="433"/>
   <unicode hex="0161"/>

diff --git a/...a/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scedilla.glif b/...a/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scedilla.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scedilla" format="1">
   <advance width="433"/>
   <unicode hex="015F"/>

diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/layercontents.plist b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/layercontents.plist
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
   <array>

diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/metainfo.plist b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/metainfo.plist
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
   <dict>
     <key>creator</key>
-    <string>org.robofab.ufoLib</string>
+    <string>com.github.fonttools.ufoLib</string>
     <key>formatVersion</key>
     <integer>2</integer>
   </dict>

diff --git a/...fo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/B_.glif b/...fo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/B_.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="B" format="2">
   <advance width="628"/>
   <unicode hex="0042"/>

diff --git a/...ta/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_caron.glif b/...ta/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_caron.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccaron" format="2">
   <advance width="632"/>
   <unicode hex="010C"/>

diff --git a/.../expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_cedilla.glif b/.../expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_cedilla.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedilla" format="2">
   <advance width="632"/>
   <unicode hex="00C7"/>

diff --git a/...fo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_.glif b/...fo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="H" format="2">
   <advance width="790"/>
   <unicode hex="0048"/>

diff --git a/...data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_bar.glif b/...data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_bar.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hbar" format="2">
   <advance width="790"/>
   <unicode hex="0126"/>

diff --git a/...pected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/I_circumflex.glif b/...pected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/I_circumflex.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Icircumflex" format="2">
   <advance width="370"/>
   <unicode hex="00CE"/>

diff --git a/...fo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_.glif b/...fo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="L" format="2">
   <advance width="597"/>
   <unicode hex="004C"/>

diff --git a/...ected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_commaaccent.glif b/...ected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_commaaccent.glif
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcommaaccent" format="2">
   <advance width="597"/>
   <unicode hex="013B"/>