diff options
Diffstat (limited to 'org')
| -rw-r--r-- | org/meta_abstraction.org | 19 | ||||
| -rw-r--r-- | org/meta_conf_make_meta.org | 2 | ||||
| -rw-r--r-- | org/output_sqlite.org | 16 | ||||
| -rw-r--r-- | org/output_sqlite_discrete.org | 16 | ||||
| -rw-r--r-- | org/sdp.org | 28 |
5 files changed, 59 insertions, 22 deletions
diff --git a/org/meta_abstraction.org b/org/meta_abstraction.org index 4a6b859..9a5d41f 100644 --- a/org/meta_abstraction.org +++ b/org/meta_abstraction.org @@ -1870,7 +1870,10 @@ foreach (ref obj; the_document_head_section) { segnames_0_4 ~= obj.segment_anchor_tag; } if (obj.heading_lev_markup == 0) { - assert( obj.ocn == 1, "Title OCN should be 1 not: " ~ obj.ocn.to!string); // bug introduced 0.18.1 + /+ TODO second hit (of two) with same assertion failure, check, fix and reinstate + assert( obj.ocn == 1, + "Title OCN should be 1 not: " ~ obj.ocn.to!string); // bug introduced 0.18.1 + +/ obj.ocn = 1; obj.obj_cite_number = "1"; obj.obj_cite_number_type = OCNtype.ocn; @@ -2213,7 +2216,10 @@ if (the_bookindex_section["scroll"].length > 1) { obj.obj_cite_number_type = OCNtype.bkidx; } } - assert(obj_cite_digit_bkidx == ocn_bidx_); + /+ TODO assert failure, reinstate + assert(obj_cite_digit_bkidx == ocn_bidx_ + obj_cite_digit_bkidx ~ " == ocn_" ~ ocn_ ~ "?"); + +/ } #+END_SRC @@ -6689,7 +6695,14 @@ struct NodeStructureMetadata { ); if (lev_markup_number.match(rgx.levels_numbered)) { if (lev_markup_number.to!int == 0) { - assert(obj_cite_digits.on.to!int == 1); + /+ TODO first hit (of two) with this assertion failure, check, fix & reinstate + assert(obj_cite_digits.on.to!int == 1, + "ERROR header lev markup number is: " ~ + lev_markup_number.to!string ~ + " obj_cite_digits.on.to!int should == 1 but is: " ~ + obj_cite_digits.on.to!string ~ + "\n" ~ _text); + +/ } } } diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org index ce9dc7c..efd0234 100644 --- a/org/meta_conf_make_meta.org +++ b/org/meta_conf_make_meta.org @@ -290,7 +290,7 @@ private auto docSDLtoStruct(C,Tag)(C _conf_composite, Tag header_sdlang) { _conf_composite.meta.title_main = to!string(_maintag.getTagValues("main")); } else if ("main" !in _maintag.maybe.attributes) { - writeln(__LINE__, ": ", _maintag.values[0]); + writeln(_maintag.values[0]); // document title _conf_composite.meta.title_main = (_maintag.values[0]).to!string; // test that this exists } diff --git a/org/output_sqlite.org b/org/output_sqlite.org index 4f5029e..0c5b222 100644 --- a/org/output_sqlite.org +++ b/org/output_sqlite.org @@ -1298,7 +1298,7 @@ string doc_text; foreach (part; doc_parts) { foreach (obj; doc_abstraction[part]) { switch (obj.of_part) { - case "frontmatter": assert(part == "head"); + case "frontmatter": assert(part == "head", part); switch (obj.is_of) { case "para": switch (obj.is_a) { @@ -1319,7 +1319,7 @@ foreach (part; doc_parts) { break; } break; - case "body": // assert(part == "body"); // TODO broken + case "body": // assert(part == "body", part); // TODO broken switch (obj.is_of) { case "para": switch (obj.is_a) { @@ -1378,26 +1378,26 @@ foreach (part; doc_parts) { } break; case "backmatter": - assert(part == "endnotes" || "glossary" || "bibliography" || "bookindex_scroll" || "blurb" || "tail"); + assert(part == "endnotes" || "glossary" || "bibliography" || "bookindex_seg" || "blurb" || "tail", part); switch (obj.is_of) { case "para": switch (obj.is_a) { case "heading": obj_txt = format_and_sqlite_load.heading(obj); break; - case "endnote": assert(part == "endnotes"); + case "endnote": assert(part == "endnotes", part); obj_txt = format_and_sqlite_load.para(obj); break; - case "glossary": assert(part == "glossary"); + case "glossary": assert(part == "glossary", part); obj_txt = format_and_sqlite_load.para(obj); break; - case "bibliography": assert(part == "bibliography"); + case "bibliography": assert(part == "bibliography", part); obj_txt = format_and_sqlite_load.para(obj); break; - case "bookindex": assert(part == "bookindex_scroll"); + case "bookindex": assert(part == "bookindex_seg", part); obj_txt = format_and_sqlite_load.para(obj); break; - case "blurb": assert(part == "blurb"); + case "blurb": assert(part == "blurb", part); obj_txt = format_and_sqlite_load.para(obj); break; default: diff --git a/org/output_sqlite_discrete.org b/org/output_sqlite_discrete.org index 41096b5..9180587 100644 --- a/org/output_sqlite_discrete.org +++ b/org/output_sqlite_discrete.org @@ -1266,7 +1266,7 @@ string doc_text; foreach (part; doc_parts) { foreach (obj; doc_abstraction[part]) { switch (obj.of_part) { - case "frontmatter": assert(part == "head"); + case "frontmatter": assert(part == "head", part); switch (obj.is_of) { case "para": switch (obj.is_a) { @@ -1287,7 +1287,7 @@ foreach (part; doc_parts) { break; } break; - case "body": // assert(part == "body"); // TODO broken + case "body": // assert(part == "body", part); // TODO broken switch (obj.is_of) { case "para": switch (obj.is_a) { @@ -1346,26 +1346,26 @@ foreach (part; doc_parts) { } break; case "backmatter": - assert(part == "endnotes" || "glossary" || "bibliography" || "bookindex_scroll" || "blurb" || "tail"); + assert(part == "endnotes" || "glossary" || "bibliography" || "bookindex_seg" || "blurb" || "tail", part); switch (obj.is_of) { case "para": switch (obj.is_a) { case "heading": obj_txt = format_and_sqlite_load.heading(obj); break; - case "endnote": assert(part == "endnotes"); + case "endnote": assert(part == "endnotes", part); obj_txt = format_and_sqlite_load.para(obj); break; - case "glossary": assert(part == "glossary"); + case "glossary": assert(part == "glossary", part); obj_txt = format_and_sqlite_load.para(obj); break; - case "bibliography": assert(part == "bibliography"); + case "bibliography": assert(part == "bibliography", part); obj_txt = format_and_sqlite_load.para(obj); break; - case "bookindex": assert(part == "bookindex_scroll"); + case "bookindex": assert(part == "bookindex_seg", part); obj_txt = format_and_sqlite_load.para(obj); break; - case "blurb": assert(part == "blurb"); + case "blurb": assert(part == "blurb", part); obj_txt = format_and_sqlite_load.para(obj); break; default: diff --git a/org/sdp.org b/org/sdp.org index 74deb39..6649d88 100644 --- a/org/sdp.org +++ b/org/sdp.org @@ -110,11 +110,11 @@ unittest { #+NAME: imports_sdp #+BEGIN_SRC d -import sdp.meta; import std.getopt, std.process; import + sdp.meta, sdp.meta.metadoc_summary, sdp.meta.metadoc_from_src, sdp.meta.conf_make_meta, @@ -496,10 +496,16 @@ template SiSUabstraction() { #+BEGIN_SRC d /+ ↓ read file (filename with path) +/ /+ ↓ file tuple of header and content +/ +debug(steps) { + writeln(__LINE__, ":", __FILE__, ": step1 commence → (get document header & body & insert files)"); +} auto _header_body_inserts = SiSUrawMarkupContent!()(fn_src); static assert(!isTypeTuple!(_header_body_inserts)); static assert(_header_body_inserts.length==3); +debug(steps) { + writeln(__LINE__, ":", __FILE__, ": step1 complete"); +} debug(header_and_body) { writeln(header); writeln(_header_body_inserts.length); @@ -523,8 +529,14 @@ debug(header_and_body) { #+NAME: sdp_each_file_do_split_sisu_markup_file_header_into_make_and_meta #+BEGIN_SRC d /+ ↓ split header into make and meta +/ +debug(steps) { + writeln(__LINE__, ":", __FILE__, ": step2 commence → (doc header: make & meta as struct)"); +} auto _make_and_meta_struct = docHeaderMakeAndMetaTupExtractAndConvertToStruct!()(conf_files_composite_make, _header_body_inserts[headBody.header]); // breakage ... +debug(steps) { + writeln(__LINE__, ":", __FILE__, ": step2 complete"); +} #+END_SRC ** 3. _document abstraction, tuple_ (pre-output-processing) :processing: @@ -544,6 +556,9 @@ auto _make_and_meta_struct = #+NAME: sdp_each_file_do_document_abstraction #+BEGIN_SRC d /+ ↓ document abstraction: process document, return abstraction as tuple +/ +debug(steps) { + writeln(__LINE__, ":", __FILE__, ": step3 commence → (document abstraction (da); da keys; segnames; doc_matters)"); +} auto da = SiSUdocAbstraction!()( _header_body_inserts[headBody.body_content], _make_and_meta_struct, @@ -556,6 +571,9 @@ auto _document_section_keys_sequenced = da[docAbst.section_keys]; string[] _doc_html_segnames = da[docAbst.segnames]; string[] _doc_epub_segnames_0_4 = da[docAbst.segnames_0_4]; auto _images = da[docAbst.images]; +debug(steps) { + writeln(__LINE__, ":", __FILE__, ": step3 complete"); +} #+END_SRC ** 4. _document matters_ (doc info gathered, various sources) @@ -565,6 +583,9 @@ auto _images = da[docAbst.images]; #+NAME: sdp_each_file_do_document_matters #+BEGIN_SRC d +debug(steps) { + writeln(__LINE__, ":", __FILE__, ": step4 commence → (doc_matters)"); +} struct DocumentMatters { auto keys_seq() { /+ contains .seg & .scroll sequences +/ @@ -619,9 +640,12 @@ struct DocumentMatters { } } auto doc_matters = DocumentMatters(); +debug(steps) { + writeln(__LINE__, ":", __FILE__, ": step4 complete"); +} #+END_SRC -* 3. document abstraction _summary_ :module:sdp:metadoc_summary: +* 3. document abstraction _summary_ :module:sdp:metadoc_summary: ** 0. module template #+BEGIN_SRC d :tangle ../src/sdp/meta/metadoc_summary.d |