cleaningdoc-reform_v0.4.1

1 files changed, 8 insertions, 60 deletions

diff --git a/org/meta_abstraction.org b/org/meta_abstraction.org
index 1a9c53c..4c98f66 100644
--- a/org/meta_abstraction.org
+++ b/org/meta_abstraction.org
@@ -639,7 +639,7 @@ if (!line.empty) {
 }
 #+END_SRC
 
-*** [#A] separate _code blocks_ from _other markup text_ [+5]
+*** separate _code blocks_ from _other markup text_ [+5] [#A]
 **** _code blocks_                                            :block:code:
 
 #+name: abs_in_loop_body_00_code_block
@@ -1076,7 +1076,7 @@ if (line.matchFirst(rgx.book_index)
 #+name: abs_in_loop_body_not_block_obj
 #+BEGIN_SRC d
   an_object_key="body_nugget";
-  if (auto m = matchFirst(line, rgx.comment)) {
+  if (auto m = line.matchFirst(rgx.comment)) {
     /+ matched comment +/
     debug(comment) {
       writeln(line);
@@ -1382,7 +1382,7 @@ if ((obj_type_status["heading"] == State.on)
   comp_obj_para.has.inline_notes_reg                        = substantive_obj_misc_tuple[sObj.notes_reg];
   comp_obj_para.has.inline_notes_star                       = substantive_obj_misc_tuple[sObj.notes_star];
   comp_obj_para.has.inline_links                            = substantive_obj_misc_tuple[sObj.links];
-  comp_obj_para.has.contains_image_without_dimensions       = substantive_obj_misc_tuple[sObj.image_no_dimensions];
+  comp_obj_para.has.image_without_dimensions                = substantive_obj_misc_tuple[sObj.image_no_dimensions];
   the_document_body_section                                 ~= comp_obj_para;
   tag_assoc = inline_para_link_anchor(an_object, tag_in_seg, tag_assoc);
   _common_reset_(line_occur, an_object, obj_type_status);
@@ -2259,7 +2259,7 @@ string[] segnames_lv0_to_4;
 #+name: abs_post
 #+BEGIN_SRC d
 auto _image_dimensions(M,O)(M manifest_matter, O obj) {
-  if (obj.has.contains_image_without_dimensions) {
+  if (obj.has.image_without_dimensions) {
     import std.math;
     import imageformats;
     int w, h, chans;
@@ -2900,58 +2900,6 @@ dom_structure_collapsed_tags_status          = [ 0, 0, 0, 0, 0, 0, 0, 0, 0,];
 dom_structure_collapsed_tags_status_buffer   = [ 0, 0, 0, 0, 0, 0, 0, 0, 0,];
 #+END_SRC
 
-*** [#A] ↻ _reloop_                                                  :reloop:
-
-- this would work, but no need for extra loop, remove
-
-#+name: abs_post_doc_reloop_processing
-#+BEGIN_SRC d
-debug(abstraction) {
-  foreach (part; sequenced_document_keys.scroll) {
-    foreach (ref obj; document_the[part]) {
-      debug(node_misc) {
-        if (obj.metainfo.is_a == "heading") {
-          writeln("heading ancestors text?: ", obj.tags.heading_ancestors_text);
-        }
-      }
-      debug(node_headings) {
-        if (obj.metainfo.is_a == "heading") {
-          writeln("---");
-          writeln(obj.text);
-          writeln("  node:                    ", obj.metainfo.node);
-          writeln("  ocn:                     ", obj.metainfo.ocn);
-          writeln("  markedup heading lev:    ", obj.metainfo.heading_lev_markup);
-          writeln("  collapsed heading lev    ", obj.metainfo.heading_lev_collapsed);
-          writeln("  parent ocn:              ", obj.metainfo.parent_ocn);
-          writeln("  parent lev:              ", obj.metainfo.parent_lev_markup);
-          writeln("  markedup ancestors o_n:  ", obj.metainfo.markedup_ancestors);
-          writeln("  dom markedup:            ", obj.metainfo.dom_structure_markedup_tags_status);
-          writeln("  collapsed ancestors o_n: ", obj.metainfo.collapsed_ancestors);
-          writeln("  dom collapsed:           ", obj.metainfo.dom_structure_collapsed_tags_status);
-        }
-      }
-      debug(node_all) {
-        writeln("---");
-        if (obj.metainfo.is_a == "heading") {
-          writeln(obj.text);
-        }
-        writeln("node:                    ", obj.metainfo.node);
-        writeln("ocn:                     ", obj.metainfo.ocn);
-        writeln("markedup heading lev:    ", obj.metainfo.heading_lev_markup);
-        writeln("collapsed heading lev    ", obj.metainfo.heading_lev_collapsed);
-        writeln("markedup ancestors o_n:  ", obj.metainfo.markedup_ancestors);
-        writeln("collapsed ancestors o_n: ", obj.metainfo.collapsed_ancestors);
-        writeln("dom markedup:            ", obj.metainfo.dom_structure_markedup_tags_status);
-        writeln("dom collapsed:           ", obj.metainfo.dom_structure_collapsed_tags_status);
-        writeln("parent ocn:              ", obj.metainfo.parent_ocn);
-        writeln("parent lev:              ", obj.metainfo.parent_lev_markup);
-        writeln("Node:                    ", obj.metainfo.ocn);
-      }
-    }
-  }
-}
-#+END_SRC
-
 *** [#A] _return document tuple_                               :return:tuple:
 
 #+name: abs_return_tuple
@@ -6117,7 +6065,7 @@ private:
           if (auto n = munge_.match(rgx.heading_anchor_tag_plus_colon)) {
             auto tag_remunge_ = n.captures[2]
               .replaceAll(rgx.heading_marker_tag_has_colon, "..");
-            munge_=munge_.replaceFirst(rgx.heading_anchor_tag_plus_colon, n.captures[1] ~ tag_remunge_ ~ " ");
+            munge_ = munge_.replaceFirst(rgx.heading_anchor_tag_plus_colon, n.captures[1] ~ tag_remunge_ ~ " ");
           }
         } else if (auto m = munge_.match(rgx.heading_extract_unnamed_anchor_tag)) {
           munge_ = munge_.replaceFirst(
@@ -7791,7 +7739,7 @@ struct HeadingAttrib {
 }
 #+END_SRC
 
-*** [#A] _composite object_
+*** _composite object_ [#A]
 
 #+name: meta_structs_init
 #+BEGIN_SRC d
@@ -7799,7 +7747,7 @@ struct DocObj_MetaInfo_ {
   string                 is_of_part                         = ""; // frontmatter, body, backmatter
   string                 is_of_section                      = ""; // toc, body, glossary, biography, book index, blurb
   string                 is_of_type                         = ""; // para, block ?
-  string                 is_a                               = ""; // heading, para, table, code block, group, ...
+  string                 is_a                               = ""; // heading, para, table, code block, group, verse/poem ...
   alias                  of_part                            = is_of_part;
   alias                  of_section                         = is_of_section;
   alias                  is_of                              = is_of_type;
@@ -7887,7 +7835,7 @@ struct DocObj_Has_ {                                         // has
   bool                   inline_links                        = false;
   bool                   inline_notes_reg                    = false;
   bool                   inline_notes_star                   = false;
-  bool                   contains_image_without_dimensions   = false;
+  bool                   image_without_dimensions            = false;
 }
 #+END_SRC