diff options
Diffstat (limited to 'src/doc_reform/output')
-rw-r--r-- | src/doc_reform/output/defaults.d | 2 | ||||
-rw-r--r-- | src/doc_reform/output/epub3.d | 10 | ||||
-rw-r--r-- | src/doc_reform/output/html.d | 16 | ||||
-rw-r--r-- | src/doc_reform/output/hub.d | 6 | ||||
-rw-r--r-- | src/doc_reform/output/paths_output.d | 44 | ||||
-rw-r--r-- | src/doc_reform/output/rgx.d | 2 | ||||
-rw-r--r-- | src/doc_reform/output/source_sisupod.d | 10 | ||||
-rw-r--r-- | src/doc_reform/output/sqlite.d | 14 | ||||
-rw-r--r-- | src/doc_reform/output/xmls.d | 16 | ||||
-rw-r--r-- | src/doc_reform/output/xmls_css.d | 10 |
10 files changed, 65 insertions, 65 deletions
diff --git a/src/doc_reform/output/defaults.d b/src/doc_reform/output/defaults.d index 97ba691..f0173cc 100644 --- a/src/doc_reform/output/defaults.d +++ b/src/doc_reform/output/defaults.d @@ -35,7 +35,7 @@ template InternalMarkup() { } } } -template SiSUlanguageCodes() { +template DocReformLanguageCodes() { /+ 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 45e632a..7c4e346 100644 --- a/src/doc_reform/output/epub3.d +++ b/src/doc_reform/output/epub3.d @@ -31,7 +31,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 = SiSUpathsEPUB!()(doc_matters.output_path, doc_matters.src.language); + auto pth_epub3 = DocReformPathsEPUB!()(doc_matters.output_path, doc_matters.src.language); string uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO sort uuid in doc_matters! string content = format(q"¶ <?xml version='1.0' encoding='utf-8'?> <package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="EPB-UUID"> @@ -220,7 +220,7 @@ template outputEPub3() { <title>%s%s</title> <link rel="stylesheet" href="css/epub.css" type="text/css" id="main-css" /> <meta name="dtb:uid" content="urn:uuid:%s" /> - <!-- <meta name="epub-creator" content="SiSU http://www.jus.uio.no/sisu (this copy)" /> --> + <!-- <meta name="epub-creator" content="DocReform http://www.jus.uio.no/sisu (this copy)" /> --> <meta name="dtb:depth" content="%s" /> <meta name="dtb:totalPageCount" content="0" /> <meta name="dtb:maxPageNumber" content="0" /> @@ -296,7 +296,7 @@ template outputEPub3() { const D doc_abstraction, I doc_matters, ) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; auto xhtml_format = outputXHTMLs(); auto rgx = Rgx(); string[][string] doc_epub3; @@ -590,7 +590,7 @@ template outputEPub3() { static assert(is(typeof(oebps_toc_ncx) == string)); static assert(is(typeof(oebps_content_opf) == string)); } - auto pth_epub3 = SiSUpathsEPUB!()(doc_matters.output_path, doc_matters.src.language); + auto pth_epub3 = DocReformPathsEPUB!()(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); @@ -744,7 +744,7 @@ template outputEPub3() { } } { /+ OEBPS/epub.css +/ - auto css = SiSUcss(); + auto css = DocReformCss(); debug(epub_output) { fn_dbg = pth_epub3.dbg_fn_oebps_css(doc_matters.src.filename); File(fn_dbg, "w").writeln(css.epub_css); diff --git a/src/doc_reform/output/html.d b/src/doc_reform/output/html.d index 07fe081..5d5ccb5 100644 --- a/src/doc_reform/output/html.d +++ b/src/doc_reform/output/html.d @@ -16,7 +16,7 @@ template outputHTML() { const D doc_abstraction, I doc_matters, ) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; auto xhtml_format = outputXHTMLs(); auto rgx = Rgx(); string[] doc_html; @@ -165,7 +165,7 @@ template outputHTML() { debug(asserts) { static assert(is(typeof(doc) == string[])); } - auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); try { if (!exists(pth_html.base)) { pth_html.base.mkdirRecurse; @@ -185,7 +185,7 @@ template outputHTML() { const D doc_abstraction, M doc_matters, ) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; auto rgx = Rgx(); auto xhtml_format = outputXHTMLs(); string[][string] doc_html; @@ -412,9 +412,9 @@ template outputHTML() { debug(asserts) { static assert(is(typeof(doc_html) == string[][string])); } - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; auto rgx = Rgx(); - auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); auto xhtml_format = outputXHTMLs(); auto m = doc_matters.src.filename.matchFirst(rgx.src_fn); try { @@ -441,8 +441,8 @@ template outputHTML() { void css(M)( auto ref M doc_matters, ) { - auto css = SiSUcss(); - auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto css = DocReformCss(); + auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); try { if (!exists(pth_html.css)) { (pth_html.css).mkdirRecurse; @@ -460,7 +460,7 @@ template outputHTML() { ) { { /+ (copy html images) +/ - auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = DocReformPathsHTML!()(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 b40c929..9e933d8 100644 --- a/src/doc_reform/output/hub.d +++ b/src/doc_reform/output/hub.d @@ -14,7 +14,7 @@ template outputHub() { doc_reform.output.paths_output; import std.parallelism; void outputHub(D,I)(D doc_abstraction, I doc_matters) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; mixin Msg; auto msg = Msg!()(doc_matters); static auto rgx = Rgx(); @@ -23,7 +23,7 @@ template outputHub() { auto msg = Msg!()(doc_matters); if (sched == outTask.sisupod) { msg.v("sisu source processing... "); - SiSUpod!()(doc_matters); + DocReformPod!()(doc_matters); msg.vv("sisu source done"); } if (sched == outTask.sqlite) { @@ -82,7 +82,7 @@ template outputHubOp() { doc_reform.output.create_zip_file, doc_reform.output.paths_output; void outputHubOp(E,O)(E env, O opt_action) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; static auto rgx = Rgx(); if ((opt_action.sqlite_db_drop)) { if ((opt_action.verbose)) { diff --git a/src/doc_reform/output/paths_output.d b/src/doc_reform/output/paths_output.d index abd21b6..451c40d 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 SiSUoutPaths() { - auto SiSUoutPaths(Po,Lng)( +template DocReformOutPaths() { + auto DocReformOutPaths(Po,Lng)( Po output_pth_root, Lng lng, ) { @@ -25,8 +25,8 @@ template SiSUoutPaths() { return _PathsStruct(); } } -template SiSUoutPathSQLite() { - auto SiSUoutPathSQLite(Po)( +template DocReformOutPathSQLite() { + auto DocReformOutPathSQLite(Po)( Po output_pth_root, ) { struct _PathsStruct { @@ -42,9 +42,9 @@ template SiSUoutPathSQLite() { return _PathsStruct(); } } -template SiSUoutPathsFnPd() { +template DocReformOutPathsFnPd() { /+ TODO stuff to work out here +/ - auto SiSUoutPathsFnPd(Fn,Pn)( + auto DocReformOutPathsFnPd(Fn,Pn)( Fn fn_src_pth, Pn pod_name ) { @@ -79,14 +79,14 @@ template SiSUoutPathsFnPd() { return _PathsStruct(); } } -template SiSUpathsHTML() { - mixin SiSUrgxInit; +template DocReformPathsHTML() { + mixin DocReformRgxInit; static auto rgx = Rgx(); - auto SiSUpathsHTML(Po,Lng)( + auto DocReformPathsHTML(Po,Lng)( Po output_pth_root, Lng lng, ) { - auto out_pth = SiSUoutPaths!()(output_pth_root, lng); + auto out_pth = DocReformOutPaths!()(output_pth_root, lng); string base_dir = "html"; string suffix = ".html"; struct _PathsStruct { @@ -121,14 +121,14 @@ template SiSUpathsHTML() { return _PathsStruct(); } } -template SiSUpathsEPUB() { - mixin SiSUrgxInit; +template DocReformPathsEPUB() { + mixin DocReformRgxInit; static auto rgx = Rgx(); - auto SiSUpathsEPUB(Po,Lng)( + auto DocReformPathsEPUB(Po,Lng)( Po output_pth_root, Lng lng, ) { - auto out_pth = SiSUoutPaths!()( output_pth_root, lng); + auto out_pth = DocReformOutPaths!()( output_pth_root, lng); string base_dir = "epub"; struct _PathsStruct { string base() { @@ -221,10 +221,10 @@ template SiSUpathsEPUB() { return _PathsStruct(); } } -template SiSUpathsSQLiteDiscrete() { - mixin SiSUrgxInit; +template DocReformPathsSQLiteDiscrete() { + mixin DocReformRgxInit; static auto rgx = Rgx(); - auto SiSUpathsSQLiteDiscrete(Po,Lng)( + auto DocReformPathsSQLiteDiscrete(Po,Lng)( Po output_pth_root, Lng lng, ) { @@ -233,7 +233,7 @@ template SiSUpathsSQLiteDiscrete() { return fn_src.baseName.stripExtension; } string base() { - auto out_pth = SiSUoutPaths!()(output_pth_root, lng); + auto out_pth = DocReformOutPaths!()(output_pth_root, lng); string base_dir = "sqlite"; return asNormalizedPath((out_pth.output_base).chainPath(base_dir)).array; } @@ -247,10 +247,10 @@ template SiSUpathsSQLiteDiscrete() { return _PathsStruct(); } } -template SiSUpathsSQLite() { - mixin SiSUrgxInit; +template DocReformPathsSQLite() { + mixin DocReformRgxInit; static auto rgx = Rgx(); - auto SiSUpathsSQLite(DbN, Po)( + auto DocReformPathsSQLite(DbN, Po)( DbN db_name, Po output_pth_root, ) { @@ -259,7 +259,7 @@ template SiSUpathsSQLite() { return fn_src.baseName.stripExtension; } string base() { - auto out_pth = SiSUoutPathSQLite!()(output_pth_root); // decide whether to have separate files for each language + auto out_pth = DocReformOutPathSQLite!()(output_pth_root); // decide whether to have separate files for each language string base_dir = "sqlite"; return asNormalizedPath((out_pth.output_root).chainPath(base_dir)).array; } diff --git a/src/doc_reform/output/rgx.d b/src/doc_reform/output/rgx.d index 0d23f11..a15e709 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 SiSUoutputRgxInit() { +static template DocReformOutputRgxInit() { import doc_reform.output.defaults; static struct Rgx { static newline = ctRegex!("\n", "mg"); diff --git a/src/doc_reform/output/source_sisupod.d b/src/doc_reform/output/source_sisupod.d index fa041fd..7d6b0fb 100644 --- a/src/doc_reform/output/source_sisupod.d +++ b/src/doc_reform/output/source_sisupod.d @@ -1,5 +1,5 @@ module doc_reform.output.source_sisupod; -template SiSUpod() { +template DocReformPod() { import doc_reform.output; import std.digest.sha, @@ -10,16 +10,16 @@ template SiSUpod() { import doc_reform.output.create_zip_file, doc_reform.output.xmls; - void SiSUpod(T)(T doc_matters) { + void DocReformPod(T)(T doc_matters) { debug(asserts) { // static assert(is(typeof(doc_matters) == tuple)); } - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; string pwd = doc_matters.env.pwd; auto src_path_info = doc_matters.src_path_info; auto pth_sisudoc_src = doc_matters.src_path_info; - auto pths_sisupod = SiSUpathsSisupods!()(doc_matters); - mixin SiSUlanguageCodes; + auto pths_sisupod = DocReformPathsSisupods!()(doc_matters); + mixin DocReformLanguageCodes; 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 a765fd7..6fbb4a7 100644 --- a/src/doc_reform/output/sqlite.d +++ b/src/doc_reform/output/sqlite.d @@ -5,7 +5,7 @@ import std.conv : to; import d2sqlite3; import std.typecons : Nullable; -mixin SiSUoutputRgxInit; +mixin DocReformOutputRgxInit; static auto rgx = Rgx(); long _metadata_tid_lastrowid; template SQLiteHubBuildTablesAndPopulate() { @@ -13,7 +13,7 @@ template SQLiteHubBuildTablesAndPopulate() { D doc_abstraction, I doc_matters, ) { - auto pth_sqlite = SiSUpathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); + auto pth_sqlite = DocReformPathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); pth_sqlite.base.mkdirRecurse; auto db = Database(pth_sqlite.sqlite_file); template SQLiteDbStatementComposite() { @@ -26,7 +26,7 @@ template SQLiteHubBuildTablesAndPopulate() { string _db_statement; { if ((doc_matters.opt.action.sqlite_db_create)) { - auto pth_sqlite = SiSUpathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); + auto pth_sqlite = DocReformPathsSQLite!()(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"); @@ -60,7 +60,7 @@ template SQLiteHubDiscreteBuildTablesAndPopulate() { D doc_abstraction, I doc_matters, ) { - auto pth_sqlite = SiSUpathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.src.language); + auto pth_sqlite = DocReformPathsSQLiteDiscrete!()(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() { @@ -131,7 +131,7 @@ template SQLiteFormatAndLoadObject() { auto SQLiteFormatAndLoadObject(I)( I doc_matters, ) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; struct sqlite_format_and_load_objects { auto generic_munge_sanitize_text_for_search( string _txt, @@ -1216,7 +1216,7 @@ template SQLiteTablesCreate() { } if (opt_action.sqlite_db_create) { string _db_statement; - auto pth_sqlite = SiSUpathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); + auto pth_sqlite = DocReformPathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); pth_sqlite.base.mkdirRecurse; auto db = Database(pth_sqlite.sqlite_file); { @@ -1230,7 +1230,7 @@ template SQLiteDbDrop() { void SQLiteDbDrop(O)(O opt_action) { writeln("db drop"); if ((opt_action.sqlite_db_drop)) { - auto pth_sqlite = SiSUpathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); + auto pth_sqlite = DocReformPathsSQLite!()(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 8428204..f2f09fa 100644 --- a/src/doc_reform/output/xmls.d +++ b/src/doc_reform/output/xmls.d @@ -11,7 +11,7 @@ template outputXHTMLs() { doc_reform.output.create_zip_file, doc_reform.output.xmls, doc_reform.output.xmls_css; - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; struct outputXHTMLs { static auto rgx = Rgx(); string div_delimit( @@ -114,10 +114,10 @@ template outputXHTMLs() { string _date_modified="Date"; string _language="en"; string _rights="Copyright: Copyright (C) year holder"; - string _generator="doc_reform [SiSU 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)"; + string _generator="doc_reform [DocReform 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)"; string _generator_home="http://www.sisudoc.org"; string o; - o = format(q"¶<!-- SiSU header metadata --> + o = format(q"¶<!-- DocReform header metadata --> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta name="dc.title" content="%s" /> <meta name="dc.author" content="%s" /> @@ -132,7 +132,7 @@ template outputXHTMLs() { <meta name="dc.rights" content="%s" /> <meta name="generator" content="%s" /> <link rel="generator" href="%s" /> - <!-- SiSU header metadata -->¶", + <!-- DocReform header metadata -->¶", _title, _author, _publisher, @@ -163,7 +163,7 @@ template outputXHTMLs() { .replaceAll( rgx.br_nl, ""); } else { - _locations = "<p class=\"tiny_left\"><a href=\"http://www.sisudoc.org\">SiSU</a></p>\n<p class=\"tiny_left\"><a href=\"http://www.sisudoc.org\">www.sisudoc.org</a></p>\n<p class=\"tiny_left\"><a href=\"http://git.sisudoc.org/gitweb/\">sources / git</a></p>"; + _locations = "<p class=\"tiny_left\"><a href=\"http://www.sisudoc.org\">DocReform</a></p>\n<p class=\"tiny_left\"><a href=\"http://www.sisudoc.org\">www.sisudoc.org</a></p>\n<p class=\"tiny_left\"><a href=\"http://git.sisudoc.org/gitweb/\">sources / git</a></p>"; } string o; o = format(q"¶<div class="flex-menu-option"> @@ -177,7 +177,7 @@ template outputXHTMLs() { M doc_matters, ) { string _action="http://www.sisudoc.org/cgi-bin/search.cgi"; - string _db="SiSU.7a.manual"; + string _db="DocReform.7a.manual"; string o; o = format(q"¶<div class="flex-menu-option"> <a name="search"></a> @@ -275,7 +275,7 @@ template outputXHTMLs() { <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta name="dc.title" content="%s" /> <meta name="dc.author" content="%s" /> - <meta name="dc.publisher" content="SiSU http://www.jus.uio.no/sisu (this copy)" /> + <meta name="dc.publisher" content="DocReform http://www.jus.uio.no/sisu (this copy)" /> <meta name="dc.date" content="year" /> <meta name="dc.date.created" content="year" /> <meta name="dc.date.issued" content="year" /> @@ -284,7 +284,7 @@ template outputXHTMLs() { <meta name="dc.date.modified" content="year" /> <meta name="dc.language" content="US" /> <meta name="dc.rights" content="Copyright: Copyright (C) year holder" /> - <meta name="generator" content="doc_reform [SiSU 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)" /> + <meta name="generator" content="doc_reform [DocReform 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)" /> <link rel="generator" href="http://www.sisudoc.org/" /> <link rel="shortcut icon" href="../_sisu/image/rb7.ico" /> <link rel="stylesheet" href="css/epub.css" type="text/css" id="main-css" /> diff --git a/src/doc_reform/output/xmls_css.d b/src/doc_reform/output/xmls_css.d index f3c0545..01c114d 100644 --- a/src/doc_reform/output/xmls_css.d +++ b/src/doc_reform/output/xmls_css.d @@ -2,8 +2,8 @@ default css settings +/ module doc_reform.output.xmls_css; -template SiSUcss() { - auto SiSUcss() { +template DocReformCss() { + auto DocReformCss() { string _css_html_seg=" *{ padding: 0px; @@ -2854,15 +2854,15 @@ template SiSUcss() { "; struct _css { auto html_seg_css() { - string _css = "/* SiSU css html seg stylesheet */\n" ~ _css_html_seg; + string _css = "/* DocReform css html seg stylesheet */\n" ~ _css_html_seg; return _css; } auto html_scroll_css() { - string _css = "/* SiSU css html scroll stylesheet */\n" ~ _css_html_scroll; + string _css = "/* DocReform css html scroll stylesheet */\n" ~ _css_html_scroll; return _css; } auto epub_css() { - string _css = "/* SiSU css epub stylesheet */\n" ~ _css_epub; + string _css = "/* DocReform css epub stylesheet */\n" ~ _css_epub; return _css; } } |