From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 22 May 2022 19:34:45 +0000 (+0100)
Subject: usvg: Pass default options even during bundle processing.
X-Git-Tag: otter-1.1.0~22
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=dd71bf125454261cace6d649a589b1e38376144e;p=otter.git

usvg: Pass default options even during bundle processing.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/bundles.rs b/src/bundles.rs
index f9c7f47a..e6141614 100644
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -850,6 +850,7 @@ fn make_usvg(instance_name: &str, bundle_name: &str, za: &mut IndexedZip,
         .context("create temporary usvg").map_err(IE::from)?;
 
       let mut cmd = Command::new(&config().usvg_bin);
+      cmd.args(usvg_default_args());
       cmd.args(&["-","-c"])
         .stdin(input)
         .stdout(usvg1.try_clone().context("dup usvg1").map_err(IE::from)?);
diff --git a/src/ui.rs b/src/ui.rs
index b0411f9f..017461f5 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -9,6 +9,8 @@ pub const HELD_SURROUND_COLOUR: &str = "black";
 const MONOSPACE: HtmlLit = Html::lit(
   r#"font-family="Latin Modern Mono, monospace" font-weight="700""#);
 
+const USVG_DEFAULT_ARGS_TEXT: &str = include_str!("USVG_DEFAULT_ARGS.txt");
+
 pub const DEFAULT_TABLE_SIZE: Pos = PosC::new( 300, 200 );
 pub const DEFAULT_TABLE_COLOUR: &str = "green";
 
@@ -148,3 +150,10 @@ impl TextOptions {
     }
   }
 }
+
+pub fn usvg_default_args() -> impl Iterator<Item=&'static str> {
+  USVG_DEFAULT_ARGS_TEXT
+    .lines()
+    .map(|l| l.trim())
+    .filter(|l| l.len() > 0 && ! l.starts_with('#'))
+}