aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--org/default_paths.org6
-rw-r--r--org/out_xmls.org12
-rw-r--r--src/doc_reform/io_out/epub3.d10
-rw-r--r--src/doc_reform/io_out/paths_output.d6
-rw-r--r--src/doc_reform/io_out/xmls.d2
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
<meta name="generator" content="%s" />
<link rel="generator" href="%s" />
<link rel="shortcut icon" href="../_dr/image/dr.ico" />
- <link rel="stylesheet" href="css/epub.css" type="text/css" id="main-css" />
+ <link rel="stylesheet" href="Styles/epub.css" type="text/css" id="main-css" />
</head>
<body lang="%s">
<a name="top" id="top"></a>┃",
@@ -2293,7 +2293,7 @@ template outputEPub3() {
#+BEGIN_SRC d
@safe string epub3_container_xml() {
string o;
- o = format(q"┃<?xml version='1.0' encoding='utf-8'?>┃") ~ "\n";
+ o = format(q"┃<?xml version="1.0" encoding="UTF-8"?>┃") ~ "\n";
o ~= format(q"┃<container version="1.0"
xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
<rootfiles>
@@ -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"┃ <?xml version='1.0' encoding='utf-8'?>
-<package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="EPB-UUID">
+ string content = format(q"┃ <?xml version="1.0" encoding="UTF-8"?>
+<package version="2.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="EPB-UUID">
<metadata
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xmlns:dcterms="https://purl.org/dc/terms/"
@@ -2513,13 +2513,13 @@ xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
auto markup = InlineMarkup();
static auto rgx = RgxO();
enum DomTags { none, open, close, close_and_open, open_still, }
- string toc = format(q"┃<?xml version='1.0' encoding='utf-8'?>
+ string toc = format(q"┃<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="https://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<!-- four required metadata items (for all NCX documents,
(including the relaxed constraints of OPS 2.0) -->
<title>%s%s</title>
- <link rel="stylesheet" href="css/epub.css" type="text/css" id="main-css" />
+ <link rel="stylesheet" href="Styles/epub.css" type="text/css" id="main-css" />
<meta name="dtb:uid" content="urn:uuid:%s" />
<meta name="dtb:depth" content="%s" />
<meta name="dtb:totalPageCount" content="0" />
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"┃<?xml version='1.0' encoding='utf-8'?>┃") ~ "\n";
+ o = format(q"┃<?xml version="1.0" encoding="UTF-8"?>┃") ~ "\n";
o ~= format(q"┃<container version="1.0"
xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
<rootfiles>
@@ -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"┃ <?xml version='1.0' encoding='utf-8'?>
- <package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="EPB-UUID">
+ string content = format(q"┃ <?xml version="1.0" encoding="UTF-8"?>
+ <package version="2.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="EPB-UUID">
<metadata
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xmlns:dcterms="https://purl.org/dc/terms/"
@@ -262,13 +262,13 @@ template outputEPub3() {
auto markup = InlineMarkup();
static auto rgx = RgxO();
enum DomTags { none, open, close, close_and_open, open_still, }
- string toc = format(q"┃<?xml version='1.0' encoding='utf-8'?>
+ string toc = format(q"┃<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="https://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<!-- four required metadata items (for all NCX documents,
(including the relaxed constraints of OPS 2.0) -->
<title>%s%s</title>
- <link rel="stylesheet" href="css/epub.css" type="text/css" id="main-css" />
+ <link rel="stylesheet" href="Styles/epub.css" type="text/css" id="main-css" />
<meta name="dtb:uid" content="urn:uuid:%s" />
<meta name="dtb:depth" content="%s" />
<meta name="dtb:totalPageCount" content="0" />
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() {
<meta name="generator" content="%s" />
<link rel="generator" href="%s" />
<link rel="shortcut icon" href="../_dr/image/dr.ico" />
- <link rel="stylesheet" href="css/epub.css" type="text/css" id="main-css" />
+ <link rel="stylesheet" href="Styles/epub.css" type="text/css" id="main-css" />
</head>
<body lang="%s">
<a name="top" id="top"></a>┃",
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 09:27:02 +0000