From 2e720c5cbf12b988265f014f569ac64b65038f95 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 20 May 2019 10:11:57 -0400 Subject: 0.7.1 odt (initial stub) --- org/default_paths.org | 74 + org/doc_reform.org | 49 +- org/meta_abstraction.org | 58 +- org/output_hub.org | 15 +- org/output_odt.org | 2517 ++++++++++++++++++++++++++++++++ src/doc_reform/doc_reform.d | 47 +- src/doc_reform/meta/metadoc_from_src.d | 58 +- src/doc_reform/output/hub.d | 10 +- src/doc_reform/output/odt.d | 2076 ++++++++++++++++++++++++++ src/doc_reform/output/paths_output.d | 67 + views/version.txt | 2 +- 11 files changed, 4861 insertions(+), 112 deletions(-) create mode 100644 org/output_odt.org create mode 100644 src/doc_reform/output/odt.d diff --git a/org/default_paths.org b/org/default_paths.org index eeed332..5e4f958 100644 --- a/org/default_paths.org +++ b/org/default_paths.org @@ -925,6 +925,7 @@ import doc_reform.meta.rgx; <> <> <> +<> <> #+END_SRC @@ -1223,6 +1224,79 @@ template DocReformPathsEPUB() { } #+END_SRC +** _odt_ :odt: + +#+name: template_paths_odf +#+BEGIN_SRC d +template DocReformPathsODT() { + mixin DocReformRgxInit; + static auto rgx = Rgx(); + auto DocReformPathsODT(M)( + M doc_matters, + ) { + auto out_pth = DocReformOutPaths!()( doc_matters.output_path, doc_matters.src.language); + string base_dir = "odf"; + struct _PathsStruct { + string base_pth() { // dir will contain odt document file (also debug file tree) + return asNormalizedPath((out_pth.output_base).chainPath(base_dir)).array; + } + // string base_filename() { + // return doc_matters.src.filename_base; + // } + string odt_file() { + return asNormalizedPath(base_pth.chainPath(doc_matters.src.filename_base ~ ".odt")).array; + } + string dirtop(string type) { + return (type == "zip") + ? "".chainPath("").array + : asNormalizedPath(base_pth.chainPath(doc_matters.src.filename_base)).array; + } + string mimetype(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(dirtop(type).chainPath("mimetype")).array; + } + string manifest_rdf(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(dirtop(type).chainPath("manifest.rdf")).array; + } + string settings_xml(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(dirtop(type).chainPath("settings.xml")).array; + } + string styles_xml(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(dirtop(type).chainPath("styles.xml")).array; + } + string image_dir(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(dirtop(type).chainPath("Pictures")).array; + } + string image(string image_fn_src, string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(image_dir(type).chainPath(image_fn_src)).array; + } + string content_xml(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(dirtop(type).chainPath("content.xml")).array; + } + string meta_inf_dir(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(dirtop(type).chainPath("META-INF")).array; + } + string manifest_xml(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(meta_inf_dir(type).chainPath("manifest.xml")).array; + } + string meta_xml(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(dirtop(type).chainPath("meta.xml")).array; + } + } + return _PathsStruct(); + } +} +#+END_SRC + ** _sqlite_ :sqlite: *** discrete diff --git a/org/doc_reform.org b/org/doc_reform.org index eb47d69..ac0aa4d 100644 --- a/org/doc_reform.org +++ b/org/doc_reform.org @@ -27,7 +27,7 @@ struct Version { int minor; int patch; } -enum _ver = Version(0, 7, 0); +enum _ver = Version(0, 7, 1); #+END_SRC ** compilation restrictions (supported compilers) @@ -317,6 +317,8 @@ bool[string] opts = [ "light" : false, "manifest" : false, "ocn" : true, + "odf" : false, + "odt" : false, "parallel" : false, "parallel-subprocesses" : false, "quiet" : false, @@ -368,6 +370,8 @@ auto helpInfo = getopt(args, "light", "--light default light theme", &opts["light"], "manifest", "--manifest process manifest output", &opts["manifest"], "ocn", "--ocn object cite numbers (default)", &opts["ocn"], + "odf", "--odf open document format text (--odt)", &opts["odf"], + "odt", "--odt open document format text", &opts["odt"], "parallel", "--parallel parallelisation", &opts["parallel"], "parallel-subprocesses", "--parallel-subprocesses nested parallelisation", &opts["parallel-subprocesses"], "quiet|q", "--quiet output to terminal", &opts["quiet"], @@ -413,7 +417,7 @@ if (helpInfo.helpWanted) { #+NAME: doc_reform_args #+BEGIN_SRC d -enum outTask { pod, source, sqlite, sqlite_multi, epub, html_scroll, html_seg, html_stuff } +enum outTask { pod, source, sqlite, sqlite_multi, odt, epub, html_scroll, html_seg, html_stuff } struct OptActions { bool assertions() { return opts["assertions"]; @@ -465,6 +469,12 @@ struct OptActions { { _is = true; } else { _is = false; } return _is; } + bool odt() { + bool _is; + if ( opts["odf"] || opts["odt"]) + { _is = true; } else { _is = false; } + return _is; + } bool manifest() { return opts["manifest"]; } @@ -578,8 +588,9 @@ struct OptActions { _is = false; } else if (opts["abstraction"] || concordance - || epub || html + || epub + || odt || manifest || pod || source @@ -615,23 +626,49 @@ struct OptActions { if (html_stuff) { schedule ~= outTask.html_stuff; } + if (odt) { + schedule ~= outTask.odt; + } return schedule.sort().uniq; } bool abstraction() { bool _is; if (opts["abstraction"] || concordance - || epub + || source + || pod || html + || epub + || odt || manifest - || pod - || source || sqlite_discrete || sqlite_delete || sqlite_update ) { _is = true; } else { _is = false; } return _is; } + bool meta_processing_general() { + bool _is; + if (opts["abstraction"] + || html + || epub + || odt + || sqlite_discrete + || sqlite_update + ) { _is = true; } else { _is = false; } + return _is; + } + bool meta_processing_xml_dom() { + bool _is; + if (opts["abstraction"] + || html + || epub + || odt + || sqlite_discrete + || sqlite_update + ) { _is = true; } else { _is = false; } + return _is; + } } auto _opt_action = OptActions(); #+END_SRC diff --git a/org/meta_abstraction.org b/org/meta_abstraction.org index 7c5fa5b..4192d3b 100644 --- a/org/meta_abstraction.org +++ b/org/meta_abstraction.org @@ -2438,12 +2438,7 @@ foreach (ref obj; the_document_head_section) { obj.metainfo.object_number_type = OCNtype.ocn; } /+ dom structure (marked up & collapsed) +/ - if ((opt_action.html) - || (opt_action.html_scroll) - || (opt_action.html_seg) - || (opt_action.epub) - || (opt_action.sqlite_discrete) - || (opt_action.sqlite_update)) { + if (opt_action.meta_processing_xml_dom) { obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); } @@ -2472,12 +2467,7 @@ if (the_table_of_contents_section.length > 1) { } } /+ dom structure (marked up & collapsed) +/ - if ((opt_action.html) - || (opt_action.html_scroll) - || (opt_action.html_seg) - || (opt_action.epub) - || (opt_action.sqlite_discrete) - || (opt_action.sqlite_update)) { + if (opt_action.meta_processing_xml_dom) { obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); } @@ -2522,12 +2512,7 @@ if (the_document_body_section.length > 1) { } } /+ dom structure (marked up & collapsed) +/ - if ((opt_action.html) - || (opt_action.html_scroll) - || (opt_action.html_seg) - || (opt_action.epub) - || (opt_action.sqlite_discrete) - || (opt_action.sqlite_update)) { + if (opt_action.meta_processing_xml_dom) { obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); } @@ -2574,12 +2559,7 @@ if (the_endnotes_section.length > 1) { } } /+ dom structure (marked up & collapsed) +/ - if ((opt_action.html) - || (opt_action.html_scroll) - || (opt_action.html_seg) - || (opt_action.epub) - || (opt_action.sqlite_discrete) - || (opt_action.sqlite_update)) { + if (opt_action.meta_processing_xml_dom) { obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); } @@ -2618,12 +2598,7 @@ if (the_glossary_section.length > 1) { } } /+ dom structure (marked up & collapsed) +/ - if ((opt_action.html) - || (opt_action.html_scroll) - || (opt_action.html_seg) - || (opt_action.epub) - || (opt_action.sqlite_discrete) - || (opt_action.sqlite_update)) { + if (opt_action.meta_processing_xml_dom) { obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); } @@ -2666,12 +2641,7 @@ if (the_bibliography_section.length > 1) { } } /+ dom structure (marked up & collapsed) +/ - if ((opt_action.html) - || (opt_action.html_scroll) - || (opt_action.html_seg) - || (opt_action.epub) - || (opt_action.sqlite_discrete) - || (opt_action.sqlite_update)) { + if (opt_action.meta_processing_xml_dom) { obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); } @@ -2720,12 +2690,7 @@ if (the_bookindex_section.length > 1) { / } } /+ dom structure (marked up & collapsed) +/ - if ((opt_action.html) - || (opt_action.html_scroll) - || (opt_action.html_seg) - || (opt_action.epub) - || (opt_action.sqlite_discrete) - || (opt_action.sqlite_update)) { + if (opt_action.meta_processing_xml_dom) { obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); } @@ -2772,12 +2737,7 @@ if (the_blurb_section.length > 1) { } } /+ dom structure (marked up & collapsed) +/ - if ((opt_action.html) - || (opt_action.html_scroll) - || (opt_action.html_seg) - || (opt_action.epub) - || (opt_action.sqlite_discrete) - || (opt_action.sqlite_update)) { + if (opt_action.meta_processing_xml_dom) { obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); } @@ -2955,7 +2915,7 @@ ObjGenericComposite[][string] document_the = [ string[][string] document_section_keys_sequenced = [ "scroll": ["head", "toc", "body",], "seg": ["head", "toc", "body",], - "sql": ["head", "body",] + "sql": ["head", "body",], ]; if (document_the["endnotes"].length > 1) { document_section_keys_sequenced["scroll"] ~= "endnotes"; diff --git a/org/output_hub.org b/org/output_hub.org index 21f5b9d..bd56940 100644 --- a/org/output_hub.org +++ b/org/output_hub.org @@ -33,7 +33,7 @@ template outputHub() { mixin Msg; auto msg = Msg!()(doc_matters); static auto rgx = Rgx(); - enum outTask { pod, source, sqlite, sqlite_multi, epub, html_scroll, html_seg, html_stuff } + enum outTask { pod, source, sqlite, sqlite_multi, odt, epub, html_scroll, html_seg, html_stuff } void Scheduled(D,I)(int sched, D doc_abstraction, I doc_matters) { auto msg = Msg!()(doc_matters); <> @@ -69,6 +69,7 @@ template outputHubOp() { #+BEGIN_SRC d import doc_reform.output, doc_reform.output.xmls, + doc_reform.output.odt, doc_reform.output.create_zip_file, doc_reform.output.paths_output; #+END_SRC @@ -137,6 +138,18 @@ if (sched == outTask.html_stuff) { } #+END_SRC +**** odf / odt :odf:odt: + +#+name: output_scheduled_task +#+BEGIN_SRC d +if (sched == outTask.odt) { + msg.v("odf:odt processing... "); + import doc_reform.output.odt; + outputODT!()(doc_abstraction, doc_matters); + msg.vv("odf:odt done"); +} +#+END_SRC + **** sqlite discrete :sqlite: #+name: output_scheduled_task diff --git a/org/output_odt.org b/org/output_odt.org new file mode 100644 index 0000000..0b9897c --- /dev/null +++ b/org/output_odt.org @@ -0,0 +1,2517 @@ +#+TITLE: doc_reform output odt +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :doc_reform:output:xml:odt: +#+AUTHOR: Ralph Amissah +#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] +#+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah +#+LANGUAGE: en +#+STARTUP: indent content hideblocks hidestars +#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t +#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc +#+OPTIONS: author:nil email:nil creator:nil timestamp:nil +#+PROPERTY: header-args :results silent :padline no :exports code :cache no :noweb yes +#+EXPORT_SELECT_TAGS: export + +- [[./doc_reform.org][doc_reform]] [[./][org/]] +- [[./output_hub.org][output_hub]] + +* odt :odt: + +- cover object types +- zip contents +- xml closures? unnecessary, this is sax rather than dom no? + +|---------------------------------+-----------------------+-------------------+------------------------+------------------| +| function | filename | module | variable | output_odt | +|---------------------------------+-----------------------+-------------------+------------------------+------------------| +| identify doc filetype | mimetype | odt_mimetypes | mimetypes | output_odt_fixed | +|---------------------------------+-----------------------+-------------------+------------------------+------------------| +| doc manifest | manifest.rdf | | | output_odt_fixed | +|---------------------------------+-----------------------+-------------------+------------------------+------------------| +| settings | settings.xml | outputODTsettings | | output_odt_fixed | +|---------------------------------+-----------------------+-------------------+------------------------+------------------| +| doc xml styles | styles.xml | outputODTstyles | | output_odt_fixed | +|---------------------------------+-----------------------+-------------------+------------------------+------------------| +| identify doc root * (imagelist) | META-INF/manifest.xml | odt_container_xml | meta_inf_container_xml | | +|---------------------------------+-----------------------+-------------------+------------------------+------------------| +| doc content * | content.xml | odt_content | content_odt | | +|---------------------------------+-----------------------+-------------------+------------------------+------------------| +| images * | Pictures/ | | | copy_odt_images | +|---------------------------------+-----------------------+-------------------+------------------------+------------------| +| doc meta * (timestamp) | meta.xml | odt_metadata | | | +|---------------------------------+-----------------------+-------------------+------------------------+------------------| + +** module template :odf:odt:module: + +#+BEGIN_SRC d :tangle "../src/doc_reform/output/odt.d" :noweb yes +module doc_reform.output.odt; +template formatODT() { + <> + mixin DocReformOutputRgxInit; + struct formatODT { + static auto rgx = Rgx(); + <> + } +} +template outputODT() { + <> + mixin InternalMarkup; + mixin DocReformOutputRgxInit; + auto rgx = Rgx(); + // mixin outputXmlODT; + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> +} +#+END_SRC + +** odt format objects +*** detail +**** odf structure + +- unless code + - images + - links + - internal / relative + - external + +**** object attrib +***** tags + +#+name: odt_format_objects +#+BEGIN_SRC d +string _tags(O)(const O obj){ + string _tags = ""; + if (obj.tags.anchor_tags.length > 0) { + foreach (tag_; obj.tags.anchor_tags) { + if (tag_.length > 0) { + _tags ~= format(q"┃ + + + +┃", + _special_characters(tag_, obj), + _special_characters(tag_, obj), + ); + } + } + } + return _tags; +} +#+END_SRC + +****** anchor tags + +#+name: odt_format_objects +#+BEGIN_SRC d +string _xhtml_anchor_tags(O)(O obj) { + const(string[]) anchor_tags = obj.tags.anchor_tags; + string tags=""; + if (anchor_tags.length > 0) { + foreach (tag; anchor_tags) { + if (!(tag.empty)) { + tags ~= ""; + } + } + } + return tags; +} +#+END_SRC + +***** ocn object number display + +#+name: odt_format_objects +#+BEGIN_SRC d +string obj_num(O)(const O obj){ // TODO + string _on; + _on = (obj.metainfo.object_number.empty) + ? "" + : (format(q"┃ + 「%s」┃", + obj.metainfo.object_number, + )); + return _on; +} +#+END_SRC + +***** footnotes + +#+name: odt_format_objects +#+begin_src d +string _footnotes()(string _txt){ + static auto rgx = Rgx(); + _txt = _txt.replaceAll( + rgx.inline_notes_al_regular_number_note, + format(q"┃ + + %s + + + + %s + + +┃", + "$1", "$1", "$2", + ) + ); + return _txt; +} +#+end_src + +***** bullet + +#+name: odt_format_objects +#+BEGIN_SRC d +string _bullet(O)(const O obj){ + string _b = ""; + if (obj.attrib.bullet) { + _b = format(q"┃● ┃",); + } + return _b; +} +#+END_SRC + +***** para (with bullet, indent levels, footnotes extracted) + +#+name: odt_format_objects +#+BEGIN_SRC d +string _indent(O)(string _txt, const O obj) { // TODO + // if (obj.attrib.indent_base > 0 || + // obj.attrib.indent_hang > 0 + // ) { + if (obj.metainfo.is_a == "toc") { + _txt = format(q"┃ +%s + %s%s%s +┃", + (obj.attrib.indent_base < 4) + ? "\n " : "", + obj.attrib.indent_base, + obj.attrib.indent_base, + _tags(obj), + _txt, + obj_num(obj), + ); + } else if (!empty(obj.metainfo.object_number)) { + if (obj.attrib.indent_base == 0 && obj.attrib.indent_hang == 0) { + _txt = format(q"┃ +%s + + + + + %s%s%s +┃", + _bullet(obj), + obj.metainfo.object_number, + obj.metainfo.object_number, + _tags(obj), + _txt, + obj_num(obj), + ); + } else if (obj.attrib.indent_base == obj.attrib.indent_hang) { + _txt = format(q"┃ +%s + + + + + %s%s%s +┃", + obj.attrib.indent_base, + _bullet(obj), + obj.metainfo.object_number, + obj.metainfo.object_number, + _tags(obj), + _txt, + obj_num(obj), + ); + } else { + _txt = format(q"┃ +%s + + + + + %s%s%s +┃", + obj.attrib.indent_base, + obj.attrib.indent_hang, + _bullet(obj), + obj.metainfo.object_number, + obj.metainfo.object_number, + _tags(obj), + _txt, + obj_num(obj), + ); + } + } else { + if (obj.attrib.indent_base == 0 && obj.attrib.indent_hang == 0) { /+ can omit and would explicitly set indent base and hang as 0 each below +/ + _txt = format(q"┃ +%s + %s%s%s +┃", + _bullet(obj), + _tags(obj), + _txt, + obj_num(obj), + ); + } else if (obj.attrib.indent_base == obj.attrib.indent_hang) { + _txt = format(q"┃ +%s + %s%s%s +┃", + obj.attrib.indent_base, + _bullet(obj), + _tags(obj), + _txt, + obj_num(obj), + ); + } else { + _txt = format(q"┃ +%s + %s%s%s +┃", + _bullet(obj), + obj.attrib.indent_base, + obj.attrib.indent_hang, + _tags(obj), + _txt, + obj_num(obj), + ); + } + } + return _txt; +} +#+END_SRC + +***** block type + +#+name: odt_format_objects +#+BEGIN_SRC d +string _block_type_delimiters(O)(string[] _block_lines, const O obj) { // TODO + string _block = ""; + foreach (i, _line; _block_lines) { + _line = _footnotes(_line); + if (i == 0) { + _block ~= format(q"┃ +%s + + + + + %s +┃", + _bullet(obj), + obj.metainfo.object_number, + obj.metainfo.object_number, + // _tags(obj), + _line, + ); + } else { + _block ~= format(q"┃ +%s┃", + _line); + } + } + _block ~= format(q"┃ + + 「%s」 + +┃", + obj_num(obj)); + return _block; +} +#+END_SRC + +**** object inline + +***** special characters + +#+name: odt_format_objects +#+BEGIN_SRC d +string _special_characters(O)(string _txt, const O obj) { + _txt = _txt + .replaceAll(rgx.xhtml_ampersand, "&") + .replaceAll(rgx.xhtml_quotation, """) + .replaceAll(rgx.xhtml_less_than, "<") + .replaceAll(rgx.xhtml_greater_than, ">") + .replaceAll(rgx.nbsp_char, " "); + return _txt; +} +#+END_SRC + +***** preserve white space + +#+name: odt_format_objects +#+BEGIN_SRC d +string _preserve_white_spaces(O)(string _txt, const O obj) { + if (obj.metainfo.is_a == "code" || obj.metainfo.is_a == "verse" || obj.metainfo.is_a == "block") { + _txt = _txt + .replaceAll(rgx.space, " "); + } + return _txt; +} +#+END_SRC + +***** font_face + +#+name: odt_format_objects +#+BEGIN_SRC d +string _font_face(string _txt){ + _txt = _txt + .replaceAll(rgx.inline_strike, "$1") + .replaceAll(rgx.inline_insert, "$1") + .replaceAll(rgx.inline_cite, "$1") + .replaceAll(rgx.inline_emphasis, format(q"┃%s┃","$1")) + .replaceAll(rgx.inline_bold, format(q"┃%s┃","$1")) + .replaceAll(rgx.inline_italics, format(q"┃%s┃","$1")) + .replaceAll(rgx.inline_underscore, format(q"┃%s┃","$1")) + .replaceAll(rgx.inline_superscript, format(q"┃%s┃","$1")) + .replaceAll(rgx.inline_subscript, format(q"┃%s┃","$1")) + .replaceAll(rgx.inline_mono, format(q"┃%s┃","$1")); + return _txt; +} +#+END_SRC + +***** object number + +#+name: odt_format_objects +#+BEGIN_SRC d +auto _obj_num(O)(O obj) { // NOT USED YET + struct objNum { + string reference() { + return format(q"┃ + + + ┃", + obj.object_number, + obj.object_number, + ); + } + string display() { + return format(q"┃ + %s%s%s + ┃", + on_o, + obj.object_number, + on_c, + ); + } + } + return objNum(); +} +#+END_SRC + +***** break page + +#+name: odt_format_objects +#+BEGIN_SRC d +string _break_page()() { + return format(q"┃ + +┃", + ); +} +#+END_SRC + +#+BEGIN_SRC d +string _break_page()() { + return format(q"┃ + +┃", + ); +} +#+END_SRC + +***** empty lines break + +#+name: odt_format_objects +#+BEGIN_SRC d +string _empty_line_break(O)(string _txt, const O obj) { + if (obj.metainfo.is_a == "code" || obj.metainfo.is_a == "verse" || obj.metainfo.is_a == "block") { + _txt = _txt + .replaceAll(rgx.br_empty_line, "
"); + } + return _txt; +} +#+END_SRC + +***** links: url, mail + +#+name: odt_format_objects +#+BEGIN_SRC d +string _links(O)(string _txt, const O obj) { + if (obj.metainfo.is_a != "code") { + if (obj.metainfo.is_a == "toc") { + _txt = replaceAll!(m => + m[1] ~ "┤" + ~ (replaceAll!(n => + n["type"] ~ n["path"] ~ (n["file"].encodeComponent) + )((obj.stow.link[m["num"].to!ulong]).to!string, rgx.uri_identify_components)) + ~ "├" + )(_txt, rgx.inline_link_number_only) + .replaceAll(rgx.inline_link, + format(q"┃%s┃", + _special_characters("$3", obj), + _special_characters("$1", obj) + )); + } else { + _txt = replaceAll!(m => + m[1] ~ "┤" + ~ (replaceAll!(n => + n["type"] ~ n["path"] ~ (n["file"].encodeComponent) + )((obj.stow.link[m["num"].to!ulong]).to!string, rgx.uri_identify_components)) + ~ "├" + )(_txt, rgx.inline_link_number_only) + .replaceAll(rgx.inline_link, + format(q"┃%s┃", + _special_characters("$2", obj), + _special_characters("$1", obj) + )); + } + } + debug(links) { + if (obj.text.match(rgx.inline_link_number) + && _txt.match(rgx.inline_link_number_only) + ) { + writeln(">> ", _txt); + writeln("is_a: ", obj.metainfo.is_a); + } + } + return _txt; +} +#+END_SRC + +***** image + +#+name: odt_format_objects +#+BEGIN_SRC d +string _images(O)(string _txt, const O obj) { + if (_txt.match(rgx.inline_image)) { + _txt = _txt + .replaceAll(rgx.inline_image, + ("$1 $6")) + .replaceAll( + rgx.inline_link_empty, + ("$1")); + } + return _txt; +} +#+END_SRC + +**** markup hub (including font face) + +#+name: odt_format_objects +#+BEGIN_SRC d +string markup(O)(const O obj) { + /+ markup TODO +/ + string _txt = obj.text; + _txt = _special_characters(_txt, obj); // TODO & why both obj & obj.text, consider also in output_xmls.org + if (obj.metainfo.is_a == "code" || obj.metainfo.is_a == "verse" || obj.metainfo.is_a == "block") { + _txt = replaceAll!(m => _preserve_white_spaces(m[1], obj))(_txt, rgx.spaces_keep); + } // check that this does what you want, keep: leading spaces (indent) & more than single spaces within text + // _txt = _preserve_white_spaces(_txt, obj); // (obj.metainfo.is_a == "code" || obj.metainfo.is_a == "verse" || obj.metainfo.is_a == "block") + _txt = _font_face(_txt); + _txt = _images(_txt, obj); // (obj.metainfo.is_a != "code") + _txt = _links(_txt, obj); // (obj.metainfo.is_a != "code") + _txt = _empty_line_break(_txt, obj); // (obj.metainfo.is_a == "code" || obj.metainfo.is_a == "verse" || obj.metainfo.is_a == "block") + return _txt; +} +#+END_SRC + +*** objects +**** para type +***** heading + +#+name: odt_format_objects +#+BEGIN_SRC d +string heading(O,M)( + const O obj, + const M doc_matters, +) { + assert(obj.metainfo.is_of_part == "body" || "frontmatter" || "backmatter"); + assert(obj.metainfo.is_of_section == "body" || "toc" || "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb"); + assert(obj.metainfo.is_of_type == "para"); + assert(obj.metainfo.is_a == "heading"); + string _o_txt_odt = markup(obj); + if (obj.metainfo.dummy_heading + && (obj.metainfo.is_a == "toc" || obj.metainfo.is_a == "heading")) { + _o_txt_odt = ""; + } else if (obj.metainfo.is_a == "toc") { + _o_txt_odt = format(q"┃%s + %s%s%s +┃", + _break_page, + obj.metainfo.heading_lev_markup, + obj.metainfo.heading_lev_markup, + _tags(obj), + _o_txt_odt, + obj_num(obj), + ); + } else { + _o_txt_odt = _footnotes(_o_txt_odt); + _o_txt_odt = format(q"┃%s + + + + + %s%s%s +┃", + _break_page, + obj.metainfo.heading_lev_markup, + obj.metainfo.heading_lev_markup, + obj.metainfo.object_number, + obj.metainfo.object_number, + _tags(obj), + _o_txt_odt, + obj_num(obj), + ); + } + return _o_txt_odt; +} +#+END_SRC + +***** para + +#+name: odt_format_objects +#+BEGIN_SRC d +string para(O,M)( + const O obj, + const M doc_matters, +) { + assert(obj.metainfo.is_of_part == "body" || "frontmatter" || "backmatter"); + assert(obj.metainfo.is_of_section == "body" || "toc" || "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb"); + assert(obj.metainfo.is_of_type == "para"); + assert(obj.metainfo.is_a == "para" || "toc" || "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb"); + string _o_txt_odt; + if (obj.metainfo.dummy_heading + && (obj.metainfo.is_a == "toc" || obj.metainfo.is_a == "heading")) { + _o_txt_odt = ""; + } else { + _o_txt_odt = markup(obj); + _o_txt_odt = _footnotes(_o_txt_odt); + _o_txt_odt = _indent(_o_txt_odt, obj); // final setting? + } + return _o_txt_odt; +} +#+END_SRC + +**** block type +***** quote + +#+name: odt_format_objects +#+BEGIN_SRC d +string quote(O,M)( + const O obj, + const M doc_matters, +) { + assert(obj.metainfo.is_of_part == "body"); + assert(obj.metainfo.is_of_section == "body" || "glossary" || "bibliography" || "bookindex" || "blurb"); + assert(obj.metainfo.is_of_type == "block"); + assert(obj.metainfo.is_a == "quote"); + string _o_txt_odt = markup(obj); + _o_txt_odt = _footnotes(_o_txt_odt); // decide + return _o_txt_odt; +} +#+END_SRC + +***** group +- group delimiter + - preserves double newlines (paragraph delimiter) +- the "group" delimiter is different from the "block" delimiter in that groups do not preserve whitespace, the "block" mark does + +#+name: odt_format_objects +#+BEGIN_SRC d +string group(O,M)( + const O obj, + const M doc_matters, +) { + assert(obj.metainfo.is_of_part == "body"); + assert(obj.metainfo.is_of_section == "body" || "glossary" || "bibliography" || "bookindex" || "blurb"); + assert(obj.metainfo.is_of_type == "block"); + assert(obj.metainfo.is_a == "group"); + string _o_txt_odt = markup(obj); + /+ TODO + - split lines + - only double newlines (paragraph delimiter), (not line breaks, single new lines) + - no hard space indentation + +/ + string[] _block_lines = (_o_txt_odt).split(rgx.br_newlines_linebreaks); + _o_txt_odt = _block_type_delimiters(_block_lines, obj); + return _o_txt_odt; +} +#+END_SRC + +***** block +- block delimiter + - preserves spaces + - preserves newlines +- the "block" delimiter is different from the "group" delimiter, in that blocks preserve whitespace, the "group" mark does not + +- + - split lines + - each line including empty lines + - hard space indentation + - "^[ ]"   + - count number only at beginning of line and replace each + +#+name: odt_format_objects +#+BEGIN_SRC d +string block(O,M)( + const O obj, + const M doc_matters, +) { + assert(obj.metainfo.is_of_part == "body"); + assert(obj.metainfo.is_of_section == "body" || "glossary" || "bibliography" || "bookindex" || "blurb"); + assert(obj.metainfo.is_of_type == "block"); + assert(obj.metainfo.is_a == "block"); + string _o_txt_odt = markup(obj); + string[] _block_lines = (_o_txt_odt).split(rgx.br_newlines_linebreaks); + _o_txt_odt = _block_type_delimiters(_block_lines, obj); + return _o_txt_odt; +} +#+END_SRC + +***** verse +- poem delimiters + - creates verses where double newlines occur (paragraph delimiter) + - preserves spaces + - preserves newlines + +#+name: odt_format_objects +#+BEGIN_SRC d +string verse(O,M)( + const O obj, + const M doc_matters, +) { + assert(obj.metainfo.is_of_part == "body"); + assert(obj.metainfo.is_of_section == "body" || "glossary" || "bibliography" || "bookindex" || "blurb"); + assert(obj.metainfo.is_of_type == "block"); + assert(obj.metainfo.is_a == "verse"); + string _o_txt_odt = markup(obj); + string[] _block_lines = (_o_txt_odt).split(rgx.br_newlines_linebreaks); + _o_txt_odt = _block_type_delimiters(_block_lines, obj); + return _o_txt_odt; +} +#+END_SRC + +***** code + +#+name: odt_format_objects +#+BEGIN_SRC d +string code(O,M)( + const O obj, + const M doc_matters, +) { + assert(obj.metainfo.is_of_part == "body"); + assert(obj.metainfo.is_of_section == "body"); + assert(obj.metainfo.is_of_type == "block"); + assert(obj.metainfo.is_a == "code"); + string _o_txt_odt = markup(obj); + /+ TODO + - split lines + - each line including empty lines + - hard space indentation + - "^[ ]"   + - count number only at beginning of line and replace each + +/ + string[] _block_lines = (_o_txt_odt).split(rgx.br_newlines_linebreaks); + string _block = ""; + foreach (i, _line; _block_lines) { + if (i == 1) { + _block ~= format(q"┃ + + + + + +%s +┃", + obj.metainfo.object_number, + obj.metainfo.object_number, + _line, + ); + } else { + _block ~= format(q"┃ +%s┃", + _line); + } + } + _block ~= format(q"┃ + + 「%s」 + +┃", + obj_num(obj)); + _o_txt_odt = _block; + return _o_txt_odt; +} +#+END_SRC + +***** table +****** tablarize + +#+name: odt_format_objects +#+BEGIN_SRC d +auto tablarize(O)( + const O obj, + string _txt, +) { + string[] _table_rows = (_txt).split(rgx.table_delimiter_row); + string[] _table_cols; + string _table; + string _tablenote; + foreach(row_idx, row; _table_rows) { + _table_cols = row.split(rgx.table_delimiter_col); + _table ~= ""; + foreach(col_idx, cell; _table_cols) { + if ((_table_cols.length == 1) + && (_table_rows.length <= row_idx+2)) { // check row_idx+2 (rather than == ++row_idx) + _tablenote ~= cell; + } else { + _table ~= format(q"┃ + +%s + +┃", + (row_idx == 0 && obj.table.heading) ? "Table_Heading" : "P_table_cell", + cell, + ); + } + } + _table ~= ""; + } + auto t = tuple( + _table, + _tablenote, + ); + return t; +} +#+END_SRC + +****** table + +#+name: odt_format_objects +#+BEGIN_SRC d +int _table_number = 0; +string table(O,M)( + const O obj, + const M doc_matters, +) { + assert(obj.metainfo.is_of_part == "body"); + assert(obj.metainfo.is_of_section == "body"); + assert(obj.metainfo.is_of_type == "block"); + assert(obj.metainfo.is_a == "table"); + string _o_txt_odt = markup(obj); + auto t = tablarize(obj, _o_txt_odt); + string _note = t[1]; + _o_txt_odt = format(q"┃ + + + + + + + %s + + + 「%s」 +┃", + _table_number++, + obj.metainfo.object_number, + obj.metainfo.object_number, + obj.table.number_of_columns, + t[0], + obj.metainfo.object_number, + // _note, + ); + return _o_txt_odt; +} +#+END_SRC + + +** write odt output :odf:odt:out: + +#+name: output_odt +#+BEGIN_SRC d +void writeOutputODT(W,I)( + const W odt_content, + I doc_matters, +) { + auto pth_odt = DocReformPathsODT!()(doc_matters); + auto fn_odt = pth_odt.odt_file; + auto zip = new ZipArchive(); // ZipArchive zip = new ZipArchive(); + void ODTzip()(string contents, string fn) { + auto zip_arc_member_file = new ArchiveMember(); + zip_arc_member_file.name = fn; + auto zip_data = new OutBuffer(); + (doc_matters.opt.action.debug_do) + ? zip_data.write(contents.dup) + : zip_data.write(contents.dup + .replaceAll(rgx.spaces_line_start, "") + .replaceAll(rgx.newline, "") + .strip + ); + zip_arc_member_file.expandedData = zip_data.toBytes(); + zip.addMember(zip_arc_member_file); + createZipFile!()(fn_odt, zip.build()); + } + try { + if (!exists(pth_odt.base_pth)) { // check + pth_odt.base_pth.mkdirRecurse; + } + string fn; + File f; + { fn = pth_odt.mimetype("zip"); + ODTzip(odt_content.mimetype, fn); + } + { fn = pth_odt.manifest_rdf("zip"); + ODTzip(odt_content.manifest_rdf, fn); + } + { fn = pth_odt.settings_xml("zip"); + ODTzip(odt_content.settings_xml, fn); + } + { fn = pth_odt.styles_xml("zip"); + ODTzip(odt_content.styles_xml, fn); + } + { fn = pth_odt.content_xml("zip"); + ODTzip(odt_content.content_xml, fn); + } + { fn = pth_odt.manifest_xml("zip"); + ODTzip(odt_content.manifest_xml, fn); + } + { fn = pth_odt.meta_xml("zip"); + ODTzip(odt_content.meta_xml, fn); + } + { /+ (images) +/ + foreach (image; doc_matters.srcs.image_list) { + auto fn_src = doc_matters.src.image_dir_path ~ "/" ~ image; + auto fn_out = pth_odt.image_dir("zip") ~ "/" ~ image; + if (exists(fn_src)) { + { + auto zip_arc_member_file = new ArchiveMember(); + zip_arc_member_file.name = fn_out; + auto zip_data = new OutBuffer(); + zip_data.write(cast(char[]) ((fn_src).read)); + zip_arc_member_file.expandedData = zip_data.toBytes(); + zip.addMember(zip_arc_member_file); + createZipFile!()(fn_odt, zip.build()); + } + } + } + } + if (!(doc_matters.opt.action.quiet)) { + writeln(" ", pth_odt.odt_file); + } + } catch (ErrnoException ex) { + // Handle error + } + if (doc_matters.opt.action.debug_do) { + pth_odt.mimetype("fs"); /+ (mimetype) +/ + pth_odt.manifest_rdf("fs"); /+ (manifest.rdf) +/ + pth_odt.settings_xml("fs"); /+ (settings.xml) +/ + pth_odt.styles_xml("fs"); /+ (styles_xml) +/ + + pth_odt.content_xml("fs"); + pth_odt.manifest_xml("fs"); + pth_odt.meta_xml("fs"); + } +} +#+END_SRC + +** odt output hub [#A] :odf:odt:out: + +#+name: output_odt +#+BEGIN_SRC d +void outputODT(D,I)( + const D doc_abstraction, + I doc_matters, +) { + struct ODT { + /+ fixed output +/ + string mimetype; + string manifest_rdf; + string settings_xml; + string styles_xml; + /+ variable output +/ + string content_xml; // substantive content + string manifest_xml; // image list changes + string meta_xml; // time stamp + } + // auto pth_odt = DocReformPathsODT!()(doc_matters); + auto odt = ODT(); + odt.mimetype = mimetype; + odt.manifest_rdf = manifest_rdf; + odt.settings_xml = settings_xml; + odt.styles_xml = styles_xml; + odt.content_xml = content_xml(doc_abstraction, doc_matters); + odt.manifest_xml = manifest_xml(doc_matters); + odt.meta_xml = meta_xml(doc_matters); + odt.writeOutputODT(doc_matters); + dirtree(doc_matters); + images_cp(doc_matters); // copy images +} +#+END_SRC + +* stuff +** shared +*** output imports + +#+name: output_imports +#+BEGIN_SRC d +import doc_reform.output; +import + std.digest.sha, + std.file, + std.outbuffer, + std.uri, + std.zip, + std.conv : to; +import + doc_reform.output.create_zip_file, + doc_reform.output.xmls, + doc_reform.output.xmls_css; +#+END_SRC + +*** make directory tree + +#+name: output_odt_fixed_dirtree +#+BEGIN_SRC d +void dirtree(I)( + I doc_matters, +) { + auto pth_odt = DocReformPathsODT!()(doc_matters); + if (doc_matters.opt.action.debug_do) { /+ (dir tree) +/ + if (!exists(pth_odt.meta_inf_dir("fs"))) { + pth_odt.meta_inf_dir("fs").mkdirRecurse; + } + if (!exists(pth_odt.image_dir("fs"))) { + pth_odt.image_dir("fs").mkdirRecurse; + } + } + if (!exists(pth_odt.base_pth)) { + pth_odt.base_pth.mkdirRecurse; + } + // return 0; +} +#+END_SRC + +** fixed items +*** mimetype :mimetype: + +#+name: output_odt_fixed_mimetype +#+BEGIN_SRC d +string mimetype() { + string mimetype_ = format(q"┃application/vnd.oasis.opendocument.text┃"); + return mimetype_; +} +#+END_SRC + +*** manifest.rdf :manifest_rdf: + +#+name: output_odt_fixed_manifest_rdf +#+BEGIN_SRC d +string manifest_rdf() { + string _manifest_rdf = format(q"┃ +#+END_SRC + +#+name: output_odt_fixed_manifest_rdf +#+BEGIN_SRC xml + + + + + + + + + + + + + + + + + +#+END_SRC + +#+name: output_odt_fixed_manifest_rdf +#+BEGIN_SRC d +┃"); + return _manifest_rdf; +} +#+END_SRC + +*** settings.xml :settings: + +#+name: output_odt_fixed_settings_xml +#+BEGIN_SRC d +string settings_xml() { + string _settings_xml = format(q"┃ +#+END_SRC + +#+name: output_odt_fixed_settings_xml +#+BEGIN_SRC xml + + + + 0 + 0 + 0 + 0 + true + false + + + view2 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + true + 100 + false + + + + + true + false + false + true + true + false + true + false + false + + false + false + false + true + true + 0 + false + false + false + false + true + false + false + false + false + true + true + false + false + true + false + true + false + high-resolution + 1 + 0 + true + + + false + true + + false + true + false + true + false + true + false + + true + true + false + true + true + true + false + false + + false + 0 + false + false + true + true + + + +#+END_SRC + +#+name: output_odt_fixed_settings_xml +#+BEGIN_SRC d +┃"); + return _settings_xml; +} +#+END_SRC + +*** styles.xml :styles_xml: + +#+name: output_odt_fixed_styles_xml +#+BEGIN_SRC d +string styles_xml() { + string _styles_xml = format(q"┃ +#+END_SRC + +#+name: output_odt_fixed_styles_xml +#+BEGIN_SRC xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#+END_SRC + +#+name: output_odt_fixed_styles_xml +#+BEGIN_SRC d +┃"); + return _styles_xml; +} +#+END_SRC + +** moving parts +*** ↻ content.xml TODO :content_xml: +**** content head +***** head open + +#+name: output_odt_variable_content_xml +#+BEGIN_SRC d +string odt_head(I)(I doc_matters) { + string _has_tables = format(q"┃ +#+END_SRC + +***** if table include within head + +#+name: output_odt_variable_content_xml +#+BEGIN_SRC xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#+END_SRC + +***** head + +#+name: output_odt_variable_content_xml +#+BEGIN_SRC d +┃",); + string _odt_head = format(q"┃ +#+END_SRC + +***** head xml + +#+name: output_odt_variable_content_xml +#+BEGIN_SRC xml + + + + + + + + + + + + + + %s + + + + + + + + + + + + + +#+END_SRC + +***** head close + +#+name: output_odt_variable_content_xml +#+BEGIN_SRC d +┃", + (doc_matters.has.tables > 0) ? _has_tables : "", +); + return _odt_head; +} +#+END_SRC + +**** ↻ content body +***** body open + +#+name: output_odt_variable_content_xml +#+BEGIN_SRC d +string odt_body(D,I)( + const D doc_abstraction, + I doc_matters, +) { + mixin formatODT; + auto odt_format = formatODT(); + string delimit = ""; + string doc_odt = ""; + string _txt = ""; +#+END_SRC + +***** ↻ the loop & outer switch (sections & objects) format output + +#+name: output_odt_variable_content_xml +#+BEGIN_SRC d + foreach (part; doc_matters.has.keys_seq.scroll) { + foreach (obj; doc_abstraction[part]) { + switch (obj.metainfo.is_of_part) { +#+END_SRC + +****** frontmatter + +#+name: output_odt_variable_content_xml +#+BEGIN_SRC d + case "frontmatter": assert(part == "head" || "toc"); + switch (obj.metainfo.is_of_type) { + case "para": + switch (obj.metainfo.is_a) { + case "heading": + _txt = delimit ~ odt_format.heading(obj, doc_matters); + goto default; + case "toc": + _txt = odt_format.para(obj, doc_matters); + goto default; + default: + doc_odt ~= _txt; + _txt = ""; + break; + } + break; + default: break; + } + break; +#+END_SRC + +****** body + +#+name: output_odt_variable_content_xml +#+BEGIN_SRC d + case "body": assert(part == "body" || "head"); // surprise + switch (obj.metainfo.is_of_type) { + case "para": + switch (obj.metainfo.is_a) { + case "heading": + _txt = delimit ~ odt_format.heading(obj, doc_matters); + goto default; + case "para": + _txt = odt_format.para(obj, doc_matters); + goto default; + default: + doc_odt ~= _txt; + _txt = ""; + break; + } + break; + case "block": + switch (obj.metainfo.is_a) { + case "quote": + _txt = odt_format.quote(obj, doc_matters); + goto default; + case "group": + _txt = odt_format.group(obj, doc_matters); + goto default; + case "block": + _txt = odt_format.block(obj, doc_matters); + goto default; + case "verse": + _txt = odt_format.verse(obj, doc_matters); + goto default; + case "code": + _txt = odt_format.code(obj, doc_matters); + goto default; + case "table": + _txt = odt_format.table(obj, doc_matters); + goto default; + default: + doc_odt ~= _txt; + _txt = ""; + break; + } + break; + default: break; + } + break; +#+END_SRC + +****** backmatter + +#+name: output_odt_variable_content_xml +#+BEGIN_SRC d + case "backmatter": + assert(part == "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb" || "tail"); + switch (obj.metainfo.is_of_type) { + case "para": + switch (obj.metainfo.is_a) { + case "heading": + _txt = delimit ~ odt_format.heading(obj, doc_matters); + goto default; + case "endnote": assert(part == "endnotes"); + _txt = odt_format.para(obj, doc_matters); + goto default; + case "glossary": assert(part == "glossary"); + _txt = odt_format.para(obj, doc_matters); + goto default; + case "bibliography": assert(part == "bibliography"); + _txt = odt_format.para(obj, doc_matters); + goto default; + case "bookindex": assert(part == "bookindex"); + _txt = odt_format.para(obj, doc_matters); + goto default; + case "blurb": assert(part == "blurb"); + _txt = odt_format.para(obj, doc_matters); + goto default; + default: + doc_odt ~= _txt; + _txt = ""; + break; + } + break; + default: break; + } + break; + case "comment": + break; + default: + { /+ debug +/ + if (doc_matters.opt.action.debug_do + && doc_matters.opt.action.verbose) { + writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_part); + writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a); + writeln(__FILE__, ":", __LINE__, ": ", obj.text); + } + } + break; +#+END_SRC + +***** closings & post loop + +#+name: output_odt_variable_content_xml +#+BEGIN_SRC d + } + } + } + return doc_odt; +} +#+END_SRC + +**** content book index? + +#+name: output_odt_variable_content_xml +#+BEGIN_SRC d +#+END_SRC + +**** content tail + +#+name: output_odt_variable_content_xml +#+BEGIN_SRC d +string odt_tail() { + string _odt_tail = format(q"┃DocReform: <www.doc_reform.org> and <www.sisudoc.org> +┃",); + return _odt_tail; +} +#+END_SRC + +**** hub + +#+name: output_odt_variable_content_xml +#+BEGIN_SRC d +string content_xml(D,I)( + const D doc_abstraction, + I doc_matters, +) { + string _content_xml; + string break_line = (doc_matters.opt.action.debug_do) ? "\n" : ""; + string odt_break_page = format(q"┃┃",); + string br_pg = format(q"┃┃",); + _content_xml ~= odt_head(doc_matters); + _content_xml ~= odt_body(doc_abstraction, doc_matters); + _content_xml ~= odt_tail; + return _content_xml; +} +#+END_SRC + +*** manifest.xml (images list changes) :manifest_xml: + - META-INF/manifest.xml + - image list changes + +#+name: output_odt_variable_manifest_xml +#+BEGIN_SRC d +string manifest_xml(M)( + auto ref M doc_matters, +) { + string _bullet = format(q"┃┃"); + string[] _images = [ _bullet ]; + foreach (image; doc_matters.srcs.image_list) { + _images ~= format(q"┃ ┃", image); + } + string _manifest_xml = format(q"┃ +#+END_SRC + +#+name: output_odt_variable_manifest_xml +#+BEGIN_SRC xml + + + + + %s + + + + + +#+END_SRC + +#+name: output_odt_variable_manifest_xml +#+BEGIN_SRC d +┃", +_images.join("\n"), +); + return _manifest_xml; +} +#+END_SRC + +*** meta.xml (time stamp) :meta_xml: + +#+name: output_odt_variable_meta_xml +#+BEGIN_SRC d +string meta_xml(M)( + auto ref M doc_matters, +) { + /+ (meta_xml includes output time-stamp) +/ + string _meta_xml = format(q"┃ +#+END_SRC + +#+name: output_odt_variable_meta_xml +#+BEGIN_SRC xml + + + %s + %s + %s + en-US + + +#+END_SRC + +#+name: output_odt_variable_meta_xml +#+BEGIN_SRC d +┃", +doc_matters.generator_program.name_and_version, +doc_matters.generated_time, +doc_matters.generated_time, +); + return _meta_xml; +} +#+END_SRC + +*** copy images :images: + +#+name: output_odt_variable_copy_odt_images +#+BEGIN_SRC d +void images_cp(M)( + auto ref M doc_matters, +) { + { /+ (copy odt images) +/ + auto pth_odt = DocReformPathsODT!()(doc_matters); + foreach (image; doc_matters.srcs.image_list) { + auto fn_src_in = doc_matters.src.image_dir_path ~ "/" ~ image; + auto fn_src_out_file = pth_odt.image_dir("fs") ~ "/" ~ image; + auto fn_src_out_zip = pth_odt.image_dir("zip") ~ "/" ~ image; + if (exists(fn_src_in)) { + if (doc_matters.opt.action.debug_do) { + if (doc_matters.opt.action.debug_do) { + fn_src_in.copy(fn_src_out_file); + } + } + } + } + } + // return 0; +} +#+END_SRC diff --git a/src/doc_reform/doc_reform.d b/src/doc_reform/doc_reform.d index be475b4..25ab2cc 100755 --- a/src/doc_reform/doc_reform.d +++ b/src/doc_reform/doc_reform.d @@ -125,6 +125,8 @@ void main(string[] args) { "light" : false, "manifest" : false, "ocn" : true, + "odf" : false, + "odt" : false, "parallel" : false, "parallel-subprocesses" : false, "quiet" : false, @@ -176,6 +178,8 @@ void main(string[] args) { "light", "--light default light theme", &opts["light"], "manifest", "--manifest process manifest output", &opts["manifest"], "ocn", "--ocn object cite numbers (default)", &opts["ocn"], + "odf", "--odf open document format text (--odt)", &opts["odf"], + "odt", "--odt open document format text", &opts["odt"], "parallel", "--parallel parallelisation", &opts["parallel"], "parallel-subprocesses", "--parallel-subprocesses nested parallelisation", &opts["parallel-subprocesses"], "quiet|q", "--quiet output to terminal", &opts["quiet"], @@ -214,7 +218,7 @@ void main(string[] args) { if (helpInfo.helpWanted) { defaultGetoptPrinter("Some information about the program.", helpInfo.options); } - enum outTask { pod, source, sqlite, sqlite_multi, epub, html_scroll, html_seg, html_stuff } + enum outTask { pod, source, sqlite, sqlite_multi, odt, epub, html_scroll, html_seg, html_stuff } struct OptActions { bool assertions() { return opts["assertions"]; @@ -266,6 +270,12 @@ void main(string[] args) { { _is = true; } else { _is = false; } return _is; } + bool odt() { + bool _is; + if ( opts["odf"] || opts["odt"]) + { _is = true; } else { _is = false; } + return _is; + } bool manifest() { return opts["manifest"]; } @@ -379,8 +389,9 @@ void main(string[] args) { _is = false; } else if (opts["abstraction"] || concordance - || epub || html + || epub + || odt || manifest || pod || source @@ -416,23 +427,49 @@ void main(string[] args) { if (html_stuff) { schedule ~= outTask.html_stuff; } + if (odt) { + schedule ~= outTask.odt; + } return schedule.sort().uniq; } bool abstraction() { bool _is; if (opts["abstraction"] || concordance - || epub + || source + || pod || html + || epub + || odt || manifest - || pod - || source || sqlite_discrete || sqlite_delete || sqlite_update ) { _is = true; } else { _is = false; } return _is; } + bool meta_processing_general() { + bool _is; + if (opts["abstraction"] + || html + || epub + || odt + || sqlite_discrete + || sqlite_update + ) { _is = true; } else { _is = false; } + return _is; + } + bool meta_processing_xml_dom() { + bool _is; + if (opts["abstraction"] + || html + || epub + || odt + || sqlite_discrete + || sqlite_update + ) { _is = true; } else { _is = false; } + return _is; + } } auto _opt_action = OptActions(); auto program_info() { diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d index 042a57e..4e0120f 100644 --- a/src/doc_reform/meta/metadoc_from_src.d +++ b/src/doc_reform/meta/metadoc_from_src.d @@ -1851,12 +1851,7 @@ template DocReformDocAbstraction() { obj.metainfo.object_number_type = OCNtype.ocn; } /+ dom structure (marked up & collapsed) +/ - if ((opt_action.html) - || (opt_action.html_scroll) - || (opt_action.html_seg) - || (opt_action.epub) - || (opt_action.sqlite_discrete) - || (opt_action.sqlite_update)) { + if (opt_action.meta_processing_xml_dom) { obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); } @@ -1879,12 +1874,7 @@ template DocReformDocAbstraction() { } } /+ dom structure (marked up & collapsed) +/ - if ((opt_action.html) - || (opt_action.html_scroll) - || (opt_action.html_seg) - || (opt_action.epub) - || (opt_action.sqlite_discrete) - || (opt_action.sqlite_update)) { + if (opt_action.meta_processing_xml_dom) { obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); } @@ -1923,12 +1913,7 @@ template DocReformDocAbstraction() { } } /+ dom structure (marked up & collapsed) +/ - if ((opt_action.html) - || (opt_action.html_scroll) - || (opt_action.html_seg) - || (opt_action.epub) - || (opt_action.sqlite_discrete) - || (opt_action.sqlite_update)) { + if (opt_action.meta_processing_xml_dom) { obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); } @@ -1967,12 +1952,7 @@ template DocReformDocAbstraction() { } } /+ dom structure (marked up & collapsed) +/ - if ((opt_action.html) - || (opt_action.html_scroll) - || (opt_action.html_seg) - || (opt_action.epub) - || (opt_action.sqlite_discrete) - || (opt_action.sqlite_update)) { + if (opt_action.meta_processing_xml_dom) { obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); } @@ -2003,12 +1983,7 @@ template DocReformDocAbstraction() { } } /+ dom structure (marked up & collapsed) +/ - if ((opt_action.html) - || (opt_action.html_scroll) - || (opt_action.html_seg) - || (opt_action.epub) - || (opt_action.sqlite_discrete) - || (opt_action.sqlite_update)) { + if (opt_action.meta_processing_xml_dom) { obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); } @@ -2043,12 +2018,7 @@ template DocReformDocAbstraction() { } } /+ dom structure (marked up & collapsed) +/ - if ((opt_action.html) - || (opt_action.html_scroll) - || (opt_action.html_seg) - || (opt_action.epub) - || (opt_action.sqlite_discrete) - || (opt_action.sqlite_update)) { + if (opt_action.meta_processing_xml_dom) { obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); } @@ -2089,12 +2059,7 @@ template DocReformDocAbstraction() { } } /+ dom structure (marked up & collapsed) +/ - if ((opt_action.html) - || (opt_action.html_scroll) - || (opt_action.html_seg) - || (opt_action.epub) - || (opt_action.sqlite_discrete) - || (opt_action.sqlite_update)) { + if (opt_action.meta_processing_xml_dom) { obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); } @@ -2135,12 +2100,7 @@ template DocReformDocAbstraction() { } } /+ dom structure (marked up & collapsed) +/ - if ((opt_action.html) - || (opt_action.html_scroll) - || (opt_action.html_seg) - || (opt_action.epub) - || (opt_action.sqlite_discrete) - || (opt_action.sqlite_update)) { + if (opt_action.meta_processing_xml_dom) { obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); } @@ -2293,7 +2253,7 @@ template DocReformDocAbstraction() { string[][string] document_section_keys_sequenced = [ "scroll": ["head", "toc", "body",], "seg": ["head", "toc", "body",], - "sql": ["head", "body",] + "sql": ["head", "body",], ]; if (document_the["endnotes"].length > 1) { document_section_keys_sequenced["scroll"] ~= "endnotes"; diff --git a/src/doc_reform/output/hub.d b/src/doc_reform/output/hub.d index 1f01dd6..b840811 100644 --- a/src/doc_reform/output/hub.d +++ b/src/doc_reform/output/hub.d @@ -6,6 +6,7 @@ module doc_reform.output.hub; template outputHub() { import doc_reform.output, doc_reform.output.xmls, + doc_reform.output.odt, doc_reform.output.create_zip_file, doc_reform.output.paths_output; import std.parallelism; @@ -14,7 +15,7 @@ template outputHub() { mixin Msg; auto msg = Msg!()(doc_matters); static auto rgx = Rgx(); - enum outTask { pod, source, sqlite, sqlite_multi, epub, html_scroll, html_seg, html_stuff } + enum outTask { pod, source, sqlite, sqlite_multi, odt, epub, html_scroll, html_seg, html_stuff } void Scheduled(D,I)(int sched, D doc_abstraction, I doc_matters) { auto msg = Msg!()(doc_matters); if (sched == outTask.pod) { @@ -47,6 +48,12 @@ template outputHub() { outputHTML!().images_cp(doc_matters); msg.vv("html css & images done"); } + if (sched == outTask.odt) { + msg.v("odf:odt processing... "); + import doc_reform.output.odt; + outputODT!()(doc_abstraction, doc_matters); + msg.vv("odf:odt done"); + } if (sched == outTask.sqlite) { msg.v("sqlite processing... "); import doc_reform.output.sqlite; @@ -82,6 +89,7 @@ template outputHub() { template outputHubOp() { import doc_reform.output, doc_reform.output.xmls, + doc_reform.output.odt, doc_reform.output.create_zip_file, doc_reform.output.paths_output; void outputHubOp(E,O)(E env, O opt_action) { diff --git a/src/doc_reform/output/odt.d b/src/doc_reform/output/odt.d new file mode 100644 index 0000000..075a73c --- /dev/null +++ b/src/doc_reform/output/odt.d @@ -0,0 +1,2076 @@ +module doc_reform.output.odt; +template formatODT() { + import doc_reform.output; + import + std.digest.sha, + std.file, + std.outbuffer, + std.uri, + std.zip, + std.conv : to; + import + doc_reform.output.create_zip_file, + doc_reform.output.xmls, + doc_reform.output.xmls_css; + mixin DocReformOutputRgxInit; + struct formatODT { + static auto rgx = Rgx(); + string _tags(O)(const O obj){ + string _tags = ""; + if (obj.tags.anchor_tags.length > 0) { + foreach (tag_; obj.tags.anchor_tags) { + if (tag_.length > 0) { + _tags ~= format(q"┃ + + + + ┃", + _special_characters(tag_, obj), + _special_characters(tag_, obj), + ); + } + } + } + return _tags; + } + string _xhtml_anchor_tags(O)(O obj) { + const(string[]) anchor_tags = obj.tags.anchor_tags; + string tags=""; + if (anchor_tags.length > 0) { + foreach (tag; anchor_tags) { + if (!(tag.empty)) { + tags ~= ""; + } + } + } + return tags; + } + string obj_num(O)(const O obj){ // TODO + string _on; + _on = (obj.metainfo.object_number.empty) + ? "" + : (format(q"┃ + 「%s」┃", + obj.metainfo.object_number, + )); + return _on; + } + string _footnotes()(string _txt){ + static auto rgx = Rgx(); + _txt = _txt.replaceAll( + rgx.inline_notes_al_regular_number_note, + format(q"┃ + + %s + + + + %s + + + ┃", + "$1", "$1", "$2", + ) + ); + return _txt; + } + string _bullet(O)(const O obj){ + string _b = ""; + if (obj.attrib.bullet) { + _b = format(q"┃● ┃",); + } + return _b; + } + string _indent(O)(string _txt, const O obj) { // TODO + // if (obj.attrib.indent_base > 0 || + // obj.attrib.indent_hang > 0 + // ) { + if (obj.metainfo.is_a == "toc") { + _txt = format(q"┃ + %s + %s%s%s + ┃", + (obj.attrib.indent_base < 4) + ? "\n " : "", + obj.attrib.indent_base, + obj.attrib.indent_base, + _tags(obj), + _txt, + obj_num(obj), + ); + } else if (!empty(obj.metainfo.object_number)) { + if (obj.attrib.indent_base == 0 && obj.attrib.indent_hang == 0) { + _txt = format(q"┃ + %s + + + + + %s%s%s + ┃", + _bullet(obj), + obj.metainfo.object_number, + obj.metainfo.object_number, + _tags(obj), + _txt, + obj_num(obj), + ); + } else if (obj.attrib.indent_base == obj.attrib.indent_hang) { + _txt = format(q"┃ + %s + + + + + %s%s%s + ┃", + obj.attrib.indent_base, + _bullet(obj), + obj.metainfo.object_number, + obj.metainfo.object_number, + _tags(obj), + _txt, + obj_num(obj), + ); + } else { + _txt = format(q"┃ + %s + + + + + %s%s%s + ┃", + obj.attrib.indent_base, + obj.attrib.indent_hang, + _bullet(obj), + obj.metainfo.object_number, + obj.metainfo.object_number, + _tags(obj), + _txt, + obj_num(obj), + ); + } + } else { + if (obj.attrib.indent_base == 0 && obj.attrib.indent_hang == 0) { /+ can omit and would explicitly set indent base and hang as 0 each below +/ + _txt = format(q"┃ + %s + %s%s%s + ┃", + _bullet(obj), + _tags(obj), + _txt, + obj_num(obj), + ); + } else if (obj.attrib.indent_base == obj.attrib.indent_hang) { + _txt = format(q"┃ + %s + %s%s%s + ┃", + obj.attrib.indent_base, + _bullet(obj), + _tags(obj), + _txt, + obj_num(obj), + ); + } else { + _txt = format(q"┃ + %s + %s%s%s + ┃", + _bullet(obj), + obj.attrib.indent_base, + obj.attrib.indent_hang, + _tags(obj), + _txt, + obj_num(obj), + ); + } + } + return _txt; + } + string _block_type_delimiters(O)(string[] _block_lines, const O obj) { // TODO + string _block = ""; + foreach (i, _line; _block_lines) { + _line = _footnotes(_line); + if (i == 0) { + _block ~= format(q"┃ + %s + + + + + %s + ┃", + _bullet(obj), + obj.metainfo.object_number, + obj.metainfo.object_number, + // _tags(obj), + _line, + ); + } else { + _block ~= format(q"┃ + %s┃", + _line); + } + } + _block ~= format(q"┃ + + 「%s」 + + ┃", + obj_num(obj)); + return _block; + } + string _special_characters(O)(string _txt, const O obj) { + _txt = _txt + .replaceAll(rgx.xhtml_ampersand, "&") + .replaceAll(rgx.xhtml_quotation, """) + .replaceAll(rgx.xhtml_less_than, "<") + .replaceAll(rgx.xhtml_greater_than, ">") + .replaceAll(rgx.nbsp_char, " "); + return _txt; + } + string _preserve_white_spaces(O)(string _txt, const O obj) { + if (obj.metainfo.is_a == "code" || obj.metainfo.is_a == "verse" || obj.metainfo.is_a == "block") { + _txt = _txt + .replaceAll(rgx.space, " "); + } + return _txt; + } + string _font_face(string _txt){ + _txt = _txt + .replaceAll(rgx.inline_strike, "$1") + .replaceAll(rgx.inline_insert, "$1") + .replaceAll(rgx.inline_cite, "$1") + .replaceAll(rgx.inline_emphasis, format(q"┃%s┃","$1")) + .replaceAll(rgx.inline_bold, format(q"┃%s┃","$1")) + .replaceAll(rgx.inline_italics, format(q"┃%s┃","$1")) + .replaceAll(rgx.inline_underscore, format(q"┃%s┃","$1")) + .replaceAll(rgx.inline_superscript, format(q"┃%s┃","$1")) + .replaceAll(rgx.inline_subscript, format(q"┃%s┃","$1")) + .replaceAll(rgx.inline_mono, format(q"┃%s┃","$1")); + return _txt; + } + auto _obj_num(O)(O obj) { // NOT USED YET + struct objNum { + string reference() { + return format(q"┃ + + + ┃", + obj.object_number, + obj.object_number, + ); + } + string display() { + return format(q"┃ + %s%s%s + ┃", + on_o, + obj.object_number, + on_c, + ); + } + } + return objNum(); + } + string _break_page()() { + return format(q"┃ + + ┃", + ); + } + string _empty_line_break(O)(string _txt, const O obj) { + if (obj.metainfo.is_a == "code" || obj.metainfo.is_a == "verse" || obj.metainfo.is_a == "block") { + _txt = _txt + .replaceAll(rgx.br_empty_line, "
"); + } + return _txt; + } + string _links(O)(string _txt, const O obj) { + if (obj.metainfo.is_a != "code") { + if (obj.metainfo.is_a == "toc") { + _txt = replaceAll!(m => + m[1] ~ "┤" + ~ (replaceAll!(n => + n["type"] ~ n["path"] ~ (n["file"].encodeComponent) + )((obj.stow.link[m["num"].to!ulong]).to!string, rgx.uri_identify_components)) + ~ "├" + )(_txt, rgx.inline_link_number_only) + .replaceAll(rgx.inline_link, + format(q"┃%s┃", + _special_characters("$3", obj), + _special_characters("$1", obj) + )); + } else { + _txt = replaceAll!(m => + m[1] ~ "┤" + ~ (replaceAll!(n => + n["type"] ~ n["path"] ~ (n["file"].encodeComponent) + )((obj.stow.link[m["num"].to!ulong]).to!string, rgx.uri_identify_components)) + ~ "├" + )(_txt, rgx.inline_link_number_only) + .replaceAll(rgx.inline_link, + format(q"┃%s┃", + _special_characters("$2", obj), + _special_characters("$1", obj) + )); + } + } + debug(links) { + if (obj.text.match(rgx.inline_link_number) + && _txt.match(rgx.inline_link_number_only) + ) { + writeln(">> ", _txt); + writeln("is_a: ", obj.metainfo.is_a); + } + } + return _txt; + } + string _images(O)(string _txt, const O obj) { + if (_txt.match(rgx.inline_image)) { + _txt = _txt + .replaceAll(rgx.inline_image, + ("$1 $6")) + .replaceAll( + rgx.inline_link_empty, + ("$1")); + } + return _txt; + } + string markup(O)(const O obj) { + /+ markup TODO +/ + string _txt = obj.text; + _txt = _special_characters(_txt, obj); // TODO & why both obj & obj.text, consider also in output_xmls.org + if (obj.metainfo.is_a == "code" || obj.metainfo.is_a == "verse" || obj.metainfo.is_a == "block") { + _txt = replaceAll!(m => _preserve_white_spaces(m[1], obj))(_txt, rgx.spaces_keep); + } // check that this does what you want, keep: leading spaces (indent) & more than single spaces within text + // _txt = _preserve_white_spaces(_txt, obj); // (obj.metainfo.is_a == "code" || obj.metainfo.is_a == "verse" || obj.metainfo.is_a == "block") + _txt = _font_face(_txt); + _txt = _images(_txt, obj); // (obj.metainfo.is_a != "code") + _txt = _links(_txt, obj); // (obj.metainfo.is_a != "code") + _txt = _empty_line_break(_txt, obj); // (obj.metainfo.is_a == "code" || obj.metainfo.is_a == "verse" || obj.metainfo.is_a == "block") + return _txt; + } + string heading(O,M)( + const O obj, + const M doc_matters, + ) { + assert(obj.metainfo.is_of_part == "body" || "frontmatter" || "backmatter"); + assert(obj.metainfo.is_of_section == "body" || "toc" || "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb"); + assert(obj.metainfo.is_of_type == "para"); + assert(obj.metainfo.is_a == "heading"); + string _o_txt_odt = markup(obj); + if (obj.metainfo.dummy_heading + && (obj.metainfo.is_a == "toc" || obj.metainfo.is_a == "heading")) { + _o_txt_odt = ""; + } else if (obj.metainfo.is_a == "toc") { + _o_txt_odt = format(q"┃%s + %s%s%s + ┃", + _break_page, + obj.metainfo.heading_lev_markup, + obj.metainfo.heading_lev_markup, + _tags(obj), + _o_txt_odt, + obj_num(obj), + ); + } else { + _o_txt_odt = _footnotes(_o_txt_odt); + _o_txt_odt = format(q"┃%s + + + + + %s%s%s + ┃", + _break_page, + obj.metainfo.heading_lev_markup, + obj.metainfo.heading_lev_markup, + obj.metainfo.object_number, + obj.metainfo.object_number, + _tags(obj), + _o_txt_odt, + obj_num(obj), + ); + } + return _o_txt_odt; + } + string para(O,M)( + const O obj, + const M doc_matters, + ) { + assert(obj.metainfo.is_of_part == "body" || "frontmatter" || "backmatter"); + assert(obj.metainfo.is_of_section == "body" || "toc" || "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb"); + assert(obj.metainfo.is_of_type == "para"); + assert(obj.metainfo.is_a == "para" || "toc" || "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb"); + string _o_txt_odt; + if (obj.metainfo.dummy_heading + && (obj.metainfo.is_a == "toc" || obj.metainfo.is_a == "heading")) { + _o_txt_odt = ""; + } else { + _o_txt_odt = markup(obj); + _o_txt_odt = _footnotes(_o_txt_odt); + _o_txt_odt = _indent(_o_txt_odt, obj); // final setting? + } + return _o_txt_odt; + } + string quote(O,M)( + const O obj, + const M doc_matters, + ) { + assert(obj.metainfo.is_of_part == "body"); + assert(obj.metainfo.is_of_section == "body" || "glossary" || "bibliography" || "bookindex" || "blurb"); + assert(obj.metainfo.is_of_type == "block"); + assert(obj.metainfo.is_a == "quote"); + string _o_txt_odt = markup(obj); + _o_txt_odt = _footnotes(_o_txt_odt); // decide + return _o_txt_odt; + } + string group(O,M)( + const O obj, + const M doc_matters, + ) { + assert(obj.metainfo.is_of_part == "body"); + assert(obj.metainfo.is_of_section == "body" || "glossary" || "bibliography" || "bookindex" || "blurb"); + assert(obj.metainfo.is_of_type == "block"); + assert(obj.metainfo.is_a == "group"); + string _o_txt_odt = markup(obj); + /+ TODO + - split lines + - only double newlines (paragraph delimiter), (not line breaks, single new lines) + - no hard space indentation + +/ + string[] _block_lines = (_o_txt_odt).split(rgx.br_newlines_linebreaks); + _o_txt_odt = _block_type_delimiters(_block_lines, obj); + return _o_txt_odt; + } + string block(O,M)( + const O obj, + const M doc_matters, + ) { + assert(obj.metainfo.is_of_part == "body"); + assert(obj.metainfo.is_of_section == "body" || "glossary" || "bibliography" || "bookindex" || "blurb"); + assert(obj.metainfo.is_of_type == "block"); + assert(obj.metainfo.is_a == "block"); + string _o_txt_odt = markup(obj); + string[] _block_lines = (_o_txt_odt).split(rgx.br_newlines_linebreaks); + _o_txt_odt = _block_type_delimiters(_block_lines, obj); + return _o_txt_odt; + } + string verse(O,M)( + const O obj, + const M doc_matters, + ) { + assert(obj.metainfo.is_of_part == "body"); + assert(obj.metainfo.is_of_section == "body" || "glossary" || "bibliography" || "bookindex" || "blurb"); + assert(obj.metainfo.is_of_type == "block"); + assert(obj.metainfo.is_a == "verse"); + string _o_txt_odt = markup(obj); + string[] _block_lines = (_o_txt_odt).split(rgx.br_newlines_linebreaks); + _o_txt_odt = _block_type_delimiters(_block_lines, obj); + return _o_txt_odt; + } + string code(O,M)( + const O obj, + const M doc_matters, + ) { + assert(obj.metainfo.is_of_part == "body"); + assert(obj.metainfo.is_of_section == "body"); + assert(obj.metainfo.is_of_type == "block"); + assert(obj.metainfo.is_a == "code"); + string _o_txt_odt = markup(obj); + /+ TODO + - split lines + - each line including empty lines + - hard space indentation + - "^[ ]"   + - count number only at beginning of line and replace each + +/ + string[] _block_lines = (_o_txt_odt).split(rgx.br_newlines_linebreaks); + string _block = ""; + foreach (i, _line; _block_lines) { + if (i == 1) { + _block ~= format(q"┃ + + + + + + %s + ┃", + obj.metainfo.object_number, + obj.metainfo.object_number, + _line, + ); + } else { + _block ~= format(q"┃ + %s┃", + _line); + } + } + _block ~= format(q"┃ + + 「%s」 + + ┃", + obj_num(obj)); + _o_txt_odt = _block; + return _o_txt_odt; + } + auto tablarize(O)( + const O obj, + string _txt, + ) { + string[] _table_rows = (_txt).split(rgx.table_delimiter_row); + string[] _table_cols; + string _table; + string _tablenote; + foreach(row_idx, row; _table_rows) { + _table_cols = row.split(rgx.table_delimiter_col); + _table ~= ""; + foreach(col_idx, cell; _table_cols) { + if ((_table_cols.length == 1) + && (_table_rows.length <= row_idx+2)) { // check row_idx+2 (rather than == ++row_idx) + _tablenote ~= cell; + } else { + _table ~= format(q"┃ + + %s + + ┃", + (row_idx == 0 && obj.table.heading) ? "Table_Heading" : "P_table_cell", + cell, + ); + } + } + _table ~= ""; + } + auto t = tuple( + _table, + _tablenote, + ); + return t; + } + int _table_number = 0; + string table(O,M)( + const O obj, + const M doc_matters, + ) { + assert(obj.metainfo.is_of_part == "body"); + assert(obj.metainfo.is_of_section == "body"); + assert(obj.metainfo.is_of_type == "block"); + assert(obj.metainfo.is_a == "table"); + string _o_txt_odt = markup(obj); + auto t = tablarize(obj, _o_txt_odt); + string _note = t[1]; + _o_txt_odt = format(q"┃ + + + + + + + %s + + + 「%s」 + ┃", + _table_number++, + obj.metainfo.object_number, + obj.metainfo.object_number, + obj.table.number_of_columns, + t[0], + obj.metainfo.object_number, + // _note, + ); + return _o_txt_odt; + } + } +} +template outputODT() { + import doc_reform.output; + import + std.digest.sha, + std.file, + std.outbuffer, + std.uri, + std.zip, + std.conv : to; + import + doc_reform.output.create_zip_file, + doc_reform.output.xmls, + doc_reform.output.xmls_css; + mixin InternalMarkup; + mixin DocReformOutputRgxInit; + auto rgx = Rgx(); + // mixin outputXmlODT; + string odt_head(I)(I doc_matters) { + string _has_tables = format(q"┃ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ┃",); + string _odt_head = format(q"┃ + + + + + + + + + + + + + + %s + + + + + + + + + + + + + + ┃", + (doc_matters.has.tables > 0) ? _has_tables : "", + ); + return _odt_head; + } + string odt_body(D,I)( + const D doc_abstraction, + I doc_matters, + ) { + mixin formatODT; + auto odt_format = formatODT(); + string delimit = ""; + string doc_odt = ""; + string _txt = ""; + foreach (part; doc_matters.has.keys_seq.scroll) { + foreach (obj; doc_abstraction[part]) { + switch (obj.metainfo.is_of_part) { + case "frontmatter": assert(part == "head" || "toc"); + switch (obj.metainfo.is_of_type) { + case "para": + switch (obj.metainfo.is_a) { + case "heading": + _txt = delimit ~ odt_format.heading(obj, doc_matters); + goto default; + case "toc": + _txt = odt_format.para(obj, doc_matters); + goto default; + default: + doc_odt ~= _txt; + _txt = ""; + break; + } + break; + default: break; + } + break; + case "body": assert(part == "body" || "head"); // surprise + switch (obj.metainfo.is_of_type) { + case "para": + switch (obj.metainfo.is_a) { + case "heading": + _txt = delimit ~ odt_format.heading(obj, doc_matters); + goto default; + case "para": + _txt = odt_format.para(obj, doc_matters); + goto default; + default: + doc_odt ~= _txt; + _txt = ""; + break; + } + break; + case "block": + switch (obj.metainfo.is_a) { + case "quote": + _txt = odt_format.quote(obj, doc_matters); + goto default; + case "group": + _txt = odt_format.group(obj, doc_matters); + goto default; + case "block": + _txt = odt_format.block(obj, doc_matters); + goto default; + case "verse": + _txt = odt_format.verse(obj, doc_matters); + goto default; + case "code": + _txt = odt_format.code(obj, doc_matters); + goto default; + case "table": + _txt = odt_format.table(obj, doc_matters); + goto default; + default: + doc_odt ~= _txt; + _txt = ""; + break; + } + break; + default: break; + } + break; + case "backmatter": + assert(part == "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb" || "tail"); + switch (obj.metainfo.is_of_type) { + case "para": + switch (obj.metainfo.is_a) { + case "heading": + _txt = delimit ~ odt_format.heading(obj, doc_matters); + goto default; + case "endnote": assert(part == "endnotes"); + _txt = odt_format.para(obj, doc_matters); + goto default; + case "glossary": assert(part == "glossary"); + _txt = odt_format.para(obj, doc_matters); + goto default; + case "bibliography": assert(part == "bibliography"); + _txt = odt_format.para(obj, doc_matters); + goto default; + case "bookindex": assert(part == "bookindex"); + _txt = odt_format.para(obj, doc_matters); + goto default; + case "blurb": assert(part == "blurb"); + _txt = odt_format.para(obj, doc_matters); + goto default; + default: + doc_odt ~= _txt; + _txt = ""; + break; + } + break; + default: break; + } + break; + case "comment": + break; + default: + { /+ debug +/ + if (doc_matters.opt.action.debug_do + && doc_matters.opt.action.verbose) { + writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_part); + writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a); + writeln(__FILE__, ":", __LINE__, ": ", obj.text); + } + } + break; + } + } + } + return doc_odt; + } + + string odt_tail() { + string _odt_tail = format(q"┃DocReform: <www.doc_reform.org> and <www.sisudoc.org> + ┃",); + return _odt_tail; + } + string content_xml(D,I)( + const D doc_abstraction, + I doc_matters, + ) { + string _content_xml; + string break_line = (doc_matters.opt.action.debug_do) ? "\n" : ""; + string odt_break_page = format(q"┃┃",); + string br_pg = format(q"┃┃",); + _content_xml ~= odt_head(doc_matters); + _content_xml ~= odt_body(doc_abstraction, doc_matters); + _content_xml ~= odt_tail; + return _content_xml; + } + string manifest_xml(M)( + auto ref M doc_matters, + ) { + string _bullet = format(q"┃┃"); + string[] _images = [ _bullet ]; + foreach (image; doc_matters.srcs.image_list) { + _images ~= format(q"┃ ┃", image); + } + string _manifest_xml = format(q"┃ + + + + + %s + + + + + + ┃", + _images.join("\n"), + ); + return _manifest_xml; + } + void images_cp(M)( + auto ref M doc_matters, + ) { + { /+ (copy odt images) +/ + auto pth_odt = DocReformPathsODT!()(doc_matters); + foreach (image; doc_matters.srcs.image_list) { + auto fn_src_in = doc_matters.src.image_dir_path ~ "/" ~ image; + auto fn_src_out_file = pth_odt.image_dir("fs") ~ "/" ~ image; + auto fn_src_out_zip = pth_odt.image_dir("zip") ~ "/" ~ image; + if (exists(fn_src_in)) { + if (doc_matters.opt.action.debug_do) { + if (doc_matters.opt.action.debug_do) { + fn_src_in.copy(fn_src_out_file); + } + } + } + } + } + // return 0; + } + string meta_xml(M)( + auto ref M doc_matters, + ) { + /+ (meta_xml includes output time-stamp) +/ + string _meta_xml = format(q"┃ + + + %s + %s + %s + en-US + + + ┃", + doc_matters.generator_program.name_and_version, + doc_matters.generated_time, + doc_matters.generated_time, + ); + return _meta_xml; + } + void dirtree(I)( + I doc_matters, + ) { + auto pth_odt = DocReformPathsODT!()(doc_matters); + if (doc_matters.opt.action.debug_do) { /+ (dir tree) +/ + if (!exists(pth_odt.meta_inf_dir("fs"))) { + pth_odt.meta_inf_dir("fs").mkdirRecurse; + } + if (!exists(pth_odt.image_dir("fs"))) { + pth_odt.image_dir("fs").mkdirRecurse; + } + } + if (!exists(pth_odt.base_pth)) { + pth_odt.base_pth.mkdirRecurse; + } + // return 0; + } + string mimetype() { + string mimetype_ = format(q"┃application/vnd.oasis.opendocument.text┃"); + return mimetype_; + } + string manifest_rdf() { + string _manifest_rdf = format(q"┃ + + + + + + + + + + + + + + + + + + ┃"); + return _manifest_rdf; + } + string settings_xml() { + string _settings_xml = format(q"┃ + + + + 0 + 0 + 0 + 0 + true + false + + + view2 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + true + 100 + false + + + + + true + false + false + true + true + false + true + false + false + + false + false + false + true + true + 0 + false + false + false + false + true + false + false + false + false + true + true + false + false + true + false + true + false + high-resolution + 1 + 0 + true + + + false + true + + false + true + false + true + false + true + false + + true + true + false + true + true + true + false + false + + false + 0 + false + false + true + true + + + + ┃"); + return _settings_xml; + } + string styles_xml() { + string _styles_xml = format(q"┃ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ┃"); + return _styles_xml; + } + + void writeOutputODT(W,I)( + const W odt_content, + I doc_matters, + ) { + auto pth_odt = DocReformPathsODT!()(doc_matters); + auto fn_odt = pth_odt.odt_file; + auto zip = new ZipArchive(); // ZipArchive zip = new ZipArchive(); + void ODTzip()(string contents, string fn) { + auto zip_arc_member_file = new ArchiveMember(); + zip_arc_member_file.name = fn; + auto zip_data = new OutBuffer(); + (doc_matters.opt.action.debug_do) + ? zip_data.write(contents.dup) + : zip_data.write(contents.dup + .replaceAll(rgx.spaces_line_start, "") + .replaceAll(rgx.newline, "") + .strip + ); + zip_arc_member_file.expandedData = zip_data.toBytes(); + zip.addMember(zip_arc_member_file); + createZipFile!()(fn_odt, zip.build()); + } + try { + if (!exists(pth_odt.base_pth)) { // check + pth_odt.base_pth.mkdirRecurse; + } + string fn; + File f; + { fn = pth_odt.mimetype("zip"); + ODTzip(odt_content.mimetype, fn); + } + { fn = pth_odt.manifest_rdf("zip"); + ODTzip(odt_content.manifest_rdf, fn); + } + { fn = pth_odt.settings_xml("zip"); + ODTzip(odt_content.settings_xml, fn); + } + { fn = pth_odt.styles_xml("zip"); + ODTzip(odt_content.styles_xml, fn); + } + { fn = pth_odt.content_xml("zip"); + ODTzip(odt_content.content_xml, fn); + } + { fn = pth_odt.manifest_xml("zip"); + ODTzip(odt_content.manifest_xml, fn); + } + { fn = pth_odt.meta_xml("zip"); + ODTzip(odt_content.meta_xml, fn); + } + { /+ (images) +/ + foreach (image; doc_matters.srcs.image_list) { + auto fn_src = doc_matters.src.image_dir_path ~ "/" ~ image; + auto fn_out = pth_odt.image_dir("zip") ~ "/" ~ image; + if (exists(fn_src)) { + { + auto zip_arc_member_file = new ArchiveMember(); + zip_arc_member_file.name = fn_out; + auto zip_data = new OutBuffer(); + zip_data.write(cast(char[]) ((fn_src).read)); + zip_arc_member_file.expandedData = zip_data.toBytes(); + zip.addMember(zip_arc_member_file); + createZipFile!()(fn_odt, zip.build()); + } + } + } + } + if (!(doc_matters.opt.action.quiet)) { + writeln(" ", pth_odt.odt_file); + } + } catch (ErrnoException ex) { + // Handle error + } + if (doc_matters.opt.action.debug_do) { + pth_odt.mimetype("fs"); /+ (mimetype) +/ + pth_odt.manifest_rdf("fs"); /+ (manifest.rdf) +/ + pth_odt.settings_xml("fs"); /+ (settings.xml) +/ + pth_odt.styles_xml("fs"); /+ (styles_xml) +/ + + pth_odt.content_xml("fs"); + pth_odt.manifest_xml("fs"); + pth_odt.meta_xml("fs"); + } + } + void outputODT(D,I)( + const D doc_abstraction, + I doc_matters, + ) { + struct ODT { + /+ fixed output +/ + string mimetype; + string manifest_rdf; + string settings_xml; + string styles_xml; + /+ variable output +/ + string content_xml; // substantive content + string manifest_xml; // image list changes + string meta_xml; // time stamp + } + // auto pth_odt = DocReformPathsODT!()(doc_matters); + auto odt = ODT(); + odt.mimetype = mimetype; + odt.manifest_rdf = manifest_rdf; + odt.settings_xml = settings_xml; + odt.styles_xml = styles_xml; + odt.content_xml = content_xml(doc_abstraction, doc_matters); + odt.manifest_xml = manifest_xml(doc_matters); + odt.meta_xml = meta_xml(doc_matters); + odt.writeOutputODT(doc_matters); + dirtree(doc_matters); + images_cp(doc_matters); // copy images + } +} diff --git a/src/doc_reform/output/paths_output.d b/src/doc_reform/output/paths_output.d index f33db27..615a666 100644 --- a/src/doc_reform/output/paths_output.d +++ b/src/doc_reform/output/paths_output.d @@ -264,6 +264,73 @@ template DocReformPathsEPUB() { return _PathsStruct(); } } +template DocReformPathsODT() { + mixin DocReformRgxInit; + static auto rgx = Rgx(); + auto DocReformPathsODT(M)( + M doc_matters, + ) { + auto out_pth = DocReformOutPaths!()( doc_matters.output_path, doc_matters.src.language); + string base_dir = "odf"; + struct _PathsStruct { + string base_pth() { // dir will contain odt document file (also debug file tree) + return asNormalizedPath((out_pth.output_base).chainPath(base_dir)).array; + } + // string base_filename() { + // return doc_matters.src.filename_base; + // } + string odt_file() { + return asNormalizedPath(base_pth.chainPath(doc_matters.src.filename_base ~ ".odt")).array; + } + string dirtop(string type) { + return (type == "zip") + ? "".chainPath("").array + : asNormalizedPath(base_pth.chainPath(doc_matters.src.filename_base)).array; + } + string mimetype(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(dirtop(type).chainPath("mimetype")).array; + } + string manifest_rdf(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(dirtop(type).chainPath("manifest.rdf")).array; + } + string settings_xml(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(dirtop(type).chainPath("settings.xml")).array; + } + string styles_xml(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(dirtop(type).chainPath("styles.xml")).array; + } + string image_dir(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(dirtop(type).chainPath("Pictures")).array; + } + string image(string image_fn_src, string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(image_dir(type).chainPath(image_fn_src)).array; + } + string content_xml(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(dirtop(type).chainPath("content.xml")).array; + } + string meta_inf_dir(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(dirtop(type).chainPath("META-INF")).array; + } + string manifest_xml(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(meta_inf_dir(type).chainPath("manifest.xml")).array; + } + string meta_xml(string type="fs") { + assert(type == "zip" || "fs"); + return asNormalizedPath(dirtop(type).chainPath("meta.xml")).array; + } + } + return _PathsStruct(); + } +} template DocReformPathsSQLiteDiscrete() { mixin DocReformRgxInit; static auto rgx = Rgx(); diff --git a/views/version.txt b/views/version.txt index f812b6e..9a7e61e 100644 --- a/views/version.txt +++ b/views/version.txt @@ -4,7 +4,7 @@ struct Version { int minor; int patch; } -enum _ver = Version(0, 7, 0); +enum _ver = Version(0, 7, 1); version (Posix) { version (DigitalMars) { } else version (LDC) { -- cgit v1.2.3