From 96b03396ddb487816ebd85d1c6f30400019702fc Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 15 Nov 2019 23:58:15 -0500 Subject: name changes --- src/doc_reform/output/defaults.d | 2 +- src/doc_reform/output/epub3.d | 10 ++--- src/doc_reform/output/html.d | 16 ++++---- src/doc_reform/output/hub.d | 6 +-- src/doc_reform/output/latex.d | 10 ++--- src/doc_reform/output/odt.d | 14 +++---- src/doc_reform/output/paths_output.d | 76 ++++++++++++++++++------------------ src/doc_reform/output/rgx.d | 2 +- src/doc_reform/output/source_pod.d | 10 ++--- src/doc_reform/output/sqlite.d | 20 +++++----- src/doc_reform/output/xmls.d | 8 ++-- src/doc_reform/output/xmls_css.d | 10 ++--- 12 files changed, 92 insertions(+), 92 deletions(-) (limited to 'src/doc_reform/output') diff --git a/src/doc_reform/output/defaults.d b/src/doc_reform/output/defaults.d index 1db06e0..fc31ea9 100644 --- a/src/doc_reform/output/defaults.d +++ b/src/doc_reform/output/defaults.d @@ -47,7 +47,7 @@ template InternalMarkup() { } } } -template DocReformLanguageCodes() { +template spineLanguageCodes() { /+ language codes +/ struct Lang { static string[string][string] codes() { diff --git a/src/doc_reform/output/epub3.d b/src/doc_reform/output/epub3.d index 2bdb8a9..f46ff6e 100644 --- a/src/doc_reform/output/epub3.d +++ b/src/doc_reform/output/epub3.d @@ -32,7 +32,7 @@ template outputEPub3() { } string epub3_oebps_content(D,M,P)(D doc_abstraction, M doc_matters, P parts) { auto xhtml_format = outputXHTMLs(); - auto pth_epub3 = DocReformPathsEPUB!()(doc_matters.output_path, doc_matters.src.language); + auto pth_epub3 = spinePathsEPUB!()(doc_matters.output_path, doc_matters.src.language); string _uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO sort uuid in doc_matters! string content = format(q"┃ @@ -221,7 +221,7 @@ template outputEPub3() { %s%s - + @@ -301,7 +301,7 @@ template outputEPub3() { const D doc_abstraction, I doc_matters, ) { - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; auto xhtml_format = outputXHTMLs(); auto rgx = Rgx(); string[] doc; @@ -619,7 +619,7 @@ template outputEPub3() { static assert(is(typeof(epub_write.oebps_content_opf) == string)); } static auto rgx = Rgx(); - auto pth_epub3 = DocReformPathsEPUB!()(doc_matters.output_path, doc_matters.src.language); + auto pth_epub3 = spinePathsEPUB!()(doc_matters.output_path, doc_matters.src.language); auto xhtml_format = outputXHTMLs(); /+ zip file +/ auto fn_epub = pth_epub3.epub_file(doc_matters.src.filename); @@ -774,7 +774,7 @@ template outputEPub3() { } } { /+ OEBPS/epub.css +/ - auto css = DocReformCss(doc_matters); + auto css = spineCss(doc_matters); { /+ debug +/ if (doc_matters.opt.action.debug_do) { fn_dbg = pth_epub3.dbg_fn_oebps_css(doc_matters.src.filename); diff --git a/src/doc_reform/output/html.d b/src/doc_reform/output/html.d index 85ec9ba..07da3c1 100644 --- a/src/doc_reform/output/html.d +++ b/src/doc_reform/output/html.d @@ -17,7 +17,7 @@ template outputHTML() { const D doc_abstraction, M doc_matters, ) { - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; auto xhtml_format = outputXHTMLs(); auto rgx = Rgx(); string[] doc_html; @@ -190,7 +190,7 @@ template outputHTML() { debug(asserts) { static assert(is(typeof(doc) == string[])); } - auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language); try { if (!exists(pth_html.base)) { pth_html.base.mkdirRecurse; @@ -210,7 +210,7 @@ template outputHTML() { const D doc_abstraction, M doc_matters, ) { - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; auto rgx = Rgx(); auto xhtml_format = outputXHTMLs(); string[][string] doc_html; @@ -467,9 +467,9 @@ template outputHTML() { debug(asserts) { static assert(is(typeof(doc_html) == string[][string])); } - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; auto rgx = Rgx(); - auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language); auto xhtml_format = outputXHTMLs(); auto m = doc_matters.src.filename.matchFirst(rgx.src_fn); try { @@ -494,8 +494,8 @@ template outputHTML() { } } void css(M)(M doc_matters) { - auto css = DocReformCss(doc_matters); - auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto css = spineCss(doc_matters); + auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language); try { if (!exists(pth_html.css)) { (pth_html.css).mkdirRecurse; @@ -513,7 +513,7 @@ template outputHTML() { ) { { /+ (copy html images) +/ - auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language); if (!exists(pth_html.image)) { pth_html.image.mkdirRecurse; } diff --git a/src/doc_reform/output/hub.d b/src/doc_reform/output/hub.d index 66dcd43..acb8a68 100644 --- a/src/doc_reform/output/hub.d +++ b/src/doc_reform/output/hub.d @@ -11,7 +11,7 @@ template outputHub() { doc_reform.output.paths_output; import std.parallelism; void outputHub(D,I)(const D doc_abstraction, I doc_matters) { - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; mixin Msg; auto msg = Msg!()(doc_matters); static auto rgx = Rgx(); @@ -26,7 +26,7 @@ template outputHub() { msg.v("spine (doc reform) source pod processing... "); } import doc_reform.output.source_pod; - DocReformPod!()(doc_matters); + spinePod!()(doc_matters); if (doc_matters.opt.action.source) { msg.vv("spine (doc reform) source done"); } @@ -109,7 +109,7 @@ template outputHubOp() { doc_reform.output.create_zip_file, doc_reform.output.paths_output; void outputHubOp(E,O)(E env, O opt_action) { - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; static auto rgx = Rgx(); if ((opt_action.sqlite_db_drop)) { if ((opt_action.verbose)) { diff --git a/src/doc_reform/output/latex.d b/src/doc_reform/output/latex.d index da509ac..8308067 100644 --- a/src/doc_reform/output/latex.d +++ b/src/doc_reform/output/latex.d @@ -8,9 +8,9 @@ template outputLaTeX() { std.uri, std.conv : to; mixin InternalMarkup; // watch - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; auto rgx = Rgx(); - mixin DocReformLanguageCodes; + mixin spineLanguageCodes; auto lang = Lang(); auto paper() { struct PaperType { @@ -219,7 +219,7 @@ template outputLaTeX() { return _width; } string _latex_image_path(string _image_path) { - auto pth_latex = DocReformPathsLaTeX(doc_matters); + auto pth_latex = spinePathsLaTeX(doc_matters); _image_path = pth_latex.latex_path_stuff ~ "/" ~ _image_path; return _image_path; } @@ -784,7 +784,7 @@ string table(O,M)( linkcolor=myred, %% \href{...} and \pageref{...} ┃", ); - string _latex_head = format(q"┃%%%% DocReform LaTeX output + string _latex_head = format(q"┃%%%% spine LaTeX output %%%% Generated by: %s %%%% D version: %s %%%% LaTeX output last Generated on: %s @@ -1155,7 +1155,7 @@ string table(O,M)( const T latex_content, M doc_matters, ) { - auto pth_latex = DocReformPathsLaTeX(doc_matters); + auto pth_latex = spinePathsLaTeX(doc_matters); try { { /+ debug +/ if (doc_matters.opt.action.debug_do diff --git a/src/doc_reform/output/odt.d b/src/doc_reform/output/odt.d index 075a73c..2d0c45d 100644 --- a/src/doc_reform/output/odt.d +++ b/src/doc_reform/output/odt.d @@ -12,7 +12,7 @@ template formatODT() { doc_reform.output.create_zip_file, doc_reform.output.xmls, doc_reform.output.xmls_css; - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; struct formatODT { static auto rgx = Rgx(); string _tags(O)(const O obj){ @@ -603,7 +603,7 @@ template outputODT() { doc_reform.output.xmls, doc_reform.output.xmls_css; mixin InternalMarkup; - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; auto rgx = Rgx(); // mixin outputXmlODT; string odt_head(I)(I doc_matters) { @@ -841,7 +841,7 @@ template outputODT() { } string odt_tail() { - string _odt_tail = format(q"┃DocReform: <www.doc_reform.org> and <www.sisudoc.org> + string _odt_tail = format(q"┃spine: <www.doc_reform.org> and <www.sisudoc.org> ┃",); return _odt_tail; } @@ -886,7 +886,7 @@ template outputODT() { auto ref M doc_matters, ) { { /+ (copy odt images) +/ - auto pth_odt = DocReformPathsODT!()(doc_matters); + auto pth_odt = spinePathsODT!()(doc_matters); foreach (image; doc_matters.srcs.image_list) { auto fn_src_in = doc_matters.src.image_dir_path ~ "/" ~ image; auto fn_src_out_file = pth_odt.image_dir("fs") ~ "/" ~ image; @@ -925,7 +925,7 @@ template outputODT() { void dirtree(I)( I doc_matters, ) { - auto pth_odt = DocReformPathsODT!()(doc_matters); + auto pth_odt = spinePathsODT!()(doc_matters); if (doc_matters.opt.action.debug_do) { /+ (dir tree) +/ if (!exists(pth_odt.meta_inf_dir("fs"))) { pth_odt.meta_inf_dir("fs").mkdirRecurse; @@ -1966,7 +1966,7 @@ template outputODT() { const W odt_content, I doc_matters, ) { - auto pth_odt = DocReformPathsODT!()(doc_matters); + auto pth_odt = spinePathsODT!()(doc_matters); auto fn_odt = pth_odt.odt_file; auto zip = new ZipArchive(); // ZipArchive zip = new ZipArchive(); void ODTzip()(string contents, string fn) { @@ -2060,7 +2060,7 @@ template outputODT() { string manifest_xml; // image list changes string meta_xml; // time stamp } - // auto pth_odt = DocReformPathsODT!()(doc_matters); + // auto pth_odt = spinePathsODT!()(doc_matters); auto odt = ODT(); odt.mimetype = mimetype; odt.manifest_rdf = manifest_rdf; diff --git a/src/doc_reform/output/paths_output.d b/src/doc_reform/output/paths_output.d index 26b3509..bc4da76 100644 --- a/src/doc_reform/output/paths_output.d +++ b/src/doc_reform/output/paths_output.d @@ -7,8 +7,8 @@ import std.array, std.regex, std.stdio; import doc_reform.meta.rgx; -template DocReformOutPaths() { - auto DocReformOutPaths()( +template spineOutPaths() { + auto spineOutPaths()( string output_pth_root, string lng = "", ) { @@ -24,8 +24,8 @@ template DocReformOutPaths() { return _PathsStruct(); } } -template DocReformOutPathSQLite() { - auto DocReformOutPathSQLite(Po)( +template spineOutPathSQLite() { + auto spineOutPathSQLite(Po)( Po output_pth_root, ) { struct _PathsStruct { @@ -40,9 +40,9 @@ template DocReformOutPathSQLite() { return _PathsStruct(); } } -template DocReformOutPathsFnPd() { +template spineOutPathsFnPd() { /+ TODO stuff to work out here +/ - auto DocReformOutPathsFnPd(Fn,Pn)( + auto spineOutPathsFnPd(Fn,Pn)( Fn fn_src_pth, Pn pod_name_with_path ) { @@ -78,11 +78,11 @@ template DocReformOutPathsFnPd() { } } -template DocReformDocRootTreeHTML() { - mixin DocReformRgxInit; +template spineDocRootTreeHTML() { + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformDocRootTreeHTML()(string lng) { - auto lng_pth = DocReformOutPaths!()("", lng); + auto spineDocRootTreeHTML()(string lng) { + auto lng_pth = spineOutPaths!()("", lng); string base_dir = "html"; string suffix = ".html"; struct _PathsStruct { @@ -135,14 +135,14 @@ template DocReformDocRootTreeHTML() { return _PathsStruct(); } } -template DocReformPathsHTML() { - mixin DocReformRgxInit; +template spinePathsHTML() { + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformPathsHTML()( + auto spinePathsHTML()( string output_path_root, string lng, ) { - auto doc_tree = DocReformDocRootTreeHTML!()(lng); + auto doc_tree = spineDocRootTreeHTML!()(lng); string base_dir = "html"; string suffix = ".html"; struct _PathsStruct { @@ -189,15 +189,15 @@ template DocReformPathsHTML() { return _PathsStruct(); } } -template DocReformUrlsHTML() { +template spineUrlsHTML() { import std.format; - mixin DocReformRgxInit; + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformUrlsHTML()( + auto spineUrlsHTML()( string url_doc_root, string lng, ) { - auto doc_tree = DocReformDocRootTreeHTML!()(lng); + auto doc_tree = spineDocRootTreeHTML!()(lng); string base_dir = "html"; string suffix = ".html"; struct _PathsStruct { @@ -285,14 +285,14 @@ template DocReformUrlsHTML() { return _PathsStruct(); } } -template DocReformPathsEPUB() { - mixin DocReformRgxInit; +template spinePathsEPUB() { + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformPathsEPUB()( + auto spinePathsEPUB()( string output_pth_root, string lng, ) { - auto out_pth = DocReformOutPaths!()(output_pth_root, lng); + auto out_pth = spineOutPaths!()(output_pth_root, lng); string base_dir = "epub"; struct _PathsStruct { string base() { @@ -387,13 +387,13 @@ template DocReformPathsEPUB() { return _PathsStruct(); } } -template DocReformPathsODT() { - mixin DocReformRgxInit; +template spinePathsODT() { + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformPathsODT(M)( + auto spinePathsODT(M)( M doc_matters, ) { - auto out_pth = DocReformOutPaths!()( doc_matters.output_path, doc_matters.src.language); + auto out_pth = spineOutPaths!()( doc_matters.output_path, doc_matters.src.language); string base_dir = "odf"; struct _PathsStruct { string base_pth() { // dir will contain odt document file (also debug file tree) @@ -451,10 +451,10 @@ template DocReformPathsODT() { return _PathsStruct(); } } -template DocReformPathsLaTeX() { - mixin DocReformRgxInit; +template spinePathsLaTeX() { + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformPathsLaTeX(M)( + auto spinePathsLaTeX(M)( M doc_matters, ) { struct _PathsStruct { @@ -462,7 +462,7 @@ template DocReformPathsLaTeX() { return fn_src.baseName.stripExtension; } string base() { - auto out_pth = DocReformOutPaths!()(doc_matters.output_path, doc_matters.src.language); + auto out_pth = spineOutPaths!()(doc_matters.output_path, doc_matters.src.language); string base_dir = "latex"; return (((out_pth.output_root).chainPath(base_dir)).asNormalizedPath).array; } @@ -480,10 +480,10 @@ template DocReformPathsLaTeX() { return _PathsStruct(); } } -template DocReformPathsSQLiteDiscrete() { - mixin DocReformRgxInit; +template spinePathsSQLiteDiscrete() { + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformPathsSQLiteDiscrete()( + auto spinePathsSQLiteDiscrete()( string output_pth_root, string lng, ) { @@ -492,7 +492,7 @@ template DocReformPathsSQLiteDiscrete() { return fn_src.baseName.stripExtension; } string base() { - auto out_pth = DocReformOutPaths!()(output_pth_root, lng); + auto out_pth = spineOutPaths!()(output_pth_root, lng); string base_dir = "sqlite"; return (((out_pth.output_base).chainPath(base_dir)).asNormalizedPath).array; } @@ -506,10 +506,10 @@ template DocReformPathsSQLiteDiscrete() { return _PathsStruct(); } } -template DocReformPathsSQLite() { - mixin DocReformRgxInit; +template spinePathsSQLite() { + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformPathsSQLite(DbN, Po)( + auto spinePathsSQLite(DbN, Po)( DbN db_name, Po output_pth_root, ) { @@ -518,7 +518,7 @@ template DocReformPathsSQLite() { return fn_src.baseName.stripExtension; } string base() { - auto out_pth = DocReformOutPathSQLite!()(output_pth_root); // decide whether to have separate files for each language + auto out_pth = spineOutPathSQLite!()(output_pth_root); // decide whether to have separate files for each language string base_dir = "sqlite"; return (((out_pth.output_root).chainPath(base_dir)).asNormalizedPath).array; } diff --git a/src/doc_reform/output/rgx.d b/src/doc_reform/output/rgx.d index 1c569f9..cda3d5e 100644 --- a/src/doc_reform/output/rgx.d +++ b/src/doc_reform/output/rgx.d @@ -2,7 +2,7 @@ regex: regular expressions used in sisu document parser +/ module doc_reform.output.rgx; -static template DocReformOutputRgxInit() { +static template spineOutputRgxInit() { import doc_reform.output.defaults; static struct Rgx { static newline = ctRegex!("\n", "mg"); diff --git a/src/doc_reform/output/source_pod.d b/src/doc_reform/output/source_pod.d index cff5ba8..8fbfa0c 100644 --- a/src/doc_reform/output/source_pod.d +++ b/src/doc_reform/output/source_pod.d @@ -1,5 +1,5 @@ module doc_reform.output.source_pod; -template DocReformPod() { +template spinePod() { import doc_reform.output; import std.digest.sha, @@ -10,16 +10,16 @@ template DocReformPod() { import doc_reform.output.create_zip_file, doc_reform.output.xmls; - void DocReformPod(T)(T doc_matters) { + void spinePod(T)(T doc_matters) { debug(asserts) { // static assert(is(typeof(doc_matters) == tuple)); } - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; string pwd = doc_matters.env.pwd; auto src_path_info = doc_matters.src_path_info; auto pth_dr_doc_src = doc_matters.src_path_info; - auto pths_pod = DocReformPathsPods!()(doc_matters); - mixin DocReformLanguageCodes; + auto pths_pod = spinePathsPods!()(doc_matters); + mixin spineLanguageCodes; auto lang = Lang(); static auto rgx = Rgx(); assert (doc_matters.src.filename.match(rgx.src_fn)); diff --git a/src/doc_reform/output/sqlite.d b/src/doc_reform/output/sqlite.d index 5bc1551..3f277c0 100644 --- a/src/doc_reform/output/sqlite.d +++ b/src/doc_reform/output/sqlite.d @@ -6,7 +6,7 @@ import std.conv : to; import d2sqlite3; import std.typecons : Nullable; -mixin DocReformOutputRgxInit; +mixin spineOutputRgxInit; mixin InternalMarkup; static auto rgx = Rgx(); static auto mkup = InlineMarkup(); @@ -16,7 +16,7 @@ template SQLiteHubBuildTablesAndPopulate() { const D doc_abstraction, M doc_matters, ) { - auto pth_sqlite = DocReformPathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); + auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); pth_sqlite.base.mkdirRecurse; auto db = Database(pth_sqlite.sqlite_file); template SQLiteDbStatementComposite() { @@ -29,7 +29,7 @@ template SQLiteHubBuildTablesAndPopulate() { string _db_statement; { if ((doc_matters.opt.action.sqlite_db_create)) { - auto pth_sqlite = DocReformPathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); + auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); pth_sqlite.base.mkdirRecurse; _db_statement ~= SQLiteTablesReCreate!()(); SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "TABLE RE-CREATE"); @@ -63,8 +63,8 @@ template SQLiteHubDiscreteBuildTablesAndPopulate() { const D doc_abstraction, M doc_matters, ) { - auto url_html = DocReformUrlsHTML!()(doc_matters.conf_make_meta.conf.webserv_url_doc_root, doc_matters.src.language); - auto pth_sqlite = DocReformPathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.src.language); + auto url_html = spineUrlsHTML!()(doc_matters.conf_make_meta.conf.webserv_url_doc_root, doc_matters.src.language); + auto pth_sqlite = spinePathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.src.language); pth_sqlite.base.mkdirRecurse; auto db = Database(pth_sqlite.sqlite_file(doc_matters.src.filename)); template SQLiteDiscreteDbStatementComposite() { @@ -138,7 +138,7 @@ template SQLiteFormatAndLoadObject() { auto SQLiteFormatAndLoadObject(M)( M doc_matters, ) { - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; struct sqlite_format_and_load_objects { string generic_munge_sanitize_text_for_search( string _txt, @@ -299,7 +299,7 @@ template SQLiteFormatAndLoadObject() { rgx.inline_seg_link, "$1"); } - auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language); if (_xml_type == "seg") { foreach (m; _txt.match(rgx.inline_link_hash)) { if (m.captures[3] in doc_matters.has.tag_associations) { @@ -1170,7 +1170,7 @@ template SQLiteInsertDocObjectsLoop() { M doc_matters, ) { string _uid = SQLinsertDelimiter!()(doc_matters.src.doc_uid); - auto url_html = DocReformUrlsHTML!()(doc_matters.conf_make_meta.conf.webserv_url_doc_root, doc_matters.src.language); + auto url_html = spineUrlsHTML!()(doc_matters.conf_make_meta.conf.webserv_url_doc_root, doc_matters.src.language); string insertDocObjectsRow(O)(O obj) { string _insert_doc_objects_row = format(q"┃ INSERT INTO doc_objects ( @@ -1535,7 +1535,7 @@ template SQLiteTablesCreate() { } if (opt_action.sqlite_db_create) { string _db_statement; - auto pth_sqlite = DocReformPathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); + auto pth_sqlite = spinePathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); pth_sqlite.base.mkdirRecurse; auto db = Database(pth_sqlite.sqlite_file); { @@ -1549,7 +1549,7 @@ template SQLiteDbDrop() { void SQLiteDbDrop(O)(O opt_action) { writeln("db drop"); if ((opt_action.sqlite_db_drop)) { - auto pth_sqlite = DocReformPathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); + auto pth_sqlite = spinePathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); writeln("remove(", pth_sqlite.sqlite_file, ")"); try { remove(pth_sqlite.sqlite_file); diff --git a/src/doc_reform/output/xmls.d b/src/doc_reform/output/xmls.d index feebb35..ae904bb 100644 --- a/src/doc_reform/output/xmls.d +++ b/src/doc_reform/output/xmls.d @@ -12,7 +12,7 @@ template outputXHTMLs() { doc_reform.output.create_zip_file, doc_reform.output.xmls, doc_reform.output.xmls_css; - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; struct outputXHTMLs { static auto rgx = Rgx(); string div_delimit( @@ -95,7 +95,7 @@ template outputXHTMLs() { ) { string _publisher="Publisher"; // TODO string o; - o = format(q"┃ + o = format(q"┃ @@ -110,7 +110,7 @@ template outputXHTMLs() { - ┃", + ┃", doc_matters.conf_make_meta.meta.title_full, doc_matters.conf_make_meta.meta.creator_author, _publisher, @@ -155,7 +155,7 @@ template outputXHTMLs() { M doc_matters, ) { string _action="http://www.sisudoc.org/cgi-bin/search.cgi"; - string _db="DocReform.7a.manual"; + string _db="spine.7a.manual"; string o; string _form; if (doc_matters.opt.action.workon) { diff --git a/src/doc_reform/output/xmls_css.d b/src/doc_reform/output/xmls_css.d index 24cb90b..553d9da 100644 --- a/src/doc_reform/output/xmls_css.d +++ b/src/doc_reform/output/xmls_css.d @@ -2,9 +2,9 @@ default css settings +/ module doc_reform.output.xmls_css; -template DocReformCss() { +template spineCss() { import std.format; - auto DocReformCss(M)(M doc_matters) { + auto spineCss(M)(M doc_matters) { string _css_indent = format(q"┃ /* indent */ p.norm { } @@ -4164,9 +4164,9 @@ template DocReformCss() { ); auto css_() { struct _CSS { - string html_seg = "/* DocReform css html seg stylesheet */\n"; - string html_scroll = "/* DocReform css html scroll stylesheet */\n"; - string epub = "/* DocReform css epub stylesheet */\n"; + string html_seg = "/* spine css html seg stylesheet */\n"; + string html_scroll = "/* spine css html scroll stylesheet */\n"; + string epub = "/* spine css epub stylesheet */\n"; } return _CSS(); } -- cgit v1.2.3