From 02714184258c9be072857ddcc03bc114b2e843d1 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 22 Oct 2019 19:32:45 -0400 Subject: cosmetic --- src/doc_reform/meta/conf_make_meta_yaml.d | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'src/doc_reform/meta/conf_make_meta_yaml.d') diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d index f36a7cf..8b76a3e 100644 --- a/src/doc_reform/meta/conf_make_meta_yaml.d +++ b/src/doc_reform/meta/conf_make_meta_yaml.d @@ -24,14 +24,11 @@ static template contentYAMLtoDocReformStruct() { auto contentYAMLtoDocReformStruct(C,Y,M)( C _struct_composite, Y _yaml, - M _manifest, + M _manifested, string _identifier ) { mixin DocReformRgxInit; static auto rgx = Rgx(); - debug (yaml) { - writeln(">> --------------------------- >>"); - } confCompositeMakeBuild _mk; /+ make ------------------------------------------------------------------- +/ if ("make" in _yaml @@ -238,7 +235,7 @@ static template contentYAMLtoDocReformStruct() { } } if (!(_struct_composite.conf.output_path)) { - _struct_composite.conf.output_path = ((_manifest.output.path).asNormalizedPath).array; + _struct_composite.conf.output_path = ((_manifested.output.path).asNormalizedPath).array; } if ("output" in _yaml && _yaml["output"].type.sequence @@ -250,7 +247,7 @@ static template contentYAMLtoDocReformStruct() { && _yaml["output"]["path"].type.string && _yaml["output"]["path"].tag.match(rgx.yaml_tag_is_str) ) { - if (_manifest.output.path == _manifest.env.pwd + if (_manifested.output.path == _manifested.env.pwd && _yaml["output"]["path"].get!string.length > 0 ) { _struct_composite.conf.output_path = (((_yaml["output"]["path"].get!string).expandTilde).asNormalizedPath).array; @@ -645,7 +642,7 @@ static template contentYAMLtoDocReformStruct() { } } } - _struct_composite.meta.language_document_char = _manifest.src.language; // move + _struct_composite.meta.language_document_char = _manifested.src.language; // move if ("links" in _yaml) { // if ("" in _yaml["links"]) { // _struct_composite.meta.links_ = _yaml["links"][""].str; @@ -782,11 +779,11 @@ static template configParseYAMLreturnDocReformStruct() { auto configParseYAMLreturnDocReformStruct(T,CCm,M)( T _document_struct, CCm _make_and_meta_struct, - M _manifest + M _manifested ){ Node yaml_root = Loader.fromString(_document_struct.content).load(); _make_and_meta_struct - = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, yaml_root, _manifest, _document_struct.filename); // struct from yaml + = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, yaml_root, _manifested, _document_struct.filename); // struct from yaml return _make_and_meta_struct; } } @@ -811,18 +808,15 @@ static template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() { auto docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct(CCm,Src,M)( Src header_src, CCm _make_and_meta_struct, - M _manifest, + M _manifested, ) { Node _yaml_root; if (header_src.match(rgx.yaml_header_meta_title)) { - debug (yaml) { - writeln(">>> document header is yaml, consider converting to JSON"); - } import dyaml; _yaml_root = Loader.fromString(header_src).load(); } auto _header_and_make_and_meta_struct - = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, _yaml_root, _manifest, "header"); + = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, _yaml_root, _manifested, "header"); return _header_and_make_and_meta_struct; } } -- cgit v1.2.3