Allow customising fonts in build script

5 files changed, 59 insertions, 19 deletions

diff --git a/build.sh b/build.sh
index ba7ae36..529d600 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-m4 -P -DAMT_SUP=3.5 -DAMT_UNSUP=2.5 chords_serifjazz.m4.xml > chords_serifjazz_1.764mm_Default.xml
-m4 -P -DAMT_SUP=4.2 -DAMT_UNSUP=3.5 chords_serifjazz.m4.xml > chords_serifjazz_1.375mm_R6.xml
-m4 -P -DAMT_SUP=6.0 -DAMT_UNSUP=5.1 chords_serifjazz.m4.xml > chords_serifjazz_0.925mm_R8.xml
+m4 -P -DAMT_SUP=3.5 -DAMT_UNSUP=2.5 -DFONT_MUSIC=default -DFONT_SERIF=default -DFONT_SANS=FreeSans chords_serifjazz.m4.xml > chords_serifjazz_1.764mm_Default.xml
+m4 -P -DAMT_SUP=4.2 -DAMT_UNSUP=3.5 -DFONT_MUSIC=default -DFONT_SERIF=default -DFONT_SANS=FreeSans chords_serifjazz.m4.xml > chords_serifjazz_1.375mm_R6.xml
+m4 -P -DAMT_SUP=6.0 -DAMT_UNSUP=5.1 -DFONT_MUSIC=default -DFONT_SERIF=default -DFONT_SANS=FreeSans chords_serifjazz.m4.xml > chords_serifjazz_0.925mm_R8.xml
diff --git a/chords_serifjazz.m4.xml b/chords_serifjazz.m4.xml
index 3287499..961c9ad 100644
--- a/chords_serifjazz.m4.xml
+++ b/chords_serifjazz.m4.xml
@@ -37,8 +37,12 @@
       configured text style font family is used.
 -->
 
-  <!-- Serif font -->
+  <!-- Use user configured font for other characters -->
   <font family="default">
+    </font>
+
+  <!-- Serif font -->
+  <font family="FONT_MUSIC">
     <sym code="0x266d" name="b"/>
     <sym code="0x266e" name="natural"/>
     <sym code="0x266f" name="#"/>
@@ -46,10 +50,12 @@
     <sym code="0x1d12a" name="##"/>
     <sym code="0x1d12b" name="bb"/>
 
+    <sym name="/"/>
+
     </font>
 
   <!-- Serif font adjusted superscript characters -->
-  <font family="default">
+  <font family="FONT_SERIF">
     <mag>1.4</mag>
 
     <sym code="0x00b0" name="degree"/>
@@ -58,7 +64,7 @@
     </font>
 
   <!-- Sans-serif font -->
-  <font family="FreeSans">
+  <font family="FONT_SANS">
     <mag>0.7</mag>
 
     <sym value="sus" name="sus"/>
@@ -101,7 +107,14 @@
 
     </font>
 
-  <font family="default">
+  <font family="FONT_MUSIC">
+    <mag>0.75</mag>
+    <sym code="0x266d" name="sb"/>
+    <sym code="0x266f" name="s#"/>
+
+    </font>
+
+  <font family="FONT_SERIF">
     <mag>0.75</mag>
 
     <sym value="," name="s,"/>
@@ -112,9 +125,6 @@
     <sym name="no"/>
     <sym name="omit"/>
 
-    <sym code="0x266d" name="sb"/>
-    <sym code="0x266f" name="s#"/>
-
     </font>
 
 <!--
diff --git a/chords_serifjazz_0.925mm_R8.xml b/chords_serifjazz_0.925mm_R8.xml
index 4125b75..0cb0198 100644
--- a/chords_serifjazz_0.925mm_R8.xml
+++ b/chords_serifjazz_0.925mm_R8.xml
@@ -37,6 +37,10 @@
       configured text style font family is used.
 -->
 
