playing with header/make substitutionsdoc-reform_v0.0.24

1 files changed, 24 insertions, 11 deletions

diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index 91c9d11..aa67709 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -48,6 +48,7 @@ import sdp.meta.conf_make_meta_structs;
 module sdp.meta.conf_make_meta_structs;
 import
   std.exception,
+  std.json,
   std.regex,
   std.stdio,
   std.string,
@@ -75,7 +76,7 @@ struct ConfCompositeMakeStr {
   string italics                        = "";
   string num_top                        = "";
   string num_depth                      = "";
-  string substitute                     = "";
+  JSONValue substitute                  = JSONValue( ["", ""] );
   string texpdf_font                    = "";
 }
 struct confCompositeMakeBuild {
@@ -86,7 +87,10 @@ struct confCompositeMakeBuild {
     return (cast(char[]) (_rgxtxt));
   }
   auto bold_substitute_abstract() {
-    return "<b>$1</b>";
+    return "*{$1}*";
+  }
+  auto bold_substitute_sisu_markup() {
+    return "*{$1}*";
   }
   auto bold_substitute_html() {
     return "<b>$1</b>";
@@ -107,7 +111,10 @@ struct confCompositeMakeBuild {
     return (cast(char[]) (_rgxtxt));
   }
   auto emphasis_substitute_abstract() {
-    return "<em>$1</em>";
+    return "!{$1}!";
+  }
+  auto emphasis_substitute_sisu_markup() {
+    return "!{$1}!";
   }
   auto emphasis_substitute_html() {
     return "<em>$1</em>";
@@ -131,7 +138,10 @@ struct confCompositeMakeBuild {
     return (cast(char[]) (_rgxtxt));
   }
   auto italics_substitute_abstract() {
-    return "<i>$1</i>";
+    return "/{$1}/";
+  }
+  auto italics_substitute_sisu_markup() {
+    return "/{$1}/";
   }
   auto italics_substitute_html() {
     return "<i>$1</i>";
@@ -142,8 +152,8 @@ struct confCompositeMakeBuild {
   auto num_depth(string _mk) {
     return _mk;
   }
-  auto substitute(string _mk) { // TODO this is different from others
-    return regex(_mk);
+  auto substitute(JSONValue _mk) {
+    return _mk;
   }
   auto texpdf_font(string _mk) {
     return _mk;
@@ -158,24 +168,27 @@ struct confCompositeMakeBuild {
 #+BEGIN_SRC d
 struct ConfCompositeMakeInit {
   char[] bold_rgxmatch                  = `=NULL`.dup;
-  auto bold_substitute_abstract         = "<b>$1</b>";
+  auto bold_substitute_abstract         = "*{$1}*";
+  auto bold_substitute_sisu_markup      = "*{$1}*";
   auto bold_substitute_html             = "<b>$1</b>";
   string breaks                         = "";
   string cover_image                    = "";
   string css                            = "";
   char[] emphasis_rgxmatch              = `=NULL`.dup;
-  auto emphasis_substitute_abstract     = "<em>$1</em>";
+  auto emphasis_substitute_abstract     = "!{$1}!";
+  auto emphasis_substitute_sisu_markup  = "!{$1}!";
   auto emphasis_substitute_html         = "<em>$1</em>";
   string footer                         = "";
   string headings                       = "";
   string home_button_image              = "";
   string home_button_text               = "";
   char[] italics_rgxmatch               = `=NULL`.dup;
-  auto italics_substitute_abstract      = "<i>$1</i>";
+  auto italics_substitute_abstract      = "/{$1}/";
+  auto italics_substitute_sisu_markup   = "/{$1}/";
   auto italics_substitute_html          = "<i>$1</i>";
   string num_top                        = "";
   string num_depth                      = "";
-  auto substitute                       = regex(""); // TODO
+  auto substitute                       = JSONValue(["", ""]);
   string texpdf_font                    = "";
 }
 #+END_SRC
@@ -482,7 +495,7 @@ if ("make" in _json.object) {
     _struct_composite.make_str.num_depth  = _json.object["num_depth"][""].str;
   }
   if ("substitute" in _json.object["make"]) {
-    _struct_composite.make_str.substitute  = _json.object["make"]["substitute"].str;
+    _struct_composite.make_str.substitute  = _json.object["make"]["substitute"].arrayNoRef;
   }
   if ("texpdf_font" in _json.object["make"]) {
     _struct_composite.make_str.texpdf_font  = _json.object["make"]["texpdf_font"].str;