aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
Diffstat (limited to 'org')
-rw-r--r--org/default_paths.org138
-rw-r--r--org/output_sqlite.org2
-rw-r--r--org/output_sqlite_discrete.org2
-rw-r--r--org/output_xmls.org25
-rw-r--r--org/sdp.org2
5 files changed, 84 insertions, 85 deletions
diff --git a/org/default_paths.org b/org/default_paths.org
index 99da708..f40ebdf 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -298,25 +298,25 @@ template SiSUpathsSRC() {
return "sisudoc";
}
auto media_root() {
- return doc_root.chainPath("media").array;
+ return asNormalizedPath(doc_root.chainPath("media")).array;
}
auto conf_root() {
- return doc_root.chainPath("conf").array;
+ return asNormalizedPath(doc_root.chainPath("conf")).array;
}
auto text_root() {
- return media_root.chainPath("text").array;
+ return asNormalizedPath(media_root.chainPath("text")).array;
}
auto image_root() {
- return media_root.chainPath("image").array;
+ return asNormalizedPath(media_root.chainPath("image")).array;
}
auto doc_src_fn_with_path_for_text_root_and_lng() {
- return text_root.chainPath(language).array;
+ return asNormalizedPath(text_root.chainPath(language)).array;
}
auto doc_src_with_relative_path() {
- return pwd.chainPath(_fn_src_and_relative_path).array;
+ return asNormalizedPath(pwd.chainPath(_fn_src_and_relative_path)).array;
}
auto doc_src_fn() {
- return _fn_src_and_relative_path.baseName.array;
+ return asNormalizedPath(_fn_src_and_relative_path.baseName).array;
}
}
return SisuSrcPaths();
@@ -447,7 +447,7 @@ template SiSUpathsSisupods() {
}
auto pod_root(string fn_src) {
auto pth_1_ = "";
- auto pth_2_ = base(fn_src).filesystem_open_zpod.chainPath("").array; // "sisudoc"
+ auto pth_2_ = asNormalizedPath(base(fn_src).filesystem_open_zpod.chainPath("")).array; // "sisudoc"
struct _pods {
auto zpod() {
return pth_1_;
@@ -461,7 +461,7 @@ template SiSUpathsSisupods() {
auto conf_root(string fn_src) {
auto pod_root_ = pod_root(fn_src);
auto pth_1_ = "conf";
- auto pth_2_ = pod_root(fn_src).filesystem_open_zpod.chainPath("conf").array;
+ auto pth_2_ = asNormalizedPath(pod_root(fn_src).filesystem_open_zpod.chainPath("conf")).array;
struct _pods {
auto zpod() {
return pth_1_;
@@ -475,8 +475,8 @@ template SiSUpathsSisupods() {
}
auto css(string fn_src) {
auto pod_root_ = pod_root(fn_src);
- auto pth_1_ = conf_root(fn_src).zpod.chainPath("css").array;
- auto pth_2_ = conf_root(fn_src).filesystem_open_zpod.chainPath("css").array;
+ auto pth_1_ = asNormalizedPath(conf_root(fn_src).zpod.chainPath("css")).array;
+ auto pth_2_ = asNormalizedPath(conf_root(fn_src).filesystem_open_zpod.chainPath("css")).array;
struct _pods {
auto zpod() {
return pth_1_;
@@ -491,7 +491,7 @@ template SiSUpathsSisupods() {
auto media_root(string fn_src) {
auto pod_root_ = pod_root(fn_src);
auto pth_1_ = "media";
- auto pth_2_ = pod_root(fn_src).filesystem_open_zpod.chainPath("media").array;
+ auto pth_2_ = asNormalizedPath(pod_root(fn_src).filesystem_open_zpod.chainPath("media")).array;
struct _pods {
auto zpod() {
return pth_1_;
@@ -505,8 +505,8 @@ template SiSUpathsSisupods() {
}
auto text_root(string fn_src) {
auto pod_root_ = pod_root(fn_src);
- auto pth_1_ = media_root(fn_src).zpod.chainPath("text").array;
- auto pth_2_ = media_root(fn_src).filesystem_open_zpod.chainPath("text").array;
+ auto pth_1_ = asNormalizedPath(media_root(fn_src).zpod.chainPath("text")).array;
+ auto pth_2_ = asNormalizedPath(media_root(fn_src).filesystem_open_zpod.chainPath("text")).array;
struct _pods {
auto zpod() {
return pth_1_;
@@ -535,8 +535,8 @@ template SiSUpathsSisupods() {
}
auto doc_lng(string fn_src, string lng) {
auto pod_root_ = pod_root(fn_src);
- auto pth_1_ = text_root(fn_src).zpod.chainPath(lng).array;
- auto pth_2_ = text_root(fn_src).filesystem_open_zpod.chainPath(lng).array;
+ auto pth_1_ = asNormalizedPath(text_root(fn_src).zpod.chainPath(lng)).array;
+ auto pth_2_ = asNormalizedPath(text_root(fn_src).filesystem_open_zpod.chainPath(lng)).array;
struct _pods {
auto zpod() {
return pth_1_;
@@ -550,8 +550,8 @@ template SiSUpathsSisupods() {
}
auto image_root(string fn_src) {
auto pod_root_ = pod_root(fn_src);
- auto pth_1_ = media_root(fn_src).zpod.chainPath("image").array;
- auto pth_2_ = media_root(fn_src).filesystem_open_zpod.chainPath("image").array;
+ auto pth_1_ = asNormalizedPath(media_root(fn_src).zpod.chainPath("image")).array;
+ auto pth_2_ = asNormalizedPath(media_root(fn_src).filesystem_open_zpod.chainPath("image")).array;
struct _pods {
auto zpod() {
return pth_1_;
@@ -567,7 +567,7 @@ template SiSUpathsSisupods() {
auto pod_root_ = pod_root(fn_src);
auto _manifest = PodManifest!()(fn_src).pod_manifest_filename;
auto pth_1_ = _manifest;
- auto pth_2_ = pod_root(fn_src).filesystem_open_zpod.chainPath(_manifest).array;
+ auto pth_2_ = asNormalizedPath(pod_root(fn_src).filesystem_open_zpod.chainPath(_manifest)).array;
struct _pods {
auto zpod() {
return pth_1_;
@@ -581,8 +581,8 @@ template SiSUpathsSisupods() {
}
auto fn_doc(string fn_src, string lng) {
auto pod_root_ = pod_root(fn_src);
- auto pth_1_ = doc_lng(fn_src, lng).zpod.chainPath(fn_src.baseName).array;
- auto pth_2_ = doc_lng(fn_src, lng).filesystem_open_zpod.chainPath(fn_src.baseName).array;
+ auto pth_1_ = asNormalizedPath(doc_lng(fn_src, lng).zpod.chainPath(fn_src.baseName)).array;
+ auto pth_2_ = asNormalizedPath(doc_lng(fn_src, lng).filesystem_open_zpod.chainPath(fn_src.baseName)).array;
struct _pods {
auto zpod() {
return pth_1_;
@@ -596,8 +596,8 @@ template SiSUpathsSisupods() {
}
auto fn_doc_insert(string fn_src, string fn_insert, string lng) {
auto pod_root_ = pod_root(fn_src);
- auto pth_1_ = doc_lng(fn_src, lng).zpod.chainPath(fn_insert.baseName).array;
- auto pth_2_ = doc_lng(fn_src, lng).filesystem_open_zpod.chainPath(fn_insert.baseName).array;
+ auto pth_1_ = asNormalizedPath(doc_lng(fn_src, lng).zpod.chainPath(fn_insert.baseName)).array;
+ auto pth_2_ = asNormalizedPath(doc_lng(fn_src, lng).filesystem_open_zpod.chainPath(fn_insert.baseName)).array;
struct _pods {
auto zpod() {
return pth_1_;
@@ -639,16 +639,22 @@ import sdp.meta.rgx;
#+name: template_paths_out
#+BEGIN_SRC d
template SiSUoutPaths() {
- auto SiSUoutPaths(Ps,Lng)(
- Ps src_pth_info,
+ auto SiSUoutPaths(Po,Lng)(
+ Po output_pth_root,
Lng lng,
) {
struct _PathsStruct {
string output_root() {
- return "sisugen";
+ string out_root_;
+ if (output_pth_root.length > 0) {
+ out_root_ = output_pth_root;
+ } else {
+ out_root_ = "sisugen";
+ }
+ return out_root_;
}
string output_base() {
- return output_root.chainPath(lng).array;
+ return asNormalizedPath(output_root.chainPath(lng)).array;
}
}
return _PathsStruct();
@@ -663,11 +669,11 @@ template SiSUoutPaths() {
template SiSUpathsHTML() {
mixin SiSUrgxInit;
static auto rgx = Rgx();
- auto SiSUpathsHTML(Ps,Lng)(
- Ps src_pth_info,
+ auto SiSUpathsHTML(Po,Lng)(
+ Po output_pth_root,
Lng lng,
) {
- auto out_pth = SiSUoutPaths!()(src_pth_info, lng);
+ auto out_pth = SiSUoutPaths!()(output_pth_root, lng);
string base_dir = "html";
string suffix = ".html";
struct _PathsStruct {
@@ -675,28 +681,28 @@ template SiSUpathsHTML() {
return fn_src.baseName.stripExtension;
}
string base() {
- return (out_pth.output_base).chainPath(base_dir).array;
+ return asNormalizedPath((out_pth.output_base).chainPath(base_dir)).array;
}
string image() {
- return (out_pth.output_root).chainPath("image").array;
+ return asNormalizedPath((out_pth.output_root).chainPath("image")).array;
}
string css() {
- return (out_pth.output_root).chainPath("css").array;
+ return asNormalizedPath((out_pth.output_root).chainPath("css")).array;
}
string fn_seg_css() {
- return css.chainPath("html_seg.css").array;
+ return asNormalizedPath(css.chainPath("html_seg.css")).array;
}
string fn_scroll_css() {
- return css.chainPath("html_scroll.css").array;
+ return asNormalizedPath(css.chainPath("html_scroll.css")).array;
}
string seg(string fn_src) {
- return base.chainPath(base_filename(fn_src)).array;
+ return asNormalizedPath(base.chainPath(base_filename(fn_src))).array;
}
string fn_scroll(string fn_src) {
- return base.chainPath(base_filename(fn_src) ~ suffix).array;
+ return asNormalizedPath(base.chainPath(base_filename(fn_src) ~ suffix)).array;
}
string fn_seg(string fn_src, string seg_filename) {
- return seg(fn_src).chainPath(seg_filename ~ suffix).array;
+ return asNormalizedPath(seg(fn_src).chainPath(seg_filename ~ suffix)).array;
}
}
return _PathsStruct();
@@ -711,57 +717,57 @@ template SiSUpathsHTML() {
template SiSUpathsEPUB() {
mixin SiSUrgxInit;
static auto rgx = Rgx();
- auto SiSUpathsEPUB(Ps,Lng)(
- Ps src_pth_info,
+ auto SiSUpathsEPUB(Po,Lng)(
+ Po output_pth_root,
Lng lng,
) {
- auto out_pth = SiSUoutPaths!()(src_pth_info, lng);
+ auto out_pth = SiSUoutPaths!()( output_pth_root, lng);
string base_dir = "epub";
struct _PathsStruct {
string base() {
- return (out_pth.output_base).chainPath(base_dir).array;
+ return asNormalizedPath((out_pth.output_base).chainPath(base_dir)).array;
}
string base_filename(string fn_src) {
return fn_src.baseName.stripExtension;
}
string epub_file(string fn_src) {
- return base.chainPath(base_filename(fn_src) ~ ".epub").array;
+ return asNormalizedPath(base.chainPath(base_filename(fn_src) ~ ".epub")).array;
}
string dirtop() {
return "".chainPath("").array;
}
string doc_meta_inf(string fn_src) {
- return dirtop.chainPath("META-INF").array;
+ return asNormalizedPath(dirtop.chainPath("META-INF")).array;
}
string doc_oebps(string fn_src) {
- return dirtop.chainPath("OEBPS").array;
+ return asNormalizedPath(dirtop.chainPath("OEBPS")).array;
}
string doc_oebps_css(string fn_src) {
- return doc_oebps(fn_src).chainPath("css").array;
+ return asNormalizedPath(doc_oebps(fn_src).chainPath("css")).array;
}
string doc_oebps_image(string fn_src) {
- return doc_oebps(fn_src).chainPath("image").array;
+ return asNormalizedPath(doc_oebps(fn_src).chainPath("image")).array;
}
string fn_mimetypes(string fn_src) {
- return dirtop.chainPath("mimetypes").array;
+ return asNormalizedPath(dirtop.chainPath("mimetypes")).array;
}
string fn_dmi_container_xml(string fn_src) {
- return doc_meta_inf(fn_src).chainPath("container.xml").array;
+ return asNormalizedPath(doc_meta_inf(fn_src).chainPath("container.xml")).array;
}
string fn_oebps_toc_nav_xhtml(string fn_src) {
- return doc_oebps(fn_src).chainPath("toc_nav.xhtml").array;
+ return asNormalizedPath(doc_oebps(fn_src).chainPath("toc_nav.xhtml")).array;
}
string fn_oebps_toc_ncx(string fn_src) {
- return doc_oebps(fn_src).chainPath("toc.ncx").array;
+ return asNormalizedPath(doc_oebps(fn_src).chainPath("toc.ncx")).array;
}
string fn_oebps_content_opf(string fn_src) {
- return doc_oebps(fn_src).chainPath("content.opf").array;
+ return asNormalizedPath(doc_oebps(fn_src).chainPath("content.opf")).array;
}
string fn_oebps_content_xhtml(string fn_src, string seg_filename) {
- return doc_oebps(fn_src).chainPath(seg_filename ~ ".xhtml").array;
+ return asNormalizedPath(doc_oebps(fn_src).chainPath(seg_filename ~ ".xhtml")).array;
}
string fn_oebps_css(string fn_src) {
- return doc_oebps_css(fn_src).chainPath("epub.css").array;
+ return asNormalizedPath(doc_oebps_css(fn_src).chainPath("epub.css")).array;
}
debug(epub_output) {
string dbg_docdir(string fn_src) {
@@ -818,24 +824,24 @@ template SiSUpathsEPUB() {
template SiSUpathsSQLiteDiscrete() {
mixin SiSUrgxInit;
static auto rgx = Rgx();
- auto SiSUpathsSQLiteDiscrete(Ps,Lng)(
- Ps src_pth_info,
+ auto SiSUpathsSQLiteDiscrete(Po,Lng)(
+ Po output_pth_root,
Lng lng,
) {
- auto out_pth = SiSUoutPaths!()(src_pth_info, lng);
+ auto out_pth = SiSUoutPaths!()(output_pth_root, lng);
string base_dir = "sqlite";
struct _PathsStruct {
string base_filename(string fn_src) {
return fn_src.baseName.stripExtension;
}
string base() {
- return (out_pth.output_base).chainPath(base_dir).array;
+ return asNormalizedPath((out_pth.output_base).chainPath(base_dir)).array;
}
string seg(string fn_src) {
- return base.chainPath(base_filename(fn_src)).array;
+ return asNormalizedPath(base.chainPath(base_filename(fn_src))).array;
}
string sqlite_file(string fn_src) {
- return base.chainPath(base_filename(fn_src) ~ ".sqlite").array;
+ return asNormalizedPath(base.chainPath(base_filename(fn_src) ~ ".sqlite")).array;
}
}
return _PathsStruct();
@@ -850,24 +856,24 @@ template SiSUpathsSQLiteDiscrete() {
template SiSUpathsSQLite() {
mixin SiSUrgxInit;
static auto rgx = Rgx();
- auto SiSUpathsSQLite(Ps,Lng)(
- Ps src_pth_info,
+ auto SiSUpathsSQLite(Po,Lng)(
+ Po output_pth_root,
Lng lng,
) {
- auto out_pth = SiSUoutPaths!()(src_pth_info, lng);
+ auto out_pth = SiSUoutPaths!()(output_pth_root, lng);
string base_dir = "sqlite";
struct _PathsStruct {
string base_filename(string fn_src) {
return fn_src.baseName.stripExtension;
}
string base() {
- return (out_pth.output_base).chainPath(base_dir).array;
+ return asNormalizedPath((out_pth.output_base).chainPath(base_dir)).array;
}
string seg(string fn_src) {
- return base.chainPath(base_filename(fn_src)).array;
+ return asNormalizedPath(base.chainPath(base_filename(fn_src))).array;
}
string sqlite_file(string fn_src) {
- return base.chainPath(base_filename(fn_src) ~ ".sqlite").array;
+ return asNormalizedPath(base.chainPath(base_filename(fn_src) ~ ".sqlite")).array;
}
}
return _PathsStruct();
diff --git a/org/output_sqlite.org b/org/output_sqlite.org
index 14b6577..6d929a6 100644
--- a/org/output_sqlite.org
+++ b/org/output_sqlite.org
@@ -466,7 +466,7 @@ auto html_table(O)(
#+name: sqlite_db_initialize
#+BEGIN_SRC d
-auto pth_sqlite = SiSUpathsSQLite!()(doc_matters.src_path_info, doc_matters.language);
+auto pth_sqlite = SiSUpathsSQLite!()(doc_matters.output_path, doc_matters.language);
auto db = Database(pth_sqlite.sqlite_file(doc_matters.environment.pwd.baseName));
// auto db = Database(":memory:"); // open database in memory
if (doc_matters.opt_action.sqlite_create) {
diff --git a/org/output_sqlite_discrete.org b/org/output_sqlite_discrete.org
index 957b6e8..056e691 100644
--- a/org/output_sqlite_discrete.org
+++ b/org/output_sqlite_discrete.org
@@ -466,7 +466,7 @@ auto html_table(O)(
#+name: sqlite_db_initialize
#+BEGIN_SRC d
-auto pth_sqlite = SiSUpathsSQLiteDiscrete!()(doc_matters.src_path_info, doc_matters.language);
+auto pth_sqlite = SiSUpathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.language);
auto db = Database(pth_sqlite.sqlite_file(doc_matters.source_filename));
// auto db = Database(":memory:"); // open database in memory
db.run("
diff --git a/org/output_xmls.org b/org/output_xmls.org
index bcf8d8d..c73b42c 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -1474,15 +1474,12 @@ void scroll_write_output(M,C)(
debug(asserts) {
static assert(is(typeof(doc) == string[]));
}
- string fn_src = doc_matters.source_filename;
- auto src_path_info = doc_matters.src_path_info;
- string lng = doc_matters.language;
- auto pth_html = SiSUpathsHTML!()(src_path_info, lng);
+ auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.language);
try {
if (!exists(pth_html.base)) {
pth_html.base.mkdirRecurse;
}
- auto f = File(pth_html.fn_scroll(fn_src), "w");
+ auto f = File(pth_html.fn_scroll(doc_matters.source_filename), "w");
foreach (o; doc) {
f.writeln(o);
}
@@ -1490,7 +1487,7 @@ void scroll_write_output(M,C)(
catch (ErrnoException ex) {
// Handle error
}
- writeln(" ", doc_matters.environment.pwd, "/", pth_html.fn_scroll(fn_src));
+ writeln(" ", pth_html.fn_scroll(doc_matters.source_filename));
}
#+END_SRC
@@ -1739,9 +1736,7 @@ void seg_write_output(M,D,E)(
}
mixin SiSUoutputRgxInit;
auto rgx = Rgx();
- auto src_path_info = doc_matters.src_path_info;
- string lng = doc_matters.language;
- auto pth_html = SiSUpathsHTML!()(src_path_info, lng);
+ auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.language);
auto xhtml_format = outputXHTMLs();
auto m = doc_matters.source_filename.matchFirst(rgx.src_fn);
try {
@@ -1762,7 +1757,7 @@ void seg_write_output(M,D,E)(
catch (ErrnoException ex) {
// handle error
}
- writeln(" ", doc_matters.environment.pwd, "/", pth_html.fn_seg(doc_matters.source_filename, "toc"));
+ writeln(" ", pth_html.fn_seg(doc_matters.source_filename, "toc"));
}
#+END_SRC
@@ -1774,7 +1769,7 @@ void css(M)(
auto return ref M doc_matters,
) {
auto css = SiSUcss();
- auto pth_html = SiSUpathsHTML!()(doc_matters.src_path_info, doc_matters.language);
+ auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.language);
try {
if (!exists(pth_html.css)) {
(pth_html.css).mkdirRecurse;
@@ -1869,7 +1864,7 @@ xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
#+BEGIN_SRC d
string epub3_oebps_content(D,I,P)(D doc_abstraction, I doc_matters, P parts) {
auto xhtml_format = outputXHTMLs();
- auto pth_epub3 = SiSUpathsEPUB!()(doc_matters.src_path_info, doc_matters.language);
+ auto pth_epub3 = SiSUpathsEPUB!()(doc_matters.output_path, doc_matters.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">
@@ -2458,9 +2453,7 @@ void epub3_write_output_files(M,D,E,Mt,Mic,Otnx,Otn,Oc)(
static assert(is(typeof(oebps_toc_ncx) == string));
static assert(is(typeof(oebps_content_opf) == string));
}
- auto src_path_info = doc_matters.src_path_info;
- string lng = doc_matters.language;
- auto pth_epub3 = SiSUpathsEPUB!()(src_path_info, lng);
+ auto pth_epub3 = SiSUpathsEPUB!()(doc_matters.output_path, doc_matters.language);
auto xhtml_format = outputXHTMLs();
/+ zip file +/
auto fn_epub = pth_epub3.epub_file(doc_matters.source_filename);
@@ -2632,7 +2625,7 @@ void epub3_write_output_files(M,D,E,Mt,Mic,Otnx,Otn,Oc)(
catch (ErrnoException ex) {
// Handle error
}
- writeln(" ", doc_matters.environment.pwd, "/", fn_epub);
+ writeln(" ", fn_epub);
#+END_SRC
** zip debug, read zip archive
diff --git a/org/sdp.org b/org/sdp.org
index 27b6cc8..4afed8b 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -26,7 +26,7 @@ struct Version {
int minor;
int patch;
}
-enum ver = Version(0, 23, 0);
+enum ver = Version(0, 23, 1);
#+END_SRC
** compilation restrictions (supported compilers)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 05:58:30 +0000