shapelib: Substitute _colour multiple times if necessary

No, or many, is not an error here.

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

diff --git a/src/shapelib.rs b/src/shapelib.rs
index f52e3e5b2343d08937292e4acfcdf4c76f7a8bfb..e615368f24eb83e037ffdb6eff257c690d2ab579 100644 (file)
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -1233,6 +1233,7 @@ fn process_files_entry(
     c_colour: Option<(&'static str, &str)>,
     c_abbrev: Option<(&'static str, &str)>,
   | {
+    let c_colour_all = colour_subst_1(substn, c_colour);
     let c_colour = colour_subst_1(subst, c_colour);
     let c_abbrev = colour_subst_1(subst, c_abbrev);
 
@@ -1282,7 +1283,7 @@ fn process_files_entry(
         .replace_all(&magic.template, |caps: &regex::Captures| {
           format!("{}{}", caps.get(1).unwrap().as_str(), &image_table)
         });
-      let spec = c_colour(&spec)?;
+      let spec = c_colour_all(&spec)?;
 
       trace!("magic item {}\n\n{}\n", &item_name, &spec);