aboutsummaryrefslogtreecommitdiffhomepage
path: root/org/meta_conf_make_meta.org
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2022-11-25 22:06:40 -0500
committerRalph Amissah <ralph.amissah@gmail.com>2022-12-23 18:17:41 -0500
commitf6d28b62f0e02b8a88a1832589e203c7a613f45b (patch)
treeb5d6462e45bae998190194784e02b143a83f79a3 /org/meta_conf_make_meta.org
parentgitignore & things nix (diff)
regex review, match speed & compile time, ctregex
- improve match time - add interim fontface identifier marker - improve compile time - remove unused regexs - separate out some specialized output matches
Diffstat (limited to 'org/meta_conf_make_meta.org')
-rw-r--r--org/meta_conf_make_meta.org265
1 files changed, 138 insertions, 127 deletions
diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index af86ba8..f45d3c4 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -7,8 +7,8 @@
#+COPYRIGHT: Copyright (C) 2015 - 2022 Ralph Amissah
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
-#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb yes
+#+PROPERTY: header-args :noweb yes
+#+PROPERTY: header-args+ :exports code
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -262,9 +262,12 @@ import
std.conv : to;
import
doc_reform.meta.defaults,
+ doc_reform.meta.rgx_yaml,
doc_reform.meta.rgx;
mixin spineRgxIn;
static auto rgx = RgxI();
+mixin spineRgxYamlTags;
+static auto rgx_y = RgxYaml();
mixin InternalMarkup;
static auto mkup = InlineMarkup();
#+END_SRC
@@ -580,6 +583,7 @@ template contentYAMLtoSpineStruct() {
import
doc_reform.meta.conf_make_meta_structs,
doc_reform.meta.defaults,
+ doc_reform.meta.rgx_yaml,
doc_reform.meta.rgx;
ConfComposite _struct_composite;
@system auto contentYAMLtoSpineStruct(C,Y,M,O,Cfg)(
@@ -592,6 +596,8 @@ template contentYAMLtoSpineStruct() {
) {
mixin spineRgxIn;
static auto rgx = RgxI();
+ mixin spineRgxYamlTags;
+ static auto rgx_y = RgxYaml();
<<meta_check_input_markup>>
confCompositeMakeBuild _mk;
if (_identifier != "header") { // called only once per run anyway
@@ -628,11 +634,11 @@ template contentYAMLtoSpineStruct() {
: _cfg.http_request_type;
if (("webserv" in _yaml && _yaml["webserv"].type.sequence)
&& (_yaml["webserv"].type.mapping
- && _yaml["webserv"].tag.match(rgx.yaml_tag_is_map))
+ && _yaml["webserv"].tag.match(rgx_y.yaml_tag_is_map))
) {
if ("http" in _yaml["webserv"]
&& _yaml["webserv"]["http"].type.string
- && _yaml["webserv"]["http"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["http"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_http
= _yaml["webserv"]["http"].get!string;
@@ -649,11 +655,11 @@ template contentYAMLtoSpineStruct() {
: _cfg.cgi_search_form_title;
if (("webserv" in _yaml && _yaml["webserv"].type.sequence)
&& (_yaml["webserv"].type.mapping
- && _yaml["webserv"].tag.match(rgx.yaml_tag_is_map))
+ && _yaml["webserv"].tag.match(rgx_y.yaml_tag_is_map))
) {
if ("cgi_search_form_title" in _yaml["webserv"]
&& _yaml["webserv"]["cgi_search_form_title"].type.string
- && _yaml["webserv"]["cgi_search_form_title"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["cgi_search_form_title"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_cgi_search_form_title
= _yaml["webserv"]["cgi_search_form_title"].get!string;
@@ -670,11 +676,11 @@ template contentYAMLtoSpineStruct() {
: _cfg.cgi_filename;
if (("webserv" in _yaml && _yaml["webserv"].type.sequence)
&& (_yaml["webserv"].type.mapping
- && _yaml["webserv"].tag.match(rgx.yaml_tag_is_map))
+ && _yaml["webserv"].tag.match(rgx_y.yaml_tag_is_map))
) {
if ("cgi_search_script" in _yaml["webserv"]
&& _yaml["webserv"]["cgi_search_script"].type.string
- && _yaml["webserv"]["cgi_search_script"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["cgi_search_script"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_cgi_search_script
= _yaml["webserv"]["cgi_search_script"].get!string;
@@ -691,11 +697,11 @@ template contentYAMLtoSpineStruct() {
: _cfg.db_sqlite_filename;
if (("webserv" in _yaml && _yaml["webserv"].type.sequence)
&& (_yaml["webserv"].type.mapping
- && _yaml["webserv"].tag.match(rgx.yaml_tag_is_map))
+ && _yaml["webserv"].tag.match(rgx_y.yaml_tag_is_map))
) {
if ("db_sqlite_filename" in _yaml["webserv"]
&& _yaml["webserv"]["db_sqlite_filename"].type.string
- && _yaml["webserv"]["db_sqlite_filename"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["db_sqlite_filename"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_db_sqlite_filename
= _yaml["webserv"]["db_sqlite_filename"].get!string;
@@ -712,11 +718,11 @@ template contentYAMLtoSpineStruct() {
: _cfg.db_sqlite_path;
if (("webserv" in _yaml && _yaml["webserv"].type.sequence)
&& (_yaml["webserv"].type.mapping
- && _yaml["webserv"].tag.match(rgx.yaml_tag_is_map))
+ && _yaml["webserv"].tag.match(rgx_y.yaml_tag_is_map))
) {
if ("db_sqlite_path" in _yaml["webserv"]
&& _yaml["webserv"]["db_sqlite_path"].type.string
- && _yaml["webserv"]["db_sqlite_path"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["db_sqlite_path"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_db_sqlite_path
= _yaml["webserv"]["db_sqlite_path"].get!string;
@@ -733,11 +739,11 @@ template contentYAMLtoSpineStruct() {
: _cfg.www_url_doc_root;
if (("webserv" in _yaml && _yaml["webserv"].type.sequence)
&& (_yaml["webserv"].type.mapping
- && _yaml["webserv"].tag.match(rgx.yaml_tag_is_map))
+ && _yaml["webserv"].tag.match(rgx_y.yaml_tag_is_map))
) {
if ("cgi_action" in _yaml["webserv"]
&& _yaml["webserv"]["cgi_action"].type.string
- && _yaml["webserv"]["cgi_action"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["cgi_action"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_cgi_action
= _yaml["webserv"]["cgi_action"].get!string;
@@ -760,14 +766,14 @@ template contentYAMLtoSpineStruct() {
: _cfg.processing_path_doc_root;
if (("webserv" in _yaml && _yaml["webserv"].type.sequence)
&& (_yaml["webserv"].type.mapping
- && _yaml["webserv"].tag.match(rgx.yaml_tag_is_map))
+ && _yaml["webserv"].tag.match(rgx_y.yaml_tag_is_map))
) {
if (_yaml["output"].type.mapping
- && _yaml["output"].tag.match(rgx.yaml_tag_is_map)
+ && _yaml["output"].tag.match(rgx_y.yaml_tag_is_map)
) {
if ("path" in _yaml["output"]
&& _yaml["output"]["path"].type.string
- && _yaml["output"]["path"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["output"]["path"].tag.match(rgx_y.yaml_tag_is_str)
) {
if (_manifested.output.path == _manifested.env.pwd
&& _yaml["output"]["path"].get!string.length > 0
@@ -788,11 +794,11 @@ template contentYAMLtoSpineStruct() {
: _cfg.processing_path_doc_root;
if (("webserv" in _yaml && _yaml["webserv"].type.sequence)
&& (_yaml["webserv"].type.mapping
- && _yaml["webserv"].tag.match(rgx.yaml_tag_is_map))
+ && _yaml["webserv"].tag.match(rgx_y.yaml_tag_is_map))
) {
if ("data_root_path" in _yaml["webserv"]
&& _yaml["webserv"]["data_root_path"].type.string
- && _yaml["webserv"]["data_root_path"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["data_root_path"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_data_root_path
= _yaml["webserv"]["data_root_path"].get!string;
@@ -810,11 +816,11 @@ template contentYAMLtoSpineStruct() {
: _cfg.cgi_bin_root;
if (("webserv" in _yaml && _yaml["webserv"].type.sequence)
&& (_yaml["webserv"].type.mapping
- && _yaml["webserv"].tag.match(rgx.yaml_tag_is_map))
+ && _yaml["webserv"].tag.match(rgx_y.yaml_tag_is_map))
) {
if ("cgi_bin_path" in _yaml["webserv"]
&& _yaml["webserv"]["cgi_bin_path"].type.string
- && _yaml["webserv"]["cgi_bin_path"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["cgi_bin_path"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_cgi_bin_path
= _yaml["webserv"]["cgi_bin_path"].get!string;
@@ -825,11 +831,11 @@ template contentYAMLtoSpineStruct() {
= "";
if (("webserv" in _yaml && _yaml["webserv"].type.sequence)
&& (_yaml["webserv"].type.mapping
- && _yaml["webserv"].tag.match(rgx.yaml_tag_is_map))
+ && _yaml["webserv"].tag.match(rgx_y.yaml_tag_is_map))
) {
if ("data_root_part" in _yaml["webserv"]
&& _yaml["webserv"]["data_root_part"].type.string
- && _yaml["webserv"]["data_root_part"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["data_root_part"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_data_root_part = _yaml["webserv"]["data_root_part"].get!string;
}
@@ -839,11 +845,11 @@ template contentYAMLtoSpineStruct() {
= "image";
if (("webserv" in _yaml && _yaml["webserv"].type.sequence)
&& (_yaml["webserv"].type.mapping
- && _yaml["webserv"].tag.match(rgx.yaml_tag_is_map))
+ && _yaml["webserv"].tag.match(rgx_y.yaml_tag_is_map))
) {
if ("images_root_part" in _yaml["webserv"]
&& _yaml["webserv"]["images_root_part"].type.string
- && _yaml["webserv"]["images_root_part"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["images_root_part"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_images_root_part = _yaml["webserv"]["images_root_part"].get!string;
}
@@ -853,31 +859,31 @@ template contentYAMLtoSpineStruct() {
if (("webserv" in _yaml
&& _yaml["webserv"].type.sequence)
&& (_yaml["webserv"].type.mapping
- && _yaml["webserv"].tag.match(rgx.yaml_tag_is_map))
+ && _yaml["webserv"].tag.match(rgx_y.yaml_tag_is_map))
) { // cannot be used as is with opt_action FIX look at remaining, decide what to do later
if ("data_http" in _yaml["webserv"]
&& _yaml["webserv"]["data_http"].type.string
- && _yaml["webserv"]["data_http"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["data_http"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_data_http = _yaml["webserv"]["data_http"].get!string;
}
// if (_opt_action.*.length > 0) {
if ("cgi_http" in _yaml["webserv"]
&& _yaml["webserv"]["cgi_http"].type.string
- && _yaml["webserv"]["cgi_http"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["cgi_http"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_cgi_http = _yaml["webserv"]["cgi_http"].get!string;
}
// if (_opt_action.*.length > 0) {
if ("host" in _yaml["webserv"]
&& _yaml["webserv"]["host"].type.string
- && _yaml["webserv"]["host"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["host"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_host = _yaml["webserv"]["host"].get!string;
}
if ("data_root_url" in _yaml["webserv"]
&& _yaml["webserv"]["data_root_url"].type.string
- && _yaml["webserv"]["data_root_url"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["data_root_url"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_data_root_url = _yaml["webserv"]["data_root_url"].get!string;
_struct_composite.conf.w_srv_data_root_url_html =
@@ -894,7 +900,7 @@ if (("webserv" in _yaml
}
if ("cgi_host" in _yaml["webserv"]
&& _yaml["webserv"]["cgi_host"].type.string
- && _yaml["webserv"]["cgi_host"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["cgi_host"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_cgi_host = _yaml["webserv"]["cgi_host"].get!string;
} else { // composite construct
@@ -902,25 +908,25 @@ if (("webserv" in _yaml
}
if ("cgi_bin_subpath" in _yaml["webserv"]
&& _yaml["webserv"]["cgi_bin_subpath"].type.string
- && _yaml["webserv"]["cgi_bin_subpath"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["cgi_bin_subpath"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_cgi_bin_subpath = _yaml["webserv"]["cgi_bin_subpath"].get!string;
}
if ("cgi_port" in _yaml["webserv"]
&& _yaml["webserv"]["cgi_port"].type.string
- && _yaml["webserv"]["cgi_port"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["cgi_port"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_cgi_port = _yaml["webserv"]["cgi_port"].get!string;
}
if ("cgi_user" in _yaml["webserv"]
&& _yaml["webserv"]["cgi_user"].type.string
- && _yaml["webserv"]["cgi_user"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["cgi_user"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_cgi_user = _yaml["webserv"]["cgi_user"].get!string;
}
if ("cgi_bin_url" in _yaml["webserv"]
&& _yaml["webserv"]["cgi_bin_url"].type.string
- && _yaml["webserv"]["cgi_bin_url"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["webserv"]["cgi_bin_url"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.w_srv_cgi_bin_url = _yaml["webserv"]["cgi_bin_url"].get!string;
} else {
@@ -936,7 +942,7 @@ if (("webserv" in _yaml
}
// if ("cgi_file_links" in _yaml["webserv"]
// && _yaml["webserv"]["cgi_file_links"].type.string
- // && _yaml["webserv"]["cgi_file_links"].tag.match(rgx.yaml_tag_is_str)
+ // && _yaml["webserv"]["cgi_file_links"].tag.match(rgx_y.yaml_tag_is_str)
// ) {
// _struct_composite.conf.w_srv_cgi_file_links = _yaml["webserv"]["cgi_file_links"].get!string;
// }
@@ -946,11 +952,11 @@ if ("processing" in _yaml
&& _yaml["processing"].type.sequence
) {
if (_yaml["processing"].type.mapping
- && _yaml["processing"].tag.match(rgx.yaml_tag_is_map)
+ && _yaml["processing"].tag.match(rgx_y.yaml_tag_is_map)
) {
if ("concord_max" in _yaml["processing"]
&& _yaml["processing"]["concord_max"].type.string
- && _yaml["processing"]["concord_max"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["processing"]["concord_max"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.processing_concord_max = _yaml["processing"]["concord_max"].get!string;
}
@@ -960,65 +966,65 @@ if ("flag" in _yaml
&& _yaml["flag"].type.sequence
) {
if (_yaml["flag"].type.mapping
- && _yaml["flag"].tag.match(rgx.yaml_tag_is_map)
+ && _yaml["flag"].tag.match(rgx_y.yaml_tag_is_map)
) {
if ("act0" in _yaml["flag"]
&& _yaml["flag"]["act0"].type.string
- && _yaml["flag"]["act0"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["flag"]["act0"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.flag_act0 = _yaml["flag"]["act0"].get!string;
}
if ("act1" in _yaml["flag"]
&& _yaml["flag"]["act1"].type.string
- && _yaml["flag"]["act1"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["flag"]["act1"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.flag_act1 = _yaml["flag"]["act1"].get!string;
}
if ("act2" in _yaml["flag"]
&& _yaml["flag"]["act2"].type.string
- && _yaml["flag"]["act2"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["flag"]["act2"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.flag_act2 = _yaml["flag"]["act2"].get!string;
}
if ("act3" in _yaml["flag"]
&& _yaml["flag"]["act3"].type.string
- && _yaml["flag"]["act3"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["flag"]["act3"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.flag_act3 = _yaml["flag"]["act3"].get!string;
}
if ("act4" in _yaml["flag"]
&& _yaml["flag"]["act4"].type.string
- && _yaml["flag"]["act4"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["flag"]["act4"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.flag_act4 = _yaml["flag"]["act4"].get!string;
}
if ("act5" in _yaml["flag"]
&& _yaml["flag"]["act5"].type.string
- && _yaml["flag"]["act5"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["flag"]["act5"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.flag_act5 = _yaml["flag"]["act5"].get!string;
}
if ("act6" in _yaml["flag"]
&& _yaml["flag"]["act6"].type.string
- && _yaml["flag"]["act6"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["flag"]["act6"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.flag_act6 = _yaml["flag"]["act6"].get!string;
}
if ("act7" in _yaml["flag"]
&& _yaml["flag"]["act7"].type.string
- && _yaml["flag"]["act7"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["flag"]["act7"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.flag_act7 = _yaml["flag"]["act7"].get!string;
}
if ("act8" in _yaml["flag"]
&& _yaml["flag"]["act8"].type.string
- && _yaml["flag"]["act8"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["flag"]["act8"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.flag_act8 = _yaml["flag"]["act8"].get!string;
}
if ("act9" in _yaml["flag"]
&& _yaml["flag"]["act9"].type.string
- && _yaml["flag"]["act9"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["flag"]["act9"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.flag_act9 = _yaml["flag"]["act9"].get!string;
}
@@ -1095,7 +1101,7 @@ if (_opt_action.latex_papersize.length > 0) {
: _cfg.default_papersize;
if ("papersize" in _yaml["default"]
&& _yaml["default"]["papersize"].type.string
- && _yaml["default"]["papersize"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["default"]["papersize"].tag.match(rgx_y.yaml_tag_is_str)
) {
_set_papersize
= _yaml["default"]["papersize"].get!string;
@@ -1106,29 +1112,29 @@ if (
"default" in _yaml
&& _yaml["default"].type.sequence
&& _yaml["default"].type.mapping
- && _yaml["default"].tag.match(rgx.yaml_tag_is_map)
+ && _yaml["default"].tag.match(rgx_y.yaml_tag_is_map)
) {
if ("text_wrap" in _yaml["default"]
&& _yaml["default"]["text_wrap"].type.string
- && _yaml["default"]["text_wrap"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["default"]["text_wrap"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.set_text_wrap = _yaml["default"]["text_wrap"].get!string;
}
if ("emphasis" in _yaml["default"]
&& _yaml["default"]["emphasis"].type.string
- && _yaml["default"]["emphasis"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["default"]["emphasis"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.set_emphasis = _yaml["default"]["emphasis"].get!string;
}
if ("language" in _yaml["default"]
&& _yaml["default"]["language"].type.string
- && _yaml["default"]["language"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["default"]["language"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.set_language = _yaml["default"]["language"].get!string;
}
if ("digest" in _yaml["default"]
&& _yaml["default"]["digest"].type.string
- && _yaml["default"]["digest"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["default"]["digest"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.set_digest = _yaml["default"]["digest"].get!string;
}
@@ -1137,29 +1143,29 @@ if ("search" in _yaml
&& _yaml["search"].type.sequence
) {
if (_yaml["search"].type.mapping
- && _yaml["search"].tag.match(rgx.yaml_tag_is_map)
+ && _yaml["search"].tag.match(rgx_y.yaml_tag_is_map)
) {
if ("flag" in _yaml["search"]
&& _yaml["search"]["flag"].type.string
- && _yaml["search"]["flag"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["search"]["flag"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.search_flag = _yaml["search"]["flag"].get!string;
}
if ("action" in _yaml["search"]
&& _yaml["search"]["action"].type.string
- && _yaml["search"]["action"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["search"]["action"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.search_action = _yaml["search"]["action"].get!string;
}
if ("db" in _yaml["search"]
&& _yaml["search"]["db"].type.string
- && _yaml["search"]["db"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["search"]["db"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.search_db = _yaml["search"]["db"].get!string;
}
if ("title" in _yaml["search"]
&& _yaml["search"]["title"].type.string
- && _yaml["search"]["title"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["search"]["title"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.conf.search_title = _yaml["search"]["title"].get!string;
}
@@ -1176,47 +1182,47 @@ if ("make" in _yaml
&& _yaml["make"].type.sequence
) {
if (_yaml["make"].type.mapping
- && _yaml["make"].tag.match(rgx.yaml_tag_is_map)
+ && _yaml["make"].tag.match(rgx_y.yaml_tag_is_map)
) {
if ("doc_type" in _yaml["make"]
&& _yaml["make"]["doc_type"].type.string
- && _yaml["make"]["doc_type"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["make"]["doc_type"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.make_str.doc_type = _yaml["make"]["doc_type"].get!string;
}
if ("breaks" in _yaml["make"]
&& _yaml["make"]["breaks"].type.string
- && _yaml["make"]["breaks"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["make"]["breaks"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.make_str.breaks = _yaml["make"]["breaks"].get!string;
}
if ("bold" in _yaml["make"]
&& _yaml["make"]["bold"].type.string
- && _yaml["make"]["bold"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["make"]["bold"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.make_str.bold = _yaml["make"]["bold"].get!string;
}
if ("cover_image" in _yaml["make"]
&& _yaml["make"]["cover_image"].type.string
- && _yaml["make"]["cover_image"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["make"]["cover_image"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.make_str.cover_image = _yaml["make"]["cover_image"].get!string;
}
if ("css" in _yaml["make"]
&& _yaml["make"]["css"].type.string
- && _yaml["make"]["css"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["make"]["css"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.make_str.css = _yaml["make"]["css"].get!string;
}
if ("emphasis" in _yaml["make"]
&& _yaml["make"]["emphasis"].type.string
- && _yaml["make"]["emphasis"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["make"]["emphasis"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.make_str.emphasis = _yaml["make"]["emphasis"].get!string;
}
if ("footer" in _yaml["make"]
&& _yaml["make"]["footer"].type.string
- && _yaml["make"]["footer"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["make"]["footer"].tag.match(rgx_y.yaml_tag_is_str)
) {
char[][] __match_footer_array
= (cast(char[]) _yaml["make"]["footer"].get!string)
@@ -1225,7 +1231,7 @@ if ("make" in _yaml
}
if ("headings" in _yaml["make"]
&& _yaml["make"]["headings"].type.string
- && _yaml["make"]["headings"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["make"]["headings"].tag.match(rgx_y.yaml_tag_is_str)
) {
char[][] __match_headings_array
= (cast(char[]) _yaml["make"]["headings"].get!string)
@@ -1233,7 +1239,7 @@ if ("make" in _yaml
_struct_composite.make_str.headings = __match_headings_array.to!(string[]);
} else if ("headings" in _yaml["make"]
&& _yaml["make"]["headings"].type.string
- && _yaml["make"]["headings"].tag.match(rgx.yaml_tag_is_seq)
+ && _yaml["make"]["headings"].tag.match(rgx_y.yaml_tag_is_seq)
) {
foreach(string identify_heading_level; _yaml["make"]["headings"]) {
_struct_composite.make_str.headings ~= identify_heading_level;
@@ -1241,7 +1247,7 @@ if ("make" in _yaml
}
if ("home_button_image" in _yaml["make"]
&& _yaml["make"]["home_button_image"].type.string
- && _yaml["make"]["home_button_image"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["make"]["home_button_image"].tag.match(rgx_y.yaml_tag_is_str)
) {
char[][] __match_home_button_image_array
= (cast(char[]) _yaml["make"]["home_button_image"].get!string)
@@ -1250,12 +1256,12 @@ if ("make" in _yaml
}
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_str)
+ && _yaml["make"]["home_button_text"].tag.match(rgx_y.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)
+ && _yaml["make"]["home_button_text"].tag.match(rgx_y.yaml_tag_is_seq)
) {
_struct_composite.make_str.home_button_text = "";
foreach(string hbt; _yaml["make"]["home_button_text"]) {
@@ -1264,13 +1270,13 @@ if ("make" in _yaml
}
if ("italics" in _yaml["make"]
&& _yaml["make"]["italics"].type.string
- && _yaml["make"]["italics"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["make"]["italics"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.make_str.italics = _yaml["make"]["italics"].get!string;
}
if ("auto_num_top_at_level" in _yaml["make"]
&& _yaml["make"]["auto_num_top_at_level"].type.string
- && _yaml["make"]["auto_num_top_at_level"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["make"]["auto_num_top_at_level"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.make_str.auto_num_top_at_level = _yaml["make"]["auto_num_top_at_level"].get!string;
switch (_yaml["make"]["auto_num_top_at_level"].get!string) {
@@ -1296,12 +1302,12 @@ if ("make" in _yaml
}
if ("auto_num_depth" in _yaml["make"]
&& _yaml["make"]["auto_num_depth"].type.string
- && _yaml["make"]["auto_num_depth"].tag.match(rgx.yaml_tag_is_int)
+ && _yaml["make"]["auto_num_depth"].tag.match(rgx_y.yaml_tag_is_int)
) { // not sure implemented for documents
_struct_composite.make_str.auto_num_depth = _yaml["make"]["auto_num_depth"].get!int;
} else if ("auto_num_depth" in _yaml["make"]
&& _yaml["make"]["auto_num_depth"].type.string
- && _yaml["make"]["auto_num_depth"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["make"]["auto_num_depth"].tag.match(rgx_y.yaml_tag_is_str)
) { // not sure implemented for documents
_struct_composite.make_str.auto_num_depth = _yaml["make"]["auto_num_depth"].get!int;
}
@@ -1340,34 +1346,34 @@ if (_struct_composite.meta.creator_author.empty) {
&& _yaml["creator"].type.sequence
) {
if (_yaml["creator"].type.mapping
- && _yaml["creator"].tag.match(rgx.yaml_tag_is_map)
+ && _yaml["creator"].tag.match(rgx_y.yaml_tag_is_map)
) {
if ("author" in _yaml["creator"]
&& _yaml["creator"]["author"].type.string
- && _yaml["creator"]["author"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["creator"]["author"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.creator_author = _yaml["creator"]["author"].get!string;
}
if ("email" in _yaml["creator"]
&& _yaml["creator"]["email"].type.string
- && _yaml["creator"]["email"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["creator"]["email"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.creator_author_email = _yaml["creator"]["email"].get!string;
}
if ("illustrator" in _yaml["creator"]
&& _yaml["creator"]["illustrator"].type.string
- && _yaml["creator"]["illustrator"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["creator"]["illustrator"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.creator_illustrator = _yaml["creator"]["illustrator"].get!string;
}
if ("translator" in _yaml["creator"]
&& _yaml["creator"]["translator"].type.string
- && _yaml["creator"]["translator"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["creator"]["translator"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.creator_translator = _yaml["creator"]["translator"].get!string;
}
} else if (_yaml["creator"].type.string
- && _yaml["creator"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["creator"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.creator_author = _yaml["creator"].get!string;
}
@@ -1407,57 +1413,57 @@ if (_struct_composite.meta.title_main.empty) {
&& _yaml["title"].type.sequence
) {
if (_yaml["title"].type.mapping
- && _yaml["title"].tag.match(rgx.yaml_tag_is_map)
+ && _yaml["title"].tag.match(rgx_y.yaml_tag_is_map)
) {
if ("main" in _yaml["title"]
&& _yaml["title"]["main"].type.string
- && _yaml["title"]["main"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["title"]["main"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.title_main = _yaml["title"]["main"].get!string;
} else if ("title" in _yaml["title"]
&& _yaml["title"]["title"].type.string
- && _yaml["title"]["title"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["title"]["title"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.title_main = _yaml["title"]["title"].get!string;
}
if ("edition" in _yaml["title"]
&& _yaml["title"]["edition"].type.string
- && _yaml["title"]["edition"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["title"]["edition"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.title_edition = _yaml["title"]["edition"].get!string;
}
if ("full" in _yaml["title"]
&& _yaml["title"]["full"].type.string
- && _yaml["title"]["full"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["title"]["full"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.title_full = _yaml["title"]["full"].get!string;
}
if ("language" in _yaml["title"]
&& _yaml["title"]["language"].type.string
- && _yaml["title"]["language"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["title"]["language"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.title_language = _yaml["title"]["language"].get!string;
}
if ("note" in _yaml["title"]
&& _yaml["title"]["note"].type.string
- && _yaml["title"]["note"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["title"]["note"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.title_note = _yaml["title"]["note"].get!string;
}
if ("subtitle" in _yaml["title"]
&& _yaml["title"]["subtitle"].type.string
- && _yaml["title"]["subtitle"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["title"]["subtitle"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.title_subtitle = _yaml["title"]["subtitle"].get!string;
} else if ("sub" in _yaml["title"]
&& _yaml["title"]["sub"].type.string
- && _yaml["title"]["sub"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["title"]["sub"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.title_subtitle = _yaml["title"]["sub"].get!string;
}
} else if (
_yaml["title"].type.string
- && _yaml["title"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["title"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.title_main = _yaml["title"].get!string;
}
@@ -1479,29 +1485,29 @@ if ("classify" in _yaml
&& _yaml["classify"].type.sequence
) {
if (_yaml["classify"].type.mapping
- && _yaml["classify"].tag.match(rgx.yaml_tag_is_map)
+ && _yaml["classify"].tag.match(rgx_y.yaml_tag_is_map)
) {
if ("dewey" in _yaml["classify"]
&& _yaml["classify"]["dewey"].type.string
- && _yaml["classify"]["dewey"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["classify"]["dewey"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.classify_dewey = _yaml["classify"]["dewey"].get!string;
}
if ("loc" in _yaml["classify"]
&& _yaml["classify"]["loc"].type.string
- && _yaml["classify"]["loc"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["classify"]["loc"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.classify_loc = _yaml["classify"]["loc"].get!string;
}
if ("keywords" in _yaml["classify"]
&& _yaml["classify"]["keywords"].type.string
- && _yaml["classify"]["keywords"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["classify"]["keywords"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.classify_keywords = _yaml["classify"]["keywords"].get!string;
}
if ("topic_register" in _yaml["classify"]
&& _yaml["classify"]["topic_register"].type.string
- && _yaml["classify"]["topic_register"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["classify"]["topic_register"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.classify_topic_register = _yaml["classify"]["topic_register"].get!string;
if (_struct_composite.meta.classify_topic_register.length > 0) {
@@ -1549,47 +1555,47 @@ if ("date" in _yaml
&& _yaml["date"].type.sequence
) {
if (_yaml["date"].type.mapping
- && _yaml["date"].tag.match(rgx.yaml_tag_is_map)
+ && _yaml["date"].tag.match(rgx_y.yaml_tag_is_map)
) {
if ("added_to_site" in _yaml["date"]
&& _yaml["date"]["added_to_site"].type.string
- && _yaml["date"]["added_to_site"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["date"]["added_to_site"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.date_added_to_site = _yaml["date"]["added_to_site"].get!string;
}
if ("available" in _yaml["date"]
&& _yaml["date"]["available"].type.string
- && _yaml["date"]["available"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["date"]["available"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.date_available = _yaml["date"]["available"].get!string;
}
if ("created" in _yaml["date"]
&& _yaml["date"]["created"].type.string
- && _yaml["date"]["created"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["date"]["created"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.date_created = _yaml["date"]["created"].get!string;
}
if ("issued" in _yaml["date"]
&& _yaml["date"]["issued"].type.string
- && _yaml["date"]["issued"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["date"]["issued"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.date_issued = _yaml["date"]["issued"].get!string;
}
if ("modified" in _yaml["date"]
&& _yaml["date"]["modified"].type.string
- && _yaml["date"]["modified"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["date"]["modified"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.date_modified = _yaml["date"]["modified"].get!string;
}
if ("published" in _yaml["date"]
&& _yaml["date"]["published"].type.string
- && _yaml["date"]["published"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["date"]["published"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.date_published = _yaml["date"]["published"].get!string;
}
if ("valid" in _yaml["date"]
&& _yaml["date"]["valid"].type.string
- && _yaml["date"]["valid"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["date"]["valid"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.date_valid = _yaml["date"]["valid"].get!string;
}
@@ -1605,23 +1611,23 @@ if ("notes" in _yaml
&& _yaml["notes"].type.sequence
) {
if (_yaml["notes"].type.mapping
- && _yaml["notes"].tag.match(rgx.yaml_tag_is_map)
+ && _yaml["notes"].tag.match(rgx_y.yaml_tag_is_map)
) {
if ("abstract" in _yaml["notes"]
&& _yaml["notes"]["abstract"].type.string
- && _yaml["notes"]["abstract"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["notes"]["abstract"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.notes_abstract = _yaml["notes"]["abstract"].get!string;
}
if ("description" in _yaml["notes"]
&& _yaml["notes"]["description"].type.string
- && _yaml["notes"]["description"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["notes"]["description"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.notes_description = _yaml["notes"]["description"].get!string;
}
if ("summary" in _yaml["notes"]
&& _yaml["notes"]["summary"].type.string
- && _yaml["notes"]["summary"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["notes"]["summary"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.notes_summary = _yaml["notes"]["summary"].get!string;
}
@@ -1631,29 +1637,29 @@ if ("original" in _yaml
&& _yaml["original"].type.sequence
) {
if (_yaml["original"].type.mapping
- && _yaml["original"].tag.match(rgx.yaml_tag_is_map)
+ && _yaml["original"].tag.match(rgx_y.yaml_tag_is_map)
) {
if ("language" in _yaml["original"]
&& _yaml["original"]["language"].type.string
- && _yaml["original"]["language"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["original"]["language"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.original_language = _yaml["original"]["language"].get!string;
}
if ("language_char" in _yaml["original"]
&& _yaml["original"]["language_char"].type.string
- && _yaml["original"]["language_char"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["original"]["language_char"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.original_language_char = _yaml["original"]["language_char"].get!string;
}
if ("source" in _yaml["original"]
&& _yaml["original"]["source"].type.string
- && _yaml["original"]["source"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["original"]["source"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.original_source = _yaml["original"]["source"].get!string;
}
if ("title" in _yaml["original"]
&& _yaml["original"]["title"].type.string
- && _yaml["original"]["title"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["original"]["title"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.original_title = _yaml["original"]["title"].get!string;
}
@@ -1668,59 +1674,59 @@ if ("rights" in _yaml
&& _yaml["rights"].type.sequence
) {
if (_yaml["rights"].type.mapping
- && _yaml["rights"].tag.match(rgx.yaml_tag_is_map)
+ && _yaml["rights"].tag.match(rgx_y.yaml_tag_is_map)
) {
if ("copyright" in _yaml["rights"]
&& _yaml["rights"]["copyright"].type.string
- && _yaml["rights"]["copyright"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["rights"]["copyright"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.rights_copyright = check_input_markup(_yaml["rights"]["copyright"].get!string);
}
if ("copyright_text" in _yaml["rights"]
&& _yaml["rights"]["copyright_text"].type.string
- && _yaml["rights"]["copyright_text"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["rights"]["copyright_text"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.rights_copyright_text = _yaml["rights"]["copyright_text"].get!string;
}
if ("copyright_audio" in _yaml["rights"]
&& _yaml["rights"]["copyright_audio"].type.string
- && _yaml["rights"]["copyright_audio"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["rights"]["copyright_audio"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.rights_copyright_audio = _yaml["rights"]["copyright_audio"].get!string;
}
if ("copyright_cover" in _yaml["rights"]
&& _yaml["rights"]["copyright_cover"].type.string
- && _yaml["rights"]["copyright_cover"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["rights"]["copyright_cover"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.rights_copyright_cover = _yaml["rights"]["copyright_cover"].get!string;
}
if ("copyright_illustrations" in _yaml["rights"]
&& _yaml["rights"]["copyright_illustrations"].type.string
- && _yaml["rights"]["copyright_illustrations"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["rights"]["copyright_illustrations"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.rights_copyright_illustrations = _yaml["rights"]["copyright_illustrations"].get!string;
}
if ("copyright_photographs" in _yaml["rights"]
&& _yaml["rights"]["copyright_photographs"].type.string
- && _yaml["rights"]["copyright_photographs"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["rights"]["copyright_photographs"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.rights_copyright_photographs = _yaml["rights"]["copyright_photographs"].get!string;
}
if ("copyright_translation" in _yaml["rights"]
&& _yaml["rights"]["copyright_translation"].type.string
- && _yaml["rights"]["copyright_translation"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["rights"]["copyright_translation"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.rights_copyright_translation = _yaml["rights"]["copyright_translation"].get!string;
}
if ("copyright_video" in _yaml["rights"]
&& _yaml["rights"]["copyright_video"].type.string
- && _yaml["rights"]["copyright_video"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["rights"]["copyright_video"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.rights_copyright_video = _yaml["rights"]["copyright_video"].get!string;
}
if ("license" in _yaml["rights"]
&& _yaml["rights"]["license"].type.string
- && _yaml["rights"]["license"].tag.match(rgx.yaml_tag_is_str)
+ && _yaml["rights"]["license"].tag.match(rgx_y.yaml_tag_is_str)
) {
_struct_composite.meta.rights_license = check_input_markup(_yaml["rights"]["license"].get!string);
}
@@ -1755,18 +1761,20 @@ static template contentJSONtoSpineStruct() {
doc_reform.meta.conf_make_meta_structs,
doc_reform.meta.conf_make_meta_json,
doc_reform.meta.defaults,
+ doc_reform.meta.rgx_yaml,
doc_reform.meta.rgx;
ConfComposite _struct_composite;
@safe auto contentJSONtoSpineStruct(C,J,M)(C _struct_composite, J _json, M _manifested, string _identifier) {
mixin spineRgxIn;
static auto rgx = RgxI();
+ mixin spineRgxYamlTags;
+ static auto rgx_y = RgxYaml();
debug (json) {
writeln(">> --------------------------- >>");
foreach (tag0; _json.object.byKeyValue) {
if (tag0.value.stringof == "string") {
writeln(tag0.key, ": ", tag0.value);
- } else {
- // writeln(tag0.key, ":");
+ } else { // writeln(tag0.key, ":");
foreach (tag1; tag0.value.object.byKeyValue) {
writeln(tag0.key, ":", tag1.key, ": ", tag1.value);
}
@@ -2461,10 +2469,13 @@ template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() {
import
doc_reform.meta.conf_make_meta_structs,
doc_reform.meta.conf_make_meta_json,
+ doc_reform.meta.rgx_yaml,
doc_reform.meta.rgx;
mixin spineRgxIn;
mixin contentJSONtoSpineStruct;
static auto rgx = RgxI();
+ mixin spineRgxYamlTags;
+ static auto rgx_y = RgxYaml();
@system auto docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct(CCm,Src,M,O,Cfg)(
Src header_src,
CCm _make_and_meta_struct,