From 8ddeddffb0f5323932f6f44c6005496075a9ad73 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 6 Sep 2016 20:47:02 -0400
Subject: naming of para indent attributes
---
org/ao_abstract_doc_source.org | 58 ++++++++++++++++++++--------------------
org/output.org | 5 ++--
src/sdp/ao_abstract_doc_source.d | 38 +++++++++++++-------------
src/sdp/ao_object_setter.d | 20 +++++++-------
src/sdp/output_html.d | 4 +--
5 files changed, 62 insertions(+), 63 deletions(-)
diff --git a/org/ao_abstract_doc_source.org b/org/ao_abstract_doc_source.org
index b570f83..b2f38c8 100644
--- a/org/ao_abstract_doc_source.org
+++ b/org/ao_abstract_doc_source.org
@@ -638,8 +638,8 @@ if ((type["heading"] == State.on)
// bullet
// );
header_set_common(line_occur, an_object, type);
- indent["first"] = "0";
- indent["second"] = "0";
+ indent["hang_position"] = "0";
+ indent["base_position"] = "0";
bullet = false;
processing.remove("verse");
++counter;
@@ -2319,8 +2319,8 @@ auto para_match(
}
type["para"] = State.on;
an_object["obj"] ~= line ~= "\n";
- indent["first"] = to!string(m.captures[1]);
- indent["second"] = "0";
+ indent["hang_position"] = to!string(m.captures[1]);
+ indent["base_position"] = "0";
bullet = false;
} else if (matchFirst(line, rgx.para_bullet)) {
debug(parabullet) { // para bullet
@@ -2328,8 +2328,8 @@ auto para_match(
}
type["para"] = State.on;
an_object["obj"] ~= line;
- indent["first"] = "0";
- indent["second"] = "0";
+ indent["hang_position"] = "0";
+ indent["base_position"] = "0";
bullet = true;
} else if (auto m = matchFirst(line, rgx.para_indent_hang)) {
debug(paraindenthang) { // para indent hang
@@ -2337,8 +2337,8 @@ auto para_match(
}
type["para"] = State.on;
an_object["obj"] ~= line;
- indent["first"] = to!string(m.captures[1]);
- indent["second"] = to!string(m.captures[2]);
+ indent["hang_position"] = to!string(m.captures[1]);
+ indent["base_position"] = to!string(m.captures[2]);
bullet = false;
} else if (auto m = matchFirst(line, rgx.para_bullet_indent)) {
debug(parabulletindent) { // para bullet indent
@@ -2346,15 +2346,15 @@ auto para_match(
}
type["para"] = State.on;
an_object["obj"] ~= line;
- indent["first"] = to!string(m.captures[1]);
- indent["second"] = "0";
+ indent["hang_position"] = to!string(m.captures[1]);
+ indent["base_position"] = "0";
bullet = true;
} else {
// !line.empty
type["para"] = State.on;
an_object["obj"] ~= line;
- indent["first"] = "0";
- indent["second"] = "0";
+ indent["hang_position"] = "0";
+ indent["base_position"] = "0";
bullet = false;
}
++line_occur["para"];
@@ -2401,23 +2401,23 @@ struct ObjAttributes {
obj_txt["munge"]=obj_txt_in;
if (matchFirst(obj_txt_in, rgx.para_bullet)) {
obj_txt["attrib"] =" \"bullet\": \"true\","
- ~ " \"indent_first\": 0,"
+ ~ " \"indent_start\": 0,"
~ " \"indent_rest\": 0,";
} else if (auto m = matchFirst(obj_txt_in, rgx.para_bullet_indent)) {
obj_txt["attrib"] =" \"bullet\": \"true\","
- ~ " \"indent_first\": " ~ to!string(m.captures[1]) ~ ","
+ ~ " \"indent_start\": " ~ to!string(m.captures[1]) ~ ","
~ " \"indent_rest\": " ~ to!string(m.captures[1]) ~ ",";
} else if (auto m = matchFirst(obj_txt_in, rgx.para_indent_hang)) {
obj_txt["attrib"] =" \"bullet\": \"false\","
- ~ " \"indent_first\": " ~ to!string(m.captures[1]) ~ ","
+ ~ " \"indent_start\": " ~ to!string(m.captures[1]) ~ ","
~ " \"indent_rest\": " ~ to!string(m.captures[2]) ~ ",";
} else if (auto m = matchFirst(obj_txt_in, rgx.para_indent)) {
obj_txt["attrib"] =" \"bullet\": \"false\","
- ~ " \"indent_first\": " ~ to!string(m.captures[1]) ~ ","
+ ~ " \"indent_start\": " ~ to!string(m.captures[1]) ~ ","
~ " \"indent_rest\": " ~ to!string(m.captures[1]) ~ ",";
} else {
obj_txt["attrib"] =" \"bullet\": \"false\","
- ~ " \"indent_first\": 0,"
+ ~ " \"indent_start\": 0,"
~ " \"indent_rest\": 0,";
}
return obj_txt["attrib"];
@@ -3107,8 +3107,8 @@ struct BookIndexReportSection {
bi_tmp = replaceFirst(bi_tmp, rgx.trailing_linebreak, "");
type="para";
attrib="";
- indent["first"] = "0";
- indent["second"] = "1";
+ indent["hang_position"] = "0";
+ indent["base_position"] = "1";
attrib="";
// bookindex_section ~=
// set_abstract_object.contents_para(
@@ -3869,8 +3869,8 @@ struct HeadingAttrib {
int lev_collapsed_number = 9;
}
struct ParaAttrib {
- int indent_first = 0;
- int indent_second = 0;
+ int indent_start = 0;
+ int indent_rest = 0;
bool bullet = false;
}
struct BlockAttrib {
@@ -3954,14 +3954,14 @@ auto contents_para(
in bool bullet
) {
ObjComposite object_set;
- object_set.use = "content";
- object_set.of = "para";
- object_set.is_a = "para";
- object_set.object = object;
- object_set.obj_cite_number = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
- object_set.para_attrib.indent_first = 0; // indent["first"];
- object_set.para_attrib.indent_second = 0; // indent["second"];
- object_set.para_attrib.bullet = false;
+ object_set.use = "content";
+ object_set.of = "para";
+ object_set.is_a = "para";
+ object_set.object = object.strip;
+ object_set.obj_cite_number = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
+ object_set.para_attrib.indent_start = 0; // indent["hang_position"];
+ object_set.para_attrib.indent_rest = 0; // indent["base_position"];
+ object_set.para_attrib.bullet = false;
// object_set.node_structure.node = node;
return object_set;
}
diff --git a/org/output.org b/org/output.org
index 8f221bc..1e1a346 100644
--- a/org/output.org
+++ b/org/output.org
@@ -18,7 +18,6 @@
** html [#A] :html:
*** html
**** html functions
-
***** html
#+name: output_html
@@ -82,8 +81,8 @@ auto html_para(O)(
◎",
obj.obj_cite_number,
obj.obj_cite_number,
- obj.para_attrib.indent_first,
- obj.para_attrib.indent_second,
+ obj.para_attrib.indent_start,
+ obj.para_attrib.indent_rest,
obj.obj_cite_number,
obj.object
);
diff --git a/src/sdp/ao_abstract_doc_source.d b/src/sdp/ao_abstract_doc_source.d
index 3b9dbe6..3971db1 100644
--- a/src/sdp/ao_abstract_doc_source.d
+++ b/src/sdp/ao_abstract_doc_source.d
@@ -460,8 +460,8 @@ template SiSUdocAbstraction() {
// bullet
// );
header_set_common(line_occur, an_object, type);
- indent["first"] = "0";
- indent["second"] = "0";
+ indent["hang_position"] = "0";
+ indent["base_position"] = "0";
bullet = false;
processing.remove("verse");
++counter;
@@ -1896,8 +1896,8 @@ template SiSUdocAbstraction() {
}
type["para"] = State.on;
an_object["obj"] ~= line ~= "\n";
- indent["first"] = to!string(m.captures[1]);
- indent["second"] = "0";
+ indent["hang_position"] = to!string(m.captures[1]);
+ indent["base_position"] = "0";
bullet = false;
} else if (matchFirst(line, rgx.para_bullet)) {
debug(parabullet) { // para bullet
@@ -1905,8 +1905,8 @@ template SiSUdocAbstraction() {
}
type["para"] = State.on;
an_object["obj"] ~= line;
- indent["first"] = "0";
- indent["second"] = "0";
+ indent["hang_position"] = "0";
+ indent["base_position"] = "0";
bullet = true;
} else if (auto m = matchFirst(line, rgx.para_indent_hang)) {
debug(paraindenthang) { // para indent hang
@@ -1914,8 +1914,8 @@ template SiSUdocAbstraction() {
}
type["para"] = State.on;
an_object["obj"] ~= line;
- indent["first"] = to!string(m.captures[1]);
- indent["second"] = to!string(m.captures[2]);
+ indent["hang_position"] = to!string(m.captures[1]);
+ indent["base_position"] = to!string(m.captures[2]);
bullet = false;
} else if (auto m = matchFirst(line, rgx.para_bullet_indent)) {
debug(parabulletindent) { // para bullet indent
@@ -1923,15 +1923,15 @@ template SiSUdocAbstraction() {
}
type["para"] = State.on;
an_object["obj"] ~= line;
- indent["first"] = to!string(m.captures[1]);
- indent["second"] = "0";
+ indent["hang_position"] = to!string(m.captures[1]);
+ indent["base_position"] = "0";
bullet = true;
} else {
// !line.empty
type["para"] = State.on;
an_object["obj"] ~= line;
- indent["first"] = "0";
- indent["second"] = "0";
+ indent["hang_position"] = "0";
+ indent["base_position"] = "0";
bullet = false;
}
++line_occur["para"];
@@ -1966,23 +1966,23 @@ template SiSUdocAbstraction() {
obj_txt["munge"]=obj_txt_in;
if (matchFirst(obj_txt_in, rgx.para_bullet)) {
obj_txt["attrib"] =" \"bullet\": \"true\","
- ~ " \"indent_first\": 0,"
+ ~ " \"indent_start\": 0,"
~ " \"indent_rest\": 0,";
} else if (auto m = matchFirst(obj_txt_in, rgx.para_bullet_indent)) {
obj_txt["attrib"] =" \"bullet\": \"true\","
- ~ " \"indent_first\": " ~ to!string(m.captures[1]) ~ ","
+ ~ " \"indent_start\": " ~ to!string(m.captures[1]) ~ ","
~ " \"indent_rest\": " ~ to!string(m.captures[1]) ~ ",";
} else if (auto m = matchFirst(obj_txt_in, rgx.para_indent_hang)) {
obj_txt["attrib"] =" \"bullet\": \"false\","
- ~ " \"indent_first\": " ~ to!string(m.captures[1]) ~ ","
+ ~ " \"indent_start\": " ~ to!string(m.captures[1]) ~ ","
~ " \"indent_rest\": " ~ to!string(m.captures[2]) ~ ",";
} else if (auto m = matchFirst(obj_txt_in, rgx.para_indent)) {
obj_txt["attrib"] =" \"bullet\": \"false\","
- ~ " \"indent_first\": " ~ to!string(m.captures[1]) ~ ","
+ ~ " \"indent_start\": " ~ to!string(m.captures[1]) ~ ","
~ " \"indent_rest\": " ~ to!string(m.captures[1]) ~ ",";
} else {
obj_txt["attrib"] =" \"bullet\": \"false\","
- ~ " \"indent_first\": 0,"
+ ~ " \"indent_start\": 0,"
~ " \"indent_rest\": 0,";
}
return obj_txt["attrib"];
@@ -2629,8 +2629,8 @@ template SiSUdocAbstraction() {
bi_tmp = replaceFirst(bi_tmp, rgx.trailing_linebreak, "");
type="para";
attrib="";
- indent["first"] = "0";
- indent["second"] = "1";
+ indent["hang_position"] = "0";
+ indent["base_position"] = "1";
attrib="";
// bookindex_section ~=
// set_abstract_object.contents_para(
diff --git a/src/sdp/ao_object_setter.d b/src/sdp/ao_object_setter.d
index 96932eb..bb7a17e 100644
--- a/src/sdp/ao_object_setter.d
+++ b/src/sdp/ao_object_setter.d
@@ -10,8 +10,8 @@ template ObjectSetter() {
int lev_collapsed_number = 9;
}
struct ParaAttrib {
- int indent_first = 0;
- int indent_second = 0;
+ int indent_start = 0;
+ int indent_rest = 0;
bool bullet = false;
}
struct BlockAttrib {
@@ -78,14 +78,14 @@ template ObjectSetter() {
in bool bullet
) {
ObjComposite object_set;
- object_set.use = "content";
- object_set.of = "para";
- object_set.is_a = "para";
- object_set.object = object;
- object_set.obj_cite_number = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
- object_set.para_attrib.indent_first = 0; // indent["first"];
- object_set.para_attrib.indent_second = 0; // indent["second"];
- object_set.para_attrib.bullet = false;
+ object_set.use = "content";
+ object_set.of = "para";
+ object_set.is_a = "para";
+ object_set.object = object.strip;
+ object_set.obj_cite_number = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
+ object_set.para_attrib.indent_start = 0; // indent["hang_position"];
+ object_set.para_attrib.indent_rest = 0; // indent["base_position"];
+ object_set.para_attrib.bullet = false;
// object_set.node_structure.node = node;
return object_set;
}
diff --git a/src/sdp/output_html.d b/src/sdp/output_html.d
index 057ee8c..38eadf0 100644
--- a/src/sdp/output_html.d
+++ b/src/sdp/output_html.d
@@ -47,8 +47,8 @@ template SiSUoutputHTML() {
◎",
obj.obj_cite_number,
obj.obj_cite_number,
- obj.para_attrib.indent_first,
- obj.para_attrib.indent_second,
+ obj.para_attrib.indent_start,
+ obj.para_attrib.indent_rest,
obj.obj_cite_number,
obj.object
);
--
cgit v1.2.3