Sync main into builtin-engines (2026-11-15)

.github/workflows/ci.yml

@@ -171,11 +171,11 @@ jobs:
           path: build/.cache/zig-x86_64-windows-0.16.0
           key: zig-0.16.0-x86_64-windows
 
-      # rhwp, Pandoc, 7-Zip and ExifTool are small; with them the HWP/HWPX, archive and metadata engine tests run too
-      # (LibreOffice is skipped to save time).
-      - name: Fetch rhwp, Pandoc, 7-Zip and ExifTool for engine tests
+      # rhwp, Pandoc, 7-Zip, ExifTool and WeasyPrint are small; with them the HWP/HWPX, archive, metadata and WeasyPrint
+      # engine tests run too, WeasyPrint's against the pinned Windows build (LibreOffice is skipped to save time).
+      - name: Fetch rhwp, Pandoc, 7-Zip, ExifTool and WeasyPrint for engine tests
         shell: pwsh
-        run: ./build/fetch-engines.ps1 -Only rhwp,pandoc,7zip,exiftool
+        run: ./build/fetch-engines.ps1 -Only rhwp,pandoc,7zip,exiftool,weasyprint
 
       # The UI tests on their own first, as the release runs them (there they crashed with 0xC0000005): a crash
       # names the test that was running and leaves a dump in TestResults.

.github/workflows/portable.yml

@@ -142,7 +142,7 @@ jobs:
 
       - name: Disk image tool
         if: runner.os == 'macOS'
-        run: python3 -m pip install dmgbuild==1.6.7
+        run: python3 -m pip install -r installer/macos/dmg/requirements.txt
 
       - name: Linux desktop dependencies
         if: runner.os == 'Linux'

CHANGELOG.md

