Merge commit '43a778492219032b9d747112e412dec2201d2667'

Author: Sibras

.ci/publish_release_artifact.sh

@@ -11,12 +11,11 @@ fi
 if ! hash ghr 2> /dev/null; then
 	_GHR_VER=v0.14.0
 	_GHR=ghr_${_GHR_VER}_linux_amd64
-	mkdir -p $HOME/.local/bin
 	curl -sfL https://github.com/tcnksm/ghr/releases/download/$_GHR_VER/$_GHR.tar.gz |
-		tar xz -C $HOME/.local/bin --strip-components=1 $_GHR/ghr
+		tar xz -C . --strip-components=1 $_GHR/ghr
 fi
 
-ghr -replace \
+./ghr -replace \
 	-u $CIRCLE_PROJECT_USERNAME \
 	-r $CIRCLE_PROJECT_REPONAME \
 	$CIRCLE_TAG \

.ci/requirements.txt

@@ -60,28 +60,28 @@ meson==1.7.0 \
     --hash=sha256:08efbe84803eed07f863b05092d653a9d348f7038761d900412fddf56deb0284 \
     --hash=sha256:ae3f12953045f3c7c60e27f2af1ad862f14dee125b4ed9bcb8a842a5080dbf85
     # via -r requirements.in
-ninja==1.11.1.3 \
-    --hash=sha256:04d48d14ea7ba11951c156599ab526bdda575450797ff57c6fdf99b2554d09c7 \
-    --hash=sha256:114ed5c61c8474df6a69ab89097a20749b769e2c219a452cb2fadc49b0d581b0 \
-    --hash=sha256:17978ad611d8ead578d83637f5ae80c2261b033db0b493a7ce94f88623f29e1b \
-    --hash=sha256:1ad2112c2b0159ed7c4ae3731595191b1546ba62316fc40808edecd0306fefa3 \
-    --hash=sha256:2883ea46b3c5079074f56820f9989c6261fcc6fd873d914ee49010ecf283c3b2 \
-    --hash=sha256:28aea3c1c280cba95b8608d50797169f3a34280e3e9a6379b6e340f0c9eaeeb0 \
-    --hash=sha256:2b4879ea3f1169f3d855182c57dcc84d1b5048628c8b7be0d702b81882a37237 \
-    --hash=sha256:53409151da081f3c198bb0bfc220a7f4e821e022c5b7d29719adda892ddb31bb \
-    --hash=sha256:56ada5d33b8741d298836644042faddebc83ee669782d661e21563034beb5aba \
-    --hash=sha256:7fa2247fce98f683bc712562d82b22b8a0a5c000738a13147ca2d1b68c122298 \
-    --hash=sha256:8c4bdb9fd2d0c06501ae15abfd23407660e95659e384acd36e013b6dd7d8a8e4 \
-    --hash=sha256:a27e78ca71316c8654965ee94b286a98c83877bfebe2607db96897bbfe458af0 \
-    --hash=sha256:a38c6c6c8032bed68b70c3b065d944c35e9f903342875d3a3218c1607987077c \
-    --hash=sha256:a4a3b71490557e18c010cbb26bd1ea9a0c32ee67e8f105e9731515b6e0af792e \
-    --hash=sha256:b6966f83064a88a51693073eea3decd47e08c3965241e09578ef7aa3a7738329 \
-    --hash=sha256:bc3ebc8b2e47716149f3541742b5cd8e0b08f51013b825c05baca3e34854370d \
-    --hash=sha256:edfa0d2e9d7ead1635b03e40a32ad56cc8f56798b6e2e9848d8300b174897076
+ninja==1.11.1.4 \
+    --hash=sha256:055f386fb550c2c9d6157e45e20a84d29c47968876b9c5794ae2aec46f952306 \
+    --hash=sha256:096487995473320de7f65d622c3f1d16c3ad174797602218ca8c967f51ec38a0 \
+    --hash=sha256:2ab67a41c90bea5ec4b795bab084bc0b3b3bb69d3cd21ca0294fc0fc15a111eb \
+    --hash=sha256:4617b3c12ff64b611a7d93fd9e378275512bb36eff8babff7c83f5116b4f8d66 \
+    --hash=sha256:5713cf50c5be50084a8693308a63ecf9e55c3132a78a41ab1363a28b6caaaee1 \
+    --hash=sha256:6aa39f6e894e0452e5b297327db00019383ae55d5d9c57c73b04f13bf79d438a \
+    --hash=sha256:9c29bb66d2aa46a2409ab369ea804c730faec7652e8c22c1e428cc09216543e5 \
+    --hash=sha256:b33923c8da88e8da20b6053e38deb433f53656441614207e01d283ad02c5e8e7 \
+    --hash=sha256:c3b96bd875f3ef1db782470e9e41d7508905a0986571f219d20ffed238befa15 \
+    --hash=sha256:cede0af00b58e27b31f2482ba83292a8e9171cdb9acc2c867a3b6e40b3353e43 \
+    --hash=sha256:cf4453679d15babc04ba023d68d091bb613091b67101c88f85d2171c6621c6eb \
+    --hash=sha256:cf554e73f72c04deb04d0cf51f5fdb1903d9c9ca3d2344249c8ce3bd616ebc02 \
+    --hash=sha256:cfdd09776436a1ff3c4a2558d3fc50a689fb9d7f1bdbc3e6f7b8c2991341ddb3 \
+    --hash=sha256:d3090d4488fadf6047d0d7a1db0c9643a8d391f0d94729554dbb89b5bdc769d7 \
+    --hash=sha256:d4a6f159b08b0ac4aca5ee1572e3e402f969139e71d85d37c0e2872129098749 \
+    --hash=sha256:ecce44a00325a93631792974659cf253a815cc6da4ec96f89742925dfc295a0d \
+    --hash=sha256:f6186d7607bb090c3be1e10c8a56b690be238f953616626f5032238c66e56867
     # via -r requirements.in
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==76.0.0 \
-    --hash=sha256:199466a166ff664970d0ee145839f5582cb9bca7a0a3a2e795b6a9cb2308e9c6 \
-    --hash=sha256:43b4ee60e10b0d0ee98ad11918e114c70701bc6051662a9a675a0496c1a158f4
+setuptools==78.1.0 \
+    --hash=sha256:18fd474d4a82a5f83dac888df697af65afa82dec7323d09c3e37d1f14288da54 \
+    --hash=sha256:3e386e96793c8702ae83d17b853fb93d3e09ef82ec62722e61da5cd22376dcd8
     # via -r requirements.in

