diff options
Diffstat (limited to 'src/doc_reform/output')
-rw-r--r-- | src/doc_reform/output/epub3.d | 2 | ||||
-rw-r--r-- | src/doc_reform/output/paths_output.d | 6 | ||||
-rw-r--r-- | src/doc_reform/output/source_pod.d | 18 | ||||
-rw-r--r-- | src/doc_reform/output/xmls.d | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/doc_reform/output/epub3.d b/src/doc_reform/output/epub3.d index e741a5e..2bdb8a9 100644 --- a/src/doc_reform/output/epub3.d +++ b/src/doc_reform/output/epub3.d @@ -742,7 +742,7 @@ template outputEPub3() { fn = pth_epub3.fn_oebps_content_opf; EPUBzip(epub_write.oebps_content_opf, fn); } - { /+ OEBPS/_sisu/image (images) +/ + { /+ OEBPS/_dr/image (images) +/ foreach (image; doc_matters.srcs.image_list) { { /+ debug +/ if (doc_matters.opt.action.debug_do) { diff --git a/src/doc_reform/output/paths_output.d b/src/doc_reform/output/paths_output.d index 70b1614..ba72bfb 100644 --- a/src/doc_reform/output/paths_output.d +++ b/src/doc_reform/output/paths_output.d @@ -8,9 +8,9 @@ import std.array, std.stdio; import doc_reform.meta.rgx; template DocReformOutPaths() { - auto DocReformOutPaths(Po,Lng)( - Po output_pth_root, - Lng lng = "", + auto DocReformOutPaths()( + string output_pth_root, + string lng = "", ) { struct _PathsStruct { string output_root() { diff --git a/src/doc_reform/output/source_pod.d b/src/doc_reform/output/source_pod.d index 79cff91..73c8d47 100644 --- a/src/doc_reform/output/source_pod.d +++ b/src/doc_reform/output/source_pod.d @@ -17,7 +17,7 @@ template DocReformPod() { 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 pth_dr_doc_src = doc_matters.src_path_info; auto pths_pod = DocReformPathsPods!()(doc_matters); mixin DocReformLanguageCodes; auto lang = Lang(); @@ -64,7 +64,7 @@ template DocReformPod() { foreach (image; doc_matters.srcs.image_list) { debug(podimages) { writeln( - pth_sisudoc_src.image_root.to!string, "/", image, " -> ", + pth_dr_doc_src.image_root.to!string, "/", image, " -> ", pths_pod.image_root(doc_matters.src.filename).zpod, "/", image ); } @@ -96,16 +96,16 @@ template DocReformPod() { } } } - } { /+ bundle sisu_document_make +/ + } { /+ bundle dr_document_make +/ auto fn_src_in = ((doc_matters.src.is_pod) ? doc_matters.src.conf_dir_path - : pth_sisudoc_src.conf_root).to!string - ~ "/" ~ "sisu_document_make"; + : pth_dr_doc_src.conf_root).to!string + ~ "/" ~ "dr_document_make"; auto fn_src_out_pod_zip_base - = pths_pod.conf_root(doc_matters.src.filename).zpod.to!string ~ "/" ~ "sisu_document_make"; + = pths_pod.conf_root(doc_matters.src.filename).zpod.to!string ~ "/" ~ "dr_document_make"; auto fn_src_out_filesystem = pths_pod.conf_root(doc_matters.src.filename).filesystem_open_zpod.to!string - ~ "/" ~ "sisu_document_make"; + ~ "/" ~ "dr_document_make"; if (exists(fn_src_in)) { debug(io) { writeln("(io debug) src out found: ", fn_src_in); @@ -248,7 +248,7 @@ template DocReformPod() { catch (ZipException ex) { // Handle errors } - if (doc_matters.src.filename == "sisudoc/media/text/en/the_wealth_of_networks.yochai_benkler.sst") { + if (doc_matters.src.filename == "dr_doc/media/text/en/the_wealth_of_networks.yochai_benkler.sst") { assert( ((data).sha256Of).toHexString == "626F83A31ED82F42CF528E922C1643498A137ABA3F2E5AFF8A379EA79EA22A1E", @@ -258,7 +258,7 @@ template DocReformPod() { ~ ((data).sha256Of).toHexString ); } - if (doc_matters.src.filename == "sisudoc/media/text/en/sisu_markup_stress_test.sst") { + if (doc_matters.src.filename == "dr_doc/media/text/en/sisu_markup_stress_test.sst") { assert( ((data).sha256Of).toHexString == "AAE0C87AB3F6D5F7385AEEA6EE661F56D40475CFE87AD930C78C9FE07FFB0D91", diff --git a/src/doc_reform/output/xmls.d b/src/doc_reform/output/xmls.d index 84028df..57277b5 100644 --- a/src/doc_reform/output/xmls.d +++ b/src/doc_reform/output/xmls.d @@ -283,7 +283,7 @@ template outputXHTMLs() { <meta name="dc.rights" content="%s" /> <meta name="generator" content="%s" /> <link rel="generator" href="%s" /> - <link rel="shortcut icon" href="../_sisu/image/d.ico" /> + <link rel="shortcut icon" href="../_dr/image/d.ico" /> <link rel="stylesheet" href="css/epub.css" type="text/css" id="main-css" /> </head> <body lang="%s"> |