Refactor font rendering pipeline, remove font-kit and pathfinder

.github/workflows/plotters-backend.yml

@@ -12,6 +12,9 @@ jobs:
     - uses: actions/checkout@v4
       with:
           submodules: recursive
+    - name: Install fontconfig
+      if: runner.os == 'Linux'
+      run: sudo apt-get update && sudo apt-get install -y libfontconfig-dev
     - uses: actions-rs/toolchain@v1
       with:
           toolchain: stable

.github/workflows/plotters-bitmap.yml

@@ -12,6 +12,9 @@ jobs:
     - uses: actions/checkout@v4
       with:
           submodules: recursive
+    - name: Install fontconfig
+      if: runner.os == 'Linux'
+      run: sudo apt-get update && sudo apt-get install -y libfontconfig-dev
     - uses: actions-rs/toolchain@v1
       with:
           toolchain: stable

.github/workflows/plotters-core.yml

@@ -8,6 +8,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Install fontconfig
+        run: sudo apt-get update && sudo apt-get install -y libfontconfig-dev
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -20,68 +22,95 @@ jobs:
   msrv:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-      with:
+      - uses: actions/checkout@v4
+        with:
           submodules: recursive
-    - uses: actions-rs/toolchain@v1
-      with:
-          toolchain: 1.56.0
+      - name: Install fontconfig
+        run: sudo apt-get update && sudo apt-get install -y libfontconfig-dev
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: 1.88.0
           override: true
           args: --all-features
   build_and_test:
     runs-on: ${{ matrix.os }}
     strategy:
-        matrix:
-            os: [ubuntu-latest, windows-latest, macos-latest]
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
-    - uses: actions/checkout@v4
-      with:
+      - uses: actions/checkout@v4
+        with:
           submodules: recursive
-    - uses: actions-rs/toolchain@v1
-      with:
+      - name: Install fontconfig
+        if: runner.os == 'Linux'
+        run: sudo apt-get update && sudo apt-get install -y libfontconfig-dev
+      - uses: actions-rs/toolchain@v1
+        with:
           toolchain: stable
           override: true
-    - uses: actions-rs/cargo@v1
-      with:
+      - uses: actions-rs/cargo@v1
+        with:
           command: test
           args: --verbose
-    - uses: actions-rs/cargo@v1
-      with:
+      - uses: actions-rs/cargo@v1
+        with:
           command: test
           args: --verbose --no-default-features --features=svg_backend --lib
-  test_all_features:
+  test_all_features_exclude_ab_glyph:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-      with:
+      - uses: actions/checkout@v4
+        with:
           submodules: recursive
-    - uses: actions-rs/toolchain@v1
-      with:
+      - name: Install fontconfig
+        run: sudo apt-get update && sudo apt-get install -y libfontconfig-dev
+      - uses: actions-rs/toolchain@v1
+        with:
           toolchain: stable
           override: true
-    - uses: actions-rs/cargo@v1
-      with:
+      - uses: actions-rs/cargo@v1
+        with:
           command: test
-          args: --verbose --all-features
+          # This is all features except for ab_glyph, which will break doctests
+          args: --verbose --features=serialization,evcxr
+  test_all_features_exclude_doctests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Install fontconfig
+        run: sudo apt-get update && sudo apt-get install -y libfontconfig-dev
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          # Run all tests with ab_glyph, but exclude doctests
+          args: --lib --bins --tests --verbose --all-features
   run_all_examples:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-      with:
+      - uses: actions/checkout@v4
+        with:
           submodules: recursive
-    - uses: actions-rs/cargo@v1
-      with:
+      - name: Install fontconfig
+        run: sudo apt-get update && sudo apt-get install -y libfontconfig-dev
+      - uses: actions-rs/cargo@v1
+        with:
           command: build
           args: --verbose --release --examples
