diff options
Diffstat (limited to 'src/doc_reform/io_out/odt.d')
-rw-r--r-- | src/doc_reform/io_out/odt.d | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/doc_reform/io_out/odt.d b/src/doc_reform/io_out/odt.d index 6e792a5..1a553d1 100644 --- a/src/doc_reform/io_out/odt.d +++ b/src/doc_reform/io_out/odt.d @@ -243,13 +243,13 @@ template formatODT() { .replaceAll(rgx.inline_strike, "<del>$1</del>") .replaceAll(rgx.inline_insert, "<ins>$1</ins>") .replaceAll(rgx.inline_cite, "<cite>$1</cite>") - .replaceAll(rgx.inline_emphasis, format(q"┃<text:span text:style-name="Span_bold">%s</text:span>┃","$1")) - .replaceAll(rgx.inline_bold, format(q"┃<text:span text:style-name="Span_bold">%s</text:span>┃","$1")) - .replaceAll(rgx.inline_italics, format(q"┃<text:span text:style-name="Span_italic">%s</text:span>┃","$1")) - .replaceAll(rgx.inline_underscore, format(q"┃<text:span text:style-name="Span_underscore">%s</text:span>┃","$1")) + .replaceAll(rgx.inline_emphasis, format(q"┃<text:span text:style-name="Span_bold">%s</text:span>┃", "$1")) + .replaceAll(rgx.inline_bold, format(q"┃<text:span text:style-name="Span_bold">%s</text:span>┃", "$1")) + .replaceAll(rgx.inline_italics, format(q"┃<text:span text:style-name="Span_italic">%s</text:span>┃", "$1")) + .replaceAll(rgx.inline_underscore, format(q"┃<text:span text:style-name="Span_underscore">%s</text:span>┃", "$1")) .replaceAll(rgx.inline_superscript, format(q"┃<text:span text:style-name="Span_superscript">%s</text:span>┃","$1")) - .replaceAll(rgx.inline_subscript, format(q"┃<text:span text:style-name="Span_subscript">%s</text:span>┃","$1")) - .replaceAll(rgx.inline_mono, format(q"┃<text:span text:style-name="Span_monospace">%s</text:span>┃","$1")); + .replaceAll(rgx.inline_subscript, format(q"┃<text:span text:style-name="Span_subscript">%s</text:span>┃", "$1")) + .replaceAll(rgx.inline_mono, format(q"┃<text:span text:style-name="Span_monospace">%s</text:span>┃", "$1")); return _txt; } auto _obj_num(O)(O obj) @safe { // NOT USED YET @@ -519,7 +519,7 @@ template formatODT() { _o_txt_odt = _block; return _o_txt_odt; } - auto tablarize(O)( + Tuple!(string, string) tablarize(O)( const O obj, string _txt, ) @safe { @@ -547,7 +547,7 @@ template formatODT() { } _table ~= "</table:table-row>"; } - auto t = tuple( + Tuple!(string, string) t = tuple( _table, _tablenote, ); @@ -563,7 +563,7 @@ template formatODT() { 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); + Tuple!(string, string) t = tablarize(obj, _o_txt_odt); string _note = t[1]; _o_txt_odt = format(q"┃ <table:table table:name="Table%s" table:style-name="Table1"> |