From 6d0b245927779e68c2554880ad46d4299d4b11d4 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 2 Dec 2015 18:23:00 -0500
Subject: sorting

---
 lib/sdp/ao_abstract_doc_source.d |  4 ++--
 lib/sdp/ao_defaults.d            |  4 ++--
 lib/sdp/ao_rgx.d                 |  4 +++-
 lib/sdp/ao_scan_inserts.d        | 32 ++++++++++++++++----------------
 4 files changed, 23 insertions(+), 21 deletions(-)

(limited to 'lib/sdp')

diff --git a/lib/sdp/ao_abstract_doc_source.d b/lib/sdp/ao_abstract_doc_source.d
index 303011b..941c3f0 100644
--- a/lib/sdp/ao_abstract_doc_source.d
+++ b/lib/sdp/ao_abstract_doc_source.d
@@ -6,7 +6,7 @@ mixin template SiSUdocAbstraction() {
   class Abstraction {
   /* abstract marked up document */
     auto abstract_doc_source(char[][] markup_sourcefile_content) {
-      /* initialize */
+      /+ initialize +/
       mixin ObjectSetters;
       mixin AssertionsOnMarkupDocumentStructure;
       mixin AssertionsOnBlocks;
@@ -23,7 +23,7 @@ mixin template SiSUdocAbstraction() {
       string[1024] biblio_arr_json = biblio_entry_tags_jsonstr;
       JSONValue[1024] bib_arr_json;
       uint[string] line_occur;
-      int counter, previous_count, count_biblio_entry, ocn, ocn_, verse_line, bib_entry, heading_pointer, notepoint;
+      uint counter, previous_count, count_biblio_entry, ocn, ocn_, verse_line, bib_entry, heading_pointer, notepoint;
       string indent_first, indent_second;
       string[][string][string] bookindex_unordered_hashes;
       bool bullet = true;
diff --git a/lib/sdp/ao_defaults.d b/lib/sdp/ao_defaults.d
index 6599e69..50c1b09 100644
--- a/lib/sdp/ao_defaults.d
+++ b/lib/sdp/ao_defaults.d
@@ -75,7 +75,7 @@ template SiSUheader() {
     },
     "links": {
     }
-  }`;
+  }`; // links
   auto pointer_head_main =
     [
       "creator",
@@ -228,7 +228,7 @@ template SiSUbiblio() {
     "note"                             : "",
     "short_name"                       : "",
     "id"                               : ""
-  }`;
+  }`; // is: book, article, magazine, newspaper, blog, other
   auto biblio_tag_map = [
     "au"                               : "author_raw",
     "ed"                               : "editor_raw",
diff --git a/lib/sdp/ao_rgx.d b/lib/sdp/ao_rgx.d
index 21101b5..7050d25 100644
--- a/lib/sdp/ao_rgx.d
+++ b/lib/sdp/ao_rgx.d
@@ -27,8 +27,10 @@ mixin template RgxInit() {
     static levels_numbered_headings  = ctRegex!(`^[0-7]$`);
     /* insert markup file */
     static insert_src_fn_ssi_or_sst  = ctRegex!(`^<<\s*(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]ss[ti])$`);
-    /* header & comments */
+    // static insert_ssi_or_sst_fn      = ctRegex!(`^<<\s*[a-zA-Z0-9._-]+[.]ss[ti]`);
+    /* comments */
     static comment                   = ctRegex!(`^%+ `);
+    /* header */
     static header                    = ctRegex!(`^@([a-z_]+):(?:\s|$)`);
     static header_make               = ctRegex!(`^@(make):(?:\s|$)`);
     static header_metadata           = ctRegex!(`^@([a-z_]+):(?:\s|$)`);
diff --git a/lib/sdp/ao_scan_inserts.d b/lib/sdp/ao_scan_inserts.d
index ab705eb..54abb8f 100644
--- a/lib/sdp/ao_scan_inserts.d
+++ b/lib/sdp/ao_scan_inserts.d
@@ -1,7 +1,7 @@
-/*
+/+
   inserts
   ao_inserts.d
-*/
++/
 mixin template SiSUdocInserts() {
   class Inserts {
     auto scan_subdoc_source(
@@ -87,8 +87,8 @@ mixin template SiSUdocInserts() {
               markup_sourcesubfile_insert_content.length
             );
           }
-            auto ins = new Inserts();
-          /*
+          auto ins = new Inserts();
+          /+
             1. load file,
             2. read lines;
             3. scan lines,
@@ -96,7 +96,7 @@ mixin template SiSUdocInserts() {
             5.   repeat 1
             6. else
             7.   add line to new array;
-          */
+          +/
         } else {
           ft1["header_make"] = 0;
           ft1["header_metadata"] = 0;
@@ -192,16 +192,16 @@ mixin template SiSUdocInserts() {
               markup_sourcefile_insert_content.length
             );
           }
-            auto ins = new Inserts();
-            auto t = ins.scan_subdoc_source(
-              markup_sourcefile_insert_content, to!string(fn_src_insert), add
-            );
-            static assert(!isTypeTuple!(t));
-            auto tmparr = t[0];
-            auto addsub = t[1];
-            cont_arbitrary_max_length_set[add .. addsub-1] = tmparr[0 .. $-1];
-            add=addsub;
-          /*
+          auto ins = new Inserts();
+          auto t = ins.scan_subdoc_source(
+            markup_sourcefile_insert_content, to!string(fn_src_insert), add
+          );
+          static assert(!isTypeTuple!(t));
+          auto tmparr = t[0];
+          auto addsub = t[1];
+          cont_arbitrary_max_length_set[add .. addsub-1] = tmparr[0 .. $-1];
+          add=addsub;
+          /+
             1. load file,
             2. read lines;
             3. scan lines,
@@ -209,7 +209,7 @@ mixin template SiSUdocInserts() {
             5.   repeat 1
             6. else
             7.   add line to new array;
-          */
+          +/
         } else {
           ft["header_make"] = 0;
           ft["header_metadata"] = 0;
-- 
cgit v1.2.3