]> git.scottworley.com Git - tablify/blobdiff - src/lib.rs
projects / tablify / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Start on 0.5.1
[tablify] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs
index 3e0efd0d68751ce974401dbfd3c66fd4c0e5f23f..d85de02dda58b9cbbe1d077d5bd485851d255946 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,33 +1,94 @@
 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;
 
-pub struct Config {}
+fn tally_marks(n: usize) -> String {
+    let fives = { 0..n / 5 }.map(|_| '𝍸');
+    let ones = { 0..n % 5 }.map(|_| '𝍷');
+    fives.chain(ones).collect()
+}
 
 
-const HEADER: &str = "<!DOCTYPE html>
+#[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 {
+    fn apply_command(&mut self, line_num: usize, cmd: &str) -> Result<(), std::io::Error> {
+        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,
+                    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(())
+    }
+}
+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>
 <head>
 <html>
 <head>
-  <meta charset=\"utf-8\">
-  <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
   <style>
     td { text-align: center; }
     /* h/t https://wabain.github.io/2019/10/13/css-rotated-table-header.html */
     th, td { white-space: nowrap; }
     th { text-align: left; font-weight: normal; }
   <style>
     td { text-align: center; }
     /* h/t https://wabain.github.io/2019/10/13/css-rotated-table-header.html */
     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; }
     tr.key > th > div > div { width: 5em; transform-origin: bottom left; transform: translateX(1em) rotate(-65deg) }
     td { border: thin solid gray; }
     table { border-collapse: collapse }
     tr.key > th { height: 10em; vertical-align: bottom; line-height: 1 }
     tr.key > th > div { width: 1em; }
     tr.key > th > div > div { width: 5em; transform-origin: bottom left; transform: translateX(1em) rotate(-65deg) }
     td { border: thin solid gray; }
