diff options
| author | Ralph Amissah <ralph@amissah.com> | 2016-08-30 12:28:56 -0400 | 
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2019-04-10 15:14:09 -0400 | 
| commit | 55bba8c290e1f5d1c4227b1b96c0e1932f3a8f55 (patch) | |
| tree | f53584c994bfee21cf3dede8f546149c177467a9 | |
| parent | org mode version sync (diff) | |
minor cleaning
| -rw-r--r-- | dub.json | 13 | ||||
| -rw-r--r-- | dub.sdl | 4 | ||||
| -rw-r--r-- | maker.org | 16 | ||||
| -rw-r--r-- | org/ao_abstract_doc_source.org | 115 | ||||
| -rw-r--r-- | org/ao_conf_make_meta.org | 222 | ||||
| -rw-r--r-- | org/ao_read_source_files.org | 4 | ||||
| -rw-r--r-- | src/sdp/ao_abstract_doc_source.d | 111 | ||||
| -rw-r--r-- | src/sdp/ao_conf_make_meta.d | 2 | ||||
| -rw-r--r-- | src/sdp/ao_conf_make_meta_native.d | 4 | ||||
| -rw-r--r-- | src/sdp/ao_conf_make_meta_sdlang.d | 216 | ||||
| -rw-r--r-- | src/sdp/ao_read_config_files.d | 4 | 
11 files changed, 419 insertions, 292 deletions
| diff --git a/dub.json b/dub.json deleted file mode 100644 index 85eb0e2..0000000 --- a/dub.json +++ /dev/null @@ -1,13 +0,0 @@ -{ -  "name"        : "sdp", -  "targetType"  : "executable", -  "targetName"  : "sdp", -  "targetPath"  : "bin", -  "description" : "sisu document parser.", -  "authors"     : ["Ralph Amissah"], -  "homepage"    : "http://sisudoc.org", -  "license"     : "AGPL-3+", -  "add-path"    : "./src/sdp", -  "dependencies": { -  } -} @@ -83,7 +83,9 @@ configuration     "sdp-debug-ldc" {    targetName      "sdp-debug-ldc"    debugVersions   "checkdoc"    debugVersions   "summary" -  debugVersions   "dumpdoc" +  #debugVersions   "dumpdoc" +  #debugVersions   "bookindex" +  #debugVersions   "biblio"    buildOptions    "debugMode" "debugInfo" "optimize"    postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug-ldc'"  } @@ -459,7 +459,7 @@ stringImportPaths "./views"  buildRequirements "allowWarnings"  #+END_SRC -**** configuration generic                                          :generic: +**** configuration generic                                              :generic:  #+BEGIN_SRC sh  :tangle dub.sdl  configuration     "sdp-release" {    name            "release" @@ -554,7 +554,9 @@ configuration     "sdp-debug-ldc" {    targetName      "sdp-debug-ldc"    debugVersions   "checkdoc"    debugVersions   "summary" -  debugVersions   "dumpdoc" +  #debugVersions   "dumpdoc" +  #debugVersions   "bookindex" +  #debugVersions   "biblio"    buildOptions    "debugMode" "debugInfo" "optimize"    postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug-ldc'"  } @@ -564,8 +566,12 @@ configuration     "sdp-debug-ldc" {  #+BEGIN_SRC sh  :tangle no    debugVersions "biblio" -  debugVersions "biblio_sorted" +  debugVersions "biblio0" +  debugVersions "bibliobuild" +  debugVersions "biblioblock" +  debugVersions "biblioblockinclude"    debugVersions "bibliosorted" +  debugVersions "biblio_sorted"    debugVersions "block"    debugVersions "bookindex"    debugVersions "bookindexmatch" @@ -574,6 +580,7 @@ configuration     "sdp-debug-ldc" {    debugVersions "checkdoc"    debugVersions "code"    debugVersions "comment" +  debugVersions "configfile"    debugVersions "dumpdoc"    debugVersions "endnotes"    debugVersions "endnotes_build" @@ -586,6 +593,7 @@ configuration     "sdp-debug-ldc" {    debugVersions "headerjson"    debugVersions "headermakejson"    debugVersions "headermetadatajson" +  debugVersions "headersdlang"    debugVersions "heading"    debugVersions "headings"    debugVersions "headingsfound" @@ -617,7 +625,7 @@ dflags        platform="dmd" "-v --force -de -w -J./views -I./src/sdp -of./bin/s  dflags        platform="dmd" "-O -release"  #buildOptions      "-O -release" -*** +dub.json+                                                         :json: +*** +dub.json+                                                          :json:  **** +sdp+  #+BEGIN_SRC json  :tangle no diff --git a/org/ao_abstract_doc_source.org b/org/ao_abstract_doc_source.org index 2fe674b..1239a50 100644 --- a/org/ao_abstract_doc_source.org +++ b/org/ao_abstract_doc_source.org @@ -152,10 +152,9 @@ line_occur = [  ];  auto type = flags_type_init;  mixin ScreenTxtColors; -int tell_lo(string color, int obj_cite_number, in char[] line) { +int tell_lo(int obj_cite_number, in char[] line) {    writefln( -    "%s%s %s", -    scr_txt_marker[color], +    "* %s %s",      to!string(obj_cite_number),      to!string(line)    ); @@ -163,8 +162,7 @@ int tell_lo(string color, int obj_cite_number, in char[] line) {  }  int tell_l(string color, in char[] line) {    writefln( -    "%s%s", -    scr_txt_marker[color], +    "* %s",      line    );    return 0; @@ -243,8 +241,7 @@ debug(source) {                                  // source lines  debug(srclines) {    if (!line.empty) {                             // source lines, not empty      writefln( -      "%s%s", -      scr_txt_marker["green"], +      "* %s",        line      );    } @@ -965,9 +962,7 @@ auto start_block(      /+ curly code open +/      debug(code) {                              // code (curly) open        writefln( -        "%s* [code curly] %s%s", -        scr_txt_color["blue"], -        scr_txt_color["off"], +        "* [code curly] %s",          line        );      } @@ -978,9 +973,7 @@ auto start_block(      /+ curly poem open +/      debug(poem) {                              // poem (curly) open        writefln( -        "%s* [poem curly] %s%s", -        scr_txt_color["red"], -        scr_txt_color["off"], +        "* [poem curly] %s",          line        );      } @@ -994,9 +987,7 @@ auto start_block(      /+ curly group open +/      debug(group) {                             // group (curly) open        writefln( -        "%s* [group curly] %s%s", -        scr_txt_color["blue"], -        scr_txt_color["off"], +        "* [group curly] %s",          line        );      } @@ -1007,9 +998,7 @@ auto start_block(      /+ curly block open +/      debug(block) {                             // block (curly) open        writefln( -        "%s* [block curly] %s%s", -        scr_txt_color["blue"], -        scr_txt_color["off"], +        "* [block curly] %s",          line        );      } @@ -1020,9 +1009,7 @@ auto start_block(      /+ curly quote open +/      debug(quote) {                             // quote (curly) open        writefln( -        "%s* [quote curly] %s%s", -        scr_txt_color["blue"], -        scr_txt_color["off"], +        "* [quote curly] %s",          line        );      } @@ -1033,9 +1020,7 @@ auto start_block(      /+ curly table open +/      debug(table) {                             // table (curly) open        writefln( -        "%s* [table curly] %s%s", -        scr_txt_color["blue"], -        scr_txt_color["off"], +        "* [table curly] %s",          line        );      } @@ -1052,9 +1037,7 @@ auto start_block(      /+ tic code open +/      debug(code) {                              // code (tic) open        writefln( -        "%s* [code tic] %s%s", -        scr_txt_color["blue"], -        scr_txt_color["off"], +        "* [code tic] %s",          line        );      } @@ -1065,9 +1048,7 @@ auto start_block(      /+ tic poem open +/      debug(poem) {                              // poem (tic) open        writefln( -        "%s* [poem tic] %s%s", -        scr_txt_color["red"], -        scr_txt_color["off"], +        "* [poem tic] %s",          line        );      } @@ -1080,9 +1061,7 @@ auto start_block(      /+ tic group open +/      debug(group) {                             // group (tic) open        writefln( -        "%s* [group tic] %s%s", -        scr_txt_color["blue"], -        scr_txt_color["off"], +        "* [group tic] %s",          line        );      } @@ -1093,9 +1072,7 @@ auto start_block(      /+ tic block open +/      debug(block) {                             // block (tic) open        writefln( -        "%s* [block tic] %s%s", -        scr_txt_color["blue"], -        scr_txt_color["off"], +        "* [block tic] %s",          line        );      } @@ -1106,9 +1083,7 @@ auto start_block(      /+ tic quote open +/      debug(quote) {                             // quote (tic) open        writefln( -        "%s* [quote tic] %s%s", -        scr_txt_color["blue"], -        scr_txt_color["off"], +        "* [quote tic] %s",          line        );      } @@ -1119,9 +1094,7 @@ auto start_block(      /+ tic table open +/      debug(table) {                             // table (tic) open        writefln( -        "%s* [table tic] %s%s", -        scr_txt_color["blue"], -        scr_txt_color["off"], +        "* [table tic] %s",          line        );      } @@ -1285,9 +1258,7 @@ auto biblio_block(    }    debug(biblio) {      writefln( -      "%s * %s %s", -      scr_txt_color["yellow"], -      scr_txt_color["off"], +      "* %s",        line      );    } @@ -1345,9 +1316,7 @@ auto biblio_block(      s = j.toString();      debug(biblio) {        writefln( -        "%s* %s%s: %s\n%s", -        scr_txt_color["red"], -        scr_txt_color["off"], +        "* %s: %s\n%s",          biblio_tag_name,          biblio_tag_entry,          j[biblio_tag_name] @@ -1377,9 +1346,7 @@ auto poem_block(        an_object["obj"]="verse"; // check that this is as you please        debug(poem) {                            // poem (curly) close          writefln( -          "%s* [poem curly] %s%s", -          scr_txt_color["red"], -          scr_txt_color["off"], +          "* [poem curly] %s",            line          );        } @@ -1389,8 +1356,7 @@ auto poem_block(        debug(poem) {                            // poem (curly) close          writeln(__LINE__);          writefln( -          "%s%s %s", -          scr_txt_marker["fuchsia"], +          "* %s %s",            obj_cite_number,            line          ); @@ -1400,7 +1366,6 @@ auto poem_block(        if (an_object.length > 0) {          debug(poem) {                            // poem (curly) close            tell_lo( -            "fuchsia",              obj_cite_number,              an_object["obj"]            ); @@ -1441,8 +1406,7 @@ auto poem_block(          an_object["obj"] = processing["verse"];          debug(poem) {                          // poem verse            writefln( -            "%s%s curly\n%s", -            scr_txt_marker["green"], +            "* %s curly\n%s",              obj_cite_number,              an_object["obj"]            ); @@ -1477,9 +1441,7 @@ auto poem_block(        an_object["obj"]="verse"; // check that this is as you please        debug(poem) {                            // poem (curly) close          writefln( -          "%s* [poem tic] %s%s", -          scr_txt_color["red"], -          scr_txt_color["off"], +          "* [poem tic] %s",            line          );        } @@ -1489,7 +1451,7 @@ auto poem_block(        if (an_object.length > 0) {          debug(poem) {                            // poem (tic) close            writeln(__LINE__); -          tell_lo("fuchsia", obj_cite_number, line); +          tell_lo(obj_cite_number, line);          }          processing.remove("verse");          an_object["is"] = "verse"; @@ -1527,8 +1489,7 @@ auto poem_block(          an_object["obj"] = processing["verse"];          debug(poem) {                            // poem (tic) close            writefln( -            "%s%s tic\n%s", -            scr_txt_marker["green"], +            "* %s tic\n%s",              obj_cite_number,              an_object["obj"]            ); @@ -1955,9 +1916,7 @@ auto book_index(      /+ match book_index +/      debug(bookindexmatch) {                       // book index        writefln( -        "%s* [bookindex] %s%s\n", -        scr_txt_color["blue"], -        scr_txt_color["off"], +        "* [bookindex] %s\n",          to!string(m.captures[1]),        );        // writeln(scr_txt_marker["blue"], to!string(m.captures[1]), "\n"); @@ -1969,9 +1928,7 @@ auto book_index(      book_idx_tmp = to!string(m.captures[1]);      debug(bookindexmatch) {                       // book index        writefln( -        "%s* [bookindex] %s%s\n", -        scr_txt_color["blue"], -        scr_txt_color["off"], +        "* [bookindex] %s\n",          book_idx_tmp,        );        // writeln(scr_txt_marker["blue"], book_idx_tmp, "\n"); @@ -1983,9 +1940,7 @@ auto book_index(        an_object["bookindex"] = book_idx_tmp ~ to!string(m.captures[1]);        debug(bookindexmatch) {                     // book index          writefln( -          "%s* [bookindex] %s%s\n", -          scr_txt_color["blue"], -          scr_txt_color["off"], +          "* [bookindex] %s\n",            book_idx_tmp,          );          // writeln(scr_txt_marker["blue"], book_idx_tmp, "\n"); @@ -2911,7 +2866,7 @@ struct BookIndexNuggetHash {        mixin ScreenTxtColors;        if (!bookindex_section.empty) {          writeln( -          scr_txt_color["blue"], "* [bookindex] ", scr_txt_color["off"], +          "* [bookindex] ",            "[", to!string(obj_cite_number), "] ", bookindex_section          );        } @@ -3039,7 +2994,7 @@ struct BookIndexReportSection {    }  #+END_SRC -**** book index (sort &) build section                 :report:section: +**** book index (sort &) build section                       :report:section:  #+name: ao_emitters  #+BEGIN_SRC d @@ -3137,7 +3092,7 @@ struct BookIndexReportSection {    }  #+END_SRC -**** book index (sort &) build section                 :report:section: +**** book index (sort &) build section                       :report:section:  #+name: ao_emitters  #+BEGIN_SRC d @@ -3432,9 +3387,9 @@ struct NodeStructureMetadata {      debug(node) {        mixin ScreenTxtColors;        if (match(lev_markup_number, rgx.levels_numbered_headings)) { -        writeln(scr_txt_marker["yellow"], to!string(node)); +        writeln("* ", to!string(node));        } else { -        writeln(scr_txt_marker["white"], to!string(node)); +        writeln("* ", to!string(node));        }      }      JSONValue j = parseJSON(node); @@ -3586,15 +3541,15 @@ struct NodeStructureMetadata {      debug(heading) {        mixin ScreenTxtColors;        if (match(lev_markup_number, rgx.levels_numbered_headings)) { -        writeln(scr_txt_marker["yellow"], to!string(node)); +        writeln("* ", to!string(node));        }      }      debug(node) {        mixin ScreenTxtColors;        if (match(lev_markup_number, rgx.levels_numbered_headings)) { -        writeln(scr_txt_marker["yellow"], to!string(node)); +        writeln("* ", to!string(node));        } else { -        writeln(scr_txt_marker["white"], to!string(node)); +        writeln("* ", to!string(node));        }      }      JSONValue j = parseJSON(node); diff --git a/org/ao_conf_make_meta.org b/org/ao_conf_make_meta.org index 38510c6..6bb8ad4 100644 --- a/org/ao_conf_make_meta.org +++ b/org/ao_conf_make_meta.org @@ -23,7 +23,9 @@ private auto sdlangToAAmake(string[string][string] conf, Tag conf_sdlang) {        if (!(conf_sdlang.maybe.tags[maintag].empty)) {          if (!(conf_sdlang.tags[maintag][0].maybe.attributes[subtag].empty)          && (conf_sdlang.tags[maintag][0].attributes[subtag][0].value.length > 1)) { -          writeln(conf_sdlang.tags[maintag][0].attributes[subtag][0].value); +          debug(headersdlang) { +            writeln(conf_sdlang.tags[maintag][0].attributes[subtag][0].value); +          }            conf[maintag][subtag] =              to!string(conf_sdlang.tags[maintag][0].attributes[subtag][0].value);          } @@ -61,91 +63,117 @@ private auto documentMakeSDLangToAAmake(Tag document_make_sdlang) {      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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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);      } @@ -160,13 +188,17 @@ private auto documentMakeSDLangToAAmake(Tag document_make_sdlang) {      // hs = "link";      // 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); +    //   debug(headersdlang) { +    //     writeln(document_make_sdlang.tags[hm][0].attributes[hs][0].value); +    //   }      //   dochead_meta[hm][hs] =      //     to!string(document_make_sdlang.tags[hm][0].attributes[hs][0].value);      // }    }    +/ -  // writeln(dochead_make); +  // debug(headersdlang) { +  //   writeln(dochead_make); +  // }    return dochead_make;  }  #+END_SRC @@ -484,7 +516,9 @@ private auto headerNativeToAA(in char[] src_header) {          header_reset_states_common(line_occur, an_object, type);          type["header_make"] = State.off;          type["header_meta"] = State.off; -        writeln(dochead_metadata_and_make); +        debug(headersdlang) { +          writeln(dochead_metadata_and_make); +        }        } else {          an_object = native_header_extract(header_line, line_occur, an_object, type);        } @@ -582,13 +616,17 @@ private auto headerSDLangToAAmake(Tag header_sdlang, string[string][string] doch      hs = "main";      if (!(header_sdlang.tags[hm].empty)      && (header_sdlang.tags[hm][0].values[0].length > 1)) { -      writeln(header_sdlang.tags[hm][0].values[0]); +      debug(headersdlang) { +        writeln(header_sdlang.tags[hm][0].values[0]); +      }        dochead_meta[hm][hs] =          to!string(header_sdlang.tags[hm][0].values[0]);          // to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);      } else 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); +      debug(headersdlang) { +        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);      } else { @@ -597,12 +635,16 @@ private auto headerSDLangToAAmake(Tag header_sdlang, string[string][string] doch      hs = "sub";      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); +      debug(headersdlang) { +        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);      } else if (!(header_sdlang.tags[hm][0].maybe.attributes["subtitle"].empty)      && (header_sdlang.tags[hm][0].attributes["subtitle"][0].value.length > 1)) { -      writeln(header_sdlang.tags[hm][0].attributes["subtitle"][0].value); +      debug(headersdlang) { +        writeln(header_sdlang.tags[hm][0].attributes["subtitle"][0].value); +      }        dochead_meta[hm][hs] =          to!string(header_sdlang.tags[hm][0].attributes["subtitle"][0].value);      } @@ -612,26 +654,34 @@ private auto headerSDLangToAAmake(Tag header_sdlang, string[string][string] doch      hs = "language";      if (!(header_sdlang.tags[hm][0].maybe.attributes["lang"].empty)      && (header_sdlang.tags[hm][0].attributes["lang"][0].value.length > 1)) { -      writeln(header_sdlang.tags[hm][0].attributes["lang"][0].value); +      debug(headersdlang) { +        writeln(header_sdlang.tags[hm][0].attributes["lang"][0].value); +      }        dochead_meta[hm][hs] =          to!string(header_sdlang.tags[hm][0].attributes["lang"][0].value);      } else 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); +      debug(headersdlang) { +        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 = "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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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);      } @@ -647,28 +697,36 @@ private auto headerSDLangToAAmake(Tag header_sdlang, string[string][string] doch      hs = "author";      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); +      debug(headersdlang) { +        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 = "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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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);      } @@ -678,35 +736,45 @@ private auto headerSDLangToAAmake(Tag header_sdlang, string[string][string] doch      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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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);      } @@ -716,49 +784,63 @@ private auto headerSDLangToAAmake(Tag header_sdlang, string[string][string] doch      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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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);      } @@ -768,21 +850,27 @@ private auto headerSDLangToAAmake(Tag header_sdlang, string[string][string] doch      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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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);      } @@ -795,7 +883,9 @@ private auto headerSDLangToAAmake(Tag header_sdlang, string[string][string] doch      // hs = "link";      // 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); +    //   debug(headersdlang) { +    //     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);      // } @@ -805,14 +895,18 @@ private auto headerSDLangToAAmake(Tag header_sdlang, string[string][string] doch      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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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);      } @@ -822,21 +916,27 @@ private auto headerSDLangToAAmake(Tag header_sdlang, string[string][string] doch      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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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);      } @@ -846,7 +946,9 @@ private auto headerSDLangToAAmake(Tag header_sdlang, string[string][string] doch      hs = "name";      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); +      debug(headersdlang) { +        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);      } @@ -856,28 +958,36 @@ private auto headerSDLangToAAmake(Tag header_sdlang, string[string][string] doch      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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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); +      debug(headersdlang) { +        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);      } @@ -926,11 +1036,9 @@ template SiSUheaderExtractHub() {      private auto headerContentAA(char[] header_src, string[string][string] conf_doc_make_aa) {        auto head_native = HeaderDocMetadataAndMakeNativeToAA();        auto head_sdlang = HeaderExtractSDL(); -      writeln(__LINE__);        auto header_make_and_meta_tuple = (match(header_src, rgx.native_header_meta_title))        ? (head_native.headerNativeToAA(header_src))        : (head_sdlang.headerSDLangToAA(header_src, conf_doc_make_aa)); -      writeln(__LINE__);        static assert(!isTypeTuple!(header_make_and_meta_tuple));        return header_make_and_meta_tuple;      } diff --git a/org/ao_read_source_files.org b/org/ao_read_source_files.org index d61b677..c1736cf 100644 --- a/org/ao_read_source_files.org +++ b/org/ao_read_source_files.org @@ -41,7 +41,9 @@ final private string readInConfigFile(string conf_sdl) {      // writeln(conf_file);      try {        if (exists(conf_file)) { -        writeln(conf_file); +        debug(configfile) { +          writeln(conf_file); +        }          config_file_str = readText(conf_file);          break;        } diff --git a/src/sdp/ao_abstract_doc_source.d b/src/sdp/ao_abstract_doc_source.d index 5095dab..eb87535 100644 --- a/src/sdp/ao_abstract_doc_source.d +++ b/src/sdp/ao_abstract_doc_source.d @@ -128,10 +128,9 @@ template SiSUdocAbstraction() {        ];        auto type = flags_type_init;        mixin ScreenTxtColors; -      int tell_lo(string color, int obj_cite_number, in char[] line) { +      int tell_lo(int obj_cite_number, in char[] line) {          writefln( -          "%s%s %s", -          scr_txt_marker[color], +          "* %s %s",            to!string(obj_cite_number),            to!string(line)          ); @@ -139,8 +138,7 @@ template SiSUdocAbstraction() {        }        int tell_l(string color, in char[] line) {          writefln( -          "%s%s", -          scr_txt_marker[color], +          "* %s",            line          );          return 0; @@ -217,8 +215,7 @@ template SiSUdocAbstraction() {          debug(srclines) {            if (!line.empty) {                             // source lines, not empty              writefln( -              "%s%s", -              scr_txt_marker["green"], +              "* %s",                line              );            } @@ -700,9 +697,7 @@ template SiSUdocAbstraction() {          /+ curly code open +/          debug(code) {                              // code (curly) open            writefln( -            "%s* [code curly] %s%s", -            scr_txt_color["blue"], -            scr_txt_color["off"], +            "* [code curly] %s",              line            );          } @@ -713,9 +708,7 @@ template SiSUdocAbstraction() {          /+ curly poem open +/          debug(poem) {                              // poem (curly) open            writefln( -            "%s* [poem curly] %s%s", -            scr_txt_color["red"], -            scr_txt_color["off"], +            "* [poem curly] %s",              line            );          } @@ -729,9 +722,7 @@ template SiSUdocAbstraction() {          /+ curly group open +/          debug(group) {                             // group (curly) open            writefln( -            "%s* [group curly] %s%s", -            scr_txt_color["blue"], -            scr_txt_color["off"], +            "* [group curly] %s",              line            );          } @@ -742,9 +733,7 @@ template SiSUdocAbstraction() {          /+ curly block open +/          debug(block) {                             // block (curly) open            writefln( -            "%s* [block curly] %s%s", -            scr_txt_color["blue"], -            scr_txt_color["off"], +            "* [block curly] %s",              line            );          } @@ -755,9 +744,7 @@ template SiSUdocAbstraction() {          /+ curly quote open +/          debug(quote) {                             // quote (curly) open            writefln( -            "%s* [quote curly] %s%s", -            scr_txt_color["blue"], -            scr_txt_color["off"], +            "* [quote curly] %s",              line            );          } @@ -768,9 +755,7 @@ template SiSUdocAbstraction() {          /+ curly table open +/          debug(table) {                             // table (curly) open            writefln( -            "%s* [table curly] %s%s", -            scr_txt_color["blue"], -            scr_txt_color["off"], +            "* [table curly] %s",              line            );          } @@ -781,9 +766,7 @@ template SiSUdocAbstraction() {          /+ tic code open +/          debug(code) {                              // code (tic) open            writefln( -            "%s* [code tic] %s%s", -            scr_txt_color["blue"], -            scr_txt_color["off"], +            "* [code tic] %s",              line            );          } @@ -794,9 +777,7 @@ template SiSUdocAbstraction() {          /+ tic poem open +/          debug(poem) {                              // poem (tic) open            writefln( -            "%s* [poem tic] %s%s", -            scr_txt_color["red"], -            scr_txt_color["off"], +            "* [poem tic] %s",              line            );          } @@ -809,9 +790,7 @@ template SiSUdocAbstraction() {          /+ tic group open +/          debug(group) {                             // group (tic) open            writefln( -            "%s* [group tic] %s%s", -            scr_txt_color["blue"], -            scr_txt_color["off"], +            "* [group tic] %s",              line            );          } @@ -822,9 +801,7 @@ template SiSUdocAbstraction() {          /+ tic block open +/          debug(block) {                             // block (tic) open            writefln( -            "%s* [block tic] %s%s", -            scr_txt_color["blue"], -            scr_txt_color["off"], +            "* [block tic] %s",              line            );          } @@ -835,9 +812,7 @@ template SiSUdocAbstraction() {          /+ tic quote open +/          debug(quote) {                             // quote (tic) open            writefln( -            "%s* [quote tic] %s%s", -            scr_txt_color["blue"], -            scr_txt_color["off"], +            "* [quote tic] %s",              line            );          } @@ -848,9 +823,7 @@ template SiSUdocAbstraction() {          /+ tic table open +/          debug(table) {                             // table (tic) open            writefln( -            "%s* [table tic] %s%s", -            scr_txt_color["blue"], -            scr_txt_color["off"], +            "* [table tic] %s",              line            );          } @@ -930,9 +903,7 @@ template SiSUdocAbstraction() {        }        debug(biblio) {          writefln( -          "%s * %s %s", -          scr_txt_color["yellow"], -          scr_txt_color["off"], +          "* %s",            line          );        } @@ -990,9 +961,7 @@ template SiSUdocAbstraction() {          s = j.toString();          debug(biblio) {            writefln( -            "%s* %s%s: %s\n%s", -            scr_txt_color["red"], -            scr_txt_color["off"], +            "* %s: %s\n%s",              biblio_tag_name,              biblio_tag_entry,              j[biblio_tag_name] @@ -1015,9 +984,7 @@ template SiSUdocAbstraction() {            an_object["obj"]="verse"; // check that this is as you please            debug(poem) {                            // poem (curly) close              writefln( -              "%s* [poem curly] %s%s", -              scr_txt_color["red"], -              scr_txt_color["off"], +              "* [poem curly] %s",                line              );            } @@ -1027,8 +994,7 @@ template SiSUdocAbstraction() {            debug(poem) {                            // poem (curly) close              writeln(__LINE__);              writefln( -              "%s%s %s", -              scr_txt_marker["fuchsia"], +              "* %s %s",                obj_cite_number,                line              ); @@ -1038,7 +1004,6 @@ template SiSUdocAbstraction() {            if (an_object.length > 0) {              debug(poem) {                            // poem (curly) close                tell_lo( -                "fuchsia",                  obj_cite_number,                  an_object["obj"]                ); @@ -1079,8 +1044,7 @@ template SiSUdocAbstraction() {              an_object["obj"] = processing["verse"];              debug(poem) {                          // poem verse                writefln( -                "%s%s curly\n%s", -                scr_txt_marker["green"], +                "* %s curly\n%s",                  obj_cite_number,                  an_object["obj"]                ); @@ -1115,9 +1079,7 @@ template SiSUdocAbstraction() {            an_object["obj"]="verse"; // check that this is as you please            debug(poem) {                            // poem (curly) close              writefln( -              "%s* [poem tic] %s%s", -              scr_txt_color["red"], -              scr_txt_color["off"], +              "* [poem tic] %s",                line              );            } @@ -1127,7 +1089,7 @@ template SiSUdocAbstraction() {            if (an_object.length > 0) {              debug(poem) {                            // poem (tic) close                writeln(__LINE__); -              tell_lo("fuchsia", obj_cite_number, line); +              tell_lo(obj_cite_number, line);              }              processing.remove("verse");              an_object["is"] = "verse"; @@ -1165,8 +1127,7 @@ template SiSUdocAbstraction() {              an_object["obj"] = processing["verse"];              debug(poem) {                            // poem (tic) close                writefln( -                "%s%s tic\n%s", -                scr_txt_marker["green"], +                "* %s tic\n%s",                  obj_cite_number,                  an_object["obj"]                ); @@ -1557,9 +1518,7 @@ template SiSUdocAbstraction() {          /+ match book_index +/          debug(bookindexmatch) {                       // book index            writefln( -            "%s* [bookindex] %s%s\n", -            scr_txt_color["blue"], -            scr_txt_color["off"], +            "* [bookindex] %s\n",              to!string(m.captures[1]),            );            // writeln(scr_txt_marker["blue"], to!string(m.captures[1]), "\n"); @@ -1571,9 +1530,7 @@ template SiSUdocAbstraction() {          book_idx_tmp = to!string(m.captures[1]);          debug(bookindexmatch) {                       // book index            writefln( -            "%s* [bookindex] %s%s\n", -            scr_txt_color["blue"], -            scr_txt_color["off"], +            "* [bookindex] %s\n",              book_idx_tmp,            );            // writeln(scr_txt_marker["blue"], book_idx_tmp, "\n"); @@ -1585,9 +1542,7 @@ template SiSUdocAbstraction() {            an_object["bookindex"] = book_idx_tmp ~ to!string(m.captures[1]);            debug(bookindexmatch) {                     // book index              writefln( -              "%s* [bookindex] %s%s\n", -              scr_txt_color["blue"], -              scr_txt_color["off"], +              "* [bookindex] %s\n",                book_idx_tmp,              );              // writeln(scr_txt_marker["blue"], book_idx_tmp, "\n"); @@ -2451,7 +2406,7 @@ template SiSUdocAbstraction() {            mixin ScreenTxtColors;            if (!bookindex_section.empty) {              writeln( -              scr_txt_color["blue"], "* [bookindex] ", scr_txt_color["off"], +              "* [bookindex] ",                "[", to!string(obj_cite_number), "] ", bookindex_section              );            } @@ -2929,9 +2884,9 @@ template SiSUdocAbstraction() {          debug(node) {            mixin ScreenTxtColors;            if (match(lev_markup_number, rgx.levels_numbered_headings)) { -            writeln(scr_txt_marker["yellow"], to!string(node)); +            writeln("* ", to!string(node));            } else { -            writeln(scr_txt_marker["white"], to!string(node)); +            writeln("* ", to!string(node));            }          }          JSONValue j = parseJSON(node); @@ -3077,15 +3032,15 @@ template SiSUdocAbstraction() {          debug(heading) {            mixin ScreenTxtColors;            if (match(lev_markup_number, rgx.levels_numbered_headings)) { -            writeln(scr_txt_marker["yellow"], to!string(node)); +            writeln("* ", to!string(node));            }          }          debug(node) {            mixin ScreenTxtColors;            if (match(lev_markup_number, rgx.levels_numbered_headings)) { -            writeln(scr_txt_marker["yellow"], to!string(node)); +            writeln("* ", to!string(node));            } else { -            writeln(scr_txt_marker["white"], to!string(node)); +            writeln("* ", to!string(node));            }          }          JSONValue j = parseJSON(node); diff --git a/src/sdp/ao_conf_make_meta.d b/src/sdp/ao_conf_make_meta.d index f78d7c4..04a9d7a 100644 --- a/src/sdp/ao_conf_make_meta.d +++ b/src/sdp/ao_conf_make_meta.d @@ -13,11 +13,9 @@ template SiSUheaderExtractHub() {      private auto headerContentAA(char[] header_src, string[string][string] conf_doc_make_aa) {        auto head_native = HeaderDocMetadataAndMakeNativeToAA();        auto head_sdlang = HeaderExtractSDL(); -      writeln(__LINE__);        auto header_make_and_meta_tuple = (match(header_src, rgx.native_header_meta_title))        ? (head_native.headerNativeToAA(header_src))        : (head_sdlang.headerSDLangToAA(header_src, conf_doc_make_aa)); -      writeln(__LINE__);        static assert(!isTypeTuple!(header_make_and_meta_tuple));        return header_make_and_meta_tuple;      } diff --git a/src/sdp/ao_conf_make_meta_native.d b/src/sdp/ao_conf_make_meta_native.d index 7bcf965..9f0ad63 100644 --- a/src/sdp/ao_conf_make_meta_native.d +++ b/src/sdp/ao_conf_make_meta_native.d @@ -302,7 +302,9 @@ template SiSUheaderExtractNative() {              header_reset_states_common(line_occur, an_object, type);              type["header_make"] = State.off;              type["header_meta"] = State.off; -            writeln(dochead_metadata_and_make); +            debug(headersdlang) { +              writeln(dochead_metadata_and_make); +            }            } else {              an_object = native_header_extract(header_line, line_occur, an_object, type);            } diff --git a/src/sdp/ao_conf_make_meta_sdlang.d b/src/sdp/ao_conf_make_meta_sdlang.d index 612c88a..9369aef 100644 --- a/src/sdp/ao_conf_make_meta_sdlang.d +++ b/src/sdp/ao_conf_make_meta_sdlang.d @@ -16,7 +16,9 @@ template SiSUheaderExtractSDLang() {            if (!(conf_sdlang.maybe.tags[maintag].empty)) {              if (!(conf_sdlang.tags[maintag][0].maybe.attributes[subtag].empty)              && (conf_sdlang.tags[maintag][0].attributes[subtag][0].value.length > 1)) { -              writeln(conf_sdlang.tags[maintag][0].attributes[subtag][0].value); +              debug(headersdlang) { +                writeln(conf_sdlang.tags[maintag][0].attributes[subtag][0].value); +              }                conf[maintag][subtag] =                  to!string(conf_sdlang.tags[maintag][0].attributes[subtag][0].value);              } @@ -42,91 +44,117 @@ template SiSUheaderExtractSDLang() {          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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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);          } @@ -141,13 +169,17 @@ template SiSUheaderExtractSDLang() {          // hs = "link";          // 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); +        //   debug(headersdlang) { +        //     writeln(document_make_sdlang.tags[hm][0].attributes[hs][0].value); +        //   }          //   dochead_meta[hm][hs] =          //     to!string(document_make_sdlang.tags[hm][0].attributes[hs][0].value);          // }        }        +/ -      // writeln(dochead_make); +      // debug(headersdlang) { +      //   writeln(dochead_make); +      // }        return dochead_make;      }      final private auto headerMakeSDLang(in string src_header) { @@ -215,13 +247,17 @@ template SiSUheaderExtractSDLang() {          hs = "main";          if (!(header_sdlang.tags[hm].empty)          && (header_sdlang.tags[hm][0].values[0].length > 1)) { -          writeln(header_sdlang.tags[hm][0].values[0]); +          debug(headersdlang) { +            writeln(header_sdlang.tags[hm][0].values[0]); +          }            dochead_meta[hm][hs] =              to!string(header_sdlang.tags[hm][0].values[0]);              // to!string(header_sdlang.tags[hm][0].attributes[hs][0].value);          } else 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); +          debug(headersdlang) { +            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);          } else { @@ -230,12 +266,16 @@ template SiSUheaderExtractSDLang() {          hs = "sub";          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); +          debug(headersdlang) { +            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);          } else if (!(header_sdlang.tags[hm][0].maybe.attributes["subtitle"].empty)          && (header_sdlang.tags[hm][0].attributes["subtitle"][0].value.length > 1)) { -          writeln(header_sdlang.tags[hm][0].attributes["subtitle"][0].value); +          debug(headersdlang) { +            writeln(header_sdlang.tags[hm][0].attributes["subtitle"][0].value); +          }            dochead_meta[hm][hs] =              to!string(header_sdlang.tags[hm][0].attributes["subtitle"][0].value);          } @@ -245,26 +285,34 @@ template SiSUheaderExtractSDLang() {          hs = "language";          if (!(header_sdlang.tags[hm][0].maybe.attributes["lang"].empty)          && (header_sdlang.tags[hm][0].attributes["lang"][0].value.length > 1)) { -          writeln(header_sdlang.tags[hm][0].attributes["lang"][0].value); +          debug(headersdlang) { +            writeln(header_sdlang.tags[hm][0].attributes["lang"][0].value); +          }            dochead_meta[hm][hs] =              to!string(header_sdlang.tags[hm][0].attributes["lang"][0].value);          } else 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); +          debug(headersdlang) { +            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 = "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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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);          } @@ -280,28 +328,36 @@ template SiSUheaderExtractSDLang() {          hs = "author";          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); +          debug(headersdlang) { +            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 = "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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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);          } @@ -311,35 +367,45 @@ template SiSUheaderExtractSDLang() {          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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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);          } @@ -349,49 +415,63 @@ template SiSUheaderExtractSDLang() {          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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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);          } @@ -401,21 +481,27 @@ template SiSUheaderExtractSDLang() {          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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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);          } @@ -428,7 +514,9 @@ template SiSUheaderExtractSDLang() {          // hs = "link";          // 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); +        //   debug(headersdlang) { +        //     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);          // } @@ -438,14 +526,18 @@ template SiSUheaderExtractSDLang() {          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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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);          } @@ -455,21 +547,27 @@ template SiSUheaderExtractSDLang() {          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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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);          } @@ -479,7 +577,9 @@ template SiSUheaderExtractSDLang() {          hs = "name";          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); +          debug(headersdlang) { +            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);          } @@ -489,28 +589,36 @@ template SiSUheaderExtractSDLang() {          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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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); +          debug(headersdlang) { +            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);          } diff --git a/src/sdp/ao_read_config_files.d b/src/sdp/ao_read_config_files.d index e53c656..571dbcc 100644 --- a/src/sdp/ao_read_config_files.d +++ b/src/sdp/ao_read_config_files.d @@ -37,7 +37,9 @@ template SiSUconfigIn() {          // writeln(conf_file);          try {            if (exists(conf_file)) { -            writeln(conf_file); +            debug(configfile) { +              writeln(conf_file); +            }              config_file_str = readText(conf_file);              break;            } | 
