From 23920cdf33513ead479801568735f4d6545422aa Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 29 Nov 2017 18:37:41 -0500
Subject: 0.21.0 paths, pod manifest source alternative

- sisupod.manifest
  - list alternative processable files with paths
    e.g.:
      media/text/en/live-manual.ssm
      media/text/fr/live-manual.ssm
      ...
  - name file followed by list of language codes
    e.g.:
      live-manual.ssm
      en, ca, de, es, fr, it, ja, pl, ro
      live-manual_next.ssm
      en, de, es, fr, it, ja
---
 org/output_sisupod.org | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'org/output_sisupod.org')

diff --git a/org/output_sisupod.org b/org/output_sisupod.org
index 398af1c..a267384 100644
--- a/org/output_sisupod.org
+++ b/org/output_sisupod.org
@@ -63,9 +63,8 @@ debug(asserts) {
 mixin SiSUoutputRgxInit;
 string pwd = doc_matters.environment["pwd"];
 auto src_path_info = doc_matters.src_path_info;
-string lng = doc_matters.language;
 auto pth_sisudoc_src = doc_matters.src_path_info;
-auto pths_sisupod = SiSUpathsSisupods!()(src_path_info, lng);
+auto pths_sisupod = SiSUpathsSisupods!()();
 mixin SiSUlanguageCodes;
 auto lang = Lang();
 static auto rgx = Rgx();
@@ -95,8 +94,8 @@ if (doc_matters.opt_action.source) {
   if (!exists(pths_sisupod.image_root(doc_matters.source_filename).filesystem_open_zpod)) {
     pths_sisupod.image_root(doc_matters.source_filename).filesystem_open_zpod.mkdirRecurse;
   }
-  if (!exists(pths_sisupod.doc_lng(doc_matters.source_filename).filesystem_open_zpod)) {
-    pths_sisupod.doc_lng(doc_matters.source_filename).filesystem_open_zpod.mkdirRecurse;
+  if (!exists(pths_sisupod.doc_lng(doc_matters.source_filename, doc_matters.language).filesystem_open_zpod)) {
+    pths_sisupod.doc_lng(doc_matters.source_filename, doc_matters.language).filesystem_open_zpod.mkdirRecurse;
   }
 }
 #+END_SRC
@@ -108,7 +107,7 @@ if (doc_matters.opt_action.source) {
 debug(sisupod) {
   writeln(__LINE__, ": ",
     doc_matters.source_filename, " -> ",
-    pths_sisupod.fn_doc(doc_matters.source_filename).filesystem_open_zpod
+    pths_sisupod.fn_doc(doc_matters.source_filename, doc_matters.language).filesystem_open_zpod
   );
 }
 auto zip = new ZipArchive();
@@ -157,9 +156,9 @@ auto fn_sisupod = pths_sisupod.sisupod_filename(doc_matters.source_filename).zpo
   }
 } { /+ TODO bundle primary file +/
   auto fn_src_in = doc_matters.source_filename;
-  auto fn_src_out_sisupod_zip_base = pths_sisupod.fn_doc(doc_matters.source_filename).zpod.to!string;
-  auto fn_src_out_filesystem = pths_sisupod.fn_doc(doc_matters.source_filename).filesystem_open_zpod.to!string; // needed without root path:
-  auto fn_src_out_inside_pod = pths_sisupod.fn_doc(doc_matters.source_filename).zpod.to!string; // needed without root path:
+  auto fn_src_out_sisupod_zip_base = pths_sisupod.fn_doc(doc_matters.source_filename, doc_matters.language).zpod.to!string;
+  auto fn_src_out_filesystem = pths_sisupod.fn_doc(doc_matters.source_filename, doc_matters.language).filesystem_open_zpod.to!string; // needed without root path:
+  auto fn_src_out_inside_pod = pths_sisupod.fn_doc(doc_matters.source_filename, doc_matters.language).zpod.to!string; // needed without root path:
   string[] filelist_src_out_sisupod_arr;
   string[] filelist_src_zpod_arr;
   if (exists(fn_src_in)) {
@@ -190,6 +189,7 @@ auto fn_sisupod = pths_sisupod.sisupod_filename(doc_matters.source_filename).zpo
           pths_sisupod.fn_doc_insert(
             doc_matters.source_filename,
             insert_file,
+            doc_matters.language,
           ).zpod
         );
       }
@@ -198,11 +198,13 @@ auto fn_sisupod = pths_sisupod.sisupod_filename(doc_matters.source_filename).zpo
         pths_sisupod.fn_doc_insert(
           doc_matters.source_filename,
           insert_file,
+          doc_matters.language,
         ).zpod.to!string;
       auto fn_src_out_filesystem =
         pths_sisupod.fn_doc_insert(
           doc_matters.source_filename,
           insert_file,
+          doc_matters.language,
         ).filesystem_open_zpod.to!string;
       if (exists(fn_src_in)) {
         if (doc_matters.opt_action.source) {
-- 
cgit v1.2.3