typst 0.15.1.6 → 0.15.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97e4afa751e5a0bded609e423ea893b263ac5676afe79fe4bcde12761bd242dd
-  data.tar.gz: 112c45f8dbebcdcbcec318948b879dc47f44dc5c2bd5a143e4c035928dec6473
+  metadata.gz: e504e7d6117a089aea226128ffb96a606d0569184d274a31b786b40323ea2459
+  data.tar.gz: c54e606e7ec710230a13fd418b8faeb1f427342f6533ebe0cfa1402fbb0ee327
 SHA512:
-  metadata.gz: d825ef788371496a9b354cf1b22d3ea06c9f7fe2e3d1cc56b18310a9af1fede42fe449b23964c20f2b34df98a31155846d21750da0eaed97d146abbd4a7ad425
-  data.tar.gz: 0c561636ed80e29170ba849853ecd0c8342cb3abc609fb1d7ffeadc466eda702d537a454e1becd36e61f7339adc320ab6177adaf84d3bd8ef048ba6e7ddab222
+  metadata.gz: db255e768cc4b75a8f233494478140672721c19de71b5c7a8e9f3dc48cbe89fb4a8a372f004fd5136388ba0a6c673a9e133a003ea73dfc285bab6f371108cd50
+  data.tar.gz: ae2a297b332214c1b83ed24a0862b5288aae8ded7a7d921b198f7777ce5ef091492ff85d4484729f171416a2ab8cd9765b4234f338e2bbd7ca3bf9c6434c315d

data/Cargo.toml

@@ -1,3 +1,6 @@
 [workspace]
 members = ["ext/typst"]
-resolver = "2"
+resolver = "2"
+
+[profile.release]
+strip = true

data/README.md

