From 96b03396ddb487816ebd85d1c6f30400019702fc Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Fri, 15 Nov 2019 23:58:15 -0500
Subject: name changes
---
src/doc_reform/meta/conf_make_meta_json.d | 6 +-
src/doc_reform/meta/conf_make_meta_structs.d | 2 +-
src/doc_reform/meta/conf_make_meta_yaml.d | 20 +++----
src/doc_reform/meta/defaults.d | 12 ++--
src/doc_reform/meta/doc_debugs.d | 6 +-
src/doc_reform/meta/metadoc.d | 22 ++++----
src/doc_reform/meta/metadoc_from_src.d | 18 +++---
src/doc_reform/meta/metadoc_harvest.d | 8 +--
src/doc_reform/meta/metadoc_harvests_authors.d | 12 ++--
src/doc_reform/meta/metadoc_harvests_topics.d | 12 ++--
src/doc_reform/meta/metadoc_show_config.d | 4 +-
src/doc_reform/meta/metadoc_show_make.d | 4 +-
src/doc_reform/meta/metadoc_show_metadata.d | 4 +-
src/doc_reform/meta/metadoc_show_summary.d | 4 +-
src/doc_reform/meta/rgx.d | 2 +-
src/doc_reform/output/defaults.d | 2 +-
src/doc_reform/output/epub3.d | 10 ++--
src/doc_reform/output/html.d | 16 +++---
src/doc_reform/output/hub.d | 6 +-
src/doc_reform/output/latex.d | 10 ++--
src/doc_reform/output/odt.d | 14 ++---
src/doc_reform/output/paths_output.d | 76 +++++++++++++-------------
src/doc_reform/output/rgx.d | 2 +-
src/doc_reform/output/source_pod.d | 10 ++--
src/doc_reform/output/sqlite.d | 20 +++----
src/doc_reform/output/xmls.d | 8 +--
src/doc_reform/output/xmls_css.d | 10 ++--
src/doc_reform/source/paths_source.d | 18 +++---
src/doc_reform/source/read_config_files.d | 4 +-
src/doc_reform/source/read_source_files.d | 10 ++--
src/doc_reform/spine.d | 50 ++++++++---------
31 files changed, 201 insertions(+), 201 deletions(-)
(limited to 'src')
diff --git a/src/doc_reform/meta/conf_make_meta_json.d b/src/doc_reform/meta/conf_make_meta_json.d
index 4b3a29c..b80ea4f 100644
--- a/src/doc_reform/meta/conf_make_meta_json.d
+++ b/src/doc_reform/meta/conf_make_meta_json.d
@@ -3,7 +3,7 @@
extract json header return json
+/
module doc_reform.meta.conf_make_meta_json;
-static template contentJSONtoDocReformStruct() {
+static template contentJSONtoSpineStruct() {
import
std.algorithm,
std.array,
@@ -21,8 +21,8 @@ static template contentJSONtoDocReformStruct() {
doc_reform.meta.defaults,
doc_reform.meta.rgx;
ConfComposite _struct_composite;
- auto contentJSONtoDocReformStruct(C,J,M)(C _struct_composite, J _json, M _manifested, string _identifier) {
- mixin DocReformRgxInit;
+ auto contentJSONtoSpineStruct(C,J,M)(C _struct_composite, J _json, M _manifested, string _identifier) {
+ mixin spineRgxInit;
static auto rgx = Rgx();
debug (json) {
writeln(">> --------------------------- >>");
diff --git a/src/doc_reform/meta/conf_make_meta_structs.d b/src/doc_reform/meta/conf_make_meta_structs.d
index 0678b4f..7875777 100644
--- a/src/doc_reform/meta/conf_make_meta_structs.d
+++ b/src/doc_reform/meta/conf_make_meta_structs.d
@@ -13,7 +13,7 @@ import
import
doc_reform.meta.defaults,
doc_reform.meta.rgx;
-mixin DocReformRgxInit;
+mixin spineRgxInit;
static auto rgx = Rgx();
mixin InternalMarkup;
auto mkup = InlineMarkup();
diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d
index aa4d77d..3d39471 100644
--- a/src/doc_reform/meta/conf_make_meta_yaml.d
+++ b/src/doc_reform/meta/conf_make_meta_yaml.d
@@ -3,7 +3,7 @@
extract yaml header return struct
+/
module doc_reform.meta.conf_make_meta_yaml;
-static template contentYAMLtoDocReformStruct() {
+static template contentYAMLtoSpineStruct() {
import
std.algorithm,
std.array,
@@ -21,13 +21,13 @@ static template contentYAMLtoDocReformStruct() {
doc_reform.meta.defaults,
doc_reform.meta.rgx;
ConfComposite _struct_composite;
- auto contentYAMLtoDocReformStruct(C,Y,M)(
+ auto contentYAMLtoSpineStruct(C,Y,M)(
C _struct_composite,
Y _yaml,
M _manifested,
string _identifier
) {
- mixin DocReformRgxInit;
+ mixin spineRgxInit;
static auto rgx = Rgx();
confCompositeMakeBuild _mk;
/+ make ------------------------------------------------------------------- +/
@@ -775,13 +775,13 @@ static template contentYAMLtoDocReformStruct() {
return _struct_composite;
}
}
-static template configParseYAMLreturnDocReformStruct() {
+static template configParseYAMLreturnSpineStruct() {
import dyaml;
import
doc_reform.meta.conf_make_meta_structs,
doc_reform.meta.conf_make_meta_json;
- mixin contentYAMLtoDocReformStruct;
- auto configParseYAMLreturnDocReformStruct(T,CCm,M)(
+ mixin contentYAMLtoSpineStruct;
+ auto configParseYAMLreturnSpineStruct(T,CCm,M)(
T _document_struct,
CCm _make_and_meta_struct,
M _manifested
@@ -790,7 +790,7 @@ static template configParseYAMLreturnDocReformStruct() {
try {
yaml_root = Loader.fromString(_document_struct.content).load();
_make_and_meta_struct
- = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, yaml_root, _manifested, _document_struct.filename); // struct from yaml
+ = contentYAMLtoSpineStruct!()(_make_and_meta_struct, yaml_root, _manifested, _document_struct.filename); // struct from yaml
} catch {
import std.stdio;
writeln("ERROR failed to read content, not parsed as yaml");
@@ -813,8 +813,8 @@ static template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() {
doc_reform.meta.conf_make_meta_structs,
doc_reform.meta.conf_make_meta_json,
doc_reform.meta.rgx;
- mixin DocReformRgxInit;
- mixin contentJSONtoDocReformStruct;
+ mixin spineRgxInit;
+ mixin contentJSONtoSpineStruct;
static auto rgx = Rgx();
auto docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct(CCm,Src,M)(
Src header_src,
@@ -831,7 +831,7 @@ static template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() {
}
}
auto _header_and_make_and_meta_struct
- = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, _yaml_root, _manifested, "header");
+ = contentYAMLtoSpineStruct!()(_make_and_meta_struct, _yaml_root, _manifested, "header");
return _header_and_make_and_meta_struct;
}
}
diff --git a/src/doc_reform/meta/defaults.d b/src/doc_reform/meta/defaults.d
index 6c01139..847dcb9 100644
--- a/src/doc_reform/meta/defaults.d
+++ b/src/doc_reform/meta/defaults.d
@@ -2,7 +2,7 @@
default settings
+/
module doc_reform.meta.defaults;
-template DocReformRgxInitFlags() {
+template spineRgxInitFlags() {
/+ regex flags +/
static int[string] flags_type_init() {
int[string] flags_type_init = [
@@ -44,7 +44,7 @@ template DocReformRgxInitFlags() {
return flags_type_init;
}
}
-template DocReformNode() {
+template spineNode() {
static string[string] node_metadata_heading_str() {
string[string] _node = [
"is" : "",
@@ -87,8 +87,8 @@ template DocReformNode() {
return _node;
}
}
-template DocReformHarvest() {
- auto DocReformHarvest() {
+template spineHarvest() {
+ auto spineHarvest() {
struct _Harvest {
struct Harvest {
string title = "";
@@ -118,7 +118,7 @@ template DocReformHarvest() {
return _Harvest();
}
}
-template DocReformBiblio() {
+template spineBiblio() {
// required: deemed_author (author || editor); year; fulltitle;
struct BibJsnStr {
static auto biblio_entry_tags_jsonstr() {
@@ -199,7 +199,7 @@ template InternalMarkup() {
}
}
}
-template DocReformLanguageCodes() {
+template spineLanguageCodes() {
/+ language codes +/
struct Lang {
static string[string][string] codes() {
diff --git a/src/doc_reform/meta/doc_debugs.d b/src/doc_reform/meta/doc_debugs.d
index f96a942..4a9a591 100644
--- a/src/doc_reform/meta/doc_debugs.d
+++ b/src/doc_reform/meta/doc_debugs.d
@@ -2,7 +2,7 @@
output debugs
+/
module doc_reform.meta.doc_debugs;
-template DocReformDebugs() {
+template spineDebugs() {
import
doc_reform.meta.defaults,
doc_reform.meta.rgx;
@@ -22,11 +22,11 @@ template DocReformDebugs() {
std.typecons,
std.utf,
std.conv : to;
- auto DocReformDebugs(S,T)(
+ auto spineDebugs(S,T)(
const S contents,
T doc_matters,
) {
- mixin DocReformRgxInit;
+ mixin spineRgxInit;
mixin InternalMarkup;
static auto rgx = Rgx();
auto markup = InlineMarkup();
diff --git a/src/doc_reform/meta/metadoc.d b/src/doc_reform/meta/metadoc.d
index 4fb9677..0d6e7a5 100644
--- a/src/doc_reform/meta/metadoc.d
+++ b/src/doc_reform/meta/metadoc.d
@@ -1,5 +1,5 @@
module doc_reform.meta.metadoc;
-template DocReformAbstraction() {
+template spineAbstraction() {
import
std.datetime,
std.getopt,
@@ -21,16 +21,16 @@ template DocReformAbstraction() {
doc_reform.source.read_config_files,
doc_reform.source.read_source_files,
doc_reform.output.hub;
- mixin DocReformRgxInit;
- mixin contentJSONtoDocReformStruct;
- mixin DocReformBiblio;
- mixin DocReformRgxInitFlags;
+ mixin spineRgxInit;
+ mixin contentJSONtoSpineStruct;
+ mixin spineBiblio;
+ mixin spineRgxInitFlags;
mixin outputHub;
enum headBody { header, body_content, header_type, insert_file_list, image_list }
enum makeMeta { make, meta }
enum docAbst { doc_abstract_obj, doc_has }
static auto rgx = Rgx();
- auto DocReformAbstraction(E,P,O,M,S)(
+ auto spineAbstraction(E,P,O,M,S)(
E _env,
P program_info,
O _opt_action,
@@ -41,7 +41,7 @@ template DocReformAbstraction() {
auto _config_document_struct = readConfigDoc!()(_manifest, _env);
if (_config_document_struct.filetype == "yaml") {
import doc_reform.meta.conf_make_meta_yaml;
- _make_and_meta_struct = _config_document_struct.configParseYAMLreturnDocReformStruct!()(_make_and_meta_struct, _manifest);
+ _make_and_meta_struct = _config_document_struct.configParseYAMLreturnSpineStruct!()(_make_and_meta_struct, _manifest);
}
}
/+ ↓ read file (filename with path) +/
@@ -53,7 +53,7 @@ template DocReformAbstraction() {
);
}
auto _header_body_insertfilelist_imagelist
- = DocReformRawMarkupContent!()(_opt_action, _manifest.src.path_and_fn);
+ = spineRawMarkupContent!()(_opt_action, _manifest.src.path_and_fn);
static assert(!isTypeTuple!(_header_body_insertfilelist_imagelist));
static assert(_header_body_insertfilelist_imagelist.length==5);
if ((_opt_action.debug_do)
@@ -92,7 +92,7 @@ template DocReformAbstraction() {
) {
writeln("step3 commence → (document abstraction (da); da keys; segnames; doc_matters)");
}
- auto da = DocReformDocAbstraction!()(
+ auto da = docAbstraction!()(
_header_body_insertfilelist_imagelist[headBody.body_content],
_make_and_meta_struct,
_opt_action,
@@ -117,7 +117,7 @@ template DocReformAbstraction() {
auto generator_program() {
struct Prog_ {
string project_name() {
- return "DocReform";
+ return "spine";
}
string name() {
return program_info.name;
@@ -191,7 +191,7 @@ template DocReformAbstraction() {
return _manifest.src;
}
auto src_path_info() {
- return DocReformPathsSRC!()(_manifest.env.pwd, _manifest.src.file_with_absolute_path); // would like (to have and use) relative path
+ return spinePathsSRC!()(_manifest.env.pwd, _manifest.src.file_with_absolute_path); // would like (to have and use) relative path
}
auto pod() {
return _manifest.pod;
diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d
index 4eb7771..511f761 100644
--- a/src/doc_reform/meta/metadoc_from_src.d
+++ b/src/doc_reform/meta/metadoc_from_src.d
@@ -4,7 +4,7 @@
metadoc_from_src.d
+/
module doc_reform.meta.metadoc_from_src;
-template DocReformDocAbstraction() {
+template docAbstraction() {
/+ ↓ abstraction imports +/
import doc_reform.meta;
import
@@ -20,7 +20,7 @@ template DocReformDocAbstraction() {
/+ ↓ abstraction mixins +/
mixin ObjectSetter;
mixin InternalMarkup;
- mixin DocReformRgxInit;
+ mixin spineRgxInit;
/+ ↓ abstraction struct init +/
/+ initialize +/
ObjGenericComposite[] the_table_of_contents_section;
@@ -309,7 +309,7 @@ template DocReformDocAbstraction() {
return tag_assoc;
}
/+ ↓ abstract marked up document +/
- auto DocReformDocAbstraction(CMM,Opt,Mf)(
+ auto docAbstraction(CMM,Opt,Mf)(
char[][] markup_sourcefile_content,
CMM conf_make_meta,
Opt opt_action,
@@ -333,8 +333,8 @@ template DocReformDocAbstraction() {
previous_length=0;
reset_note_numbers=true;
}
- mixin DocReformRgxInitFlags;
- mixin DocReformNode;
+ mixin spineRgxInitFlags;
+ mixin spineNode;
auto node_para_int_ = node_metadata_para_int;
auto node_para_str_ = node_metadata_para_str;
ObjGenericComposite comp_obj_heading_, comp_obj_para, comp_obj_toc;
@@ -3170,7 +3170,7 @@ template DocReformDocAbstraction() {
return ref string biblio_entry_str_json,
return ref string[] biblio_arr_json
) {
- mixin DocReformBiblio;
+ mixin spineBiblio;
auto jsn = BibJsnStr();
static auto rgx = Rgx();
if (line.matchFirst(rgx.heading_biblio)
@@ -5230,7 +5230,7 @@ template DocReformDocAbstraction() {
debug(asserts) {
static assert(is(typeof(obj_cite_digits.object_number) == int));
}
- mixin DocReformNode;
+ mixin spineNode;
mixin InternalMarkup;
static auto mkup = InlineMarkup();
string type_is;
@@ -5481,7 +5481,7 @@ template DocReformDocAbstraction() {
N obj_cite_digits,
O opt_action,
) {
- mixin DocReformNode;
+ mixin spineNode;
ObjGenericComposite[] the_endnotes_section;
auto endnotes_ = gathered_notes();
string type_is;
@@ -6125,7 +6125,7 @@ template DocReformDocAbstraction() {
"block status: off or closing");
}
/+ abstraction functions assertions ↑ +/
-} /+ ← closed: template DocReformDocAbstraction +/
+} /+ ← closed: template docAbstraction +/
template docSectKeysSeq() {
auto docSectKeysSeq(string[][string] document_section_keys_sequenced) {
struct doc_sect_keys_seq {
diff --git a/src/doc_reform/meta/metadoc_harvest.d b/src/doc_reform/meta/metadoc_harvest.d
index 2e6c426..37c375a 100644
--- a/src/doc_reform/meta/metadoc_harvest.d
+++ b/src/doc_reform/meta/metadoc_harvest.d
@@ -1,6 +1,6 @@
module doc_reform.meta.metadoc_harvest;
-template DocReformMetaDocHarvest() {
- auto DocReformMetaDocHarvest(T,H)(
+template spineMetaDocHarvest() {
+ auto spineMetaDocHarvest(T,H)(
T doc_matters,
H hvst,
) {
@@ -21,8 +21,8 @@ template DocReformMetaDocHarvest() {
mixin InternalMarkup;
auto markup = InlineMarkup();
import doc_reform.output.paths_output;
- auto pth_html_abs = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language);
- auto pth_html_rel = DocReformDocRootTreeHTML!()(doc_matters.src.language);
+ auto pth_html_abs = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language);
+ auto pth_html_rel = spineDocRootTreeHTML!()(doc_matters.src.language);
hvst.harvest.title = doc_matters.conf_make_meta.meta.title_full;
hvst.harvest.author = doc_matters.conf_make_meta.meta.creator_author;
hvst.harvest.author_surname = doc_matters.conf_make_meta.meta.creator_author_surname;
diff --git a/src/doc_reform/meta/metadoc_harvests_authors.d b/src/doc_reform/meta/metadoc_harvests_authors.d
index acb21ce..21e8f28 100644
--- a/src/doc_reform/meta/metadoc_harvests_authors.d
+++ b/src/doc_reform/meta/metadoc_harvests_authors.d
@@ -10,12 +10,12 @@ module doc_reform.meta.metadoc_harvests_authors;
import
doc_reform.meta.defaults,
doc_reform.meta.rgx;
- mixin DocReformHarvest;
+ mixin spineHarvest;
mixin InternalMarkup;
- mixin DocReformRgxInit;
-template DocReformMetaDocHarvestsAuthors() {
+ mixin spineRgxInit;
+template spineMetaDocHarvestsAuthors() {
auto mkup = InlineMarkup();
- void DocReformMetaDocHarvestsAuthors(H,M,O)(
+ void spineMetaDocHarvestsAuthors(H,M,O)(
H harvests,
M _make_and_meta_struct,
O _opt_action,
@@ -174,7 +174,7 @@ string theme_light_1 = format(q"┃
<link rel="generator" href="http://sisudoc.org" />
<link href="./css/harvest.css" rel="stylesheet">
<style TYPE="text/css">
-/* DocReform harvest css default stylesheet */%s
+/* spine harvest css default stylesheet */%s
.norm, .bold {
line-height : 150%%;
margin-left : 1em;
@@ -348,7 +348,7 @@ string theme_light_1 = format(q"┃
</html>
┃") ~ "\n";
import doc_reform.output.paths_output;
- auto out_pth = DocReformPathsHTML!()(_make_and_meta_struct.conf.output_path, "");
+ auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, "");
try {
auto f = File(out_pth.harvest("authors.html"), "w");
foreach (o; authors) {
diff --git a/src/doc_reform/meta/metadoc_harvests_topics.d b/src/doc_reform/meta/metadoc_harvests_topics.d
index 9f889b2..ea43d5a 100644
--- a/src/doc_reform/meta/metadoc_harvests_topics.d
+++ b/src/doc_reform/meta/metadoc_harvests_topics.d
@@ -10,12 +10,12 @@ module doc_reform.meta.metadoc_harvests_topics;
import
doc_reform.meta.defaults,
doc_reform.meta.rgx;
- mixin DocReformHarvest;
+ mixin spineHarvest;
mixin InternalMarkup;
- mixin DocReformRgxInit;
-template DocReformMetaDocHarvestsTopics() {
+ mixin spineRgxInit;
+template spineMetaDocHarvestsTopics() {
auto mkup = InlineMarkup();
- void DocReformMetaDocHarvestsTopics(H,M,O)(
+ void spineMetaDocHarvestsTopics(H,M,O)(
H hvst,
M _make_and_meta_struct,
O _opt_action,
@@ -215,7 +215,7 @@ string theme_light_1 = format(q"┃
<link rel="generator" href="http://sisudoc.org" />
<link href="./css/harvest.css" rel="stylesheet">
<style TYPE="text/css">
-/* DocReform harvest css default stylesheet */%s
+/* spine harvest css default stylesheet */%s
.norm, .bold {
line-height : 150%%;
margin-left : 1em;
@@ -507,7 +507,7 @@ string theme_light_1 = format(q"┃
</html>
┃") ~ "\n";
import doc_reform.output.paths_output;
- auto out_pth = DocReformPathsHTML!()(_make_and_meta_struct.conf.output_path, "");
+ auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, "");
try {
auto f = File(out_pth.harvest("topics.html"), "w");
foreach (o; topics) {
diff --git a/src/doc_reform/meta/metadoc_show_config.d b/src/doc_reform/meta/metadoc_show_config.d
index 25300aa..6e18516 100644
--- a/src/doc_reform/meta/metadoc_show_config.d
+++ b/src/doc_reform/meta/metadoc_show_config.d
@@ -1,6 +1,6 @@
module doc_reform.meta.metadoc_show_config;
-template DocReformShowConfig() {
- void DocReformShowConfig(T)(
+template spineShowConfig() {
+ void spineShowConfig(T)(
T doc_matters,
) {
import
diff --git a/src/doc_reform/meta/metadoc_show_make.d b/src/doc_reform/meta/metadoc_show_make.d
index 017480c..ed334d0 100644
--- a/src/doc_reform/meta/metadoc_show_make.d
+++ b/src/doc_reform/meta/metadoc_show_make.d
@@ -1,6 +1,6 @@
module doc_reform.meta.metadoc_show_make;
-template DocReformShowMake() {
- void DocReformShowMake(T)(
+template spineShowMake() {
+ void spineShowMake(T)(
T doc_matters,
) {
import
diff --git a/src/doc_reform/meta/metadoc_show_metadata.d b/src/doc_reform/meta/metadoc_show_metadata.d
index 11769db..e860452 100644
--- a/src/doc_reform/meta/metadoc_show_metadata.d
+++ b/src/doc_reform/meta/metadoc_show_metadata.d
@@ -1,6 +1,6 @@
module doc_reform.meta.metadoc_show_metadata;
-template DocReformShowMetaData() {
- void DocReformShowMetaData(T)(
+template spineShowMetaData() {
+ void spineShowMetaData(T)(
T doc_matters,
) {
import
diff --git a/src/doc_reform/meta/metadoc_show_summary.d b/src/doc_reform/meta/metadoc_show_summary.d
index 67db962..71d8d87 100644
--- a/src/doc_reform/meta/metadoc_show_summary.d
+++ b/src/doc_reform/meta/metadoc_show_summary.d
@@ -1,6 +1,6 @@
module doc_reform.meta.metadoc_show_summary;
-template DocReformMetaDocSummary() {
- void DocReformMetaDocSummary(S,T)(
+template spineMetaDocSummary() {
+ void spineMetaDocSummary(S,T)(
const S doc_abstraction,
T doc_matters,
) {
diff --git a/src/doc_reform/meta/rgx.d b/src/doc_reform/meta/rgx.d
index a7826be..d08100b 100644
--- a/src/doc_reform/meta/rgx.d
+++ b/src/doc_reform/meta/rgx.d
@@ -2,7 +2,7 @@
regex: regular expressions used in sisu document parser
+/
module doc_reform.meta.rgx;
-static template DocReformRgxInit() {
+static template spineRgxInit() {
import doc_reform.meta.defaults;
static struct Rgx {
/+ misc +/
diff --git a/src/doc_reform/output/defaults.d b/src/doc_reform/output/defaults.d
index 1db06e0..fc31ea9 100644
--- a/src/doc_reform/output/defaults.d
+++ b/src/doc_reform/output/defaults.d
@@ -47,7 +47,7 @@ template InternalMarkup() {
}
}
}
-template DocReformLanguageCodes() {
+template spineLanguageCodes() {
/+ language codes +/
struct Lang {
static string[string][string] codes() {
diff --git a/src/doc_reform/output/epub3.d b/src/doc_reform/output/epub3.d
index 2bdb8a9..f46ff6e 100644
--- a/src/doc_reform/output/epub3.d
+++ b/src/doc_reform/output/epub3.d
@@ -32,7 +32,7 @@ template outputEPub3() {
}
string epub3_oebps_content(D,M,P)(D doc_abstraction, M doc_matters, P parts) {
auto xhtml_format = outputXHTMLs();
- auto pth_epub3 = DocReformPathsEPUB!()(doc_matters.output_path, doc_matters.src.language);
+ 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">
@@ -221,7 +221,7 @@ template outputEPub3() {
<title>%s%s</title>
<link rel="stylesheet" href="css/epub.css" type="text/css" id="main-css" />
<meta name="dtb:uid" content="urn:uuid:%s" />
- <!-- <meta name="epub-creator" content="DocReform http://www.jus.uio.no/sisu (this copy)" /> -->
+ <!-- <meta name="epub-creator" content="spine http://www.jus.uio.no/sisu (this copy)" /> -->
<meta name="dtb:depth" content="%s" />
<meta name="dtb:totalPageCount" content="0" />
<meta name="dtb:maxPageNumber" content="0" />
@@ -301,7 +301,7 @@ template outputEPub3() {
const D doc_abstraction,
I doc_matters,
) {
- mixin DocReformOutputRgxInit;
+ mixin spineOutputRgxInit;
auto xhtml_format = outputXHTMLs();
auto rgx = Rgx();
string[] doc;
@@ -619,7 +619,7 @@ template outputEPub3() {
static assert(is(typeof(epub_write.oebps_content_opf) == string));
}
static auto rgx = Rgx();
- auto pth_epub3 = DocReformPathsEPUB!()(doc_matters.output_path, doc_matters.src.language);
+ auto pth_epub3 = spinePathsEPUB!()(doc_matters.output_path, doc_matters.src.language);
auto xhtml_format = outputXHTMLs();
/+ zip file +/
auto fn_epub = pth_epub3.epub_file(doc_matters.src.filename);
@@ -774,7 +774,7 @@ template outputEPub3() {
}
}
{ /+ OEBPS/epub.css +/
- auto css = DocReformCss(doc_matters);
+ auto css = spineCss(doc_matters);
{ /+ debug +/
if (doc_matters.opt.action.debug_do) {
fn_dbg = pth_epub3.dbg_fn_oebps_css(doc_matters.src.filename);
diff --git a/src/doc_reform/output/html.d b/src/doc_reform/output/html.d
index 85ec9ba..07da3c1 100644
--- a/src/doc_reform/output/html.d
+++ b/src/doc_reform/output/html.d
@@ -17,7 +17,7 @@ template outputHTML() {
const D doc_abstraction,
M doc_matters,
) {
- mixin DocReformOutputRgxInit;
+ mixin spineOutputRgxInit;
auto xhtml_format = outputXHTMLs();
auto rgx = Rgx();
string[] doc_html;
@@ -190,7 +190,7 @@ template outputHTML() {
debug(asserts) {
static assert(is(typeof(doc) == string[]));
}
- auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language);
+ auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language);
try {
if (!exists(pth_html.base)) {
pth_html.base.mkdirRecurse;
@@ -210,7 +210,7 @@ template outputHTML() {
const D doc_abstraction,
M doc_matters,
) {
- mixin DocReformOutputRgxInit;
+ mixin spineOutputRgxInit;
auto rgx = Rgx();
auto xhtml_format = outputXHTMLs();
string[][string] doc_html;
@@ -467,9 +467,9 @@ template outputHTML() {
debug(asserts) {
static assert(is(typeof(doc_html) == string[][string]));
}
- mixin DocReformOutputRgxInit;
+ mixin spineOutputRgxInit;
auto rgx = Rgx();
- auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language);
+ 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);
try {
@@ -494,8 +494,8 @@ template outputHTML() {
}
}
void css(M)(M doc_matters) {
- auto css = DocReformCss(doc_matters);
- auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language);
+ auto css = spineCss(doc_matters);
+ auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language);
try {
if (!exists(pth_html.css)) {
(pth_html.css).mkdirRecurse;
@@ -513,7 +513,7 @@ template outputHTML() {
) {
{ /+ (copy html images) +/
- auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language);
+ auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language);
if (!exists(pth_html.image)) {
pth_html.image.mkdirRecurse;
}
diff --git a/src/doc_reform/output/hub.d b/src/doc_reform/output/hub.d
index 66dcd43..acb8a68 100644
--- a/src/doc_reform/output/hub.d
+++ b/src/doc_reform/output/hub.d
@@ -11,7 +11,7 @@ template outputHub() {
doc_reform.output.paths_output;
import std.parallelism;
void outputHub(D,I)(const D doc_abstraction, I doc_matters) {
- mixin DocReformOutputRgxInit;
+ mixin spineOutputRgxInit;
mixin Msg;
auto msg = Msg!()(doc_matters);
static auto rgx = Rgx();
@@ -26,7 +26,7 @@ template outputHub() {
msg.v("spine (doc reform) source pod processing... ");
}
import doc_reform.output.source_pod;
- DocReformPod!()(doc_matters);
+ spinePod!()(doc_matters);
if (doc_matters.opt.action.source) {
msg.vv("spine (doc reform) source done");
}
@@ -109,7 +109,7 @@ template outputHubOp() {
doc_reform.output.create_zip_file,
doc_reform.output.paths_output;
void outputHubOp(E,O)(E env, O opt_action) {
- mixin DocReformOutputRgxInit;
+ mixin spineOutputRgxInit;
static auto rgx = Rgx();
if ((opt_action.sqlite_db_drop)) {
if ((opt_action.verbose)) {
diff --git a/src/doc_reform/output/latex.d b/src/doc_reform/output/latex.d
index da509ac..8308067 100644
--- a/src/doc_reform/output/latex.d
+++ b/src/doc_reform/output/latex.d
@@ -8,9 +8,9 @@ template outputLaTeX() {
std.uri,
std.conv : to;
mixin InternalMarkup; // watch
- mixin DocReformOutputRgxInit;
+ mixin spineOutputRgxInit;
auto rgx = Rgx();
- mixin DocReformLanguageCodes;
+ mixin spineLanguageCodes;
auto lang = Lang();
auto paper() {
struct PaperType {
@@ -219,7 +219,7 @@ template outputLaTeX() {
return _width;
}
string _latex_image_path(string _image_path) {
- auto pth_latex = DocReformPathsLaTeX(doc_matters);
+ auto pth_latex = spinePathsLaTeX(doc_matters);
_image_path = pth_latex.latex_path_stuff ~ "/" ~ _image_path;
return _image_path;
}
@@ -784,7 +784,7 @@ string table(O,M)(
linkcolor=myred, %% \href{...} and \pageref{...}
┃",
);
- string _latex_head = format(q"┃%%%% DocReform LaTeX output
+ string _latex_head = format(q"┃%%%% spine LaTeX output
%%%% Generated by: %s
%%%% D version: %s
%%%% LaTeX output last Generated on: %s
@@ -1155,7 +1155,7 @@ string table(O,M)(
const T latex_content,
M doc_matters,
) {
- auto pth_latex = DocReformPathsLaTeX(doc_matters);
+ auto pth_latex = spinePathsLaTeX(doc_matters);
try {
{ /+ debug +/
if (doc_matters.opt.action.debug_do
diff --git a/src/doc_reform/output/odt.d b/src/doc_reform/output/odt.d
index 075a73c..2d0c45d 100644
--- a/src/doc_reform/output/odt.d
+++ b/src/doc_reform/output/odt.d
@@ -12,7 +12,7 @@ template formatODT() {
doc_reform.output.create_zip_file,
doc_reform.output.xmls,
doc_reform.output.xmls_css;
- mixin DocReformOutputRgxInit;
+ mixin spineOutputRgxInit;
struct formatODT {
static auto rgx = Rgx();
string _tags(O)(const O obj){
@@ -603,7 +603,7 @@ template outputODT() {
doc_reform.output.xmls,
doc_reform.output.xmls_css;
mixin InternalMarkup;
- mixin DocReformOutputRgxInit;
+ mixin spineOutputRgxInit;
auto rgx = Rgx();
// mixin outputXmlODT;
string odt_head(I)(I doc_matters) {
@@ -841,7 +841,7 @@ template outputODT() {
}
string odt_tail() {
- string _odt_tail = format(q"┃<text:p text:style-name="P_normal">DocReform: <<text:a xl:type="simple" xl:href="http://www.doc_reform.org">www.doc_reform.org</text:a>> and <<text:a xl:type="simple" xl:href="http://www.sisudoc.org">www.sisudoc.org</text:a>></text:p>
+ string _odt_tail = format(q"┃<text:p text:style-name="P_normal">spine: <<text:a xl:type="simple" xl:href="http://www.doc_reform.org">www.doc_reform.org</text:a>> and <<text:a xl:type="simple" xl:href="http://www.sisudoc.org">www.sisudoc.org</text:a>></text:p>
</office:text></office:body></office:document-content>┃",);
return _odt_tail;
}
@@ -886,7 +886,7 @@ template outputODT() {
auto ref M doc_matters,
) {
{ /+ (copy odt images) +/
- auto pth_odt = DocReformPathsODT!()(doc_matters);
+ auto pth_odt = spinePathsODT!()(doc_matters);
foreach (image; doc_matters.srcs.image_list) {
auto fn_src_in = doc_matters.src.image_dir_path ~ "/" ~ image;
auto fn_src_out_file = pth_odt.image_dir("fs") ~ "/" ~ image;
@@ -925,7 +925,7 @@ template outputODT() {
void dirtree(I)(
I doc_matters,
) {
- auto pth_odt = DocReformPathsODT!()(doc_matters);
+ auto pth_odt = spinePathsODT!()(doc_matters);
if (doc_matters.opt.action.debug_do) { /+ (dir tree) +/
if (!exists(pth_odt.meta_inf_dir("fs"))) {
pth_odt.meta_inf_dir("fs").mkdirRecurse;
@@ -1966,7 +1966,7 @@ template outputODT() {
const W odt_content,
I doc_matters,
) {
- auto pth_odt = DocReformPathsODT!()(doc_matters);
+ auto pth_odt = spinePathsODT!()(doc_matters);
auto fn_odt = pth_odt.odt_file;
auto zip = new ZipArchive(); // ZipArchive zip = new ZipArchive();
void ODTzip()(string contents, string fn) {
@@ -2060,7 +2060,7 @@ template outputODT() {
string manifest_xml; // image list changes
string meta_xml; // time stamp
}
- // auto pth_odt = DocReformPathsODT!()(doc_matters);
+ // auto pth_odt = spinePathsODT!()(doc_matters);
auto odt = ODT();
odt.mimetype = mimetype;
odt.manifest_rdf = manifest_rdf;
diff --git a/src/doc_reform/output/paths_output.d b/src/doc_reform/output/paths_output.d
index 26b3509..bc4da76 100644
--- a/src/doc_reform/output/paths_output.d
+++ b/src/doc_reform/output/paths_output.d
@@ -7,8 +7,8 @@ import std.array,
std.regex,
std.stdio;
import doc_reform.meta.rgx;
-template DocReformOutPaths() {
- auto DocReformOutPaths()(
+template spineOutPaths() {
+ auto spineOutPaths()(
string output_pth_root,
string lng = "",
) {
@@ -24,8 +24,8 @@ template DocReformOutPaths() {
return _PathsStruct();
}
}
-template DocReformOutPathSQLite() {
- auto DocReformOutPathSQLite(Po)(
+template spineOutPathSQLite() {
+ auto spineOutPathSQLite(Po)(
Po output_pth_root,
) {
struct _PathsStruct {
@@ -40,9 +40,9 @@ template DocReformOutPathSQLite() {
return _PathsStruct();
}
}
-template DocReformOutPathsFnPd() {
+template spineOutPathsFnPd() {
/+ TODO stuff to work out here +/
- auto DocReformOutPathsFnPd(Fn,Pn)(
+ auto spineOutPathsFnPd(Fn,Pn)(
Fn fn_src_pth,
Pn pod_name_with_path
) {
@@ -78,11 +78,11 @@ template DocReformOutPathsFnPd() {
}
}
-template DocReformDocRootTreeHTML() {
- mixin DocReformRgxInit;
+template spineDocRootTreeHTML() {
+ mixin spineRgxInit;
static auto rgx = Rgx();
- auto DocReformDocRootTreeHTML()(string lng) {
- auto lng_pth = DocReformOutPaths!()("", lng);
+ auto spineDocRootTreeHTML()(string lng) {
+ auto lng_pth = spineOutPaths!()("", lng);
string base_dir = "html";
string suffix = ".html";
struct _PathsStruct {
@@ -135,14 +135,14 @@ template DocReformDocRootTreeHTML() {
return _PathsStruct();
}
}
-template DocReformPathsHTML() {
- mixin DocReformRgxInit;
+template spinePathsHTML() {
+ mixin spineRgxInit;
static auto rgx = Rgx();
- auto DocReformPathsHTML()(
+ auto spinePathsHTML()(
string output_path_root,
string lng,
) {
- auto doc_tree = DocReformDocRootTreeHTML!()(lng);
+ auto doc_tree = spineDocRootTreeHTML!()(lng);
string base_dir = "html";
string suffix = ".html";
struct _PathsStruct {
@@ -189,15 +189,15 @@ template DocReformPathsHTML() {
return _PathsStruct();
}
}
-template DocReformUrlsHTML() {
+template spineUrlsHTML() {
import std.format;
- mixin DocReformRgxInit;
+ mixin spineRgxInit;
static auto rgx = Rgx();
- auto DocReformUrlsHTML()(
+ auto spineUrlsHTML()(
string url_doc_root,
string lng,
) {
- auto doc_tree = DocReformDocRootTreeHTML!()(lng);
+ auto doc_tree = spineDocRootTreeHTML!()(lng);
string base_dir = "html";
string suffix = ".html";
struct _PathsStruct {
@@ -285,14 +285,14 @@ template DocReformUrlsHTML() {
return _PathsStruct();
}
}
-template DocReformPathsEPUB() {
- mixin DocReformRgxInit;
+template spinePathsEPUB() {
+ mixin spineRgxInit;
static auto rgx = Rgx();
- auto DocReformPathsEPUB()(
+ auto spinePathsEPUB()(
string output_pth_root,
string lng,
) {
- auto out_pth = DocReformOutPaths!()(output_pth_root, lng);
+ auto out_pth = spineOutPaths!()(output_pth_root, lng);
string base_dir = "epub";
struct _PathsStruct {
string base() {
@@ -387,13 +387,13 @@ template DocReformPathsEPUB() {
return _PathsStruct();
}
}
-template DocReformPathsODT() {
- mixin DocReformRgxInit;
+template spinePathsODT() {
+ mixin spineRgxInit;
static auto rgx = Rgx();
- auto DocReformPathsODT(M)(
+ auto spinePathsODT(M)(
M doc_matters,
) {
- auto out_pth = DocReformOutPaths!()( doc_matters.output_path, doc_matters.src.language);
+ auto out_pth = spineOutPaths!()( doc_matters.output_path, doc_matters.src.language);
string base_dir = "odf";
struct _PathsStruct {
string base_pth() { // dir will contain odt document file (also debug file tree)
@@ -451,10 +451,10 @@ template DocReformPathsODT() {
return _PathsStruct();
}
}
-template DocReformPathsLaTeX() {
- mixin DocReformRgxInit;
+template spinePathsLaTeX() {
+ mixin spineRgxInit;
static auto rgx = Rgx();
- auto DocReformPathsLaTeX(M)(
+ auto spinePathsLaTeX(M)(
M doc_matters,
) {
struct _PathsStruct {
@@ -462,7 +462,7 @@ template DocReformPathsLaTeX() {
return fn_src.baseName.stripExtension;
}
string base() {
- auto out_pth = DocReformOutPaths!()(doc_matters.output_path, doc_matters.src.language);
+ auto out_pth = spineOutPaths!()(doc_matters.output_path, doc_matters.src.language);
string base_dir = "latex";
return (((out_pth.output_root).chainPath(base_dir)).asNormalizedPath).array;
}
@@ -480,10 +480,10 @@ template DocReformPathsLaTeX() {
return _PathsStruct();
}
}
-template DocReformPathsSQLiteDiscrete() {
- mixin DocReformRgxInit;
+template spinePathsSQLiteDiscrete() {
+ mixin spineRgxInit;
static auto rgx = Rgx();
- auto DocReformPathsSQLiteDiscrete()(
+ auto spinePathsSQLiteDiscrete()(
string output_pth_root,
string lng,
) {
@@ -492,7 +492,7 @@ template DocReformPathsSQLiteDiscrete() {
return fn_src.baseName.stripExtension;
}
string base() {
- auto out_pth = DocReformOutPaths!()(output_pth_root, lng);
+ auto out_pth = spineOutPaths!()(output_pth_root, lng);
string base_dir = "sqlite";
return (((out_pth.output_base).chainPath(base_dir)).asNormalizedPath).array;
}
@@ -506,10 +506,10 @@ template DocReformPathsSQLiteDiscrete() {
return _PathsStruct();
}
}
-template DocReformPathsSQLite() {
- mixin DocReformRgxInit;
+template spinePathsSQLite() {
+ mixin spineRgxInit;
static auto rgx = Rgx();
- auto DocReformPathsSQLite(DbN, Po)(
+ auto spinePathsSQLite(DbN, Po)(
DbN db_name,
Po output_pth_root,
) {
@@ -518,7 +518,7 @@ template DocReformPathsSQLite() {
return fn_src.baseName.stripExtension;
}
string base() {
- auto out_pth = DocReformOutPathSQLite!()(output_pth_root); // decide whether to have separate files for each language
+ auto out_pth = spineOutPathSQLite!()(output_pth_root); // decide whether to have separate files for each language
string base_dir = "sqlite";
return (((out_pth.output_root).chainPath(base_dir)).asNormalizedPath).array;
}
diff --git a/src/doc_reform/output/rgx.d b/src/doc_reform/output/rgx.d
index 1c569f9..cda3d5e 100644
--- a/src/doc_reform/output/rgx.d
+++ b/src/doc_reform/output/rgx.d
@@ -2,7 +2,7 @@
regex: regular expressions used in sisu document parser
+/
module doc_reform.output.rgx;
-static template DocReformOutputRgxInit() {
+static template spineOutputRgxInit() {
import doc_reform.output.defaults;
static struct Rgx {
static newline = ctRegex!("\n", "mg");
diff --git a/src/doc_reform/output/source_pod.d b/src/doc_reform/output/source_pod.d
index cff5ba8..8fbfa0c 100644
--- a/src/doc_reform/output/source_pod.d
+++ b/src/doc_reform/output/source_pod.d
@@ -1,5 +1,5 @@
module doc_reform.output.source_pod;
-template DocReformPod() {
+template spinePod() {
import doc_reform.output;
import
std.digest.sha,
@@ -10,16 +10,16 @@ template DocReformPod() {
import
doc_reform.output.create_zip_file,
doc_reform.output.xmls;
- void DocReformPod(T)(T doc_matters) {
+ void spinePod(T)(T doc_matters) {
debug(asserts) {
// static assert(is(typeof(doc_matters) == tuple));
}
- mixin DocReformOutputRgxInit;
+ mixin spineOutputRgxInit;
string pwd = doc_matters.env.pwd;
auto src_path_info = doc_matters.src_path_info;
auto pth_dr_doc_src = doc_matters.src_path_info;
- auto pths_pod = DocReformPathsPods!()(doc_matters);
- mixin DocReformLanguageCodes;
+ auto pths_pod = spinePathsPods!()(doc_matters);
+ mixin spineLanguageCodes;
auto lang = Lang();
static auto rgx = Rgx();
assert (doc_matters.src.filename.match(rgx.src_fn));
diff --git a/src/doc_reform/output/sqlite.d b/src/doc_reform/output/sqlite.d
index 5bc1551..3f277c0 100644
--- a/src/doc_reform/output/sqlite.d
+++ b/src/doc_reform/output/sqlite.d
@@ -6,7 +6,7 @@ import
std.conv : to;
import d2sqlite3;
import std.typecons : Nullable;
-mixin DocReformOutputRgxInit;
+mixin spineOutputRgxInit;
mixin InternalMarkup;
static auto rgx = Rgx();
static auto mkup = InlineMarkup();
@@ -16,7 +16,7 @@ template SQLiteHubBuildTablesAndPopulate() {
const D doc_abstraction,
M doc_matters,
) {
- auto pth_sqlite = DocReformPathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path);
+ auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path);
pth_sqlite.base.mkdirRecurse;
auto db = Database(pth_sqlite.sqlite_file);
template SQLiteDbStatementComposite() {
@@ -29,7 +29,7 @@ template SQLiteHubBuildTablesAndPopulate() {
string _db_statement;
{
if ((doc_matters.opt.action.sqlite_db_create)) {
- auto pth_sqlite = DocReformPathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path);
+ auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path);
pth_sqlite.base.mkdirRecurse;
_db_statement ~= SQLiteTablesReCreate!()();
SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "TABLE RE-CREATE");
@@ -63,8 +63,8 @@ template SQLiteHubDiscreteBuildTablesAndPopulate() {
const D doc_abstraction,
M doc_matters,
) {
- auto url_html = DocReformUrlsHTML!()(doc_matters.conf_make_meta.conf.webserv_url_doc_root, doc_matters.src.language);
- auto pth_sqlite = DocReformPathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.src.language);
+ auto url_html = spineUrlsHTML!()(doc_matters.conf_make_meta.conf.webserv_url_doc_root, doc_matters.src.language);
+ auto pth_sqlite = spinePathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.src.language);
pth_sqlite.base.mkdirRecurse;
auto db = Database(pth_sqlite.sqlite_file(doc_matters.src.filename));
template SQLiteDiscreteDbStatementComposite() {
@@ -138,7 +138,7 @@ template SQLiteFormatAndLoadObject() {
auto SQLiteFormatAndLoadObject(M)(
M doc_matters,
) {
- mixin DocReformOutputRgxInit;
+ mixin spineOutputRgxInit;
struct sqlite_format_and_load_objects {
string generic_munge_sanitize_text_for_search(
string _txt,
@@ -299,7 +299,7 @@ template SQLiteFormatAndLoadObject() {
rgx.inline_seg_link,
"$1");
}
- auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language);
+ auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language);
if (_xml_type == "seg") {
foreach (m; _txt.match(rgx.inline_link_hash)) {
if (m.captures[3] in doc_matters.has.tag_associations) {
@@ -1170,7 +1170,7 @@ template SQLiteInsertDocObjectsLoop() {
M doc_matters,
) {
string _uid = SQLinsertDelimiter!()(doc_matters.src.doc_uid);
- auto url_html = DocReformUrlsHTML!()(doc_matters.conf_make_meta.conf.webserv_url_doc_root, doc_matters.src.language);
+ auto url_html = spineUrlsHTML!()(doc_matters.conf_make_meta.conf.webserv_url_doc_root, doc_matters.src.language);
string insertDocObjectsRow(O)(O obj) {
string _insert_doc_objects_row = format(q"┃
INSERT INTO doc_objects (
@@ -1535,7 +1535,7 @@ template SQLiteTablesCreate() {
}
if (opt_action.sqlite_db_create) {
string _db_statement;
- auto pth_sqlite = DocReformPathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set);
+ auto pth_sqlite = spinePathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set);
pth_sqlite.base.mkdirRecurse;
auto db = Database(pth_sqlite.sqlite_file);
{
@@ -1549,7 +1549,7 @@ template SQLiteDbDrop() {
void SQLiteDbDrop(O)(O opt_action) {
writeln("db drop");
if ((opt_action.sqlite_db_drop)) {
- auto pth_sqlite = DocReformPathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set);
+ auto pth_sqlite = spinePathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set);
writeln("remove(", pth_sqlite.sqlite_file, ")");
try {
remove(pth_sqlite.sqlite_file);
diff --git a/src/doc_reform/output/xmls.d b/src/doc_reform/output/xmls.d
index feebb35..ae904bb 100644
--- a/src/doc_reform/output/xmls.d
+++ b/src/doc_reform/output/xmls.d
@@ -12,7 +12,7 @@ template outputXHTMLs() {
doc_reform.output.create_zip_file,
doc_reform.output.xmls,
doc_reform.output.xmls_css;
- mixin DocReformOutputRgxInit;
+ mixin spineOutputRgxInit;
struct outputXHTMLs {
static auto rgx = Rgx();
string div_delimit(
@@ -95,7 +95,7 @@ template outputXHTMLs() {
) {
string _publisher="Publisher"; // TODO
string o;
- o = format(q"┃<!-- DocReform header metadata -->
+ o = format(q"┃<!-- spine header metadata -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="dc.title" content="%s" />
<meta name="dc.author" content="%s" />
@@ -110,7 +110,7 @@ template outputXHTMLs() {
<meta name="dc.rights" content="%s" />
<meta name="generator" content="%s" />
<link rel="generator" href="%s" />
- <!-- DocReform header metadata -->┃",
+ <!-- spine header metadata -->┃",
doc_matters.conf_make_meta.meta.title_full,
doc_matters.conf_make_meta.meta.creator_author,
_publisher,
@@ -155,7 +155,7 @@ template outputXHTMLs() {
M doc_matters,
) {
string _action="http://www.sisudoc.org/cgi-bin/search.cgi";
- string _db="DocReform.7a.manual";
+ string _db="spine.7a.manual";
string o;
string _form;
if (doc_matters.opt.action.workon) {
diff --git a/src/doc_reform/output/xmls_css.d b/src/doc_reform/output/xmls_css.d
index 24cb90b..553d9da 100644
--- a/src/doc_reform/output/xmls_css.d
+++ b/src/doc_reform/output/xmls_css.d
@@ -2,9 +2,9 @@
default css settings
+/
module doc_reform.output.xmls_css;
-template DocReformCss() {
+template spineCss() {
import std.format;
- auto DocReformCss(M)(M doc_matters) {
+ auto spineCss(M)(M doc_matters) {
string _css_indent = format(q"┃
/* indent */
p.norm { }
@@ -4164,9 +4164,9 @@ template DocReformCss() {
);
auto css_() {
struct _CSS {
- string html_seg = "/* DocReform css html seg stylesheet */\n";
- string html_scroll = "/* DocReform css html scroll stylesheet */\n";
- string epub = "/* DocReform css epub stylesheet */\n";
+ string html_seg = "/* spine css html seg stylesheet */\n";
+ string html_scroll = "/* spine css html scroll stylesheet */\n";
+ string epub = "/* spine css epub stylesheet */\n";
}
return _CSS();
}
diff --git a/src/doc_reform/source/paths_source.d b/src/doc_reform/source/paths_source.d
index e0b844a..ef1e6d0 100644
--- a/src/doc_reform/source/paths_source.d
+++ b/src/doc_reform/source/paths_source.d
@@ -14,7 +14,7 @@ import
doc_reform.meta.defaults,
doc_reform.meta.rgx;
template PodManifest() {
- mixin DocReformRgxInit;
+ mixin spineRgxInit;
static auto rgx = Rgx();
auto PodManifest(P)(
P _pth=""
@@ -64,7 +64,7 @@ template PodManifest() {
}
}
template PathMatters() {
- mixin DocReformRgxInit;
+ mixin spineRgxInit;
mixin InternalMarkup;
static auto rgx = Rgx();
static auto mkup = InlineMarkup();
@@ -406,7 +406,7 @@ template PathMatters() {
}
}
template ConfigFilePaths() {
- mixin DocReformRgxInit;
+ mixin spineRgxInit;
static auto rgx = Rgx();
auto ConfigFilePaths(M,E)(
M _manifested,
@@ -527,10 +527,10 @@ template ConfigFilePaths() {
return ConfFilePaths();
}
}
-template DocReformPathsSRC() {
- mixin DocReformRgxInit;
+template spinePathsSRC() {
+ mixin spineRgxInit;
static auto rgx = Rgx();
- auto DocReformPathsSRC(D,Fn)(
+ auto spinePathsSRC(D,Fn)(
D _pwd,
Fn _fn_src_and_path,
) {
@@ -578,11 +578,11 @@ template DocReformPathsSRC() {
}
-template DocReformPathsPods() {
- mixin DocReformRgxInit;
+template spinePathsPods() {
+ mixin spineRgxInit;
static auto rgx = Rgx();
string _suffix = ".zip";
- auto DocReformPathsPods(M)(M doc_matters) {
+ auto spinePathsPods(M)(M doc_matters) {
string _base_dir_pod = (doc_matters.output_path.length > 0)
? doc_matters.output_path ~ "/pod"
: "/pod";
diff --git a/src/doc_reform/source/read_config_files.d b/src/doc_reform/source/read_config_files.d
index 2b3e4fb..f522c29 100644
--- a/src/doc_reform/source/read_config_files.d
+++ b/src/doc_reform/source/read_config_files.d
@@ -13,7 +13,7 @@ static template readConfigSite() {
doc_reform.source.paths_source,
std.file,
std.path;
- mixin DocReformRgxInit;
+ mixin spineRgxInit;
final auto readConfigSite(M,E)(
M _manifested,
E _env,
@@ -80,7 +80,7 @@ static template readConfigDoc() {
doc_reform.source.paths_source,
std.file,
std.path;
- mixin DocReformRgxInit;
+ mixin spineRgxInit;
final auto readConfigDoc(M,E)(M _manifested, E _env) {
static auto rgx = Rgx();
string config_file_str;
diff --git a/src/doc_reform/source/read_source_files.d b/src/doc_reform/source/read_source_files.d
index f4de5fe..7626a89 100644
--- a/src/doc_reform/source/read_source_files.d
+++ b/src/doc_reform/source/read_source_files.d
@@ -4,7 +4,7 @@
- if master file scan for addional files to import/insert
+/
module doc_reform.source.read_source_files;
-static template DocReformRawMarkupContent() {
+static template spineRawMarkupContent() {
import
doc_reform.meta.rgx;
import
@@ -12,7 +12,7 @@ static template DocReformRawMarkupContent() {
doc_reform.source.paths_source,
std.file,
std.path;
- mixin DocReformRgxInit;
+ mixin spineRgxInit;
static auto rgx = Rgx();
string[] _images=[];
auto _extract_images(S)(S content_block) {
@@ -24,7 +24,7 @@ static template DocReformRawMarkupContent() {
return images_;
}
auto rawsrc = RawMarkupContent();
- auto DocReformRawMarkupContent(O,Fn)(O _opt_action, Fn fn_src) {
+ auto spineRawMarkupContent(O,Fn)(O _opt_action, Fn fn_src) {
auto _0_header_1_body_content_2_insert_filelist_tuple
= rawsrc.sourceContentSplitIntoHeaderAndBody(_opt_action, rawsrc.sourceContent(fn_src), fn_src);
return _0_header_1_body_content_2_insert_filelist_tuple;
@@ -167,7 +167,7 @@ static template DocReformRawMarkupContent() {
char[][] markup_sourcefile_insert_content,
string fn_src
) {
- mixin DocReformRgxInitFlags;
+ mixin spineRgxInitFlags;
char[][] contents_insert;
int[string] type1 = flags_type_init;
auto fn_pth_full = fn_src.match(rgx.src_pth_sst_or_ssm);
@@ -253,7 +253,7 @@ static template DocReformRawMarkupContent() {
string fn_src
) {
import std.algorithm;
- mixin DocReformRgxInitFlags;
+ mixin spineRgxInitFlags;
char[][] contents;
int[string] type = flags_type_init;
auto fn_pth_full = fn_src.match(rgx.src_pth_sst_or_ssm);
diff --git a/src/doc_reform/spine.d b/src/doc_reform/spine.d
index 9ace644..c70b87c 100755
--- a/src/doc_reform/spine.d
+++ b/src/doc_reform/spine.d
@@ -79,7 +79,7 @@ import std.algorithm;
import std.parallelism;
mixin(import("version.txt"));
mixin CompileTimeInfo;
-string project_name = "DocReform";
+string project_name = "spine";
string program_name = "spine";
/++
name "spine"
@@ -87,12 +87,12 @@ description "A SiSU inspired document parser writen in D."
homepage "http://sisudoc.org"
+/
void main(string[] args) {
- mixin DocReformRgxInit;
- mixin contentJSONtoDocReformStruct;
- mixin DocReformBiblio;
- mixin DocReformRgxInitFlags;
+ mixin spineRgxInit;
+ mixin contentJSONtoSpineStruct;
+ mixin spineBiblio;
+ mixin spineRgxInitFlags;
mixin outputHub;
- auto hvst = DocReformHarvest!();
+ auto hvst = spineHarvest!();
string flag_action;
string arg_unrecognized;
enum dAM { abstraction, matters }
@@ -541,7 +541,7 @@ void main(string[] args) {
auto _config_local_site_struct = readConfigSite!()(_manifested, _env);
if (_config_local_site_struct.filetype == "yaml") {
import doc_reform.meta.conf_make_meta_yaml;
- _make_and_meta_struct = _config_local_site_struct.configParseYAMLreturnDocReformStruct!()(_make_and_meta_struct, _manifested); // - get local site config
+ _make_and_meta_struct = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_make_and_meta_struct, _manifested); // - get local site config
break;
}
}
@@ -552,7 +552,7 @@ void main(string[] args) {
auto _config_local_site_struct = readConfigSite!()(_manifested, _env, _opt_action.config_path_set);
if (_config_local_site_struct.filetype == "yaml") {
import doc_reform.meta.conf_make_meta_yaml;
- _make_and_meta_struct = _config_local_site_struct.configParseYAMLreturnDocReformStruct!()(_make_and_meta_struct, _manifested); // - get local site config
+ _make_and_meta_struct = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_make_and_meta_struct, _manifested); // - get local site config
}
}
}
@@ -756,7 +756,7 @@ void main(string[] args) {
) {
writeln("--->\nstepX commence → (document abstraction)");
}
- auto t = DocReformAbstraction!()(_env, program_info, _opt_action, manifest, _make_and_meta_struct);
+ auto t = spineAbstraction!()(_env, program_info, _opt_action, manifest, _make_and_meta_struct);
static assert(!isTypeTuple!(t));
static assert(t.length==2);
auto doc_abstraction = t[dAM.abstraction];
@@ -771,32 +771,32 @@ void main(string[] args) {
|| doc_matters.opt.action.show_summary
) {
import doc_reform.meta.metadoc_show_summary;
- DocReformMetaDocSummary!()(doc_abstraction, doc_matters);
+ spineMetaDocSummary!()(doc_abstraction, doc_matters);
}
/+ ↓ debugs +/
if (doc_matters.opt.action.show_metadata
) {
import doc_reform.meta.metadoc_show_metadata;
- DocReformShowMetaData!()(doc_matters);
+ spineShowMetaData!()(doc_matters);
}
/+ ↓ debugs +/
if (doc_matters.opt.action.show_make
) {
import doc_reform.meta.metadoc_show_make;
- DocReformShowMake!()(doc_matters);
+ spineShowMake!()(doc_matters);
}
/+ ↓ debugs +/
if (doc_matters.opt.action.show_config
) {
import doc_reform.meta.metadoc_show_config;
- DocReformShowConfig!()(doc_matters);
+ spineShowConfig!()(doc_matters);
}
if (doc_matters.opt.action.harvest) {
- hvst.harvests ~= DocReformMetaDocHarvest!()(doc_matters, hvst);
+ hvst.harvests ~= spineMetaDocHarvest!()(doc_matters, hvst);
}
/+ ↓ debugs +/
if (doc_matters.opt.action.debug_do) {
- DocReformDebugs!()(doc_abstraction, doc_matters);
+ spineDebugs!()(doc_abstraction, doc_matters);
}
/+ ↓ output hub +/
if (!(doc_matters.opt.action.skip_output)) {
@@ -860,7 +860,7 @@ void main(string[] args) {
) {
writeln("--->\nstepX commence → (document abstraction)");
}
- auto t = DocReformAbstraction!()(_env, program_info, _opt_action, manifest, _make_and_meta_struct);
+ auto t = spineAbstraction!()(_env, program_info, _opt_action, manifest, _make_and_meta_struct);
static assert(!isTypeTuple!(t));
static assert(t.length==2);
auto doc_abstraction = t[dAM.abstraction];
@@ -875,32 +875,32 @@ void main(string[] args) {
|| doc_matters.opt.action.show_summary
) {
import doc_reform.meta.metadoc_show_summary;
- DocReformMetaDocSummary!()(doc_abstraction, doc_matters);
+ spineMetaDocSummary!()(doc_abstraction, doc_matters);
}
/+ ↓ debugs +/
if (doc_matters.opt.action.show_metadata
) {
import doc_reform.meta.metadoc_show_metadata;
- DocReformShowMetaData!()(doc_matters);
+ spineShowMetaData!()(doc_matters);
}
/+ ↓ debugs +/
if (doc_matters.opt.action.show_make
) {
import doc_reform.meta.metadoc_show_make;
- DocReformShowMake!()(doc_matters);
+ spineShowMake!()(doc_matters);
}
/+ ↓ debugs +/
if (doc_matters.opt.action.show_config
) {
import doc_reform.meta.metadoc_show_config;
- DocReformShowConfig!()(doc_matters);
+ spineShowConfig!()(doc_matters);
}
if (doc_matters.opt.action.harvest) {
- hvst.harvests ~= DocReformMetaDocHarvest!()(doc_matters, hvst);
+ hvst.harvests ~= spineMetaDocHarvest!()(doc_matters, hvst);
}
/+ ↓ debugs +/
if (doc_matters.opt.action.debug_do) {
- DocReformDebugs!()(doc_abstraction, doc_matters);
+ spineDebugs!()(doc_abstraction, doc_matters);
}
/+ ↓ output hub +/
if (!(doc_matters.opt.action.skip_output)) {
@@ -936,14 +936,14 @@ void main(string[] args) {
}
if (hvst.harvests.length > 0) {
if (_opt_action.harvest_topics) {
- DocReformMetaDocHarvestsTopics!()(hvst, _make_and_meta_struct, _opt_action);
+ spineMetaDocHarvestsTopics!()(hvst, _make_and_meta_struct, _opt_action);
}
if (_opt_action.harvest_authors) {
- DocReformMetaDocHarvestsAuthors!()(hvst.harvests, _make_and_meta_struct, _opt_action);
+ spineMetaDocHarvestsAuthors!()(hvst.harvests, _make_and_meta_struct, _opt_action);
}
if (!(_opt_action.quiet)) {
import doc_reform.output.paths_output;
- auto out_pth = DocReformPathsHTML!()(_make_and_meta_struct.conf.output_path, "");
+ auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, "");
if (_opt_action.harvest_authors) {
writeln("- ", out_pth.harvest("authors.html"));
}
--
cgit v1.2.3