Merge pull request #582 from typemytype/issue-581

Make sure we specify every axis in the font to ensure we get the expected default value behavior

Author: justvanrossum

drawBot/context/tools/variation.py

@@ -91,17 +91,16 @@ def getNamedInstancesForFont(font):
 
 def getFontVariationAttributes(font, fontVariations):
     coreTextFontVariations = dict()
-    if fontVariations:
-        existingAxes = getVariationAxesForFont(font)
-        for axis, value in fontVariations.items():
-            if axis in existingAxes:
-                existinsAxis = existingAxes[axis]
-                # clip variation value within the min max value
-                if value < existinsAxis["minValue"]:
-                    value = existinsAxis["minValue"]
-                if value > existinsAxis["maxValue"]:
-                    value = existinsAxis["maxValue"]
-                coreTextFontVariations[convertVariationTagToInt(axis)] = value
-            else:
-                warnings.warn("variation axis '%s' not available for '%s'" % (axis, font.fontName()))
+    axes = getVariationAxesForFont(font)
+
+    for axisTag, axis in axes.items():
+        value = min(
+            max(fontVariations.get(axisTag, axis["defaultValue"]), axis["minValue"]),
+            axis["maxValue"],
+        )
+        coreTextFontVariations[convertVariationTagToInt(axisTag)] = value
+
+    for axisTag in sorted(set(fontVariations) - set(axes)):
+        warnings.warn("variation axis '%s' not available for '%s'" % (axisTag, font.fontName()))
+
     return coreTextFontVariations