]> git.scottworley.com Git - tablify/blobdiff - src/lib.rs
projects / tablify / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Release 0.5.1
[tablify] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs
index acf53834208d68cc32fc75f9959c027e850f54ed..c1a47617c701a4e018890b6106f6142733f271cd 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,23 +1,68 @@
 use std::borrow::ToOwned;
 use std::borrow::ToOwned;
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::fmt::Write;
 use std::io::BufRead;
 use std::iter::Iterator;
 
 use std::fmt::Write;
 use std::io::BufRead;
 use std::iter::Iterator;
 
+fn tally_marks(n: usize) -> String {
+    let fives = { 0..n / 5 }.map(|_| '𝍸');
+    let ones = { 0..n % 5 }.map(|_| '𝍷');
+    fives.chain(ones).collect()
+}
+
 #[derive(PartialEq, Eq, Debug)]
 struct Config {
     column_threshold: usize,
 #[derive(PartialEq, Eq, Debug)]
 struct Config {
     column_threshold: usize,
+    static_columns: Vec<Option<String>>,
+    hidden_columns: HashSet<String>,
+    substitute_labels: HashMap<String, String>,
 }
 impl Config {
 }
 impl Config {
-    fn apply_command(&mut self, cmd: &str) -> Result<(), std::io::Error> {
+    fn apply_command(&mut self, line_num: usize, cmd: &str) -> Result<(), std::io::Error> {
         if let Some(threshold) = cmd.strip_prefix("col_threshold ") {
         if let Some(threshold) = cmd.strip_prefix("col_threshold ") {
-            self.column_threshold = threshold
-                .parse()
-                .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidInput, e))?;
+            self.column_threshold = threshold.parse().map_err(|e| {
+                std::io::Error::new(
+                    std::io::ErrorKind::InvalidInput,
+                    format!("line {line_num}: col_threshold must be numeric: {e}"),
+                )
+            })?;
+        } else if let Some(col) = cmd.strip_prefix("hide ") {
+            self.hidden_columns.insert(col.to_owned());
+        } else if let Some(col) = cmd.strip_prefix("col ") {
+            self.static_columns.push(Some(col.to_owned()));
+        } else if cmd == "colsep" {
+            self.static_columns.push(None);
+        } else if let Some(directive) = cmd.strip_prefix("label ") {
+            match directive.split_once(':') {
+                None => {
+                    return Err(std::io::Error::new(
+                        std::io::ErrorKind::InvalidInput,
+                        format!("line {line_num}: Annotation missing ':'"),
+                    ))
+                }
+                Some((col, label)) => self
+                    .substitute_labels
+                    .insert(col.to_owned(), label.to_owned()),
+            };
+        } else {
+            return Err(std::io::Error::new(
+                std::io::ErrorKind::InvalidInput,
+                format!("line {line_num}: Unknown command: {cmd}"),
+            ));
         }
         Ok(())
     }
 }
         }
         Ok(())
     }
 }
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            column_threshold: 2,
+            static_columns: vec![],
+            hidden_columns: HashSet::new(),
+            substitute_labels: HashMap::new(),
+        }
+    }
+}
 
 const HEADER: &str = r#"<!DOCTYPE html>
 <html>
 
 const HEADER: &str = r#"<!DOCTYPE html>
 <html>
@@ -30,6 +75,7 @@ const HEADER: &str = r#"<!DOCTYPE html>
     th, td { white-space: nowrap; }
     th { text-align: left; font-weight: normal; }
     th.spacer_row { height: .3em; }
     th, td { white-space: nowrap; }
     th { text-align: left; font-weight: normal; }
     th.spacer_row { height: .3em; }
+    .spacer_col { border: none; width: .2em; }
     table { border-collapse: collapse }
     tr.key > th { height: 10em; vertical-align: bottom; line-height: 1 }
     tr.key > th > div { width: 1em; }
     table { border-collapse: collapse }
     tr.key > th { height: 10em; vertical-align: bottom; line-height: 1 }
     tr.key > th > div { width: 1em; }