@@ -73,7 +73,7 @@ Fixes for two advisories, [GHSA-gw2f-hq9g-3jc2](https://github.com/KnifeLemon/Fi
 - **OCR in several languages:** a preset's OCR can read more than one language at once, for scans that mix them (Simplified Chinese and English, for example).
 - **Subtitles and transcripts to TXT:** subtitle files (SRT, ASS, WebVTT, SAMI, LRC, TTML and more) convert to plain text with one line per cue and no times. With *Generate subtitles (Whisper)* turned on, a TXT preset turns speech in a video or sound file into text.
 - **Animated AVIF:** animated GIF, WebP, APNG and MNG keep every frame in AVIF, and an animated AVIF converts as an animation. With the FFmpeg engine installed, writing is much faster and can be cancelled.
-- **Show output format** (*Settings → Donut toolbar → Appearance*; by @lightscape-jm): turn it off to show only the slice names. It's on by default.
+- **Show output format** (*Settings → Donut toolbar → Edit Donut Size*; by @lightscape-jm): turn it off to show only the slice names. It's on by default.
 - **New languages:** বাংলা (Bengali, by @fluentmoheshwar) and فارسی (Persian, by @nimazerobit).
 - **Engines page** (by @adnan-bhaldar): dragging an engine card is animated, with an outlined slot and a smaller copy that follows the pointer, and only the drag handle shows the move cursor. It follows *Reduce animations*.
 - **Settings → General** (by @adnan-bhaldar): the Settings folder card says what Filee keeps there, and each button of the Presets and toolbars card has an icon and a short description. *Clear history* and *Clear* on the Triggers page use the danger style.

CONTRIBUTING.md

@@ -34,8 +34,18 @@ dotnet test Filee.slnx -c Release
 pwsh build/build-portable.ps1 -Runtime linux-x64
 ```
 
-Use the matching runtime on a Mac or ARM64 Linux machine. A Mac also needs dmgbuild for the disk image
-(`python3 -m pip install dmgbuild==1.6.7`). Magick.NET has no ImageMagick library for Intel Macs: there,
+Use the matching runtime on a Mac or ARM64 Linux machine. A Mac also needs dmgbuild for the disk image. Homebrew's
+Python refuses `pip install` outside a virtual environment (PEP 668), so install it into one and run the build from
+a shell where that environment is active:
+
+```sh
+python3 -m venv ~/.venvs/filee-dmg
+source ~/.venvs/filee-dmg/bin/activate
+python3 -m pip install -r installer/macos/dmg/requirements.txt
+```
+
+`build-portable.ps1` checks for it with `python3 -c 'import dmgbuild'`, so a pipx install isn't found.
+Magick.NET has no ImageMagick library for Intel Macs: there,
 put Filee's own next to each build after building, e.g.
 `pwsh build/fetch-magick-native.ps1 -Runtime osx-x64 -Destination src/Filee.App/bin/Debug/net10.0`. Packaging runs on Linux/macOS so archives retain
 executable permissions. Each archive contains the app, CLI, rhwp, installation instructions and per-user

README.md

@@ -166,8 +166,8 @@ To undo it, remove the entries in Windows Security → App & browser control →
 
 | From | To |
 |---|---|
-| **Images**: JPG, PNG, WEBP, AVIF, TIFF, BMP, GIF, APNG, ICO, ICNS, JPEG XL, JPEG 2000, PSD/PSB, TGA, PPM, HEIC, QOI, DDS, PCX, MNG, CUR, …;<br>GIMP XCF, camera RAW (CR2, CR3, NEF, ARW, DNG, …), DICOM, OpenEXR, HDR, FITS, JPEG XR (Windows), iPhone Live Photo (LIVP), Paint.NET PDN (↔ PSD with its layers), animated cursor (ANI) read | any of these (HEIC⁵), Paint.NET PDN, PDF, SVG (traced), resized, grayscale;<br>Live/Motion Photos (iPhone, Android) → their video (MP4, MOV⁵), and a video → Live Photo (iPhone) or Motion Photo (Android)⁵, experimental |
-| **Vector**: SVG, SVGZ, EMF, WMF, AI, Visio VSDX, ODG, FODG<br>EPS, PS¹<br>CDR, binary Visio VSD, CGM² | PDF (vector), PNG and other images,<br>SVG ↔ SVGZ, SVG → DXF/DWG, PDF → EPS/PS, SVG → EMF, WMF, ODG² |
+| **Images**: JPG, PNG, WEBP, AVIF, TIFF, BMP, GIF, APNG, ICO, ICNS, JPEG XL, JPEG 2000, PSD/PSB, TGA, PPM, HEIC, QOI, DDS, PCX, MNG, CUR, …;<br>camera RAW (CR2, CR3, NEF, ARW, DNG, …), DICOM, OpenEXR, HDR, FITS, JPEG XR (Windows), iPhone Live Photo (LIVP), Valve Texture VTF (Source engine, Garry's Mod), animated cursor (ANI) read;<br>GIMP XCF and Paint.NET PDN (layers kept between XCF, PDN and PSD) | any of these (HEIC⁵), GIMP XCF, Paint.NET PDN, VTF, PDF, SVG (traced), resized, grayscale;<br>Live/Motion Photos (iPhone, Android) → their video (MP4, MOV⁵), and a video → Live Photo (iPhone) or Motion Photo (Android)⁵, experimental |
+| **Vector**: SVG, SVGZ, EMF, WMF, AI, Visio VSDX, ODG, FODG<br>EPS, PS¹<br>CDR, binary Visio VSD, CGM²<br>Obsidian Canvas (JSON Canvas) read | PDF (vector), PNG and other images,<br>SVG ↔ SVGZ, SVG → DXF/DWG, PDF → EPS/PS, SVG → EMF, WMF, ODG²;<br>Obsidian Canvas → its text as Markdown |
 | **PDF** | DOCX, HWPX, TXT, PNG, JPG, TIFF, CBZ, PPTX (a picture of each page), SVG²;<br>merge (in an order you choose first), split, page ranges, compress (smaller PDFs) |
 | **Documents**: DOCX, DOCM, DOTX, DOC, DOT, ODT, EML, Outlook MSG;<br>OFD (Chinese e-invoices, official documents) read<br>FODT, OTT, RTF, WPS, WPD, Pages, ClarisWorks, MacWrite, T602, …² | PDF, DOCX, ODT, HWPX, EPUB, TXT, HTML, PPTX and ODP slides;<br>MSG → EML<br>FODT, OTT² |
 | **Spreadsheets**: XLSX, XLSM, XLS, XLT, ODS, CSV, TSV<br>OTS, FODS, Numbers, ET² | PDF, XLSX, ODS, CSV, TSV, JSON, HWPX, HTML<br>XLT, OTS² |
@@ -177,9 +177,9 @@ To undo it, remove the entries in Windows Security → App & browser control →
 | **E-books**: EPUB, KEPUB, MOBI, AZW3, AZW, AZW4, FB2, CBZ, CBR, CB7, HTMLZ, TXTZ, CHM, PDB, PML, TCR, RB, SNB, OEB<br>LIT, LRF⁴ | PDF, EPUB, KEPUB (Kobo), DOCX, TXT, HTML, HWPX<br>MOBI, AZW3 |
 | **Video**⁵: MP4, MOV, MKV, WEBM, AVI, WMV, FLV, MPEG, Video CD (DAT), TS, M2TS, 3GP, OGV, VOB, … | MP4 (H.264, HEVC, AV1), WEBM, MOV, MKV, AVI, GIF, APNG, MP3, M4A, 720p,<br>subtitles (SRT, ASS, WebVTT) |
 | **Audio**⁵: MP3, M4A, AAC, WAV, FLAC, OGG, OPUS, WMA, AIFF, AMR, APE, WavPack, TTA, DSD (DSF, DFF), DTS, AC3, E-AC3, … | MP3, M4A (AAC, ALAC), WAV, FLAC, OGG, OPUS, AAC, WavPack, TTA, W64, AC3, E-AC3 |
-| **Subtitles**: SRT, ASS/SSA, WebVTT, SAMI (SMI), LRC, TTML, MicroDVD, SCC | each other as UTF-8 (Korean CP949 files read correctly) |
+| **Subtitles**: SRT, ASS/SSA, WebVTT, SAMI (SMI), LRC, KRC, TTML, MicroDVD, SCC | each other as UTF-8 (Korean CP949 files read correctly) |
 | **Archives**: ZIP, ANSYS Workbench (WBPZ), 7Z, RAR, TAR, TAR.GZ, TAR.BZ2, TAR.XZ, GZ, XZ, ISO, UDF, IMG, DMG, CAB, LHA, ARJ, ALZ, EGG, … | extract, ZIP, 7Z, TAR, TAR.GZ, TAR.XZ, XZ;<br>any files → one ZIP |
-| **CAD**: DWG, DXF | PDF, SVG, PNG, DWG ↔ DXF |
+| **CAD**: DWG, DXF<br>Gerber PCB layers (GBR, GTL, GBL, GTO, …) read;<br>G-code of 3D printers and CNC machines (GCODE, GCO, NGC) read | PDF, SVG, PNG, DWG ↔ DXF;<br>G-code → toolpath (from above or isometric) or the slicer's preview |
 | **Fonts**: TTF, OTF, WOFF, WOFF2, EOT;<br>FON (Windows bitmap fonts) read | each other;<br>FON → one font per size |
 | **Data**: JSON, JSON Lines, YAML, TOML, XML<br>vCard, iCalendar | each other, CSV and XLSX (tables);<br>vCard, iCalendar ↔ CSV |
 | **3D models**: GLB, glTF, STL, OBJ (+ MTL), 3MF, PLY;<br>FBX read | each other, PNG preview |

THIRD-PARTY-NOTICES.md

@@ -81,6 +81,7 @@ Downloaded from their official release pages when the user chooses to install th
 | Microsoft Visual C++ Redistributable (for Ghostscript and Upscayl, conda-forge `vc14_runtime` and `vcomp14`) | Microsoft Visual C++ Redistributable license | https://github.com/conda-forge/vc-feedstock |
 | FFmpeg 9.0.2 (gyan.dev "full_build-shared" Windows build; ffmpeg.exe, ffprobe.exe and their libraries, incl. x264, x265, libvpx, LAME, Opus, Vorbis, Theora, OpenCORE AMR) | GPL-3.0-or-later (the build is configured with `--enable-gpl --enable-version3`); FFmpeg itself LGPL-2.1-or-later | https://ffmpeg.org, build: https://www.gyan.dev/ffmpeg/builds/ (source: https://github.com/GyanD/codexffmpeg) |
 | calibre (ebook-convert) | GPL-3.0 | https://calibre-ebook.com |
+| WeasyPrint 70.0 (Windows "onedir" build, `weasyprint-windows-onedir.zip`: `weasyprint.exe` with its `_internal` folder, built with PyInstaller on MSYS2 UCRT64; it embeds Python 3.14, Pango, HarfBuzz, FreeType, Fontconfig, FriBidi, GLib, libthai, Pillow, fontTools, Pyphen, pydyf, tinycss2, cssselect2, Brotli, Zopfli, OpenSSL, zlib, libpng, Expat and the MinGW runtime) | BSD-3-Clause (WeasyPrint); PSF-2.0 (Python); LGPL-2.1-or-later (Pango, GLib, FriBidi, libthai); MIT (HarfBuzz, Fontconfig, fontTools, Brotli, Expat); FreeType License; HPND (Pillow); GPL/LGPL/MPL tri-licence (Pyphen); BSD-3-Clause (pydyf, tinycss2, cssselect2); Apache-2.0 (Zopfli, OpenSSL); GCC Runtime Library Exception (MinGW runtime); zlib and libpng licences | https://github.com/Kozea/WeasyPrint |
 | Tesseract OCR 5.4 (UB Mannheim Windows build, with Leptonica and the MinGW libraries it ships; their notices are in its `doc` folder) | Apache-2.0 (Tesseract); Leptonica BSD-2-Clause; others as listed in the build | https://github.com/tesseract-ocr/tesseract, build: https://github.com/UB-Mannheim/tesseract |
 | Tesseract language data (tessdata_fast 4.1.0), downloaded per language when used | Apache-2.0 | https://github.com/tesseract-ocr/tessdata_fast |
 | whisper.cpp (whisper-cli.exe Windows build) | MIT | https://github.com/ggml-org/whisper.cpp |

build/build-portable.ps1

@@ -1,7 +1,7 @@
 # Builds the Linux or macOS portable package (tar.gz + SHA256SUMS) on its own operating system. macOS also gets a
 # disk image (the signed Filee.app next to an Applications link, to drag it there, on the background and window
-# layout of installer/macos/dmg, built with dmgbuild: python3 -m pip install dmgbuild==1.6.7). The image itself is not
-# signed, and neither it nor the app is notarized here.
+# layout of installer/macos/dmg, built with dmgbuild, pinned in installer/macos/dmg/requirements.txt). The image
+# itself is not signed, and neither it nor the app is notarized here.
 #
 # Linux packages must run on Ubuntu 22.04 (glibc 2.35). rhwp's Linux release needs a newer glibc, so CI builds it from
 # source on Ubuntu 22.04 (build/build-native.py) and passes it in:
@@ -36,7 +36,9 @@ if (($Runtime.StartsWith('osx-') -and -not $IsMacOS) -or ($Runtime.StartsWith('l
 }
 if ($Runtime.StartsWith('osx-')) {
     python3 -c 'import dmgbuild' 2>$null
-    if ($LASTEXITCODE -ne 0) { throw 'The disk image needs dmgbuild: python3 -m pip install dmgbuild==1.6.7' }
+    if ($LASTEXITCODE -ne 0) {
+        throw 'The disk image needs dmgbuild: install installer/macos/dmg/requirements.txt into an active virtual environment (CONTRIBUTING.md).'
+    }
 }
 if ($RhwpOverride -and -not $Runtime.StartsWith('linux-')) {
     throw '-RhwpOverride is for Linux packages.'

build/fetch-engines.ps1

@@ -22,6 +22,8 @@
                      can't call without building Filee); the language data is downloaded by the app when needed
       exiftool/      ExifTool (Perl's licence, separate program), the Windows build: exiftool(-k).exe renamed
                      exiftool.exe (the "-k" makes it wait for a key), with its exiftool_files/ beside it
+      weasyprint/    WeasyPrint (BSD-3-Clause, separate program), its Windows "onedir" build: weasyprint.exe with
+                     its _internal/ folder (Python, Pango, HarfBuzz, ...) and LICENSE, HTML -> PDF
 
   Every download is pinned to a version and verified with SHA-256 (src/Filee.Engines/Infrastructure/engines.json,
   shared with the app). Downloads are cached in build/.cache.
@@ -129,15 +131,26 @@ function Get-Engine([string]$name, [switch]$X64) {
         Write-Host "ok   $name (cached)"
         return $file
     }
-    Write-Host "get  $name  $($info.Url)"
-    # GitHub's release downloads answer 504 for minutes at a time, which stopped whole CI runs: try again a few times.
-    Invoke-WebRequest -Uri $info.Url -OutFile $file -UseBasicParsing -UserAgent 'Filee-build' -MaximumRetryCount 5 -RetryIntervalSec 20
-    $hash = (Get-FileHash $file -Algorithm SHA256).Hash
-    if ($hash -ne $info.Sha256) {
+    # Filee's own copy (EngineDownloads.MirrorUrl), for when the pinned URL is gone, e.g. a retired LibreOffice (#1474).
+    $mirror = 'https://dl.filee.sh/engines/' + $info.Sha256.ToLowerInvariant() + '/' + [Uri]::EscapeDataString([Uri]::UnescapeDataString(($info.Url -split '/')[-1]))
+    foreach ($url in @($info.Url, $mirror)) {
+        Write-Host "get  $name  $url"
+        try {
+            # GitHub's release downloads answer 504 for minutes at a time, which stopped whole CI runs: try again a few times.
+            Invoke-WebRequest -Uri $url -OutFile $file -UseBasicParsing -UserAgent 'Filee-build' -MaximumRetryCount 5 -RetryIntervalSec 20
+        }
+        catch {
+            Write-Warning "$name could not be downloaded from $url ($($_.Exception.Message))"
+            continue
+        }
+        $hash = (Get-FileHash $file -Algorithm SHA256).Hash
+        if ($hash -eq $info.Sha256) {
+            return $file
+        }
         Remove-Item $file
-        throw "Checksum mismatch for $name. Expected $($info.Sha256), got $hash."
+        Write-Warning "Checksum mismatch for $name from $url. Expected $($info.Sha256), got $hash."
     }
-    return $file
+    throw "$name could not be downloaded with its pinned SHA-256 ($($info.Sha256)) from $($info.Url) or $mirror."
 }
 
 function Reset-Folder([string]$path) {
@@ -337,6 +350,23 @@ if ('exiftool' -in $selected) {
     if (-not (Test-Path (Join-Path $target 'exiftool.exe'))) { throw 'exiftool.exe not found in the archive.' }
 }
 
+if ('weasyprint' -in $selected) {
+    # As EngineInstaller.WeasyPrintFolder does: the folder with weasyprint.exe (onedir/weasyprint), with the licence
+    # from the top of the zip moved into it.
+    $tmp = Join-Path $cache ('w-' + [Guid]::NewGuid().ToString('N').Substring(0, 8))
+    Expand-Archive -Path (Get-Engine 'weasyprint') -DestinationPath $tmp
+    $exe = Get-ChildItem $tmp -Recurse -Filter 'weasyprint.exe' | Select-Object -First 1
+    if (-not $exe) { throw 'weasyprint.exe not found in the archive.' }
+    $target = Join-Path $Destination 'weasyprint'
+    Reset-Folder $target
+    Get-ChildItem $exe.DirectoryName -Force | Move-Item -Destination $target
+    foreach ($name in 'LICENSE', 'README.rst') {
+        $file = Join-Path $tmp $name
+        if (Test-Path $file) { Move-Item -LiteralPath $file -Destination $target -Force }
+    }
+    Remove-Item $tmp -Recurse -Force
+}
+
 if ('calibre' -in $selected) {
     $msi = Get-Engine 'calibre'
     $tmp = Join-Path $cache 'calibre-admin'