From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 15 May 2022 11:47:50 +0000 (+0100)
Subject: subst: Always substitute dollars in mformat 2 text
X-Git-Tag: otter-1.1.0~124
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6fc7f1cfbf3e426d69337e3e3f929083671710f7;p=otter.git

subst: Always substitute dollars in mformat 2 text

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

diff --git a/src/shapelib.rs b/src/shapelib.rs
index ef46c23b..bf03ff14 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -1288,6 +1288,8 @@ fn process_files_entry(
     move |input| Ok(
       if let Some((keyword, val)) = kv {
         subst(input.mky(mformat, dollars), keyword, val)?.into()
+      } else if dollars.enabled(mformat) {
+        input.mky(mformat, dollars).into()
       } else {
         input
       }