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/doc/latex/perltex/README | 8 ++-- Master/texmf-dist/doc/latex/perltex/example.tex | 2 +- Master/texmf-dist/doc/latex/perltex/perltex.pdf | Bin 333605 -> 333786 bytes Master/texmf-dist/scripts/perltex/perltex.pl | 19 ++++---- Master/texmf-dist/source/latex/perltex/perltex.dtx | 51 ++++++++++++--------- Master/texmf-dist/source/latex/perltex/perltex.ins | 4 +- Master/texmf-dist/tex/latex/perltex/perltex.sty | 4 +- Master/texmf/doc/man/man1/perltex.1 | 2 +- Master/texmf/doc/man/man1/perltex.man1.pdf | Bin 10342 -> 10223 bytes 9 files changed, 49 insertions(+), 41 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/perltex/README b/Master/texmf-dist/doc/latex/perltex/README index abc92a178dd..cf6fcdcb5e9 100644 --- a/Master/texmf-dist/doc/latex/perltex/README +++ b/Master/texmf-dist/doc/latex/perltex/README @@ -5,7 +5,7 @@ Description -=========== +----------- PerlTeX is a combination Perl script (perltex.pl) and LaTeX2e style file (perltex.sty) that, together, give the user the ability to define @@ -15,7 +15,7 @@ LaTeX's typesetting power with Perl's programmability. Installation -============ +------------ In case it's not obvious, you'll need a Perl installation. Perl is freely available and runs on dozens of platforms. See the list of Perl @@ -40,9 +40,9 @@ perltex.gls", then "latex perltex.dtx" again, then "dvips perltex.dvi License -======= +------- -Copyright (C) 2009 Scott Pakin +Copyright (C) 2010 Scott Pakin These files may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license or diff --git a/Master/texmf-dist/doc/latex/perltex/example.tex b/Master/texmf-dist/doc/latex/perltex/example.tex index 95de2dc062c..0fb07d1ec1d 100644 --- a/Master/texmf-dist/doc/latex/perltex/example.tex +++ b/Master/texmf-dist/doc/latex/perltex/example.tex @@ -8,7 +8,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 license diff --git a/Master/texmf-dist/doc/latex/perltex/perltex.pdf b/Master/texmf-dist/doc/latex/perltex/perltex.pdf index 19db36b997c..7b66c014abb 100644 Binary files a/Master/texmf-dist/doc/latex/perltex/perltex.pdf and b/Master/texmf-dist/doc/latex/perltex/perltex.pdf differ 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]+//; diff --git a/Master/texmf-dist/source/latex/perltex/perltex.dtx b/Master/texmf-dist/source/latex/perltex/perltex.dtx index 4513a50f8d3..3f61570dda6 100644 --- a/Master/texmf-dist/source/latex/perltex/perltex.dtx +++ b/Master/texmf-dist/source/latex/perltex/perltex.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2009 Scott Pakin +% Copyright (C) 2010 Scott Pakin % --------------------------------------------------- % % This file may be distributed and/or modified under the conditions of @@ -22,7 +22,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{perltex} %<*package> - [2009/11/24 v2.0 LaTeX macros for use with PerlTeX] + [2010/07/10 v2.1 LaTeX macros for use with PerlTeX] % % %<*driver> @@ -62,7 +62,7 @@ % % \fi % -% \CheckSum{601} +% \CheckSum{602} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -921,7 +921,7 @@ % \section{License agreement} % \label{sec:license} % -% Copyright \textcopyright{} 2009 Scott Pakin \texttt{} +% Copyright \textcopyright{} 2010 Scott Pakin \texttt{} % % \providecommand{\url}[1]{\texttt{##1}} % @@ -939,15 +939,16 @@ % \label{sec:acknowledgments} % % Thanks to Andrew Mertz for writing the first draft of the code that -% produces the \PerlTeX-free \noperlmac\ style file and for testing -% the final draft; to Andrei Alexandrescu for providing a few bug -% fixes; and to Nick Andrewes for identifying and helping diagnose a -% problem running \PerlTeX\ with \XeTeX\ and to Jonathan Kew for -% suggesting a workaround. Also, thanks to the many people who have -% sent me fan mail or submitted bug reports, documentation -% corrections, or feature requests. (The \texttt{\string\perldo} -% macro and the \texttt{--makesty} option were particularly popular -% requests.) +% produces the \PerlTeX-free \noperlmac\ style file and for testing the +% final draft; to Andrei Alexandrescu for providing a few bug fixes; to +% Nick Andrewes for identifying and helping diagnose a problem running +% \PerlTeX\ with \XeTeX\ and to Jonathan Kew for suggesting a +% workaround; and to Linus K\"allberg for reporting and helping diagnose +% some problems with running \PerlTeX\ on Windows. Also, thanks to the +% many people who have sent me fan mail or submitted bug reports, +% documentation corrections, or feature requests. (The +% \texttt{\string\perldo} macro and the \texttt{--makesty} option were +% particularly popular requests.) % % \PrintChanges % \PrintIndex @@ -2144,7 +2145,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 @@ -2192,7 +2193,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; @@ -2433,14 +2434,17 @@ $latexcmdline[$firstcmd] = % \changes{v2.0}{2009/11/24}{Refer to each communication file using % its absolute path. This makes \perltex\ robust to user code % that changes the current directory} +% \changes{v2.1}{2010/07/10}{Replaced \texttt{abs\_path()} with +% \texttt{File::Spec-\char"3Erel2abs()} because the latter seems +% to be more robust to nonexistent files} % \begin{macrocode} -$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); % \end{macrocode} % % \changes{v1.9}{2009/09/13}{Introduced handlers for \textsc{sigalrm} @@ -2615,7 +2619,10 @@ while (1) { % the Perl code to define. If |$optag| is |USE| then |@otherstuff| will % be a list of subroutine arguments. If |$optag| is |RUN| then % |@otherstuff| will be a block of Perl code to run. +% \changes{v2.1}{2010/07/10}{Normalized line endings across +% Unix\slash Windows\slash Macintosh} % \begin{macrocode} + $entirefile =~ s/\r//g; my ($optag, $macroname, @otherstuff) = map {chomp; $_} split "$separator\n", $entirefile; % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/perltex/perltex.ins b/Master/texmf-dist/source/latex/perltex/perltex.ins index 6abc0acbf3e..6f5b1b2fa57 100644 --- a/Master/texmf-dist/source/latex/perltex/perltex.ins +++ b/Master/texmf-dist/source/latex/perltex/perltex.ins @@ -1,5 +1,5 @@ %% -%% 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 license @@ -21,7 +21,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 license diff --git a/Master/texmf-dist/tex/latex/perltex/perltex.sty b/Master/texmf-dist/tex/latex/perltex/perltex.sty index 05c6b23cda3..1aff9fc138f 100644 --- a/Master/texmf-dist/tex/latex/perltex/perltex.sty +++ b/Master/texmf-dist/tex/latex/perltex/perltex.sty @@ -8,7 +8,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 license @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{perltex} - [2009/11/24 v2.0 LaTeX macros for use with PerlTeX] + [2010/07/10 v2.1 LaTeX macros for use with PerlTeX] \newif\ifplmac@required \plmac@requiredtrue \DeclareOption{optional}{\plmac@requiredfalse} \ProcessOptions\relax \newif\ifperl diff --git a/Master/texmf/doc/man/man1/perltex.1 b/Master/texmf/doc/man/man1/perltex.1 index 80e40a34ad9..28c0508e680 100644 --- a/Master/texmf/doc/man/man1/perltex.1 +++ b/Master/texmf/doc/man/man1/perltex.1 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "PERLTEX 1" -.TH PERLTEX 1 "2009-11-24" "v2.0" "User Contributed Perl Documentation" +.TH PERLTEX 1 "2010-07-10" "v2.1" " " .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/Master/texmf/doc/man/man1/perltex.man1.pdf b/Master/texmf/doc/man/man1/perltex.man1.pdf index 4cf49a745e2..1aab77154c5 100644 Binary files a/Master/texmf/doc/man/man1/perltex.man1.pdf and b/Master/texmf/doc/man/man1/perltex.man1.pdf differ -- cgit v1.2.3