Explicitly specify a font for tally marks

[tablify] / src / lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 731457e6b07389fdd1cf39ff5e423d71b3c6e27a..bfcfdec72aa9d9186cb017c6cba14b6a75bfcf62 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,10 +4,18 @@ use std::fmt::Write;
 use std::io::BufRead;
 use std::iter::Iterator;
 
 use std::io::BufRead;
 use std::iter::Iterator;
 

-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()
+const TALLY_FONT: &str = "BabelStone Han";
+
+fn tally_marks(n: usize, mark: Option<&str>) -> HTML {
+    HTML(match mark {
+        None => {
+            let fives = { 0..n / 5 }.map(|_| '𝍸');
+            let ones = { 0..n % 5 }.map(|_| '𝍷');
+            let marks: String = fives.chain(ones).collect();
+            format!("<span style=\"font-family: '{TALLY_FONT}'\">{marks}</span>")
+        }
+        Some(m) => { 0..n }.map(|_| m).collect(),
+    })

 }
 
 #[derive(PartialEq, Eq, Debug)]
 }
 
 #[derive(PartialEq, Eq, Debug)]


@@ -45,6 +53,16 @@ impl Config {
                     .substitute_labels
                     .insert(col.to_owned(), label.to_owned()),
             };
                     .substitute_labels
                     .insert(col.to_owned(), label.to_owned()),
             };

+        } else if let Some(directive) = cmd.strip_prefix("mark ") {
+            match directive.split_once(':') {
+                None => {
+                    return Err(std::io::Error::new(
+                        std::io::ErrorKind::InvalidInput,
+                        format!("line {line_num}: Mark missing ':'"),
+                    ))
+                }
+                Some((col, label)) => self.mark.insert(col.to_owned(), label.to_owned()),
+            };

         } else {
             return Err(std::io::Error::new(
                 std::io::ErrorKind::InvalidInput,
         } else {
             return Err(std::io::Error::new(
                 std::io::ErrorKind::InvalidInput,


@@ -192,9 +210,7 @@ impl<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> Reader<'cfg,
         }
     }
 }
         }
     }
 }

