aboutsummaryrefslogtreecommitdiffhomepage
path: root/org/meta_conf_make_meta.org
diff options
context:
space:
mode:
Diffstat (limited to 'org/meta_conf_make_meta.org')
-rw-r--r--org/meta_conf_make_meta.org36
1 files changed, 19 insertions, 17 deletions
diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index 9f6fbf7..fba8663 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -84,14 +84,18 @@ auto url_markup(string line) {
~ _mkup.lnk_o ~ "$2" ~ _mkup.lnk_c
~ _mkup.url_o ~ "$3" ~ _mkup.url_c
~ "$4") // ("$1{ $2 }$3$4")
- )
+ )
.replaceAll(
_rgx.inline_link_naked_url,
("$1"
~ _mkup.lnk_o ~ "$2" ~ _mkup.lnk_c
~ _mkup.url_o ~ "$2" ~ _mkup.url_c
~ "$3") // ("$1{ $2 }$2$3")
- );
+ )
+ .replaceAll(
+ _rgx.arr_delimiter,
+ _mkup.br_line
+ );
return line_;
}
struct ConfCompositeMakeStr {
@@ -103,7 +107,9 @@ struct ConfCompositeMakeStr {
string[] footer;
string[] headings;
string[] home_button_image;
- string[] home_button_text;
+ string home_button_text = "{SiSU}http://www.sisudoc.org;"
+ ~ " {www.sisudoc.org}http://www.sisudoc.org;"
+ ~ " {sources / git}http://git.sisudoc.org/gitweb/";
string italics;
string auto_num_top_at_level;
int auto_num_top_lv = 9;
@@ -149,13 +155,8 @@ struct confCompositeMakeBuild {
auto home_button_image(string[] _mk) {
return _mk;
}
- auto home_button_text(string[] _mk) {
- string line_;
- string[] _mk2;
- foreach (line; _mk) {
- _mk2 ~= url_markup(line);
- }
- return _mk2;
+ auto home_button_text(string _mk) {
+ return url_markup(_mk);
}
auto italics(string _mk) {
string[] _out;
@@ -196,7 +197,9 @@ struct ConfCompositeMakeInit {
string[] footer;
string[] headings;
string[] home_button_image;
- string[] home_button_text;
+ string home_button_text = "{SiSU}http://www.sisudoc.org;"
+ ~ " {www.sisudoc.org}http://www.sisudoc.org;"
+ ~ " {sources / git}http://git.sisudoc.org/gitweb/";
string[] italics;
string auto_num_top_at_level;
int auto_num_top_lv = 9;
@@ -543,17 +546,16 @@ if ("make" in _json.object) {
if ("home_button_text" in _json.object["make"]
&& (_json.object["make"]["home_button_text"].type().to!string == "STRING")
) {
- char[][] __match_home_button_text_array
- = (cast(char[]) _json.object["make"]["home_button_text"].str)
- .split(_rgx.make_heading_delimiter);
- _struct_composite.make_str.home_button_text = __match_home_button_text_array.to!(string[]);
+ _struct_composite.make_str.home_button_text = _json.object["make"]["home_button_text"].str;
} else if ("home_button_text" in _json.object["make"]
- && _json.object["make"]["home_button_text"].type().to!string == "ARRAY") {
+ && _json.object["make"]["home_button_text"].type().to!string == "ARRAY"
+ ) {
string[] _match_home_button_text_array;
foreach (_match_heading; _json.object["make"]["home_button_text"].arrayNoRef) {
_match_home_button_text_array ~= _match_heading.str;
}
- _struct_composite.make_str.home_button_text = _match_home_button_text_array;
+ string _match_home_button_text_str = (_match_home_button_text_array).join("; ");
+ _struct_composite.make_str.home_button_text = _match_home_button_text_str;
}
if ("italics" in _json.object["make"]
&& (_json.object["make"]["italics"].type().to!string == "STRING")