aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sdp
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2018-06-19 19:02:18 -0400
committerRalph Amissah <ralph@amissah.com>2019-04-10 15:14:15 -0400
commite29d507ab0b217595041fb1061efca98aaa17536 (patch)
treefb6623dd7dfbbff6bd15f01d0278716af0ab8936 /src/sdp
parentnaming is_of_ (is_ of_) (diff)
naming is_of_ (is_ of_)
Diffstat (limited to 'src/sdp')
-rw-r--r--src/sdp/meta/doc_debugs.d6
-rw-r--r--src/sdp/meta/metadoc_summary.d2
-rw-r--r--src/sdp/output/epub3.d16
-rw-r--r--src/sdp/output/html.d30
-rw-r--r--src/sdp/output/sqlite.d18
5 files changed, 36 insertions, 36 deletions
diff --git a/src/sdp/meta/doc_debugs.d b/src/sdp/meta/doc_debugs.d
index f10411b..652fb00 100644
--- a/src/sdp/meta/doc_debugs.d
+++ b/src/sdp/meta/doc_debugs.d
@@ -39,7 +39,7 @@ template SiSUdebugs() {
);
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",
@@ -61,7 +61,7 @@ template SiSUdebugs() {
);
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,
@@ -236,7 +236,7 @@ template SiSUdebugs() {
__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/src/sdp/meta/metadoc_summary.d b/src/sdp/meta/metadoc_summary.d
index a025411..0c5e73d 100644
--- a/src/sdp/meta/metadoc_summary.d
+++ b/src/sdp/meta/metadoc_summary.d
@@ -28,7 +28,7 @@ template SiSUabstractionSummary() {
];
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;
diff --git a/src/sdp/output/epub3.d b/src/sdp/output/epub3.d
index 82d8764..74856e1 100644
--- a/src/sdp/output/epub3.d
+++ b/src/sdp/output/epub3.d
@@ -369,9 +369,9 @@ template outputEPub3() {
}
} 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":
@@ -388,13 +388,13 @@ template outputEPub3() {
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":
@@ -449,14 +449,14 @@ template outputEPub3() {
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");
@@ -492,7 +492,7 @@ template outputEPub3() {
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;
}
@@ -501,7 +501,7 @@ template outputEPub3() {
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/src/sdp/output/html.d b/src/sdp/output/html.d
index 6078c00..d9992a8 100644
--- a/src/sdp/output/html.d
+++ b/src/sdp/output/html.d
@@ -28,9 +28,9 @@ template outputHTML() {
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":
@@ -48,13 +48,13 @@ template outputHTML() {
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":
@@ -101,14 +101,14 @@ template outputHTML() {
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":
@@ -138,7 +138,7 @@ template outputHTML() {
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;
}
@@ -147,7 +147,7 @@ template outputHTML() {
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);
}
@@ -264,9 +264,9 @@ template outputHTML() {
}
} 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":
@@ -288,7 +288,7 @@ template outputHTML() {
}
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":
@@ -343,14 +343,14 @@ template outputHTML() {
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");
@@ -386,7 +386,7 @@ template outputHTML() {
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;
}
@@ -395,7 +395,7 @@ template outputHTML() {
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/src/sdp/output/sqlite.d b/src/sdp/output/sqlite.d
index f45eec6..b4be286 100644
--- a/src/sdp/output/sqlite.d
+++ b/src/sdp/output/sqlite.d
@@ -892,7 +892,7 @@ template SQLiteInsertDocObjectsLoop() {
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,
);
return _insert_doc_objects_row;
@@ -903,9 +903,9 @@ template SQLiteInsertDocObjectsLoop() {
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":
@@ -920,13 +920,13 @@ template SQLiteInsertDocObjectsLoop() {
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":
@@ -978,14 +978,14 @@ template SQLiteInsertDocObjectsLoop() {
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":
@@ -1012,7 +1012,7 @@ template SQLiteInsertDocObjectsLoop() {
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;
}
@@ -1021,7 +1021,7 @@ template SQLiteInsertDocObjectsLoop() {
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
}