summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/glossaries
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-06-26 22:59:33 +0000
committerKarl Berry <karl@freefriends.org>2013-06-26 22:59:33 +0000
commit4cabe029e53d7b74996e026c1d70eb6200592c52 (patch)
treeaa9a83ca317344aced9e06f0c70c560e2075920d /Master/texmf-dist/scripts/glossaries
parentb236252d91485f591e2e4fa402e21b237e92e289 (diff)
glossaries (17jun13)
git-svn-id: svn://tug.org/texlive/trunk@30964 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/glossaries')
-rwxr-xr-xMaster/texmf-dist/scripts/glossaries/makeglossaries99
1 files changed, 44 insertions, 55 deletions
diff --git a/Master/texmf-dist/scripts/glossaries/makeglossaries b/Master/texmf-dist/scripts/glossaries/makeglossaries
index 07ce68bd8d1..811848b5437 100755
--- a/Master/texmf-dist/scripts/glossaries/makeglossaries
+++ b/Master/texmf-dist/scripts/glossaries/makeglossaries
@@ -2,7 +2,7 @@
# File : makeglossaries
# Author : Nicola Talbot
-# Version : 2.06 (2013/04/21)
+# Version : 2.07 (2013/06/17)
# Description: simple Perl script that calls makeindex or xindy.
# Intended for use with "glossaries.sty" (saves having to remember
# all the various switches)
@@ -27,9 +27,12 @@
# glossary-super.sty, glossaries.perl.
# Also makeglossaries and makeglossaries.
-my $version="2.06 (2013-04-21)";
+my $version="2.07 (2013-06-17)";
# History:
+# v2.07 (2013-06-17):
+# * added check for success on chdir if -d used
+# * added dialect map
# v2.06 (2013-04-21):
# * added "din5007" as default if language is set to "german"
# v2.05 (2012-11-12):
@@ -102,8 +105,43 @@ unless ($#ARGV == 0)
# v2.02: added:
print "makeglossaries version $version\n" unless ($opt_q);
+# v2.07: added babel dialect -> xindy language map:
+my %languagemap =
+(
+ 'american' => 'english',
+ 'austrian' => 'german',
+ 'british' => 'english',
+ 'francais' => 'french',
+ 'frenchb' => 'french',
+ 'germanb' => 'german',
+ 'lsorbian' => 'lower-sorbian',
+ 'magyar' => 'hungarian',
+ 'naustrian' => 'german',
+ 'ngermanb' => 'german',
+ 'norsk' => 'norwegian',
+ 'portuges' => 'portuguese',
+ 'russianb' => 'russian',
+ 'slovene' => 'slovenian',
+ 'UKenglish' => 'english',
+ 'USenglish' => 'english',
+ 'ukraineb' => 'ukrainian',
+ 'usorbian' => 'upper-sorbian'
+);
+
+# v2.07 added check for success and for -q
# v2.05 added:
-chdir $opt_d if ($opt_d);
+
+if ($opt_d)
+{
+ if (chdir $opt_d)
+ {
+ print "Changed to '$opt_d'\n" unless ($opt_q);
+ }
+ else
+ {
+ die "Unable to chdir to '$opt_d' $!\n";
+ }
+}
# v2.02: added:
my $xdynotist = 1;
@@ -666,61 +704,12 @@ sub xindy{
$module = $ist;
$module=~s/\.xdy\Z//;
- unless (defined($language))
+ if ($language)
{
- $language = '';
- }
+ # map babel names to xindy names
- # map babel names to xindy names
- if ($language eq "frenchb")
- {
- $language = "french";
- }
- elsif ($language=~/^n?germanb?$/)
- {
- $language = "german";
+ $language = $languagemap{$language} if ($languagemap{$language});
- # v2.06 added:
- if ($codepage and not $codepage=~/(din|duden)/)
- {
- $codepage = "din5007-$codepage";
- }
- }
- elsif ($language eq "magyar")
- {
- $language = "hungarian";
- }
- elsif ($language eq "lsorbian")
- {
- $language = "lower-sorbian";
- }
- elsif ($language eq "norsk")
- {
- $language = "norwegian";
- }
- elsif ($language eq "portuges")
- {
- $language = "portuguese";
- }
- elsif ($language eq "russianb")
- {
- $language = "russian";
- }
- elsif ($language eq "slovene")
- {
- $language = "slovenian";
- }
- elsif ($language eq "ukraineb")
- {
- $language = "ukrainian";
- }
- elsif ($language eq "usorbian")
- {
- $language = "upper-sorbian";
- }
-
- if ($language)
- {
$langparam = "-L $language";
}
else