@@ -269,7 +269,8 @@ clear_cache was contributed by [NRicciVestmark](https://github.com/NRicciVestmar
 CI improvements were contributed by [am1006](https://github.com/am1006)\
 Defect resolutions by [adam12](https://github.com/adam12) and [walterdavis](https://github.com/walterdavis)\
 Design suggestions by [alec-c4](https://github.com/alec-c4)\
-Compiler warnings were contributed by [TheSoloHacker47](https://github.com/TheSoloHacker47)
+Compiler warnings were contributed by [TheSoloHacker47](https://github.com/TheSoloHacker47) \
+Font optimization patches were contributed by [dmke](https://github.com/dmke)
 
 ## License
 

data/README.typ

@@ -276,7 +276,8 @@ clear_cache was contributed by #link("https://github.com/NRicciVestmark")[NRicci
 CI improvements were contributed by #link("https://github.com/am1006")[am1006]\
 Defect resolutions by #link("https://github.com/adam12")[adam12] and #link("https://github.com/walterdavis")[walterdavis]\
 Design suggestions by #link("https://github.com/alec-c4")[alec-c4]\
-Compiler warnings were contributed by #link("https://github.com/TheSoloHacker47")[TheSoloHacker47]
+Compiler warnings were contributed by #link("https://github.com/TheSoloHacker47")[TheSoloHacker47] \
+Font optimization patches were contributed by #link("https://github.com/dmke")[dmke]
 
 == License
 

data/Rakefile

@@ -34,6 +34,10 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
+task 'benchmark' do |t|
+  sh "bundle exec ruby benchmarks/compile_pdf.rb"
+end
+
 task 'gem:native' do |t|
   CROSS_PLATFORMS.each do |platform|
     sh "bundle exec rb-sys-dock --platform #{platform} --build"

data/ext/typst/src/lib.rs

@@ -287,6 +287,10 @@ fn clear_cache(_ruby: &Ruby, max_age: usize) {
     comemo::evict(max_age);
 }
 
+fn clear_font_cache(_ruby: &Ruby) {
+    world::clear_font_cache();
+}
+
 #[magnus::init]
 fn init(ruby: &Ruby) -> Result<(), Error> {
     env_logger::init();
@@ -298,5 +302,6 @@ fn init(ruby: &Ruby) -> Result<(), Error> {
     module.define_singleton_method("_to_html", function!(to_html, 8))?;
     module.define_singleton_method("_query", function!(query, 10))?;
     module.define_singleton_method("_clear_cache", function!(clear_cache, 1))?;
+    module.define_singleton_method("_clear_font_cache", function!(clear_font_cache, 0))?;
     Ok(())
 }

data/ext/typst/src/world.rs

@@ -7,10 +7,10 @@ use chrono::{DateTime, Datelike, FixedOffset, Local};
 use typst::diag::{FileError, FileResult, StrResult};
 use typst::foundations::{Bytes, Datetime, Dict, Duration};
 use typst::syntax::{FileId, Lines, Source, VirtualPath, VirtualRoot, RootedPath};
-use typst::text::{Font, FontBook};
+use typst::text::{Font, FontBook, FontInfo};
 use typst::utils::LazyHash;
 use typst::{Features, Library, LibraryExt, World};
-use typst_kit::fonts::{self, FontStore};
+use typst_kit::fonts::{self, FontPath, FontStore};
 use typst_kit::packages::{FsPackages, SystemPackages, UniversePackages};
 
 /// A world that provides access to the operating system.
@@ -195,7 +195,7 @@ impl SystemWorldBuilder {
     }
 
     pub fn build(self) -> StrResult<SystemWorld> {
-        let fonts = Arc::new(build_font_store(self.ignore_system_fonts, self.ignore_embedded_fonts, self.font_paths));
+        let fonts = font_store(self.ignore_system_fonts, self.ignore_embedded_fonts, self.font_paths);
 
         let package_storage = system_packages(self.package_path, self.package_cache_path);
 
@@ -217,13 +217,84 @@ impl SystemWorldBuilder {
     }
 }
 
+/// Font discovery, which is far too slow to repeat on every compile.
+///
+/// A full system font scan takes about 95 ms, which for a small document
+/// dwarfs the compilation itself. `FontStore` cannot be cloned, so the
+/// discovered fonts are kept alongside the assembled stores.
+struct FontCache {
+    /// The locations found by walking the system font directories.
+    system: Option<Arc<Vec<(PathBuf, u32, FontInfo)>>>,
+    /// The fonts shipped with typst, already parsed.
+    embedded: Option<Arc<Vec<(Font, FontInfo)>>>,
+    /// A store per combination of the two ignore flags, for compiles that
+    /// bring no font paths of their own. Sharing one keeps the fonts a
+    /// document uses loaded between compiles and hashes the book only once.
+    stores: [Option<Arc<FontStore>>; 4],
+}
+
+const EMPTY_FONT_CACHE: FontCache =
+    FontCache { system: None, embedded: None, stores: [const { None }; 4] };
+
+static FONT_CACHE: Mutex<FontCache> = Mutex::new(EMPTY_FONT_CACHE);
+
+/// Forgets everything discovered so far, so that the next compile picks up
+/// fonts installed or removed since.
+pub fn clear_font_cache() {
+    *FONT_CACHE.lock().unwrap() = EMPTY_FONT_CACHE;
+}
+
+/// Reads a cache field, filling it on a miss.
+///
+/// The lock is not held while building, so two threads missing at once both
+/// build and one result is dropped. That wastes a scan but keeps a 95 ms
+/// build off the lock.
+fn cached<T>(
+    select: impl Fn(&mut FontCache) -> &mut Option<Arc<T>>,
+    build: impl FnOnce() -> T,
+) -> Arc<T> {
+    let hit = select(&mut FONT_CACHE.lock().unwrap()).clone();
+    if let Some(value) = hit {
+        return value;
+    }
+
+    let value = Arc::new(build());
+    *select(&mut FONT_CACHE.lock().unwrap()) = Some(value.clone());
+    value
+}
+
+/// Obtains a font store for the given configuration.
+///
+/// Extra font paths are scanned on every compile. They are usually a
+/// temporary directory written by `Typst.build_world_from_s`, so their
+/// contents can change between compiles and caching on them would grow
+/// without bound.
+fn font_store(ignore_system_fonts: bool, ignore_embedded_fonts: bool, font_paths: Vec<PathBuf>) -> Arc<FontStore> {
+    if !font_paths.is_empty() {
+        return Arc::new(build_font_store(ignore_system_fonts, ignore_embedded_fonts, font_paths));
+    }
+
+    let index = usize::from(ignore_system_fonts) << 1 | usize::from(ignore_embedded_fonts);
+    cached(
+        move |cache| &mut cache.stores[index],
+        || build_font_store(ignore_system_fonts, ignore_embedded_fonts, Vec::new()),
+    )
+}
+
 fn build_font_store(ignore_system_fonts: bool, ignore_embedded_fonts: bool, font_paths: Vec<PathBuf>) -> FontStore {
     let mut fonts = FontStore::new();
     if !ignore_system_fonts {
-        fonts.extend(fonts::system());
+        let system = cached(
+            |cache| &mut cache.system,
+            || fonts::system().map(|(path, info)| (path.path, path.index, info)).collect(),
+        );
+        fonts.extend(system.iter().map(|(path, index, info)| {
+            (FontPath { path: path.clone(), index: *index }, info.clone())
+        }));
     }
     if !ignore_embedded_fonts {
-        fonts.extend(fonts::embedded());
+        let embedded = cached(|cache| &mut cache.embedded, || fonts::embedded().collect());
+        fonts.extend(embedded.iter().cloned());
     }
     for path in font_paths {
         fonts.extend(fonts::scan(&path));

data/lib/typst.rb

@@ -17,6 +17,12 @@ module Typst
     Typst::_clear_cache(max_age)
   end
 
+  # Discards the discovered system and embedded fonts, so that the next
+  # compile picks up fonts installed or removed since the first one.
+  def self.clear_font_cache
+    Typst::_clear_font_cache
+  end
+
   def self.build_world_from_s(main_source, **options, &blk)
     dependencies = options[:dependencies] ||= {}
     fonts = options[:fonts] ||= {}
@@ -30,16 +36,18 @@ module Typst
         File.binwrite(tmp_dep_file, dep_source)
       end
 
-      relative_font_path = Pathname.new(tmp_dir).join("fonts")
-      relative_font_path.mkpath
-      fonts.each do |font_name, font_bytes|
-        tmp_font_file = relative_font_path.join(font_name)
-        File.binwrite(tmp_font_file, font_bytes)
+      unless fonts.empty?
+        relative_font_path = Pathname.new(tmp_dir).join("fonts")
+        relative_font_path.mkpath
+        fonts.each do |font_name, font_bytes|
+          tmp_font_file = relative_font_path.join(font_name)
+          File.binwrite(tmp_font_file, font_bytes)
+        end
+        options[:font_paths] = (options[:font_paths] || []) + [relative_font_path]
       end
 
       options[:file] = tmp_main_file
       options[:root] = tmp_dir
-      options[:font_paths] = [relative_font_path]
 
       blk.call(options)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typst
 version: !ruby/object:Gem::Version
-  version: 0.15.1.6
+  version: 0.15.1.8
 platform: ruby
 authors:
 - Flinn
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.19
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Ruby binding to typst, a new markup-based typesetting system that is powerful
   and easy to learn.