From f78907dd0dbcfa12698f85a6cebe77f3f5de46e9 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 13 Jun 2018 18:19:46 -0400 Subject: object_number, replaces object_cite_number in code --- org/default_misc.org | 4 +- org/default_regex.org | 26 +-- org/meta_abstraction.org | 432 ++++++++++++++++++++-------------------- org/meta_debugs.org | 136 ++++++------- org/output_xmls.org | 76 +++---- org/sdp.org | 26 +-- src/sdp/meta/defaults.d | 4 +- src/sdp/meta/doc_debugs.d | 134 ++++++------- src/sdp/meta/metadoc_from_src.d | 418 +++++++++++++++++++------------------- src/sdp/meta/metadoc_summary.d | 26 +-- src/sdp/meta/object_setter.d | 10 +- src/sdp/meta/rgx.d | 22 +- src/sdp/output/epub3.d | 12 +- src/sdp/output/xmls.d | 64 +++--- 14 files changed, 695 insertions(+), 695 deletions(-) diff --git a/org/default_misc.org b/org/default_misc.org index 582dfa9..05496f1 100644 --- a/org/default_misc.org +++ b/org/default_misc.org @@ -69,8 +69,8 @@ template SiSUrgxInitFlags() { "tic_block" : 0, "tic_quote" : 0, "tic_table" : 0, - "ocn_status" : 0, // 0 obj_cite_number; 1 no obj_cite_number; 2 no obj_cite_number & dummy headings - "ocn_status_off_for_multiple_objects" : 0, // 0 obj_cite_number; 1 no obj_cite_number; 2 no obj_cite_number & dummy headings + "ocn_status" : 0, // 0 object_number; 1 no object_number; 2 no object_number & dummy headings + "ocn_status_off_for_multiple_objects" : 0, // 0 object_number; 1 no object_number; 2 no object_number & dummy headings "book_index" : 0, ]; return flags_type_init; diff --git a/org/default_regex.org b/org/default_regex.org index a018c1b..5278bc9 100644 --- a/org/default_regex.org +++ b/org/default_regex.org @@ -285,25 +285,25 @@ static book_index_open = ctRegex!(`^=\{\s*([^}]+? static book_index_close = ctRegex!(`^(.*?)\}$`, "m"); #+END_SRC -** no obj_cite_number object :ocn:off:object: +** no object_number object :ocn:off:object: #+name: meta_rgx #+BEGIN_SRC d -/+ no obj_cite_number object +/ -static obj_cite_number_off = ctRegex!(`~#$`, "m"); -static obj_cite_number_off_dh = ctRegex!(`-#$`, "m"); -static obj_cite_number_off_all = ctRegex!(`[~-]#$`, "m"); +/+ no object_number object +/ +static object_number_off = ctRegex!(`~#$`, "m"); +static object_number_off_dh = ctRegex!(`-#$`, "m"); +static object_number_off_all = ctRegex!(`[~-]#$`, "m"); #+END_SRC -** no obj_cite_number block :ocn:off:block: +** no object_number block :ocn:off:block: #+name: meta_rgx #+BEGIN_SRC d -/+ no obj_cite_number block +/ -static obj_cite_number_off_block = ctRegex!(`^--~#$`); -static obj_cite_number_off_block_dh = ctRegex!(`^---#$`); -static obj_cite_number_off_block_close = ctRegex!(`^--\+#$`); -static obj_cite_number_block_marks = ctRegex!(`^--[+~-]#$`); +/+ no object_number block +/ +static object_number_off_block = ctRegex!(`^--~#$`); +static object_number_off_block_dh = ctRegex!(`^---#$`); +static object_number_off_block_close = ctRegex!(`^--\+#$`); +static object_number_block_marks = ctRegex!(`^--[+~-]#$`); #+END_SRC ** ignore outside code blocks :block:code: @@ -352,8 +352,8 @@ static biblio_abbreviations = ctRegex!(`^(au|ed|ti|lng /+ bookindex split +/ static bi_main_terms_split = ctRegex!(`\s*;\s*`); static bi_main_term_plus_rest_split = ctRegex!(`\s*:\s*`); -static bi_sub_terms_plus_obj_cite_number_offset_split = ctRegex!(`\s*\|\s*`); -static bi_term_and_obj_cite_numbers_match = ctRegex!(`^(.+?)\+(\d+)`); +static bi_sub_terms_plus_object_number_offset_split = ctRegex!(`\s*\|\s*`); +static bi_term_and_object_numbers_match = ctRegex!(`^(.+?)\+(\d+)`); #+END_SRC ** language codes :language:codes: diff --git a/org/meta_abstraction.org b/org/meta_abstraction.org index b1c08ad..3d6f6b0 100644 --- a/org/meta_abstraction.org +++ b/org/meta_abstraction.org @@ -451,7 +451,7 @@ line_occur = [ "blurb" : 0, ]; auto obj_type_status = flags_type_init; -string[string] obj_cite_number_poem = [ +string[string] object_number_poem = [ "start" : "", "end" : "" ]; @@ -509,9 +509,9 @@ comp_obj_heading_.typeinfo.is_of = "para"; comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Table of Contents"; comp_obj_heading_.node.ocn = 0; -comp_obj_heading_.node.obj_cite_number = ""; -comp_obj_heading_.misc.obj_cite_number_off = ""; -comp_obj_heading_.misc.obj_cite_number_type = 0; +comp_obj_heading_.node.object_number = ""; +comp_obj_heading_.misc.object_number_off = ""; +comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "toc"; comp_obj_heading_.node.marked_up_level = "1"; comp_obj_heading_.node.heading_lev_markup = 4; @@ -601,7 +601,7 @@ debug(srclines) { } #+END_SRC -*** check whether obj_cite_number is on or turned off :ocn: +*** check whether object_number is on or turned off :ocn: #+name: abs_in_loop_body_00 #+BEGIN_SRC d @@ -686,9 +686,9 @@ if there is a glossary section you need to: comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Glossary"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "_part_glossary"; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; @@ -705,9 +705,9 @@ if there is a glossary section you need to: comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Glossary"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "glossary"; comp_obj_heading_.node.marked_up_level = "1"; comp_obj_heading_.node.heading_lev_markup = 4; @@ -727,9 +727,9 @@ if there is a glossary section you need to: comp_obj_para.typeinfo.is_a = "glossary"; comp_obj_para.text = line.to!string.strip; comp_obj_para.node.ocn = 0; - comp_obj_para.node.obj_cite_number = ""; - comp_obj_para.misc.obj_cite_number_off = ""; - comp_obj_para.misc.obj_cite_number_type = 0; + comp_obj_para.node.object_number = ""; + comp_obj_para.misc.object_number_off = ""; + comp_obj_para.misc.object_number_type = 0; comp_obj_para.attrib.indent_hang = indent["hang_position"]; comp_obj_para.attrib.indent_base = indent["base_position"]; comp_obj_para.attrib.bullet = bullet; @@ -810,9 +810,9 @@ if there is a blurb section you need to: comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Blurb"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "_part_blurb"; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; @@ -829,9 +829,9 @@ if there is a blurb section you need to: comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Blurb"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "blurb"; comp_obj_heading_.node.marked_up_level = "1"; comp_obj_heading_.node.heading_lev_markup = 4; @@ -851,9 +851,9 @@ if there is a blurb section you need to: comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = line.to!string; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "blurb"; comp_obj_heading_.node.marked_up_level = an_object["lev"].to!string; comp_obj_heading_.node.heading_lev_markup = an_object["lev_markup_number"].to!int; // make int, remove need to conv @@ -870,9 +870,9 @@ if there is a blurb section you need to: comp_obj_para.typeinfo.is_a = "blurb"; comp_obj_para.text = munge.url_links(line.to!string.strip).replaceFirst(rgx.para_attribs, ""); comp_obj_para.node.ocn = 0; - comp_obj_para.node.obj_cite_number = ""; - comp_obj_para.misc.obj_cite_number_off = ""; - comp_obj_para.misc.obj_cite_number_type = 0; + comp_obj_para.node.object_number = ""; + comp_obj_para.misc.object_number_off = ""; + comp_obj_para.misc.object_number_type = 0; comp_obj_para.attrib.indent_hang = indent["hang_position"]; comp_obj_para.attrib.indent_base = indent["base_position"]; comp_obj_para.has.inline_links = true; @@ -938,7 +938,7 @@ if there is a blurb section you need to: #+BEGIN_SRC d } else if (obj_type_status["poem"] == TriState.on) { /+ within block object: poem +/ - _poem_block_(line, an_object, obj_type_status, cntr, obj_cite_number_poem, conf_make_meta); + _poem_block_(line, an_object, obj_type_status, cntr, object_number_poem, conf_make_meta); continue; #+END_SRC @@ -973,9 +973,9 @@ if (line.matchFirst(rgx.block_poem_open)) { /+ poem to verse exceptions! +/ object_reset(an_object); processing.remove("verse"); - obj_cite_number_poem["start"] = obj_cite_digits.on.to!string; + object_number_poem["start"] = obj_cite_digits.on.to!string; } -_start_block_(line, obj_type_status, obj_cite_number_poem); +_start_block_(line, obj_type_status, object_number_poem); continue; #+END_SRC @@ -1135,7 +1135,7 @@ _block_flag_line_empty_( comp_obj_heading, cntr, obj_type_status, - obj_cite_number_poem, + object_number_poem, conf_make_meta, ); #+END_SRC @@ -1288,10 +1288,10 @@ if ((obj_type_status["heading"] == State.on) comp_obj_para.typeinfo.is_a = "para"; comp_obj_para.text = an_object["substantive"].to!string.strip; comp_obj_para.node.ocn = obj_cite_digits.digit; - comp_obj_para.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_para.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_para.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_para.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_para.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_para.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_para.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_para.misc.object_number_type = obj_cite_digits.type; comp_obj_para.attrib.indent_hang = indent["hang_position"]; comp_obj_para.attrib.indent_base = indent["base_position"]; comp_obj_para.attrib.bullet = bullet; @@ -1413,9 +1413,9 @@ if (an_object["glossary_nugget"].length == 0) { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "(skip) there is no Glossary section"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; comp_obj_heading_.node.heading_lev_collapsed = 1; @@ -1452,9 +1452,9 @@ if (biblio_ordered.length > 0) { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Bibliography"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "_part_bibliography"; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; @@ -1469,9 +1469,9 @@ if (biblio_ordered.length > 0) { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Bibliography"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "bibliography"; comp_obj_heading_.node.marked_up_level = "1"; comp_obj_heading_.node.heading_lev_markup = 4; @@ -1488,9 +1488,9 @@ if (biblio_ordered.length > 0) { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "(skip) there is no Bibliography"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; comp_obj_heading_.node.heading_lev_collapsed = 1; @@ -1527,9 +1527,9 @@ foreach (entry; biblio_ordered) { comp_obj_para.typeinfo.is_a = "bibliography"; comp_obj_para.text = out_.to!string.strip; comp_obj_para.node.ocn = 0; - comp_obj_para.node.obj_cite_number = ""; - comp_obj_para.misc.obj_cite_number_off = ""; - comp_obj_para.misc.obj_cite_number_type = 0; + comp_obj_para.node.object_number = ""; + comp_obj_para.misc.object_number_off = ""; + comp_obj_para.misc.object_number_type = 0; comp_obj_para.attrib.indent_hang = 0; comp_obj_para.attrib.indent_base = 1; comp_obj_para.attrib.bullet = bullet; @@ -1613,9 +1613,9 @@ if (an_object["blurb_nugget"].length == 0) { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "(skip) there is no Blurb section"; comp_obj_heading_.node.ocn = 0; - comp_obj_para.node.obj_cite_number = ""; - comp_obj_para.misc.obj_cite_number_off = ""; - comp_obj_para.misc.obj_cite_number_type = 0; + comp_obj_para.node.object_number = ""; + comp_obj_para.misc.object_number_off = ""; + comp_obj_para.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = ""; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; @@ -1645,9 +1645,9 @@ comp_obj_toc.typeinfo.of_section = "toc"; comp_obj_toc.typeinfo.is_of = "para"; comp_obj_toc.typeinfo.is_a = "toc"; comp_obj_toc.node.ocn = 0; -comp_obj_toc.node.obj_cite_number = ""; -comp_obj_toc.misc.obj_cite_number_off = ""; -comp_obj_toc.misc.obj_cite_number_type = 0; +comp_obj_toc.node.object_number = ""; +comp_obj_toc.misc.object_number_off = ""; +comp_obj_toc.misc.object_number_type = 0; comp_obj_toc.attrib.indent_hang = indent["hang_position"]; comp_obj_toc.attrib.indent_base = indent["base_position"]; comp_obj_toc.attrib.bullet = false; @@ -2002,8 +2002,8 @@ foreach (ref obj; the_document_head_section) { "Title OCN should be 1 not: " ~ obj.node.ocn.to!string); // bug introduced 0.18.1 +/ obj.node.ocn = 1; - obj.node.obj_cite_number = "1"; - obj.misc.obj_cite_number_type = OCNtype.ocn; + obj.node.object_number = "1"; + obj.misc.object_number_type = OCNtype.ocn; } /+ dom structure (marked up & collapsed) +/ if ((opt_action.html) @@ -2145,7 +2145,7 @@ if (the_endnotes_section.length > 1) { } obj_cite_digits = ocn_emit(OCNstatus.on); obj.node.ocn = obj_cite_digits.digit; - obj.node.obj_cite_number = obj_cite_digits.on.to!string; + obj.node.object_number = obj_cite_digits.on.to!string; if (obj.node.heading_lev_markup <= 4) { segnames_0_4 ~= obj.tags.segment_anchor_tag; if (obj.node.heading_lev_markup == 4) { @@ -2189,7 +2189,7 @@ if (the_glossary_section.length > 1) { } obj_cite_digits = ocn_emit(OCNstatus.on); obj.node.ocn = obj_cite_digits.digit; - obj.node.obj_cite_number = obj_cite_digits.on.to!string; + obj.node.object_number = obj_cite_digits.on.to!string; if (obj.node.heading_lev_markup <= 4) { segnames_0_4 ~= obj.tags.segment_anchor_tag; if (obj.node.heading_lev_markup == 4) { @@ -2216,7 +2216,7 @@ if (the_glossary_section.length > 1) { } else if (obj.typeinfo.is_a == "glossary") { obj_cite_digits = ocn_emit(OCNstatus.on); obj.node.ocn = obj_cite_digits.digit; - obj.node.obj_cite_number = obj_cite_digits.on.to!string; + obj.node.object_number = obj_cite_digits.on.to!string; } } } @@ -2237,7 +2237,7 @@ if (the_bibliography_section.length > 1) { } obj_cite_digits = ocn_emit(OCNstatus.on); obj.node.ocn = obj_cite_digits.digit; - obj.node.obj_cite_number = obj_cite_digits.on.to!string; // check + obj.node.object_number = obj_cite_digits.on.to!string; // check if (obj.node.heading_lev_markup <= 4) { segnames_0_4 ~= obj.tags.segment_anchor_tag; if (obj.node.heading_lev_markup == 4) { @@ -2264,7 +2264,7 @@ if (the_bibliography_section.length > 1) { } else if (obj.typeinfo.is_a == "bibliography") { obj_cite_digits = ocn_emit(OCNstatus.on); obj.node.ocn = obj_cite_digits.on; - obj.node.obj_cite_number = obj_cite_digits.on.to!string; + obj.node.object_number = obj_cite_digits.on.to!string; } } } @@ -2290,7 +2290,7 @@ if (the_bookindex_section["scroll"].length > 1) { } obj_cite_digits = ocn_emit(OCNstatus.on); obj.node.ocn = obj_cite_digits.on; - obj.node.obj_cite_number = obj_cite_digits.on.to!string; + obj.node.object_number = obj_cite_digits.on.to!string; if (obj.node.heading_lev_markup <= 4) { segnames_0_4 ~= obj.tags.segment_anchor_tag; if (obj.node.heading_lev_markup == 4) { @@ -2317,8 +2317,8 @@ if (the_bookindex_section["scroll"].length > 1) { } else if (obj.typeinfo.is_a == "bookindex") { obj_cite_digits = ocn_emit(OCNstatus.bkidx); obj.node.ocn = obj_cite_digits.digit; - obj.misc.obj_cite_number_bkidx = obj_cite_digits.bkidx.to!string; - obj.misc.obj_cite_number_type = OCNtype.bkidx; + obj.misc.object_number_bkidx = obj_cite_digits.bkidx.to!string; + obj.misc.object_number_type = OCNtype.bkidx; } } /+ seg +/ @@ -2330,7 +2330,7 @@ if (the_bookindex_section["scroll"].length > 1) { writeln(obj.text); } obj.node.ocn = ++ocn_; - obj.node.obj_cite_number = obj.node.ocn.to!string; + obj.node.object_number = obj.node.ocn.to!string; if (obj.node.heading_lev_markup <= 4) { segnames_0_4 ~= obj.tags.segment_anchor_tag; if (obj.node.heading_lev_markup == 4) { @@ -2356,8 +2356,8 @@ if (the_bookindex_section["scroll"].length > 1) { obj = obj_heading_ancestors(obj, lv_ancestors_txt); } else if (obj.typeinfo.is_a == "bookindex") { ocn_bidx_ = ++ocn_bkidx_; - obj.misc.obj_cite_number_bkidx = ocn_bidx_.to!string; // FIX need to distinguish from regular ocn - obj.misc.obj_cite_number_type = OCNtype.bkidx; + obj.misc.object_number_bkidx = ocn_bidx_.to!string; // FIX need to distinguish from regular ocn + obj.misc.object_number_type = OCNtype.bkidx; } } /+ TODO assert failure, reinstate @@ -2380,7 +2380,7 @@ if (the_blurb_section.length > 1) { } obj_cite_digits = ocn_emit(OCNstatus.on); obj.node.ocn = obj_cite_digits.on; - obj.node.obj_cite_number = obj_cite_digits.on.to!string; + obj.node.object_number = obj_cite_digits.on.to!string; if (obj.node.heading_lev_markup <= 4) { segnames_0_4 ~= obj.tags.segment_anchor_tag; if (obj.node.heading_lev_markup == 4) { @@ -2406,8 +2406,8 @@ if (the_blurb_section.length > 1) { obj = obj_heading_ancestors(obj, lv_ancestors_txt); } else if (obj.typeinfo.is_a == "blurb") { obj_cite_digits = ocn_emit(OCNstatus.off); - obj.misc.obj_cite_number_off = obj_cite_digits.off.to!string; - obj.misc.obj_cite_number_type = OCNtype.non; + obj.misc.object_number_off = obj_cite_digits.off.to!string; + obj.misc.object_number_type = OCNtype.non; } } } @@ -2429,9 +2429,9 @@ comp_obj_heading_.typeinfo.of_section = "empty"; comp_obj_heading_.typeinfo.is_of = "para"; comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.node.ocn = 0; -comp_obj_para.node.obj_cite_number = ""; -comp_obj_para.misc.obj_cite_number_off = ""; -comp_obj_para.misc.obj_cite_number_type = 0; +comp_obj_para.node.object_number = ""; +comp_obj_para.misc.object_number_off = ""; +comp_obj_para.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = ""; comp_obj_heading_.node.marked_up_level = ""; comp_obj_heading_.node.heading_lev_markup = 9; @@ -2606,7 +2606,7 @@ auto _common_reset_(L,O,T)( } #+END_SRC -*** check obj_cite_number status in document :ocn: +*** check object_number status in document :ocn: #+name: abs_functions_ocn_status #+BEGIN_SRC d @@ -2620,16 +2620,16 @@ static auto _check_ocn_status_(L,T)( } static auto rgx = Rgx(); if ((!line.empty) && (obj_type_status["ocn_status_off_for_multiple_objects"] == TriState.off)) { - /+ not multi-line object, check whether obj_cite_number is on or turned off +/ - if (line.matchFirst(rgx.obj_cite_number_block_marks)) { - /+ switch off obj_cite_number +/ - if (line.matchFirst(rgx.obj_cite_number_off_block)) { + /+ not multi-line object, check whether object_number is on or turned off +/ + if (line.matchFirst(rgx.object_number_block_marks)) { + /+ switch off object_number +/ + if (line.matchFirst(rgx.object_number_off_block)) { obj_type_status["ocn_status_off_for_multiple_objects"] = TriState.on; debug(ocnoff) { writeln(line); } } - if (line.matchFirst(rgx.obj_cite_number_off_block_dh)) { + if (line.matchFirst(rgx.object_number_off_block_dh)) { obj_type_status["ocn_status_off_for_multiple_objects"] = TriState.closing; debug(ocnoff) { writeln(line); @@ -2637,9 +2637,9 @@ static auto _check_ocn_status_(L,T)( } } else { if (obj_type_status["ocn_status_off_for_multiple_objects"] == TriState.off) { - if (line.matchFirst(rgx.obj_cite_number_off)) { + if (line.matchFirst(rgx.object_number_off)) { obj_type_status["ocn_status"] = OCNstatus.off; - } else if (line.matchFirst(rgx.obj_cite_number_off_dh)) { + } else if (line.matchFirst(rgx.object_number_off_dh)) { obj_type_status["ocn_status"] = OCNstatus.closing; } else { obj_type_status["ocn_status"] = OCNstatus.on; @@ -2650,7 +2650,7 @@ static auto _check_ocn_status_(L,T)( } } } else if ((!line.empty) && (obj_type_status["ocn_status_off_for_multiple_objects"] > TriState.off)) { - if (line.matchFirst(rgx.obj_cite_number_off_block_close)) { + if (line.matchFirst(rgx.object_number_off_block_close)) { obj_type_status["ocn_status_off_for_multiple_objects"] = TriState.off; obj_type_status["ocn_status"] = OCNstatus.on; debug(ocnoff) { @@ -2730,12 +2730,12 @@ auto _doc_header_and_make_substitutions_fontface_(L,CMM)( void _start_block_(L,T,N)( L line, return ref T obj_type_status, - return ref N obj_cite_number_poem + return ref N object_number_poem ) { debug(asserts) { static assert(is(typeof(line) == char[])); static assert(is(typeof(obj_type_status) == int[string])); - static assert(is(typeof(obj_cite_number_poem) == string[string])); + static assert(is(typeof(object_number_poem) == string[string])); } #+END_SRC @@ -2767,7 +2767,7 @@ void _start_block_(L,T,N)( line ); } - obj_cite_number_poem["start"] = obj_cite_digits.on.to!string; + object_number_poem["start"] = obj_cite_digits.on.to!string; obj_type_status["blocks"] = TriState.on; obj_type_status["verse_new"] = State.on; obj_type_status["poem"] = TriState.on; @@ -2852,7 +2852,7 @@ void _start_block_(L,T,N)( line ); } - obj_cite_number_poem["start"] = obj_cite_digits.on.to!string; + object_number_poem["start"] = obj_cite_digits.on.to!string; obj_type_status["blocks"] = TriState.on; obj_type_status["verse_new"] = State.on; obj_type_status["poem"] = TriState.on; @@ -3349,7 +3349,7 @@ void _poem_block_(L,O,T,C,N,CMM)( return ref O an_object, return ref T obj_type_status, return ref C cntr, - N obj_cite_number_poem, + N object_number_poem, CMM conf_make_meta, ) { debug(asserts) { @@ -3357,7 +3357,7 @@ void _poem_block_(L,O,T,C,N,CMM)( static assert(is(typeof(an_object) == string[string])); static assert(is(typeof(obj_type_status) == int[string])); static assert(is(typeof(cntr) == int)); - static assert(is(typeof(obj_cite_number_poem) == string[string])); + static assert(is(typeof(object_number_poem) == string[string])); } static auto rgx = Rgx(); if (obj_type_status["curly_poem"] == TriState.on) { @@ -3400,10 +3400,10 @@ void _poem_block_(L,O,T,C,N,CMM)( comp_obj_block.typeinfo.is_of = "block"; comp_obj_block.typeinfo.is_a = "verse"; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digits.type; comp_obj_block.text = an_object["substantive"]; comp_obj_block.has.inline_notes_reg = substantive_obj_misc_tuple[sObj.notes_reg]; comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star]; @@ -3414,7 +3414,7 @@ void _poem_block_(L,O,T,C,N,CMM)( processing.remove("verse"); ++cntr; } - obj_cite_number_poem["end"] = obj_cite_digits.on.to!string; + object_number_poem["end"] = obj_cite_digits.on.to!string; obj_type_status["blocks"] = TriState.closing; obj_type_status["poem"] = TriState.closing; obj_type_status["curly_poem"] = TriState.off; @@ -3458,10 +3458,10 @@ void _poem_block_(L,O,T,C,N,CMM)( comp_obj_block.typeinfo.is_of = "block"; comp_obj_block.typeinfo.is_a = "verse"; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digits.type; comp_obj_block.text = an_object["substantive"]; comp_obj_block.has.inline_notes_reg = substantive_obj_misc_tuple[sObj.notes_reg]; comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star]; @@ -3501,16 +3501,16 @@ void _poem_block_(L,O,T,C,N,CMM)( comp_obj_block.typeinfo.is_of = "block"; comp_obj_block.typeinfo.is_a = "verse"; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digits.type; comp_obj_block.text = an_object["substantive"]; comp_obj_block.has.inline_notes_reg = substantive_obj_misc_tuple[sObj.notes_reg]; comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star]; comp_obj_block.has.inline_links = substantive_obj_misc_tuple[sObj.links]; the_document_body_section ~= comp_obj_block; - obj_cite_number_poem["end"] = obj_cite_digits.on.to!string; + object_number_poem["end"] = obj_cite_digits.on.to!string; object_reset(an_object); processing.remove("verse"); ++cntr; @@ -3559,10 +3559,10 @@ void _poem_block_(L,O,T,C,N,CMM)( comp_obj_block.typeinfo.is_of = "block"; comp_obj_block.typeinfo.is_a = "verse"; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digits.type; comp_obj_block.text = an_object["substantive"]; comp_obj_block.has.inline_notes_reg = substantive_obj_misc_tuple[sObj.notes_reg]; comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star]; @@ -3698,10 +3698,10 @@ void _table_closed_make_special_notation_table_(N,CMM)( = obj_im.obj_inline_markup_and_anchor_tags_and_misc(an_object, "body_nugget", conf_make_meta); an_object["substantive"] = substantive_obj_misc_tuple[sObj.content]; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digits.type; comp_obj_block = table_instructions(comp_obj_block, an_object["table_head"]); comp_obj_block = table_substantive_munge_special(comp_obj_block, an_object["substantive"]); the_document_body_section ~= comp_obj_block; @@ -3727,7 +3727,7 @@ void _block_flag_line_empty_(B,N,CMM)( return ref ObjGenericComposite _comp_obj_heading, return ref int cntr, return ref int[string] obj_type_status, - string[string] obj_cite_number_poem, + string[string] object_number_poem, CMM conf_make_meta, ) { assert( @@ -3776,10 +3776,10 @@ void _block_flag_line_empty_(B,N,CMM)( comp_obj_block.typeinfo.is_of = "block"; comp_obj_block.typeinfo.is_a = "quote"; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digit_type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digit_type; comp_obj_block.text = an_object["substantive"]; comp_obj_block.has.inline_notes_reg = substantive_obj_misc_tuple[sObj.notes_reg]; comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star]; @@ -3826,10 +3826,10 @@ void _block_flag_line_empty_(B,N,CMM)( comp_obj_block.typeinfo.is_of = "block"; comp_obj_block.typeinfo.is_a = "group"; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digits.type; comp_obj_block.text = an_object["substantive"]; comp_obj_block.has.inline_notes_reg = substantive_obj_misc_tuple[sObj.notes_reg]; comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star]; @@ -3875,10 +3875,10 @@ void _block_flag_line_empty_(B,N,CMM)( comp_obj_block.typeinfo.is_of = "block"; comp_obj_block.typeinfo.is_a = "block"; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digit_type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digit_type; comp_obj_block.text = an_object["substantive"]; comp_obj_block.has.inline_notes_reg = substantive_obj_misc_tuple[sObj.notes_reg]; comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star]; @@ -3920,10 +3920,10 @@ void _block_flag_line_empty_(B,N,CMM)( comp_obj_poem_ocn.typeinfo.is_of = "block"; comp_obj_poem_ocn.typeinfo.is_a = "poem"; comp_obj_poem_ocn.node.ocn = obj_cite_digits.on; - comp_obj_poem_ocn.node.obj_cite_number = (obj_cite_number_poem["start"] ~ "..." ~ obj_cite_number_poem["end"]); - comp_obj_poem_ocn.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; // - comp_obj_poem_ocn.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; // - comp_obj_poem_ocn.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_poem_ocn.node.object_number = (object_number_poem["start"] ~ "..." ~ object_number_poem["end"]); + comp_obj_poem_ocn.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; // + comp_obj_poem_ocn.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; // + comp_obj_poem_ocn.misc.object_number_type = obj_cite_digits.type; comp_obj_poem_ocn.text = ""; the_document_body_section ~= comp_obj_poem_ocn; obj_type_status["blocks"] = TriState.off; @@ -3966,10 +3966,10 @@ void _block_flag_line_empty_(B,N,CMM)( comp_obj_code.typeinfo.is_of = "block"; comp_obj_code.typeinfo.is_a = "code"; comp_obj_code.node.ocn = obj_cite_digits.on; - comp_obj_code.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_code.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digits.type; comp_obj_code.text = an_object["substantive"]; comp_obj_code.has.inline_notes_reg = substantive_obj_misc_tuple[sObj.notes_reg]; comp_obj_code.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star]; @@ -4012,10 +4012,10 @@ void _block_flag_line_empty_(B,N,CMM)( an_object["substantive"] = substantive_obj_misc_tuple[sObj.content]; comp_obj_block = comp_obj_block.init; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digits.type; comp_obj_block = table_instructions(comp_obj_block, an_object["table_head"]); comp_obj_block = table_substantive_munge(comp_obj_block, an_object["substantive"]); the_document_body_section ~= comp_obj_block; @@ -5075,7 +5075,7 @@ static struct ObjInlineMarkupMunge { body { obj_txt["munge"]=(obj_txt_in) .replaceFirst(rgx.heading, "") - .replaceFirst(rgx.obj_cite_number_off_all, "") + .replaceFirst(rgx.object_number_off_all, "") .strip; auto t = object_notes_and_links_(obj_txt["munge"], reset_note_numbers); debug(munge) { @@ -5109,7 +5109,7 @@ static struct ObjInlineMarkupMunge { body { obj_txt["munge"]=(obj_txt_in) .replaceFirst(rgx.para_attribs, "") - .replaceFirst(rgx.obj_cite_number_off_all, ""); + .replaceFirst(rgx.object_number_off_all, ""); auto t = object_notes_and_links_(obj_txt["munge"]); debug(munge) { writeln(__LINE__); @@ -5446,9 +5446,9 @@ static struct ObjInlineMarkup { comp_obj_toc.typeinfo.is_of = "para"; comp_obj_toc.typeinfo.is_a = "toc"; comp_obj_toc.node.ocn = 0; - comp_obj_toc.node.obj_cite_number = ""; - comp_obj_toc.misc.obj_cite_number_off = ""; - comp_obj_toc.misc.obj_cite_number_type = 0; + comp_obj_toc.node.object_number = ""; + comp_obj_toc.misc.object_number_off = ""; + comp_obj_toc.misc.object_number_type = 0; comp_obj_toc.attrib.indent_hang = indent["hang_position"]; comp_obj_toc.attrib.indent_base = indent["base_position"]; comp_obj_toc.attrib.bullet = false; @@ -5466,9 +5466,9 @@ static struct ObjInlineMarkup { comp_obj_toc.typeinfo.is_of = "para"; comp_obj_toc.typeinfo.is_a = "toc"; comp_obj_toc.node.ocn = 0; - comp_obj_toc.node.obj_cite_number = ""; - comp_obj_toc.misc.obj_cite_number_off = ""; - comp_obj_toc.misc.obj_cite_number_type = 0; + comp_obj_toc.node.object_number = ""; + comp_obj_toc.misc.object_number_off = ""; + comp_obj_toc.misc.object_number_type = 0; comp_obj_toc.attrib.indent_hang = indent["hang_position"]; comp_obj_toc.attrib.indent_base = indent["base_position"]; comp_obj_toc.attrib.bullet = false; @@ -5482,9 +5482,9 @@ static struct ObjInlineMarkup { comp_obj_toc.typeinfo.is_of = "para"; comp_obj_toc.typeinfo.is_a = "toc"; comp_obj_toc.node.ocn = 0; - comp_obj_toc.node.obj_cite_number = ""; - comp_obj_toc.misc.obj_cite_number_off = ""; - comp_obj_toc.misc.obj_cite_number_type = 0; + comp_obj_toc.node.object_number = ""; + comp_obj_toc.misc.object_number_off = ""; + comp_obj_toc.misc.object_number_type = 0; comp_obj_toc.attrib.bullet = false; comp_obj_toc.has.inline_links = true; switch (obj_["lev_markup_number"].to!int) { @@ -5855,7 +5855,7 @@ struct ObjAttributes { writeln(_obj_attrib["json"]); writeln( "is: ", oa_j["is"].str(), - "; obj_cite_number: ", oa_j["obj_cite_number"].integer() + "; object_number: ", oa_j["object_number"].integer() ); } } @@ -6108,7 +6108,7 @@ struct ObjAttributes { (oa_j.type == JSON_TYPE.OBJECT) ); if (obj_is_ == "heading") { - oa_j.object["obj_cite_number"] = _comp_obj_heading.node.ocn; + oa_j.object["object_number"] = _comp_obj_heading.node.ocn; oa_j.object["lev_markup_number"] = _comp_obj_heading.node.heading_lev_markup; oa_j.object["lev_collapsed_number"] = _comp_obj_heading.node.heading_lev_collapsed; oa_j.object["heading_ptr"] @@ -6116,7 +6116,7 @@ struct ObjAttributes { oa_j.object["doc_object_ptr"] = _comp_obj_heading.ptr.doc_object; } - oa_j.object["parent_obj_cite_number"] = _comp_obj_heading.node.parent_ocn; + oa_j.object["parent_object_number"] = _comp_obj_heading.node.parent_ocn; oa_j.object["parent_lev_markup_number"] = _comp_obj_heading.node.parent_lev_markup; _obj_attrib = oa_j.toString(); return _obj_attrib; @@ -6137,8 +6137,8 @@ struct ObjAttributes { #+BEGIN_SRC d struct BookIndexNuggetHash { string main_term, sub_term, sub_term_bits; - int obj_cite_number_offset, obj_cite_number_endpoint; - string[] obj_cite_numbers; + int object_number_offset, object_number_endpoint; + string[] object_numbers; string[][string][string] bi; string[][string][string] hash_nugget; string[] bi_main_terms_split_arr; @@ -6170,41 +6170,41 @@ struct BookIndexNuggetHash { auto bi_main_term_and_rest = bi_main_terms_content.split(rgx.bi_main_term_plus_rest_split); if (auto m = bi_main_term_and_rest[0].match( - rgx.bi_term_and_obj_cite_numbers_match) + rgx.bi_term_and_object_numbers_match) ) { main_term = m.captures[1].strip; - obj_cite_number_offset = m.captures[2].to!int; - obj_cite_number_endpoint=(obj_cite_digits.on + obj_cite_number_offset); - obj_cite_numbers ~= (obj_cite_digits.on.to!string ~ "-" ~ to!string(obj_cite_number_endpoint) + object_number_offset = m.captures[2].to!int; + object_number_endpoint=(obj_cite_digits.on + object_number_offset); + object_numbers ~= (obj_cite_digits.on.to!string ~ "-" ~ to!string(object_number_endpoint) ~ ":" ~ segment_anchor_tag); } else { main_term = bi_main_term_and_rest[0].strip; - obj_cite_numbers ~= obj_cite_digits.on.to!string + object_numbers ~= obj_cite_digits.on.to!string ~ ":" ~ segment_anchor_tag; } - bi[main_term]["_a"] ~= obj_cite_numbers; - obj_cite_numbers=null; + bi[main_term]["_a"] ~= object_numbers; + object_numbers=null; if (bi_main_term_and_rest.length > 1) { auto bi_sub_terms_split_arr = bi_main_term_and_rest[1].split( - rgx.bi_sub_terms_plus_obj_cite_number_offset_split + rgx.bi_sub_terms_plus_object_number_offset_split ); foreach (sub_terms_bits; bi_sub_terms_split_arr) { - if (auto m = sub_terms_bits.match(rgx.bi_term_and_obj_cite_numbers_match)) { + if (auto m = sub_terms_bits.match(rgx.bi_term_and_object_numbers_match)) { sub_term = m.captures[1].strip; - obj_cite_number_offset = m.captures[2].to!int; - obj_cite_number_endpoint=(obj_cite_digits.on + obj_cite_number_offset); - obj_cite_numbers ~= (obj_cite_digits.on.to!string ~ " - " ~ to!string(obj_cite_number_endpoint) + object_number_offset = m.captures[2].to!int; + object_number_endpoint=(obj_cite_digits.on + object_number_offset); + object_numbers ~= (obj_cite_digits.on.to!string ~ " - " ~ to!string(object_number_endpoint) ~ ":" ~ segment_anchor_tag); } else { sub_term = sub_terms_bits.strip; - obj_cite_numbers ~= to!string(obj_cite_digits.on) + object_numbers ~= to!string(obj_cite_digits.on) ~ ":" ~ segment_anchor_tag; } if (!empty(sub_term)) { - bi[main_term][sub_term] ~= obj_cite_numbers; + bi[main_term][sub_term] ~= object_numbers; } - obj_cite_numbers=null; + object_numbers=null; } } } @@ -6337,9 +6337,9 @@ struct BookIndexReportSection { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Book Index"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "_part_book_index"; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; @@ -6357,9 +6357,9 @@ struct BookIndexReportSection { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Index"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "bookindex"; comp_obj_heading_.node.marked_up_level = "1"; comp_obj_heading_.node.heading_lev_markup = 4; @@ -6435,9 +6435,9 @@ struct BookIndexReportSection { comp_obj_para.typeinfo.is_a = "bookindex"; comp_obj_para.text = bi_tmp_scroll.to!string.strip; comp_obj_para.node.ocn = 0; - comp_obj_para.node.obj_cite_number = ""; - comp_obj_para.misc.obj_cite_number_off = ""; - comp_obj_para.misc.obj_cite_number_type = 0; + comp_obj_para.node.object_number = ""; + comp_obj_para.misc.object_number_off = ""; + comp_obj_para.misc.object_number_type = 0; comp_obj_para.tags.anchor_tags = bi_tmp_tags; comp_obj_para.attrib.indent_hang = 0; comp_obj_para.attrib.indent_base = 1; @@ -6452,9 +6452,9 @@ struct BookIndexReportSection { comp_obj_heading_ = comp_obj_heading_.init; comp_obj_heading_.text = "(skip) there is no Book Index"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; comp_obj_heading_.node.heading_lev_collapsed = 1; @@ -6596,9 +6596,9 @@ struct NotesSection { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Endnotes"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "_part_endnotes"; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; @@ -6614,9 +6614,9 @@ struct NotesSection { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Endnotes"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "endnotes"; comp_obj_heading_.node.marked_up_level = "1"; comp_obj_heading_.node.heading_lev_markup = 4; @@ -6634,9 +6634,9 @@ struct NotesSection { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "(skip) there are no Endnotes"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; comp_obj_heading_.node.heading_lev_collapsed = 1; @@ -6652,9 +6652,9 @@ struct NotesSection { comp_obj_endnote_.typeinfo.is_of = "para"; comp_obj_endnote_.typeinfo.is_a = "endnote"; comp_obj_endnote_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_endnote_.attrib.indent_hang = 0; comp_obj_endnote_.attrib.indent_base = 0; comp_obj_endnote_.attrib.bullet = false; @@ -6857,23 +6857,23 @@ struct NodeStructureMetadata { assert(obj_cite_digits.on.to!int >= 0); // should not be necessary if (lv7 > State.off) { p_["lev_markup_number"] = DocStructMarkupHeading.h_text_4; - p_["obj_cite_number"] = lv7; + p_["object_number"] = lv7; } else if (lv6 > State.off) { p_["lev_markup_number"] = DocStructMarkupHeading.h_text_3; - p_["obj_cite_number"] = lv6; + p_["object_number"] = lv6; } else if (lv5 > State.off) { p_["lev_markup_number"] = DocStructMarkupHeading.h_text_2; - p_["obj_cite_number"] = lv5; + p_["object_number"] = lv5; } else { p_["lev_markup_number"] = DocStructMarkupHeading.h_text_1; - p_["obj_cite_number"] = lv4; + p_["object_number"] = lv4; } ObjGenericComposite comp_obj_location; comp_obj_location = comp_obj_location.init; comp_obj_location.typeinfo.is_a = is_; comp_obj_location.node.ocn = obj_cite_digits.on; comp_obj_location.tags.segment_anchor_tag = segment_anchor_tag.to!string; - comp_obj_location.node.parent_ocn = p_["obj_cite_number"]; + comp_obj_location.node.parent_ocn = p_["object_number"]; comp_obj_location.node.parent_lev_markup = p_["lev_markup_number"]; debug(node) { if (lev_markup_number.match(rgx.levels_numbered_headings)) { @@ -6951,7 +6951,7 @@ struct NodeStructureMetadata { lv0 = obj_cite_digit; lv1=0; lv2=0; lv3=0; lv4=0; lv5=0; lv6=0; lv7=0; p_["lev_markup_number"] = 0; - p_["obj_cite_number"] = 0; + p_["object_number"] = 0; break; case 1: lv = DocStructMarkupHeading.h_sect_B; @@ -6959,7 +6959,7 @@ struct NodeStructureMetadata { lv2=0; lv3=0; lv4=0; lv5=0; lv6=0; lv7=0; p_["lev_markup_number"] = DocStructMarkupHeading.h_sect_A; - p_["obj_cite_number"] = lv0; + p_["object_number"] = lv0; break; case 2: lv = DocStructMarkupHeading.h_sect_C; @@ -6967,7 +6967,7 @@ struct NodeStructureMetadata { lv3=0; lv4=0; lv5=0; lv6=0; lv7=0; p_["lev_markup_number"] = DocStructMarkupHeading.h_sect_B; - p_["obj_cite_number"] = lv1; + p_["object_number"] = lv1; break; case 3: lv = DocStructMarkupHeading.h_sect_D; @@ -6975,7 +6975,7 @@ struct NodeStructureMetadata { lv4=0; lv5=0; lv6=0; lv7=0; p_["lev_markup_number"] = DocStructMarkupHeading.h_sect_C; - p_["obj_cite_number"] = lv2; + p_["object_number"] = lv2; break; case 4: lv = DocStructMarkupHeading.h_text_1; @@ -6984,19 +6984,19 @@ struct NodeStructureMetadata { if (lv3 > State.off) { p_["lev_markup_number"] = DocStructMarkupHeading.h_sect_D; - p_["obj_cite_number"] = lv3; + p_["object_number"] = lv3; } else if (lv2 > State.off) { p_["lev_markup_number"] = DocStructMarkupHeading.h_sect_C; - p_["obj_cite_number"] = lv2; + p_["object_number"] = lv2; } else if (lv1 > State.off) { p_["lev_markup_number"] = DocStructMarkupHeading.h_sect_B; - p_["obj_cite_number"] = lv1; + p_["object_number"] = lv1; } else { p_["lev_markup_number"] = DocStructMarkupHeading.h_sect_A; - p_["obj_cite_number"] = lv0; + p_["object_number"] = lv0; } break; case 5: @@ -7005,7 +7005,7 @@ struct NodeStructureMetadata { lv6=0; lv7=0; p_["lev_markup_number"] = DocStructMarkupHeading.h_text_1; - p_["obj_cite_number"] = lv4; + p_["object_number"] = lv4; break; case 6: lv = DocStructMarkupHeading.h_text_3; @@ -7013,14 +7013,14 @@ struct NodeStructureMetadata { lv7=0; p_["lev_markup_number"] = DocStructMarkupHeading.h_text_2; - p_["obj_cite_number"] = lv5; + p_["object_number"] = lv5; break; case 7: lv = DocStructMarkupHeading.h_text_4; lv7 = obj_cite_digit; p_["lev_markup_number"] = DocStructMarkupHeading.h_text_3; - p_["obj_cite_number"] = lv6; + p_["object_number"] = lv6; break; default: break; @@ -7033,14 +7033,14 @@ struct NodeStructureMetadata { _comp_obj_heading_.typeinfo.is_a = "heading"; _comp_obj_heading_.text = _text.to!string.strip; _comp_obj_heading_.node.ocn = obj_cite_digits.on; - _comp_obj_heading_.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - _comp_obj_heading_.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - _comp_obj_heading_.misc.obj_cite_number_type = obj_cite_digits.type; + _comp_obj_heading_.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + _comp_obj_heading_.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + _comp_obj_heading_.misc.object_number_type = obj_cite_digits.type; _comp_obj_heading_.tags.segment_anchor_tag = segment_anchor_tag.to!string; _comp_obj_heading_.node.marked_up_level = lev; _comp_obj_heading_.node.heading_lev_markup = (!(lev_markup_number.empty) ? lev_markup_number.to!int : 0); _comp_obj_heading_.node.heading_lev_collapsed = (!(lev_collapsed_number.empty) ? lev_collapsed_number.to!int : 0); - _comp_obj_heading_.node.parent_ocn = p_["obj_cite_number"]; + _comp_obj_heading_.node.parent_ocn = p_["object_number"]; _comp_obj_heading_.node.parent_lev_markup = p_["lev_markup_number"]; _comp_obj_heading_.tags.heading_ancestors_text = lv_ancestors_txt; _comp_obj_heading_.ptr.doc_object = cntr_; @@ -7385,8 +7385,8 @@ struct DocObj_Has_ { } struct DocObj_Node_ { string[string][string] node; - int ocn = 0; // duplicated as string with obj_cite_number - string obj_cite_number = ""; // duplicated as int with ocn may apply additional info for backmatter (glossary, biblio etc.) + int ocn = 0; // duplicated as string with object_number + string object_number = ""; // duplicated as int with ocn may apply additional info for backmatter (glossary, biblio etc.) string marked_up_level = "9"; int heading_lev_markup = 9; int heading_lev_collapsed = 9; @@ -7421,9 +7421,9 @@ struct DocObj_Tags_ { string[] anchor_tags = []; } struct DocObj_Misc_ { - string obj_cite_number_bkidx = ""; - string obj_cite_number_off = ""; - int obj_cite_number_type = 0; // { ocn, non, bkidx } + string object_number_bkidx = ""; + string object_number_off = ""; + int object_number_type = 0; // { ocn, non, bkidx } } struct ObjGenericComposite { string text = ""; diff --git a/org/meta_debugs.org b/org/meta_debugs.org index 5af5cc4..38b3b4e 100644 --- a/org/meta_debugs.org +++ b/org/meta_debugs.org @@ -93,7 +93,7 @@ debug(parent) { if (obj.typeinfo.is_a == "heading") { writefln( "%s node: %s heading: %s %s", - obj.obj_cite_number, + obj.object_number, obj.node, obj.heading_lev_markup, obj.text, @@ -120,7 +120,7 @@ debug(dumpdoc) { if (obj.typeinfo.of_part != "empty") { writefln( "[%s][%s]\n%s", - obj.obj_cite_number, + obj.object_number, obj.typeinfo.is_a, obj.text ); @@ -212,7 +212,7 @@ debug(checkdoc) { foreach (obj; contents[key]) { writefln( "[%s][%s]\n%s", - obj.obj_cite_number, + obj.object_number, obj.typeinfo.is_a, obj.text ); @@ -233,7 +233,7 @@ debug(section_head) { foreach (obj; contents[key]) { writefln( "[%s][%s]\n%s", - obj.obj_cite_number, + obj.object_number, obj.typeinfo.is_a, obj.text ); @@ -291,7 +291,7 @@ debug(section_body) { foreach (obj; contents[key]) { writefln( "[%s][%s]\n%s", - obj.obj_cite_number, + obj.object_number, obj.typeinfo.is_a, obj.text ); @@ -393,7 +393,7 @@ debug(section_glossary) { foreach (obj; contents[key]) { writefln( "[%s][%s]\n%s", - obj.obj_cite_number, + obj.object_number, obj.typeinfo.is_a, obj.text ); @@ -412,7 +412,7 @@ debug(section_bibliography) { foreach (obj; contents[key]) { writefln( "[%s][%s]\n%s", - obj.obj_cite_number, + obj.object_number, obj.typeinfo.is_a, obj.text ); @@ -462,7 +462,7 @@ debug(blurb_section) { foreach (obj; contents[key]) { writefln( "[%s][%s]\n%s", - obj.obj_cite_number, + obj.object_number, obj.typeinfo.is_a, obj.text ); @@ -485,7 +485,7 @@ debug(objects) { if (obj.typeinfo.of_part != "empty") { writefln( "* [%s][%s] %s", - obj.obj_cite_number, + obj.object_number, obj.typeinfo.is_a, obj.text ); @@ -670,7 +670,7 @@ debug(anchor) { writefln( "%s~ [%s] %s %s", obj.marked_up_level, - obj.obj_cite_number, + obj.object_number, obj.anchor_tags, // "[", obj["is"], "] ", obj.text @@ -718,7 +718,7 @@ debug(headings) { writefln( "%s~ [%s] %s", obj.marked_up_level, - obj.obj_cite_number, + obj.object_number, // "[", obj["is"], "] ", obj.text ); @@ -732,12 +732,12 @@ debug(headings) { #+BEGIN_SRC d debug(summary) { string[string] check = [ - "last_obj_cite_number" : "NA [debug \"checkdoc\" not run]", + "last_object_number" : "NA [debug \"checkdoc\" not run]", ]; } #+END_SRC -*** compare number of obj_cite_number for known sisu markup output (checkdoc) +*** compare number of object_number for known sisu markup output (checkdoc) #+name: meta_output_debugs_summary #+BEGIN_SRC d @@ -747,117 +747,117 @@ debug(checkdoc) { switch (mfn.captures[2]) { // live manual: case "live-manual.ssm": - assert(check["last_obj_cite_number"] == - "1019","last obj_cite_number should be: 1019 (check test, document is frequently updated)"); // ok + assert(check["last_object_number"] == + "1019","last object_number should be: 1019 (check test, document is frequently updated)"); // ok break; // sisu_markup: case "sisu_markup.sst": - assert(check["last_obj_cite_number"] == - "297","last obj_cite_number expected to be: 297 rather than " ~ check["last_obj_cite_number"]); // ok - // assert(check["last_obj_cite_number"] == "297","last obj_cite_number expected to be: 297 rather than " ~ check["last_obj_cite_number"]); + assert(check["last_object_number"] == + "297","last object_number expected to be: 297 rather than " ~ check["last_object_number"]); // ok + // assert(check["last_object_number"] == "297","last object_number expected to be: 297 rather than " ~ check["last_object_number"]); // notes for first divergance study sisu headings 247 250 - // sisu has issue with code that contains heading 1~ which results in no obj_cite_number! ?? - // sisu currently has incorrect last body obj_cite_number of 294! + // sisu has issue with code that contains heading 1~ which results in no object_number! ?? + // sisu currently has incorrect last body object_number of 294! // bug in sisu? attend break; // sisu-markup-samples: case "accelerando.charles_stross.sst": - assert(check["last_obj_cite_number"] == - "2861","last obj_cite_number expected to be: 2861 rather than " ~ check["last_obj_cite_number"]); // ok + assert(check["last_object_number"] == + "2861","last object_number expected to be: 2861 rather than " ~ check["last_object_number"]); // ok break; case "alices_adventures_in_wonderland.lewis_carroll.sst": - assert(check["last_obj_cite_number"] == - "805","last obj_cite_number expected to be: 805 rather than " ~ check["last_obj_cite_number"]); // 808 + assert(check["last_object_number"] == + "805","last object_number expected to be: 805 rather than " ~ check["last_object_number"]); // 808 break; case "autonomy_markup0.sst": - assert(check["last_obj_cite_number"] == - "77","last obj_cite_number expected to be: 77 rather than " ~ check["last_obj_cite_number"]); // ok endnotes - // assert(check["last_obj_cite_number"] == "78","last obj_cite_number expected to be: 78 rather than " ~ check["last_obj_cite_number"]); + assert(check["last_object_number"] == + "77","last object_number expected to be: 77 rather than " ~ check["last_object_number"]); // ok endnotes + // assert(check["last_object_number"] == "78","last object_number expected to be: 78 rather than " ~ check["last_object_number"]); break; case "content.cory_doctorow.sst": - assert(check["last_obj_cite_number"] == - "953","last obj_cite_number expected to be: 953 rather than " ~ check["last_obj_cite_number"]); // 1007 way off, check obj_cite_number off switches - // assert(check["last_obj_cite_number"] == "953","last obj_cite_number expected to be: 953 rather than " ~ check["last_obj_cite_number"]); + assert(check["last_object_number"] == + "953","last object_number expected to be: 953 rather than " ~ check["last_object_number"]); // 1007 way off, check object_number off switches + // assert(check["last_object_number"] == "953","last object_number expected to be: 953 rather than " ~ check["last_object_number"]); break; case "democratizing_innovation.eric_von_hippel.sst": // fixed ERROR! range violation, broken check! endnotes, bookindex, biblio // error in bookindex ... (ch1; ch6; ch8 ) - assert(check["last_obj_cite_number"] == - "905","last obj_cite_number expected to be: 905 rather than " ~ check["last_obj_cite_number"]); // 911 + assert(check["last_object_number"] == + "905","last object_number expected to be: 905 rather than " ~ check["last_object_number"]); // 911 break; case "down_and_out_in_the_magic_kingdom.cory_doctorow.sst": - assert(check["last_obj_cite_number"] == - "1417","last obj_cite_number expected to be: 1417 rather than " ~ check["last_obj_cite_number"]); // 1455 check obj_cite_number off switches + assert(check["last_object_number"] == + "1417","last object_number expected to be: 1417 rather than " ~ check["last_object_number"]); // 1455 check object_number off switches break; case "for_the_win.cory_doctorow.sst": - assert(check["last_obj_cite_number"] == - "3510","last obj_cite_number expected to be: 3510 rather than " ~ check["last_obj_cite_number"]); // 3569 check obj_cite_number off switches + assert(check["last_object_number"] == + "3510","last object_number expected to be: 3510 rather than " ~ check["last_object_number"]); // 3569 check object_number off switches break; case "free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst": - assert(check["last_obj_cite_number"] == - "1082","last obj_cite_number expected to be: 1082 rather than " ~ check["last_obj_cite_number"]); // check 1079 too few + assert(check["last_object_number"] == + "1082","last object_number expected to be: 1082 rather than " ~ check["last_object_number"]); // check 1079 too few break; case "free_culture.lawrence_lessig.sst": - assert(check["last_obj_cite_number"] == - "1330","last obj_cite_number expected to be: 1330 rather than " ~ check["last_obj_cite_number"]); // 1312 + assert(check["last_object_number"] == + "1330","last object_number expected to be: 1330 rather than " ~ check["last_object_number"]); // 1312 // fixed ERROR! range violation, broken check! // error in bookindex ... sections piracy (ch1) & property (ch10 market concentration) fixed break; case "free_for_all.peter_wayner.sst": // endnotes, bookindex, biblio - assert(check["last_obj_cite_number"] == - "1559","last obj_cite_number expected to be: 1559 rather than " ~ check["last_obj_cite_number"]); // 1560, check obj_cite_number off switches, has endnotes so 2 too many - // assert(check["last_obj_cite_number"] == "1559","last obj_cite_number expected to be: 1559 rather than " ~ check["last_obj_cite_number"]); + assert(check["last_object_number"] == + "1559","last object_number expected to be: 1559 rather than " ~ check["last_object_number"]); // 1560, check object_number off switches, has endnotes so 2 too many + // assert(check["last_object_number"] == "1559","last object_number expected to be: 1559 rather than " ~ check["last_object_number"]); break; case "gpl2.fsf.sst": - assert(check["last_obj_cite_number"] == - "65","last obj_cite_number expected to be: 65 rather than " ~ check["last_obj_cite_number"]); // ok endnotes? check - // assert(check["last_obj_cite_number"] == "66","last obj_cite_number expected to be: 66 rather than " ~ check["last_obj_cite_number"]); + assert(check["last_object_number"] == + "65","last object_number expected to be: 65 rather than " ~ check["last_object_number"]); // ok endnotes? check + // assert(check["last_object_number"] == "66","last object_number expected to be: 66 rather than " ~ check["last_object_number"]); break; case "gpl3.fsf.sst": - assert(check["last_obj_cite_number"] == - "123","last obj_cite_number expected to be: 123 rather than " ~ check["last_obj_cite_number"]); // ok + assert(check["last_object_number"] == + "123","last object_number expected to be: 123 rather than " ~ check["last_object_number"]); // ok break; case "gullivers_travels.jonathan_swift.sst": - assert(check["last_obj_cite_number"] == - "668","last obj_cite_number expected to be: 668 rather than " ~ check["last_obj_cite_number"]); // 674 + assert(check["last_object_number"] == + "668","last object_number expected to be: 668 rather than " ~ check["last_object_number"]); // 674 break; case "little_brother.cory_doctorow.sst": - assert(check["last_obj_cite_number"] == - "3130","last obj_cite_number expected to be: 3130 rather than " ~ check["last_obj_cite_number"]); // 3204, check obj_cite_number off switches + assert(check["last_object_number"] == + "3130","last object_number expected to be: 3130 rather than " ~ check["last_object_number"]); // 3204, check object_number off switches break; case "the_cathedral_and_the_bazaar.eric_s_raymond.sst": - assert(check["last_obj_cite_number"] == - "258","last obj_cite_number expected to be: 258 rather than " ~ check["last_obj_cite_number"]); // ok + assert(check["last_object_number"] == + "258","last object_number expected to be: 258 rather than " ~ check["last_object_number"]); // ok break; case "the_public_domain.james_boyle.sst": - assert(check["last_obj_cite_number"] == - "970","last obj_cite_number expected to be: 970 rather than " ~ check["last_obj_cite_number"]); // 978 + assert(check["last_object_number"] == + "970","last object_number expected to be: 970 rather than " ~ check["last_object_number"]); // 978 break; case "the_wealth_of_networks.yochai_benkler.sst": // endnotes, bookindex - assert(check["last_obj_cite_number"] == - "829","last obj_cite_number expected to be: 829 rather than " ~ check["last_obj_cite_number"]); // ok - // assert(check["last_obj_cite_number"] == "832","last obj_cite_number expected to be: 832 rather than " ~ check["last_obj_cite_number"]); + assert(check["last_object_number"] == + "829","last object_number expected to be: 829 rather than " ~ check["last_object_number"]); // ok + // assert(check["last_object_number"] == "832","last object_number expected to be: 832 rather than " ~ check["last_object_number"]); // has endnotes and bookindex, issue with sisu.rb break; case "through_the_looking_glass.lewis_carroll.sst": - assert(check["last_obj_cite_number"] == - "949","last obj_cite_number expected to be: 949 rather than " ~ check["last_obj_cite_number"]); // 955 + assert(check["last_object_number"] == + "949","last object_number expected to be: 949 rather than " ~ check["last_object_number"]); // 955 break; case "two_bits.christopher_kelty.sst": // endnotes, bookindex, biblio - assert(check["last_obj_cite_number"] == - "1190","last obj_cite_number expected to be: 1190 rather than " ~ check["last_obj_cite_number"]); // 1191 - // assert(check["last_obj_cite_number"] == "1193","last obj_cite_number expected to be: 1193 rather than " ~ check["last_obj_cite_number"]); // 1191 ok? + assert(check["last_object_number"] == + "1190","last object_number expected to be: 1190 rather than " ~ check["last_object_number"]); // 1191 + // assert(check["last_object_number"] == "1193","last object_number expected to be: 1193 rather than " ~ check["last_object_number"]); // 1191 ok? // has endnotes and bookindex, issue with sisu.rb break; // fixed ERROR! range violation! // error in bookindex ... (ch3 the movement) case "un_contracts_international_sale_of_goods_convention_1980.sst": - assert(check["last_obj_cite_number"] == - "377","last obj_cite_number expected to be: 377 rather than " ~ check["last_obj_cite_number"]); // ok + assert(check["last_object_number"] == + "377","last object_number expected to be: 377 rather than " ~ check["last_object_number"]); // ok break; case "viral_spiral.david_bollier.sst": // endnotes, bookindex - assert(check["last_obj_cite_number"] == - "1078","last obj_cite_number expected to be: 1078 rather than " ~ check["last_obj_cite_number"]); // 1100 + assert(check["last_object_number"] == + "1078","last object_number expected to be: 1078 rather than " ~ check["last_object_number"]); // 1100 // fixed ERROR! range violation! // error in bookindex ... (ch7 ... building the cc machine, an extra semi colon) break; diff --git a/org/output_xmls.org b/org/output_xmls.org index eb0e263..db81b28 100644 --- a/org/output_xmls.org +++ b/org/output_xmls.org @@ -738,7 +738,7 @@ auto heading(O)( } _txt = font_face(_txt); string o; - if (obj.node.obj_cite_number.empty) { + if (obj.node.object_number.empty) { o = format(q"¶%s
%s @@ -761,12 +761,12 @@ auto heading(O)(
¶", _horizontal_rule, - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, obj.node.heading_lev_markup, obj.typeinfo.is_a, - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, tags, _txt, obj.node.heading_lev_markup, @@ -827,7 +827,7 @@ auto para(O)( _txt = font_face(_txt); string o; _txt = (obj.attrib.bullet) ? ("●  " ~ _txt) : _txt; - if (obj.node.obj_cite_number.empty) { + if (obj.node.object_number.empty) { o = format(q"¶

%s %s @@ -846,12 +846,12 @@ auto para(O)( %s

¶", - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, obj.typeinfo.is_a, obj.attrib.indent_hang, obj.attrib.indent_base, - obj.node.obj_cite_number, + obj.node.object_number, tags, _txt ); @@ -909,7 +909,7 @@ auto quote(O)( ) { _txt = font_face(_txt); string o; - if (obj.node.obj_cite_number.empty) { + if (obj.node.object_number.empty) { o = format(q"¶

%s @@ -925,10 +925,10 @@ auto quote(O)( %s

¶", - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, obj.typeinfo.is_a, - obj.node.obj_cite_number, + obj.node.object_number, _txt ); } @@ -985,7 +985,7 @@ auto group(O)( ) { _txt = font_face(_txt); string o; - if (obj.node.obj_cite_number.empty) { + if (obj.node.object_number.empty) { o = format(q"¶

%s @@ -1001,10 +1001,10 @@ auto group(O)( %s

¶", - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, obj.typeinfo.is_a, - obj.node.obj_cite_number, + obj.node.object_number, _txt ); } @@ -1062,7 +1062,7 @@ auto block(O)( ) { _txt = font_face(_txt); string o; - if (obj.node.obj_cite_number.empty) { + if (obj.node.object_number.empty) { o = format(q"¶

%s

¶", @@ -1074,10 +1074,10 @@ auto block(O)(

%s

¶", - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, obj.typeinfo.is_a, - obj.node.obj_cite_number, + obj.node.object_number, _txt.stripRight ); } @@ -1135,7 +1135,7 @@ auto verse(O)( ) { _txt = font_face(_txt); string o; - if (obj.node.obj_cite_number.empty) { + if (obj.node.object_number.empty) { o = format(q"¶

%s

¶", @@ -1147,10 +1147,10 @@ auto verse(O)(

%s

¶", - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, obj.typeinfo.is_a, - obj.node.obj_cite_number, + obj.node.object_number, _txt ); } @@ -1206,7 +1206,7 @@ auto code(O)( string _txt, ) { string o; - if (obj.node.obj_cite_number.empty) { + if (obj.node.object_number.empty) { o = format(q"¶

%s

¶", @@ -1218,10 +1218,10 @@ auto code(O)(

%s

¶", - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, obj.typeinfo.is_a, - obj.node.obj_cite_number, + obj.node.object_number, _txt ); } @@ -1300,10 +1300,10 @@ auto table(O)( %s

¶", - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, obj.typeinfo.is_a, - obj.node.obj_cite_number, + obj.node.object_number, tags, _txt, _note @@ -2017,7 +2017,7 @@ string epub3_oebps_content(D,I,P)(D doc_abstraction, I doc_matters, P parts) { "%s~ [%s.xhtml#%s] %s", obj.marked_up_level, obj.tags.segment_anchor_tag, - obj.node.obj_cite_number, + obj.node.object_number, obj.text ); } @@ -2454,23 +2454,23 @@ void outputEPub3(D,I)( format(q"¶ ¶", obj.tags.segment_anchor_tag, - obj.node.obj_cite_number, + obj.node.object_number, obj.tags.segment_anchor_tag, - obj.node.obj_cite_number, + obj.node.object_number, ); oepbs_content_parts["spine"] ~= format(q"¶ ¶", obj.tags.segment_anchor_tag, - obj.node.obj_cite_number, + obj.node.object_number, ); oepbs_content_parts["guide"] ~= format(q"¶ ¶", obj.tags.segment_anchor_tag, - obj.node.obj_cite_number, + obj.node.object_number, obj.tags.segment_anchor_tag, - obj.node.obj_cite_number, + obj.node.object_number, ); } } diff --git a/org/sdp.org b/org/sdp.org index 7a8d86d..15fd5d4 100644 --- a/org/sdp.org +++ b/org/sdp.org @@ -940,24 +940,24 @@ auto markup = InlineMarkup(); #+name: meta_metadoc_summary #+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", + "last_object_number" : "NA [debug \"checkdoc\" not run]", + "last_object_number_body" : "0", + "last_object_number_bkidx" : "0", ]; foreach (k; doc_matters.xml.keys_seq.seg) { foreach (obj; doc_abstraction[k]) { if (obj.typeinfo.of_part != "empty") { - if (!empty(obj.node.obj_cite_number)) { + if (!empty(obj.node.object_number)) { if (k == "body") { - check["last_obj_cite_number_body"] = obj.node.obj_cite_number; + check["last_object_number_body"] = obj.node.object_number; } - if (!(obj.node.obj_cite_number.empty)) { - check["last_obj_cite_number"] = obj.node.obj_cite_number; + if (!(obj.node.object_number.empty)) { + check["last_object_number"] = obj.node.object_number; } } if (k == "bookindex_seg") { - if (obj.misc.obj_cite_number_type == 2) { - check["last_obj_cite_number_bkidx"] = obj.misc.obj_cite_number_bkidx; + if (obj.misc.object_number_type == 2) { + check["last_object_number_bkidx"] = obj.misc.object_number_bkidx; } } } @@ -987,9 +987,9 @@ writefln( "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"]), + to!int(check["last_object_number_body"]), + "last object_number:", + to!int(check["last_object_number"]), "length endnotes:", // subtract headings (doc_abstraction["endnotes"].length > 2) ? (to!int(doc_abstraction["endnotes"].length - 2)) @@ -1007,7 +1007,7 @@ writefln( ? (to!int(doc_abstraction["bookindex_seg"].length)) : 0, " last book idx ocn:", - to!int(check["last_obj_cite_number_bkidx"]), + to!int(check["last_object_number_bkidx"]), "length blurb:", (doc_abstraction["blurb"].length > 1) ? (to!int(doc_abstraction["blurb"].length)) diff --git a/src/sdp/meta/defaults.d b/src/sdp/meta/defaults.d index 2663c15..70089e5 100644 --- a/src/sdp/meta/defaults.d +++ b/src/sdp/meta/defaults.d @@ -35,8 +35,8 @@ template SiSUrgxInitFlags() { "tic_block" : 0, "tic_quote" : 0, "tic_table" : 0, - "ocn_status" : 0, // 0 obj_cite_number; 1 no obj_cite_number; 2 no obj_cite_number & dummy headings - "ocn_status_off_for_multiple_objects" : 0, // 0 obj_cite_number; 1 no obj_cite_number; 2 no obj_cite_number & dummy headings + "ocn_status" : 0, // 0 object_number; 1 no object_number; 2 no object_number & dummy headings + "ocn_status_off_for_multiple_objects" : 0, // 0 object_number; 1 no object_number; 2 no object_number & dummy headings "book_index" : 0, ]; return flags_type_init; diff --git a/src/sdp/meta/doc_debugs.d b/src/sdp/meta/doc_debugs.d index 60ad63f..f10411b 100644 --- a/src/sdp/meta/doc_debugs.d +++ b/src/sdp/meta/doc_debugs.d @@ -43,7 +43,7 @@ template SiSUdebugs() { if (obj.typeinfo.is_a == "heading") { writefln( "%s node: %s heading: %s %s", - obj.obj_cite_number, + obj.object_number, obj.node, obj.heading_lev_markup, obj.text, @@ -64,7 +64,7 @@ template SiSUdebugs() { if (obj.typeinfo.of_part != "empty") { writefln( "[%s][%s]\n%s", - obj.obj_cite_number, + obj.object_number, obj.typeinfo.is_a, obj.text ); @@ -78,7 +78,7 @@ template SiSUdebugs() { foreach (obj; contents[key]) { writefln( "[%s][%s]\n%s", - obj.obj_cite_number, + obj.object_number, obj.typeinfo.is_a, obj.text ); @@ -107,7 +107,7 @@ template SiSUdebugs() { foreach (obj; contents[key]) { writefln( "[%s][%s]\n%s", - obj.obj_cite_number, + obj.object_number, obj.typeinfo.is_a, obj.text ); @@ -184,7 +184,7 @@ template SiSUdebugs() { foreach (obj; contents[key]) { writefln( "[%s][%s]\n%s", - obj.obj_cite_number, + obj.object_number, obj.typeinfo.is_a, obj.text ); @@ -197,7 +197,7 @@ template SiSUdebugs() { foreach (obj; contents[key]) { writefln( "[%s][%s]\n%s", - obj.obj_cite_number, + obj.object_number, obj.typeinfo.is_a, obj.text ); @@ -222,7 +222,7 @@ template SiSUdebugs() { foreach (obj; contents[key]) { writefln( "[%s][%s]\n%s", - obj.obj_cite_number, + obj.object_number, obj.typeinfo.is_a, obj.text ); @@ -239,7 +239,7 @@ template SiSUdebugs() { if (obj.typeinfo.of_part != "empty") { writefln( "* [%s][%s] %s", - obj.obj_cite_number, + obj.object_number, obj.typeinfo.is_a, obj.text ); @@ -406,7 +406,7 @@ template SiSUdebugs() { writefln( "%s~ [%s] %s %s", obj.marked_up_level, - obj.obj_cite_number, + obj.object_number, obj.anchor_tags, // "[", obj["is"], "] ", obj.text @@ -442,7 +442,7 @@ template SiSUdebugs() { writefln( "%s~ [%s] %s", obj.marked_up_level, - obj.obj_cite_number, + obj.object_number, // "[", obj["is"], "] ", obj.text ); @@ -452,7 +452,7 @@ template SiSUdebugs() { } debug(summary) { string[string] check = [ - "last_obj_cite_number" : "NA [debug \"checkdoc\" not run]", + "last_object_number" : "NA [debug \"checkdoc\" not run]", ]; } debug(checkdoc) { @@ -463,117 +463,117 @@ template SiSUdebugs() { switch (mfn.captures[2]) { // live manual: case "live-manual.ssm": - assert(check["last_obj_cite_number"] == - "1019","last obj_cite_number should be: 1019 (check test, document is frequently updated)"); // ok + assert(check["last_object_number"] == + "1019","last object_number should be: 1019 (check test, document is frequently updated)"); // ok break; // sisu_markup: case "sisu_markup.sst": - assert(check["last_obj_cite_number"] == - "297","last obj_cite_number expected to be: 297 rather than " ~ check["last_obj_cite_number"]); // ok - // assert(check["last_obj_cite_number"] == "297","last obj_cite_number expected to be: 297 rather than " ~ check["last_obj_cite_number"]); + assert(check["last_object_number"] == + "297","last object_number expected to be: 297 rather than " ~ check["last_object_number"]); // ok + // assert(check["last_object_number"] == "297","last object_number expected to be: 297 rather than " ~ check["last_object_number"]); // notes for first divergance study sisu headings 247 250 - // sisu has issue with code that contains heading 1~ which results in no obj_cite_number! ?? - // sisu currently has incorrect last body obj_cite_number of 294! + // sisu has issue with code that contains heading 1~ which results in no object_number! ?? + // sisu currently has incorrect last body object_number of 294! // bug in sisu? attend break; // sisu-markup-samples: case "accelerando.charles_stross.sst": - assert(check["last_obj_cite_number"] == - "2861","last obj_cite_number expected to be: 2861 rather than " ~ check["last_obj_cite_number"]); // ok + assert(check["last_object_number"] == + "2861","last object_number expected to be: 2861 rather than " ~ check["last_object_number"]); // ok break; case "alices_adventures_in_wonderland.lewis_carroll.sst": - assert(check["last_obj_cite_number"] == - "805","last obj_cite_number expected to be: 805 rather than " ~ check["last_obj_cite_number"]); // 808 + assert(check["last_object_number"] == + "805","last object_number expected to be: 805 rather than " ~ check["last_object_number"]); // 808 break; case "autonomy_markup0.sst": - assert(check["last_obj_cite_number"] == - "77","last obj_cite_number expected to be: 77 rather than " ~ check["last_obj_cite_number"]); // ok endnotes - // assert(check["last_obj_cite_number"] == "78","last obj_cite_number expected to be: 78 rather than " ~ check["last_obj_cite_number"]); + assert(check["last_object_number"] == + "77","last object_number expected to be: 77 rather than " ~ check["last_object_number"]); // ok endnotes + // assert(check["last_object_number"] == "78","last object_number expected to be: 78 rather than " ~ check["last_object_number"]); break; case "content.cory_doctorow.sst": - assert(check["last_obj_cite_number"] == - "953","last obj_cite_number expected to be: 953 rather than " ~ check["last_obj_cite_number"]); // 1007 way off, check obj_cite_number off switches - // assert(check["last_obj_cite_number"] == "953","last obj_cite_number expected to be: 953 rather than " ~ check["last_obj_cite_number"]); + assert(check["last_object_number"] == + "953","last object_number expected to be: 953 rather than " ~ check["last_object_number"]); // 1007 way off, check object_number off switches + // assert(check["last_object_number"] == "953","last object_number expected to be: 953 rather than " ~ check["last_object_number"]); break; case "democratizing_innovation.eric_von_hippel.sst": // fixed ERROR! range violation, broken check! endnotes, bookindex, biblio // error in bookindex ... (ch1; ch6; ch8 ) - assert(check["last_obj_cite_number"] == - "905","last obj_cite_number expected to be: 905 rather than " ~ check["last_obj_cite_number"]); // 911 + assert(check["last_object_number"] == + "905","last object_number expected to be: 905 rather than " ~ check["last_object_number"]); // 911 break; case "down_and_out_in_the_magic_kingdom.cory_doctorow.sst": - assert(check["last_obj_cite_number"] == - "1417","last obj_cite_number expected to be: 1417 rather than " ~ check["last_obj_cite_number"]); // 1455 check obj_cite_number off switches + assert(check["last_object_number"] == + "1417","last object_number expected to be: 1417 rather than " ~ check["last_object_number"]); // 1455 check object_number off switches break; case "for_the_win.cory_doctorow.sst": - assert(check["last_obj_cite_number"] == - "3510","last obj_cite_number expected to be: 3510 rather than " ~ check["last_obj_cite_number"]); // 3569 check obj_cite_number off switches + assert(check["last_object_number"] == + "3510","last object_number expected to be: 3510 rather than " ~ check["last_object_number"]); // 3569 check object_number off switches break; case "free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst": - assert(check["last_obj_cite_number"] == - "1082","last obj_cite_number expected to be: 1082 rather than " ~ check["last_obj_cite_number"]); // check 1079 too few + assert(check["last_object_number"] == + "1082","last object_number expected to be: 1082 rather than " ~ check["last_object_number"]); // check 1079 too few break; case "free_culture.lawrence_lessig.sst": - assert(check["last_obj_cite_number"] == - "1330","last obj_cite_number expected to be: 1330 rather than " ~ check["last_obj_cite_number"]); // 1312 + assert(check["last_object_number"] == + "1330","last object_number expected to be: 1330 rather than " ~ check["last_object_number"]); // 1312 // fixed ERROR! range violation, broken check! // error in bookindex ... sections piracy (ch1) & property (ch10 market concentration) fixed break; case "free_for_all.peter_wayner.sst": // endnotes, bookindex, biblio - assert(check["last_obj_cite_number"] == - "1559","last obj_cite_number expected to be: 1559 rather than " ~ check["last_obj_cite_number"]); // 1560, check obj_cite_number off switches, has endnotes so 2 too many - // assert(check["last_obj_cite_number"] == "1559","last obj_cite_number expected to be: 1559 rather than " ~ check["last_obj_cite_number"]); + assert(check["last_object_number"] == + "1559","last object_number expected to be: 1559 rather than " ~ check["last_object_number"]); // 1560, check object_number off switches, has endnotes so 2 too many + // assert(check["last_object_number"] == "1559","last object_number expected to be: 1559 rather than " ~ check["last_object_number"]); break; case "gpl2.fsf.sst": - assert(check["last_obj_cite_number"] == - "65","last obj_cite_number expected to be: 65 rather than " ~ check["last_obj_cite_number"]); // ok endnotes? check - // assert(check["last_obj_cite_number"] == "66","last obj_cite_number expected to be: 66 rather than " ~ check["last_obj_cite_number"]); + assert(check["last_object_number"] == + "65","last object_number expected to be: 65 rather than " ~ check["last_object_number"]); // ok endnotes? check + // assert(check["last_object_number"] == "66","last object_number expected to be: 66 rather than " ~ check["last_object_number"]); break; case "gpl3.fsf.sst": - assert(check["last_obj_cite_number"] == - "123","last obj_cite_number expected to be: 123 rather than " ~ check["last_obj_cite_number"]); // ok + assert(check["last_object_number"] == + "123","last object_number expected to be: 123 rather than " ~ check["last_object_number"]); // ok break; case "gullivers_travels.jonathan_swift.sst": - assert(check["last_obj_cite_number"] == - "668","last obj_cite_number expected to be: 668 rather than " ~ check["last_obj_cite_number"]); // 674 + assert(check["last_object_number"] == + "668","last object_number expected to be: 668 rather than " ~ check["last_object_number"]); // 674 break; case "little_brother.cory_doctorow.sst": - assert(check["last_obj_cite_number"] == - "3130","last obj_cite_number expected to be: 3130 rather than " ~ check["last_obj_cite_number"]); // 3204, check obj_cite_number off switches + assert(check["last_object_number"] == + "3130","last object_number expected to be: 3130 rather than " ~ check["last_object_number"]); // 3204, check object_number off switches break; case "the_cathedral_and_the_bazaar.eric_s_raymond.sst": - assert(check["last_obj_cite_number"] == - "258","last obj_cite_number expected to be: 258 rather than " ~ check["last_obj_cite_number"]); // ok + assert(check["last_object_number"] == + "258","last object_number expected to be: 258 rather than " ~ check["last_object_number"]); // ok break; case "the_public_domain.james_boyle.sst": - assert(check["last_obj_cite_number"] == - "970","last obj_cite_number expected to be: 970 rather than " ~ check["last_obj_cite_number"]); // 978 + assert(check["last_object_number"] == + "970","last object_number expected to be: 970 rather than " ~ check["last_object_number"]); // 978 break; case "the_wealth_of_networks.yochai_benkler.sst": // endnotes, bookindex - assert(check["last_obj_cite_number"] == - "829","last obj_cite_number expected to be: 829 rather than " ~ check["last_obj_cite_number"]); // ok - // assert(check["last_obj_cite_number"] == "832","last obj_cite_number expected to be: 832 rather than " ~ check["last_obj_cite_number"]); + assert(check["last_object_number"] == + "829","last object_number expected to be: 829 rather than " ~ check["last_object_number"]); // ok + // assert(check["last_object_number"] == "832","last object_number expected to be: 832 rather than " ~ check["last_object_number"]); // has endnotes and bookindex, issue with sisu.rb break; case "through_the_looking_glass.lewis_carroll.sst": - assert(check["last_obj_cite_number"] == - "949","last obj_cite_number expected to be: 949 rather than " ~ check["last_obj_cite_number"]); // 955 + assert(check["last_object_number"] == + "949","last object_number expected to be: 949 rather than " ~ check["last_object_number"]); // 955 break; case "two_bits.christopher_kelty.sst": // endnotes, bookindex, biblio - assert(check["last_obj_cite_number"] == - "1190","last obj_cite_number expected to be: 1190 rather than " ~ check["last_obj_cite_number"]); // 1191 - // assert(check["last_obj_cite_number"] == "1193","last obj_cite_number expected to be: 1193 rather than " ~ check["last_obj_cite_number"]); // 1191 ok? + assert(check["last_object_number"] == + "1190","last object_number expected to be: 1190 rather than " ~ check["last_object_number"]); // 1191 + // assert(check["last_object_number"] == "1193","last object_number expected to be: 1193 rather than " ~ check["last_object_number"]); // 1191 ok? // has endnotes and bookindex, issue with sisu.rb break; // fixed ERROR! range violation! // error in bookindex ... (ch3 the movement) case "un_contracts_international_sale_of_goods_convention_1980.sst": - assert(check["last_obj_cite_number"] == - "377","last obj_cite_number expected to be: 377 rather than " ~ check["last_obj_cite_number"]); // ok + assert(check["last_object_number"] == + "377","last object_number expected to be: 377 rather than " ~ check["last_object_number"]); // ok break; case "viral_spiral.david_bollier.sst": // endnotes, bookindex - assert(check["last_obj_cite_number"] == - "1078","last obj_cite_number expected to be: 1078 rather than " ~ check["last_obj_cite_number"]); // 1100 + assert(check["last_object_number"] == + "1078","last object_number expected to be: 1078 rather than " ~ check["last_object_number"]); // 1100 // fixed ERROR! range violation! // error in bookindex ... (ch7 ... building the cc machine, an extra semi colon) break; @@ -643,7 +643,7 @@ template SiSUdebugs() { foreach (obj; contents[key]) { writefln( "[%s][%s]\n%s", - obj.obj_cite_number, + obj.object_number, obj.typeinfo.is_a, obj.text ); diff --git a/src/sdp/meta/metadoc_from_src.d b/src/sdp/meta/metadoc_from_src.d index ba85b68..fab23e3 100644 --- a/src/sdp/meta/metadoc_from_src.d +++ b/src/sdp/meta/metadoc_from_src.d @@ -274,7 +274,7 @@ template SiSUdocAbstraction() { "blurb" : 0, ]; auto obj_type_status = flags_type_init; - string[string] obj_cite_number_poem = [ + string[string] object_number_poem = [ "start" : "", "end" : "" ]; @@ -332,9 +332,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Table of Contents"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "toc"; comp_obj_heading_.node.marked_up_level = "1"; comp_obj_heading_.node.heading_lev_markup = 4; @@ -473,9 +473,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Glossary"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "_part_glossary"; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; @@ -492,9 +492,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Glossary"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "glossary"; comp_obj_heading_.node.marked_up_level = "1"; comp_obj_heading_.node.heading_lev_markup = 4; @@ -514,9 +514,9 @@ template SiSUdocAbstraction() { comp_obj_para.typeinfo.is_a = "glossary"; comp_obj_para.text = line.to!string.strip; comp_obj_para.node.ocn = 0; - comp_obj_para.node.obj_cite_number = ""; - comp_obj_para.misc.obj_cite_number_off = ""; - comp_obj_para.misc.obj_cite_number_type = 0; + comp_obj_para.node.object_number = ""; + comp_obj_para.misc.object_number_off = ""; + comp_obj_para.misc.object_number_type = 0; comp_obj_para.attrib.indent_hang = indent["hang_position"]; comp_obj_para.attrib.indent_base = indent["base_position"]; comp_obj_para.attrib.bullet = bullet; @@ -584,9 +584,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Blurb"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "_part_blurb"; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; @@ -603,9 +603,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Blurb"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "blurb"; comp_obj_heading_.node.marked_up_level = "1"; comp_obj_heading_.node.heading_lev_markup = 4; @@ -625,9 +625,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = line.to!string; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "blurb"; comp_obj_heading_.node.marked_up_level = an_object["lev"].to!string; comp_obj_heading_.node.heading_lev_markup = an_object["lev_markup_number"].to!int; // make int, remove need to conv @@ -644,9 +644,9 @@ template SiSUdocAbstraction() { comp_obj_para.typeinfo.is_a = "blurb"; comp_obj_para.text = munge.url_links(line.to!string.strip).replaceFirst(rgx.para_attribs, ""); comp_obj_para.node.ocn = 0; - comp_obj_para.node.obj_cite_number = ""; - comp_obj_para.misc.obj_cite_number_off = ""; - comp_obj_para.misc.obj_cite_number_type = 0; + comp_obj_para.node.object_number = ""; + comp_obj_para.misc.object_number_off = ""; + comp_obj_para.misc.object_number_type = 0; comp_obj_para.attrib.indent_hang = indent["hang_position"]; comp_obj_para.attrib.indent_base = indent["base_position"]; comp_obj_para.has.inline_links = true; @@ -687,7 +687,7 @@ template SiSUdocAbstraction() { continue; } else if (obj_type_status["poem"] == TriState.on) { /+ within block object: poem +/ - _poem_block_(line, an_object, obj_type_status, cntr, obj_cite_number_poem, conf_make_meta); + _poem_block_(line, an_object, obj_type_status, cntr, object_number_poem, conf_make_meta); continue; } else if (obj_type_status["table"] == TriState.on) { /+ within block object: table +/ @@ -706,9 +706,9 @@ template SiSUdocAbstraction() { /+ poem to verse exceptions! +/ object_reset(an_object); processing.remove("verse"); - obj_cite_number_poem["start"] = obj_cite_digits.on.to!string; + object_number_poem["start"] = obj_cite_digits.on.to!string; } - _start_block_(line, obj_type_status, obj_cite_number_poem); + _start_block_(line, obj_type_status, object_number_poem); continue; } else if (!line.empty) { /+ line not empty +/ @@ -824,7 +824,7 @@ template SiSUdocAbstraction() { comp_obj_heading, cntr, obj_type_status, - obj_cite_number_poem, + object_number_poem, conf_make_meta, ); } else { @@ -960,10 +960,10 @@ template SiSUdocAbstraction() { comp_obj_para.typeinfo.is_a = "para"; comp_obj_para.text = an_object["substantive"].to!string.strip; comp_obj_para.node.ocn = obj_cite_digits.digit; - comp_obj_para.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_para.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_para.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_para.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_para.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_para.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_para.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_para.misc.object_number_type = obj_cite_digits.type; comp_obj_para.attrib.indent_hang = indent["hang_position"]; comp_obj_para.attrib.indent_base = indent["base_position"]; comp_obj_para.attrib.bullet = bullet; @@ -1059,9 +1059,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "(skip) there is no Glossary section"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; comp_obj_heading_.node.heading_lev_collapsed = 1; @@ -1088,9 +1088,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Bibliography"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "_part_bibliography"; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; @@ -1105,9 +1105,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Bibliography"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "bibliography"; comp_obj_heading_.node.marked_up_level = "1"; comp_obj_heading_.node.heading_lev_markup = 4; @@ -1124,9 +1124,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "(skip) there is no Bibliography"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; comp_obj_heading_.node.heading_lev_collapsed = 1; @@ -1157,9 +1157,9 @@ template SiSUdocAbstraction() { comp_obj_para.typeinfo.is_a = "bibliography"; comp_obj_para.text = out_.to!string.strip; comp_obj_para.node.ocn = 0; - comp_obj_para.node.obj_cite_number = ""; - comp_obj_para.misc.obj_cite_number_off = ""; - comp_obj_para.misc.obj_cite_number_type = 0; + comp_obj_para.node.object_number = ""; + comp_obj_para.misc.object_number_off = ""; + comp_obj_para.misc.object_number_type = 0; comp_obj_para.attrib.indent_hang = 0; comp_obj_para.attrib.indent_base = 1; comp_obj_para.attrib.bullet = bullet; @@ -1195,9 +1195,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "(skip) there is no Blurb section"; comp_obj_heading_.node.ocn = 0; - comp_obj_para.node.obj_cite_number = ""; - comp_obj_para.misc.obj_cite_number_off = ""; - comp_obj_para.misc.obj_cite_number_type = 0; + comp_obj_para.node.object_number = ""; + comp_obj_para.misc.object_number_off = ""; + comp_obj_para.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = ""; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; @@ -1221,9 +1221,9 @@ template SiSUdocAbstraction() { comp_obj_toc.typeinfo.is_of = "para"; comp_obj_toc.typeinfo.is_a = "toc"; comp_obj_toc.node.ocn = 0; - comp_obj_toc.node.obj_cite_number = ""; - comp_obj_toc.misc.obj_cite_number_off = ""; - comp_obj_toc.misc.obj_cite_number_type = 0; + comp_obj_toc.node.object_number = ""; + comp_obj_toc.misc.object_number_off = ""; + comp_obj_toc.misc.object_number_type = 0; comp_obj_toc.attrib.indent_hang = indent["hang_position"]; comp_obj_toc.attrib.indent_base = indent["base_position"]; comp_obj_toc.attrib.bullet = false; @@ -1471,8 +1471,8 @@ template SiSUdocAbstraction() { "Title OCN should be 1 not: " ~ obj.node.ocn.to!string); // bug introduced 0.18.1 +/ obj.node.ocn = 1; - obj.node.obj_cite_number = "1"; - obj.misc.obj_cite_number_type = OCNtype.ocn; + obj.node.object_number = "1"; + obj.misc.object_number_type = OCNtype.ocn; } /+ dom structure (marked up & collapsed) +/ if ((opt_action.html) @@ -1594,7 +1594,7 @@ template SiSUdocAbstraction() { } obj_cite_digits = ocn_emit(OCNstatus.on); obj.node.ocn = obj_cite_digits.digit; - obj.node.obj_cite_number = obj_cite_digits.on.to!string; + obj.node.object_number = obj_cite_digits.on.to!string; if (obj.node.heading_lev_markup <= 4) { segnames_0_4 ~= obj.tags.segment_anchor_tag; if (obj.node.heading_lev_markup == 4) { @@ -1630,7 +1630,7 @@ template SiSUdocAbstraction() { } obj_cite_digits = ocn_emit(OCNstatus.on); obj.node.ocn = obj_cite_digits.digit; - obj.node.obj_cite_number = obj_cite_digits.on.to!string; + obj.node.object_number = obj_cite_digits.on.to!string; if (obj.node.heading_lev_markup <= 4) { segnames_0_4 ~= obj.tags.segment_anchor_tag; if (obj.node.heading_lev_markup == 4) { @@ -1657,7 +1657,7 @@ template SiSUdocAbstraction() { } else if (obj.typeinfo.is_a == "glossary") { obj_cite_digits = ocn_emit(OCNstatus.on); obj.node.ocn = obj_cite_digits.digit; - obj.node.obj_cite_number = obj_cite_digits.on.to!string; + obj.node.object_number = obj_cite_digits.on.to!string; } } } @@ -1670,7 +1670,7 @@ template SiSUdocAbstraction() { } obj_cite_digits = ocn_emit(OCNstatus.on); obj.node.ocn = obj_cite_digits.digit; - obj.node.obj_cite_number = obj_cite_digits.on.to!string; // check + obj.node.object_number = obj_cite_digits.on.to!string; // check if (obj.node.heading_lev_markup <= 4) { segnames_0_4 ~= obj.tags.segment_anchor_tag; if (obj.node.heading_lev_markup == 4) { @@ -1697,7 +1697,7 @@ template SiSUdocAbstraction() { } else if (obj.typeinfo.is_a == "bibliography") { obj_cite_digits = ocn_emit(OCNstatus.on); obj.node.ocn = obj_cite_digits.on; - obj.node.obj_cite_number = obj_cite_digits.on.to!string; + obj.node.object_number = obj_cite_digits.on.to!string; } } } @@ -1715,7 +1715,7 @@ template SiSUdocAbstraction() { } obj_cite_digits = ocn_emit(OCNstatus.on); obj.node.ocn = obj_cite_digits.on; - obj.node.obj_cite_number = obj_cite_digits.on.to!string; + obj.node.object_number = obj_cite_digits.on.to!string; if (obj.node.heading_lev_markup <= 4) { segnames_0_4 ~= obj.tags.segment_anchor_tag; if (obj.node.heading_lev_markup == 4) { @@ -1742,8 +1742,8 @@ template SiSUdocAbstraction() { } else if (obj.typeinfo.is_a == "bookindex") { obj_cite_digits = ocn_emit(OCNstatus.bkidx); obj.node.ocn = obj_cite_digits.digit; - obj.misc.obj_cite_number_bkidx = obj_cite_digits.bkidx.to!string; - obj.misc.obj_cite_number_type = OCNtype.bkidx; + obj.misc.object_number_bkidx = obj_cite_digits.bkidx.to!string; + obj.misc.object_number_type = OCNtype.bkidx; } } /+ seg +/ @@ -1755,7 +1755,7 @@ template SiSUdocAbstraction() { writeln(obj.text); } obj.node.ocn = ++ocn_; - obj.node.obj_cite_number = obj.node.ocn.to!string; + obj.node.object_number = obj.node.ocn.to!string; if (obj.node.heading_lev_markup <= 4) { segnames_0_4 ~= obj.tags.segment_anchor_tag; if (obj.node.heading_lev_markup == 4) { @@ -1781,8 +1781,8 @@ template SiSUdocAbstraction() { obj = obj_heading_ancestors(obj, lv_ancestors_txt); } else if (obj.typeinfo.is_a == "bookindex") { ocn_bidx_ = ++ocn_bkidx_; - obj.misc.obj_cite_number_bkidx = ocn_bidx_.to!string; // FIX need to distinguish from regular ocn - obj.misc.obj_cite_number_type = OCNtype.bkidx; + obj.misc.object_number_bkidx = ocn_bidx_.to!string; // FIX need to distinguish from regular ocn + obj.misc.object_number_type = OCNtype.bkidx; } } /+ TODO assert failure, reinstate @@ -1799,7 +1799,7 @@ template SiSUdocAbstraction() { } obj_cite_digits = ocn_emit(OCNstatus.on); obj.node.ocn = obj_cite_digits.on; - obj.node.obj_cite_number = obj_cite_digits.on.to!string; + obj.node.object_number = obj_cite_digits.on.to!string; if (obj.node.heading_lev_markup <= 4) { segnames_0_4 ~= obj.tags.segment_anchor_tag; if (obj.node.heading_lev_markup == 4) { @@ -1825,8 +1825,8 @@ template SiSUdocAbstraction() { obj = obj_heading_ancestors(obj, lv_ancestors_txt); } else if (obj.typeinfo.is_a == "blurb") { obj_cite_digits = ocn_emit(OCNstatus.off); - obj.misc.obj_cite_number_off = obj_cite_digits.off.to!string; - obj.misc.obj_cite_number_type = OCNtype.non; + obj.misc.object_number_off = obj_cite_digits.off.to!string; + obj.misc.object_number_type = OCNtype.non; } } } @@ -1842,9 +1842,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_of = "para"; comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.node.ocn = 0; - comp_obj_para.node.obj_cite_number = ""; - comp_obj_para.misc.obj_cite_number_off = ""; - comp_obj_para.misc.obj_cite_number_type = 0; + comp_obj_para.node.object_number = ""; + comp_obj_para.misc.object_number_off = ""; + comp_obj_para.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = ""; comp_obj_heading_.node.marked_up_level = ""; comp_obj_heading_.node.heading_lev_markup = 9; @@ -1982,16 +1982,16 @@ template SiSUdocAbstraction() { } static auto rgx = Rgx(); if ((!line.empty) && (obj_type_status["ocn_status_off_for_multiple_objects"] == TriState.off)) { - /+ not multi-line object, check whether obj_cite_number is on or turned off +/ - if (line.matchFirst(rgx.obj_cite_number_block_marks)) { - /+ switch off obj_cite_number +/ - if (line.matchFirst(rgx.obj_cite_number_off_block)) { + /+ not multi-line object, check whether object_number is on or turned off +/ + if (line.matchFirst(rgx.object_number_block_marks)) { + /+ switch off object_number +/ + if (line.matchFirst(rgx.object_number_off_block)) { obj_type_status["ocn_status_off_for_multiple_objects"] = TriState.on; debug(ocnoff) { writeln(line); } } - if (line.matchFirst(rgx.obj_cite_number_off_block_dh)) { + if (line.matchFirst(rgx.object_number_off_block_dh)) { obj_type_status["ocn_status_off_for_multiple_objects"] = TriState.closing; debug(ocnoff) { writeln(line); @@ -1999,9 +1999,9 @@ template SiSUdocAbstraction() { } } else { if (obj_type_status["ocn_status_off_for_multiple_objects"] == TriState.off) { - if (line.matchFirst(rgx.obj_cite_number_off)) { + if (line.matchFirst(rgx.object_number_off)) { obj_type_status["ocn_status"] = OCNstatus.off; - } else if (line.matchFirst(rgx.obj_cite_number_off_dh)) { + } else if (line.matchFirst(rgx.object_number_off_dh)) { obj_type_status["ocn_status"] = OCNstatus.closing; } else { obj_type_status["ocn_status"] = OCNstatus.on; @@ -2012,7 +2012,7 @@ template SiSUdocAbstraction() { } } } else if ((!line.empty) && (obj_type_status["ocn_status_off_for_multiple_objects"] > TriState.off)) { - if (line.matchFirst(rgx.obj_cite_number_off_block_close)) { + if (line.matchFirst(rgx.object_number_off_block_close)) { obj_type_status["ocn_status_off_for_multiple_objects"] = TriState.off; obj_type_status["ocn_status"] = OCNstatus.on; debug(ocnoff) { @@ -2071,12 +2071,12 @@ template SiSUdocAbstraction() { void _start_block_(L,T,N)( L line, return ref T obj_type_status, - return ref N obj_cite_number_poem + return ref N object_number_poem ) { debug(asserts) { static assert(is(typeof(line) == char[])); static assert(is(typeof(obj_type_status) == int[string])); - static assert(is(typeof(obj_cite_number_poem) == string[string])); + static assert(is(typeof(object_number_poem) == string[string])); } static auto rgx = Rgx(); string code_block_syntax = ""; @@ -2102,7 +2102,7 @@ template SiSUdocAbstraction() { line ); } - obj_cite_number_poem["start"] = obj_cite_digits.on.to!string; + object_number_poem["start"] = obj_cite_digits.on.to!string; obj_type_status["blocks"] = TriState.on; obj_type_status["verse_new"] = State.on; obj_type_status["poem"] = TriState.on; @@ -2181,7 +2181,7 @@ template SiSUdocAbstraction() { line ); } - obj_cite_number_poem["start"] = obj_cite_digits.on.to!string; + object_number_poem["start"] = obj_cite_digits.on.to!string; obj_type_status["blocks"] = TriState.on; obj_type_status["verse_new"] = State.on; obj_type_status["poem"] = TriState.on; @@ -2368,7 +2368,7 @@ template SiSUdocAbstraction() { return ref O an_object, return ref T obj_type_status, return ref C cntr, - N obj_cite_number_poem, + N object_number_poem, CMM conf_make_meta, ) { debug(asserts) { @@ -2376,7 +2376,7 @@ template SiSUdocAbstraction() { static assert(is(typeof(an_object) == string[string])); static assert(is(typeof(obj_type_status) == int[string])); static assert(is(typeof(cntr) == int)); - static assert(is(typeof(obj_cite_number_poem) == string[string])); + static assert(is(typeof(object_number_poem) == string[string])); } static auto rgx = Rgx(); if (obj_type_status["curly_poem"] == TriState.on) { @@ -2419,10 +2419,10 @@ template SiSUdocAbstraction() { comp_obj_block.typeinfo.is_of = "block"; comp_obj_block.typeinfo.is_a = "verse"; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digits.type; comp_obj_block.text = an_object["substantive"]; comp_obj_block.has.inline_notes_reg = substantive_obj_misc_tuple[sObj.notes_reg]; comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star]; @@ -2433,7 +2433,7 @@ template SiSUdocAbstraction() { processing.remove("verse"); ++cntr; } - obj_cite_number_poem["end"] = obj_cite_digits.on.to!string; + object_number_poem["end"] = obj_cite_digits.on.to!string; obj_type_status["blocks"] = TriState.closing; obj_type_status["poem"] = TriState.closing; obj_type_status["curly_poem"] = TriState.off; @@ -2477,10 +2477,10 @@ template SiSUdocAbstraction() { comp_obj_block.typeinfo.is_of = "block"; comp_obj_block.typeinfo.is_a = "verse"; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digits.type; comp_obj_block.text = an_object["substantive"]; comp_obj_block.has.inline_notes_reg = substantive_obj_misc_tuple[sObj.notes_reg]; comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star]; @@ -2520,16 +2520,16 @@ template SiSUdocAbstraction() { comp_obj_block.typeinfo.is_of = "block"; comp_obj_block.typeinfo.is_a = "verse"; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digits.type; comp_obj_block.text = an_object["substantive"]; comp_obj_block.has.inline_notes_reg = substantive_obj_misc_tuple[sObj.notes_reg]; comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star]; comp_obj_block.has.inline_links = substantive_obj_misc_tuple[sObj.links]; the_document_body_section ~= comp_obj_block; - obj_cite_number_poem["end"] = obj_cite_digits.on.to!string; + object_number_poem["end"] = obj_cite_digits.on.to!string; object_reset(an_object); processing.remove("verse"); ++cntr; @@ -2578,10 +2578,10 @@ template SiSUdocAbstraction() { comp_obj_block.typeinfo.is_of = "block"; comp_obj_block.typeinfo.is_a = "verse"; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digits.type; comp_obj_block.text = an_object["substantive"]; comp_obj_block.has.inline_notes_reg = substantive_obj_misc_tuple[sObj.notes_reg]; comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star]; @@ -2874,10 +2874,10 @@ template SiSUdocAbstraction() { = obj_im.obj_inline_markup_and_anchor_tags_and_misc(an_object, "body_nugget", conf_make_meta); an_object["substantive"] = substantive_obj_misc_tuple[sObj.content]; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digits.type; comp_obj_block = table_instructions(comp_obj_block, an_object["table_head"]); comp_obj_block = table_substantive_munge_special(comp_obj_block, an_object["substantive"]); the_document_body_section ~= comp_obj_block; @@ -2895,7 +2895,7 @@ template SiSUdocAbstraction() { return ref ObjGenericComposite _comp_obj_heading, return ref int cntr, return ref int[string] obj_type_status, - string[string] obj_cite_number_poem, + string[string] object_number_poem, CMM conf_make_meta, ) { assert( @@ -2938,10 +2938,10 @@ template SiSUdocAbstraction() { comp_obj_block.typeinfo.is_of = "block"; comp_obj_block.typeinfo.is_a = "quote"; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digit_type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digit_type; comp_obj_block.text = an_object["substantive"]; comp_obj_block.has.inline_notes_reg = substantive_obj_misc_tuple[sObj.notes_reg]; comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star]; @@ -2982,10 +2982,10 @@ template SiSUdocAbstraction() { comp_obj_block.typeinfo.is_of = "block"; comp_obj_block.typeinfo.is_a = "group"; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digits.type; comp_obj_block.text = an_object["substantive"]; comp_obj_block.has.inline_notes_reg = substantive_obj_misc_tuple[sObj.notes_reg]; comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star]; @@ -3025,10 +3025,10 @@ template SiSUdocAbstraction() { comp_obj_block.typeinfo.is_of = "block"; comp_obj_block.typeinfo.is_a = "block"; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digit_type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digit_type; comp_obj_block.text = an_object["substantive"]; comp_obj_block.has.inline_notes_reg = substantive_obj_misc_tuple[sObj.notes_reg]; comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star]; @@ -3064,10 +3064,10 @@ template SiSUdocAbstraction() { comp_obj_poem_ocn.typeinfo.is_of = "block"; comp_obj_poem_ocn.typeinfo.is_a = "poem"; comp_obj_poem_ocn.node.ocn = obj_cite_digits.on; - comp_obj_poem_ocn.node.obj_cite_number = (obj_cite_number_poem["start"] ~ "..." ~ obj_cite_number_poem["end"]); - comp_obj_poem_ocn.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; // - comp_obj_poem_ocn.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; // - comp_obj_poem_ocn.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_poem_ocn.node.object_number = (object_number_poem["start"] ~ "..." ~ object_number_poem["end"]); + comp_obj_poem_ocn.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; // + comp_obj_poem_ocn.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; // + comp_obj_poem_ocn.misc.object_number_type = obj_cite_digits.type; comp_obj_poem_ocn.text = ""; the_document_body_section ~= comp_obj_poem_ocn; obj_type_status["blocks"] = TriState.off; @@ -3104,10 +3104,10 @@ template SiSUdocAbstraction() { comp_obj_code.typeinfo.is_of = "block"; comp_obj_code.typeinfo.is_a = "code"; comp_obj_code.node.ocn = obj_cite_digits.on; - comp_obj_code.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_code.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digits.type; comp_obj_code.text = an_object["substantive"]; comp_obj_code.has.inline_notes_reg = substantive_obj_misc_tuple[sObj.notes_reg]; comp_obj_code.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star]; @@ -3144,10 +3144,10 @@ template SiSUdocAbstraction() { an_object["substantive"] = substantive_obj_misc_tuple[sObj.content]; comp_obj_block = comp_obj_block.init; comp_obj_block.node.ocn = obj_cite_digits.on; - comp_obj_block.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - comp_obj_block.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; - comp_obj_block.misc.obj_cite_number_type = obj_cite_digits.type; + comp_obj_block.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + comp_obj_block.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + comp_obj_block.misc.object_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; + comp_obj_block.misc.object_number_type = obj_cite_digits.type; comp_obj_block = table_instructions(comp_obj_block, an_object["table_head"]); comp_obj_block = table_substantive_munge(comp_obj_block, an_object["substantive"]); the_document_body_section ~= comp_obj_block; @@ -4082,7 +4082,7 @@ template SiSUdocAbstraction() { body { obj_txt["munge"]=(obj_txt_in) .replaceFirst(rgx.heading, "") - .replaceFirst(rgx.obj_cite_number_off_all, "") + .replaceFirst(rgx.object_number_off_all, "") .strip; auto t = object_notes_and_links_(obj_txt["munge"], reset_note_numbers); debug(munge) { @@ -4104,7 +4104,7 @@ template SiSUdocAbstraction() { body { obj_txt["munge"]=(obj_txt_in) .replaceFirst(rgx.para_attribs, "") - .replaceFirst(rgx.obj_cite_number_off_all, ""); + .replaceFirst(rgx.object_number_off_all, ""); auto t = object_notes_and_links_(obj_txt["munge"]); debug(munge) { writeln(__LINE__); @@ -4345,9 +4345,9 @@ template SiSUdocAbstraction() { comp_obj_toc.typeinfo.is_of = "para"; comp_obj_toc.typeinfo.is_a = "toc"; comp_obj_toc.node.ocn = 0; - comp_obj_toc.node.obj_cite_number = ""; - comp_obj_toc.misc.obj_cite_number_off = ""; - comp_obj_toc.misc.obj_cite_number_type = 0; + comp_obj_toc.node.object_number = ""; + comp_obj_toc.misc.object_number_off = ""; + comp_obj_toc.misc.object_number_type = 0; comp_obj_toc.attrib.indent_hang = indent["hang_position"]; comp_obj_toc.attrib.indent_base = indent["base_position"]; comp_obj_toc.attrib.bullet = false; @@ -4365,9 +4365,9 @@ template SiSUdocAbstraction() { comp_obj_toc.typeinfo.is_of = "para"; comp_obj_toc.typeinfo.is_a = "toc"; comp_obj_toc.node.ocn = 0; - comp_obj_toc.node.obj_cite_number = ""; - comp_obj_toc.misc.obj_cite_number_off = ""; - comp_obj_toc.misc.obj_cite_number_type = 0; + comp_obj_toc.node.object_number = ""; + comp_obj_toc.misc.object_number_off = ""; + comp_obj_toc.misc.object_number_type = 0; comp_obj_toc.attrib.indent_hang = indent["hang_position"]; comp_obj_toc.attrib.indent_base = indent["base_position"]; comp_obj_toc.attrib.bullet = false; @@ -4381,9 +4381,9 @@ template SiSUdocAbstraction() { comp_obj_toc.typeinfo.is_of = "para"; comp_obj_toc.typeinfo.is_a = "toc"; comp_obj_toc.node.ocn = 0; - comp_obj_toc.node.obj_cite_number = ""; - comp_obj_toc.misc.obj_cite_number_off = ""; - comp_obj_toc.misc.obj_cite_number_type = 0; + comp_obj_toc.node.object_number = ""; + comp_obj_toc.misc.object_number_off = ""; + comp_obj_toc.misc.object_number_type = 0; comp_obj_toc.attrib.bullet = false; comp_obj_toc.has.inline_links = true; switch (obj_["lev_markup_number"].to!int) { @@ -4712,7 +4712,7 @@ template SiSUdocAbstraction() { writeln(_obj_attrib["json"]); writeln( "is: ", oa_j["is"].str(), - "; obj_cite_number: ", oa_j["obj_cite_number"].integer() + "; object_number: ", oa_j["object_number"].integer() ); } } @@ -4893,7 +4893,7 @@ template SiSUdocAbstraction() { (oa_j.type == JSON_TYPE.OBJECT) ); if (obj_is_ == "heading") { - oa_j.object["obj_cite_number"] = _comp_obj_heading.node.ocn; + oa_j.object["object_number"] = _comp_obj_heading.node.ocn; oa_j.object["lev_markup_number"] = _comp_obj_heading.node.heading_lev_markup; oa_j.object["lev_collapsed_number"] = _comp_obj_heading.node.heading_lev_collapsed; oa_j.object["heading_ptr"] @@ -4901,7 +4901,7 @@ template SiSUdocAbstraction() { oa_j.object["doc_object_ptr"] = _comp_obj_heading.ptr.doc_object; } - oa_j.object["parent_obj_cite_number"] = _comp_obj_heading.node.parent_ocn; + oa_j.object["parent_object_number"] = _comp_obj_heading.node.parent_ocn; oa_j.object["parent_lev_markup_number"] = _comp_obj_heading.node.parent_lev_markup; _obj_attrib = oa_j.toString(); return _obj_attrib; @@ -4910,8 +4910,8 @@ template SiSUdocAbstraction() { /+ +/ struct BookIndexNuggetHash { string main_term, sub_term, sub_term_bits; - int obj_cite_number_offset, obj_cite_number_endpoint; - string[] obj_cite_numbers; + int object_number_offset, object_number_endpoint; + string[] object_numbers; string[][string][string] bi; string[][string][string] hash_nugget; string[] bi_main_terms_split_arr; @@ -4943,41 +4943,41 @@ template SiSUdocAbstraction() { auto bi_main_term_and_rest = bi_main_terms_content.split(rgx.bi_main_term_plus_rest_split); if (auto m = bi_main_term_and_rest[0].match( - rgx.bi_term_and_obj_cite_numbers_match) + rgx.bi_term_and_object_numbers_match) ) { main_term = m.captures[1].strip; - obj_cite_number_offset = m.captures[2].to!int; - obj_cite_number_endpoint=(obj_cite_digits.on + obj_cite_number_offset); - obj_cite_numbers ~= (obj_cite_digits.on.to!string ~ "-" ~ to!string(obj_cite_number_endpoint) + object_number_offset = m.captures[2].to!int; + object_number_endpoint=(obj_cite_digits.on + object_number_offset); + object_numbers ~= (obj_cite_digits.on.to!string ~ "-" ~ to!string(object_number_endpoint) ~ ":" ~ segment_anchor_tag); } else { main_term = bi_main_term_and_rest[0].strip; - obj_cite_numbers ~= obj_cite_digits.on.to!string + object_numbers ~= obj_cite_digits.on.to!string ~ ":" ~ segment_anchor_tag; } - bi[main_term]["_a"] ~= obj_cite_numbers; - obj_cite_numbers=null; + bi[main_term]["_a"] ~= object_numbers; + object_numbers=null; if (bi_main_term_and_rest.length > 1) { auto bi_sub_terms_split_arr = bi_main_term_and_rest[1].split( - rgx.bi_sub_terms_plus_obj_cite_number_offset_split + rgx.bi_sub_terms_plus_object_number_offset_split ); foreach (sub_terms_bits; bi_sub_terms_split_arr) { - if (auto m = sub_terms_bits.match(rgx.bi_term_and_obj_cite_numbers_match)) { + if (auto m = sub_terms_bits.match(rgx.bi_term_and_object_numbers_match)) { sub_term = m.captures[1].strip; - obj_cite_number_offset = m.captures[2].to!int; - obj_cite_number_endpoint=(obj_cite_digits.on + obj_cite_number_offset); - obj_cite_numbers ~= (obj_cite_digits.on.to!string ~ " - " ~ to!string(obj_cite_number_endpoint) + object_number_offset = m.captures[2].to!int; + object_number_endpoint=(obj_cite_digits.on + object_number_offset); + object_numbers ~= (obj_cite_digits.on.to!string ~ " - " ~ to!string(object_number_endpoint) ~ ":" ~ segment_anchor_tag); } else { sub_term = sub_terms_bits.strip; - obj_cite_numbers ~= to!string(obj_cite_digits.on) + object_numbers ~= to!string(obj_cite_digits.on) ~ ":" ~ segment_anchor_tag; } if (!empty(sub_term)) { - bi[main_term][sub_term] ~= obj_cite_numbers; + bi[main_term][sub_term] ~= object_numbers; } - obj_cite_numbers=null; + object_numbers=null; } } } @@ -5085,9 +5085,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Book Index"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "_part_book_index"; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; @@ -5105,9 +5105,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Index"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "bookindex"; comp_obj_heading_.node.marked_up_level = "1"; comp_obj_heading_.node.heading_lev_markup = 4; @@ -5183,9 +5183,9 @@ template SiSUdocAbstraction() { comp_obj_para.typeinfo.is_a = "bookindex"; comp_obj_para.text = bi_tmp_scroll.to!string.strip; comp_obj_para.node.ocn = 0; - comp_obj_para.node.obj_cite_number = ""; - comp_obj_para.misc.obj_cite_number_off = ""; - comp_obj_para.misc.obj_cite_number_type = 0; + comp_obj_para.node.object_number = ""; + comp_obj_para.misc.object_number_off = ""; + comp_obj_para.misc.object_number_type = 0; comp_obj_para.tags.anchor_tags = bi_tmp_tags; comp_obj_para.attrib.indent_hang = 0; comp_obj_para.attrib.indent_base = 1; @@ -5200,9 +5200,9 @@ template SiSUdocAbstraction() { comp_obj_heading_ = comp_obj_heading_.init; comp_obj_heading_.text = "(skip) there is no Book Index"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; comp_obj_heading_.node.heading_lev_collapsed = 1; @@ -5315,9 +5315,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Endnotes"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "_part_endnotes"; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; @@ -5333,9 +5333,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "Endnotes"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.tags.segment_anchor_tag = "endnotes"; comp_obj_heading_.node.marked_up_level = "1"; comp_obj_heading_.node.heading_lev_markup = 4; @@ -5353,9 +5353,9 @@ template SiSUdocAbstraction() { comp_obj_heading_.typeinfo.is_a = "heading"; comp_obj_heading_.text = "(skip) there are no Endnotes"; comp_obj_heading_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_heading_.node.marked_up_level = "B"; comp_obj_heading_.node.heading_lev_markup = 1; comp_obj_heading_.node.heading_lev_collapsed = 1; @@ -5371,9 +5371,9 @@ template SiSUdocAbstraction() { comp_obj_endnote_.typeinfo.is_of = "para"; comp_obj_endnote_.typeinfo.is_a = "endnote"; comp_obj_endnote_.node.ocn = 0; - comp_obj_heading_.node.obj_cite_number = ""; - comp_obj_heading_.misc.obj_cite_number_off = ""; - comp_obj_heading_.misc.obj_cite_number_type = 0; + comp_obj_heading_.node.object_number = ""; + comp_obj_heading_.misc.object_number_off = ""; + comp_obj_heading_.misc.object_number_type = 0; comp_obj_endnote_.attrib.indent_hang = 0; comp_obj_endnote_.attrib.indent_base = 0; comp_obj_endnote_.attrib.bullet = false; @@ -5522,23 +5522,23 @@ template SiSUdocAbstraction() { assert(obj_cite_digits.on.to!int >= 0); // should not be necessary if (lv7 > State.off) { p_["lev_markup_number"] = DocStructMarkupHeading.h_text_4; - p_["obj_cite_number"] = lv7; + p_["object_number"] = lv7; } else if (lv6 > State.off) { p_["lev_markup_number"] = DocStructMarkupHeading.h_text_3; - p_["obj_cite_number"] = lv6; + p_["object_number"] = lv6; } else if (lv5 > State.off) { p_["lev_markup_number"] = DocStructMarkupHeading.h_text_2; - p_["obj_cite_number"] = lv5; + p_["object_number"] = lv5; } else { p_["lev_markup_number"] = DocStructMarkupHeading.h_text_1; - p_["obj_cite_number"] = lv4; + p_["object_number"] = lv4; } ObjGenericComposite comp_obj_location; comp_obj_location = comp_obj_location.init; comp_obj_location.typeinfo.is_a = is_; comp_obj_location.node.ocn = obj_cite_digits.on; comp_obj_location.tags.segment_anchor_tag = segment_anchor_tag.to!string; - comp_obj_location.node.parent_ocn = p_["obj_cite_number"]; + comp_obj_location.node.parent_ocn = p_["object_number"]; comp_obj_location.node.parent_lev_markup = p_["lev_markup_number"]; debug(node) { if (lev_markup_number.match(rgx.levels_numbered_headings)) { @@ -5610,7 +5610,7 @@ template SiSUdocAbstraction() { lv0 = obj_cite_digit; lv1=0; lv2=0; lv3=0; lv4=0; lv5=0; lv6=0; lv7=0; p_["lev_markup_number"] = 0; - p_["obj_cite_number"] = 0; + p_["object_number"] = 0; break; case 1: lv = DocStructMarkupHeading.h_sect_B; @@ -5618,7 +5618,7 @@ template SiSUdocAbstraction() { lv2=0; lv3=0; lv4=0; lv5=0; lv6=0; lv7=0; p_["lev_markup_number"] = DocStructMarkupHeading.h_sect_A; - p_["obj_cite_number"] = lv0; + p_["object_number"] = lv0; break; case 2: lv = DocStructMarkupHeading.h_sect_C; @@ -5626,7 +5626,7 @@ template SiSUdocAbstraction() { lv3=0; lv4=0; lv5=0; lv6=0; lv7=0; p_["lev_markup_number"] = DocStructMarkupHeading.h_sect_B; - p_["obj_cite_number"] = lv1; + p_["object_number"] = lv1; break; case 3: lv = DocStructMarkupHeading.h_sect_D; @@ -5634,7 +5634,7 @@ template SiSUdocAbstraction() { lv4=0; lv5=0; lv6=0; lv7=0; p_["lev_markup_number"] = DocStructMarkupHeading.h_sect_C; - p_["obj_cite_number"] = lv2; + p_["object_number"] = lv2; break; case 4: lv = DocStructMarkupHeading.h_text_1; @@ -5643,19 +5643,19 @@ template SiSUdocAbstraction() { if (lv3 > State.off) { p_["lev_markup_number"] = DocStructMarkupHeading.h_sect_D; - p_["obj_cite_number"] = lv3; + p_["object_number"] = lv3; } else if (lv2 > State.off) { p_["lev_markup_number"] = DocStructMarkupHeading.h_sect_C; - p_["obj_cite_number"] = lv2; + p_["object_number"] = lv2; } else if (lv1 > State.off) { p_["lev_markup_number"] = DocStructMarkupHeading.h_sect_B; - p_["obj_cite_number"] = lv1; + p_["object_number"] = lv1; } else { p_["lev_markup_number"] = DocStructMarkupHeading.h_sect_A; - p_["obj_cite_number"] = lv0; + p_["object_number"] = lv0; } break; case 5: @@ -5664,7 +5664,7 @@ template SiSUdocAbstraction() { lv6=0; lv7=0; p_["lev_markup_number"] = DocStructMarkupHeading.h_text_1; - p_["obj_cite_number"] = lv4; + p_["object_number"] = lv4; break; case 6: lv = DocStructMarkupHeading.h_text_3; @@ -5672,14 +5672,14 @@ template SiSUdocAbstraction() { lv7=0; p_["lev_markup_number"] = DocStructMarkupHeading.h_text_2; - p_["obj_cite_number"] = lv5; + p_["object_number"] = lv5; break; case 7: lv = DocStructMarkupHeading.h_text_4; lv7 = obj_cite_digit; p_["lev_markup_number"] = DocStructMarkupHeading.h_text_3; - p_["obj_cite_number"] = lv6; + p_["object_number"] = lv6; break; default: break; @@ -5692,14 +5692,14 @@ template SiSUdocAbstraction() { _comp_obj_heading_.typeinfo.is_a = "heading"; _comp_obj_heading_.text = _text.to!string.strip; _comp_obj_heading_.node.ocn = obj_cite_digits.on; - _comp_obj_heading_.node.obj_cite_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; - _comp_obj_heading_.misc.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; - _comp_obj_heading_.misc.obj_cite_number_type = obj_cite_digits.type; + _comp_obj_heading_.node.object_number = (obj_cite_digits.on==0) ? "" : obj_cite_digits.on.to!string; + _comp_obj_heading_.misc.object_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; + _comp_obj_heading_.misc.object_number_type = obj_cite_digits.type; _comp_obj_heading_.tags.segment_anchor_tag = segment_anchor_tag.to!string; _comp_obj_heading_.node.marked_up_level = lev; _comp_obj_heading_.node.heading_lev_markup = (!(lev_markup_number.empty) ? lev_markup_number.to!int : 0); _comp_obj_heading_.node.heading_lev_collapsed = (!(lev_collapsed_number.empty) ? lev_collapsed_number.to!int : 0); - _comp_obj_heading_.node.parent_ocn = p_["obj_cite_number"]; + _comp_obj_heading_.node.parent_ocn = p_["object_number"]; _comp_obj_heading_.node.parent_lev_markup = p_["lev_markup_number"]; _comp_obj_heading_.tags.heading_ancestors_text = lv_ancestors_txt; _comp_obj_heading_.ptr.doc_object = cntr_; diff --git a/src/sdp/meta/metadoc_summary.d b/src/sdp/meta/metadoc_summary.d index 0566ff5..3167677 100644 --- a/src/sdp/meta/metadoc_summary.d +++ b/src/sdp/meta/metadoc_summary.d @@ -22,24 +22,24 @@ template SiSUabstractionSummary() { auto markup = InlineMarkup(); 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", + "last_object_number" : "NA [debug \"checkdoc\" not run]", + "last_object_number_body" : "0", + "last_object_number_bkidx" : "0", ]; foreach (k; doc_matters.xml.keys_seq.seg) { foreach (obj; doc_abstraction[k]) { if (obj.typeinfo.of_part != "empty") { - if (!empty(obj.node.obj_cite_number)) { + if (!empty(obj.node.object_number)) { if (k == "body") { - check["last_obj_cite_number_body"] = obj.node.obj_cite_number; + check["last_object_number_body"] = obj.node.object_number; } - if (!(obj.node.obj_cite_number.empty)) { - check["last_obj_cite_number"] = obj.node.obj_cite_number; + if (!(obj.node.object_number.empty)) { + check["last_object_number"] = obj.node.object_number; } } if (k == "bookindex_seg") { - if (obj.misc.obj_cite_number_type == 2) { - check["last_obj_cite_number_bkidx"] = obj.misc.obj_cite_number_bkidx; + if (obj.misc.object_number_type == 2) { + check["last_object_number_bkidx"] = obj.misc.object_number_bkidx; } } } @@ -63,9 +63,9 @@ template SiSUabstractionSummary() { "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"]), + to!int(check["last_object_number_body"]), + "last object_number:", + to!int(check["last_object_number"]), "length endnotes:", // subtract headings (doc_abstraction["endnotes"].length > 2) ? (to!int(doc_abstraction["endnotes"].length - 2)) @@ -83,7 +83,7 @@ template SiSUabstractionSummary() { ? (to!int(doc_abstraction["bookindex_seg"].length)) : 0, " last book idx ocn:", - to!int(check["last_obj_cite_number_bkidx"]), + to!int(check["last_object_number_bkidx"]), "length blurb:", (doc_abstraction["blurb"].length > 1) ? (to!int(doc_abstraction["blurb"].length)) diff --git a/src/sdp/meta/object_setter.d b/src/sdp/meta/object_setter.d index 2e92877..840a71c 100644 --- a/src/sdp/meta/object_setter.d +++ b/src/sdp/meta/object_setter.d @@ -26,8 +26,8 @@ template ObjectSetter() { } struct DocObj_Node_ { string[string][string] node; - int ocn = 0; // duplicated as string with obj_cite_number - string obj_cite_number = ""; // duplicated as int with ocn may apply additional info for backmatter (glossary, biblio etc.) + int ocn = 0; // duplicated as string with object_number + string object_number = ""; // duplicated as int with ocn may apply additional info for backmatter (glossary, biblio etc.) string marked_up_level = "9"; int heading_lev_markup = 9; int heading_lev_collapsed = 9; @@ -62,9 +62,9 @@ template ObjectSetter() { string[] anchor_tags = []; } struct DocObj_Misc_ { - string obj_cite_number_bkidx = ""; - string obj_cite_number_off = ""; - int obj_cite_number_type = 0; // { ocn, non, bkidx } + string object_number_bkidx = ""; + string object_number_off = ""; + int object_number_type = 0; // { ocn, non, bkidx } } struct ObjGenericComposite { string text = ""; diff --git a/src/sdp/meta/rgx.d b/src/sdp/meta/rgx.d index 869728f..071d693 100644 --- a/src/sdp/meta/rgx.d +++ b/src/sdp/meta/rgx.d @@ -158,15 +158,15 @@ static template SiSUrgxInit() { static book_index = ctRegex!(`^=\{\s*(.+?)\}$`, "m"); static book_index_open = ctRegex!(`^=\{\s*([^}]+?)$`); static book_index_close = ctRegex!(`^(.*?)\}$`, "m"); - /+ no obj_cite_number object +/ - static obj_cite_number_off = ctRegex!(`~#$`, "m"); - static obj_cite_number_off_dh = ctRegex!(`-#$`, "m"); - static obj_cite_number_off_all = ctRegex!(`[~-]#$`, "m"); - /+ no obj_cite_number block +/ - static obj_cite_number_off_block = ctRegex!(`^--~#$`); - static obj_cite_number_off_block_dh = ctRegex!(`^---#$`); - static obj_cite_number_off_block_close = ctRegex!(`^--\+#$`); - static obj_cite_number_block_marks = ctRegex!(`^--[+~-]#$`); + /+ no object_number object +/ + static object_number_off = ctRegex!(`~#$`, "m"); + static object_number_off_dh = ctRegex!(`-#$`, "m"); + static object_number_off_all = ctRegex!(`[~-]#$`, "m"); + /+ no object_number block +/ + static object_number_off_block = ctRegex!(`^--~#$`); + static object_number_off_block_dh = ctRegex!(`^---#$`); + static object_number_off_block_close = ctRegex!(`^--\+#$`); + static object_number_block_marks = ctRegex!(`^--[+~-]#$`); /+ ignore outside code blocks +/ static skip_from_regular_parse = ctRegex!(`^(--[+~-]#|-[\\]{2}-|=[.\\]{2}=)$`); /+ line & page breaks +/ @@ -185,8 +185,8 @@ static template SiSUrgxInit() { /+ bookindex split +/ static bi_main_terms_split = ctRegex!(`\s*;\s*`); static bi_main_term_plus_rest_split = ctRegex!(`\s*:\s*`); - static bi_sub_terms_plus_obj_cite_number_offset_split = ctRegex!(`\s*\|\s*`); - static bi_term_and_obj_cite_numbers_match = ctRegex!(`^(.+?)\+(\d+)`); + static bi_sub_terms_plus_object_number_offset_split = ctRegex!(`\s*\|\s*`); + static bi_term_and_object_numbers_match = ctRegex!(`^(.+?)\+(\d+)`); /+ language codes +/ auto language_codes = ctRegex!("(am|bg|bn|br|ca|cs|cy|da|de|el|en|eo|es|et|eu|fi|fr|ga|gl|he|hi|hr|hy|ia|is|it|ja|ko|la|lo|lt|lv|ml|mr|nl|no|nn|oc|pl|pt|pt_BR|ro|ru|sa|se|sk|sl|sq|sr|sv|ta|te|th|tk|tr|uk|ur|vi|zh)"); diff --git a/src/sdp/output/epub3.d b/src/sdp/output/epub3.d index 18b9986..303898d 100644 --- a/src/sdp/output/epub3.d +++ b/src/sdp/output/epub3.d @@ -117,7 +117,7 @@ template outputEPub3() { "%s~ [%s.xhtml#%s] %s", obj.marked_up_level, obj.tags.segment_anchor_tag, - obj.node.obj_cite_number, + obj.node.object_number, obj.text ); } @@ -531,23 +531,23 @@ template outputEPub3() { format(q"¶ ¶", obj.tags.segment_anchor_tag, - obj.node.obj_cite_number, + obj.node.object_number, obj.tags.segment_anchor_tag, - obj.node.obj_cite_number, + obj.node.object_number, ); oepbs_content_parts["spine"] ~= format(q"¶ ¶", obj.tags.segment_anchor_tag, - obj.node.obj_cite_number, + obj.node.object_number, ); oepbs_content_parts["guide"] ~= format(q"¶ ¶", obj.tags.segment_anchor_tag, - obj.node.obj_cite_number, + obj.node.object_number, obj.tags.segment_anchor_tag, - obj.node.obj_cite_number, + obj.node.object_number, ); } } diff --git a/src/sdp/output/xmls.d b/src/sdp/output/xmls.d index cc08bfe..e5d27c9 100644 --- a/src/sdp/output/xmls.d +++ b/src/sdp/output/xmls.d @@ -579,7 +579,7 @@ template outputXHTMLs() { } _txt = font_face(_txt); string o; - if (obj.node.obj_cite_number.empty) { + if (obj.node.object_number.empty) { o = format(q"¶%s
%s @@ -602,12 +602,12 @@ template outputXHTMLs() {
¶", _horizontal_rule, - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, obj.node.heading_lev_markup, obj.typeinfo.is_a, - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, tags, _txt, obj.node.heading_lev_markup, @@ -649,7 +649,7 @@ template outputXHTMLs() { _txt = font_face(_txt); string o; _txt = (obj.attrib.bullet) ? ("●  " ~ _txt) : _txt; - if (obj.node.obj_cite_number.empty) { + if (obj.node.object_number.empty) { o = format(q"¶

%s %s @@ -668,12 +668,12 @@ template outputXHTMLs() { %s

¶", - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, obj.typeinfo.is_a, obj.attrib.indent_hang, obj.attrib.indent_base, - obj.node.obj_cite_number, + obj.node.object_number, tags, _txt ); @@ -712,7 +712,7 @@ template outputXHTMLs() { ) { _txt = font_face(_txt); string o; - if (obj.node.obj_cite_number.empty) { + if (obj.node.object_number.empty) { o = format(q"¶

%s @@ -728,10 +728,10 @@ template outputXHTMLs() { %s

¶", - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, obj.typeinfo.is_a, - obj.node.obj_cite_number, + obj.node.object_number, _txt ); } @@ -769,7 +769,7 @@ template outputXHTMLs() { ) { _txt = font_face(_txt); string o; - if (obj.node.obj_cite_number.empty) { + if (obj.node.object_number.empty) { o = format(q"¶

%s @@ -785,10 +785,10 @@ template outputXHTMLs() { %s

¶", - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, obj.typeinfo.is_a, - obj.node.obj_cite_number, + obj.node.object_number, _txt ); } @@ -827,7 +827,7 @@ template outputXHTMLs() { ) { _txt = font_face(_txt); string o; - if (obj.node.obj_cite_number.empty) { + if (obj.node.object_number.empty) { o = format(q"¶

%s

¶", @@ -839,10 +839,10 @@ template outputXHTMLs() {

%s

¶", - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, obj.typeinfo.is_a, - obj.node.obj_cite_number, + obj.node.object_number, _txt.stripRight ); } @@ -881,7 +881,7 @@ template outputXHTMLs() { ) { _txt = font_face(_txt); string o; - if (obj.node.obj_cite_number.empty) { + if (obj.node.object_number.empty) { o = format(q"¶

%s

¶", @@ -893,10 +893,10 @@ template outputXHTMLs() {

%s

¶", - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, obj.typeinfo.is_a, - obj.node.obj_cite_number, + obj.node.object_number, _txt ); } @@ -981,10 +981,10 @@ template outputXHTMLs() { %s

¶", - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, obj.typeinfo.is_a, - obj.node.obj_cite_number, + obj.node.object_number, tags, _txt, _note @@ -1011,7 +1011,7 @@ template outputXHTMLs() { string _txt, ) { string o; - if (obj.node.obj_cite_number.empty) { + if (obj.node.object_number.empty) { o = format(q"¶

%s

¶", @@ -1023,10 +1023,10 @@ template outputXHTMLs() {

%s

¶", - obj.node.obj_cite_number, - obj.node.obj_cite_number, + obj.node.object_number, + obj.node.object_number, obj.typeinfo.is_a, - obj.node.obj_cite_number, + obj.node.object_number, _txt ); } -- cgit v1.2.3