Merge pull request #107 from kas-gui/push-szwzytvuyznt

Update fontique; fix selection of fonts with differing synthesis

Author: dhardy

.github/workflows/test.yml

@@ -15,6 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libfontconfig1-dev
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@nightly
         with:
@@ -45,6 +49,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
+      - name: Install dependencies
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libfontconfig1-dev
       - name: Install toolchain
         uses: actions-rs/toolchain@v1
         with:

Cargo.toml

@@ -51,7 +51,7 @@ log = "0.4"
 serde = { version = "1.0.123", features = ["derive"], optional = true }
 ab_glyph = { version = "0.2.10", optional = true }
 swash = "0.2.4"
-fontique = "0.6.0"
+fontique = "0.7.0"
 
 [dependencies.rustybuzz]
 version = "0.20.1"

README.md

@@ -49,6 +49,22 @@ Pure-Rust alternatives for typesetting and rendering text:
 -   [glyph_brush](https://github.com/alexheretic/glyph-brush) is a fast caching text render library using [ab_glyph].
 
 
+Crates and features
+-------------------
+
+Significant external dependencies:
+
+-   [rustybuzz](https://crates.io/crates/rustybuzz): a complete harfbuzz's shaping algorithm port to Rust
+-   [fontique](https://crates.io/crates/fontique): Font enumeration and fallback
+
+### Feature flags
+
+This crate has a few optional features (all are disabled by default). See [Cargo.toml](https://github.com/kas-gui/kas-text/blob/master/Cargo.toml#L21) for a full list. Highlighted features:
+
+-   `shaping`: enable text shaping (recommended)
+-   `markdown`: rich text support with Markdown parsing (only supports a small subset of Markdown features)
+
+
 Contributing
 --------
 

src/fonts/library.rs

@@ -86,9 +86,7 @@ pub struct FaceStore {
 }
 
 impl FaceStore {
-    /// Construct, given a file path, a reference to the loaded data and the face index
-    ///
-    /// The `path` is to be stored; its contents are already loaded in `data`.
+    /// Construct, given a data blob, face index and synthesis settings
     fn new(blob: Blob<u8>, index: u32, synthesis: Synthesis) -> Result<Self, FontError> {
         // Safety: this is a private fn used to construct a FaceStore instance
         // to be stored in FontLibrary which is never deallocated. This
@@ -367,13 +365,22 @@ impl FontLibrary {
                 let mut hasher = DefaultHasher::new();
                 qf.blob.id().hash(&mut hasher);
                 hasher.write_u32(qf.index);
+                // Hashing of qf.synthesis is incomplete, but we use an equality test later anyway
+                for var in qf.synthesis.variation_settings() {
+                    var.0.hash(&mut hasher);
+                }
+                qf.synthesis.embolden().hash(&mut hasher);
+                qf.synthesis.skew().is_some().hash(&mut hasher);
                 hasher.finish()
             };
 
             for (h, id) in face_list.source_hash.iter().cloned() {
                 if h == source_hash {
                     let face = &face_list.faces[id.get()];
-                    if face.blob.id() == qf.blob.id() && face.index == qf.index {
+                    if face.blob.id() == qf.blob.id()
+                        && face.index == qf.index
+                        && face.synthesis == qf.synthesis
+                    {
                         faces.push(id);
                         return QueryStatus::Continue;
                     }