From b676529f393d3d460bc15eda52a259a7c1886652 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 6 Nov 2017 11:04:52 -0500 Subject: 0.20.0 sisupod & source dir structure changed - ./media (instead of ./multimedia) - ./media/text (instead of ./text) --- org/default_paths.org | 32 ++++++++++++++++---------------- org/sdp.org | 3 +-- src/sdp/output/paths_output.d | 16 ++++++++-------- src/sdp/output/paths_source.d | 8 ++++---- views/version.txt | 2 +- 5 files changed, 30 insertions(+), 31 deletions(-) diff --git a/org/default_paths.org b/org/default_paths.org index ebb50bc..24ece4e 100644 --- a/org/default_paths.org +++ b/org/default_paths.org @@ -54,15 +54,15 @@ template SiSUpathsSRC() { auto doc_root() { return "sisudoc"; } - auto text_root() { - return doc_root.chainPath("text").array; - } auto media_root() { - return doc_root.chainPath("docmedia").array; + return doc_root.chainPath("media").array; } auto conf_root() { return doc_root.chainPath("conf").array; } + auto text_root() { + return media_root.chainPath("text").array; + } auto image_root() { return media_root.chainPath("image").array; } @@ -110,13 +110,13 @@ sisupod └── sisudoc ├── conf │   └── sisu_document_make - ├── docmedia + ├── media │   ├── audio │   ├── image + │   ├── text + │   │ └── en │   └── video - ├── sisudoc.txt - └── text - └── en + └── sisudoc.txt _replace:_ @@ -183,15 +183,15 @@ template SiSUpathsSisupodZipped() { auto pod_root(string fn_src) { return "sisudoc"; } - auto text_root(string fn_src) { - return pod_root(fn_src).chainPath("text").array; - } auto media_root(string fn_src) { - return pod_root(fn_src).chainPath("docmedia").array; + return pod_root(fn_src).chainPath("media").array; } auto conf_root(string fn_src) { return pod_root(fn_src).chainPath("conf").array; } + auto text_root(string fn_src) { + return media_root(fn_src).chainPath("text").array; + } auto doc(string fn_src) { return text_root(fn_src); } @@ -241,15 +241,15 @@ template SiSUpathsSisupodFileSystem() { auto pod_root(string fn_src) { return base(fn_src).chainPath("sisudoc").array; } - auto text_root(string fn_src) { - return pod_root(fn_src).chainPath("text").array; - } auto media_root(string fn_src) { - return pod_root(fn_src).chainPath("docmedia").array; + return pod_root(fn_src).chainPath("media").array; } auto conf_root(string fn_src) { return pod_root(fn_src).chainPath("conf").array; } + auto text_root(string fn_src) { + return media_root(fn_src).chainPath("text").array; + } auto doc(string fn_src) { return pod_root(fn_src); } diff --git a/org/sdp.org b/org/sdp.org index 6649d88..39d76f6 100644 --- a/org/sdp.org +++ b/org/sdp.org @@ -26,7 +26,7 @@ struct Version { int minor; int patch; } -enum ver = Version(0, 19, 0); +enum ver = Version(0, 20, 0); #+END_SRC #+NAME: version_txt @@ -1173,4 +1173,3 @@ provide the result as a single set of make instructions for each document parsed | | | | - sub | | | | | | - subtitle | | |---------------------+-----------------------+-------------------------+------------------------+-----------------------------| - diff --git a/src/sdp/output/paths_output.d b/src/sdp/output/paths_output.d index d66ada8..2204965 100644 --- a/src/sdp/output/paths_output.d +++ b/src/sdp/output/paths_output.d @@ -54,15 +54,15 @@ template SiSUpathsSisupodZipped() { auto pod_root(string fn_src) { return "sisudoc"; } - auto text_root(string fn_src) { - return pod_root(fn_src).chainPath("text").array; - } auto media_root(string fn_src) { - return pod_root(fn_src).chainPath("docmedia").array; + return pod_root(fn_src).chainPath("media").array; } auto conf_root(string fn_src) { return pod_root(fn_src).chainPath("conf").array; } + auto text_root(string fn_src) { + return media_root(fn_src).chainPath("text").array; + } auto doc(string fn_src) { return text_root(fn_src); } @@ -106,15 +106,15 @@ template SiSUpathsSisupodFileSystem() { auto pod_root(string fn_src) { return base(fn_src).chainPath("sisudoc").array; } - auto text_root(string fn_src) { - return pod_root(fn_src).chainPath("text").array; - } auto media_root(string fn_src) { - return pod_root(fn_src).chainPath("docmedia").array; + return pod_root(fn_src).chainPath("media").array; } auto conf_root(string fn_src) { return pod_root(fn_src).chainPath("conf").array; } + auto text_root(string fn_src) { + return media_root(fn_src).chainPath("text").array; + } auto doc(string fn_src) { return pod_root(fn_src); } diff --git a/src/sdp/output/paths_source.d b/src/sdp/output/paths_source.d index c0dc234..a242a33 100644 --- a/src/sdp/output/paths_source.d +++ b/src/sdp/output/paths_source.d @@ -33,15 +33,15 @@ template SiSUpathsSRC() { auto doc_root() { return "sisudoc"; } - auto text_root() { - return doc_root.chainPath("text").array; - } auto media_root() { - return doc_root.chainPath("docmedia").array; + return doc_root.chainPath("media").array; } auto conf_root() { return doc_root.chainPath("conf").array; } + auto text_root() { + return media_root.chainPath("text").array; + } auto image_root() { return media_root.chainPath("image").array; } diff --git a/views/version.txt b/views/version.txt index c11baec..f39f6a3 100644 --- a/views/version.txt +++ b/views/version.txt @@ -4,7 +4,7 @@ struct Version { int minor; int patch; } -enum ver = Version(0, 19, 0); +enum ver = Version(0, 20, 0); version (Posix) { version (DigitalMars) { } else version (LDC) { -- cgit v1.2.3