cosmetic

1 files changed, 31 insertions, 31 deletions

diff --git a/org/default_paths.org b/org/default_paths.org
index d122c9a..e50881f 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -126,7 +126,7 @@ template PathMatters() {
     string   _fns              = "",
     char[][] _manifest_fn_list = [[]],
   ) {
-    auto _manifest = PodManifest!()(_pth);
+    auto _manifested = PodManifest!()(_pth);
     struct ManifestMatters_ {
       auto env() {
         auto _env = _env;
@@ -143,35 +143,35 @@ template PathMatters() {
       auto opt() {
         auto _opt_actions = _opt_actions;
         struct Opt_ {
-          auto action() { // redundant
+          auto action() {
             return _opt_actions;
           }
         }
         return Opt_();
       }
       bool src_is_pod() {
-        return (_manifest.pod_manifest_path.length > 0) ? true : false;
+        return (_manifested.pod_manifest_path.length > 0) ? true : false;
       }
       auto pod() {
         struct Pod_ {
           bool src_is_pod() {
-            return (_manifest.pod_manifest_path.length > 0) ? true : false;
+            return (_manifested.pod_manifest_path.length > 0) ? true : false;
           }
           auto collection_root() {
-            auto _collection_root = ((chainPath(_manifest.pod_manifest_path, "..")).asNormalizedPath).array;
+            auto _collection_root = ((chainPath(_manifested.pod_manifest_path, "..")).asNormalizedPath).array;
             return _collection_root;
           }
           string manifest_filename() {
-            return _manifest.pod_manifest_filename;
+            return _manifested.pod_manifest_filename;
           }
           string manifest_path() {
-            return _manifest.pod_manifest_path;
+            return _manifested.pod_manifest_path;
           }
           string pod_name_with_path() {
-            return _manifest.pod_manifest_path.baseName;
+            return _manifested.pod_manifest_path.baseName;
           }
           string manifest_file_with_path() {
-            return _manifest.pod_manifest_file_with_path;
+            return _manifested.pod_manifest_file_with_path;
           }
           string[] config_dr_document_make_dirs() {
             string[] _config_dirs;
@@ -208,13 +208,13 @@ template PathMatters() {
         auto _env = _env;
         struct SRC_ {
           bool is_pod() {
-            return (_manifest.pod_manifest_path.length > 0) ? true : false;
+            return (_manifested.pod_manifest_path.length > 0) ? true : false;
           }
           string path_and_fn() {
             return _fns;
           }
           string pod_name_with_path() {
-            return (is_pod) ? _manifest.pod_manifest_path : "";
+            return (is_pod) ? _manifested.pod_manifest_path : "";
           }
           string pod_name() {
             return pod_name_with_path.baseName;
@@ -452,7 +452,7 @@ template ConfigFilePaths() {
   mixin DocReformRgxInit;
   static auto rgx = Rgx();
   auto ConfigFilePaths(M,E)(
-    M   _manifest,
+    M   _manifested,
     E   _env,
   ) {
     struct ConfFilePaths {
@@ -469,17 +469,17 @@ template ConfigFilePaths() {
             /+ config local site (file system only, not in pod) +/
             /+ return paths +/
             string[] _possible_config_path_locations;
-            if (_manifest.src.is_pod) {
+            if (_manifested.src.is_pod) {
               /+ config document in pod +/
               string _dr_doc_conf_pod;
               string _dr_doc_conf_pod_text;
               _dr_doc_conf_pod = asNormalizedPath(chainPath(
                 to!string(_env["pwd"]),
-                _manifest.pod.manifest_path ~ "/conf"
+                _manifested.pod.manifest_path ~ "/conf"
               )).array;
               _dr_doc_conf_pod_text = asNormalizedPath(chainPath(
                 to!string(_env["pwd"]),
-                _manifest.pod.manifest_path ~ "/media/text/" ~ _manifest.src.lng ~ "/conf"
+                _manifested.pod.manifest_path ~ "/media/text/" ~ _manifested.src.lng ~ "/conf"
               )).array;
               /+ return paths +/
               _possible_config_path_locations = [
@@ -515,9 +515,9 @@ template ConfigFilePaths() {
             string _dot_home       = ((chainPath(to!string(_env["home"]), ".dr")).asNormalizedPath).array;
             /+ return paths +/
             string[] _possible_config_path_locations;
-            if (_manifest.src.is_pod) {
-              string _collection_root_a = ((chainPath(to!string(_manifest.pod.collection_root.to!string), ".dr")).asNormalizedPath).array;
-              string _collection_root_b = ((chainPath(to!string(_manifest.pod.collection_root.to!string), "_dr")).asNormalizedPath).array;
+            if (_manifested.src.is_pod) {
+              string _collection_root_a = ((chainPath(to!string(_manifested.pod.collection_root.to!string), ".dr")).asNormalizedPath).array;
+              string _collection_root_b = ((chainPath(to!string(_manifested.pod.collection_root.to!string), "_dr")).asNormalizedPath).array;
               _possible_config_path_locations = [
                 _dot_pwd,
                 _underscore_pwd,
@@ -878,9 +878,9 @@ template DocReformPathsPods() {
       }
       auto fn_pod_filelist(string fn_src) {
         auto pod_root_ = pod_root(fn_src);
-        auto _manifest = PodManifest!()(fn_src).pod_manifest_filename;
-        auto pth_1_ = _manifest;
-        auto pth_2_ = ((pod_root(fn_src).filesystem_open_zpod.chainPath(_manifest)).asNormalizedPath).array;
+        auto _manifested = PodManifest!()(fn_src).pod_manifest_filename;
+        auto pth_1_ = _manifested;
+        auto pth_2_ = ((pod_root(fn_src).filesystem_open_zpod.chainPath(_manifested)).asNormalizedPath).array;
         struct _pods {
           auto zpod() {
             return pth_1_;
@@ -1112,7 +1112,7 @@ template DocReformPathsHTML() {
   mixin DocReformRgxInit;
   static auto rgx = Rgx();
   auto DocReformPathsHTML()(
-    string root_pth,
+    string output_path_root,
     string lng,
   ) {
     auto doc_tree = DocReformDocRootTreeHTML!()(lng);
@@ -1120,34 +1120,34 @@ template DocReformPathsHTML() {
     string suffix = ".html";
     struct _PathsStruct {
       string doc_root() {
-        return ((root_pth.chainPath(doc_tree.doc_root)).asNormalizedPath).array;
+        return ((output_path_root.chainPath(doc_tree.doc_root)).asNormalizedPath).array;
       }
       string harvest(string fn_harvest) {
         return doc_root ~ "/" ~ fn_harvest;
       }
       string base() {
-        return ((root_pth.chainPath(doc_tree.base)).asNormalizedPath).array;
+        return ((output_path_root.chainPath(doc_tree.base)).asNormalizedPath).array;
       }
       string image() {
-        return ((root_pth.chainPath(doc_tree.image)).asNormalizedPath).array;
+        return ((output_path_root.chainPath(doc_tree.image)).asNormalizedPath).array;
       }
       string css() {
-        return ((root_pth.chainPath(doc_tree.css)).asNormalizedPath).array;
+        return ((output_path_root.chainPath(doc_tree.css)).asNormalizedPath).array;
       }
       string fn_seg_css() {
-        return ((root_pth.chainPath(doc_tree.fn_seg_css)).asNormalizedPath).array;
+        return ((output_path_root.chainPath(doc_tree.fn_seg_css)).asNormalizedPath).array;
       }
       string fn_scroll_css() {
-        return ((root_pth.chainPath(doc_tree.fn_scroll_css)).asNormalizedPath).array;
+        return ((output_path_root.chainPath(doc_tree.fn_scroll_css)).asNormalizedPath).array;
       }
       string seg(string fn_src) {
-        return ((root_pth.chainPath(doc_tree.seg(fn_src))).asNormalizedPath).array;
+        return ((output_path_root.chainPath(doc_tree.seg(fn_src))).asNormalizedPath).array;
       }
       string fn_scroll(string fn_src) {
-        return ((root_pth.chainPath(doc_tree.fn_scroll(fn_src))).asNormalizedPath).array;
+        return ((output_path_root.chainPath(doc_tree.fn_scroll(fn_src))).asNormalizedPath).array;
       }
       string fn_seg(string fn_src, string seg_filename) {
-        return ((root_pth.chainPath(doc_tree.fn_seg(fn_src, seg_filename))).asNormalizedPath).array;
+        return ((output_path_root.chainPath(doc_tree.fn_seg(fn_src, seg_filename))).asNormalizedPath).array;
       }
       string tail_seg(string fn_src) {
         return doc_tree.tail_seg(fn_src);