From b77338f9a9cc17af78819cb19e6e5e1b89f5e734 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 13 Dec 2011 22:08:17 -0500
Subject: v3: texpdf, output_by: filetype, fix, language code part of filename,
fix
* files previously given same name and written over
* [reported by chals (live-manual) on irc oftc #sisu]
* [output_by language and filename ok]
---
data/doc/sisu/CHANGELOG_v3 | 3 +++
lib/sisu/v3/sysenv.rb | 6 ++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 427561d1..3dec3c02 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -21,6 +21,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.8.orig.tar.xz
sisu_3.1.8-1.dsc
sisu_3.1.8-1.debian.tar.gz
+ * texpdf, output by filetype, fix, produce pdf files with language code as
+ part of filename (previously written over)
+
* odf:odt, codeblocks, a match fix, affects e.g. "<<"
%% 3.1.7.orig.tar.xz (2011-12-08:49/4)
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb
index 953c8eec..98a58f72 100644
--- a/lib/sisu/v3/sysenv.rb
+++ b/lib/sisu/v3/sysenv.rb
@@ -3818,15 +3818,13 @@ WOK
end
end
def pdf_p
- if @env.output_dir_structure.by_language_code? \
- or @env.output_dir_structure.by_filetype?
+ if @env.output_dir_structure.by_language_code?
@md.fnb + '.portrait.'
else 'portrait' + @md.lang_code_insert + '.'
end
end
def pdf_l
- if @env.output_dir_structure.by_language_code? \
- or @env.output_dir_structure.by_filetype?
+ if @env.output_dir_structure.by_language_code?
@md.fnb + '.landscape.'
else 'landscape' + @md.lang_code_insert + '.'
end
--
cgit v1.2.3