typst 0.15.1.2 → 0.15.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7bf353967f1d7f6dcccb3bfbe559f64bd63c9facae952ebaffe6a0d743f8e6a
-  data.tar.gz: ca8beb7256a32418ddd6c60918b14eb794a52470f7693b70498ba92b6699c245
+  metadata.gz: a463fc66211965514d27ea8a2867902818e7f4398779b79a4c304a993e4d5e63
+  data.tar.gz: 484a1cdbecc7ae9381d7de90313a82b0288f053dd7a105974dc80f82d0baa4e3
 SHA512:
-  metadata.gz: 0d6f559d110d239d554269ea3cf09c4284b2c28606839f356a8137eb5eb8ed7665f681e9b7ac01308ac384396e59eef17ee7df509b262d693560343e1cb2021c
-  data.tar.gz: d4328bb04dbe6365a7418207dcb6fae0df21a643fe8874495d5b2f2b493fc05ed751e86ec1e3cc90c72de7d977456884d86d1ac1569fe758a52043368270bad6
+  metadata.gz: 930e9e74d5cd98a50c7f06c181f4104b5ef9325a43008e9b114ae7006b4d13b2445ea57c27c28c3d60f2df5ee07c0734ea2047f52e494c4303df917058a0feed
+  data.tar.gz: 0e806b7acb6b404e92ae170ce0f78f86743ca56dd99d99f5e365bd62a0f154bb7aebf8efadf4977260a85872325d4055aadde543df199dfa582b8aa07635caf8

data/README.md

