jer/mdbook-toc
1
Fork 0
Code Actions Activity

auto format

Browse source
This commit is contained in:
Jan-Erik Rediger 2019-07-16 12:18:33 +02:00
parent 01f997792e
commit 3979de2d32
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/bin/mdbook-toc.rs
View file

@ -18,7 +18,8 @@ pub fn make_app() -> App<'static, 'static> {
.subcommand( .subcommand(
SubCommand::with_name("supports") SubCommand::with_name("supports")
.arg(Arg::with_name("renderer").required(true)) .arg(Arg::with_name("renderer").required(true))
.about("Check whether a renderer is supported by this preprocessor")) .about("Check whether a renderer is supported by this preprocessor"),
)
} }
fn main() { fn main() {

19
src/lib.rs
View file

@ -2,13 +2,13 @@ extern crate mdbook;
extern crate pulldown_cmark; extern crate pulldown_cmark;
extern crate pulldown_cmark_to_cmark; extern crate pulldown_cmark_to_cmark;
use mdbook::errors::{Error, Result};
use mdbook::book::{Book, BookItem, Chapter}; use mdbook::book::{Book, BookItem, Chapter};
use mdbook::errors::{Error, Result};
use mdbook::preprocess::{Preprocessor, PreprocessorContext}; use mdbook::preprocess::{Preprocessor, PreprocessorContext};
use pulldown_cmark::{Event, Parser};
use pulldown_cmark::Tag::*;
use pulldown_cmark_to_cmark::fmt::cmark;
use pulldown_cmark::CowStr; use pulldown_cmark::CowStr;
use pulldown_cmark::Tag::*;
use pulldown_cmark::{Event, Parser};
use pulldown_cmark_to_cmark::fmt::cmark;
pub struct Toc; pub struct Toc;
@ -39,7 +39,7 @@ fn build_toc<'a>(toc: &[(i32, CowStr<'a>)]) -> String {
let mut result = String::new(); let mut result = String::new();
for (level, name) in toc { for (level, name) in toc {
let width = 2*(level-1) as usize; let width = 2 * (level - 1) as usize;
let slug = mdbook::utils::normalize_id(&name); let slug = mdbook::utils::normalize_id(&name);
let entry = format!("{1:0$}* [{2}](#{3})\n", width, "", name, slug); let entry = format!("{1:0$}* [{2}](#{3})\n", width, "", name, slug);
result.push_str(&entry); result.push_str(&entry);
@ -53,7 +53,7 @@ fn add_toc(content: &str) -> Result<String> {
let mut toc_found = false; let mut toc_found = false;
let mut toc_content = vec![]; let mut toc_content = vec![];
let mut current_header_level : Option<i32> = None; let mut current_header_level: Option<i32> = None;
for e in Parser::new(&content) { for e in Parser::new(&content) {
if let Event::Html(html) = e { if let Event::Html(html) = e {
@ -88,21 +88,22 @@ 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).map(|e| { let events = Parser::new(&content)
.map(|e| {
if let Event::Html(html) = e.clone() { if let Event::Html(html) = e.clone() {
if &*html == "<!-- toc -->\n" { if &*html == "<!-- toc -->\n" {
return toc_events.clone(); return toc_events.clone();
} }
} }
vec![e] vec![e]
}).flat_map(|e| e); })
.flat_map(|e| e);
cmark(events, &mut buf, None) cmark(events, &mut buf, None)
.map(|_| buf) .map(|_| buf)
.map_err(|err| Error::from(format!("Markdown serialization failed: {}", err))) .map_err(|err| Error::from(format!("Markdown serialization failed: {}", err)))
} }
impl Toc { impl Toc {
fn add_toc(chapter: &mut Chapter) -> Result<String> { fn add_toc(chapter: &mut Chapter) -> Result<String> {
add_toc(&chapter.content) add_toc(&chapter.content)