diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v5 | 1 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v6 | 1 | ||||
| -rw-r--r-- | lib/sisu/v5/se_file_op.rb | 4 | ||||
| -rw-r--r-- | lib/sisu/v5/xhtml_epub2_tune.rb | 5 | ||||
| -rw-r--r-- | lib/sisu/v6/se_file_op.rb | 4 | ||||
| -rw-r--r-- | lib/sisu/v6/xhtml_epub2_tune.rb | 5 |
6 files changed, 14 insertions, 6 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index b4131580..7870236d 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -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 diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 228ee5d9..e5568614 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -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 diff --git a/lib/sisu/v5/se_file_op.rb b/lib/sisu/v5/se_file_op.rb index dfd2aadf..826c01ab 100644 --- a/lib/sisu/v5/se_file_op.rb +++ b/lib/sisu/v5/se_file_op.rb @@ -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 diff --git a/lib/sisu/v5/xhtml_epub2_tune.rb b/lib/sisu/v5/xhtml_epub2_tune.rb index afeff30e..7376212a 100644 --- a/lib/sisu/v5/xhtml_epub2_tune.rb +++ b/lib/sisu/v5/xhtml_epub2_tune.rb @@ -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 diff --git a/lib/sisu/v6/se_file_op.rb b/lib/sisu/v6/se_file_op.rb index 941b7b7a..ff9aa65a 100644 --- a/lib/sisu/v6/se_file_op.rb +++ b/lib/sisu/v6/se_file_op.rb @@ -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 diff --git a/lib/sisu/v6/xhtml_epub2_tune.rb b/lib/sisu/v6/xhtml_epub2_tune.rb index 4188ae24..07337309 100644 --- a/lib/sisu/v6/xhtml_epub2_tune.rb +++ b/lib/sisu/v6/xhtml_epub2_tune.rb @@ -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 |