|
38 | 38 | except: |
39 | 39 | hasUfo2svg = False |
40 | 40 |
|
| 41 | +autohint_identifier = "%s.%s" % (settingsIdentifier, "autohintSettings") |
41 | 42 |
|
42 | 43 | def getFontBounds(font): |
43 | 44 | gs = font.getGlyphSet() |
@@ -88,7 +89,7 @@ def convertToTTF(otfPath, dest, report): |
88 | 89 | sourceFontWithTables.close() |
89 | 90 | del sourceFontWithTables |
90 | 91 |
|
91 | | - autohintOptions = getExtensionDefault(settingsIdentifier, defaultOptions) |
| 92 | + autohintOptions = getExtensionDefault(autohint_identifier, defaultOptions) |
92 | 93 | result = TTFAutohint(tempDest, dest, autohintOptions) |
93 | 94 | report.writeItems(result) |
94 | 95 |
|
@@ -135,7 +136,7 @@ def generateTTF(ufoPath, dest, report): |
135 | 136 | font.close() |
136 | 137 | report.write(result) |
137 | 138 |
|
138 | | - autohintOptions = getExtensionDefault(settingsIdentifier, defaultOptions) |
| 139 | + autohintOptions = getExtensionDefault(autohint_identifier, defaultOptions) |
139 | 140 | result = TTFAutohint(tempDest, dest, autohintOptions) |
140 | 141 | report.writeItems(result) |
141 | 142 |
|
@@ -175,11 +176,9 @@ def convertToSVG(ttfPath, dest): |
175 | 176 |
|
176 | 177 | class TTHAutoHintSettings(BaseWindowController): |
177 | 178 |
|
178 | | - identifier = "%s.%s" % (settingsIdentifier, "autohintSettings") |
179 | 179 |
|
180 | 180 | def __init__(self, parentWindow): |
181 | | - |
182 | | - data = getExtensionDefault(settingsIdentifier, dict()) |
| 181 | + data = getExtensionDefault(autohint_identifier, dict()) |
183 | 182 | self.w = Sheet((470, 580), parentWindow=parentWindow) |
184 | 183 |
|
185 | 184 | self.w.tabs = Tabs((10, 10, -10, -40), ["TTF AutoHint", "HTML Preview"]) |
@@ -218,7 +217,7 @@ def resetCallback(self, sender): |
218 | 217 |
|
219 | 218 | def saveCallback(self, sender): |
220 | 219 | data = self.settings.get() |
221 | | - setExtensionDefault(settingsIdentifier, data) |
| 220 | + setExtensionDefault(autohint_identifier, data) |
222 | 221 | setExtensionDefault("%s.htmlPreview" % settingsIdentifier, self.html.get()) |
223 | 222 | setExtensionDefault("%s.globalCSSPreview" % settingsIdentifier, self.globalCss.get()) |
224 | 223 | self.closeCallback(sender) |
@@ -320,7 +319,7 @@ def _getTempTTF(self, path, report=None, preserveTTFhints=False): |
320 | 319 | report.write("Auto hint the existing TTF file.") |
321 | 320 | report.indent() |
322 | 321 | tempDest = tempfile.mkstemp(suffix=".ttf")[1] |
323 | | - autohintOptions = getExtensionDefault(settingsIdentifier, defaultOptions) |
| 322 | + autohintOptions = getExtensionDefault(autohint_identifier, defaultOptions) |
324 | 323 | result = TTFAutohint(self._tempTTFPath, tempDest, autohintOptions) |
325 | 324 | report.writeItems(result) |
326 | 325 | os.remove(self._tempTTFPath) |
@@ -585,7 +584,7 @@ def run(self, destDir, progress): |
585 | 584 |
|
586 | 585 | report.newLine() |
587 | 586 | report.writeTitle("TTFAutohint options:") |
588 | | - autohintOptions = getExtensionDefault(settingsIdentifier, defaultOptions) |
| 587 | + autohintOptions = getExtensionDefault(autohint_identifier, defaultOptions) |
589 | 588 | report.writeDict(autohintOptions) |
590 | 589 |
|
591 | 590 | reportPath = os.path.join(destDir, "WebFonts Report.txt") |
|
0 commit comments