summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-03-27 23:54:12 +0000
committerKarl Berry <karl@freefriends.org>2013-03-27 23:54:12 +0000
commit4c8f194875e6cdcf1a410ca368903999610003ec (patch)
tree5e2a3d6bc968fb5a1df870334db63f7ba7f43771 /Build
parent657aab648e9ae6f3a13cc3ea6ddb37ad9476e6c7 (diff)
set LC_ALL (and unset LANG/LANGUAGE) in the script, not the test
git-svn-id: svn://tug.org/texlive/trunk@29533 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/utils/tpic2pdftex/ChangeLog2
-rwxr-xr-xBuild/source/utils/tpic2pdftex/tpic2pdftex9
-rwxr-xr-xBuild/source/utils/tpic2pdftex/tpic2pdftex.test6
3 files changed, 7 insertions, 10 deletions
diff --git a/Build/source/utils/tpic2pdftex/ChangeLog b/Build/source/utils/tpic2pdftex/ChangeLog
index 6bc91efdd51..63d1eeb473b 100644
--- a/Build/source/utils/tpic2pdftex/ChangeLog
+++ b/Build/source/utils/tpic2pdftex/ChangeLog
@@ -1,6 +1,6 @@
2013-03-28 Karl Berry <karl@tug.org>
- * tpic2pdftex.test: set LC_ALL=C, unset LANG and LANGUAGE,
+ * tpic2pdftex: set LC_ALL, not LANG, and advise same
to avoid "Floating point numbers miss decimal point." error.
Report on tlbuild from Mojca, 27 Mar 2013 16:38:45.
diff --git a/Build/source/utils/tpic2pdftex/tpic2pdftex b/Build/source/utils/tpic2pdftex/tpic2pdftex
index e36ac62f248..f4fa0534fe3 100755
--- a/Build/source/utils/tpic2pdftex/tpic2pdftex
+++ b/Build/source/utils/tpic2pdftex/tpic2pdftex
@@ -20,7 +20,7 @@
# Bounding box does not care for line thickness (groff pic feature).
# Splines might be outside bounding box.
#
-# Copyright (C) 2002--2011 by Hartmut Henkel
+# Copyright (C) 2002--2013 by Hartmut Henkel
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -116,7 +116,8 @@ if test -z "$AWK"; then # if set by user, leave it.
fi
fi
-LANG="C"; export LANG
+unset LANG; unset LANGUAGE
+LC_ALL=C; export LC_ALL
AWKPROG='
# begin of awk input file
@@ -163,10 +164,10 @@ BEGIN{
pi = atan2(0, -1);
if (match(sprintf("%f", 0.5), /\./) == 0) {
print "ERROR: Floating point numbers miss decimal point. Do"
- print " LANG=\"C\"; export LANG"
+ print " LC_ALL=\"C\"; export LC_ALL; unset LANGUAGE"
print "before calling awk."
print "ERROR: Floating point numbers miss decimal point. Do" > "/dev/stderr"
- print " LANG=\"C\"; export LANG" > "/dev/stderr"
+ print " LC_ALL=\"C\"; export LD_ALL; unset LANGUAGE" > "/dev/stderr"
print "before calling awk." > "/dev/stderr"
exit 1;
}
diff --git a/Build/source/utils/tpic2pdftex/tpic2pdftex.test b/Build/source/utils/tpic2pdftex/tpic2pdftex.test
index 154f26b780b..754b05d7f91 100755
--- a/Build/source/utils/tpic2pdftex/tpic2pdftex.test
+++ b/Build/source/utils/tpic2pdftex/tpic2pdftex.test
@@ -1,12 +1,8 @@
#! /bin/sh
-# Copyright (C) 2009, 2013 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
-unset LANGUAGE
-unset LANG
-LC_ALL=C; export LC_ALL
-
for f in beamerexample example; do
pic -z -t $srcdir/$f.pic >$f.tpic || exit 77
$srcdir/tpic2pdftex $f.tpic >$f.tex || exit 1