v5 v6: epub tune, --maintenance, fix
authorRalph Amissah <ralph@amissah.com>
Sun, 12 Oct 2014 14:18:59 +0000 (10:18 -0400)
committerRalph Amissah <ralph@amissah.com>
Sun, 12 Oct 2014 14:18:59 +0000 (10:18 -0400)
data/doc/sisu/CHANGELOG_v5
data/doc/sisu/CHANGELOG_v6
lib/sisu/v5/se_file_op.rb
lib/sisu/v5/xhtml_epub2_tune.rb
lib/sisu/v6/se_file_op.rb
lib/sisu/v6/xhtml_epub2_tune.rb

index b41315804fb99901e6259209b99bd3d809add322..7870236dadf2ed39fb2808f76ffb60841be24e66 100644 (file)
@@ -40,6 +40,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.7.0.orig.tar.xz
 
 * fixes, minor
   * qrcode, sha call
+  * epub tune, --maintenance related
 
 %% 5.6.9.orig.tar.xz (2014-10-03:39/5)
 http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.9
index 228ee5d946e1ac2f6260eae56f2792fb6e71e465..e5568614f239a6a8a19440ea66b1316485881c2b 100644 (file)
@@ -30,6 +30,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.3.0.orig.tar.xz
 
 * fixes, minor
   * qrcode, sha call
+  * epub tune, --maintenance related
 
 %% 6.2.10.orig.tar.xz (2014-10-03:39/5)
 http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.10
index dfd2aadf13cc2547d74ab6304a8fd2b7d5270314..826c01ab75995934e98f67eac061adb6da3ff7fc 100644 (file)
@@ -145,6 +145,10 @@ module SiSU_Info_File
         @env.processing_path.tune + '/' \
           + @fns + '.marshal_tune'
       end
+      def xhtml_tune
+        @env.processing_path.tune + '/' \
+          + @fns + '.marshal_tune'
+      end
       self
     end
     def write_file_processing
index afeff30e778cbc4b3de3c011a0ea91a62e41e43f..7376212ac8160d179fc11d7ef55590aa4aa2ec69 100644 (file)
@@ -77,7 +77,7 @@ module SiSU_XHTML_EPUB2_Tune
   class Output
     def initialize(data,md)
       @data,@md=data,md
-      @file=SiSU_Env::FileOp.new(@md)
+      @file=SiSU_Env::InfoFile.new(@md.fns)
       @cX=SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set]).cX
     end
     def hard_output
@@ -89,7 +89,7 @@ module SiSU_XHTML_EPUB2_Tune
       end
     end
     def marshal
-      File.open(@file.marshal.html_tune,'w') {|f| Marshal.dump(@data.to_a,f)}
+      File.open(@file.marshal.xhtml_tune,'w') {|f| Marshal.dump(@data.to_a,f)}
     end
   end
   class CleanXHTML
@@ -112,7 +112,6 @@ module SiSU_XHTML_EPUB2_Tune
     def initialize(data,md)
       @data,@md=data,md
       @vz=SiSU_Viz::Defaults.new
-      @env=SiSU_Env::InfoEnv.new(@md.fns)
       @sys=SiSU_Env::SystemCall.new
       @env=SiSU_Env::InfoEnv.new(@md.fns)
       @brace_url=SiSU_Viz::Defaults.new.url_decoration
index 941b7b7aabbdc3687dc2c3f0899f0f5b7c71ce31..ff9aa65a8589564d9fd32d449ac8d7e33eb09bcf 100644 (file)
@@ -145,6 +145,10 @@ module SiSU_Info_File
         @env.processing_path.tune + '/' \
           + @fns + '.marshal_tune'
       end
+      def xhtml_tune
+        @env.processing_path.tune + '/' \
+          + @fns + '.marshal_tune'
+      end
       self
     end
     def write_file_processing
index 4188ae2476f24e9e3ba3c667426243f238657afa..07337309c01d88b3c88b48c86fcc47eb99890dd2 100644 (file)
@@ -77,7 +77,7 @@ module SiSU_XHTML_EPUB2_Tune
   class Output
     def initialize(data,md)
       @data,@md=data,md
-      @file=SiSU_Env::FileOp.new(@md)
+      @file=SiSU_Env::InfoFile.new(@md.fns)
       @cX=SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set]).cX
     end
     def hard_output
@@ -89,7 +89,7 @@ module SiSU_XHTML_EPUB2_Tune
       end
     end
     def marshal
-      File.open(@file.marshal.html_tune,'w') {|f| Marshal.dump(@data.to_a,f)}
+      File.open(@file.marshal.xhtml_tune,'w') {|f| Marshal.dump(@data.to_a,f)}
     end
   end
   class CleanXHTML
@@ -112,7 +112,6 @@ module SiSU_XHTML_EPUB2_Tune
     def initialize(data,md)
       @data,@md=data,md
       @vz=SiSU_Viz::Defaults.new
-      @env=SiSU_Env::InfoEnv.new(@md.fns)
       @sys=SiSU_Env::SystemCall.new
       @env=SiSU_Env::InfoEnv.new(@md.fns)
       @brace_url=SiSU_Viz::Defaults.new.url_decoration