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

Fix anchors, Fixes #211

This commit is contained in:
Mathieu David 2017-02-24 11:51:00 +01:00
parent 5e3a3f3482
commit 1345c05b18
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,14 +95,15 @@ impl Renderer for HtmlHandlebars {
debug!("[*]: Render template"); debug!("[*]: Render template");
let rendered = try!(handlebars.render("index", &data)); let rendered = try!(handlebars.render("index", &data));
let filename = Path::new(&ch.path).with_extension("html");
// create links for headers // create links for headers
let rendered = build_header_links(rendered); let rendered = build_header_links(rendered, filename.to_str().unwrap_or(""));
// fix code blocks // fix code blocks
let rendered = fix_code_blocks(rendered); let rendered = fix_code_blocks(rendered);
// Write to file // Write to file
let filename = Path::new(&ch.path).with_extension("html");
info!("[*] Creating {:?} ✓", filename.display()); info!("[*] Creating {:?} ✓", filename.display());
try!(book.write_file(filename, &rendered.into_bytes())); try!(book.write_file(filename, &rendered.into_bytes()));
@ -144,7 +145,7 @@ impl Renderer for HtmlHandlebars {
debug!("[*]: Render template"); debug!("[*]: Render template");
let rendered = try!(handlebars.render("index", &data)); let rendered = try!(handlebars.render("index", &data));
let rendered = build_header_links(rendered); let rendered = build_header_links(rendered, "print.html");
// fix code blocks // fix code blocks
let rendered = fix_code_blocks(rendered); let rendered = fix_code_blocks(rendered);
@ -224,7 +225,7 @@ fn make_data(book: &MDBook) -> Result<serde_json::Map<String, serde_json::Value>
Ok(data) Ok(data)
} }
fn build_header_links(html: String) -> String { fn build_header_links(html: String, filename: &str) -> String {
let regex = Regex::new(r"<h(\d)>(.*?)</h\d>").unwrap(); let regex = Regex::new(r"<h(\d)>(.*?)</h\d>").unwrap();
regex.replace_all(&html, |caps: &Captures| { regex.replace_all(&html, |caps: &Captures| {
@ -251,7 +252,8 @@ fn build_header_links(html: String) -> String {
} }
}).collect::<String>(); }).collect::<String>();
format!("<a class=\"header\" href=\"#{id}\" name=\"{id}\"><h{level}>{text}</h{level}></a>", level=level, id=id, text=text) format!("<a class=\"header\" href=\"{filename}#{id}\" name=\"{id}\"><h{level}>{text}</h{level}></a>",
level=level, id=id, text=text, filename=filename)
}).into_owned() }).into_owned()
} }