summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/perltex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-13 16:20:48 +0000
committerKarl Berry <karl@freefriends.org>2010-09-13 16:20:48 +0000
commit086bc4b16ab450babff05841b78cc999f38fe5bd (patch)
treedde996306453023735f436cc66c9fe0177e7584e /Master/texmf-dist/scripts/perltex
parent4b0df656c35cd9a2eded4e224631cc9d74fe70d4 (diff)
perltex 2.1 (25jul10)
git-svn-id: svn://tug.org/texlive/trunk@19702 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/perltex')
-rwxr-xr-xMaster/texmf-dist/scripts/perltex/perltex.pl19
1 files changed, 10 insertions, 9 deletions
diff --git a/Master/texmf-dist/scripts/perltex/perltex.pl b/Master/texmf-dist/scripts/perltex/perltex.pl
index 64309cc1926..1c17aa73101 100755
--- a/Master/texmf-dist/scripts/perltex/perltex.pl
+++ b/Master/texmf-dist/scripts/perltex/perltex.pl
@@ -15,7 +15,7 @@
#
# This is a generated file.
#
-# Copyright (C) 2009 Scott Pakin <scott+pt@pakin.org>
+# Copyright (C) 2010 Scott Pakin <scott+pt@pakin.org>
#
# This file may be distributed and/or modified under the conditions
# of the LaTeX Project Public License, either version 1.3c of this
@@ -39,7 +39,7 @@ use Pod::Usage;
use File::Basename;
use Fcntl;
use POSIX;
-use Cwd qw(abs_path);
+use File::Spec;
use IO::Handle;
use warnings;
use strict;
@@ -105,13 +105,13 @@ $latexcmdline[$firstcmd] =
'\plmac@doneflag', $doneflag,
'\plmac@pipe', $pipe,
$latexcmdline[$firstcmd];
-$toperl = abs_path $toperl;
-$fromperl = abs_path $fromperl;
-$toflag = abs_path $toflag;
-$fromflag = abs_path $fromflag;
-$doneflag = abs_path $doneflag;
-$logfile = abs_path $logfile;
-$pipe = abs_path $pipe;
+$toperl = File::Spec->rel2abs($toperl);
+$fromperl = File::Spec->rel2abs($fromperl);
+$toflag = File::Spec->rel2abs($toflag);
+$fromflag = File::Spec->rel2abs($fromflag);
+$doneflag = File::Spec->rel2abs($doneflag);
+$logfile = File::Spec->rel2abs($logfile);
+$pipe = File::Spec->rel2abs($pipe);
$SIG{"ALRM"} = sub {
undef $latexpid;
exit 0;
@@ -175,6 +175,7 @@ while (1) {
$entirefile = <TOPERL>;
close TOPERL;
}
+ $entirefile =~ s/\r//g;
my ($optag, $macroname, @otherstuff) =
map {chomp; $_} split "$separator\n", $entirefile;
$macroname =~ s/^[^A-Za-z]+//;