aboutsummaryrefslogtreecommitdiffhomepage
path: root/org/meta_conf_make_meta.org
diff options
context:
space:
mode:
Diffstat (limited to 'org/meta_conf_make_meta.org')
-rw-r--r--org/meta_conf_make_meta.org28
1 files changed, 14 insertions, 14 deletions
diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index 240be44..fcae4bb 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -65,7 +65,7 @@ import
import
doc_reform.meta.defaults,
doc_reform.meta.rgx;
-mixin SiSUrgxInit;
+mixin DocReformRgxInit;
static auto _rgx = Rgx();
mixin InternalMarkup;
auto _mkup = InlineMarkup();
@@ -418,7 +418,7 @@ auto config_jsonstr = `{
}`;
#+END_SRC
-* 1. JSON to SiSUstruct :module:doc_reform:meta_conf_make_meta_json:
+* 1. JSON to DocReformStruct :module:doc_reform:meta_conf_make_meta_json:
** 0. module template
#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_json.d
@@ -427,7 +427,7 @@ auto config_jsonstr = `{
extract json header return json
+/
module doc_reform.meta.conf_make_meta_json;
-static template contentJSONtoSiSUstruct() {
+static template contentJSONtoDocReformStruct() {
import
std.exception,
std.regex,
@@ -442,8 +442,8 @@ static template contentJSONtoSiSUstruct() {
doc_reform.meta.conf_make_meta_json,
doc_reform.meta.rgx;
ConfCompositePlus _struct_composite;
- auto contentJSONtoSiSUstruct(C, J)(C _struct_composite, J _json, string _identifier) {
- mixin SiSUrgxInit;
+ auto contentJSONtoDocReformStruct(C,J)(C _struct_composite, J _json, string _identifier) {
+ mixin DocReformRgxInit;
static auto _rgx = Rgx();
debug (json) {
writeln(">> --------------------------- >>");
@@ -1050,7 +1050,7 @@ if (_struct_composite.meta.title_main.empty) {
}
#+END_SRC
-* 2. TOML returns SiSUstruct (via JSON) :module:doc_reform:meta_conf_make_meta:
+* 2. TOML returns DocReformStruct (via JSON) :module:doc_reform:meta_conf_make_meta:
** 0. parse TOML config return JSON
#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_toml.d
@@ -1080,24 +1080,24 @@ static template configParseTOMLreturnJSON() {
}
#+END_SRC
-** 1. parse TOML config to JSON return SiSUstruct
+** 1. parse TOML config to JSON return DocReformStruct
#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_toml.d
-static template configParseTOMLreturnSiSUstruct() {
+static template configParseTOMLreturnDocReformStruct() {
import
toml,
toml.json;
import
doc_reform.meta.conf_make_meta_structs,
doc_reform.meta.conf_make_meta_json;
- mixin contentJSONtoSiSUstruct;
- auto configParseTOMLreturnSiSUstruct(CCm, T)(
+ mixin contentJSONtoDocReformStruct;
+ auto configParseTOMLreturnDocReformStruct(CCm, T)(
CCm _make_and_meta_struct,
T _document_struct
){
TOMLDocument _doc = parseTOML(cast(string)(_document_struct.content));
auto _doc_json = toJSON(_doc);
- _make_and_meta_struct = contentJSONtoSiSUstruct!()(_make_and_meta_struct, _doc_json, _document_struct.filename); // struct from json
+ _make_and_meta_struct = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, _document_struct.filename); // struct from json
return _make_and_meta_struct;
}
}
@@ -1122,8 +1122,8 @@ static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() {
doc_reform.meta.conf_make_meta_structs,
doc_reform.meta.conf_make_meta_json,
doc_reform.meta.rgx;
- mixin SiSUrgxInit;
- mixin contentJSONtoSiSUstruct;
+ mixin DocReformRgxInit;
+ mixin contentJSONtoDocReformStruct;
static auto rgx = Rgx();
auto docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct(CCm, Src)(
CCm _make_and_meta_struct,
@@ -1137,7 +1137,7 @@ static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() {
_doc = parseTOML(cast(string)(header_src));
}
auto _doc_json = toJSON(_doc);
- auto _header_and_make_and_meta_struct = contentJSONtoSiSUstruct!()(_make_and_meta_struct, _doc_json, "header");
+ auto _header_and_make_and_meta_struct = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, "header");
return _header_and_make_and_meta_struct;
}
}