@@ -155,7 +201,7 @@ impl<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> Iterator
                 Some((_, Err(e))) => return Some(Err(e)),
                 Some((n, Ok(line))) => match InputLine::from(line.as_ref()) {
                     InputLine::Command(cmd) => {
                 Some((_, Err(e))) => return Some(Err(e)),
                 Some((n, Ok(line))) => match InputLine::from(line.as_ref()) {
                     InputLine::Command(cmd) => {
-                        if let Err(e) = self.config.apply_command(cmd) {
+                        if let Err(e) = self.config.apply_command(n + 1, cmd) {
                             return Some(Err(e));
                         }
                     }
                             return Some(Err(e));
                         }
                     }
@@ -166,7 +212,7 @@ impl<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> Iterator
                     InputLine::Entry(col, instance) => match &mut self.row {
                         None => {
                             return Some(Err(std::io::Error::other(format!(
                     InputLine::Entry(col, instance) => match &mut self.row {
                         None => {
                             return Some(Err(std::io::Error::other(format!(
-                                "{}: Entry with no header",
+                                "line {}: Entry with no header",
                                 n + 1
                             ))))
                         }
                                 n + 1
                             ))))
                         }
@@ -194,9 +240,7 @@ impl<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> Iterator
 }
 
 fn read_input(input: impl std::io::Read) -> Result<(Vec<Rowlike>, Config), std::io::Error> {
 }
 
 fn read_input(input: impl std::io::Read) -> Result<(Vec<Rowlike>, Config), std::io::Error> {
-    let mut config = Config {
-        column_threshold: 2,
-    };
+    let mut config = Config::default();
     let reader = Reader::new(&mut config, std::io::BufReader::new(input).lines());
     reader
         .collect::<Result<Vec<_>, _>>()
     let reader = Reader::new(&mut config, std::io::BufReader::new(input).lines());
     reader
         .collect::<Result<Vec<_>, _>>()
@@ -224,64 +268,92 @@ fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
     counts
 }
 fn column_order(config: &Config, rows: &[Rowlike]) -> Vec<String> {
     counts
 }
 fn column_order(config: &Config, rows: &[Rowlike]) -> Vec<String> {
+    let static_columns: HashSet<&str> = config
+        .static_columns
+        .iter()
+        .flatten()
+        .map(std::string::String::as_str)
+        .collect();
     column_counts(rows)
         .into_iter()
     column_counts(rows)
         .into_iter()
-        .filter_map(|(n, col)| (n >= config.column_threshold).then_some(col))
+        .filter_map(|(n, col)| {
+            (n >= config.column_threshold
+                && !static_columns.contains(col.as_str())
+                && !config.hidden_columns.contains(&col))
+            .then_some(col)
+        })
         .collect()
 }
 
         .collect()
 }
 
-fn render_one_instance(instance: &Option<String>) -> HTML {
-    match instance {
-        None => HTML::from("βœ“"),
-        Some(instance) => HTML::escape(instance.as_ref()),
-    }
-}
-
 fn render_instances(instances: &[Option<String>]) -> HTML {
 fn render_instances(instances: &[Option<String>]) -> HTML {
-    let all_empty = instances.iter().all(Option::is_none);
-    if all_empty && instances.len() == 1 {
-        HTML::from("")
-    } else if all_empty {
-        HTML(format!("{}", instances.len()))
-    } else {
-        HTML(
-            instances
-                .iter()
-                .map(render_one_instance)
-                .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
-                .collect::<Vec<_>>()
-                .join(" "),
-        )
+    let mut tally = 0;
+    let mut out = vec![];
+    for ins in instances {
+        match ins {
+            None => tally += 1,
+            Some(content) => {
+                if tally > 0 {
+                    out.push(HTML(tally_marks(tally)));
+                    tally = 0;
+                }
+                out.push(HTML::escape(content));
+            }
+        }
+    }
+    if tally > 0 {
+        out.push(HTML(tally_marks(tally)));
     }
     }
+    HTML(
+        out.into_iter()
+            .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
+            .collect::<Vec<_>>()
+            .join(" "),
+    )
 }
 
 }
 
-fn render_cell(col: &str, row: &mut Row) -> HTML {
+fn render_cell(config: &Config, col: &str, row: &mut Row) -> HTML {
     let row_label = HTML::escape(row.label.as_ref());
     let row_label = HTML::escape(row.label.as_ref());
-    let col_label = HTML::escape(col);
+    let col_label = HTML::escape(
+        config
+            .substitute_labels
+            .get(col)
+            .map_or(col, std::string::String::as_str),
+    );
     let instances: Option<&Vec<Option<String>>> = row.entries.get(col);
     let instances: Option<&Vec<Option<String>>> = row.entries.get(col);
-    let class = HTML::from(if instances.is_none() { "" } else { "yes" });
+    let is_empty = match instances {
+        None => true,
+        Some(is) => is.iter().all(|ins| match ins {
+            None => false,
+            Some(content) => content == "Γ—",
+        }),
+    };
+    let class = HTML::from(if is_empty { "" } else { r#" class="yes""# });
     let contents = match instances {
         None => HTML::from(""),
         Some(is) => render_instances(is),
     };
     row.entries.remove(col);
     HTML(format!(
     let contents = match instances {
         None => HTML::from(""),
         Some(is) => render_instances(is),
     };
     row.entries.remove(col);
     HTML(format!(
-        r#"<td class="{class}" onmouseover="h2('{row_label}','{col_label}')" onmouseout="ch2('{row_label}','{col_label}')">{contents}</td>"#
+        r#"<td{class} onmouseover="h2('{row_label}','{col_label}')" onmouseout="ch2('{row_label}','{col_label}')">{contents}</td>"#
     ))
 }
 
 fn render_leftover(notcol: &str, instances: &[Option<String>]) -> HTML {
     let label = HTML::escape(notcol);
     ))
 }
 
 fn render_leftover(notcol: &str, instances: &[Option<String>]) -> HTML {
     let label = HTML::escape(notcol);
-    let rest = render_instances(instances);
-    if rest == HTML::from("") {
+    if instances.len() == 1 && instances[0].is_none() {
         HTML(format!("{label}"))
     } else {
         HTML(format!("{label}"))
     } else {
+        let rest = render_instances(instances);
         HTML(format!("{label}: {rest}"))
     }
 }
 
         HTML(format!("{label}: {rest}"))
     }
 }
 
-fn render_all_leftovers(row: &Row) -> HTML {
-    let mut order: Vec<_> = row.entries.keys().collect();
+fn render_all_leftovers(config: &Config, row: &Row) -> HTML {
+    let mut order: Vec<_> = row
+        .entries
+        .keys()
+        .filter(|&col| !config.hidden_columns.contains(col))
+        .collect();
     order.sort_unstable();
     HTML(
         order
     order.sort_unstable();
     HTML(
         order
@@ -298,27 +370,59 @@ fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTM
         Rowlike::Spacer => HTML::from("<tr><th class=\"spacer_row\"></th></tr>\n"),
         Rowlike::Row(row) => {
             let row_label = HTML::escape(row.label.as_ref());
         Rowlike::Spacer => HTML::from("<tr><th class=\"spacer_row\"></th></tr>\n"),
         Rowlike::Row(row) => {
             let row_label = HTML::escape(row.label.as_ref());
-            let cells = columns
+            let static_cells = config
+                .static_columns
                 .iter()
                 .iter()
-                .map(|col| render_cell(col, row))
+                .map(|ocol| match ocol {
+                    Some(col) if config.hidden_columns.contains(col) => HTML::from(""),
+                    Some(col) => render_cell(config, col, row),
+                    None => HTML::from(r#"<td class="spacer_col"></td>"#),
+                })
                 .collect::<HTML>();
                 .collect::<HTML>();
-            let leftovers = render_all_leftovers(row);
+            let dynamic_cells = columns
+                .iter()
+                .filter(|&col| !config.hidden_columns.contains(col))
+                .map(|col| render_cell(config, col, row))
+                .collect::<HTML>();
+            let leftovers = render_all_leftovers(config, row);
             HTML(format!(
             HTML(format!(
-                "<tr><th id=\"{row_label}\">{row_label}</th>{cells}<td class=\"leftover\" onmouseover=\"highlight('{row_label}')\" onmouseout=\"clear_highlight('{row_label}')\">{leftovers}</td></tr>\n"
+                "<tr><th id=\"{row_label}\">{row_label}</th>{static_cells}{dynamic_cells}<td class=\"leftover\" onmouseover=\"highlight('{row_label}')\" onmouseout=\"clear_highlight('{row_label}')\">{leftovers}</td></tr>\n"
             ))
         }
     }
 }
 
             ))
         }
     }
 }
 
+fn column_header_labels<'a>(
+    config: &'a Config,
+    columns: &'a [String],
+) -> impl Iterator<Item = Option<&'a String>> {
+    let static_columns = config.static_columns.iter().map(|oc| oc.as_ref());
+    let dynamic_columns = columns.iter().map(Some);
+    static_columns
+        .chain(dynamic_columns)
+        .filter(|ocol| ocol.map_or(true, |col| !config.hidden_columns.contains(col)))
+        .map(|ocol| {
+            ocol.map(|col| match config.substitute_labels.get(col) {
+                None => col,
+                Some(substitute) => substitute,
+            })
+        })
+}
+
 fn render_column_headers(config: &Config, columns: &[String]) -> HTML {
     HTML(
         String::from(r#"<tr class="key"><th></th>"#)
 fn render_column_headers(config: &Config, columns: &[String]) -> HTML {
     HTML(
         String::from(r#"<tr class="key"><th></th>"#)
-            + &columns.iter().fold(String::new(), |mut acc, col| {
-                let col_header = HTML::escape(col.as_ref());
-                write!(
-                    &mut acc,
-                    r#"<th id="{col_header}"><div><div>{col_header}</div></div></th>"#
-                )
+            + &column_header_labels(config, columns).fold(String::new(), |mut acc, ocol| {
+                match ocol {
+                    Some(col) => {
+                        let col_header = HTML::escape(col);
+                        write!(
+                            &mut acc,
+                            r#"<th id="{col_header}"><div><div>{col_header}</div></div></th>"#
+                        )
+                    }
+                    None => write!(&mut acc, r#"<th class="col_spacer"></th>"#),
+                }
                 .unwrap();
                 acc
             })
                 .unwrap();
                 acc
             })
@@ -377,6 +481,21 @@ 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), "𝍸𝍸𝍷");
+    }
+
     fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {
         read_input(input).map(|(rows, _)| rows)
     }
     fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {
         read_input(input).map(|(rows, _)| rows)
     }
@@ -479,11 +598,11 @@ mod tests {
 
         let bad = read_rows(&b" foo"[..]);
         assert!(bad.is_err());
 
         let bad = read_rows(&b" foo"[..]);
         assert!(bad.is_err());
-        assert!(format!("{bad:?}").contains("1: Entry with no header"));
+        assert!(format!("{bad:?}").contains("line 1: Entry with no header"));
 
         let bad2 = read_rows(&b"foo\n\n bar"[..]);
         assert!(bad2.is_err());
 
         let bad2 = read_rows(&b"foo\n\n bar"[..]);
         assert!(bad2.is_err());
-        assert!(format!("{bad2:?}").contains("3: Entry with no header"));
+        assert!(format!("{bad2:?}").contains("line 3: Entry with no header"));
     }
 
     #[test]
     }
 
     #[test]
@@ -494,10 +613,28 @@ mod tests {
                 .column_threshold,
             10
         );
                 .column_threshold,
             10
         );
+        assert_eq!(
+            read_config(&b"!col foo"[..]).unwrap().static_columns,
+            vec![Some("foo".to_owned())]
+        );
+        assert_eq!(
+            read_config(&b"!label foo:bar"[..])
+                .unwrap()
+                .substitute_labels["foo"],
+            "bar"
+        );
+
+        let bad_command = read_config(&b"!no such command"[..]);
+        assert!(bad_command.is_err());
+        assert!(format!("{bad_command:?}").contains("line 1: Unknown command"));
 
         let bad_num = read_config(&b"!col_threshold foo"[..]);
         assert!(bad_num.is_err());
 
         let bad_num = read_config(&b"!col_threshold foo"[..]);
         assert!(bad_num.is_err());
-        assert!(format!("{bad_num:?}").contains("Parse"));
+        assert!(format!("{bad_num:?}").contains("line 1: col_threshold must be numeric"));
+
+        let bad_sub = read_config(&b"!label foo"[..]);
+        assert!(bad_sub.is_err());
+        assert!(format!("{bad_sub:?}").contains("line 1: Annotation missing ':'"));
     }
 
     #[test]
     }
 
     #[test]
@@ -522,10 +659,43 @@ mod tests {
         );
     }
 
         );
     }
 
