Break out TextOptions::start_element (from currency)

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

diff --git a/src/currency.rs b/src/currency.rs
index 9d29bde711319d0494c959cd29a58dcc249b44ce..61af1ff1a59bab2eaefafb9d100a14b4be415dc2 100644 (file)
--- a/src/currency.rs
+++ b/src/currency.rs
@@ -118,13 +118,10 @@ impl PieceTrait for Banknote {
     self.image.svg(f, vpid, gpc.face, &gpc.xdata)?;
     
     let value: &Value = gpc.xdata.get_exp()?;
-    let label_y_adj = self.label_options.size * SVG_FONT_Y_ADJUST_OF_FONT_SIZE;
 
     hwrite!(f,
-            r##"<{} text-align="center" text-anchor="middle" x="0" y="{}" fill="{}" font-size="{}">{}{}</text>"##,
-            HTML_TEXT_LABEL_ELEM_START,
-            label_y_adj, &self.label_options.colour, self.label_options.size,
-            value.qty, &self.currency)?;
+            r##"<{}>{}{}</text>"##,
+            &self.label_options.start_element(), value.qty, &self.currency)?;
   }
 
   #[throws(ApiPieceOpError)]

diff --git a/src/ui.rs b/src/ui.rs
index fb35c410acc820c8f10041f05812bd7697c9f380..e31cc48438165529b2587a21b1de588748109832 100644 (file)
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -133,3 +133,14 @@ impl Display for AbbrevPresentationLayout {
     })?
   }
 }
+
+impl TextOptions {
+  pub fn start_element(&self) -> Html {
+    let y_adj = self.size * SVG_FONT_Y_ADJUST_OF_FONT_SIZE;
+    hformat!{
+ r##"{} text-align="center" text-anchor="middle" x="0" y="{}" fill="{}" font-size="{}px""##,
+             HTML_TEXT_LABEL_ELEM_START,
+             y_adj, &self.colour, self.size,
+    }
+  }
+}