name changes

1 files changed, 47 insertions, 47 deletions

diff --git a/org/default_paths.org b/org/default_paths.org
index 08adb45..99f7909 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -46,7 +46,7 @@ import
 #+name: template_paths_src
 #+BEGIN_SRC d
 template PodManifest() {
-  mixin DocReformRgxInit;
+  mixin spineRgxInit;
   static auto rgx = Rgx();
   auto PodManifest(P)(
     P   _pth=""
@@ -118,7 +118,7 @@ pod
 #+name: template_paths_src
 #+BEGIN_SRC d
 template PathMatters() {
-  mixin DocReformRgxInit;
+  mixin spineRgxInit;
   mixin InternalMarkup;
   static auto rgx  = Rgx();
   static auto mkup = InlineMarkup();
@@ -466,7 +466,7 @@ template PathMatters() {
 #+name: template_paths_src
 #+BEGIN_SRC d
 template ConfigFilePaths() {
-  mixin DocReformRgxInit;
+  mixin spineRgxInit;
   static auto rgx = Rgx();
   auto ConfigFilePaths(M,E)(
     M      _manifested,
@@ -639,10 +639,10 @@ filelist for processing [things to ponder]
 
 #+name: template_paths_src
 #+BEGIN_SRC d
-template DocReformPathsSRC() {
-  mixin DocReformRgxInit;
+template spinePathsSRC() {
+  mixin spineRgxInit;
   static auto rgx = Rgx();
-  auto DocReformPathsSRC(D,Fn)(
+  auto spinePathsSRC(D,Fn)(
     D   _pwd,
     Fn  _fn_src_and_path,
   ) {
@@ -694,11 +694,11 @@ template DocReformPathsSRC() {
 
 #+name: template_paths_pods
 #+BEGIN_SRC d
-template DocReformPathsPods() {
-  mixin DocReformRgxInit;
+template spinePathsPods() {
+  mixin spineRgxInit;
   static auto rgx = Rgx();
   string _suffix = ".zip";
-  auto DocReformPathsPods(M)(M doc_matters) {
+  auto spinePathsPods(M)(M doc_matters) {
     string _base_dir_pod = (doc_matters.output_path.length > 0)
     ? doc_matters.output_path ~ "/pod"
     : "/pod";
@@ -992,8 +992,8 @@ import doc_reform.meta.rgx;
 
 #+name: template_paths_out
 #+BEGIN_SRC d
-template DocReformOutPaths() {
-  auto DocReformOutPaths()(
+template spineOutPaths() {
+  auto spineOutPaths()(
     string output_pth_root,
     string lng = "",
   ) {
@@ -1009,8 +1009,8 @@ template DocReformOutPaths() {
     return _PathsStruct();
   }
 }
-template DocReformOutPathSQLite() {
-  auto DocReformOutPathSQLite(Po)(
+template spineOutPathSQLite() {
+  auto spineOutPathSQLite(Po)(
     Po  output_pth_root,
   ) {
     struct _PathsStruct {
@@ -1031,9 +1031,9 @@ template DocReformOutPathSQLite() {
 
 #+name: template_paths_out
 #+BEGIN_SRC d
-template DocReformOutPathsFnPd() {
+template spineOutPathsFnPd() {
   /+ TODO stuff to work out here +/
-  auto DocReformOutPathsFnPd(Fn,Pn)(
+  auto spineOutPathsFnPd(Fn,Pn)(
     Fn  fn_src_pth,
     Pn  pod_name_with_path
   ) {
@@ -1075,11 +1075,11 @@ template DocReformOutPathsFnPd() {
 
 #+name: template_paths_html
 #+BEGIN_SRC d
-template DocReformDocRootTreeHTML() {
-  mixin DocReformRgxInit;
+template spineDocRootTreeHTML() {
+  mixin spineRgxInit;
   static auto rgx = Rgx();
-  auto DocReformDocRootTreeHTML()(string lng) {
-    auto lng_pth = DocReformOutPaths!()("", lng);
+  auto spineDocRootTreeHTML()(string lng) {
+    auto lng_pth = spineOutPaths!()("", lng);
     string base_dir = "html";
     string suffix = ".html";
     struct _PathsStruct {
@@ -1138,14 +1138,14 @@ template DocReformDocRootTreeHTML() {
 
 #+name: template_paths_html
 #+BEGIN_SRC d
-template DocReformPathsHTML() {
-  mixin DocReformRgxInit;
+template spinePathsHTML() {
+  mixin spineRgxInit;
   static auto rgx = Rgx();
-  auto DocReformPathsHTML()(
+  auto spinePathsHTML()(
     string output_path_root,
     string lng,
   ) {
-    auto doc_tree = DocReformDocRootTreeHTML!()(lng);
+    auto doc_tree = spineDocRootTreeHTML!()(lng);
     string base_dir = "html";
     string suffix = ".html";
     struct _PathsStruct {
@@ -1198,15 +1198,15 @@ template DocReformPathsHTML() {
 
 #+name: template_paths_html
 #+BEGIN_SRC d
-template DocReformUrlsHTML() {
+template spineUrlsHTML() {
   import std.format;
-  mixin DocReformRgxInit;
+  mixin spineRgxInit;
   static auto rgx = Rgx();
-  auto DocReformUrlsHTML()(
+  auto spineUrlsHTML()(
     string url_doc_root,
     string lng,
   ) {
-    auto doc_tree = DocReformDocRootTreeHTML!()(lng);
+    auto doc_tree = spineDocRootTreeHTML!()(lng);
     string base_dir = "html";
     string suffix = ".html";
     struct _PathsStruct {
@@ -1300,14 +1300,14 @@ template DocReformUrlsHTML() {
 
 #+name: template_paths_epub
 #+BEGIN_SRC d
-template DocReformPathsEPUB() {
-  mixin DocReformRgxInit;
+template spinePathsEPUB() {
+  mixin spineRgxInit;
   static auto rgx = Rgx();
-  auto DocReformPathsEPUB()(
+  auto spinePathsEPUB()(
     string output_pth_root,
     string lng,
   ) {
-    auto out_pth = DocReformOutPaths!()(output_pth_root, lng);
+    auto out_pth = spineOutPaths!()(output_pth_root, lng);
     string base_dir = "epub";
     struct _PathsStruct {
       string base() {
@@ -1408,13 +1408,13 @@ template DocReformPathsEPUB() {
 
 #+name: template_paths_odf
 #+BEGIN_SRC d
-template DocReformPathsODT() {
-  mixin DocReformRgxInit;
+template spinePathsODT() {
+  mixin spineRgxInit;
   static auto rgx = Rgx();
-  auto DocReformPathsODT(M)(
+  auto spinePathsODT(M)(
     M  doc_matters,
   ) {
-    auto out_pth = DocReformOutPaths!()( doc_matters.output_path, doc_matters.src.language);
+    auto out_pth = spineOutPaths!()( doc_matters.output_path, doc_matters.src.language);
     string base_dir = "odf";
     struct _PathsStruct {
       string base_pth() { // dir will contain odt document file (also debug file tree)
@@ -1478,10 +1478,10 @@ template DocReformPathsODT() {
 
 #+name: template_paths_latex
 #+BEGIN_SRC d
-template DocReformPathsLaTeX() {
-  mixin DocReformRgxInit;
+template spinePathsLaTeX() {
+  mixin spineRgxInit;
   static auto rgx = Rgx();
-  auto DocReformPathsLaTeX(M)(
+  auto spinePathsLaTeX(M)(
     M  doc_matters,
   ) {
     struct _PathsStruct {
@@ -1489,7 +1489,7 @@ template DocReformPathsLaTeX() {
         return fn_src.baseName.stripExtension;
       }
       string base() {
-        auto out_pth = DocReformOutPaths!()(doc_matters.output_path, doc_matters.src.language);
+        auto out_pth = spineOutPaths!()(doc_matters.output_path, doc_matters.src.language);
         string base_dir = "latex";
         return (((out_pth.output_root).chainPath(base_dir)).asNormalizedPath).array;
       }
@@ -1514,10 +1514,10 @@ template DocReformPathsLaTeX() {
 
 #+name: template_paths_sqlite
 #+BEGIN_SRC d
-template DocReformPathsSQLiteDiscrete() {
-  mixin DocReformRgxInit;
+template spinePathsSQLiteDiscrete() {
+  mixin spineRgxInit;
   static auto rgx = Rgx();
-  auto DocReformPathsSQLiteDiscrete()(
+  auto spinePathsSQLiteDiscrete()(
     string output_pth_root,
     string lng,
   ) {
@@ -1526,7 +1526,7 @@ template DocReformPathsSQLiteDiscrete() {
         return fn_src.baseName.stripExtension;
       }
       string base() {
-        auto out_pth = DocReformOutPaths!()(output_pth_root, lng);
+        auto out_pth = spineOutPaths!()(output_pth_root, lng);
         string base_dir = "sqlite";
         return (((out_pth.output_base).chainPath(base_dir)).asNormalizedPath).array;
       }
@@ -1546,10 +1546,10 @@ template DocReformPathsSQLiteDiscrete() {
 
 #+name: template_paths_sqlite
 #+BEGIN_SRC d
-template DocReformPathsSQLite() {
-  mixin DocReformRgxInit;
+template spinePathsSQLite() {
+  mixin spineRgxInit;
   static auto rgx = Rgx();
-  auto DocReformPathsSQLite(DbN, Po)(
+  auto spinePathsSQLite(DbN, Po)(
     DbN db_name,
     Po  output_pth_root,
   ) {
@@ -1558,7 +1558,7 @@ template DocReformPathsSQLite() {
         return fn_src.baseName.stripExtension;
       }
       string base() {
-        auto out_pth = DocReformOutPathSQLite!()(output_pth_root); // decide whether to have separate files for each language
+        auto out_pth = spineOutPathSQLite!()(output_pth_root); // decide whether to have separate files for each language
         string base_dir = "sqlite";
         return (((out_pth.output_root).chainPath(base_dir)).asNormalizedPath).array;
       }