+    #[test]
+    fn test_column_header_labels() {
+        let mut cfg = Config::default();
+
+        assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([Some(&"foo".to_owned())]));
+
+        cfg.static_columns.push(Some("bar".to_owned()));
+        assert!(column_header_labels(&cfg, &["foo".to_owned()])
+            .eq([Some(&"bar".to_owned()), Some(&"foo".to_owned())]));
+
+        cfg.static_columns.push(None);
+        assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([
+            Some(&"bar".to_owned()),
+            None,
+            Some(&"foo".to_owned())
+        ]));
+
+        cfg.substitute_labels
+            .insert("foo".to_owned(), "foo (bits)".to_owned());
+        assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([
+            Some(&"bar".to_owned()),
+            None,
+            Some(&"foo (bits)".to_owned())
+        ]));
+
+        cfg.hidden_columns.insert("foo".to_owned());
+        assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([Some(&"bar".to_owned()), None]));
+
+        cfg.hidden_columns.insert("bar".to_owned());
+        assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([None]));
+    }
+
     #[test]
     fn test_render_cell() {
         assert_eq!(
             render_cell(
     #[test]
     fn test_render_cell() {
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -533,11 +703,12 @@ mod tests {
                 }
             ),
             HTML::from(
                 }
             ),
             HTML::from(
-                r#"<td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
+                r#"<td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
             )
         );
         assert_eq!(
             render_cell(
             )
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -545,11 +716,12 @@ mod tests {
                 }
             ),
             HTML::from(
                 }
             ),
             HTML::from(
-                r#"<td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
+                r#"<td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
             )
         );
         assert_eq!(
             render_cell(
             )
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -557,11 +729,12 @@ 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')">𝍷</td>"#
             )
         );
         assert_eq!(
             render_cell(
             )
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -569,11 +742,12 @@ mod tests {
                 }
             ),
             HTML::from(
                 }
             ),
             HTML::from(
-                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">2</td>"#
+                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">𝍷𝍷</td>"#
             )
         );
         assert_eq!(
             render_cell(
             )
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -589,6 +763,7 @@ mod tests {
         );
         assert_eq!(
             render_cell(
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -596,11 +771,25 @@ 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 π·</td>"#
+            )
+        );
+        assert_eq!(
+            render_cell(
+                &Config::default(),
+                "foo",
+                &mut Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![Some("Γ—".to_owned())])]),
+                }
+            ),
+            HTML::from(
+                r#"<td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">Γ—</td>"#
             )
         );
         assert_eq!(
             render_cell(
             )
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "heart",
                 &mut Row {
                     label: "nope".to_owned(),
                 "heart",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -613,6 +802,7 @@ mod tests {
         );
         assert_eq!(
             render_cell(
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "bob's".to_owned(),
                 "foo",
                 &mut Row {
                     label: "bob's".to_owned(),
@@ -620,7 +810,7 @@ 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')">𝍷</td>"#
             )
         );
         let mut r = Row {
             )
         );
         let mut r = Row {
@@ -631,60 +821,184 @@ mod tests {
             ]),
         };
         assert_eq!(r.entries.len(), 2);
             ]),
         };
         assert_eq!(r.entries.len(), 2);
