aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
Diffstat (limited to 'org')
-rw-r--r--org/meta_debugs.org6
-rw-r--r--org/output_sqlite.org18
-rw-r--r--org/output_xmls.org46
-rw-r--r--org/sdp.org2
4 files changed, 36 insertions, 36 deletions
diff --git a/org/meta_debugs.org b/org/meta_debugs.org
index 38b3b4e..7789f06 100644
--- a/org/meta_debugs.org
+++ b/org/meta_debugs.org
@@ -89,7 +89,7 @@ debug(parent) {
);
foreach (key; doc_matters.xml.keys_seq.seg) {
foreach (obj; contents[key]) {
- if (obj.typeinfo.of_part != "empty") {
+ if (obj.typeinfo.is_of_part != "empty") {
if (obj.typeinfo.is_a == "heading") {
writefln(
"%s node: %s heading: %s %s",
@@ -117,7 +117,7 @@ debug(dumpdoc) {
);
if (key.length > 0) {
foreach (obj; contents[key]) {
- if (obj.typeinfo.of_part != "empty") {
+ if (obj.typeinfo.is_of_part != "empty") {
writefln(
"[%s][%s]\n%s",
obj.object_number,
@@ -482,7 +482,7 @@ debug(objects) {
__LINE__,
);
foreach (obj; contents[key]) {
- if (obj.typeinfo.of_part != "empty") {
+ if (obj.typeinfo.is_of_part != "empty") {
writefln(
"* [%s][%s] %s",
obj.object_number,
diff --git a/org/output_sqlite.org b/org/output_sqlite.org
index 8348870..376d042 100644
--- a/org/output_sqlite.org
+++ b/org/output_sqlite.org
@@ -935,9 +935,9 @@ string doc_text;
string[] _insert_doc_objects;
foreach (part; doc_matters.xml.keys_seq.sql) {
foreach (obj; doc_abstraction[part]) {
- switch (obj.typeinfo.of_part) {
+ switch (obj.typeinfo.is_of_part) {
case "frontmatter": assert(part == "head", part);
- switch (obj.typeinfo.is_of) {
+ switch (obj.typeinfo.is_of_type) {
case "para":
switch (obj.typeinfo.is_a) {
case "heading":
@@ -952,13 +952,13 @@ foreach (part; doc_matters.xml.keys_seq.sql) {
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_type);
}
break;
}
break;
case "body": // assert(part == "body", part); // TODO broken
- switch (obj.typeinfo.is_of) {
+ switch (obj.typeinfo.is_of_type) {
case "para":
switch (obj.typeinfo.is_a) {
case "heading":
@@ -1010,14 +1010,14 @@ foreach (part; doc_matters.xml.keys_seq.sql) {
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_type);
}
break;
}
break;
case "backmatter":
assert(part == "glossary" || "bibliography" || "bookindex_seg" || "blurb" || "tail", part);
- switch (obj.typeinfo.is_of) {
+ switch (obj.typeinfo.is_of_type) {
case "para":
switch (obj.typeinfo.is_a) {
case "heading":
@@ -1044,7 +1044,7 @@ foreach (part; doc_matters.xml.keys_seq.sql) {
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_type);
}
break;
}
@@ -1053,7 +1053,7 @@ foreach (part; doc_matters.xml.keys_seq.sql) {
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.of_part); // check where empty value could come from
+ writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_part); // check where empty value could come from
writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_a);
writeln(__FILE__, ":", __LINE__, ": ", obj.text); // check where empty value could come from
}
@@ -1306,7 +1306,7 @@ _insert_doc_objects_row = format(q"ΒΆ
SQLinsertDelimiter!()(obj_txt["text"]),
SQLinsertDelimiter!()(obj_txt["html"]),
obj.node.heading_lev_markup,
- obj.typeinfo.is_of,
+ obj.typeinfo.is_of_type,
obj.typeinfo.is_a,
);
#+END_SRC
diff --git a/org/output_xmls.org b/org/output_xmls.org
index 58f251a..894f329 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -1369,9 +1369,9 @@ void scroll(D,I)(
foreach (obj; doc_abstraction[part]) {
delimit = xhtml_format.div_delimit(part, previous_part);
string _txt = xhtml_format.special_characters(obj, obj.text);
- switch (obj.typeinfo.of_part) {
+ switch (obj.typeinfo.is_of_part) {
case "frontmatter": assert(part == "head" || "toc_scroll");
- switch (obj.typeinfo.is_of) {
+ switch (obj.typeinfo.is_of_type) {
case "para":
switch (obj.typeinfo.is_a) {
case "heading":
@@ -1389,13 +1389,13 @@ void scroll(D,I)(
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_type);
}
break;
}
break;
case "body": assert(part == "body" || "head"); // surprise
- switch (obj.typeinfo.is_of) {
+ switch (obj.typeinfo.is_of_type) {
case "para":
switch (obj.typeinfo.is_a) {
case "heading":
@@ -1442,14 +1442,14 @@ void scroll(D,I)(
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_type);
}
break;
}
break;
case "backmatter":
assert(part == "endnotes" || "glossary" || "bibliography" || "bookindex_scroll" || "blurb" || "tail");
- switch (obj.typeinfo.is_of) {
+ switch (obj.typeinfo.is_of_type) {
case "para":
switch (obj.typeinfo.is_a) {
case "heading":
@@ -1479,7 +1479,7 @@ void scroll(D,I)(
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_type);
}
break;
}
@@ -1488,7 +1488,7 @@ void scroll(D,I)(
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.of_part);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_part);
writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_a);
writeln(__FILE__, ":", __LINE__, ": ", obj.text);
}
@@ -1618,9 +1618,9 @@ void seg(D,M)(
}
} else {
assert(part == "head" || "toc_seg" || "body" || "endnotes" || "glossary" || "bibliography" || "bookindex_seg" || "blurb" || "tail");
- switch (obj.typeinfo.of_part) {
+ switch (obj.typeinfo.is_of_part) {
case "frontmatter": assert(part == "head" || "toc_seg");
- switch (obj.typeinfo.is_of) {
+ switch (obj.typeinfo.is_of_type) {
case "para":
switch (obj.typeinfo.is_a) {
case "toc":
@@ -1642,7 +1642,7 @@ void seg(D,M)(
}
break;
case "body": assert(part == "body");
- switch (obj.typeinfo.is_of) {
+ switch (obj.typeinfo.is_of_type) {
case "para":
switch (obj.typeinfo.is_a) {
case "para":
@@ -1697,14 +1697,14 @@ void seg(D,M)(
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_type);
}
break;
}
break;
case "backmatter":
assert(part == "endnotes" || "glossary" || "bibliography" || "bookindex_seg" || "blurb" || "tail");
- switch (obj.typeinfo.is_of) {
+ switch (obj.typeinfo.is_of_type) {
case "para":
switch (obj.typeinfo.is_a) {
case "endnote": assert(part == "endnotes");
@@ -1740,7 +1740,7 @@ void seg(D,M)(
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_type);
}
break;
}
@@ -1749,7 +1749,7 @@ void seg(D,M)(
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.of_part);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_part);
}
break;
}
@@ -2292,9 +2292,9 @@ void outputEPub3(D,I)(
}
} else {
assert(part == "head" || "toc_seg" || "body" || "endnotes" || "glossary" || "bibliography" || "bookindex_seg" || "blurb" || "tail");
- switch (obj.typeinfo.of_part) {
+ switch (obj.typeinfo.is_of_part) {
case "frontmatter": assert(part == "head" || "toc_seg");
- switch (obj.typeinfo.is_of) {
+ switch (obj.typeinfo.is_of_type) {
case "para":
switch (obj.typeinfo.is_a) {
case "toc":
@@ -2311,13 +2311,13 @@ void outputEPub3(D,I)(
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_type);
}
break;
}
break;
case "body": assert(part == "body");
- switch (obj.typeinfo.is_of) {
+ switch (obj.typeinfo.is_of_type) {
case "para":
switch (obj.typeinfo.is_a) {
case "para":
@@ -2372,14 +2372,14 @@ void outputEPub3(D,I)(
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_type);
}
break;
}
break;
case "backmatter":
assert(part == "endnotes" || "glossary" || "bibliography" || "bookindex_seg" || "blurb" || "tail");
- switch (obj.typeinfo.is_of) {
+ switch (obj.typeinfo.is_of_type) {
case "para":
switch (obj.typeinfo.is_a) {
case "endnote": assert(part == "endnotes");
@@ -2415,7 +2415,7 @@ void outputEPub3(D,I)(
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_type);
}
break;
}
@@ -2424,7 +2424,7 @@ void outputEPub3(D,I)(
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.of_part);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_part);
}
break;
}
diff --git a/org/sdp.org b/org/sdp.org
index 727b16a..e5ed367 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -995,7 +995,7 @@ string[string] check = [
];
foreach (k; doc_matters.xml.keys_seq.seg) {
foreach (obj; doc_abstraction[k]) {
- if (obj.typeinfo.of_part != "empty") {
+ if (obj.typeinfo.is_of_part != "empty") {
if (!empty(obj.node.object_number)) {
if (k == "body") {
check["last_object_number_body"] = obj.node.object_number;