diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v4 | 2 | ||||
| -rw-r--r-- | lib/sisu/v4/sysenv.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 33ec693c..95c45ff2 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -33,6 +33,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.16.orig.tar.xz * 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/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 |