diff options
author | Rasmus Andersson <rasmus@notion.se> | 2017-09-24 23:07:42 +0300 |
---|---|---|
committer | Rasmus Andersson <rasmus@notion.se> | 2017-09-24 23:07:42 +0300 |
commit | d525f12f4b08637e8bdf725be9ecb3995f2145ea (patch) | |
tree | 57a8ff3cf10dae9d52c17f60eec84e0d07bc4315 | |
parent | 989a5e2e61b16dfe3bc782cb86ef870168c66250 (diff) | |
download | inter-d525f12f4b08637e8bdf725be9ecb3995f2145ea.tar.xz |
Support for included files in fixup-features script
-rwxr-xr-x | misc/fixup-features.py | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/misc/fixup-features.py b/misc/fixup-features.py index e9597f7ae..dd4c2658f 100755 --- a/misc/fixup-features.py +++ b/misc/fixup-features.py @@ -126,6 +126,25 @@ def loadLocalNamesDB(fonts, agl, diacriticComps): return uc2names, name2ucs, allNames + +includeRe = re.compile(r'^include\(([^\)]+)\);\s*$') + + +def loadFeaturesFile(filepath): + print('read', filepath) + lines = [] + with open(filepath, 'r') as f: + for line in f: + m = includeRe.match(line) + if m is not None: + includedFilename = m.group(1) + includedPath = os.path.normpath(os.path.join(os.path.dirname(filepath), includedFilename)) + lines = lines + loadFeaturesFile(includedPath) + else: + lines.append(line) + return lines + + def main(): argparser = ArgumentParser(description='Fixup features.fea') @@ -146,18 +165,10 @@ def main(): fonts = [OpenFont(fontPath) for fontPath in args.fontPaths] uc2names, name2ucs, allNames = loadLocalNamesDB(fonts, agl, diacriticComps) - # open feature.fea - featuresFilename = '' - featuresLines = [] - for fontPath in args.fontPaths: - try: - featuresFilename = os.path.join(fontPath, 'features.fea') - with open(featuresFilename, 'r') as f: - print('read', featuresFilename) - featuresLines = f.read().splitlines() - break - except: - pass + includeRe = re.compile(r'^include\(([^\)]+)\);\s*$') + + # open features.fea + featuresLines = loadFeaturesFile(os.path.join(fontPath, 'features.fea')) classDefRe = re.compile(r'^@([^\s=]+)\s*=\s*\[([^\]]+)\]\s*;\s*$') subRe = re.compile(r'^\s*sub\s+(.+)(\'?)\s+by\s+(.+)\s*;\s*$') |