diff options
Diffstat (limited to 'src/generate_html.rs')
| -rw-r--r-- | src/generate_html.rs | 443 |
1 files changed, 259 insertions, 184 deletions
diff --git a/src/generate_html.rs b/src/generate_html.rs index 55bd8ef..2b979ea 100644 --- a/src/generate_html.rs +++ b/src/generate_html.rs @@ -4,9 +4,16 @@ use markdown::*; use recipe::*; -pub fn generate_html(document: &MarkdownDocument, page: &Page, website: &Website) -> String { +pub fn generate_html(page: &Page, website: &Website) -> String { let root = page.root(); - let page_name = sanitize_text(&page.name, true); + let mut page_name = sanitize_text(&page.name, true); + for block in &page.document.blocks { + if let Block::Fragment { language, content } = block { + if language == "override-title" { + page_name = sanitize_text(content.trim(), true); + } + } + } let site_name = sanitize_text(&website.name, true); let mut parent_url = String::new(); for segment in &page.parents { @@ -20,8 +27,12 @@ pub fn generate_html(document: &MarkdownDocument, page: &Page, website: &Website Some(name) => format!("<a id='parent' href='../{}.html'>{name}</a>", make_url_safe(name)), None => String::new(), }; - let table_of_contents = get_table_of_contents(page); - let main = document_to_html(document, page, website); let main = main.trim(); + let toc = get_table_of_contents(page); + let toc_main = if page.headings.len() >= 3 { + format!("<details><summary></summary>\n{toc}</details>\n") + } else { String::new() }; + let toc_side = format!("<div>{toc}</div>\n"); + let main = document_to_html(page, website); let main = main.trim(); format!("\ <!DOCTYPE html> @@ -32,6 +43,11 @@ pub fn generate_html(document: &MarkdownDocument, page: &Page, website: &Website {head} </head> <body> +<nav id='outline' class='hidden'> +<h1></h1> +{toc_side} +</nav> +<div id='page'> <header> <nav id='up'> {home_link} @@ -39,42 +55,58 @@ pub fn generate_html(document: &MarkdownDocument, page: &Page, website: &Website </nav> <h1 id='title'>{page_name}</h1> <nav id='toc'> -{table_of_contents} +{toc_main} </nav> </header> <main> {main} </main> +</div> </body> </html>") } -pub fn generate_html_redirect(path: &str) -> String { +pub fn generate_html_redirect(path: &str, website: &Website) -> String { + let head = website.get_config("html.redirect.head"); let head = head.trim(); let path = sanitize_text(path, false); format!("\ <!DOCTYPE html> <head> -<title>Redirect</title> +<title>Redirecting...</title> <meta http-equiv='refresh' content='0; url={path}'> +{head} </head> -<html>") +</html>") } pub fn get_html_head(page: &Page, website: &Website) -> String { + let mut include_default_head = true; + let mut html_head = String::new(); + for block in &page.document.blocks { + if let markdown::Block::Fragment { language, content } = block { + if language == "override-html-head" { + html_head.push_str(content); + include_default_head = false; + } + if language == "embed-html-head" { + html_head.push_str(content); + } + } + } + if include_default_head { + html_head.insert_str(0, &website.get_config("html.head")); + } let root = page.root(); - website.get_config("html.head") + html_head .replace("href='/", &format!("href='{root}")) .replace("src='/", &format!("src='{root}")) } pub fn get_table_of_contents(page: &Page) -> String { - if page.headings.iter().filter(|h| h.level != Level::Heading3).count() < 3 { - return String::new(); - } - let mut toc = String::from("<details><summary></summary><ul>\n"); + let mut toc = String::from("<ul>\n"); let site_name = sanitize_text(&page.name, true); toc.push_str(&format!("<li class='l1'><a href='#title'>{site_name}</a></li>\n")); @@ -88,13 +120,14 @@ pub fn get_table_of_contents(page: &Page) -> String { }; toc.push_str(&format!("<li class='{class}'><a href='#{url}'>{name}</a></li>\n")); } - toc.push_str("</ul></details>\n"); + toc.push_str("</ul>\n"); return toc; } -pub fn document_to_html(document: &MarkdownDocument, page: &Page, website: &Website) -> String { - let from = &page.name; +pub fn document_to_html(page: &Page, website: &Website) -> String { + let from = &page; + let root = page.root(); let mut html = String::new(); macro_rules! line_to_html { @@ -108,176 +141,209 @@ pub fn document_to_html(document: &MarkdownDocument, page: &Page, website: &Webs ($t:expr,$c:expr,$f:expr) => {{ html!("<{} {}>", $t, $c); $f; html!("</{}>", $t); }}; ($t:expr,$f:expr) => {{ html!("<{}>", $t); $f; html!("</{}>", $t); }}; } - let root = page.root(); - for block in &document.blocks { - match block { - Block::Heading { level, line } => { - let id = make_url_safe(strip_appendix(&line_to_html!(line))); - match level { - Level::Heading1 => tag!("h1", line, format!("id='{id}'")), - Level::Heading2 => tag!("h2", line, format!("id='{id}'")), - Level::Heading3 => tag!("h3", line, format!("id='{id}'")), - } - } - Block::Paragraph(line) => tag!("p", line), - Block::Math(content) => html!("<div class='math'>{}</div>", sanitize_text(content, false)), - Block::List(lines) => wrap!("ul", for line in lines { - // Insert a <br> tag directly after the first untagged colon. - let mut depth = 0; - let mut prev = '\0'; - let mut output = String::new(); - let mut class = String::new(); - for c in line_to_html!(line).chars() { - output.push(c); - if c == '<' { - depth += 1; - } else if c == '/' && prev == '<' { - depth -= 2; // 2 because prev was a '<' as well. - } else if c == ':' && depth == 0 { - output.pop(); output.push_str("<br>"); - class.push_str("extended"); depth += 99; - } - prev = c; - } - // Replace a leading checkbox with a real checkbox. - if let Some(stripped) = output.strip_prefix("<code>[ ]</code>") { - output = format!("<input type='checkbox' disabled>{stripped}"); - class.push_str(" checkbox"); - } else if let Some(stripped) = output.strip_prefix("<code>[x]</code>") { - output = format!("<input type='checkbox' disabled checked>{stripped}"); - class.push_str(" checkbox"); - } else if let Some(stripped) = output.strip_prefix("<code>[X]</code>") { - output = format!("<input type='checkbox' disabled checked>{stripped}"); - class.push_str(" checkbox"); - }else if let Some(stripped) = output.strip_prefix("[ ]") { - output = format!("<input type='checkbox' disabled>{stripped}"); - class.push_str(" checkbox"); - } else if let Some(stripped) = output.strip_prefix("[x]") { - output = format!("<input type='checkbox' disabled checked>{stripped}"); - class.push_str(" checkbox"); - } else if let Some(stripped) = output.strip_prefix("[X]") { - output = format!("<input type='checkbox' disabled checked>{stripped}"); - class.push_str(" checkbox"); - } - let class = class.trim(); - match class.is_empty() { - true => html!("<li>{output}</li>"), - false => html!("<li class='{class}'>{output}</li>"), + wrap!("article", + for (i, block) in page.document.blocks.iter().enumerate() { + match block { + Block::Heading { level, line } => { + if let Level::Heading1 = level { + html!("</article>"); + html!("<article>"); + // html!("<nav class='return'><a href='#'></a></nav>"); + }; + // Find namespaced heading ID from headings list. + let url = match page.headings.iter().find(|h| h.block_id == i) { + Some(heading) => heading.url.clone(), + None => unreachable!("Couldn't find heading in headings list"), + }; + // let url = make_url_safe(strip_appendix(&line.to_string())); + let heading_tag = match level { + Level::Heading1 => "h1", + Level::Heading2 => "h2", + Level::Heading3 => "h3", + }; + wrap!(heading_tag, format!("id='{url}'"), { + tag!("a", line, format!("href='#{url}'")); + }); } - }), - Block::Note(lines) => wrap!("aside", for line in lines { tag!("p", line) }), - Block::Embed { label, path } => match path.rsplit_once('.') { - Some((_, extension)) => { - let mut path = path.to_string(); - if !path.contains("://") { - match website.has_static(page, &path) { - Some(resolved) => path = resolved, - None => warn!("Page {from:?} embeds nonexistent static file {path:?}"), + Block::Paragraph(line) => tag!("p", line), + Block::Math(content) => html!("<div class='math'>{}</div>", sanitize_text(content, false)), + Block::List(lines) => wrap!("ul", for line in lines { + // Insert a <br> tag directly after the first untagged colon. + let mut depth = 0; + let mut prev = '\0'; + let mut output = String::new(); + let mut class = String::new(); + for c in line_to_html!(line).chars() { + output.push(c); + if c == '<' { + depth += 1; + } else if c == '/' && prev == '<' { + depth -= 2; // 2 because prev was a '<' as well. + } else if c == ':' && depth == 0 { + output.pop(); output.push_str("<br>"); + class.push_str("extended"); depth += 99; } + prev = c; } - let label = sanitize_text(label, true); - match extension.to_lowercase().as_str() { - "jpg"|"jpeg"|"png"|"webp"|"gif"|"tiff" => html!( - "<figure><a href='{path}'><img src='{path}' alt='{label}' title='{label}' /></a></figure>"), - "mp3"|"wav"|"m4a" => html!("<audio controls src='{path}'>{label}</audio>"), - "mp4"|"avi" => html!("<video controls src='{path}'>{label}</video>"), - ext @ _ => warn!("Unrecognised extension for embedded file {path:?} with extension {ext:?} in page {from:?}"), + // Replace a leading checkbox with a real checkbox. + if let Some(stripped) = output.strip_prefix("<code>[ ]</code>") { + output = format!("<input type='checkbox' disabled>{stripped}"); + class.push_str(" checkbox"); + } else if let Some(stripped) = output.strip_prefix("<code>[x]</code>") { + output = format!("<input type='checkbox' disabled checked>{stripped}"); + class.push_str(" checkbox"); + } else if let Some(stripped) = output.strip_prefix("<code>[X]</code>") { + output = format!("<input type='checkbox' disabled checked>{stripped}"); + class.push_str(" checkbox"); + }else if let Some(stripped) = output.strip_prefix("[ ]") { + output = format!("<input type='checkbox' disabled>{stripped}"); + class.push_str(" checkbox"); + } else if let Some(stripped) = output.strip_prefix("[x]") { + output = format!("<input type='checkbox' disabled checked>{stripped}"); + class.push_str(" checkbox"); + } else if let Some(stripped) = output.strip_prefix("[X]") { + output = format!("<input type='checkbox' disabled checked>{stripped}"); + class.push_str(" checkbox"); } - } - _ => warn!("Cannot embed file {path:?} with no file extension in page {from:?}"), - } - Block::Fragment { language, content } => { - match language.as_str() { - "math" => html!("<div class='math'>{}</div>", content.replace("\n", " \\\\\n")), - "embed-html" => html!("{content}"), - "embed-css" => wrap!("style", html!("{content}")), - "embed-javascript"|"embed-js" => wrap!("script", html!("{content}")), - "hidden"|"todo"|"embed-html-head" => (), - "poem" => wrap!("div", "class='poem'", for line in content.lines() { - let line = line.trim_end(); - match line.is_empty() { - true => html!("<br>"), - false => html!("<p>{}</p>", sanitize_text(line, true)), + let class = class.trim(); + match class.is_empty() { + true => html!("<li>{output}</li>"), + false => html!("<li class='{class}'>{output}</li>"), + } + }), + Block::Note(lines) => wrap!("aside", for line in lines { tag!("p", line) }), + Block::Embed { label, path } => match path.rsplit_once('.') { + Some((_, extension)) => { + let mut path = path.to_string(); + if !path.contains("://") { + match website.has_static(page, &path) { + Some(resolved) => path = resolved, + None => warn!("Page {from:?} embeds nonexistent static file {path:?}"), + } } - }), - "recipe" => { - let recipe = Recipe::parse(content); - html!("<div class='recipe'><ul>"); - for ingredient in recipe.ingredients { html!("<li>{ingredient}</li>") } - html!("</ul><hr>"); - for paragraph in recipe.process { html!("<p>{paragraph}</p>") } - html!("</div>"); - }, - "gallery" => wrap!("div", "class='gallery'", for line in content.lines() { - let file = line.trim(); - if !website.has_image(file) { - warn!("Gallery on page {from:?} references nonexistent image {file:?}"); - continue; + let label = sanitize_text(label, true); + let path = sanitize_text(&path, false); + match extension.to_lowercase().as_str() { + "jpg"|"jpeg"|"png"|"webp"|"gif"|"tiff" => html!( + "<figure><a href='{path}'><img src='{path}' alt='{label}' title='{label}' /></a></figure>"), + "mp3"|"wav"|"m4a" => html!("<audio controls src='{path}'>{label}</audio>"), + "mp4"|"avi" => html!("<figure><video controls src='{path}'>{label}</video></figure>"), + ext @ _ => warn!("Unrecognised extension for embedded file {path:?} with extension {ext:?} in page {from:?}"), } - let large = format!("{root}images/large/{file}"); - // let small = format!("{root}images/small/{file}"); - let thumb = format!("{root}images/thumb/{file}"); - html!("<a href='{large}'><img src='{thumb}' /></a>"); - }), - "gallery-nav" => wrap!("div", "class='gallery-nav'", for line in content.lines() { - let line = line.trim(); - if let Some((name, image)) = line.split_once("::") { - let name = name.trim(); - let image = image.trim(); - let ParsedLink { path, class, label } = parse_internal_link(name, page, website); - if website.has_image(image) { - let thumb = format!("{root}images/thumb/{image}"); - html!("<a href='{path}' class='{class}'><img src='{thumb}'/><p>{label}</p></a>") + } + _ => warn!("Cannot embed file {path:?} with no file extension in page {from:?}"), + } + Block::Fragment { language, content } => { + match language.as_str() { + "math" => html!("<div class='math'>{}</div>", content.replace("\n", " \\\\\n")), + "embed-html" => html!("{content}"), + "embed-css" => wrap!("style", html!("{content}")), + "embed-javascript"|"embed-js" => wrap!("script", html!("{content}")), + "embed-html-head"|"override-html-head"|"override-title" => (), + "hidden"|"todo" => (), + "poem" => wrap!("div", "class='poem'", for line in content.lines() { + let line = line.trim_end(); + match line.is_empty() { + true => html!("<br>"), + false => html!("<p>{}</p>", sanitize_text(line, true)), + } + }), + "recipe" => { + let recipe = Recipe::parse(content); + html!("<div class='recipe'><ul>"); + for ingredient in recipe.ingredients { html!("<li>{ingredient}</li>") } + html!("</ul><hr>"); + for paragraph in recipe.process { html!("<p>{paragraph}</p>") } + html!("</div>"); + }, + "gallery" => wrap!("div", "class='gallery'", for line in content.lines() { + let file_name = line.trim(); + if let Some(image_paths) = website.has_image(file_name, &root) { + let large = sanitize_text(&image_paths.large, false); + let thumb = sanitize_text(&image_paths.thumb, false); + html!("<a href='{large}'><img src='{thumb}' /></a>"); } else { - warn!("Gallery-nav on page {from:?} references nonexistent image {image:?}"); + warn!("Gallery on page {from:?} references nonexistent image {file_name:?}"); } - } else { - warn!("Gallery-nav on page {from:?} has line without a '::' separator"); - } - }), - _ => wrap!("pre", format!("class='{language}'"), html!("{}", sanitize_text(content, false))), + }), + "gallery-nav" => wrap!("div", "class='gallery-nav'", for line in content.lines() { + let line = line.trim(); + if let Some((name, file_name)) = line.split_once("::") { + let name = name.trim(); + let file_name = file_name.trim(); + let ParsedLink { path, class, label } = parse_internal_link(name, page, website); + if let Some(image_paths) = website.has_image(file_name, &root) { + let thumb = sanitize_text(&image_paths.thumb, false); + html!("<a href='{path}' class='{class}'><img src='{thumb}'/><p>{label}</p></a>") + } else { + warn!("Gallery on page {from:?} references nonexistent image {file_name:?}"); + warn!("Gallery-nav on page {from:?} references nonexistent image {file_name:?}"); + } + } else { + warn!("Gallery-nav on page {from:?} has line without a '::' separator"); + } + }), + _ => wrap!("pre", format!("class='{language}'"), { + if let Some(i) = website.highlighters.languages.get(language) { + let mut source = String::new(); + let highlighter = &website.highlighters.highlighters[*i]; + for span in highlighter.highlight(content) { + if span.tag.is_empty() { + source.push_str(&sanitize_text(&span.text, false)); + } else { + source.push_str(&format!("<span class='{}'>", span.tag.to_lowercase())); + source.push_str(&sanitize_text(&span.text, false)); + source.push_str("</span>"); + } + } + html!("{source}"); + } else { + html!("{}", sanitize_text(content, false)) + } + }) + } } - } - Block::Break => html!("<hr>"), - Block::Table(table) => wrap!("div", "class='table'", wrap!("table", { - wrap!("thead", - wrap!("tr", for column in &table.columns { - match column.border_right { - true => tag!("th", column.name, "class='border'"), - false => tag!("th", column.name), - } - }) - ); - for section in &table.sections { - wrap!("tbody", for row in section { - wrap!("tr", for (column, cell) in std::iter::zip(&table.columns, row) { - let text_raw = line_to_html!(cell); - let text = match text_raw.as_str() { - "Yes" => "✓", - "No" => "✗", - other => other, - }; - let mut class = match text { - "--" => "c", - _ => match column.alignment { - Alignment::Left => "l", - Alignment::Center => "c", - Alignment::Right => "r", - }, - }.to_string(); - if ["No", "--", "0"].contains(&text_raw.as_str()) { - class.push_str(" dim"); - }; - if column.border_right { - class.push_str(" border"); + Block::Break => html!("<hr>"), + Block::Table(table) => wrap!("div", "class='table'", wrap!("table", { + wrap!("thead", + wrap!("tr", for column in &table.columns { + match column.border_right { + true => tag!("th", column.name, "class='border'"), + false => tag!("th", column.name), } - html!("<td class='{class}'>{text}</td>"); }) - }) - }; - })) + ); + for section in &table.sections { + wrap!("tbody", for row in section { + wrap!("tr", for (column, cell) in std::iter::zip(&table.columns, row) { + let text_raw = line_to_html!(cell); + let text = match text_raw.as_str() { + "Yes" => "✓", + "No" => "✗", + other => other, + }; + let mut class = match text { + "--" => "c", + _ => match column.alignment { + Alignment::Left => "l", + Alignment::Center => "c", + Alignment::Right => "r", + }, + }.to_string(); + if ["No", "--", "0"].contains(&text_raw.as_str()) { + class.push_str(" dim"); + }; + if column.border_right { + class.push_str(" border"); + } + html!("<td class='{class}'>{text}</td>"); + }) + }) + }; + })) + } } - } + ); return html; } @@ -322,7 +388,7 @@ struct ParsedLink { } fn parse_internal_link(name: &str, page: &Page, website: &Website) -> ParsedLink { - let from = &page.name; + let from = &page; let (class, label, path) = match name.split_once('#') { Some(("", heading)) => ("heading", heading, format!("#{}", strip_appendix(heading))), Some((page, heading)) => ("page", heading, format!("{page}.html#{}", strip_appendix(heading))), @@ -352,7 +418,7 @@ fn parse_internal_link(name: &str, page: &Page, website: &Website) -> ParsedLink } fn parse_external_link(label: &str, path: &str, page: &Page, website: &Website) -> ParsedLink { - let from = &page.name; + let from = &page; let mut path = path.to_owned(); let mut label = label.to_string(); let mut is_internal = true; @@ -406,17 +472,26 @@ fn sanitize_text(text: &str, fancy: bool) -> String { }, '<' => output.push_str("<"), '>' => output.push_str(">"), - '"' if fancy => match prev.is_whitespace() { - true => output.push('“'), - false => output.push('”'), + '"' => match fancy { + true => match prev.is_whitespace() { + true => output.push('“'), + false => output.push('”'), + } + false => output.push_str("""), }, - '\'' if fancy => match prev.is_whitespace() { - true => output.push('‘'), - false => output.push('’'), + '\'' => match fancy { + true => match prev.is_whitespace() { + true => output.push('‘'), + false => output.push('’'), + } + false => output.push_str("'"), }, '-' if fancy => match prev.is_whitespace() && next.is_whitespace() { - true => output.push('—'), - false => output.push('-'), + true => match i > 0 { + true => output.push('—'), // em-dash, for mid-sentence + false => output.push('–'), // en-dash, for start of line + } + false => output.push('-'), // regular dash, for mid-word } _ => output.push(*c), } |