From b157271169fe8cd896b54a89d28fd3b7c8768826 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 8 Jul 2019 17:57:23 -0400 Subject: 0.7.5 xmls css code reorganised; ocn can turn off or hide --- src/doc_reform/output/epub3.d | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'src/doc_reform/output/epub3.d') diff --git a/src/doc_reform/output/epub3.d b/src/doc_reform/output/epub3.d index 09dea3d..e741a5e 100644 --- a/src/doc_reform/output/epub3.d +++ b/src/doc_reform/output/epub3.d @@ -464,10 +464,10 @@ template outputEPub3() { epubWrite.doc_epub3_endnotes[segment_filename] ~= t[1]; break; case "code": - epubWrite.doc_epub3[segment_filename] ~= xhtml_format.code(_txt, obj); + epubWrite.doc_epub3[segment_filename] ~= xhtml_format.code(_txt, obj, doc_matters); break; case "table": - epubWrite.doc_epub3[segment_filename] ~= xhtml_format.table(_txt, obj); + epubWrite.doc_epub3[segment_filename] ~= xhtml_format.table(_txt, obj, doc_matters); epubWrite.doc_epub3_endnotes[segment_filename] ~= ""; break; default: @@ -606,9 +606,9 @@ template outputEPub3() { epubWrite.oebps_content_opf = doc_abstraction.epub3_oebps_content(doc_matters, oepbs_content_parts); epubWrite.epub3_write_output_files(doc_matters); } - void epub3_write_output_files(W,I)( - W epub_write, - I doc_matters, + void epub3_write_output_files(W,M)( + W epub_write, + M doc_matters, ) { debug(asserts) { static assert(is(typeof(epub_write.doc_epub3) == string[][string])); @@ -774,22 +774,18 @@ template outputEPub3() { } } { /+ OEBPS/epub.css +/ - auto css = DocReformCss(); + auto css = DocReformCss(doc_matters); { /+ debug +/ if (doc_matters.opt.action.debug_do) { fn_dbg = pth_epub3.dbg_fn_oebps_css(doc_matters.src.filename); - (doc_matters.opt.action.css_theme_default) - ? File(fn_dbg, "w").writeln(css.light.epub) - : File(fn_dbg, "w").writeln(css.dark.epub); + File(fn_dbg, "w").writeln(css.epub); } } fn = pth_epub3.fn_oebps_css; auto zip_arc_member_file = new ArchiveMember(); zip_arc_member_file.name = fn; auto zip_data = new OutBuffer(); - (doc_matters.opt.action.css_theme_default) - ? zip_data.write(css.light.epub.dup) - : zip_data.write(css.dark.epub.dup); + zip_data.write(css.epub.dup); zip_arc_member_file.expandedData = zip_data.toBytes(); zip.addMember(zip_arc_member_file); createZipFile!()(fn_epub, zip.build()); -- cgit v1.2.3