More otfautohint rounding fixes

adobe-type-tools · Jan 24, 2025 · 541b24c · 541b24c
1 parent 4999028
commit 541b24c
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 18 deletions.
diff --git a/python/afdko/otfautohint/hinter.py b/python/afdko/otfautohint/hinter.py
@@ -1174,6 +1174,10 @@ def addStemValue(self, lloc, uloc, val, spc, lseg, useg):
         if not useg:
             return
 
+        if self.options.roundCoords:
+            lloc = round(lloc)
+            uloc = round(uloc)
+
         sv = stemValue(lloc, uloc, val, spc, lseg, useg, ghst)
         self.insertStemValue(sv)
 
@@ -1721,7 +1725,9 @@ def addBBox(self, doSubpaths=False):
                                utype, 0, self.isV(), self.isV(), "u bbox")
             self.hs.getPEState(pbs.extpes[1][peidx],
                                True).m_segs.append(useg)
-            hv = stemValue(mn_pt.o, mx_pt.o, 100, 0, lseg, useg, False)
+            lloc = round(mn_pt.o) if self.options.roundCoords else mn_pt.o
+            uloc = round(mx_pt.o) if self.options.roundCoords else mx_pt.o
+            hv = stemValue(lloc, uloc, 100, 0, lseg, useg, False)
             self.insertStemValue(hv, "bboxadd")
             self.hs.mainValues.append(hv)
             self.hs.mainValues.sort(key=lambda sv: sv.compVal(self.SpcBonus),

diff --git a/python/afdko/otfautohint/hintstate.py b/python/afdko/otfautohint/hintstate.py
@@ -468,6 +468,8 @@ def addToLoc(self, loc, score, strong=False, bb=False, seg=None):
             if sid in self.usedSegs:
                 return
             self.usedSegs.add(sid)
+        if self.dhinter.options.roundCoords:
+            loc = round(loc)
         if loc in self.candDict:
             sLC = self.candDict[loc]
         else:

diff --git a/...tohint_data/input/dummy/decimals.ufo/glyphs.com.adobe.type.processedglyphs/braceleft.glif b/...tohint_data/input/dummy/decimals.ufo/glyphs.com.adobe.type.processedglyphs/braceleft.glif
@@ -11,20 +11,20 @@
       <point x="153.6" y="-84"/>
       <point x="142.4" y="-63.2"/>
       <point x="142.4" y="-11.2" type="curve"/>
-      <point x="142.4" y="37.6"/>
+      <point x="142.4" y="37.6" name="hintRef0001"/>
       <point x="147.2" y="79.2"/>
       <point x="147.2" y="133.6" type="curve"/>
-      <point x="147.2" y="184.8" name="hintRef0001"/>
+      <point x="147.2" y="184.8" name="hintRef0002"/>
       <point x="133.6" y="211.2"/>
       <point x="99.2" y="220.8" type="curve"/>
       <point x="99.2" y="224" type="line"/>
       <point x="133.6" y="233.6"/>
       <point x="147.2" y="259.2"/>
       <point x="147.2" y="311.2" type="curve"/>
-      <point x="147.2" y="365.6" name="hintRef0002"/>
+      <point x="147.2" y="365.6"/>
       <point x="142.4" y="407.2"/>
       <point x="142.4" y="456" type="curve"/>
-      <point x="142.4" y="508"/>
+      <point x="142.4" y="508" name="hintRef0003"/>
       <point x="153.6" y="528.8"/>
       <point x="196.8" y="528.8" type="curve"/>
       <point x="218.4" y="528.8" type="line"/>
@@ -33,17 +33,17 @@
       <point x="119.2" y="566.4"/>
       <point x="88.8" y="542.4"/>
       <point x="88.8" y="460" type="curve"/>
-      <point x="88.8" y="401.6"/>
+      <point x="88.8" y="401.6" name="hintRef0004"/>
       <point x="96" y="359.2"/>
       <point x="96" y="304.8" type="curve"/>
-      <point x="96" y="274.4" name="hintRef0003"/>
+      <point x="96" y="274.4"/>
       <point x="81.6" y="244"/>
       <point x="27.2" y="243.2" type="curve"/>
-      <point x="27.2" y="201.6" type="line"/>
-      <point x="81.6" y="200.8"/>
+      <point x="27.2" y="201.6" type="line" name="hintRef0005"/>
+      <point x="81.6" y="200.8" name="hintRef0006"/>
       <point x="96" y="170.4"/>
       <point x="96" y="139.2" type="curve"/>
-      <point x="96" y="85.6" name="hintRef0004"/>
+      <point x="96" y="85.6"/>
       <point x="88.8" y="43.2"/>
       <point x="88.8" y="-15.2" type="curve"/>
       <point x="88.8" y="-97.6"/>
@@ -75,7 +75,7 @@
               <string>hstem -121.6 37.6</string>
               <string>hstem 201.6 41.6</string>
               <string>hstem 528.8 37.6</string>
-              <string>vstem 27.2 72</string>
+              <string>vstem 96 51.2</string>
             </array>
           </dict>
           <dict>
@@ -86,7 +86,7 @@
               <string>hstem -121.6 37.6</string>
               <string>hstem 201.6 41.6</string>
               <string>hstem 528.8 37.6</string>
-              <string>vstem 88.8 53.6</string>
+              <string>vstem 96 51.2</string>
             </array>
           </dict>
           <dict>
@@ -97,7 +97,7 @@
               <string>hstem -121.6 37.6</string>
               <string>hstem 201.6 41.6</string>
               <string>hstem 528.8 37.6</string>
-              <string>vstem 27.2 72</string>
+              <string>vstem 88.8 53.6</string>
             </array>
           </dict>
           <dict>
@@ -108,7 +108,29 @@
               <string>hstem -121.6 37.6</string>
               <string>hstem 201.6 41.6</string>
               <string>hstem 528.8 37.6</string>
-              <string>vstem 88.8 53.6</string>
+              <string>vstem 96 51.2</string>
+            </array>
+          </dict>
+          <dict>
+            <key>pointTag</key>
+            <string>hintRef0005</string>
+            <key>stems</key>
+            <array>
+              <string>hstem -121.6 37.6</string>
+              <string>hstem 201.6 41.6</string>
+              <string>hstem 528.8 37.6</string>
+              <string>vstem 27.2 72</string>
+            </array>
+          </dict>
+          <dict>
+            <key>pointTag</key>
+            <string>hintRef0006</string>
+            <key>stems</key>
+            <array>
+              <string>hstem -121.6 37.6</string>
+              <string>hstem 201.6 41.6</string>
+              <string>hstem 528.8 37.6</string>
+              <string>vstem 96 51.2</string>
             </array>
           </dict>
         </array>

diff --git a/...ohint_data/input/dummy/decimals.ufo/glyphs.com.adobe.type.processedglyphs/braceright.glif b/...ohint_data/input/dummy/decimals.ufo/glyphs.com.adobe.type.processedglyphs/braceright.glif
@@ -19,7 +19,7 @@
       <point x="161.6" y="244" name="hintRef0003"/>
       <point x="146.4" y="274.4"/>
       <point x="146.4" y="304.8" type="curve"/>
-      <point x="146.4" y="359.2"/>
+      <point x="146.4" y="359.2" name="hintRef0004"/>
       <point x="153.6" y="401.6"/>
       <point x="153.6" y="460" type="curve"/>
       <point x="153.6" y="542.4"/>
@@ -34,14 +34,14 @@
       <point x="100" y="407.2"/>
       <point x="96" y="365.6"/>
       <point x="96" y="311.2" type="curve"/>
-      <point x="96" y="259.2" name="hintRef0004"/>
+      <point x="96" y="259.2" name="hintRef0005"/>
       <point x="108.8" y="233.6"/>
       <point x="143.2" y="224" type="curve"/>
       <point x="143.2" y="220.8" type="line"/>
       <point x="108.8" y="211.2"/>
       <point x="96" y="184.8"/>
       <point x="96" y="133.6" type="curve"/>
-      <point x="96" y="79.2" name="hintRef0005"/>
+      <point x="96" y="79.2" name="hintRef0006"/>
       <point x="100" y="37.6"/>
       <point x="100" y="-11.2" type="curve"/>
       <point x="100" y="-63.2"/>
@@ -108,13 +108,24 @@
               <string>hstem -121.6 37.6</string>
               <string>hstem 201.6 41.6</string>
               <string>hstem 528.8 37.6</string>
-              <string>vstem 96 50.4</string>
+              <string>vstem 100 53.6</string>
             </array>
           </dict>
           <dict>
             <key>pointTag</key>
             <string>hintRef0005</string>
             <key>stems</key>
+            <array>
+              <string>hstem -121.6 37.6</string>
+              <string>hstem 201.6 41.6</string>
+              <string>hstem 528.8 37.6</string>
+              <string>vstem 96 50.4</string>
+            </array>
+          </dict>
+          <dict>
+            <key>pointTag</key>
+            <string>hintRef0006</string>
+            <key>stems</key>
             <array>
               <string>hstem -121.6 37.6</string>
               <string>hstem 201.6 41.6</string>

diff --git a/tests/otfautohint_data/input/dummy/font.ps b/tests/otfautohint_data/input/dummy/font.ps