From fa544551111f3f102ec483570283239338f2bf74 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 8 Aug 2013 18:50:31 -0400 Subject: v4 v5: dal_expand_insertions, refinement for monolingual output --- data/doc/sisu/CHANGELOG_v4 | 2 ++ data/doc/sisu/CHANGELOG_v5 | 2 ++ lib/sisu/v4/dal_expand_insertions.rb | 16 +++++++++++----- lib/sisu/v5/dal_expand_insertions.rb | 16 +++++++++++----- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 55ba6c72..d12acf79 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.11.orig.tar.xz sisu_4.1.11.orig.tar.xz sisu_4.1.11-1.dsc +* dal_expand_insertions, refinement for monolingual output + %% 4.1.10.orig.tar.xz (2013-08-08:31/4) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.10 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.10-1 diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index f6213ea6..38d16c60 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.11.orig.tar.xz sisu_5.0.11.orig.tar.xz sisu_5.0.11-1.dsc +* dal_expand_insertions, refinement for monolingual output + %% 5.0.10.orig.tar.xz (2013-08-08:31/4) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.10 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.10-1 diff --git a/lib/sisu/v4/dal_expand_insertions.rb b/lib/sisu/v4/dal_expand_insertions.rb index bfa9f7da..52deed0a 100644 --- a/lib/sisu/v4/dal_expand_insertions.rb +++ b/lib/sisu/v4/dal_expand_insertions.rb @@ -110,11 +110,10 @@ module SiSU_DAL_Insertions end def by_language(linked_doc,lng,src=nil) @linked_doc,@lng,@src=linked_doc,lng,src - @base_path="#{@md.file.output_path.base.url}/#{@lng}" + @base_path="#{@md.file.output_path.base.url}/#{lng}" def fnh { fn: @linked_doc, - ft: ft, } end def path_and_file(fn,pth) @@ -182,10 +181,12 @@ module SiSU_DAL_Insertions end def by_filetype(linked_doc,lng,src=nil) @linked_doc,@lng,@src=linked_doc,lng,src + @lc=SiSU_Env::FilenameLanguageCodeInsert.new(@md.opt,lng).language_code_insert @base_path="#{@md.file.output_path.base.url}" def fnh { fn: @linked_doc, + lng: @lc, } end def path_and_file(fn,pth) @@ -253,14 +254,18 @@ module SiSU_DAL_Insertions end def by_filename(linked_doc,lng,src=nil) @linked_doc,@lng,@src=linked_doc,lng,src + @lc=SiSU_Env::FilenameLanguageCodeInsert.new(@md.opt,lng).language_code_insert @base_path="#{@md.file.output_path.base.url}/#{@linked_doc}" def fnh { fn: @linked_doc, + lng: @lc, } end - def path_and_file(fn) - "#{@base_path}/#{fn}" + def path_and_file(fn,pth=nil) + (pth.nil?) \ + ? "#{@base_path}/#{fn}" + : "#{@base_path}/#{pth}/#{fn}" end def manifest fn=@md.file.base_filename.manifest(fnh) @@ -279,7 +284,8 @@ module SiSU_DAL_Insertions path_and_file(fn) end def epub - "#{@base_path}/epub/#{@linked_doc}.#{@lng}.epub" + fn=@md.file.base_filename.epub(fnh) + path_and_file(fn,'epub') end def pdf_landscape fn=@md.file.base_filename.pdf_l_a4(fnh) diff --git a/lib/sisu/v5/dal_expand_insertions.rb b/lib/sisu/v5/dal_expand_insertions.rb index d85910aa..ca234624 100644 --- a/lib/sisu/v5/dal_expand_insertions.rb +++ b/lib/sisu/v5/dal_expand_insertions.rb @@ -110,11 +110,10 @@ module SiSU_DAL_Insertions end def by_language(linked_doc,lng,src=nil) @linked_doc,@lng,@src=linked_doc,lng,src - @base_path="#{@md.file.output_path.base.url}/#{@lng}" + @base_path="#{@md.file.output_path.base.url}/#{lng}" def fnh { fn: @linked_doc, - ft: ft, } end def path_and_file(fn,pth) @@ -182,10 +181,12 @@ module SiSU_DAL_Insertions end def by_filetype(linked_doc,lng,src=nil) @linked_doc,@lng,@src=linked_doc,lng,src + @lc=SiSU_Env::FilenameLanguageCodeInsert.new(@md.opt,lng).language_code_insert @base_path="#{@md.file.output_path.base.url}" def fnh { fn: @linked_doc, + lng: @lc, } end def path_and_file(fn,pth) @@ -253,14 +254,18 @@ module SiSU_DAL_Insertions end def by_filename(linked_doc,lng,src=nil) @linked_doc,@lng,@src=linked_doc,lng,src + @lc=SiSU_Env::FilenameLanguageCodeInsert.new(@md.opt,lng).language_code_insert @base_path="#{@md.file.output_path.base.url}/#{@linked_doc}" def fnh { fn: @linked_doc, + lng: @lc, } end - def path_and_file(fn) - "#{@base_path}/#{fn}" + def path_and_file(fn,pth=nil) + (pth.nil?) \ + ? "#{@base_path}/#{fn}" + : "#{@base_path}/#{pth}/#{fn}" end def manifest fn=@md.file.base_filename.manifest(fnh) @@ -279,7 +284,8 @@ module SiSU_DAL_Insertions path_and_file(fn) end def epub - "#{@base_path}/epub/#{@linked_doc}.#{@lng}.epub" + fn=@md.file.base_filename.epub(fnh) + path_and_file(fn,'epub') end def pdf_landscape fn=@md.file.base_filename.pdf_l_a4(fnh) -- cgit v1.2.3