aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
Diffstat (limited to 'org')
-rw-r--r--org/default_misc.org3
-rw-r--r--org/default_paths.org32
-rw-r--r--org/default_regex.org8
-rw-r--r--org/meta_abstraction.org55
-rw-r--r--org/output_hub.org3
-rw-r--r--org/output_sisupod.org5
-rw-r--r--org/output_xmls.org153
7 files changed, 199 insertions, 60 deletions
diff --git a/org/default_misc.org b/org/default_misc.org
index d021565..582dfa9 100644
--- a/org/default_misc.org
+++ b/org/default_misc.org
@@ -214,7 +214,7 @@ import
21 special characters used:
#+BEGIN_SRC text
-【】〖〗┥┝┤├¤░┘┙┚┼┿╂┊┏┚┆■
+【】〖〗┥┝┤├¤░┘┙┚┼┿╂┊┏┚┆■☼
#+END_SRC
#+name: defaults_template_markup
@@ -240,6 +240,7 @@ template InternalMarkup() {
auto tc_c = "┚";
auto tc_p = "┆";
auto mono = "■";
+ auto img = "☼";
static string indent_by_spaces_provided(int indent, string _indent_spaces ="░░") {
_indent_spaces = replicate(_indent_spaces, indent);
return _indent_spaces;
diff --git a/org/default_paths.org b/org/default_paths.org
index 4da6a85..5c0dba4 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -61,7 +61,7 @@ template PodManifest() {
_manifest_path = _pth;
} else if (_pth.match(rgx.src_pth_contents)
&& exists(_pth)!=0 && _pth.isFile) {
- _manifest_path = dirName(_pth);
+ _manifest_path = _pth.dirName;
} else if (_pth.match(rgx.src_pth_pod_sst_or_ssm)
&& exists(_pth)!=0 && (_pth.isFile)) {
if (auto m = _pth.match(rgx.src_pth_pod_sst_or_ssm)) {
@@ -591,7 +591,7 @@ template SiSUpathsSRC() {
static auto rgx = Rgx();
auto SiSUpathsSRC(D,Fn)(
D _pwd,
- Fn _fn_src_and_relative_path,
+ Fn _fn_src_and_path,
) {
struct SisuSrcPaths {
auto pwd() {
@@ -600,7 +600,7 @@ template SiSUpathsSRC() {
auto language() {
// use command line info as well?
string _k;
- if (auto m = _fn_src_and_relative_path.match(rgx.language_code_and_filename)) {
+ if (auto m = _fn_src_and_path.match(rgx.language_code_and_filename)) {
_k = m.captures[1];
} else { /+ unknown until doc_meta read, (could provide & use command line info?) +/
_k = "xx"; // original default was "en" but is not known
@@ -625,11 +625,29 @@ template SiSUpathsSRC() {
auto doc_src_fn_with_path_for_text_root_and_lng() {
return asNormalizedPath(text_root.chainPath(language)).array;
}
- auto doc_src_with_relative_path() {
- return asNormalizedPath(pwd.chainPath(_fn_src_and_relative_path)).array;
- }
auto doc_src_fn() {
- return asNormalizedPath(_fn_src_and_relative_path.baseName).array;
+ return asNormalizedPath(_fn_src_and_path.baseName).array;
+ }
+ auto doc_src_with_path() {
+ return asNormalizedPath(pwd.chainPath(_fn_src_and_path)).array;
+ }
+ auto src_image_root_with_path() {
+ string[] _possible_img_pth = [
+ asNormalizedPath(pwd.chainPath((_fn_src_and_path).dirName ~ "/image")).array,
+ asNormalizedPath(pwd.chainPath((_fn_src_and_path).dirName ~ "/../image")).array,
+ asNormalizedPath(pwd.chainPath((_fn_src_and_path).dirName ~ "/../../image")).array,
+ ];
+ string _img_pth_found = "";
+ foreach(_img_pth; _possible_img_pth) {
+ if (exists(_img_pth)) {
+ _img_pth_found = _img_pth;
+ break;
+ }
+ }
+ if (_img_pth_found.empty) {
+ writeln("WARNING not image path found, searched: ", _possible_img_pth);
+ }
+ return _img_pth_found;
}
}
return SisuSrcPaths();
diff --git a/org/default_regex.org b/org/default_regex.org
index 5b759b0..6b535a0 100644
--- a/org/default_regex.org
+++ b/org/default_regex.org
@@ -22,10 +22,10 @@ http://dlang.org/phobos/std_regex.html
- Regex!char (wchar/dchar) that contains a pattern in the form of compiled bytecode.
- StaticRegex!char (wchar/dchar) that contains a pattern in the form of compiled native machine code.
-21 special characters used:
+22 special characters used:
#+BEGIN_SRC text
-【】〖〗┥┝┤├¤░┘┙┚┼┿╂┊┏┚┆■
+【】〖〗┥┝┤├¤░┘┙┚┼┿╂┊┏┚┆■☼
#+END_SRC
** 0. module template
@@ -269,6 +269,9 @@ static smid_inline_link_endnote_url_helper = ctRegex!(`\{~\^\s+(?P<co
#+name: meta_rgx
#+BEGIN_SRC d
static image = ctRegex!(`([a-zA-Z0-9._-]+?\.(?:png|gif|jpg))`, "mg");
+static smid_image_generic = ctRegex!(`(?:^|[ ]|[^\S]?)\{(?:~\^\s+|\s*)\S+\.(?:png|gif|jpg).+?\}(?:image|(?:(?:https?|git):\/\/|¤?\.\.\/|¤?\.\/|¤|#)\S+?)[;:!,?.]?(?:[ )\]]|$)`, "mg");
+static smid_image_with_dimensions = ctRegex!(`(?P<pre>(?:^|[ ]|[^\S]?)\{(?:~\^\s+|\s*))(?P<image>\S+\.(?:png|gif|jpg))\s+(?P<width>\d+)x(?P<height>\d+)\s*(?P<post>(?:.+?)\s*\}(?:image|(?:(?:https?|git):\/\/|¤?\.\.\/|¤?\.\/|¤|#)\S+?)(?:[;:!,?.]?(?:[ )\]]|$)))`, "mg");
+static smid_image = ctRegex!(`(?P<pre>(?:^|[ ]|[^\S]?)\{(?:~\^\s+|\s*))(?P<image>\S+\.(?:png|gif|jpg))\s*(?P<post>(?:.+?)\s*\}(?:image|(?:(?:https?|git):\/\/|¤?\.\.\/|¤?\.\/|¤|#)\S+?)(?:[;:!,?.]?(?:[ )\]]|$)))`, "mg");
#+END_SRC
*** inline markup book index :inline:bookindex:
@@ -485,6 +488,7 @@ static inline_text_and_note_al_ = ctRegex!(`(.+?(?:【[*+]
#+name: prgmkup_rgx
#+BEGIN_SRC d
/+ inline markup footnotes endnotes +/
+static inline_image = ctRegex!(`(?P<pre>┥)☼(?P<imginf>(?P<img>\S+?\.(?:jpg|gif|png)),w(?P<width>\d+)h(?P<height>\d+))\s*(?P<post>.*?┝┤.+?├)`, "mg");
static inline_link = ctRegex!(`┥(?P<text>.+?)┝┤(?P<link>.+?)├`, "mg");
static inline_link_clean = ctRegex!(`┤(?:.+?)├|[┥┝]`, "mg");
static inline_a_url = ctRegex!(`(┤)(\S+?)(├)`, "mg");
diff --git a/org/meta_abstraction.org b/org/meta_abstraction.org
index 27f83be..4acb481 100644
--- a/org/meta_abstraction.org
+++ b/org/meta_abstraction.org
@@ -2614,7 +2614,7 @@ auto _doc_header_and_make_substitutions_(L,CMM)(
if (conf_make_meta.make.substitute) {
foreach(substitution_pair; conf_make_meta.make.substitute) {
line = line.replaceAll(
- regex(substitution_pair[Substitute.match]),
+ regex("\b" ~ substitution_pair[Substitute.match]),
substitution_pair[Substitute.markup]
);
}
@@ -2637,19 +2637,19 @@ auto _doc_header_and_make_substitutions_fontface_(L,CMM)(
enum Substitute { match, markup, }
if ( conf_make_meta.make.bold) {
line = line.replaceAll(
- regex(conf_make_meta.make.bold[Substitute.match]),
+ regex("\b" ~ conf_make_meta.make.bold[Substitute.match]),
conf_make_meta.make.bold[Substitute.markup]
);
}
if (conf_make_meta.make.emphasis) {
line = line.replaceAll(
- regex(conf_make_meta.make.emphasis[Substitute.match]),
+ regex("\b" ~ conf_make_meta.make.emphasis[Substitute.match]),
conf_make_meta.make.emphasis[Substitute.markup]
);
}
if (conf_make_meta.make.italics) {
line = line.replaceAll(
- regex(conf_make_meta.make.italics[Substitute.match]),
+ regex("\b" ~ conf_make_meta.make.italics[Substitute.match]),
conf_make_meta.make.italics[Substitute.markup]
);
}
@@ -4747,7 +4747,7 @@ static struct ObjInlineMarkupMunge {
}
#+END_SRC
-******* url links
+******* url links including images
#+name: meta_emitters_obj_inline_markup_munge
#+BEGIN_SRC d
@@ -4812,6 +4812,47 @@ static struct ObjInlineMarkupMunge {
}
#+END_SRC
+#+name: meta_emitters_obj_inline_markup_munge
+#+BEGIN_SRC d
+ static auto images(Ot)(Ot obj_txt_in) {
+ debug(asserts) {
+ static assert(is(typeof(obj_txt_in) == string));
+ }
+ static auto mng = InlineMarkup();
+ obj_txt_in = obj_txt_in.replaceAll(rgx.inline_mono, (mng.mono ~ "{$1}" ~ mng.mono)); // figure
+ /+ url matched +/
+ obj_txt_in = obj_txt_in.replaceAll(rgx.inline_notes_al_special, ""); // TODO reinstate when special footnotes are implemented
+ if (obj_txt_in.match(rgx.smid_image_generic)) { /+ images with and without links +/
+ debug(images) {
+ writeln("Image: ", obj_txt_in);
+ }
+ if (obj_txt_in.match(rgx.smid_image_with_dimensions)) {
+ obj_txt_in = (obj_txt_in).replaceAll(
+ rgx.smid_image_with_dimensions,
+ ("$1"
+ ~ mkup.img ~ "$2,w$3h$4 "
+ ~ "$5") // ("$1{ $2 }$2$3")
+ );
+ debug(images) {
+ writeln("IMAGE with size: ", obj_txt_in); // decide on representation
+ }
+ } else if (obj_txt_in.match(rgx.smid_image)) {
+ obj_txt_in = (obj_txt_in).replaceAll(
+ rgx.smid_image,
+ ("$1"
+ ~ mkup.img ~ "$2,w0h0 "
+ ~ "$3") // ("$1{ $2 }$2$3")
+ );
+ debug(images) {
+ writeln("IMAGE: ", obj_txt_in); // decide on representation
+ }
+ }
+ }
+ obj_txt_in = obj_txt_in.replaceAll(rgx.inline_mono_box, ("#{$1}#")); // figure
+ return obj_txt_in;
+ }
+#+END_SRC
+
******* footnotes endnotes markup
#+name: meta_emitters_obj_inline_markup_munge
@@ -4909,6 +4950,10 @@ static struct ObjInlineMarkupMunge {
rgx.inline_notes_curly_sp_plus,
(mkup.en_a_o ~ "+" ~ " $1" ~ mkup.en_a_c)
);
+ /+ image matched +/
+ if (obj_txt_in.match(rgx.smid_image_generic)) {
+ obj_txt_in = images(obj_txt_in);
+ }
/+ url matched +/
if (obj_txt_in.match(rgx.smid_inline_url)) {
urls = true;
diff --git a/org/output_hub.org b/org/output_hub.org
index 3129b72..bccfb01 100644
--- a/org/output_hub.org
+++ b/org/output_hub.org
@@ -160,6 +160,7 @@ if (doc_matters.opt.action.html) {
writeln("html seg done");
}
outputHTML!().css(doc_matters);
+ outputHTML!().images_cp(doc_matters);
} else if (doc_matters.opt.action.html_seg) {
if ((doc_matters.opt.action.verbose)) {
writeln("html seg processing... ");
@@ -170,6 +171,7 @@ if (doc_matters.opt.action.html) {
writeln("html seg done");
}
outputHTML!().css(doc_matters);
+ outputHTML!().images_cp(doc_matters);
} else if (doc_matters.opt.action.html_scroll) {
if ((doc_matters.opt.action.verbose)) {
writeln("html scroll processing... ");
@@ -180,6 +182,7 @@ if (doc_matters.opt.action.html) {
writeln("html scroll done");
}
outputHTML!().css(doc_matters);
+ outputHTML!().images_cp(doc_matters);
}
#+END_SRC
diff --git a/org/output_sisupod.org b/org/output_sisupod.org
index a53f9c7..931f80b 100644
--- a/org/output_sisupod.org
+++ b/org/output_sisupod.org
@@ -120,10 +120,7 @@ auto fn_sisupod = pths_sisupod.sisupod_filename(doc_matters.src.filename).zpod;
pths_sisupod.image_root(doc_matters.src.filename).zpod, "/", image
);
}
- auto fn_src_in = ((doc_matters.src.is_pod)
- ? doc_matters.src.image_dir_path
- : pth_sisudoc_src.image_root).to!string
- ~ "/" ~ image;
+ auto fn_src_in = doc_matters.src_path_info.src_image_root_with_path ~ "/" ~ image;
auto fn_src_out_sisupod_zip_base
= pths_sisupod.image_root(doc_matters.src.filename).zpod.to!string
~ "/" ~ image;
diff --git a/org/output_xmls.org b/org/output_xmls.org
index 0cbde63..9a27bc7 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -416,6 +416,36 @@ auto tail() {
#+END_SRC
*** inline markup
+**** images
+
+#+name: xhtml_format_objects
+#+BEGIN_SRC d
+auto inline_images(O)(
+ auto return ref const O obj,
+ string _txt,
+ string _suffix = ".html",
+ string _xml_type = "seg",
+) {
+ string _img_pth;
+ if (_xml_type == "epub") {
+ _img_pth = "image/";
+ } else if (_xml_type == "scroll") {
+ _img_pth = "../../image/";
+ } else if (_xml_type == "seg") {
+ _img_pth = "../../../image/";
+ }
+ if (_txt.match(rgx.inline_image)) {
+ _txt = (_txt)
+ .replaceAll( // TODO bug where image dimensions (w or h) not given & consequently set to 0; should not be used (calculate earlier, abstraction)
+ rgx.inline_image,
+ ("$1<img src=\""
+ ~ _img_pth
+ ~ "$3\" width=\"$4\" height=\"$5\" naturalsizeflag=\"0\" align=\"bottom\" border=\"0\" /> $6"));
+ }
+ return _txt;
+}
+#+END_SRC
+
**** links
#+name: xhtml_format_objects
@@ -424,11 +454,11 @@ auto inline_links(O)(
auto return ref const O obj,
string _txt,
string _suffix = ".html",
- string seg_scroll = "seg",
+ string _xml_type = "seg",
) {
if (obj.inline_links) {
if ((_txt.match(rgx.mark_internal_site_lnk))
- && (seg_scroll == "scroll")) { // conditions reversed to avoid: gdc compiled program run segfault
+ && (_xml_type == "scroll")) { // conditions reversed to avoid: gdc compiled program run segfault
_txt = (_txt).replaceAll(
rgx.inline_seg_link,
"$1");
@@ -551,6 +581,7 @@ auto inline_markup_scroll(O)(
string _txt,
string _suffix = ".html",
) {
+ _txt = inline_images(obj, _txt, _suffix, "scroll");
_txt = inline_links(obj, _txt, _suffix, "scroll");
_txt = inline_notes_scroll(obj, _txt);
return _txt;
@@ -565,8 +596,10 @@ auto inline_markup_seg(O)(
auto return ref const O obj,
string _txt,
string _suffix = ".html",
+ string _xml_type = "seg",
) {
- _txt = inline_links(obj, _txt, _suffix, "seg");
+ _txt = inline_images(obj, _txt, _suffix, _xml_type);
+ _txt = inline_links(obj, _txt, _suffix, _xml_type);
auto t = inline_notes_seg(obj, _txt);
return t;
}
@@ -696,11 +729,11 @@ auto nav_pre_next_svg(O)(
auto heading(O)(
auto return ref const O obj,
string _txt,
- string _type="html",
+ string _xml_type = "html",
) {
auto tags = _xhtml_anchor_tags(obj.anchor_tags);
string _horizontal_rule = "<hr />";
- if ((_type != "html")
+ if ((_xml_type != "html")
|| (obj.heading_lev_markup == 0 || obj.heading_lev_markup > 4)) {
_horizontal_rule = "";
}
@@ -768,12 +801,12 @@ auto heading_seg(O)(
auto return ref const O obj,
string _txt,
string _suffix = ".html",
- string _type = "html",
+ string _xml_type = "html",
) {
- auto t = inline_markup_seg(obj, _txt, _suffix);
+ auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
_txt = t[0];
string[] _endnotes = t[1];
- string o = heading(obj, _txt, _type);
+ string o = heading(obj, _txt, _xml_type);
auto u = tuple(
o,
_endnotes,
@@ -852,8 +885,9 @@ auto para_seg(O)(
auto return ref const O obj,
string _txt,
string _suffix = ".html",
+ string _xml_type = "html",
) {
- auto t = inline_markup_seg(obj, _txt, _suffix);
+ auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
_txt = t[0].to!string;
string[] _endnotes = t[1];
string o = para(obj, _txt);
@@ -927,8 +961,9 @@ auto quote_seg(O)(
auto return ref const O obj,
string _txt,
string _suffix = ".html",
+ string _xml_type = "html",
) {
- auto t = inline_markup_seg(obj, _txt, _suffix);
+ auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
_txt = t[0].to!string;
string[] _endnotes = t[1];
string o = quote(obj, _txt);
@@ -986,6 +1021,7 @@ auto group_scroll(O)(
auto return ref const O obj,
string _txt,
string _suffix = ".html",
+ string _xml_type = "html",
) {
auto tags = _xhtml_anchor_tags(obj.anchor_tags);
_txt = inline_markup_scroll(obj, _txt, _suffix);
@@ -1002,8 +1038,9 @@ auto group_seg(O)(
auto return ref const O obj,
string _txt,
string _suffix = ".html",
+ string _xml_type = "html",
) {
- auto t = inline_markup_seg(obj, _txt, _suffix);
+ auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
_txt = t[0].to!string;
string[] _endnotes = t[1];
string o = group(obj, _txt);
@@ -1057,6 +1094,7 @@ auto block_scroll(O)(
auto return ref const O obj,
string _txt,
string _suffix = ".html",
+ string _xml_type = "html",
) {
auto tags = _xhtml_anchor_tags(obj.anchor_tags);
_txt = inline_markup_scroll(obj, _txt, _suffix);
@@ -1073,8 +1111,9 @@ auto block_seg(O)(
auto return ref const O obj,
string _txt,
string _suffix = ".html",
+ string _xml_type = "html",
) {
- auto t = inline_markup_seg(obj, _txt, _suffix);
+ auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
_txt = t[0].to!string;
string[] _endnotes = t[1];
string o = block(obj, _txt);
@@ -1128,6 +1167,7 @@ auto verse_scroll(O)(
auto return ref const O obj,
string _txt,
string _suffix = ".html",
+ string _xml_type = "html",
) {
auto tags = _xhtml_anchor_tags(obj.anchor_tags);
_txt = inline_markup_scroll(obj, _txt, _suffix);
@@ -1144,8 +1184,9 @@ auto verse_seg(O)(
auto return ref const O obj,
string _txt,
string _suffix = ".html",
+ string _xml_type = "html",
) {
- auto t = inline_markup_seg(obj, _txt, _suffix);
+ auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
_txt = t[0].to!string;
string[] _endnotes = t[1];
string o = verse(obj, _txt);
@@ -1304,6 +1345,7 @@ template outputHTML() {
<<output_html_scroll>>
<<output_html_seg>>
<<output_html_css>>
+ <<copy_html_images>>
}
#+END_SRC
@@ -1538,7 +1580,7 @@ void seg(D,I)(
top_level_headings[3] = "";
goto default;
default:
- auto t = xhtml_format.heading_seg(obj, _txt, suffix);
+ auto t = xhtml_format.heading_seg(obj, _txt, suffix, "seg");
top_level_headings[obj.heading_lev_markup] = t[0];
break;
}
@@ -1553,13 +1595,13 @@ void seg(D,I)(
// writeln(top_level_heading);
doc_html[segment_filename] ~= top_level_heading;
}
- auto t = xhtml_format.heading_seg(obj, _txt, suffix);
+ auto t = xhtml_format.heading_seg(obj, _txt, suffix, "seg");
doc_html[segment_filename] ~= t[0].to!string;
doc_html[segment_filename] ~= xhtml_format.lev4_heading_subtoc(obj);
doc_html_endnotes[segment_filename] ~= t[1];
break;
case 5: .. case 7:
- auto t = xhtml_format.heading_seg(obj, _txt, suffix);
+ auto t = xhtml_format.heading_seg(obj, _txt, suffix, "seg");
doc_html[segment_filename] ~= t[0].to!string;
doc_html_endnotes[segment_filename] ~= t[1];
break;
@@ -1583,7 +1625,7 @@ void seg(D,I)(
case "para":
switch (obj.is_a) {
case "toc":
- auto t = xhtml_format.para_seg(obj, _txt, suffix);
+ auto t = xhtml_format.para_seg(obj, _txt, suffix, "seg");
doc_html[segment_filename] ~= t[0].to!string;
break;
default:
@@ -1605,7 +1647,7 @@ void seg(D,I)(
case "para":
switch (obj.is_a) {
case "para":
- auto t = xhtml_format.para_seg(obj, _txt, suffix);
+ auto t = xhtml_format.para_seg(obj, _txt, suffix, "seg");
doc_html[segment_filename] ~= t[0].to!string;
doc_html_endnotes[segment_filename] ~= t[1];
break;
@@ -1619,24 +1661,24 @@ void seg(D,I)(
case "block":
switch (obj.is_a) {
case "quote":
- auto t = xhtml_format.quote_seg(obj, _txt, suffix);
+ auto t = xhtml_format.quote_seg(obj, _txt, suffix, "seg");
doc_html[segment_filename] ~= t[0].to!string;
doc_html_endnotes[segment_filename] ~= t[1];
break;
case "group":
- auto t = xhtml_format.group_seg(obj, _txt, suffix);
+ auto t = xhtml_format.group_seg(obj, _txt, suffix, "seg");
doc_html[segment_filename] ~= t[0].to!string;
doc_html_endnotes[segment_filename] ~= t[1];
break;
case "block":
- auto t = xhtml_format.block_seg(obj, _txt, suffix);
+ auto t = xhtml_format.block_seg(obj, _txt, suffix, "seg");
doc_html[segment_filename] ~= t[0].to!string;
doc_html_endnotes[segment_filename] ~= t[1];
break;
case "poem":
break;
case "verse":
- auto t = xhtml_format.verse_seg(obj, _txt, suffix);
+ auto t = xhtml_format.verse_seg(obj, _txt, suffix, "seg");
doc_html[segment_filename] ~= t[0].to!string;
doc_html_endnotes[segment_filename] ~= t[1];
break;
@@ -1667,26 +1709,26 @@ void seg(D,I)(
case "para":
switch (obj.is_a) {
case "endnote": assert(part == "endnotes");
- auto t = xhtml_format.para_seg(obj, _txt, suffix);
+ auto t = xhtml_format.para_seg(obj, _txt, suffix, "seg");
doc_html[segment_filename] ~= t[0];
break;
case "glossary": assert(part == "glossary");
- auto t = xhtml_format.para_seg(obj, _txt, suffix);
+ auto t = xhtml_format.para_seg(obj, _txt, suffix, "seg");
doc_html[segment_filename] ~= t[0];
doc_html_endnotes[segment_filename] ~= t[1];
break;
case "bibliography": assert(part == "bibliography");
- auto t = xhtml_format.para_seg(obj, _txt, suffix);
+ auto t = xhtml_format.para_seg(obj, _txt, suffix, "seg");
doc_html[segment_filename] ~= t[0];
doc_html_endnotes[segment_filename] ~= t[1];
break;
case "bookindex": assert(part == "bookindex_seg");
- auto t = xhtml_format.para_seg(obj, _txt, suffix);
+ auto t = xhtml_format.para_seg(obj, _txt, suffix, "seg");
doc_html[segment_filename] ~= t[0];
doc_html_endnotes[segment_filename] ~= t[1];
break;
case "blurb": assert(part == "blurb");
- auto t = xhtml_format.para_seg(obj, _txt, suffix);
+ auto t = xhtml_format.para_seg(obj, _txt, suffix, "seg");
doc_html[segment_filename] ~= t[0];
doc_html_endnotes[segment_filename] ~= t[1];
break;
@@ -1782,6 +1824,35 @@ void css(M)(
}
#+END_SRC
+** images :images:
+
+#+name: copy_html_images
+#+BEGIN_SRC d
+void images_cp(M)(
+ auto return ref M doc_matters,
+) {
+ { /+ (copy html images) +/
+
+ auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.src.language);
+ if (!exists(pth_html.image)) {
+ pth_html.image.mkdirRecurse;
+ }
+ foreach (image; doc_matters.srcs.image_list) {
+ auto fn_src_in = doc_matters.src_path_info.src_image_root_with_path ~ "/" ~ image;
+ auto fn_src_out = pth_html.image ~ "/" ~ image;
+ debug(images_html) {
+ writeln(fn_src_in, " -> ", fn_src_out);
+ }
+ if (exists(fn_src_in)) {
+ fn_src_in.copy(fn_src_out);
+ } else {
+ writeln("WARNING image not found: ", fn_src_in);
+ }
+ }
+ }
+}
+#+END_SRC
+
* _epub_ [#B] :module:sdp:output_epub3:
|-----------------------+--------------------------+---------------------------+----------------------------------|
@@ -2228,7 +2299,7 @@ void outputEPub3(D,I)(
case "para":
switch (obj.is_a) {
case "toc":
- auto t = xhtml_format.para_seg(obj, _txt, suffix);
+ auto t = xhtml_format.para_seg(obj, _txt, suffix, "epub");
doc_epub3[segment_filename] ~= t[0];
doc_epub3_endnotes[segment_filename] ~= t[1];
break;
@@ -2251,7 +2322,7 @@ void outputEPub3(D,I)(
case "para":
switch (obj.is_a) {
case "para":
- auto t = xhtml_format.para_seg(obj, _txt, suffix);
+ auto t = xhtml_format.para_seg(obj, _txt, suffix, "epub");
doc_epub3[segment_filename] ~= t[0];
doc_epub3_endnotes[segment_filename] ~= t[1];
break;
@@ -2265,24 +2336,24 @@ void outputEPub3(D,I)(
case "block":
switch (obj.is_a) {
case "quote":
- auto t = xhtml_format.quote_seg(obj, _txt, suffix);
+ auto t = xhtml_format.quote_seg(obj, _txt, suffix, "epub");
doc_epub3[segment_filename] ~= t[0].to!string;
doc_epub3_endnotes[segment_filename] ~= t[1];
break;
case "group":
- auto t = xhtml_format.group_seg(obj, _txt, suffix);
+ auto t = xhtml_format.group_seg(obj, _txt, suffix, "epub");
doc_epub3[segment_filename] ~= t[0].to!string;
doc_epub3_endnotes[segment_filename] ~= t[1];
break;
case "block":
- auto t = xhtml_format.block_seg(obj, _txt, suffix);
+ auto t = xhtml_format.block_seg(obj, _txt, suffix, "epub");
doc_epub3[segment_filename] ~= t[0].to!string;
doc_epub3_endnotes[segment_filename] ~= t[1];
break;
case "poem":
break;
case "verse":
- auto t = xhtml_format.verse_seg(obj, _txt, suffix);
+ auto t = xhtml_format.verse_seg(obj, _txt, suffix, "epub");
doc_epub3[segment_filename] ~= t[0].to!string;
doc_epub3_endnotes[segment_filename] ~= t[1];
break;
@@ -2313,26 +2384,26 @@ void outputEPub3(D,I)(
case "para":
switch (obj.is_a) {
case "endnote": assert(part == "endnotes");
- auto t = xhtml_format.para_seg(obj, _txt, suffix);
+ auto t = xhtml_format.para_seg(obj, _txt, suffix, "epub");
doc_epub3[segment_filename] ~= t[0];
break;
case "glossary": assert(part == "glossary");
- auto t = xhtml_format.para_seg(obj, _txt, suffix);
+ auto t = xhtml_format.para_seg(obj, _txt, suffix, "epub");
doc_epub3[segment_filename] ~= t[0];
doc_epub3_endnotes[segment_filename] ~= t[1];
break;
case "bibliography": assert(part == "bibliography");
- auto t = xhtml_format.para_seg(obj, _txt, suffix);
+ auto t = xhtml_format.para_seg(obj, _txt, suffix, "epub");
doc_epub3[segment_filename] ~= t[0];
doc_epub3_endnotes[segment_filename] ~= t[1];
break;
case "bookindex": assert(part == "bookindex_seg");
- auto t = xhtml_format.para_seg(obj, _txt, suffix);
+ auto t = xhtml_format.para_seg(obj, _txt, suffix, "epub");
doc_epub3[segment_filename] ~= t[0];
doc_epub3_endnotes[segment_filename] ~= t[1];
break;
case "blurb": assert(part == "blurb");
- auto t = xhtml_format.para_seg(obj, _txt, suffix);
+ auto t = xhtml_format.para_seg(obj, _txt, suffix, "epub");
doc_epub3[segment_filename] ~= t[0];
doc_epub3_endnotes[segment_filename] ~= t[1];
break;
@@ -2582,13 +2653,13 @@ void epub3_write_output_files(M,D,E,Mt,Mic,Otnx,Otn,Oc)(
debug(epub_output) {
debug(epub_images) {
writeln(
- doc_matters.src_path_info.image_root, image, " -> ",
+ doc_matters.src_path_info.src_image_root_with_path, "/", image, " -> ",
pth_epub3.dbg_doc_oebps_image(doc_matters.src.filename), "/", image
);
}
}
- auto fn_src = doc_matters.src_path_info.image_root ~ image;
- auto fn_out = pth_epub3.doc_oebps_image(doc_matters.src.filename).to!string ~ "/" ~ image;
+ auto fn_src = doc_matters.src_path_info.src_image_root_with_path ~ "/" ~ image;
+ auto fn_out = pth_epub3.doc_oebps_image(doc_matters.src.filename.to!string) ~ "/" ~ image;
if (exists(fn_src)) {
{
auto zip_arc_member_file = new ArchiveMember();
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 11:38:21 +0000