0.8.0 name change in code use dr (doc reform) instead of sisu

1 files changed, 52 insertions, 52 deletions

diff --git a/org/default_paths.org b/org/default_paths.org
index 05ab1ae..197c934 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -173,7 +173,7 @@ template PathMatters() {
           string manifest_file_with_path() {
             return _manifest.pod_manifest_file_with_path;
           }
-          string[] config_sisu_document_make_dirs() {
+          string[] config_dr_document_make_dirs() {
             string[] _config_dirs;
             return _config_dirs;
           }
@@ -445,7 +445,7 @@ template PathMatters() {
 }
 #+END_SRC
 
-** _config_ (sisu_document_make & config_local_site)                  :config:
+** _config_ (dr_document_make & config_local_site)                    :config:
 
 #+name: template_paths_src
 #+BEGIN_SRC d
@@ -458,49 +458,49 @@ template ConfigFilePaths() {
   ) {
     struct ConfFilePaths {
       string config_filename_document_toml() {
-        return "sisu_document_make";
+        return "dr_document_make";
       }
       string config_filename_site_toml() {
         return "config_local_site";
       }
       auto possible_config_path_locations() {
         struct _ConfFilePaths {
-          string[] sisu_document_make() {
+          string[] dr_document_make() {
             /+ FIX clean up conf paths ↓ +/
             /+ config local site (file system only, not in pod) +/
             /+ return paths +/
             string[] _possible_config_path_locations;
             if (_manifest.src.is_pod) {
               /+ config document in pod +/
-              string _sisudoc_conf_pod; //
-              string _sisudoc_conf_pod_text; //
-              _sisudoc_conf_pod = asNormalizedPath(chainPath(
+              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"
               )).array;
-              _sisudoc_conf_pod_text = asNormalizedPath(chainPath(
+              _dr_doc_conf_pod_text = asNormalizedPath(chainPath(
                 to!string(_env["pwd"]),
                 _manifest.pod.manifest_path ~ "/media/text/" ~ _manifest.src.lng ~ "/conf"
               )).array;
               /+ return paths +/
               _possible_config_path_locations = [
-                _sisudoc_conf_pod_text,
-                _sisudoc_conf_pod,
+                _dr_doc_conf_pod_text,
+                _dr_doc_conf_pod,
               ];
             } else {
               /+ config document (& or local site) on filesystem +/
-              string _sisudoc_conf_pwd   = asNormalizedPath(chainPath(to!string(_env["pwd"]), "sisudoc/conf")).array; // think about
-              string _sisudoc_conf_pwd_a = asNormalizedPath(chainPath(to!string(_env["pwd"]), "conf")).array;
-              string _sisudoc_conf_pwd_b = asNormalizedPath(chainPath(to!string(_env["pwd"]), "../conf")).array;
-              string _sisudoc_conf_pwd_c = asNormalizedPath(chainPath(to!string(_env["pwd"]), "../../conf")).array;
-              string _sisudoc_conf_pwd_d = asNormalizedPath(chainPath(to!string(_env["pwd"]), "../../../conf")).array;
+              string _dr_doc_conf_pwd   = asNormalizedPath(chainPath(to!string(_env["pwd"]), "dr_doc/conf")).array; // think about
+              string _dr_doc_conf_pwd_a = asNormalizedPath(chainPath(to!string(_env["pwd"]), "conf")).array;
+              string _dr_doc_conf_pwd_b = asNormalizedPath(chainPath(to!string(_env["pwd"]), "../conf")).array;
+              string _dr_doc_conf_pwd_c = asNormalizedPath(chainPath(to!string(_env["pwd"]), "../../conf")).array;
+              string _dr_doc_conf_pwd_d = asNormalizedPath(chainPath(to!string(_env["pwd"]), "../../../conf")).array;
               /+ return paths +/
               _possible_config_path_locations = [
-                _sisudoc_conf_pwd,
-                _sisudoc_conf_pwd_a,
-                _sisudoc_conf_pwd_b,
-                _sisudoc_conf_pwd_c,
-                _sisudoc_conf_pwd_d,
+                _dr_doc_conf_pwd,
+                _dr_doc_conf_pwd_a,
+                _dr_doc_conf_pwd_b,
+                _dr_doc_conf_pwd_c,
+                _dr_doc_conf_pwd_d,
               ];
             }
             /+ FIX clean up conf paths ↑
@@ -511,39 +511,39 @@ template ConfigFilePaths() {
           string[] config_local_site() {
             /+ FIX clean up conf paths ↓ +/
             /+ config local site (file system only, not in pod) +/
-            string _dot_pwd        = asNormalizedPath(chainPath(to!string(_env["pwd"]), ".sisu")).array;
-            string _underscore_pwd = asNormalizedPath(chainPath(to!string(_env["pwd"]), "_sisu")).array;
-            string _dot_home       = asNormalizedPath(chainPath(to!string(_env["home"]), ".sisu")).array;
+            string _dot_pwd        = asNormalizedPath(chainPath(to!string(_env["pwd"]), ".dr")).array;
+            string _underscore_pwd = asNormalizedPath(chainPath(to!string(_env["pwd"]), "_dr")).array;
+            string _dot_home       = asNormalizedPath(chainPath(to!string(_env["home"]), ".dr")).array;
             /+ return paths +/
             string[] _possible_config_path_locations;
             if (_manifest.src.is_pod) {
-              string _collection_root_a = asNormalizedPath(chainPath(to!string(_manifest.pod.collection_root.to!string), ".sisu")).array;
-              string _collection_root_b = asNormalizedPath(chainPath(to!string(_manifest.pod.collection_root.to!string), "_sisu")).array;
+              string _collection_root_a = asNormalizedPath(chainPath(to!string(_manifest.pod.collection_root.to!string), ".dr")).array;
+              string _collection_root_b = asNormalizedPath(chainPath(to!string(_manifest.pod.collection_root.to!string), "_dr")).array;
               _possible_config_path_locations = [
                 _dot_pwd,
                 _underscore_pwd,
                 _dot_home,
-                "/etc/sisu",
+                "/etc/dr",
                 _collection_root_a, // set priority higher?
                 _collection_root_b // set priority higher?
               ];
             } else {
               /+ config document (& or local site) on filesystem +/
-              string _sisudoc_conf_pwd   = asNormalizedPath(chainPath(to!string(_env["pwd"]), "sisudoc/conf")).array; // think about
-              string _sisudoc_conf_pwd_a = asNormalizedPath(chainPath(to!string(_env["pwd"]), "conf")).array;
-              string _sisudoc_conf_pwd_b = asNormalizedPath(chainPath(to!string(_env["pwd"]), "../conf")).array;
-              string _sisudoc_conf_pwd_c = asNormalizedPath(chainPath(to!string(_env["pwd"]), "../../conf")).array;
-              string _sisudoc_conf_pwd_d = asNormalizedPath(chainPath(to!string(_env["pwd"]), "../../../conf")).array;
+              string _dr_doc_conf_pwd   = asNormalizedPath(chainPath(to!string(_env["pwd"]), "dr_doc/conf")).array;
+              string _dr_doc_conf_pwd_a = asNormalizedPath(chainPath(to!string(_env["pwd"]), "conf")).array;
+              string _dr_doc_conf_pwd_b = asNormalizedPath(chainPath(to!string(_env["pwd"]), "../conf")).array;
+              string _dr_doc_conf_pwd_c = asNormalizedPath(chainPath(to!string(_env["pwd"]), "../../conf")).array;
+              string _dr_doc_conf_pwd_d = asNormalizedPath(chainPath(to!string(_env["pwd"]), "../../../conf")).array;
               _possible_config_path_locations = [
-                _sisudoc_conf_pwd,
-                _sisudoc_conf_pwd_a,
-                _sisudoc_conf_pwd_b,
-                _sisudoc_conf_pwd_c,
-                _sisudoc_conf_pwd_d,
+                _dr_doc_conf_pwd,
+                _dr_doc_conf_pwd_a,
+                _dr_doc_conf_pwd_b,
+                _dr_doc_conf_pwd_c,
+                _dr_doc_conf_pwd_d,
                 _dot_pwd,
                 _underscore_pwd,
                 _dot_home,
-                "/etc/sisu"
+                "/etc/dr"
               ];
             }
             /+ FIX clean up conf paths ↑
@@ -565,9 +565,9 @@ template ConfigFilePaths() {
 
 tree pod
 pod
-└── sisudoc
+└── dr_doc
     ├── conf
-    │   └── sisu_document_make
+    │   └── dr_document_make
     ├── media
     │   ├── audio
     │   ├── image
@@ -584,8 +584,8 @@ _replace:_
 doc
 ├── en
 │   └── the_wealth_of_networks.yochai_benkler.sst
-└── _sisu
-    └── sisu_document_make
+└── _dr
+    └── dr_document_make
 
 filelist for processing [things to ponder]
 
@@ -617,7 +617,7 @@ template DocReformPathsSRC() {
     D   _pwd,
     Fn  _fn_src_and_path,
   ) {
-    struct SisuSrcPaths {
+    struct drSrcPaths {
       auto pwd() {
         return _pwd;
       }
@@ -632,7 +632,7 @@ template DocReformPathsSRC() {
         return _k;
       }
       string doc_root() {
-        return "sisudoc";
+        return "dr_doc";
       }
       auto media_root() {
         return asNormalizedPath(doc_root.chainPath("media")).array;
@@ -656,7 +656,7 @@ template DocReformPathsSRC() {
         return asNormalizedPath(pwd.chainPath(_fn_src_and_path)).array;
       }
     }
-    return SisuSrcPaths();
+    return drSrcPaths();
   }
 }
 #+END_SRC
@@ -673,7 +673,7 @@ template DocReformPathsPods() {
     string _base_dir_pod = (doc_matters.output_path.length > 0)
     ? doc_matters.output_path ~ "/pod"
     : "/pod";
-    string _base_dir_doc = "sisudoc";
+    string _base_dir_doc = "dr_doc";
     struct _PodPaths {
       string base_filename_(string fn_src) {
         auto pth = fn_src.baseName.stripExtension;
@@ -683,7 +683,7 @@ template DocReformPathsPods() {
         auto pth = _base_dir_pod;
         return pth;
       }
-      string sisudoc_dir_() {
+      string dr_doc_dir_() {
         auto pth = _base_dir_doc;
         return pth;
       }
@@ -742,7 +742,7 @@ template DocReformPathsPods() {
       }
       auto pod_root(string fn_src) {
         auto pth_1_ = "";
-        auto pth_2_ = asNormalizedPath(base(fn_src).filesystem_open_zpod.chainPath("")).array; // "sisudoc"
+        auto pth_2_ = asNormalizedPath(base(fn_src).filesystem_open_zpod.chainPath("")).array;
         struct _pods {
           auto zpod() {
             return pth_1_;
@@ -938,16 +938,16 @@ import doc_reform.meta.rgx;
   be used elsewere
   - if the pod directory has a different name from the file append the pod
     directory name to the output file name: pod_directory.markup_filename e.g.
-    sisu-manual.sisu_markup
+    dr-manual.sisu_markup
   - if pod and file have same name, keep name (makes no sense to repeat pod
-    name) NO sisu_markup.sisu_markup should be sisu_markup
+    name) NO dr_markup.sisu_markup should be sisu_markup
 
 #+name: template_paths_out
 #+BEGIN_SRC d
 template DocReformOutPaths() {
-  auto DocReformOutPaths(Po,Lng)(
-    Po  output_pth_root,
-    Lng lng = "",
+  auto DocReformOutPaths()(
+    string output_pth_root,
+    string lng = "",
   ) {
     struct _PathsStruct {
       string output_root() {