%s%s

From 294cc379872379aa5263a67a57ce9d800ff2e40d Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 13 Apr 2021 13:31:16 -0400 Subject: epub, minor adjustments --- org/default_paths.org | 6 +++--- org/out_xmls.org | 12 ++++++------ src/doc_reform/io_out/epub3.d | 10 +++++----- src/doc_reform/io_out/paths_output.d | 6 +++--- src/doc_reform/io_out/xmls.d | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/org/default_paths.org b/org/default_paths.org index 5fee26f..d411606 100644 --- a/org/default_paths.org +++ b/org/default_paths.org @@ -1374,7 +1374,7 @@ template spinePathsEPUB() { return (("OEBPS").asNormalizedPath).array; } string doc_oebps_css() { - return ((doc_oebps.chainPath("css")).asNormalizedPath).array; + return ((doc_oebps.chainPath("Styles")).asNormalizedPath).array; } string doc_oebps_image() { return ((doc_oebps.chainPath("image")).asNormalizedPath).array; @@ -1386,7 +1386,7 @@ template spinePathsEPUB() { return "".chainPath("").array; } string fn_mimetypes() { - return ((dirtop.chainPath("mimetypes")).asNormalizedPath).array; + return ((dirtop.chainPath("mimetype")).asNormalizedPath).array; } string fn_dmi_container_xml() { return ((doc_meta_inf.chainPath("container.xml")).asNormalizedPath).array; @@ -1426,7 +1426,7 @@ template spinePathsEPUB() { return dbg_doc_oebps(fn_src).chainPath("image").array; } string dbg_fn_mimetypes(string fn_src) { - return dbg_docdir(fn_src).chainPath("mimetypes").array; + return dbg_docdir(fn_src).chainPath("mimetype").array; } string dbg_fn_dmi_container_xml(string fn_src) { return dbg_doc_meta_inf(fn_src).chainPath("container.xml").array; diff --git a/org/out_xmls.org b/org/out_xmls.org index db7e648..3646132 100644 --- a/org/out_xmls.org +++ b/org/out_xmls.org @@ -431,7 +431,7 @@ import - + ┃", @@ -2293,7 +2293,7 @@ template outputEPub3() { #+BEGIN_SRC d @safe string epub3_container_xml() { string o; - o = format(q"┃┃") ~ "\n"; + o = format(q"┃┃") ~ "\n"; o ~= format(q"┃ @@ -2317,8 +2317,8 @@ xmlns="urn:oasis:names:tc:opendocument:xmlns:container"> auto xhtml_format = outputXHTMLs(); 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"┃ - + string content = format(q"┃ + auto markup = InlineMarkup(); static auto rgx = RgxO(); enum DomTags { none, open, close, close_and_open, open_still, } - string toc = format(q"┃ + string toc = format(q"┃ %s%s - + diff --git a/src/doc_reform/io_out/epub3.d b/src/doc_reform/io_out/epub3.d index 21c7e4d..1a8d924 100644 --- a/src/doc_reform/io_out/epub3.d +++ b/src/doc_reform/io_out/epub3.d @@ -70,7 +70,7 @@ template outputEPub3() { } @safe string epub3_container_xml() { string o; - o = format(q"┃┃") ~ "\n"; + o = format(q"┃┃") ~ "\n"; o ~= format(q"┃ @@ -83,8 +83,8 @@ template outputEPub3() { auto xhtml_format = outputXHTMLs(); 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"┃ - + string content = format(q"┃ + + string toc = format(q"┃ %s%s - + diff --git a/src/doc_reform/io_out/paths_output.d b/src/doc_reform/io_out/paths_output.d index bde9fc4..62bf6c0 100644 --- a/src/doc_reform/io_out/paths_output.d +++ b/src/doc_reform/io_out/paths_output.d @@ -399,7 +399,7 @@ template spinePathsEPUB() { return (("OEBPS").asNormalizedPath).array; } string doc_oebps_css() { - return ((doc_oebps.chainPath("css")).asNormalizedPath).array; + return ((doc_oebps.chainPath("Styles")).asNormalizedPath).array; } string doc_oebps_image() { return ((doc_oebps.chainPath("image")).asNormalizedPath).array; @@ -411,7 +411,7 @@ template spinePathsEPUB() { return "".chainPath("").array; } string fn_mimetypes() { - return ((dirtop.chainPath("mimetypes")).asNormalizedPath).array; + return ((dirtop.chainPath("mimetype")).asNormalizedPath).array; } string fn_dmi_container_xml() { return ((doc_meta_inf.chainPath("container.xml")).asNormalizedPath).array; @@ -451,7 +451,7 @@ template spinePathsEPUB() { return dbg_doc_oebps(fn_src).chainPath("image").array; } string dbg_fn_mimetypes(string fn_src) { - return dbg_docdir(fn_src).chainPath("mimetypes").array; + return dbg_docdir(fn_src).chainPath("mimetype").array; } string dbg_fn_dmi_container_xml(string fn_src) { return dbg_doc_meta_inf(fn_src).chainPath("container.xml").array; diff --git a/src/doc_reform/io_out/xmls.d b/src/doc_reform/io_out/xmls.d index abc98d9..e8e0978 100644 --- a/src/doc_reform/io_out/xmls.d +++ b/src/doc_reform/io_out/xmls.d @@ -326,7 +326,7 @@ template outputXHTMLs() { - + ┃", -- cgit v1.2.3