jer/mdbook-toc
1
Fork 0
Code Actions Activity

Bug fix: Enable the same markdown extensions as mdbook

Browse source
This commit is contained in:
Jan-Erik Rediger 2020-04-08 10:21:15 +02:00
parent f381d29663
commit ead6cac96d
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/lib.rs
View file

@ -3,7 +3,7 @@ use mdbook::errors::{Error, Result};
use mdbook::preprocess::{Preprocessor, PreprocessorContext}; use mdbook::preprocess::{Preprocessor, PreprocessorContext};
use pulldown_cmark::CowStr; use pulldown_cmark::CowStr;
use pulldown_cmark::Tag::*; use pulldown_cmark::Tag::*;
use pulldown_cmark::{Event, Parser}; use pulldown_cmark::{Event, Parser, Options};
use pulldown_cmark_to_cmark::fmt::cmark; use pulldown_cmark_to_cmark::fmt::cmark;
pub struct Toc; pub struct Toc;
@ -51,7 +51,13 @@ fn add_toc(content: &str) -> Result<String> {
let mut toc_content = vec![]; let mut toc_content = vec![];
let mut current_header_level: Option<u32> = None; let mut current_header_level: Option<u32> = None;
for e in Parser::new(&content) { let mut opts = Options::empty();
opts.insert(Options::ENABLE_TABLES);
opts.insert(Options::ENABLE_FOOTNOTES);
opts.insert(Options::ENABLE_STRIKETHROUGH);
opts.insert(Options::ENABLE_TASKLISTS);
for e in Parser::new_ext(&content, opts.clone()) {
if let Event::Html(html) = e { if let Event::Html(html) = e {
if &*html == "<!-- toc -->\n" { if &*html == "<!-- toc -->\n" {
toc_found = true; toc_found = true;
@ -89,7 +95,7 @@ fn add_toc(content: &str) -> Result<String> {
let toc_events = build_toc(&toc_content); let toc_events = build_toc(&toc_content);
let toc_events = Parser::new(&toc_events).collect::<Vec<_>>(); let toc_events = Parser::new(&toc_events).collect::<Vec<_>>();
let events = Parser::new(&content) let events = Parser::new_ext(&content, opts)
.map(|e| { .map(|e| {
if let Event::Html(html) = e.clone() { if let Event::Html(html) = e.clone() {
if &*html == "<!-- toc -->\n" { if &*html == "<!-- toc -->\n" {
@ -192,4 +198,26 @@ mod test {
assert_eq!(expected, add_toc(content).unwrap()); assert_eq!(expected, add_toc(content).unwrap());
} }
#[test]
fn leaves_tables_untouched() {
// Regression test.
// Previously we forgot to enable the same markdwon extensions as mdbook itself.
let content = r#"# Heading
| Head 1 | Head 2 |
|--------|--------|
| Row 1 | Row 2 |
"#;
// Markdown roundtripping removes some insignificant whitespace
let expected = r#"# Heading
|Head 1|Head 2|
|------|------|
|Row 1|Row 2|"#;
assert_eq!(expected, add_toc(content).unwrap());
}
} }