From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 Apr 2022 23:54:56 +0000 (+0100)
Subject: currency: Tweaks to rendering
X-Git-Tag: otter-1.1.0~491
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=001b38cc3a224db4aabcdb02be035cd05773a550;p=otter.git

currency: Tweaks to rendering

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

diff --git a/src/currency.rs b/src/currency.rs
index e39cfc2b..c575f488 100644
--- a/src/currency.rs
+++ b/src/currency.rs
@@ -94,9 +94,9 @@ impl PieceBaseTrait for Banknote {
 impl PieceTrait for Banknote {
   #[throws(IE)]
   fn describe_html(&self, gpc: &GPiece, _: &GameOccults) -> Html {
-    hformat!("{}, {} {}",
+    hformat!("{}, {}{}",
              self.image.describe_html(gpc.face)?,
-             self.qty, Html::from_txt(&self.currency))
+             self.qty, &self.currency)
   }
 
   #[throws(IE)]
@@ -108,7 +108,7 @@ impl PieceTrait for Banknote {
     let label_y_adj = label_font_size * SVG_FONT_Y_ADJUST_OF_FONT_SIZE;
 
     hwrite!(f,
-            r##"<text text-align="center" text-anchor="middle" x="0" y="{}" font-size="{}">{} {}</text>"##,
+            r##"<text text-align="center" text-anchor="middle" x="0" y="{}" font-size="{}">{}{}</text>"##,
             label_y_adj, label_font_size,
             self.qty, &self.currency)?;
   }