From d6569741844800684461d641fd28b5aa6fce2a8c Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 26 Jan 2017 13:51:37 -0500 Subject: output, template & struct names --- org/output.org | 58 ++++++++++++++++++++++++------------------------ src/sdp/output_epub.d | 10 ++++----- src/sdp/output_html.d | 12 +++++----- src/sdp/output_hub.d | 30 ++++++++++++------------- src/sdp/output_xhtmls.d | 4 ++-- src/sdp/source_sisupod.d | 2 +- 6 files changed, 58 insertions(+), 58 deletions(-) diff --git a/org/output.org b/org/output.org index 259d4dd..e0cf35b 100644 --- a/org/output.org +++ b/org/output.org @@ -25,24 +25,24 @@ template outputHub() { void outputHub(C,D)(C contents, D doc_matters) { auto rgx = Rgx(); if (doc_matters.opt_action_bool["source"]) { - /+ mixin SiSUoutputSource; +/ + /+ mixin outputSource; +/ writeln("source"); } if (doc_matters.opt_action_bool["sisupod"]) { mixin SiSUpod; - auto sisupod=SDPsisupod(); + auto sisupod=SiSUpod(); sisupod.sisupod_assemble(doc_matters.source_filename); writeln("sisupod source"); } if (doc_matters.opt_action_bool["text"]) { - /+ mixin SiSUoutputText; +/ + /+ mixin outputText; +/ writeln("text processing"); // auto text=SDPoutput_text(); // text.scroll(contents, bookindex_unordered_hashes, biblio, dochead_make, dochead_meta, fn_src, opt_action_bool); } if (doc_matters.opt_action_bool["html"]) { - mixin SiSUoutputHTML; - auto html=SDPoutputHTML(); + mixin outputHTML; + auto html=outputHTML(); html.css_write; html.scroll( contents, @@ -53,16 +53,16 @@ template outputHub() { doc_matters, ); } else if(doc_matters.opt_action_bool["html_seg"]) { - mixin SiSUoutputHTML; - auto html=SDPoutputHTML(); + mixin outputHTML; + auto html=outputHTML(); html.css_write; html.seg( contents, doc_matters, ); } else if(doc_matters.opt_action_bool["html_scroll"]) { - mixin SiSUoutputHTML; - auto html=SDPoutputHTML(); + mixin outputHTML; + auto html=outputHTML(); html.css_write; html.scroll( contents, @@ -70,8 +70,8 @@ template outputHub() { ); } if (doc_matters.opt_action_bool["epub"]) { - mixin SiSUoutputEPub; - auto epub=SDPoutputEPub(); + mixin outputEPub; + auto epub=outputEPub(); epub.doc_content( // consolidate contents, doc_matters, @@ -80,19 +80,19 @@ template outputHub() { // writeln("epub processing"); } if (doc_matters.opt_action_bool["pdf"]) { - /+ mixin SiSUoutputPDF; +/ + /+ mixin outputPDF; +/ writeln("pdf processing"); } if (doc_matters.opt_action_bool["odt"]) { - /+ mixin SiSUoutputODT; +/ + /+ mixin outputODT; +/ writeln("odt processing"); } if (doc_matters.opt_action_bool["sqlite"]) { - /+ mixin SiSUoutputSQLite; +/ + /+ mixin outputSQLite; +/ writeln("sqlite processing"); } if (doc_matters.opt_action_bool["postgresql"]) { - /+ mixin SiSUoutputPostgreSQL; +/ + /+ mixin outputPostgreSQL; +/ writeln("pgsql processing"); } } @@ -104,7 +104,7 @@ template outputHub() { #+BEGIN_SRC d :tangle ../src/sdp/source_sisupod.d template SiSUpod() { - struct SDPsisupod { + struct SiSUpod { <> <> <> @@ -117,8 +117,8 @@ template SiSUpod() { *** xhtml common #+BEGIN_SRC d :tangle ../src/sdp/output_xhtmls.d -template SiSUoutputXHTMLs() { - struct SDPoutputXHTMLs { +template outputXHTMLs() { + struct outputXHTMLs { <> <> } @@ -128,9 +128,9 @@ template SiSUoutputXHTMLs() { *** html #+BEGIN_SRC d :tangle ../src/sdp/output_html.d -template SiSUoutputHTML() { - struct SDPoutputHTML { - mixin SiSUoutputXHTMLs; +template outputHTML() { + struct outputHTML { + mixin outputXHTMLs; <> <> <> @@ -142,10 +142,10 @@ template SiSUoutputHTML() { *** epub #+BEGIN_SRC d :tangle ../src/sdp/output_epub.d -template SiSUoutputEPub() { - struct SDPoutputEPub { +template outputEPub() { + struct outputEPub { mixin InternalMarkup; - mixin SiSUoutputXHTMLs; + mixin outputXHTMLs; <> <> <> @@ -566,7 +566,7 @@ void scroll(C,T)( auto ref const C contents, auto ref T doc_matters, ) { - auto xhtml_format = SDPoutputXHTMLs(); + auto xhtml_format = outputXHTMLs(); auto rgx = Rgx(); string[] doc_html; string[] doc; @@ -693,7 +693,7 @@ void seg_write_output_files(Fn,FnS,D)( } mixin SiSUpaths; auto pth_html = HtmlPaths(); - auto xhtml_format = SDPoutputXHTMLs(); + auto xhtml_format = outputXHTMLs(); auto m = matchFirst(fn_src, rgx.src_fn); try { mkdirRecurse(pth_html.seg(fn_src)); @@ -721,7 +721,7 @@ void seg(C,T)( auto ref const C contents, auto ref T doc_matters, ) { - auto xhtml_format = SDPoutputXHTMLs(); + auto xhtml_format = outputXHTMLs(); auto rgx = Rgx(); string[][string] doc_html; string[] doc; @@ -2356,7 +2356,7 @@ void doc_content(C,T)( auto ref const C contents, auto ref T doc_matters, ) { - auto xhtml_format = SDPoutputXHTMLs(); + auto xhtml_format = outputXHTMLs(); auto rgx = Rgx(); // string[] toc; string[][string] doc_epub; @@ -2551,7 +2551,7 @@ void epub_write_output_files(Fn,FnS,De,Mt,Mic,Ot,Oc)( mixin SiSUpaths; auto pth_epub = EpubPaths(); // doc = xhtml_format.scroll_head ~ doc_epub ~ xhtml_format.tail; - auto xhtml_format = SDPoutputXHTMLs(); + auto xhtml_format = outputXHTMLs(); try { mkdirRecurse(pth_epub.doc_meta_inf(fn_src)); mkdirRecurse(pth_epub.doc_oebps_css(fn_src)); diff --git a/src/sdp/output_epub.d b/src/sdp/output_epub.d index 8faf9e1..c7c13ef 100644 --- a/src/sdp/output_epub.d +++ b/src/sdp/output_epub.d @@ -1,7 +1,7 @@ -template SiSUoutputEPub() { - struct SDPoutputEPub { +template outputEPub() { + struct outputEPub { mixin InternalMarkup; - mixin SiSUoutputXHTMLs; + mixin outputXHTMLs; string epub_mimetypes() { string o; o = format(q"¶application/epub+zip¶"); @@ -148,7 +148,7 @@ template SiSUoutputEPub() { auto ref const C contents, auto ref T doc_matters, ) { - auto xhtml_format = SDPoutputXHTMLs(); + auto xhtml_format = outputXHTMLs(); auto rgx = Rgx(); // string[] toc; string[][string] doc_epub; @@ -337,7 +337,7 @@ template SiSUoutputEPub() { mixin SiSUpaths; auto pth_epub = EpubPaths(); // doc = xhtml_format.scroll_head ~ doc_epub ~ xhtml_format.tail; - auto xhtml_format = SDPoutputXHTMLs(); + auto xhtml_format = outputXHTMLs(); try { mkdirRecurse(pth_epub.doc_meta_inf(fn_src)); mkdirRecurse(pth_epub.doc_oebps_css(fn_src)); diff --git a/src/sdp/output_html.d b/src/sdp/output_html.d index bf1d59c..ec8b74e 100644 --- a/src/sdp/output_html.d +++ b/src/sdp/output_html.d @@ -1,6 +1,6 @@ -template SiSUoutputHTML() { - struct SDPoutputHTML { - mixin SiSUoutputXHTMLs; +template outputHTML() { + struct outputHTML { + mixin outputXHTMLs; void scroll_write_output_file(Fn,D)( Fn fn_src, @@ -27,7 +27,7 @@ template SiSUoutputHTML() { auto ref const C contents, auto ref T doc_matters, ) { - auto xhtml_format = SDPoutputXHTMLs(); + auto xhtml_format = outputXHTMLs(); auto rgx = Rgx(); string[] doc_html; string[] doc; @@ -147,7 +147,7 @@ template SiSUoutputHTML() { } mixin SiSUpaths; auto pth_html = HtmlPaths(); - auto xhtml_format = SDPoutputXHTMLs(); + auto xhtml_format = outputXHTMLs(); auto m = matchFirst(fn_src, rgx.src_fn); try { mkdirRecurse(pth_html.seg(fn_src)); @@ -169,7 +169,7 @@ template SiSUoutputHTML() { auto ref const C contents, auto ref T doc_matters, ) { - auto xhtml_format = SDPoutputXHTMLs(); + auto xhtml_format = outputXHTMLs(); auto rgx = Rgx(); string[][string] doc_html; string[] doc; diff --git a/src/sdp/output_hub.d b/src/sdp/output_hub.d index db6bee2..16fc120 100644 --- a/src/sdp/output_hub.d +++ b/src/sdp/output_hub.d @@ -6,24 +6,24 @@ template outputHub() { void outputHub(C,D)(C contents, D doc_matters) { auto rgx = Rgx(); if (doc_matters.opt_action_bool["source"]) { - /+ mixin SiSUoutputSource; +/ + /+ mixin outputSource; +/ writeln("source"); } if (doc_matters.opt_action_bool["sisupod"]) { mixin SiSUpod; - auto sisupod=SDPsisupod(); + auto sisupod=SiSUpod(); sisupod.sisupod_assemble(doc_matters.source_filename); writeln("sisupod source"); } if (doc_matters.opt_action_bool["text"]) { - /+ mixin SiSUoutputText; +/ + /+ mixin outputText; +/ writeln("text processing"); // auto text=SDPoutput_text(); // text.scroll(contents, bookindex_unordered_hashes, biblio, dochead_make, dochead_meta, fn_src, opt_action_bool); } if (doc_matters.opt_action_bool["html"]) { - mixin SiSUoutputHTML; - auto html=SDPoutputHTML(); + mixin outputHTML; + auto html=outputHTML(); html.css_write; html.scroll( contents, @@ -34,16 +34,16 @@ template outputHub() { doc_matters, ); } else if(doc_matters.opt_action_bool["html_seg"]) { - mixin SiSUoutputHTML; - auto html=SDPoutputHTML(); + mixin outputHTML; + auto html=outputHTML(); html.css_write; html.seg( contents, doc_matters, ); } else if(doc_matters.opt_action_bool["html_scroll"]) { - mixin SiSUoutputHTML; - auto html=SDPoutputHTML(); + mixin outputHTML; + auto html=outputHTML(); html.css_write; html.scroll( contents, @@ -51,8 +51,8 @@ template outputHub() { ); } if (doc_matters.opt_action_bool["epub"]) { - mixin SiSUoutputEPub; - auto epub=SDPoutputEPub(); + mixin outputEPub; + auto epub=outputEPub(); epub.doc_content( // consolidate contents, doc_matters, @@ -61,19 +61,19 @@ template outputHub() { // writeln("epub processing"); } if (doc_matters.opt_action_bool["pdf"]) { - /+ mixin SiSUoutputPDF; +/ + /+ mixin outputPDF; +/ writeln("pdf processing"); } if (doc_matters.opt_action_bool["odt"]) { - /+ mixin SiSUoutputODT; +/ + /+ mixin outputODT; +/ writeln("odt processing"); } if (doc_matters.opt_action_bool["sqlite"]) { - /+ mixin SiSUoutputSQLite; +/ + /+ mixin outputSQLite; +/ writeln("sqlite processing"); } if (doc_matters.opt_action_bool["postgresql"]) { - /+ mixin SiSUoutputPostgreSQL; +/ + /+ mixin outputPostgreSQL; +/ writeln("pgsql processing"); } } diff --git a/src/sdp/output_xhtmls.d b/src/sdp/output_xhtmls.d index c7a23fe..4288ab8 100644 --- a/src/sdp/output_xhtmls.d +++ b/src/sdp/output_xhtmls.d @@ -1,5 +1,5 @@ -template SiSUoutputXHTMLs() { - struct SDPoutputXHTMLs { +template outputXHTMLs() { + struct outputXHTMLs { string _xhtml_anchor_tags(const(string[]) anchor_tags) { string tags=""; if (anchor_tags.length > 0) { diff --git a/src/sdp/source_sisupod.d b/src/sdp/source_sisupod.d index 20e0ef1..081bb51 100644 --- a/src/sdp/source_sisupod.d +++ b/src/sdp/source_sisupod.d @@ -1,5 +1,5 @@ template SiSUpod() { - struct SDPsisupod { + struct SiSUpod { void sisupod_assemble(S)( S fn_src, -- cgit v1.2.3