From 086bc4b16ab450babff05841b78cc999f38fe5bd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 13 Sep 2010 16:20:48 +0000 Subject: perltex 2.1 (25jul10) git-svn-id: svn://tug.org/texlive/trunk@19702 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/scripts/perltex/perltex.pl | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/scripts/perltex') 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 +# Copyright (C) 2010 Scott Pakin # # 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 = ; close TOPERL; } + $entirefile =~ s/\r//g; my ($optag, $macroname, @otherstuff) = map {chomp; $_} split "$separator\n", $entirefile; $macroname =~ s/^[^A-Za-z]+//; -- cgit v1.2.3