minor

1 files changed, 25 insertions, 10 deletions

diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d
index 8b76a3e..a9c4434 100644
--- a/src/doc_reform/meta/conf_make_meta_yaml.d
+++ b/src/doc_reform/meta/conf_make_meta_yaml.d
@@ -451,16 +451,21 @@ static template contentYAMLtoDocReformStruct() {
         = _struct_composite.meta.creator_author.split(rgx.arr_delimiter);
       auto _lastname = appender!(char[])();
       foreach (author_raw; authors_raw_arr) {
-        author_arr                   ~= author_raw.replace(rgx.raw_author_munge, "$2 $1");
-        authors_hash_arr["first"]    ~= author_raw.replace(rgx.raw_author_munge, "$2");
-        authors_hash_arr["last"]     ~= author_raw.replace(rgx.raw_author_munge, "$1");
-        authors_hash_arr["full"]     ~= author_raw.replace(rgx.raw_author_munge, "$2 $1");
-        authors_hash_arr["as_input"] ~= author_raw;
         if (auto m = author_raw.match(rgx.raw_author_munge)) {
+          author_arr                   ~= author_raw.replace(rgx.raw_author_munge, "$2 $1");
+          authors_hash_arr["first"]    ~= author_raw.replace(rgx.raw_author_munge, "$2");
+          authors_hash_arr["last"]     ~= author_raw.replace(rgx.raw_author_munge, "$1");
+          authors_hash_arr["full"]     ~= author_raw.replace(rgx.raw_author_munge, "$2 $1");
           (m.captures[1]).map!toUpper.copy(_lastname);
           authors_hash_arr["last_first"] ~= _lastname.data.to!string ~ ", " ~ m.captures[2];
           _lastname = appender!(char[])();
+        } else {
+          author_arr                     ~= author_raw;
+          authors_hash_arr["last"]       ~= author_raw;
+          authors_hash_arr["full"]       ~= author_raw;
+          authors_hash_arr["last_first"] ~= author_raw;
         }
+        authors_hash_arr["as_input"] ~= author_raw;
       }
       _struct_composite.meta.creator_author_arr = author_arr;
       _struct_composite.meta.creator_author     = author_arr.join(", ").chomp.chomp;
@@ -781,9 +786,15 @@ static template configParseYAMLreturnDocReformStruct() {
     CCm     _make_and_meta_struct,
     M       _manifested
   ){
-    Node yaml_root = Loader.fromString(_document_struct.content).load();
-    _make_and_meta_struct
-      = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, yaml_root, _manifested, _document_struct.filename); // struct from yaml
+    Node yaml_root;
+    try {
+      yaml_root = Loader.fromString(_document_struct.content).load();
+      _make_and_meta_struct
+        = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, yaml_root, _manifested, _document_struct.filename); // struct from yaml
+    } catch {
+      import std.stdio;
+      writeln("ERROR failed to read content, not parsed as yaml");
+    }
     return _make_and_meta_struct;
   }
 }
@@ -812,8 +823,12 @@ static template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() {
   ) {
     Node _yaml_root;
     if (header_src.match(rgx.yaml_header_meta_title)) {
-      import dyaml;
-      _yaml_root = Loader.fromString(header_src).load();
+      try {
+        _yaml_root = Loader.fromString(header_src).load();
+      } catch {
+        import std.stdio;
+        writeln("ERROR failed to read document header, not parsed as yaml");
+      }
     }
     auto _header_and_make_and_meta_struct
       = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, _yaml_root, _manifested, "header");