From dcfbef65816211cc09bbf1fe3937207ec1bb9850 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 19 Apr 2011 21:32:12 -0400
Subject: v3: urls, minor fixes

* fix maintenance urls -M (where processing files are kept for examination)
* odf maintenance added
---
 data/doc/sisu/CHANGELOG_v3 |  9 +++++++--
 lib/sisu/v3/urls.rb        | 31 +++++++++++++++----------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 4b61d60b..6af9b0d2 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -20,8 +20,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.7.orig.tar.gz
   sisu_3.0.7-1.dsc
   sisu_3.0.7-1.debian.tar.gz
 
-  * urls, share/reuse code, fix show all urls -U
-
   * options, maintenance -M (--maintenance, new alias --keep-processing-files)
     * new alias --keep-processing-files (see Bug#622902)
     * minor rearrangement of regex
@@ -45,6 +43,13 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.7.orig.tar.gz
 
   * screen_text_color (ansi colors) touched, consider reviewing later
 
+  * urls, report output locations
+    * fix show all urls -U
+    * share/reuse code
+    * fix maintenance urls -M (where processing files are kept for examination)
+    * odf maintenance added
+    * html_tune maintenance fix
+
   * documentation, sisu-markup-samples, man page, html
     * document existence of new alias for -M (--maintenance)
       --keep-maintenance-files (see Bug#622902)
diff --git a/lib/sisu/v3/urls.rb b/lib/sisu/v3/urls.rb
index 08bf0dae..77952d0b 100644
--- a/lib/sisu/v3/urls.rb
+++ b/lib/sisu/v3/urls.rb
@@ -68,7 +68,7 @@ module SiSU_urls
     end
     def read
       begin
-        SiSU_urls::Output_urls.new(@opt).songsheet if @opt.fnb #fnb[/.+?\.(?:[_-]?sst|ssm)$/]
+        SiSU_urls::Output_urls.new(@opt).songsheet if @opt.fnb
       rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd).error
       ensure
       end
@@ -174,7 +174,6 @@ module SiSU_urls
           SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.pdf_viewer} #{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_p}pdf").result
         end
         def landscape(x)
-          SiSU_Screen::Ansi.new(@opt.cmd,"-p (LaTeX)","#{@prog.text_editor} ~work/tex_rz/#{@fnb}.tex").result #if y=~/landscape/
           SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.pdf_viewer} #{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_l}pdf").result
         end
         self
@@ -227,21 +226,20 @@ module SiSU_urls
       if x=~/^([abcehHmNoptwxXy])/ \
       and opt.cmd =~/[abcehHmNoptwxXy]/ \
       and x=~/^[#{opt.cmd}]/ \
-      and opt.cmd =~/M/
+      and opt.cmd =~/[MV]/
         m=$1
         f=y
         tool=@prog.text_editor
         if x =~/^m/ \
         and @opt.cmd=~/m/ \
         and x=~/^[#{opt.cmd}]/
-          SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.text_editor} #{@env.processing_path.dal}/#{@opt.fns}.meta").maintenance if @opt.cmd =~/[MVv]/
+          SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.text_editor} #{@env.processing_path.dal}/#{@opt.fns}.meta").maintenance
         end
-        if x=~/^([hHw])/ \
-        and @opt.cmd=~/[hHw]/ \
-        and x=~/^[#{@opt.cmd}]/
-          f=if x !~/segmented/; "#{y}.html"
-          else                  "#{y}.index.html"
-          end
+        if x=~/^([hw])/ \
+        and @opt.cmd=~/[hw]/ \
+        and x=~/^[#{@opt.cmd}]/ \
+        and x !~/segmented/; "#{y}.html"
+          SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.text_editor} #{@env.processing_path.tune}/#{@md.fns}.tune").maintenance
         end
         if x=~/^p/ \
         and @opt.cmd=~/p/ \
@@ -249,11 +247,11 @@ module SiSU_urls
           tool=@prog.pdf_viewer
           fns=@opt.fns.gsub(/~/,'-')
           unless @opt.cmd =~/q/
-            tell=if y =~/landscape/
+            tell=if x =~/landscape/
               SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.text_editor} #{@env.processing_path.tex}/#{fns}.landscape.tex")
             else SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.text_editor} #{@env.processing_path.tex}/#{fns}.tex")
             end
-            tell.maintenance if @opt.cmd =~/[MVv]/
+            tell.maintenance
           end
         end
         if x=~/^o/ \
@@ -264,12 +262,13 @@ module SiSU_urls
         if x=~/^e/ \
         and @opt.cmd=~/e/ \
         and x=~/^[#{@opt.cmd}]/
-          SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.text_editor} #{@env.processing_path.epub}/OPS/toc.xhtml").maintenance if @opt.cmd =~/[MVv]/
+          SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.text_editor} #{@env.processing_path.epub}/OPS/toc.xhtml").maintenance
         end
-        if x !~/^[me]/
-          SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{tool} #{@env.path.output}/#{@fnb}/#{y}").maintenance if @opt.cmd =~/[MVv]/
+        if x=~/^o/ \
+        and @opt.cmd=~/o/ \
+        and x=~/^[#{@opt.cmd}]/
+          SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.text_editor} #{@env.processing_path.odf}/content.xml").maintenance #not implemented
         end
-        #@opt.cmd.gsub!(/#{m}/,'')
       end
     end
     def urls_select
-- 
cgit v1.2.3