From e31e98f5cc3c2289ad47198a506d8d03a063512c Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 7 May 2017 16:07:11 -0400
Subject: 0.15.0 named modules
---
src/sdp/abstraction.d | 25 +++++++++++++------------
src/sdp/abstraction_summary.d | 5 +++--
src/sdp/ao_abstract_doc_source.d | 9 +++++----
src/sdp/ao_conf_make_meta.d | 7 ++++---
src/sdp/ao_conf_make_meta_native.d | 5 +++--
src/sdp/ao_conf_make_meta_sdlang.d | 5 +++--
src/sdp/ao_defaults.d | 1 +
src/sdp/ao_doc_debugs.d | 5 +++--
src/sdp/ao_object_setter.d | 1 +
src/sdp/ao_read_config_files.d | 1 +
src/sdp/ao_read_source_files.d | 5 +++--
src/sdp/ao_rgx.d | 3 ++-
src/sdp/compile_time_info.d | 1 +
src/sdp/create_zip_file.d | 1 +
src/sdp/defaults.d | 1 +
src/sdp/output_epub3.d | 13 +++++++------
src/sdp/output_html.d | 13 +++++++------
src/sdp/output_hub.d | 17 +++++++++--------
src/sdp/output_rgx.d | 3 ++-
src/sdp/output_xmls.d | 13 +++++++------
src/sdp/output_xmls_css.d | 1 +
src/sdp/paths_output.d | 3 ++-
src/sdp/paths_source.d | 3 ++-
src/sdp/source_sisupod.d | 11 ++++++-----
24 files changed, 88 insertions(+), 64 deletions(-)
(limited to 'src/sdp')
diff --git a/src/sdp/abstraction.d b/src/sdp/abstraction.d
index 726513c..40cf4d3 100644
--- a/src/sdp/abstraction.d
+++ b/src/sdp/abstraction.d
@@ -1,18 +1,19 @@
+module sdp.abstraction;
template SiSUabstraction() {
/+ sdp: sisu document parser, see http://sisudoc.org +/
import
- abstraction_summary,
- ao_abstract_doc_source,
- ao_conf_make_meta,
- ao_conf_make_meta_native,
- ao_conf_make_meta_sdlang,
- ao_defaults,
- ao_doc_debugs,
- ao_read_config_files,
- ao_read_source_files,
- ao_rgx,
- output_hub,
- paths_source;
+ sdp.abstraction_summary,
+ sdp.ao_abstract_doc_source,
+ sdp.ao_conf_make_meta,
+ sdp.ao_conf_make_meta_native,
+ sdp.ao_conf_make_meta_sdlang,
+ sdp.ao_defaults,
+ sdp.ao_doc_debugs,
+ sdp.ao_read_config_files,
+ sdp.ao_read_source_files,
+ sdp.ao_rgx,
+ sdp.output_hub,
+ sdp.paths_source;
/+ sdlang http://sdlang.org +/
import sdlang;
/+ std +/
diff --git a/src/sdp/abstraction_summary.d b/src/sdp/abstraction_summary.d
index fe97783..9532fc7 100644
--- a/src/sdp/abstraction_summary.d
+++ b/src/sdp/abstraction_summary.d
@@ -1,11 +1,12 @@
+module sdp.abstraction_summary;
template SiSUabstractionSummary() {
auto SiSUabstractionSummary(S,T)(
auto return ref const S doc_abstraction,
auto return ref T doc_matters,
) {
import
- ao_defaults,
- ao_rgx;
+ sdp.ao_defaults,
+ sdp.ao_rgx;
import
std.array,
std.exception,
diff --git a/src/sdp/ao_abstract_doc_source.d b/src/sdp/ao_abstract_doc_source.d
index baf13b8..ab7cc99 100644
--- a/src/sdp/ao_abstract_doc_source.d
+++ b/src/sdp/ao_abstract_doc_source.d
@@ -3,13 +3,14 @@
abstraction of sisu markup for downstream processing
ao_abstract_doc_source.d
+/
+module sdp.ao_abstract_doc_source;
template SiSUdocAbstraction() {
/+ ↓ abstraction imports +/
import
- ao_defaults,
- ao_object_setter,
- ao_rgx,
- output_hub;
+ sdp.ao_defaults,
+ sdp.ao_object_setter,
+ sdp.ao_rgx,
+ sdp.output_hub;
private import
std.algorithm,
std.array,
diff --git a/src/sdp/ao_conf_make_meta.d b/src/sdp/ao_conf_make_meta.d
index b34b7f3..52cc98d 100644
--- a/src/sdp/ao_conf_make_meta.d
+++ b/src/sdp/ao_conf_make_meta.d
@@ -8,6 +8,7 @@
converting the metadata and make instructions to a common json format used by
program internally. Moved to associative array.
+/
+module sdp.ao_conf_make_meta;
template SiSUheaderExtractHub() {
private import
std.exception,
@@ -19,9 +20,9 @@ template SiSUheaderExtractHub() {
std.conv : to;
private import sdlang;
private import
- ao_rgx,
- ao_conf_make_meta_native,
- ao_conf_make_meta_sdlang;
+ sdp.ao_rgx,
+ sdp.ao_conf_make_meta_native,
+ sdp.ao_conf_make_meta_sdlang;
mixin SiSUrgxInit;
mixin SiSUheaderExtractNative;
mixin SiSUheaderExtractSDLang;
diff --git a/src/sdp/ao_conf_make_meta_native.d b/src/sdp/ao_conf_make_meta_native.d
index 500be52..899b59f 100644
--- a/src/sdp/ao_conf_make_meta_native.d
+++ b/src/sdp/ao_conf_make_meta_native.d
@@ -2,6 +2,7 @@
native headers using<br>@title:<BR>:subtitle:<BR>type tags<BR>
extract native/orig header return associative array
+/
+module sdp.ao_conf_make_meta_native;
template SiSUheaderExtractNative() {
private import
std.exception,
@@ -13,8 +14,8 @@ template SiSUheaderExtractNative() {
std.utf,
std.conv : to;
private import
- ao_rgx,
- ao_defaults;
+ sdp.ao_rgx,
+ sdp.ao_defaults;
struct HeaderDocMetadataAndMakeNativeToAA {
mixin SiSUregisters;
mixin SiSUrgxInitFlags;
diff --git a/src/sdp/ao_conf_make_meta_sdlang.d b/src/sdp/ao_conf_make_meta_sdlang.d
index 74bb996..1fb8993 100644
--- a/src/sdp/ao_conf_make_meta_sdlang.d
+++ b/src/sdp/ao_conf_make_meta_sdlang.d
@@ -2,6 +2,7 @@
sdlang headers<BR>
extract sdlang header return sdlang
+/
+module sdp.ao_conf_make_meta_sdlang;
template SiSUheaderExtractSDLang() {
private import
std.exception,
@@ -13,8 +14,8 @@ template SiSUheaderExtractSDLang() {
std.utf,
std.conv : to;
private import
- ao_rgx,
- ao_defaults;
+ sdp.ao_rgx,
+ sdp.ao_defaults;
struct HeaderExtractSDL {
mixin SiSUregisters;
mixin SiSUrgxInit;
diff --git a/src/sdp/ao_defaults.d b/src/sdp/ao_defaults.d
index 363cc39..6363fdc 100644
--- a/src/sdp/ao_defaults.d
+++ b/src/sdp/ao_defaults.d
@@ -1,6 +1,7 @@
/++
default settings
+/
+module sdp.ao_defaults;
template SiSUregisters() {
private import
std.algorithm,
diff --git a/src/sdp/ao_doc_debugs.d b/src/sdp/ao_doc_debugs.d
index e650e5b..2c78c76 100644
--- a/src/sdp/ao_doc_debugs.d
+++ b/src/sdp/ao_doc_debugs.d
@@ -1,10 +1,11 @@
/++
output debugs
+/
+module sdp.ao_doc_debugs;
template SiSUdebugs() {
import
- ao_defaults,
- ao_rgx;
+ sdp.ao_defaults,
+ sdp.ao_rgx;
private import
std.algorithm,
std.array,
diff --git a/src/sdp/ao_object_setter.d b/src/sdp/ao_object_setter.d
index f09e64d..a5ddb4a 100644
--- a/src/sdp/ao_object_setter.d
+++ b/src/sdp/ao_object_setter.d
@@ -3,6 +3,7 @@
setting of sisu objects for downstream processing
ao_object_setter.d
+/
+module sdp.ao_object_setter;
template ObjectSetter() {
/+ structs +/
struct HeadingAttrib {
diff --git a/src/sdp/ao_read_config_files.d b/src/sdp/ao_read_config_files.d
index 2cdf861..b8d9890 100644
--- a/src/sdp/ao_read_config_files.d
+++ b/src/sdp/ao_read_config_files.d
@@ -3,6 +3,7 @@
- read config files<BR>
ao_config_files.d
+/
+module sdp.ao_read_config_files;
template ConfigIn() {
private import
std.algorithm,
diff --git a/src/sdp/ao_read_source_files.d b/src/sdp/ao_read_source_files.d
index 33e7987..b6ad942 100644
--- a/src/sdp/ao_read_source_files.d
+++ b/src/sdp/ao_read_source_files.d
@@ -3,9 +3,10 @@
- open markup files<BR>
- if master file scan for addional files to import/insert
+/
+module sdp.ao_read_source_files;
template SiSUrawMarkupContent() {
private import
- ao_rgx;
+ sdp.ao_rgx;
private import
std.algorithm,
std.array,
@@ -139,7 +140,7 @@ template SiSUrawMarkupContent() {
}
}
struct Inserts {
- private import ao_defaults;
+ private import sdp.ao_defaults;
auto scan_subdoc_source(
char[][] markup_sourcefile_insert_content,
string fn_src
diff --git a/src/sdp/ao_rgx.d b/src/sdp/ao_rgx.d
index 38c7fae..29a96af 100644
--- a/src/sdp/ao_rgx.d
+++ b/src/sdp/ao_rgx.d
@@ -1,8 +1,9 @@
/++
regex: regular expressions used in sisu document parser
+/
+module sdp.ao_rgx;
template SiSUrgxInit() {
- private import ao_defaults;
+ private import sdp.ao_defaults;
struct Rgx {
/+ misc +/
static true_dollar = ctRegex!(`\$`, "gm");
diff --git a/src/sdp/compile_time_info.d b/src/sdp/compile_time_info.d
index 2b0151d..cf4d0a5 100644
--- a/src/sdp/compile_time_info.d
+++ b/src/sdp/compile_time_info.d
@@ -1,6 +1,7 @@
/++
compile_time_info
+/
+module sdp.compile_time_info;
template CompileTimeInfo() {
version(Windows) {
pragma(msg, "[ Windows compilation ]");
diff --git a/src/sdp/create_zip_file.d b/src/sdp/create_zip_file.d
index 6ea55f4..93e85ee 100644
--- a/src/sdp/create_zip_file.d
+++ b/src/sdp/create_zip_file.d
@@ -1,3 +1,4 @@
+module sdp.create_zip_file;
template createZipFile() {
import std.file;
import std.outbuffer;
diff --git a/src/sdp/defaults.d b/src/sdp/defaults.d
index d4e4220..a344f7f 100644
--- a/src/sdp/defaults.d
+++ b/src/sdp/defaults.d
@@ -1,6 +1,7 @@
/++
default settings
+/
+module sdp.defaults;
template InternalMarkup() {
struct InlineMarkup {
diff --git a/src/sdp/output_epub3.d b/src/sdp/output_epub3.d
index 56f9be3..6cc496c 100644
--- a/src/sdp/output_epub3.d
+++ b/src/sdp/output_epub3.d
@@ -1,3 +1,4 @@
+module sdp.output_epub3;
template outputEPub3() {
private import
std.algorithm,
@@ -22,12 +23,12 @@ template outputEPub3() {
std.zip,
std.conv : to;
import
- create_zip_file,
- defaults,
- output_rgx,
- output_xmls,
- output_xmls_css,
- paths_output;
+ sdp.create_zip_file,
+ sdp.defaults,
+ sdp.output_rgx,
+ sdp.output_xmls,
+ sdp.output_xmls_css,
+ sdp.paths_output;
mixin InternalMarkup;
mixin outputXHTMLs;
string epub3_mimetypes() {
diff --git a/src/sdp/output_html.d b/src/sdp/output_html.d
index 363ff4a..41d68dd 100644
--- a/src/sdp/output_html.d
+++ b/src/sdp/output_html.d
@@ -1,3 +1,4 @@
+module sdp.output_html;
template outputHTML() {
private import
std.algorithm,
@@ -22,12 +23,12 @@ template outputHTML() {
std.zip,
std.conv : to;
import
- create_zip_file,
- defaults,
- output_rgx,
- output_xmls,
- output_xmls_css,
- paths_output;
+ sdp.create_zip_file,
+ sdp.defaults,
+ sdp.output_rgx,
+ sdp.output_xmls,
+ sdp.output_xmls_css,
+ sdp.paths_output;
mixin outputXHTMLs;
void scroll(D,I)(
diff --git a/src/sdp/output_hub.d b/src/sdp/output_hub.d
index 389d187..ef8156c 100644
--- a/src/sdp/output_hub.d
+++ b/src/sdp/output_hub.d
@@ -2,6 +2,7 @@
output hub<BR>
check & generate output types requested
+/
+module sdp.output_hub;
template outputHub() {
private import
std.regex,
@@ -22,14 +23,14 @@ template outputHub() {
std.uni,
std.utf;
import
- create_zip_file,
- defaults,
- output_epub3,
- output_html,
- output_rgx,
- output_xmls,
- paths_output,
- source_sisupod;
+ sdp.defaults,
+ sdp.output_epub3,
+ sdp.output_html,
+ sdp.output_rgx,
+ sdp.output_xmls,
+ sdp.source_sisupod,
+ sdp.create_zip_file,
+ sdp.paths_output;
void outputHub(D,I)(D doc_abstraction, I doc_matters) {
mixin SiSUoutputRgxInit;
auto rgx = Rgx();
diff --git a/src/sdp/output_rgx.d b/src/sdp/output_rgx.d
index be0a91e..af0751e 100644
--- a/src/sdp/output_rgx.d
+++ b/src/sdp/output_rgx.d
@@ -1,8 +1,9 @@
/++
regex: regular expressions used in sisu document parser
+/
+module sdp.output_rgx;
template SiSUoutputRgxInit() {
- private import defaults;
+ private import sdp.defaults;
struct Rgx {
static newline = ctRegex!("\n", "mg");
static strip_br = ctRegex!("^<br>\n|<br>\n*$");
diff --git a/src/sdp/output_xmls.d b/src/sdp/output_xmls.d
index a408872..373a871 100644
--- a/src/sdp/output_xmls.d
+++ b/src/sdp/output_xmls.d
@@ -1,3 +1,4 @@
+module sdp.output_xmls;
template outputXHTMLs() {
private import
std.algorithm,
@@ -22,12 +23,12 @@ template outputXHTMLs() {
std.zip,
std.conv : to;
import
- create_zip_file,
- defaults,
- output_rgx,
- output_xmls,
- output_xmls_css,
- paths_output;
+ sdp.create_zip_file,
+ sdp.defaults,
+ sdp.output_rgx,
+ sdp.output_xmls,
+ sdp.output_xmls_css,
+ sdp.paths_output;
mixin SiSUoutputRgxInit;
struct outputXHTMLs {
auto rgx = Rgx();
diff --git a/src/sdp/output_xmls_css.d b/src/sdp/output_xmls_css.d
index c746b16..eb1ab2b 100644
--- a/src/sdp/output_xmls_css.d
+++ b/src/sdp/output_xmls_css.d
@@ -1,6 +1,7 @@
/++
default css settings
+/
+module sdp.output_xmls_css;
template SiSUcss() {
auto SiSUcss() {
string css_shared="
diff --git a/src/sdp/paths_output.d b/src/sdp/paths_output.d
index e9599db..ea68567 100644
--- a/src/sdp/paths_output.d
+++ b/src/sdp/paths_output.d
@@ -1,11 +1,12 @@
/++
default settings
+/
+module sdp.paths_output;
import std.array,
std.path,
std.regex,
std.stdio;
-import ao_rgx;
+import sdp.ao_rgx;
template SiSUpathsSisupod() {
mixin SiSUrgxInit;
auto rgx = Rgx();
diff --git a/src/sdp/paths_source.d b/src/sdp/paths_source.d
index f60949d..b5a60e8 100644
--- a/src/sdp/paths_source.d
+++ b/src/sdp/paths_source.d
@@ -3,11 +3,12 @@
- read config files<BR>
ao_config_files.d
+/
+module sdp.paths_source;
import std.array,
std.path,
std.regex,
std.stdio;
-import ao_rgx;
+import sdp.ao_rgx;
template SiSUpathsSRC() {
mixin SiSUrgxInit;
auto rgx = Rgx();
diff --git a/src/sdp/source_sisupod.d b/src/sdp/source_sisupod.d
index e5233ba..7babba3 100644
--- a/src/sdp/source_sisupod.d
+++ b/src/sdp/source_sisupod.d
@@ -1,3 +1,4 @@
+module sdp.source_sisupod;
template SiSUpod() {
private import
std.algorithm,
@@ -22,11 +23,11 @@ template SiSUpod() {
std.zip,
std.conv : to;
import
- create_zip_file,
- defaults,
- output_rgx,
- output_xmls,
- paths_output;
+ sdp.create_zip_file,
+ sdp.defaults,
+ sdp.output_rgx,
+ sdp.output_xmls,
+ sdp.paths_output;
void SiSUpod(T)(T doc_matters) {
debug(asserts) {
// static assert(is(typeof(doc_matters) == tuple));
--
cgit v1.2.3