From 7f083ac31241cc86d019ea6227fa508b9fcf39a6 Mon Sep 17 00:00:00 2001
From: Roozbeh Pournader <roozbeh@google.com>
Date: Tue, 22 Jul 2014 19:02:28 -0700
Subject: Update toolchain to latest ParaType delivery.

---
 scripts/lib/fontbuild/Build.py | 2 +-
 scripts/lib/fontbuild/mix.py   | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'scripts/lib/fontbuild')

diff --git a/scripts/lib/fontbuild/Build.py b/scripts/lib/fontbuild/Build.py
index 6ed91c3..cc858d3 100644
--- a/scripts/lib/fontbuild/Build.py
+++ b/scripts/lib/fontbuild/Build.py
@@ -102,7 +102,7 @@ class FontProject:
                 
                 if (g.name in self.lessItalic):
                     italicizeGlyph(g, 9, stemWidth=stemWidth)
-                else:
+                elif g.name != ".notdef":
                     italicizeGlyph(g, 10, stemWidth=stemWidth)
                 g.RemoveOverlap()
                 g.width += 10
diff --git a/scripts/lib/fontbuild/mix.py b/scripts/lib/fontbuild/mix.py
index 86bf4ed..06c62dc 100644
--- a/scripts/lib/fontbuild/mix.py
+++ b/scripts/lib/fontbuild/mix.py
@@ -227,6 +227,13 @@ class Master:
     
     def openFont(self, path, overlayPath=None):
         fl.Open(path,True)
+        self.ifont = fl.ifont
+        for g in fl.font.glyphs:
+          size = len(g)
+          csize = len(g.components)
+          if (size > 0 and csize > 0):
+            g.Decompose()
+
         self.ifont = fl.ifont
         self.font = fl.font
         if overlayPath != None:
-- 
cgit v1.2.3