summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-07 22:49:34 +0000
committerKarl Berry <karl@freefriends.org>2012-05-07 22:49:34 +0000
commit00594439f07c4918772b72ae22786fb762b93f37 (patch)
tree353a0b80b614cb8c21a4fd9e2793400229ac556b /Master
parent442cbc456148fe4adcdfeb54e0f381b2e95a4ad1 (diff)
psfragx 1.1 (7may12)
git-svn-id: svn://tug.org/texlive/trunk@26243 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/psfragx/README.laprint-3.16 (renamed from Master/texmf-dist/doc/latex/psfragx/README.txt.laprint-3.16)0
-rw-r--r--Master/texmf-dist/doc/latex/psfragx/psfragx.m30
-rw-r--r--Master/texmf-dist/doc/latex/psfragx/psfragx.pdfbin163161 -> 214814 bytes
-rw-r--r--Master/texmf-dist/doc/latex/psfragx/readmePFX.txt2
-rw-r--r--Master/texmf-dist/source/latex/psfragx/psfragx.drv2
-rw-r--r--Master/texmf-dist/source/latex/psfragx/psfragx.dtx54
-rw-r--r--Master/texmf-dist/source/latex/psfragx/psfragx.ins4
-rw-r--r--Master/texmf-dist/tex/latex/psfragx/psfragx.cfg4
-rw-r--r--Master/texmf-dist/tex/latex/psfragx/psfragx.sty4
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check1
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.config.tlpsrc14
11 files changed, 82 insertions, 33 deletions
diff --git a/Master/texmf-dist/doc/latex/psfragx/README.txt.laprint-3.16 b/Master/texmf-dist/doc/latex/psfragx/README.laprint-3.16
index 30a32a5e161..30a32a5e161 100644
--- a/Master/texmf-dist/doc/latex/psfragx/README.txt.laprint-3.16
+++ b/Master/texmf-dist/doc/latex/psfragx/README.laprint-3.16
diff --git a/Master/texmf-dist/doc/latex/psfragx/psfragx.m b/Master/texmf-dist/doc/latex/psfragx/psfragx.m
index c61488279a2..5c051b953b5 100644
--- a/Master/texmf-dist/doc/latex/psfragx/psfragx.m
+++ b/Master/texmf-dist/doc/latex/psfragx/psfragx.m
@@ -1,3 +1,28 @@
+%% psfragx.m [2012/05/02 v0.4 Pascal Kockaert]
+%%
+%% function psfragx(TeXname,EPSname,Outname)
+%% nargin=1 -> EPSname=TeXname
+%% nargin=2 -> Outname=EPSname
+%%
+%% Interleaves lines of TeXname.tex and EPSname.eps
+%% so that all the lines of EPSname.eps are copied in Outname.tex and
+%% lines from TeXname.tex starting with
+%% \psfrag
+%% and
+%% %<pfx>
+%% are written in Outname.eps, as a comment following the
+%% %%BoundigBox
+%% line.
+
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This file is currently maintained by Pascal Kockaert
function psfragx(TeXname,EPSname,Outname)
TMPname='psfragx_tmp';
@@ -12,6 +37,11 @@ TeXName=([TeXname,'.tex']);
EPSName=([EPSname,'.eps']);
OutName=([Outname,'.eps']);
+%% Uncomment for debugging purposes
+%% eval(['ls ',TeXName])
+%% eval(['ls ',EPSName])
+%% eval(['ls ',OutName])
+
BeginInput ='%%BoundingBox:';
BeginPSFRAG='%<pfx>\pfxbegin[1.0]{laprint}%';
EndPSFRAG ='%<pfx>\pfxend';
diff --git a/Master/texmf-dist/doc/latex/psfragx/psfragx.pdf b/Master/texmf-dist/doc/latex/psfragx/psfragx.pdf
index 44b21d85fd1..f8636081a88 100644
--- a/Master/texmf-dist/doc/latex/psfragx/psfragx.pdf
+++ b/Master/texmf-dist/doc/latex/psfragx/psfragx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/psfragx/readmePFX.txt b/Master/texmf-dist/doc/latex/psfragx/readmePFX.txt
index e6dbc59bc1c..e8d4536514f 100644
--- a/Master/texmf-dist/doc/latex/psfragx/readmePFX.txt
+++ b/Master/texmf-dist/doc/latex/psfragx/readmePFX.txt
@@ -4,7 +4,7 @@ This file describes how to install the package.
All you need is the file psfragx.dtx. If the file psfragx.ins does
not exist, run LaTeX on the file psfragx.dtx. This should
-generated the file psfragx.ins.
+generate the file psfragx.ins.
Run LaTeX on the file psfragx.ins. This generates all the files of
the package. The documentation will be generated if you run LaTeX
diff --git a/Master/texmf-dist/source/latex/psfragx/psfragx.drv b/Master/texmf-dist/source/latex/psfragx/psfragx.drv
index bdd30fe3c73..4ce4d638286 100644
--- a/Master/texmf-dist/source/latex/psfragx/psfragx.drv
+++ b/Master/texmf-dist/source/latex/psfragx/psfragx.drv
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2003, 2004 Pascal Kockaert
+%% Copyright (C) 2003-2012 Pascal Kockaert
%% Pascal.Kockaert ad ulb.ac.be
%% Note that ''ad创 is often replaced by the ''@创 sign.
%% ----------------------------------------------------------
diff --git a/Master/texmf-dist/source/latex/psfragx/psfragx.dtx b/Master/texmf-dist/source/latex/psfragx/psfragx.dtx
index 3a01ae353b8..ba44e145652 100644
--- a/Master/texmf-dist/source/latex/psfragx/psfragx.dtx
+++ b/Master/texmf-dist/source/latex/psfragx/psfragx.dtx
@@ -9,7 +9,7 @@
%
%
%
-% Copyright 2003, Pascal Kockaert
+% Copyright 2003-2012, Pascal Kockaert
% This file is distributed under the LPPL license.
% (see http://www.latex-project.org/lppl.txt for details)
%
@@ -53,7 +53,7 @@ This file describes how to install the package.
All you need is the file psfragx.dtx. If the file psfragx.ins does
not exist, run LaTeX on the file psfragx.dtx. This should
-generated the file psfragx.ins.
+generate the file psfragx.ins.
Run LaTeX on the file psfragx.ins. This generates all the files of
the package. The documentation will be generated if you run LaTeX
@@ -92,7 +92,7 @@ Pascal Kockaert
% driver files from the doc files in this package when run through
% LaTeX or TeX.
%
-% Copyright (C) 2003,2004 Pascal Kockaert
+% Copyright (C) 2003-2012 Pascal Kockaert
% Pascal.Kockaert ad ulb.ac.be
% Note that ''ad创 is often replaced by the ligature: ''@创.
% ----------------------------------------------------------
@@ -118,7 +118,7 @@ Pascal Kockaert
This is a generated file.
-Copyright (C) 2003, 2004 Pascal Kockaert
+Copyright (C) 2003-2012 Pascal Kockaert
Pascal.Kockaert ad ulb.ac.be
Note that ''ad创 is often replaced by the ''@创 sign.
----------------------------------------------------------
@@ -171,7 +171,7 @@ version 1999/12/01 or later.
%<*version>
% %\fi
% \ProvidesFile{psfragx.dtx}
- [2004/12/10 v1.0 psfragx (Pascal Kockaert)]
+ [2012/05/02 v1.1 psfragx (Pascal Kockaert)]
% % \iffalse
%</version>
%<*gobble>
@@ -1450,19 +1450,31 @@ version 1999/12/01 or later.
%
% \begin{macrocode}
%<*matlab>
-% psfragx.m %%% [-*- Matlab -*-]
-%
-% function psfragx(NomTeX,NomEPS)
-% nargin=1 -> NomTeX=NomEPS
-%
-% Copy lines of NomTeX.tex
-% starting with
-% \psfrag
-% and
-% %<pfx>
-% to the file NomEPS.eps, as a comment following the
-% %%BoundigBox
-% line.
+%% psfragx.m [2012/05/02 v0.4 Pascal Kockaert]
+%%
+%% function psfragx(TeXname,EPSname,Outname)
+%% nargin=1 -> EPSname=TeXname
+%% nargin=2 -> Outname=EPSname
+%%
+%% Interleaves lines of TeXname.tex and EPSname.eps
+%% so that all the lines of EPSname.eps are copied in Outname.tex and
+%% lines from TeXname.tex starting with
+%% \psfrag
+%% and
+%% %<pfx>
+%% are written in Outname.eps, as a comment following the
+%% %%BoundigBox
+%% line.
+
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This file is currently maintained by Pascal Kockaert
function psfragx(TeXname,EPSname,Outname)
TMPname='psfragx_tmp';
@@ -1477,6 +1489,12 @@ TeXName=([TeXname,'.tex']);
EPSName=([EPSname,'.eps']);
OutName=([Outname,'.eps']);
+%% Uncomment for debugging purposes
+%% eval(['ls ',TeXName])
+%% eval(['ls ',EPSName])
+%% eval(['ls ',OutName])
+
+
BeginInput ='%%BoundingBox:';
BeginPSFRAG='%<pfx>\pfxbegin[1.0]{laprint}%';
EndPSFRAG ='%<pfx>\pfxend';
diff --git a/Master/texmf-dist/source/latex/psfragx/psfragx.ins b/Master/texmf-dist/source/latex/psfragx/psfragx.ins
index 7fad319da5d..b7452e8966e 100644
--- a/Master/texmf-dist/source/latex/psfragx/psfragx.ins
+++ b/Master/texmf-dist/source/latex/psfragx/psfragx.ins
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2003, 2004 Pascal Kockaert
+%% Copyright (C) 2003-2012 Pascal Kockaert
%% Pascal.Kockaert ad ulb.ac.be
%% Note that ''ad创 is often replaced by the ''@创 sign.
%% ----------------------------------------------------------
@@ -31,7 +31,7 @@
This is a generated file.
-Copyright (C) 2003, 2004 Pascal Kockaert
+Copyright (C) 2003-2012 Pascal Kockaert
Pascal.Kockaert ad ulb.ac.be
Note that ''ad创 is often replaced by the ''@创 sign.
----------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/psfragx/psfragx.cfg b/Master/texmf-dist/tex/latex/psfragx/psfragx.cfg
index 72c2e4399cd..ca920bd729d 100644
--- a/Master/texmf-dist/tex/latex/psfragx/psfragx.cfg
+++ b/Master/texmf-dist/tex/latex/psfragx/psfragx.cfg
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2003, 2004 Pascal Kockaert
+%% Copyright (C) 2003-2012 Pascal Kockaert
%% Pascal.Kockaert ad ulb.ac.be
%% Note that ''ad创 is often replaced by the ''@创 sign.
%% ----------------------------------------------------------
@@ -22,7 +22,7 @@
%% version 1999/12/01 or later.
%%
\ProvidesFile{psfragx.cfg}
- [2004/12/10 v1.0 psfragx (Pascal Kockaert)]
+ [2012/05/02 v1.1 psfragx (Pascal Kockaert)]
\newcommand{\providecolorcommands}
{\def\pfx@gobble@two##1##2{\typeout{Some psfragx
replacement would appear
diff --git a/Master/texmf-dist/tex/latex/psfragx/psfragx.sty b/Master/texmf-dist/tex/latex/psfragx/psfragx.sty
index db5203e0f83..f53a5e0f09b 100644
--- a/Master/texmf-dist/tex/latex/psfragx/psfragx.sty
+++ b/Master/texmf-dist/tex/latex/psfragx/psfragx.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2003, 2004 Pascal Kockaert
+%% Copyright (C) 2003-2012 Pascal Kockaert
%% Pascal.Kockaert ad ulb.ac.be
%% Note that ''ad创 is often replaced by the ''@创 sign.
%% ----------------------------------------------------------
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2001/06/01]
\ProvidesPackage{psfragx}
- [2004/12/10 v1.0 psfragx (Pascal Kockaert)]
+ [2012/05/02 v1.1 psfragx (Pascal Kockaert)]
\DeclareOption{sub}{\pfx@subtrue}
\DeclareOption{nosub}{\pfx@subfalse}
\DeclareOption{allcom}{\allmetacomments}
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 92ee8fa5b29..19eff60d52a 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -467,6 +467,7 @@ my @TLP_no_check = (
"detex", # binary
"devnag", # binary
"dnp", # part of cjk
+ "dtl", # binary
"dvi2tty", # binary
"dvicopy", # binary
"dvidvi", # binary
diff --git a/Master/tlpkg/tlpsrc/00texlive.config.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.config.tlpsrc
index 1889c152b34..f672bd0f383 100644
--- a/Master/tlpkg/tlpsrc/00texlive.config.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.config.tlpsrc
@@ -4,21 +4,21 @@ longdesc This package contains configuration options for the TeX Live archive.
longdesc
longdesc If container_split_{doc,src}_files/1 are dependencies, the
longdesc {doc,src} files are split into separate containers (.tar.xz)
-longdesc during container build time. Note that this has NO effect on the
+longdesc during container build time. This has NO effect on the
longdesc appearance within texlive.tlpdb. It is only on the container level.
longdesc
-longdesc The container_format/WHATEVER specifies the format, currently "xz"
-longdesc the only supported value (generating .tar.xz files).
+longdesc The container_format/WHATEVER specifies the format, currently
+longdesc "xz" is the only supported value (generating .tar.xz files).
longdesc
longdesc release/YYYY specifies the release number as used in the installer.
longdesc
longdesc minrelease/ZZZZ specifies the minimum release for which this
longdesc repository is valid, i.e., a release of ZZZZ or later can
longdesc theoretically be upgraded.
-longdesc
-longdesc These values are taken from TeXLive::TLConfig::TLPDBConfigs hash
-longdesc at tlpdb creation time. (The 00texlive.config.tlpsrc file just
-longdesc has these comments.)
+longdesc
+longdesc These values are taken from TeXLive::TLConfig::TLPDBConfigs
+longdesc hash values at tlpdb creation time. (The 00texlive.config.tlpsrc
+longdesc file just has these comments.)
longdesc
longdesc For information on the 00texlive prefix see
longdesc 00texlive.installation(.tlpsrc)