[buildCFF2VF] Fix support for CFF2 fonts with multiple FontDicts #279
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aka derived from CID-keyed CFF fonts.
Delete unused variables, fix whitespace.
miguelsousa
reviewed
Mar 7, 2018
| for fdIndex in range(numFDArray): | ||
| blendedPD = {} | ||
| privateDictList.append(blendedPD) | ||
| for i in range(numMasters): |
There was a problem hiding this comment.
use master_index instead of i
miguelsousa
reviewed
Mar 7, 2018
| if isinstance(valList[0], list): | ||
| lenValueList = len(value) | ||
| if lenValueList != len(valList): | ||
| print("Error: the value list for key %s in the\ |
There was a problem hiding this comment.
don't use backslashes; do it like in line 310
miguelsousa
reviewed
Mar 7, 2018
| @@ -467,7 +465,6 @@ def buildMasterList(inputPaths): | |||
|
|
|||
| # Now build MM versions. | |||
| print("Reading glyph data...") | |||
| bcDictList = {} | |||
| blendError = 0 | |||
There was a problem hiding this comment.
blendError is a boolean. Change this to False
There was a problem hiding this comment.
There are other lines like this. Please change them all.
miguelsousa
reviewed
Mar 7, 2018
| except KeyError: | ||
| if isinstance(value, list): | ||
| lenValueList = len(value) | ||
| valList = [None]*lenValueList |
There was a problem hiding this comment.
PEP 8 (E226): missing whitespace around arithmetic operator
miguelsousa
reviewed
Mar 7, 2018
| lenValueList = len(value) | ||
| valList = [None]*lenValueList | ||
| for j in range(lenValueList): | ||
| vList = [value[j]]*numMasters |
There was a problem hiding this comment.
PEP 8 (E226): missing whitespace around arithmetic operator
miguelsousa
reviewed
Mar 7, 2018
| valList[j] = vList | ||
| blendedPD[key] = valList | ||
| else: | ||
| blendedPD[key] = [value]*numMasters |
There was a problem hiding this comment.
PEP 8 (E226): missing whitespace around arithmetic operator
miguelsousa
reviewed
Mar 7, 2018
| break | ||
| dataList = [] | ||
| if needsBlend: | ||
| prevBlendList = [0]*len(valList[0]) |
There was a problem hiding this comment.
PEP 8 (E226): missing whitespace around arithmetic operator
miguelsousa
reviewed
Mar 7, 2018
| for blendList in valList: | ||
| # convert blend list from absolute values to relative | ||
| # values from the previous blend list. | ||
| relBlendList = [(val-prevBlendList[i]) for i, val in |
There was a problem hiding this comment.
PEP 8 (E226): missing whitespace around arithmetic operator
Drop use of backslash for line continuation, ensure whitespace around arithmetic operators.
Introduced bug in adding FDArray support when changing PrivateDict references by using wrong field name.
varLib.builder.buildVarData() now has a new argument 'optimize' with a default value of True. This triggers calling varLib.builder.VarData_CalculateNumShorts(). This function removes all region references that aren't referenced by a data item. Since CFF2 the VarDataStore structure has no items, all the regions get optimized away, leaving a RegionCount of 0. Work-around is to set optimize=False.
aka derived from CID-keyed CFF fonts.
varLib.builder.buildVarData() now has a new argument 'optimize' with a default value of True. This triggers calling varLib.builder.VarData_CalculateNumShorts(). This function removes all region references that aren't referenced by a data item. Since CFF2 the VarDataStore structure has no items, all the regions get optimized away, leaving a RegionCount of 0. Work-around is to set optimize=False.
miguelsousa
force-pushed
the
FDArray-support
branch
from
ddee6ed
to
1e16efd
Compare
miguelsousa
approved these changes
Mar 7, 2018
|
merging with main. Changes to support CID-keyed fonts as sources to buildFontCFFVF. |
…/afdko into FDArray-support * 'FDArray-support' of https://github.com/adobe-type-tools/afdko: [buildCFF2VF] Added work-around for bug in fonttools [buildCFF2VF] Fix support for CFF2 fonts with multiple FontDicts # Conflicts: # afdko/Tools/SharedData/FDKScripts/buildCFF2VF.py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
aka derived from CID-keyed CFF fonts.