Merge branch 'develop' into fg_remove_PUAs

.flake8

@@ -5,7 +5,7 @@
 select = E,F,W,B,B901,B902,B903
 
 # ignore W504 line break before binary operator
-ignore = W504,B017,E731,E741
+ignore = W504,B017,E731,E741,B038
 
 # explicitly set line length limitation
 max-line-length = 79

.github/workflows/asan.yml

@@ -17,14 +17,14 @@ jobs:
       run: |
         echo "Reason for triggering: ${{ github.event.inputs.reason }}"
 
-    - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       with:
         submodules: true
 
     - 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/build_wheels.yml

@@ -27,7 +27,7 @@ jobs:
         echo "Reason for triggering: ${{ github.event.inputs.reason }}"
 
     - name: Check out
-      uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+      uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       with:
         fetch-depth: 0  # unshallow fetch for setuptools-scm
 
@@ -38,29 +38,32 @@ jobs:
 
     - name: Build wheel (only macosx_universal2)
       if: matrix.os == 'macos-latest'
-      uses: pypa/cibuildwheel@v2.15.0
+      uses: pypa/cibuildwheel@v2.21.1
       with:
         output-dir: dist
       env:
         CIBW_BUILD: "cp39-*"
         CIBW_ARCHS_MACOS: universal2
-        CIBW_ENVIRONMENT_MACOS: "CFLAGS='-arch arm64 -arch x86_64 -I/usr/include/libxml2' CXXFLAGS='-arch arm64 -arch x86_64' LDFLAGS='-arch arm64 -arch x86_64'"
+        CIBW_ENVIRONMENT_MACOS: "CFLAGS='-arch arm64 -arch x86_64 -I/usr/include/libxml2' CXXFLAGS='-arch arm64 -arch x86_64' LDFLAGS='-arch arm64 -arch x86_64'  MACOSX_DEPLOYMENT_TARGET='10.13'"
 
     - name: Build wheel (except macosx_universal2)
-      uses: pypa/cibuildwheel@v2.15.0
+      uses: pypa/cibuildwheel@v2.21.1
       with:
         output-dir: dist
       env:
         CIBW_BUILD: "cp39-*"
         CIBW_ARCHS_MACOS: x86_64
         CIBW_ARCHS_WINDOWS: AMD64
         CIBW_ARCHS_LINUX: x86_64
-        CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
+        CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
         CIBW_SKIP: "*musllinux*"
         # CIBW_BEFORE_ALL_LINUX: "yum install -y libuuid-devel && yum install -y libxml2-devel"
         # CIBW_ENVIRONMENT_LINUX: "CFLAGS='-I/usr/include/libxml2'"
-        CIBW_BEFORE_ALL_LINUX: "yum install -y libuuid-devel"
-        CIBW_ENVIRONMENT: "FORCE_BUILD_LIBXML2=ON"
+        # CIBW_BEFORE_ALL_LINUX: "yum install -y libuuid-devel"
+        # CIBW_BEFORE_ALL_LINUX: "dnf -y install uuid-devel"
+        CIBW_ENVIRONMENT_MACOS: "CFLAGS='-I/usr/include/libxml2' MACOSX_DEPLOYMENT_TARGET='10.13'"
+        CIBW_ENVIRONMENT_LINUX: "FORCE_BUILD_LIBXML2=ON"
+        CIBW_ENVIRONMENT_WINDOWS: "FORCE_BUILD_LIBXML2=ON"
 
     - name: Build sdist (Ubuntu only)
       if: matrix.os == 'ubuntu-latest'

.github/workflows/codeql.yml

@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
 
       - name: Install Dependencies (python)
         if: ${{ matrix.language == 'python' }}

.github/workflows/run_cvg.yml

@@ -30,14 +30,14 @@ jobs:
       run: |
         echo "Reason for triggering: ${{ github.event.inputs.reason }}"
     - name: Check out
-      uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+      uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       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,16 +28,20 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
         exclude:
           - os: macos-latest
-            python-version: "3.8"
+            python-version: "3.9"
+          - os: macos-latest
+            python-version: "3.10"
           - os: macos-latest
+            python-version: "3.11"
+          - os: windows-latest
             python-version: "3.9"
           - os: windows-latest
-            python-version: "3.8"
+            python-version: "3.10"
           - os: windows-latest
-            python-version: "3.9"
+            python-version: "3.11"
 
     steps:
 
@@ -47,7 +51,7 @@ jobs:
         echo "Reason for triggering: ${{ github.event.inputs.reason }}"
 
     - name: Check out
-      uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+      uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       with:
         fetch-depth: 0  # unshallow fetch for setuptools-scm
 

.gitignore

@@ -26,3 +26,6 @@ cov*.xml
 
 # temp output dirs created during tests
 **/temp_output
+
+# macOS cruft
+.DS_Store

CMakeLists.txt

@@ -39,7 +39,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 add_definitions(-DANTLR4CPP_STATIC)
 set(ANTLR4_WITH_STATIC_CRT OFF)
 # 4.9.3 is the latest ANTLR4 version
-set(ANTLR4_TAG tags/4.9.3)
+set(ANTLR4_TAG tags/4.13.2)
 include(ExternalAntlr4Cpp)
 
 

NEWS.md

