Merge branch 'develop' into fix-doc-hhea-descender

.github/workflows/asan.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: "3.11"
 
     - name: Install multilib packages
       run: sudo apt-get install gcc-multilib g++-multilib

.github/workflows/run_cvg.yml

@@ -34,10 +34,10 @@ jobs:
       with:
         fetch-depth: 0  # unshallow fetch for setuptools-scm
 
-    - name: Set up Python 3.8
+    - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.8"
+        python-version: "3.11"
 
     - name: Build AFDKO wheel
       env:

.github/workflows/testpythonpackage.yml

@@ -28,20 +28,20 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
         exclude:
-          - os: macos-latest
-            python-version: "3.8"
           - os: macos-latest
             python-version: "3.9"
           - os: macos-latest
             python-version: "3.10"
-          - os: windows-latest
-            python-version: "3.8"
+          - os: macos-latest
+            python-version: "3.11"
           - os: windows-latest
             python-version: "3.9"
           - os: windows-latest
             python-version: "3.10"
+          - os: windows-latest
+            python-version: "3.11"
 
     steps:
 

README.md

@@ -38,8 +38,8 @@ More information can be found in [docs/otfautohint_Notes.md](docs/otfautohint_No
 Installation
 ------------
 
-The AFDKO requires [Python](http://www.python.org/download) 3.8
-or later. It should work with any Python > 3.8, but occasionally
+The AFDKO requires [Python](http://www.python.org/download) 3.9
+or later. It should work with any Python > 3.9, but occasionally
 tool-chain components and dependencies don't keep pace with major
 Python releases, so there might be some lag time while they catch up.
 
@@ -132,7 +132,7 @@ On macOS, install these with:
 
 On Linux (Ubuntu 17.10 LTS or later), install these with:
 
-    apt-get -y install python3.8
+    apt-get -y install python3.9
     apt-get -y install python-pip
     apt-get -y install python-dev
     apt-get -y install uuid-dev

python/afdko/makeinstancesufo.py

@@ -112,7 +112,7 @@ def updateInstance(fontInstancePath, options):
 
 def clearCustomLibs(dFont):
     for key in list(dFont.lib.keys()):
-        if key not in ['public.glyphOrder', 'public.postscriptNames']:
+        if not key.startswith('public.'):
             del dFont.lib[key]
 
     libGlyphs = [g for g in dFont if len(g.lib)]

python/afdko/otfautohint/__main__.py

@@ -343,6 +343,7 @@ def __init__(self, pargs):
         self.writeToDefaultLayer = pargs.write_to_default_layer
         self.maxSegments = pargs.max_segments
         self.verbose = pargs.verbose
+        self.looseOverlapMapping = pargs.loose_overlap_mapping
         if pargs.force_overlap:
             self.overlapForcing = True
         elif pargs.force_no_overlap:
@@ -581,6 +582,14 @@ def add_common_options(parser, term, name):
              'default when hinting individual, non-variable fonts and not '
              'supplying an overlap list)'
     )
+    overlap_parser.add_argument(
+        '--loose-overlap-mapping',
+        action='store_true',
+        help='Some fonts see high numbers of "Unable to map derived path '
+             'element from ..." warnings when processing overlap. This flag '
+             'loosens the matching heuristics and should lower (but not '
+             'eliminate) the number of those warnings'
+    )
     parser.add_argument(
         '--log',
         metavar='PATH',
@@ -865,6 +874,7 @@ def __init__(self, pargs):
         self.report_zones = pargs.alignment_zones
         self.report_all_stems = pargs.all_stems
         self.verbose = pargs.verbose
+        self.looseOverlapMapping = pargs.loose_overlap_mapping
         if pargs.force_overlap:
             self.overlapForcing = True
         elif pargs.force_no_overlap:

python/afdko/otfautohint/autohint.py

@@ -37,6 +37,7 @@ def __init__(self):
         self.excludeGlyphList = False
         self.overlapList = []
         self.overlapForcing = None
+        self.looseOverlapMapping = False
         self.hintAll = False
         self.readHints = True
         self.allowChanges = False

python/afdko/otfautohint/fdTools.py

@@ -265,7 +265,7 @@ def buildBlueLists(self):
                             "zone %s with the bottom at %s." %
                             (self.DictName, prevPair[2], prevPair[0], pair[2],
                              pair[1]))
-                    elif abs(pair[1] - prevPair[0]) <= zoneBuffer:
+                    elif abs(pair[1] - prevPair[0]) < zoneBuffer:
                         raise FontInfoParseError(
                             "In FDDict %s. The top of zone %s at %s is within "
                             "the min separation limit (%s units) of zone %s "
@@ -546,7 +546,7 @@ def mergeFDDicts(prevDictList):
                 log.warning("For final FontDict, skipping zone %s in FDDict %s"
                             " because it overlaps with zone %s in FDDict %s.",
                             zoneName, fdDictName, prevZoneName, prevFDictName)
-            elif abs(zone[1] - prevZone[0]) <= zoneBuffer:
+            elif abs(zone[1] - prevZone[0]) < zoneBuffer:
                 log.warning("For final FontDict, skipping zone %s in FDDict %s"
                             " because it is within the minimum separation "
                             "allowed (%s units) of %s in FDDict %s.",

python/afdko/otfautohint/glyphData.py

@@ -515,6 +515,7 @@ class pathElement:
     """
     assocMatchFactor = 93
     tSlop = .005
+    middleMult = 2
 
     def __init__(self, *args, is_close=False, masks=None, flex=False,
                  position=None):
@@ -625,12 +626,13 @@ def cubicParameters(self):
         """Returns the fontTools cubic parameters for this pathElement"""
         return calcCubicParameters(self.s, self.cs, self.ce, self.e)
 
-    def getAssocFactor(self):
+    def getAssocFactor(self, loose=False):
         if self.is_line:
             l = sqrt(self.s.distsq(self.e))
         else:
             l = approximateCubicArcLength(self.s, self.cs, self.ce, self.e)
-        return l / self.assocMatchFactor
+        return l / (self.assocMatchFactor / 2
+                    if loose else self.assocMatchFactor)
 
     def containsPoint(self, p, factor, returnT=False):
         if self.is_line:
@@ -1264,19 +1266,21 @@ def __iter__(self):
 
     # utility
 
-    def checkAssocPoint(self, segs, spe, ope, sp, op, mapEnd, factor=None):
+    def checkAssocPoint(self, segs, spe, ope, sp, op, mapEnd, loose,
+                        factor=None):
         if factor is None:
-            factor = ope.getAssocFactor()
+            factor = ope.getAssocFactor(loose)
         if sp == op or ope.containsPoint(sp, factor):
-            if not ope.containsPoint(spe.atT(.5), factor):
+            if not ope.containsPoint(spe.atT(.5), factor * ope.middleMult):
                 return False
             spe.association = ope
             return True
         else:
             does, t = spe.containsPoint(op, factor, True)
             if does and spe.tSlop < t < 1 - spe.tSlop:
                 midMapped = (1 - (1 - t) / 2) if mapEnd else t / 2
-                if not ope.containsPoint(spe.atT(midMapped), factor):
+                if not ope.containsPoint(spe.atT(midMapped),
+                                         factor * ope.middleMult):
                     return False
                 following = spe.splitAt(t)
                 if mapEnd:
@@ -1293,7 +1297,7 @@ def checkAssocPoint(self, segs, spe, ope, sp, op, mapEnd, factor=None):
                 return True
         return False
 
-    def associatePath(self, orig):
+    def associatePath(self, orig, loose=False):
         peMap = defaultdict(list)
         for oc in orig:
             peMap[tuple(oc.e.round(1))].append(oc)
@@ -1309,13 +1313,14 @@ def associatePath(self, orig):
             oepel = peMap.get(tuple(c.e.round(1)), [])
             if oepel:
                 for oepe in oepel:
-                    if self.checkAssocPoint(segs, c, oepe, c.s, oepe.s, True):
+                    if self.checkAssocPoint(segs, c, oepe, c.s, oepe.s, True,
+                                            loose):
                         done = True
                         break
                     else:
                         oepen = orig.nextInSubpath(oepe)
                         if self.checkAssocPoint(segs, c, oepen, c.s, oepen.e,
-                                                True):
+                                                True, loose):
                             done = True
                             break
                 if done:
@@ -1325,24 +1330,24 @@ def associatePath(self, orig):
                 for ospe in ospel:
                     ospen = orig.nextInSubpath(ospe)
                     if self.checkAssocPoint(segs, c, ospen, c.e, ospen.e,
-                                            False):
+                                            False, loose):
                         done = True
                         break
                     elif self.checkAssocPoint(segs, c, ospe, c.e, ospe.s,
-                                              False):
+                                              False, loose):
                         done = True
                         break
                 if done:
                     continue
             cBounds = c.getBounds()
             for oc in orig:
-                factor = oc.getAssocFactor()
+                factor = oc.getAssocFactor(loose)
                 if cBounds.intersects(oc.getBounds(), factor):
                     if (oc.containsPoint(c.s, factor) and
                             (self.checkAssocPoint(segs, c, oc, c.e, oc.e,
-                                                  False, factor) or
+                                                  False, loose, factor) or
                              self.checkAssocPoint(segs, c, oc, c.e, oc.s,
-                                                  False, factor))):
+                                                  False, loose, factor))):
                         done = True
                         break
             if done:
@@ -1351,13 +1356,13 @@ def associatePath(self, orig):
             # was very close to but not quite identical to another start point.
             # Try again from the other end.
             for oc in orig:
-                factor = oc.getAssocFactor()
+                factor = oc.getAssocFactor(loose)
                 if cBounds.intersects(oc.getBounds(), factor):
                     if (oc.containsPoint(c.e, factor) and
                             (self.checkAssocPoint(segs, c, oc, c.s, oc.s,
-                                                  True, factor) or
+                                                  True, loose, factor) or
                              self.checkAssocPoint(segs, c, oc, c.s, oc.e,
-                                                  True, factor))):
+                                                  True, loose, factor))):
                         done = True
                         break
             if done:

python/afdko/otfautohint/hinter.py

@@ -667,8 +667,7 @@ def extremaSegment(self, pe, extp, extt, isMn):
         of the segment are within ExtremaDist of pe
         """
         a, b, c, d = pe.cubicParameters()
-        loc = round(extp.o) + (-self.ExtremaDist
-                               if isMn else self.ExtremaDist)
+        loc = extp.o + (-self.ExtremaDist if isMn else self.ExtremaDist)
 
         horiz = not self.isV()  # When finding vertical stems solve for x
         sl = solveCubic(a[horiz], b[horiz], c[horiz], d[horiz] - loc)
@@ -776,7 +775,8 @@ def genSegs(self):
                 origGlyph = None
                 self.hs.overlapRemoved = False
             else:
-                self.glyph.associatePath(origGlyph)
+                self.glyph.associatePath(origGlyph,
+                                         self.options.looseOverlapMapping)
 
         self.prepForSegs()
         self.Bonus = 0
@@ -2446,11 +2446,10 @@ def compatiblePaths(self, gllist, fddicts):
                 gp = g.subpaths[si]
                 dpl, gpl = len(dp), len(gp)
                 if gpl != dpl:
-                    # XXX decide on warning message for these
                     if (gpl == dpl + 1 and gp[-1].isClose() and
                             not dp[-1].isClose()):
                         for _gi in range(i + 1):
-                            gllist[i].addNullClose(si)
+                            gllist[_gi].addNullClose(si)
                         continue
                     if (dpl == gpl + 1 and dp[-1].isClose() and
                             not gp[-1].isClose()):

setup.py

@@ -152,7 +152,7 @@ def main():
         'Intended Audience :: Developers',
         'Topic :: Software Development :: Build Tools',
         'License :: OSI Approved :: Apache Software License',
-        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Operating System :: MacOS :: MacOS X',
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX :: Linux',
@@ -194,7 +194,7 @@ def main():
               ],
           },
           zip_safe=False,
-          python_requires='>=3.8',
+          python_requires='>=3.9',
           setup_requires=[
               'wheel',
               'setuptools_scm',

tests/proofpdf_test.py

@@ -27,7 +27,7 @@ def _get_filename_label(file_name):
     'fontplot',
     'fontplot2',
     'hintplot',
-    'waterfallplot',
+    # 'waterfallplot',  disabled until we debug problem
 ])
 def test_glyphs_2_7(tool_name, font_filename):
     if 'cid' in font_filename:
@@ -50,8 +50,8 @@ def test_glyphs_2_7(tool_name, font_filename):
     'cidfont_noHints.otf',
     'cidfont_noStems.otf',
     'cidfont_noZones.otf',
-    'font_noHints.otf',
-    'font_noStems.otf',
+    # 'font_noHints.otf',   Disabled until we figure out problem
+    # 'font_noStems.otf',   Disabled until we figure out problem
     'font_noZones.otf',
 ])
 @pytest.mark.parametrize('tool_name', [
@@ -113,6 +113,7 @@ def test_fontsetplot():
                    '-s', '/CreationDate', '-e', 'macroman'])
 
 
+@pytest.mark.skip(reason="Disable until we figure out problem")
 @pytest.mark.parametrize('filename', ['SourceSansPro-Black',
                                       'SourceSansPro-BlackIt'])
 def test_waterfallplot(filename):