step 0.6.3 includes fixes

1 files changed, 321 insertions, 0 deletions

diff --git a/src/sdp/ao_conf_make_meta_sdlang.d b/src/sdp/ao_conf_make_meta_sdlang.d
index 16a36e9..612c88a 100644
--- a/src/sdp/ao_conf_make_meta_sdlang.d
+++ b/src/sdp/ao_conf_make_meta_sdlang.d
@@ -32,6 +32,107 @@ template SiSUheaderExtractSDLang() {
     private auto documentMakeSDLangToAAmake(Tag document_make_sdlang) {
       auto dochead_make = sdlangToAAmake(make_aa, document_make_sdlang);
       /+
+      /+ dochead +/
+      string hm;
+      string hs;
+      /+ make +/
+      auto dochead_make = make_aa;
+      if (!(document_make_sdlang.maybe.tags["make"].empty)) {
+        hm = "make";
+        hs = "bold";
+        if (!(document_make_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (document_make_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_make[hm][hs] =
+            to!string(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "breaks";
+        if (!(document_make_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (document_make_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_make[hm][hs] =
+            to!string(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "cover_image";
+        if (!(document_make_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (document_make_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_make[hm][hs] =
+            to!string(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "css";
+        if (!(document_make_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (document_make_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_make[hm][hs] =
+            to!string(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "emphasis";
+        if (!(document_make_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (document_make_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_make[hm][hs] =
+            to!string(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "footer";
+        if (!(document_make_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (document_make_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_make[hm][hs] =
+            to!string(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "headings";
+        if (!(document_make_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (document_make_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_make[hm][hs] =
+            to!string(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "home_button_image";
+        if (!(document_make_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (document_make_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_make[hm][hs] =
+            to!string(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "home_button_text";
+        if (!(document_make_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (document_make_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_make[hm][hs] =
+            to!string(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "italics";
+        if (!(document_make_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (document_make_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_make[hm][hs] =
+            to!string(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "num_top";
+        if (!(document_make_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (document_make_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_make[hm][hs] =
+            to!string(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "substitute";
+        if (!(document_make_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (document_make_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_make[hm][hs] =
+            to!string(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "texpdf_font";
+        if (!(document_make_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (document_make_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_make[hm][hs] =
+            to!string(document_make_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+      }
+      +/
+      /+
       hm = "links";
       if (!(document_make_sdlang.maybe.tags[hm].empty)) {
         /+ TODO
@@ -153,6 +254,20 @@ template SiSUheaderExtractSDLang() {
           dochead_meta[hm][hs] =
             to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
         }
+        hs = "edition";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "note";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
       }
       hm = "creator";
       if (!(header_sdlang.maybe.tags[hm].empty)) {
@@ -169,6 +284,141 @@ template SiSUheaderExtractSDLang() {
           dochead_meta[hm][hs] =
             to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
         }
+        hs = "author_email";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "illustrator";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "translator";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+      }
+      hm = "classify";
+      if (!(header_sdlang.maybe.tags[hm].empty)) {
+        hs = "dewey";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "keywords";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "loc";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "subject";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "topic_register";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+      }
+      hm = "date";
+      if (!(header_sdlang.maybe.tags[hm].empty)) {
+        hs = "added_to_site";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "available";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "created";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "issued";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "modified";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "published";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "valid";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+      }
+      hm = "identifier";
+      if (!(header_sdlang.maybe.tags[hm].empty)) {
+        hs = "isbn";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "oclc";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "pg";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
       }
       hm = "links";
       if (!(header_sdlang.maybe.tags[hm].empty)) {
@@ -183,6 +433,47 @@ template SiSUheaderExtractSDLang() {
         //     to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
         // }
       }
+      hm = "notes";
+      if (!(header_sdlang.maybe.tags[hm].empty)) {
+        hs = "abstract";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "description";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+      }
+      hm = "original";
+      if (!(header_sdlang.maybe.tags[hm].empty)) {
+        hs = "language";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "source";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "title";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+      }
       hm = "publisher";
       if (!(header_sdlang.maybe.tags[hm].empty)) {
         hs = "name";
@@ -193,6 +484,36 @@ template SiSUheaderExtractSDLang() {
             to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
         }
       }
+      hm = "rights";
+      if (!(header_sdlang.maybe.tags[hm].empty)) {
+        hs = "copyright";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "cover";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "illustrations";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
+        hs = "license";
+        if (!(header_sdlang.tags[hm][0].maybe.attributes[hs].empty)
+        && (header_sdlang.tags[hm][0].attributes[hs][0].value.length > 1)) {
+          writeln(header_sdlang.tags[hm][0].attributes[hs][0].value);
+          dochead_meta[hm][hs] =
+            to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);
+        }
       }
       +/
       auto t = tuple(dochead_make, dochead_meta);