From 8ab7e935913c102fb039110e20b71f698a68c6ee Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 16 Jun 2016 01:49:06 -0400
Subject: step5 sdlang used for config files and doc headers

---
 org/ao_abstract_doc_source.org | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

(limited to 'org/ao_abstract_doc_source.org')

diff --git a/org/ao_abstract_doc_source.org b/org/ao_abstract_doc_source.org
index 557cda0..9e9e9e5 100644
--- a/org/ao_abstract_doc_source.org
+++ b/org/ao_abstract_doc_source.org
@@ -463,24 +463,24 @@ if (matchFirst(line, rgx.block_open)) {
     && ((type["para"] == State.off)
     && (type["heading"] == State.off))) {
       /+ heading or para but neither flag nor line exists +/
-      if ((to!string(dochead_make_json["make"]["headings"]).length > 2)
-      && (type["make_headings"] == State.off)) {
-        /+ heading found +/
-        auto dochead_make_headings =
-          to!string(dochead_make_json["make"]["headings"]);
-        heading_found(line, dochead_make_headings, heading_match_str, heading_match_rgx, type);
-      }
+      // if ((to!string(dochead_make["make"]["headings"]).length > 2)
+      // && (type["make_headings"] == State.off)) {
+      //   /+ heading found +/
+      //   auto dochead_make_headings =
+      //     to!string(dochead_make["make"]["headings"]);
+      //   heading_found(line, dochead_make_headings, heading_match_str, heading_match_rgx, type);
+      // }
       if ((type["make_headings"] == State.on)
       && ((line_occur["para"] == State.off)
       && (line_occur["heading"] == State.off))
       && ((type["para"] == State.off)
       && (type["heading"] == State.off))) {
         /+ heading make set +/
-        heading_make_set(line, line_occur, heading_match_rgx, type);
+        // heading_make_set(line, line_occur, heading_match_rgx, type);
       }
       if (matchFirst(line, rgx.heading)) {
         /+ heading match +/
-        heading_matched(line, line_occur, an_object, lv, collapsed_lev, type, dochead_meta_json);
+        heading_matched(line, line_occur, an_object, lv, collapsed_lev, type);
       } else if (line_occur["para"] == State.off) {
         /+ para match +/
         para_match(line, an_object, indent, bullet, type, line_occur);
@@ -2000,7 +2000,7 @@ auto book_index(
 ** heading or paragraph                                   :heading:paragraph:
 *** heading found                                                   :heading:
 
-#+name: abs_functions
+##+name: abs_functions
 #+BEGIN_SRC d
 auto heading_found(
   char[] line,
@@ -2164,8 +2164,8 @@ auto heading_matched(
   ref string[string] an_object,
   ref int[string] lv,
   ref int[string] collapsed_lev,
-  ref int[string] type,
-  ref JSONValue[string] dochead_meta_json
+  ref int[string] type
+  // ref JSONValue[string] dochead_meta_json
 ) {
   if (auto m = match(line, rgx.heading)) {
     /+ heading match +/
@@ -2179,10 +2179,10 @@ auto heading_matched(
     assertions_doc_structure(an_object, lv); // includes most of the logic for collapsed levels
     switch (an_object["lev"]) {
     case "A":
-      an_object["obj"]=replaceFirst(an_object["obj"], rgx.head_value_title, to!string(dochead_meta_json["title"]["main"]));
-      an_object["obj"]=replaceFirst(an_object["obj"], rgx.head_value_author, to!string(dochead_meta_json["creator"]["author"]));
-      // an_object["obj"]=replaceFirst(an_object["obj"], rgx.head_value_title, to!string(parseJSON(dochead_meta_json["title"]["main"])));
-      // an_object["obj"]=replaceFirst(an_object["obj"], rgx.head_value_author, to!string(parseJSON(dochead_meta_json["creator"]["author"])));
+      // an_object["obj"]=replaceFirst(an_object["obj"], rgx.head_value_title, to!string(dochead_metadata["title"]["main"]));
+      // an_object["obj"]=replaceFirst(an_object["obj"], rgx.head_value_author, to!string(dochead_metadata["creator"]["author"]));
+      // // an_object["obj"]=replaceFirst(an_object["obj"], rgx.head_value_title, to!string(parseJSON(dochead_metadata["title"]["main"])));
+      // // an_object["obj"]=replaceFirst(an_object["obj"], rgx.head_value_author, to!string(parseJSON(dochead_metadata["creator"]["author"])));
       collapsed_lev["h0"] = 1;
       an_object["lev_collapsed_number"] =
         to!string(collapsed_lev["h0"]);
@@ -4039,11 +4039,8 @@ template SiSUdocAbstraction() {
     <<abs_init_struct>>
 
     /+ ↓ abstract marked up document +/
-    auto abstract_doc_source(
-      char[][] markup_sourcefile_content,
-      JSONValue[string] dochead_make_json,
-      JSONValue[string] dochead_meta_json
-    ) {
+    auto abstract_doc_source(char[][] markup_sourcefile_content) {
+
       /+ ↓ abstraction init +/
       <<abs_init_rest>>
       /+ abstraction init ↑ +/
-- 
cgit v1.2.3