From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 Sep 2020 19:54:51 +0000 (+0100)
Subject: usvg processing: Provide a --sans-serif-family argument
X-Git-Tag: otter-0.2.0~829
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d3fdb243fb14161184235216935fbe01e8091c0f;p=otter.git

usvg processing: Provide a --sans-serif-family argument

The default is "Arial" which is no good because it's proprietary.

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

diff --git a/Makefile b/Makefile
index fb31eb6b..ff73a757 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ default: debug
 CARGO ?= cargo
 CARGO_TARGET_DIR ?= target
 USVG ?= usvg
+USVG_OPTIONS = "--sans-serif-family=DejaVu Sans"
 
 ifneq (,$(wildcard(../Cargo.nail)))
 NAILING_CARGO = nailing-cargo
@@ -37,7 +38,7 @@ endif
 include $(wildcard library/*/files.make)
 
 USVG_PROCESSOR = usvg-processor
-LIBRARY_PROCESS_SVG = ./$(USVG_PROCESSOR) $@ $(wordlist 1,2,$^) '$(USVG)'
+LIBRARY_PROCESS_SVG = ./$(USVG_PROCESSOR) $@ $(wordlist 1,2,$^) '$(USVG) $(USVG_OPTIONS)'
 $(LIBRARY_FILES): $(USVG_PROCESSOR) Makefile
 
 assets: templates/script.js libraries