diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v4 | 14 | ||||
| -rw-r--r-- | data/sisu/v4/v/version.yml | 2 | ||||
| -rw-r--r-- | lib/sisu/v4/hub.rb | 27 | ||||
| -rw-r--r-- | lib/sisu/v4/sysenv.rb | 5 |
4 files changed, 39 insertions, 9 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 5b994c82..95c45ff2 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -21,6 +21,20 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +%% 4.0.16.orig.tar.xz (2013-03-18:11/1) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.16 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.16-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.16.orig.tar.xz + sisu_4.0.16.orig.tar.xz + sisu_4.0.16-1.dsc + +* v4: hub, processing flow, sequence, fix + * re-run manifests at end of general processing run: + * where document source shared and more than one markup file processed; + * where translations of same document exist (determined by filename) + +* v4: sysenv, epub images where processing multilingual doc in lang code sub-dir + %% 4.0.15.orig.tar.xz (2013-03-18:11/1) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.15 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.15-1 diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml index 02553a35..2b1a5447 100644 --- a/data/sisu/v4/v/version.yml +++ b/data/sisu/v4/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 4.0.15 +:version: 4.0.16 :date_stamp: 2013w11/1 :date: "2013-03-18" :project: SiSU diff --git a/lib/sisu/v4/hub.rb b/lib/sisu/v4/hub.rb index ba36c9ad..6577f1fa 100644 --- a/lib/sisu/v4/hub.rb +++ b/lib/sisu/v4/hub.rb @@ -146,11 +146,9 @@ module SiSU number_of_files={} @opt.files.each_with_index do |fns,i| fn=fns.gsub(/(?:~(?:#{@r}))?\.ss[tm]$/,'') - if number_of_files[fn].is_a?(Array) - number_of_files[fn] << i - else - number_of_files.store(fn,[i]) - end + (number_of_files[fn].is_a?(Array)) \ + ? (number_of_files[fn] << i) + : (number_of_files.store(fn,[i])) end files_translated_idx=[] number_of_files.each do |x| @@ -359,6 +357,14 @@ module SiSU require_relative 'dbi_discrete' # -d dbi_discrete.rb SiSU_DBI_Discrete::SQL.new(@opt).build end + if @opt.act[:manifest][:set]==:on #% --manifest, -y + require_relative 'manifest' # -y manifest.rb + ((@opt.act[:sisupod][:set]==:on \ + || @opt.act[:share_source][:set]==:on) \ + && @opt.files.length < 2 ) \ + ? nil + : SiSU_Manifest::Source.new(@opt).read + end end end def loop_files_on_given_option_pre_do @@ -413,9 +419,16 @@ module SiSU end end end - if @opt.act[:manifest][:set]==:on #% --manifest, -y + if (@opt.act[:sisupod][:set]==:on \ + || @opt.act[:share_source][:set]==:on) \ + and @opt.act[:manifest][:set]==:on #% --manifest, -y require_relative 'manifest' # -y manifest.rb - SiSU_Manifest::Source.new(@opt).read + begin + ensure + OptionLoopFiles.new(@opt).loop_files_on_given_option_bundle do + SiSU_Manifest::Source.new(@opt).read + end + end end ensure path_pod=@env.processing_path.processing_sisupod(@opt).paths diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb index e95a0b1e..92ba76b5 100644 --- a/lib/sisu/v4/sysenv.rb +++ b/lib/sisu/v4/sysenv.rb @@ -2034,7 +2034,8 @@ WOK and defined? @rc['image']['public'] pth="#{@rc['image']['path']}" "#{pth}/#{@rc['image']['public']}" - else "#{share}/image" + else + "#{share}/image" end end def image_source_sisu_includes @@ -2047,6 +2048,8 @@ WOK "#{@rc['image']['path']}/#{@rc['image']['public']}" elsif FileTest.directory?("#{@@pwd}/#{defaults[:image_stub]}")==true "#{@@pwd}/#{defaults[:image_stub]}" + elsif FileTest.directory?("#{SiSU_Utils::Path.new.base_markup}/#{defaults[:image_stub]}")==true + "#{SiSU_Utils::Path.new.base_markup}/#{defaults[:image_stub]}" else "#{share}/image" end |