+    td.leftover { text-align: left; border: none; padding-left: .4em; }
     td.yes { border: thin solid gray; background-color: #ddd; }
     /* h/t https://stackoverflow.com/questions/5687035/css-bolding-some-text-without-changing-its-containers-size/46452396#46452396 */
     .highlight { text-shadow: -0.06ex 0 black, 0.06ex 0 black; }
   </style>
   <script>
     td.yes { border: thin solid gray; background-color: #ddd; }
     /* h/t https://stackoverflow.com/questions/5687035/css-bolding-some-text-without-changing-its-containers-size/46452396#46452396 */
     .highlight { text-shadow: -0.06ex 0 black, 0.06ex 0 black; }
   </style>
   <script>
-    function highlight(id)       { const e = document.getElementById(id); if (e) { e.classList.add(   \"highlight\"); } }
-    function clear_highlight(id) { const e = document.getElementById(id); if (e) { e.classList.remove(\"highlight\"); } }
+    function highlight(id)       { const e = document.getElementById(id); if (e) { e.classList.add(   "highlight"); } }
+    function clear_highlight(id) { const e = document.getElementById(id); if (e) { e.classList.remove("highlight"); } }
     function h2(a, b)  {       highlight(a);       highlight(b); }
     function ch2(a, b) { clear_highlight(a); clear_highlight(b); }
   </script>
     function h2(a, b)  {       highlight(a);       highlight(b); }
     function ch2(a, b) { clear_highlight(a); clear_highlight(b); }
   </script>
@@ -35,7 +96,7 @@ const HEADER: &str = "<!DOCTYPE html>
 <body>
   <table>
     <tbody>
 <body>
   <table>
     <tbody>
-";
+"#;
 const FOOTER: &str = "    </tbody>
   </table>
 </body>
 const FOOTER: &str = "    </tbody>
   </table>
 </body>
@@ -83,12 +144,15 @@ enum InputLine<'a> {
     Blank,
     RowHeader(&'a str),
     Entry(&'a str, Option<&'a str>),
     Blank,
     RowHeader(&'a str),
     Entry(&'a str, Option<&'a str>),
+    Command(&'a str),
 }
 impl<'a> From<&'a str> for InputLine<'a> {
     fn from(value: &'a str) -> InputLine<'a> {
         let trimmed = value.trim_end();
         if trimmed.is_empty() {
             InputLine::Blank
 }
 impl<'a> From<&'a str> for InputLine<'a> {
     fn from(value: &'a str) -> InputLine<'a> {
         let trimmed = value.trim_end();
         if trimmed.is_empty() {
             InputLine::Blank
+        } else if let Some(cmd) = trimmed.strip_prefix('!') {
+            InputLine::Command(cmd)
         } else if !trimmed.starts_with(' ') {
             InputLine::RowHeader(value.trim())
         } else {
         } else if !trimmed.starts_with(' ') {
             InputLine::RowHeader(value.trim())
         } else {
@@ -106,34 +170,49 @@ struct Row {
     entries: HashMap<String, Vec<Option<String>>>,
 }
 
     entries: HashMap<String, Vec<Option<String>>>,
 }
 
-struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {
+#[derive(Debug, PartialEq, Eq)]
+enum Rowlike {
+    Row(Row),
+    Spacer,
+}
+
+struct Reader<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> {
     input: std::iter::Enumerate<Input>,
     row: Option<Row>,
     input: std::iter::Enumerate<Input>,
     row: Option<Row>,
+    config: &'cfg mut Config,
 }
 }
-impl<Input: Iterator<Item = Result<String, std::io::Error>>> Reader<Input> {
-    fn new(input: Input) -> Self {
+impl<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> Reader<'cfg, Input> {
+    fn new(config: &'cfg mut Config, input: Input) -> Self {
         Self {
             input: input.enumerate(),
             row: None,
         Self {
             input: input.enumerate(),
             row: None,
+            config,
         }
     }
 }
         }
     }
 }
-impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader<Input> {
-    type Item = Result<Row, std::io::Error>;
+impl<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> Iterator
+    for Reader<'cfg, Input>
+{
+    type Item = Result<Rowlike, std::io::Error>;
     fn next(&mut self) -> Option<Self::Item> {
         loop {
             match self.input.next() {
     fn next(&mut self) -> Option<Self::Item> {
         loop {
             match self.input.next() {
-                None => return Ok(std::mem::take(&mut self.row)).transpose(),
+                None => return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose(),
                 Some((_, Err(e))) => return Some(Err(e)),
                 Some((n, Ok(line))) => match InputLine::from(line.as_ref()) {
                 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(n + 1, cmd) {
+                            return Some(Err(e));
+                        }
+                    }
                     InputLine::Blank if self.row.is_some() => {
                     InputLine::Blank if self.row.is_some() => {
-                        return Ok(std::mem::take(&mut self.row)).transpose()
+                        return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose()
                     }
                     }
-                    InputLine::Blank => {}
+                    InputLine::Blank => return Some(Ok(Rowlike::Spacer)),
                     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
                             ))))
                         }
@@ -151,7 +230,7 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader
                             entries: HashMap::new(),
                         });
                         if prev.is_some() {
                             entries: HashMap::new(),
                         });
                         if prev.is_some() {
-                            return Ok(prev).transpose();
+                            return Ok(prev.map(Rowlike::Row)).transpose();
                         }
                     }
                 },
                         }
                     }
                 },
@@ -160,14 +239,22 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader
     }
 }
 
     }
 }
 
-fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<Row, std::io::Error>> {
-    Reader::new(std::io::BufReader::new(input).lines())
+fn read_input(input: impl std::io::Read) -> Result<(Vec<Rowlike>, Config), std::io::Error> {
+    let mut config = Config::default();
+    let reader = Reader::new(&mut config, std::io::BufReader::new(input).lines());
+    reader
+        .collect::<Result<Vec<_>, _>>()
+        .map(|rows| (rows, config))
 }
 
 }
 
-fn column_counts(rows: &[Row]) -> Vec<(usize, String)> {
+fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
+    let empty = HashMap::new();
     let mut counts: Vec<_> = rows
         .iter()
     let mut counts: Vec<_> = rows
         .iter()
-        .flat_map(|r| r.entries.keys())
+        .flat_map(|rl| match rl {
+            Rowlike::Row(r) => r.entries.keys(),
+            Rowlike::Spacer => empty.keys(),
+        })
         .fold(HashMap::new(), |mut cs, col| {
             cs.entry(col.to_owned())
                 .and_modify(|n| *n += 1)
         .fold(HashMap::new(), |mut cs, col| {
             cs.entry(col.to_owned())
                 .and_modify(|n| *n += 1)
@@ -180,67 +267,157 @@ fn column_counts(rows: &[Row]) -> Vec<(usize, String)> {
     counts.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol)));
     counts
 }
     counts.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol)));
     counts
 }
-fn column_order(rows: &[Row]) -> Vec<String> {
+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()
-        .map(|(_, col)| 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_instance(instance: &Option<String>) -> HTML {
-    match instance {
-        None => HTML::from("✓"),
-        Some(instance) => HTML::escape(instance.as_ref()),
+fn render_instances(instances: &[Option<String>]) -> HTML {
+    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: &Row) -> HTML {
+fn render_cell(col: &str, row: &mut Row) -> HTML {
     let row_label = HTML::escape(row.label.as_ref());
     let col_label = HTML::escape(col);
     let instances: Option<&Vec<Option<String>>> = row.entries.get(col);
     let row_label = HTML::escape(row.label.as_ref());
     let col_label = HTML::escape(col);
     let instances: Option<&Vec<Option<String>>> = row.entries.get(col);
-    let class = HTML::from(if instances.is_none() { "" } else { "yes" });
-    let all_empty = instances
-        .iter()
-        .flat_map(|is| is.iter())
-        .all(Option::is_none);
-    let contents = if instances.is_none() || (all_empty && instances.unwrap().len() == 1) {
-        HTML::from("")
-    } else if all_empty {
-        HTML(format!("{}", instances.unwrap().len()))
+    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!(
+        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);
+    if instances.len() == 1 && instances[0].is_none() {
+        HTML(format!("{label}"))
     } else {
     } else {
-        HTML(
-            instances
-                .unwrap()
+        let rest = render_instances(instances);
+        HTML(format!("{label}: {rest}"))
+    }
+}
+
+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
+            .into_iter()
+            .map(|notcol| render_leftover(notcol, row.entries.get(notcol).expect("Key vanished?!")))
+            .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
+            .collect::<Vec<_>>()
+            .join(", "),
+    )
+}
+
+fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTML {
+    match rowlike {
+        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 static_cells = config
+                .static_columns
                 .iter()
                 .iter()
-                .map(render_instance)
-                .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
-                .collect::<Vec<_>>()
-                .join(" "),
-        )
-    };
-    HTML(format!("<td class=\"{class}\" onmouseover=\"h2('{row_label}','{col_label}')\" onmouseout=\"ch2('{row_label}','{col_label}')\">{contents}</td>"))
+                .map(|ocol| match ocol {
+                    Some(col) if config.hidden_columns.contains(col) => HTML::from(""),
+                    Some(col) => render_cell(col, row),
+                    None => HTML::from(r#"<td class="spacer_col"></td>"#),
+                })
+                .collect::<HTML>();
+            let dynamic_cells = columns
+                .iter()
+                .filter(|&col| !config.hidden_columns.contains(col))
+                .map(|col| render_cell(col, row))
+                .collect::<HTML>();
+            let leftovers = render_all_leftovers(config, row);
+            HTML(format!(
+                "<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 render_row(columns: &[String], row: &Row) -> HTML {
-    let row_label = HTML::escape(row.label.as_ref());
-    HTML(format!(
-        "<tr><th id=\"{row_label}\">{row_label}</th>{}</tr>\n",
-        &columns
-            .iter()
-            .map(|col| render_cell(col, row))
-            .collect::<HTML>()
-    ))
+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(columns: &[String]) -> HTML {
+fn render_column_headers(config: &Config, columns: &[String]) -> HTML {
     HTML(
     HTML(
-        String::from("<tr class=\"key\"><th></th>")
-            + &columns.iter().fold(String::new(), |mut acc, col| {
-                let col_header = HTML::escape(col.as_ref());
-                write!(
-                    &mut acc,
-                    "<th id=\"{col_header}\"><div><div>{col_header}</div></div></th>"
-                )
+        String::from(r#"<tr class="key"><th></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
             })
@@ -254,14 +431,14 @@ fn render_column_headers(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(config: &Config, input: impl std::io::Read) -> Result<HTML, std::io::Error> {
-    let rows = read_rows(input).collect::<Result<Vec<_>, _>>()?;
-    let columns = column_order(&rows);
+pub fn tablify(input: impl std::io::Read) -> Result<HTML, std::io::Error> {
+    let (rows, config) = read_input(input)?;
+    let columns = column_order(&config, &rows);
     Ok(HTML(format!(
         "{HEADER}{}{}{FOOTER}",
     Ok(HTML(format!(
         "{HEADER}{}{}{FOOTER}",
-        render_column_headers(&columns),
+        render_column_headers(&config, &columns),
         rows.into_iter()
         rows.into_iter()
-            .map(|r| render_row(&columns, &r))
+            .map(|mut r| render_row(&config, &columns, &mut r))
             .collect::<HTML>()
     )))
 }
             .collect::<HTML>()
     )))
 }
@@ -299,220 +476,498 @@ 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_config(input: impl std::io::Read) -> Result<Config, std::io::Error> {
+        read_input(input).map(|(_, config)| config)
+    }
     #[test]
     fn test_read_rows() {
         assert_eq!(
     #[test]
     fn test_read_rows() {
         assert_eq!(
-            read_rows(&b"foo"[..]).flatten().collect::<Vec<_>>(),
-            vec![Row {
+            read_rows(&b"foo"[..]).unwrap(),
+            vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::new(),
                 label: "foo".to_owned(),
                 entries: HashMap::new(),
-            }]
+            })]
         );
         assert_eq!(
         );
         assert_eq!(
-            read_rows(&b"bar"[..]).flatten().collect::<Vec<_>>(),
-            vec![Row {
+            read_rows(&b"bar"[..]).unwrap(),
+            vec![Rowlike::Row(Row {
                 label: "bar".to_owned(),
                 entries: HashMap::new(),
                 label: "bar".to_owned(),
                 entries: HashMap::new(),
-            }]
+            })]
         );
         assert_eq!(
         );
         assert_eq!(
-            read_rows(&b"foo\nbar\n"[..]).flatten().collect::<Vec<_>>(),
+            read_rows(&b"foo\nbar\n"[..]).unwrap(),
             vec![
             vec![
-                Row {
+                Rowlike::Row(Row {
                     label: "foo".to_owned(),
                     entries: HashMap::new(),
                     label: "foo".to_owned(),
                     entries: HashMap::new(),
-                },
-                Row {
+                }),
+                Rowlike::Row(Row {
                     label: "bar".to_owned(),
                     entries: HashMap::new(),
                     label: "bar".to_owned(),
                     entries: HashMap::new(),
-                }
+                })
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(
-            read_rows(&b"foo\n bar\n"[..]).flatten().collect::<Vec<_>>(),
-            vec![Row {
+            read_rows(&b"foo\n bar\n"[..]).unwrap(),
+            vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
-            }]
+            })]
         );
         assert_eq!(
         );
         assert_eq!(
-            read_rows(&b"foo\n bar\n baz\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
-            vec![Row {
+            read_rows(&b"foo\n bar\n baz\n"[..]).unwrap(),
+            vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([
                     ("bar".to_owned(), vec![None]),
                     ("baz".to_owned(), vec![None])
                 ]),
                 label: "foo".to_owned(),
                 entries: HashMap::from([
                     ("bar".to_owned(), vec![None]),
                     ("baz".to_owned(), vec![None])
                 ]),
-            }]
+            })]
         );
         assert_eq!(
         );
         assert_eq!(
-            read_rows(&b"foo\n\nbar\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo\n\nbar\n"[..]).unwrap(),
             vec![
             vec![
-                Row {
+                Rowlike::Row(Row {
                     label: "foo".to_owned(),
                     entries: HashMap::new(),
                     label: "foo".to_owned(),
                     entries: HashMap::new(),
-                },
-                Row {
+                }),
+                Rowlike::Row(Row {
                     label: "bar".to_owned(),
                     entries: HashMap::new(),
                     label: "bar".to_owned(),
                     entries: HashMap::new(),
-                }
+                })
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(
-            read_rows(&b"foo\n \nbar\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo\n\n\nbar\n"[..]).unwrap(),
             vec![
             vec![
-                Row {
+                Rowlike::Row(Row {
                     label: "foo".to_owned(),
                     entries: HashMap::new(),
                     label: "foo".to_owned(),
                     entries: HashMap::new(),
-                },
-                Row {
+                }),
+                Rowlike::Spacer,
+                Rowlike::Row(Row {
                     label: "bar".to_owned(),
                     entries: HashMap::new(),
                     label: "bar".to_owned(),
                     entries: HashMap::new(),
-                }
+                })
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(
-            read_rows(&b"foo  \n bar  \n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
-            vec![Row {
+            read_rows(&b"foo\n \nbar\n"[..]).unwrap(),
+            vec![
+                Rowlike::Row(Row {
+                    label: "foo".to_owned(),
+                    entries: HashMap::new(),
+                }),
+                Rowlike::Row(Row {
+                    label: "bar".to_owned(),
+                    entries: HashMap::new(),
+                })
+            ]
+        );
+        assert_eq!(
+            read_rows(&b"foo  \n bar  \n"[..]).unwrap(),
+            vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
-            }]
+            })]
         );
 
         );
 
-        let bad = read_rows(&b" foo"[..]).next().unwrap();
+        let bad = read_rows(&b" foo"[..]);
         assert!(bad.is_err());
         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"[..]).nth(1).unwrap();
+        let bad2 = read_rows(&b"foo\n\n bar"[..]);
         assert!(bad2.is_err());
         assert!(bad2.is_err());
-        assert!(format!("{bad2:?}").contains("3: Entry with no header"));
+        assert!(format!("{bad2:?}").contains("line 3: Entry with no header"));
+    }
+
+    #[test]
+    fn test_read_config() {
+        assert_eq!(
+            read_config(&b"!col_threshold 10"[..])
+                .unwrap()
+                .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());
+        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]
     fn test_column_counts() {
         assert_eq!(
     }
 
     #[test]
     fn test_column_counts() {
         assert_eq!(
-            column_counts(
-                &read_rows(&b"foo\n bar\n baz\n"[..])
-                    .collect::<Result<Vec<_>, _>>()
-                    .unwrap()
-            ),
+            column_counts(&read_rows(&b"foo\n bar\n baz\n"[..]).unwrap()),
             vec![(1, String::from("bar")), (1, String::from("baz"))]
         );
         assert_eq!(
             vec![(1, String::from("bar")), (1, String::from("baz"))]
         );
         assert_eq!(
-            column_counts(
-                &read_rows(&b"foo\n bar\n baz\nquux\n baz"[..])
-                    .collect::<Result<Vec<_>, _>>()
-                    .unwrap()
-            ),
+            column_counts(&read_rows(&b"foo\n bar\n baz\nquux\n baz"[..]).unwrap()),
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
-            column_counts(
-                &read_rows(&b"foo\n bar\n bar\n baz\n bar\nquux\n baz"[..])
-                    .collect::<Result<Vec<_>, _>>()
-                    .unwrap()
-            ),
+            column_counts(&read_rows(&b"foo\n bar\n bar\n baz\n bar\nquux\n baz"[..]).unwrap()),
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
             column_counts(
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
             column_counts(
-                &read_rows(&b"foo\n bar: 1\n bar: 2\n baz\n bar\nquux\n baz"[..])
-                    .collect::<Result<Vec<_>, _>>()
-                    .unwrap()
+                &read_rows(&b"foo\n bar: 1\n bar: 2\n baz\n bar\nquux\n baz"[..]).unwrap()
             ),
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
     }
 
             ),
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
     }
 
+    #[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(
                 "foo",
     #[test]
     fn test_render_cell() {
         assert_eq!(
             render_cell(
                 "foo",
-                &Row {
+                &mut Row {
                     label: "nope".to_owned(),
                     entries: HashMap::new(),
                 }
             ),
                     label: "nope".to_owned(),
                     entries: HashMap::new(),
                 }
             ),
-            HTML::from("<td class=\"\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
+            HTML::from(
+                r#"<td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
+            )
         );
         assert_eq!(
             render_cell(
                 "foo",
         );
         assert_eq!(
             render_cell(
                 "foo",
-                &Row {
+                &mut Row {
                     label: "nope".to_owned(),
                     entries: HashMap::from([("bar".to_owned(), vec![None])]),
                 }
             ),
                     label: "nope".to_owned(),
                     entries: HashMap::from([("bar".to_owned(), vec![None])]),
                 }
             ),
-            HTML::from("<td class=\"\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
+            HTML::from(
+                r#"<td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
+            )
         );
         assert_eq!(
             render_cell(
                 "foo",
         );
         assert_eq!(
             render_cell(
                 "foo",
-                &Row {
+                &mut Row {
                     label: "nope".to_owned(),
                     entries: HashMap::from([("foo".to_owned(), vec![None])]),
                 }
             ),
                     label: "nope".to_owned(),
                     entries: HashMap::from([("foo".to_owned(), vec![None])]),
                 }
             ),
-            HTML::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
+            HTML::from(
+                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">𝍷</td>"#
+            )
         );
         assert_eq!(
             render_cell(
                 "foo",
         );
         assert_eq!(
             render_cell(
                 "foo",
-                &Row {
+                &mut Row {
                     label: "nope".to_owned(),
                     entries: HashMap::from([("foo".to_owned(), vec![None, None])]),
                 }
             ),
                     label: "nope".to_owned(),
                     entries: HashMap::from([("foo".to_owned(), vec![None, None])]),
                 }
             ),
-            HTML::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">2</td>")
+            HTML::from(
+                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">𝍷𝍷</td>"#
+            )
         );
         assert_eq!(
             render_cell(
                 "foo",
         );
         assert_eq!(
             render_cell(
                 "foo",
-                &Row {
+                &mut Row {
                     label: "nope".to_owned(),
                     label: "nope".to_owned(),
-                    entries: HashMap::from([("foo".to_owned(), vec![Some("5".to_owned()), Some("10".to_owned())])]),
+                    entries: HashMap::from([(
+                        "foo".to_owned(),
+                        vec![Some("5".to_owned()), Some("10".to_owned())]
+                    )]),
                 }
             ),
                 }
             ),
-            HTML::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">5 10</td>")
+            HTML::from(
+                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">5 10</td>"#
+            )
         );
         assert_eq!(
             render_cell(
                 "foo",
         );
         assert_eq!(
             render_cell(
                 "foo",
-                &Row {
+                &mut Row {
                     label: "nope".to_owned(),
                     entries: HashMap::from([("foo".to_owned(), vec![Some("5".to_owned()), None])]),
                 }
             ),
                     label: "nope".to_owned(),
                     entries: HashMap::from([("foo".to_owned(), vec![Some("5".to_owned()), None])]),
                 }
             ),
-            HTML::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">5 ✓</td>")
+            HTML::from(
+                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">5 𝍷</td>"#
+            )
+        );
+        assert_eq!(
+            render_cell(
+                "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(
                 "heart",
         );
         assert_eq!(
             render_cell(
                 "heart",
-                &Row {
+                &mut Row {
                     label: "nope".to_owned(),
                     entries: HashMap::from([("heart".to_owned(), vec![Some("<3".to_owned())])]),
                 }
             ),
                     label: "nope".to_owned(),
                     entries: HashMap::from([("heart".to_owned(), vec![Some("<3".to_owned())])]),
                 }
             ),
-            HTML::from("<td class=\"yes\" onmouseover=\"h2('nope','heart')\" onmouseout=\"ch2('nope','heart')\">&lt;3</td>")
+            HTML::from(
+                r#"<td class="yes" onmouseover="h2('nope','heart')" onmouseout="ch2('nope','heart')">&lt;3</td>"#
+            )
         );
         assert_eq!(
             render_cell(
                 "foo",
         );
         assert_eq!(
             render_cell(
                 "foo",
-                &Row {
+                &mut Row {
                     label: "bob's".to_owned(),
                     entries: HashMap::from([("foo".to_owned(), vec![None])]),
                 }
             ),
                     label: "bob's".to_owned(),
                     entries: HashMap::from([("foo".to_owned(), vec![None])]),
                 }
             ),
-            HTML::from("<td class=\"yes\" onmouseover=\"h2('bob&#39;s','foo')\" onmouseout=\"ch2('bob&#39;s','foo')\"></td>")
+            HTML::from(
+                r#"<td class="yes" onmouseover="h2('bob&#39;s','foo')" onmouseout="ch2('bob&#39;s','foo')">𝍷</td>"#
+            )
+        );
+        let mut r = Row {
+            label: "nope".to_owned(),
+            entries: HashMap::from([
+                ("foo".to_owned(), vec![None]),
+                ("baz".to_owned(), vec![None]),
+            ]),
+        };
+        assert_eq!(r.entries.len(), 2);
+        render_cell("foo", &mut r);
+        assert_eq!(r.entries.len(), 1);
+        render_cell("bar", &mut r);
+        assert_eq!(r.entries.len(), 1);
+        render_cell("baz", &mut r);
+        assert_eq!(r.entries.len(), 0);
+    }
+
+    #[test]
+    fn test_render_leftovers() {
+        assert_eq!(
+            render_all_leftovers(
+                &Config::default(),
+                &Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![None])]),
+                }
+            ),
+            HTML::from("foo")
+        );
+        assert_eq!(
+            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!(
+            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() {
+        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,
+                    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>
+"#
+            )
         );
     }
 }
         );
     }
 }
Summarize a text log as an HTML table