UFO Rountrip

.gitignore

@@ -12,12 +12,12 @@ dist
 # Unit test
 .cache/
 .tox/
-.coverage
+.coverage*
 htmlcov
 
 # Autosaved files
 *~
 
-# Additional test files
-# (there's a script to download them from GitHub)
-tests/noto-source*
+# Files generated by tests
+actual*
+expected*

Lib/glyphsLib/__init__.py

@@ -17,18 +17,19 @@
                         unicode_literals)
 
 from io import open
+import os
 import logging
 
 from fontTools.misc.py23 import tostr
 
-from glyphsLib.builder import to_ufos
-from glyphsLib.interpolation import interpolate, build_designspace
-from glyphsLib.parser import load, loads
-from glyphsLib.writer import dump, dumps
-from glyphsLib.util import write_ufo
-
 from glyphsLib.classes import __all__ as __all_classes__
 from glyphsLib.classes import *
+from glyphsLib.builder import to_ufos, to_designspace, to_glyphs
+from glyphsLib.builder.instances import InstanceData
+from glyphsLib.interpolation import interpolate
+from glyphsLib.parser import load, loads
+from glyphsLib.writer import dump, dumps
+from glyphsLib.util import clean_ufo
 
 __version__ = "2.2.2.dev0"
 
@@ -76,16 +77,26 @@ def build_masters(filename, master_dir, designspace_instance_dir=None,
         paths from the designspace and respective data from the Glyphs source.
     """
 
-    ufos, instance_data = load_to_ufos(
-        filename, include_instances=True, family_name=family_name,
-        propagate_anchors=propagate_anchors)
+    font = GSFont(filename)
+    designspace = to_designspace(
+        font, family_name=family_name, propagate_anchors=propagate_anchors,
+        instance_dir=designspace_instance_dir)
+    ufos = []
+    for source in designspace.sources:
+        ufos.append(source.font)
+        ufo_path = os.path.join(master_dir, source.filename)
+        clean_ufo(ufo_path)
+        source.font.save(ufo_path)
+
     if designspace_instance_dir is not None:
-        designspace_path, instance_data = build_designspace(
-            ufos, master_dir, designspace_instance_dir, instance_data)
-        return ufos, designspace_path, instance_data
+        designspace_path = os.path.join(master_dir, designspace.filename)
+        designspace.write(designspace_path)
+        # All the instance data should be in the designspace. That's why for
+        # now we return the full designspace in place of `instance_data`.
+        # However, other functions still expect the instance data to have
+        # a list of (path, something) tuples, hence the class `InstanceData`.
+        return ufos, designspace_path, InstanceData(designspace)
     else:
-        for ufo in ufos:
-            write_ufo(ufo, master_dir)
         return ufos
 
 

Lib/glyphsLib/builder/__init__.py

@@ -17,13 +17,21 @@
 from glyphsLib import classes
 import defcon
 
+# FIXME: (jany) import from fonttools
+from glyphsLib.designSpaceDocument import DesignSpaceDocument
+
 from .builders import UFOBuilder, GlyphsBuilder
 
 logger = logging.getLogger(__name__)
 
 
-def to_ufos(font, include_instances=False, family_name=None,
-            propagate_anchors=True, ufo_module=defcon):
+def to_ufos(font,
+            include_instances=False,
+            family_name=None,
+            propagate_anchors=True,
+            ufo_module=defcon,
+            minimize_glyphs_diffs=False):
+    # TODO: (jany) Update documentation
     """Take .glyphs file data and load it into UFOs.
 
     Takes in data as Glyphs.app-compatible classes, as documented at
@@ -38,7 +46,8 @@ def to_ufos(font, include_instances=False, family_name=None,
         font,
         ufo_module=ufo_module,
         family_name=family_name,
-        propagate_anchors=propagate_anchors)
+        propagate_anchors=propagate_anchors,
+        minimize_glyphs_diffs=minimize_glyphs_diffs)
 
     result = list(builder.masters)
 
