From 50df287852367d3e50779155c6e92b6e2a388c9d Mon Sep 17 00:00:00 2001 From: Ben Bridle Date: Fri, 12 Dec 2025 19:59:27 +1300 Subject: Allow pages to contain duplicate headings under different h1 headings This kind of works, but the whole system will have to be rewritten from the ground up so that every heading knows its own canonical name. --- src/generate_html.rs | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'src/generate_html.rs') diff --git a/src/generate_html.rs b/src/generate_html.rs index 33158a5..306892b 100644 --- a/src/generate_html.rs +++ b/src/generate_html.rs @@ -28,12 +28,10 @@ pub fn generate_html(page: &Page, website: &Website) -> String { None => String::new(), }; let toc = get_table_of_contents(page); - let toc_main = if page.headings.len() > 3 { + let toc_main = if page.headings.len() >= 3 { format!("

\n{toc}

\n") } else { String::new() }; - let toc_side = if page.headings.len() > 3 { - format!("

{toc}

\n") - } else { String::new() }; + let toc_side = format!("

{toc}

\n"); let main = document_to_html(page, website); let main = main.trim(); format!("\ @@ -45,7 +43,8 @@ pub fn generate_html(page: &Page, website: &Website) -> String { {head} -

@@ -107,9 +106,6 @@ pub fn get_html_head(page: &Page, website: &Website) -> String { pub fn get_table_of_contents(page: &Page) -> String { - if page.headings.len() < 3 { - return String::new(); - } let mut toc = String::from("

{site_name}

"); + // html!(""); + }; + // 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 id = make_url_safe(strip_appendix(&line.to_string())); + // 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='{id}'"), { - tag!("a", line, format!("href='#{id}'")); + wrap!(heading_tag, format!("id='{url}'"), { + tag!("a", line, format!("href='#{url}'")); }); } Block::Paragraph(line) => tag!("p", line), -- cgit v1.2.3-70-g09d2