-    - name: Run all the examples
-      run: |
-        cd plotters
-        for example in examples/*.rs
-        do 
-          ../target/release/examples/$(basename ${example} .rs)
-        done 
-        tar -czvf example-outputs.tar.gz plotters-doc-data
-    - uses: actions/upload-artifact@v4
-      with:
+      - name: Run all the examples
+        run: |
+          cd plotters
+          for example in examples/*.rs
+          do 
+            ../target/release/examples/$(basename ${example} .rs)
+          done 
+          tar -czvf example-outputs.tar.gz plotters-doc-data
+      - uses: actions/upload-artifact@v4
+        with:
           name: example-outputs
           path: plotters/example-outputs.tar.gz

.github/workflows/plotters-svg.yml

@@ -12,6 +12,9 @@ jobs:
     - uses: actions/checkout@v4
       with:
           submodules: recursive
+    - name: Install fontconfig
+      if: runner.os == 'Linux'
+      run: sudo apt-get update && sudo apt-get install -y libfontconfig-dev
     - uses: actions-rs/toolchain@v1
       with:
           toolchain: stable

.github/workflows/rust-clippy.yml

@@ -29,6 +29,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Install fontconfig
+        run: sudo apt-get update && sudo apt-get install -y libfontconfig-dev
+
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af #@v1
         with:

.github/workflows/wasm.yml

@@ -11,6 +11,8 @@ jobs:
     - uses: actions/checkout@v4
       with:
           submodules: recursive
+    - name: Install fontconfig
+      run: sudo apt-get update && sudo apt-get install -y libfontconfig-dev
     - name: Install WASM tool chain
       run: rustup target add wasm32-unknown-unknown
     - name: Check WASM Target Compiles

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "plotters-doc-data"]
 	path = plotters/plotters-doc-data
 	url = https://github.com/38/plotters-doc-data
+[submodule "plotters/plotters-doc-data"]
+	path = plotters/plotters-doc-data
+	url = git@github.com:plotters-rs/plotters-doc-data.git

README.md

@@ -532,25 +532,30 @@ The following list is a complete list of features that can be opted in or out.
 
 | Name    |  Description | Additional Dependency |Default?|
 |---------|--------------|--------|------------|
-| bitmap\_encoder  | Allow `BitMapBackend` to save the result to bitmap files | image, rusttype, font-kit | Yes |
+| bitmap\_encoder  | Allow `BitMapBackend` to save the result to bitmap files | image | Yes |
 | svg\_backend     | Enable `SVGBackend` Support | None | Yes |
 | bitmap\_gif| Opt-in GIF animation Rendering support for `BitMapBackend`, implies `bitmap` enabled | gif | Yes |
 
 - Font manipulation features
 
-| Name     | Description                              | Additional Dependency | Default? |
-|----------|------------------------------------------|-----------------------|----------|
-| ttf      | Allows TrueType font support             | font-kit              | Yes      |
-| ab_glyph | Skips loading system fonts, unlike `ttf` | ab_glyph              | No       |
-
-`ab_glyph` supports TrueType and OpenType fonts, but does not attempt to
-load fonts provided by the system on which it is running.
-It is pure Rust, and easier to cross compile.
-To use this, you *must* call `plotters::style::register_font` before
-using any `plotters` functions which require the ability to render text.
-This function only exists when the `ab_glyph` feature is enabled.
+Native text rendering is always available. Plotters resolves system fonts
+through `fontique`, shapes text with `harfrust`, reads outlines with `skrifa`,
+and rasterizes glyphs with `zeno`. Use `DrawingArea::with_fonts` when a chart
+should use in-memory fonts instead of, or in addition to, system fonts. See
+[`plotters/examples/dynamic_font.rs`](plotters/examples/dynamic_font.rs) for an
+end-to-end example that downloads Roboto from Google Fonts at runtime and
+attaches it to a chart through the new pipeline.
+
+| Name     | Description                                                                       | Additional Dependency | Default? |
+|----------|-----------------------------------------------------------------------------------|-----------------------|----------|
+| ab_glyph | Compatibility shim: exposes `register_font` and disables default system font use   | None                  | No       |
+
+The `ab_glyph` feature is retained for source compatibility with code that
+uses `plotters::style::register_font`. New code should prefer
+`DrawingArea::with_fonts` for per-area font registration.
+`register_font` only exists when the `ab_glyph` feature is enabled.
 ```rust,ignore
-/// Register a font in the fonts table.
+/// Register a font in the legacy process-global font table.
 ///
 /// The `name` parameter gives the name this font shall be referred to
 /// in the other APIs, like `"sans-serif"`.
@@ -646,4 +651,3 @@ pub struct RGBAColor(pub u8, pub u8, pub u8, pub f64);
     In the case that error handling is important, you need manually call the `present()` method before the backend gets dropped.
 	For more information, please see the examples.
 
-

doc-template/readme.template.md

@@ -270,25 +270,30 @@ The following list is a complete list of features that can be opted in or out.
 
 | Name    |  Description | Additional Dependency |Default?|
 |---------|--------------|--------|------------|
-| bitmap\_encoder  | Allow `BitMapBackend` to save the result to bitmap files | image, rusttype, font-kit | Yes |
+| bitmap\_encoder  | Allow `BitMapBackend` to save the result to bitmap files | image | Yes |
 | svg\_backend     | Enable `SVGBackend` Support | None | Yes |
 | bitmap\_gif| Opt-in GIF animation Rendering support for `BitMapBackend`, implies `bitmap` enabled | gif | Yes |
 
 - Font manipulation features
 
-| Name     | Description                              | Additional Dependency | Default? |
-|----------|------------------------------------------|-----------------------|----------|
-| ttf      | Allows TrueType font support             | font-kit              | Yes      |
-| ab_glyph | Skips loading system fonts, unlike `ttf` | ab_glyph              | No       |
-
-`ab_glyph` supports TrueType and OpenType fonts, but does not attempt to
-load fonts provided by the system on which it is running.
-It is pure Rust, and easier to cross compile.
-To use this, you *must* call `plotters::style::register_font` before
-using any `plotters` functions which require the ability to render text.
-This function only exists when the `ab_glyph` feature is enabled.
+Native text rendering is always available. Plotters resolves system fonts
+through `fontique`, shapes text with `harfrust`, reads outlines with `skrifa`,
+and rasterizes glyphs with `zeno`. Use `DrawingArea::with_fonts` when a chart
+should use in-memory fonts instead of, or in addition to, system fonts. See
+[`plotters/examples/dynamic_font.rs`](plotters/examples/dynamic_font.rs) for an
+end-to-end example that downloads Roboto from Google Fonts at runtime and
+attaches it to a chart through the new pipeline.
+
+| Name     | Description                                                                       | Additional Dependency | Default? |
+|----------|-----------------------------------------------------------------------------------|-----------------------|----------|
+| ab_glyph | Compatibility shim: exposes `register_font` and disables default system font use   | None                  | No       |
+
+The `ab_glyph` feature is retained for source compatibility with code that
+uses `plotters::style::register_font`. New code should prefer
+`DrawingArea::with_fonts` for per-area font registration.
+`register_font` only exists when the `ab_glyph` feature is enabled.
 ```rust,ignore
-/// Register a font in the fonts table.
+/// Register a font in the legacy process-global font table.
 ///
 /// The `name` parameter gives the name this font shall be referred to
 /// in the other APIs, like `"sans-serif"`.
@@ -369,4 +374,3 @@ pub fn register_font(
 	For more information, please see the examples.
 
 $$style$$
-

plotters-bitmap/Cargo.toml

@@ -31,7 +31,7 @@ gif_backend = ["gif", "image_encoder"]
 
 [dev-dependencies.plotters]
 default-features = false
-features = ["ttf", "line_series", "bitmap_backend"]
+features = ["line_series", "bitmap_backend"]
 path = "../plotters"
 
 [dev-dependencies]

plotters-svg/Cargo.toml

@@ -16,7 +16,7 @@ version = "0.3.6"
 path = "../plotters-backend"
 
 [dependencies.image]
-version = "0.25.9"
+version = "0.25.10"
 optional = true
 default-features = false
 features = ["jpeg", "png", "bmp"]
@@ -27,5 +27,4 @@ bitmap_encoder = ["image"]
 
 [dev-dependencies.plotters]
 default-features = false
-features = ["ttf"]
 path = "../plotters"

plotters-svg/src/svg.rs

@@ -602,7 +602,7 @@ impl<'a> DrawingBackend for SVGBackend<'a> {
 
             let color = image::ColorType::Rgb8;
 
-            encoder.write_image(src, w, h, color).map_err(|e| {
+            encoder.write_image(src, w, h, color.into()).map_err(|e| {
                 DrawingErrorKind::DrawingError(Error::new(
                     std::io::ErrorKind::Other,
                     format!("Image error: {}", e),

plotters/Cargo.toml

@@ -38,13 +38,11 @@ optional = true
 path = "../plotters-svg"
 
 [target.'cfg(not(all(target_arch = "wasm32", not(target_os = "wasi"))))'.dependencies]
-ttf-parser = { version = "0.25.1", optional = true }
-lazy_static = { version = "1.4.0", optional = true }
-pathfinder_geometry = { version = "0.5.1", optional = true }
-font-kit = { version = "0.14.2", optional = true }
-ab_glyph = { version = "0.2.12", optional = true }
-once_cell = { version = "1.8.0", optional = true }
-
+fontique = "0.9.0"
+harfrust = "0.6.0"
+once_cell = "1.8.0"
+skrifa = "0.42.1"
+zeno = "0.3.3"
 
 [target.'cfg(not(all(target_arch = "wasm32", not(target_os = "wasi"))))'.dependencies.image]
 version = "0.25.9"
@@ -72,8 +70,7 @@ features = [
 default = [
         "bitmap_backend", "bitmap_encoder", "bitmap_gif",
         "svg_backend",
-        "chrono",
-        "ttf",
+        "datetime",
         "image",
         "deprecated_items",  "all_series", "all_elements",
         "full_palette",
@@ -104,13 +101,8 @@ line_series = []
 point_series = []
 surface_series = []
 
-# Font implementation
-ttf = ["font-kit", "ttf-parser", "lazy_static", "pathfinder_geometry"]
-# dlopen fontconfig C library at runtime instead of linking at build time
-# Can be useful for cross compiling, especially considering fontconfig has lots of C dependencies
-fontconfig-dlopen = ["font-kit/source-fontconfig-dlopen"]
-
-ab_glyph = ["dep:ab_glyph", "once_cell"]
+# Font compatibility
+ab_glyph = []
 
 # Misc
 datetime = ["chrono"]
@@ -143,4 +135,3 @@ path = "benches/main.rs"
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "doc_cfg"]
-

plotters/examples/3d-plot.rs

@@ -9,7 +9,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let z_axis = (-3.0..3.0).step(0.1);
 
     let mut chart = ChartBuilder::on(&area)
-        .caption("3D Plot Test", ("sans", 20))
+        .caption("3D Plot Test", ("sans-serif", 20))
         .build_cartesian_3d(x_axis.clone(), -3.0..3.0, z_axis.clone())?;
 
     chart.with_projection(|mut pb| {