.circleci/config.yml

@@ -37,7 +37,7 @@ jobs:
       - run: meson dist --no-tests -Cbuild
       - persist_to_workspace:
           root: .
-          paths: build/meson-dist/harfbuzz-*.tar.xz
+          paths: [build/meson-dist/harfbuzz-*.tar.xz]
 
   publish-dist:
     executor: dist-executor
@@ -58,21 +58,6 @@ jobs:
       - run: meson compile -Cbuild -j9
       - run: RUN_VALGRIND=1 meson test -Cbuild -t 10 --no-suite=slow --wrap='valgrind --leak-check=full --error-exitcode=1' --print-errorlogs --num-processes=$(($(nproc)/2 + 1))
 
-  minsize:
-    docker:
-      - image: ubuntu
-    steps:
-      - checkout
-      - run: apt update
-      - run: DEBIAN_FRONTEND=noninteractive apt install -y ninja-build binutils gcc g++ pkg-config ragel libfreetype6-dev libglib2.0-dev libcairo2-dev python3 python3-pip python3-venv
-      - run: |
-          python3 -m venv venv
-          source venv/bin/activate
-          pip3 install meson==0.56.0
-          meson setup build --buildtype=minsize
-          meson compile -Cbuild
-          meson test -Cbuild --print-errorlogs
-
   asan-ubsan:
     docker:
       - image: ubuntu
@@ -141,7 +126,7 @@ jobs:
           source venv/bin/activate
           pip3 install meson==1.6.0
           bash .ci/build-win.sh 32
-          meson devenv -Cbuild-win32 meson test --print-errorlogs --suite=harfbuzz
+          meson devenv -Cbuild-win32 meson test -t 10 --print-errorlogs --suite=harfbuzz
       - store_artifacts:
           path: harfbuzz-win32.zip
       - persist_to_workspace:
@@ -154,6 +139,8 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
+      - run: apt update
+      - run: DEBIAN_FRONTEND=noninteractive apt install -y curl
       - run: |
           mv harfbuzz-win32{,-$CIRCLE_TAG}.zip
           .ci/publish_release_artifact.sh harfbuzz-win32-$CIRCLE_TAG.zip
@@ -170,7 +157,7 @@ jobs:
           source venv/bin/activate
           pip3 install meson==1.6.0
           bash .ci/build-win.sh 64
