From 02714184258c9be072857ddcc03bc114b2e843d1 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Tue, 22 Oct 2019 19:32:45 -0400
Subject: cosmetic

---
 org/meta_conf_make_meta.org | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

(limited to 'org/meta_conf_make_meta.org')

diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index 6912a3b..b6f1c7d 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -367,14 +367,11 @@ static template contentYAMLtoDocReformStruct() {
   auto contentYAMLtoDocReformStruct(C,Y,M)(
     C _struct_composite,
     Y _yaml,
-    M _manifest,
+    M _manifested,
     string _identifier
   ) {
     mixin DocReformRgxInit;
     static auto rgx = Rgx();
-    debug (yaml) {
-      writeln(">> --------------------------- >>");
-    }
     confCompositeMakeBuild _mk;
     <<yaml_objects>>
     return _struct_composite;
@@ -597,7 +594,7 @@ if ("webserv" in _yaml
   }
 }
 if (!(_struct_composite.conf.output_path)) {
-  _struct_composite.conf.output_path = ((_manifest.output.path).asNormalizedPath).array;
+  _struct_composite.conf.output_path = ((_manifested.output.path).asNormalizedPath).array;
 }
 if ("output" in _yaml
   && _yaml["output"].type.sequence
@@ -609,7 +606,7 @@ if ("output" in _yaml
       && _yaml["output"]["path"].type.string
       && _yaml["output"]["path"].tag.match(rgx.yaml_tag_is_str)
     ) {
-      if (_manifest.output.path == _manifest.env.pwd
+      if (_manifested.output.path == _manifested.env.pwd
         && _yaml["output"]["path"].get!string.length > 0
       ) {
         _struct_composite.conf.output_path = (((_yaml["output"]["path"].get!string).expandTilde).asNormalizedPath).array;
@@ -1010,7 +1007,7 @@ if ("date" in _yaml
     }
   }
 }
-_struct_composite.meta.language_document_char = _manifest.src.language; // move
+_struct_composite.meta.language_document_char = _manifested.src.language; // move
 if ("links" in _yaml) {
   // if ("" in _yaml["links"]) {
   //   _struct_composite.meta.links_ = _yaml["links"][""].str;
@@ -1164,7 +1161,7 @@ static template contentJSONtoDocReformStruct() {
     doc_reform.meta.defaults,
     doc_reform.meta.rgx;
   ConfCompositePlus _struct_composite;
-  auto contentJSONtoDocReformStruct(C,J,M)(C _struct_composite, J _json, M _manifest, string _identifier) {
+  auto contentJSONtoDocReformStruct(C,J,M)(C _struct_composite, J _json, M _manifested, string _identifier) {
     mixin DocReformRgxInit;
     static auto rgx = Rgx();
     debug (json) {
@@ -1712,7 +1709,7 @@ if ("date" in _json.object) {
   ) {
     _struct_composite.meta.date_valid = _json.object["date"]["valid"].str;
   }
-  _struct_composite.meta.language_document_char = _manifest.src.language;
+  _struct_composite.meta.language_document_char = _manifested.src.language;
 }
 if ("links" in _json.object) {}
 if ("notes" in _json.object) {
@@ -1811,11 +1808,11 @@ static template configParseYAMLreturnDocReformStruct() {
   auto configParseYAMLreturnDocReformStruct(T,CCm,M)(
     T       _document_struct,
     CCm     _make_and_meta_struct,
-    M       _manifest
+    M       _manifested
   ){
     Node yaml_root = Loader.fromString(_document_struct.content).load();
     _make_and_meta_struct
-      = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, yaml_root, _manifest, _document_struct.filename); // struct from yaml
+      = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, yaml_root, _manifested, _document_struct.filename); // struct from yaml
     return _make_and_meta_struct;
   }
 }
@@ -1845,18 +1842,15 @@ static template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() {
   auto docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct(CCm,Src,M)(
     Src     header_src,
     CCm     _make_and_meta_struct,
-    M       _manifest,
+    M       _manifested,
   ) {
     Node _yaml_root;
     if (header_src.match(rgx.yaml_header_meta_title)) {
-      debug (yaml) {
-        writeln(">>> document header is yaml, consider converting to JSON");
-      }
       import dyaml;
       _yaml_root = Loader.fromString(header_src).load();
     }
     auto _header_and_make_and_meta_struct
-      = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, _yaml_root, _manifest, "header");
+      = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, _yaml_root, _manifested, "header");
     return _header_and_make_and_meta_struct;
   }
 }
-- 
cgit v1.2.3