-impl<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> Iterator
-    for Reader<'cfg, Input>
-{
+impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader<'_, Input> {

     type Item = Result<Rowlike, std::io::Error>;
     fn next(&mut self) -> Option<Self::Item> {
         loop {
     type Item = Result<Rowlike, std::io::Error>;
     fn next(&mut self) -> Option<Self::Item> {
         loop {


@@ -211,7 +227,7 @@ impl<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> Iterator
                         return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose()
                     }
                     InputLine::Blank => return Some(Ok(Rowlike::Spacer)),
                         return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose()
                     }
                     InputLine::Blank => return Some(Ok(Rowlike::Spacer)),

-                    InputLine::Entry(col, instance) => match &mut self.row {
+                    InputLine::Entry(col, instance) => match self.row {

                         None => {
                             return Some(Err(std::io::Error::other(format!(
                                 "line {}: Entry with no header",
                         None => {
                             return Some(Err(std::io::Error::other(format!(
                                 "line {}: Entry with no header",


@@ -253,8 +269,8 @@ fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
     let empty = HashMap::new();
     let mut counts: Vec<_> = rows
         .iter()
     let empty = HashMap::new();
     let mut counts: Vec<_> = rows
         .iter()

-        .flat_map(|rl| match rl {
-            Rowlike::Row(r) => r.entries.keys(),
+        .flat_map(|rl| match *rl {
+            Rowlike::Row(ref r) => r.entries.keys(),

             Rowlike::Spacer => empty.keys(),
         })
         .fold(HashMap::new(), |mut cs, col| {
             Rowlike::Spacer => empty.keys(),
         })
         .fold(HashMap::new(), |mut cs, col| {


@@ -266,7 +282,7 @@ fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
         .into_iter()
         .map(|(col, n)| (n, col))
         .collect();
         .into_iter()
         .map(|(col, n)| (n, col))
         .collect();

-    counts.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol)));
+    counts.sort_unstable_by(|a, b| b.0.cmp(&a.0).then(a.1.cmp(&b.1)));

     counts
 }
 fn column_order(config: &Config, rows: &[Rowlike]) -> Vec<String> {
     counts
 }
 fn column_order(config: &Config, rows: &[Rowlike]) -> Vec<String> {


@@ -291,11 +307,11 @@ fn render_instances(instances: &[Option<String>], mark: Option<&str>) -> HTML {
     let mut tally = 0;
     let mut out = vec![];
     for ins in instances {
     let mut tally = 0;
     let mut out = vec![];
     for ins in instances {

-        match ins {
+        match *ins {

             None => tally += 1,
             None => tally += 1,

-            Some(content) => {
+            Some(ref content) => {

                 if tally > 0 {
                 if tally > 0 {

-                    out.push(HTML(tally_marks(tally, mark)));
+                    out.push(tally_marks(tally, mark));

                     tally = 0;
                 }
                 out.push(HTML::escape(content));
                     tally = 0;
                 }
                 out.push(HTML::escape(content));


@@ -303,11 +319,11 @@ fn render_instances(instances: &[Option<String>], mark: Option<&str>) -> HTML {
         }
     }
     if tally > 0 {
         }
     }
     if tally > 0 {

-        out.push(HTML(tally_marks(tally, mark)));
+        out.push(tally_marks(tally, mark));

     }
     HTML(
         out.into_iter()
     }
     HTML(
         out.into_iter()

-            .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
+            .map(|html| html.0)

             .collect::<Vec<_>>()
             .join(" "),
     )
             .collect::<Vec<_>>()
             .join(" "),
     )


@@ -324,9 +340,9 @@ fn render_cell(config: &Config, col: &str, row: &mut Row) -> HTML {
     let instances: Option<&Vec<Option<String>>> = row.entries.get(col);
     let is_empty = match instances {
         None => true,
     let instances: Option<&Vec<Option<String>>> = row.entries.get(col);
     let is_empty = match instances {
         None => true,

-        Some(is) => is.iter().all(|ins| match ins {
+        Some(is) => is.iter().all(|ins| match *ins {

             None => false,
             None => false,

-            Some(content) => content == "×",
+            Some(ref content) => content == "×",

         }),
     };
     let class = HTML::from(if is_empty { "" } else { r#" class="yes""# });
         }),
     };
     let class = HTML::from(if is_empty { "" } else { r#" class="yes""# });


@@ -367,23 +383,23 @@ fn render_all_leftovers(config: &Config, row: &Row) -> HTML {
                     row.entries.get(notcol).expect("Key vanished?!"),
                 )
             })
                     row.entries.get(notcol).expect("Key vanished?!"),
                 )
             })

-            .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
+            .map(|html| html.0)

             .collect::<Vec<_>>()
             .join(", "),
     )
 }
 
 fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTML {
             .collect::<Vec<_>>()
             .join(", "),
     )
 }
 
 fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTML {

-    match rowlike {
+    match *rowlike {

         Rowlike::Spacer => HTML::from("<tr><th class=\"spacer_row\"></th></tr>\n"),
         Rowlike::Spacer => HTML::from("<tr><th class=\"spacer_row\"></th></tr>\n"),

-        Rowlike::Row(row) => {
+        Rowlike::Row(ref mut row) => {

             let row_label = HTML::escape(row.label.as_ref());
             let static_cells = config
                 .static_columns
                 .iter()
             let row_label = HTML::escape(row.label.as_ref());
             let static_cells = config
                 .static_columns
                 .iter()

-                .map(|ocol| match ocol {
-                    Some(col) if config.hidden_columns.contains(col) => HTML::from(""),
-                    Some(col) => render_cell(config, col, row),
+                .map(|ocol| match *ocol {
+                    Some(ref col) if config.hidden_columns.contains(col) => HTML::from(""),
+                    Some(ref col) => render_cell(config, col, row),

                     None => HTML::from(r#"<td class="spacer_col"></td>"#),
                 })
                 .collect::<HTML>();
                     None => HTML::from(r#"<td class="spacer_col"></td>"#),
                 })
                 .collect::<HTML>();


@@ -408,7 +424,7 @@ fn column_header_labels<'a>(
     let dynamic_columns = columns.iter().map(Some);
     static_columns
         .chain(dynamic_columns)
     let dynamic_columns = columns.iter().map(Some);
     static_columns
         .chain(dynamic_columns)

-        .filter(|ocol| ocol.map_or(true, |col| !config.hidden_columns.contains(col)))
+        .filter(|ocol| ocol.is_none_or(|col| !config.hidden_columns.contains(col)))

         .map(|ocol| {
             ocol.map(|col| match config.substitute_labels.get(col) {
                 None => col,
         .map(|ocol| {
             ocol.map(|col| match config.substitute_labels.get(col) {
                 None => col,


@@ -444,7 +460,7 @@ fn render_column_headers(config: &Config, columns: &[String]) -> HTML {
 ///   * there's an i/o error while reading `input`
 ///   * the log has invalid syntax:
 ///     * an indented line with no preceding non-indented line
 ///   * there's an i/o error while reading `input`
 ///   * the log has invalid syntax:
 ///     * an indented line with no preceding non-indented line

-pub fn tablify(input: impl std::io::Read) -> Result<HTML, std::io::Error> {
+pub fn tablify<R: std::io::Read>(input: R) -> Result<HTML, std::io::Error> {

     let (rows, config) = read_input(input)?;
     let columns = column_order(&config, &rows);
     Ok(HTML(format!(
     let (rows, config) = read_input(input)?;
     let columns = column_order(&config, &rows);
     Ok(HTML(format!(


@@ -491,17 +507,77 @@ mod tests {
 
     #[test]
     fn test_tally_marks() {
 
     #[test]
     fn test_tally_marks() {

-        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), "𝍸𝍸𝍷");
+        assert_eq!(
+            tally_marks(1, None),
+            HTML(format!(
+                "<span style=\"font-family: '{TALLY_FONT}'\">𝍷</span>"
+            ))
+        );
+        assert_eq!(
+            tally_marks(2, None),
+            HTML(format!(
+                "<span style=\"font-family: '{TALLY_FONT}'\">𝍷𝍷</span>"
+            ))
+        );
+        assert_eq!(
+            tally_marks(3, None),
+            HTML(format!(
+                "<span style=\"font-family: '{TALLY_FONT}'\">𝍷𝍷𝍷</span>"
+            ))
+        );
+        assert_eq!(
+            tally_marks(4, None),
+            HTML(format!(
+                "<span style=\"font-family: '{TALLY_FONT}'\">𝍷𝍷𝍷𝍷</span>"
+            ))
+        );
+        assert_eq!(
+            tally_marks(5, None),
+            HTML(format!(
+                "<span style=\"font-family: '{TALLY_FONT}'\">𝍸</span>"
+            ))
+        );
+        assert_eq!(
+            tally_marks(6, None),
+            HTML(format!(
+                "<span style=\"font-family: '{TALLY_FONT}'\">𝍸𝍷</span>"
+            ))
+        );
+        assert_eq!(
+            tally_marks(7, None),
+            HTML(format!(
+                "<span style=\"font-family: '{TALLY_FONT}'\">𝍸𝍷𝍷</span>"
+            ))
+        );
+        assert_eq!(
+            tally_marks(8, None),
+            HTML(format!(
+                "<span style=\"font-family: '{TALLY_FONT}'\">𝍸𝍷𝍷𝍷</span>"
+            ))
+        );
+        assert_eq!(
+            tally_marks(9, None),
+            HTML(format!(
+                "<span style=\"font-family: '{TALLY_FONT}'\">𝍸𝍷𝍷𝍷𝍷</span>"
+            ))
+        );
+        assert_eq!(
+            tally_marks(10, None),
+            HTML(format!(
+                "<span style=\"font-family: '{TALLY_FONT}'\">𝍸𝍸</span>"
+            ))
+        );
+        assert_eq!(
+            tally_marks(11, None),
+            HTML(format!(
+                "<span style=\"font-family: '{TALLY_FONT}'\">𝍸𝍸𝍷</span>"
+            ))
+        );
+        assert_eq!(tally_marks(1, Some("x")), "x".into());
+        assert_eq!(tally_marks(4, Some("x")), "xxxx".into());
+        assert_eq!(tally_marks(5, Some("x")), "xxxxx".into());
+        assert_eq!(tally_marks(6, Some("x")), "xxxxxx".into());
+        assert_eq!(tally_marks(2, Some("🍔")), "🍔🍔".into());

     }
 
     fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {
     }
 
     fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {


@@ -631,6 +707,7 @@ mod tests {
                 .substitute_labels["foo"],
             "bar"
         );
                 .substitute_labels["foo"],
             "bar"
         );

+        assert_eq!(read_config(&b"!mark foo:*"[..]).unwrap().mark["foo"], "*");

 
         let bad_command = read_config(&b"!no such command"[..]);
         assert!(bad_command.is_err());
 
         let bad_command = read_config(&b"!no such command"[..]);
         assert!(bad_command.is_err());


@@ -643,6 +720,10 @@ mod tests {
         let bad_sub = read_config(&b"!label foo"[..]);
         assert!(bad_sub.is_err());
         assert!(format!("{bad_sub:?}").contains("line 1: Annotation missing ':'"));
         let bad_sub = read_config(&b"!label foo"[..]);
         assert!(bad_sub.is_err());
         assert!(format!("{bad_sub:?}").contains("line 1: Annotation missing ':'"));

+
+        let bad_mark = read_config(&b"!mark foo"[..]);
+        assert!(bad_mark.is_err());
+        assert!(format!("{bad_mark:?}").contains("line 1: Mark missing ':'"));

     }
 
     #[test]
     }
 
     #[test]


@@ -737,7 +818,7 @@ mod tests {
                 }
             ),
             HTML::from(
                 }
             ),
             HTML::from(

-                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">𝍷</td>"#
+                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"><span style="font-family: 'BabelStone Han'">𝍷</span></td>"#

             )
         );
         assert_eq!(
             )
         );
         assert_eq!(


@@ -750,7 +831,7 @@ mod tests {
                 }
             ),
             HTML::from(
                 }
             ),
             HTML::from(

-                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">𝍷𝍷</td>"#
+                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"><span style="font-family: 'BabelStone Han'">𝍷𝍷</span></td>"#

             )
         );
         assert_eq!(
             )
         );
         assert_eq!(


@@ -779,7 +860,7 @@ mod tests {
                 }
             ),
             HTML::from(
                 }
             ),
             HTML::from(

-                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">5 𝍷</td>"#
+                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">5 <span style="font-family: 'BabelStone Han'">𝍷</span></td>"#

             )
         );
         assert_eq!(
             )
         );
         assert_eq!(


@@ -818,9 +899,29 @@ mod tests {
                 }
             ),
             HTML::from(
                 }
             ),
             HTML::from(

-                r#"<td class="yes" onmouseover="h2('bob&#39;s','foo')" onmouseout="ch2('bob&#39;s','foo')">𝍷</td>"#
+                r#"<td class="yes" onmouseover="h2('bob&#39;s','foo')" onmouseout="ch2('bob&#39;s','foo')"><span style="font-family: 'BabelStone Han'">𝍷</span></td>"#

             )
         );
             )
         );

+        assert_eq!(
+            render_cell(
+                &Config {
+                    column_threshold: 2,
+                    static_columns: vec![],
+                    hidden_columns: HashSet::new(),
+                    substitute_labels: HashMap::new(),
+                    mark: HashMap::from([("foo".to_owned(), "🦄".to_owned())]),
+                },
+                "foo",
+                &mut Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![None])]),
+                }
+            ),
+            HTML::from(
+                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">🦄</td>"#
+            )
+        );
+

         let mut r = Row {
             label: "nope".to_owned(),
             entries: HashMap::from([
         let mut r = Row {
             label: "nope".to_owned(),
             entries: HashMap::from([


@@ -873,7 +974,7 @@ mod tests {
                     ]),
                 }
             ),
                     ]),
                 }
             ),

-            HTML::from("bar: 𝍷𝍷, foo")
+            HTML::from(r#"bar: <span style="font-family: 'BabelStone Han'">𝍷𝍷</span>, foo"#)

         );
         assert_eq!(
             render_all_leftovers(
         );
         assert_eq!(
             render_all_leftovers(


@@ -891,6 +992,22 @@ mod tests {
             ),
             HTML::from("")
         );
             ),
             HTML::from("")
         );

+        assert_eq!(
+            render_all_leftovers(
+                &Config {
+                    column_threshold: 2,
+                    static_columns: vec![],
+                    hidden_columns: HashSet::new(),
+                    substitute_labels: HashMap::new(),
+                    mark: HashMap::from([("foo".to_owned(), "🌈".to_owned())]),
+                },
+                &Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![None, None])]),
+                }
+            ),
+            HTML::from("foo: 🌈🌈")
+        );

     }
 
     #[test]
     }
 
     #[test]


@@ -1012,7 +1129,7 @@ mod tests {
                 })
             ),
             HTML::from(
                 })
             ),
             HTML::from(

-                r#"<tr><th id="nope">nope</th><td class="yes" onmouseover="h2('nope','bar')" onmouseout="ch2('nope','bar')">𝍷</td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
+                r#"<tr><th id="nope">nope</th><td class="yes" onmouseover="h2('nope','bar')" onmouseout="ch2('nope','bar')"><span style="font-family: 'BabelStone Han'">𝍷</span></td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>

 "#
             )
         );
 "#
             )
         );