jer/mdbook-toc
1
Fork 0
Code Actions Activity

Fix regression: newlines around code blocks were fixed upstream

Browse source
This commit is contained in:
Jan-Erik Rediger 2020-05-18 11:40:52 +02:00
parent 0444a7bbb1
commit 71a9f56685
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Cargo.lock generated
View file

@ -681,7 +681,7 @@ dependencies = [
"mdbook 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "mdbook 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"pulldown-cmark 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "pulldown-cmark 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pulldown-cmark-to-cmark 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "pulldown-cmark-to-cmark 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1029,7 +1029,7 @@ dependencies = [
[[package]] [[package]]
name = "pulldown-cmark-to-cmark" name = "pulldown-cmark-to-cmark"
version = "4.0.0" version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"pulldown-cmark 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "pulldown-cmark 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1833,7 +1833,7 @@ dependencies = [
"checksum proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3" "checksum proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3"
"checksum pulldown-cmark 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1c205cc82214f3594e2d50686730314f817c67ffa80fe800cf0db78c3c2b9d9e" "checksum pulldown-cmark 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1c205cc82214f3594e2d50686730314f817c67ffa80fe800cf0db78c3c2b9d9e"
"checksum pulldown-cmark 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2c2d7fd131800e0d63df52aff46201acaab70b431a4a1ec6f0343fe8e64f35a4" "checksum pulldown-cmark 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2c2d7fd131800e0d63df52aff46201acaab70b431a4a1ec6f0343fe8e64f35a4"
"checksum pulldown-cmark-to-cmark 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9f80851bae4714721298e6d05a0e1454055985ce5d82c4d01bf6905f8c5a382a" "checksum pulldown-cmark-to-cmark 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3b4d8d4a8ba6196543f202112fc5d77d36bf082bae5823c9707cf48f20bc436f"
"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" "checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
"checksum quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" "checksum quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"

2
Cargo.toml
View file

@ -11,7 +11,7 @@ edition = "2018"
[dependencies] [dependencies]
mdbook = "0.3" mdbook = "0.3"
pulldown-cmark = "0.7.0" pulldown-cmark = "0.7.0"
pulldown-cmark-to-cmark = "4.0.0" pulldown-cmark-to-cmark = "4.0.1"
env_logger = "0.7.1" env_logger = "0.7.1"
log = "0.4" log = "0.4"
clap = "2.33" clap = "2.33"

6
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::Tag::*; use pulldown_cmark::Tag::*;
use pulldown_cmark::{Event, Parser, Options}; use pulldown_cmark::{Event, Parser, Options};
use pulldown_cmark_to_cmark::cmark; use pulldown_cmark_to_cmark::{cmark_with_options, Options as COptions};
pub struct Toc; pub struct Toc;
@ -115,7 +115,9 @@ fn add_toc(content: &str) -> Result<String> {
}) })
.flat_map(|e| e); .flat_map(|e| e);
cmark(events, &mut buf, None) let mut opts = COptions::default();
opts.newlines_after_codeblock = 1;
cmark_with_options(events, &mut buf, None, opts)
.map(|_| buf) .map(|_| buf)
.map_err(|err| Error::from(format!("Markdown serialization failed: {}", err))) .map_err(|err| Error::from(format!("Markdown serialization failed: {}", err)))
} }