@@ -47,13 +56,51 @@ def to_ufos(font, include_instances=False, family_name=None,
     return result
 
 
-def to_glyphs(ufos, designspace=None, glyphs_module=classes):
+def to_designspace(font,
+                   family_name=None,
+                   instance_dir=None,
+                   propagate_anchors=True,
+                   ufo_module=defcon,
+                   minimize_glyphs_diffs=False):
+    # TODO: (jany) Update documentation
+    """Take .glyphs file data and load it into a Designspace Document + UFOS.
+
+    Takes in data as Glyphs.app-compatible classes, as documented at
+    https://docu.glyphsapp.com/
+
+    If include_instances is True, also returns the parsed instance data.
+
+    If family_name is provided, the master UFOs will be given this name and
+    only instances with this name will be returned.
+    """
+    builder = UFOBuilder(
+        font,
+        ufo_module=ufo_module,
+        family_name=family_name,
+        instance_dir=instance_dir,
+        propagate_anchors=propagate_anchors,
+        use_designspace=True,
+        minimize_glyphs_diffs=minimize_glyphs_diffs)
+    return builder.designspace
+
+
+def to_glyphs(ufos_or_designspace,
+              glyphs_module=classes,
+              minimize_ufo_diffs=False):
     """
     Take a list of UFOs and combine them into a single .glyphs file.
 
     This should be the inverse function of `to_ufos`,
     so we should have to_glyphs(to_ufos(font)) == font
+    and also to_glyphs(to_designspace(font)) == font
     """
-    builder = GlyphsBuilder(
-        ufos, designspace=designspace, glyphs_module=glyphs_module)
+    # FIXME: (jany) duck-type instead of isinstance
+    if isinstance(ufos_or_designspace, DesignSpaceDocument):
+        builder = GlyphsBuilder(designspace=ufos_or_designspace,
+                                glyphs_module=glyphs_module,
+                                minimize_ufo_diffs=minimize_ufo_diffs)
+    else:
+        builder = GlyphsBuilder(ufos=ufos_or_designspace,
+                                glyphs_module=glyphs_module,
+                                minimize_ufo_diffs=minimize_ufo_diffs)
     return builder.font

Lib/glyphsLib/builder/anchors.py

@@ -18,6 +18,8 @@
 
 from fontTools.misc.transform import Transform
 
+from glyphsLib.types import Point
+
 __all__ = ['to_ufo_propagate_font_anchors']
 
 
@@ -104,3 +106,12 @@ def to_ufo_glyph_anchors(self, glyph, anchors):
         x, y = anchor.position
         anchor_dict = {'name': anchor.name, 'x': x, 'y': y}
         glyph.appendAnchor(anchor_dict)
+
+
+def to_glyphs_glyph_anchors(self, ufo_glyph, layer):
+    """Add UFO glif anchors to a GSLayer."""
+    for ufo_anchor in ufo_glyph.anchors:
+        anchor = self.glyphs_module.GSAnchor()
+        anchor.name = ufo_anchor.name
+        anchor.position = Point(ufo_anchor.x, ufo_anchor.y)
+        layer.anchors.append(anchor)

Lib/glyphsLib/builder/annotations.py

@@ -0,0 +1,59 @@
+# Copyright 2016 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+from __future__ import (print_function, division, absolute_import,
+                        unicode_literals)
+
+from .constants import GLYPHS_PREFIX
+from glyphsLib.types import Point
+
+LIB_KEY = GLYPHS_PREFIX + 'annotations'
+
+
+def to_ufo_annotations(self, ufo_glyph, layer):
+    try:
+        value = layer.annotations
+    except KeyError:
+        return
+    annotations = []
+    for an in list(value.values()):
+        annot = {}
+        for attr in ['angle', 'position', 'text', 'type', 'width']:
+            val = getattr(an, attr, None)
+            if attr == 'position' and val:
+                val = list(val)
+            if val:
+                annot[attr] = val
+        annotations.append(annot)
+
+    if annotations:
+        ufo_glyph.lib[LIB_KEY] = annotations
+
+
+def to_glyphs_annotations(self, ufo_glyph, layer):
+    if LIB_KEY not in ufo_glyph.lib:
+        return
+
+    for annot in ufo_glyph.lib[LIB_KEY]:
+        annotation = self.glyphs_module.GSAnnotation()
+        for attr in ['angle', 'position', 'text', 'type', 'width']:
+            if attr in annot and annot[attr]:
+                if attr == 'position':
+                    position = Point()
+                    position.x, position.y = annot[attr]
+                    annotation.position = position
+                else:
+                    setattr(annotation, attr, annot[attr])
+        layer.annotations.append(annotation)