From 194c896c4a3780e9fece376507dcac3657237cd4 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 26 Feb 2018 15:42:10 -0500
Subject: playing with header/make substitutions
---
src/sdp/meta/conf_make_meta_structs.d | 33 +++++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
(limited to 'src/sdp/meta/conf_make_meta_structs.d')
diff --git a/src/sdp/meta/conf_make_meta_structs.d b/src/sdp/meta/conf_make_meta_structs.d
index 211d2c0..3253b45 100644
--- a/src/sdp/meta/conf_make_meta_structs.d
+++ b/src/sdp/meta/conf_make_meta_structs.d
@@ -1,6 +1,7 @@
module sdp.meta.conf_make_meta_structs;
import
std.exception,
+ std.json,
std.regex,
std.stdio,
std.string,
@@ -21,7 +22,7 @@ struct ConfCompositeMakeStr {
string italics = "";
string num_top = "";
string num_depth = "";
- string substitute = "";
+ JSONValue substitute = JSONValue( ["", ""] );
string texpdf_font = "";
}
struct confCompositeMakeBuild {
@@ -32,7 +33,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>";
@@ -53,7 +57,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>";
@@ -77,7 +84,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>";
@@ -88,8 +98,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;
@@ -97,24 +107,27 @@ struct confCompositeMakeBuild {
}
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 = "";
}
struct ConfCompositeSiteLocal {
--
cgit v1.2.3