Pass mark overrides to tally_marks()

[tablify] / src / lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 50775908f0ce2c8bdf568a4f7415be1040ad8eba..731457e6b07389fdd1cf39ff5e423d71b3c6e27a 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,7 +4,7 @@ use std::fmt::Write;
 use std::io::BufRead;
 use std::iter::Iterator;
 
-fn tally_marks(n: usize) -> String {
+fn tally_marks(n: usize, mark: Option<&str>) -> String {
     let fives = { 0..n / 5 }.map(|_| '𝍸');
     let ones = { 0..n % 5 }.map(|_| '𝍷');
     fives.chain(ones).collect()
@@ -287,7 +287,7 @@ fn column_order(config: &Config, rows: &[Rowlike]) -> Vec<String> {
         .collect()
 }
 
-fn render_instances(instances: &[Option<String>]) -> HTML {
+fn render_instances(instances: &[Option<String>], mark: Option<&str>) -> HTML {
     let mut tally = 0;
     let mut out = vec![];
     for ins in instances {
@@ -295,7 +295,7 @@ fn render_instances(instances: &[Option<String>]) -> HTML {
             None => tally += 1,
             Some(content) => {
                 if tally > 0 {
-                    out.push(HTML(tally_marks(tally)));
+                    out.push(HTML(tally_marks(tally, mark)));
                     tally = 0;
                 }
                 out.push(HTML::escape(content));
@@ -303,7 +303,7 @@ fn render_instances(instances: &[Option<String>]) -> HTML {
         }
     }
     if tally > 0 {
-        out.push(HTML(tally_marks(tally)));
+        out.push(HTML(tally_marks(tally, mark)));
     }
     HTML(
         out.into_iter()
@@ -332,7 +332,7 @@ fn render_cell(config: &Config, col: &str, row: &mut Row) -> HTML {
     let class = HTML::from(if is_empty { "" } else { r#" class="yes""# });
     let contents = match instances {
         None => HTML::from(""),
-        Some(is) => render_instances(is),
+        Some(is) => render_instances(is, config.mark.get(col).map(String::as_str)),
     };
     row.entries.remove(col);
     HTML(format!(
@@ -340,12 +340,12 @@ fn render_cell(config: &Config, col: &str, row: &mut Row) -> HTML {
     ))
 }
 
-fn render_leftover(notcol: &str, instances: &[Option<String>]) -> HTML {
+fn render_leftover(config: &Config, notcol: &str, instances: &[Option<String>]) -> HTML {
     let label = HTML::escape(notcol);
     if instances.len() == 1 && instances[0].is_none() {
         HTML(format!("{label}"))
     } else {
-        let rest = render_instances(instances);
+        let rest = render_instances(instances, config.mark.get(notcol).map(String::as_str));
         HTML(format!("{label}: {rest}"))
     }
 }
@@ -360,7 +360,13 @@ fn render_all_leftovers(config: &Config, row: &Row) -> HTML {
     HTML(
         order
             .into_iter()
-            .map(|notcol| render_leftover(notcol, row.entries.get(notcol).expect("Key vanished?!")))
+            .map(|notcol| {
+                render_leftover(
+                    config,
+                    notcol,
+                    row.entries.get(notcol).expect("Key vanished?!"),
+                )
+            })
             .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
             .collect::<Vec<_>>()
             .join(", "),
@@ -485,17 +491,17 @@ mod tests {
 
     #[test]
     fn test_tally_marks() {
-        assert_eq!(tally_marks(1), "𝍷");
-        assert_eq!(tally_marks(2), "𝍷𝍷");
-        assert_eq!(tally_marks(3), "𝍷𝍷𝍷");
-        assert_eq!(tally_marks(4), "𝍷𝍷𝍷𝍷");
-        assert_eq!(tally_marks(5), "𝍸");
-        assert_eq!(tally_marks(6), "𝍸𝍷");
-        assert_eq!(tally_marks(7), "𝍸𝍷𝍷");
-        assert_eq!(tally_marks(8), "𝍸𝍷𝍷𝍷");
-        assert_eq!(tally_marks(9), "𝍸𝍷𝍷𝍷𝍷");
-        assert_eq!(tally_marks(10), "𝍸𝍸");
-        assert_eq!(tally_marks(11), "𝍸𝍸𝍷");
+        assert_eq!(tally_marks(1, None), "𝍷");
+        assert_eq!(tally_marks(2, None), "𝍷𝍷");
+        assert_eq!(tally_marks(3, None), "𝍷𝍷𝍷");
+        assert_eq!(tally_marks(4, None), "𝍷𝍷𝍷𝍷");
+        assert_eq!(tally_marks(5, None), "𝍸");
+        assert_eq!(tally_marks(6, None), "𝍸𝍷");
+        assert_eq!(tally_marks(7, None), "𝍸𝍷𝍷");
+        assert_eq!(tally_marks(8, None), "𝍸𝍷𝍷𝍷");
+        assert_eq!(tally_marks(9, None), "𝍸𝍷𝍷𝍷𝍷");
+        assert_eq!(tally_marks(10, None), "𝍸𝍸");
+        assert_eq!(tally_marks(11, None), "𝍸𝍸𝍷");
     }
 
     fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {