Skip to content

Commit fafe703

Browse files
committed
Be consistent with autohint settings identifier
So it's accurate in the report and generate
1 parent 2f733ac commit fafe703

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

Batch.roboFontExt/lib/webFormats/__init__.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
except:
3939
hasUfo2svg = False
4040

41+
autohint_identifier = "%s.%s" % (settingsIdentifier, "autohintSettings")
4142

4243
def getFontBounds(font):
4344
gs = font.getGlyphSet()
@@ -88,7 +89,7 @@ def convertToTTF(otfPath, dest, report):
8889
sourceFontWithTables.close()
8990
del sourceFontWithTables
9091

91-
autohintOptions = getExtensionDefault(settingsIdentifier, defaultOptions)
92+
autohintOptions = getExtensionDefault(autohint_identifier, defaultOptions)
9293
result = TTFAutohint(tempDest, dest, autohintOptions)
9394
report.writeItems(result)
9495

@@ -135,7 +136,7 @@ def generateTTF(ufoPath, dest, report):
135136
font.close()
136137
report.write(result)
137138

138-
autohintOptions = getExtensionDefault(settingsIdentifier, defaultOptions)
139+
autohintOptions = getExtensionDefault(autohint_identifier, defaultOptions)
139140
result = TTFAutohint(tempDest, dest, autohintOptions)
140141
report.writeItems(result)
141142

@@ -175,11 +176,9 @@ def convertToSVG(ttfPath, dest):
175176

176177
class TTHAutoHintSettings(BaseWindowController):
177178

178-
identifier = "%s.%s" % (settingsIdentifier, "autohintSettings")
179179

180180
def __init__(self, parentWindow):
181-
182-
data = getExtensionDefault(settingsIdentifier, dict())
181+
data = getExtensionDefault(autohint_identifier, dict())
183182
self.w = Sheet((470, 580), parentWindow=parentWindow)
184183

185184
self.w.tabs = Tabs((10, 10, -10, -40), ["TTF AutoHint", "HTML Preview"])
@@ -218,7 +217,7 @@ def resetCallback(self, sender):
218217

219218
def saveCallback(self, sender):
220219
data = self.settings.get()
221-
setExtensionDefault(settingsIdentifier, data)
220+
setExtensionDefault(autohint_identifier, data)
222221
setExtensionDefault("%s.htmlPreview" % settingsIdentifier, self.html.get())
223222
setExtensionDefault("%s.globalCSSPreview" % settingsIdentifier, self.globalCss.get())
224223
self.closeCallback(sender)
@@ -320,7 +319,7 @@ def _getTempTTF(self, path, report=None, preserveTTFhints=False):
320319
report.write("Auto hint the existing TTF file.")
321320
report.indent()
322321
tempDest = tempfile.mkstemp(suffix=".ttf")[1]
323-
autohintOptions = getExtensionDefault(settingsIdentifier, defaultOptions)
322+
autohintOptions = getExtensionDefault(autohint_identifier, defaultOptions)
324323
result = TTFAutohint(self._tempTTFPath, tempDest, autohintOptions)
325324
report.writeItems(result)
326325
os.remove(self._tempTTFPath)
@@ -585,7 +584,7 @@ def run(self, destDir, progress):
585584

586585
report.newLine()
587586
report.writeTitle("TTFAutohint options:")
588-
autohintOptions = getExtensionDefault(settingsIdentifier, defaultOptions)
587+
autohintOptions = getExtensionDefault(autohint_identifier, defaultOptions)
589588
report.writeDict(autohintOptions)
590589

591590
reportPath = os.path.join(destDir, "WebFonts Report.txt")

0 commit comments

Comments
 (0)