@@ -1,6 +1,24 @@
 Changelog
 =========
 
+4.0.2 (released 2024-11-05)
+---------------------------
+- [otfautohint] Fix otfautohint bugs ([#1759](https://github.com/adobe-type-tools/afdko/pull/1759), [#1751](https://github.com/adobe-type-tools/afdko/pull/1751), [#1749](https://github.com/adobe-type-tools/afdko/pull/1749), [#1758](https://github.com/adobe-type-tools/afdko/pull/1758))
+- [ANTLR] Upgrade ANTLR to v4.13.2
+- [makeinstancesufo] keep all public lib keys in instances (thank you, @arialcrime!) ([#1747](https://github.com/adobe-type-tools/afdko/pull/1747))
+- [ci] Enable Python v3.12, drop v3.8 ([#1756](https://github.com/adobe-type-tools/afdko/pull/1756))
+
+4.0.1 (released 2024-01-16)
+---------------------------
+- [tx] Fix build failures discovered by an upcoming gcc-14 release (thanks @trofi!)([#1730](https://github.com/adobe-type-tools/afdko/pull/1730))
+- [tx] parse multiple attrs in xmlNode ([#1720](https://github.com/adobe-type-tools/afdko/pull/1720))
+- [makeotfexe] Add guards for h->otl == NULL before calling otlSubtableAdd ([#1716](https://github.com/adobe-type-tools/afdko/pull/1716))
+- [otfstemhist] Fix otfstemhist bugs ([#1703](https://github.com/adobe-type-tools/afdko/pull/1703))
+- [sfntedit] Fix bug when attempting to add non-existent file ([#1696](https://github.com/adobe-type-tools/afdko/pull/1696))
+- [documentation] Updates ([#1711](https://github.com/adobe-type-tools/afdko/pull/1711))
+- [requirements.txt] Update dependencies, remove psautohint from dependencies ([#1725](https://github.com/adobe-type-tools/afdko/pull/1725))
+- [ci] Add Python 3.11 to CI test matrix ([#1718](https://github.com/adobe-type-tools/afdko/pull/1718))
+
 4.0.0 (released 2023-09-11)
 ---------------------------
 **The Python port of psautohint was (re)integrated into the AFDKO repository as "otfautohint"**

README.md

@@ -38,9 +38,10 @@ 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.
-Regarding Python 3.11: while Python 3.11 itself is now relatively stable, we are waiting to let some known tool-chain problems resolve.
+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.
 
 Releases are available on the [Python Package
 Index](https://pypi.python.org/pypi/afdko) (PyPI) and can be installed
@@ -70,21 +71,29 @@ Note for Linux users (and users of other platforms that are not macOS or Windows
 
 - Create a virtual environment:
 
-        python -m venv afdko_env
+    ```sh
+    python -m venv afdko_env
+    ```
 
 - Activate the virtual environment:
 
     - macOS & Linux
 
-            source afdko_env/bin/activate
+        ```sh
+        source afdko_env/bin/activate
+        ```
 
     - Windows
 
-            afdko_env\Scripts\activate.bat
+        ```sh
+        afdko_env\Scripts\activate.bat
+        ```
 
 - Install [afdko](https://pypi.python.org/pypi/afdko):
 
-        python -m pip install afdko
+    ```sh
+    python -m pip install afdko
+    ```
 
 Installing the **afdko** inside a virtual environment prevents conflicts
 between its dependencies and other modules installed globally.
@@ -123,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
@@ -143,6 +152,12 @@ directory of the afdko, and run:
 
     python -m pip install .
 
+Developing
+-----------------
+If you'd like to develop & debug AFDKO using Xcode, run:
+
+    CMake -G Xcode .
+
 For further information on building from source see
 [docs/FDK\_Build\_Notes.md](docs/FDK_Build_Notes.md).
 

c/makeotf/include/hotconv.h

@@ -12,7 +12,7 @@ This software is licensed as OpenSource, under the Apache License, Version 2.0.
 extern "C" {
 #endif
 
-#define HOT_VERSION 0x010100 /* Library version (1.1.0) */
+#define HOT_VERSION 0x010101 /* Library version (1.1.1) */
 /* Major, minor, build = (HOT_VERSION >> 16) & 0xff, (HOT_VERSION >> 8) & 0xff, HOT_VERSION & 0xff) */
 /* Warning: this string is now part of heuristic used by CoolType to identify the
 first round of CoolType fonts which had the backtrack sequence of a chaining

c/makeotf/lib/hotconv/BuildGrammar.py

@@ -7,7 +7,7 @@
 import os
 
 antlr_program = "antlr4"
-antlr_version = "4.9.3"
+antlr_version = "4.13.2"
 
 antlr_args = ['-no-listener', '-Dlanguage=Cpp']
 

c/makeotf/lib/hotconv/CMakeLists.txt

@@ -68,6 +68,7 @@ add_library(hotconv STATIC
 )
 
 set_property(TARGET hotconv PROPERTY C_STANDARD 99)
+set_property(TARGET hotconv PROPERTY CXX_STANDARD 17)
 target_include_directories(hotconv PRIVATE AFTER $<$<COMPILE_LANGUAGE:CXX>:${ANTLR4_INCLUDE_DIRS}>)
 target_link_libraries(hotconv PUBLIC antlr4_static)