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

Final cleanup of render content

This commit is contained in:
Sytse Reitsma 2019-04-25 20:25:18 +02:00
parent 21b5d322c8
commit 47531f7576
1 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,12 +41,11 @@ impl HtmlHandlebars {
.to_str() .to_str()
.chain_err(|| "Could not convert path to str")?; .chain_err(|| "Could not convert path to str")?;
self.render_print_content( print_content.push_str(&self.render_print_content(
print_content,
&ch.content, &ch.content,
&ch.path, &ch.path,
ctx.html_config.curly_quotes, &ctx.html_config,
); ));
let content = ch.content.clone(); let content = ch.content.clone();
let content = utils::render_markdown(&content, ctx.html_config.curly_quotes); let content = utils::render_markdown(&content, ctx.html_config.curly_quotes);
@ -88,16 +87,16 @@ impl HtmlHandlebars {
fn render_print_content( fn render_print_content(
&self, &self,
print_content: &mut String,
content: &String, content: &String,
path: &PathBuf, path: &PathBuf,
curly_quotes: bool, config: &HtmlConfig,
) { ) -> String {
let string_path = path.parent().unwrap().display().to_string(); let string_path = path.parent().unwrap().display().to_string();
let fixed_content = utils::render_markdown_with_base(content, curly_quotes, &string_path); let fixed_content =
utils::render_markdown_with_base(content, config.curly_quotes, &string_path);
print_content.push_str(&fixed_content); fixed_content
} }
fn get_title( fn get_title(
@ -781,12 +780,33 @@ mod tests {
#[test] #[test]
fn test_render_print_content() { fn test_render_print_content() {
let mut print_content = String::from("");
let path = PathBuf::from("foobar.md"); let path = PathBuf::from("foobar.md");
let content = String::from("# Awesome"); let content = String::from("# Awesome 'quotes'");
let html_config = HtmlConfig {
curly_quotes: false,
..Default::default()
};
let html_handlebars = HtmlHandlebars::new(); let html_handlebars = HtmlHandlebars::new();
html_handlebars.render_print_content(&mut print_content, &content, &path, true); assert_eq!(
assert_eq!("<h1>Awesome</h1>\n", print_content); "<h1>Awesome 'quotes'</h1>\n",
html_handlebars.render_print_content(&content, &path, &html_config)
);
}
#[test]
fn test_render_print_content_with_curly_quotes() {
let path = PathBuf::from("foobar.md");
let content = String::from("# Some curly 'quotes'?");
let html_config = HtmlConfig {
curly_quotes: true,
..Default::default()
};
let html_handlebars = HtmlHandlebars::new();
assert_eq!(
"<h1>Some curly ‘quotes’?</h1>\n",
html_handlebars.render_print_content(&content, &path, &html_config)
);
} }
} }