actions
/
mdBook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't include empty class attribute.

This commit is contained in:
Eric Huss 2023-05-28 11:32:31 -07:00
parent b141297651
commit 34e5ef22a0
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/renderer/html_handlebars/hbs_renderer.rs
View File

@ -832,10 +832,12 @@ fn insert_link_into_header(
id_counter: &mut HashMap<String, usize>, id_counter: &mut HashMap<String, usize>,
) -> String { ) -> String {
let id = id.unwrap_or_else(|| utils::unique_id_from_content(content, id_counter)); let id = id.unwrap_or_else(|| utils::unique_id_from_content(content, id_counter));
let classes = classes.unwrap_or("".to_string()); let classes = classes
.map(|s| format!(" class=\"{s}\""))
.unwrap_or_default();
format!( format!(
r##"<h{level} id="{id}" class="{classes}"><a class="header" href="#{id}">{text}</a></h{level}>"##, r##"<h{level} id="{id}"{classes}><a class="header" href="#{id}">{text}</a></h{level}>"##,
level = level, level = level,
id = id, id = id,
text = content, text = content,
@ -1014,28 +1016,39 @@ mod tests {
let inputs = vec![ let inputs = vec![
( (
"blah blah <h1>Foo</h1>", "blah blah <h1>Foo</h1>",
r##"blah blah <h1 id="foo" class=""><a class="header" href="#foo">Foo</a></h1>"##, r##"blah blah <h1 id="foo"><a class="header" href="#foo">Foo</a></h1>"##,
), ),
( (
"<h1>Foo</h1>", "<h1>Foo</h1>",
r##"<h1 id="foo" class=""><a class="header" href="#foo">Foo</a></h1>"##, r##"<h1 id="foo"><a class="header" href="#foo">Foo</a></h1>"##,
), ),
( (
"<h3>Foo^bar</h3>", "<h3>Foo^bar</h3>",
r##"<h3 id="foobar" class=""><a class="header" href="#foobar">Foo^bar</a></h3>"##, r##"<h3 id="foobar"><a class="header" href="#foobar">Foo^bar</a></h3>"##,
), ),
( (
"<h4></h4>", "<h4></h4>",
r##"<h4 id="" class=""><a class="header" href="#"></a></h4>"##, r##"<h4 id=""><a class="header" href="#"></a></h4>"##,
), ),
( (
"<h4><em>Hï</em></h4>", "<h4><em>Hï</em></h4>",
r##"<h4 id="hï" class=""><a class="header" href="#hï"><em>Hï</em></a></h4>"##, r##"<h4 id="hï"><a class="header" href="#hï"><em>Hï</em></a></h4>"##,
), ),
( (
"<h1>Foo</h1><h3>Foo</h3>", "<h1>Foo</h1><h3>Foo</h3>",
r##"<h1 id="foo" class=""><a class="header" href="#foo">Foo</a></h1><h3 id="foo-1" class=""><a class="header" href="#foo-1">Foo</a></h3>"##, r##"<h1 id="foo"><a class="header" href="#foo">Foo</a></h1><h3 id="foo-1"><a class="header" href="#foo-1">Foo</a></h3>"##,
), ),
// id only
(
r##"<h1 id="foobar">Foo</h1>"##,
r##"<h1 id="foobar"><a class="header" href="#foobar">Foo</a></h1>"##,
),
// class only
(
r##"<h1 class="class1 class2">Foo</h1>"##,
r##"<h1 id="foo" class="class1 class2"><a class="header" href="#foo">Foo</a></h1>"##,
),
// both id and class
( (
r##"<h1 id="foobar" class="class1 class2">Foo</h1>"##, r##"<h1 id="foobar" class="class1 class2">Foo</h1>"##,
r##"<h1 id="foobar" class="class1 class2"><a class="header" href="#foobar">Foo</a></h1>"##, r##"<h1 id="foobar" class="class1 class2"><a class="header" href="#foobar">Foo</a></h1>"##,

6
tests/rendered_output.rs
View File

@ -105,12 +105,12 @@ fn check_correct_cross_links_in_nested_dir() {
assert_contains_strings( assert_contains_strings(
first.join("index.html"), first.join("index.html"),
&[r##"<h2 id="some-section" class=""><a class="header" href="#some-section">"##], &[r##"<h2 id="some-section"><a class="header" href="#some-section">"##],
); );
assert_contains_strings( assert_contains_strings(
first.join("nested.html"), first.join("nested.html"),
&[r##"<h2 id="some-section" class=""><a class="header" href="#some-section">"##], &[r##"<h2 id="some-section"><a class="header" href="#some-section">"##],
); );
} }
@ -393,7 +393,7 @@ fn able_to_include_files_in_chapters() {
let includes = temp.path().join("book/first/includes.html"); let includes = temp.path().join("book/first/includes.html");
let summary_strings = &[ let summary_strings = &[
r##"<h1 id="summary" class=""><a class="header" href="#summary">Summary</a></h1>"##, r##"<h1 id="summary"><a class="header" href="#summary">Summary</a></h1>"##,
">First Chapter</a>", ">First Chapter</a>",
]; ];
assert_contains_strings(&includes, summary_strings); assert_contains_strings(&includes, summary_strings);