Changeset 707

Show
Ignore:
Timestamp:
03/05/10 08:15:02 (5 months ago)
Author:
tal
Message:
Added WOFF support and made a few changes in the process.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • packages/extractor/trunk/Lib/extractor/__init__.py

    r703 r707  
    11from exceptions import ExtractorError 
    22from formats.opentype import isOpenType, extractFontFromOpenType 
     3from formats.woff import isWOFF, extractFontFromWOFF 
    34 
    45def extractUFO(pathOrFile, destination, doGlyphs=True, doInfo=True, doKerning=True): 
    56    if isOpenType(pathOrFile): 
    6         extractFontFromOpenType(pathOrFile, destination, doGlyphs=doGlyphs, doInfo=doInfo, doKerning=doKerning) 
     7        func = extractFontFromOpenType 
     8    elif isWOFF(pathOrFile): 
     9        func = extractFontFromWOFF 
    710    else: 
    811        raise ExtractorError("Unknown file format.") 
     12    func(pathOrFile, destination, doGlyphs=doGlyphs, doInfo=doInfo, doKerning=doKerning) 
  • packages/extractor/trunk/Lib/extractor/formats/opentype.py

    r706 r707  
    44from fontTools.misc.textTools import num2binary 
    55from extractor.exceptions import ExtractorError 
    6 from extractor.tools import RelaxedInfo 
     6from extractor.tools import RelaxedInfo, defaultLeftKerningGroupPrefix, defaultRightKerningGroupPrefix 
    77 
    88# ---------------- 
     
    1313    try: 
    1414        font = TTFont(pathOrFile) 
    15         font.close() 
    1615        del font 
    1716    except TTLibError: 
     
    282281# ------- 
    283282 
    284 def extractOpenTypeKerning(source, destination, leftGroupPrefix="@KERN_LEFT_", rightGroupPrefix="@KERN_RIGHT_"): 
     283def extractOpenTypeKerning(source, destination, leftGroupPrefix=defaultLeftKerningGroupPrefix, rightGroupPrefix=defaultRightKerningGroupPrefix): 
    285284    kerning = {} 
    286285    groups = {} 
  • packages/extractor/trunk/Lib/extractor/tools.py

    r703 r707  
    11from robofab.ufoLib import fontInfoAttributesVersion2, validateFontInfoVersion2ValueForAttribute 
     2 
     3defaultLeftKerningGroupPrefix = "@KERN_LEFT_" 
     4defaultRightKerningGroupPrefix = "@KERN_RIGHT_" 
     5 
    26 
    37class RelaxedInfo(object):