-        render_cell("foo", &mut r);
+        render_cell(&Config::default(), "foo", &mut r);
         assert_eq!(r.entries.len(), 1);
         assert_eq!(r.entries.len(), 1);
-        render_cell("bar", &mut r);
+        render_cell(&Config::default(), "bar", &mut r);
         assert_eq!(r.entries.len(), 1);
         assert_eq!(r.entries.len(), 1);
-        render_cell("baz", &mut r);
+        render_cell(&Config::default(), "baz", &mut r);
         assert_eq!(r.entries.len(), 0);
     }
 
     #[test]
     fn test_render_leftovers() {
         assert_eq!(
         assert_eq!(r.entries.len(), 0);
     }
 
     #[test]
     fn test_render_leftovers() {
         assert_eq!(
-            render_all_leftovers(&Row {
-                label: "nope".to_owned(),
-                entries: HashMap::from([("foo".to_owned(), vec![None])]),
-            }),
+            render_all_leftovers(
+                &Config::default(),
+                &Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![None])]),
+                }
+            ),
             HTML::from("foo")
         );
         assert_eq!(
             HTML::from("foo")
         );
         assert_eq!(
-            render_all_leftovers(&Row {
-                label: "nope".to_owned(),
-                entries: HashMap::from([
-                    ("foo".to_owned(), vec![None]),
-                    ("bar".to_owned(), vec![None])
-                ]),
-            }),
+            render_all_leftovers(
+                &Config::default(),
+                &Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([
+                        ("foo".to_owned(), vec![None]),
+                        ("bar".to_owned(), vec![None])
+                    ]),
+                }
+            ),
             HTML::from("bar, foo")
         );
         assert_eq!(
             HTML::from("bar, foo")
         );
         assert_eq!(
-            render_all_leftovers(&Row {
-                label: "nope".to_owned(),
-                entries: HashMap::from([
-                    ("foo".to_owned(), vec![None]),
-                    ("bar".to_owned(), vec![None, None])
-                ]),
-            }),
-            HTML::from("bar: 2, foo")
+            render_all_leftovers(
+                &Config::default(),
+                &Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([
+                        ("foo".to_owned(), vec![None]),
+                        ("bar".to_owned(), vec![None, None])
+                    ]),
+                }
+            ),
+            HTML::from("bar: π·π·, foo")
+        );
+        assert_eq!(
+            render_all_leftovers(
+                &Config {
+                    column_threshold: 2,
+                    static_columns: vec![],
+                    hidden_columns: HashSet::from(["private".to_owned()]),
+                    substitute_labels: HashMap::new(),
+                },
+                &Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("private".to_owned(), vec![None]),]),
+                }
+            ),
+            HTML::from("")
         );
     }
 
     #[test]
     fn test_render_row() {
         );
     }
 
     #[test]
     fn test_render_row() {
+        assert_eq!(
+            render_row(
+                &Config::default(),
+                &["foo".to_owned()],
+                &mut Rowlike::Row(Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("bar".to_owned(), vec![None])]),
+                })
+            ),
+            HTML::from(
+                r#"<tr><th id="nope">nope</th><td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')">bar</td></tr>
+"#
+            )
+        );
         assert_eq!(
             render_row(
                 &Config {
                     column_threshold: 0,
         assert_eq!(
             render_row(
                 &Config {
                     column_threshold: 0,
+                    static_columns: vec![Some("foo".to_owned()), Some("bar".to_owned())],
+                    hidden_columns: HashSet::new(),
+                    substitute_labels: HashMap::new(),
+                },
+                &["baz".to_owned()],
+                &mut Rowlike::Row(Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([
+                        ("bar".to_owned(), vec![Some("r".to_owned())]),
+                        ("baz".to_owned(), vec![Some("z".to_owned())]),
+                        ("foo".to_owned(), vec![Some("f".to_owned())]),
+                    ]),
+                })
+            ),
+            HTML::from(
+                r#"<tr><th id="nope">nope</th><td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">f</td><td class="yes" onmouseover="h2('nope','bar')" onmouseout="ch2('nope','bar')">r</td><td class="yes" onmouseover="h2('nope','baz')" onmouseout="ch2('nope','baz')">z</td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
+"#
+            )
+        );
+        assert_eq!(
+            render_row(
+                &Config {
+                    column_threshold: 0,
+                    static_columns: vec![Some("foo".to_owned()), None, Some("bar".to_owned())],
+                    hidden_columns: HashSet::new(),
+                    substitute_labels: HashMap::new(),
+                },
+                &[],
+                &mut Rowlike::Row(Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([
+                        ("bar".to_owned(), vec![Some("r".to_owned())]),
+                        ("foo".to_owned(), vec![Some("f".to_owned())]),
+                    ]),
+                })
+            ),
+            HTML::from(
+                r#"<tr><th id="nope">nope</th><td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">f</td><td class="spacer_col"></td><td class="yes" onmouseover="h2('nope','bar')" onmouseout="ch2('nope','bar')">r</td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
+"#
+            )
+        );
+        assert_eq!(
+            render_row(
+                &Config {
+                    column_threshold: 0,
+                    static_columns: vec![],
+                    hidden_columns: HashSet::from(["foo".to_owned()]),
+                    substitute_labels: HashMap::new(),
+                },
+                &[],
+                &mut Rowlike::Row(Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![Some("f".to_owned())]),]),
+                })
+            ),
+            HTML::from(
+                r#"<tr><th id="nope">nope</th><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
+"#
+            )
+        );
+        assert_eq!(
+            render_row(
+                &Config {
+                    column_threshold: 0,
+                    static_columns: vec![Some("foo".to_owned())],
+                    hidden_columns: HashSet::from(["foo".to_owned()]),
+                    substitute_labels: HashMap::new(),
+                },
+                &[],
+                &mut Rowlike::Row(Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![Some("f".to_owned())]),]),
+                })
+            ),
+            HTML::from(
+                r#"<tr><th id="nope">nope</th><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
+"#
+            )
+        );
+        assert_eq!(
+            render_row(
+                &Config {
+                    column_threshold: 0,
+                    static_columns: vec![],
+                    hidden_columns: HashSet::new(),
+                    substitute_labels: HashMap::from([("foo".to_owned(), "bar".to_owned())]),
                 },
                 &["foo".to_owned()],
                 &mut Rowlike::Row(Row {
                     label: "nope".to_owned(),
                 },
                 &["foo".to_owned()],
                 &mut Rowlike::Row(Row {
                     label: "nope".to_owned(),
-                    entries: HashMap::from([("bar".to_owned(), vec![None])]),
+                    entries: HashMap::from([("foo".to_owned(), vec![None])]),
                 })
             ),
             HTML::from(
                 })
             ),
             HTML::from(
-                r#"<tr><th id="nope">nope</th><td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')">bar</td></tr>
+                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>
 "#
             )
         );
 "#
             )
         );
Summarize a text log as an HTML table