diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2019-07-09 18:25:00 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2019-10-17 19:07:20 -0400 |
| commit | 703ddafbb14127db4b7b52bfada3d3d96e22754d (patch) | |
| tree | 6ea5c66293da1e8e9579325e42411df820ad10be /src/doc_reform/meta | |
| parent | 0.7.4 sqlite related, also some xml paths (diff) | |
cosmetic
Diffstat (limited to 'src/doc_reform/meta')
| -rw-r--r-- | src/doc_reform/meta/metadoc_from_src.d | 18 | ||||
| -rw-r--r-- | src/doc_reform/meta/object_setter.d | 31 | ||||
| -rw-r--r-- | src/doc_reform/meta/rgx.d | 1 |
3 files changed, 24 insertions, 26 deletions
diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d index bd8a635..7775f4c 100644 --- a/src/doc_reform/meta/metadoc_from_src.d +++ b/src/doc_reform/meta/metadoc_from_src.d @@ -345,16 +345,16 @@ template DocReformDocAbstraction() { "blurb" : 0, ]; uint[string] dochas = [ - "inline_links" : 0, - "inline_notes" : 0, + "inline_links" : 0, + "inline_notes" : 0, "inline_notes_star" : 0, - "codeblock" : 0, - "table" : 0, - "block" : 0, - "group" : 0, - "poem" : 0, - "quote" : 0, - "images" : 0, + "codeblock" : 0, + "table" : 0, + "block" : 0, + "group" : 0, + "poem" : 0, + "quote" : 0, + "images" : 0, ]; auto obj_type_status = flags_type_init; string[string] object_number_poem = [ diff --git a/src/doc_reform/meta/object_setter.d b/src/doc_reform/meta/object_setter.d index 264d439..6a95bcf 100644 --- a/src/doc_reform/meta/object_setter.d +++ b/src/doc_reform/meta/object_setter.d @@ -14,8 +14,8 @@ template ObjectSetter() { alias of_part = is_of_part; alias of_section = is_of_section; alias is_of = is_of_type; - string attrib = ""; // TODO analyze attrib and subdivide here? - string lang = ""; // blocks: group, block, quote; not codeblock; TODO poem:verse not yet done + string attrib = ""; + string lang = ""; // blocks: group, block, quote; not codeblock; string syntax = ""; // codeblock only /+ o_n +/ int o_n_substantive = 0; @@ -44,7 +44,6 @@ template ObjectSetter() { } bool object_number_off = false; bool visible_object_number = false; - // enum ONtype { none, substantive, non_substantive, glossary, bibliography, book_index, blurb, comment } int object_number_type = 0; // { ocn, non, bkidx } /+ node +/ string[string][string] node; @@ -59,15 +58,15 @@ template ObjectSetter() { string marked_up_level() const @property { string _out; switch (heading_lev_markup) { - case 0: _out = "A"; break; - case 1: _out = "B"; break; - case 2: _out = "C"; break; - case 3: _out = "D"; break; - case 4: _out = "1"; break; - case 5: _out = "2"; break; - case 6: _out = "3"; break; - case 7: _out = "4"; break; - default: _out = ""; break; + case 0 : _out = "A"; break; + case 1 : _out = "B"; break; + case 2 : _out = "C"; break; + case 3 : _out = "D"; break; + case 4 : _out = "1"; break; + case 5 : _out = "2"; break; + case 6 : _out = "3"; break; + case 7 : _out = "4"; break; + default : _out = ""; break; // "9"; } return _out; } @@ -84,9 +83,9 @@ template ObjectSetter() { int indent_base = 0; int indent_hang = 0; bool bullet = false; - string language = ""; // not implemented, consider + string language = ""; } - struct DocObj_Has_ { // doc object has + struct DocObj_Has_ { bool inline_links = false; bool inline_notes_reg = false; bool inline_notes_star = false; @@ -98,7 +97,7 @@ template ObjectSetter() { double[] column_widths = []; string[] column_aligns = []; bool heading = false; - bool walls = false; // not implemented + bool walls = false; } struct DocObj_CodeBlock_ { string syntax = ""; @@ -112,7 +111,7 @@ template ObjectSetter() { int heading = 0; } struct DocObj_Tags_ { - string[] heading_ancestors_text = [ "", "", "", "", "", "", "", "", ]; // TODO redundant? see markedup and collapsed ancestors DONE + string[] heading_ancestors_text = [ "", "", "", "", "", "", "", "", ]; string anchor_tag_html = ""; string in_segment_html = ""; string segment_anchor_tag_epub = ""; diff --git a/src/doc_reform/meta/rgx.d b/src/doc_reform/meta/rgx.d index 544b432..949a665 100644 --- a/src/doc_reform/meta/rgx.d +++ b/src/doc_reform/meta/rgx.d @@ -216,7 +216,6 @@ static template DocReformRgxInit() { static src_pth_sst_or_ssm = ctRegex!(`^(?P<path>[/]?(?:[a-zA-Z0-9._-]+/)*)(?P<filename>[a-zA-Z0-9._-]+[.](?P<extension>ss[tm]))$`); static src_pth_pod_sst_or_ssm = ctRegex!(`^(?P<podpath>[/]?(?:[a-zA-Z0-9._-]+/)*)media/text/[a-z]{2}/(?P<filename>[a-zA-Z0-9._-]+[.]ss[tm])$`); static src_pth_contents = ctRegex!(`^(?P<path>[/]?(?:[a-zA-Z0-9._-]+/)*)(?P<filename>[a-zA-Z0-9._-]+)/pod[.]manifest$`); - static src_pth_pod_root = ctRegex!(`^(?P<podroot>(?:[/]?(?:[a-zA-Z0-9._-]+/)*)(pod))$`); static src_pth_zip = ctRegex!(`^(?P<path>[/]?(?:[a-zA-Z0-9._-]+/)*)(?P<filename>[a-zA-Z0-9._-]+[.]zip)$`); static src_pth_unzip_pod = ctRegex!(`^(?P<path>media/text/[a-z]{2}/)*(?P<filename>[a-zA-Z0-9._-]+[.]ss[im])$`); static src_pth_types = |