-          meson devenv -Cbuild-win64 meson test --print-errorlogs --suite=harfbuzz
+          meson devenv -Cbuild-win64 meson test -t 10 --print-errorlogs --suite=harfbuzz
       - store_artifacts:
           path: harfbuzz-win64.zip
       - persist_to_workspace:
@@ -183,6 +170,8 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
+      - run: apt update
+      - run: DEBIAN_FRONTEND=noninteractive apt install -y curl
       - run: |
           mv harfbuzz-win64{,-$CIRCLE_TAG}.zip
           .ci/publish_release_artifact.sh harfbuzz-win64-$CIRCLE_TAG.zip
@@ -207,7 +196,6 @@ workflows:
             branches:
               ignore: /.*/
       - fedora-valgrind
-      - minsize
       - asan-ubsan
       - tsan
       - msan

NEWS

@@ -1,3 +1,34 @@
+Overview of changes leading to 11.0.0
+Friday, April 4, 2025
+====================================
+- The change in version 10.3.0 to apply “trak” table tracking values to glyph
+  advances directly has been reverted as it required every font functions
+  implementation to handle it, which breaks existing custom font functions.
+  Tracking is instead back to being applied during shaping.
+- When `directwrite` integration is enabled, we now link to `dwrite.dll`
+  instead of dynamically loading it.
+- A new experimental APIs for getting raw “CFF” and “CFF2” CharStrings.
+- We now provide manpages for the various command line utilities. Building
+  manpages requires “help2man” and will be skipped if it is not present.
+- The command line utilities now set different return value for different kinds
+  of failures. Details are provided in the manpages.
+- Various fixes and improvements to `fontations` font functions.
+- All shaping operations using the `ot` shaper have become memory
+  allocation-free.
+- Glyph extents returned by `hb-ot` and `hb-ft` font functions are now rounded
+  in stead of flooring/ceiling them, which also matches what other font
+  libraries do.
+- Fix “AAT” deleted glyph marks interfering with fallback mark positioning.
+- Glyph outlines emboldening have been moved out of `hb-ot` and `hb-ft` font
+  functions to the HarfBuzz font layer, so that it works with any font
+  functions implementation.
+- Fix our fallback C++11 atomics integration, which seems to not be widely
+  used.
+- Various testing fixes and improvements.
+- Various subsetting fixes and improvements.
+- Various other fixes and improvements.
+
+
 Overview of changes leading to 11.0.0
 Monday, March 24, 2025
 ====================================

README.md

@@ -35,13 +35,20 @@ will also find Win32/Win64 binary bundles that include `libharfbuzz` DLL,
 `hb-view.exe`, `hb-shape.exe`, and all dependencies.
 
 The canonical source tree is available on [github][4].
+Both development and user support discussion around HarfBuzz happens on
+[github][4] as well.
 
 The API that comes with `hb.h` will not change incompatibly. Other, peripheral,
 headers are more likely to go through minor modifications, but again, we do our
 best to never change API in an incompatible way. We will never break the ABI.
 
-If you are not sure whether Pango or HarfBuzz is right for you, read [Pango vs
-HarfBuzz][5].
+The API and ABI are stable even across major version number jumps. In fact,
+current HarfBuzz is API/ABI compatible all the way back to the 0.9.x series.
+If one day we need to break the API/ABI, that would be called a new a library.
+
+As such, we bump the major version number only when we add major new features,
+the minor version when there is new API, and the micro version when there
+are bug fixes.
 
 ## Development
 
@@ -51,26 +58,34 @@ For custom configurations, see [CONFIG.md](CONFIG.md).
 
 For testing and profiling, see [TESTING.md](TESTING.md).
 
