diff options
| author | Rasmus Andersson <rasmus@notion.se> | 2019-01-07 20:15:58 +0300 |
|---|---|---|
| committer | Rasmus Andersson <rasmus@notion.se> | 2019-01-07 20:15:58 +0300 |
| commit | dfe6b939c719410b73aa965016173b50b5b55995 (patch) | |
| tree | 9f64794459df0c7f98af04699e1edf680b0b6e74 /misc | |
| parent | 01d2e27868a353c607af499753b20330d2b5b02a (diff) | |
| download | inter-dfe6b939c719410b73aa965016173b50b5b55995.tar.xz | |
upgrade ufo2ft that includes fixed fonttools. This means we can also drop our temporary fonttools patch. Related to https://github.com/fonttools/fonttools/pull/1430 and https://github.com/googlei18n/ufo2ft/issues/306
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/fonttools-3.34.2-psCharStrings.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/misc/fonttools-3.34.2-psCharStrings.patch b/misc/fonttools-3.34.2-psCharStrings.patch deleted file mode 100644 index 7be387201..000000000 --- a/misc/fonttools-3.34.2-psCharStrings.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/fontTools/misc/psCharStrings.py -+++ b/fontTools/misc/psCharStrings.py -@@ -223,9 +223,16 @@ - else: - return b"\xff" + pack(">l", value) # encode the entire fixed point value - -+ -+realZeroBytes = bytechr(30) + bytechr(0xf) -+ - def encodeFloat(f): - # For CFF only, used in cffLib -- s = str(f).upper() -+ if f == 0.0: # 0.0 == +0.0 == -0.0 -+ return realZeroBytes -+ # Note: 14 decimal digits seems to be the limitation for CFF real numbers -+ # in macOS. However, we use 8 here to match the implementation of AFDKO. -+ s = "%.8G" % f - if s[:2] == "0.": - s = s[1:] - elif s[:3] == "-0.": -@@ -234,9 +241,13 @@ - while s: - c = s[0] - s = s[1:] -- if c == "E" and s[:1] == "-": -- s = s[1:] -- c = "E-" -+ if c == "E": -+ c2 = s[:1] -+ if c2 == "-": -+ s = s[1:] -+ c = "E-" -+ elif c2 == "+": -+ s = s[1:] - nibbles.append(realNibblesDict[c]) - nibbles.append(0xf) - if len(nibbles) % 2: |