Improve behavior to be less error-prone

- paints border in magenta when anchors are incomplete
- border becomes dotted when there are no anchors
- don't place anchors when double-clicked outside current glyph
- press shift to place anchors by 10 units
- press shift + option to place anchors by 5 units
- update i386 binary using vtool to be notarized without rejection

Author: takaakifuji

CJKAnchorPlacement.glyphsTool/Contents/CodeResources

@@ -3,7 +3,7 @@
 import objc
 from GlyphsApp import *
 from GlyphsApp.plugins import *
-from AppKit import NSGraphicsContext, NSColor, NSMakeRect, NSInsetRect, NSMakePoint, NSAlternateKeyMask, NSBeep, NSNumberFormatter, NSValueTransformer
+from AppKit import NSApplication, NSGraphicsContext, NSColor, NSMakeRect, NSInsetRect, NSMakePoint, NSAlternateKeyMask, NSBeep, NSNumberFormatter, NSValueTransformer, NSEventTypeLeftMouseDown, NSEventTypeLeftMouseDragged, NSEventTypeMouseMoved, NSEventTypeLeftMouseUp, NSEventTypePressure, NSEventTypeTabletPoint
 from Foundation import NSNotFound, NSNumber, NSMutableDictionary
 import math
 import collections
@@ -78,6 +78,9 @@ def apply_values_for_anchors(font, master, layer, lsb_value, rsb_value, tsb_valu
         else:
             delete_anchor(font, master, layer, 'BSB')
 
+def round_to_grid(value, subdivision=1.0):
+    return int(math.floor(value / subdivision + 0.5)) * subdivision if subdivision else value
+
 def make_gray_color():
     return NSColor.colorWithDeviceRed_green_blue_alpha_(0.0 / 256.0, 0.0 / 256.0, 0.0 / 256.0, 0.25)
 
@@ -87,7 +90,7 @@ def make_magenta_color():
 def make_cyan_color():
     return NSColor.colorWithDeviceRed_green_blue_alpha_(0.0 / 256.0, 159.0 / 256.0, 227.0 / 256.0, 1.0)
 
-def draw_metrics_rect(font, master, layer, lsb_value, rsb_value, tsb_value, bsb_value):
+def draw_metrics_rect(font, master, layer, lsb_value, rsb_value, tsb_value, bsb_value, scale=1.0, dotted=False):
     vert_width = layer.vertWidth() if callable(layer.vertWidth) else layer.vertWidth
     if vert_width is None:
         vert_width = master.ascender - master.descender
@@ -99,8 +102,10 @@ def draw_metrics_rect(font, master, layer, lsb_value, rsb_value, tsb_value, bsb_
     y2 = descender + (bsb_value or 0.0)
 
     path = NSBezierPath.bezierPathWithRect_(NSMakeRect(x1, y2, x2 - x1, y1 - y2))
-    path.setLineWidth_(1.0)
-    path.stroke()    
+    path.setLineWidth_(1.0 / scale)
+    if dotted:
+        path.setLineDash_count_phase_([path.lineWidth() * 3.0, path.lineWidth() * 3.0], 2, 0.0)
+    path.stroke()
 
 def guess_anchor_direction_and_calc_distance_from_edge(location, master, layer):
     vert_width = layer.vertWidth() if callable(layer.vertWidth) else layer.vertWidth
@@ -188,6 +193,9 @@ class CJKAnchorPlacementTool(SelectTool):
     @objc.python_method
     def start(self):
         self.needs_disable_update_anchors = False
+        self.grid_subdivision = 1.0
+        self.last_do_kerning = None
+        self.last_do_spacing = None
 
     @objc.python_method
     def settings(self):
@@ -212,15 +220,18 @@ def mouseDoubleDown_(self, event):
             font = layer.parent.parent
             master = font.masters[layer.associatedMasterId or layer.layerId]
             anchor_name, distance_from_edge = guess_anchor_direction_and_calc_distance_from_edge(location, master, layer)
-            if anchor_name == 'LSB':
-                self.LSBValue = distance_from_edge
-            elif anchor_name == 'RSB':
-                self.RSBValue = distance_from_edge
-            elif anchor_name == 'TSB':
-                self.TSBValue = distance_from_edge
-            elif anchor_name == 'BSB':
-                self.BSBValue = distance_from_edge
-    
+            if distance_from_edge > 0.0:
+                if anchor_name == 'LSB':
+                    self.LSBValue = distance_from_edge
+                elif anchor_name == 'RSB':
+                    self.RSBValue = distance_from_edge
+                elif anchor_name == 'TSB':
+                    self.TSBValue = distance_from_edge
+                elif anchor_name == 'BSB':
+                    self.BSBValue = distance_from_edge
+                return
+        super(CJKAnchorPlacementTool, self).mouseDoubleDown_(event)
+
     @LSBValue.setter
     def LSBValue(self, value):
         if self._LSBValue != value:
@@ -265,41 +276,70 @@ def update_anchors(self):
                 apply_values_for_anchors(font, master, layer, self.LSBValue, self.RSBValue, self.TSBValue, self.BSBValue)
 
     @objc.python_method
-    def sync_values(self, font, master, layer):
+    def sync_values(self, font, master, layer, needs_round=False):
         if layer:
             lsb_anchor = layer.anchors['LSB'] if layer.anchors else None
             rsb_anchor = layer.anchors['RSB'] if layer.anchors else None
             tsb_anchor = layer.anchors['TSB'] if layer.anchors else None
             bsb_anchor = layer.anchors['BSB'] if layer.anchors else None
             self.needs_disable_update_anchors = True
             if lsb_anchor:
-                self.LSBValue = lsb_anchor.position.x
+                self.LSBValue = round_to_grid(lsb_anchor.position.x, self.grid_subdivision if needs_round else None)
             else:
                 self.LSBValue = None
             if rsb_anchor:
-                self.RSBValue = layer.width - rsb_anchor.position.x
+                self.RSBValue = round_to_grid(layer.width - rsb_anchor.position.x, self.grid_subdivision if needs_round else None)
             else:
                 self.RSBValue = None
             if tsb_anchor and master:
-                self.TSBValue = master.ascender - tsb_anchor.position.y
+                self.TSBValue = round_to_grid(master.ascender - tsb_anchor.position.y, self.grid_subdivision if needs_round else None)
             else:
                 self.TSBValue = None
             if bsb_anchor and master:
-                self.BSBValue = -(master.descender - bsb_anchor.position.y)
+                self.BSBValue = round_to_grid(-(master.descender - bsb_anchor.position.y), self.grid_subdivision if needs_round else None)
             else:
                 self.BSBValue = None
             self.needs_disable_update_anchors = False
+            if needs_round:
+                self.update_anchors() # feedback if rounding is enabled
+    
+    @objc.python_method
+    def update_grid_subdivision(self, event):
+        if event:
+            flags = event.modifierFlags()
+            if flags & NSShiftKeyMask:
+                self.grid_subdivision = 10.0
+                if flags & NSAlternateKeyMask:
+                    self.grid_subdivision *= 0.5
+            else:
+                self.grid_subdivision = 1.0
+        else:
+            self.grid_subdivision = 1.0
 
     @objc.python_method
     def background(self, layer):
         font = layer.parent.parent
         master = font.masters[layer.associatedMasterId or layer.layerId]
-        
+        event = NSApplication.sharedApplication().currentEvent()
+        valid_event_types = (NSEventTypeLeftMouseDragged, NSEventTypeMouseMoved, NSEventTypeLeftMouseUp, NSEventTypePressure, NSEventTypeTabletPoint)
         arrange_anchors(font, master, layer)
-        self.sync_values(font, master, layer)
+        self.update_grid_subdivision(event)
+        self.sync_values(font, master, layer, needs_round=event.type() in valid_event_types if event else False)
         with currentGraphicsContext() as ctx:
-            make_cyan_color().setStroke()
-            draw_metrics_rect(font, master, layer, self.LSBValue, self.RSBValue, self.TSBValue, self.BSBValue)
+            dotted = False
+            has_unbalanced_palt = sum((1 if value is None else 0 for value in (self.LSBValue, self.RSBValue))) == 1
+            has_unbalanced_vpal = sum((1 if value is None else 0 for value in (self.TSBValue, self.BSBValue))) == 1
+            if sum((1 if value is None else 0 for value in (self.LSBValue, self.RSBValue, self.TSBValue, self.BSBValue))) == 4:
+                has_unbalanced_palt, has_unbalanced_vpal = None, None
+            if has_unbalanced_palt is None and has_unbalanced_vpal is None:
+                dotted = True
+                make_cyan_color().setStroke()
+            elif has_unbalanced_palt or has_unbalanced_vpal:
+                make_magenta_color().setStroke()
+            else:
+                make_cyan_color().setStroke()
+            scale = self.editViewController().graphicView().scale()
+            draw_metrics_rect(font, master, layer, self.LSBValue, self.RSBValue, self.TSBValue, self.BSBValue, scale=scale, dotted=dotted)
 
     @objc.python_method
     def __file__(self):

CJKAnchorPlacement.glyphsTool/Contents/MacOS/plugin

@@ -14,7 +14,7 @@
 		</data>
 		<key>Resources/plugin.py</key>
 		<data>
-		6IQQ0XAU5v0Q93/ZX866dC5b6OU=
+		KIJgddwP2E0BZMyWXnUB+520KmE=
 		</data>
 		<key>Resources/toolbar.ai</key>
 		<data>
@@ -53,11 +53,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			6IQQ0XAU5v0Q93/ZX866dC5b6OU=
+			KIJgddwP2E0BZMyWXnUB+520KmE=
 			</data>
 			<key>hash2</key>
 			<data>
-			CvStjcnrvn7Sd1Px+wGJPwb33B1IBAbXgEE6TRkVYHY=
+			FzufauSDJm/r2jgE6MgqxCnnGYSnk810dqKntpEMoKY=
 			</data>
 		</dict>
 		<key>Resources/toolbar.ai</key>