summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2009-07-15 01:13:04 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2009-07-15 01:13:04 +0000
commite2abceca35f10da35aa6711162768d389e554987 (patch)
tree21b403172c10290850cba1c1fbb9ffe5b1707f37 /Master/tlpkg/TeXLive
parent181c66eec8ef64814280c5d11c6e4f92edc6c12d (diff)
Undo rev 14242, 14243, 14256, 14257: apparently our Perl for windows doesn't
support the open pragma. (OOPS: commited more than I wanted to. Also added files from the generic package 'shade'. This package was 'added' in r14213.) git-svn-id: svn://tug.org/texlive/trunk@14264 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive')
-rw-r--r--Master/tlpkg/TeXLive/TLMedia.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLPOBJ.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLPSRC.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLPaper.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLPostActions.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLTREE.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLWinGoo.pm2
-rw-r--r--Master/tlpkg/TeXLive/TeXCatalogue.pm6
10 files changed, 3 insertions, 21 deletions
diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm
index f57454df618..bb8638a765d 100644
--- a/Master/tlpkg/TeXLive/TLMedia.pm
+++ b/Master/tlpkg/TeXLive/TLMedia.pm
@@ -13,8 +13,6 @@ use TeXLive::TLUtils qw(copy win32 dirname mkdirhier basename download_file
use TeXLive::TLPDB;
use TeXLive::TLWinGoo;
-use open qw(:utf8 :std);
-
sub new
{
my ($class, @args) = @_;
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index ea6dd80f4ce..5c65d57f726 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -71,8 +71,6 @@ use TeXLive::TLPOBJ;
use Cwd 'abs_path';
-use open qw(:utf8 :std);
-
my $_listdir;
=pod
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index 2c46736c60d..87a19e70377 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -12,8 +12,6 @@ use TeXLive::TLConfig qw($DefaultCategory $CategoriesRegexp
use TeXLive::TLUtils;
use TeXLive::TLTREE;
-use open qw(:utf8 :std);
-
our $_tmp;
my $_containerdir;
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index 8807e16ea6f..4a099bc9c41 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -13,8 +13,6 @@ use TeXLive::TLUtils;
use TeXLive::TLPOBJ;
use TeXLive::TLTREE;
-use open qw(:utf8 :std);
-
my $_tmp;
my %autopatterns; # computed once internally
diff --git a/Master/tlpkg/TeXLive/TLPaper.pm b/Master/tlpkg/TeXLive/TLPaper.pm
index 478184cbb7e..66e39adeb07 100644
--- a/Master/tlpkg/TeXLive/TLPaper.pm
+++ b/Master/tlpkg/TeXLive/TLPaper.pm
@@ -31,8 +31,6 @@ C<TeXLive::TLPaper> -- paper size setting
use TeXLive::TLUtils qw(:DEFAULT dirname merge_into mkdirhier);
-use open qw(:utf8 :std);
-
my %paper_sub = (
"xdvi" => \&paper_xdvi,
"pdftex" => \&paper_pdftex,
diff --git a/Master/tlpkg/TeXLive/TLPostActions.pm b/Master/tlpkg/TeXLive/TLPostActions.pm
index 531daeefd21..f1e1f2da76c 100644
--- a/Master/tlpkg/TeXLive/TLPostActions.pm
+++ b/Master/tlpkg/TeXLive/TLPostActions.pm
@@ -21,8 +21,6 @@ use TeXLive::TLUtils qw(win32 mkdirhier copy conv_to_w32_path log debug info
touch tlwarn);
use TeXLive::TLWinGoo;
-use open qw(:utf8 :std);
-
my $mainmenu = "TeX Live 2008";
our %PostInstall;
diff --git a/Master/tlpkg/TeXLive/TLTREE.pm b/Master/tlpkg/TeXLive/TLTREE.pm
index 550a163ba3f..d0897d20885 100644
--- a/Master/tlpkg/TeXLive/TLTREE.pm
+++ b/Master/tlpkg/TeXLive/TLTREE.pm
@@ -9,8 +9,6 @@ package TeXLive::TLTREE;
use TeXLive::TLUtils;
-use open qw(:utf8 :std);
-
sub new {
my $class = shift;
my %params = @_;
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 297eddd4118..3482df218d8 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -139,8 +139,6 @@ BEGIN {
win32 xchdir xsystem run_cmd);
}
-use open qw(:utf8 :std);
-
use Cwd;
use Digest::MD5;
use Getopt::Long;
diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm
index d895a4580cc..d1f773f87d6 100644
--- a/Master/tlpkg/TeXLive/TLWinGoo.pm
+++ b/Master/tlpkg/TeXLive/TLWinGoo.pm
@@ -132,8 +132,6 @@ BEGIN {
use TeXLive::TLUtils;
TeXLive::TLUtils->import( qw( mkdirhier ) );
-use open qw(:utf8 :std);
-
my $is_win = $^O=~/^MSWin(32|64)$/i;
=pod
diff --git a/Master/tlpkg/TeXLive/TeXCatalogue.pm b/Master/tlpkg/TeXLive/TeXCatalogue.pm
index 7322278da9f..b35bbeba8e1 100644
--- a/Master/tlpkg/TeXLive/TeXCatalogue.pm
+++ b/Master/tlpkg/TeXLive/TeXCatalogue.pm
@@ -10,8 +10,7 @@
use XML::Parser;
use XML::XPath;
use XML::XPath::XMLParser;
-
-use open qw(:utf8 :std);
+use Encode;
package TeXLive::TeXCatalogue::Entry;
@@ -81,7 +80,8 @@ sub beautify{
$txt =~ s/\n/ /g;
$txt =~ s/^[[:space:]]*//g;
$txt =~ s/[[:space:]][[:space:]]*/ /g;
- return $txt;
+ # turn of the utf8 flag by encoding it to utf8
+ return(Encode::encode("utf-8", $txt));
}
sub name {