diff --git a/src/lib/book.rs b/src/lib/book.rs index 350c027..a731d46 100644 --- a/src/lib/book.rs +++ b/src/lib/book.rs @@ -897,8 +897,8 @@ impl Book { "html.css" => html::CSS, "html.css.colours" => html::CSS_COLOURS, "html.css.print" => html::PRINT_CSS, - "html_single.html" => html_single::HTML, - "html_single.js" => html_single::JS, + "html.standalone.html" => html_single::HTML, + "html.standalone.js" => html_single::JS, "html.js" => html::JS, "html_dir.index.html" => html_dir::INDEX_HTML, "html_dir.chapter.html" => html_dir::CHAPTER_HTML, diff --git a/src/lib/bookoptions.rs b/src/lib/bookoptions.rs index 4bcb6fa..dd0274b 100644 --- a/src/lib/bookoptions.rs +++ b/src/lib/bookoptions.rs @@ -63,9 +63,9 @@ html.side_notes:bool:false # {side_notes} html.escape_nb_spaces:bool:true # {nb_spaces} # {html_single_opt} -html_single.one_chapter:bool:false # {one_chapter} -html_single.html:tpl # {single_html} -html_single.js:tpl # {single_js} +html.standalone.one_chapter:bool:false # {one_chapter} +html.standalone.html:tpl # {single_html} +html.standalone.js:tpl # {single_js} # {html_dir_opt} @@ -157,6 +157,9 @@ epub.template:alias:epub.chapter.xhtml # {renamed} html_dir.css:alias:html.css # {renamed} rendering.chapter_template:alias:rendering.chapter.template # {renamed} import_config:alias:import # {renamed} +html_single.one_chapter:alias:html.standalone.one_chapter #{renamed} +html_single.html:alias:html.standalone.html # {renamed} +html_single.js:alias:html.standalone.js # {renamed} nb_char:alias # {removed} tex.short:alias # {removed} html.crowbook_link:alias # {removed} diff --git a/src/lib/html_single.rs b/src/lib/html_single.rs index 1fe981d..4a75e59 100644 --- a/src/lib/html_single.rs +++ b/src/lib/html_single.rs @@ -81,7 +81,7 @@ impl<'a> HtmlSingleRenderer<'a> { let mut titles = vec![]; let mut chapters = vec![]; let render_notes_chapter = - self.html.book.options.get_bool("html_single.one_chapter").unwrap(); + self.html.book.options.get_bool("html.standalone.one_chapter").unwrap(); for (i, chapter) in self.html.book.chapters.iter().enumerate() { self.html.handler.add_link(chapter.filename.as_ref(), @@ -127,7 +127,7 @@ impl<'a> HtmlSingleRenderer<'a> { self.html.source = Source::empty(); for (i, chapter) in chapters.iter().enumerate() { - if self.html.book.options.get_bool("html_single.one_chapter").unwrap() && i != 0 { + if self.html.book.options.get_bool("html.standalone.one_chapter").unwrap() && i != 0 { content.push_str(&format!("

HtmlSingleRenderer<'a> { titles[i - 1])); } content.push_str(chapter); - if self.html.book.options.get_bool("html_single.one_chapter").unwrap() && + if self.html.book.options.get_bool("html.standalone.one_chapter").unwrap() && i < titles.len() - 1 { content.push_str(&format!("

@@ -196,14 +196,14 @@ impl<'a> HtmlSingleRenderer<'a> { // Render the JS let template_js = - compile_str(self.html.book.get_template("html_single.js")?.as_ref(), + compile_str(self.html.book.get_template("html.standalone.js")?.as_ref(), &self.html.book.source, - lformat!("could not compile template 'html_single.js'"))?; + lformat!("could not compile template 'html.standalone.js'"))?; let data = self.html.book.get_metadata(|s| Ok(s.to_owned()))? .insert_str("book_svg", &book_svg) .insert_str("pages_svg", &pages_svg) .insert_bool("one_chapter", - self.html.book.options.get_bool("html_single.one_chapter").unwrap()) + self.html.book.options.get_bool("html.standalone.one_chapter").unwrap()) .insert_str("common_script", self.html.book.get_template("html.js").unwrap().as_ref()) .build(); @@ -219,7 +219,7 @@ impl<'a> HtmlSingleRenderer<'a> { .insert_str("script", js) .insert_bool(self.html.book.options.get_str("lang").unwrap(), true) .insert_bool("one_chapter", - self.html.book.options.get_bool("html_single.one_chapter").unwrap()) + self.html.book.options.get_bool("html.standalone.one_chapter").unwrap()) .insert_str("style", css.as_ref()) .insert_str("print_style", self.html.book.get_template("html.css.print").unwrap()) @@ -247,10 +247,10 @@ impl<'a> HtmlSingleRenderer<'a> { .insert_str("highlight_js", highlight_js); } let data = mapbuilder.build(); - let template = compile_str(self.html.book.get_template("html_single.html")? + let template = compile_str(self.html.book.get_template("html.standalone.html")? .as_ref(), &self.html.book.source, - lformat!("could not compile template 'html_single.html'"))?; + lformat!("could not compile template 'html.standalone.html'"))?; let mut res = vec![]; template.render_data(&mut res, &data)?; Ok(String::from_utf8_lossy(&res).into_owned())