aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/python/fonttools/fontTools/merge/tables.py
diff options
context:
space:
mode:
authorrobot-piglet <robot-piglet@yandex-team.com>2024-06-08 08:51:43 +0300
committerrobot-piglet <robot-piglet@yandex-team.com>2024-06-08 09:02:27 +0300
commitc3763910c6f878b17102c94e0b62cab57c9954b8 (patch)
tree19de35706beeb1adc158f13ca87110e110f1a753 /contrib/python/fonttools/fontTools/merge/tables.py
parent63965219325c32d9b72b466b89fc613295746336 (diff)
downloadydb-c3763910c6f878b17102c94e0b62cab57c9954b8.tar.gz
Intermediate changes
Diffstat (limited to 'contrib/python/fonttools/fontTools/merge/tables.py')
-rw-r--r--contrib/python/fonttools/fontTools/merge/tables.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/python/fonttools/fontTools/merge/tables.py b/contrib/python/fonttools/fontTools/merge/tables.py
index 57ed64d337c..208a5099ff1 100644
--- a/contrib/python/fonttools/fontTools/merge/tables.py
+++ b/contrib/python/fonttools/fontTools/merge/tables.py
@@ -225,7 +225,7 @@ def merge(self, m, tables):
g.removeHinting()
# Expand composite glyphs to load their
# composite glyph names.
- if g.isComposite() or g.isVarComposite():
+ if g.isComposite():
g.expand(table)
return DefaultTable.merge(self, m, tables)
@@ -294,6 +294,8 @@ def merge(self, m, tables):
extractor.execute(c)
width = extractor.width
if width is not defaultWidthXToken:
+ # The following will be wrong if the width is added
+ # by a subroutine. Ouch!
c.program.pop(0)
else:
width = defaultWidthX