diff options
Diffstat (limited to 'org/output_xmls.org')
| -rw-r--r-- | org/output_xmls.org | 20 | 
1 files changed, 10 insertions, 10 deletions
| diff --git a/org/output_xmls.org b/org/output_xmls.org index 2eb0e48..5e312f2 100644 --- a/org/output_xmls.org +++ b/org/output_xmls.org @@ -2217,7 +2217,7 @@ string epub3_oebps_content(D,M,P)(D doc_abstraction, M doc_matters, P parts) {      _uuid,      _uuid,      _uuid, -    (pth_epub3.fn_oebps_css(doc_matters.src.filename)).chompPrefix("OEBPS/"), +    (pth_epub3.fn_oebps_css).chompPrefix("OEBPS/"),    );    content ~= "    " ~ "<!-- Content Documents -->" ~ "\n  ";    content ~= parts["manifest_documents"]; @@ -2227,7 +2227,7 @@ string epub3_oebps_content(D,M,P)(D doc_abstraction, M doc_matters, P parts) {      content ~= format(q"┃      <item id="%s" href="%s/%s" media-type="image/%s" />  ┃",        image.baseName.stripExtension, -      (pth_epub3.doc_oebps_image(doc_matters.src.filename)).chompPrefix("OEBPS/"), +      (pth_epub3.doc_oebps_image).chompPrefix("OEBPS/"),        image,        image.extension.chompPrefix("."),      ); @@ -2868,7 +2868,7 @@ void epub3_write_output_files(W,I)(      }      { /+ OEBPS/[segments].xhtml (the document contents) +/        foreach (seg_filename; doc_matters.has.segnames_lv_0_to_4) { -        string fn = pth_epub3.fn_oebps_content_xhtml(doc_matters.src.filename, seg_filename); +        string fn = pth_epub3.fn_oebps_content_xhtml(seg_filename);          auto zip_arc_member_file = new ArchiveMember();          zip_arc_member_file.name = fn;          auto zip_data = new OutBuffer(); @@ -2908,7 +2908,7 @@ void epub3_write_output_files(W,I)(            File(fn_dbg, "w").writeln(epub_write.mimetypes);          }        } -      fn = pth_epub3.fn_mimetypes(doc_matters.src.filename); +      fn = pth_epub3.fn_mimetypes;        EPUBzip(epub_write.mimetypes, fn);      }      { /+  META-INF/container.xml (identify doc root) +/ @@ -2918,7 +2918,7 @@ void epub3_write_output_files(W,I)(            File(fn_dbg, "w").writeln(epub_write.meta_inf_container_xml);          }        } -      fn = pth_epub3.fn_dmi_container_xml(doc_matters.src.filename); +      fn = pth_epub3.fn_dmi_container_xml;        EPUBzip(epub_write.meta_inf_container_xml, fn);      }      { /+ OEBPS/toc_nav.xhtml (navigation toc epub3) +/ @@ -2928,7 +2928,7 @@ void epub3_write_output_files(W,I)(            File(fn_dbg, "w").writeln(epub_write.oebps_toc_nav_xhtml);          }        } -      fn = pth_epub3.fn_oebps_toc_nav_xhtml(doc_matters.src.filename); +      fn = pth_epub3.fn_oebps_toc_nav_xhtml;        EPUBzip(epub_write.oebps_toc_nav_xhtml, fn);      }      { /+ OEBPS/toc.ncx (navigation toc epub2) +/ @@ -2938,7 +2938,7 @@ void epub3_write_output_files(W,I)(            File(fn_dbg, "w").writeln(epub_write.oebps_toc_ncx);          }        } -      fn = pth_epub3.fn_oebps_toc_ncx(doc_matters.src.filename); +      fn = pth_epub3.fn_oebps_toc_ncx;        EPUBzip(epub_write.oebps_toc_ncx, fn);      }      { /+ OEBPS/content.opf (doc manifest) +/ @@ -2948,7 +2948,7 @@ void epub3_write_output_files(W,I)(            File(fn_dbg, "w").writeln(epub_write.oebps_content_opf);          }        } -      fn = pth_epub3.fn_oebps_content_opf(doc_matters.src.filename); +      fn = pth_epub3.fn_oebps_content_opf;        EPUBzip(epub_write.oebps_content_opf, fn);      }      { /+ OEBPS/_sisu/image (images) +/ @@ -2968,7 +2968,7 @@ void epub3_write_output_files(W,I)(            }          }          auto fn_src = doc_matters.src.image_dir_path ~ "/" ~ image; -        auto fn_out =  pth_epub3.doc_oebps_image(doc_matters.src.filename.to!string) ~ "/" ~ image; +        auto fn_out =  pth_epub3.doc_oebps_image ~ "/" ~ image;          if (exists(fn_src)) {            {              auto zip_arc_member_file = new ArchiveMember(); @@ -2992,7 +2992,7 @@ void epub3_write_output_files(W,I)(            : File(fn_dbg, "w").writeln(css.dark.epub);          }        } -      fn = pth_epub3.fn_oebps_css(doc_matters.src.filename); +      fn = pth_epub3.fn_oebps_css;        auto zip_arc_member_file = new ArchiveMember();        zip_arc_member_file.name = fn;        auto zip_data = new OutBuffer(); | 
