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

7 files changed, 77 insertions, 78 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() {
diff --git a/org/doc_reform.org b/org/doc_reform.org
index 0db3aa1..a38fd26 100644
--- a/org/doc_reform.org
+++ b/org/doc_reform.org
@@ -28,7 +28,7 @@ struct Version {
   int minor;
   int patch;
 }
-enum _ver = Version(0, 7, 5);
+enum _ver = Version(0, 8, 0);
 #+END_SRC
 
 ** compilation restrictions (supported compilers)
@@ -1037,8 +1037,8 @@ template DocReformAbstraction() {
     M _manifest
   ){
     <<doc_reform_conf_files_in_toml>>
-    <<doc_reform_each_file_do_read_and_split_sisu_markup_file_content_into_header_and_body>>
-    <<doc_reform_each_file_do_split_sisu_markup_file_header_into_make_and_meta_structs>>
+    <<doc_reform_each_file_do_read_and_split_dr_markup_file_content_into_header_and_body>>
+    <<doc_reform_each_file_do_split_dr_markup_file_header_into_make_and_meta_structs>>
     <<doc_reform_each_file_do_document_abstraction>>
     <<doc_reform_each_file_do_document_matters>>
     auto t = tuple(doc_abstraction, doc_matters);
@@ -1075,7 +1075,7 @@ if build source pod requested all information needed to build it available at th
   - insert file list              _header_body_insertfilelist_imagelist[headBody.insert_file_list]
   - image list                    _header_body_insertfilelist_imagelist[headBody.image_list]
 
-#+NAME: doc_reform_each_file_do_read_and_split_sisu_markup_file_content_into_header_and_body
+#+NAME: doc_reform_each_file_do_read_and_split_dr_markup_file_content_into_header_and_body
 #+BEGIN_SRC d
 /+ ↓ read file (filename with path) +/
 /+ ↓ file tuple of header and content +/
@@ -1114,7 +1114,7 @@ debug(header_and_body) {
   - make instructions (from configuration files & document header make
     instructions)
 
-#+NAME: doc_reform_each_file_do_split_sisu_markup_file_header_into_make_and_meta_structs
+#+NAME: doc_reform_each_file_do_split_dr_markup_file_header_into_make_and_meta_structs
 #+BEGIN_SRC d
 /+ ↓ split header into make and meta +/
 if ((_opt_action.debug_do)
diff --git a/org/output_hub.org b/org/output_hub.org
index 071a0fb..5375b2f 100644
--- a/org/output_hub.org
+++ b/org/output_hub.org
@@ -77,7 +77,7 @@ import doc_reform.output,
 
 ** outputs
 *** files
-**** source: _sisusrc_ &/or _pod_                                 :source:pod:
+**** source: _dr_src_ &/or _pod_                                 :source:pod:
 - [[./output_pod.org][output_pod]]
 
 #+name: output_scheduled_task
diff --git a/org/output_sqlite.org b/org/output_sqlite.org
index 6eb1640..fc0f1ab 100644
--- a/org/output_sqlite.org
+++ b/org/output_sqlite.org
@@ -1583,7 +1583,6 @@ CREATE TABLE topic_register (
 );
 #+END_SRC
 
-
 **** CREATE TABLE site_urls ?
 
 #+name: sqlite_statement_create_table_site_urls
diff --git a/org/output_src_pod.org b/org/output_src_pod.org
index 0820ca2..1fd6f6c 100644
--- a/org/output_src_pod.org
+++ b/org/output_src_pod.org
@@ -65,7 +65,7 @@ debug(asserts) {
 mixin DocReformOutputRgxInit;
 string pwd = doc_matters.env.pwd;
 auto src_path_info = doc_matters.src_path_info;
-auto pth_sisudoc_src = doc_matters.src_path_info;
+auto pth_dr_doc_src = doc_matters.src_path_info;
 auto pths_pod = DocReformPathsPods!()(doc_matters);
 mixin DocReformLanguageCodes;
 auto lang = Lang();
@@ -121,7 +121,7 @@ auto fn_pod = pths_pod.pod_filename(doc_matters.src.filename).zpod;
   foreach (image; doc_matters.srcs.image_list) {
     debug(podimages) {
       writeln(
-        pth_sisudoc_src.image_root.to!string, "/", image, " -> ",
+        pth_dr_doc_src.image_root.to!string, "/", image, " -> ",
         pths_pod.image_root(doc_matters.src.filename).zpod, "/", image
       );
     }
@@ -153,16 +153,16 @@ auto fn_pod = pths_pod.pod_filename(doc_matters.src.filename).zpod;
       }
     }
   }
-} { /+ bundle sisu_document_make +/
+} { /+ bundle dr_document_make +/
   auto fn_src_in = ((doc_matters.src.is_pod)
     ? doc_matters.src.conf_dir_path
-    : pth_sisudoc_src.conf_root).to!string
-    ~ "/" ~ "sisu_document_make";
+    : pth_dr_doc_src.conf_root).to!string
+    ~ "/" ~ "dr_document_make";
   auto fn_src_out_pod_zip_base
-    = pths_pod.conf_root(doc_matters.src.filename).zpod.to!string ~ "/" ~ "sisu_document_make";
+    = pths_pod.conf_root(doc_matters.src.filename).zpod.to!string ~ "/" ~ "dr_document_make";
   auto fn_src_out_filesystem
     = pths_pod.conf_root(doc_matters.src.filename).filesystem_open_zpod.to!string
-    ~ "/" ~ "sisu_document_make";
+    ~ "/" ~ "dr_document_make";
   if (exists(fn_src_in)) {
     debug(io) {
       writeln("(io debug) src out found: ", fn_src_in);
@@ -311,7 +311,7 @@ if (exists(fn_pod)) {
       catch (ZipException ex) {
         // Handle errors
       }
-      if (doc_matters.src.filename == "sisudoc/media/text/en/the_wealth_of_networks.yochai_benkler.sst") {
+      if (doc_matters.src.filename == "dr_doc/media/text/en/the_wealth_of_networks.yochai_benkler.sst") {
         assert(
           ((data).sha256Of).toHexString
           == "626F83A31ED82F42CF528E922C1643498A137ABA3F2E5AFF8A379EA79EA22A1E",
@@ -321,7 +321,7 @@ if (exists(fn_pod)) {
           ~ ((data).sha256Of).toHexString
         );
       }
-      if (doc_matters.src.filename == "sisudoc/media/text/en/sisu_markup_stress_test.sst") {
+      if (doc_matters.src.filename == "dr_doc/media/text/en/sisu_markup_stress_test.sst") {
         assert(
           ((data).sha256Of).toHexString
           == "AAE0C87AB3F6D5F7385AEEA6EE661F56D40475CFE87AD930C78C9FE07FFB0D91",
diff --git a/org/output_xmls.org b/org/output_xmls.org
index 0a57127..7a5464f 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -381,7 +381,7 @@ string epub3_seg_head(M)(
   <meta name="dc.rights" content="%s" />
   <meta name="generator" content="%s" />
   <link rel="generator" href="%s" />
-  <link rel="shortcut icon" href="../_sisu/image/d.ico" />
+  <link rel="shortcut icon" href="../_dr/image/d.ico" />
   <link rel="stylesheet" href="css/epub.css" type="text/css" id="main-css" />
 </head>
 <body lang="%s">
@@ -3016,7 +3016,7 @@ void epub3_write_output_files(W,M)(
       fn = pth_epub3.fn_oebps_content_opf;
       EPUBzip(epub_write.oebps_content_opf, fn);
     }
-    { /+ OEBPS/_sisu/image (images) +/
+    { /+ OEBPS/_dr/image (images) +/
       foreach (image; doc_matters.srcs.image_list) {
         { /+ debug +/
           if (doc_matters.opt.action.debug_do) {
diff --git a/org/source_files_read.org b/org/source_files_read.org
index 110b1a2..e7eb02a 100644
--- a/org/source_files_read.org
+++ b/org/source_files_read.org
@@ -42,7 +42,7 @@ module doc_reform.source.read_config_files;
 <<meta_config_file_hub>>
 #+END_SRC
 
-*** 0. read config files (config_local_site & sisu_document_make) toml
+*** 0. read config files (config_local_site & dr_document_make) toml
 **** 1. site configuration
 
 #+name: meta_config_file_hub
@@ -102,7 +102,7 @@ static template readConfigDoc() {
     string config_file_str;
     string conf_filename = "NONE";
     auto _conf_file_details = ConfigFilePaths!()(_manifest, _env);
-    string[] possible_config_path_locations = _conf_file_details.possible_config_path_locations.sisu_document_make;
+    string[] possible_config_path_locations = _conf_file_details.possible_config_path_locations.dr_document_make;
     foreach(conf_fn; [_conf_file_details.config_filename_document_toml]) {
       foreach(pth; possible_config_path_locations) {
         auto conf_file = asNormalizedPath(chainPath(pth.to!string, conf_fn)).array;
@@ -142,7 +142,7 @@ static template readConfigDoc() {
 #+END_SRC
 
 ** A. TOML                                                            :toml:
-*** 1. TOML read config files (config_local_site & sisu_document_make) :file:config:
+*** 1. TOML read config files (config_local_site & dr_document_make) :file:config:
 **** TOML config_local_site
 
 #+name: meta_config_file_in
@@ -180,7 +180,7 @@ static template configReadInSiteTOML() {
 }
 #+END_SRC
 
-**** TOML sisu_document_make
+**** TOML dr_document_make
 
 #+name: meta_config_file_in
 #+BEGIN_SRC d
@@ -189,7 +189,7 @@ static template configReadInDocTOML() {
   final string configReadInDocTOML(M,E)(M manifest, E env) {
     auto conf_file_details = ConfigFilePaths!()(manifest, env);
     string conf_toml = conf_file_details.config_filename_document_toml;
-    string[] possible_config_path_locations = conf_file_details.possible_config_path_locations.sisu_document_make;
+    string[] possible_config_path_locations = conf_file_details.possible_config_path_locations.dr_document_make;
     string config_file_str;
     debug(io) {
       writeln("WARNING (io debug) in config filename: ", conf_toml);
@@ -237,7 +237,7 @@ static template configTOML() {
 }
 #+END_SRC
 
-*** 3. TOML config (config_local_site & sisu_document_make) :file:config:hub:
+*** 3. TOML config (config_local_site & dr_document_make) :file:config:hub:
 
 #+name: meta_config_file_hub
 #+BEGIN_SRC d
@@ -450,7 +450,7 @@ auto markupSourceReadIn(in string fn_src) {
   static auto rgx = Rgx();
   enforce(
     fn_src.match(rgx.src_pth_sst_or_ssm),
-    "not a sisu markup filename: «" ~
+    "not a dr markup filename: «" ~
     fn_src ~ "»"
   );
   auto source_txt_str = readInMarkupSource(fn_src);
@@ -494,7 +494,7 @@ final char[][] getInsertMarkupSourceContentRawLineArray(
 ) {
   enforce(
     fn_src_insert.match(rgx_file),
-    "not a sisu markup filename: «" ~
+    "not a dr markup filename: «" ~
     fn_src_insert  ~ "»"
   );
   auto source_txt_str = readInMarkupSource(fn_src_insert);