From e9ff8330d44330ed87bb2cce562f132a9a005f3d Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 9 Feb 2022 14:18:45 -0500 Subject: xmls, copyright and license display --- org/meta_conf_make_meta.org | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'org/meta_conf_make_meta.org') diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org index f91a615..331fe49 100644 --- a/org/meta_conf_make_meta.org +++ b/org/meta_conf_make_meta.org @@ -16,6 +16,18 @@ #+PROPERTY: header-args+ :padline no #+PROPERTY: header-args+ :mkdirp yes +#+NAME: meta_check_input_markup +#+BEGIN_SRC d +string check_input_markup()( + string _txt, +) { + _txt = _txt + .replaceAll(regex(r"\\"), mkup.br_newline_inline) + .strip; + return _txt; +} +#+END_SRC + [[./spine.org][spine]] [[./][org/]] * generic ** conf yaml REFERENCE @@ -573,6 +585,7 @@ template contentYAMLtoSpineStruct() { ) { mixin spineRgxIn; static auto rgx = RgxI(); + <> confCompositeMakeBuild _mk; if (_identifier != "header") { // called only once per run anyway <> @@ -1647,7 +1660,7 @@ if ("rights" in _yaml && _yaml["rights"]["copyright"].type.string && _yaml["rights"]["copyright"].tag.match(rgx.yaml_tag_is_str) ) { - _struct_composite.meta.rights_copyright = _yaml["rights"]["copyright"].get!string; + _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 @@ -1695,7 +1708,7 @@ if ("rights" in _yaml && _yaml["rights"]["license"].type.string && _yaml["rights"]["license"].tag.match(rgx.yaml_tag_is_str) ) { - _struct_composite.meta.rights_license = _yaml["rights"]["license"].get!string; + _struct_composite.meta.rights_license = check_input_markup(_yaml["rights"]["license"].get!string); } } } -- cgit v1.2.3