+  <!-- Use user configured font for other characters -->
+  <font family="default">
+    </font>
+
   <!-- Serif font -->
   <font family="default">
     <sym code="0x266d" name="b"/>
@@ -46,6 +50,8 @@
     <sym code="0x1d12a" name="##"/>
     <sym code="0x1d12b" name="bb"/>
 
+    <sym name="/"/>
+
     </font>
 
   <!-- Serif font adjusted superscript characters -->
@@ -103,6 +109,13 @@
 
   <font family="default">
     <mag>0.75</mag>
+    <sym code="0x266d" name="sb"/>
+    <sym code="0x266f" name="s#"/>
+
+    </font>
+
+  <font family="default">
+    <mag>0.75</mag>
 
     <sym value="," name="s,"/>
     <sym value="/" name="s/"/>
@@ -112,9 +125,6 @@
     <sym name="no"/>
     <sym name="omit"/>
 
-    <sym code="0x266d" name="sb"/>
-    <sym code="0x266f" name="s#"/>
-
     </font>
 
 <!--
diff --git a/chords_serifjazz_1.375mm_R6.xml b/chords_serifjazz_1.375mm_R6.xml
index bc7673b..a90d478 100644
--- a/chords_serifjazz_1.375mm_R6.xml
+++ b/chords_serifjazz_1.375mm_R6.xml
@@ -37,6 +37,10 @@
       configured text style font family is used.
 -->
 
+  <!-- Use user configured font for other characters -->
+  <font family="default">
+    </font>
+
   <!-- Serif font -->
   <font family="default">
     <sym code="0x266d" name="b"/>
@@ -46,6 +50,8 @@
     <sym code="0x1d12a" name="##"/>
     <sym code="0x1d12b" name="bb"/>
 
+    <sym name="/"/>
+
     </font>
 
   <!-- Serif font adjusted superscript characters -->
@@ -103,6 +109,13 @@
 
   <font family="default">
     <mag>0.75</mag>
+    <sym code="0x266d" name="sb"/>
+    <sym code="0x266f" name="s#"/>
+
+    </font>
+
+  <font family="default">
+    <mag>0.75</mag>
 
     <sym value="," name="s,"/>
     <sym value="/" name="s/"/>
@@ -112,9 +125,6 @@
     <sym name="no"/>
     <sym name="omit"/>
 
-    <sym code="0x266d" name="sb"/>
-    <sym code="0x266f" name="s#"/>
-
     </font>
 
 <!--
diff --git a/chords_serifjazz_1.764mm_Default.xml b/chords_serifjazz_1.764mm_Default.xml
index 278f63a..1f564e8 100644
--- a/chords_serifjazz_1.764mm_Default.xml
+++ b/chords_serifjazz_1.764mm_Default.xml
@@ -37,6 +37,10 @@
       configured text style font family is used.
 -->
 
+  <!-- Use user configured font for other characters -->
+  <font family="default">
+    </font>
+
   <!-- Serif font -->
   <font family="default">
     <sym code="0x266d" name="b"/>
@@ -46,6 +50,8 @@
     <sym code="0x1d12a" name="##"/>
     <sym code="0x1d12b" name="bb"/>
 
+    <sym name="/"/>
+
     </font>
 
   <!-- Serif font adjusted superscript characters -->
@@ -103,6 +109,13 @@
 
   <font family="default">
     <mag>0.75</mag>
+    <sym code="0x266d" name="sb"/>
+    <sym code="0x266f" name="s#"/>
+
+    </font>
+
+  <font family="default">
+    <mag>0.75</mag>
 
     <sym value="," name="s,"/>
     <sym value="/" name="s/"/>
@@ -112,9 +125,6 @@
     <sym name="no"/>
     <sym name="omit"/>
 
-    <sym code="0x266d" name="sb"/>
-    <sym code="0x266f" name="s#"/>
-
     </font>
 
 <!--