+For using with Python, see [README.python.md](README.python.md). There is also [uharfbuzz](https://github.com/harfbuzz/uharfbuzz).
+
 For cross-compiling to Windows from Linux or macOS, see [README.mingw.md](README.mingw.md).
 
+To report bugs or submit patches please use [github][4] issues and pull-requests.
+
+### Developer documents
+
 To get a better idea of where HarfBuzz stands in the text rendering stack you
 may want to read [State of Text Rendering 2024][6].
 Here are a few presentation slides about HarfBuzz at the
 Internationalization and Unicode Conference over the years:
 
-*   November 2014, [Unicode, OpenType, and HarfBuzz: Closing the Circle][7],
-*   October 2012, [HarfBuzz, The Free and Open Text Shaping Engine][8],
-*   October 2009, [HarfBuzz: the Free and Open Shaping Engine][9].
-
-Both development and user support discussion around HarfBuzz happens on the
-[github][4].
+-   November 2014, [Unicode, OpenType, and HarfBuzz: Closing the Circle][7],
+-   October 2012, [HarfBuzz, The Free and Open Text Shaping Engine][8],
+-   October 2009, [HarfBuzz: the Free and Open Shaping Engine][9].
 
-To report bugs or submit patches please use [github][4] issues and
-pull-requests.
+More presentations and papers are available on [behdad][11]'s website.
+In particular, the following documents are relevant to HarfBuzz development:
 
-For a comparison of old vs new HarfBuzz memory consumption see [this][10].
+- 2025 — HarfBuzz Study: Caching — [Paper][12]
+- 2025 — HarfBuzz Study: `hb-decycler` — [Paper][13]
+- 2022 — HarfBuzz Study: `hb-iter` — [Paper][14]
+- 2022 — HarfBuzz Study: A C library written in C++ — [Paper][15]
+- 2022 — HarfBuzz Study: PackTab: A static integer table packer — [Paper][16]
+- 2014 — Reflections on Building the HarfBuzz Indic Shaper — [Paper][17]
+- 2012 — HarfBuzz Memory Consumption — [Paper][10]
 
-<!--See past and upcoming [HarfBuzz Hackfests](https://freedesktop.org/wiki/Software/HarfBuzz/Hackfests/)!-->
 
 ## Name
 
@@ -98,9 +113,15 @@ transliterated using the Latin script. It also means "talkative" or
 [2]: https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6AATIntro.html
 [3]: https://github.com/harfbuzz/harfbuzz/releases
 [4]: https://github.com/harfbuzz/harfbuzz
-[5]: http://mces.blogspot.com/2009/11/pango-vs-harfbuzz.html
 [6]: http://behdad.org/text2024
-[7]: https://goo.gl/FSIQuC
-[8]: https://goo.gl/2wSRu
+[7]: https://docs.google.com/presentation/d/1x97pfbB1gbD53Yhz6-_yBUozQMVJ_5yMqqR_D-R7b7I/preview
+[8]: https://docs.google.com/presentation/d/1ySTZaXP5XKFg0OpmHZM00v5b17GSr3ojnzJekl4U8qI/preview
 [9]: http://behdad.org/download/Presentations/slippy/harfbuzz_slides.pdf
-[10]: https://goo.gl/woyty
+[10]: https://docs.google.com/document/d/12jfNpQJzeVIAxoUSpk7KziyINAa1msbGliyXqguS86M/preview
+[11]: https://behdad.org/
+[12]: https://docs.google.com/document/d/1_VgObf6Je0J8byMLsi7HCQHnKo2emGnx_ib_sHo-bt4/preview
+[13]: https://docs.google.com/document/d/1Y-u08l9YhObRVObETZt1k8f_5lQdOix9TRH3zEXaoAw/preview
+[14]: https://docs.google.com/document/d/1o-xvxCbgMe9JYFHLVnPjk01ZY_8Cj0vB9-KTI1d0nyk/preview
+[15]: https://docs.google.com/document/d/18hI56KJpvXtwWbc9QSaz9zzhJwIMnrJ-zkAaKS-W-8k/preview
+[16]: https://docs.google.com/document/d/1Xq3owVt61HVkJqbLFHl73il6pcTy6PdPJJ7bSouQiQw/preview
+[17]: https://docs.google.com/document/d/1wMPwVNBvsIriamcyBO5aNs7Cdr8lmbwLJ8GmZBAswF4/preview

README.mingw.md

@@ -30,6 +30,11 @@ a few different ways to build and test HarfBuzz for Windows.
   - Ubuntu, 64bit: `apt install wine wine64`.
   - Mac: `brew install wine-stable`.
 
+Note that to run Wine on Apple silicon systems, you need the Apple Rosetta translator.
+Follow the instructions you got from brew. This should do it:
+
+  - `softwareupdate --install-rosetta --agree-to-license`
+
 2. Install the `mingw-w64` cross-compiler.
 
   - Fedora, 32bit: `dnf install mingw32-gcc-c++`
@@ -41,7 +46,7 @@ a few different ways to build and test HarfBuzz for Windows.
 3. Install dependencies.
 
 First, make sure you do not have the mingw32 harfbuzz package, as that will
-override our own build:
+override our own build with older `meson`:
 
   - Fedora, 32bit: `dnf remove mingw32-harfbuzz`
   - Fedora, 64bit: `dnf remove mingw64-harfbuzz`

RELEASING.md

@@ -3,17 +3,17 @@
 - [ ] Open gitk and review changes since last release.
 
 	- [ ] Print all public API changes:
-        `git diff $(git describe | sed 's/-.*//').. src/*.h`
+          `git diff $(git describe | sed 's/-.*//').. src/*.h`
 
     - [ ]  Document them in NEWS.
-        All API and API semantic changes should be clearly marked as API additions, API changes, or API deletions.
+           All API and API semantic changes should be clearly marked as API additions, API changes, or API deletions.
 
     - [ ] Document deprecations.
-        Ensure all new API / deprecations are in listed correctly in docs/harfbuzz-sections.txt.
-        If release added new API, add entry for new API index at the end of docs/harfbuzz-docs.xml.
+          Ensure all new API / deprecations are listed correctly in docs/harfbuzz-sections.txt.
+          If release added new API, add entry for new API index at the end of docs/harfbuzz-docs.xml.
 
-     If there's a backward-incompatible API change (including deletions for API used anywhere), that's a release blocker.
-     Do NOT release.
+      If there's a backward-incompatible API change (including deletions for API used anywhere), that's a release blocker.
+      Do NOT release.
 
 - [ ] Based on severity of changes, decide whether it's a minor or micro release number bump.
 
@@ -26,12 +26,16 @@
 - [ ] Do a `meson test -Cbuild` so it both checks the tests and updates hb-version.h (use `git diff` to see if is really updated).
 
 - [ ] Commit NEWS, meson.build, and src/hb-version.h, as well as any REPLACEME changes you made.
-        The commit message is simply the release number, e. g. "1.4.7"
+      The commit message is simply the release number, e. g. "1.4.7"
 
 - [ ] Do a `meson dist -Cbuild` that runs the tests against the latest committed changes.
-   If doesn't pass, something fishy is going on, reset the repo and start over.
+      If it does not pass, something fishy is going on, reset the repo and start over.
 
 - [ ] Tag the release and sign it: e.g. `git tag -s 1.4.7 -m 1.4.7`.
 	  Enter your GPG password.
 
 - [ ] Push the commit and tag out: `git push --follow-tags`.
+
+- [ ] There should be a GitHub release automatically created.
+      When it does, go to that release page and add description.
+      The description should be the NEWS file additions.

docs/harfbuzz-sections.txt

@@ -955,6 +955,10 @@ hb_subset_serialize_object_t
 hb_subset_serialize_or_fail
 <SUBSECTION Private>
 hb_subset_input_override_name_table
+hb_subset_cff_get_charstring_data
+hb_subset_cff_get_charstrings_index
+hb_subset_cff2_get_charstring_data
+hb_subset_cff2_get_charstrings_index
 </SECTION>
 
 <SECTION>

meson.build

@@ -1,6 +1,6 @@
 project('harfbuzz', ['c', 'cpp'],
   meson_version: '>= 0.55.0',
-  version: '11.0.0',
+  version: '11.0.1',
   default_options: [
     'cpp_eh=none',          # Just to support msvc, we are passing -fno-exceptions also anyway
     # 'cpp_rtti=false',     # Do NOT enable, wraps inherit it and ICU needs RTTI
@@ -332,12 +332,16 @@ if host_machine.system() == 'windows' and not get_option('gdi').disabled()
   endif
 endif
 
+directwrite_dep = []
 # DirectWrite (Windows)
 if host_machine.system() == 'windows' and not get_option('directwrite').disabled()
   if get_option('directwrite').enabled() and not cpp.has_header('dwrite_3.h')
     error('DirectWrite was enabled explicitly, but required header is missing.')
   endif
-  conf.set('HAVE_DIRECTWRITE', 1)
+  directwrite_dep = cpp.find_library('dwrite', required: get_option('directwrite'))
+  if directwrite_dep.found()
+    conf.set('HAVE_DIRECTWRITE', 1)
+  endif
 endif
 
 # CoreText (macOS)

src/OT/Layout/Common/CoverageFormat1.hh

@@ -77,7 +77,7 @@ struct CoverageFormat1_3
 
   bool intersects (const hb_set_t *glyphs) const
   {
-    if (glyphArray.len > glyphs->get_population () * hb_bit_storage ((unsigned) glyphArray.len) / 2)
+    if (glyphArray.len > glyphs->get_population () * hb_bit_storage ((unsigned) glyphArray.len))
     {
       for (auto g : *glyphs)
         if (get_coverage (g) != NOT_COVERED)