paths, further adjustmentsdoc-reform_v0.0.23

1 files changed, 9 insertions, 7 deletions

diff --git a/org/output_xmls.org b/org/output_xmls.org
index 19f8552..4a0babb 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -1918,7 +1918,7 @@ string epub3_oebps_content(D,I,P)(D doc_abstraction, I doc_matters, P parts) {
   content ~= parts["manifest_documents"];
   // TODO sort jpg & png
   content ~= "    " ~ "<!-- Images -->" ~ "\n  ";
-  foreach (image; doc_matters.src.image_list) {
+  foreach (image; doc_matters.srcs.image_list) {
     content ~= format(q"¶      <item id="%s" href="%s/%s" media-type="image/%s" />
 ¶",
       image.baseName.stripExtension,
@@ -2575,24 +2575,24 @@ void epub3_write_output_files(M,D,E,Mt,Mic,Otnx,Otn,Oc)(
       createZipFile!()(fn_epub, zip.build());
     }
     { /+ OEBPS/_sisu/image (images) +/
-      foreach (image; doc_matters.src.image_list) {
+      foreach (image; doc_matters.srcs.image_list) {
         debug(epub_output) {
-          if (exists(doc_matters.src.path_info.image_root ~ "/" ~ image)) {
-            (doc_matters.src.path_info.image_root ~ "/" ~ image)
+          if (exists(doc_matters.src_path_info.image_root ~ "/" ~ image)) {
+            (doc_matters.src_path_info.image_root ~ "/" ~ image)
             .copy((pth_epub3.dbg_doc_oebps_image(doc_matters.src.filename)) ~ "/" ~ image);
           }
         }
       }
-      foreach (image; doc_matters.src.image_list) {
+      foreach (image; doc_matters.srcs.image_list) {
         debug(epub_output) {
           debug(epub_images) {
             writeln(
-              doc_matters.src.path_info.image_root, image, " -> ",
+              doc_matters.src_path_info.image_root, 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_src = doc_matters.src_path_info.image_root ~ image;
         auto fn_out =  pth_epub3.doc_oebps_image(doc_matters.src.filename).to!string ~ "/" ~ image;
         if (exists(fn_src)) {
           {
@@ -2649,3 +2649,5 @@ void epub3_write_output_files(M,D,E,Mt,Mic,Otnx,Otn,Oc)(
   }
 }
 #+END_SRC
+
+* __END__