From 55d04fb22b31a565618340cbfc927a88fc0766a6 Mon Sep 17 00:00:00 2001 From: Miguel Sousa Date: Fri, 2 Nov 2018 17:31:19 -0700 Subject: [PATCH] Remove ufoLib dependency Fixes #666 --- python/afdko/checkoutlinesufo.py | 4 +-- python/afdko/ttfcomponentizer.py | 6 ++-- python/afdko/ufotools.py | 32 +++++++++++-------- requirements.txt | 17 +++++----- .../B_.glif | 2 +- .../C_caron.glif | 2 +- .../C_cedilla.glif | 2 +- .../H_.glif | 2 +- .../H_bar.glif | 2 +- .../I_circumflex.glif | 2 +- .../L_.glif | 2 +- .../L_commaaccent.glif | 2 +- .../L_dot.glif | 2 +- .../L_slash.glif | 2 +- .../N_commaaccent.glif | 2 +- .../N_grave.glif | 2 +- .../O_slash.glif | 2 +- .../O_slashmacron.glif | 2 +- .../S_.glif | 2 +- .../S_acute.glif | 2 +- .../S_caron.glif | 2 +- .../S_cedilla.glif | 2 +- .../caroncmb.cap.glif | 2 +- .../ccedilla.glif | 2 +- .../cedillacmb.cap.glif | 2 +- .../commabelowcmb.glif | 2 +- .../contents.plist | 2 +- .../s.glif | 2 +- .../sacute.glif | 2 +- .../scaron.glif | 2 +- .../scedilla.glif | 2 +- .../ufo2-proc-layer.ufo/layercontents.plist | 2 +- .../ufo2-proc-layer.ufo/metainfo.plist | 4 +-- .../B_.glif | 2 +- .../C_caron.glif | 2 +- .../C_cedilla.glif | 2 +- .../H_.glif | 2 +- .../H_bar.glif | 2 +- .../I_circumflex.glif | 2 +- .../L_.glif | 2 +- .../L_commaaccent.glif | 2 +- .../L_dot.glif | 2 +- .../L_slash.glif | 2 +- .../N_commaaccent.glif | 2 +- .../N_grave.glif | 2 +- .../O_slash.glif | 2 +- .../O_slashmacron.glif | 2 +- .../S_.glif | 2 +- .../S_acute.glif | 2 +- .../S_caron.glif | 2 +- .../S_cedilla.glif | 2 +- .../caroncmb.cap.glif | 2 +- .../ccedilla.glif | 2 +- .../cedillacmb.cap.glif | 2 +- .../commabelowcmb.glif | 2 +- .../contents.plist | 2 +- .../s.glif | 2 +- .../sacute.glif | 2 +- .../scaron.glif | 2 +- .../scedilla.glif | 2 +- .../ufo3-proc-layer.ufo/layercontents.plist | 2 +- .../ufo3-proc-layer.ufo/metainfo.plist | 4 +-- .../expected_output/bold.ufo/metainfo.plist | 4 +-- .../extralight.ufo/metainfo.plist | 2 +- .../A_.glif | 2 +- .../A_acute.glif | 2 +- .../A_dieresis.glif | 2 +- .../A_tilde.glif | 2 +- .../Y_.glif | 2 +- .../Y_acute.glif | 2 +- .../Y_dieresis.glif | 2 +- .../Y_tilde.glif | 2 +- .../a.glif | 2 +- .../aacute.glif | 2 +- .../adieresis.glif | 2 +- .../atilde.glif | 2 +- .../contents.plist | 2 +- .../y.glif | 2 +- .../yacute.glif | 2 +- .../ydieresis.glif | 2 +- .../ytilde.glif | 2 +- .../expected_output/light.ufo/metainfo.plist | 2 +- .../regular.ufo/metainfo.plist | 2 +- .../regular1.ufo/metainfo.plist | 4 +-- tests/makeotf_test.py | 6 ++-- tests/ttfcomponentizer_test.py | 9 ++---- 86 files changed, 120 insertions(+), 122 deletions(-) diff --git a/python/afdko/checkoutlinesufo.py b/python/afdko/checkoutlinesufo.py index 54c27192c..66648fd0c 100644 --- 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 index 27114bb12..22803f0c1 100755 --- 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 index 104a095dc..1ad8e0ae6 100644 --- 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 index 80ae67002..36ebdbaeb 100644 --- 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/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/B_.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/B_.glif index db27e2739..3b4f370f9 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/B_.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/B_.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_caron.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_caron.glif index 6555ae385..147c34345 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_caron.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_caron.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_cedilla.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_cedilla.glif index 9216b2303..f6bfe5c45 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_cedilla.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_cedilla.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_.glif index 69748d217..6ae6dbcac 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_bar.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_bar.glif index e089a8ec7..5149910ef 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_bar.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_bar.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/I_circumflex.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/I_circumflex.glif index 4b2356f59..91c6f67bd 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/I_circumflex.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/I_circumflex.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_.glif index d08eade7c..4c79f151f 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_commaaccent.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_commaaccent.glif index d6a867ea3..9c5db3b5d 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_commaaccent.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_commaaccent.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_dot.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_dot.glif index f08adfb4a..3b11633b5 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_dot.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_dot.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_slash.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_slash.glif index 672fdec5f..f848009c9 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_slash.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_slash.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_commaaccent.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_commaaccent.glif index adab4c07c..50989dc5b 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_commaaccent.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_commaaccent.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_grave.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_grave.glif index c359fa934..b0127b358 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_grave.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_grave.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slash.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slash.glif index 793b0ca96..d08324849 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slash.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slash.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slashmacron.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slashmacron.glif index 941103063..87954706f 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slashmacron.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slashmacron.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_.glif index 604483278..75c1b737c 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_acute.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_acute.glif index 47c5e20c9..e2faff65f 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_acute.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_acute.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_caron.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_caron.glif index c9f97a82e..7bf58f377 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_caron.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_caron.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_cedilla.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_cedilla.glif index 6e6ddea56..b58c33c41 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_cedilla.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_cedilla.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/caroncmb.cap.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/caroncmb.cap.glif index a6624c879..9d7283e39 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/caroncmb.cap.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/caroncmb.cap.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/ccedilla.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/ccedilla.glif index 5179acd3f..a2da54db9 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/ccedilla.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/ccedilla.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/cedillacmb.cap.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/cedillacmb.cap.glif index 1918838e8..41d3fe3bc 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/cedillacmb.cap.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/cedillacmb.cap.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/commabelowcmb.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/commabelowcmb.glif index ecaa11b26..09e60ed52 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/commabelowcmb.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/commabelowcmb.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/contents.plist b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/contents.plist index 80d5bda88..1cf8b46c8 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/contents.plist +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/contents.plist @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/s.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/s.glif index 034cd6db3..21186b639 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/s.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/s.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/sacute.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/sacute.glif index f5bb2af3e..38cbd3ee8 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/sacute.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/sacute.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scaron.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scaron.glif index b021b84ed..62076cec4 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scaron.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scaron.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scedilla.glif b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scedilla.glif index 5d74777b0..044593ded 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scedilla.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo2-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scedilla.glif @@ -1,4 +1,4 @@ - + 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 index f477ba09b..b07680883 100644 --- 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 @@ - + 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 index 58145b5a1..65beda3c6 100644 --- 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 @@ - + creator - org.robofab.ufoLib + com.github.fonttools.ufoLib formatVersion 2 diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/B_.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/B_.glif index 3ede2b949..0e85c5ba7 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/B_.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/B_.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_caron.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_caron.glif index 3af82d92d..62ab68ca3 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_caron.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_caron.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_cedilla.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_cedilla.glif index 03d14ebbb..6065ca76b 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_cedilla.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/C_cedilla.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_.glif index 2546470b7..6c87f74e1 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_bar.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_bar.glif index 893e9cf88..2c7721586 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_bar.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/H_bar.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/I_circumflex.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/I_circumflex.glif index 4030805a2..cfa942b3b 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/I_circumflex.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/I_circumflex.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_.glif index 66ce8323a..b6707325e 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_commaaccent.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_commaaccent.glif index 2130f57a6..2081ac776 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_commaaccent.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_commaaccent.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_dot.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_dot.glif index 6a50c2f57..af29d89df 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_dot.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_dot.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_slash.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_slash.glif index 15378223e..e16866840 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_slash.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/L_slash.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_commaaccent.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_commaaccent.glif index b783aa2f6..a88f9e503 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_commaaccent.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_commaaccent.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_grave.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_grave.glif index 27a75b739..1bb5b246e 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_grave.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/N_grave.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slash.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slash.glif index 4c2480e37..62d65c785 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slash.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slash.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slashmacron.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slashmacron.glif index e4868fd44..eeedbc0c6 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slashmacron.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/O_slashmacron.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_.glif index fe8c16644..54b3f7e4d 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_acute.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_acute.glif index 89985a858..99c6a35fb 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_acute.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_acute.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_caron.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_caron.glif index 176e4820a..19f9fa25f 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_caron.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_caron.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_cedilla.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_cedilla.glif index e1b7c1e57..7fa54ac62 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_cedilla.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/S_cedilla.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/caroncmb.cap.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/caroncmb.cap.glif index 5ab769403..08d8c5a5a 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/caroncmb.cap.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/caroncmb.cap.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/ccedilla.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/ccedilla.glif index 8a6d2e02b..a130d8880 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/ccedilla.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/ccedilla.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/cedillacmb.cap.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/cedillacmb.cap.glif index 73c1ef0fb..01e2c8309 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/cedillacmb.cap.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/cedillacmb.cap.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/commabelowcmb.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/commabelowcmb.glif index 3eb7601ae..79bcc5340 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/commabelowcmb.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/commabelowcmb.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/contents.plist b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/contents.plist index 80d5bda88..1cf8b46c8 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/contents.plist +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/contents.plist @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/s.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/s.glif index 2b5541be3..ad1e9c671 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/s.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/s.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/sacute.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/sacute.glif index 5550cded2..6b3a4500e 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/sacute.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/sacute.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scaron.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scaron.glif index dff0592bf..9cb25d153 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scaron.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scaron.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scedilla.glif b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scedilla.glif index 6240e9497..a390f335d 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scedilla.glif +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/glyphs.com.adobe.type.processedglyphs/scedilla.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/layercontents.plist b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/layercontents.plist index f477ba09b..b07680883 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/layercontents.plist +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/layercontents.plist @@ -1,4 +1,4 @@ - + diff --git a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/metainfo.plist b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/metainfo.plist index 8e836fbfb..7b8b34ac6 100644 --- a/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/metainfo.plist +++ b/tests/checkoutlinesufo_data/expected_output/ufo3-proc-layer.ufo/metainfo.plist @@ -1,9 +1,9 @@ - + creator - org.robofab.ufoLib + com.github.fonttools.ufoLib formatVersion 3 diff --git a/tests/makeinstancesufo_data/expected_output/bold.ufo/metainfo.plist b/tests/makeinstancesufo_data/expected_output/bold.ufo/metainfo.plist index 58145b5a1..65beda3c6 100644 --- a/tests/makeinstancesufo_data/expected_output/bold.ufo/metainfo.plist +++ b/tests/makeinstancesufo_data/expected_output/bold.ufo/metainfo.plist @@ -1,9 +1,9 @@ - + creator - org.robofab.ufoLib + com.github.fonttools.ufoLib formatVersion 2 diff --git a/tests/makeinstancesufo_data/expected_output/extralight.ufo/metainfo.plist b/tests/makeinstancesufo_data/expected_output/extralight.ufo/metainfo.plist index 9c654d4c2..ca3852e2b 100644 --- a/tests/makeinstancesufo_data/expected_output/extralight.ufo/metainfo.plist +++ b/tests/makeinstancesufo_data/expected_output/extralight.ufo/metainfo.plist @@ -3,7 +3,7 @@ creator - org.robofab.ufoLib + com.github.fonttools.ufoLib formatVersion 2 diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/A_.glif b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/A_.glif index 04d25eba6..a8b5f5551 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/A_.glif +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/A_.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/A_acute.glif b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/A_acute.glif index 48a0ad7d7..21ba72a2a 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/A_acute.glif +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/A_acute.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/A_dieresis.glif b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/A_dieresis.glif index 63658ac37..1a392f16a 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/A_dieresis.glif +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/A_dieresis.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/A_tilde.glif b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/A_tilde.glif index 4c7c77531..21c89a979 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/A_tilde.glif +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/A_tilde.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/Y_.glif b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/Y_.glif index 784499da5..2e4395557 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/Y_.glif +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/Y_.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/Y_acute.glif b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/Y_acute.glif index b0917301a..06a6f5a11 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/Y_acute.glif +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/Y_acute.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/Y_dieresis.glif b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/Y_dieresis.glif index 8ed21e0b9..8a3c1f70d 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/Y_dieresis.glif +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/Y_dieresis.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/Y_tilde.glif b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/Y_tilde.glif index c8b602fef..728a37cd9 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/Y_tilde.glif +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/Y_tilde.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/a.glif b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/a.glif index eda6cbfd4..4dc4a879d 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/a.glif +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/a.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/aacute.glif b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/aacute.glif index 33e3385c8..af16a1284 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/aacute.glif +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/aacute.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/adieresis.glif b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/adieresis.glif index 36bef6d20..1e859a174 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/adieresis.glif +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/adieresis.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/atilde.glif b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/atilde.glif index d2de15464..4fcd2e44d 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/atilde.glif +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/atilde.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/contents.plist b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/contents.plist index af5b893f7..41edc9de1 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/contents.plist +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/contents.plist @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/y.glif b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/y.glif index e9befb047..a7666c700 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/y.glif +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/y.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/yacute.glif b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/yacute.glif index 4081fbc00..9901d5823 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/yacute.glif +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/yacute.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/ydieresis.glif b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/ydieresis.glif index 41cef835c..3bcd7c7ab 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/ydieresis.glif +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/ydieresis.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/ytilde.glif b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/ytilde.glif index 24502b570..c94b96e0e 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/ytilde.glif +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/glyphs.com.adobe.type.processedglyphs/ytilde.glif @@ -1,4 +1,4 @@ - + diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/metainfo.plist b/tests/makeinstancesufo_data/expected_output/light.ufo/metainfo.plist index 9c654d4c2..ca3852e2b 100644 --- a/tests/makeinstancesufo_data/expected_output/light.ufo/metainfo.plist +++ b/tests/makeinstancesufo_data/expected_output/light.ufo/metainfo.plist @@ -3,7 +3,7 @@ creator - org.robofab.ufoLib + com.github.fonttools.ufoLib formatVersion 2 diff --git a/tests/makeinstancesufo_data/expected_output/regular.ufo/metainfo.plist b/tests/makeinstancesufo_data/expected_output/regular.ufo/metainfo.plist index 9c654d4c2..ca3852e2b 100644 --- a/tests/makeinstancesufo_data/expected_output/regular.ufo/metainfo.plist +++ b/tests/makeinstancesufo_data/expected_output/regular.ufo/metainfo.plist @@ -3,7 +3,7 @@ creator - org.robofab.ufoLib + com.github.fonttools.ufoLib formatVersion 2 diff --git a/tests/makeinstancesufo_data/expected_output/regular1.ufo/metainfo.plist b/tests/makeinstancesufo_data/expected_output/regular1.ufo/metainfo.plist index 58145b5a1..65beda3c6 100644 --- a/tests/makeinstancesufo_data/expected_output/regular1.ufo/metainfo.plist +++ b/tests/makeinstancesufo_data/expected_output/regular1.ufo/metainfo.plist @@ -1,9 +1,9 @@ - + creator - org.robofab.ufoLib + com.github.fonttools.ufoLib formatVersion 2 diff --git a/tests/makeotf_test.py b/tests/makeotf_test.py index e08f9cf3f..56fba4655 100755 --- a/tests/makeotf_test.py +++ b/tests/makeotf_test.py @@ -33,8 +33,8 @@ TEMP_DIR = os.path.join(DATA_DIR, 'temp_output') -xfail_py36_win = pytest.mark.xfail( - sys.version_info >= (3, 0) and sys.platform == 'win32', +xfail_win = pytest.mark.xfail( + sys.platform == 'win32', reason="Console's encoding is not UTF-8 ?") @@ -111,7 +111,7 @@ def test_getSourceGOADBData(): ['g2', 'g2', '']] -@xfail_py36_win +@xfail_win @pytest.mark.parametrize('input_filename', [ T1PFA_NAME, UFO2_NAME, UFO3_NAME, CID_NAME]) def test_path_with_non_ascii_chars_bug222(input_filename): diff --git a/tests/ttfcomponentizer_test.py b/tests/ttfcomponentizer_test.py index 98b8f63d3..6ec515736 100644 --- a/tests/ttfcomponentizer_test.py +++ b/tests/ttfcomponentizer_test.py @@ -7,7 +7,6 @@ import tempfile from fontTools.ttLib import TTFont -from fontTools.ufoLib.errors import UFOLibError from afdko import ttfcomponentizer as ttfcomp @@ -90,9 +89,7 @@ def test_run_invalid_ufo(): ufo_path = save_path + '.ufo' copy2(ttf_path, save_path) copy2(ttf_path, ufo_path) - with pytest.raises(UFOLibError): - # message: 'The specified UFO does not have a known structure' - ttfcomp.main([save_path]) + assert ttfcomp.main([save_path]) == 1 def test_run_with_output_path(): @@ -197,9 +194,7 @@ def test_get_goadb_names_mapping_goadb_not_found(): def test_get_glyph_names_mapping_invalid_ufo(): path = _get_test_ttf_path() - with pytest.raises(UFOLibError): - # message: 'The specified UFO does not have a known structure' - ttfcomp.get_glyph_names_mapping(path) + assert ttfcomp.get_glyph_names_mapping(path) == (None, None) def test_get_glyph_names_mapping_names_from_lib():