@@ -194,7 +194,9 @@ Typst::clear_cache(max_age)
 ## Contributors & Acknowledgements
 typst-rb is based on [typst-py](https://github.com/messense/typst-py) by [messense](https://github.com/messense)\
 clear_cache was contributed by [NRicciVestmark](https://github.com/NRicciVestmark)\
-CI improvements were contributed by [am1006](https://github.com/am1006)
+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)
 
 ## License
 

data/README.typ

@@ -202,7 +202,9 @@ Typst::clear_cache(max_age)
 == Contributors & Acknowledgements
 typst-rb is based on #link("https://github.com/messense/typst-py")[typst-py] by #link("https://github.com/messense")[messense]\
 clear_cache was contributed by #link("https://github.com/NRicciVestmark")[NRicciVestmark]\
-CI improvements were contributed by #link("https://github.com/am1006")[am1006]
+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]
 
 == License
 

data/Rakefile

@@ -23,6 +23,11 @@ RbSys::ExtensionTask.new("typst", spec) do |ext|
   ext.cross_platform = CROSS_PLATFORMS
 end
 
+Rake::Task['release'].clear
+desc "Create tag #{spec.version} and build"
+task "release", [:remote] => ["build", "release:guard_clean", "release:source_control_push"] do
+end
+
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/*_test.rb']

data/ext/typst/src/compiler.rs

@@ -21,6 +21,7 @@ impl SystemWorld {
         ppi: Option<f32>,
         pdf_standards: &[typst_pdf::PdfStandard],
         pretty: bool,
+        render_bleed: bool,
     ) -> StrResult<Vec<Vec<u8>>> {
         // Reset everything and ensure that the main file is present.
         self.reset();
@@ -49,10 +50,10 @@ impl SystemWorld {
                                 typst_pdf::PdfStandards::new(pdf_standards)
                                     .map_err(|e| eco_format!("PDF standards error: {:?}", e))
                                     .at(Span::detached()).unwrap(),
-                                pretty
+                                pretty,
                             )?]),
-                            "png" => Ok(export_image(&document, ImageExportFormat::Png, ppi, pretty)?),
-                            "svg" => Ok(export_image(&document, ImageExportFormat::Svg, ppi, pretty)?),
+                            "png" => Ok(export_image(&document, ImageExportFormat::Png, ppi, pretty, render_bleed)?),
+                            "svg" => Ok(export_image(&document, ImageExportFormat::Svg, ppi, pretty, render_bleed)?),
                             fmt => Err(eco_format!("unknown format: {fmt}")),
                         }
                     }
@@ -129,6 +130,7 @@ fn export_image(
     fmt: ImageExportFormat,
     ppi: Option<f32>,
     pretty: bool,
+    render_bleed: bool,
 ) -> StrResult<Vec<Vec<u8>>> {
     let mut buffers = Vec::new();
     for page in document.pages() {
@@ -137,13 +139,16 @@ fn export_image(
                 page,
                 &typst_render::RenderOptions {
                     pixel_per_pt: typst::utils::Scalar::new(f64::from(ppi.unwrap_or(144.0) / 72.0)),
-                    render_bleed: false,
+                    render_bleed: render_bleed,
                 },
             )
             .encode_png()
             .map_err(|err| eco_format!("failed to write PNG file ({err})"))?,
             ImageExportFormat::Svg => {
-                let svg = typst_svg::svg(page, &typst_svg::SvgOptions{ render_bleed: false, pretty: pretty });
+                let svg = typst_svg::svg(
+                    page,
+                    &typst_svg::SvgOptions{ render_bleed: render_bleed, pretty: pretty }
+                );
                 svg.as_bytes().to_vec()
             }
         };

data/ext/typst/src/lib.rs

@@ -21,6 +21,7 @@ fn to_html(
     font_paths: Vec<PathBuf>,
     ignore_system_fonts: bool,
     ignore_embedded_fonts: bool,
+    render_bleed: bool,
     pretty: bool,
     sys_inputs: HashMap<String, String>,
 ) -> Result<Vec<Vec<u8>>, Error> {
@@ -62,7 +63,7 @@ fn to_html(
         .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     let bytes = world
-        .compile(Some("html"), None, &Vec::new(), pretty)
+        .compile(Some("html"), None, &Vec::new(), pretty, render_bleed)
         .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     Ok(bytes)
@@ -75,6 +76,7 @@ fn to_svg(
     font_paths: Vec<PathBuf>,
     ignore_system_fonts: bool,
     ignore_embedded_fonts: bool,
+    render_bleed: bool,
     pretty: bool,
     sys_inputs: HashMap<String, String>,
 ) -> Result<Vec<Vec<u8>>, Error> {
@@ -103,7 +105,7 @@ fn to_svg(
         .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     let svg_bytes = world
-        .compile(Some("svg"), None, &Vec::new(), pretty)
+        .compile(Some("svg"), None, &Vec::new(), pretty, render_bleed)
         .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     Ok(svg_bytes)
@@ -116,6 +118,7 @@ fn to_png(
     font_paths: Vec<PathBuf>,
     ignore_system_fonts: bool,
     ignore_embedded_fonts: bool,
+    render_bleed: bool,
     sys_inputs: HashMap<String, String>,
     ppi: Option<f32>,
 ) -> Result<Vec<Vec<u8>>, Error> {
@@ -144,7 +147,7 @@ fn to_png(
         .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     let bytes = world
-        .compile(Some("png"), ppi, &Vec::new(), false)
+        .compile(Some("png"), ppi, &Vec::new(), false, render_bleed)
         .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     Ok(bytes)
@@ -215,7 +218,7 @@ fn to_pdf(
     }
 
     let pdf_bytes = world
-        .compile(Some("pdf"), None, &pdf_standards_vec, pretty)
+        .compile(Some("pdf"), None, &pdf_standards_vec, pretty, true)
         .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     Ok(pdf_bytes)
@@ -290,9 +293,9 @@ fn init(ruby: &Ruby) -> Result<(), Error> {
 
     let module = ruby.define_module("Typst")?;
     module.define_singleton_method("_to_pdf", function!(to_pdf, 8))?;
-    module.define_singleton_method("_to_svg", function!(to_svg, 7))?;
-    module.define_singleton_method("_to_png", function!(to_png, 7))?;
-    module.define_singleton_method("_to_html", function!(to_html, 7))?;
+    module.define_singleton_method("_to_svg", function!(to_svg, 8))?;
+    module.define_singleton_method("_to_png", function!(to_png, 8))?;
+    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))?;
     Ok(())

data/lib/base.rb

@@ -37,29 +37,32 @@ module Typst
       options[:ignore_system_fonts] ||= false
       options[:ignore_embedded_fonts] ||= false
       options[:pretty] ||= false
+      options[:render_bleed] ||= false
     
       self.options = options
     end
 
     def typst_options
-      [:file, :root, :font_paths, :ignore_system_fonts, :ignore_embedded_fonts]
+      [:file, :root, :font_paths, :ignore_system_fonts, :ignore_embedded_fonts, :render_bleed]
     end
 
-    def typst_args
-      options.values_at(*typst_options).append(options[:sys_inputs].map{ |k,v| [k.to_s,v.to_s] }.to_h)
+    def typst_args(opts)
+      options.values_at(*opts).append(options[:sys_inputs].map{ |k,v| [k.to_s,v.to_s] }.to_h)
     end
 
     def typst_pretty_args
-      options.values_at(*typst_options, :pretty).append(options[:sys_inputs].map{ |k,v| [k.to_s,v.to_s] }.to_h)
+      typst_args(typst_options.append(:pretty))
     end
 
     def typst_pdf_args
       options[:pdf_standards] ||= []
-      [*typst_pretty_args, options[:pdf_standards]]
+      opts = typst_options - [:render_bleed] + [:pretty]
+      args = typst_args(opts)
+      [*args, options[:pdf_standards]]
     end
 
     def typst_png_args
-      [*typst_args, options[:ppi]]
+      [*typst_args(typst_options), options[:ppi]]
     end
 
     def self.from_s(main_source, **options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typst
 version: !ruby/object:Gem::Version
-  version: 0.15.1.2
+  version: 0.15.1.5
 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.15
+rubygems_version: 4.0.17
 specification_version: 4
 summary: Ruby binding to typst, a new markup-based typesetting system that is powerful
   and easy to learn.