xmls, home button fixes

3 files changed, 34 insertions, 16 deletions

diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index c3da874..67bbebe 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -109,9 +109,9 @@ struct ConfCompositeMakeStr {
   string[]   footer;
   string[]   headings;
   string[]   home_button_image;
-  string     home_button_text = "{Spine, Doc Reform}http://www.doc-reform.org;"
-    ~ " {www.doc-reform.org}http://www.doc-reform.org;"
-    ~ " {sources / git}https://git.doc-reform.org/software/spine";
+  string     home_button_text = "┥Spine, Doc Reform┝┤http://www.doc-reform.org├"
+    ~ " ┥www.doc-reform.org┝┤http://www.doc-reform.org├"
+    ~ " ┥sources / git┝┤https://git.doc-reform.org/software/spine├";
   string     italics;
   string     auto_num_top_at_level;
   int        auto_num_top_lv           = 9;
@@ -199,9 +199,9 @@ struct ConfCompositeMakeInit {
   string[]   footer;
   string[]   headings;
   string[]   home_button_image;
-  string     home_button_text = "{Spine, Doc Reform}http://www.doc-reform.org;"
-    ~ " {www.doc-reform.org}http://www.doc-reform.org;"
-    ~ " {sources / git}https://git.doc-reform.org/software/spine";
+  string     home_button_text = "┥Spine, Doc Reform┝┤http://www.doc-reform.org├"
+    ~ " ┥www.doc-reform.org┝┤http://www.doc-reform.org├"
+    ~ " ┥sources / git┝┤https://git.doc-reform.org/software/spine├";
   string[] italics;
   string     auto_num_top_at_level;
   int        auto_num_top_lv               = 9;
@@ -368,7 +368,9 @@ static template contentYAMLtoSpineStruct() {
     mixin spineRgxInit;
     static auto rgx = Rgx();
     confCompositeMakeBuild _mk;
-    <<yaml_objects>>
+    <<yaml_objects_make>>
+    <<yaml_objects_conf>>
+    <<yaml_objects_meta>>
     return _struct_composite;
   }
 }
@@ -376,7 +378,7 @@ static template contentYAMLtoSpineStruct() {
 
 **  make
 
-#+name: yaml_objects
+#+name: yaml_objects_make
 #+BEGIN_SRC d
 /+ make ------------------------------------------------------------------- +/
 if ("make" in _yaml
@@ -454,6 +456,14 @@ if ("make" in _yaml
       && _yaml["make"]["home_button_text"].tag.match(rgx.yaml_tag_is_str)
     ) {
       _struct_composite.make_str.home_button_text = _yaml["make"]["home_button_text"].get!string;
+    } else if ("home_button_text" in _yaml["make"]
+      && _yaml["make"]["home_button_text"].type.string
+      && _yaml["make"]["home_button_text"].tag.match(rgx.yaml_tag_is_seq)
+    ) {
+      _struct_composite.make_str.home_button_text = "";
+      foreach(string hbt; _yaml["make"]["home_button_text"]) {
+        _struct_composite.make_str.home_button_text ~= hbt ~ "; ";
+      }
     }
     if ("italics" in _yaml["make"]
       && _yaml["make"]["italics"].type.string
@@ -525,7 +535,7 @@ if ("make" in _yaml
 
 **  conf
 
-#+name: yaml_objects
+#+name: yaml_objects_conf
 #+BEGIN_SRC d
 /+ conf ------------------------------------------------------------------- +/
 if ("webserv" in _yaml
@@ -765,7 +775,7 @@ if ("search" in _yaml
 
 **  meta
 
-#+name: yaml_objects
+#+name: yaml_objects_meta
 #+BEGIN_SRC d
 /+ meta ------------------------------------------------------------------- +/
 if (_struct_composite.meta.creator_author.empty) {
diff --git a/src/doc_reform/meta/conf_make_meta_structs.d b/src/doc_reform/meta/conf_make_meta_structs.d
index 10a754a..91ecab7 100644
--- a/src/doc_reform/meta/conf_make_meta_structs.d
+++ b/src/doc_reform/meta/conf_make_meta_structs.d
@@ -48,9 +48,9 @@ struct ConfCompositeMakeStr {
   string[]   footer;
   string[]   headings;
   string[]   home_button_image;
-  string     home_button_text = "{Spine, Doc Reform}http://www.doc-reform.org;"
-    ~ " {www.doc-reform.org}http://www.doc-reform.org;"
-    ~ " {sources / git}https://git.doc-reform.org/software/spine";
+  string     home_button_text = "┥Spine, Doc Reform┝┤http://www.doc-reform.org├"
+    ~ " ┥www.doc-reform.org┝┤http://www.doc-reform.org├"
+    ~ " ┥sources / git┝┤https://git.doc-reform.org/software/spine├";
   string     italics;
   string     auto_num_top_at_level;
   int        auto_num_top_lv           = 9;
@@ -131,9 +131,9 @@ struct ConfCompositeMakeInit {
   string[]   footer;
   string[]   headings;
   string[]   home_button_image;
-  string     home_button_text = "{Spine, Doc Reform}http://www.doc-reform.org;"
-    ~ " {www.doc-reform.org}http://www.doc-reform.org;"
-    ~ " {sources / git}https://git.doc-reform.org/software/spine";
+  string     home_button_text = "┥Spine, Doc Reform┝┤http://www.doc-reform.org├"
+    ~ " ┥www.doc-reform.org┝┤http://www.doc-reform.org├"
+    ~ " ┥sources / git┝┤https://git.doc-reform.org/software/spine├";
   string[] italics;
   string     auto_num_top_at_level;
   int        auto_num_top_lv               = 9;
diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d
index a01a025..8f1f885 100644
--- a/src/doc_reform/meta/conf_make_meta_yaml.d
+++ b/src/doc_reform/meta/conf_make_meta_yaml.d
@@ -106,6 +106,14 @@ static template contentYAMLtoSpineStruct() {
           && _yaml["make"]["home_button_text"].tag.match(rgx.yaml_tag_is_str)
         ) {
           _struct_composite.make_str.home_button_text = _yaml["make"]["home_button_text"].get!string;
+        } else if ("home_button_text" in _yaml["make"]
+          && _yaml["make"]["home_button_text"].type.string
+          && _yaml["make"]["home_button_text"].tag.match(rgx.yaml_tag_is_seq)
+        ) {
+          _struct_composite.make_str.home_button_text = "";
+          foreach(string hbt; _yaml["make"]["home_button_text"]) {
+            _struct_composite.make_str.home_button_text ~= hbt ~ "; ";
+          }
         }
         if ("italics" in _yaml["make"]
           && _yaml["make"]["italics"].type.string