aboutsummaryrefslogtreecommitdiffhomepage
path: root/org/out_xmls.org
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2020-01-25 13:34:47 -0500
committerRalph Amissah <ralph@amissah.com>2020-02-26 09:59:18 -0500
commited71ef0ac032456c882bea44b04c02863cb90a46 (patch)
treeb6a27cbb13a31a2e3e436aa9d75d125aa586a2c5 /org/out_xmls.org
parentaddress compilation issues with dmd (v2.090.0) (diff)
code ctRegex calls, tidying
Diffstat (limited to 'org/out_xmls.org')
-rw-r--r--org/out_xmls.org26
1 files changed, 13 insertions, 13 deletions
diff --git a/org/out_xmls.org b/org/out_xmls.org
index b5107f2..9f51e84 100644
--- a/org/out_xmls.org
+++ b/org/out_xmls.org
@@ -25,9 +25,9 @@
module doc_reform.io_out.xmls;
template outputXHTMLs() {
<<output_imports>>
- mixin spineOutputRgxInit;
+ mixin spineRgxOut;
struct outputXHTMLs {
- static auto rgx = Rgx();
+ static auto rgx = RgxO();
<<xhtml_format_objects>>
<<xhtml_format_objects_code>>
}
@@ -1526,9 +1526,9 @@ template outputHTML() {
const D doc_abstraction,
M doc_matters,
) {
- mixin spineOutputRgxInit;
+ mixin spineRgxOut;
auto xhtml_format = outputXHTMLs();
- static auto rgx = Rgx();
+ static auto rgx = RgxO();
string[] doc_html;
string[] doc;
string suffix = ".html";
@@ -1762,8 +1762,8 @@ template outputHTML() {
const D doc_abstraction,
M doc_matters,
) {
- mixin spineOutputRgxInit;
- static auto rgx = Rgx();
+ mixin spineRgxOut;
+ static auto rgx = RgxO();
auto xhtml_format = outputXHTMLs();
string[][string] doc_html;
string[][string] doc_html_endnotes;
@@ -2067,8 +2067,8 @@ template outputHTML() {
debug(asserts) {
static assert(is(typeof(doc_html) == string[][string]));
}
- mixin spineOutputRgxInit;
- static auto rgx = Rgx();
+ mixin spineRgxOut;
+ static auto rgx = RgxO();
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);
@@ -2333,7 +2333,7 @@ xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
@safe string epub3_oebps_toc_nav_xhtml(D,I)(D doc_abstraction, I doc_matters) {
enum DomTags { none, open, close, close_and_open, open_still, }
auto markup = InlineMarkup();
- static auto rgx = Rgx();
+ static auto rgx = RgxO();
string toc =format("<html xmlns=\"http://www.w3.org/1999/xhtml\"
xmlns:epub=\"http://www.idpf.org/2007/ops\">
<head>
@@ -2422,7 +2422,7 @@ xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
int counter = 0;
string _uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO shared elsewhere
auto markup = InlineMarkup();
- static auto rgx = Rgx();
+ 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'?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
@@ -2518,9 +2518,9 @@ xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
const D doc_abstraction,
I doc_matters,
) {
- mixin spineOutputRgxInit;
+ mixin spineRgxOut;
auto xhtml_format = outputXHTMLs();
- static auto rgx = Rgx();
+ static auto rgx = RgxO();
string[] doc;
string segment_filename;
string[] top_level_headings = ["","","",""];
@@ -2883,7 +2883,7 @@ xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
static assert(is(typeof(epub_write.oebps_toc_ncx) == string));
static assert(is(typeof(epub_write.oebps_content_opf) == string));
}
- static auto rgx = Rgx();
+ static auto rgx = RgxO();
auto pth_epub3 = spinePathsEPUB!()(doc_matters.output_path, doc_matters.src.language);
auto xhtml_format = outputXHTMLs();
/+ zip file +/