Merge pull request #148 from aliftype/guideline-locked

Make sure Guideline.locked is saved as boolean

Author: justvanrossum

src/fontra_glyphs/backend.py

@@ -1413,7 +1413,7 @@ def gsGuidelineToFontraGuideline(gsGuideline):
         y=gsGuideline.position.y,
         angle=gsGuideline.angle,
         name=gsGuideline.name,
-        locked=gsGuideline.locked,
+        locked=bool(gsGuideline.locked),
     )
 
 
@@ -1695,7 +1695,7 @@ def fontraGuidelineToGSGuide(guideline):
     gsGuide.position.x = guideline.x
     gsGuide.position.y = guideline.y
     gsGuide.angle = guideline.angle
-    gsGuide.locked = guideline.locked
+    gsGuide.locked = 1 if guideline.locked else 0
     return gsGuide
 
 

tests/data/GlyphsUnitTestSans3.fontra/font-data.json

@@ -88,7 +88,7 @@
 "name": "",
 "x": -126,
 "y": 90,
-"locked": 1
+"locked": true
 },
 {
 "name": "",

tests/test_backend.py

@@ -703,15 +703,18 @@ async def test_addGuideline(writableTestFont):
     )
     glyph.layers[layerName] = Layer(glyph=StaticGlyph(xAdvance=0))
     glyph.layers[layerName].glyph.guidelines.append(Guideline(name="top", x=207, y=746))
+    glyph.layers[layerName].glyph.guidelines.append(
+        Guideline(name="bottom", x=207, y=0, locked=True)
+    )
 
     await writableTestFont.putGlyph(glyphName, glyph, glyphMap[glyphName])
 
     savedGlyph = await writableTestFont.getGlyph(glyphName)
+    savedGuidelines = savedGlyph.layers[layerName].glyph.guidelines
 
-    assert (
-        glyph.layers[layerName].glyph.guidelines
-        == savedGlyph.layers[layerName].glyph.guidelines
-    )
+    assert glyph.layers[layerName].glyph.guidelines == savedGuidelines
+    assert savedGuidelines[0].locked is False
+    assert savedGuidelines[1].locked is True
 
 
 async def test_getKerning(testFont, referenceFont):