meta doc abstraction summary

5 files changed, 81 insertions, 14 deletions

diff --git a/dub.sdl b/dub.sdl
index 428140b..5bc5650 100644
--- a/dub.sdl
+++ b/dub.sdl
@@ -8,7 +8,7 @@ targetPath        "./bin"
 #sourcePath        "./src/sdp"
 stringImportPaths "./views"
 buildRequirements "allowWarnings"
-dependency        "sdlang-d" version="~>0.10.0"
+dependency        "sdlang-d" version="~>0.10.1"
 dependency        "archive"  version="~>0.6.0"
 configuration "sdp-release" {
   name                 "release"
diff --git a/makefile b/makefile
index 12e27a2..f03500d 100644
--- a/makefile
+++ b/makefile
@@ -95,6 +95,13 @@ all_builds_debug: clean skel tangle
 ver:
 	echo sdp-$(PROJECT_VERSION)
 # dmd
+dmd_rel: expunge skel tangle
+	$(DUB) --compiler=dmd --config=sdp-release
+dmd_stamp:
+	$(DUB) --compiler=dmd --config=sdp-dmd
+dmd_ver:
+	$(DUB) --compiler=dmd --config=sdp-dmd
+	mv bin/sdp-dmd bin/sdp-dmd-$(PROJECT_VERSION)
 dmd_release: expunge skel tangle
 	$(DUB) --compiler=dmd --config=sdp-release
 dmd_release_stamp:
@@ -143,6 +150,13 @@ gdc_debug_clean: tangle
 gdc_debug_src:
 	$(DUB) --compiler=gdc --config=sdp-debug
 # ldc2
+ldc_rel: expunge skel tangle
+	$(DUB) --compiler=ldc2 --config=sdp-release
+ldc_stamp:
+	$(DUB) --compiler=ldc2 --config=sdp-ldc
+ldc_ver:
+	$(DUB) --compiler=ldc2 --config=sdp-ldc
+	mv bin/sdp-ldc bin/sdp-ldc-$(PROJECT_VERSION)
 ldc_release: expunge skel tangle
 	$(DUB) --compiler=ldc2 --config=sdp-release
 ldc_release_stamp:
diff --git a/maker.org b/maker.org
index 38f738a..3d294b5 100644
--- a/maker.org
+++ b/maker.org
@@ -299,6 +299,13 @@ ver:
 
 #+BEGIN_SRC makefile :tangle makefile
 # dmd
+dmd_rel: expunge skel tangle
+	$(DUB) --compiler=dmd --config=sdp-release
+dmd_stamp:
+	$(DUB) --compiler=dmd --config=sdp-dmd
+dmd_ver:
+	$(DUB) --compiler=dmd --config=sdp-dmd
+	mv bin/sdp-dmd bin/sdp-dmd-$(PROJECT_VERSION)
 dmd_release: expunge skel tangle
 	$(DUB) --compiler=dmd --config=sdp-release
 dmd_release_stamp:
@@ -357,6 +364,13 @@ gdc_debug_src:
 
 #+BEGIN_SRC makefile :tangle makefile
 # ldc2
+ldc_rel: expunge skel tangle
+	$(DUB) --compiler=ldc2 --config=sdp-release
+ldc_stamp:
+	$(DUB) --compiler=ldc2 --config=sdp-ldc
+ldc_ver:
+	$(DUB) --compiler=ldc2 --config=sdp-ldc
+	mv bin/sdp-ldc bin/sdp-ldc-$(PROJECT_VERSION)
 ldc_release: expunge skel tangle
 	$(DUB) --compiler=ldc2 --config=sdp-release
 ldc_release_stamp:
@@ -568,7 +582,7 @@ gitsnapshot: distclean tangle
 
 Every DUB package should contain a [[http://code.dlang.org/package-format?lang=json][dub.json]] (or [[http://code.dlang.org/package-format?lang=sdl][dub.sdl]])
 
-** dub.sdl [#A]                                                   :sdl:
+** dub.sdl [#A]                                                        :sdl:
 *** header                                                         :header:
 
 #+BEGIN_SRC sh  :tangle dub.sdl
@@ -582,7 +596,7 @@ targetPath        "./bin"
 #sourcePath        "./src/sdp"
 stringImportPaths "./views"
 buildRequirements "allowWarnings"
-dependency        "sdlang-d" version="~>0.10.0"
+dependency        "sdlang-d" version="~>0.10.1"
 dependency        "archive"  version="~>0.6.0"
 #+END_SRC
 
@@ -1181,7 +1195,20 @@ debugVersions "table"
 debugVersions "toc"
 #+END_SRC
 
-*** make (emacs)
+*** make
+
+#+BEGIN_SRC sh
+time make ldc_release_stamp
+time make ldc_release_stamp_ver
+time make ldc_ver
+
+time (make clean_src && make skel && make tangle && make ldc_release_stamp)
+time (make clean_src && make skel && make tangle && make ldc_release_stamp_ver)
+
+time (make clean_src && make skel && make tangle && dub --config=sdp-ldc-debug --debug=asserts)
+#+END_SRC
+
+**** make (emacs)
 
 #+BEGIN_SRC sh
 make -k  tangle
diff --git a/org/sdp.org b/org/sdp.org
index 5eb1364..eed2bbc 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -704,12 +704,21 @@ auto markup = InlineMarkup();
 #+BEGIN_SRC d
 string[string] check = [
   "last_obj_cite_number" : "NA [debug \"checkdoc\" not run]",
+  "last_obj_cite_number_body"  : "0",
+  "last_obj_cite_number_bkidx" : "0",
 ];
 foreach (k; doc_matters.keys_seq.seg) {
   foreach (obj; doc_abstraction[k]) {
     if (obj.use != "empty") {
       if (!empty(obj.obj_cite_number)) {
-        check["last_obj_cite_number"] = obj.obj_cite_number;
+        if (k == "body") {
+          check["last_obj_cite_number_body"] = obj.obj_cite_number;
+        }
+        if ((k != "bookindex_seg") && (k != "blurb")) {
+          check["last_obj_cite_number"] = obj.obj_cite_number;
+        } else if (k == "bookindex_seg") {
+          check["last_obj_cite_number_bkidx"] = obj.obj_cite_number;
+        }
       }
     }
   }
@@ -727,7 +736,7 @@ char_repeat_number = (char_repeat_number > min_repeat_number)
 ? char_repeat_number
 : min_repeat_number;
 writefln(
-  "%s\n\"%s\", %s\n%s\n%s\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n(%s: %s)\n%s",
+  "%s\n\"%s\", %s\n%s\n%s\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n(%s: %s)\n%s",
   markup.repeat_character_by_number_provided("-", char_repeat_number),
   doc_matters.dochead_meta["title"]["full"],
   doc_matters.dochead_meta["creator"]["author"],
@@ -737,11 +746,13 @@ writefln(
   to!int(doc_abstraction["toc_seg"].length),
   "length doc_abstraction arr:",
   to!int(doc_abstraction["body"].length),
+  "last doc body ocn:",
+  to!int(check["last_obj_cite_number_body"]),
   "last obj_cite_number:",
   to!int(check["last_obj_cite_number"]),
-  "length endnotes:",
-  (doc_abstraction["endnotes"].length > 1)
-  ? (to!int(doc_abstraction["endnotes"].length))
+  "length endnotes:",                                // subtract headings
+  (doc_abstraction["endnotes"].length > 2)
+  ? (to!int(doc_abstraction["endnotes"].length - 2))
   : 0,
   "length glossary:",
   (doc_abstraction["glossary"].length > 1)
@@ -755,6 +766,8 @@ writefln(
   (doc_abstraction["bookindex_seg"].length > 1)
   ? (to!int(doc_abstraction["bookindex_seg"].length))
   : 0,
+  "  last book idx ocn:",
+  to!int(check["last_obj_cite_number_bkidx"]),
   "length blurb:",
   (doc_abstraction["blurb"].length > 1)
   ? (to!int(doc_abstraction["blurb"].length))
diff --git a/src/sdp/meta/metadoc_summary.d b/src/sdp/meta/metadoc_summary.d
index e2b85b8..e217726 100644
--- a/src/sdp/meta/metadoc_summary.d
+++ b/src/sdp/meta/metadoc_summary.d
@@ -23,12 +23,21 @@ template SiSUabstractionSummary() {
     if (doc_matters.opt_action["verbose"]) {
       string[string] check = [
         "last_obj_cite_number" : "NA [debug \"checkdoc\" not run]",
+        "last_obj_cite_number_body"  : "0",
+        "last_obj_cite_number_bkidx" : "0",
       ];
       foreach (k; doc_matters.keys_seq.seg) {
         foreach (obj; doc_abstraction[k]) {
           if (obj.use != "empty") {
             if (!empty(obj.obj_cite_number)) {
-              check["last_obj_cite_number"] = obj.obj_cite_number;
+              if (k == "body") {
+                check["last_obj_cite_number_body"] = obj.obj_cite_number;
+              }
+              if ((k != "bookindex_seg") && (k != "blurb")) {
+                check["last_obj_cite_number"] = obj.obj_cite_number;
+              } else if (k == "bookindex_seg") {
+                check["last_obj_cite_number_bkidx"] = obj.obj_cite_number;
+              }
             }
           }
         }
@@ -40,7 +49,7 @@ template SiSUabstractionSummary() {
       ? char_repeat_number
       : min_repeat_number;
       writefln(
-        "%s\n\"%s\", %s\n%s\n%s\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n(%s: %s)\n%s",
+        "%s\n\"%s\", %s\n%s\n%s\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n(%s: %s)\n%s",
         markup.repeat_character_by_number_provided("-", char_repeat_number),
         doc_matters.dochead_meta["title"]["full"],
         doc_matters.dochead_meta["creator"]["author"],
@@ -50,11 +59,13 @@ template SiSUabstractionSummary() {
         to!int(doc_abstraction["toc_seg"].length),
         "length doc_abstraction arr:",
         to!int(doc_abstraction["body"].length),
+        "last doc body ocn:",
+        to!int(check["last_obj_cite_number_body"]),
         "last obj_cite_number:",
         to!int(check["last_obj_cite_number"]),
-        "length endnotes:",
-        (doc_abstraction["endnotes"].length > 1)
-        ? (to!int(doc_abstraction["endnotes"].length))
+        "length endnotes:",                                // subtract headings
+        (doc_abstraction["endnotes"].length > 2)
+        ? (to!int(doc_abstraction["endnotes"].length - 2))
         : 0,
         "length glossary:",
         (doc_abstraction["glossary"].length > 1)
@@ -68,6 +79,8 @@ template SiSUabstractionSummary() {
         (doc_abstraction["bookindex_seg"].length > 1)
         ? (to!int(doc_abstraction["bookindex_seg"].length))
         : 0,
+        "  last book idx ocn:",
+        to!int(check["last_obj_cite_number_bkidx"]),
         "length blurb:",
         (doc_abstraction["blurb"].length > 1)
         ? (to!int(doc_abstraction["blurb"].length))