Skip to content

Commit 6cdadbc

Browse files
typemytypetypemytype
authored
Merge pull request #58 from ryanbugden/master
Webfont export folders, slider
2 parents 69022eb + f558599 commit 6cdadbc

3 files changed

Lines changed: 33 additions & 22 deletions

File tree

‎Batch.roboFontExt/info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
<key>requiresVersionMinor</key>
2222
<string>2</string>
2323
<key>timeStamp</key>
24-
<real>1373965736.141633</real>
24+
<real>1680146593</real>
2525
<key>version</key>
26-
<string>1.9.12</string>
26+
<string>1.9.13</string>
2727
<key>com.robofontmechanic.Mechanic</key>
2828
<dict>
2929
<key>repository</key>

‎Batch.roboFontExt/lib/webFormats/__init__.py‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -393,24 +393,35 @@ def _convertPath(self, path, destDir, saveOTF=True, saveTTF=True, saveWOFF=True,
393393
fileName += suffix
394394
fileName = fileName.replace(" ", "_")
395395

396+
# if Export in Sub Folder is selected, build a directory for each format
396397
if self.controller.exportInFolders():
397-
fontDir = os.path.join(destDir, familyName.replace(" ", ""), styleName.replace(" ", ""))
398+
otfDir = os.path.join(destDir, 'otf')
399+
ttfDir = os.path.join(destDir, 'ttf')
400+
woffDir = os.path.join(destDir, 'woff')
401+
woff2Dir = os.path.join(destDir, 'woff2')
402+
eotDir = os.path.join(destDir, 'eot')
403+
svgDir = os.path.join(destDir, 'svg')
398404
else:
399-
fontDir = destDir
400-
401-
otfPath = os.path.join(fontDir, fileName + ".otf")
402-
ttfPath = os.path.join(fontDir, fileName + ".ttf")
403-
woffPath = os.path.join(fontDir, fileName + ".woff")
404-
woff2Path = os.path.join(fontDir, fileName + ".woff2")
405-
eotPath = os.path.join(fontDir, fileName + ".eot")
406-
svgPath = os.path.join(fontDir, fileName + ".svg")
405+
otfDir = destDir
406+
ttfDir = destDir
407+
woffDir = destDir
408+
woff2Dir = destDir
409+
eotDir = destDir
410+
svgDir = destDir
411+
412+
otfPath = os.path.join(otfDir, fileName + ".otf")
413+
ttfPath = os.path.join(ttfDir, fileName + ".ttf")
414+
woffPath = os.path.join(woffDir, fileName + ".woff")
415+
woff2Path = os.path.join(woff2Dir, fileName + ".woff2")
416+
eotPath = os.path.join(eotDir, fileName + ".eot")
417+
svgPath = os.path.join(svgDir, fileName + ".svg")
407418

408419
# save otf
409420
if saveOTF:
410421
report.writeTitle("Build OTF", "'")
411422
report.indent()
412423
report.write("path: %s" % otfPath)
413-
buildTree(fontDir)
424+
buildTree(otfDir)
414425
temp = self._getTempOTF(path, report=report, preserveTTFhints=preserveTTFhints)
415426
shutil.copyfile(temp, otfPath)
416427
report.dedent()
@@ -421,7 +432,7 @@ def _convertPath(self, path, destDir, saveOTF=True, saveTTF=True, saveWOFF=True,
421432
report.writeTitle("Build TTF", "'")
422433
report.indent()
423434
report.write("path: %s" % ttfPath)
424-
buildTree(fontDir)
435+
buildTree(ttfDir)
425436
temp = self._getTempTTF(path, report=report, preserveTTFhints=preserveTTFhints)
426437
shutil.copyfile(temp, ttfPath)
427438
report.dedent()
@@ -438,7 +449,7 @@ def _convertPath(self, path, destDir, saveOTF=True, saveTTF=True, saveWOFF=True,
438449
report.writeTitle("Build WOFF (%s)" % reportFormat, "'")
439450
report.indent()
440451
report.write("path: %s" % woffPath)
441-
buildTree(fontDir)
452+
buildTree(woffDir)
442453
temp = func(path, report=report, preserveTTFhints=preserveTTFhints)
443454
convertToWoff(temp, woffPath)
444455
report.dedent()
@@ -455,7 +466,7 @@ def _convertPath(self, path, destDir, saveOTF=True, saveTTF=True, saveWOFF=True,
455466
report.writeTitle("Build WOFF2 (%s)" % reportFormat, "'")
456467
report.indent()
457468
report.write("path: %s" % woff2Path)
458-
buildTree(fontDir)
469+
buildTree(woff2Dir)
459470
temp = func(path, report=report, preserveTTFhints=preserveTTFhints)
460471
convertToWoff2(temp, woff2Path)
461472
report.dedent()
@@ -466,7 +477,7 @@ def _convertPath(self, path, destDir, saveOTF=True, saveTTF=True, saveWOFF=True,
466477
report.writeTitle("Build EOT", "'")
467478
report.indent()
468479
report.write("path: %s" % eotPath)
469-
buildTree(fontDir)
480+
buildTree(eotDir)
470481
temp = self._getTempTTF(path, report=report, preserveTTFhints=preserveTTFhints)
471482
convertToEot(temp, eotPath)
472483
report.dedent()
@@ -477,7 +488,7 @@ def _convertPath(self, path, destDir, saveOTF=True, saveTTF=True, saveWOFF=True,
477488
report.writeTitle("Build SVG", "'")
478489
report.indent()
479490
report.write("path: %s" % svgPath)
480-
buildTree(fontDir)
491+
buildTree(svgDir)
481492
message = convertToSVG(path, svgPath)
482493
if message:
483494
report.indent()

‎Batch.roboFontExt/lib/webFormats/autohint.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import vanilla
88

9-
from lib.UI.stepper import SliderEditIntStepper
9+
from lib.UI.stepper import SliderEditStepper
1010

1111
from batchTools import updateWithDefaultValues
1212

@@ -152,24 +152,24 @@ def __init__(self, posSize):
152152
y = 10
153153

154154
self.hintRangeMininmumText = vanilla.TextBox((10, y+2, column, 22), "Hint Set Range Minimum:", alignment="right")
155-
self.hintRangeMinimum = SliderEditIntStepper((column + gutter, y, -10, 22), self.options["hintRangeMinimum"], callback=self.hintRangeMinimumMaximumCallback)
155+
self.hintRangeMinimum = SliderEditStepper((column + gutter, y, -10, 22), self.options["hintRangeMinimum"], callback=self.hintRangeMinimumMaximumCallback)
156156

157157
y += 30
158158
self.hintRangeMaximumText = vanilla.TextBox((10, y+2, column, 22), "Hint Set Range Maximum:", alignment="right")
159-
self.hintRangeMaximum = SliderEditIntStepper((column + gutter, y, -10, 22), self.options["hintRangeMaximum"], callback=self.hintRangeMinimumMaximumCallback)
159+
self.hintRangeMaximum = SliderEditStepper((column + gutter, y, -10, 22), self.options["hintRangeMaximum"], callback=self.hintRangeMinimumMaximumCallback)
160160

161161
y += 50
162162

163163
self.hintingLimitText = vanilla.TextBox((10, y+2, column, 22), "Hinting Limit:", alignment="right")
164-
self.hintingLimit = SliderEditIntStepper((column + gutter, y, -10, 22), self.options["hintingLimit"])
164+
self.hintingLimit = SliderEditStepper((column + gutter, y, -10, 22), self.options["hintingLimit"])
165165

166166
y += 28
167167
self.noHintingLimit = vanilla.CheckBox((column + gutter, y, -10, 22), "No Hinting Limit", callback=self.noHintingLimitCallback, sizeStyle="small")
168168

169169
y += 30
170170

171171
self.xHeightIncreaseLimitText = vanilla.TextBox((10, y+2, column, 22), "X Height Increase Limit:", alignment="right")
172-
self.xHeightIncreaseLimit = SliderEditIntStepper((column + gutter, y, -10, 22), self.options["xHeightIncreaseLimit"])
172+
self.xHeightIncreaseLimit = SliderEditStepper((column + gutter, y, -10, 22), self.options["xHeightIncreaseLimit"])
173173

174174
y += 28
175175
self.noXHeightIncreaseLimit = vanilla.CheckBox((column + gutter, y, -10, 22), "No X Height Increase Limit", callback=self.noXHeightIncreaseLimitCallback, sizeStyle="small")

0 commit comments

Comments
 (0)