From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 15 May 2022 15:52:56 +0000 (+0100)
Subject: shapelib, subst: Allow colours to provide magic substs
X-Git-Tag: otter-1.1.0~102
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9ae38c3579ac95b6c0eb36dac5e2f1f546f4af8d;p=otter.git

shapelib, subst: Allow colours to provide magic substs

Eg, for text colour.  The dice want this.

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

diff --git a/src/shapelib-toml.rs b/src/shapelib-toml.rs
index 5de8d572..e0ef9985 100644
--- a/src/shapelib-toml.rs
+++ b/src/shapelib-toml.rs
@@ -93,6 +93,7 @@ pub enum OccultationMethod {
 pub struct RecolourData {
   pub abbrev: String,
   #[cfg(doc)] pub map: HashMap<String, String>,
+  #[serde(default)] pub substs: HashMap<String,String>,
 }
 
 #[doc(hidden)]
diff --git a/src/shapelib.rs b/src/shapelib.rs
index a3d71d31..d68923a1 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -1388,6 +1388,7 @@ fn process_files_entry(
   let mut add1 = |
     c_colour: Option<(&'static str, &str)>,
     c_abbrev: Option<(&'static str, &str)>,
+    c_substs: Option<&HashMap<String, String>>,
   | {
     let c_colour_all =colour_subst_1(mformat,Dollars::Text, substn, c_colour);
     let c_colour =    colour_subst_1(mformat,Dollars::Text, subst,  c_colour);
@@ -1445,6 +1446,7 @@ fn process_files_entry(
       for (k,v) in chain!{
         fe.extra_fields.iter().filter(|(k,_v)| k.starts_with('x')),
         &magic.substs,
+        c_substs.into_iter().map(IntoIterator::into_iter).flatten(),
       } {
         spec = substn(spec, format!("${{{}}}", k), v)?;
       }
@@ -1468,11 +1470,12 @@ fn process_files_entry(
   };
 
   if group.d.colours.is_empty() {
-    add1(None, None)?;
+    add1(None, None, None)?;
   } else {
     for (colour, recolourdata) in &group.d.colours {
       add1(Some(("${colour}", colour)),
-           Some(("_c", &recolourdata.abbrev)))?;
+           Some(("_c", &recolourdata.abbrev)),
+           Some(&recolourdata.substs))?;
     }
   }
 }