Hello community,
here is the log from the commit of package texlive-specs-p for openSUSE:Factory checked in at 2013-09-12 14:15:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-p (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-p.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-p"
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-p/texlive-specs-p.changes 2013-07-24 15:22:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.texlive-specs-p.new/texlive-specs-p.changes 2013-09-12 14:19:25.000000000 +0200
@@ -1,0 +2,61 @@
+Tue Sep 10 15:25:02 UTC 2013 - werner@suse.de
+
+- Change /bin/env to /usr/bin/env in latexdiff tool below doc
+
+-------------------------------------------------------------------
+Fri Aug 9 07:31:30 UTC 2013 - werner@suse.de
+
+- Be aware that the package texlive-ascii-font is the former
+ texlive-ascii
+
+-------------------------------------------------------------------
+Thu Aug 8 14:43:07 UTC 2013 - werner@suse.de
+
+- Do not override TEXMFLOCAL with TEXMFMAIN as this is now TEXMFDIST
+
+-------------------------------------------------------------------
+Wed Aug 7 11:01:50 UTC 2013 - werner@suse.de
+
+- Drop dependency freeglut-devel of texlive-asymptote (bnc#833498)
+
+-------------------------------------------------------------------
+Mon Aug 5 10:24:25 UTC 2013 - werner@suse.de
+
+- Make sure that TEXMFMAIN is /usr/share/texmf now
+- Replace texmf.cnf if really required that is do not install
+ as .rpmnew but move the old to .rpmold
+
+-------------------------------------------------------------------
+Fri Aug 2 08:45:18 UTC 2013 - werner@suse.de
+
+- Move leipzig.tex from doc/latex/leipzig/leipzig.tex to
+ tex/latex/leipzig/leipzig.tex
+
+-------------------------------------------------------------------
+Tue Jul 30 16:14:46 UTC 2013 - werner@suse.de
+
+- Update to TeXLive 2013 (timestamp 20130620)
+ + Distribution layout: the top-level texmf/ directory has been
+ merged into texmf-dist/, for simplicity. Both the TEXMFMAIN
+ and TEXMFDIST Kpathsea variables now point to texmf-dist.
+ + Many small language collections have been merged together,
+ to simplify installation.
+ + MetaPost: native support for PNG output and floating-point
+ (IEEE double) has been added.
+ + LuaTEX: updated to Lua 5.2, and includes a new library
+ (pdfscanner) to process external PDF page content, among
+ much else (see its web pages).
+ + XeTEX (also see its web pages for more):
+ The HarfBuzz library now used for font layout instead of ICU.
+ Graphite2 and HarfBuzz are used instead of SilGraphite for Graphite layout.
+ On Macs, Core Text is used instead of the (deprecated) ATSUI.
+ Prefer TrueType/OpenType fonts to Type1 when the names are the same.
+ Fix occasional mismatch in font finding between XeTEX and xdvipdfmx.
+ Support OpenType math cut-ins.
+ + xdvi: now uses FreeType instead of t1lib for rendering.
+ + microtype.sty: some support for XeTEX (protrusion) and LuaTEX
+ (protrusion, font expansion, tracking), among other enhancements.
+- Update biblatex-biber to 1.7
+- Udpate biblatex of TeXLive 2013 to 2.7a
+
+-------------------------------------------------------------------
Old:
----
polyglot.doc.tar.xz
polyglot.tar.xz
psafm.tar.xz
pstricks-tutorial.doc.tar.xz
New:
----
patch.tar.xz
patgen.tar.xz
patgen2-tutorial.tar.xz
pfarrei.doc.tar.xz
pfarrei.tar.xz
physics.doc.tar.xz
physics.tar.xz
pictexsum.tar.xz
pkuthss.doc.tar.xz
pkuthss.tar.xz
plain-doc.tar.xz
plainpkg.doc.tar.xz
plainpkg.tar.xz
plipsum.doc.tar.xz
plipsum.tar.xz
plstmary.doc.tar.xz
plstmary.tar.xz
pmx.doc.tar.xz
pmx.tar.xz
poetrytex.doc.tar.xz
poetrytex.tar.xz
presentations-en.doc.tar.xz
presentations-en.tar.xz
presentations.tar.xz
proposal.doc.tar.xz
proposal.tar.xz
psfrag-italian.tar.xz
pst-eucl-translation-bg.tar.xz
pst-fit.doc.tar.xz
pst-fit.tar.xz
pst-ode.doc.tar.xz
pst-ode.tar.xz
pst-vectorian.doc.tar.xz
pst-vectorian.tar.xz
ptex2pdf.doc.tar.xz
ptex2pdf.tar.xz
ptext.doc.tar.xz
ptext.tar.xz
punk-latex.doc.tar.xz
punk-latex.tar.xz
punk.doc.tar.xz
pxbase.doc.tar.xz
pxbase.tar.xz
pxchfon.doc.tar.xz
pxchfon.tar.xz
pxcjkcat.doc.tar.xz
pxcjkcat.tar.xz
pxjahyper.doc.tar.xz
pxjahyper.tar.xz
pxpgfmark.doc.tar.xz
pxpgfmark.tar.xz
pxrubrica.doc.tar.xz
pxrubrica.tar.xz
python.doc.tar.xz
python.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-p.spec ++++++
++++ 1023 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-p/texlive-specs-p.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-p.new/texlive-specs-p.spec
++++++ pageslts.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pageslts/README new/doc/latex/pageslts/README
--- old/doc/latex/pageslts/README 2011-08-14 00:16:14.000000000 +0200
+++ new/doc/latex/pageslts/README 2013-01-30 00:35:09.000000000 +0100
@@ -53,29 +53,20 @@
\pageref* and \pageref*, for using hyperref but suppressing
links, are supported.
This material is subject to the LaTeX Project Public License
-(LPPL). See http://www.ctan.org/tex-archive/help/Catalogue/
-licenses.lppl.html for the details of that license.
+(LPPL). See http://www.ctan.org/license/lppl1.3
+for the details of that license.
2 DOWNLOAD
==========
`pageslts' is available on CTAN:
- CTAN:macros/latex/contrib/pageslts/
+ http://www.ctan.org/tex-archive/macros/latex/contrib/pageslts/
Also a ZIP file is provided that contains the files, already
-sorted in a TDS tree (should become available on CTAN soon):
- CTAN:install/macros/latex/contrib/pageslts.tds.zip
-
-`CTAN:' means one of the `Comprehensive TeX Archive Network'
-nodes or one of its mirrors. This is explained in
- http://www.tex.ac.uk/cgi-bin/texfaq2html?label=archives
-
-The CTAN stuff will be mirrored automatically from the
-ftp server, so
- ftp://ftp.tug.org/pub/tex/pageslts/
-corresponds to
- CTAN:macros/latex/contrib/pageslts/
+sorted in a TDS tree:
+ http://mirrors.ctan.org/install/macros/latex/contrib/
+ pageslts.tds.zip
3 INSTALLATION
@@ -86,7 +77,8 @@
The ZIP file `pageslts.tds.zip' contains the files sorted
in a TDS tree. Thus you can directly unpack the ZIP file
inside a TDS tree.
- (See CTAN:tds.zip for an explanation of TDS.)
+(See http://www.ctan.org/TDS-guidelines for an explanation
+of TDS.)
Example:
cd /...somewhere.../texmf
unzip /...downloadpath.../pageslts.tds.zip
@@ -101,8 +93,8 @@
If necessary, unpack them.
b) Generate the package and driver files:
tex pageslts.ins
-c) Install the files `*.sty' and `*.cfg' in your TDS tree:
- cp *.sty *.cfg TDS:tex/latex/pageslts/
+c) Install the file `*.sty' in your TDS tree:
+ cp *.sty TDS:tex/latex/pageslts/
Replace `TDS:' by the prefix of your TDS tree
(texmf directory).
d) Copy the documentation files to
@@ -121,7 +113,7 @@
For unpacking the pageslts.dtx file and constructing the
documentation it is required:
-- TeXFormat LaTeX2e, 1994/06/01, v2e
+- TeXFormat LaTeX2e, 2011/06/27, v2e
- document class ltxdoc, 2007/11/11, v2.0u,
CTAN:macros/latex/base/ltxdoc.dtx
- package holtxdoc, 2011/02/04, v0.21
@@ -135,27 +127,27 @@
The pageslts.sty for LATEX2e (i. e. all documents using the
pageslts package) requires:
-- TeXFormat LaTeX2e, 1994/06/01, v2e
-- package atveryend, 2010/03/24, v1.5,
+- TeXFormat LaTeX2e, 2011/06/27, v2e
+- package atveryend, 2011/06/30, v1.8,
CTAN:macros/latex/contrib/oberdiek/atveryend.dtx
- package everyshi, 2001/05/15, v3.00,
CTAN:macros/latex/contrib/ms/everyshi.dtx
-- package kvoptions, 2010/02/22, v3.7,
+- package kvoptions, 2011/06/30, v3.11,
CTAN:macros/latex/contrib/oberdiek/kvoptions.dtx
-- package undolabl, 2011/08/08, v1.0j,
+- package undolabl, 2012/01/01, v1.0k,
CTAN:macros/latex/contrib/undolabl/undolabl.dtx
The pageslts-example.tex requires the same files as all
documents using the pageslts package, and additionally:
-- package alphalph, 2010/04/18, v2.3,
+- package alphalph, 2011/05/13, v2.4,
CTAN:macros/latex/generic/oberdiek/alphalph.dtx
- package lipsum, 2011/04/14, v1.2,
CTAN:macros/latex/contrib/lipsum/lipsum.dtx
- package showkeys, 2007/08/07, v3.15,
CTAN:macros/latex/required/tools/showkeys.dtx
-- package hyperref, 2011/04/17, v6.82g,
+- package hyperref, 2012/11/06, v6.83m,
CTAN:macros/latex/contrib/hyperref.zip
-- package pageslts, 2011/08/08, v2.0a,
+- package pageslts, 2013/01/28, v2.0b,
CTAN:macros/latex/contrib/pageslts/pageslts.dtx
(Well, it is the example file for this package, and
because you are reading the README for the pageslts
Files old/doc/latex/pageslts/pageslts-example.pdf and new/doc/latex/pageslts/pageslts-example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pageslts/pageslts-example.tex new/doc/latex/pageslts/pageslts-example.tex
--- old/doc/latex/pageslts/pageslts-example.tex 2011-08-14 00:16:14.000000000 +0200
+++ new/doc/latex/pageslts/pageslts-example.tex 2013-01-30 00:35:09.000000000 +0100
@@ -8,6 +8,13 @@
%%
%% This is a generated file.
%%
+%% Project: pageslts
+%% Version: 2013/01/28 v1.2b
+%%
+%% Copyright (C) 2010 - 2013 by
+%% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
+%% Portions of code copyrighted by other people as marked.
+%%
%% IMPORTANT NOTICE:
%% On the first page backslash pagenumbering should be called
%% (with the appropriate argument out of e.g.
@@ -16,8 +23,8 @@
%% * arabic - Arabic numerals: 1, 2, 3, 4,...
%% * alph - Lowercase letters: a, b, c, d,...
%% * Alph - Uppercase letters: A, B, C, D,...
-%% * fnsymbol - Footnote symbols: *, ^^86 (ddagger), ^^87 (dddagger),
-%% ^^a7 (mathsection),...
+%% * fnsymbol - Footnote symbols: *, ^^e2^^80^^a0 (ddagger), ^^e2^^80^^a1 (dddagger),
+%% ^^c2^^a7 (mathsection),...
%% ). The command backslash pagenumbering is renewed, but no change
%% should be visible to the output text, because only labels are added.
%% backslash OrigPagenumbering can be used to get the original meaning
@@ -25,7 +32,7 @@
%% see the change in the page numbering scheme and will make mistakes.
%% The package takes options.
%%
-%% The usual disclaimers apply:
+%% The usual disclaimer applies:
%% If it doesn't work right that's your problem.
%% (Nevertheless, send an e-mail to the maintainer
%% when you find an error in this package.)
@@ -42,12 +49,11 @@
%%
%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainer of this work is H.-Martin Muench
-%% (Martin dot Muench at Uni-Bonn dot de).
+%% The Current Maintainer of this work is H.-Martin Muench.
%%
%% This package first started as a revision of the lastpage
%% package of Jeffrey P. Goldberg (jeffrey+news at goldmark dot org),
-%% but it became obviouse that a replacement was needed.
+%% but it became obvious that a replacement was needed.
%%
%% This work consists of the main source file pageslts.dtx
%% and the derived files
@@ -59,7 +65,7 @@
\usepackage{lipsum}[2011/04/14]% v1.2
\usepackage[draft]{showkeys}[2007/08/07]% v3.15
%% Use final instead of draft to hide the keys. %%
-\usepackage{hyperref}[2011/04/17]% v6.82g
+\usepackage{hyperref}[2012/11/06]% v6.83m
\hypersetup{%
extension=pdf,%
plainpages=false,%
@@ -69,13 +75,13 @@
pdftitle={pageslts package example},%
pdfauthor={Hans-Martin Muench},%
pdfsubject={Example for the pageslts package},%
- pdfkeywords={LaTeX, pageslts, Hans-Martin Muench},%
+ pdfkeywords={LaTeX, pageslts, H.-Martin Muench},%
pdfview=Fit,%
pdfstartview=Fit,%
pdfpagelayout=SinglePage,%
bookmarksopen=true%
}
-\usepackage[pagecontinue=true,alphMult=ab,AlphMulti=AB,fnsymbolmult=true,romanMult=true,RomanMulti=true]{pageslts}[2011/08/08]% v1.2a
+\usepackage[pagecontinue=true,alphMult=ab,AlphMulti=AB,fnsymbolmult=true,romanMult=true,RomanMulti=true]{pageslts}[2013/01/28]% v1.2b
%% These are the default options. %%
\makeatletter
\renewcommand{\@evenfoot}%
@@ -104,7 +110,7 @@
\markboth{Example for pageslts}{Example for pageslts}
This example demonstrates the most common uses of package\\
-\textsf{pageslts}, v1.2a as of 2011/08/08 (HMM).\\
+\textsf{pageslts}, v1.2b as of 2013/01/28 (HMM).\\
The used options were \texttt{pagecontinue=true},
\texttt{alphMult=ab}, \texttt{AlphMulti=AB}, \linebreak
\texttt{fnsymbolmult=true},
@@ -147,7 +153,7 @@
\textbf{Tip}: Use \textit{logical page numbers} for
the display of the pdf!\\
-(In Adobe Reader X (10.1.0): \underline{E}dit $>$
+(In Adobe Reader XI (11.0.1): \underline{E}dit $>$
Prefere\underline{n}ces (Ctrl+k) $>$ Page Display $>$
Page Content and Information $>$ Use logical page
\nolinebreak{\underline{n}umbers.)}\\
@@ -177,7 +183,7 @@
\section{roman}
\noindent (\texttt{roman} page numbering was started before,
-becaue the page numbering scheme was needed to start at
+because the page numbering scheme was needed to start at
the first page, of course.)\\
\noindent First page (\verb|\lastpageref{pagesLTS.0}|):
@@ -193,7 +199,7 @@
\noindent CurrentPageLocal (\verb|\theCurrentPageLocal|),
i.\,e. counted continuously from the first page of the
-current page numbering sheme): \theCurrentPageLocal \\
+current page numbering scheme): \theCurrentPageLocal \\
You can get also this in other formats, too:
\roman{pagesLTS.current.local.roman}, \Roman{pagesLTS.current.local.roman},
\arabic{pagesLTS.current.local.roman}, \fnsymbol{pagesLTS.current.local.roman},
@@ -268,7 +274,7 @@
\noindent CurrentPageLocal (\verb|\theCurrentPageLocal|),
i.\,e. counted continuously from the first page of the
-current page numbering sheme): \theCurrentPageLocal \\
+current page numbering scheme): \theCurrentPageLocal \\
\noindent Last roman page (pagesLTS.roman): \lastpageref{pagesLTS.roman}{\hskip4em }
(There are \lastpageref{pagesLTS.roman.local} pages with roman numbers.)\\
@@ -341,7 +347,7 @@
\noindent CurrentPageLocal (\verb|\theCurrentPageLocal|),
i.\,e. counted continuously from the first page of the
-current page numbering sheme): \theCurrentPageLocal \\
+current page numbering scheme): \theCurrentPageLocal \\
\noindent Last roman page (pagesLTS.roman): \lastpageref{pagesLTS.roman}{\hskip4em }
(There are \lastpageref{pagesLTS.roman.local} pages with roman numbers.)\\
@@ -400,7 +406,7 @@
\noindent CurrentPageLocal (\verb|\theCurrentPageLocal|),
i.\,e. counted continuously from the first page of the
-current page numbering sheme): \theCurrentPageLocal \\
+current page numbering scheme): \theCurrentPageLocal \\
\noindent Last roman page (pagesLTS.roman): \lastpageref{pagesLTS.roman}{\hskip4em }
(There are \lastpageref{pagesLTS.roman.local} pages with roman numbers.)\\
@@ -459,7 +465,7 @@
\noindent CurrentPageLocal (from \verb|\theCurrentPageLocal|\ %
command), i.\,e. counted continuously from the first page of the
-current page numbering sheme): \theCurrentPageLocal\\
+current page numbering scheme): \theCurrentPageLocal\\
\noindent Last page's number (LastPages): \lastpageref{LastPages}{\hskip3em }
(= total number of pages)\\
@@ -472,29 +478,29 @@
\section{fnsymbol}
-Adobe Reader X (10.1.0) does not show the correct page names
+Adobe Reader XI (11.0.1) does not show the correct page names
for all pages with \texttt{fnsymbol} page numbering scheme:
\begin{center}
-\begin{tabular}{c|c|c|c|c}
-page & page & \multicolumn{2}{c|}{shown by the Reader} & with \textsf{alphalph} package and \\
-number & name & without & with & with \textsf{pageslts} package \\
- & & \multicolumn{2}{c|}{\textsf{alphalph} \&\ \textsf{pageslts}} & with \texttt{fnsymbolmult} option \\ \hline
-$-2$ & \texttt{LaTeX Error} & & \ensuremath {-\ } & \ensuremath {- \dagger } \\
-$-1$ & \texttt{LaTeX Error} & & \ensuremath {- *} & \ensuremath {- *} \\
- $0$ & (ignored by \LaTeX) & & 0 & 0 \\
- $1$ & \ensuremath {*} & * & \ensuremath {*} & \ensuremath {*} \\
- $2$ & \ensuremath {\dagger } & & & \ensuremath {\dagger } \\
- $3$ & \ensuremath {\ddagger } & & & \ensuremath {\ddagger } \\
- $4$ & \ensuremath {\mathsection } & & & \ensuremath {\mathsection } \\
- $5$ & \ensuremath {\mathparagraph } & & & \ensuremath {\mathparagraph } \\
- $6$ & \ensuremath {\delimiter "026B30D } & "026B30D & \ensuremath {**} & \ensuremath {**} \\
- $7$ & \ensuremath {**} & ** & & \ensuremath {\dagger \dagger } \\
- $8$ & \ensuremath {\dagger \dagger } & & & \ensuremath {\ddagger \ddagger } \\
- $9$ & \ensuremath {\ddagger \ddagger } & & & \ensuremath {\mathsection \mathsection } \\
-$10$ & \texttt{LaTeX Error} & & & \ensuremath {\mathparagraph \mathparagraph }\\
-$11$ & \texttt{LaTeX Error} & & \ensuremath {***} & \ensuremath {***} \\
-$12$ & \texttt{LaTeX Error} & & & \ensuremath {\dagger \dagger \dagger } \\
+\begin{tabular}{c|c|c|c}
+page & page & \multicolumn{2}{c|}{shown by the Reader} \\
+number & name & without & \multicolumn{1}{c|}{with} \\
+ & & \multicolumn{2}{c|}{\textsf{alphalph} \&\ \textsf{pageslts}}\\ \hline
+$-2$ & \texttt{LaTeX Error} & & \ensuremath {-\ }\\
+$-1$ & \texttt{LaTeX Error} & & \ensuremath {- *}\\
+ $0$ & (ignored by \LaTeX) & & 0 \\
+ $1$ & \ensuremath {*} & * & \ensuremath {*} \\
+ $2$ & \ensuremath {\dagger } & & \\
+ $3$ & \ensuremath {\ddagger } & & \\
+ $4$ & \ensuremath {\mathsection } & & \\
+ $5$ & \ensuremath {\mathparagraph } & & \\
+ $6$ & \ensuremath {\delimiter "026B30D } & "026B30D & \ensuremath {**} \\
+ $7$ & \ensuremath {**} & ** & \\
+ $8$ & \ensuremath {\dagger \dagger } & & \\
+ $9$ & \ensuremath {\ddagger \ddagger } & & \\
+$10$ & \texttt{LaTeX Error} & & \\
+$11$ & \texttt{LaTeX Error} & & \ensuremath {***}\\
+$12$ & \texttt{LaTeX Error} & & \\
\end{tabular}
\end{center}
@@ -538,7 +544,7 @@
\noindent CurrentPageLocal (\verb|\theCurrentPageLocal|),
i.\,e. counted continuously from the first page of the
-current page numbering sheme): \theCurrentPageLocal \\
+current page numbering scheme): \theCurrentPageLocal \\
\noindent Last roman page (pagesLTS.roman): \lastpageref{pagesLTS.roman}{\hskip4em }
(There are \lastpageref{pagesLTS.roman.local} pages with roman numbers.)\\
@@ -591,7 +597,7 @@
\nolinebreak{with\textbf{out}} option \texttt{pagecontinue=false}).
This package remembered the (\arabic{pagesLTS.double.Roman}-1)\footnote{%
OK, here you have to compute this value for yourself, but\ %
-subtracting one should be managable for \TeX{}nicians.} pages already
+subtracting one should be manageable for \TeX{}nicians.} pages already
done in Roman output, and therefore continues with page
\textquotedblleft \thepage \textquotedblright .\\
If you want to start with \textquotedblleft I\textquotedblright\ all
@@ -609,7 +615,7 @@
\noindent CurrentPageLocal (\verb|\theCurrentPageLocal|),
i.\,e. counted continuously from the first page of the
-current page numbering sheme): \theCurrentPageLocal \\
+current page numbering scheme): \theCurrentPageLocal \\
\noindent Last roman page (pagesLTS.roman): \lastpageref{pagesLTS.roman}{\hskip4em }
(There are \lastpageref{pagesLTS.roman.local} pages with roman numbers.)\\
@@ -680,7 +686,7 @@
\noindent CurrentPageLocal (\verb|\theCurrentPageLocal|),
i.\,e. counted continuously from the first page of the
-current page numbering sheme): \theCurrentPageLocal \\
+current page numbering scheme): \theCurrentPageLocal \\
\noindent Last roman page (pagesLTS.roman): \lastpageref{pagesLTS.roman}{\hskip4em }
(There are \lastpageref{pagesLTS.roman.local} pages with roman numbers.)\\
@@ -779,7 +785,7 @@
\noindent CurrentPageLocal (\verb|\theCurrentPageLocal|),
i.\,e. counted continuously from the first page of the
-current page numbering sheme): \theCurrentPageLocal \\
+current page numbering scheme): \theCurrentPageLocal \\
\noindent Last roman page (pagesLTS.roman): \lastpageref{pagesLTS.roman}{\hskip4em }
(There are \lastpageref{pagesLTS.roman.local} pages with roman numbers.)\\
@@ -849,7 +855,7 @@
\noindent CurrentPageLocal (\verb|\theCurrentPageLocal|),
i.\,e. counted continuously from the first page of the
-current page numbering sheme): \theCurrentPageLocal \\
+current page numbering scheme): \theCurrentPageLocal \\
\noindent Last roman page (pagesLTS.roman): \lastpageref{pagesLTS.roman}{\hskip4em }
(There are \lastpageref{pagesLTS.roman.local} pages with roman numbers.)\\
@@ -919,7 +925,7 @@
\noindent CurrentPageLocal (\verb|\theCurrentPageLocal|),
i.\,e. counted continuously from the first page of the
-current page numbering sheme): \theCurrentPageLocal \\
+current page numbering scheme): \theCurrentPageLocal \\
\noindent Last roman page (pagesLTS.roman): \lastpageref{pagesLTS.roman}{\hskip4em }
(There are \lastpageref{pagesLTS.roman.local} pages with roman numbers.)\\
Files old/doc/latex/pageslts/pageslts.pdf and new/doc/latex/pageslts/pageslts.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pageslts.doc.tlpobj new/tlpkg/tlpobj/pageslts.doc.tlpobj
--- old/tlpkg/tlpobj/pageslts.doc.tlpobj 2011-08-14 04:20:01.000000000 +0200
+++ new/tlpkg/tlpobj/pageslts.doc.tlpobj 2013-01-30 04:37:21.000000000 +0100
@@ -1,9 +1,9 @@
name pageslts.doc
category Package
-revision 23534
+revision 28986
shortdesc doc files of pageslts
relocated 1
-docfiles size=244
+docfiles size=243
RELOC/doc/latex/pageslts/README
RELOC/doc/latex/pageslts/pageslts-example.pdf
RELOC/doc/latex/pageslts/pageslts-example.tex
++++++ pageslts.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pageslts/pageslts.sty new/tex/latex/pageslts/pageslts.sty
--- old/tex/latex/pageslts/pageslts.sty 2011-08-14 00:16:14.000000000 +0200
+++ new/tex/latex/pageslts/pageslts.sty 2013-01-30 00:35:09.000000000 +0100
@@ -8,6 +8,13 @@
%%
%% This is a generated file.
%%
+%% Project: pageslts
+%% Version: 2013/01/28 v1.2b
+%%
+%% Copyright (C) 2010 - 2013 by
+%% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
+%% Portions of code copyrighted by other people as marked.
+%%
%% IMPORTANT NOTICE:
%% On the first page backslash pagenumbering should be called
%% (with the appropriate argument out of e.g.
@@ -16,8 +23,8 @@
%% * arabic - Arabic numerals: 1, 2, 3, 4,...
%% * alph - Lowercase letters: a, b, c, d,...
%% * Alph - Uppercase letters: A, B, C, D,...
-%% * fnsymbol - Footnote symbols: *, ^^86 (ddagger), ^^87 (dddagger),
-%% ^^a7 (mathsection),...
+%% * fnsymbol - Footnote symbols: *, ^^e2^^80^^a0 (ddagger), ^^e2^^80^^a1 (dddagger),
+%% ^^c2^^a7 (mathsection),...
%% ). The command backslash pagenumbering is renewed, but no change
%% should be visible to the output text, because only labels are added.
%% backslash OrigPagenumbering can be used to get the original meaning
@@ -25,7 +32,7 @@
%% see the change in the page numbering scheme and will make mistakes.
%% The package takes options.
%%
-%% The usual disclaimers apply:
+%% The usual disclaimer applies:
%% If it doesn't work right that's your problem.
%% (Nevertheless, send an e-mail to the maintainer
%% when you find an error in this package.)
@@ -42,20 +49,19 @@
%%
%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainer of this work is H.-Martin Muench
-%% (Martin dot Muench at Uni-Bonn dot de).
+%% The Current Maintainer of this work is H.-Martin Muench.
%%
%% This package first started as a revision of the lastpage
%% package of Jeffrey P. Goldberg (jeffrey+news at goldmark dot org),
-%% but it became obviouse that a replacement was needed.
+%% but it became obvious that a replacement was needed.
%%
%% This work consists of the main source file pageslts.dtx
%% and the derived files
%% pageslts.sty, pageslts.pdf, pageslts.ins, pageslts.drv,
%% pageslts-example.tex.
%%
-\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesPackage{pageslts}[2011/08/08 v1.2a
+\NeedsTeXFormat{LaTeX2e}[2011/06/27]
+\ProvidesPackage{pageslts}[2013/01/28 v1.2b
Refers to special pages' numbers/names (HMM)]
%% Allows for things like\\
@@ -94,10 +100,11 @@
\gdef\pagesLTS@loaded{p@gesLTSlo@ded}
-\RequirePackage{atveryend}[2011/04/23]% v1.7
-\RequirePackage{everyshi}[2001/05/15]% v3.00
-\RequirePackage{kvoptions}[2010/02/22]% v3.7
-\RequirePackage{undolabl}[2011/08/08]% v1.0j
+\RequirePackage{atveryend}[2011/06/30]% v1.8
+\RequirePackage{everyshi}[2001/05/15]% v3.00
+\RequirePackage{letltxmacro}[2010/09/02]% v1.4
+\RequirePackage{kvoptions}[2011/06/30]% v3.11
+\RequirePackage{undolabl}[2012/01/01]% v1.0k
\RequirePackage{rerunfilecheck}[2011/04/15]% v1.7
%% pageslts package uses Prelim@EveryShipout code from the
%% prelim2e package [2009/05/29 v1.3] by Martin Schr\"{o}der, thanks!
@@ -246,15 +253,15 @@
\fi
\ifx\pagesLTS@alphMult\pagesLTS@zero% \relax
-\else \RequirePackage{alphalph}[2010/04/18]% v2.3
+\else \RequirePackage{alphalph}[2011/05/13]% v2.4
\fi
\ifx\pagesLTS@AlphMulti\pagesLTS@zero% \relax
-\else \RequirePackage{alphalph}[2010/04/18]% v2.3
+\else \RequirePackage{alphalph}[2011/05/13]% v2.4
\fi
\ifpagesLTS@fnsymbolmult%
-\RequirePackage{alphalph}[2010/04/18]% v2.3
+\RequirePackage{alphalph}[2011/05/13]% v2.4
\fi
\ifpagesLTS@romanMult%
@@ -361,6 +368,7 @@
\def\pagesLTS@Alph{Alph}
\def\pagesLTS@AlphAlph{0}
\def\pagesLTS@hyper{0}
+\def\pagesLTS@nameref{0}
\def\pagesLTS@rerun{0}
\def\pagesLTS@eso{0}
\def\pagesLTS@esov{0}
@@ -392,7 +400,7 @@
}
\fi
-\let\OrigPagenumbering\pagenumbering
+\LetLtxMacro{\OrigPagenumbering}{\pagenumbering}
\newcounter{CurrentPage}
\setcounter{CurrentPage}{1}
@@ -596,7 +604,7 @@
\setcounter{pagesLTS.current.local.\pagesLTS@pnc}{1}%
\fi%
\else%
- %% before the first page has shiped out
+ %% before the first page has shipped out
\xdef\pagesLTS@pnc{#1}%
\countdef\c@page=0 \c@page=1
\def\cl@page{}
@@ -976,8 +984,13 @@
\else%
\if@filesw%
\ifnum \value{pagesLTS.pnc.\pagesLTS@pnc}<2%
- \immediate\write\@auxout{\string
- \newlabel{#1}{{}{#2}}}%
+ \ifx\pagesLTS@nameref\pagesLTS@one%
+ \immediate\write\@auxout{\string
+ \newlabel{#1}{{}{#2}{}{}{}}}%
+ \else%
+ \immediate\write\@auxout{\string
+ \newlabel{#1}{{}{#2}}}%
+ \fi%
\else%
\edef\pagesLTStmpA{#1}%
\edef\pagesLTStmpB{pagesLTS.\pagesLTS@pnc.local}%
@@ -988,8 +1001,13 @@
\undonewlabel{#1}}%
\fi%
\fi%
- \immediate\write\@auxout{\string
- \newlabel{#1}{{}{#2}}}%
+ \ifx\pagesLTS@nameref\pagesLTS@one%
+ \immediate\write\@auxout{\string
+ \newlabel{#1}{{}{#2}{}{}{}}}%
+ \else%
+ \immediate\write\@auxout{\string
+ \newlabel{#1}{{}{#2}}}%
+ \fi%
\fi%
\fi%
\fi%
@@ -1024,7 +1042,7 @@
\fi%
\@ifpackageloaded{endfloat}%
{\@ifpackagelater{endfloat}{1992/03/31}% April 1992 v2.0
- {\@ifpackagelater{endfloat}{1995/10/10}{% 1995/10/11 v2.4i
+ {\@ifpackagelater{endfloat}{2011/12/24}{% 2011/12/25 v2.5d
\relax}%
{\PackageWarningNoLine{pageslts}{Old endfloat package detected:\MessageBreak%
There is a newer version of the endfloat package available.\MessageBreak%
@@ -1036,10 +1054,10 @@
{\PackageError{pageslts}{Incompatible, very old endfloat package detected.}%
{The very old version 2.0 (and earlier) of the\MessageBreak%
endfloat package actually redefined the \ enddocument,\MessageBreak%
- and so interferred drastically with the LaTeX2e commands\MessageBreak%
+ and so interfered drastically with the LaTeX2e commands\MessageBreak%
which make use of \ AtEndDocument.\MessageBreak%
Newer versions of the endfloat package exists\MessageBreak%
- (at least: v2.4i as of 1995/10/11)\MessageBreak%
+ (at least: v2.5d as of 2011/12/25)\MessageBreak%
in modern documentation form,\MessageBreak%
which should be available from CTAN.\MessageBreak%
Please update your endfloat package\MessageBreak%
@@ -1050,7 +1068,7 @@
}{}%
\@ifpackageloaded{lastpage}%
{\@ifpackagelater{lastpage}{2010/07/28}% 2010/07/29 v1.2a
- {\@ifpackagelater{lastpage}{2011/08/07}% 2011/08/08 v1.2i
+ {\@ifpackagelater{lastpage}{2013/01/27}% 2013/01/28 v1.2l
{\PackageWarning{pageslts}{lastpage package detected.\MessageBreak%
With pageslts package in use, lastpage has no function.\MessageBreak%
Just remove the lastpage package from your document.\MessageBreak%
@@ -1084,19 +1102,19 @@
}{% \relax
}
\@ifpackageloaded{hyperref}%
- {\global\def\pagesLTS@hyper{1}%
+ {\gdef\pagesLTS@hyper{1}%
\@ifpackageloaded{pdfpages}%
{\PackageWarningNoLine{pageslts}{Package pdfpages detected.\MessageBreak%
Using hyperref with pdfpages can cause problems. See\MessageBreak%
ftp://ftp.ctan.org/tex-archive/\MessageBreak%
macros/latex/contrib/pax/\MessageBreak%
- for project pax (PDFAnnotExtractor).%
+ for project pax (PDFAnnotExtractor)%
}%
}{% \relax
}%
\@ifpackageloaded{undolabl}%
{\@ifpackagelater{undolabl}{2010/07/14}% 2010/07/15 v1.0d
- {\@ifpackagelater{undolabl}{2011/08/07}% 2011/08/08 v1.0j
+ {\@ifpackagelater{undolabl}{2011/12/31}% 2012/01/01 v1.0k
{% recent version as of the time of last revision of this package: OK
}{% old, but not obsolete version
\PackageWarningNoLine{pageslts}{Old version of undolabl package used.\MessageBreak%
@@ -1118,7 +1136,7 @@
Type X <return> to quit.\MessageBreak%
}%
}
- \@ifpackagelater{hyperref}{2011/04/16}{% 2011/04/17 v6.82g
+ \@ifpackagelater{hyperref}{2012/11/05}{% 2012/11/06 v6.83m
\relax}{%
\PackageWarningNoLine{pageslts}{Old hyperref package detected:\MessageBreak%
There is a newer version of the\MessageBreak%
@@ -1127,7 +1145,7 @@
}%
}%
%% pageslts supports the use of the package hyperref by
- %% Heiko Oberdiek (hyperref version 2011/04/17 v6.82g).
+ %% Heiko Oberdiek (hyperref version 2012/11/06 v6.83m).
%% pageslts may work with earlier versions of this packages,
%% but this was not tested.
}%
@@ -1135,6 +1153,10 @@
pageslts would support hyperref. The page references\MessageBreak%
will NOT be hyperlinked!\MessageBreak }%
}%
+ \@ifpackageloaded{nameref}%
+ {\gdef\pagesLTS@nameref{1}%
+ }{% relax, \pagesLTS@nameref stays 0
+ }%
\@ifpackageloaded{showkeys}{%
\@ifpackagewith{showkeys}{final}{\relax}{\gdef\pagesLTS@SK{1}}%
}{% \relax
@@ -1208,7 +1230,7 @@
\fi%
\addtocounter{page}{+1}%
\addtocounter{CurrentPage}{-1}%
- \def\pagesLTS@tmpB{\arabic{CurrentPage}}%
+ \edef\pagesLTS@tmpB{\arabic{CurrentPage}}%
\if@filesw%
\immediate\write\@auxout{\string
\setcounter{pagesLTS.pagenr}{\pagesLTS@tmpB}}%
@@ -1220,6 +1242,13 @@
\message{^^J%
AED: pageslts setting LastPages via AfterLastShipout ^^J}%
\pagesLTS@putlabels%
+ \typeout{^^J}%
+ \ifodd\pagesLTS@tmpB%
+ \@PackageInfoNoLine{pageslts}{Total number of pages is odd}%
+ \else%
+ \@PackageInfoNoLine{pageslts}{Total number of pages is even}%
+ \fi%
+ \typeout{^^J}%
\let\pagesLTS@tmpA\undefined%
\let\pagesLTS@tmpB\undefined%
}
@@ -1228,7 +1257,7 @@
\ifx\pagesLTS@rerun\pagesLTS@one%
\PackageWarningNoLine{pageslts}{%
Label(s) may have changed.\MessageBreak%
- Rerun to get cross-references right.\MessageBreak%
+ Rerun to get cross-references right%
}%
\fi%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pageslts.tlpobj new/tlpkg/tlpobj/pageslts.tlpobj
--- old/tlpkg/tlpobj/pageslts.tlpobj 2011-08-14 04:20:02.000000000 +0200
+++ new/tlpkg/tlpobj/pageslts.tlpobj 2013-01-30 04:37:21.000000000 +0100
@@ -1,6 +1,6 @@
name pageslts
category Package
-revision 23534
+revision 28986
shortdesc Variants of last page labels.
relocated 1
longdesc The package was designed as an extension of the lastpage
@@ -15,6 +15,6 @@
runfiles size=12
RELOC/tex/latex/pageslts/pageslts.sty
catalogue-ctan /macros/latex/contrib/pageslts
-catalogue-date 2011-08-13 08:34:58 +0200
+catalogue-date 2013-01-28 22:45:23 +0100
catalogue-license lppl1.3
-catalogue-version 1.2a
+catalogue-version 1.2b
++++++ palatino.tar.xz ++++++
Files old/fonts/tfm/cspsfonts-adobe/palatino/pplb8z.tfm and new/fonts/tfm/cspsfonts-adobe/palatino/pplb8z.tfm differ
Files old/fonts/tfm/cspsfonts-adobe/palatino/pplbc8z.tfm and new/fonts/tfm/cspsfonts-adobe/palatino/pplbc8z.tfm differ
Files old/fonts/tfm/cspsfonts-adobe/palatino/pplbi8z.tfm and new/fonts/tfm/cspsfonts-adobe/palatino/pplbi8z.tfm differ
Files old/fonts/tfm/cspsfonts-adobe/palatino/pplr8z.tfm and new/fonts/tfm/cspsfonts-adobe/palatino/pplr8z.tfm differ
Files old/fonts/tfm/cspsfonts-adobe/palatino/pplrc8z.tfm and new/fonts/tfm/cspsfonts-adobe/palatino/pplrc8z.tfm differ
Files old/fonts/tfm/cspsfonts-adobe/palatino/pplri8z.tfm and new/fonts/tfm/cspsfonts-adobe/palatino/pplri8z.tfm differ
Files old/fonts/tfm/cspsfonts-adobe/palatino/rpplb.tfm and new/fonts/tfm/cspsfonts-adobe/palatino/rpplb.tfm differ
Files old/fonts/tfm/cspsfonts-adobe/palatino/rpplbi.tfm and new/fonts/tfm/cspsfonts-adobe/palatino/rpplbi.tfm differ
Files old/fonts/tfm/cspsfonts-adobe/palatino/rpplbu.tfm and new/fonts/tfm/cspsfonts-adobe/palatino/rpplbu.tfm differ
Files old/fonts/tfm/cspsfonts-adobe/palatino/rpplr.tfm and new/fonts/tfm/cspsfonts-adobe/palatino/rpplr.tfm differ
Files old/fonts/tfm/cspsfonts-adobe/palatino/rpplri.tfm and new/fonts/tfm/cspsfonts-adobe/palatino/rpplri.tfm differ
Files old/fonts/tfm/cspsfonts-adobe/palatino/rpplro.tfm and new/fonts/tfm/cspsfonts-adobe/palatino/rpplro.tfm differ
Files old/fonts/tfm/cspsfonts-adobe/palatino/rpplrre.tfm and new/fonts/tfm/cspsfonts-adobe/palatino/rpplrre.tfm differ
Files old/fonts/tfm/cspsfonts-adobe/palatino/rpplrrn.tfm and new/fonts/tfm/cspsfonts-adobe/palatino/rpplrrn.tfm differ
Files old/fonts/tfm/cspsfonts-adobe/palatino/rpplru.tfm and new/fonts/tfm/cspsfonts-adobe/palatino/rpplru.tfm differ
Files old/fonts/vf/cspsfonts-adobe/palatino/pplb8z.vf and new/fonts/vf/cspsfonts-adobe/palatino/pplb8z.vf differ
Files old/fonts/vf/cspsfonts-adobe/palatino/pplbc8z.vf and new/fonts/vf/cspsfonts-adobe/palatino/pplbc8z.vf differ
Files old/fonts/vf/cspsfonts-adobe/palatino/pplbi8z.vf and new/fonts/vf/cspsfonts-adobe/palatino/pplbi8z.vf differ
Files old/fonts/vf/cspsfonts-adobe/palatino/pplr8z.vf and new/fonts/vf/cspsfonts-adobe/palatino/pplr8z.vf differ
Files old/fonts/vf/cspsfonts-adobe/palatino/pplrc8z.vf and new/fonts/vf/cspsfonts-adobe/palatino/pplrc8z.vf differ
Files old/fonts/vf/cspsfonts-adobe/palatino/pplri8z.vf and new/fonts/vf/cspsfonts-adobe/palatino/pplri8z.vf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/palatino.tlpobj new/tlpkg/tlpobj/palatino.tlpobj
--- old/tlpkg/tlpobj/palatino.tlpobj 2011-04-06 04:17:27.000000000 +0200
+++ new/tlpkg/tlpobj/palatino.tlpobj 2012-12-22 04:32:31.000000000 +0100
@@ -1,6 +1,6 @@
name palatino
category Package
-revision 21993
+revision 28614
catalogue urw-base35
shortdesc URW "Base 35" font pack for LaTeX.
relocated 1
@@ -15,7 +15,7 @@
longdesc (substituting for Adobe's Zapf Chancery); - URW Gothic L Book
longdesc (substituting for Adobe's Avant Garde); and - URW Palladio L
longdesc (substituting for Adobe's Palatino).
-runfiles size=409
+runfiles size=388
RELOC/dvips/palatino/config.upl
RELOC/fonts/afm/adobe/palatino/pplb8a.afm
RELOC/fonts/afm/adobe/palatino/pplbi8a.afm
@@ -107,21 +107,6 @@
RELOC/fonts/tfm/adobe/palatino/zppler7t.tfm
RELOC/fonts/tfm/adobe/palatino/zppler7v.tfm
RELOC/fonts/tfm/adobe/palatino/zppler7y.tfm
- RELOC/fonts/tfm/cspsfonts-adobe/palatino/pplb8z.tfm
- RELOC/fonts/tfm/cspsfonts-adobe/palatino/pplbc8z.tfm
- RELOC/fonts/tfm/cspsfonts-adobe/palatino/pplbi8z.tfm
- RELOC/fonts/tfm/cspsfonts-adobe/palatino/pplr8z.tfm
- RELOC/fonts/tfm/cspsfonts-adobe/palatino/pplrc8z.tfm
- RELOC/fonts/tfm/cspsfonts-adobe/palatino/pplri8z.tfm
- RELOC/fonts/tfm/cspsfonts-adobe/palatino/rpplb.tfm
- RELOC/fonts/tfm/cspsfonts-adobe/palatino/rpplbi.tfm
- RELOC/fonts/tfm/cspsfonts-adobe/palatino/rpplbu.tfm
- RELOC/fonts/tfm/cspsfonts-adobe/palatino/rpplr.tfm
- RELOC/fonts/tfm/cspsfonts-adobe/palatino/rpplri.tfm
- RELOC/fonts/tfm/cspsfonts-adobe/palatino/rpplro.tfm
- RELOC/fonts/tfm/cspsfonts-adobe/palatino/rpplrre.tfm
- RELOC/fonts/tfm/cspsfonts-adobe/palatino/rpplrrn.tfm
- RELOC/fonts/tfm/cspsfonts-adobe/palatino/rpplru.tfm
RELOC/fonts/tfm/urw35vf/palatino/uplb7t.tfm
RELOC/fonts/tfm/urw35vf/palatino/uplb8c.tfm
RELOC/fonts/tfm/urw35vf/palatino/uplb8r.tfm
@@ -223,12 +208,6 @@
RELOC/fonts/vf/adobe/palatino/zppler7t.vf
RELOC/fonts/vf/adobe/palatino/zppler7v.vf
RELOC/fonts/vf/adobe/palatino/zppler7y.vf
- RELOC/fonts/vf/cspsfonts-adobe/palatino/pplb8z.vf
- RELOC/fonts/vf/cspsfonts-adobe/palatino/pplbc8z.vf
- RELOC/fonts/vf/cspsfonts-adobe/palatino/pplbi8z.vf
- RELOC/fonts/vf/cspsfonts-adobe/palatino/pplr8z.vf
- RELOC/fonts/vf/cspsfonts-adobe/palatino/pplrc8z.vf
- RELOC/fonts/vf/cspsfonts-adobe/palatino/pplri8z.vf
RELOC/fonts/vf/urw35vf/palatino/uplb7t.vf
RELOC/fonts/vf/urw35vf/palatino/uplb8c.vf
RELOC/fonts/vf/urw35vf/palatino/uplb8t.vf
@@ -258,5 +237,5 @@
RELOC/tex/latex/palatino/t1upl.fd
RELOC/tex/latex/palatino/ts1upl.fd
catalogue-ctan /fonts/urw/base35
-catalogue-date 2011-03-01 21:42:17 +0100
+catalogue-date 2012-06-06 22:57:48 +0200
catalogue-license gpl
++++++ paracol.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/paracol/README new/doc/latex/paracol/README
--- old/doc/latex/paracol/README 2011-10-29 01:39:47.000000000 +0200
+++ new/doc/latex/paracol/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,61 +0,0 @@
-paracol (v1.00): a multi-column package to typeset columns in "parallel".
-===
-Copyright (C) 2005-2011
- Hiroshi Nakashima
- (Kyoto Univerisity)
-This package can be redistributed and/or modified under the terms
-of the LaTeX Project Public License distributed from CTAN
-archives in directory macros/latex/base/lppl.txt; either
-version 1 of the License, or any later version.
-===
-
-[Contents]
-
-- README ............ this document
-- paracol.ins ....... for docstrip
-- paracol.dtx ....... main dtx for manual and implementation document
-- man.dtx ........... source of Section 1 to 6 of user's manual
-- ref.dtx ........... source of Section 7 of user's manual
-- impl.dtx .......... source of implementation document
-- paracol-man.pdf ... PDF of user's manual
-
-[How to "make"]
-
- % tex paracol.ins # you'll have paracol.sty and paracol-man.tex
-
-# to have user's manual (its PDF is included in the distribution)
- % latex paracol-man
- % latex paracol-man # you need do it twice to make index correct.
- % makeindex -s gind.ist -o paracol-man.ind paracol-man.idx
- % latex paracol-man
-
-# to have implementation document
- % latex paracol.dtx
- % latex paracol.dtx # you need do it twice to make index correct.
- % makeindex -s gind.ist -o paracol.ind paracol.idx
- % makeindex -s gglo.ist -o paracol.gls paracol.glo
- % latex paracol.dtx
-
-Note that if you want LaTeXing paracol-man.tex and/or paracol.dtx,
-you need newvbtm.sty being also available in CTAN.
-
-[Features]
-
-+ "paracol" environment in which you may "switch" and "synchronize columns
- by \switchcolumn(*).
-
-+ "column", "nthcolumn", "leftcolumn" and "rightcolumn" environments used in
- "paracol" to enclose texts to appear in a column.
-
-+ Counters are "local" to each column in default but you may make some of
- them global to all columns by \globalcounter{<ctr>}.
-
-+ \definethecounter{<ctr>}{<col>}{<rep>} to give <ctr> its <rep>resentaion
- specific to <col>-th column.
-
-+ \addcontentsonly{<file>}{<col>} to allow contents output for <file> only
- from <col> (new for v1.00).
-
-Enjoy!
-
-Hiroshi Nakashima
Files old/doc/latex/paracol/paracol-man.pdf and new/doc/latex/paracol/paracol-man.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/paracol/paracol-man.tex new/doc/latex/paracol/paracol-man.tex
--- old/doc/latex/paracol/paracol-man.tex 2011-10-29 01:39:47.000000000 +0200
+++ new/doc/latex/paracol/paracol-man.tex 2013-05-27 03:43:45.000000000 +0200
@@ -1,5 +1,5 @@
%% LaTeX file 'paracol-man'.
-%% Copyright (C) 2005-2011
+%% Copyright (C) 2005-2012
%% Hiroshi Nakashima
%% (Kyoto University)
%% This program can be redistributed and/or modified under the terms
@@ -8,10 +8,11 @@
%% version 1 of the License, or any later version.
\ProvidesFile{paracol-man.tex}
-[2011/10/10 v1.0 ]
+[2013/05/11 v1.2 ]
\documentclass{ltxdoc}
\usepackage{paracol}
\usepackage{newvbtm}
+\usepackage{color}
\DisableCrossrefs
\PageIndex
\CodelineNumbered
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/paracol.doc.tlpobj new/tlpkg/tlpobj/paracol.doc.tlpobj
--- old/tlpkg/tlpobj/paracol.doc.tlpobj 2011-10-29 04:31:21.000000000 +0200
+++ new/tlpkg/tlpobj/paracol.doc.tlpobj 2013-05-28 17:08:04.000000000 +0200
@@ -1,9 +1,8 @@
name paracol.doc
category Package
-revision 24426
+revision 30705
shortdesc doc files of paracol
relocated 1
-docfiles size=33
- RELOC/doc/latex/paracol/README
+docfiles size=49
RELOC/doc/latex/paracol/paracol-man.pdf
RELOC/doc/latex/paracol/paracol-man.tex
++++++ paracol.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/paracol/paracol.sty new/tex/latex/paracol/paracol.sty
--- old/tex/latex/paracol/paracol.sty 2011-10-29 01:39:47.000000000 +0200
+++ new/tex/latex/paracol/paracol.sty 2013-05-27 03:43:45.000000000 +0200
@@ -1,5 +1,5 @@
%% Style file `paracol'.
-%% Copyright (C) 2005-2011
+%% Copyright (C) 2005-2012
%% Hiroshi Nakashima
%% (Kyoto University)
%% This program can be redistributed and/or modified under the terms
@@ -9,26 +9,64 @@
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesPackage{paracol}
-[2011/10/10 v1.0 ]
+[2013/05/11 v1.2 ]
%% Register Declaration
-\newcount\pcol@currcol
+\newcount\pcol@currcol \global\pcol@currcol\z@
\newcount\pcol@nextcol
\newcount\pcol@ncol
\newcount\pcol@page
\newcount\pcol@basepage
\newcount\pcol@toppage
+\newcount\pcol@footnotebase
+\newcount\pcol@nfootnotes
+\newif\ifpcol@output \global\pcol@outputfalse
\newif\ifpcol@nospan
\newif\ifpcol@sync \pcol@syncfalse
\newif\ifpcol@mctext \pcol@mctextfalse
\newif\ifpcol@clear \pcol@clearfalse
+\newif\ifpcol@flush
\newif\ifpcol@outputflt
\newif\ifpcol@lastpage
+\newif\ifpcol@lastpagesave
+\newif\ifpcol@scfnote \pcol@scfnotefalse
+\newif\ifpcol@mgfnote \pcol@mgfnotefalse
+\newif\ifpcol@fncounteradjustment \pcol@fncounteradjustmentfalse
+\newif\ifpcol@swapcolumn \global\pcol@swapcolumnfalse
\newdimen\pcol@prevdepth
\newdimen\pcol@colht
\newdimen\pcol@textfloatsep
+\newdimen\pcol@lrmargin
\newskip\pcol@topskip
+\newbox\pcol@topfnotes
+
+%% Logging Tools
+
+\def\pcol@ShowBox#1{\message{(\the\ht#1+\the\dp#1)x(\the\wd#1)}%
+ {\showboxdepth\@M \showboxbreadth\@M \setbox\z@\vbox to\z@{\unvcopy#1}}}
+\def\pcol@LogLevel#1#2#3{%
+ \pcol@iLogLevel{#1}{pcol@Log}%
+ \pcol@iLogLevel{#2}{pcol@Logstart}%
+ \pcol@iLogLevel{#2}{pcol@Logend}%
+ \pcol@iLogLevel{#3}{pcol@Logfn}}
+\def\pcol@iLogLevel#1#2{%
+ \expandafter\let\expandafter\reserved@a
+ \csname #2@\romannumeral#1\endcsname
+ \expandafter\let\csname #2\endcsname\reserved@a}
+\def\pcol@Log@iii#1#2#3{\message{\string#1{#2%
+ (\number\pcol@page:\number\pcol@currcol/\number\pcol@toppage)}}%
+ \pcol@ShowBox#3\message{end\string#1}}
+\def\pcol@Log@ii#1#2#3{\message{\string#1{#2%
+ (\number\pcol@page:\number\pcol@currcol/\number\pcol@toppage)}=\the\ht#3}}
+\def\pcol@Log@i#1#2#3{}
+\def\pcol@Logstart@ii#1{\message{S\string#1}}
+\def\pcol@Logend@ii#1{\message{E\string#1}}
+\def\pcol@Logstart@i#1{}
+\def\pcol@Logend@i#1{}
+\def\pcol@Logfn@ii#1{\message{\string#1}}
+\def\pcol@Logfn@i#1{}
+\pcol@LogLevel111
%% \output Routine
@@ -36,14 +74,22 @@
\PackageError{paracol}{Too many unprocessed columns/floats}\@ehb}
\def\pcol@output{\let\par\@@par
+ \pcol@Logstart{\pcol@output\number\outputpenalty}%
\ifnum\outputpenalty<-\@M
\pcol@specialoutput
- \else
+ \else\ifpcol@output
\pcol@makecol
\pcol@opcol
- \pcol@startcolumn
- \@whilesw\if@fcolmade\fi{\pcol@opcol \pcol@startcolumn}%
- \fi
+ \pcol@startcolumn\@ne
+ \@whilesw\if@fcolmade\fi{\pcol@opcol \pcol@startcolumn\@ne}%
+ \else
+ \@twocolumnfalse \let\@combinefloats\pcol@@combinefloats
+ \@makecol
+ \@opcol
+ \@startcolumn
+ \@whilesw\if@fcolmade\fi{\@opcol\@startcolumn}%
+ \fi\fi
+ \global\maxdepth\@maxdepth
\ifnum\outputpenalty>-\@Miv
\ifdim\@colroom<1.5\baselineskip
\ifdim\@colroom<\textheight
@@ -58,22 +104,41 @@
\fi
\else
\global\vsize\maxdimen
- \fi}
+ \fi
+ \pcol@Logend\pcol@output}
%% Completing Column-Page
+\def\pcol@@makecol{\@makecol
+ \setbox\@outputbox\vbox to\@colht{\boxmaxdepth\@maxdepth \unvbox\@outputbox}}
\def\pcol@makecol{\let\pcol@textbottom\@textbottom
- \ifdim\pcol@textfloatsep=\maxdimen\else \ifpcol@lastpage\else
- \def\@textbottom{\vskip\z@\@plus.0001fil\@minus.0001fil}\fi\fi
- \@makecol \let\@textbottom\pcol@textbottom}
+ \ifdim\pcol@textfloatsep=\maxdimen\else
+ \def\@textbottom{\vskip\z@\@plus.0001fil\@minus.0001fil}\fi
+ \def\pcol@currfoot{\voidb@x}%
+ \ifpcol@scfnote \ifvoid\footins\else
+ \pcol@shrinkcolbyfn\footins
+ \setbox\@cclv\vbox{\pcol@unvbox@cclv\footins}%
+ \ifnum\pcol@page=\pcol@toppage
+ \pcol@Log\pcol@makecol{save}\footins
+ \pcol@savefootins\pcol@currfoot
+ \else
+ \pcol@Log\pcol@makecol{discard}\footins
+ \setbox\@tempboxa\box\footins
+ \fi
+ \fi\fi
+ \pcol@Logstart\pcol@makecol
+ \ifvoid\footins\else \pcol@Log\@makecol{put}\footins \fi
+ \@makecol
+ \pcol@Logend\pcol@makecol
+ \let\@textbottom\pcol@textbottom}
\def\pcol@combinefloats{%
+ \global\maxdepth\@maxdepth
\ifx\@toplist\@empty\else
\ifdim\pcol@textfloatsep=\maxdimen \@cflt \else \pcol@cflt \fi
\fi
\ifx\@botlist\@empty\else \@cflb
\ifpcol@lastpage
- \setbox\@outputbox\vbox{\unvbox\@outputbox \vskip\textfloatsep
- \@tempdima\textfloatsep \vskip\z@\@minus\@tempdima}%
+ \setbox\@outputbox\vbox{\box\@outputbox \vskip\textfloatsep}%
\fi
\fi}
\def\pcol@cflt{%
@@ -81,7 +146,7 @@
\setbox\@tempboxa\vbox{}%
\@toplist
\setbox\@outputbox\vbox{
- \boxmaxdepth\maxdepth
+ \boxmaxdepth\@maxdepth
\box\@tempboxa
\vskip-\floatsep
\ifdim\pcol@textfloatsep>5000\p@
@@ -96,7 +161,9 @@
\global\let\@toplist\@empty}
\def\pcol@opcol{%
- \@next\@currbox\@freelist{\global\setbox\@currbox\box\@outputbox}\pcol@ovf
+ \@next\@currbox\@freelist{\global\setbox\@currbox\vbox to\@colht{
+ \boxmaxdepth\@maxdepth
+ \pcol@clearcst@unvbox\@outputbox}}\pcol@ovf
\expandafter\@cons\csname pcol@shipped\number\pcol@currcol\endcsname\@currbox
\ifnum\pcol@currcol=\z@ \pcol@setpageno \fi
\pcol@nextpage
@@ -113,40 +180,29 @@
\global\let\pcol@pages\@empty \global\let\pcol@currpage\@empty
\let\@elt\pcol@setpnoelt \reserved@a
\endgroup}
-\def\pcol@setpnoelt#1{%
+\def\pcol@setpnoelt#1#2#3{%
{\let\@elt\relax \xdef\pcol@pages{\pcol@pages\pcol@currpage}}%
- \pcol@nospantrue
- \ifnum#1<\z@ \gdef\pcol@currpage{\@elt{#1}}%
- \else\ifnum#1>\@cclv \gdef\pcol@currpage{\@elt{#1}}%
- \else \gdef\pcol@currpage{\@elt#1}\pcol@nospanfalse
- \fi\fi
- \ifnum\@tempcnta>\z@\else
- \ifpcol@nospan \pcol@setordpage
- \else \global\count#1\c@page
- \fi
+ \ifnum\@tempcnta>\z@ \gdef\pcol@currpage{\@elt{#1}#2#3}%
+ \else \pcol@defcurrpage{\number\c@page}{#2}{#3}%
\advance\c@page\@ne
\fi
\advance\@tempcnta\m@ne}
-\def\pcol@setordpage{\begingroup
- \@tempcnta\c@page
- \ifnum\@tempcnta<\z@\else \advance\@tempcnta\@cclvi \fi
- \let\@elt\relax \xdef\pcol@currpage{\@elt{\number\@tempcnta}}
- \endgroup}
+\def\pcol@defcurrpage#1#2#3{{%
+ \let\@elt\relax \xdef\pcol@currpage{\@elt{#1}#2#3}}}
\def\pcol@nextpage{\begingroup
\@tempcnta\pcol@page \advance\@tempcnta-\pcol@basepage
\@tempswatrue
- \let\@elt\pcol@nextpelt \pcol@pages\pcol@currpage
+ \let\@elt\pcol@nextpelt \pcol@pages
\global\advance\pcol@page\@ne
\endgroup}
-\def\pcol@nextpelt#1{%
+\def\pcol@nextpelt#1#2#3{%
\ifnum\@tempcnta<\z@
- \ifnum#1<\z@ \@tempswafalse
- \else\ifnum#1>\@cclv \@tempswafalse
+ \ifvoid#2\@tempswafalse
\else\ifdim\dimen#1<\z@
\if@tempswa \global\advance\pcol@page\@ne \fi
\else \@tempswafalse
- \fi\fi\fi
+ \fi\fi
\fi
\advance\@tempcnta\m@ne}
@@ -160,20 +216,19 @@
\@tempcnta\pcol@page \advance\@tempcnta-\pcol@basepage
\let\@elt\pcol@getpelt \pcol@pages\pcol@currpage
\endgroup}
-\def\pcol@getpelt#1{%
+\def\pcol@getpelt#1#2#3{%
\ifnum\@tempcnta=\z@
- \pcol@getpinfo{#1}{\global\c@page}{\global\@colht}{\global\topskip}\fi
+ \pcol@getpinfo{#1}#2#3{\global\c@page}{\global\@colht}{\global\topskip}\fi
\advance\@tempcnta\m@ne}
-\def\pcol@getpinfo#1#2#3#4{\count@#1\relax \pcol@nospantrue
- \ifnum\count@>\@cclv
- \advance\count@-\@cclvi #2\count@ #3\textheight #4\pcol@topskip
- \else\ifnum\count@<\z@
- #2\count@ #3\textheight #4\pcol@topskip
- \else #2\count\count@ #3\dimen\count@ #4\skip\count@ \pcol@nospanfalse
- \fi\fi}
-\def\pcol@getcurrpinfo#1{%
- \edef#1{\expandafter\@cdr\pcol@currpage\@nil}%
- \pcol@getpinfo#1}
+\def\pcol@getpinfo#1#2#3#4#5#6{\pcol@nospantrue
+ \gdef\pcol@spanning{#2}\gdef\pcol@footins{#3}%
+ #4#1\relax
+ \ifvoid#2\relax #5\textheight #6\pcol@topskip
+ \else #5\dimen#2\relax #6\skip#2\relax \pcol@nospanfalse
+ \fi}
+\def\pcol@getcurrpinfo{%
+ \edef\reserved@a{\expandafter\@cdr\pcol@currpage\@nil}%
+ \expandafter\pcol@getpinfo\reserved@a}
%% Starting New Page
@@ -181,9 +236,9 @@
\global\let\pcol@firstprevdepth\relax
\global\pcol@toppage\pcol@page
\ifx\pcol@currpage\@empty\else
- \pcol@getcurrpinfo\@currbox{\global\c@page}\@tempdima\@tempskipa
+ \pcol@getcurrpinfo{\global\c@page}\@tempdima\@tempskipa
+ \@cons\pcol@pages{{\number\c@page}\pcol@spanning\pcol@currfoot}%
\stepcounter{page}%
- \xdef\pcol@pages{\pcol@pages\pcol@currpage}%
\fi
\global\@colht\textheight
\global\topskip\pcol@topskip
@@ -192,10 +247,9 @@
\@whilesw\if@fcolmade\fi{%
\@next\@currbox\@freelist{%
\global\setbox\@currbox\box\@outputbox}\pcol@ovf
- \global\count\@currbox\c@page
\global\dimen\@currbox-\maxdimen
\global\skip\@currbox\pcol@topskip
- \@cons\pcol@pages\@currbox
+ \@cons\pcol@pages{{\number\c@page}\@currbox\voidb@x}
\stepcounter{page}%
\global\advance\pcol@page\@ne \global\pcol@toppage\pcol@page
\@tryfcolumn\@dbldeferlist}%
@@ -206,7 +260,7 @@
\reserved@b
\endgroup
\ifx\@dbltoplist\@empty
- \pcol@setordpage
+ \pcol@defcurrpage{\number\c@page}\voidb@x\voidb@x
\else
\setbox\@tempboxa\vbox{}%
\begingroup
@@ -220,13 +274,12 @@
\unvbox\@tempboxa \vskip-\dblfloatsep \dblfigrule
\vskip\dbltextfloatsep}}%
\pcol@ovf
- \global\count\@currbox\c@page
\global\dimen\@currbox\@colht
\global\skip\@currbox\pcol@topskip
- \xdef\pcol@currpage{\@elt\@currbox}%
+ \pcol@defcurrpage{\number\c@page}\@currbox\voidb@x
\endgroup
\fi
-}
+ \gdef\pcol@footins{\voidb@x}}
%% Shipping Page Out
@@ -235,41 +288,47 @@
\let\reserved@b\pcol@pages \gdef\pcol@pages{}%
\reserved@b
\endgroup}
-\def\pcol@outputelt#1#2{%
+\def\pcol@outputelt#1#2#3#4{%
\setbox\@outputbox\box\voidb@x
- \def\@currbox{#2}%
- \pcol@getpinfo\@currbox\c@page\@tempdima\@tempskipa
+ \pcol@getpinfo{#2}#3#4\c@page\@tempdima\@tempskipa
\ifdim\@tempdima<\z@
\ifpcol@outputflt
- \setbox\@outputbox\box\@currbox
- \@cons\@freelist\@currbox
+ \setbox\@outputbox\box\pcol@spanning
+ \@cons\@freelist\pcol@spanning
\else
- \@cons\pcol@pages\@currbox
+ \@cons\pcol@pages{{#2}#3#4}
\fi
\else\if@tempswa
\ifnum#1=\z@ \@tempswafalse \fi
+ \pcol@Logstart\pcol@outputelt
\setbox\@outputbox\vbox to\textheight{%
\ifpcol@nospan\else
- \@cons\@freelist\@currbox
- \unvbox\@currbox
+ \@cons\@freelist\pcol@spanning
+ \unvbox\pcol@spanning
\fi
\hb@xt@\textwidth{%
\let\pcol@hfil\relax
\@tempcnta\z@ \@whilenum\@tempcnta<\pcol@ncol\do{%
+ \pcol@swapcolumn\@tempcnta\@tempcntb
\expandafter\@next\expandafter\@currbox
- \csname pcol@shipped\number\@tempcnta\endcsname
+ \csname pcol@shipped\number\@tempcntb\endcsname
\relax{\let\@currbox\voidb@x}%
\ifvoid\@currbox\else \@cons\@freelist\@currbox \fi
- \pcol@hfil \hb@xt@\columnwidth{\box\@currbox\hss}%
+ \expandafter\@tempdima
+ \csname pcol@columnwidth\number\@tempcntb \endcsname
+ \pcol@hfil \hb@xt@\@tempdima{\box\@currbox\hss}%
\let\pcol@hfil\hfil
- \advance\@tempcnta\@ne}}}%
+ \advance\@tempcnta\@ne}}%
+ \ifvoid\pcol@footins\else
+ \pcol@Log\pcol@outputelt{output}\pcol@footins
+ \pcol@putfootins\pcol@footins
+ \@cons\@freelist\pcol@footins
+ \fi
+ \boxmaxdepth\@maxdepth}%
+ \pcol@Logend\pcol@outputelt
\else
\pcol@outputfltfalse
- \ifpcol@nospan
- \@cons\pcol@pages{{\@currbox}}
- \else
- \@cons\pcol@pages\@currbox
- \fi
+ \@cons\pcol@pages{{#2}#3#4}%
\fi\fi
\ifvoid\@outputbox\else
\@outputpage \global\advance\pcol@basepage\@ne
@@ -277,10 +336,28 @@
%% Starting New Column Page
-\def\pcol@startcolumn{%
+\def\pcol@startcolumn#1{%
+ \@tempdima\@colht \@tempdimb\z@
+ \ifvoid\pcol@footins\else \pcol@shrinkcolbyfn\pcol@footins \fi
\global\@colroom\@colht
\@tryfcolumn\@deferlist
- \if@fcolmade\else \pcol@trynextcolumn \fi}
+ \if@fcolmade\else
+ \pcol@trynextcolumn
+ \ifpcol@scfnote \ifnum#1>\z@
+ \ifvoid\pcol@footins\else
+ \edef\pcol@currfoot{\pcol@footins}%
+ \pcol@getcurrfoot\copy
+ \pcol@Log\pcol@startcolumn{insert}\footins
+ \insert\footins{\unvbox\footins}%
+ \fi
+ \ifnum\pcol@page=\pcol@toppage
+ \pcol@deferredfootins\pcol@startcolumn \fi
+ \fi\fi
+ \fi
+ \advance\@tempdima-\@colht
+ \global\advance\@colroom\@tempdima
+ \global\advance\@colht\@tempdima
+ \pcol@savecolorstack}
\def\pcol@trynextcolumn{\begingroup
\let\reserved@b\@deferlist
\global\let\@deferlist\@empty
@@ -308,6 +385,9 @@
\let\reserved@a\pcol@output@end
\else \let\reserved@a\@specialoutput
\fi\fi\fi\fi\fi
+ \ifnum\outputpenalty=-\@Miv\relax
+ \ifvoid\footins\else \pcol@Log\dummy{dummy}\footins
+ \fi\fi
\ifx\reserved@a\@specialoutput\else
\global\setbox\@holdpg\vbox{\unvbox\@holdpg \unvbox\@cclv
\setbox\@tempboxa\lastbox \unskip}%
@@ -318,33 +398,39 @@
%% Special Output Routines: Building First Page
\def\pcol@output@start{%
- \pcol@makenormalcol
- \global\advance\@colht-\ht\@outputbox
- \global\advance\@colht-\dp\@outputbox
+ \global\pcol@outputtrue
\global\pcol@page\z@ \global\pcol@toppage\z@ \global\pcol@basepage\z@
\global\let\pcol@pages\@empty
\global\let\@dbldeferlist\@deferlist \global\let\@deferlist\@empty
- \ifdim\@colht<1.5\baselineskip
+ \setbox\z@\box\pcol@topfnotes
+ \@tempdima\@colroom
+ \advance\@tempdima-\ht\@holdpg \advance\@tempdima-\dp\@holdpg
+ \ifvoid\footins\else
+ \advance\@tempdima-\skip\footins
+ \advance\@tempdima-\ht\footins \advance\@tempdima-\dp\footins
+ \fi
+ \ifx\@botlist\@empty\else \advance\@tempdima-\textfloatsep \fi
+ \ifdim\@tempdima<1.5\baselineskip
+ \pcol@makenormalcol\z@
\@outputpage
\global\let\pcol@currpage\@empty \pcol@startpage
\global\topskip\pcol@topskip
\else
+ \pcol@makenormalcol\@ne
+ \@tempdima\ht\@outputbox \advance\@tempdima\dp\@outputbox
+ \global\advance\@colht-\@tempdima
\@next\@currbox\@freelist{\global\setbox\@currbox\box\@outputbox}\pcol@ovf
- \global\count\@currbox\c@page \global\dimen\@currbox\@colht
- \@tempskipa\z@
- \ifdim\ht\@currbox=\z@ \ifdim\dp\@currbox=\z@
- \@tempskipa\topskip
- \fi\fi
+ \global\dimen\@currbox\@colht
+ \ifdim\@tempdima=\z@ \@tempskipa\topskip \else \@tempskipa\z@ \fi
\global\skip\@currbox\@tempskipa \global\topskip\@tempskipa
- \xdef\pcol@currpage{\@elt\@currbox}%
+ \pcol@defcurrpage{\number\c@page}\@currbox\voidb@x
\fi
\global\@colroom\@colht
\pcol@floatplacement
\pcol@currcol\z@ \@whilenum\pcol@currcol<\pcol@ncol\do{%
\@next\@currbox\@freelist{\global\setbox\@currbox\vbox{%
\ifdim\topskip=\z@ \hrule\@height\z@\@width\z@
- \fi}}
- \pcol@ovf
+ \fi}}\pcol@ovf
\pcol@setcurrcolnf
\global\count\@currbox\z@
\global\dimen\@currbox\@colroom
@@ -352,26 +438,27 @@
\advance\pcol@currcol\@ne}%
\global\pcol@currcol\z@
\pcol@getcurrcol
- \@cons\@freelist\@currbox
- \unvbox\@currbox}
+ \gdef\pcol@colorstack{}\pcol@savecolorstack
+ \@cons\@freelist\@currbox \unvbox\@currbox
+ \ifvoid\footins\else
+ \pcol@Log\pcol@output@start{insert}\footins
+ \insert\footins{\box\footins\penalty\interlinepenalty}%
+ \fi}
-\def\pcol@makenormalcol{%
- \ifvoid\footins \setbox\@outputbox\box\@holdpg
+\def\pcol@makenormalcol#1{%
+ \ifvoid\footins \@tempswafalse \else \@tempswatrue \fi
+ \ifpcol@mgfnote \ifnum#1=\@ne \@tempswafalse \fi\fi
+ \if@tempswa
+ \pcol@Log\pcol@makenormalcol{output}\footins
+ \pcol@combinefootins\@holdpg\footins
\else
- \setbox\@outputbox\vbox{
- \boxmaxdepth\@maxdepth
- \unvbox\@holdpg
- \vskip\skip\footins
- \color@begingroup
- \normalcolor
- \footnoterule
- \unvbox\footins
- \color@endgroup}%
- \fi
+ \setbox\@outputbox\box\@holdpg
+ \fi
\let\@elt\relax
\xdef\@freelist{\@freelist\@midlist}%
\global\let\@midlist\@empty
- \@combinefloats}
+ \ifnum#1=\@ne \pcol@lastpagetrue \fi
+ \pcol@combinefloats \pcol@lastpagefalse}
\def\pcol@floatplacement{%
\global\@mparbottom\z@ \global\@textfloatsheight\z@
@@ -381,28 +468,38 @@
%% Special Output Routines: Column-Switching
\def\pcol@output@switch{%
- \@next\@currbox\@freelist{\global\setbox\@currbox\box\@holdpg}\pcol@ovf
- \ifvoid\footins
- \def\pcol@currfoot{\voidb@x}%
- \else
- \@next\pcol@currfoot\@freelist{%
- \global\setbox\pcol@currfoot\box\footins
- \global\count\pcol@currfoot\count\footins
- \global\dimen\pcol@currfoot\dimen\footins
- \global\skip\pcol@currfoot\skip\footins}\pcol@ovf
+ \@next\@currbox\@freelist{\global\setbox\@currbox\vbox{
+ \pcol@clearcst@unvbox\@holdpg}}\pcol@ovf
+ \def\pcol@currfoot{\voidb@x}%
+ \ifvoid\footins\else
+ \ifpcol@scfnote
+ \ifnum\pcol@page=\pcol@toppage
+ \pcol@getcurrpinfo\@tempcnta\@tempdima\@tempskipa
+ \pcol@Log\pcol@output@switch{save}\footins
+ \pcol@savefootins\pcol@footins
+ \pcol@defcurrpage{\number\@tempcnta}\pcol@spanning\pcol@footins
+ \else
+ \pcol@Log\pcol@output@switch{discard}\footins
+ \setbox\@tempboxa\box\footins
+ \fi
+ \else
+ \pcol@Log\pcol@output@switch{save}\footins
+ \pcol@savefootins\pcol@currfoot
+ \fi
\fi
\ifnum\pcol@currcol=\z@ \pcol@setpageno \fi
\pcol@setcurrcol
\global\count\@currbox\pcol@page
\global\dimen\@currbox\@colroom
\@tempswafalse
+ \let\reserved@a\@nobreakfalse \let\reserved@b\@afterindentfalse
\ifpcol@sync
\ifpcol@mctext
- \if@nobreak \@tempswatrue \fi
+ \if@nobreak \let\reserved@a\@nobreaktrue \fi
+ \if@afterindent \let\reserved@b\@afterindenttrue \fi
\@temptokena\everypar
\pcol@currcol\z@ \@whilenum\pcol@currcol<\pcol@ncol\do{%
- \pcol@getcurrcol \if@tempswa \@nobreaktrue \fi
- \everypar\@temptokena
+ \pcol@getcurrcol \reserved@a \reserved@b \everypar\@temptokena
\pcol@setcurrcol
\advance\pcol@currcol\@ne}%
\fi
@@ -411,7 +508,10 @@
\fi
\ifpcol@clear \@tempswatrue \fi
\if@tempswa \pcol@sync \fi
- \ifpcol@clear\else \pcol@restartcolumn \fi}
+ \@tempswatrue
+ \ifpcol@clear \ifpcol@sync\else \@tempswafalse \fi\fi
+ \if@tempswa \pcol@restartcolumn \fi
+ \global\pcol@syncfalse}
\def\pcol@restartcolumn{%
\global\pcol@currcol\pcol@nextcol
@@ -420,15 +520,41 @@
\global\@colroom\dimen\@currbox
\@cons\@freelist\@currbox
\pcol@getcurrpage
- \ifvoid\pcol@currfoot\else \@cons\@freelist\pcol@currfoot \fi
- \pcol@getcurrfoot
- \ifvoid\footins\else \insert\footins{\unvbox\footins}\fi
- \unvbox\@currbox
- \if@nobreak \nobreak \else \addpenalty\interlinepenalty \fi}
+ \@tempswafalse
+ \ifpcol@scfnote
+ \edef\pcol@currfoot{\pcol@footins}%
+ \ifnum\pcol@page=\pcol@toppage\else \@tempswatrue \fi
+ \fi
+ \if@tempswa\else
+ \pcol@restorecst@restart
+ \if@nobreak \nobreak \else \addpenalty\interlinepenalty \fi
+ \fi
+ \@tempdima\@colht \@tempdimb\z@
+ \ifvoid\pcol@currfoot\else
+ \if@tempswa
+ \pcol@getcurrfoot\copy
+ \pcol@Log\pcol@restartcolumn{insdmy}\footins
+ \else
+ \pcol@getcurrfoot\box \@cons\@freelist\pcol@currfoot
+ \pcol@Log\pcol@restartcolumn{insert}\footins
+ \fi
+ \pcol@shrinkcolbyfn\footins
+ \insert\footins{\unvbox\footins}%
+ \fi
+ \if@tempswa
+ \pcol@restorecst@restart
+ \if@nobreak \nobreak \else \addpenalty\interlinepenalty \fi
+ \fi
+ \ifpcol@scfnote \ifnum\pcol@page=\pcol@toppage
+ \pcol@deferredfootins\pcol@restartcolumn
+ \fi\fi
+ \@colht\@tempdima}
\def\pcol@getcurrcol{%
\expandafter\expandafter\expandafter\pcol@igetcurrcol
- \csname pcol@col\number\pcol@currcol\endcsname}
+ \csname pcol@col\number\pcol@currcol\endcsname
+ \expandafter\global\expandafter\columnwidth
+ \csname pcol@columnwidth\number\pcol@currcol\endcsname}
\def\pcol@igetcurrcol#1#2#3#4#5#6#7#8#9{%
\def\@currbox{#1}\def\pcol@currfoot{#2}\global\pcol@prevdepth#3sp\relax
\gdef\@toplist{#4}\gdef\@midlist{#5}\gdef\@botlist{#6}\gdef\@deferlist{#7}%
@@ -445,10 +571,10 @@
\relax
\fi
\global\everypar{#9}}
-\def\pcol@getcurrfoot{%
+\def\pcol@getcurrfoot#1{%
\ifvoid\pcol@currfoot \global\setbox\footins\box\voidb@x
\else
- \global\setbox\footins\box\pcol@currfoot
+ \global\setbox\footins#1\pcol@currfoot
\global\count\footins\count\pcol@currfoot
\global\dimen\footins\dimen\pcol@currfoot
\global\skip\footins\skip\pcol@currfoot
@@ -463,34 +589,174 @@
{\number\@colnum}{\number\@tempcnta}{\the\everypar}}}}}
\def\pcol@setcurrcolnf{\def\pcol@currfoot{\voidb@x}\pcol@setcurrcol}
+%% Special Output Routines: Color
+
+\def\pcol@set@color@push{\pcol@set@color
+ \@cons\pcol@colorstack{{\current@color}}}
+\def\pcol@reset@color@pop{\pcol@reset@color \begingroup
+ \let\reserved@a\pcol@colorstack
+ \gdef\pcol@colorstack{}\let\@elt\pcol@reset@color@elt
+ \reserved@a\@elt\@nil \endgroup}
+\def\pcol@reset@color@elt#1\@elt#2{\def\reserved@b{#2}%
+ \ifx\reserved@b\@nnil \let\reserved@b\relax
+ \else \@cons\pcol@colorstack{{#1}}\def\reserved@b{\@elt{#2}}%
+ \fi
+ \reserved@b}
+
+\def\pcol@magicpenalty{12345}
+\def\pcol@ifempty#1#2#3{%
+ \setbox\@tempboxa\vbox{\penalty\pcol@magicpenalty
+ \unvcopy#1\xdef\@gtempa{\number\lastpenalty}}%
+ \ifnum\@gtempa=\pcol@magicpenalty\relax \def\reserved@a{#2}%
+ \else \def\reserved@a{#3}%
+ \fi
+ \reserved@a}
+
+\def\pcol@clearcst@unvbox#1{%
+ \pcol@ifempty#1\relax
+ {\pcol@restorecst\pcol@colorstack@saved
+ \unvbox#1\pcol@clearcolorstack}}
+\def\pcol@clearcolorstack{{\def\@elt##1{\pcol@reset@color}%
+ \pcol@colorstack@full}}
+
+\def\pcol@restorecst@restart{%
+ \pcol@ifempty\@currbox
+ \pcol@savecolorstack
+ {\gdef\pcol@colorstack@saved{}\unvbox\@currbox \pcol@restorecolorstack}}
+\def\pcol@restorecolorstack{\pcol@restorecst\pcol@colorstack@full}
+\def\pcol@restorecst#1{{\let\@elt\pcol@set@color@elt#1}}
+\def\pcol@set@color@elt#1{\def\current@color{#1}\let\aftergroup\@gobble
+ \pcol@set@color}
+
+\def\pcol@savecolorstack{{\let\@elt\relax
+ \xdef\pcol@colorstack@saved{\pcol@colorstack@full}}}
+\def\pcol@colorstack@full{%
+ \expandafter\ifx\csname pcol@columncolor\number\pcol@currcol\endcsname\relax
+ \@empty
+ \else \@nameuse{pcol@columncolor\number\pcol@currcol}\fi
+ \pcol@colorstack}
+
+\def\columncolor{\@ifnextchar[%]
+ \pcol@xcolumncolor\pcol@ycolumncolor}
+\def\pcol@xcolumncolor[#1]#2{\pcol@columncolor{\color[#1]{#2}}}
+\def\pcol@ycolumncolor#1{\pcol@columncolor{\color{#1}}}
+\def\pcol@columncolor#1{\@ifnextchar[%]
+ {\pcol@icolumncolor{#1}}{\pcol@icolumncolor{#1}[\number\pcol@currcol]}}
+\def\normalcolumncolor{\@ifnextchar[%]
+ {\pcol@icolumncolor\normalcolor}%
+ {\pcol@icolumncolor\normalcolor[\number\pcol@currcol]}}
+\def\pcol@icolumncolor#1[#2]{%
+ \ifx\set@color\relax\else
+ \ifx\pcol@paracol\paracol\else \pcol@clearcolorstack \fi
+ \begingroup
+ \let\@elt\relax \let\set@color\relax #1%
+ \expandafter\xdef\csname pcol@columncolor#2\endcsname
+ {\@elt{\current@color}}%
+ \endgroup
+ \ifx\pcol@paracol\paracol\else \pcol@restorecolorstack \fi
+ \fi}
+
+%% Special Output Routines: Footnote Handling
+
+\def\pcol@savefootins#1{%
+ \@next#1\@freelist{%
+ \global\setbox#1\box\footins
+ \global\count#1\count\footins
+ \global\dimen#1\dimen\footins
+ \global\skip#1\skip\footins}{\def#1{\voidb@x}\pcol@ovf}}
+
+\def\pcol@shrinkcolbyfn#1{%
+ \@tempdimb-\skip#1\relax
+ \advance\@colht-\ht#1\advance\@colht-\dp#1\advance\@colht\@tempdimb}
+\def\pcol@unvbox@cclv#1{%
+ \@tempdima\dp\@cclv \unvbox\@cclv
+ \vskip \ifdim\@tempdima>\@maxdepth -\@maxdepth \else -\@tempdima \fi
+ \vskip\skip#1\@tempdima\skip#1\vskip-\@tempdima}
+
+\def\pcol@deferredfootins#1{%
+ \ifdim\@tempdimb=\z@ \@tempdimb-\skip\footins \fi
+ \advance\@tempdimb\@colht\relax
+ \ifvoid\pcol@topfnotes\else \ifdim\@tempdimb>\z@
+ \begingroup
+ \splitmaxdepth\@maxdepth \splittopskip\z@ \vbadness\@M
+ \setbox\@tempboxa\vsplit\pcol@topfnotes to\@tempdimb
+ \ifvoid\pcol@topfnotes\else
+ \global\setbox\pcol@topfnotes\vbox{\penalty\interlinepenalty
+ \unvbox\pcol@topfnotes}%
+ \fi
+ \setbox\@tempboxa\vbox{\unvbox\@tempboxa}%
+ \ifdim\ht\@tempboxa>\z@
+ \pcol@Log#1{add}\@tempboxa
+ \insert\footins{\unvbox\@tempboxa}%
+ \fi
+ \endgroup
+ \fi\fi}
+
+\def\pcol@combinefootins#1#2{%
+ \setbox\@outputbox\vbox{
+ \boxmaxdepth\@maxdepth
+ \unvbox#1\relax
+ \pcol@putfootins#2\unskip}}
+\def\pcol@putfootins#1{%
+ \vskip\skip#1\relax
+ \color@begingroup
+ \normalcolor
+ \footnoterule
+ \unvbox#1\relax
+ \color@endgroup \vskip\z@}
+
%% Special Output Routines: Synchronization
\def\pcol@sync{%
\pcol@currcol\z@ \@whilenum\pcol@currcol<\pcol@ncol\do\pcol@flushcolumn
\pcol@outputpage\@ne
- \pcol@getcurrpinfo\@currbox{\global\c@page}{\global\@colht}{\global\topskip}%
+ \pcol@getcurrpinfo{\global\c@page}{\global\@colht}{\global\topskip}%
\@tempdima-\maxdimen \@tempdimb-\maxdimen \pcol@colht-\maxdimen
- \@tempdimc\maxdimen \@pagedp\maxdimen
+ \@pageht-\maxdimen \@tempdimc\maxdimen \@pagedp\maxdimen \@tempcntb\z@
\pcol@currcol\z@ \@whilenum\pcol@currcol<\pcol@ncol\do\pcol@measurecolumn
- \ifdim\@tempdima<\z@\else
- \advance\@tempdimb\@tempdima
- \@tempswafalse
- \ifdim\@tempdimb<\@colht \ifpcol@clear\else
- \@tempswatrue
+ \@tempswatrue \global\pcol@flushfalse
+ \ifpcol@clear
+ \ifpcol@lastpage \@tempdimb\pcol@colht \else \@tempdimb\@pageht \fi
+ \ifpcol@sync \@tempswafalse \fi
+ \else
+ \ifdim\@tempdima<\z@ \@tempswafalse
+ \else\ifdim\@tempdimb<\z@ \@tempdimb\@tempdima
+ \else \advance\@tempdimb\@tempdima
\fi\fi
- \pcol@currcol\z@ \@whilenum\pcol@currcol<\pcol@ncol\do\pcol@synccolumn
\fi
- \global\pcol@syncfalse}
+ \ifpcol@scfnote\ifvoid\pcol@footins\else
+ \ifdim\@tempdimb<\z@ \@tempdimb\z@ \fi
+ \advance\@tempdimb\ht\pcol@footins \advance\@tempdimb\dp\pcol@footins
+ \advance\@tempdimb\skip\pcol@footins
+ \fi\fi
+ \ifdim\@tempdimb>\@colht
+ \global\pcol@flushtrue \@tempswafalse \pcol@nextcol\@tempcntb
+ \fi
+ \ifdim\@tempdimb<\z@\else \if@tempswa
+ \pcol@currcol\z@ \@whilenum\pcol@currcol<\pcol@ncol\do\pcol@synccolumn
+ \fi\fi}
\def\pcol@flushcolumn{%
\pcol@getcurrcol
\ifnum\count\@currbox<\pcol@toppage
+ \ifpcol@lastpage \pcol@lastpagesavetrue \else \pcol@lastpagesavefalse \fi
+ \pcol@lastpagefalse
\pcol@page\count\@currbox
\setbox\@cclv\vbox{\unvbox\@currbox \vfil}%
\ifvoid\pcol@currfoot\else \@cons\@freelist\pcol@currfoot \fi
- \pcol@getcurrfoot
+ \pcol@getcurrfoot\box
\pcol@getcurrpage
- \@makecol
+ \ifvoid\pcol@footins\else
+ \pcol@shrinkcolbyfn\pcol@footins
+ \setbox\@cclv\vbox{\pcol@unvbox@cclv\pcol@footins}%
+ \fi
+ \pcol@Logstart\pcol@flushcolumn
+ \ifdim\@toproom=\maxdimen
+ \setbox\@outputbox\pcol@makefcolpage \global\@toproom\z@
+ \else
+ \pcol@@makecol
+ \fi
+ \pcol@Logend\pcol@flushcolumn
\global\setbox\@currbox\box\@outputbox
\expandafter\@cons\csname pcol@shipped\number\pcol@currcol\endcsname
\@currbox
@@ -498,6 +764,7 @@
\ifx\@deferlist\@empty\else
\@whilenum\pcol@page<\pcol@toppage\do{%
\pcol@getcurrpage
+ \ifvoid\pcol@footins\else \pcol@shrinkcolbyfn\pcol@footins \fi
\@makefcolumn\@deferlist
\if@fcolmade
\@next\@currbox\@freelist{\global\setbox\@currbox\box\@outputbox}%
@@ -507,8 +774,11 @@
\fi
\advance\pcol@page\@ne}%
\fi
+ \ifpcol@lastpagesave \pcol@lastpagetrue \fi
\@next\@currbox\@freelist{\global\setbox\@currbox\vbox{}}\pcol@ovf
- \pcol@getcurrpinfo\reserved@a\@tempcnta{\global\@colht}\@tempskipa
+ \pcol@getcurrpinfo\@tempcnta{\global\@colht}\@tempskipa
+ \@pageht\@colht
+ \ifvoid\pcol@footins\else \pcol@shrinkcolbyfn\pcol@footins \fi
\global\@colroom\@colht \pcol@floatplacement
\ifx\@deferlist\@empty\else
\ifpcol@clear
@@ -518,7 +788,8 @@
\fi\fi
\pcol@setcurrcolnf
\global\count\@currbox\pcol@page
- \global\dimen\@currbox\@colroom
+ \advance\@pageht-\@colht \advance\@pageht\@colroom
+ \global\dimen\@currbox\@pageht
\fi %\ifnum\count\@currbox<\pcol@toppage
\advance\pcol@currcol\@ne}
@@ -536,12 +807,7 @@
\ifpcol@lastpage \ifx\@deferlist\@empty \ifdim\@colroom<\@fpmin
\@tempswafalse \global\@toproom\maxdimen
\fi\fi\fi
- \if@tempswa
- \setbox\@currbox\vbox to\@colht{\vskip\@fptop \vskip-\@fpsep
- \def\@elt##1{\vskip\@fpsep\box##1}\@toplist \vskip\@fpbot \vfilneg}%
- \xdef\@freelist{\@freelist\@toplist}%
- \global\let\@toplist\@empty
- \fi
+ \if@tempswa \global\setbox\@currbox\vbox{\pcol@makefcolpage} \fi
\fi}
\def\pcol@makefcolelt#1{%
\@tempdimb\ht#1{}\advance\@tempdimb\dp#1{}\advance\@tempdimb\@tempdimc
@@ -550,20 +816,20 @@
\else \@cons\@toplist#1\relax
\advance\@tempdima-\@tempdimb \global\advance\@colroom\@tempdimb
\fi}
+\def\pcol@makefcolpage{\vbox to\@colht{
+ \vskip\@fptop \vskip-\@fpsep
+ \def\@elt##1{\vskip\@fpsep\box##1}\@toplist \vskip\@fpbot}%
+ \xdef\@freelist{\@freelist\@toplist}\global\let\@toplist\@empty}
-\def\pcol@magicpenalty{12345}
\def\pcol@measurecolumn{%
\pcol@getcurrcol
\@tempswafalse
\dimen@\z@ \pcol@addflhd\@toplist\pcol@textfloatsep
\global\skip\@currbox\dimen@
\advance\dimen@\ht\@currbox \advance\dimen@\dp\@currbox \dimen@ii\dimen@
- \setbox\@tempboxa\vbox{\penalty\pcol@magicpenalty
- \unvcopy\@currbox \xdef\@gtempa{\number\lastpenalty}}%
- \ifnum\@gtempa=\pcol@magicpenalty\relax \global\pcol@prevdepth\maxdimen
- \pcol@setcurrcol
- \else \@tempswatrue
- \fi
+ \pcol@ifempty\@currbox
+ {\global\pcol@prevdepth\maxdimen \pcol@setcurrcol}%
+ {\@tempswatrue}%
\pcol@measureupdate\@tempdima\dimen@ii\@tempdimc\pcol@prevdepth
\ifvoid\pcol@currfoot \dimen@\z@
\else
@@ -574,6 +840,9 @@
\pcol@addflhd\@botlist\maxdimen
\ifdim\dimen@>\@tempdimb \@tempdimb\dimen@ \fi
\advance\dimen@\dimen@ii
+ \if@tempswa \ifdim\dimen@>\@pageht
+ \@pageht\dimen@ \@tempcntb\pcol@currcol
+ \fi\fi
\dimen@ii\pcol@prevdepth
\ifvoid\pcol@currfoot\else \dimen@ii\dp\pcol@currfoot \fi
\ifx\@botlist\@empty\else \dimen@ii\z@ \advance\dimen@\textfloatsep \fi
@@ -600,7 +869,13 @@
\def\pcol@synccolumn{%
\pcol@getcurrcol
- \if@tempswa
+ \ifpcol@clear
+ \global\pcol@prevdepth\@m\p@
+ \global\setbox\@currbox\vbox{\unvbox\@currbox
+ \ifdim\pcol@textfloatsep=\maxdimen \vfil
+ \else \vskip\z@\@plus1fil\@minus.0001fil
+ \fi}%
+ \else
\@tempdimb\@tempdima
\advance\@tempdimb-\skip\@currbox
\ifdim\@tempdimc=\maxdimen
@@ -629,9 +904,6 @@
\vbox to\@tempdimb{\unvbox\@currbox \vskip\z@\@plus.0001fil}
\fi}%
\fi
- \else
- \global\pcol@prevdepth\@m\p@
- \global\setbox\@currbox\vbox{\unvbox\@currbox \vfil \penalty-\@M}%
\fi
\global\@topnum\z@ \pcol@setcurrcol
\advance\pcol@currcol\@ne}
@@ -640,31 +912,36 @@
\def\pcol@output@flush{%
\pcol@makeflushedpage\@colht
- \setbox\@outputbox\vbox to\textheight{\unvbox\@outputbox}%
+ \pcol@Logstart\pcol@output@flush
+ \setbox\@outputbox\vbox to\textheight{\boxmaxdepth\@maxdepth
+ \unvbox\@outputbox}%
+ \pcol@Logend\pcol@output@flush
\@outputpage
\pcol@freshpage}
\def\pcol@output@clear{%
\pcol@makeflushedpage\@colht
- \setbox\@outputbox\vbox to\textheight{\unvbox\@outputbox}%
+ \pcol@Logstart\pcol@output@clear
+ \setbox\@outputbox\vbox to\textheight{\boxmaxdepth\@maxdepth
+ \unvbox\@outputbox}%
+ \pcol@Logend\pcol@output@clear
\@outputpage
\pcol@flushfloats
\begingroup
\@dblfloatplacement
\@makefcolumn\@dbldeferlist
- \@whilesw\if@fcolmade\fi{\@outputpage
- \@makefcolumn\@dbldeferlist}%
+ \@whilesw\if@fcolmade\fi{\@outputpage \@makefcolumn\@dbldeferlist}%
\endgroup
\pcol@freshpage}
\def\pcol@makeflushedpage#1{%
\pcol@cleartrue \pcol@output@switch \pcol@clearfalse
- \pcol@getcurrpinfo\@currbox{\global\c@page}{\global\@colht}\@tempskipa
+ \pcol@getcurrpinfo{\global\c@page}{\global\@colht}\@tempskipa
\global\@fcolmadefalse
\setbox\@outputbox\vbox{%
\ifpcol@nospan\else
- \unvbox\@currbox
- \@cons\@freelist\@currbox
+ \unvbox\pcol@spanning
+ \@cons\@freelist\pcol@spanning
\fi
\ifdim#1=-\maxdimen
\pcol@currcol\z@ \@whilenum\pcol@currcol<\pcol@ncol\do{%
@@ -673,29 +950,47 @@
\advance\pcol@currcol\@ne}%
\else
\hb@xt@\textwidth{%
+ \ifvoid\pcol@footins\else \pcol@shrinkcolbyfn\pcol@footins \fi
\let\pcol@hfil\relax \@pageht\@colht \ifdim#1<\@colht \@colht#1\fi
- \pcol@currcol\z@ \@whilenum\pcol@currcol<\pcol@ncol\do{%
+ \@tempcntb\z@ \@whilenum\@tempcntb<\pcol@ncol\do{%
+ \pcol@swapcolumn\@tempcntb\pcol@currcol
\pcol@getcurrcol
\ifx\@deferlist\@empty\else \global\@fcolmadetrue \fi
\setbox\@cclv\box\@currbox
\ifvoid\pcol@currfoot\else \@cons\@freelist\pcol@currfoot \fi
- \pcol@getcurrfoot
+ \pcol@getcurrfoot\box
\@tempswafalse
- \ifdim\@toproom=\maxdimen
- \global\@toproom\topfraction\@pageht \let\topfigrule\relax
- \ifdim\@colht=\@pageht \@tempswatrue \fi
- \fi
- \if@tempswa
- \setbox\@outputbox\vbox to\@colht{\vskip\@fptop \vskip-\@fpsep
- \def\@elt##1{\vskip\@fpsep\box##1}\@toplist \vskip\@fpbot}%
- \xdef\@freelist{\@freelist\@toplist}\global\@toplist\@empty
- \else \@makecol
- \fi
- \pcol@hfil \hb@xt@\columnwidth{\box\@outputbox\hss}%
+ \begingroup
+ \ifdim\@toproom=\maxdimen
+ \let\topfigrule\relax \ifdim\@colht=\@pageht \@tempswatrue \fi
+ \fi
+ \if@tempswa
+ \pcol@Logstart{\pcol@makeflushedpage(1)}%
+ \setbox\@outputbox\pcol@makefcolpage
+ \pcol@Logend{\pcol@makeflushedpage(1)}%
+ \else
+ \pcol@Logstart{\pcol@makeflushedpage(2)}%
+ \pcol@@makecol
+ \pcol@Logend{\pcol@makeflushedpage(2)}%
+ \fi
+ \pcol@hfil \hb@xt@\columnwidth{\box\@outputbox\hss}%
+ \endgroup
\let\pcol@hfil\hfil
\pcol@setcurrcolnf
- \advance\pcol@currcol\@ne}}%
- \fi}}
+ \advance\@tempcntb\@ne}}%
+ \fi
+ \ifvoid\pcol@footins\else
+ \@tempswatrue \ifpcol@mgfnote\ifpcol@lastpage \@tempswafalse \fi\fi
+ \if@tempswa
+ \pcol@Log\pcol@makeflushedpage{output}\pcol@footins
+ \pcol@putfootins\pcol@footins
+ \@cons\@freelist\pcol@footins \gdef\pcol@footins{\voidb@x}%
+ \ifpcol@lastpage \ifdim\pcol@colht=-\maxdimen
+ \global\pcol@colht\z@
+ \fi\fi
+ \fi
+ \fi}%
+ }
\def\pcol@flushfloats{%
\global\@colht\textheight
@@ -703,16 +998,16 @@
\setbox\@outputbox\vbox{\hb@xt@\textwidth{%
\let\pcol@hfil\relax
\@tempswafalse
- \pcol@currcol\z@ \@whilenum\pcol@currcol<\pcol@ncol\do{%
+ \@tempcntb\z@ \@whilenum\@tempcntb<\pcol@ncol\do{%
+ \pcol@swapcolumn\@tempcntb\pcol@currcol
\pcol@getcurrcol
\@makefcolumn\@deferlist
\pcol@hfil \hb@xt@\columnwidth{\if@fcolmade \box\@outputbox \fi \hss}%
\ifx\@deferlist\@empty\else \@tempswatrue \fi
\let\pcol@hfil\hfil
\pcol@setcurrcolnf
- \advance\pcol@currcol\@ne}%
- \global\@fcolmadefalse
- \if@tempswa \global\@fcolmadetrue \fi}}%
+ \advance\@tempcntb\@ne}%
+ \if@tempswa \global\@fcolmadetrue \else \global\@fcolmadefalse \fi}}%
\@outputpage}}
\def\pcol@freshpage{%
@@ -724,8 +1019,8 @@
\let\pcol@currboxsave\@currbox
\pcol@getcurrpage
\pcol@floatplacement
- \pcol@startcolumn
- \@whilesw\if@fcolmade\fi{\pcol@opcol \pcol@startcolumn}%
+ \pcol@startcolumn\z@
+ \@whilesw\if@fcolmade\fi{\pcol@opcol \pcol@startcolumn\z@}%
\let\@currbox\pcol@currboxsave
\global\setbox\@currbox\vbox{}%
\global\count\@currbox\pcol@page \global\dimen\@currbox\@colroom
@@ -736,13 +1031,23 @@
%% Special Output Routines: Last Page
\def\pcol@output@end{%
- \pcol@lastpagetrue \pcol@makeflushedpage\pcol@colht
- \@tempswafalse
+ \pcol@Logstart\pcol@output@end
+ \pcol@makeflushedpage\pcol@colht
+ \global\pcol@outputfalse \@tempswafalse
\if@fcolmade
\ifdim\pcol@colht>-\maxdimen \@tempswatrue \fi
\ifpcol@nospan\else \@tempswatrue \fi
+ \ifvoid\pcol@footins\else \@tempswatrue \fi
\if@tempswa
- \setbox\@outputbox\vbox to\textheight{\unvbox\@outputbox \vfil}%
+ \pcol@Logstart{\pcol@output@end(1)}%
+ \setbox\@outputbox\vbox to\textheight{\boxmaxdepth\@maxdepth
+ \unvbox\@outputbox \vfil
+ \ifvoid\pcol@footins\else
+ \pcol@Log\pcol@output@end{output}\pcol@footins
+ \pcol@putfootins\pcol@footins
+ \@cons\@freelist\pcol@footins \gdef\pcol@footins{\voidb@x}%
+ \fi}%
+ \pcol@Logend{\pcol@output@end(1)}%
\@outputpage
\fi
\pcol@flushfloats
@@ -761,7 +1066,14 @@
\else
\topskip\z@ \box\@outputbox
\fi\fi
- \pcol@currcol\z@ \@whilenum\pcol@currcol<\pcol@ncol\do{%
+ \ifvoid\pcol@footins\else
+ \pcol@Log\pcol@output@end{insert}\pcol@footins
+ \insert\footins{\unvbox\pcol@footins}\@cons\@freelist\pcol@footins
+ \fi
+ \ifvoid\pcol@topfnotes\else \insert\footins{\unvbox\pcol@topfnotes}\fi
+ \expandafter\let\csname pcol@columncolor\number\z@\endcsname\relax
+ \pcol@currcol\z@ \pcol@restorecolorstack
+ \@whilenum\pcol@currcol<\pcol@ncol\do{%
\pcol@getcurrcol \@cons\@freelist\@currbox
\advance\pcol@currcol\@ne}%
\global\pcol@prevdepth\@pagedp
@@ -769,16 +1081,25 @@
\global\@colroom\textheight
\global\let\@deferlist\@dbldeferlist \gdef\@dbldeferlist{}%
\pcol@floatplacement
+ \pcol@lastpagefalse
\if@tempswa
- \pcol@lastpagefalse
\@startcolumn \@whilesw\if@fcolmade\fi{\@opcol\@startcolumn}%
- \fi}
+ \fi
+ \pcol@Logend\pcol@output@end
+}
%% Starting Environment
\def\pcol@invokeoutput#1{%
+ \pcol@Logstart{\pcol@invokeoutput
+ {#1:\the\pcol@currcol/\the\pcol@nextcol%
+ \ifnum#1=-10011:\ifpcol@sync s\fi \ifpcol@clear c\fi\fi}}%
\penalty-\@Miv \global\pcol@prevdepth\prevdepth \vbox{}%
- \penalty#1\relax \prevdepth\pcol@prevdepth}
+ \penalty#1\relax \prevdepth\pcol@prevdepth
+ \linewidth\columnwidth \advance\linewidth-\pcol@lrmargin
+ \ifdim\pcol@lrmargin>\z@ \parshape\@ne\@totalleftmargin\linewidth \fi
+ \hsize\columnwidth
+ \pcol@Logend{\pcol@invokeoutput{#1}}}
\def\paracol#1{\par
\global\pcol@ncol#1\relax
@@ -790,16 +1111,33 @@
\let\@elt\pcol@cmpctrelt \global\let\@gtempa\@empty \pcol@counters
\pcol@synccounter\@gtempa
\endgroup
- \global\columnwidth\textwidth
- \@tempdima\columnsep \multiply\@tempdima\pcol@ncol
- \advance\@tempdima-\columnsep
- \global\advance\columnwidth-\@tempdima \global\divide\columnwidth\pcol@ncol
- \global\hsize\columnwidth \global\linewidth\columnwidth
- \global\@twocolumntrue \global\@firstcolumntrue \col@number\@ne
+ \global\@twocolumntrue \col@number\@ne
+ \pcol@swapcolumn\z@\@tempcntb
+ \ifnum\@tempcntb=\z@ \global\@firstcolumntrue \else \global\@firstcolumnfalse
+ \fi
+ \pcol@setcolumnwidth
+ \pcol@lrmargin\textwidth \advance\pcol@lrmargin-\linewidth
\global\pcol@topskip\topskip
\global\pcol@textfloatsep\maxdimen
\pcol@lastpagefalse \xdef\pcol@firstprevdepth{\number\prevdepth}%
- \let\@combinefloats\pcol@combinefloats
+ \let\pcol@@combinefloats\@combinefloats \let\@combinefloats\pcol@combinefloats
+ \let\pcol@set@color\set@color \let\pcol@reset@color\reset@color
+ \ifx\set@color\relax\else
+ \let\set@color\pcol@set@color@push \let\reset@color\pcol@reset@color@pop
+ \fi
+ \pcol@footnotebase\c@footnote \global\pcol@nfootnotes\z@
+ \let\footnote\pcol@footnote
+ \let\footnotemark\pcol@footnotemark
+ \let\footnotetext\pcol@footnotetext
+ \ifpcol@scfnote
+ \def\footnoterule{{\columnwidth\textwidth \pcol@footnoterule}}%
+ \fi
+ \let\@footnotetext\pcol@fntext
+ \def\swapcolumninevenpages{\pcol@ignore\swapcolumninevenpages}%
+ \def\noswapcolumninevenpages{\pcol@ignore\noswapcolumninevenpages}%
+ \def\multicolumnfootnotes{\pcol@ignore\multicolumnfootnotes}%
+ \def\singlecolumnfootnotes{\pcol@ignore\singlecolumnfootnotes}%
+ \def\mergedfootnotes{\pcol@ignore\mergedfootnotes}%
\let\@elt\pcol@defcomelt \pcol@localcommands
\def\column{\pcol@com@column}%
\@namedef{column*}{\@nameuse{pcol@com@column*}}%
@@ -815,6 +1153,33 @@
\pcol@nextcol\z@
\@ifnextchar[%]
\pcol@mctext\relax}
+\let\pcol@paracol\paracol
+
+\def\columnratio{\gdef\pcol@columnratio}
+\columnratio{}
+\def\pcol@setcolumnwidth{
+ \@tempcntb\pcol@ncol \advance\@tempcntb\m@ne
+ \@tempdima-\columnsep \multiply\@tempdima\@tempcntb
+ \advance\@tempdima\textwidth \@tempdimb\@tempdima
+ \@tempcnta\z@
+ \@for\reserved@a:=\pcol@columnratio\do{%
+ \ifnum\@tempcnta<\@tempcntb
+ \@tempdimc\reserved@a\@tempdima
+ \expandafter\edef\csname pcol@columnwidth\number\@tempcnta\endcsname{%
+ \number\@tempdimc sp}%
+ \advance\@tempdimb-\@tempdimc
+ \advance\@tempcnta\@ne
+ \fi}%
+ \@tempcntb\pcol@ncol \advance\@tempcntb-\@tempcnta
+ \divide\@tempdimb\@tempcntb
+ \@whilenum\@tempcnta<\pcol@ncol\do{%
+ \expandafter\edef\csname pcol@columnwidth\number\@tempcnta\endcsname{%
+ \number\@tempdimb sp}%
+ \advance\@tempcnta\@ne}%
+}
+
+\def\pcol@ignore#1{\PackageWarning{paracol}{The command \string#1 is not
+ effective in paracol environment and thus ignored}}
\def\pcol@localcommands{%
\@elt{switchcolumn}%
@@ -831,20 +1196,30 @@
%% Counter Opearations
-\def\globalcounter#1{\@cons\pcol@gcounters{{#1}}}
+\def\globalcounter#1{{%
+ \@tempswafalse \def\reserved@a{#1}%
+ \def\@elt##1{\def\reserved@b{##1}%
+ \ifx\reserved@a\reserved@b \@tempswatrue \fi}%
+ \pcol@gcounters
+ \if@tempswa\else \@cons\pcol@gcounters{{#1}}\fi}}
\gdef\pcol@gcounters{\@elt{page}}
+\def\localcounter#1{%
+ \expandafter\ifx\csname c@#1\endcsname\c@page\else
+ \pcol@removecounter\pcol@gcounters{#1}%
+ \fi}
\def\pcol@remctrelt#1{%
\expandafter\let\expandafter\reserved@a\csname cl@#1\endcsname
\expandafter\let\csname pcol@cl@#1\endcsname\reserved@a
\expandafter\ifx\csname c@#1\endcsname\c@page\else
\@namedef{cl@#1}{\pcol@stepcounter{#1}}%
\fi
- \def\reserved@a{#1}\let\reserved@b\pcol@counters
- \global\let\pcol@counters\@empty
- {\let\@elt\pcol@iremctrelt \reserved@b}}
-\def\pcol@iremctrelt#1{%
- \def\reserved@b{#1}%
- \ifx\reserved@a\reserved@b\else \@cons\pcol@counters{{#1}}\fi}
+ \pcol@removecounter\pcol@counters{#1}}
+\def\pcol@removecounter#1#2{%
+ \def\reserved@a{#2}\let\reserved@b#1\relax \global\let#1\@empty
+ {\def\@elt{\pcol@iremctrelt#1}\reserved@b}}
+\def\pcol@iremctrelt#1#2{%
+ \def\reserved@b{#2}%
+ \ifx\reserved@a\reserved@b\else \@cons#1{{#2}}\fi}
\def\definethecounter#1#2#3{\@namedef{pcol@thectr@#1#2}{#3}}
\def\pcol@thectrelt#1{%
@@ -879,7 +1254,7 @@
\let\@elt\relax \edef\reserved@a{#1}%
\pcol@currcol\z@ \@whilenum\pcol@currcol<\pcol@ncol\do{%
\let\@elt\pcol@loadctrelt \@nameuse{pcol@counters\number\pcol@currcol}%
- \let\@elt\pcol@syncctrelt\reserved@a
+ \let\@elt\pcol@syncctrelt \reserved@a
\pcol@storecounters
\advance\pcol@currcol\@ne}}}
\def\pcol@syncctrelt#1{%
@@ -938,10 +1313,13 @@
\long\def\pcol@mctext[#1]{%
\@tempcnta\pcol@nextcol
- \global\pcol@synctrue \pcol@nextcol\z@
+ \global\pcol@synctrue \pcol@swapcolumn\z@\pcol@nextcol
\pcol@switchcol
\begingroup
- \hsize\textwidth \col@number\@ne #1\pcol@par
+ \columnwidth\textwidth \hsize\columnwidth
+ \linewidth\columnwidth \advance\linewidth-\pcol@lrmargin
+ \ifdim\pcol@lrmargin>\z@ \parshape\@ne\@totalleftmargin\linewidth \fi
+ \col@number\@ne #1\pcol@par
\global\pcol@mctexttrue
\expandafter\global\expandafter\everypar\expandafter{\the\everypar}%
\endgroup
@@ -949,15 +1327,34 @@
\def\pcol@switchcol{%
\pcol@savecounters
- \pcol@invokeoutput\pcol@op@switch
- \ifnum\pcol@currcol=\z@ \global\@firstcolumntrue
- \else \global\@firstcolumnfalse
+ \ifpcol@sync
+ \global\pcol@syncfalse \pcol@visitallcols\@@par \global\pcol@synctrue
+ \pcol@invokeoutput\pcol@op@switch
+ \@whilesw\ifpcol@flush\fi{%
+ \vfil \penalty-\@M
+ \global\pcol@syncfalse \pcol@visitallcols\newpage \global\pcol@synctrue
+ \pcol@invokeoutput\pcol@op@switch}%
+ \else
+ \pcol@invokeoutput\pcol@op@switch
+ \fi
+ \pcol@swapcolumn\pcol@currcol\@tempcntb
+ \ifnum\@tempcntb=\z@ \global\@firstcolumntrue \else \global\@firstcolumnfalse
\fi
\let\@elt\pcol@setctrelt
\csname pcol@counters\number\pcol@currcol\endcsname
\let\@elt\pcol@aconlyelt \pcol@aconly
\let\@elt\relax}
+\def\pcol@visitallcols#1{\begingroup
+ \@tempcnta\z@ \@tempcntb\pcol@currcol
+ \@whilenum\@tempcnta<\pcol@ncol\do{%
+ \ifnum\@tempcnta=\@tempcntb\else
+ \pcol@nextcol\@tempcnta \pcol@invokeoutput\pcol@op@switch #1%
+ \fi
+ \advance\@tempcnta\@ne}%
+ \pcol@nextcol\@tempcntb \pcol@invokeoutput\pcol@op@switch
+ \endgroup}
+
\def\pcol@defcolumn{%
\gdef\pcol@com@column{\pcol@switchenv{column}\relax}%
\global\@namedef{pcol@com@column*}{\pcol@switchenv{column*}*}}
@@ -1024,20 +1421,121 @@
%% Page Flushing Commands
-\def\pcol@com@flushpage{\pcol@par
- \pcol@nextcol\pcol@currcol
+\def\pcol@com@flushpage{\pcol@flushclear\voidb@x
\pcol@invokeoutput\pcol@op@flush}
-\def\pcol@com@clearpage{\pcol@par
- \pcol@nextcol\pcol@currcol
+\def\pcol@com@clearpage{\pcol@flushclear\voidb@x
\pcol@invokeoutput\pcol@op@clear}
+\def\pcol@flushclear#1{\pcol@par
+ \pcol@nextcol\pcol@currcol
+ \pcol@visitallcols\@@par
+ \pcol@cleartrue \global\pcol@synctrue
+ \ifpcol@lastpage \pcol@lastpagesavetrue \else \pcol@lastpagesavefalse \fi
+ \pcol@invokeoutput\pcol@op@switch \ifvoid#1\else \global\pcol@flushtrue \fi
+ \@whilesw\ifpcol@flush\fi{%
+ \pcol@lastpagefalse
+ \vfil \penalty-\@M \pcol@cleartrue \global\pcol@synctrue
+ \ifpcol@lastpagesave \pcol@lastpagetrue \fi
+ \pcol@invokeoutput\pcol@op@switch
+ \ifvoid#1\else \global\pcol@flushtrue \fi}%
+ \pcol@clearfalse}
+
+%% Commands for Footnotes
+
+\def\multicolumnfootnotes{\global\pcol@scfnotefalse \global\pcol@mgfnotefalse
+ \localcounter{footnote}\nofncounteradjustment}
+\def\singlecolumnfootnotes{\global\pcol@scfnotetrue \global\pcol@mgfnotefalse
+ \globalcounter{footnote}\fncounteradjustment}
+\def\mergedfootnotes{\singlecolumnfootnotes \global\pcol@mgfnotetrue}
+
+\def\pcol@fntext{%
+ \let\reserved@a\pcol@fntexttop
+ \ifpcol@scfnote \ifnum\pcol@page<\pcol@toppage
+ \let\reserved@a\pcol@fntextother
+ \fi\fi
+ \reserved@a}
+\long\def\pcol@fntexttop#1{%
+ \pcol@Logfn{\pcol@fntexttop{\@thefnmark}}%
+ \insert\footins{\pcol@fntextbody{#1}\penalty\interlinepenalty}}
+\long\def\pcol@fntextother#1{%
+ \global\setbox\pcol@topfnotes\vbox{\unvbox\pcol@topfnotes
+ \penalty\interlinepenalty\pcol@fntextbody{#1}}}
+\long\def\pcol@fntextbody#1{\setbox\@tempboxa\vbox{%
+ \reset@font\footnotesize
+ \interlinepenalty\interfootnotelinepenalty
+ \splittopskip\footnotesep
+ \splitmaxdepth\dp\strutbox \floatingpenalty\@MM
+ \hsize \ifpcol@scfnote \textwidth \else \columnwidth \fi
+ \@parboxrestore
+ \protected@edef\@currentlabel{\p@footnote\@thefnmark}%
+ \color@begingroup
+ \@makefntext{%
+ \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+ \color@endgroup}%
+ \@tempdima\ht\@tempboxa \advance\@tempdima\dp\@tempboxa
+ \@tempdimb\textheight \advance\@tempdimb-\skip\footins
+ \ifdim\@tempdima>\@tempdimb
+ \setbox\@tempboxa\vbox to\@tempdimb{\unvbox\@tempboxa\vss}%
+ \PackageWarning{paracol}{Too tall footnote}%
+ \fi
+ \box\@tempboxa}
+
+\def\fncounteradjustment{\global\pcol@fncounteradjustmenttrue}
+\def\nofncounteradjustment{\global\pcol@fncounteradjustmentfalse}
+\nofncounteradjustment
+
+\let\pcol@footnoterule\footnoterule
+\let\pcol@@footnote\footnote
+\let\pcol@@footnotemark\footnotemark
+\let\pcol@@footnotetext\footnotetext
+\def\pcol@footnote{\@ifstar{\pcol@adjustfnctr\pcol@ifootnote}\pcol@ifootnote}
+\def\pcol@ifootnote{\global\advance\pcol@nfootnotes\@ne \pcol@@footnote}
+\def\pcol@footnotemark{\@ifstar
+ {\pcol@adjustfnctr{\pcol@ifootnotemark\relax}}%
+ \pcol@ifootnotemark}
+\def\pcol@ifootnotemark{\global\advance\pcol@nfootnotes\@ne
+ \pcol@@footnotemark}
+\def\pcol@adjustfnctr#1{\@ifnextchar[%]
+ {\pcol@iadjustfnctr{#1}}{\pcol@iadjustfnctr{#1}[+1]}}
+\def\pcol@iadjustfnctr#1[#2]{\pcol@calcfnctr#2\@nil
+ \global\c@footnote\@tempcnta \global\advance\c@footnote\m@ne#1}
+\def\pcol@calcfnctr#1#2\@nil{\@tempcnta\c@footnote
+ \def\reserved@a{#1}\def\reserved@b{+}%
+ \ifx\reserved@a\reserved@b \advance\@tempcnta#2\relax
+ \else \def\reserved@b{-}%
+ \ifx\reserved@a\reserved@b \advance\@tempcnta-#2\relax
+ \else \@tempcnta\pcol@footnotebase \advance\@tempcnta#1#2\relax
+ \fi\fi}
+\def\pcol@footnotetext{\@ifstar\pcol@ifootnotetext\pcol@@footnotetext}
+\def\pcol@ifootnotetext{\@ifnextchar[%]
+ \pcol@iifootnotetext{\stepcounter{footnote}\pcol@@footnotetext}}
+\def\pcol@iifootnotetext[#1]{\pcol@calcfnctr#1\@nil
+ \expandafter\pcol@@footnotetext\expandafter[\number\@tempcnta]}
+
+%% Column Swapping
+
+\def\swapcolumninevenpages{\global\pcol@swapcolumntrue}
+\def\noswapcolumninevenpages{\global\pcol@swapcolumnfalse}
+\def\pcol@swapcolumn#1#2{%
+ \ifpcol@swapcolumn
+ \ifodd\c@page\relax #2#1\relax
+ \else #2\pcol@ncol \advance#2-#1\relax \advance#2\m@ne
+ \fi
+ \else #2#1\relax
+ \fi}
%% Closing Environment
\def\endparacol{\pcol@par
\pcol@nextcol\z@ \pcol@switchcol
+ \pcol@lastpagetrue
+ \ifpcol@mgfnote \pcol@flushclear\voidb@x
+ \else \pcol@flushclear\pcol@topfnotes
+ \fi
\pcol@invokeoutput\pcol@op@end
\global\columnwidth\textwidth
- \global\hsize\columnwidth
- \global\linewidth\columnwidth
\global\@twocolumnfalse
- \global\topskip\pcol@topskip}
+ \global\topskip\pcol@topskip
+ \ifpcol@fncounteradjustment
+ \global\c@footnote\pcol@footnotebase
+ \global\advance\c@footnote\pcol@nfootnotes
+ \fi}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/paracol.tlpobj new/tlpkg/tlpobj/paracol.tlpobj
--- old/tlpkg/tlpobj/paracol.tlpobj 2011-10-29 04:31:21.000000000 +0200
+++ new/tlpkg/tlpobj/paracol.tlpobj 2013-05-28 17:08:04.000000000 +0200
@@ -1,15 +1,15 @@
name paracol
category Package
-revision 24426
+revision 30705
shortdesc Multiple columns with texts "in parallel".
relocated 1
longdesc The package provides yet another multi-column typesetting
longdesc mechanism by which you produce multi-column (e.g., bilingual)
longdesc document switching and sychronizing each corresponding part in
longdesc "parallel".
-runfiles size=9
+runfiles size=14
RELOC/tex/latex/paracol/paracol.sty
catalogue-ctan /macros/latex/contrib/paracol
-catalogue-date 2011-10-27 18:19:57 +0200
+catalogue-date 2013-05-28 11:00:31 +0200
catalogue-license lppl
-catalogue-version 1.00
+catalogue-version 1.2
++++++ paratype.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/paratype/CHANGELOG new/doc/fonts/paratype/CHANGELOG
--- old/doc/fonts/paratype/CHANGELOG 2012-02-25 00:45:55.000000000 +0100
+++ new/doc/fonts/paratype/CHANGELOG 2013-05-22 01:04:15.000000000 +0200
@@ -1,3 +1,39 @@
+2013-05-21
+----------
+
+- Added PT Mono Bold in the Type 1 format provided by ParaType.
+ Now, all the fonts are in both the TrueType and Type 1
+ format.
+
+- Removed paratype-mixed.map. There is no need to mix TrueType
+ and Type 1 fonts.
+
+
+2013-05-19
+----------
+
+- Added PT Mono Regular in the Type 1 format provided by ParaType.
+ PT Mono Bold in the Type 1 format is still missing.
+
+- Changed paratype-type1.map and paratype-mixed.map to use the
+ PT Mono Regular in the Type 1 format.
+
+
+2013-04-01
+----------
+
+- Added faked (bold) slanted style where there is no true (bold) italic
+ style. That means that these styles were added for families
+ PT Sans Caption, PT Sans Narrow and PT Mono. There is no automatic
+ substitution from the italic style to the faked slanted style.
+
+
+2012-06-03
+----------
+
+- Added PT Mono Bold, updated PT Mono Regular.
+
+
2012-02-24
----------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/paratype/README new/doc/fonts/paratype/README
--- old/doc/fonts/paratype/README 2012-02-24 01:19:00.000000000 +0100
+++ new/doc/fonts/paratype/README 2013-05-22 01:04:15.000000000 +0200
@@ -5,19 +5,11 @@
The fonts are included in the original TrueType format and in the Type 1
format kindly provided by ParaType (it has afm, pfb, pfm and inf files).
-Currently, there is no Type 1 version of PT Mono, but I will include it
-as soon as I get it from ParaType. Before that happens, you must create
-your own Type 1 version of PT Mono if you need it. Look at paratype.pdf
-what you need to do.
-
The package supports the OT1, T1, IL2, TS1, T2* and X2 encodings.
PT Sans has four basic styles, two narrow styles and two caption styles.
PT Serif has four basic styles and two caption styles. PT Mono has
-just the regular style.
-
-The version of PT Sans is 2.003, the version of PT Serif is 1.000 and the
-version of PT Mono is 1.000.
+just the regular and bold styles.
The fonts (both TrueType and Type 1) are licensed under the Paratype Free
Font License (the license is included). All the support files are released
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/paratype/manifest.txt new/doc/fonts/paratype/manifest.txt
--- old/doc/fonts/paratype/manifest.txt 2012-02-24 01:19:00.000000000 +0100
+++ new/doc/fonts/paratype/manifest.txt 2013-05-22 01:04:15.000000000 +0200
@@ -1,6 +1,5 @@
List of files licensed under LPPL
-./README
./doc/fonts/paratype/CHANGELOG
./doc/fonts/paratype/README
./doc/fonts/paratype/paratype-sample.pdf
@@ -31,9 +30,38 @@
./fonts/enc/dvips/paratype/ptserif_t2c.enc
./fonts/enc/dvips/paratype/ptserif_ts1.enc
./fonts/enc/dvips/paratype/ptserif_x2.enc
-./fonts/map/dvips/paratype/paratype-mixed.map
./fonts/map/dvips/paratype/paratype-truetype.map
./fonts/map/dvips/paratype/paratype-type1.map
+./fonts/tfm/paratype/ptmono/PTMono-Bold-tlf-il2--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Bold-tlf-il2.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Bold-tlf-ot1--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Bold-tlf-ot1.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Bold-tlf-t1--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Bold-tlf-t1.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Bold-tlf-t2a--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Bold-tlf-t2a.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Bold-tlf-t2b--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Bold-tlf-t2b.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Bold-tlf-t2c--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Bold-tlf-t2c.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Bold-tlf-ts1--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Bold-tlf-ts1.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Bold-tlf-x2--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Bold-tlf-x2.tfm
+./fonts/tfm/paratype/ptmono/PTMono-BoldSlanted-tlf-il2.tfm
+./fonts/tfm/paratype/ptmono/PTMono-BoldSlanted-tlf-ot1.tfm
+./fonts/tfm/paratype/ptmono/PTMono-BoldSlanted-tlf-t1--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-BoldSlanted-tlf-t1.tfm
+./fonts/tfm/paratype/ptmono/PTMono-BoldSlanted-tlf-t2a--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-BoldSlanted-tlf-t2a.tfm
+./fonts/tfm/paratype/ptmono/PTMono-BoldSlanted-tlf-t2b--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-BoldSlanted-tlf-t2b.tfm
+./fonts/tfm/paratype/ptmono/PTMono-BoldSlanted-tlf-t2c--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-BoldSlanted-tlf-t2c.tfm
+./fonts/tfm/paratype/ptmono/PTMono-BoldSlanted-tlf-ts1--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-BoldSlanted-tlf-ts1.tfm
+./fonts/tfm/paratype/ptmono/PTMono-BoldSlanted-tlf-x2--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-BoldSlanted-tlf-x2.tfm
./fonts/tfm/paratype/ptmono/PTMono-Regular-tlf-il2--base.tfm
./fonts/tfm/paratype/ptmono/PTMono-Regular-tlf-il2.tfm
./fonts/tfm/paratype/ptmono/PTMono-Regular-tlf-ot1--base.tfm
@@ -50,6 +78,20 @@
./fonts/tfm/paratype/ptmono/PTMono-Regular-tlf-ts1.tfm
./fonts/tfm/paratype/ptmono/PTMono-Regular-tlf-x2--base.tfm
./fonts/tfm/paratype/ptmono/PTMono-Regular-tlf-x2.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Slanted-tlf-il2.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Slanted-tlf-ot1.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Slanted-tlf-t1--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Slanted-tlf-t1.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Slanted-tlf-t2a--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Slanted-tlf-t2a.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Slanted-tlf-t2b--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Slanted-tlf-t2b.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Slanted-tlf-t2c--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Slanted-tlf-t2c.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Slanted-tlf-ts1--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Slanted-tlf-ts1.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Slanted-tlf-x2--base.tfm
+./fonts/tfm/paratype/ptmono/PTMono-Slanted-tlf-x2.tfm
./fonts/tfm/paratype/ptsans/PTSans-Bold-tlf-il2.tfm
./fonts/tfm/paratype/ptsans/PTSans-Bold-tlf-ot1.tfm
./fonts/tfm/paratype/ptsans/PTSans-Bold-tlf-t1--base.tfm
@@ -106,6 +148,34 @@
./fonts/tfm/paratype/ptsans/PTSans-CaptionBold-tlf-ts1.tfm
./fonts/tfm/paratype/ptsans/PTSans-CaptionBold-tlf-x2--base.tfm
./fonts/tfm/paratype/ptsans/PTSans-CaptionBold-tlf-x2.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-il2.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-ot1.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-t1--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-t1.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-t2a--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-t2a.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-t2b--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-t2b.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-t2c--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-t2c.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-ts1--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-ts1.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-x2--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-x2.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionSlanted-tlf-il2.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionSlanted-tlf-ot1.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionSlanted-tlf-t1--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionSlanted-tlf-t1.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionSlanted-tlf-t2a--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionSlanted-tlf-t2a.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionSlanted-tlf-t2b--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionSlanted-tlf-t2b.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionSlanted-tlf-t2c--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionSlanted-tlf-t2c.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionSlanted-tlf-ts1--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionSlanted-tlf-ts1.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionSlanted-tlf-x2--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-CaptionSlanted-tlf-x2.tfm
./fonts/tfm/paratype/ptsans/PTSans-Italic-tlf-il2.tfm
./fonts/tfm/paratype/ptsans/PTSans-Italic-tlf-ot1.tfm
./fonts/tfm/paratype/ptsans/PTSans-Italic-tlf-t1--base.tfm
@@ -148,6 +218,34 @@
./fonts/tfm/paratype/ptsans/PTSans-NarrowBold-tlf-ts1.tfm
./fonts/tfm/paratype/ptsans/PTSans-NarrowBold-tlf-x2--base.tfm
./fonts/tfm/paratype/ptsans/PTSans-NarrowBold-tlf-x2.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-il2.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-ot1.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-t1--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-t1.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-t2a--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-t2a.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-t2b--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-t2b.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-t2c--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-t2c.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-ts1--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-ts1.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-x2--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-x2.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowSlanted-tlf-il2.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowSlanted-tlf-ot1.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowSlanted-tlf-t1--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowSlanted-tlf-t1.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowSlanted-tlf-t2a--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowSlanted-tlf-t2a.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowSlanted-tlf-t2b--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowSlanted-tlf-t2b.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowSlanted-tlf-t2c--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowSlanted-tlf-t2c.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowSlanted-tlf-ts1--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowSlanted-tlf-ts1.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowSlanted-tlf-x2--base.tfm
+./fonts/tfm/paratype/ptsans/PTSans-NarrowSlanted-tlf-x2.tfm
./fonts/tfm/paratype/ptsans/PTSans-Regular-tlf-il2.tfm
./fonts/tfm/paratype/ptsans/PTSans-Regular-tlf-ot1.tfm
./fonts/tfm/paratype/ptsans/PTSans-Regular-tlf-t1--base.tfm
@@ -330,6 +428,20 @@
./fonts/tfm/paratype/ptserif/PTSerif-UprightItalic-tlf-ts1.tfm
./fonts/tfm/paratype/ptserif/PTSerif-UprightItalic-tlf-x2--base.tfm
./fonts/tfm/paratype/ptserif/PTSerif-UprightItalic-tlf-x2.tfm
+./fonts/vf/paratype/ptmono/PTMono-Bold-tlf-il2.vf
+./fonts/vf/paratype/ptmono/PTMono-Bold-tlf-ot1.vf
+./fonts/vf/paratype/ptmono/PTMono-Bold-tlf-t1.vf
+./fonts/vf/paratype/ptmono/PTMono-Bold-tlf-t2a.vf
+./fonts/vf/paratype/ptmono/PTMono-Bold-tlf-t2b.vf
+./fonts/vf/paratype/ptmono/PTMono-Bold-tlf-t2c.vf
+./fonts/vf/paratype/ptmono/PTMono-Bold-tlf-ts1.vf
+./fonts/vf/paratype/ptmono/PTMono-Bold-tlf-x2.vf
+./fonts/vf/paratype/ptmono/PTMono-BoldSlanted-tlf-t1.vf
+./fonts/vf/paratype/ptmono/PTMono-BoldSlanted-tlf-t2a.vf
+./fonts/vf/paratype/ptmono/PTMono-BoldSlanted-tlf-t2b.vf
+./fonts/vf/paratype/ptmono/PTMono-BoldSlanted-tlf-t2c.vf
+./fonts/vf/paratype/ptmono/PTMono-BoldSlanted-tlf-ts1.vf
+./fonts/vf/paratype/ptmono/PTMono-BoldSlanted-tlf-x2.vf
./fonts/vf/paratype/ptmono/PTMono-Regular-tlf-il2.vf
./fonts/vf/paratype/ptmono/PTMono-Regular-tlf-ot1.vf
./fonts/vf/paratype/ptmono/PTMono-Regular-tlf-t1.vf
@@ -338,6 +450,12 @@
./fonts/vf/paratype/ptmono/PTMono-Regular-tlf-t2c.vf
./fonts/vf/paratype/ptmono/PTMono-Regular-tlf-ts1.vf
./fonts/vf/paratype/ptmono/PTMono-Regular-tlf-x2.vf
+./fonts/vf/paratype/ptmono/PTMono-Slanted-tlf-t1.vf
+./fonts/vf/paratype/ptmono/PTMono-Slanted-tlf-t2a.vf
+./fonts/vf/paratype/ptmono/PTMono-Slanted-tlf-t2b.vf
+./fonts/vf/paratype/ptmono/PTMono-Slanted-tlf-t2c.vf
+./fonts/vf/paratype/ptmono/PTMono-Slanted-tlf-ts1.vf
+./fonts/vf/paratype/ptmono/PTMono-Slanted-tlf-x2.vf
./fonts/vf/paratype/ptsans/PTSans-Bold-tlf-t1.vf
./fonts/vf/paratype/ptsans/PTSans-Bold-tlf-t2a.vf
./fonts/vf/paratype/ptsans/PTSans-Bold-tlf-t2b.vf
@@ -362,6 +480,18 @@
./fonts/vf/paratype/ptsans/PTSans-CaptionBold-tlf-t2c.vf
./fonts/vf/paratype/ptsans/PTSans-CaptionBold-tlf-ts1.vf
./fonts/vf/paratype/ptsans/PTSans-CaptionBold-tlf-x2.vf
+./fonts/vf/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-t1.vf
+./fonts/vf/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-t2a.vf
+./fonts/vf/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-t2b.vf
+./fonts/vf/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-t2c.vf
+./fonts/vf/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-ts1.vf
+./fonts/vf/paratype/ptsans/PTSans-CaptionBoldSlanted-tlf-x2.vf
+./fonts/vf/paratype/ptsans/PTSans-CaptionSlanted-tlf-t1.vf
+./fonts/vf/paratype/ptsans/PTSans-CaptionSlanted-tlf-t2a.vf
+./fonts/vf/paratype/ptsans/PTSans-CaptionSlanted-tlf-t2b.vf
+./fonts/vf/paratype/ptsans/PTSans-CaptionSlanted-tlf-t2c.vf
+./fonts/vf/paratype/ptsans/PTSans-CaptionSlanted-tlf-ts1.vf
+./fonts/vf/paratype/ptsans/PTSans-CaptionSlanted-tlf-x2.vf
./fonts/vf/paratype/ptsans/PTSans-Italic-tlf-t1.vf
./fonts/vf/paratype/ptsans/PTSans-Italic-tlf-t2a.vf
./fonts/vf/paratype/ptsans/PTSans-Italic-tlf-t2b.vf
@@ -380,6 +510,18 @@
./fonts/vf/paratype/ptsans/PTSans-NarrowBold-tlf-t2c.vf
./fonts/vf/paratype/ptsans/PTSans-NarrowBold-tlf-ts1.vf
./fonts/vf/paratype/ptsans/PTSans-NarrowBold-tlf-x2.vf
+./fonts/vf/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-t1.vf
+./fonts/vf/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-t2a.vf
+./fonts/vf/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-t2b.vf
+./fonts/vf/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-t2c.vf
+./fonts/vf/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-ts1.vf
+./fonts/vf/paratype/ptsans/PTSans-NarrowBoldSlanted-tlf-x2.vf
+./fonts/vf/paratype/ptsans/PTSans-NarrowSlanted-tlf-t1.vf
+./fonts/vf/paratype/ptsans/PTSans-NarrowSlanted-tlf-t2a.vf
+./fonts/vf/paratype/ptsans/PTSans-NarrowSlanted-tlf-t2b.vf
+./fonts/vf/paratype/ptsans/PTSans-NarrowSlanted-tlf-t2c.vf
+./fonts/vf/paratype/ptsans/PTSans-NarrowSlanted-tlf-ts1.vf
+./fonts/vf/paratype/ptsans/PTSans-NarrowSlanted-tlf-x2.vf
./fonts/vf/paratype/ptsans/PTSans-Regular-tlf-t1.vf
./fonts/vf/paratype/ptsans/PTSans-Regular-tlf-t2a.vf
./fonts/vf/paratype/ptsans/PTSans-Regular-tlf-t2b.vf
Files old/doc/fonts/paratype/paratype-sample.pdf and new/doc/fonts/paratype/paratype-sample.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/paratype/paratype-sample.tex new/doc/fonts/paratype/paratype-sample.tex
--- old/doc/fonts/paratype/paratype-sample.tex 2012-02-24 01:19:00.000000000 +0100
+++ new/doc/fonts/paratype/paratype-sample.tex 2013-04-04 00:31:45.000000000 +0200
@@ -90,16 +90,38 @@
{\usefont{T1}{PTSansNarrow-TLF}{b}{n}\SampleText}
+\section*{PT Sans Narrow---faked styles}
+
+{\usefont{T1}{PTSansNarrow-TLF}{m}{sl}\SampleText}\par
+{\usefont{T1}{PTSansNarrow-TLF}{b}{sl}\SampleText}
+
+
\section*{PT Sans Caption}
{\usefont{T1}{PTSansCaption-TLF}{m}{n}\SampleText}\par
{\usefont{T1}{PTSansCaption-TLF}{b}{n}\SampleText}
+\section*{PT Sans Caption---faked styles}
+
+{\usefont{T1}{PTSansCaption-TLF}{m}{sl}\SampleText}\par
+{\usefont{T1}{PTSansCaption-TLF}{b}{sl}\SampleText}
+
+
\section*{PT Mono}
\begin{flushleft}
{\usefont{T1}{PTMono-TLF}{m}{n}\SampleText}\par
+{\usefont{T1}{PTMono-TLF}{b}{n}\SampleText}
\end{flushleft}
+
+\section*{PT Mono--faked styles}
+
+\begin{flushleft}
+{\usefont{T1}{PTMono-TLF}{m}{sl}\SampleText}\par
+{\usefont{T1}{PTMono-TLF}{b}{sl}\SampleText}
+\end{flushleft}
+
+
\end{document}
Files old/doc/fonts/paratype/paratype.pdf and new/doc/fonts/paratype/paratype.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/paratype/paratype.tex new/doc/fonts/paratype/paratype.tex
--- old/doc/fonts/paratype/paratype.tex 2012-02-24 01:19:00.000000000 +0100
+++ new/doc/fonts/paratype/paratype.tex 2013-05-22 01:04:15.000000000 +0200
@@ -53,7 +53,7 @@
PT Serif and PT Mono released by ParaType.
PT Sans has four basic styles, two narrow styles and two caption styles.
PT Serif has four basic styles and two caption styles. PT Mono has just
-the regular style.
+the regular and bold styles.
\begin{figure}[!htb]
\centering{%
@@ -87,7 +87,8 @@
\begin{figure}[!htb]
\centering{%
\begin{tabular}{ll}
- {\usefont{T1}{PTMono-TLF}{m}{n}PT Mono Regular}
+ {\usefont{T1}{PTMono-TLF}{m}{n}PT Mono Regular} &
+ {\usefont{T1}{PTMono-TLF}{b}{n}PT Mono Bold}
\end{tabular}
\caption{The styles of PT Mono}}
\end{figure}
@@ -96,7 +97,7 @@
pages and contain also characters of all title languages of the
Russian Federation.This package supports encodings T1, OT1, IL2,
TS1, T2A, T2B, T2C and X2. The fonts are included in the original
-TrueType format and in the converted Type 1 format.
+TrueType format and in the Type 1 format (without PT Mono Bold).
The fonts were developed by ParaType for the project \emph{Public Types
of Russian Federation} and released under an open user license.
@@ -112,8 +113,6 @@
The fonts in TrueType format are original files designed by ParaType. The
fonts in Type 1 format are also original files kindly provided by ParaType.
-Currently, there is no Type 1 version of PT Mono. I will include it
-as soon as I get it from ParaType.
All the support files are licensed under \LaTeX\ Project Public License,
either version 1.3 of this license or (at your option) any later version.
@@ -129,26 +128,17 @@
\subsection{Choosing the right map file}
-There are three map files: \code{paratype-truetype.map}, \code{paratype-type1.map}
-and \code{paratype-mixed.map}. The first two map
-files will be included in all future releases of this package, the last map
-file is just a temporary solution and it may disappear as soon as I get the
-Type 1 version of PT Mono. You should use just one of these map files.
+There are two map files: \code{paratype-truetype.map} and
+\code{paratype-type1.map}.
+You should use just one of these map files.
The map file \code{paratype-type1.map} is good for \program{dvips}. It sets
-Type 1 version of PT Sans and PT Serif. There is not PT Mono in this map file,
-because it does not make sense to set TrueType version of PT Mono for
-\program{dvips}.
+Type~1 fonts for PT Sans, PT Serif and PT Mono.
+This map file is a safe choice if you do not know which map file to use.
The map file \code{paratype-truetype.map} is good for \program{pdf\TeX}. It sets
-TrueType fonts for PT Sans, PT Serif and PT Mono.
-
-The map file \code{paratype-mixed.map} is a relatively safe choice if you do not
-know which map file to use. It sets Type 1 version of PT Sans and PT Serif and
-TrueType version of PT Mono. This is undoubtedly Ok for \program{pdf\TeX} and
-it has some advantages when you use faked styles of PT Serif (see
-section~\ref{faked-styles}). It will work also for \program{dvips}, unless you
-request font PT Mono.
+TrueType fonts for PT Sans, PT Serif and PT Mono. You can use it if you prefer
+TrueType fonts.
You install the required map file with a command like:
\begin{verbatim}
@@ -159,7 +149,7 @@
before you install the new one:
\begin{verbatim}
updmap-sys --disable paratype-type1.map
-updmap-sys --enable Map=paratype-mixed.map
+updmap-sys --enable Map=paratype-truetype.map
\end{verbatim}
@@ -204,12 +194,12 @@
\end{verbatim}
-\subsection{Faked styles of PT Serif}
+\subsection{Faked styles}
\label{faked-styles}
-PT Serif and PT Serif Caption have also faked \textsl{slanted} and
-{\usefont{T1}{PTSerif-TLF}{m}{ui}upright italic} styles. PT Serif has them
-also in bold weight.
+PT Serif and PT Serif Caption have faked slanted and upright italic styles. PT Serif has them also in bold weight.
+PT Sans Caption, PT Sans Narrow and PT Mono have faked slanted and bold
+slanted styles.
As all faked styles, they can not reach the quality of the true designed
styles and there can be some problems. In PT Serif, there are problems with
@@ -229,11 +219,11 @@
\subsection{The available series/shape combinations}
You can see the available series/shape combinations in the
-table~\ref{tableShape}. The table shows just the combinations that really
-exist in the fonts (and faked styles of PT Serif in red), but you can use
-also some other combinations (relying on substitution). The bold extended
-series will be changed to the bold series and the slanted shape
-of PT Sans to the italic shape.
+table~\ref{tableShape}. The table shows the combinations that really
+exist in the fonts in black and faked styles in red.
+
+There is also automatic substitution. If you request the bold extended series,
+you will get the bold series instead.
\begin{table}[!htb]
\centering{%
@@ -242,12 +232,12 @@
font family & series/shape combinations \\
\midrule
PTSans-TLF & m/n, m/it, b/n, b/it, c/n, bc/n \\
- PTSansNarrow-TLF & m/n, b/n \\
- PTSansCaption-TLF & m/n, b/n \\
+ PTSansNarrow-TLF & m/n, b/n, \faked{m/sl}, \faked{b/sl} \\
+ PTSansCaption-TLF & m/n, b/n, \faked{m/sl}, \faked{b/sl} \\
PTSerif-TLF & m/n, m/it, b/n, b/it,
\faked{m/sl}, \faked{m/ui}, \faked{b/sl}, \faked{b/ui} \\
PTSerifCaption-TLF & m/n, m/it, \faked{m/sl}, \faked{m/ui} \\
- PTMono-TLF & m/n \\
+ PTMono-TLF & m/n, b/n, \faked{m/sl}, \faked{b/sl} \\
\bottomrule
\end{tabular}
\caption{The series/shape combinations for the fonts}\label{tableShape}}
@@ -260,29 +250,6 @@
should decide if and where he will use them.
-\subsection{Installing your own Type 1 version of PT Mono}
-
-This package will include the Type 1 version of PT Mono as soon as I
-get it from ParaType. Before that happens, you must install your own
-Type 1 version if you need it. This section should help you with it.
-
-First, convert the TrueType font \code{PTM55F.ttf} to Type 1. You can use
-free tools like \program{FontForge} or \program{ttf2pt1}. The only
-file you really need is \code{PTM55F.pfb}. Look where similar files for
-PT Sans and PT Serif are and put this file in directory
-\code{paratype/ptmono} and update the file name database.
-
-Second, you should create a map file for this font. It is best
-to start with the file \code{paratype-mixed.map} and replace all
-occurencies of \code{PTM55F.ttf} with \code{PTM55F.pfb}. Save the result
-under some new name, such as \code{paratype-new.map}. Then uninstall the
-old map file and install the map file just created with commands like:
-\begin{verbatim}
-updmap-sys --disable paratype-truetype.map
-updmap-sys --enable Map=paratype-new.map
-\end{verbatim}
-
-
\subsection{Notes for the Czech and Slovak users}
I changed the width of some letters in the encoding IL2: Lcaron
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/paratype.doc.tlpobj new/tlpkg/tlpobj/paratype.doc.tlpobj
--- old/tlpkg/tlpobj/paratype.doc.tlpobj 2012-02-25 04:30:45.000000000 +0100
+++ new/tlpkg/tlpobj/paratype.doc.tlpobj 2013-05-22 03:52:22.000000000 +0200
@@ -1,9 +1,9 @@
name paratype.doc
category Package
-revision 25499
+revision 30615
shortdesc doc files of paratype
relocated 1
-docfiles size=243
+docfiles size=289
RELOC/doc/fonts/paratype/CHANGELOG
RELOC/doc/fonts/paratype/OT_TT_Install_E.txt
RELOC/doc/fonts/paratype/OT_TT_Install_R.txt
++++++ paratype.tar.xz ++++++
++++ 3961 lines of diff (skipped)
++++++ paresse.doc.tar.xz ++++++
Files old/doc/latex/paresse/paresse-en.pdf and new/doc/latex/paresse/paresse-en.pdf differ
Files old/doc/latex/paresse/paresse-ex-en.pdf and new/doc/latex/paresse/paresse-ex-en.pdf differ
Files old/doc/latex/paresse/paresse-ex-fr.pdf and new/doc/latex/paresse/paresse-ex-fr.pdf differ
Files old/doc/latex/paresse/paresse-fr.pdf and new/doc/latex/paresse/paresse-fr.pdf differ
Files old/doc/latex/paresse/paresse.pdf and new/doc/latex/paresse/paresse.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/paresse.doc.tlpobj new/tlpkg/tlpobj/paresse.doc.tlpobj
--- old/tlpkg/tlpobj/paresse.doc.tlpobj 2011-04-30 04:21:07.000000000 +0200
+++ new/tlpkg/tlpobj/paresse.doc.tlpobj 2013-04-10 21:07:32.000000000 +0200
@@ -1,6 +1,6 @@
name paresse.doc
category Package
-revision 22257
+revision 29803
shortdesc doc files of paresse
relocated 1
docfiles size=406
++++++ paresse.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/paresse/paresse.sty new/tex/latex/paresse/paresse.sty
--- old/tex/latex/paresse/paresse.sty 2011-04-20 03:03:05.000000000 +0200
+++ new/tex/latex/paresse/paresse.sty 2013-02-16 23:42:39.000000000 +0100
@@ -7,7 +7,7 @@
%% paresse.dtx (with options: `common,package')
%% This is a generated file.
%%
-%% Copyright (C) 2011
+%% Copyright (C) 2011, 2013
%% by Yvon Henel, alias le TeXnicien de surface
%%
%%
@@ -21,12 +21,12 @@
%% and version 1.2 or later is part of all distributions of LaTeX
%% version 1999/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\def\fileversion{v4}
-\def\filedate{2011/04/19}
+\def\fileversion{v4.1}
+\def\filedate{2013/02/16}
\def\fileinfo{fichier paresse par le TeXnicien de surface}
\ProvidesPackage{paresse}
[\filedate\space\fileversion\space\fileinfo]
-\RequirePackage{skeyval}
+\RequirePackage{skeyval-bc}
\RequirePackage{ifluatex}
\RequirePackage{ifxetex}
\define@bitogkeys[GA]{paresse.sty}[GA@]{legacy}[true]{levi}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/paresse/paresseold.sto new/tex/latex/paresse/paresseold.sto
--- old/tex/latex/paresse/paresseold.sto 2011-04-30 02:26:32.000000000 +0200
+++ new/tex/latex/paresse/paresseold.sto 2013-02-16 23:42:39.000000000 +0100
@@ -7,7 +7,7 @@
%% paresse.dtx (with options: `oldpack')
%% This is a generated file.
%%
-%% Copyright (C) 2011
+%% Copyright (C) 2011, 2013
%% by Yvon Henel, alias le TeXnicien de surface
%%
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/paresse/paresseutf8.sto new/tex/latex/paresse/paresseutf8.sto
--- old/tex/latex/paresse/paresseutf8.sto 2011-04-30 02:26:32.000000000 +0200
+++ new/tex/latex/paresse/paresseutf8.sto 2013-02-16 23:42:39.000000000 +0100
@@ -7,7 +7,7 @@
%% paresse.dtx (with options: `utf8pack')
%% This is a generated file.
%%
-%% Copyright (C) 2011
+%% Copyright (C) 2011, 2013
%% by Yvon Henel, alias le TeXnicien de surface
%%
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/paresse.tlpobj new/tlpkg/tlpobj/paresse.tlpobj
--- old/tlpkg/tlpobj/paresse.tlpobj 2011-04-30 04:21:08.000000000 +0200
+++ new/tlpkg/tlpobj/paresse.tlpobj 2013-04-10 21:07:33.000000000 +0200
@@ -1,15 +1,16 @@
name paresse
category Package
-revision 22257
-shortdesc Defines simple macros for greek letters.
+revision 29803
+shortdesc Define simple macros for greek letters.
relocated 1
-longdesc Defines macros using SS to type greek letters so that the user
-longdesc may (for example) type SSa to get the effect of $\alpha$.
+longdesc The package defines macros using SS to type greek letters. so
+longdesc that the user may (for example) type SSa to get the effect of
+longdesc $\alpha$.
runfiles size=5
RELOC/tex/latex/paresse/paresse.sty
RELOC/tex/latex/paresse/paresseold.sto
RELOC/tex/latex/paresse/paresseutf8.sto
catalogue-ctan /macros/latex/contrib/paresse
-catalogue-date 2011-04-20 18:25:54 +0200
+catalogue-date 2013-02-16 13:58:07 +0100
catalogue-license lppl
-catalogue-version 4
+catalogue-version 4.1
++++++ patgen.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/patgen.1 new/texmf/doc/man/man1/patgen.1
--- old/texmf/doc/man/man1/patgen.1 2011-04-15 11:43:54.000000000 +0200
+++ new/texmf/doc/man/man1/patgen.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,191 +0,0 @@
-.TH PATGEN 1 "7 April 2010" "Web2C 2011"
-.\"=====================================================================
-.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
-.if n .ds TX TeX
-.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP for troff
-.el .ds OX TeX
-.\" that's for nroff.
-.\" the same but obliqued
-.\" BX definition must follow TX so BX can use TX
-.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
-.if n .ds BX BibTeX
-.\" LX definition must follow TX so LX can use TX
-.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX
-.if n .ds LX LaTeX
-.\"=====================================================================
-.SH NAME
-patgen \- generate patterns for TeX hyphenation
-.SH SYNOPSIS
-.B patgen
-.I dictionary_file pattern_file patout_file translate_file
-.\"=====================================================================
-.SH DESCRIPTION
-This manual page is not meant to be exhaustive.
-See also the Info file or manual
-.IR "Web2C: A TeX implementation" .
-.PP
-The
-.I patgen
-program reads the
-.I dictionary_file
-containing a list of hyphenated words and the
-.I pattern_file
-containing previously-generated patterns (if any) for a particular
-language (not a complete TeX source file; see below), and produces the
-.I patout_file
-with (previously- plus newly-generated) hyphenation patterns for that
-language. The
-.I translate_file
-defines language specific values for the parameters
-.IR left_hyphen_min " and " right_hyphen_min
-used by \*(TX's hyphenation algorithm and the external representation
-of the lower and upper case version(s) of all \`letters' of that
-language. Further details of the pattern generation process such as
-hyphenation levels and pattern lengths are requested interactively from
-the user's terminal. Optionally
-.I patgen
-creates a new dictionary file
-.BI pattmp. n
-showing the good and bad hyphens found by the generated patterns, where
-.I n
-is the highest hyphenation level.
-.PP
-The patterns generated by
-.I patgen
-can be read by
-.B initex
-for use in hyphenating words. For a real-life example of
-.IR patgen 's
-output, see
-.IR $TEXMFMAIN/tex/generic/hyphen/hyphen.tex ,
-which contains the patterns \*(TX uses for English by default.
-At some sites, patterns for (many) other languages may be available,
-and the local
-.B tex
-programs may have them preloaded.
-.PP
-All filenames must be complete; no adding of default
-extensions or path searching is done.
-.\"=====================================================================
-.SH FILE FORMATS
-.TP \w'@@'u+2n
-.B Letters
-When
-.B initex
-digests hyphenation patterns, \*(TX first expands macros and the result
-must entirely consist of digits (hyphenation levels), dots (\`.', edge
-of a word), and letters. In pattern files for non-English languages
-letters are often represented by macros or other expandable constructs.
-For the purpose of
-.I patgen
-these are just character sequences, subject to the condition that no
-such sequence is a prefix of another one.
-.TP \w'@@'u+2n
-.B Dictionary file
-A dictionary file contains a weighted list of hyphenated words, one word
-per line starting in column 1. A digit in column 1 indicates a global
-word weight (initially =1) applicable to all following words up to the
-next global word weight. A digit at some intercharacter position
-indicates a weight for that position only.
-
-The hyphens in a word are indicated by \`-', \`*', or \`.' (or their
-replacements as defined in the translate file) for hyphens yet to be
-found, \`good' hyphens (correctly found by the patterns), and \`bad'
-hyphens (erroneously found by the patterns) respectively; when reading a
-dictionary file \`*' is treated like \`-' and \`.' is ignored.
-.TP
-.B Pattern file
-A pattern file contains only patterns in the format above, e.g., from a
-previous run of patgen. It may \fInot\fR contain any \*(TX comments or
-control sequences. For instance, this is not a valid pattern file:
-.nf
-
-% this is a pattern file read by TeX.
-\\patterns{%
- .\|.\|.
-}
-.fi
-It can only contain the actual patterns, i.e., the `.\|.\|.'.
-.TP
-.B Translate file
-A translate file starts with a line containing the values of
-.I left_hyphen_min
-in columns 1-2,
-.I right_hyphen_min
-in columns 3-4, and either a blank or the replacement for one of the
-"hyphen" characters \`-', \`*', and \`.' in columns 5, 6, and 7. (Input
-lines are padded with blanks as for many \*(TX related programs.)
-
-Each following line defines one \`letter': an arbitrary delimiter
-character in column 1, followed by one or more external representations
-of that character (first the \`lower' case one used for output), each
-one terminated by the delimiter and the whole sequence terminated by
-another delimiter.
-
-If the translate file is empty, the values
-.IR left_hyphen_min "=2, " right_hyphen_min "=3,"
-and the 26 lower case letters
-.BR a .\|.\|. z
-with their upper case representations
-.BR A .\|.\|. Z
-are assumed.
-.TP
-.B Terminal input
-After reading the
-.I translate_file
-and any previously-generated patterns from
-.IR pattern_file ,
-.I patgen
-requests input from the user's terminal.
-
-First the integer values of
-.IR hyph_start " and " hyph_finish ,
-the lowest and highest hyphenation level for which patterns are to be
-generated. The value of
-.I hyph_start
-should be larger than any hyphenation level already present in
-.IR pattern_file .
-
-Then, for each hyphenation level, the integer values of
-.IR pat_start " and " pat_finish ,
-the smallest and largest pattern length to be analyzed, as well as
-.IR "good weight" ", " "bad weight" ", and " threshold ,
-the weights for good and bad hyphens and a weight threshold for useful
-patterns.
-
-Finally the decision (\`y' or \`Y' vs. anything else) whether or not to
-produce a hyphenated word list.
-.\"=====================================================================
-.SH FILES
-.TP \w'@@'u+2n
-.I $TEXMFMAIN/tex/generic/hyphen/hyphen.tex
-The original hyphenation patterns for English, by Donald Knuth and Frank
-Liang.
-.TP
-.I $TEXMFMAIN/tex/generic/hyphen/ushyphmax.tex
-Maximal hyphenation patterns for English, extended by Gerard Kuiken.
-.TP
-.I http://www.ctan.org/tex-archive/language/
-Patterns and support for many other languages
-.\"=====================================================================
-.SH "SEE ALSO"
-Frank Liang and Peter Breitenlohner,
-patgen.web.
-.PP
-Frank Liang,
-.IR "Word hy-phen-a-tion by com-puter" ,
-STAN-CS-83-977,
-Stanford University Ph.D. thesis, 1983,
-http://tug.org/docs/liang.
-.PP
-Donald E. Knuth,
-.IR "The \*(OXbook" ,
-Addison-Wesley, 1986, ISBN 0-201-13447-0, Appendix H.
-.\"=====================================================================
-.SH AUTHORS
-Frank Liang wrote the first version of this program. Peter
-Breitenlohner made a
-substantial revision in 1991 for \*(TX 3.
-The first version was published as the appendix to the
-.I \*(OXware
-technical report. Howard Trickey originally ported it to Unix.
Files old/texmf/doc/man/man1/patgen.man1.pdf and new/texmf/doc/man/man1/patgen.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/patgen.1 new/texmf-dist/doc/man/man1/patgen.1
--- old/texmf-dist/doc/man/man1/patgen.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/patgen.1 2013-04-08 23:16:34.000000000 +0200
@@ -0,0 +1,191 @@
+.TH PATGEN 1 "7 April 2010" "Web2C 2013"
+.\"=====================================================================
+.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
+.if n .ds TX TeX
+.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP for troff
+.el .ds OX TeX
+.\" that's for nroff.
+.\" the same but obliqued
+.\" BX definition must follow TX so BX can use TX
+.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
+.if n .ds BX BibTeX
+.\" LX definition must follow TX so LX can use TX
+.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX
+.if n .ds LX LaTeX
+.\"=====================================================================
+.SH NAME
+patgen \- generate patterns for TeX hyphenation
+.SH SYNOPSIS
+.B patgen
+.I dictionary_file pattern_file patout_file translate_file
+.\"=====================================================================
+.SH DESCRIPTION
+This manual page is not meant to be exhaustive.
+See also the Info file or manual
+.IR "Web2C: A TeX implementation" .
+.PP
+The
+.I patgen
+program reads the
+.I dictionary_file
+containing a list of hyphenated words and the
+.I pattern_file
+containing previously-generated patterns (if any) for a particular
+language (not a complete TeX source file; see below), and produces the
+.I patout_file
+with (previously- plus newly-generated) hyphenation patterns for that
+language. The
+.I translate_file
+defines language specific values for the parameters
+.IR left_hyphen_min " and " right_hyphen_min
+used by \*(TX's hyphenation algorithm and the external representation
+of the lower and upper case version(s) of all \`letters' of that
+language. Further details of the pattern generation process such as
+hyphenation levels and pattern lengths are requested interactively from
+the user's terminal. Optionally
+.I patgen
+creates a new dictionary file
+.BI pattmp. n
+showing the good and bad hyphens found by the generated patterns, where
+.I n
+is the highest hyphenation level.
+.PP
+The patterns generated by
+.I patgen
+can be read by
+.B initex
+for use in hyphenating words. For a real-life example of
+.IR patgen 's
+output, see
+.IR $TEXMFMAIN/tex/generic/hyphen/hyphen.tex ,
+which contains the patterns \*(TX uses for English by default.
+At some sites, patterns for (many) other languages may be available,
+and the local
+.B tex
+programs may have them preloaded.
+.PP
+All filenames must be complete; no adding of default
+extensions or path searching is done.
+.\"=====================================================================
+.SH FILE FORMATS
+.TP \w'@@'u+2n
+.B Letters
+When
+.B initex
+digests hyphenation patterns, \*(TX first expands macros and the result
+must entirely consist of digits (hyphenation levels), dots (\`.', edge
+of a word), and letters. In pattern files for non-English languages
+letters are often represented by macros or other expandable constructs.
+For the purpose of
+.I patgen
+these are just character sequences, subject to the condition that no
+such sequence is a prefix of another one.
+.TP \w'@@'u+2n
+.B Dictionary file
+A dictionary file contains a weighted list of hyphenated words, one word
+per line starting in column 1. A digit in column 1 indicates a global
+word weight (initially =1) applicable to all following words up to the
+next global word weight. A digit at some intercharacter position
+indicates a weight for that position only.
+
+The hyphens in a word are indicated by \`-', \`*', or \`.' (or their
+replacements as defined in the translate file) for hyphens yet to be
+found, \`good' hyphens (correctly found by the patterns), and \`bad'
+hyphens (erroneously found by the patterns) respectively; when reading a
+dictionary file \`*' is treated like \`-' and \`.' is ignored.
+.TP
+.B Pattern file
+A pattern file contains only patterns in the format above, e.g., from a
+previous run of patgen. It may \fInot\fR contain any \*(TX comments or
+control sequences. For instance, this is not a valid pattern file:
+.nf
+
+% this is a pattern file read by TeX.
+\\patterns{%
+ .\|.\|.
+}
+.fi
+It can only contain the actual patterns, i.e., the `.\|.\|.'.
+.TP
+.B Translate file
+A translate file starts with a line containing the values of
+.I left_hyphen_min
+in columns 1-2,
+.I right_hyphen_min
+in columns 3-4, and either a blank or the replacement for one of the
+"hyphen" characters \`-', \`*', and \`.' in columns 5, 6, and 7. (Input
+lines are padded with blanks as for many \*(TX related programs.)
+
+Each following line defines one \`letter': an arbitrary delimiter
+character in column 1, followed by one or more external representations
+of that character (first the \`lower' case one used for output), each
+one terminated by the delimiter and the whole sequence terminated by
+another delimiter.
+
+If the translate file is empty, the values
+.IR left_hyphen_min "=2, " right_hyphen_min "=3,"
+and the 26 lower case letters
+.BR a .\|.\|. z
+with their upper case representations
+.BR A .\|.\|. Z
+are assumed.
+.TP
+.B Terminal input
+After reading the
+.I translate_file
+and any previously-generated patterns from
+.IR pattern_file ,
+.I patgen
+requests input from the user's terminal.
+
+First the integer values of
+.IR hyph_start " and " hyph_finish ,
+the lowest and highest hyphenation level for which patterns are to be
+generated. The value of
+.I hyph_start
+should be larger than any hyphenation level already present in
+.IR pattern_file .
+
+Then, for each hyphenation level, the integer values of
+.IR pat_start " and " pat_finish ,
+the smallest and largest pattern length to be analyzed, as well as
+.IR "good weight" ", " "bad weight" ", and " threshold ,
+the weights for good and bad hyphens and a weight threshold for useful
+patterns.
+
+Finally the decision (\`y' or \`Y' vs. anything else) whether or not to
+produce a hyphenated word list.
+.\"=====================================================================
+.SH FILES
+.TP \w'@@'u+2n
+.I $TEXMFMAIN/tex/generic/hyphen/hyphen.tex
+The original hyphenation patterns for English, by Donald Knuth and Frank
+Liang.
+.TP
+.I $TEXMFMAIN/tex/generic/hyphen/ushyphmax.tex
+Maximal hyphenation patterns for English, extended by Gerard Kuiken.
+.TP
+.I http://www.ctan.org/tex-archive/language/
+Patterns and support for many other languages
+.\"=====================================================================
+.SH "SEE ALSO"
+Frank Liang and Peter Breitenlohner,
+patgen.web.
+.PP
+Frank Liang,
+.IR "Word hy-phen-a-tion by com-puter" ,
+STAN-CS-83-977,
+Stanford University Ph.D. thesis, 1983,
+http://tug.org/docs/liang.
+.PP
+Donald E. Knuth,
+.IR "The \*(OXbook" ,
+Addison-Wesley, 1986, ISBN 0-201-13447-0, Appendix H.
+.\"=====================================================================
+.SH AUTHORS
+Frank Liang wrote the first version of this program. Peter
+Breitenlohner made a
+substantial revision in 1991 for \*(TX 3.
+The first version was published as the appendix to the
+.I \*(OXware
+technical report. Howard Trickey originally ported it to Unix.
Files old/texmf-dist/doc/man/man1/patgen.man1.pdf and new/texmf-dist/doc/man/man1/patgen.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/patgen.doc.tlpobj new/tlpkg/tlpobj/patgen.doc.tlpobj
--- old/tlpkg/tlpobj/patgen.doc.tlpobj 2011-06-23 04:16:01.000000000 +0200
+++ new/tlpkg/tlpobj/patgen.doc.tlpobj 2013-04-09 03:40:32.000000000 +0200
@@ -1,7 +1,7 @@
name patgen.doc
category TLCore
-revision 23089
+revision 29764
shortdesc doc files of patgen
docfiles size=5
- texmf/doc/man/man1/patgen.1
- texmf/doc/man/man1/patgen.man1.pdf
+ texmf-dist/doc/man/man1/patgen.1
+ texmf-dist/doc/man/man1/patgen.man1.pdf
++++++ pdfcomment.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/CHANGES new/doc/latex/pdfcomment/CHANGES
--- old/doc/latex/pdfcomment/CHANGES 2012-03-15 00:23:54.000000000 +0100
+++ new/doc/latex/pdfcomment/CHANGES 2012-09-29 00:47:25.000000000 +0200
@@ -1,5 +1,16 @@
+5a38dc437d0f
+
=== pdfcomment.sty ===
+-- pdfcomment.sty (v2.3a) (<- v2.3 2012/09/28) (Commit: 5a38dc437d0f)
+
+2012/09/28 Bugfix: problem with boxes around tooltips [jk]
+ spurious backslash in "/Ff/65536\space%" in line 2967, see:
+ https://bitbucket.org/kleberj/pdfcomment/issue/8/pdftooltip-tooltip-area-is-...
+ http://tex.stackexchange.com/questions/34698/strange-appearance-of-tooltips-...
+
+ reported by: diabonas
+
-- pdfcomment.sty (v2.3) (<- v2.2.16dev 2012/03/13) (Commit: ad8cf0b2bed753142c5f96bdc584e5a89c7285ea)
2012/03/07 reimplemented \pdfmarkupcomment by using soulpos.sty [jk]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/README new/doc/latex/pdfcomment/README
--- old/doc/latex/pdfcomment/README 2012-03-15 00:23:54.000000000 +0100
+++ new/doc/latex/pdfcomment/README 2012-09-29 00:47:25.000000000 +0200
@@ -15,16 +15,11 @@
License: LPPL
-Changes in v2.3:
+Changes in v2.3a:
-- reimplemented \pdfmarkupcomment by using soulpos.sty
- much better support of non standard text cases, like:
- \twocolumn: feature request by: Ren� Schwarz, Thomas Feller, Til Birnstiel
- setspace.sty: feature request by: Andrew Dawson
- enumerate, itemize, ...
+- Bugfix: problem with boxes around tooltips [jk]
+ spurious backslash in "/Ff/65536\space%" in line 2967, see:
+ https://bitbucket.org/kleberj/pdfcomment/issue/8/pdftooltip-tooltip-area-is-...
+ http://tex.stackexchange.com/questions/34698/strange-appearance-of-tooltips-...
-- added support for twocolumn mode in \pdfsidelinecomment
-
-- added option local to \pdfcommentsetup
-
- feature request by: Florent Chervet
\ No newline at end of file
+ reported by: diabonas
\ No newline at end of file
Files old/doc/latex/pdfcomment/example.pdf and new/doc/latex/pdfcomment/example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/example.tex new/doc/latex/pdfcomment/example.tex
--- old/doc/latex/pdfcomment/example.tex 2012-03-15 00:23:54.000000000 +0100
+++ new/doc/latex/pdfcomment/example.tex 2012-09-29 00:47:25.000000000 +0200
@@ -28,7 +28,7 @@
\pdfcomment[avatar=CaptainJack,style=MyStar,subject={enough},deadline={2009/11/11 - Josef}]{It's enough now!}
\pdffreetextcomment[avatar=CaptainJack,height=3cm,type=freetext,subject={freetext},width=4.5cm,voffset=-4.8cm,hoffset=-3.2cm,opacity=0.5,justification=right]{This is also a comment, but it's a FreeText annotation! Your, Captain Jack}
\pdflinecomment[avatar=CaptainJack,subject={Line1},type=line,opacity=1,line={100 680 250 680},color=green,icolor=blue,caption=top,linebegin={/ROpenArrow},lineend={/OpenArrow},linewidth=2bp,captionhoffset=-5pt,captionvoffset=15pt]{This is a Line comment!}
-\pdffreetextcomment[avatar=CaptainJack,subject={typewriter},height=1.8cm,width=5.8cm,voffset=-7.2cm,hoffset=-1.2cm,opacity=1.0,justification=right,type=typewriter,font=Harrington,fontsize=18pt,fontcolor=CornflowerBlue]{This is a typewriter FreeText annotation!}
+\pdffreetextcomment[avatar=CaptainJack,subject={typewriter},height=1.8cm,width=6.8cm,voffset=-7.2cm,hoffset=-1.2cm,opacity=1.0,justification=right,type=typewriter,font=LucidaConsole,fontsize=14pt,fontcolor=CornflowerBlue]{This is a typewriter FreeText annotation!}
\marginnote{\begin{textblock*}{1cm}(7cm,14.5cm)
\pdffreetextcomment[avatar=CaptainJack,subject={callout},height=1.9cm,width=9cm,opacity=0.5,voffset=0pt,hoffset=0pt,opacity=1.0,font=Georgia,fontsize=9pt,fontcolor=red,justification=left,linewidth=2bp,bse=cloudy,bsei=1.3,type=callout,line={170 515 120 460 200 460},lineend=/ClosedArrow]{This one was placed with absolute coordinates (textpos.sty) (font=Georgia, fontsize=9pt, fontcolor=red, linewidth=2bp, bse=cloudy, bsei=1.3, type=callout, line=\{170 515 120 460 200 460\}, lineend=/ClosedArrow)}
@@ -83,7 +83,7 @@
\pdfmarkupcomment[author={Donald Duck},subject={squiggly},color=Teal,opacity=1.0,markup=Squiggly]{Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.}{This is a Squiggly markup annotation}
\noindent\pdfsquarecomment[avatar=CaptainJack,subject={square},height=2.5cm,width=5.8cm,voffset=-2.8cm,hoffset=1cm,opacity=1.0,justification=right,icolor=CornflowerBlue,bse=cloudy,bsei=2.5,linewidth=8pt]{This is a Square annotation!}
-\pdffreetextcomment[avatar=CaptainJack,subject={overlay},height=2.2cm,width=4.8cm,voffset=-2.8cm,hoffset=1.5cm,opacity=1.0,justification=right,type=typewriter,font=Jokerman,fontsize=13pt,fontcolor=black]{This typewriter annotation overlays the square!}
+\pdffreetextcomment[avatar=CaptainJack,subject={overlay},height=2.2cm,width=4.8cm,voffset=-2.8cm,hoffset=1.5cm,opacity=1.0,justification=right,type=typewriter,font=PalatinoLinotype,fontsize=13pt,fontcolor=black]{This typewriter annotation overlays the square!}
\pdfcirclecomment[avatar=CaptainJack,color=blue,subject={circle},height=2.5cm,width=5.8cm,voffset=-2.8cm,hoffset=8cm,opacity=1.0,justification=right,icolor={yellow},linewidth=12pt,borderstyle=dashed,dashstyle={10 5}]{This is a Circle annotation!}
\pdflinecomment[type=polyline,avatar=CaptainJack,subject={polyline},opacity=1,line={150 120 260 120 300 150 400 80},color=green,icolor=blue,linebegin={/Slash},lineend={/Diamond},linewidth=3bp,bse=cloudy]{This is a Polyline comment!}
Files old/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf and new/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/example_latex_dvipdfmx.tex new/doc/latex/pdfcomment/example_latex_dvipdfmx.tex
--- old/doc/latex/pdfcomment/example_latex_dvipdfmx.tex 2011-05-24 00:06:07.000000000 +0200
+++ new/doc/latex/pdfcomment/example_latex_dvipdfmx.tex 2012-09-29 00:47:25.000000000 +0200
@@ -31,7 +31,7 @@
\pdfcomment[avatar=CaptainJack,style=MyStar]{It's enough now!}
\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=3cm,type=freetext,width=4.5cm,voffset=-4.8cm,hoffset=-3.2cm,opacity=0.5,justification=right]{This is also a comment, but it's a FreeText annotation! Your, Captain Jack}
\pdflinecomment[avatar=CaptainJack,subject={Top2},type=line,opacity=1,line={100 680 250 680},color=green,icolor=blue,caption=top,linebegin={/ROpenArrow},lineend={/OpenArrow},linewidth=2bp,captionhoffset=-5pt,captionvoffset=15pt]{This is a Line comment!}
-\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=1.8cm,width=5.8cm,voffset=-7.2cm,hoffset=-1.2cm,opacity=1.0,justification=right,type=typewriter,font=Harrington,fontsize=18pt,fontcolor=CornflowerBlue]{This is a typewriter FreeText annotation!}
+\pdffreetextcomment[avatar=CaptainJack,subject={typewriter},height=1.8cm,width=6.8cm,voffset=-7.2cm,hoffset=-1.2cm,opacity=1.0,justification=right,type=typewriter,font=LucidaConsole,fontsize=14pt,fontcolor=CornflowerBlue]{This is a typewriter FreeText annotation!}
\marginnote{\begin{textblock*}{1cm}(7cm,14.5cm)
\pdffreetextcomment[avatar=CaptainJack,height=1.9cm,width=9cm,opacity=0.5,voffset=0pt,hoffset=0pt,opacity=1.0,font=Georgia,fontsize=9pt,fontcolor=red,justification=left,linewidth=2bp,bse=cloudy,bsei=1.3,type=callout,line={170 515 120 460 200 460},lineend=/ClosedArrow]{This one was placed with absolute coordinates (textpos.sty) (font=Georgia, fontsize=9pt, fontcolor=red, linewidth=2bp, bse=cloudy, bsei=1.3, type=callout, line=\{170 515 120 460 200 460\}, lineend=/ClosedArrow)}
@@ -86,7 +86,7 @@
\pdfmarkupcomment[author={Donald Duck},color=Teal,opacity=1.0,markup=Squiggly]{Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.}{This is a Squiggly markup annotation}
\noindent\pdfsquarecomment[avatar=CaptainJack,subject={Top2},height=2.5cm,width=5.8cm,voffset=-2.8cm,hoffset=1cm,opacity=1.0,justification=right,icolor=CornflowerBlue,bse=cloudy,bsei=2.5,linewidth=8pt]{This is a Square annotation!}
-\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=2.2cm,width=4.8cm,voffset=-2.8cm,hoffset=1.5cm,opacity=1.0,justification=right,type=typewriter,font=Jokerman,fontsize=13pt,fontcolor=black]{This typewriter annotation overlays the square!}
+\pdffreetextcomment[avatar=CaptainJack,subject={overlay},height=2.2cm,width=4.8cm,voffset=-2.8cm,hoffset=1.5cm,opacity=1.0,justification=right,type=typewriter,font=PalatinoLinotype,fontsize=13pt,fontcolor=black]{This typewriter annotation overlays the square!}
\pdfcirclecomment[avatar=CaptainJack,color=blue,subject={Top2},height=2.5cm,width=5.8cm,voffset=-2.8cm,hoffset=8cm,opacity=1.0,justification=right,icolor={yellow},linewidth=12pt,borderstyle=dashed,dashstyle={10 5}]{This is a Circle annotation!}
\pdflinecomment[type=polyline,avatar=CaptainJack,subject={Top2},opacity=1,line={150 120 260 120 300 150 400 80},color=green,icolor=blue,linebegin={/Slash},lineend={/Diamond},linewidth=3bp,bse=cloudy]{This is a Polyline comment!}
Files old/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.pdf and new/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex new/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex
--- old/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex 2011-05-24 00:06:07.000000000 +0200
+++ new/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex 2012-09-29 00:47:25.000000000 +0200
@@ -28,7 +28,7 @@
\pdfcomment[avatar=CaptainJack,style=MyStar]{It's enough now!}%
\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=3cm,type=freetext,width=4.5cm,voffset=-4.3cm,hoffset=-3.2cm,opacity=0.5,justification=right]{This is also a comment, but it's a FreeText annotation! Your, Captain Jack}%
\pdflinecomment[avatar=CaptainJack,subject={Top2},type=line,opacity=1,line={100 680 250 680},color=green,icolor=blue,caption=top,linebegin={/ROpenArrow},lineend={/OpenArrow},linewidth=2bp,captionhoffset=-5pt,captionvoffset=15pt]{This is a Line comment!}%
-\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=1.8cm,width=5.8cm,voffset=-7.2cm,hoffset=-1.2cm,opacity=1.0,justification=right,type=typewriter,font=Harrington,fontsize=18pt,fontcolor=CornflowerBlue]{This is a typewriter FreeText annotation!}%
+\pdffreetextcomment[avatar=CaptainJack,subject={typewriter},height=1.8cm,width=6.8cm,voffset=-7.2cm,hoffset=-1.2cm,opacity=1.0,justification=right,type=typewriter,font=LucidaConsole,fontsize=14pt,fontcolor=CornflowerBlue]{This is a typewriter FreeText annotation!}
\marginnote{\begin{textblock*}{1cm}(7cm,14.5cm)%
\pdffreetextcomment[avatar=CaptainJack,height=1.9cm,width=9cm,opacity=0.5,voffset=0pt,hoffset=0pt,opacity=1.0,font=Georgia,fontsize=9pt,fontcolor=red,justification=left,linewidth=2bp,bse=cloudy,bsei=1.3,type=callout,line={170 515 120 460 200 460},lineend=/ClosedArrow]{This one was placed with absolute coordinates (textpos.sty) (font=Georgia, fontsize=9pt, fontcolor=red, linewidth=2bp, bse=cloudy, bsei=1.3, type=callout, line=\{170 515 120 460 200 460\}, lineend=/ClosedArrow)}%
@@ -83,7 +83,7 @@
\pdfmarkupcomment[author={Donald Duck},color=Teal,opacity=1.0,markup=Squiggly]{Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.}{This is a Squiggly markup annotation}
\noindent\pdfsquarecomment[avatar=CaptainJack,subject={Top2},height=2.5cm,width=5.8cm,voffset=-2.8cm,hoffset=1cm,opacity=1.0,justification=right,icolor=CornflowerBlue,bse=cloudy,bsei=2.5,linewidth=8pt]{This is a Square annotation!}
-\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=2.2cm,width=4.8cm,voffset=-2.8cm,hoffset=1.5cm,opacity=1.0,justification=right,type=typewriter,font=Jokerman,fontsize=13pt,fontcolor=black]{This typewriter annotation overlays the square!}
+\pdffreetextcomment[avatar=CaptainJack,subject={overlay},height=2.2cm,width=4.8cm,voffset=-2.8cm,hoffset=1.5cm,opacity=1.0,justification=right,type=typewriter,font=PalatinoLinotype,fontsize=13pt,fontcolor=black]{This typewriter annotation overlays the square!}
\pdfcirclecomment[avatar=CaptainJack,color=blue,subject={Top2},height=2.5cm,width=5.8cm,voffset=-2.8cm,hoffset=8cm,opacity=1.0,justification=right,icolor={yellow},linewidth=12pt,borderstyle=dashed,dashstyle={10 5}]{This is a Circle annotation!}
\pdflinecomment[type=polyline,avatar=CaptainJack,subject={Top2},opacity=1,line={150 120 260 120 300 150 400 80},color=green,icolor=blue,linebegin={/Slash},lineend={/Diamond},linewidth=3bp,bse=cloudy]{This is a Polyline comment!}
Files old/doc/latex/pdfcomment/example_math_markup.pdf and new/doc/latex/pdfcomment/example_math_markup.pdf differ
Files old/doc/latex/pdfcomment/example_xelatex.pdf and new/doc/latex/pdfcomment/example_xelatex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/example_xelatex.tex new/doc/latex/pdfcomment/example_xelatex.tex
--- old/doc/latex/pdfcomment/example_xelatex.tex 2012-03-15 00:23:54.000000000 +0100
+++ new/doc/latex/pdfcomment/example_xelatex.tex 2012-09-29 00:47:25.000000000 +0200
@@ -1,4 +1,4 @@
-% Make sure to write the page size into the dvi file!
+% Make sure to write the page size into the dvi file!
% That's possible with the pagesize option of KoMa-Script
% Otherwise the positioning of the annotations will fail!
\documentclass[pagesize]{scrartcl}
@@ -17,9 +17,8 @@
\usepackage{amsmath,array,bm}
\usepackage[absolute]{textpos}
\usepackage[subject={Top1},author={Ånsgar Lund},version=1]{pdfcomment}
-\setmainfont[Mapping=tex-text]{Bergamo}
+\setmainfont[Mapping=tex-text]{Tahoma}
\begin{document}
-\fontspec[SmallCapsFont={BergamoSmc},]{Bergamo}
\defineavatar{Joe}{author=Joe,color=yellow}
\defineavatar{Bob}{author=Bob,color=green}
\definecolor{myblue}{rgb}{0.045,0.278,0.643}
@@ -36,7 +35,7 @@
\pdfcomment[avatar=CaptainJack,style=MyStar,date={}]{It's enough now!}
\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=3cm,type=freetext,width=4.5cm,voffset=-4.8cm,hoffset=-2.7cm,opacity=0.5,justification=right]{This is also a comment, but it's a FreeText annotation! Your, Captain Jack}
\pdflinecomment[avatar=CaptainJack,subject={Top2},type=line,opacity=1,line={100 680 250 680},color=green,icolor=blue,caption=top,linebegin={/ROpenArrow},lineend={/OpenArrow},linewidth=2bp,captionhoffset=-5pt,captionvoffset=15pt]{This is a Line comment!}
-\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=1.8cm,width=5.8cm,voffset=-7.2cm,hoffset=-1.2cm,opacity=1.0,justification=right,type=typewriter,font=Harrington,fontsize=18pt,fontcolor=CornflowerBlue]{This is a typewriter FreeText annotation!}
+\pdffreetextcomment[avatar=CaptainJack,subject={typewriter},height=1.8cm,width=6.8cm,voffset=-7.2cm,hoffset=-1.2cm,opacity=1.0,justification=right,type=typewriter,font=LucidaConsole,fontsize=14pt,fontcolor=CornflowerBlue]{This is a typewriter FreeText annotation!}
\marginnote{\begin{textblock*}{1cm}(7cm,14.5cm)
\pdffreetextcomment[avatar=CaptainJack,height=1.9cm,width=9cm,opacity=0.5,voffset=0pt,hoffset=0pt,opacity=1.0,font=Georgia,fontsize=9pt,fontcolor=red,justification=left,linewidth=2bp,bse=cloudy,bsei=1.3,type=callout,line={170 515 120 460 200 460},lineend=/ClosedArrow]{This one was placed with absolute coordinates (textpos.sty) (font=Georgia, fontsize=9pt, fontcolor=red, linewidth=2bp, bse=cloudy, bsei=1.3, type=callout, line=\{170 515 120 460 200 460\}, lineend=/ClosedArrow)}
@@ -91,7 +90,7 @@
\pdfmarkupcomment[author={Donald Duck},color=Teal,opacity=1.0,markup=Squiggly]{Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.}{This is a Squiggly markup annotation}
\noindent\pdfsquarecomment[avatar=CaptainJack,subject={Top2},height=2.5cm,width=5.8cm,voffset=-2.8cm,hoffset=1cm,opacity=1.0,justification=right,icolor=CornflowerBlue,bse=cloudy,bsei=2.5,linewidth=8pt]{This is a Square annotation!}
-\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=2.2cm,width=4.8cm,voffset=-2.8cm,hoffset=1.5cm,opacity=1.0,justification=right,type=typewriter,font=Jokerman,fontsize=13pt,fontcolor=black]{This typewriter annotation overlays the square!}
+\pdffreetextcomment[avatar=CaptainJack,subject={overlay},height=2.2cm,width=4.8cm,voffset=-2.8cm,hoffset=1.5cm,opacity=1.0,justification=right,type=typewriter,font=PalatinoLinotype,fontsize=13pt,fontcolor=black]{This typewriter annotation overlays the square!}
\pdfcirclecomment[avatar=CaptainJack,color=blue,subject={Top2},height=2.5cm,width=5.8cm,voffset=-2.8cm,hoffset=8cm,opacity=1.0,justification=right,icolor={yellow},linewidth=12pt,borderstyle=dashed,dashstyle={10 5}]{This is a Circle annotation!}
\pdflinecomment[type=polyline,avatar=CaptainJack,subject={Top2},opacity=1,line={150 120 260 120 300 150 400 80},color=green,icolor=blue,linebegin={/Slash},lineend={/Diamond},linewidth=3bp,bse=cloudy]{This is a Polyline comment!}
Files old/doc/latex/pdfcomment/pdfcomment.pdf and new/doc/latex/pdfcomment/pdfcomment.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/pdfcomment.tex new/doc/latex/pdfcomment/pdfcomment.tex
--- old/doc/latex/pdfcomment/pdfcomment.tex 2012-03-15 00:23:54.000000000 +0100
+++ new/doc/latex/pdfcomment/pdfcomment.tex 2012-09-29 00:47:25.000000000 +0200
@@ -138,7 +138,7 @@
\title{\filename}%
\Subtitle{A user-friendly interface to PDF annotations}%
\author{Josef Kleber}
-\Fileversion{v2.3}
+\Fileversion{v2.3a}
\Refline{\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}\\\href{https://bitbucket.org/kleberj/pdfcomment/}{\texttt{https://bitbucket.org/kleberj/pdfcomment/}}}
\maketitle
\Headline{Abstract}
@@ -191,7 +191,7 @@
\item \textbf{Herbert Vo�} also for answering my stupid questions on d.c.t.t.
\end{itemize}
-I also want to thank the following persons for bug reports, feature requests, ...: Til Birnstiel, Jannis von Buttlar, Gabriel Cardona, Thomas Feller, Florent Chervet, Jin-Hwan Cho, Marcel Dausend, Andrew Dawson, Max Funk, Zvi Gilboa, Thomas K�nig, Marc-Andr� Michel, Guillaume Millet, Fritz Moore, Michael Niedermair, Stefan Pinnow, Ren� Schwarz
+I also want to thank the following persons for bug reports, feature requests, ...: Til Birnstiel, Jannis von Buttlar, Gabriel Cardona, Thomas Feller, Florent Chervet, Jin-Hwan Cho, Marcel Dausend, Andrew Dawson, diabonas, Max Funk, Zvi Gilboa, Thomas K�nig, Marc-Andr� Michel, Guillaume Millet, Fritz Moore, Michael Niedermair, Stefan Pinnow, Ren� Schwarz
\clearpage
\section{Options}
\subsection{Global options}
Files old/doc/latex/pdfcomment/pdfcomment_de.pdf and new/doc/latex/pdfcomment/pdfcomment_de.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/pdfcomment_de.tex new/doc/latex/pdfcomment/pdfcomment_de.tex
--- old/doc/latex/pdfcomment/pdfcomment_de.tex 2012-03-15 00:23:54.000000000 +0100
+++ new/doc/latex/pdfcomment/pdfcomment_de.tex 2012-09-29 00:47:25.000000000 +0200
@@ -152,7 +152,7 @@
\title{\filename}%
\Subtitle{Ein benutzerfreundliches Interface zu PDF-Kommentaren}%
\author{Josef Kleber}
-\Fileversion{v2.3}
+\Fileversion{v2.3a}
\Refline{\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}\\\href{https://bitbucket.org/kleberj/pdfcomment/}{\texttt{https://bitbucket.org/kleberj/pdfcomment/}}}
\maketitle
\Headline{Zusammenfassung}%
@@ -205,7 +205,7 @@
\item \textbf{Herbert Vo�} ebenfalls f�r das Beantworten meiner dummen Fragen in d.c.t.t.
\end{itemize}
-Au�erdem m�chte ich folgenden Personen danken f�r bug reports, feature requests, ...: Til Birnstiel, Jannis von Buttlar, Gabriel Cardona, Thomas Feller, Florent Chervet, Jin-Hwan Cho, Marcel Dausend, Andrew Dawson, Max Funk, Zvi Gilboa, Thomas K�nig, Marc-Andr� Michel, Guillaume Millet, Fritz Moore, Michael Niedermair, Stefan Pinnow, Ren� Schwarz
+Au�erdem m�chte ich folgenden Personen danken f�r bug reports, feature requests, ...: Til Birnstiel, Jannis von Buttlar, Gabriel Cardona, Thomas Feller, Florent Chervet, Jin-Hwan Cho, Marcel Dausend, Andrew Dawson, diabonas, Max Funk, Zvi Gilboa, Thomas K�nig, Marc-Andr� Michel, Guillaume Millet, Fritz Moore, Michael Niedermair, Stefan Pinnow, Ren� Schwarz
\clearpage
\section{Optionen}
\subsection{Globale Styleoptionen}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfcomment.doc.tlpobj new/tlpkg/tlpobj/pdfcomment.doc.tlpobj
--- old/tlpkg/tlpobj/pdfcomment.doc.tlpobj 2012-03-15 04:27:37.000000000 +0100
+++ new/tlpkg/tlpobj/pdfcomment.doc.tlpobj 2012-09-29 04:34:36.000000000 +0200
@@ -1,9 +1,9 @@
name pdfcomment.doc
category Package
-revision 25643
+revision 27844
shortdesc doc files of pdfcomment
relocated 1
-docfiles size=416
+docfiles size=357
RELOC/doc/latex/pdfcomment/CHANGES
RELOC/doc/latex/pdfcomment/INSTALL
RELOC/doc/latex/pdfcomment/README
++++++ pdfcomment.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfcomment/pdfcomment.sty new/tex/latex/pdfcomment/pdfcomment.sty
--- old/tex/latex/pdfcomment/pdfcomment.sty 2012-03-15 00:23:54.000000000 +0100
+++ new/tex/latex/pdfcomment/pdfcomment.sty 2012-09-29 00:47:25.000000000 +0200
@@ -20,7 +20,7 @@
%% This work consists of all files listed in manifest.txt.
%%
%
-\ProvidesPackage{pdfcomment}[2012/03/13 pdfcomment.sty v2.3 - Josef Kleber (C) 2008-2012]%
+\ProvidesPackage{pdfcomment}[2012/09/28 pdfcomment.sty v2.3a - Josef Kleber (C) 2008-2012]%
%
\RequirePackage{xkeyval}%
%
@@ -2964,7 +2964,7 @@
/T (tooltip \thezref@unique)\space%
/C [0 0 0]\space%
/FT/Btn\space%
- /Ff/65536\space%
+ /Ff 65536\space%
/H/N\space%
}%
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfcomment.tlpobj new/tlpkg/tlpobj/pdfcomment.tlpobj
--- old/tlpkg/tlpobj/pdfcomment.tlpobj 2012-03-15 04:27:38.000000000 +0100
+++ new/tlpkg/tlpobj/pdfcomment.tlpobj 2012-09-29 04:34:37.000000000 +0200
@@ -1,6 +1,6 @@
name pdfcomment
category Package
-revision 25643
+revision 27844
shortdesc A user-friendly interface to pdf annotations.
relocated 1
longdesc For a long time pdfLaTeX has offered the command \pdfannot for
@@ -20,6 +20,6 @@
runfiles size=24
RELOC/tex/latex/pdfcomment/pdfcomment.sty
catalogue-ctan /macros/latex/contrib/pdfcomment
-catalogue-date 2012-03-14 10:19:48 +0100
+catalogue-date 2012-09-28 15:59:23 +0200
catalogue-license lppl1.3
-catalogue-version v2.3
+catalogue-version v2.3a
++++++ pdfcrop.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/pdfcrop/README new/texmf-dist/doc/support/pdfcrop/README
--- old/texmf-dist/doc/support/pdfcrop/README 2012-04-19 18:23:18.000000000 +0200
+++ new/texmf-dist/doc/support/pdfcrop/README 2012-11-05 00:01:42.000000000 +0100
@@ -1,4 +1,4 @@
-README for pdfcrop 2012/04/18 v1.34
+README for pdfcrop 2012/11/02 v1.38
TABLE OF CONTENTS
=================
@@ -243,6 +243,13 @@
2012/04/18 v1.34: * Format of option --version changed
from naked version number to a line with
program name, date and version.
+2012/10/15 v1.35: * Additional debug infos added for Perl version.
+2012/10/16 v1.36: * More error codes added.
+2012/10/16 v1.37: * Extended error messages if available.
+ * Fix for broken v1.36.
+2012/11/02 v1.38: * Fix for unsufficient cleanup, if function `cleanup' is
+ prematurely called in `eval' for `symlink' checking.
+
M. TODO
=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfcrop.doc.tlpobj new/tlpkg/tlpobj/pdfcrop.doc.tlpobj
--- old/tlpkg/tlpobj/pdfcrop.doc.tlpobj 2012-04-20 04:43:18.000000000 +0200
+++ new/tlpkg/tlpobj/pdfcrop.doc.tlpobj 2013-03-12 04:38:32.000000000 +0100
@@ -1,6 +1,6 @@
name pdfcrop.doc
category Package
-revision 26043
+revision 29348
shortdesc doc files of pdfcrop
docfiles size=3
texmf-dist/doc/support/pdfcrop/README
++++++ pdfcrop.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pdfcrop/pdfcrop.pl new/texmf-dist/scripts/pdfcrop/pdfcrop.pl
--- old/texmf-dist/scripts/pdfcrop/pdfcrop.pl 2012-04-19 18:23:18.000000000 +0200
+++ new/texmf-dist/scripts/pdfcrop/pdfcrop.pl 2012-11-05 00:01:42.000000000 +0100
@@ -22,8 +22,8 @@
my $prj = 'pdfcrop';
my $file = "$prj.pl";
my $program = uc($&) if $file =~ /^\w+/;
-my $version = "1.33";
-my $date = "2012/02/01";
+my $version = "1.38";
+my $date = "2012/11/02";
my $author = "Heiko Oberdiek";
my $copyright = "Copyright (c) 2002-2012 by $author.";
#
@@ -101,6 +101,12 @@
# 2012/04/18 v1.34: * Format of --version changed
# from naked version number to a line with
# program name, date and version.
+# 2012/10/15 v1.35: * Additional debug infos added for Perl version.
+# 2012/10/16 v1.36: * More error codes added.
+# 2012/10/16 v1.37: * Extended error messages if available.
+# * Fix for broken v1.36.
+# 2012/11/02 v1.38: * Fix for unsufficient cleanup, if function `cleanup' is
+# prematurely called in `eval' for `symlink' checking.
### program identification
my $title = "$program $version, $date - $copyright\n";
@@ -119,11 +125,41 @@
my $archname = $Config{'archname'};
$archname = 'unknown' unless defined $Config{'archname'};
+### extended error messages
+sub exterr () {
+ chomp(my $msg_errno = $!);
+ chomp(my $msg_extended_os_error = $^E);
+ if ($msg_errno eq $msg_extended_os_error) {
+ $msg_errno;
+ }
+ else {
+ "$msg_errno/$msg_extended_os_error";
+ }
+}
+
### string constants for Ghostscript run
# get Ghostscript command name
$::opt_gscmd = '';
sub find_ghostscript () {
return if $::opt_gscmd;
+ if ($::opt_debug) {
+ print "* Perl executable: $^X\n";
+ if ($] < 5.006) {
+ print "* Perl version: $]\n";
+ }
+ else {
+ printf "* Perl version: v%vd\n", $^V;
+ }
+ if (defined &ActivePerl::BUILD) {
+ printf "* Perl product: ActivePerl, build %s\n", ActivePerl::BUILD();
+ }
+ use Config;
+ printf "* Pointer size: $Config{'ptrsize'}\n";
+ printf "* Pipe support: %s\n",
+ (defined($Config{'d_pipe'}) ? 'yes' : 'no');
+ printf "* Fork support: %s\n",
+ (defined($Config{'d_fork'}) ? 'yes' : 'no');
+ }
my $system = 'unix';
$system = "dos" if $^O =~ /dos/i;
$system = "os2" if $^O =~ /os2/i;
@@ -628,7 +664,9 @@
$inputfilesafe = "$tmp-stdin.pdf";
print "* Temporary input file: $inputfilesafe\n" if $::opt_debug;
push @unlink_files, $inputfilesafe;
- open(OUT, '>', $inputfilesafe) or die "$Error Cannot write `$inputfilesafe'!\n";
+ open(OUT, '>', $inputfilesafe)
+ or die sprintf "$Error Cannot write `%s' (%s)!\n",
+ $inputfilesafe, exterr;
binmode(OUT);
my $size = 0;
my $len = 0;
@@ -637,11 +675,12 @@
do {
$len = read STDIN, $buf, $buf_size;
if (not defined $len) {
- my $msg = $!;
- chomp $msg;
+ my $msg = exterr;
die "$Error Reading standard input ($msg)!\n";
}
- print OUT $buf or die "$Error Writing `$inputfilesafe'!\n";
+ print OUT $buf
+ or die sprintf "$Error Writing `%s` (%s)!\n",
+ $inputfilesafe, exterr;
$size += $len;
}
while ($len);
@@ -651,28 +690,36 @@
elsif (not $inputfile =~ /^[\w\d\.\-\:\/@]+$/) { # /[\s\$~'"#{}%]/
$inputfilesafe = "$tmp-img.pdf";
push @unlink_files, $inputfilesafe;
- my $symlink_exists = eval { symlink("", ""); 1 };
+ my $symlink_exists = eval {
+ local $SIG{'__DIE__'};
+ symlink("", "");
+ 1;
+ };
print "* Input file name `$inputfile' contains special characters.\n"
. "* " . ($symlink_exists ? "Link" : "Copy")
. " input file to temporary file `$inputfilesafe'.\n"
if $::opt_verbose;
if ($symlink_exists) {
symlink($inputfile, $inputfilesafe)
- or die "$Error Link from `$inputfile' to"
- . " `$inputfilesafe' failed: $!\n";
+ or die sprintf "$Error Link from `%s' to `%s' failed (%s)!\n",
+ $inputfile, $inputfilesafe, exterr;
}
else {
use File::Copy;
copy($inputfile, $inputfilesafe)
- or die "$Error Copy from `$inputfile' to"
- . " `$inputfilesafe' failed: $!\n";
+ or die sprintf "$Error Copy from `%s' to `%s' failed (%s)\n",
+ $inputfile, $inputfilesafe, exterr;
}
}
if ($::opt_pdfversion eq 'auto') {
- open(IN, '<', $inputfilesafe) or die "!!! Error: Cannot open `$inputfilesafe'!\n";
+ open(IN, '<', $inputfilesafe)
+ or die sprintf "!!! Error: Cannot open `%s' (%s)!\n",
+ $inputfilesafe, exterr;
my $buf;
- read(IN, $buf, 1024) or die "!!! Error: Cannot read the header of `$inputfilesafe' failed!\n";
+ read(IN, $buf, 1024)
+ or die sprintf "!!! Error: Cannot read the header of `%s' failed (%s)!\n",
+ $inputfilesafe, exterr;
close(IN);
if ($buf =~ /%PDF-1.([0-7])\s/) {
$::opt_pdfversion = $1;
@@ -704,8 +751,9 @@
my $tmpfile = "$tmp.tex";
push @unlink_files, $tmpfile;
-open(TMP, ">$tmpfile") or
- die "$Error Cannot write tmp file `$tmpfile'!\n";
+open(TMP, ">$tmpfile")
+ or die sprintf "$Error Cannot write tmp file `%s' (%s)!\n",
+ $tmpfile, exterr;
print TMP <<'END_TMP';
\catcode37 14 % percent
\catcode33 12 % exclam
@@ -989,10 +1037,11 @@
my $page = 0;
my $gs_pipe = "$::opt_gscmd -dSAFER @gsargs 2>&1";
$gs_pipe .= " 1>$null" unless $::opt_verbose;
-$gs_pipe .= "|";
+$gs_pipe .= " |";
-open(GS, $gs_pipe) or
- die "$Error Cannot call ghostscript ($::opt_gscmd)!\n";
+open(GS, $gs_pipe)
+ or die sprintf "$Error Cannot call ghostscript `%s' (%s)!\n",
+ $::opt_gscmd, exterr;
my $bb = ($::opt_hires) ? "%%HiResBoundingBox" : "%%BoundingBox";
my $previous_line = 'Previous line';
# Ghostscript workaround for buggy ports that prints
@@ -1056,7 +1105,11 @@
}
close(GS);
-if ($? & 127) {
+if ($? == -1) {
+ die sprintf "$Error Ghostscript failed to execute (%s)!\n",
+ exterr;
+}
+elsif ($? & 127) {
die sprintf "$Error Ghostscript died with signal %d!\n",
($? & 127);
}
@@ -1108,19 +1161,36 @@
else {
`$cmd`;
}
-if ($?) {
- die "$Error $texname run failed!\n";
+if ($? == -1) {
+ die sprintf "$Error %s run failed to execute (%s)!\n",
+ $texname, exterr;
+}
+elsif ($? & 127) {
+ die sprintf "$Error %s run died with signal %d!\n",
+ $texname, ($? & 127);
+}
+elsif ($? != 0) {
+ die sprintf "$Error %s run failed with value %d!\n",
+ $texname, ($? >> 8);
}
### Check pdf version of temp file
if ($::opt_pdfversion) {
- open(PDF, '+<', "$tmp.pdf") or die "!!! Error: Cannot open `$tmp.pdf'!\n";
+ open(PDF, '+<', "$tmp.pdf")
+ or die sprintf "!!! Error: Cannot open `%s' (%s)!\n",
+ "$tmp.pdf", exterr;
my $header;
- read PDF, $header, 9 or die "!!! Error: Cannot read header of `$tmp.pdf'!\n";
+ read PDF, $header, 9
+ or die sprintf "!!! Error: Cannot read header of `%s' (%s)!\n",
+ "$tmp.pdf", exterr;
$header =~ /^%PDF-1\.(\d)\s$/ or die "!!! Error: Cannot find header of `$tmp.pdf'!\n";
if ($1 ne $::opt_pdfversion) {
- seek PDF, 7, 0 or die "!!! Error: Cannot seek in `$tmp.pdf'!\n";
- print PDF $::opt_pdfversion or die "!!! Error: Cannot write in `$tmp.pdf'!\n";
+ seek PDF, 7, 0
+ or die sprintf "!!! Error: Cannot seek in `%s' (%s)!\n",
+ "$tmp.pdf", exterr;
+ print PDF $::opt_pdfversion
+ or die sprintf "!!! Error: Cannot write in `%s' (%s)!\n",
+ "$tmp.pdf", exterr;
print "* PDF version correction in output file: 1.$::opt_pdfversion\n"
if $::opt_debug;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfcrop.tlpobj new/tlpkg/tlpobj/pdfcrop.tlpobj
--- old/tlpkg/tlpobj/pdfcrop.tlpobj 2012-04-20 04:43:18.000000000 +0200
+++ new/tlpkg/tlpobj/pdfcrop.tlpobj 2013-03-12 04:38:32.000000000 +0100
@@ -1,13 +1,13 @@
name pdfcrop
category Package
-revision 26043
+revision 29348
shortdesc Crop PDF graphics.
longdesc A Perl script that can either trim pages of any whitespace
longdesc border, or trim them of a fixed border.
depend pdfcrop.ARCH
-runfiles size=9
+runfiles size=10
texmf-dist/scripts/pdfcrop/pdfcrop.pl
catalogue-ctan /support/pdfcrop/pdfcrop.pl
-catalogue-date 2012-04-18 16:26:37 +0200
+catalogue-date 2012-10-25 10:45:27 +0200
catalogue-license lppl
-catalogue-version 1.34
+catalogue-version 1.37
++++++ pdfjam.doc.tar.xz ++++++
++++ 1962 lines of diff (skipped)
++++++ pdfjam.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfjam.tlpobj new/tlpkg/tlpobj/pdfjam.tlpobj
--- old/tlpkg/tlpobj/pdfjam.tlpobj 2010-11-17 04:07:22.000000000 +0100
+++ new/tlpkg/tlpobj/pdfjam.tlpobj 2013-04-08 21:26:36.000000000 +0200
@@ -1,6 +1,6 @@
name pdfjam
category Package
-revision 20459
+revision 29752
shortdesc Shell scripts interfacing to pdfpages.
longdesc This is a collection of shell scripts which provide an
longdesc interface to the pdfpages LaTeX package. They do such jobs as
@@ -21,6 +21,6 @@
texmf-dist/scripts/pdfjam/pdfnup
texmf-dist/scripts/pdfjam/pdfpun
catalogue-ctan /support/pdfjam
-catalogue-date 2010-04-16 12:45:24 +0200
+catalogue-date 2012-06-17 01:47:14 +0200
catalogue-license gpl2
catalogue-version 2.02
++++++ pdfpages.doc.tar.xz ++++++
Files old/doc/latex/pdfpages/pdfpages.pdf and new/doc/latex/pdfpages/pdfpages.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfpages.doc.tlpobj new/tlpkg/tlpobj/pdfpages.doc.tlpobj
--- old/tlpkg/tlpobj/pdfpages.doc.tlpobj 2012-04-10 04:45:17.000000000 +0200
+++ new/tlpkg/tlpobj/pdfpages.doc.tlpobj 2012-09-03 04:28:56.000000000 +0200
@@ -1,9 +1,9 @@
name pdfpages.doc
category Package
-revision 25883
+revision 27574
shortdesc doc files of pdfpages
relocated 1
-docfiles size=61
+docfiles size=86
RELOC/doc/latex/pdfpages/dummy-l.pdf
RELOC/doc/latex/pdfpages/dummy.pdf
RELOC/doc/latex/pdfpages/pdf-ex.tex
++++++ pdfpages.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/pdfpages.sty new/tex/latex/pdfpages/pdfpages.sty
--- old/tex/latex/pdfpages/pdfpages.sty 2012-04-09 18:29:15.000000000 +0200
+++ new/tex/latex/pdfpages/pdfpages.sty 2012-09-03 00:45:16.000000000 +0200
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS .
%%
-\def\AM@fileversion{v0.4s}
+\def\AM@fileversion{v0.4t}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2012-04-03 21:07:24 +0200 (Tue, 03 Apr 2012) $
+\AM@SVN@Date$Date: 2012-08-31 18:15:36 +0200 (Fri, 31 Aug 2012) $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM@filedate\space\AM@fileversion\space
@@ -94,6 +94,7 @@
\newif\ifAM@doublepagestwistx\AM@doublepagestwistxfalse
\newif\ifAM@doublepagestmp\AM@doublepagestmpfalse
\newif\ifAM@doublepagestmpi\AM@doublepagestmpifalse
+\newif\ifAM@duplicatepages\AM@duplicatepagesfalse
\newif\ifAM@linkfilename\AM@linkfilenamefalse
\newif\ifAM@signature\AM@signaturefalse
\newif\ifAM@signaturestar\AM@signaturestarfalse
@@ -788,6 +789,15 @@
\edef\AM@doclist{\AM@doclist,\AM@currentdocname}%
\edef\AM@pagelist{\AM@pagelist,#1}%
\fi
+ \ifAM@duplicatepages
+ \count@=0
+ \loop
+ \advance\count@ 1
+ \ifnum\count@<\AM@nduplicatepages
+ \edef\AM@doclist{\AM@doclist,\AM@currentdocname}%
+ \edef\AM@pagelist{\AM@pagelist,#1}%
+ \repeat
+ \fi
\AM@defaultonefalse
}
\newif\ifAM@endoflist\AM@endoflistfalse
@@ -1025,6 +1035,7 @@
\equal{doublepagestwistodd}{\AM@temp}\or
\equal{doublepagestwist*}{\AM@temp}\or
\equal{doublepagestwistodd*}{\AM@temp}\or
+ \equal{duplicatepages}{\AM@temp}\or
\equal{signature}{\AM@temp}\or
\equal{signature*}{\AM@temp}\or
\equal{booklet}{\AM@temp}\or
@@ -1469,6 +1480,9 @@
\setboolean{AM@doublepagestwist}{#1}%
\AM@doublepagestmpfalse\AM@doublepagestmpitrue
\AM@doublepagestwistxtrue}
+\define@key{pdfpages}{duplicatepages}[2]%
+ {\def\AM@nduplicatepages{#1}%
+ \AM@duplicatepagestrue}
\define@key{pdfpages}{signature}{\def\AM@signature{#1}}
\define@key{pdfpages}{signature*}{\def\AM@signature{#1}%
\AM@signaturestartrue}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppdvipdfm.def new/tex/latex/pdfpages/ppdvipdfm.def
--- old/tex/latex/pdfpages/ppdvipdfm.def 2012-04-09 18:29:15.000000000 +0200
+++ new/tex/latex/pdfpages/ppdvipdfm.def 2012-09-03 00:45:16.000000000 +0200
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS .
%%
-\def\AM@fileversion{v0.4s}
+\def\AM@fileversion{v0.4t}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2012-04-03 21:07:24 +0200 (Tue, 03 Apr 2012) $
+\AM@SVN@Date$Date: 2012-08-31 18:15:36 +0200 (Fri, 31 Aug 2012) $
\ProvidesFile{ppdvipdfm.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for dvipdfm (AM)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppdvips.def new/tex/latex/pdfpages/ppdvips.def
--- old/tex/latex/pdfpages/ppdvips.def 2012-04-09 18:29:15.000000000 +0200
+++ new/tex/latex/pdfpages/ppdvips.def 2012-09-03 00:45:16.000000000 +0200
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS .
%%
-\def\AM@fileversion{v0.4s}
+\def\AM@fileversion{v0.4t}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2012-04-03 21:07:24 +0200 (Tue, 03 Apr 2012) $
+\AM@SVN@Date$Date: 2012-08-31 18:15:36 +0200 (Fri, 31 Aug 2012) $
\ProvidesFile{ppdvips.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for dvips (AM)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppnull.def new/tex/latex/pdfpages/ppnull.def
--- old/tex/latex/pdfpages/ppnull.def 2012-04-09 18:29:15.000000000 +0200
+++ new/tex/latex/pdfpages/ppnull.def 2012-09-03 00:45:16.000000000 +0200
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS .
%%
-\def\AM@fileversion{v0.4s}
+\def\AM@fileversion{v0.4t}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2012-04-03 21:07:24 +0200 (Tue, 03 Apr 2012) $
+\AM@SVN@Date$Date: 2012-08-31 18:15:36 +0200 (Fri, 31 Aug 2012) $
\ProvidesFile{ppnull.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages dummy driver (AM)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/pppdftex.def new/tex/latex/pdfpages/pppdftex.def
--- old/tex/latex/pdfpages/pppdftex.def 2012-04-09 18:29:15.000000000 +0200
+++ new/tex/latex/pdfpages/pppdftex.def 2012-09-03 00:45:16.000000000 +0200
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS .
%%
-\def\AM@fileversion{v0.4s}
+\def\AM@fileversion{v0.4t}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2012-04-03 21:07:24 +0200 (Tue, 03 Apr 2012) $
+\AM@SVN@Date$Date: 2012-08-31 18:15:36 +0200 (Fri, 31 Aug 2012) $
\ProvidesFile{pppdftex.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for pdfTeX (AM)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppvtex.def new/tex/latex/pdfpages/ppvtex.def
--- old/tex/latex/pdfpages/ppvtex.def 2012-04-09 18:29:15.000000000 +0200
+++ new/tex/latex/pdfpages/ppvtex.def 2012-09-03 00:45:16.000000000 +0200
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS .
%%
-\def\AM@fileversion{v0.4s}
+\def\AM@fileversion{v0.4t}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2012-04-03 21:07:24 +0200 (Tue, 03 Apr 2012) $
+\AM@SVN@Date$Date: 2012-08-31 18:15:36 +0200 (Fri, 31 Aug 2012) $
\ProvidesFile{ppvtex.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for VTeX (AM)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppxetex.def new/tex/latex/pdfpages/ppxetex.def
--- old/tex/latex/pdfpages/ppxetex.def 2012-04-09 18:29:15.000000000 +0200
+++ new/tex/latex/pdfpages/ppxetex.def 2012-09-03 00:45:16.000000000 +0200
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS .
%%
-\def\AM@fileversion{v0.4s}
+\def\AM@fileversion{v0.4t}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2012-04-03 21:07:24 +0200 (Tue, 03 Apr 2012) $
+\AM@SVN@Date$Date: 2012-08-31 18:15:36 +0200 (Fri, 31 Aug 2012) $
\ProvidesFile{ppxetex.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for XeTeX (AM)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfpages.tlpobj new/tlpkg/tlpobj/pdfpages.tlpobj
--- old/tlpkg/tlpobj/pdfpages.tlpobj 2012-04-10 04:45:17.000000000 +0200
+++ new/tlpkg/tlpobj/pdfpages.tlpobj 2012-09-03 04:28:56.000000000 +0200
@@ -1,6 +1,6 @@
name pdfpages
category Package
-revision 25883
+revision 27574
shortdesc Include PDF documents in LaTeX.
relocated 1
longdesc This package simplifies the inclusion of external multi-page
@@ -21,6 +21,6 @@
RELOC/tex/latex/pdfpages/ppvtex.def
RELOC/tex/latex/pdfpages/ppxetex.def
catalogue-ctan /macros/latex/contrib/pdfpages
-catalogue-date 2012-04-08 13:49:02 +0200
+catalogue-date 2012-08-31 19:14:38 +0200
catalogue-license lppl
-catalogue-version 0.4s
+catalogue-version 0.4t
++++++ pdfscreen.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfscreen.doc.tlpobj new/tlpkg/tlpobj/pdfscreen.doc.tlpobj
--- old/tlpkg/tlpobj/pdfscreen.doc.tlpobj 2010-06-10 18:40:44.000000000 +0200
+++ new/tlpkg/tlpobj/pdfscreen.doc.tlpobj 2012-08-24 04:36:30.000000000 +0200
@@ -1,6 +1,6 @@
name pdfscreen.doc
category Package
-revision 16987
+revision 27510
shortdesc doc files of pdfscreen
relocated 1
docfiles size=216
++++++ pdfscreen.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfscreen.tlpobj new/tlpkg/tlpobj/pdfscreen.tlpobj
--- old/tlpkg/tlpobj/pdfscreen.tlpobj 2010-06-10 18:40:44.000000000 +0200
+++ new/tlpkg/tlpobj/pdfscreen.tlpobj 2012-08-24 04:36:30.000000000 +0200
@@ -1,6 +1,6 @@
name pdfscreen
category Package
-revision 16987
+revision 27510
shortdesc Support screen-based document design.
relocated 1
longdesc An extension of the hyperref package to provide a screen-based
@@ -28,6 +28,6 @@
RELOC/tex/latex/pdfscreen/pdfscreen.sty
RELOC/tex/latex/pdfscreen/right.pdf
catalogue-ctan /macros/latex/contrib/pdfscreen
-catalogue-date 2006-12-05 17:23:05 +0100
+catalogue-date 2012-07-18 20:44:29 +0200
catalogue-license lppl
catalogue-version 1.5
++++++ pdftex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/pdfetex.1 new/texmf/doc/man/man1/pdfetex.1
--- old/texmf/doc/man/man1/pdfetex.1 2011-04-15 11:43:54.000000000 +0200
+++ new/texmf/doc/man/man1/pdfetex.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-.TH PDFETEX 1 "14 May 2010" "pdftex 1.40" "Web2C 2011"
-.\"=====================================================================
-.if n .ds MF Metafont
-.if t .ds MF M\s-2ETAFONT\s0
-.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
-.if n .ds TX TeX
-.if n .ds MF Metafont
-.if t .ds MF M\s-2ETAFONT\s0
-.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP\" for troff
-.el .ds OX TeX\" for nroff
-.\" the same but obliqued
-.\" BX definition must follow TX so BX can use TX
-.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
-.if n .ds BX BibTeX
-.\" LX definition must follow TX so LX can use TX
-.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX
-.if n .ds LX LaTeX
-.if t .ds AX \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(TX
-.if n .ds AX AmSTeX
-.if t .ds AY \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(LX
-.if n .ds AY AmSLaTeX
-.\"=====================================================================
-.SH NAME
-pdfetex \- PDF output from e-TeX
-.SH SYNOPSIS
-.B pdfetex
-.RI [ options ]
-.RI [ \fB&\fPformat ]
-.RI [ file | \fB\e\fPcommands ]
-.\"=====================================================================
-.SH DESCRIPTION
-pdfe\*(TX is another name for pdf\*(TX; they behave identically.
-See pdftex(1) for all information.
-.\"=====================================================================
-.SH "SEE ALSO"
-.BR pdftex (1),
-http://pdftex.org, http://tug.org/web2c.
Files old/texmf/doc/man/man1/pdfetex.man1.pdf and new/texmf/doc/man/man1/pdfetex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/pdftex.1 new/texmf/doc/man/man1/pdftex.1
--- old/texmf/doc/man/man1/pdftex.1 2011-04-15 11:43:54.000000000 +0200
+++ new/texmf/doc/man/man1/pdftex.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,476 +0,0 @@
-.TH PDFTEX 1 "1 March 2011" "pdftex 1.40" "Web2C 2011"
-.\"=====================================================================
-.if n .ds MF Metafont
-.if t .ds MF M\s-2ETAFONT\s0
-.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
-.if n .ds TX TeX
-.if n .ds MF Metafont
-.if t .ds MF M\s-2ETAFONT\s0
-.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP for troff
-.el .ds OX TeX for nroff
-.\" the same but obliqued
-.\" BX definition must follow TX so BX can use TX
-.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
-.if n .ds BX BibTeX
-.\" LX definition must follow TX so LX can use TX
-.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX
-.if n .ds LX LaTeX
-.if t .ds AX \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(TX
-.if n .ds AX AmSTeX
-.if t .ds AY \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(LX
-.if n .ds AY AmSLaTeX
-.if n .ds WB Web
-.if t .ds WB W\s-2EB\s0
-.\"=====================================================================
-.SH NAME
-pdftex, pdfinitex, pdfvirtex \- PDF output from TeX
-.SH SYNOPSIS
-.B pdftex
-.RI [ options ]
-.RI [ \fB&\fPformat ]
-.RI [ file | \fB\e\fPcommands ]
-.\"=====================================================================
-.SH DESCRIPTION
-Run the pdf\*(TX typesetter on
-.IR file ,
-usually creating
-.IR file.pdf .
-If the file argument has no extension, ".tex" will be appended to it.
-Instead of a filename, a set of pdf\*(TX commands can be given, the first
-of which must start with a backslash.
-With a
-.BI & format
-argument pdf\*(TX uses a different set of precompiled commands,
-contained in
-.IR format\fB.fmt\fP ;
-it is usually better to use the
-.B -fmt
-.I format
-option instead.
-.PP
-pdf\*(TX is a version of \*(TX, with the e-\*(TX extensions, that can create
-.I PDF
-files as well as
-.I DVI
-files.
-.PP
-In
-.I DVI
-mode, pdf\*(TX can be used as a complete replacement for the \*(TX
-engine.
-.PP
-The typical use of pdf\*(TX is with a pregenerated formats for which
-PDF output has been enabled. The
-.B pdftex
-command uses the equivalent of the plain \*(TX format, and the
-.B pdflatex
-command uses the equivalent of the \*(LX format.
-To generate formats, use the
-.B -ini
-switch.
-.PP
-The
-.B pdfinitex
-and
-.B pdfvirtex
-commands are pdf\*(TX's analogues to the
-.B initex
-and
-.B virtex
-commands. In this installation, if the links exist, they are symbolic
-links to the
-.B pdftex
-executable.
-.PP
-In
-.I PDF
-mode, pdf\*(TX can natively handle the
-.IR PDF ,
-.IR JPG ,
-.IR JBIG2 ,
-and
-.I PNG
-graphics formats. pdf\*(TX cannot include PostScript or Encapsulated
-PostScript (EPS) graphics files; first convert them to PDF using
-.BR epstopdf (1).
-pdf\*(TX's handling of its command-line arguments is similar to that of
-of the other \*(TX programs in the
-.I web2c
-implementation.
-.\"=====================================================================
-.SH OPTIONS
-This version of pdf\*(TX understands the following command line options.
-.TP
-.B -draftmode
-Sets \epdfdraftmode so pdf\*(TX doesn't write a PDF and doesn't read any
-included images, thus speeding up execution.
-.TP
-.B -enc
-Enable the enc\*(TX extensions. This option is only effective in
-combination with
-.BR -ini .
-For documentation of the enc\*(TX extensions see
-.BR http://www.olsak.net/enctex.html .
-.TP
-.B -etex
-Enable the e-\*(TX extensions. This option is only effective in
-combination with
-.BR -ini .
-See
-.BR etex (1).
-.TP
-.B -file-line-error
-Print error messages in the form
-.I file:line:error
-which is similar to the way many compilers format them.
-.TP
-.B -no-file-line-error
-Disable printing error messages in the
-.I file:line:error
-style.
-.TP
-.B -file-line-error-style
-This is the old name of the
-.B -file-line-error
-option.
-.TP
-.BI -fmt \ format
-Use
-.I format
-as the name of the format to be used, instead of the name by which
-pdf\*(TX was called or a
-.I %&
-line.
-.TP
-.B -halt-on-error
-Exit with an error code when an error is encountered during processing.
-.TP
-.B -help
-Print help message and exit.
-.TP
-.B -ini
-Start in
-.I INI
-mode, which is used to dump formats. The
-.I INI
-mode can be used for typesetting, but no format is preloaded, and
-basic initializations like setting catcodes may be required.
-.TP
-.BI -interaction \ mode
-Sets the interaction mode. The mode can be either
-.IR batchmode ,
-.IR nonstopmode ,
-.IR scrollmode ,
-and
-.IR errorstopmode .
-The meaning of these modes is the same as that of the corresponding
-\ecommands.
-.TP
-.B -ipc
-Send DVI or PDF output to a socket as well as the usual output file.
-Whether this option is available is the choice of the installer.
-.TP
-.B -ipc-start
-As
-.BR -ipc ,
-and starts the server at the other end as well. Whether this option
-is available is the choice of the installer.
-.TP
-.BI -jobname \ name
-Use
-.I name
-for the job name, instead of deriving it from the name of the input file.
-.TP
-.BI -kpathsea-debug \ bitmask
-Sets path searching debugging flags according to the bitmask. See the
-.I Kpathsea
-manual for details.
-.TP
-.BI -mktex \ fmt
-Enable
-.RI mktex fmt ,
-where
-.I fmt
-must be either
-.I tex
-or
-.IR tfm .
-.TP
-.B -mltex
-Enable ML\*(TX extensions. Only effective in combination with
-.BR -ini .
-.TP
-.BI -no-mktex \ fmt
-Disable
-.RI mktex fmt ,
-where
-.I fmt
-must be either
-.I tex
-or
-.IR tfm .
-.TP
-.BI -output-comment \ string
-In
-.I DVI
-mode, use
-.I string
-for the
-.I DVI
-file comment instead of the date. This option is ignored
-in
-.I PDF
-mode.
-.TP
-.BI -output-directory \ directory
-Write output files in
-.I directory
-instead of the current directory. Look up input files in
-.I directory
-first, the along the normal search path.
-.TP
-.BI -output-format \ format
-Set the output format mode, where
-.I format
-must be either
-.I pdf
-or
-.IR dvi .
-This also influences the set of graphics formats understood by pdf\*(TX.
-.TP
-.B -parse-first-line
-If the first line of the main input file begins with
-.I %&
-parse it to look for a dump name or a
-.B -translate-file
-option.
-.TP
-.B -no-parse-first-line
-Disable parsing of the first line of the main input file.
-.TP
-.BI -progname \ name
-Pretend to be program
-.IR name .
-This affects both the format used and the search paths.
-.TP
-.B -recorder
-Enable the filename recorder.
-This leaves a trace of the files opened for input and output
-in a file with extension
-.IR .fls .
-.TP
-.B -shell-escape
-Enable the
-.BI \ewrite18{ command }
-construct. The
-.I command
-can be any shell command. This construct is normally
-disallowed for security reasons.
-.TP
-.B -no-shell-escape
-Disable the
-.BI \ewrite18{ command }
-construct, even if it is enabled in the
-.I texmf.cnf
-file.
-.TP
-.B -src-specials
-In
-.I DVI
-mode, insert source specials into the
-.I DVI
-file.
-This option is ignored in
-.I PDF
-mode.
-.TP
-.BI -src-specials \ where
-In
-.I DVI
-mode, insert source specials in certain placed of the
-.I DVI
-file.
-.I where
-is a comma-separated value list:
-.IR cr ,
-.IR display ,
-.IR hbox ,
-.IR math ,
-.IR par ,
-.IR parent ,
-or
-.IR vbox .
-This option is ignored in
-.I PDF
-mode.
-.TP
-.BI -translate-file \ tcxname
-Use the
-.I tcxname
-translation table to set the mapping of input characters and
-re-mapping of output characters.
-.TP
-.BI -default-translate-file \ tcxname
-Like
-.B -translate-file
-except that a
-.I %&
-line can overrule this setting.
-.TP
-.B -version
-Print version information and exit.
-.\"=====================================================================
-.SH ENVIRONMENT
-See the Kpathsearch library documentation (the `Path specifications'
-node) for precise details of how the environment variables are used.
-The
-.B kpsewhich
-utility can be used to query the values of the variables.
-.PP
-One caveat: In most pdf\*(TX formats, you cannot use ~ in a filename you
-give directly to pdf\*(TX, because ~ is an active character, and hence is
-expanded, not taken as part of the filename. Other programs, such as
-\*(MF, do not have this problem.
-.PP
-.TP
-.B TEXMFOUTPUT
-Normally, pdf\*(TX puts its output files in the current directory. If
-any output file cannot be opened there, it tries to open it in the
-directory specified in the environment variable TEXMFOUTPUT.
-There is no default value for that variable. For example, if you say
-.I pdftex paper
-and the current directory is not writable and TEXMFOUTPUT has
-the value
-.IR /tmp ,
-pdf\*(TX attempts to create
-.I /tmp/paper.log
-(and
-.IR /tmp/paper.pdf ,
-if any output is produced.) TEXMFOUTPUT is also checked for input
-files, as \*(TX often generates files that need to be subsequently
-read; for input, no suffixes (such as ``.tex'') are added by default,
-the input name is simply checked as given.
-.TP
-.B TEXINPUTS
-Search path for
-.I \einput
-and
-.I \eopenin
-files.
-This should start with ``.'', so
-that user files are found before system files. An empty path
-component will be replaced with the paths defined in the
-.I texmf.cnf
-file. For example, set TEXINPUTS to ".:/home/user/tex:" to prepend the
-current directory and ``/home/user/tex'' to the standard search path.
-.TP
-.B TEXFORMATS
-Search path for format files.
-.TP
-.B TEXPOOL
-search path for
-.B pdftex
-internal strings.
-.TP
-.B TEXEDIT
-Command template for switching to editor. The default, usually
-.BR vi ,
-is set when pdf\*(TX is compiled.
-.TP
-.B TFMFONTS
-Search path for font metric
-.RI ( .tfm )
-files.
-.\"=====================================================================
-.SH FILES
-The location of the files mentioned below varies from system to
-system. Use the
-.B kpsewhich
-utility to find their locations.
-.TP
-.I pdftex.pool
-Text file containing pdf\*(TX's internal strings.
-.TP
-.I pdftex.map
-Filename mapping definitions.
-.TP
-.I *.tfm
-Metric files for pdf\*(TX's fonts.
-.TP
-.I *.fmt
-Predigested pdf\*(TX format (.\|fmt) files.
-.br
-.\"=====================================================================
-.SH NOTES
-Starting with version 1.40, pdf\*(TX incorporates the e-\*(TX
-extensions, and pdfe\*(TX is just a copy of pdf\*(TX. See
-.BR etex (1).
-This manual page is not meant to be exhaustive. The complete
-documentation for this version of pdf\*(TX can be found in the
-.IR "pdf\*(TX manual"
-and the info manual
-.IR "Web2C: A TeX implementation" .
-.\"=====================================================================
-.SH BUGS
-This version of pdf\*(TX implements a number of optional extensions.
-In fact, many of these extensions conflict to a greater or lesser
-extent with the definition of pdf\*(TX. When such extensions are
-enabled, the banner printed when pdf\*(TX starts is changed to print
-.B pdfTeXk
-instead of
-.BR pdfTeX .
-.PP
-This version of pdf\*(TX fails to trap arithmetic overflow when
-dimensions are added or subtracted. Cases where this occurs are rare,
-but when it does the generated
-.I DVI
-file will be invalid. Whether a generated
-.I PDF
-file would be usable is unknown.
-.\"=====================================================================
-.SH AVAILABILITY
-pdf\*(TX is available for a large variety of machine architectures
-and operation systems.
-pdf\*(TX is part of all major \*(TX distributions.
-.P
-Information on how to get pdf\*(TX and related information
-is available at the
-.B http://www.pdftex.org
-.IR "pdf\*(TX"
-web site.
-.P
-The following pdfe\*(TX related mailing list is available:
-.BR pdftex@tug.org .
-This is a mailman list;
-to subscribe send a message containing
-.I subscribe
-to
-.BR pdftex-request@tug.org .
-A web interface and list archives can be found at the
-.B "http://lists.tug.org/pdftex"
-mailing list web site.
-.\"=====================================================================
-.SH "SEE ALSO"
-.BR epstopdf (1),
-.BR etex (1),
-.BR latex (1),
-.BR mptopdf (1),
-.BR tex (1),
-.BR mf (1).
-http://tug.org/applications/pdftex, http://tug.org/web2c.
-.\"=====================================================================
-.SH AUTHORS
-The primary authors of pdf\*(TX are Han The Thanh, Petr Sojka,
-Jiri Zlatuska, and Peter Breitenlohner (e\*(TX).
-.PP
-\*(TX was designed by Donald E. Knuth,
-who implemented it using his \*(WB system for Pascal programs.
-It was ported to Unix at Stanford by Howard Trickey, and
-at Cornell by Pavel Curtis.
-The version now offered with the Unix \*(TX distribution is that
-generated by the \*(WB to C system
-.RB ( web2c ),
-originally written by Tomas Rokicki and Tim Morgan.
-.PP
-The enc\*(TX extensions were written by Petr Olsak.
-.\" vim: syntax=nroff
Files old/texmf/doc/man/man1/pdftex.man1.pdf and new/texmf/doc/man/man1/pdftex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pdfetex.1 new/texmf-dist/doc/man/man1/pdfetex.1
--- old/texmf-dist/doc/man/man1/pdfetex.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/pdfetex.1 2013-04-08 23:16:34.000000000 +0200
@@ -0,0 +1,37 @@
+.TH PDFETEX 1 "14 May 2010" "pdftex 1.40" "Web2C 2013"
+.\"=====================================================================
+.if n .ds MF Metafont
+.if t .ds MF M\s-2ETAFONT\s0
+.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
+.if n .ds TX TeX
+.if n .ds MF Metafont
+.if t .ds MF M\s-2ETAFONT\s0
+.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP\" for troff
+.el .ds OX TeX\" for nroff
+.\" the same but obliqued
+.\" BX definition must follow TX so BX can use TX
+.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
+.if n .ds BX BibTeX
+.\" LX definition must follow TX so LX can use TX
+.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX
+.if n .ds LX LaTeX
+.if t .ds AX \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(TX
+.if n .ds AX AmSTeX
+.if t .ds AY \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(LX
+.if n .ds AY AmSLaTeX
+.\"=====================================================================
+.SH NAME
+pdfetex \- PDF output from e-TeX
+.SH SYNOPSIS
+.B pdfetex
+.RI [ options ]
+.RI [ \fB&\fPformat ]
+.RI [ file | \fB\e\fPcommands ]
+.\"=====================================================================
+.SH DESCRIPTION
+pdfe\*(TX is another name for pdf\*(TX; they behave identically.
+See pdftex(1) for all information.
+.\"=====================================================================
+.SH "SEE ALSO"
+.BR pdftex (1),
+http://pdftex.org, http://tug.org/web2c.
Files old/texmf-dist/doc/man/man1/pdfetex.man1.pdf and new/texmf-dist/doc/man/man1/pdfetex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pdftex.1 new/texmf-dist/doc/man/man1/pdftex.1
--- old/texmf-dist/doc/man/man1/pdftex.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/pdftex.1 2013-04-08 23:16:34.000000000 +0200
@@ -0,0 +1,476 @@
+.TH PDFTEX 1 "1 March 2011" "pdftex 1.40" "Web2C 2013"
+.\"=====================================================================
+.if n .ds MF Metafont
+.if t .ds MF M\s-2ETAFONT\s0
+.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
+.if n .ds TX TeX
+.if n .ds MF Metafont
+.if t .ds MF M\s-2ETAFONT\s0
+.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP for troff
+.el .ds OX TeX for nroff
+.\" the same but obliqued
+.\" BX definition must follow TX so BX can use TX
+.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
+.if n .ds BX BibTeX
+.\" LX definition must follow TX so LX can use TX
+.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX
+.if n .ds LX LaTeX
+.if t .ds AX \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(TX
+.if n .ds AX AmSTeX
+.if t .ds AY \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(LX
+.if n .ds AY AmSLaTeX
+.if n .ds WB Web
+.if t .ds WB W\s-2EB\s0
+.\"=====================================================================
+.SH NAME
+pdftex, pdfinitex, pdfvirtex \- PDF output from TeX
+.SH SYNOPSIS
+.B pdftex
+.RI [ options ]
+.RI [ \fB&\fPformat ]
+.RI [ file | \fB\e\fPcommands ]
+.\"=====================================================================
+.SH DESCRIPTION
+Run the pdf\*(TX typesetter on
+.IR file ,
+usually creating
+.IR file.pdf .
+If the file argument has no extension, ".tex" will be appended to it.
+Instead of a filename, a set of pdf\*(TX commands can be given, the first
+of which must start with a backslash.
+With a
+.BI & format
+argument pdf\*(TX uses a different set of precompiled commands,
+contained in
+.IR format\fB.fmt\fP ;
+it is usually better to use the
+.B -fmt
+.I format
+option instead.
+.PP
+pdf\*(TX is a version of \*(TX, with the e-\*(TX extensions, that can create
+.I PDF
+files as well as
+.I DVI
+files.
+.PP
+In
+.I DVI
+mode, pdf\*(TX can be used as a complete replacement for the \*(TX
+engine.
+.PP
+The typical use of pdf\*(TX is with a pregenerated formats for which
+PDF output has been enabled. The
+.B pdftex
+command uses the equivalent of the plain \*(TX format, and the
+.B pdflatex
+command uses the equivalent of the \*(LX format.
+To generate formats, use the
+.B -ini
+switch.
+.PP
+The
+.B pdfinitex
+and
+.B pdfvirtex
+commands are pdf\*(TX's analogues to the
+.B initex
+and
+.B virtex
+commands. In this installation, if the links exist, they are symbolic
+links to the
+.B pdftex
+executable.
+.PP
+In
+.I PDF
+mode, pdf\*(TX can natively handle the
+.IR PDF ,
+.IR JPG ,
+.IR JBIG2 ,
+and
+.I PNG
+graphics formats. pdf\*(TX cannot include PostScript or Encapsulated
+PostScript (EPS) graphics files; first convert them to PDF using
+.BR epstopdf (1).
+pdf\*(TX's handling of its command-line arguments is similar to that of
+of the other \*(TX programs in the
+.I web2c
+implementation.
+.\"=====================================================================
+.SH OPTIONS
+This version of pdf\*(TX understands the following command line options.
+.TP
+.B -draftmode
+Sets \epdfdraftmode so pdf\*(TX doesn't write a PDF and doesn't read any
+included images, thus speeding up execution.
+.TP
+.B -enc
+Enable the enc\*(TX extensions. This option is only effective in
+combination with
+.BR -ini .
+For documentation of the enc\*(TX extensions see
+.BR http://www.olsak.net/enctex.html .
+.TP
+.B -etex
+Enable the e-\*(TX extensions. This option is only effective in
+combination with
+.BR -ini .
+See
+.BR etex (1).
+.TP
+.B -file-line-error
+Print error messages in the form
+.I file:line:error
+which is similar to the way many compilers format them.
+.TP
+.B -no-file-line-error
+Disable printing error messages in the
+.I file:line:error
+style.
+.TP
+.B -file-line-error-style
+This is the old name of the
+.B -file-line-error
+option.
+.TP
+.BI -fmt \ format
+Use
+.I format
+as the name of the format to be used, instead of the name by which
+pdf\*(TX was called or a
+.I %&
+line.
+.TP
+.B -halt-on-error
+Exit with an error code when an error is encountered during processing.
+.TP
+.B -help
+Print help message and exit.
+.TP
+.B -ini
+Start in
+.I INI
+mode, which is used to dump formats. The
+.I INI
+mode can be used for typesetting, but no format is preloaded, and
+basic initializations like setting catcodes may be required.
+.TP
+.BI -interaction \ mode
+Sets the interaction mode. The mode can be either
+.IR batchmode ,
+.IR nonstopmode ,
+.IR scrollmode ,
+and
+.IR errorstopmode .
+The meaning of these modes is the same as that of the corresponding
+\ecommands.
+.TP
+.B -ipc
+Send DVI or PDF output to a socket as well as the usual output file.
+Whether this option is available is the choice of the installer.
+.TP
+.B -ipc-start
+As
+.BR -ipc ,
+and starts the server at the other end as well. Whether this option
+is available is the choice of the installer.
+.TP
+.BI -jobname \ name
+Use
+.I name
+for the job name, instead of deriving it from the name of the input file.
+.TP
+.BI -kpathsea-debug \ bitmask
+Sets path searching debugging flags according to the bitmask. See the
+.I Kpathsea
+manual for details.
+.TP
+.BI -mktex \ fmt
+Enable
+.RI mktex fmt ,
+where
+.I fmt
+must be either
+.I tex
+or
+.IR tfm .
+.TP
+.B -mltex
+Enable ML\*(TX extensions. Only effective in combination with
+.BR -ini .
+.TP
+.BI -no-mktex \ fmt
+Disable
+.RI mktex fmt ,
+where
+.I fmt
+must be either
+.I tex
+or
+.IR tfm .
+.TP
+.BI -output-comment \ string
+In
+.I DVI
+mode, use
+.I string
+for the
+.I DVI
+file comment instead of the date. This option is ignored
+in
+.I PDF
+mode.
+.TP
+.BI -output-directory \ directory
+Write output files in
+.I directory
+instead of the current directory. Look up input files in
+.I directory
+first, the along the normal search path.
+.TP
+.BI -output-format \ format
+Set the output format mode, where
+.I format
+must be either
+.I pdf
+or
+.IR dvi .
+This also influences the set of graphics formats understood by pdf\*(TX.
+.TP
+.B -parse-first-line
+If the first line of the main input file begins with
+.I %&
+parse it to look for a dump name or a
+.B -translate-file
+option.
+.TP
+.B -no-parse-first-line
+Disable parsing of the first line of the main input file.
+.TP
+.BI -progname \ name
+Pretend to be program
+.IR name .
+This affects both the format used and the search paths.
+.TP
+.B -recorder
+Enable the filename recorder.
+This leaves a trace of the files opened for input and output
+in a file with extension
+.IR .fls .
+.TP
+.B -shell-escape
+Enable the
+.BI \ewrite18{ command }
+construct. The
+.I command
+can be any shell command. This construct is normally
+disallowed for security reasons.
+.TP
+.B -no-shell-escape
+Disable the
+.BI \ewrite18{ command }
+construct, even if it is enabled in the
+.I texmf.cnf
+file.
+.TP
+.B -src-specials
+In
+.I DVI
+mode, insert source specials into the
+.I DVI
+file.
+This option is ignored in
+.I PDF
+mode.
+.TP
+.BI -src-specials \ where
+In
+.I DVI
+mode, insert source specials in certain placed of the
+.I DVI
+file.
+.I where
+is a comma-separated value list:
+.IR cr ,
+.IR display ,
+.IR hbox ,
+.IR math ,
+.IR par ,
+.IR parent ,
+or
+.IR vbox .
+This option is ignored in
+.I PDF
+mode.
+.TP
+.BI -translate-file \ tcxname
+Use the
+.I tcxname
+translation table to set the mapping of input characters and
+re-mapping of output characters.
+.TP
+.BI -default-translate-file \ tcxname
+Like
+.B -translate-file
+except that a
+.I %&
+line can overrule this setting.
+.TP
+.B -version
+Print version information and exit.
+.\"=====================================================================
+.SH ENVIRONMENT
+See the Kpathsearch library documentation (the `Path specifications'
+node) for precise details of how the environment variables are used.
+The
+.B kpsewhich
+utility can be used to query the values of the variables.
+.PP
+One caveat: In most pdf\*(TX formats, you cannot use ~ in a filename you
+give directly to pdf\*(TX, because ~ is an active character, and hence is
+expanded, not taken as part of the filename. Other programs, such as
+\*(MF, do not have this problem.
+.PP
+.TP
+.B TEXMFOUTPUT
+Normally, pdf\*(TX puts its output files in the current directory. If
+any output file cannot be opened there, it tries to open it in the
+directory specified in the environment variable TEXMFOUTPUT.
+There is no default value for that variable. For example, if you say
+.I pdftex paper
+and the current directory is not writable and TEXMFOUTPUT has
+the value
+.IR /tmp ,
+pdf\*(TX attempts to create
+.I /tmp/paper.log
+(and
+.IR /tmp/paper.pdf ,
+if any output is produced.) TEXMFOUTPUT is also checked for input
+files, as \*(TX often generates files that need to be subsequently
+read; for input, no suffixes (such as ``.tex'') are added by default,
+the input name is simply checked as given.
+.TP
+.B TEXINPUTS
+Search path for
+.I \einput
+and
+.I \eopenin
+files.
+This should start with ``.'', so
+that user files are found before system files. An empty path
+component will be replaced with the paths defined in the
+.I texmf.cnf
+file. For example, set TEXINPUTS to ".:/home/user/tex:" to prepend the
+current directory and ``/home/user/tex'' to the standard search path.
+.TP
+.B TEXFORMATS
+Search path for format files.
+.TP
+.B TEXPOOL
+search path for
+.B pdftex
+internal strings.
+.TP
+.B TEXEDIT
+Command template for switching to editor. The default, usually
+.BR vi ,
+is set when pdf\*(TX is compiled.
+.TP
+.B TFMFONTS
+Search path for font metric
+.RI ( .tfm )
+files.
+.\"=====================================================================
+.SH FILES
+The location of the files mentioned below varies from system to
+system. Use the
+.B kpsewhich
+utility to find their locations.
+.TP
+.I pdftex.pool
+Text file containing pdf\*(TX's internal strings.
+.TP
+.I pdftex.map
+Filename mapping definitions.
+.TP
+.I *.tfm
+Metric files for pdf\*(TX's fonts.
+.TP
+.I *.fmt
+Predigested pdf\*(TX format (.\|fmt) files.
+.br
+.\"=====================================================================
+.SH NOTES
+Starting with version 1.40, pdf\*(TX incorporates the e-\*(TX
+extensions, and pdfe\*(TX is just a copy of pdf\*(TX. See
+.BR etex (1).
+This manual page is not meant to be exhaustive. The complete
+documentation for this version of pdf\*(TX can be found in the
+.IR "pdf\*(TX manual"
+and the info manual
+.IR "Web2C: A TeX implementation" .
+.\"=====================================================================
+.SH BUGS
+This version of pdf\*(TX implements a number of optional extensions.
+In fact, many of these extensions conflict to a greater or lesser
+extent with the definition of pdf\*(TX. When such extensions are
+enabled, the banner printed when pdf\*(TX starts is changed to print
+.B pdfTeXk
+instead of
+.BR pdfTeX .
+.PP
+This version of pdf\*(TX fails to trap arithmetic overflow when
+dimensions are added or subtracted. Cases where this occurs are rare,
+but when it does the generated
+.I DVI
+file will be invalid. Whether a generated
+.I PDF
+file would be usable is unknown.
+.\"=====================================================================
+.SH AVAILABILITY
+pdf\*(TX is available for a large variety of machine architectures
+and operation systems.
+pdf\*(TX is part of all major \*(TX distributions.
+.P
+Information on how to get pdf\*(TX and related information
+is available at the
+.B http://www.pdftex.org
+.IR "pdf\*(TX"
+web site.
+.P
+The following pdfe\*(TX related mailing list is available:
+.BR pdftex@tug.org .
+This is a mailman list;
+to subscribe send a message containing
+.I subscribe
+to
+.BR pdftex-request@tug.org .
+A web interface and list archives can be found at the
+.B "http://lists.tug.org/pdftex"
+mailing list web site.
+.\"=====================================================================
+.SH "SEE ALSO"
+.BR epstopdf (1),
+.BR etex (1),
+.BR latex (1),
+.BR mptopdf (1),
+.BR tex (1),
+.BR mf (1).
+http://tug.org/applications/pdftex, http://tug.org/web2c.
+.\"=====================================================================
+.SH AUTHORS
+The primary authors of pdf\*(TX are Han The Thanh, Petr Sojka,
+Jiri Zlatuska, and Peter Breitenlohner (e\*(TX).
+.PP
+\*(TX was designed by Donald E. Knuth,
+who implemented it using his \*(WB system for Pascal programs.
+It was ported to Unix at Stanford by Howard Trickey, and
+at Cornell by Pavel Curtis.
+The version now offered with the Unix \*(TX distribution is that
+generated by the \*(WB to C system
+.RB ( web2c ),
+originally written by Tomas Rokicki and Tim Morgan.
+.PP
+The enc\*(TX extensions were written by Petr Olsak.
+.\" vim: syntax=nroff
Files old/texmf-dist/doc/man/man1/pdftex.man1.pdf and new/texmf-dist/doc/man/man1/pdftex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/pdftex-pdfkeys/pdftex-pdfkeys.tex new/texmf-dist/doc/pdftex/pdftex-pdfkeys/pdftex-pdfkeys.tex
--- old/texmf-dist/doc/pdftex/pdftex-pdfkeys/pdftex-pdfkeys.tex 2006-01-03 01:00:18.000000000 +0100
+++ new/texmf-dist/doc/pdftex/pdftex-pdfkeys/pdftex-pdfkeys.tex 2013-01-22 00:51:04.000000000 +0100
@@ -2,7 +2,7 @@
% Copyright (c) 2001 Martin Schr�der
% Permission is granted to copy, distribute and/or modify this document
% under the terms of the GNU Free Documentation License, Version 1.1 or
-% any later version published by the Free Software Foundation; with with
+% any later version published by the Free Software Foundation; with
% no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
% Texts.
% A copy of the license is included in the appendix entitled "GNU Free
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdftex.doc.tlpobj new/tlpkg/tlpobj/pdftex.doc.tlpobj
--- old/tlpkg/tlpobj/pdftex.doc.tlpobj 2012-05-06 04:36:18.000000000 +0200
+++ new/tlpkg/tlpobj/pdftex.doc.tlpobj 2013-05-28 17:08:04.000000000 +0200
@@ -1,8 +1,12 @@
name pdftex.doc
category TLCore
-revision 26213
+revision 30753
shortdesc doc files of pdftex
docfiles size=1161
+ texmf-dist/doc/man/man1/pdfetex.1
+ texmf-dist/doc/man/man1/pdfetex.man1.pdf
+ texmf-dist/doc/man/man1/pdftex.1
+ texmf-dist/doc/man/man1/pdftex.man1.pdf
texmf-dist/doc/pdftex/Announcement-1.40.2
texmf-dist/doc/pdftex/NEWS
texmf-dist/doc/pdftex/README
@@ -50,7 +54,3 @@
texmf-dist/doc/pdftex/thanh/ext/mktfm8z
texmf-dist/doc/pdftex/thanh/ext/protcode.tex
texmf-dist/doc/pdftex/thanh/ext/ufntinst.sty
- texmf/doc/man/man1/pdfetex.1
- texmf/doc/man/man1/pdfetex.man1.pdf
- texmf/doc/man/man1/pdftex.1
- texmf/doc/man/man1/pdftex.man1.pdf
++++++ pdftex.tar.xz ++++++
++++ 89288 lines of diff (skipped)
++++++ pdftools.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/e2pall.1 new/texmf/doc/man/man1/e2pall.1
--- old/texmf/doc/man/man1/e2pall.1 2006-01-03 01:00:18.000000000 +0100
+++ new/texmf/doc/man/man1/e2pall.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-.TH "e2pall" "1" "August 2000" "teTeX" "teTeX"
-.PP
-.SH "NAME"
-e2pall \- convert all EPS files in a LaTeX document to PDF
-.PP
-.SH "SYNOPSIS"
-.PP
-\fBe2pall\fP \fITEXFILE\fP
-.PP
-.SH "DESCRIPTION"
-.PP
-\fBe2pall\fP searches through \fITEXFILE\fP for \eincludegraphics
-commands to find the base names of image files\&. When it finds one,
-\fBe2pall\fP runs \fBepstopdf\fP(1) to create a PDF file from the EPS
-file\&.
-.PP
-\fBe2pall\fP will check to be sure that an existing PDF file is
-up-to-date with the EPS file, and will not run \fBepstopdf\fP(1) if
-the PDF file is newer than the EPS file\&.
-.PP
-.SH "BUGS"
-.PP
-.IP ""
-Seems to be broken
-.IP ""
-Cannot handle \einput{\fIfilename\fP} or
-\eincludegraphics{\fIfilename\fP} split over more than one
-line
-.IP ""
-Must be run from same directory as the LaTeX file
-.IP ""
-Does not look down $TEXINPUTS
-.IP ""
-Cannot handle documents that use \einclude commands
-.IP ""
-Assumes \fIall\fP files included with \eincludegraphics are EPS
-files
-.IP
-.PP
-.SH "SEE ALSO"
-.PP
-\fBepstopdf\fP(1)
-.PP
-.SH "AUTHOR"
-.PP
-\fBe2pall\fP was written by Jody Klymak and published in a posting to
-the (mailing list)\&.
-.PP
-This manual page was written by C\&.M\&. Connelly
-, for
-the Debian GNU/Linux system\&. It may be used by other distributions
-without contacting the author\&. Any mistakes or omissions in the
-manual page are my fault; inquiries about or corrections to this
-manual page should be directed to me (and not to the primary author)\&.
-.PP
Files old/texmf/doc/man/man1/e2pall.man1.pdf and new/texmf/doc/man/man1/e2pall.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/pdfclose.1 new/texmf/doc/man/man1/pdfclose.1
--- old/texmf/doc/man/man1/pdfclose.1 2011-05-19 10:00:00.000000000 +0200
+++ new/texmf/doc/man/man1/pdfclose.1 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-.so man1/pdfopen.1
Files old/texmf/doc/man/man1/pdfclose.man1.pdf and new/texmf/doc/man/man1/pdfclose.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/pdfopen.1 new/texmf/doc/man/man1/pdfopen.1
--- old/texmf/doc/man/man1/pdfopen.1 2011-05-31 17:20:08.000000000 +0200
+++ new/texmf/doc/man/man1/pdfopen.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,157 +0,0 @@
-.\" This manpage is licensed under the GNU Public License
-.TH PDFOPEN 1 2011-05-17 "pdfopen 0.82" ""
-.
-.SH NAME
-pdfopen, pdfclose \- open or close a PDF file viewer
-.
-.SH SYNOPSIS
-.B pdfopen
-[\fIOPTION\fP]
-\fIFILE.PDF\fP
-.br
-.B pdfclose
-\fIFILE.PDF\fP
-.
-.SH OPTIONS
-.TP 8
-.B -h, --help
-output help and exit
-.TP
-.B -v, --version
-output the version number and exit
-.TP
-.B -viewer
-<\fIar9\fP|\fIar9-tab\fP|\fIar8\fP|\fIar7\fP|\fIar5\fP|\fIxpdf\fP|\fIevince\fP>
-use (respectively) Adobe Reader 9 (in a new window), Adobe Reader 9
-(in a new tab of a running AR9, if any),
-Adobe Reader 8, Adobe Reader 7, Adobe Reader 5, xpdf or evince as the
-PDF viewer program.
-Adobe Reader 9 (in a new window) is the default.
-.
-.SH RATIONALE
-At certain points of TeX document preparation, many people repeat a
-"edit-compile-view" cycle. Since PDF viewers such as Adobe's Acrobat
-Reader ("\fBacroread\fP") do not automatically refresh the display when the
-PDF file changes, this cycle can be more cumbersome than desired.
-The
-.B pdfopen
-program provides the ability to automate the reloading of the PDF
-document when it is changed.
-
-Note: there seems to be little need for
-.B pdfclose
-under GNU/Linux, since (unlike the situation for MS windows)
-.B acroread
-does not lock the PDF file, which would prevent
-.B pdftex
-(or a DVI to PDF converter) from creating a new version of the PDF
-output file. However,
-.B pdfclose
-is provided in case someone finds it useful.
-.
-.SH DESCRIPTION
-.B pdfopen
-searches for an instance of the specified (or default) PDF viewer
-displaying the specified PDF file.
-If there is already an instance of the given viewer displaying the
-given file, the viewer is instructed to reload the file. If no such
-instance is found, \fBpdfopen\fP attempts to run the specified viewer
-on the specified document.
-
-The default viewer is "\fBacroread\fP", which could start any one
-of a number of versions of Acrobat Reader, depending on what is
-installed on your system. However, the commands to reload the current
-document vary from one version of \fBacroread\fP to another;
-consequently, if you are using a version of \fBacroread\fP other than
-AR9, you should explicitly specify the viewer program.
-
-Version 0.81 of \fBpdfopen\fP accepts the following viewer options:
-.br
-\fIar9\fP, \fIar9-tab\fP, \fIar8\fP, \fIar7\fP, \fIar5\fP, \fIxpdf\fP,
-and \fIevince\fP.
-.br
-The difference between \fIar9\fP and \fIar9-tab\fP is significant
-when there is no instance of AR9 already displaying the requested
-document. In this situation, while \fIar9\fP will
-request \fBacroread\fP to create a new instance of \fBacroread\fP
-(and thus open a new window) by using the \fB-openInNewInstance\fP
-argument, \fIar9-tab\fP starts \fBacroread\fP without this argument;
-if there is already an instance of \fBacroread\fP running, a new
-tab will be opened in an existing window.
-
-.B pdfclose
-searches for one of the above PDF viewers displaying the given file
-and instructs the viewer to "close" the window. In most cases, the
-PDF viewer continues to run, possibly now displaying just a blank
-window. (This behaviour varies somewhat from one PDF viewer to another.)
-.
-.SH PORTABILITY AND AVAILABILITY
-Users familiar with the Windows version of
-.B pdfopen
-might wonder about the lack of a
-.B --page
-.IR <pagenumber>
-option. Unfortunately, to date no GNU/Linux versions of
-.B acroread
-support this feature. Anyone having a friend at Adobe is encouraged
-to ask them to implement a
-"\fB-page \fP\fI<pagenumber>\fP"
-command line option for \fBacroread\fP.
-
-These programs have been tested on Slackware64 Version 13.1 and a few
-other versions / distributions of GNU/Linux. The code is reasonably
-generic and should work out of the box using most recent X11
-implementations. (Reports to the contrary are welcome, particularly
-if they come with robust fixes.)
-
-These programs are designed for X11-based systems. If you somehow
-find compiled versions of these programs on a system using another
-window system, they are very unlikely to be of any use to you.
-
-Source and binaries of the programs can be downloaded from
-CTAN://support/xpdfopen/
-(e.g., http://mirror.ctan.org/support/xpdfopen).
-.
-.SH CAVEATS
-If you use
-.I ar9-tab
-to reload the PDF document and the instance
-of
-.B acroread
-with the given document is currently displaying some other document,
-the command causes your document to be displayed, but not reloaded.
-
-.B pdfopen
-works by looking for a window with a name (window title) matching that
-expected for the given viewer and document. If for some reason your
-viewer's window name is not as expected,
-.B pdfopen
-may not work for you.
-
-With at least AR9 and some window managers, using
-.B pdfopen
-to reload the document gives focus to the
-.B acroread
-window, even though the mouse cursor is not necessarily in that
-window. This can be annoying. A contribution from an X11 wizard to
-retain focus in the current window (or to restore focus to that
-window after reloading the PDF document) would be cheerily accepted.
-.
-.SH AUTHOR
-This manual page was written by Jim Diamond .
-I am the current maintainer of the X11 versions of
-.B pdfopen
-and
-\fBpdfclose\fP.
-Report any bugs you find to me. Feature enhancement requests are
-welcome, coded enhancements even more so.
-
-Past authors:
-Fabrice Popineau wrote the MS-windows versions of
-.B pdfopen
-and
-.B pdfclose
-upon which these programs were originally based.
-Taco Hoekwater created the GNU/Linux versions, up to Version 0.61
-(including some documentation which inspired parts of this man page).
-
Files old/texmf/doc/man/man1/pdfopen.man1.pdf and new/texmf/doc/man/man1/pdfopen.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/pdftosrc.1 new/texmf/doc/man/man1/pdftosrc.1
--- old/texmf/doc/man/man1/pdftosrc.1 2010-05-19 10:40:53.000000000 +0200
+++ new/texmf/doc/man/man1/pdftosrc.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,237 +0,0 @@
-.\" Process this file with
-.\" groff -man -Tascii pdftosrc.1
-.\"
-.\" $Id: pdftosrc.1,v 1.5 2006/12/22 23:46:23 hhenkel Exp $
-.\"
-.TH pdftosrc 1 "23 December 2006" "User Manuals"
-.SH NAME
-pdftosrc \- extract source file or stream from PDF file
-.SH SYNOPSIS
-.B pdftosrc
-.I PDF-file
-.RI [ stream-object-number ]
-.SH DESCRIPTION
-If only
-.I PDF-file
-is given as argument,
-.B pdftosrc
-extracts the embedded source file
-from the first found stream object
-with /Type /SourceFile within the
-.I PDF-file
-and writes it to a file with the name /SourceName
-as defined in that PDF stream object
-(see application example below).
-
-If both
-.I PDF-file
-and
-.I stream-object-number
-are given as arguments, and
-.I stream-object-number
-is positive,
-.B pdftosrc
-extracts and uncompresses the PDF stream of the object
-given by its
-.I stream-object-number
-from the
-.I PDF-file
-and writes it to a file named
-.IR PDF-file . stream-object-number
-with the ending
-.B .pdf
-or
-.B .PDF
-stripped from the original
-.I PDF-file
-name.
-
-A special case is related to XRef object streams that are part
-of the PDF standard from PDF-1.5 onward:
-If
-.I stream-object-number
-equals -1,
-then
-.B pdftosrc
-decompresses the XRef stream from the PDF file and writes it
-in human-readable PDF cross-reference table format to a file named
-.IB PDF-file .xref
-(these XRef streams can not be extracted just by giving their object number).
-
-In any case
-an existing file with the output file name will be overwritten.
-.SH OPTIONS
-None.
-.SH FILES
-Just the executable
-.BR pdftosrc .
-.SH ENVIRONMENT
-None.
-.SH DIAGNOSTICS
-At success the exit code of
-.B pdftosrc
-is 0, else 1.
-
-All messages go to stderr.
-At program invocation,
-.B pdftosrc
-issues the current version number of the program
-.BR xpdf ,
-on which
-.B pdftosrc
-is based:
-
-.RS
-pdftosrc version 3.01
-
-.RE
-When
-.B pdftosrc
-was successful with the output file writing,
-one of the following messages will be issued:
-
-.RS
-Source file extracted to
-.I source-file-name
-
-.RE
-or
-
-.RS
-Stream object extracted to
-.IR PDF-file . stream-object-number
-
-.RE
-or
-
-.RS
-Cross-reference table extracted to
-.IR PDF-file .xref
-
-.RE
-
-.RE
-When the object given by the
-.I stream-object-number
-does not contain a stream,
-.B pdftosrc
-issues the following error message:
-
-.RS
-Not a Stream object
-
-.RE
-When the
-.I PDF-file
-can't be opened, the error message is:
-
-.RS
-Error: Couldn't open file
-.RI ' PDF-file '.
-
-.RE
-When
-.B pdftosrc
-encounters an invalid PDF file,
-the error message (several lines) is:
-
-.RS
-Error: May not be a PDF file (continuing anyway)
-.RE
-.RS
-(more lines)
-.RE
-.RS
-Invalid PDF file
-
-.RE
-There are also more error messages from
-.B pdftosrc
-for various kinds of broken PDF files.
-.SH NOTES
-An embedded source file will be written out unchanged,
-i. e. it will not be uncompressed in this process.
-
-Only the stream of the object will be written,
-i. e. not the dictionary of that object.
-
-Knowing which
-.I stream-object-number
-to query requires information about the PDF file
-that has to be gained elsewhere,
-e. g. by looking into the PDF file with an editor.
-
-The stream extraction capabilities of
-.B pdftosrc
-(e. g. regarding understood PDF versions and filter types)
-follow the capabilities of the underlying
-.B xpdf
-program version.
-
-Currently the generation number of the stream object
-is not supported.
-The default value 0 (zero) is taken.
-
-The wording
-.I stream-object-number
-has nothing to do with the `object streams' introduced
-by the Adobe PDF Reference,
-5th edition, version 1.6.
-.SH EXAMPLES
-When using pdftex,
-a source file can be embedded into some
-.I PDF-file
-by using pdftex primitives,
-as illustrated by the following example:
-
-\\immediate\\pdfobj
-.RE
- stream attr {/Type /SourceFile /SourceName (myfile.zip)}
-.RS
-.RE
- file{myfile.zip}
-.RS
-.RE
-\\pdfcatalog{/SourceObject \\the\\pdflastobj\\space 0 R}
-
-Then this zip file can be extracted from the
-.I PDF-file
-by calling
-.B pdftosrc
-.IR PDF-file .
-.SH BUGS
-Not all embedded source files will be extracted,
-only the first found one.
-
-Email bug reports to
-.B pdftex@tug.org.
-.SH SEE ALSO
-.BR xpdf (1),
-.BR pdfimages (1),
-.BR pdftotext (1),
-.BR pdftex (1),
-.SH AUTHORS
-.B pdftosrc
-written by Han The Thanh, using
-.B xpdf
-functionality from Derek Noonburg.
-
-Man page written by Hartmut Henkel.
-.SH COPYRIGHT
-Copyright (c) 1996-2006 Han The Thanh,
-
-This file is part of pdfTeX.
-
-pdfTeX is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-pdfTeX is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with pdfTeX; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Files old/texmf/doc/man/man1/pdftosrc.man1.pdf and new/texmf/doc/man/man1/pdftosrc.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/e2pall.1 new/texmf-dist/doc/man/man1/e2pall.1
--- old/texmf-dist/doc/man/man1/e2pall.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/e2pall.1 2006-01-03 01:00:18.000000000 +0100
@@ -0,0 +1,55 @@
+.TH "e2pall" "1" "August 2000" "teTeX" "teTeX"
+.PP
+.SH "NAME"
+e2pall \- convert all EPS files in a LaTeX document to PDF
+.PP
+.SH "SYNOPSIS"
+.PP
+\fBe2pall\fP \fITEXFILE\fP
+.PP
+.SH "DESCRIPTION"
+.PP
+\fBe2pall\fP searches through \fITEXFILE\fP for \eincludegraphics
+commands to find the base names of image files\&. When it finds one,
+\fBe2pall\fP runs \fBepstopdf\fP(1) to create a PDF file from the EPS
+file\&.
+.PP
+\fBe2pall\fP will check to be sure that an existing PDF file is
+up-to-date with the EPS file, and will not run \fBepstopdf\fP(1) if
+the PDF file is newer than the EPS file\&.
+.PP
+.SH "BUGS"
+.PP
+.IP ""
+Seems to be broken
+.IP ""
+Cannot handle \einput{\fIfilename\fP} or
+\eincludegraphics{\fIfilename\fP} split over more than one
+line
+.IP ""
+Must be run from same directory as the LaTeX file
+.IP ""
+Does not look down $TEXINPUTS
+.IP ""
+Cannot handle documents that use \einclude commands
+.IP ""
+Assumes \fIall\fP files included with \eincludegraphics are EPS
+files
+.IP
+.PP
+.SH "SEE ALSO"
+.PP
+\fBepstopdf\fP(1)
+.PP
+.SH "AUTHOR"
+.PP
+\fBe2pall\fP was written by Jody Klymak and published in a posting to
+the (mailing list)\&.
+.PP
+This manual page was written by C\&.M\&. Connelly
+, for
+the Debian GNU/Linux system\&. It may be used by other distributions
+without contacting the author\&. Any mistakes or omissions in the
+manual page are my fault; inquiries about or corrections to this
+manual page should be directed to me (and not to the primary author)\&.
+.PP
Files old/texmf-dist/doc/man/man1/e2pall.man1.pdf and new/texmf-dist/doc/man/man1/e2pall.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pdfclose.1 new/texmf-dist/doc/man/man1/pdfclose.1
--- old/texmf-dist/doc/man/man1/pdfclose.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/pdfclose.1 2011-05-19 10:00:00.000000000 +0200
@@ -0,0 +1 @@
+.so man1/pdfopen.1
Files old/texmf-dist/doc/man/man1/pdfclose.man1.pdf and new/texmf-dist/doc/man/man1/pdfclose.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pdfopen.1 new/texmf-dist/doc/man/man1/pdfopen.1
--- old/texmf-dist/doc/man/man1/pdfopen.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/pdfopen.1 2012-05-28 19:40:26.000000000 +0200
@@ -0,0 +1,160 @@
+.\" This manpage is licensed under the GNU Public License
+.TH PDFOPEN 1 2012-01-28 "pdfopen 0.83" ""
+.
+.SH NAME
+pdfopen, pdfclose \- open or close a PDF file viewer
+.
+.SH SYNOPSIS
+.B pdfopen
+[\fIOPTION\fP]
+\fIFILE.PDF\fP
+.br
+.B pdfclose
+\fIFILE.PDF\fP
+.
+.SH OPTIONS
+.TP 8
+.B -h, --help
+output help and exit
+.TP
+.B -v, --version
+output the version number and exit
+.TP
+.B -r, --reset_focus
+after sending commands to the PDF viewer, attempt to reset the input focus to
+the window which had focus before the commands were sent
+.TP
+.B -viewer
+<\fIar9\fP|\fIar9-tab\fP|\fIar8\fP|\fIar7\fP|\fIar5\fP|\fIxpdf\fP|\fIevince\fP>
+use (respectively) Adobe Reader 9 (in a new window), Adobe Reader 9
+(in a new tab of a running AR9, if any),
+Adobe Reader 8, Adobe Reader 7, Adobe Reader 5, xpdf or evince as the
+PDF viewer program.
+Adobe Reader 9 (in a new window) is the default.
+.
+.SH RATIONALE
+At certain points of TeX document preparation, many people repeat a
+"edit-compile-view" cycle. Since PDF viewers such as Adobe's Acrobat
+Reader ("\fBacroread\fP") do not automatically refresh the display when the
+PDF file changes, this cycle can be more cumbersome than desired.
+The
+.B pdfopen
+program provides the ability to automate the reloading of the PDF
+document when it is changed.
+
+Note: there seems to be little need for
+.B pdfclose
+under GNU/Linux, since (unlike the situation for MS windows)
+.B acroread
+does not lock the PDF file, which would prevent
+.B pdftex
+(or a DVI to PDF converter) from creating a new version of the PDF
+output file. However,
+.B pdfclose
+is provided in case someone finds it useful.
+.
+.SH DESCRIPTION
+.B pdfopen
+searches for an instance of the specified (or default) PDF viewer
+displaying the specified PDF file.
+If there is already an instance of the given viewer displaying the
+given file, the viewer is instructed to reload the file. If no such
+instance is found, \fBpdfopen\fP attempts to run the specified viewer
+on the specified document.
+
+The default viewer is "\fBacroread\fP", which could start any one
+of a number of versions of Acrobat Reader, depending on what is
+installed on your system. However, the commands to reload the current
+document vary from one version of \fBacroread\fP to another;
+consequently, if you are using a version of \fBacroread\fP other than
+AR9, you should explicitly specify the viewer program.
+
+Version 0.83 of \fBpdfopen\fP accepts the following viewer options:
+.br
+\fIar9\fP, \fIar9-tab\fP, \fIar8\fP, \fIar7\fP, \fIar5\fP, \fIxpdf\fP,
+and \fIevince\fP.
+.br
+The difference between \fIar9\fP and \fIar9-tab\fP is significant
+when there is no instance of AR9 already displaying the requested
+document. In this situation, while \fIar9\fP will
+request \fBacroread\fP to create a new instance of \fBacroread\fP
+(and thus open a new window) by using the \fB-openInNewInstance\fP
+argument, \fIar9-tab\fP starts \fBacroread\fP without this argument;
+if there is already an instance of \fBacroread\fP running, a new
+tab will be opened in an existing window.
+
+.B pdfclose
+searches for one of the above PDF viewers displaying the given file
+and instructs the viewer to "close" the window. In most cases, the
+PDF viewer continues to run, possibly now displaying just a blank
+window. (This behaviour varies somewhat from one PDF viewer to another.)
+.
+.SH PORTABILITY AND AVAILABILITY
+Users familiar with the Windows version of
+.B pdfopen
+might wonder about the lack of a
+.B --page
+.IR <pagenumber>
+option. Unfortunately, to date no GNU/Linux versions of
+.B acroread
+support this feature. Anyone having a friend at Adobe is encouraged
+to ask them to implement a
+"\fB-page \fP\fI<pagenumber>\fP"
+command line option for \fBacroread\fP.
+
+These programs have been tested on Slackware64 Version 13.37 and a few
+other versions / distributions of GNU/Linux. The code is reasonably
+generic and should work out of the box using most recent X11
+implementations. (Reports to the contrary are welcome, particularly
+if they come with robust fixes.)
+
+These programs are designed for X11-based systems. If you somehow
+find compiled versions of these programs on a system using another
+window system, they are very unlikely to be of any use to you.
+
+Source and binaries of the programs can be downloaded from
+CTAN://support/xpdfopen/
+(e.g., http://mirror.ctan.org/support/xpdfopen).
+.
+.SH CAVEATS
+If you use
+.I ar9-tab
+to reload the PDF document and the instance
+of
+.B acroread
+with the given document is currently displaying some other document,
+the command causes your document to be displayed, but not reloaded.
+
+.B pdfopen
+works by looking for a window with a name (window title) matching that
+expected for the given viewer and document. If for some reason your
+viewer's window name is not as expected,
+.B pdfopen
+may not work for you.
+
+With at least AR9 and some window managers, using
+.B pdfopen
+to reload the document gives focus to the
+.B acroread
+window, even though the mouse cursor is not necessarily in that
+window. This can be annoying. The \fB-reset_focus\fP option can be
+used to deal with this problem.
+.
+.SH AUTHOR
+This manual page was written by Jim Diamond .
+I am the current maintainer of the X11 versions of
+.B pdfopen
+and
+\fBpdfclose\fP.
+Report any bugs you find to me. Feature enhancement requests are
+welcome, coded enhancements even more so.
+
+Past authors:
+Fabrice Popineau wrote the MS-windows versions of
+.B pdfopen
+and
+.B pdfclose
+upon which these programs were originally based.
+Taco Hoekwater created the GNU/Linux versions, up to Version 0.61
+(including some documentation which inspired parts of this man page).
+
Files old/texmf-dist/doc/man/man1/pdfopen.man1.pdf and new/texmf-dist/doc/man/man1/pdfopen.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pdftosrc.1 new/texmf-dist/doc/man/man1/pdftosrc.1
--- old/texmf-dist/doc/man/man1/pdftosrc.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/pdftosrc.1 2010-05-19 10:40:53.000000000 +0200
@@ -0,0 +1,237 @@
+.\" Process this file with
+.\" groff -man -Tascii pdftosrc.1
+.\"
+.\" $Id: pdftosrc.1,v 1.5 2006/12/22 23:46:23 hhenkel Exp $
+.\"
+.TH pdftosrc 1 "23 December 2006" "User Manuals"
+.SH NAME
+pdftosrc \- extract source file or stream from PDF file
+.SH SYNOPSIS
+.B pdftosrc
+.I PDF-file
+.RI [ stream-object-number ]
+.SH DESCRIPTION
+If only
+.I PDF-file
+is given as argument,
+.B pdftosrc
+extracts the embedded source file
+from the first found stream object
+with /Type /SourceFile within the
+.I PDF-file
+and writes it to a file with the name /SourceName
+as defined in that PDF stream object
+(see application example below).
+
+If both
+.I PDF-file
+and
+.I stream-object-number
+are given as arguments, and
+.I stream-object-number
+is positive,
+.B pdftosrc
+extracts and uncompresses the PDF stream of the object
+given by its
+.I stream-object-number
+from the
+.I PDF-file
+and writes it to a file named
+.IR PDF-file . stream-object-number
+with the ending
+.B .pdf
+or
+.B .PDF
+stripped from the original
+.I PDF-file
+name.
+
+A special case is related to XRef object streams that are part
+of the PDF standard from PDF-1.5 onward:
+If
+.I stream-object-number
+equals -1,
+then
+.B pdftosrc
+decompresses the XRef stream from the PDF file and writes it
+in human-readable PDF cross-reference table format to a file named
+.IB PDF-file .xref
+(these XRef streams can not be extracted just by giving their object number).
+
+In any case
+an existing file with the output file name will be overwritten.
+.SH OPTIONS
+None.
+.SH FILES
+Just the executable
+.BR pdftosrc .
+.SH ENVIRONMENT
+None.
+.SH DIAGNOSTICS
+At success the exit code of
+.B pdftosrc
+is 0, else 1.
+
+All messages go to stderr.
+At program invocation,
+.B pdftosrc
+issues the current version number of the program
+.BR xpdf ,
+on which
+.B pdftosrc
+is based:
+
+.RS
+pdftosrc version 3.01
+
+.RE
+When
+.B pdftosrc
+was successful with the output file writing,
+one of the following messages will be issued:
+
+.RS
+Source file extracted to
+.I source-file-name
+
+.RE
+or
+
+.RS
+Stream object extracted to
+.IR PDF-file . stream-object-number
+
+.RE
+or
+
+.RS
+Cross-reference table extracted to
+.IR PDF-file .xref
+
+.RE
+
+.RE
+When the object given by the
+.I stream-object-number
+does not contain a stream,
+.B pdftosrc
+issues the following error message:
+
+.RS
+Not a Stream object
+
+.RE
+When the
+.I PDF-file
+can't be opened, the error message is:
+
+.RS
+Error: Couldn't open file
+.RI ' PDF-file '.
+
+.RE
+When
+.B pdftosrc
+encounters an invalid PDF file,
+the error message (several lines) is:
+
+.RS
+Error: May not be a PDF file (continuing anyway)
+.RE
+.RS
+(more lines)
+.RE
+.RS
+Invalid PDF file
+
+.RE
+There are also more error messages from
+.B pdftosrc
+for various kinds of broken PDF files.
+.SH NOTES
+An embedded source file will be written out unchanged,
+i. e. it will not be uncompressed in this process.
+
+Only the stream of the object will be written,
+i. e. not the dictionary of that object.
+
+Knowing which
+.I stream-object-number
+to query requires information about the PDF file
+that has to be gained elsewhere,
+e. g. by looking into the PDF file with an editor.
+
+The stream extraction capabilities of
+.B pdftosrc
+(e. g. regarding understood PDF versions and filter types)
+follow the capabilities of the underlying
+.B xpdf
+program version.
+
+Currently the generation number of the stream object
+is not supported.
+The default value 0 (zero) is taken.
+
+The wording
+.I stream-object-number
+has nothing to do with the `object streams' introduced
+by the Adobe PDF Reference,
+5th edition, version 1.6.
+.SH EXAMPLES
+When using pdftex,
+a source file can be embedded into some
+.I PDF-file
+by using pdftex primitives,
+as illustrated by the following example:
+
+\\immediate\\pdfobj
+.RE
+ stream attr {/Type /SourceFile /SourceName (myfile.zip)}
+.RS
+.RE
+ file{myfile.zip}
+.RS
+.RE
+\\pdfcatalog{/SourceObject \\the\\pdflastobj\\space 0 R}
+
+Then this zip file can be extracted from the
+.I PDF-file
+by calling
+.B pdftosrc
+.IR PDF-file .
+.SH BUGS
+Not all embedded source files will be extracted,
+only the first found one.
+
+Email bug reports to
+.B pdftex@tug.org.
+.SH SEE ALSO
+.BR xpdf (1),
+.BR pdfimages (1),
+.BR pdftotext (1),
+.BR pdftex (1),
+.SH AUTHORS
+.B pdftosrc
+written by Han The Thanh, using
+.B xpdf
+functionality from Derek Noonburg.
+
+Man page written by Hartmut Henkel.
+.SH COPYRIGHT
+Copyright (c) 1996-2006 Han The Thanh,
+
+This file is part of pdfTeX.
+
+pdfTeX is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+pdfTeX is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with pdfTeX; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Files old/texmf-dist/doc/man/man1/pdftosrc.man1.pdf and new/texmf-dist/doc/man/man1/pdftosrc.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdftools.doc.tlpobj new/tlpkg/tlpobj/pdftools.doc.tlpobj
--- old/tlpkg/tlpobj/pdftools.doc.tlpobj 2011-06-23 04:16:06.000000000 +0200
+++ new/tlpkg/tlpobj/pdftools.doc.tlpobj 2013-04-09 03:40:37.000000000 +0200
@@ -1,13 +1,13 @@
name pdftools.doc
category TLCore
-revision 23089
+revision 29764
shortdesc doc files of pdftools
docfiles size=17
- texmf/doc/man/man1/e2pall.1
- texmf/doc/man/man1/e2pall.man1.pdf
- texmf/doc/man/man1/pdfclose.1
- texmf/doc/man/man1/pdfclose.man1.pdf
- texmf/doc/man/man1/pdfopen.1
- texmf/doc/man/man1/pdfopen.man1.pdf
- texmf/doc/man/man1/pdftosrc.1
- texmf/doc/man/man1/pdftosrc.man1.pdf
+ texmf-dist/doc/man/man1/e2pall.1
+ texmf-dist/doc/man/man1/e2pall.man1.pdf
+ texmf-dist/doc/man/man1/pdfclose.1
+ texmf-dist/doc/man/man1/pdfclose.man1.pdf
+ texmf-dist/doc/man/man1/pdfopen.1
+ texmf-dist/doc/man/man1/pdfopen.man1.pdf
+ texmf-dist/doc/man/man1/pdftosrc.1
+ texmf-dist/doc/man/man1/pdftosrc.man1.pdf
++++++ pdftools.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/scripts/tetex/e2pall.pl new/texmf/scripts/tetex/e2pall.pl
--- old/texmf/scripts/tetex/e2pall.pl 2008-03-03 19:51:04.000000000 +0100
+++ new/texmf/scripts/tetex/e2pall.pl 1970-01-01 01:00:00.000000000 +0100
@@ -1,89 +0,0 @@
-#!/usr/bin/env perl
-
-# Author: Jody Klymak , publisted by a posting
-# to the pdftex mailinglist.
-
-# recursively finds all your eps files. Looks down \input{fname}.
-# CAVEATS:
-# 1) cannot handle \input{fname} split over more than one line.
-# 1.5) cannot handle multiple \input{} or \includegraphics{} on one line.
-# 2) Must be run from same directory as the Latex file.
-# 3) Does not look down $TEXINPUTS or anything fancy like that...
-# 4) Handling of \include is untested (though I guess its trivial)
-# 5) Assumes *all* your graphics inclusions are [e]ps. But don't
-# fret, because if they are not epstopdf dies anyhow....
-# 6) Does not distinguish between percent (\%) and comment (%).
-
-# Changelog:
-# 20030103 -- Lachlan Andrew
-# * Only append '.tex' if $fname doesn't exist.
-# * Correctly handle lines with '}' after the \includegraphics{}
-# * Allow multiple extensions for graphics files. .eps -> .ps -> none
-# (Should try them in the same order as \includegraphics does
-# -- given by \DeclareGraphicsExtensions{}?)
-# * Allow \include the same way as \input
-# * Allow \includegraphics{} to be split over multiple lines
-# * Check that commands begin with '\', and allow spaces before arguments
-
-# EDIT these two lines for your system....
-
-$Eps2PdfCom = "epstopdf";
-$ThisFunCom = "e2pall";
-
-$fname=$ARGV[0];
-
-# check for a *.tex at the end...
-if ((-f "$fname")=="" && $fname !~ /.tex$/){
- $fname = "$fname.tex";
-}
-
-open(TEXFILE,$fname) or die "Cannot open file $fname";
-# print "Finding *.eps files in $fname\n";
-
-$seekingArg = 0;
-while($line=<TEXFILE>){
- # truncate $line after % sign....
- $line=~s/%.*//;
- # check for /input....
- if ($line=~/\\input *{([^}]*)}/){
- print `$ThisFunCom $1`;
- }
- # check for /include....
- if ($line=~/\\include *{([^}]*)}/){
- print `$ThisFunCom $1`;
- }
-
- $base = "";
- if ($line=~/\\includegraphics.*{([^}]*)}/){
- $base = $1;
- }
- elsif ($seekingArg==1 && ($line=~/{([^}]*)}/)){
- $base = $1;
- }
- elsif ($line=~/\\includegraphics/){
- $seekingArg = 1;
- }
-
- if ($base ne "") {
- $seekingArg = 0;
- if ((-f "$base.eps")!="") {
- $srcfile = "$base.eps";
- }
- elsif ((-f "$base.ps")!=""){
- $srcfile = "$base.ps";
- }
- else {
- $srcfile = $base;
- }
- # check that the [e]ps version is newer than the pdf version....
- if ((-M "$base.pdf")=="" || (-M "$base.pdf") >= (-M "$srcfile")){
- print "Constructing \t $base.pdf from $srcfile\n";
- print `$Eps2PdfCom $srcfile`;
- }
- else{
- print "$base.pdf \t is up to date with $srcfile\n";
- }
-
- };
-}
-close(TEXFILE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texlive/e2pall.pl new/texmf-dist/scripts/texlive/e2pall.pl
--- old/texmf-dist/scripts/texlive/e2pall.pl 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/scripts/texlive/e2pall.pl 2013-04-08 17:51:20.000000000 +0200
@@ -0,0 +1,89 @@
+#!/usr/bin/env perl
+
+# Author: Jody Klymak , publisted by a posting
+# to the pdftex mailinglist.
+
+# recursively finds all your eps files. Looks down \input{fname}.
+# CAVEATS:
+# 1) cannot handle \input{fname} split over more than one line.
+# 1.5) cannot handle multiple \input{} or \includegraphics{} on one line.
+# 2) Must be run from same directory as the Latex file.
+# 3) Does not look down $TEXINPUTS or anything fancy like that...
+# 4) Handling of \include is untested (though I guess its trivial)
+# 5) Assumes *all* your graphics inclusions are [e]ps. But don't
+# fret, because if they are not epstopdf dies anyhow....
+# 6) Does not distinguish between percent (\%) and comment (%).
+
+# Changelog:
+# 20030103 -- Lachlan Andrew
+# * Only append '.tex' if $fname doesn't exist.
+# * Correctly handle lines with '}' after the \includegraphics{}
+# * Allow multiple extensions for graphics files. .eps -> .ps -> none
+# (Should try them in the same order as \includegraphics does
+# -- given by \DeclareGraphicsExtensions{}?)
+# * Allow \include the same way as \input
+# * Allow \includegraphics{} to be split over multiple lines
+# * Check that commands begin with '\', and allow spaces before arguments
+
+# EDIT these two lines for your system....
+
+$Eps2PdfCom = "epstopdf";
+$ThisFunCom = "e2pall";
+
+$fname=$ARGV[0];
+
+# check for a *.tex at the end...
+if ((-f "$fname")=="" && $fname !~ /.tex$/){
+ $fname = "$fname.tex";
+}
+
+open(TEXFILE,$fname) or die "Cannot open file $fname";
+# print "Finding *.eps files in $fname\n";
+
+$seekingArg = 0;
+while($line=<TEXFILE>){
+ # truncate $line after % sign....
+ $line=~s/%.*//;
+ # check for /input....
+ if ($line=~/\\input *{([^}]*)}/){
+ print `$ThisFunCom $1`;
+ }
+ # check for /include....
+ if ($line=~/\\include *{([^}]*)}/){
+ print `$ThisFunCom $1`;
+ }
+
+ $base = "";
+ if ($line=~/\\includegraphics.*{([^}]*)}/){
+ $base = $1;
+ }
+ elsif ($seekingArg==1 && ($line=~/{([^}]*)}/)){
+ $base = $1;
+ }
+ elsif ($line=~/\\includegraphics/){
+ $seekingArg = 1;
+ }
+
+ if ($base ne "") {
+ $seekingArg = 0;
+ if ((-f "$base.eps")!="") {
+ $srcfile = "$base.eps";
+ }
+ elsif ((-f "$base.ps")!=""){
+ $srcfile = "$base.ps";
+ }
+ else {
+ $srcfile = $base;
+ }
+ # check that the [e]ps version is newer than the pdf version....
+ if ((-M "$base.pdf")=="" || (-M "$base.pdf") >= (-M "$srcfile")){
+ print "Constructing \t $base.pdf from $srcfile\n";
+ print `$Eps2PdfCom $srcfile`;
+ }
+ else{
+ print "$base.pdf \t is up to date with $srcfile\n";
+ }
+
+ };
+}
+close(TEXFILE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdftools.tlpobj new/tlpkg/tlpobj/pdftools.tlpobj
--- old/tlpkg/tlpobj/pdftools.tlpobj 2011-06-23 04:16:06.000000000 +0200
+++ new/tlpkg/tlpobj/pdftools.tlpobj 2013-04-09 03:40:37.000000000 +0200
@@ -1,6 +1,6 @@
name pdftools
category TLCore
-revision 23089
+revision 29764
catalogue xpdfopen
shortdesc PDF-related utilities, including PostScript-to-PDF conversion
longdesc The command-line programs pdfopen and pdfclose allow you to
@@ -11,8 +11,8 @@
longdesc Popineau for Microsoft operating systems.
depend pdftools.ARCH
runfiles size=1
- texmf/scripts/tetex/e2pall.pl
+ texmf-dist/scripts/texlive/e2pall.pl
catalogue-ctan /support/xpdfopen
-catalogue-date 2011-05-31 15:00:33 +0200
+catalogue-date 2012-09-07 16:54:33 +0200
catalogue-license pd
-catalogue-version 0.82
+catalogue-version 0.83
++++++ pedigree-perl.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pedigree-perl.doc.tlpobj new/tlpkg/tlpobj/pedigree-perl.doc.tlpobj
--- old/tlpkg/tlpobj/pedigree-perl.doc.tlpobj 2012-04-15 04:29:02.000000000 +0200
+++ new/tlpkg/tlpobj/pedigree-perl.doc.tlpobj 2012-05-15 17:33:29.000000000 +0200
@@ -1,6 +1,6 @@
name pedigree-perl.doc
category Package
-revision 25970
+revision 26313
shortdesc doc files of pedigree-perl
docfiles size=463
texmf-dist/doc/support/pedigree-perl/LICENSE
++++++ pedigree-perl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pedigree-perl.tlpobj new/tlpkg/tlpobj/pedigree-perl.tlpobj
--- old/tlpkg/tlpobj/pedigree-perl.tlpobj 2012-04-15 04:29:03.000000000 +0200
+++ new/tlpkg/tlpobj/pedigree-perl.tlpobj 2012-05-15 17:33:30.000000000 +0200
@@ -1,6 +1,6 @@
name pedigree-perl
category Package
-revision 25970
+revision 26313
shortdesc Generate TeX pedigree files from CSV files.
longdesc This program generates TeX commands to typeset pedigrees --
longdesc either TeX fragments or full LaTeX files, to be processed by
++++++ perltex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/perltex.1 new/texmf/doc/man/man1/perltex.1
--- old/texmf/doc/man/man1/perltex.1 2010-09-13 18:20:48.000000000 +0200
+++ new/texmf/doc/man/man1/perltex.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,280 +0,0 @@
-.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings. \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-. ds -- \(*W-
-. ds PI pi
-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-. ds L" ""
-. ds R" ""
-. ds C` ""
-. ds C' ""
-'br\}
-.el\{\
-. ds -- \|\(em\|
-. ds PI \(*p
-. ds L" ``
-. ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD. Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
-..
-. nr % 0
-. rr F
-.\}
-.el \{\
-. de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear. Run. Save yourself. No user-serviceable parts.
-. \" fudge factors for nroff and troff
-.if n \{\
-. ds #H 0
-. ds #V .8m
-. ds #F .3m
-. ds #[ \f1
-. ds #] \fP
-.\}
-.if t \{\
-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-. ds #V .6m
-. ds #F 0
-. ds #[ \&
-. ds #] \&
-.\}
-. \" simple accents for nroff and troff
-.if n \{\
-. ds ' \&
-. ds ` \&
-. ds ^ \&
-. ds , \&
-. ds ~ ~
-. ds /
-.\}
-.if t \{\
-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-. \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-. \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-. \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-. ds : e
-. ds 8 ss
-. ds o a
-. ds d- d\h'-1'\(ga
-. ds D- D\h'-1'\(hy
-. ds th \o'bp'
-. ds Th \o'LP'
-. ds ae ae
-. ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "PERLTEX 1"
-.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
-.nh
-.SH "NAME"
-perltex \- enable LaTeX macros to be defined in terms of Perl code
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-perltex
-[\fB\-\-help\fR]
-[\fB\-\-latex\fR=\fIprogram\fR]
-[\fB\-\-\fR[\fBno\fR]\fBsafe\fR]
-[\fB\-\-permit\fR=\fIfeature\fR]
-[\fB\-\-makesty\fR]
-[\fIlatex options\fR]
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-LaTeX \*(-- through the underlying TeX typesetting system \*(-- produces
-beautifully typeset documents but has a macro language that is
-difficult to program. In particular, support for complex string
-manipulation is largely lacking. Perl is a popular general-purpose
-programming language whose forte is string manipulation. However, it
-has no typesetting capabilities whatsoever.
-.PP
-Clearly, Perl's programmability could complement LaTeX's typesetting
-strengths. \fBperltex\fR is the tool that enables a symbiosis between
-the two systems. All a user needs to do is compile a LaTeX document
-using \fBperltex\fR instead of \fBlatex\fR. (\fBperltex\fR is actually a
-wrapper for \fBlatex\fR, so no \fBlatex\fR functionality is lost.) If the
-document includes a \f(CW\*(C`\eusepackage{perltex}\*(C'\fR in its preamble, then
-\&\f(CW\*(C`\eperlnewcommand\*(C'\fR and \f(CW\*(C`\eperlrenewcommand\*(C'\fR macros will be made
-available. These behave just like LaTeX's \f(CW\*(C`\enewcommand\*(C'\fR and
-\&\f(CW\*(C`\erenewcommand\*(C'\fR except that the macro body contains Perl code instead
-of LaTeX code.
-.SH "OPTIONS"
-.IX Header "OPTIONS"
-\&\fBperltex\fR accepts the following command-line options:
-.IP "\fB\-\-help\fR" 4
-.IX Item "--help"
-Display basic usage information.
-.IP "\fB\-\-latex\fR=\fIprogram\fR" 4
-.IX Item "--latex=program"
-Specify a program to use instead of \fBlatex\fR. For example,
-\&\f(CW\*(C`\-\-latex=pdflatex\*(C'\fR would typeset the given document using
-\&\fBpdflatex\fR instead of ordinary \fBlatex\fR.
-.IP "\fB\-\-\fR[\fBno\fR]\fBsafe\fR" 4
-.IX Item "--[no]safe"
-Enable or disable sandboxing. With the default of \fB\-\-safe\fR,
-\&\fBperltex\fR executes the code from a \f(CW\*(C`\eperlnewcommand\*(C'\fR or
-\&\f(CW\*(C`\eperlrenewcommand\*(C'\fR macro within a protected environment that
-prohibits ``unsafe'' operations such as accessing files or executing
-external programs. Specifying \fB\-\-nosafe\fR gives the LaTeX document
-\&\fIcarte blanche\fR to execute any arbitrary Perl code, including that
-which can harm the user's files. See Safe for more information.
-.IP "\fB\-\-permit\fR=\fIfeature\fR" 4
-.IX Item "--permit=feature"
-Permit particular Perl operations to be performed. The \fB\-\-permit\fR
-option, which can be specified more than once on the command line,
-enables finer-grained control over the \fBperltex\fR sandbox. See
-Opcode for more information.
-.IP "\fB\-\-makesty\fR" 4
-.IX Item "--makesty"
-Generate a LaTeX style file called \fInoperltex.sty\fR. Replacing the
-document's \f(CW\*(C`\eusepackage{perltex}\*(C'\fR line with \f(CW\*(C`\eusepackage{noperltex}\*(C'\fR
-produces the same output but does not require PerlTeX, making the
-document suitable for distribution to people who do not have PerlTeX
-installed. The disadvantage is that \fInoperltex.sty\fR is specific to
-the document that produced it. Any changes to the document's PerlTeX
-macro definitions or macro invocations necessitates rerunning
-\&\fBperltex\fR with the \fB\-\-makesty\fR option.
-.PP
-These options are then followed by whatever options are normally
-passed to \fBlatex\fR (or whatever program was specified with
-\&\f(CW\*(C`\-\-latex\*(C'\fR), including, for instance, the name of the \fI.tex\fR file to
-compile.
-.SH "EXAMPLES"
-.IX Header "EXAMPLES"
-In its simplest form, \fBperltex\fR is run just like \fBlatex\fR:
-.PP
-.Vb 1
-\& perltex myfile.tex
-.Ve
-.PP
-To use \fBpdflatex\fR instead of regular \fBlatex\fR, use the \fB\-\-latex\fR
-option:
-.PP
-.Vb 1
-\& perltex \-\-latex=pdflatex myfile.tex
-.Ve
-.PP
-If LaTeX gives a ``\f(CW\*(C`trapped by operation mask\*(C'\fR'' error and you trust
-the \fI.tex\fR file you're trying to compile not to execute malicious
-Perl code (e.g., because you wrote it yourself), you can disable
-\&\fBperltex\fR's safety mechansisms with \fB\-\-nosafe\fR:
-.PP
-.Vb 1
-\& perltex \-\-nosafe myfile.tex
-.Ve
-.PP
-The following command gives documents only \fBperltex\fR's default
-permissions (\f(CW\*(C`:browse\*(C'\fR) plus the ability to open files and invoke the
-\&\f(CW\*(C`time\*(C'\fR command:
-.PP
-.Vb 2
-\& perltex \-\-permit=:browse \-\-permit=:filesys_open
-\& \-\-permit=time myfile.tex
-.Ve
-.SH "ENVIRONMENT"
-.IX Header "ENVIRONMENT"
-\&\fBperltex\fR honors the following environment variables:
-.IP "\s-1PERLTEX\s0" 4
-.IX Item "PERLTEX"
-Specify the filename of the LaTeX compiler. The LaTeX compiler
-defaults to ``\f(CW\*(C`latex\*(C'\fR''. The \f(CW\*(C`PERLTEX\*(C'\fR environment variable
-overrides this default, and the \fB\-\-latex\fR command-line option (see
-\&\*(L"\s-1OPTIONS\s0\*(R") overrides that.
-.SH "FILES"
-.IX Header "FILES"
-While compiling \fIjobname.tex\fR, \fBperltex\fR makes use of the following
-files:
-.IP "\fIjobname.lgpl\fR" 4
-.IX Item "jobname.lgpl"
-log file written by Perl; helpful for debugging Perl macros
-.IP "\fIjobname.topl\fR" 4
-.IX Item "jobname.topl"
-information sent from LaTeX to Perl
-.IP "\fIjobname.frpl\fR" 4
-.IX Item "jobname.frpl"
-information sent from Perl to LaTeX
-.IP "\fIjobname.tfpl\fR" 4
-.IX Item "jobname.tfpl"
-``flag'' file whose existence indicates that \fIjobname.topl\fR contains
-valid data
-.IP "\fIjobname.ffpl\fR" 4
-.IX Item "jobname.ffpl"
-``flag'' file whose existence indicates that \fIjobname.frpl\fR contains
-valid data
-.IP "\fIjobname.dfpl\fR" 4
-.IX Item "jobname.dfpl"
-``flag'' file whose existence indicates that \fIjobname.ffpl\fR has been
-deleted
-.IP "\fInoperltex\-#.tex\fR" 4
-.IX Item "noperltex-#.tex"
-file generated by \fInoperltex.sty\fR for each PerlTeX macro invocation
-.SH "NOTES"
-.IX Header "NOTES"
-\&\fBperltex\fR's sandbox defaults to what Opcode calls ``\f(CW\*(C`:browse\*(C'\fR''.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-\&\fIlatex\fR\|(1), \fIpdflatex\fR\|(1), \fIperl\fR\|(1), \fISafe\fR\|(3pm), \fIOpcode\fR\|(3pm)
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Scott Pakin, \fIscott+pt@pakin.org\fR
Files old/texmf/doc/man/man1/perltex.man1.pdf and new/texmf/doc/man/man1/perltex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/perltex.1 new/texmf-dist/doc/man/man1/perltex.1
--- old/texmf-dist/doc/man/man1/perltex.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/perltex.1 2010-09-13 18:20:48.000000000 +0200
@@ -0,0 +1,280 @@
+.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings. \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote. \*(C+ will
+.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+. ds -- \(*W-
+. ds PI pi
+. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
+. ds L" ""
+. ds R" ""
+. ds C` ""
+. ds C' ""
+'br\}
+.el\{\
+. ds -- \|\(em\|
+. ds PI \(*p
+. ds L" ``
+. ds R" ''
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD. Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
+..
+. nr % 0
+. rr F
+.\}
+.el \{\
+. de IX
+..
+.\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear. Run. Save yourself. No user-serviceable parts.
+. \" fudge factors for nroff and troff
+.if n \{\
+. ds #H 0
+. ds #V .8m
+. ds #F .3m
+. ds #[ \f1
+. ds #] \fP
+.\}
+.if t \{\
+. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+. ds #V .6m
+. ds #F 0
+. ds #[ \&
+. ds #] \&
+.\}
+. \" simple accents for nroff and troff
+.if n \{\
+. ds ' \&
+. ds ` \&
+. ds ^ \&
+. ds , \&
+. ds ~ ~
+. ds /
+.\}
+.if t \{\
+. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+. \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+. \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+. \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+. ds : e
+. ds 8 ss
+. ds o a
+. ds d- d\h'-1'\(ga
+. ds D- D\h'-1'\(hy
+. ds th \o'bp'
+. ds Th \o'LP'
+. ds ae ae
+. ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "PERLTEX 1"
+.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
+.nh
+.SH "NAME"
+perltex \- enable LaTeX macros to be defined in terms of Perl code
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+perltex
+[\fB\-\-help\fR]
+[\fB\-\-latex\fR=\fIprogram\fR]
+[\fB\-\-\fR[\fBno\fR]\fBsafe\fR]
+[\fB\-\-permit\fR=\fIfeature\fR]
+[\fB\-\-makesty\fR]
+[\fIlatex options\fR]
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+LaTeX \*(-- through the underlying TeX typesetting system \*(-- produces
+beautifully typeset documents but has a macro language that is
+difficult to program. In particular, support for complex string
+manipulation is largely lacking. Perl is a popular general-purpose
+programming language whose forte is string manipulation. However, it
+has no typesetting capabilities whatsoever.
+.PP
+Clearly, Perl's programmability could complement LaTeX's typesetting
+strengths. \fBperltex\fR is the tool that enables a symbiosis between
+the two systems. All a user needs to do is compile a LaTeX document
+using \fBperltex\fR instead of \fBlatex\fR. (\fBperltex\fR is actually a
+wrapper for \fBlatex\fR, so no \fBlatex\fR functionality is lost.) If the
+document includes a \f(CW\*(C`\eusepackage{perltex}\*(C'\fR in its preamble, then
+\&\f(CW\*(C`\eperlnewcommand\*(C'\fR and \f(CW\*(C`\eperlrenewcommand\*(C'\fR macros will be made
+available. These behave just like LaTeX's \f(CW\*(C`\enewcommand\*(C'\fR and
+\&\f(CW\*(C`\erenewcommand\*(C'\fR except that the macro body contains Perl code instead
+of LaTeX code.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+\&\fBperltex\fR accepts the following command-line options:
+.IP "\fB\-\-help\fR" 4
+.IX Item "--help"
+Display basic usage information.
+.IP "\fB\-\-latex\fR=\fIprogram\fR" 4
+.IX Item "--latex=program"
+Specify a program to use instead of \fBlatex\fR. For example,
+\&\f(CW\*(C`\-\-latex=pdflatex\*(C'\fR would typeset the given document using
+\&\fBpdflatex\fR instead of ordinary \fBlatex\fR.
+.IP "\fB\-\-\fR[\fBno\fR]\fBsafe\fR" 4
+.IX Item "--[no]safe"
+Enable or disable sandboxing. With the default of \fB\-\-safe\fR,
+\&\fBperltex\fR executes the code from a \f(CW\*(C`\eperlnewcommand\*(C'\fR or
+\&\f(CW\*(C`\eperlrenewcommand\*(C'\fR macro within a protected environment that
+prohibits ``unsafe'' operations such as accessing files or executing
+external programs. Specifying \fB\-\-nosafe\fR gives the LaTeX document
+\&\fIcarte blanche\fR to execute any arbitrary Perl code, including that
+which can harm the user's files. See Safe for more information.
+.IP "\fB\-\-permit\fR=\fIfeature\fR" 4
+.IX Item "--permit=feature"
+Permit particular Perl operations to be performed. The \fB\-\-permit\fR
+option, which can be specified more than once on the command line,
+enables finer-grained control over the \fBperltex\fR sandbox. See
+Opcode for more information.
+.IP "\fB\-\-makesty\fR" 4
+.IX Item "--makesty"
+Generate a LaTeX style file called \fInoperltex.sty\fR. Replacing the
+document's \f(CW\*(C`\eusepackage{perltex}\*(C'\fR line with \f(CW\*(C`\eusepackage{noperltex}\*(C'\fR
+produces the same output but does not require PerlTeX, making the
+document suitable for distribution to people who do not have PerlTeX
+installed. The disadvantage is that \fInoperltex.sty\fR is specific to
+the document that produced it. Any changes to the document's PerlTeX
+macro definitions or macro invocations necessitates rerunning
+\&\fBperltex\fR with the \fB\-\-makesty\fR option.
+.PP
+These options are then followed by whatever options are normally
+passed to \fBlatex\fR (or whatever program was specified with
+\&\f(CW\*(C`\-\-latex\*(C'\fR), including, for instance, the name of the \fI.tex\fR file to
+compile.
+.SH "EXAMPLES"
+.IX Header "EXAMPLES"
+In its simplest form, \fBperltex\fR is run just like \fBlatex\fR:
+.PP
+.Vb 1
+\& perltex myfile.tex
+.Ve
+.PP
+To use \fBpdflatex\fR instead of regular \fBlatex\fR, use the \fB\-\-latex\fR
+option:
+.PP
+.Vb 1
+\& perltex \-\-latex=pdflatex myfile.tex
+.Ve
+.PP
+If LaTeX gives a ``\f(CW\*(C`trapped by operation mask\*(C'\fR'' error and you trust
+the \fI.tex\fR file you're trying to compile not to execute malicious
+Perl code (e.g., because you wrote it yourself), you can disable
+\&\fBperltex\fR's safety mechansisms with \fB\-\-nosafe\fR:
+.PP
+.Vb 1
+\& perltex \-\-nosafe myfile.tex
+.Ve
+.PP
+The following command gives documents only \fBperltex\fR's default
+permissions (\f(CW\*(C`:browse\*(C'\fR) plus the ability to open files and invoke the
+\&\f(CW\*(C`time\*(C'\fR command:
+.PP
+.Vb 2
+\& perltex \-\-permit=:browse \-\-permit=:filesys_open
+\& \-\-permit=time myfile.tex
+.Ve
+.SH "ENVIRONMENT"
+.IX Header "ENVIRONMENT"
+\&\fBperltex\fR honors the following environment variables:
+.IP "\s-1PERLTEX\s0" 4
+.IX Item "PERLTEX"
+Specify the filename of the LaTeX compiler. The LaTeX compiler
+defaults to ``\f(CW\*(C`latex\*(C'\fR''. The \f(CW\*(C`PERLTEX\*(C'\fR environment variable
+overrides this default, and the \fB\-\-latex\fR command-line option (see
+\&\*(L"\s-1OPTIONS\s0\*(R") overrides that.
+.SH "FILES"
+.IX Header "FILES"
+While compiling \fIjobname.tex\fR, \fBperltex\fR makes use of the following
+files:
+.IP "\fIjobname.lgpl\fR" 4
+.IX Item "jobname.lgpl"
+log file written by Perl; helpful for debugging Perl macros
+.IP "\fIjobname.topl\fR" 4
+.IX Item "jobname.topl"
+information sent from LaTeX to Perl
+.IP "\fIjobname.frpl\fR" 4
+.IX Item "jobname.frpl"
+information sent from Perl to LaTeX
+.IP "\fIjobname.tfpl\fR" 4
+.IX Item "jobname.tfpl"
+``flag'' file whose existence indicates that \fIjobname.topl\fR contains
+valid data
+.IP "\fIjobname.ffpl\fR" 4
+.IX Item "jobname.ffpl"
+``flag'' file whose existence indicates that \fIjobname.frpl\fR contains
+valid data
+.IP "\fIjobname.dfpl\fR" 4
+.IX Item "jobname.dfpl"
+``flag'' file whose existence indicates that \fIjobname.ffpl\fR has been
+deleted
+.IP "\fInoperltex\-#.tex\fR" 4
+.IX Item "noperltex-#.tex"
+file generated by \fInoperltex.sty\fR for each PerlTeX macro invocation
+.SH "NOTES"
+.IX Header "NOTES"
+\&\fBperltex\fR's sandbox defaults to what Opcode calls ``\f(CW\*(C`:browse\*(C'\fR''.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fIlatex\fR\|(1), \fIpdflatex\fR\|(1), \fIperl\fR\|(1), \fISafe\fR\|(3pm), \fIOpcode\fR\|(3pm)
+.SH "AUTHOR"
+.IX Header "AUTHOR"
+Scott Pakin, \fIscott+pt@pakin.org\fR
Files old/texmf-dist/doc/man/man1/perltex.man1.pdf and new/texmf-dist/doc/man/man1/perltex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/perltex.doc.tlpobj new/tlpkg/tlpobj/perltex.doc.tlpobj
--- old/tlpkg/tlpobj/perltex.doc.tlpobj 2010-09-14 04:04:54.000000000 +0200
+++ new/tlpkg/tlpobj/perltex.doc.tlpobj 2013-04-08 21:26:44.000000000 +0200
@@ -1,10 +1,10 @@
name perltex.doc
category Package
-revision 19702
+revision 29752
shortdesc doc files of perltex
docfiles size=90
texmf-dist/doc/latex/perltex/README
texmf-dist/doc/latex/perltex/example.tex
texmf-dist/doc/latex/perltex/perltex.pdf
- texmf/doc/man/man1/perltex.1
- texmf/doc/man/man1/perltex.man1.pdf
+ texmf-dist/doc/man/man1/perltex.1
+ texmf-dist/doc/man/man1/perltex.man1.pdf
++++++ perltex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/perltex.tlpobj new/tlpkg/tlpobj/perltex.tlpobj
--- old/tlpkg/tlpobj/perltex.tlpobj 2010-09-14 04:04:54.000000000 +0200
+++ new/tlpkg/tlpobj/perltex.tlpobj 2013-04-08 21:26:44.000000000 +0200
@@ -1,6 +1,6 @@
name perltex
category Package
-revision 19702
+revision 29752
shortdesc Define LaTeX macros in terms of Perl code
longdesc PerlTeX is a combination Perl script (perltex.pl) and LaTeX2e
longdesc package (perltex.sty) that, together, give the user the ability
@@ -18,6 +18,6 @@
texmf-dist/scripts/perltex/perltex.pl
texmf-dist/tex/latex/perltex/perltex.sty
catalogue-ctan /macros/latex/contrib/perltex
-catalogue-date 2010-07-24 23:20:00 +0200
+catalogue-date 2012-06-12 18:08:23 +0200
catalogue-license lppl
catalogue-version 2.1
++++++ persian-modern.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/persian-modern/OFL.txt new/doc/fonts/persian-modern/OFL.txt
--- old/doc/fonts/persian-modern/OFL.txt 2011-09-13 01:19:26.000000000 +0200
+++ new/doc/fonts/persian-modern/OFL.txt 2013-04-05 01:01:07.000000000 +0200
@@ -1,4 +1,4 @@
-Copyright (c) 2011, Vafa Khalighi, (http://ctan.org/pkg/persian-modern|vafaklg@gmail.com),
+Copyright (c) 2011–2013, Persian TeX Group, (http://ctan.org/pkg/persian-modern|persian-tex@tug.org),
with Reserved Font Name Persian Modern.
This Font Software is licensed under the SIL Open Font License, Version 1.1.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/persian-modern/README new/doc/fonts/persian-modern/README
--- old/doc/fonts/persian-modern/README 2011-09-15 00:27:20.000000000 +0200
+++ new/doc/fonts/persian-modern/README 2013-04-24 00:12:17.000000000 +0200
@@ -1,18 +1,27 @@
____________________________________
The “Persian Modern” Family of Fonts
-v0.3
+v0.4
The Persian Modern family consists of 12 fonts (based on
the “FarsiTeX Scientific fonts” released into the public
domain by the FarsiTeX project). The single set of fonts
-is available in TrueType format (.ttf).
+is available in OpenType format (.otf).
-To get help, please explore http://forum.parsilatex.com
+If you want to report any bugs or typos and corrections in the documentation,
+or ask for any new features, or suggest any improvements, or ask any questions
+about the package, then please do not send any direct emails to us; we will not
+answer any direct emails. Instead please use the issue tracker:
+ https://github.com/persian-tex/persian-modern/issues
+In doing so, please always explain your issue well enough, always include
+a minimal working examples showing the issue, and always choose the appropriate
+label for your query (i.e. if you are reporting any bugs, choose `bug' label).
+
+Current version release date: 2013/04/21
_________________
-Vafa Khalighi
-vafaklg@gmail.com
+Persian TeX Group
+persian-tex@tug.org
-Copyright © 2011 Vafa Khalighi
+Copyright © 2011–2013 Persian TeX Group
Distributed under the SIL Open Font License (OFL)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/persian-modern.doc.tlpobj new/tlpkg/tlpobj/persian-modern.doc.tlpobj
--- old/tlpkg/tlpobj/persian-modern.doc.tlpobj 2011-09-16 04:28:10.000000000 +0200
+++ new/tlpkg/tlpobj/persian-modern.doc.tlpobj 2013-04-24 03:47:11.000000000 +0200
@@ -1,6 +1,6 @@
name persian-modern.doc
category Package
-revision 23959
+revision 30078
shortdesc doc files of persian-modern
relocated 1
docfiles size=14
++++++ persian-modern.tar.xz ++++++
Files old/fonts/opentype/public/persian-modern/persian-modern-bold.otf and new/fonts/opentype/public/persian-modern/persian-modern-bold.otf differ
Files old/fonts/opentype/public/persian-modern/persian-modern-bolditalic.otf and new/fonts/opentype/public/persian-modern/persian-modern-bolditalic.otf differ
Files old/fonts/opentype/public/persian-modern/persian-modern-boldoblique.otf and new/fonts/opentype/public/persian-modern/persian-modern-boldoblique.otf differ
Files old/fonts/opentype/public/persian-modern/persian-modern-italic.otf and new/fonts/opentype/public/persian-modern/persian-modern-italic.otf differ
Files old/fonts/opentype/public/persian-modern/persian-modern-italicoutline.otf and new/fonts/opentype/public/persian-modern/persian-modern-italicoutline.otf differ
Files old/fonts/opentype/public/persian-modern/persian-modern-italicshadow.otf and new/fonts/opentype/public/persian-modern/persian-modern-italicshadow.otf differ
Files old/fonts/opentype/public/persian-modern/persian-modern-oblique.otf and new/fonts/opentype/public/persian-modern/persian-modern-oblique.otf differ
Files old/fonts/opentype/public/persian-modern/persian-modern-obliqueoutline.otf and new/fonts/opentype/public/persian-modern/persian-modern-obliqueoutline.otf differ
Files old/fonts/opentype/public/persian-modern/persian-modern-obliqueshadow.otf and new/fonts/opentype/public/persian-modern/persian-modern-obliqueshadow.otf differ
Files old/fonts/opentype/public/persian-modern/persian-modern-outline.otf and new/fonts/opentype/public/persian-modern/persian-modern-outline.otf differ
Files old/fonts/opentype/public/persian-modern/persian-modern-regular.otf and new/fonts/opentype/public/persian-modern/persian-modern-regular.otf differ
Files old/fonts/opentype/public/persian-modern/persian-modern-shadow.otf and new/fonts/opentype/public/persian-modern/persian-modern-shadow.otf differ
Files old/fonts/truetype/public/persian-modern/persian-modern-bold.ttf and new/fonts/truetype/public/persian-modern/persian-modern-bold.ttf differ
Files old/fonts/truetype/public/persian-modern/persian-modern-bolditalic.ttf and new/fonts/truetype/public/persian-modern/persian-modern-bolditalic.ttf differ
Files old/fonts/truetype/public/persian-modern/persian-modern-boldoblique.ttf and new/fonts/truetype/public/persian-modern/persian-modern-boldoblique.ttf differ
Files old/fonts/truetype/public/persian-modern/persian-modern-italic.ttf and new/fonts/truetype/public/persian-modern/persian-modern-italic.ttf differ
Files old/fonts/truetype/public/persian-modern/persian-modern-italicoutline.ttf and new/fonts/truetype/public/persian-modern/persian-modern-italicoutline.ttf differ
Files old/fonts/truetype/public/persian-modern/persian-modern-italicshadow.ttf and new/fonts/truetype/public/persian-modern/persian-modern-italicshadow.ttf differ
Files old/fonts/truetype/public/persian-modern/persian-modern-oblique.ttf and new/fonts/truetype/public/persian-modern/persian-modern-oblique.ttf differ
Files old/fonts/truetype/public/persian-modern/persian-modern-obliqueoutline.ttf and new/fonts/truetype/public/persian-modern/persian-modern-obliqueoutline.ttf differ
Files old/fonts/truetype/public/persian-modern/persian-modern-obliqueshadow.ttf and new/fonts/truetype/public/persian-modern/persian-modern-obliqueshadow.ttf differ
Files old/fonts/truetype/public/persian-modern/persian-modern-outline.ttf and new/fonts/truetype/public/persian-modern/persian-modern-outline.ttf differ
Files old/fonts/truetype/public/persian-modern/persian-modern-regular.ttf and new/fonts/truetype/public/persian-modern/persian-modern-regular.ttf differ
Files old/fonts/truetype/public/persian-modern/persian-modern-shadow.ttf and new/fonts/truetype/public/persian-modern/persian-modern-shadow.ttf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/persian-modern.tlpobj new/tlpkg/tlpobj/persian-modern.tlpobj
--- old/tlpkg/tlpobj/persian-modern.tlpobj 2011-09-16 04:28:10.000000000 +0200
+++ new/tlpkg/tlpobj/persian-modern.tlpobj 2013-04-24 03:47:11.000000000 +0200
@@ -1,27 +1,26 @@
name persian-modern
category Package
-revision 23959
+revision 30078
shortdesc The "Persian Modern" family of fonts.
relocated 1
longdesc The Persian Modern family consists of 12 fonts (based on the
longdesc "FarsiTeX Scientific fonts" released into the public domain by
longdesc the FarsiTeX project). The single set of fonts is available in
-longdesc TrueType format (.ttf). Support may be available via the
-longdesc ParsiLaTeX forum.
-runfiles size=492
- RELOC/fonts/truetype/public/persian-modern/persian-modern-bold.ttf
- RELOC/fonts/truetype/public/persian-modern/persian-modern-bolditalic.ttf
- RELOC/fonts/truetype/public/persian-modern/persian-modern-boldoblique.ttf
- RELOC/fonts/truetype/public/persian-modern/persian-modern-italic.ttf
- RELOC/fonts/truetype/public/persian-modern/persian-modern-italicoutline.ttf
- RELOC/fonts/truetype/public/persian-modern/persian-modern-italicshadow.ttf
- RELOC/fonts/truetype/public/persian-modern/persian-modern-oblique.ttf
- RELOC/fonts/truetype/public/persian-modern/persian-modern-obliqueoutline.ttf
- RELOC/fonts/truetype/public/persian-modern/persian-modern-obliqueshadow.ttf
- RELOC/fonts/truetype/public/persian-modern/persian-modern-outline.ttf
- RELOC/fonts/truetype/public/persian-modern/persian-modern-regular.ttf
- RELOC/fonts/truetype/public/persian-modern/persian-modern-shadow.ttf
-catalogue-ctan /fonts/persian-modern
-catalogue-date 2011-09-14 17:59:09 +0200
+longdesc OpenType format (.otf).
+runfiles size=1089
+ RELOC/fonts/opentype/public/persian-modern/persian-modern-bold.otf
+ RELOC/fonts/opentype/public/persian-modern/persian-modern-bolditalic.otf
+ RELOC/fonts/opentype/public/persian-modern/persian-modern-boldoblique.otf
+ RELOC/fonts/opentype/public/persian-modern/persian-modern-italic.otf
+ RELOC/fonts/opentype/public/persian-modern/persian-modern-italicoutline.otf
+ RELOC/fonts/opentype/public/persian-modern/persian-modern-italicshadow.otf
+ RELOC/fonts/opentype/public/persian-modern/persian-modern-oblique.otf
+ RELOC/fonts/opentype/public/persian-modern/persian-modern-obliqueoutline.otf
+ RELOC/fonts/opentype/public/persian-modern/persian-modern-obliqueshadow.otf
+ RELOC/fonts/opentype/public/persian-modern/persian-modern-outline.otf
+ RELOC/fonts/opentype/public/persian-modern/persian-modern-regular.otf
+ RELOC/fonts/opentype/public/persian-modern/persian-modern-shadow.otf
+catalogue-ctan /fonts/persian/persian-modern
+catalogue-date 2013-04-20 21:59:01 +0200
catalogue-license ofl
-catalogue-version 0.3
+catalogue-version 0.4
++++++ pgfmolbio.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/pgfmolbio/README new/doc/lualatex/pgfmolbio/README
--- old/doc/lualatex/pgfmolbio/README 2011-09-21 01:13:59.000000000 +0200
+++ new/doc/lualatex/pgfmolbio/README 2012-10-19 00:52:50.000000000 +0200
@@ -1,13 +1,12 @@
-The pgfmolbio package
+The pgfmolbio package v0.2
------------------------------------------------------------------------------
This package is released under the LaTeX Project Public License v1.3c or later
(see http://www.latex-project.org/lppl.txt).
The experimental package pgfmolbio draws graphs typically found in
-molecular biology texts. Currently, the package contains one module,
-which creates DNA sequencing chromatograms from files in standard
-chromatogram format (scf).
+molecular biology texts. Currently, the package contains modules
+for drawing DNA sequencing chromatograms and protein domain diagrams.
The package requires pgf/TikZ (http://tug.ctan.org/pkg/pgf)
and LuaTeX (http://www.luatex.org).
@@ -16,4 +15,4 @@
--
Wolfgang Skala
-September 20th, 2011
+October 1st, 2012
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/pgfmolbio/SampleGff.gff new/doc/lualatex/pgfmolbio/SampleGff.gff
--- old/doc/lualatex/pgfmolbio/SampleGff.gff 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/lualatex/pgfmolbio/SampleGff.gff 2012-10-19 00:52:50.000000000 +0200
@@ -0,0 +1,14 @@
+##gff-version 3
+##sequence-region TestProtein 1 200
+TestProtein TheDatabase disulfide 5 45 . . . Disulfide 1
+TestProtein TheDatabase disulfide 30 122 . . . Disulfide 2
+TestProtein TheDatabase disulfide 51 99 . . . Disulfide 3
+TestProtein TheDatabase domain 10 40 . . . Domain 1
+TestProtein TheDatabase domain 60 120 . . . Domain 2
+TestProtein TheDatabase domain 135 178 . . . Domain 3
+TestProtein TheDatabase beta strand 15 23 . . . Strand 1
+TestProtein TheDatabase beta strand 25 32 . . . Strand 2
+TestProtein TheDatabase alpha helix 60 75 . . . Helix 1
+TestProtein TheDatabase alpha helix 80 108 . . . Helix 1
+TestProtein TheDatabase carbohydrate 151 151 . . . Sugar 1
+TestProtein TheDatabase carbohydrate 183 183 . . . Sugar 2
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/pgfmolbio/SampleUniprot.txt new/doc/lualatex/pgfmolbio/SampleUniprot.txt
--- old/doc/lualatex/pgfmolbio/SampleUniprot.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/lualatex/pgfmolbio/SampleUniprot.txt 2012-10-19 00:52:50.000000000 +0200
@@ -0,0 +1,19 @@
+ID TestProtein Reviewed; 200 AA.
+FT DISULFID 5 45 Disulfide 1
+FT DISULFID 30 122 Disulfide 2
+FT DISULFID 51 99 Disulfide 3
+FT DOMAIN 10 40 Domain 1
+FT DOMAIN 60 120 Domain 2
+FT DOMAIN 135 178 Domain 3
+FT STRAND 15 23 Strand 1
+FT STRAND 25 32 Strand 2
+FT HELIX 60 75 Helix 1
+FT HELIX 80 108 Helix 2
+FT CARBOHYD 151 151 Sugar 1
+FT CARBOHYD 183 183 Sugar 2
+SQ SEQUENCE 200 AA; 22041 MW; 00A52FE2EC5431D9 CRC64;
+ MGSKRSVPSR HRSLTTYEVM FAVLFVILVA LCAGLIAVSW LSIQGSVKDA AFGKSHEARG
+ TLKIISGATY NPHLQDKLSV DFKVLAFDIQ QMIDDIFQSS NLKNEYKNSR VLQFENGSII
+ VIFDLLFDQW VSDKNVKEEL IQGIEANKSS QLVTFHIDLN SIDITASLEN FSTISPATTS
+ EKLTTSIPLA TPGNVSIECP
+//
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/pgfmolbio/pgfmolbio.lua new/doc/lualatex/pgfmolbio/pgfmolbio.lua
--- old/doc/lualatex/pgfmolbio/pgfmolbio.lua 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/lualatex/pgfmolbio/pgfmolbio.lua 2012-10-19 00:52:50.000000000 +0200
@@ -0,0 +1,80 @@
+--
+-- This is file `pgfmolbio.lua',
+-- generated with the docstrip utility.
+--
+-- The original source files were:
+--
+-- pgfmolbio.dtx (with options: `pgfmolbio-lua')
+--
+-- Copyright (C) 2012 by Wolfgang Skala
+--
+-- 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.
+--
+module("pgfmolbio", package.seeall)
+
+
+if luatexbase then
+ luatexbase.provides_module({
+ name = "pgfmolbio",
+ version = 0.2,
+ date = "2012/10/01",
+ description = "Molecular biology graphs wit LuaLaTeX",
+ author = "Wolfgang Skala",
+ copyright = "Wolfgang Skala",
+ license = "LPPL",
+ })
+end
+
+local coordUnit, coordFmtStr
+
+function setCoordinateFormat(unit, fmtString)
+ coordUnit = unit
+ coordFmtStr = fmtString
+end
+
+function stringToDim(x)
+ if type(x) == "string" then
+ return dimen(x)[1]
+ end
+end
+
+function dimToString(x)
+ return number.todimen(x, coordUnit, coordFmtStr)
+end
+
+function getRange(rangeInput, ...)
+ if type(rangeInput) ~= "string" then return end
+ local result = {}
+ for _, v in ipairs(arg) do
+ if type(v) ~= "string" then return end
+ table.insert(result, rangeInput:match(v))
+ end
+ return unpack(result)
+end
+
+function packageWarning(message)
+ tex.sprint("\\PackageWarning{pgfmolbio}{" .. message .. "}")
+end
+
+function packageError(message)
+ tex.error("Package pgfmolbio Error: " .. message)
+ errorCatched = true
+end
+
+errorCatched = false
+
+if not string.trim then
+ string.trim = function(self)
+ return self:match("^%s*(.-)%s*$")
+ end
+end
+
+outputFileId = 0
+--
+-- End of file `pgfmolbio.lua'.
Files old/doc/lualatex/pgfmolbio/pgfmolbio.pdf and new/doc/lualatex/pgfmolbio/pgfmolbio.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgfmolbio.doc.tlpobj new/tlpkg/tlpobj/pgfmolbio.doc.tlpobj
--- old/tlpkg/tlpobj/pgfmolbio.doc.tlpobj 2011-09-21 04:25:12.000000000 +0200
+++ new/tlpkg/tlpobj/pgfmolbio.doc.tlpobj 2012-10-19 04:32:29.000000000 +0200
@@ -1,9 +1,12 @@
name pgfmolbio.doc
category Package
-revision 24040
+revision 28023
shortdesc doc files of pgfmolbio
relocated 1
-docfiles size=129
+docfiles size=246
RELOC/doc/lualatex/pgfmolbio/README
+ RELOC/doc/lualatex/pgfmolbio/SampleGff.gff
RELOC/doc/lualatex/pgfmolbio/SampleScf.scf
+ RELOC/doc/lualatex/pgfmolbio/SampleUniprot.txt
+ RELOC/doc/lualatex/pgfmolbio/pgfmolbio.lua
RELOC/doc/lualatex/pgfmolbio/pgfmolbio.pdf
++++++ pgfmolbio.tar.xz ++++++
++++ 2886 lines of diff (skipped)
++++++ pgfplots.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-p/pgfplots.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-p.new/pgfplots.doc.tar.xz differ: char 26, line 1
++++++ pgfplots.tar.xz ++++++
++++ 22966 lines of diff (skipped)
++++++ philex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/philex/README new/doc/latex/philex/README
--- old/doc/latex/philex/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/philex/README 2012-09-24 00:57:06.000000000 +0200
@@ -0,0 +1,5 @@
+Philex is a small package with additions to Wolfgang Sternefeld's linguex package (adapted to version 4.1). It provides extended functions for cross-referencing and repeating numbered and named sentences, additional formatting options and hyperref support.
+Version: 1.01
+Author: Peter Pagin (with a contribution by Robin Fairbairns).
+email: peter.pagin@philosophy.su.se
+Date: 2012.09.22
Files old/doc/latex/philex/philexmanual.pdf and new/doc/latex/philex/philexmanual.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/philex/philexmanual.tex new/doc/latex/philex/philexmanual.tex
--- old/doc/latex/philex/philexmanual.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/philex/philexmanual.tex 2012-09-24 00:57:06.000000000 +0200
@@ -0,0 +1,425 @@
+\documentclass[10pt]{article}
+\usepackage[utf8]{inputenc}
+
+
+\usepackage{linguex,eqparbox}
+\usepackage[oldpunct,hyper]{philex}
+\usepackage[left=6cm,right=4cm,top=4cm,bottom=5cm]{geometry}
+\usepackage[colorlinks,linkcolor=black,bookmarksnumbered]{hyperref}
+
+\newcommand{\qut}[1]{`#1'}
+\usepackage[english]{babel}
+
+\usepackage{latexsym,amssymb,amsmath,amsthm,wasysym}
+\usepackage{calc}
+
+\newcounter{hour}
+\newcounter{minute}
+
+
+
+\newcommand{\emp}{\emph}
+\newcommand{\note}{\footnote}
+\setcounter{hour}{\time/60}
+\setcounter{minute}{\time-60*\thehour}
+\ifnum\thehour<10 \def\nowh{0\thehour} \else \def\nowh{\thehour}\fi
+\ifnum\theminute<10\def\nowm{0\theminute} \else \def\nowm{\theminute}\fi
+\def\now{\nowh:\nowm}
+\def\aut{Peter Pagin\\ peter.pagin@philosophy.su.se}
+\def\home{\begin{flushright}
+\item Department of Philosophy
+\item Stockholm University
+\item peter.pagin@philosophy.su.se
+\end{flushright}}
+
+
+\begin{document}
+\tracingassigns=3
+\title{The \tt philex \rm Package \\ version 1.01}
+\author{\aut}
+\date{\today, \now}
+\maketitle
+\reversemarginpar
+\setlength{\marginparwidth}{3cm}
+\subsection*{Changes since version 1.0}
+-- Bugfix: eliminated unwanted space after \verb+\rn{}+ cross-references.
+
+\subsection*{Changes since version 0.9 (internal version)}
+-- \quad Adapted the package to version 4.1 of \verb+linguex+.\\
+-- \quad Added two commands for label separation.
+
+\subsection*{Changes since version 0.6}
+-- \quad Added support for \verb+hyperref+ for named environments.\\
+\noindent -- \quad Added naming options for sub-environments (\verb+\lba+, \verb+\lbb+, \verb+\lbz+).\\
+\noindent -- \quad Added customizing of brackets and numbering-style for second-level sub-environments.\\
+\noindent -- \quad Corrected errors in vertical spacing for \verb+\lbu+ and \verb+\rff+.\\
+\noindent -- \quad Corrected an error in the centering option, and added an alternative for centering.\\
+\noindent -- \quad Replaced earlier (overly short) punctuation commands, and added a package option for using the old commands.\\
+\noindent -- Added customizing of vertical spacing and horizontal spacing as well as label length.\\
+\noindent -- \quad Made the \verb+\lbpx+ environments labels more customizable.\\
+\noindent -- \quad Rewrote and reorganized the manual.
+
+\subsection*{Changes since version 0.5}
+Corrected vertical spacing between adjacent \verb+\lb+ and \verb+\lbp+ environments.
+
+\subsection*{Changes since version 0.3}
+In version 0.3, forward cross-reference was effected by means of writing command definitions to a separate file, \emp{myfile}-px.tex, which was subsequently read-in at the beginning of the following run of typesetting. In version 0.5 the information is instead written to the .aux file and then read from the .aux file in the subsequent run. This method is more elegant and eliminates problems with the implementation of the old method. The improvement is due to Robin Fairbairns.
+
+
+
+\section*{Manual}
+The \verb+philex+ package is intended for use in topics such as philosophy and linguistics, where there is a need both of many example sentences and of named principles, and of cross-references to them in the text. Sometimes one wants cross-reference to environment numbers (or prefix plus number), sometimes to a non-numbered named environment, and sometimes to the content of the environment, for repeating the content in running text or in another environment. The package is a small addition to Wolfgang Sternefeld's \verb+linguex+ package and requires \verb+linguex+. As of version 0.2 it also requires \verb+calc+. \verb+philex+ will load \verb+linguex+ if it is installed. The purpose of \verb+philex+ is to add functions for more flexible cross-referencing, for repeating and embedding named or numbered environments, \verb+hyperref+ support and a some further formatting options.
+
+As of version 0.5 \verb+philex+ writes cross-ref information to the .aux file and reads that information at the beginning of the subsequent run of typesetting. This allows forward cross-referencing to environments that are named or numbered+named, such as \rf{clauses} on p. \pageref{clauses},
+in analogy to the label-reference system of LaTeX itself. As of version 0.9 hyperlinks produced by \verb+hyperref+ are created also for named environments with the \verb+<hyper>+ package option.
+
+\section{Calling the package}
+\verb+philex+ is \marginpar{\tt philex} called by adding \verb+\usepackage[<package options>]{philex}+ in the preamble. This will also automatically load the \verb+linguex+ package. If \verb+linguex+ is called separately, it should be called \emp{before} \verb+philex+, since \verb+philex+ (marginally) redefines some commands in \verb+linguex+.
+
+\section{Package options}
+With \marginpar{\tt <hyper>} the \verb+<hyper>+ option hyperlinks will be created by cross-references to named environments (such as \verb+\lbp+). This requires that the \verb+hyperref+ package is called (should be called last). If \verb+hyperref+ is called without the \verb+<hyper>+ option, hyperlinks will anyway be created from the usual \verb+philex+ cross-references that make use of the basic label- and cross-reference function in LaTeX.
+
+With the \verb+<oldpunct>+ package option \marginpar{\tt <oldpunct>} the old punctuation commands (see below) will still work. This is for the purpose of using more recent versions of \verb+philex+ with older files, without needing search-and-replace.
+
+\section{Top-level environments}
+The basic environment command of \verb+philex+ is \marginpar{\tt \(\backslash\)lb} \verb+\lb{}{}+. It takes two obligatory arguments. The first argument is the label of the environment, and the second is the content of the environment itself. \verb+lb+ uses the \verb+\ex.+ formatting of \verb+linguex+, and thereby the \verb+ExNo+ counter. Type
+
+\begin{verbatim}
+\lb{nice}{This is a nice day. \\ Not too hot.}
+\end{verbatim}
+and the result will be
+
+\lb{nice}{This is a nice day.\\ Not too hot.}
+in case it is the first \verb+\lb+-environment in your document.
+
+In \verb+linguex+ you leave a blank line after sentence to close the environment. The blank line gives a \verb+\par+-command to TeX. In \verb+philex+ the \verb+\par+-command is built into the top-level environments. So you leave a blank line after an \verb+\lb{}{}+-environment only if you want to start a new paragraph. The reason for this change is that only this way will the \verb+philex+ package work together with the \verb+extract+ package by Hendri Adriaens, which can be used for extracting material, e.g. for generating a handout, from documents making use of \verb+philex+. \verb+linguex+ comes together with Sternefeld's \verb+linguho+ package, which has the function of generating a handout from documents using \verb+linguex+. \verb+linguho+ does not work with \verb+philex+, since the \verb+linguex+ environments are not explicit in the document. The corresponding function, only more flexible, can be served with the \verb+extract+ package.
+
+In many cases you \marginpar{Update with \tt\(\backslash\)lbu}will want to produce a variant of the original sentence, which will have the same name or number as the original, but with an added suffix, like a letter or a prime symbol. This is achieved with the \verb+\lbu{}{}{}{}+-command. It takes four obligatory arguments. The first is the label of the new sentence, the second is the label of the environment you are giving a variant of, the third is the suffix you want to add, and the fourth is the new content itself.
+\begin{verbatim}
+\lbu{nicy}{nice}{\('\)}{But that yesterday was even nicer.}
+\end{verbatim}
+produces \lbu{nicy}{nice}{\('\)}{But yesterday was even nicer.}
+
+You may also want to \marginpar{Named environments with \tt\(\backslash\)lbp} have named principles, such as in \rf{life} below (exemplifying forward cross-reference) \bron
+\lbp{life}{W}{Life is wonderful!}
+These are produced with the \verb+\lbp{}{}{}+-command which makes use of the optional argument to \verb+\ex.[]+ in \verb+linguex+. If you later change the name of the principle, or the formulation, the changes are reflected in the cross-references and repetitions after the next typesetting, as long as you do not change the labels.
+
+And updates with \verb+\lbu+, like
+
+\lbu{newlife}{life}{\textsuperscript{+}}{\q Life is terrific!}
+work as before.
+
+In case you \marginpar{Prefixed numbering with \tt\(\backslash\)lbpx} wish a list of independently numbered principles with a shared name stem, there are four independent series. Use one of the \verb+\lbpx+-commands, where \verb+x+ is one of \verb+a,b,c,d+. You can format the listing with \verb+\bpxformat{}{}{}+, where again \verb+x+ has the corresponding value. The first argument sets the numbering style (see below), the second the prefix and the third argument the suffix (this is a change since version 0.6, where there was no suffix argument, and general bracket commands were used).
+ Then the \verb+\lbpx+-command picks it up: \bpaformat{1}{(T}{)}
+
+\begin{verbatim}
+\bpaformat{1}{(T}{)}
+\lbpa{kno}{John is in the know.}
+\lbpa{hu}{Elsa is, too.}
+\lbpa{kne}{Alfred agrees.}
+\end{verbatim}
+produces
+\lbpa{kno}{John is in the know.}
+\lbpa{hu}{Elsa is, too.}
+\lbpa{kne}{Alfred agrees.}
+These enumerations are independent of \verb+ExNO+ and of each other, and the counters (\verb+bpx+) are reset with the relevant \verb+\bpxformat+. They still work with sub-clauses, cross-references and the rest of the apparatus. Note that these enumerations do not have to be contiguous:
+
+\lbpa{glufs}{But he shouldn't.}
+
+All the top-level \marginpar{Centering} environments take an optional argument \verb+[c]+ for centering the text. \verb+\lb[c]{compo}{\[\mu(\sigma(t_{1},\ldots, t_{n}))=+ \verb+r_{\sigma}(\mu(t_{1}), \ldots, \mu(t_{n}))\]}+ produces
+
+\lb[c]{compo}{\[\mu(\sigma(t_{1},\ldots, t_{n}))=r_{\sigma}(\mu(t_{1}), \ldots, \mu(t_{n}))\]}
+ In this example a displaymath environment (\verb+\[..\]+ or \verb+$$..$$+) has been used. This produces extra vertical space above and below, suitable for equations. With centering and in-line math environment (\verb+\(..\)+ or \verb+$..$+), no extra vertical space is produced.
+
+
+The default for \verb+philex+ is centering in the entire column, i.e. along \verb+\columnwidth+. As an alternative, you can make \verb+philex+ center the text within the \verb+philex+ text area itself. This puts the text slightly more to the right. To achieve this, give the command \verb+\narrowcenter+ before the relevant environment. To later revert to the default option, give the command \verb+\widecenter+.
+
+Horizontal alignment \marginpar{Alignment} can be easily achieved by means of Scott Pakin's recent elegant \verb+eqparbox+ package. The code
+
+\begin{verbatim}
+\lb{alignthis}{\eqmakebox[hit][l]{\(2+3\)} \quad = \quad \(5\) \\
+\eqmakebox[hit][l]{\(2+3+4\)} \quad = \quad \(9\)}
+\end{verbatim}
+ automatically generates alignment after a second round of typesetting, without the need of an equation align environment:
+
+\lb{alignthis}{\eqmakebox[hit][l]{\(2+3\)} \quad = \quad \(5\) \\
+\eqmakebox[hit][l]{\(2+3+4\)} \quad = \quad \(9\)}
+
+
+By means of \verb+philex+ commands, the brackets can be \marginpar{Top-level brackets} removed or replaced for all the top-level environments except \verb+\lb+ itself. However, as of version 4.0 of \verb+linguex+, the brackets for the \verb+\lb+ command can be customized. By means of
+
+\begin{verbatim}
+\renewcommand{\ExLBr}{]}
+\renewcommand{\ExRBr}{[}
+\renewcommand{\FnExLBr}{\{}
+\renewcommand{\FnExRBr}{\}}
+\end{verbatim}
+ you can change the \verb+\lb+ brackets to square brackets in main text and to curly brackets in footnotes.
+
+
+For the other cases, you might e.g. want an \verb+\lbp+ environment without label. To turn the brackets off, give the command \verb+\broff+ before the environment. To turn them back on later, give the command \verb+\bron+.
+
+The non-\verb+\lb+ top-level brackets can be reset by the two-argument command \verb+\philbrackets+. For instance \verb+\philbrackets{[}{]}+ will make the following environment labels have square brackets.
+
+There is sometimes a reason \marginpar{Punctuation} to embed the content of an environment in running text or in another environment, so that changes in the original environment are automatically reflected (see below on cross-references). You might then not want the original full stop of an environment sentence to come along. For this purpose there is a punctuation command \verb+\philpunct+ at the end of top-level environments. By default, \verb+\philpunct+ is set to be empty. You can redefine it to provide a full stop by means of \verb+\philfullstop+ before the environment. The command \verb+\philcomma+ redefines it to produce a comma, \verb+\philexclaim+ produces an exclamation mark, \verb+\philquestion+ a question mark, and \verb+\philempty+ turns it back to empty. By means of \verb+\renewcommand{\philpunct}{}+ you can set it as you like.
+
+In earlier versions of \verb+philex+ the corresponding commands were \verb+\p+, \verb+\s+ (for full stop), \verb+\km+ (for comma) and \verb+\q+ (empty). Mostly because I have learned that it is bad design to use one-letter commands, these are now replaced by the new commands. In case of typesetting a file with the old commands, choose the package option \verb+<oldpunct>+.
+
+\verb+linguex+ has \marginpar{Footnotes} sensitivity to footnote contexts, and provides a separate counter, \verb+FnExNo+, that is reset in each footnote. This is inherited by \verb+philex+.\note
+ {The result is illustrated by
+ \lb{ffnote}{A first footnote example:}
+ \lb{sfnote}{A second footnote example.}
+ which shows that numbering is lowercase roman.}
+
+\section{Sub-environments}
+\verb+linguex+ and \marginpar{\tt \(\backslash\)lba, \(\backslash\)lbb, and \(\backslash\)lbz} hence also \verb+philex+ provides sub-environments (sublists) . To illustrate, the code
+
+\begin{verbatim}
+\lbp{clauses}{PP}{Some main words, followed by
+\lba{first}{Time flies
+\lba{firstnew}{Like an arrow}
+\lbz{lastnew}{And much too fast}}
+\lbb{second}{But never stops}
+\lbz{last}{Which is lucky}
+and a concluding comment.}
+\end{verbatim}
+produces
+
+\lbp{clauses}{PP}{Some main words, followed by
+\lba{first}{Time flies}
+\lba{firstnew}{Like an arrow}
+\lbz{lastnew}{And much too fast}
+\lbb{second}{But never stops}
+\lbz{last}{Which is lucky}
+and a concluding comment.}
+ As shown in the source example, the sub-environments must be embedded in the last argument of the top-level command. A second-level sub-environment need not be embedded in the first-level sub-environment (and so on).
+
+As exemplified, sub-environments can be nested up to three levels. The first two levels have their own counters, \verb+SubExNo+ and \verb+SubSubExNo+, provided by \verb+linguex+.
+
+The \verb+\lba+ command restarts the counter of the relevant level. The \verb+\lbb+ command steps the counter, while the \verb+\lbz+ command steps the counter and closes the level, returning to the next higher level. It is not necessary to use \verb+\lbz+ for the last item at the first sub-level (i.e. at the end of a top-level environment). In case only a single sub-environment is used, the command \verb+\z.+ of \verb+linguex+ returns to the higher level.
+
+The labels of the first two sub-levels can be \marginpar{Label formatting} customized in two ways, with respect to numbering style and with respect to brackets. The command \verb+\subformat+ takes three arguments.
+
+The first argument determines the numbering style. The value \qut{R} displays the counter in upper-case roman numerals, \qut{r} in lower case roman, \qut{1} in arabic numerals, \qut{A} in upper-case alphabetic listing, and \qut{a} in lower-case alphabetic listing. Default for the first sub-level is lower-case alphabetic.
+
+The second argument sets the prefix (opening bracket) and the third argument sets the suffix (closing bracket). Default for the first sub-level is no left-hand bracket and a period for the suffix, as shown in the example.
+
+The corresponding command for the second sub-level is \verb+\subsubformat+, with the same arguments and values. Default for the second sub-level is lower-case roman numerals for displaying the counter, and ordinary left- and right-hand round brackets, as shown in the example (these defaults are set by \verb+linguex+). To exemplify, the source code
+
+\begin{verbatim}
+\lbu{clausesup}{clauses}{$'$}{
+\subformat{A}{}{)}
+\subsubformat{1}{[}{]}
+Some introductory words, followed by
+\lba{firstb}{Time flies}
+\lba{firstnewb}{Like an arrow}
+\lbz{lastnewb}{And much too fast}
+\lbb{secondb}{But never stops}
+\lbz{lastb}{Which is lucky}
+and a concluding comment.}
+\end{verbatim}
+
+produces
+
+\lbu{clausesup}{clauses}{$'$}{
+\subformat{A}{}{)}
+\subsubformat{1}{[}{]}
+Some introductory words, followed by
+\lba{firstb}{Time flies}
+\lba{firstnewb}{Like an arrow}
+\lbz{lastnewb}{And much too fast}
+\lbb{secondb}{But never stops}
+\lbz{lastb}{Which is lucky}
+and a concluding comment.}
+
+If the sub-formatting commands are given within the top-level environment, they control only the labels within that environment. If they are given outside, the commands are valid until superseded by later commands.
+
+The sub-level commands \marginpar{Names for \\ sub-environments} have an optional argument (inherited from \verb+linguex+) that can be used for naming sub-environments. For instance, the source
+
+\begin{verbatim}
+\lb{crane}{The saying
+\lba[S]{squeak}{The squeaky wheel gets the grease}
+\z.
+is often confirmed.}
+\end{verbatim}
+ produces
+
+
+\lb{crane}{The saying
+\lba[S]{squeak}{The squeaky wheel gets the grease}
+\z.
+is often confirmed.}
+ Round brackets are put in by default. This can be reset by the \verb+\philbrackets+ command.
+
+Punctuation for sub-environments \marginpar{Punctuation for \\ sub-environments} is controlled by means of the commands \verb+\philsubpunct+, \verb+\philsubstop+, \verb+\philsubcomma+, \verb+\philsubexclaim+, \verb+\philsubquestion+, and \verb+\philsubempty+, analogous to the corresponding top-level commands. The corresponding older commands where \verb+\pt+, \verb+\stp+ (full stop), \verb+\kmt+ (comma), and \verb+\qt+ (empty). As before, they are made active by means of the \verb+<oldpunct>+ package option.
+
+\section{Cross-references}
+The first argument of all environment commands are used by \verb+philex+ to give a \verb+\label+ command. If the environment is numbered by a counter, the label makes the environment accessible for cross-reference by the standard cross-reference mechanism of LaTeX. For instance, \verb+\ref{nice}+ produces the cross-reference `\ref{nice}' to the first \verb+\lb+ environment on page \pageref{nice}.\note
+ {The reason for the fuss about brackets is that in order to modify the material within the brackets, e.g. with {\tt lbu}, the brackets cannot be hard-coded into the cross-reference command, but must be put in afterwords.}
+
+However, \verb+philex+ provides \marginpar{\tt \(\backslash\)rf, \(\backslash\)rn} its own cross-reference command, \verb+\rf+, which has a wider function. It provides ordinary cross-references in accordance with the numbering style of the antecedent, and keeps track of the embedding. It also provides cross-references to \emp{named} environments, where there is no counter value to pick up. The difference between \verb+\rf+ and \verb+\rn+ is that the latter leaves out the brackets. So we will have the productions
+\begin{trivlist}
+\item \noindent \verb+\rf{nice}+ \(\longrightarrow\) \rf{nice} \hfill (target on page \pageref{nice})
+\item \noindent \verb+\rf{kne}+ \(\longrightarrow\) \rf{kne} \hfill (target on page \pageref{kne})
+\item \noindent \verb+\rn{kne}+ \(\longrightarrow\) \rn{kne} \hfill (target on page \pageref{kne})
+\item \verb+\rn{clauseup}+ \(\longrightarrow\) \rn{clausesup} \hfill (target on page \pageref{clausesup})
+\item \verb+\rf{lastnew}+ \(\longrightarrow\) \rf{lastnew}\hfill (target on page \pageref{lastnew})
+\item \verb+\rf{lastnewb}+ \(\longrightarrow\) \rf{lastnewb} \hfill (target on page \pageref{lastnewb})
+\end{trivlist}
+ Both \verb+\rf+ and \verb+\rn+ have an optional argument which produces an optional suffix. \verb+\rf[*]{nice}+ produces \rf[*]{nice}.
+
+Both \verb+linguex+ and \verb+philex+ \marginpar{Inner delimiters} provide customizing of inner delimiters in complex cross-references. \verb+linguex+ has changed in version 4.0 (see its manual). With \verb+philex+, use the \verb+\phildashes{}{}+ \marginpar{\tt \(\backslash\)phildashes} command. This works together with the \verb+\subformat+ and the \verb+\subsubformat+ commands. The first argument sets the delimiter between the top-level reference and the reference to the first sub-environment, while the second argument sets the delimiter between references to the first and the second sub-level environments. To illustrate. We use the input
+\begin{verbatim}
+\lb{cool}{We would like a colon
+\phildashes{:}{}
+\subformat{a}{}{)}
+\lba{coola}{before reference to this.}
+\lba{coolb}{but nothing more before reference to this}}
+\end{verbatim}
+to create and make a cross-reference with \verb+\rf{coolb}+ to \rf{coolb} below:
+\lb{cool}{We would like a colon
+\phildashes{:}{}
+\subformat{a}{}{)}
+\lba{coola}{before reference to this}
+\lba{coolb}{but nothing more before reference to this.}}
+
+If the \verb+hyperref+ package \marginpar{\tt hyperref} is called (must be called last) in the preamble, all ordinary cross-references of the label+cross-reference mechanism of LaTeX are by default made into pdf hyperlinks. This includes all cross-references in \verb+philex+ that rely on counters. If the \verb+<hyper>+ package option is also called, cross-references to \emp{named} environments are made into hyperlinks as well.
+
+This is useful for reading pdf:s on the screen, and also for \verb+beamer+ slide-show presentations: click on a cross-reference to a named principle, and you are taken to the page where that principle is stated. In \verb+beamer+ you are taken to the first slide of the relevant frame.
+
+Sub-environments can \marginpar{Cross-reference to \\ sub-environments in footnotes} be used in footnotes as well. But here, to get the cross-references right, the \verb+subformat+ command must be used.\note
+ {This is illustrated by
+ \lb{ffnote}{A first footnote example:
+ \subformat{a}{}{)}
+ \lba{fnota}{Be careful in footnotes.}}
+ \lb{sfnote}{A second footnote example.}
+ This cross-reference to \rf{fnota} is correct.}
+ The example is produced by the input
+\begin{verbatim}
+\lb{ffnote}{A first footnote example:
+ \subformat{a}{}{)}
+ \lba{fnota}{Be careful in footnotes.}}
+ \lb{sfnote}{A second footnote example.
+ This cross-reference to \rf{fnota} is correct.}
+\end{verbatim}
+
+\verb+philex+ also has cross-reference \marginpar{Repeating content} functions for repeating the \emp{contents} of environment. By means of \verb+\rp{nicy}+ you repeat the content of \rf{nicy}: \rp{nicy} If you want to embed the content in another sentence, you may want the initial capital letter to be made lowercase. Then use the \verb+\ml+ command, as in
+
+\lb{jsays}{John says that \ml{nice}}
+ produced by
+\begin{verbatim}
+\lb{jsays}{John says that \ml{nice}}
+\end{verbatim}
+
+In case you want a full stop at the end of an earlier environment and want to embed the content without the stop, you can use the \verb+\philfullstop+ command to have it inserted for you:
+
+
+
+
+\begin{verbatim}
+\philfullstop
+\lb{stop}{It is very cold}
+\philexclaim
+\lb{ifstop}{If \ml{stop}, you should put on a cap}
+\end{verbatim}
+ produces
+
+\philfullstop
+\lb{stop}{It is very cold}
+\philexclaim
+
+\lb{ifstop}{If \ml{stop}, you should put on a cap}
+\philempty
+
+Finally, one can repeat an entire environment with label by means of the \verb+\rff+ command. \verb+\rff{nice}+ produces \rff{nice}
+
+\section{Lengths and spaces}
+\verb+linguex+ provides a number length and spacing commands that can be used to customize the appearance of \verb+philex+ environments. Below are given the length name, brief explanation, and the default value set by \verb+linguex+. \qut{hspace} is short for \qut{horizontal space} and \qut{vspace} analogously:
+
+\begin{trivlist}
+\item \verb+\Exlabelsep+ (hspace after label) \hfill \verb+1.3em+
+\item \verb+\Extopsep+ (extra vspace above and below) \hfill \verb+.66\baselineskip+
+\item \verb+\SubExleftmargin+ (hspace after sub-level label) \hfill \verb+2em+
+\item \verb+\SubSubExleftmargin+ (hspace after sub-sub-level label) \hfill \verb+2.4em+
+\item \verb+\Exindent+ (indent of the environment) \hfill \verb+0pt+
+%\item \verb+\Exlabelwidth+ (width of top-level label) \hfill \verb+4em+
+\end{trivlist}
+ Beside these, \verb+philex+ modifies \verb+linguex+ by letting two re-definable commands replace hard-coded lengths:
+
+\begin{trivlist}
+\item \verb+\phlabelwidth{}+ (width of label) \hfill \verb+3em+
+\item \verb+\phlabeldefault+ (returns to default value)
+\item \verb+\phlabelsep{}+ (sets hspace after label to the argument, e.g. 1cm)
+\item \verb+\phlabelsepdefault+ (sets default value of the label separation)
+\item \verb+\Exredux+ (vspace reduction between environments) \hfill \verb+-\baselineskip+
+\end{trivlist}
+
+If one needs longer labels, e.g. as names of principles or for other purposes, one can use \verb+\phlabelwidth+ in combination with \verb+\Exlabelsep+. For example
+
+\begin{verbatim}
+\setlength{\Exlabelsep}{2cm}
+\phlabelwidth{4cm}
+\broff
+\lb{defe}{Compositionality:}{The meaning ... etc. }
+\end{verbatim}
+ has the following effect:
+
+
+
+\setlength{\Exlabelsep}{2cm}
+\phlabelwidth{4cm}
+\broff
+
+\lbp{compo}{Compositionality:}{The meaning of a complex expression is a function of the meanings of its parts and its mode of composition.}
+ For two-column documents, the label separation should preferably be somewhat reduced. This has to be set manually by means of these commands, since there is no automatic adaptation to two-column options or environments.
+
+\setlength{\Exlabelsep}{1.3em}
+\phlabeldefault
+
+
+Vertical spacing is controlled with \verb+\Extopsep+ and \verb+\Exredux+. The second controls the reduction of inter-environment vertical space and needs to be adapted to the general control of vertical space. To illustrate, the input
+
+\begin{verbatim}
+\setlength{\Extopsep}{2\baselineskip}
+\setlength{\Exredux}{-3\baselineskip}
+\end{verbatim}
+ has the following effect on vertical spacing:
+
+\setlength{\Extopsep}{2\baselineskip}
+\setlength{\Exredux}{-3\baselineskip}
+
+\lb{vertia}{First vertical space example}
+\lb{vertib}{Second vertical space example}
+\lb{vertic}{Third vertical space example}
+ Next line comes here.
+
+\setlength{\Extopsep}{.66\baselineskip}
+\setlength{\Exredux}{-1\baselineskip}
+
+
+\section{Troubleshooting}
+The most \marginpar{Infelicitous labels} common problem you can run into with \verb+philex+ derives from an infelicitous choice of label (first argument to the commands). \verb+philex+ creates new command names (control sequences) from the labels, and especially with short labels it sometimes happens that a generated label coincides with a control sequence defined by TeX, or LaTeX, or some document class or package. Typesetting will halt with an error message that does not give the appropriate information. The location of the error need not be right either.
+
+To remedy, try replacing your latest label(s) by new ones that are unlikely to clash with other control sequences.
+
+Another type or error \marginpar{\tt hyperref \normalfont and the\\ .aux file} can occur in case the \verb+hyperref+ package is used, and \verb+hyperref+ does not find the information it needs in the .aux file, perhaps because of an error in a previous round.
+
+The remedy is to enter non-stop typesetting mode by pressing \qut{r} in response to the error message. Typesetting will be completed, with incorrect results, but the next round of typesetting will then work as it should. If there is still a problem, abort typesetting, trash the auxiliary file and start over.
+
+A problem may arise \marginpar{math environment in \tt lbu} because LaTeX style math environment delimiters (\verb+\(..\)+) are used in the third argument (the update symbol) of the \verb+\lbu+ command. To avoid this problem, use TeX style delimiters (\verb+$..$+) instead.
+
+A further possible problem derives from \marginpar{Clash between \\ \texttt {hyperref} and \\ \texttt{linguex}} a clash between \verb+linguex+ and fairly recent versions of \verb+hyperref+. This (as has been explained to me by Heiko Oberdiek) depends on a conflict over the use of \verb+\b+. The result will be that sub-environments will lack labels and be incorrectly formatted.
+
+The remedy has been provided by Heiko Oberdiek, who has added a workaround in \verb+hyperref+. To make use of this, make sure that your version of \verb+hyperref+ is 6.78o (from 2009.02.02) or later.
+
+There is also \marginpar{Clash between \\ \texttt{setspace} and \\ \tt linguex} a conflict between the \verb+setspace+ package and \verb+linguex+. The problem seems to be that \verb+setspace+ redefines \verb+\@footnotetext+ in a way that interferes with the way \verb+linguex+ is meant to work in footnotes.
+
+To avoid this problem, load \verb+philex+ (and \verb+linguex+ too, if called) \emp{after} \verb+setspace+. Also, don't use the \verb+\setstretch+ command in the preamble for setting line spacing. Rather set a \verb+spacing+ environment in the main body, after \verb+\begin{document}+. This environment may span the entire main document.
+
+Finally, \marginpar{Comments} bug reports, comments or suggestions are welcome and should be directed to Peter Pagin at \hyperref{mailto:peter.pagin@philosophy.su.se}{}{}{peter.pagin@philosophy.su.se}.
+
+
+
+
+
+\end{document}
\ No newline at end of file
Files old/doc/latex/philex/philexmanualb.pdf and new/doc/latex/philex/philexmanualb.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/philex/philexmanualb.tex new/doc/latex/philex/philexmanualb.tex
--- old/doc/latex/philex/philexmanualb.tex 2010-04-15 19:06:54.000000000 +0200
+++ new/doc/latex/philex/philexmanualb.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,422 +0,0 @@
-\documentclass[10pt]{article}
-\usepackage[utf8]{inputenc}
-
-
-\usepackage{linguex,eqparbox}
-\usepackage[oldpunct,hyper]{philex}
-\usepackage[left=6cm,right=4cm,top=4cm,bottom=5cm]{geometry}
-\usepackage[colorlinks,linkcolor=black,bookmarksnumbered]{hyperref}
-
-\newcommand{\qut}[1]{`#1'}
-\usepackage[english]{babel}
-
-\usepackage{latexsym,amssymb,amsmath,amsthm,wasysym}
-\usepackage{calc}
-
-\newcounter{hour}
-\newcounter{minute}
-
-
-
-\newcommand{\emp}{\emph}
-\newcommand{\note}{\footnote}
-\setcounter{hour}{\time/60}
-\setcounter{minute}{\time-60*\thehour}
-\ifnum\thehour<10 \def\nowh{0\thehour} \else \def\nowh{\thehour}\fi
-\ifnum\theminute<10\def\nowm{0\theminute} \else \def\nowm{\theminute}\fi
-\def\now{\nowh:\nowm}
-\def\aut{Peter Pagin\\ peter.pagin@philosophy.su.se}
-\def\home{\begin{flushright}
-\item Department of Philosophy
-\item Stockholm University
-\item peter.pagin@philosophy.su.se
-\end{flushright}}
-
-
-\begin{document}
-\tracingassigns=3
-\title{The \tt philex \rm Package \\ version 1.0}
-\author{\aut}
-\date{\today, \now}
-\maketitle
-\reversemarginpar
-\setlength{\marginparwidth}{3cm}
-\subsection*{Changes since version 0.9 (internal version)}
--- \quad Adapted the package to version 4.1 of \verb+linguex+.\\
--- \quad Added two commands for label separation.
-
-\subsection*{Changes since version 0.6}
--- \quad Added support for \verb+hyperref+ for named environments.\\
-\noindent -- \quad Added naming options for sub-environments (\verb+\lba+, \verb+\lbb+, \verb+\lbz+).\\
-\noindent -- \quad Added customizing of brackets and numbering-style for second-level sub-environments.\\
-\noindent -- \quad Corrected errors in vertical spacing for \verb+\lbu+ and \verb+\rff+.\\
-\noindent -- \quad Corrected an error in the centering option, and added an alternative for centering.\\
-\noindent -- \quad Replaced earlier (overly short) punctuation commands, and added a package option for using the old commands.\\
-\noindent -- Added customizing of vertical spacing and horizontal spacing as well as label length.\\
-\noindent -- \quad Made the \verb+\lbpx+ environments labels more customizable.\\
-\noindent -- \quad Rewrote and reorganized the manual.
-
-\subsection*{Changes since version 0.5}
-Corrected vertical spacing between adjacent \verb+\lb+ and \verb+\lbp+ environments.
-
-\subsection*{Changes since version 0.3}
-In version 0.3, forward cross-reference was effected by means of writing command definitions to a separate file, \emp{myfile}-px.tex, which was subsequently read-in at the beginning of the following run of typesetting. In version 0.5 the information is instead written to the .aux file and then read from the .aux file in the subsequent run. This method is more elegant and eliminates problems with the implementation of the old method. The improvement is due to Robin Fairbairns.
-
-
-
-\section*{Manual}
-The \verb+philex+ package is intended for use in topics such as philosophy and linguistics, where there is a need both of many example sentences and of named principles, and of cross-references to them in the text. Sometimes one wants cross-reference to environment numbers (or prefix plus number), sometimes to a non-numbered named environment, and sometimes to the content of the environment, for repeating the content in running text or in another environment. The package is a small addition to Wolfgang Sternefeld's \verb+linguex+ package and requires \verb+linguex+. As of version 0.2 it also requires \verb+calc+. \verb+philex+ will load \verb+linguex+ if it is installed. The purpose of \verb+philex+ is to add functions for more flexible cross-referencing, for repeating and embedding named or numbered environments, \verb+hyperref+ support and a some further formatting options.
-
-As of version 0.5 \verb+philex+ writes cross-ref information to the .aux file and reads that information at the beginning of the subsequent run of typesetting. This allows forward cross-referencing to environments that are named or numbered+named, such as \rf{clauses} on p. \pageref{clauses},
-in analogy to the label-reference system of LaTeX itself. As of version 0.9 hyperlinks produced by \verb+hyperref+ are created also for named environments with the \verb+<hyper>+ package option.
-
-\section{Calling the package}
-\verb+philex+ is \marginpar{\tt philex} called by adding \verb+\usepackage[<package options>]{philex}+ in the preamble. This will also automatically load the \verb+linguex+ package. If \verb+linguex+ is called separately, it should be called \emp{before} \verb+philex+, since \verb+philex+ (marginally) redefines some commands in \verb+linguex+.
-
-\section{Package options}
-With \marginpar{\tt <hyper>} the \verb+<hyper>+ option hyperlinks will be created by cross-references to named environments (such as \verb+\lbp+). This requires that the \verb+hyperref+ package is called (should be called last). If \verb+hyperref+ is called without the \verb+<hyper>+ option, hyperlinks will anyway be created from the usual \verb+philex+ cross-references that make use of the basic label- and cross-reference function in LaTeX.
-
-With the \verb+<oldpunct>+ package option \marginpar{\tt <oldpunct>} the old punctuation commands (see below) will still work. This is for the purpose of using more recent versions of \verb+philex+ with older files, without needing search-and-replace.
-
-\section{Top-level environments}
-The basic environment command of \verb+philex+ is \marginpar{\tt \(\backslash\)lb} \verb+\lb{}{}+. It takes two obligatory arguments. The first argument is the label of the environment, and the second is the content of the environment itself. \verb+lb+ uses the \verb+\ex.+ formatting of \verb+linguex+, and thereby the \verb+ExNo+ counter. Type
-
-\begin{verbatim}
-\lb{nice}{This is a nice day. \\ Not too hot.}
-\end{verbatim}
-and the result will be
-
-\lb{nice}{This is a nice day.\\ Not too hot.}
-in case it is the first \verb+\lb+-environment in your document.
-
-In \verb+linguex+ you leave a blank line after sentence to close the environment. The blank line gives a \verb+\par+-command to TeX. In \verb+philex+ the \verb+\par+-command is built into the top-level environments. So you leave a blank line after an \verb+\lb{}{}+-environment only if you want to start a new paragraph. The reason for this change is that only this way will the \verb+philex+ package work together with the \verb+extract+ package by Hendri Adriaens, which can be used for extracting material, e.g. for generating a handout, from documents making use of \verb+philex+. \verb+linguex+ comes together with Sternefeld's \verb+linguho+ package, which has the function of generating a handout from documents using \verb+linguex+. \verb+linguho+ does not work with \verb+philex+, since the \verb+linguex+ environments are not explicit in the document. The corresponding function, only more flexible, can be served with the \verb+extract+ package.
-
-In many cases you \marginpar{Update with \tt\(\backslash\)lbu}will want to produce a variant of the original sentence, which will have the same name or number as the original, but with an added suffix, like a letter or a prime symbol. This is achieved with the \verb+\lbu{}{}{}{}+-command. It takes four obligatory arguments. The first is the label of the new sentence, the second is the label of the environment you are giving a variant of, the third is the suffix you want to add, and the fourth is the new content itself.
-\begin{verbatim}
-\lbu{nicy}{nice}{\('\)}{But that yesterday was even nicer.}
-\end{verbatim}
-produces \lbu{nicy}{nice}{\('\)}{But yesterday was even nicer.}
-
-You may also want to \marginpar{Named environments with \tt\(\backslash\)lbp} have named principles, such as in \rf{life} below (exemplifying forward cross-reference) \bron
-\lbp{life}{W}{Life is wonderful!}
-These are produced with the \verb+\lbp{}{}{}+-command which makes use of the optional argument to \verb+\ex.[]+ in \verb+linguex+. If you later change the name of the principle, or the formulation, the changes are reflected in the cross-references and repetitions after the next typesetting, as long as you do not change the labels.
-
-And updates with \verb+\lbu+, like
-
-\lbu{newlife}{life}{\textsuperscript{+}}{\q Life is terrific!}
-work as before.
-
-In case you \marginpar{Prefixed numbering with \tt\(\backslash\)lbpx} wish a list of independently numbered principles with a shared name stem, there are four independent series. Use one of the \verb+\lbpx+-commands, where \verb+x+ is one of \verb+a,b,c,d+. You can format the listing with \verb+\bpxformat{}{}{}+, where again \verb+x+ has the corresponding value. The first argument sets the numbering style (see below), the second the prefix and the third argument the suffix (this is a change since version 0.6, where there was no suffix argument, and general bracket commands were used).
- Then the \verb+\lbpx+-command picks it up: \bpaformat{1}{(T}{)}
-
-\begin{verbatim}
-\bpaformat{1}{(T}{)}
-\lbpa{kno}{John is in the know.}
-\lbpa{hu}{Elsa is, too.}
-\lbpa{kne}{Alfred agrees.}
-\end{verbatim}
-produces
-\lbpa{kno}{John is in the know.}
-\lbpa{hu}{Elsa is, too.}
-\lbpa{kne}{Alfred agrees.}
-These enumerations are independent of \verb+ExNO+ and of each other, and the counters (\verb+bpx+) are reset with the relevant \verb+\bpxformat+. They still work with sub-clauses, cross-references and the rest of the apparatus. Note that these enumerations do not have to be contiguous:
-
-\lbpa{glufs}{But he shouldn't.}
-
-All the top-level \marginpar{Centering} environments take an optional argument \verb+[c]+ for centering the text. \verb+\lb[c]{compo}{\[\mu(\sigma(t_{1},\ldots, t_{n}))=+ \verb+r_{\sigma}(\mu(t_{1}), \ldots, \mu(t_{n}))\]}+ produces
-
-\lb[c]{compo}{\[\mu(\sigma(t_{1},\ldots, t_{n}))=r_{\sigma}(\mu(t_{1}), \ldots, \mu(t_{n}))\]}
- In this example a displaymath environment (\verb+\[..\]+ or \verb+$$..$$+) has been used. This produces extra vertical space above and below, suitable for equations. With centering and in-line math environment (\verb+\(..\)+ or \verb+$..$+), no extra vertical space is produced.
-
-
-The default for \verb+philex+ is centering in the entire column, i.e. along \verb+\columnwidth+. As an alternative, you can make \verb+philex+ center the text within the \verb+philex+ text area itself. This puts the text slightly more to the right. To achieve this, give the command \verb+\narrowcenter+ before the relevant environment. To later revert to the default option, give the command \verb+\widecenter+.
-
-Horizontal alignment \marginpar{Alignment} can be easily achieved by means of Scott Pakin's recent elegant \verb+eqparbox+ package. The code
-
-\begin{verbatim}
-\lb{alignthis}{\eqmakebox[hit][l]{\(2+3\)} \quad = \quad \(5\) \\
-\eqmakebox[hit][l]{\(2+3+4\)} \quad = \quad \(9\)}
-\end{verbatim}
- automatically generates alignment after a second round of typesetting, without the need of an equation align environment:
-
-\lb{alignthis}{\eqmakebox[hit][l]{\(2+3\)} \quad = \quad \(5\) \\
-\eqmakebox[hit][l]{\(2+3+4\)} \quad = \quad \(9\)}
-
-
-By means of \verb+philex+ commands, the brackets can be \marginpar{Top-level brackets} removed or replaced for all the top-level environments except \verb+\lb+ itself. However, as of version 4.0 of \verb+linguex+, the brackets for the \verb+\lb+ command can be customized. By means of
-
-\begin{verbatim}
-\renewcommand{\ExLBr}{]}
-\renewcommand{\ExRBr}{[}
-\renewcommand{\FnExLBr}{\{}
-\renewcommand{\FnExRBr}{\}}
-\end{verbatim}
- you can change the \verb+\lb+ brackets to square brackets in main text and to curly brackets in footnotes.
-
-
-For the other cases, you might e.g. want an \verb+\lbp+ environment without label. To turn the brackets off, give the command \verb+\broff+ before the environment. To turn them back on later, give the command \verb+\bron+.
-
-The non-\verb+\lb+ top-level brackets can be reset by the two-argument command \verb+\philbrackets+. For instance \verb+\philbrackets{[}{]}+ will make the following environment labels have square brackets.
-
-There is sometimes a reason \marginpar{Punctuation} to embed the content of an environment in running text or in another environment, so that changes in the original environment are automatically reflected (see below on cross-references). You might then not want the original full stop of an environment sentence to come along. For this purpose there is a punctuation command \verb+\philpunct+ at the end of top-level environments. By default, \verb+\philpunct+ is set to be empty. You can redefine it to provide a full stop by means of \verb+\philfullstop+ before the environment. The command \verb+\philcomma+ redefines it to produce a comma, \verb+\philexclaim+ produces an exclamation mark, \verb+\philquestion+ a question mark, and \verb+\philempty+ turns it back to empty. By means of \verb+\renewcommand{\philpunct}{}+ you can set it as you like.
-
-In earlier versions of \verb+philex+ the corresponding commands were \verb+\p+, \verb+\s+ (for full stop), \verb+\km+ (for comma) and \verb+\q+ (empty). Mostly because I have learned that it is bad design to use one-letter commands, these are now replaced by the new commands. In case of typesetting a file with the old commands, choose the package option \verb+<oldpunct>+.
-
-\verb+linguex+ has \marginpar{Footnotes} sensitivity to footnote contexts, and provides a separate counter, \verb+FnExNo+, that is reset in each footnote. This is inherited by \verb+philex+.\note
- {The result is illustrated by
- \lb{ffnote}{A first footnote example:}
- \lb{sfnote}{A second footnote example.}
- which shows that numbering is lowercase roman.}
-
-\section{Sub-environments}
-\verb+linguex+ and \marginpar{\tt \(\backslash\)lba, \(\backslash\)lbb, and \(\backslash\)lbz} hence also \verb+philex+ provides sub-environments (sublists) . To illustrate, the code
-
-\begin{verbatim}
-\lbp{clauses}{PP}{Some main words, followed by
-\lba{first}{Time flies
-\lba{firstnew}{Like an arrow}
-\lbz{lastnew}{And much too fast}}
-\lbb{second}{But never stops}
-\lbz{last}{Which is lucky}
-and a concluding comment.}
-\end{verbatim}
-produces
-
-\lbp{clauses}{PP}{Some main words, followed by
-\lba{first}{Time flies}
-\lba{firstnew}{Like an arrow}
-\lbz{lastnew}{And much too fast}
-\lbb{second}{But never stops}
-\lbz{last}{Which is lucky}
-and a concluding comment.}
- As shown in the source example, the sub-environments must be embedded in the last argument of the top-level command. A second-level sub-environment need not be embedded in the first-level sub-environment (and so on).
-
-As exemplified, sub-environments can be nested up to three levels. The first two levels have their own counters, \verb+SubExNo+ and \verb+SubSubExNo+, provided by \verb+linguex+.
-
-The \verb+\lba+ command restarts the counter of the relevant level. The \verb+\lbb+ command steps the counter, while the \verb+\lbz+ command steps the counter and closes the level, returning to the next higher level. It is not necessary to use \verb+\lbz+ for the last item at the first sub-level (i.e. at the end of a top-level environment). In case only a single sub-environment is used, the command \verb+\z.+ of \verb+linguex+ returns to the higher level.
-
-The labels of the first two sub-levels can be \marginpar{Label formatting} customized in two ways, with respect to numbering style and with respect to brackets. The command \verb+\subformat+ takes three arguments.
-
-The first argument determines the numbering style. The value \qut{R} displays the counter in upper-case roman numerals, \qut{r} in lower case roman, \qut{1} in arabic numerals, \qut{A} in upper-case alphabetic listing, and \qut{a} in lower-case alphabetic listing. Default for the first sub-level is lower-case alphabetic.
-
-The second argument sets the prefix (opening bracket) and the third argument sets the suffix (closing bracket). Default for the first sub-level is no left-hand bracket and a period for the suffix, as shown in the example.
-
-The corresponding command for the second sub-level is \verb+\subsubformat+, with the same arguments and values. Default for the second sub-level is lower-case roman numerals for displaying the counter, and ordinary left- and right-hand round brackets, as shown in the example (these defaults are set by \verb+linguex+). To exemplify, the source code
-
-\begin{verbatim}
-\lbu{clausesup}{clauses}{$'$}{
-\subformat{A}{}{)}
-\subsubformat{1}{[}{]}
-Some introductory words, followed by
-\lba{firstb}{Time flies}
-\lba{firstnewb}{Like an arrow}
-\lbz{lastnewb}{And much too fast}
-\lbb{secondb}{But never stops}
-\lbz{lastb}{Which is lucky}
-and a concluding comment.}
-\end{verbatim}
-
-produces
-
-\lbu{clausesup}{clauses}{$'$}{
-\subformat{A}{}{)}
-\subsubformat{1}{[}{]}
-Some introductory words, followed by
-\lba{firstb}{Time flies}
-\lba{firstnewb}{Like an arrow}
-\lbz{lastnewb}{And much too fast}
-\lbb{secondb}{But never stops}
-\lbz{lastb}{Which is lucky}
-and a concluding comment.}
-
-If the sub-formatting commands are given within the top-level environment, they control only the labels within that environment. If they are given outside, the commands are valid until superseded by later commands.
-
-The sub-level commands \marginpar{Names for \\ sub-environments} have an optional argument (inherited from \verb+linguex+) that can be used for naming sub-environments. For instance, the source
-
-\begin{verbatim}
-\lb{crane}{The saying
-\lba[S]{squeak}{The squeaky wheel gets the grease}
-\z.
-is often confirmed.}
-\end{verbatim}
- produces
-
-
-\lb{crane}{The saying
-\lba[S]{squeak}{The squeaky wheel gets the grease}
-\z.
-is often confirmed.}
- Round brackets are put in by default. This can be reset by the \verb+\philbrackets+ command.
-
-Punctuation for sub-environments \marginpar{Punctuation for \\ sub-environments} is controlled by means of the commands \verb+\philsubpunct+, \verb+\philsubstop+, \verb+\philsubcomma+, \verb+\philsubexclaim+, \verb+\philsubquestion+, and \verb+\philsubempty+, analogous to the corresponding top-level commands. The corresponding older commands where \verb+\pt+, \verb+\stp+ (full stop), \verb+\kmt+ (comma), and \verb+\qt+ (empty). As before, they are made active by means of the \verb+<oldpunct>+ package option.
-
-\section{Cross-references}
-The first argument of all environment commands are used by \verb+philex+ to give a \verb+\label+ command. If the environment is numbered by a counter, the label makes the environment accessible for cross-reference by the standard cross-reference mechanism of LaTeX. For instance, \verb+\ref{nice}+ produces the cross-reference `\ref{nice}' to the first \verb+\lb+ environment on page \pageref{nice}.\note
- {The reason for the fuss about brackets is that in order to modify the material within the brackets, e.g. with {\tt lbu}, the brackets cannot be hard-coded into the cross-reference command, but must be put in afterwords.}
-
-However, \verb+philex+ provides \marginpar{\tt \(\backslash\)rf, \(\backslash\)rn} its own cross-reference command, \verb+\rf+, which has a wider function. It provides ordinary cross-references in accordance with the numbering style of the antecedent, and keeps track of the embedding. It also provides cross-references to \emp{named} environments, where there is no counter value to pick up. The difference between \verb+\rf+ and \verb+\rn+ is that the latter leaves out the brackets. So we will have the productions
-\begin{trivlist}
-\item \noindent \verb+\rf{nice}+ \(\longrightarrow\) \rf{nice} \hfill (target on page \pageref{nice})
-\item \noindent \verb+\rf{kne}+ \(\longrightarrow\) \rf{kne} \hfill (target on page \pageref{kne})
-\item \noindent \verb+\rn{kne}+ \(\longrightarrow\) \rn{kne} \hfill (target on page \pageref{kne})
-\item \verb+\rn{clauseup}+ \(\longrightarrow\) \rn{clausesup} \hfill (target on page \pageref{clausesup})
-\item \verb+\rf{lastnew}+ \(\longrightarrow\) \rf{lastnew}\hfill (target on page \pageref{lastnew})
-\item \verb+\rf{lastnewb}+ \(\longrightarrow\) \rf{lastnewb} \hfill (target on page \pageref{lastnewb})
-\end{trivlist}
- Both \verb+\rf+ and \verb+\rn+ have an optional argument which produces an optional suffix. \verb+\rf[*]{nice}+ produces \rf[*]{nice}.
-
-Both \verb+linguex+ and \verb+philex+ \marginpar{Inner delimiters} provide customizing of inner delimiters in complex cross-references. \verb+linguex+ has changed in version 4.0 (see its manual). With \verb+philex+, use the \verb+\phildashes{}{}+ \marginpar{\tt \(\backslash\)phildashes} command. This works together with the \verb+\subformat+ and the \verb+\subsubformat+ commands. The first argument sets the delimiter between the top-level reference and the reference to the first sub-environment, while the second argument sets the delimiter between references to the first and the second sub-level environments. To illustrate. We use the input
-\begin{verbatim}
-\lb{cool}{We would like a colon
-\phildashes{:}{}
-\subformat{a}{}{)}
-\lba{coola}{before reference to this.}
-\lba{coolb}{but nothing more before reference to this}}
-\end{verbatim}
-to create and make a cross-reference with \verb+\rf{coolb}+ to \rf{coolb} below:
-\lb{cool}{We would like a colon
-\phildashes{:}{}
-\subformat{a}{}{)}
-\lba{coola}{before reference to this}
-\lba{coolb}{but nothing more before reference to this.}}
-
-If the \verb+hyperref+ package \marginpar{\tt hyperref} is called (must be called last) in the preamble, all ordinary cross-references of the label+cross-reference mechanism of LaTeX are by default made into pdf hyperlinks. This includes all cross-references in \verb+philex+ that rely on counters. If the \verb+<hyper>+ package option is also called, cross-references to \emp{named} environments are made into hyperlinks as well.
-
-This is useful for reading pdf:s on the screen, and also for \verb+beamer+ slide-show presentations: click on a cross-reference to a named principle, and you are taken to the page where that principle is stated. In \verb+beamer+ you are taken to the first slide of the relevant frame.
-
-Sub-environments can \marginpar{Cross-reference to \\ sub-environments in footnotes} be used in footnotes as well. But here, to get the cross-references right, the \verb+subformat+ command must be used.\note
- {This is illustrated by
- \lb{ffnote}{A first footnote example:
- \subformat{a}{}{)}
- \lba{fnota}{Be careful in footnotes.}}
- \lb{sfnote}{A second footnote example.}
- This cross-reference to \rf{fnota} is correct.}
- The example is produced by the input
-\begin{verbatim}
-\lb{ffnote}{A first footnote example:
- \subformat{a}{}{)}
- \lba{fnota}{Be careful in footnotes.}}
- \lb{sfnote}{A second footnote example.
- This cross-reference to \rf{fnota} is correct.}
-\end{verbatim}
-
-\verb+philex+ also has cross-reference \marginpar{Repeating content} functions for repeating the \emp{contents} of environment. By means of \verb+\rp{nicy}+ you repeat the content of \rf{nicy}: \rp{nicy} If you want to embed the content in another sentence, you may want the initial capital letter to be made lowercase. Then use the \verb+\ml+ command, as in
-
-\lb{jsays}{John says that \ml{nice}}
- produced by
-\begin{verbatim}
-\lb{jsays}{John says that \ml{nice}}
-\end{verbatim}
-
-In case you want a full stop at the end of an earlier environment and want to embed the content without the stop, you can use the \verb+\philfullstop+ command to have it inserted for you:
-
-
-
-
-\begin{verbatim}
-\philfullstop
-\lb{stop}{It is very cold}
-\philexclaim
-\lb{ifstop}{If \ml{stop}, you should put on a cap}
-\end{verbatim}
- produces
-
-\philfullstop
-\lb{stop}{It is very cold}
-\philexclaim
-
-\lb{ifstop}{If \ml{stop}, you should put on a cap}
-\philempty
-
-Finally, one can repeat an entire environment with label by means of the \verb+\rff+ command. \verb+\rff{nice}+ produces \rff{nice}
-
-\section{Lengths and spaces}
-\verb+linguex+ provides a number length and spacing commands that can be used to customize the appearance of \verb+philex+ environments. Below are given the length name, brief explanation, and the default value set by \verb+linguex+. \qut{hspace} is short for \qut{horizontal space} and \qut{vspace} analogously:
-
-\begin{trivlist}
-\item \verb+\Exlabelsep+ (hspace after label) \hfill \verb+1.3em+
-\item \verb+\Extopsep+ (extra vspace above and below) \hfill \verb+.66\baselineskip+
-\item \verb+\SubExleftmargin+ (hspace after sub-level label) \hfill \verb+2em+
-\item \verb+\SubSubExleftmargin+ (hspace after sub-sub-level label) \hfill \verb+2.4em+
-\item \verb+\Exindent+ (indent of the environment) \hfill \verb+0pt+
-%\item \verb+\Exlabelwidth+ (width of top-level label) \hfill \verb+4em+
-\end{trivlist}
- Beside these, \verb+philex+ modifies \verb+linguex+ by letting two re-definable commands replace hard-coded lengths:
-
-\begin{trivlist}
-\item \verb+\phlabelwidth{}+ (width of label) \hfill \verb+3em+
-\item \verb+\phlabeldefault+ (returns to default value)
-\item \verb+\phlabelsep{}+ (sets hspace after label to the argument, e.g. 1cm)
-\item \verb+\phlabelsepdefault+ (sets default value of the label separation)
-\item \verb+\Exredux+ (vspace reduction between environments) \hfill \verb+-\baselineskip+
-\end{trivlist}
-
-If one needs longer labels, e.g. as names of principles or for other purposes, one can use \verb+\phlabelwidth+ in combination with \verb+\Exlabelsep+. For example
-
-\begin{verbatim}
-\setlength{\Exlabelsep}{2cm}
-\phlabelwidth{4cm}
-\broff
-\lb{defe}{Compositionality:}{The meaning ... etc. }
-\end{verbatim}
- has the following effect:
-
-
-
-\setlength{\Exlabelsep}{2cm}
-\phlabelwidth{4cm}
-\broff
-
-\lbp{compo}{Compositionality:}{The meaning of a complex expression is a function of the meanings of its parts and its mode of composition.}
- For two-column documents, the label separation should preferably be somewhat reduced. This has to be set manually by means of these commands, since there is no automatic adaptation to two-column options or environments.
-
-\setlength{\Exlabelsep}{1.3em}
-\phlabeldefault
-
-
-Vertical spacing is controlled with \verb+\Extopsep+ and \verb+\Exredux+. The second controls the reduction of inter-environment vertical space and needs to be adapted to the general control of vertical space. To illustrate, the input
-
-\begin{verbatim}
-\setlength{\Extopsep}{2\baselineskip}
-\setlength{\Exredux}{-3\baselineskip}
-\end{verbatim}
- has the following effect on vertical spacing:
-
-\setlength{\Extopsep}{2\baselineskip}
-\setlength{\Exredux}{-3\baselineskip}
-
-\lb{vertia}{First vertical space example}
-\lb{vertib}{Second vertical space example}
-\lb{vertic}{Third vertical space example}
- Next line comes here.
-
-\setlength{\Extopsep}{.66\baselineskip}
-\setlength{\Exredux}{-1\baselineskip}
-
-
-\section{Troubleshooting}
-The most \marginpar{Infelicitous labels} common problem you can run into with \verb+philex+ derives from an infelicitous choice of label (first argument to the commands). \verb+philex+ creates new command names (control sequences) from the labels, and especially with short labels it sometimes happens that a generated label coincides with a control sequence defined by TeX, or LaTeX, or some document class or package. Typesetting will halt with an error message that does not give the appropriate information. The location of the error need not be right either.
-
-To remedy, try replacing your latest label(s) by new ones that are unlikely to clash with other control sequences.
-
-Another type or error \marginpar{\tt hyperref \normalfont and the\\ .aux file} can occur in case the \verb+hyperref+ package is used, and \verb+hyperref+ does not find the information it needs in the .aux file, perhaps because of an error in a previous round.
-
-The remedy is to enter non-stop typesetting mode by pressing \qut{r} in response to the error message. Typesetting will be completed, with incorrect results, but the next round of typesetting will then work as it should. If there is still a problem, abort typesetting, trash the auxiliary file and start over.
-
-A problem may arise \marginpar{math environment in \tt lbu} because LaTeX style math environment delimiters (\verb+\(..\)+) are used in the third argument (the update symbol) of the \verb+\lbu+ command. To avoid this problem, use TeX style delimiters (\verb+$..$+) instead.
-
-A further possible problem derives from \marginpar{Clash between \\ \texttt {hyperref} and \\ \texttt{linguex}} a clash between \verb+linguex+ and fairly recent versions of \verb+hyperref+. This (as has been explained to me by Heiko Oberdiek) depends on a conflict over the use of \verb+\b+. The result will be that sub-environments will lack labels and be incorrectly formatted.
-
-The remedy has been provided by Heiko Oberdiek, who has added a workaround in \verb+hyperref+. To make use of this, make sure that your version of \verb+hyperref+ is 6.78o (from 2009.02.02) or later.
-
-There is also \marginpar{Clash between \\ \texttt{setspace} and \\ \tt linguex} a conflict between the \verb+setspace+ package and \verb+linguex+. The problem seems to be that \verb+setspace+ redefines \verb+\@footnotetext+ in a way that interferes with the way \verb+linguex+ is meant to work in footnotes.
-
-To avoid this problem, load \verb+philex+ (and \verb+linguex+ too, if called) \emp{after} \verb+setspace+. Also, don't use the \verb+\setstretch+ command in the preamble for setting line spacing. Rather set a \verb+spacing+ environment in the main body, after \verb+\begin{document}+. This environment may span the entire main document.
-
-Finally, \marginpar{Comments} bug reports, comments or suggestions are welcome and should be directed to Peter Pagin at \hyperref{mailto:peter.pagin@philosophy.su.se}{}{}{peter.pagin@philosophy.su.se}.
-
-
-
-
-
-\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/philex.doc.tlpobj new/tlpkg/tlpobj/philex.doc.tlpobj
--- old/tlpkg/tlpobj/philex.doc.tlpobj 2010-06-10 18:41:35.000000000 +0200
+++ new/tlpkg/tlpobj/philex.doc.tlpobj 2012-09-24 04:25:37.000000000 +0200
@@ -1,8 +1,9 @@
name philex.doc
category Package
-revision 17879
+revision 27785
shortdesc doc files of philex
relocated 1
-docfiles size=61
- RELOC/doc/latex/philex/philexmanualb.pdf
- RELOC/doc/latex/philex/philexmanualb.tex
+docfiles size=56
+ RELOC/doc/latex/philex/README
+ RELOC/doc/latex/philex/philexmanual.pdf
+ RELOC/doc/latex/philex/philexmanual.tex
++++++ philex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/philex/philex.sty new/tex/latex/philex/philex.sty
--- old/tex/latex/philex/philex.sty 2010-04-15 19:06:54.000000000 +0200
+++ new/tex/latex/philex/philex.sty 2012-09-24 00:57:06.000000000 +0200
@@ -1,8 +1,8 @@
%This is a small package with additions to Wolfgang Sternefeld's linguex package (adapted to version 4.1). It provides extended functions for cross-referencing and repeating numbered and named sentences, additional formatting options and hyperref support.
%Author: Peter Pagin (with a contribution by Robin Fairbairns).
%email: peter.pagin@philosophy.su.se
-%Date: 2010.04.14
-%Version: 1.0
+%Date: 2012.09.22
+%Version: 1.01
\NeedsTeXFormat{LaTeX2e}
@@ -326,7 +326,7 @@
\ifhyperref
\hyperlink{#2}{\csname#2\endcsname}#1%
\else
-\csname#2\endcsname#1
+\csname#2\endcsname#1%
\fi}
%Repeating the sentence
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/philex.tlpobj new/tlpkg/tlpobj/philex.tlpobj
--- old/tlpkg/tlpobj/philex.tlpobj 2010-06-10 18:41:35.000000000 +0200
+++ new/tlpkg/tlpobj/philex.tlpobj 2012-09-24 04:25:37.000000000 +0200
@@ -1,6 +1,6 @@
name philex
category Package
-revision 17879
+revision 27785
shortdesc Cross references for named and numbered environments.
relocated 1
longdesc Philex provides means for creating and cross-referencing named
@@ -13,6 +13,6 @@
runfiles size=5
RELOC/tex/latex/philex/philex.sty
catalogue-ctan /macros/latex/contrib/philex
-catalogue-date 2010-04-29 12:33:30 +0200
+catalogue-date 2012-09-23 11:23:18 +0200
catalogue-license lppl
-catalogue-version 1.0
+catalogue-version 1.01
++++++ philosophersimprint.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/philosophersimprint/README new/doc/latex/philosophersimprint/README
--- old/doc/latex/philosophersimprint/README 2011-12-05 00:59:43.000000000 +0100
+++ new/doc/latex/philosophersimprint/README 2013-01-16 00:01:24.000000000 +0100
@@ -16,8 +16,18 @@
have any commercial fonts installed on their machines. The class
uses only freely available and freely distributed fonts.
+Changes in version 1.3
+
+ - Added copyright licensing information
+
+Changes in version 1.2
+
+ - Added trailing slash to the title page URL
+
Changes in version 1.1
- New formatting of journal URL
- Better handling of footnotes
- - Use for microtype if exists
\ No newline at end of file
+ - Use for microtype if exists
+
+
Files old/doc/latex/philosophersimprint/philosophersimprint.pdf and new/doc/latex/philosophersimprint/philosophersimprint.pdf differ
Files old/doc/latex/philosophersimprint/sample.pdf and new/doc/latex/philosophersimprint/sample.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/philosophersimprint/sample.tex new/doc/latex/philosophersimprint/sample.tex
--- old/doc/latex/philosophersimprint/sample.tex 2011-12-05 00:59:43.000000000 +0100
+++ new/doc/latex/philosophersimprint/sample.tex 2013-01-16 00:01:24.000000000 +0100
@@ -15,7 +15,8 @@
\keywords{libraries, philosophy, free access, publications}
-\copyrightinfo{2007, Philosophers' Imprint}
+\copyrightinfo{2007, Philosophers' Imprint}
+%\copyrightlicense{}
\journalvolume{100}
\journalnumber{20}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/philosophersimprint.doc.tlpobj new/tlpkg/tlpobj/philosophersimprint.doc.tlpobj
--- old/tlpkg/tlpobj/philosophersimprint.doc.tlpobj 2011-12-05 04:29:55.000000000 +0100
+++ new/tlpkg/tlpobj/philosophersimprint.doc.tlpobj 2013-01-16 04:41:12.000000000 +0100
@@ -1,6 +1,6 @@
name philosophersimprint.doc
category Package
-revision 24753
+revision 28845
shortdesc doc files of philosophersimprint
relocated 1
docfiles size=119
++++++ philosophersimprint.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/philosophersimprint/philosophersimprint.cls new/tex/latex/philosophersimprint/philosophersimprint.cls
--- old/tex/latex/philosophersimprint/philosophersimprint.cls 2011-12-05 00:59:43.000000000 +0100
+++ new/tex/latex/philosophersimprint/philosophersimprint.cls 2013-01-16 00:01:24.000000000 +0100
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{philosophersimprint}
-[2011/11/25 v1.1 Typesetting articles for Philosophers' Imprint]
+[2013/01/13 v1.3 Typesetting articles for Philosophers' Imprint]
\newif\ifPHIM@titleimage\PHIM@titleimagetrue
\DeclareOption{titleimage}{\PHIM@titleimagetrue}
\DeclareOption{notitleimage}{\PHIM@titleimagefalse}
@@ -216,6 +216,9 @@
\subject{}
\newcommand*{\keywords}[1]{\gdef\@keywords{#1}}
\keywords{}
+\newcommand*{\copyrightlicense}[1]{\gdef\@copyrightlicense{#1}}
+\copyrightlicense{This work is licensed under a Creative Commons
+ Attribution-NonCommercial-NoDerivatives 3.0 License}
\def\PHIM@addzeros#1#2{\@tempcnta=#1\relax
\edef#2{%
\ifnum\@tempcnta>99
@@ -293,10 +296,12 @@
{\large\itshape\@affiliation\par}%
\vskip 0pt plus 0.2fill\relax
{\ifx\@copyrightinfo\@empty~\else%
- \copyright\space\@copyrightinfo\fi\\[0.3ex]
+ \copyright\space\@copyrightinfo\fi\\
\itshape
+ \ifx\@copyrightlicense\@empty~\else%
+ \@copyrightlicense\fi\\[0.3ex]
\edef\PHIM@url{%
- www.philosophersimprint.org/\@@journalvolume\@@journalnumber}
+ www.philosophersimprint.org/\@@journalvolume\@@journalnumber/}
\ifPHIM@hyperref\relax
\href{http://\PHIM@url}{\textcolor{black}{
\textless \PHIM@url\textgreater}}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/philosophersimprint.tlpobj new/tlpkg/tlpobj/philosophersimprint.tlpobj
--- old/tlpkg/tlpobj/philosophersimprint.tlpobj 2011-12-05 04:29:55.000000000 +0100
+++ new/tlpkg/tlpobj/philosophersimprint.tlpobj 2013-01-16 04:41:12.000000000 +0100
@@ -1,6 +1,6 @@
name philosophersimprint
category Package
-revision 24753
+revision 28845
shortdesc Typesetting articles for "Philosophers' Imprint".
relocated 1
longdesc In its mission statement we read "Philosophers' Imprint is a
@@ -18,6 +18,6 @@
runfiles size=4
RELOC/tex/latex/philosophersimprint/philosophersimprint.cls
catalogue-ctan /macros/latex/contrib/philosophersimprint
-catalogue-date 2011-11-29 10:19:57 +0100
+catalogue-date 2013-01-15 09:51:57 +0100
catalogue-license lppl
-catalogue-version 1.1
+catalogue-version 1.3
++++++ pict2e.doc.tar.xz ++++++
Files old/doc/latex/pict2e/pict2e.pdf and new/doc/latex/pict2e/pict2e.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pict2e.doc.tlpobj new/tlpkg/tlpobj/pict2e.doc.tlpobj
--- old/tlpkg/tlpobj/pict2e.doc.tlpobj 2011-04-06 04:17:28.000000000 +0200
+++ new/tlpkg/tlpobj/pict2e.doc.tlpobj 2013-02-24 04:35:23.000000000 +0100
@@ -1,9 +1,9 @@
name pict2e.doc
category Package
-revision 21987
+revision 29215
shortdesc doc files of pict2e
relocated 1
-docfiles size=163
+docfiles size=211
RELOC/doc/latex/pict2e/README
RELOC/doc/latex/pict2e/manifest.txt
RELOC/doc/latex/pict2e/p2e-drivers.pdf
++++++ pict2e.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pict2e.tlpobj new/tlpkg/tlpobj/pict2e.tlpobj
--- old/tlpkg/tlpobj/pict2e.tlpobj 2011-04-06 04:17:29.000000000 +0200
+++ new/tlpkg/tlpobj/pict2e.tlpobj 2013-02-24 04:35:23.000000000 +0100
@@ -1,6 +1,6 @@
name pict2e
category Package
-revision 21987
+revision 29215
shortdesc New implementation of picture commands.
relocated 1
longdesc This package was described in the 2nd edition of 'LaTeX: A
@@ -9,10 +9,11 @@
longdesc included a 'pict2e package' that merely produced an apologetic
longdesc error message. The new package extends the existing LaTeX
longdesc picture environment, using the familiar technique (cf. the
-longdesc graphics and color packages) of driver files. The package
-longdesc documentation has a fair number of examples of use, showing
-longdesc where things are improved by comparison with the LaTeX picture
-longdesc environment.
+longdesc graphics and color packages) of driver files (at present,
+longdesc drivers for PostScript output from LaTeX, and for use with
+longdesc PDFLaTeX are available). The package documentation has a fair
+longdesc number of examples of use, showing where things are improved by
+longdesc comparison with the LaTeX picture environment.
runfiles size=17
RELOC/tex/latex/pict2e/p2e-dvipdfm.def
RELOC/tex/latex/pict2e/p2e-dvipdfmx.def
@@ -26,6 +27,6 @@
RELOC/tex/latex/pict2e/pict2e.cfg
RELOC/tex/latex/pict2e/pict2e.sty
catalogue-ctan /macros/latex/contrib/pict2e
-catalogue-date 2009-08-09 12:58:24 +0200
+catalogue-date 2013-01-08 22:57:06 +0100
catalogue-license lppl
-catalogue-version 0.2x
+catalogue-version 0.2y
++++++ pkfix-helper.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/pkfix-helper.1 new/texmf/doc/man/man1/pkfix-helper.1
--- old/texmf/doc/man/man1/pkfix-helper.1 2011-06-14 23:13:39.000000000 +0200
+++ new/texmf/doc/man/man1/pkfix-helper.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,516 +0,0 @@
-.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings. \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-. ds -- \(*W-
-. ds PI pi
-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-. ds L" ""
-. ds R" ""
-. ds C` ""
-. ds C' ""
-'br\}
-.el\{\
-. ds -- \|\(em\|
-. ds PI \(*p
-. ds L" ``
-. ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD. Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
-..
-. nr % 0
-. rr F
-.\}
-.el \{\
-. de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear. Run. Save yourself. No user-serviceable parts.
-. \" fudge factors for nroff and troff
-.if n \{\
-. ds #H 0
-. ds #V .8m
-. ds #F .3m
-. ds #[ \f1
-. ds #] \fP
-.\}
-.if t \{\
-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-. ds #V .6m
-. ds #F 0
-. ds #[ \&
-. ds #] \&
-.\}
-. \" simple accents for nroff and troff
-.if n \{\
-. ds ' \&
-. ds ` \&
-. ds ^ \&
-. ds , \&
-. ds ~ ~
-. ds /
-.\}
-.if t \{\
-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-. \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-. \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-. \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-. ds : e
-. ds 8 ss
-. ds o a
-. ds d- d\h'-1'\(ga
-. ds D- D\h'-1'\(hy
-. ds th \o'bp'
-. ds Th \o'LP'
-. ds ae ae
-. ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "PKFIX-HELPER 1"
-.TH PKFIX-HELPER 1 "2011-06-11" "v1.4" " "
-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-pkfix\-helper \- preprocess dvips\-produced PostScript documents before passing them to pkfix
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-pkfix-helper
-[\fB\-\-help\fR]
-[\fB\-\-verbose\fR]
-[\fB\-\-force\fR=\fIname\fR=\fIfontspec\fR]
-[\fB\-\-ps\fR=\fIfilename.ps\fR]
-[\fB\-\-tex\fR=\fIfilename.tex\fR]
-[\fB\-\-cache\fR=\fIfilename\fR]
-[\fB\-\-include\fR=\fIfontspec\fR]
-[\fB\-\-exclude\fR=\fIregexp\fR]
-[\fB\-\-keep\fR=\fIfontspec\fR]
-[\fB\-\-quiet\fR]
-[\fB\-\-no\-repeats\fR]
-[\fB\-\-spp\fR=\fInumber\fR]
-[\fIinput.ps\fR [\fIoutput.ps\fR]]
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-.SS "Motivation"
-.IX Subsection "Motivation"
-PostScript documents created with old versions of \fBdvips\fR almost
-invariably utilize bitmapped (PostScript Type\ 3) fonts. The
-problem with bitmapped fonts is that they target a specific device
-resolution; a PostScript file produced using 300\ \s-1DPI\s0 fonts will
-look grainy on a 600\ \s-1DPI\s0 printer. Even worse, \fIall\fR bitmapped
-fonts look grainy when zoomed in on screen. The solution is to use
-vector (PostScript Type\ 1) fonts, which are resolution-independent
-and appear crisp at any size or scale.
-.PP
-While it is no longer difficult to configure \fBdvips\fR to use vector
-fonts, it is not always possible to rerun \fBdvips\fR on an old \fI.dvi\fR
-file. The \fI.dvi\fR file and document source may have been lost; or,
-the source may no longer compile because packages it depends upon may
-no longer be available.
-.PP
-Heiko Oberdiek's \fBpkfix\fR script replaces bitmapped fonts in
-\&\fBdvips\fR\-produced PostScript files with the corresponding vector
-fonts. It works by parsing the PostScript comments with which
-\&\fBdvips\fR surrounds bitmapped-font definitions. For example, a font
-definition beginning with the comment \f(CW\*(C`%DVIPSBitmapFont: Fi cmss10 11
-28\*(C'\fR and ending with a matching \f(CW%EndDVIPSBitmapFont\fR is known to
-define font \f(CW\*(C`Fi\*(C'\fR as \f(CW\*(C`cmss10\*(C'\fR (Computer Modern Sans Serif at a design
-size of 10\ points) scaled to \f(CW11\fR\ points. Only the \f(CW28\fR
-characters actually used by the document are defined. \fBpkfix\fR then
-replaces the font definition with one that defines \f(CW\*(C`Fi\*(C'\fR using the
-same set of characters but taken from the \fIcmss10.pfb\fR vector font
-file.
-.PP
-Unfortunately, \fBpkfix\fR works only with versions of \fBdvips\fR newer
-than v5.58 (ca.\ 1996). Naturally, the older a PostScript document,
-the less likely its sources still exist and can still be recompiled.
-Older versions of \fBdvips\fR lack \f(CW%DVIPSBitmapFont\fR comments and
-various other PostScript comments on which \fBpkfix\fR relies. Without
-PostScript comments to guide it, \fBpkfix\fR is unable to determine which
-vector fonts correspond with which bitmapped fonts.
-.SS "Overview"
-.IX Subsection "Overview"
-The \fBpkfix-helper\fR script is a preprocessor for \fBpkfix\fR that
-attempts to determine the association between each document-font name
-(e.g.,\ \f(CW\*(C`Fi\*(C'\fR) in a PostScript file and the original font (e.g.,\ \f(CW\*(C`cmss10\*(C'\fR) and fonts size (e.g., \f(CW11\fR\ points). It then
-fabricates the PostScript comments that \fBpkfix\fR expects to see so
-that \fBpkfix\fR can do its job.
-.PP
-\&\fBpkfix-helper\fR works by comparing every document font against every
-\&\fI.tfm\fR font file it knows about (assuming that each such font has a
-corresponding \fI.pfb\fR vector version) and selecting the best matching
-\&\fI.tfm\fR file for every document font. \fBpkfix-helper\fR has access only
-to the widths of characters and only to those characters actually used
-in the document. Also, the program recognizes only a limited set of
-the most popular \fI.tfm\fR files and scaling factors. Consequently, the
-comparison is imperfect and \fBpkfix-helper\fR may attribute an incorrect
-font to a given name. Fonts comprising only one or two characters
-actually used in a document are particularly problematic for
-\&\fBpkfix-helper\fR because many fonts may be near-enough matches to fool
-the problem.
-.PP
-\&\fBpkfix-helper\fR is designed so that a user can guide the
-font-selection process by manually designating matching fonts. With a
-modicum of diligence and patience a user can correct any mismatched
-fonts and help the program provide proper input to \fBpkfix\fR.
-.SH "OPTIONS"
-.IX Header "OPTIONS"
-\&\fBpkfix-helper\fR accepts on the command line the filename of a
-PostScript document to process (with the default being the standard
-input device) and the filename of a modified PostScript document to
-create (with the default being the standard output device). The
-program also accepts the following command-line options:
-.SS "Frequently Used Options"
-.IX Subsection "Frequently Used Options"
-.IP "\fB\-h\fR, \fB\-\-help\fR" 4
-.IX Item "-h, --help"
-Display usage information and exit. The \fB\-\-verbose\fR and \fB\-\-quiet\fR
-options can be used to increase and decrease the amount of information
-presented.
-.IP "\fB\-v\fR, \fB\-\-verbose\fR" 4
-.IX Item "-v, --verbose"
-Increase the amount of status information that \fBpkfix-helper\fR
-displays as it runs. Additional instances of \fB\-\-verbose\fR on the
-command line further increase the program's verbosity. By default,
-only major operations are displayed. A single \fB\-\-verbose\fR
-additionally displays information about individual font comparisons.
-A second \fB\-\-verbose\fR additionally displays details about some of the
-program's internal operations.
-.IP "\fB\-f\fR \fIname\fR=\fIfontspec\fR, \fB\-\-force\fR=\fIname\fR=\fIfontspec\fR" 4
-.IX Item "-f name=fontspec, --force=name=fontspec"
-Force \fBpkfix-helper\fR to associate a specific font with a given font
-name appearing the document. \fIname\fR is a two-character \fBdvips\fR font
-name such as \f(CW\*(C`Fa\*(C'\fR. \fIfontspec\fR is a font specification such as
-\&\f(CW\*(C`cmmi8\*(C'\fR or \f(CW\*(C`cmsy10\ @\ 1.1X\*(C'\fR. An asterisk used in the name of the
-base font (e.g.,\ \f(CW\*(C`cmti*\*(C'\fR) will automatically try all integral test
-font sizes from 5 to 17 points (\f(CW\*(C`cmti5\*(C'\fR, \f(CW\*(C`cmti6\*(C'\fR,\ ...,
-\&\f(CW\*(C`cmti17\*(C'\fR). An asterisk used as a scale value (e.g.,\ \f(CW\*(C`cmsy10\ @\ *\*(C'\fR) will be replaced by the scale value that gives the best match to
-the original font's metrics. The \fB\-\-force\fR option can be specified
-repeatedly on the command line.
-.IP "\fB\-p\fR \fIfilename.ps\fR, \fB\-\-ps\fR=\fIfilename.ps\fR" 4
-.IX Item "-p filename.ps, --ps=filename.ps"
-Create a PostScript file called \fIfilename.ps\fR that shows the \fBdvips\fR
-name and a font sample of every font used by the input document.
-.IP "\fB\-t\fR \fIfilename.tex\fR, \fB\-\-tex\fR=\fIfilename.tex\fR" 4
-.IX Item "-t filename.tex, --tex=filename.tex"
-Create a Plain TeX file called \fIfilename.tex\fR that shows the \fBdvips\fR
-name and a font sample of every font that \fBpkfix-helper\fR used in the
-output document.
-.SS "Infrequently Used Options"
-.IX Subsection "Infrequently Used Options"
-.IP "\fB\-C\fR \fIfilename\fR, \fB\-\-cache\fR=\fIfilename\fR" 4
-.IX Item "-C filename, --cache=filename"
-Speed up \s-1TFM\s0 file processing by caching character metrics into file
-\&\fIfilename\fR. On some systems it takes a long time to read a \s-1TFM\s0 file,
-spawn \fItftopl\fR to convert it to \s-1PL\s0 format, and extract from the \s-1PL\s0
-data the metrics for each character. The first time \fB\-\-cache\fR is
-specified, \fBpkfix-helper\fR proceeds as normal then writes all of the
-extracted character metrics to \fIfilename\fR. On subsequent runs in
-which \fB\-\-cache\fR=\fIfilename\fR is specified, \fBpkfix-helper\fR reads the
-previously extracted metrics from \fIfilename\fR, going through the
-\&\fItftopl\fR\-based process only for \s-1TFM\s0 files that were not previously
-encountered.
-.IP "\fB\-q\fR, \fB\-\-quiet\fR" 4
-.IX Item "-q, --quiet"
-Instruct \fBpkfix-helper\fR to produce no output during its run except
-for fatal error messages.
-.IP "\fB\-1\fR, \fB\-\-no\-repeats\fR" 4
-.IX Item "-1, --no-repeats"
-Prevent \fBpkfix-helper\fR from associating the same \fIfontspec\fR with
-more than one \fBdvips\fR font name.
-.IP "\fB\-i\fR \fIfontspec\fR, \fB\-\-include\fR=\fIfontspec\fR" 4
-.IX Item "-i fontspec, --include=fontspec"
-Add \fIfontspec\fR to the list of font specifications against which
-\&\fBpkfix-helper\fR compares \fIevery\fR document font. (In contrast,
-\&\fB\-\-force\fR designates a font specification to use only for a
-\&\fIspecific\fR document font.) The \fB\-\-include\fR option can be specified
-repeatedly on the command line.
-.IP "\fB\-x\fR \fIregexp\fR, \fB\-\-exclude\fR=\fIregexp\fR" 4
-.IX Item "-x regexp, --exclude=regexp"
-Remove all font specifications matching regular expression \fIregexp\fR
-from \fBpkfix-helper\fR's list of known fonts. The \fB\-\-exclude\fR option
-can be specified repeatedly on the command line.
-.IP "\fB\-k\fR \fIfontspec\fR, \fB\-\-keep\fR=\fIfontspec\fR" 4
-.IX Item "-k fontspec, --keep=fontspec"
-Do not substitute a vector font for bitmapped font \fIfontspec\fR (\f(CW\*(C`Fa\*(C'\fR,
-\&\f(CW\*(C`Fb\*(C'\fR, etc.). This is useful when converting documents that use
-obscure bitmapped fonts for which there is no vector equivalent. For
-example, it was somewhat common in the past to include graphics such
-as university or corporate logos into a document by converting the
-bitmapped image into a single-character font and using that font in
-LaTeX. \fB\-\-keep\fR prevents such fonts from being replaced. The
-\&\fB\-\-keep\fR option can be specified repeatedly on the command line.
-.IP "\fB\-a\fR, \fB\-\-any\-scale\fR" 4
-.IX Item "-a, --any-scale"
-Allow any value to be used to scale a font when "\f(CW\*(C`*\*(C'\fR" is specified as
-the scale factor. Normally, \fBpkfix-helper\fR considers only integer
-multiples of 0.1 that are greater than or equal to 1.0 (i.e.,
-\&\fIfontname\fR\f(CW@1X\fR, \f(CW\*(C`@1.1X\*(C'\fR, \f(CW\*(C`@1.2X\*(C'\fR, \f(CW\*(C`@1.3X\*(C'\fR, etc.).
-.IP "\fB\-s\fR, \fB\-\-spp\fR" 4
-.IX Item "-s, --spp"
-Specify the number of font samples per page to print to the files
-indicated using the \fB\-\-ps\fR and \fB\-\-tex\fR options. The default
-value,\ 25, should work well in most circumstances.
-.SH "DIAGNOSTICS"
-.IX Header "DIAGNOSTICS"
-.ie n .IP """Best match for \f(CIname\f(CW is rather poor""" 4
-.el .IP "\f(CWBest match for \f(CIname\f(CW is rather poor\fR" 4
-.IX Item "Best match for name is rather poor"
-The best font \fBpkfix-helper\fR found for \fBdvips\fR font name \fIname\fR has
-a mismatch value greater than or equal to\ 1.0. (The mismatch value
-is the sum of the squares of the difference between the character
-widths of a document font and a potential replacement font.) Use the
-\&\fB\-\-force\fR option to designate an alternative replacement font or
-scaling amount.
-.SH "EXAMPLES"
-.IX Header "EXAMPLES"
-For the purpose of the following examples, assume that \fIoldfile.ps\fR
-is the name of a PostScript file produced by an old version of
-\&\fBdvips\fR and utilizing at least one bitmapped font. It's always worth
-verifying that \fBpkfix\fR can't convert the file on its own:
-.PP
-.Vb 3
-\& $ pkfix oldfile.ps newfile.ps
-\& PKFIX 1.3, 2005/02/25 \- Copyright (c) 2001, 2005 by Heiko Oberdiek.
-\& ==> no fonts converted
-.Ve
-.PP
-(Alternatively \fBpkfix\fR may issue an error message such as \f(CW\*(C`!!!
-Error: Parse error (@start parameters)!\*(C'\fR.) Only when \fBpkfix\fR can't
-replace bitmapped fonts with vector fonts is \fBpkfix-helper\fR needed.
-In its simplest form, \fBpkfix-helper\fR takes the name of an input file
-(\fIoldfile.ps\fR in this example) and the name of an output file
-(\fIpkfix\-oldfile.ps\fR), which will have the same contents as the input
-file but serve as suitable input for \fBpkfix\fR:
-.PP
-.Vb 10
-\& $ pkfix\-helper oldfile.ps pkfix\-oldfile.ps
-\& Reading oldfile.ps ... done.
-\& Number of Type 3 fonts encountered: 10
-\& Bitmapped fonts are typeset at 600 DPI.
-\& Finding character widths ... done.
-\& Reading TFM files ... done (103 TFMs in 193 scaling variations).
-\& Matching fonts:
-\& Processing Fi ... done (cmr10 @ 1X, mismatch=0.11683).
-\& Processing Fa ... done (cmti10 @ 1X, mismatch=0.08892).
-\& Processing Fb ... done (cmr8 @ 1X, mismatch=0.07133).
-\& Processing Ff ... done (cmbx12 @ 1.2X, mismatch=0.02948).
-\& Processing Fh ... done (cmtt10 @ 1X, mismatch=0.06895).
-\& Processing Fd ... done (cmmi10 @ 1X, mismatch=0.03966).
-\& Processing Fj ... done (cmbx12 @ 1X, mismatch=0.03972).
-\& Processing Fe ... done (cmbx10 @ 1X, mismatch=0.00762).
-\& Processing Fg ... done (cmsy10 @ 1X, mismatch=0.00875).
-\& Processing Fc ... done (cmr6 @ 1X, mismatch=0.00284).
-\&
-\& $ pkfix pkfix\-oldfile.ps newfile.ps
-\& PKFIX 1.3, 2005/02/25 \- Copyright (c) 2001, 2005 by Heiko Oberdiek.
-\& *** Font conversion: \`cmti10\*(Aq \-> \`CMTI10\*(Aq.
-\& *** Font conversion: \`cmr8\*(Aq \-> \`CMR8\*(Aq.
-\& *** Font conversion: \`cmr6\*(Aq \-> \`CMR6\*(Aq.
-\& *** Font conversion: \`cmmi10\*(Aq \-> \`CMMI10\*(Aq.
-\& *** Font conversion: \`cmbx10\*(Aq \-> \`CMBX10\*(Aq.
-\& *** Font conversion: \`cmbx12\*(Aq \-> \`CMBX12\*(Aq.
-\& *** Font conversion: \`cmsy10\*(Aq \-> \`CMSY10\*(Aq.
-\& *** Font conversion: \`cmtt10\*(Aq \-> \`CMTT10\*(Aq.
-\& *** Font conversion: \`cmr10\*(Aq \-> \`CMR10\*(Aq.
-\& *** Font conversion: \`cmbx12\*(Aq \-> \`CMBX12\*(Aq.
-\& *** Merging font \`CMBX12\*(Aq (2).
-\& ==> 10 converted fonts.
-\& ==> 1 merged font.
-.Ve
-.PP
-Although \fBpkfix-helper\fR tries to automate as much as possible the
-font-detection process, some fonts will invariably be incorrectly
-identified. The program outputs a warning message if it \fIknows\fR a
-match is bad but the lack of a warning message does not necessarily
-indicate that \fBpkfix-helper\fR did a good job. It is therefore
-strongly recommended that the user produce \*(L"before\*(R" and \*(L"after\*(R" font
-sheets:
-.PP
-.Vb 2
-\& $ pkfix\-helper \-q oldfile.ps pkfix\-oldfile.ps \e
-\& \-\-ps=oldfonts.ps \-\-tex=newfonts.tex
-\&
-\& $ tex newfonts.tex
-\& This is TeX, Version 3.14159 (Web2C 7.4.5)
-\& (./newfonts.tex [1] )
-\& Output written on newfonts.dvi (1 page, 1292 bytes).
-\& Transcript written on newfonts.log.
-\&
-\& $ dvips newfonts.dvi \-o newfonts.ps
-\& This is dvips(k) 5.92b Copyright 2002 Radical Eye Software (www.radicaleye.com)
-\& \*(Aq TeX output 2006.06.11:1636\*(Aq \-> newfonts.ps
-\& <8r.enc>.
-\& [1]
-.Ve
-.PP
-After running the preceding commands, \fIoldfonts.ps\fR shows samples of
-the fonts in \fIoldfile.ps\fR and \fInewfonts.ps\fR shows samples of the
-replacement fonts that \fBpkfix-helper\fR used to produce
-\&\fIpkfix\-oldfile.ps\fR. Print \fIoldfonts.ps\fR and \fInewfonts.ps\fR and
-compare them carefully for incorrect fonts and sizes.
-.PP
-Suppose that the choice of \f(CW\*(C`cmbx12 @ 1.2X\*(C'\fR for font \f(CW\*(C`Ff\*(C'\fR looks
-wrong; say the characters look taller in \fIoldfonts.ps\fR than in
-\&\fInewfonts.ps\fR. This is where the trial-and-error stage begins.
-Let's hypothesize that \f(CW\*(C`cmb12\*(C'\fR is a better match than \f(CW\*(C`cmbx12\*(C'\fR but
-we don't know how much to scale the font. Fortunately,
-\&\fBpkfix-helper\fR allows \f(CW\*(C`*\*(C'\fR to be used as a scaling factor to tell the
-program to automatically detect an optimal scaling factor, even if
-doing so means choosing a nonstandard font size:
-.PP
-.Vb 7
-\& $ pkfix\-helper oldfile.ps pkfix\-oldfile.ps \-\-force="Ff=cmb12 @ *"
-\& Reading oldfile.ps ... done.
-\& Number of Type 3 fonts encountered: 10
-\& Bitmapped fonts are typeset at 600 DPI.
-\& Finding character widths ... done.
-\& Reading TFM files ... failed.
-\& pkfix\-helper: Unable to process user\-specified TFM file "cmb12"
-.Ve
-.PP
-Oops, it looks like we don't have a \fIcmb12.tfm\fR file on our system.
-Let's try scaling up \fIcmb10.tfm\fR instead:
-.PP
-.Vb 10
-\& $ pkfix\-helper oldfile.ps pkfix\-oldfile.ps \-\-force="Ff=cmb10 @ *"
-\& Reading oldfile.ps ... done.
-\& Number of Type 3 fonts encountered: 10
-\& Bitmapped fonts are typeset at 600 DPI.
-\& Finding character widths ... done.
-\& Reading TFM files ... done (103 TFMs in 193 scaling variations).
-\& Matching fonts:
-\& Processing Fi ... done (cmr10 @ 1X, mismatch=0.11683).
-\& Processing Fa ... done (cmti10 @ 1X, mismatch=0.08892).
-\& Processing Fb ... done (cmr8 @ 1X, mismatch=0.07133).
-\& Processing Ff ... done (cmb10 @ 1.5X, mismatch=0.00035).
-\& Processing Fh ... done (cmtt10 @ 1X, mismatch=0.06895).
-\& Processing Fd ... done (cmmi10 @ 1X, mismatch=0.03966).
-\& Processing Fj ... done (cmbx12 @ 1X, mismatch=0.03972).
-\& Processing Fe ... done (cmbx10 @ 1X, mismatch=0.00762).
-\& Processing Fg ... done (cmsy10 @ 1X, mismatch=0.00875).
-\& Processing Fc ... done (cmr6 @ 1X, mismatch=0.00284).
-.Ve
-.PP
-The match has definitely improved, although 15\ pt. is certainly an
-odd size for a font. Then again, many documents \fIdo\fR use nonstandard
-sizes so this may in fact be correct. The best way to verify is once
-again to produce, print, and compare a pair of font samples and
-iterate until all of the fonts look correct. Use one instance of
-\&\fB\-\-force\fR for each font you want to alter.
-.SH "ENVIRONMENT"
-.IX Header "ENVIRONMENT"
-\&\fBpkfix-helper\fR honors the following environment variables:
-.IP "\s-1GS\s0" 8
-.IX Item "GS"
-The name of the Ghostscript interpreter (default: \fIgs\fR)
-.IP "\s-1TFTOPL\s0" 8
-.IX Item "TFTOPL"
-The name of a utility for converting \fI.tfm\fR files to \fI.pl\fR files
-(default: \fItftopl\fR)
-.SH "BUGS"
-.IX Header "BUGS"
-Even when \fBpkfix-helper\fR finds a perfect match (i.e.,\ the correct
-font in the correct size) the mismatch value is still typically
-nonzero. The same error is probably what causes \fBpkfix-helper\fR
-sometimes to consider the wrong font as being a better match than the
-correct font. Suggestions for fixing these bugs are welcome.
-.SH "RESTRICTIONS"
-.IX Header "RESTRICTIONS"
-\&\fBpkfix-helper\fR works only with PostScript files produced by \fBdvips\fR,
-not with arbitrary PostScript files. The program has not been tested
-with output from versions of \fBdvips\fR older than v5.490 (ca.\ 1992);
-output from older versions may or may not work. Only bitmapped fonts
-loaded by \fBdvips\fR can be analyzed, not bitmapped fonts loaded by
-embedded graphics.
-.PP
-\&\fBpkfix-helper\fR works by comparing character widths, not the actual
-glyphs. Consequently, it is misled by sets of fonts with similar
-character widths (at least for those characters used by a given
-document). As an extreme example, all Computer Modern Teletype fonts
-of a given design size (e.g., \f(CW\*(C`cmtt10\*(C'\fR, \f(CW\*(C`cmsltt10\*(C'\fR, and \f(CW\*(C`cmitt10\*(C'\fR)
-use exactly the same widths for all characters. Human assistance is
-generally needed to guide \fBpkfix-helper\fR's font-matching procedures.
-.SH "NOTES"
-.IX Header "NOTES"
-Files produced using the \fB\-\-tex\fR option are Plain TeX files and
-therefore must be compiled with \fItex\fR (or a variation such as
-\&\fIpdftex\fR, \fIluatex\fR, etc.), \fInot\fR with \fIlatex\fR.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-\&\fIpkfix\fR\|(1), \fIdvips\fR\|(1), \fItex\fR\|(1), \fIgs\fR\|(1)
-.PP
-PostScript Language Reference, Third Edition.
-Published by Addison-Wesley, \s-1ISBN\s0 0\-201\-37922\-8,
-http://www.adobe.com/products/postscript/pdfs/PLRM.pdf.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Scott Pakin, \fIscott+pkfh@pakin.org\fR
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2011, Scott Pakin
-.PP
-This file may be distributed and/or modified under the conditions of
-the LaTeX Project Public License, either version 1.3c 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.3c or later is part of all distributions of LaTeX version 2006/05/20
-or later.
Files old/texmf/doc/man/man1/pkfix-helper.man1.pdf and new/texmf/doc/man/man1/pkfix-helper.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pkfix-helper.1 new/texmf-dist/doc/man/man1/pkfix-helper.1
--- old/texmf-dist/doc/man/man1/pkfix-helper.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/pkfix-helper.1 2011-06-14 23:13:39.000000000 +0200
@@ -0,0 +1,516 @@
+.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings. \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote. \*(C+ will
+.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+. ds -- \(*W-
+. ds PI pi
+. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
+. ds L" ""
+. ds R" ""
+. ds C` ""
+. ds C' ""
+'br\}
+.el\{\
+. ds -- \|\(em\|
+. ds PI \(*p
+. ds L" ``
+. ds R" ''
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD. Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
+..
+. nr % 0
+. rr F
+.\}
+.el \{\
+. de IX
+..
+.\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear. Run. Save yourself. No user-serviceable parts.
+. \" fudge factors for nroff and troff
+.if n \{\
+. ds #H 0
+. ds #V .8m
+. ds #F .3m
+. ds #[ \f1
+. ds #] \fP
+.\}
+.if t \{\
+. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+. ds #V .6m
+. ds #F 0
+. ds #[ \&
+. ds #] \&
+.\}
+. \" simple accents for nroff and troff
+.if n \{\
+. ds ' \&
+. ds ` \&
+. ds ^ \&
+. ds , \&
+. ds ~ ~
+. ds /
+.\}
+.if t \{\
+. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+. \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+. \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+. \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+. ds : e
+. ds 8 ss
+. ds o a
+. ds d- d\h'-1'\(ga
+. ds D- D\h'-1'\(hy
+. ds th \o'bp'
+. ds Th \o'LP'
+. ds ae ae
+. ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "PKFIX-HELPER 1"
+.TH PKFIX-HELPER 1 "2011-06-11" "v1.4" " "
+.\" For nroff, turn off justification. Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+pkfix\-helper \- preprocess dvips\-produced PostScript documents before passing them to pkfix
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+pkfix-helper
+[\fB\-\-help\fR]
+[\fB\-\-verbose\fR]
+[\fB\-\-force\fR=\fIname\fR=\fIfontspec\fR]
+[\fB\-\-ps\fR=\fIfilename.ps\fR]
+[\fB\-\-tex\fR=\fIfilename.tex\fR]
+[\fB\-\-cache\fR=\fIfilename\fR]
+[\fB\-\-include\fR=\fIfontspec\fR]
+[\fB\-\-exclude\fR=\fIregexp\fR]
+[\fB\-\-keep\fR=\fIfontspec\fR]
+[\fB\-\-quiet\fR]
+[\fB\-\-no\-repeats\fR]
+[\fB\-\-spp\fR=\fInumber\fR]
+[\fIinput.ps\fR [\fIoutput.ps\fR]]
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+.SS "Motivation"
+.IX Subsection "Motivation"
+PostScript documents created with old versions of \fBdvips\fR almost
+invariably utilize bitmapped (PostScript Type\ 3) fonts. The
+problem with bitmapped fonts is that they target a specific device
+resolution; a PostScript file produced using 300\ \s-1DPI\s0 fonts will
+look grainy on a 600\ \s-1DPI\s0 printer. Even worse, \fIall\fR bitmapped
+fonts look grainy when zoomed in on screen. The solution is to use
+vector (PostScript Type\ 1) fonts, which are resolution-independent
+and appear crisp at any size or scale.
+.PP
+While it is no longer difficult to configure \fBdvips\fR to use vector
+fonts, it is not always possible to rerun \fBdvips\fR on an old \fI.dvi\fR
+file. The \fI.dvi\fR file and document source may have been lost; or,
+the source may no longer compile because packages it depends upon may
+no longer be available.
+.PP
+Heiko Oberdiek's \fBpkfix\fR script replaces bitmapped fonts in
+\&\fBdvips\fR\-produced PostScript files with the corresponding vector
+fonts. It works by parsing the PostScript comments with which
+\&\fBdvips\fR surrounds bitmapped-font definitions. For example, a font
+definition beginning with the comment \f(CW\*(C`%DVIPSBitmapFont: Fi cmss10 11
+28\*(C'\fR and ending with a matching \f(CW%EndDVIPSBitmapFont\fR is known to
+define font \f(CW\*(C`Fi\*(C'\fR as \f(CW\*(C`cmss10\*(C'\fR (Computer Modern Sans Serif at a design
+size of 10\ points) scaled to \f(CW11\fR\ points. Only the \f(CW28\fR
+characters actually used by the document are defined. \fBpkfix\fR then
+replaces the font definition with one that defines \f(CW\*(C`Fi\*(C'\fR using the
+same set of characters but taken from the \fIcmss10.pfb\fR vector font
+file.
+.PP
+Unfortunately, \fBpkfix\fR works only with versions of \fBdvips\fR newer
+than v5.58 (ca.\ 1996). Naturally, the older a PostScript document,
+the less likely its sources still exist and can still be recompiled.
+Older versions of \fBdvips\fR lack \f(CW%DVIPSBitmapFont\fR comments and
+various other PostScript comments on which \fBpkfix\fR relies. Without
+PostScript comments to guide it, \fBpkfix\fR is unable to determine which
+vector fonts correspond with which bitmapped fonts.
+.SS "Overview"
+.IX Subsection "Overview"
+The \fBpkfix-helper\fR script is a preprocessor for \fBpkfix\fR that
+attempts to determine the association between each document-font name
+(e.g.,\ \f(CW\*(C`Fi\*(C'\fR) in a PostScript file and the original font (e.g.,\ \f(CW\*(C`cmss10\*(C'\fR) and fonts size (e.g., \f(CW11\fR\ points). It then
+fabricates the PostScript comments that \fBpkfix\fR expects to see so
+that \fBpkfix\fR can do its job.
+.PP
+\&\fBpkfix-helper\fR works by comparing every document font against every
+\&\fI.tfm\fR font file it knows about (assuming that each such font has a
+corresponding \fI.pfb\fR vector version) and selecting the best matching
+\&\fI.tfm\fR file for every document font. \fBpkfix-helper\fR has access only
+to the widths of characters and only to those characters actually used
+in the document. Also, the program recognizes only a limited set of
+the most popular \fI.tfm\fR files and scaling factors. Consequently, the
+comparison is imperfect and \fBpkfix-helper\fR may attribute an incorrect
+font to a given name. Fonts comprising only one or two characters
+actually used in a document are particularly problematic for
+\&\fBpkfix-helper\fR because many fonts may be near-enough matches to fool
+the problem.
+.PP
+\&\fBpkfix-helper\fR is designed so that a user can guide the
+font-selection process by manually designating matching fonts. With a
+modicum of diligence and patience a user can correct any mismatched
+fonts and help the program provide proper input to \fBpkfix\fR.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+\&\fBpkfix-helper\fR accepts on the command line the filename of a
+PostScript document to process (with the default being the standard
+input device) and the filename of a modified PostScript document to
+create (with the default being the standard output device). The
+program also accepts the following command-line options:
+.SS "Frequently Used Options"
+.IX Subsection "Frequently Used Options"
+.IP "\fB\-h\fR, \fB\-\-help\fR" 4
+.IX Item "-h, --help"
+Display usage information and exit. The \fB\-\-verbose\fR and \fB\-\-quiet\fR
+options can be used to increase and decrease the amount of information
+presented.
+.IP "\fB\-v\fR, \fB\-\-verbose\fR" 4
+.IX Item "-v, --verbose"
+Increase the amount of status information that \fBpkfix-helper\fR
+displays as it runs. Additional instances of \fB\-\-verbose\fR on the
+command line further increase the program's verbosity. By default,
+only major operations are displayed. A single \fB\-\-verbose\fR
+additionally displays information about individual font comparisons.
+A second \fB\-\-verbose\fR additionally displays details about some of the
+program's internal operations.
+.IP "\fB\-f\fR \fIname\fR=\fIfontspec\fR, \fB\-\-force\fR=\fIname\fR=\fIfontspec\fR" 4
+.IX Item "-f name=fontspec, --force=name=fontspec"
+Force \fBpkfix-helper\fR to associate a specific font with a given font
+name appearing the document. \fIname\fR is a two-character \fBdvips\fR font
+name such as \f(CW\*(C`Fa\*(C'\fR. \fIfontspec\fR is a font specification such as
+\&\f(CW\*(C`cmmi8\*(C'\fR or \f(CW\*(C`cmsy10\ @\ 1.1X\*(C'\fR. An asterisk used in the name of the
+base font (e.g.,\ \f(CW\*(C`cmti*\*(C'\fR) will automatically try all integral test
+font sizes from 5 to 17 points (\f(CW\*(C`cmti5\*(C'\fR, \f(CW\*(C`cmti6\*(C'\fR,\ ...,
+\&\f(CW\*(C`cmti17\*(C'\fR). An asterisk used as a scale value (e.g.,\ \f(CW\*(C`cmsy10\ @\ *\*(C'\fR) will be replaced by the scale value that gives the best match to
+the original font's metrics. The \fB\-\-force\fR option can be specified
+repeatedly on the command line.
+.IP "\fB\-p\fR \fIfilename.ps\fR, \fB\-\-ps\fR=\fIfilename.ps\fR" 4
+.IX Item "-p filename.ps, --ps=filename.ps"
+Create a PostScript file called \fIfilename.ps\fR that shows the \fBdvips\fR
+name and a font sample of every font used by the input document.
+.IP "\fB\-t\fR \fIfilename.tex\fR, \fB\-\-tex\fR=\fIfilename.tex\fR" 4
+.IX Item "-t filename.tex, --tex=filename.tex"
+Create a Plain TeX file called \fIfilename.tex\fR that shows the \fBdvips\fR
+name and a font sample of every font that \fBpkfix-helper\fR used in the
+output document.
+.SS "Infrequently Used Options"
+.IX Subsection "Infrequently Used Options"
+.IP "\fB\-C\fR \fIfilename\fR, \fB\-\-cache\fR=\fIfilename\fR" 4
+.IX Item "-C filename, --cache=filename"
+Speed up \s-1TFM\s0 file processing by caching character metrics into file
+\&\fIfilename\fR. On some systems it takes a long time to read a \s-1TFM\s0 file,
+spawn \fItftopl\fR to convert it to \s-1PL\s0 format, and extract from the \s-1PL\s0
+data the metrics for each character. The first time \fB\-\-cache\fR is
+specified, \fBpkfix-helper\fR proceeds as normal then writes all of the
+extracted character metrics to \fIfilename\fR. On subsequent runs in
+which \fB\-\-cache\fR=\fIfilename\fR is specified, \fBpkfix-helper\fR reads the
+previously extracted metrics from \fIfilename\fR, going through the
+\&\fItftopl\fR\-based process only for \s-1TFM\s0 files that were not previously
+encountered.
+.IP "\fB\-q\fR, \fB\-\-quiet\fR" 4
+.IX Item "-q, --quiet"
+Instruct \fBpkfix-helper\fR to produce no output during its run except
+for fatal error messages.
+.IP "\fB\-1\fR, \fB\-\-no\-repeats\fR" 4
+.IX Item "-1, --no-repeats"
+Prevent \fBpkfix-helper\fR from associating the same \fIfontspec\fR with
+more than one \fBdvips\fR font name.
+.IP "\fB\-i\fR \fIfontspec\fR, \fB\-\-include\fR=\fIfontspec\fR" 4
+.IX Item "-i fontspec, --include=fontspec"
+Add \fIfontspec\fR to the list of font specifications against which
+\&\fBpkfix-helper\fR compares \fIevery\fR document font. (In contrast,
+\&\fB\-\-force\fR designates a font specification to use only for a
+\&\fIspecific\fR document font.) The \fB\-\-include\fR option can be specified
+repeatedly on the command line.
+.IP "\fB\-x\fR \fIregexp\fR, \fB\-\-exclude\fR=\fIregexp\fR" 4
+.IX Item "-x regexp, --exclude=regexp"
+Remove all font specifications matching regular expression \fIregexp\fR
+from \fBpkfix-helper\fR's list of known fonts. The \fB\-\-exclude\fR option
+can be specified repeatedly on the command line.
+.IP "\fB\-k\fR \fIfontspec\fR, \fB\-\-keep\fR=\fIfontspec\fR" 4
+.IX Item "-k fontspec, --keep=fontspec"
+Do not substitute a vector font for bitmapped font \fIfontspec\fR (\f(CW\*(C`Fa\*(C'\fR,
+\&\f(CW\*(C`Fb\*(C'\fR, etc.). This is useful when converting documents that use
+obscure bitmapped fonts for which there is no vector equivalent. For
+example, it was somewhat common in the past to include graphics such
+as university or corporate logos into a document by converting the
+bitmapped image into a single-character font and using that font in
+LaTeX. \fB\-\-keep\fR prevents such fonts from being replaced. The
+\&\fB\-\-keep\fR option can be specified repeatedly on the command line.
+.IP "\fB\-a\fR, \fB\-\-any\-scale\fR" 4
+.IX Item "-a, --any-scale"
+Allow any value to be used to scale a font when "\f(CW\*(C`*\*(C'\fR" is specified as
+the scale factor. Normally, \fBpkfix-helper\fR considers only integer
+multiples of 0.1 that are greater than or equal to 1.0 (i.e.,
+\&\fIfontname\fR\f(CW@1X\fR, \f(CW\*(C`@1.1X\*(C'\fR, \f(CW\*(C`@1.2X\*(C'\fR, \f(CW\*(C`@1.3X\*(C'\fR, etc.).
+.IP "\fB\-s\fR, \fB\-\-spp\fR" 4
+.IX Item "-s, --spp"
+Specify the number of font samples per page to print to the files
+indicated using the \fB\-\-ps\fR and \fB\-\-tex\fR options. The default
+value,\ 25, should work well in most circumstances.
+.SH "DIAGNOSTICS"
+.IX Header "DIAGNOSTICS"
+.ie n .IP """Best match for \f(CIname\f(CW is rather poor""" 4
+.el .IP "\f(CWBest match for \f(CIname\f(CW is rather poor\fR" 4
+.IX Item "Best match for name is rather poor"
+The best font \fBpkfix-helper\fR found for \fBdvips\fR font name \fIname\fR has
+a mismatch value greater than or equal to\ 1.0. (The mismatch value
+is the sum of the squares of the difference between the character
+widths of a document font and a potential replacement font.) Use the
+\&\fB\-\-force\fR option to designate an alternative replacement font or
+scaling amount.
+.SH "EXAMPLES"
+.IX Header "EXAMPLES"
+For the purpose of the following examples, assume that \fIoldfile.ps\fR
+is the name of a PostScript file produced by an old version of
+\&\fBdvips\fR and utilizing at least one bitmapped font. It's always worth
+verifying that \fBpkfix\fR can't convert the file on its own:
+.PP
+.Vb 3
+\& $ pkfix oldfile.ps newfile.ps
+\& PKFIX 1.3, 2005/02/25 \- Copyright (c) 2001, 2005 by Heiko Oberdiek.
+\& ==> no fonts converted
+.Ve
+.PP
+(Alternatively \fBpkfix\fR may issue an error message such as \f(CW\*(C`!!!
+Error: Parse error (@start parameters)!\*(C'\fR.) Only when \fBpkfix\fR can't
+replace bitmapped fonts with vector fonts is \fBpkfix-helper\fR needed.
+In its simplest form, \fBpkfix-helper\fR takes the name of an input file
+(\fIoldfile.ps\fR in this example) and the name of an output file
+(\fIpkfix\-oldfile.ps\fR), which will have the same contents as the input
+file but serve as suitable input for \fBpkfix\fR:
+.PP
+.Vb 10
+\& $ pkfix\-helper oldfile.ps pkfix\-oldfile.ps
+\& Reading oldfile.ps ... done.
+\& Number of Type 3 fonts encountered: 10
+\& Bitmapped fonts are typeset at 600 DPI.
+\& Finding character widths ... done.
+\& Reading TFM files ... done (103 TFMs in 193 scaling variations).
+\& Matching fonts:
+\& Processing Fi ... done (cmr10 @ 1X, mismatch=0.11683).
+\& Processing Fa ... done (cmti10 @ 1X, mismatch=0.08892).
+\& Processing Fb ... done (cmr8 @ 1X, mismatch=0.07133).
+\& Processing Ff ... done (cmbx12 @ 1.2X, mismatch=0.02948).
+\& Processing Fh ... done (cmtt10 @ 1X, mismatch=0.06895).
+\& Processing Fd ... done (cmmi10 @ 1X, mismatch=0.03966).
+\& Processing Fj ... done (cmbx12 @ 1X, mismatch=0.03972).
+\& Processing Fe ... done (cmbx10 @ 1X, mismatch=0.00762).
+\& Processing Fg ... done (cmsy10 @ 1X, mismatch=0.00875).
+\& Processing Fc ... done (cmr6 @ 1X, mismatch=0.00284).
+\&
+\& $ pkfix pkfix\-oldfile.ps newfile.ps
+\& PKFIX 1.3, 2005/02/25 \- Copyright (c) 2001, 2005 by Heiko Oberdiek.
+\& *** Font conversion: \`cmti10\*(Aq \-> \`CMTI10\*(Aq.
+\& *** Font conversion: \`cmr8\*(Aq \-> \`CMR8\*(Aq.
+\& *** Font conversion: \`cmr6\*(Aq \-> \`CMR6\*(Aq.
+\& *** Font conversion: \`cmmi10\*(Aq \-> \`CMMI10\*(Aq.
+\& *** Font conversion: \`cmbx10\*(Aq \-> \`CMBX10\*(Aq.
+\& *** Font conversion: \`cmbx12\*(Aq \-> \`CMBX12\*(Aq.
+\& *** Font conversion: \`cmsy10\*(Aq \-> \`CMSY10\*(Aq.
+\& *** Font conversion: \`cmtt10\*(Aq \-> \`CMTT10\*(Aq.
+\& *** Font conversion: \`cmr10\*(Aq \-> \`CMR10\*(Aq.
+\& *** Font conversion: \`cmbx12\*(Aq \-> \`CMBX12\*(Aq.
+\& *** Merging font \`CMBX12\*(Aq (2).
+\& ==> 10 converted fonts.
+\& ==> 1 merged font.
+.Ve
+.PP
+Although \fBpkfix-helper\fR tries to automate as much as possible the
+font-detection process, some fonts will invariably be incorrectly
+identified. The program outputs a warning message if it \fIknows\fR a
+match is bad but the lack of a warning message does not necessarily
+indicate that \fBpkfix-helper\fR did a good job. It is therefore
+strongly recommended that the user produce \*(L"before\*(R" and \*(L"after\*(R" font
+sheets:
+.PP
+.Vb 2
+\& $ pkfix\-helper \-q oldfile.ps pkfix\-oldfile.ps \e
+\& \-\-ps=oldfonts.ps \-\-tex=newfonts.tex
+\&
+\& $ tex newfonts.tex
+\& This is TeX, Version 3.14159 (Web2C 7.4.5)
+\& (./newfonts.tex [1] )
+\& Output written on newfonts.dvi (1 page, 1292 bytes).
+\& Transcript written on newfonts.log.
+\&
+\& $ dvips newfonts.dvi \-o newfonts.ps
+\& This is dvips(k) 5.92b Copyright 2002 Radical Eye Software (www.radicaleye.com)
+\& \*(Aq TeX output 2006.06.11:1636\*(Aq \-> newfonts.ps
+\& <8r.enc>.
+\& [1]
+.Ve
+.PP
+After running the preceding commands, \fIoldfonts.ps\fR shows samples of
+the fonts in \fIoldfile.ps\fR and \fInewfonts.ps\fR shows samples of the
+replacement fonts that \fBpkfix-helper\fR used to produce
+\&\fIpkfix\-oldfile.ps\fR. Print \fIoldfonts.ps\fR and \fInewfonts.ps\fR and
+compare them carefully for incorrect fonts and sizes.
+.PP
+Suppose that the choice of \f(CW\*(C`cmbx12 @ 1.2X\*(C'\fR for font \f(CW\*(C`Ff\*(C'\fR looks
+wrong; say the characters look taller in \fIoldfonts.ps\fR than in
+\&\fInewfonts.ps\fR. This is where the trial-and-error stage begins.
+Let's hypothesize that \f(CW\*(C`cmb12\*(C'\fR is a better match than \f(CW\*(C`cmbx12\*(C'\fR but
+we don't know how much to scale the font. Fortunately,
+\&\fBpkfix-helper\fR allows \f(CW\*(C`*\*(C'\fR to be used as a scaling factor to tell the
+program to automatically detect an optimal scaling factor, even if
+doing so means choosing a nonstandard font size:
+.PP
+.Vb 7
+\& $ pkfix\-helper oldfile.ps pkfix\-oldfile.ps \-\-force="Ff=cmb12 @ *"
+\& Reading oldfile.ps ... done.
+\& Number of Type 3 fonts encountered: 10
+\& Bitmapped fonts are typeset at 600 DPI.
+\& Finding character widths ... done.
+\& Reading TFM files ... failed.
+\& pkfix\-helper: Unable to process user\-specified TFM file "cmb12"
+.Ve
+.PP
+Oops, it looks like we don't have a \fIcmb12.tfm\fR file on our system.
+Let's try scaling up \fIcmb10.tfm\fR instead:
+.PP
+.Vb 10
+\& $ pkfix\-helper oldfile.ps pkfix\-oldfile.ps \-\-force="Ff=cmb10 @ *"
+\& Reading oldfile.ps ... done.
+\& Number of Type 3 fonts encountered: 10
+\& Bitmapped fonts are typeset at 600 DPI.
+\& Finding character widths ... done.
+\& Reading TFM files ... done (103 TFMs in 193 scaling variations).
+\& Matching fonts:
+\& Processing Fi ... done (cmr10 @ 1X, mismatch=0.11683).
+\& Processing Fa ... done (cmti10 @ 1X, mismatch=0.08892).
+\& Processing Fb ... done (cmr8 @ 1X, mismatch=0.07133).
+\& Processing Ff ... done (cmb10 @ 1.5X, mismatch=0.00035).
+\& Processing Fh ... done (cmtt10 @ 1X, mismatch=0.06895).
+\& Processing Fd ... done (cmmi10 @ 1X, mismatch=0.03966).
+\& Processing Fj ... done (cmbx12 @ 1X, mismatch=0.03972).
+\& Processing Fe ... done (cmbx10 @ 1X, mismatch=0.00762).
+\& Processing Fg ... done (cmsy10 @ 1X, mismatch=0.00875).
+\& Processing Fc ... done (cmr6 @ 1X, mismatch=0.00284).
+.Ve
+.PP
+The match has definitely improved, although 15\ pt. is certainly an
+odd size for a font. Then again, many documents \fIdo\fR use nonstandard
+sizes so this may in fact be correct. The best way to verify is once
+again to produce, print, and compare a pair of font samples and
+iterate until all of the fonts look correct. Use one instance of
+\&\fB\-\-force\fR for each font you want to alter.
+.SH "ENVIRONMENT"
+.IX Header "ENVIRONMENT"
+\&\fBpkfix-helper\fR honors the following environment variables:
+.IP "\s-1GS\s0" 8
+.IX Item "GS"
+The name of the Ghostscript interpreter (default: \fIgs\fR)
+.IP "\s-1TFTOPL\s0" 8
+.IX Item "TFTOPL"
+The name of a utility for converting \fI.tfm\fR files to \fI.pl\fR files
+(default: \fItftopl\fR)
+.SH "BUGS"
+.IX Header "BUGS"
+Even when \fBpkfix-helper\fR finds a perfect match (i.e.,\ the correct
+font in the correct size) the mismatch value is still typically
+nonzero. The same error is probably what causes \fBpkfix-helper\fR
+sometimes to consider the wrong font as being a better match than the
+correct font. Suggestions for fixing these bugs are welcome.
+.SH "RESTRICTIONS"
+.IX Header "RESTRICTIONS"
+\&\fBpkfix-helper\fR works only with PostScript files produced by \fBdvips\fR,
+not with arbitrary PostScript files. The program has not been tested
+with output from versions of \fBdvips\fR older than v5.490 (ca.\ 1992);
+output from older versions may or may not work. Only bitmapped fonts
+loaded by \fBdvips\fR can be analyzed, not bitmapped fonts loaded by
+embedded graphics.
+.PP
+\&\fBpkfix-helper\fR works by comparing character widths, not the actual
+glyphs. Consequently, it is misled by sets of fonts with similar
+character widths (at least for those characters used by a given
+document). As an extreme example, all Computer Modern Teletype fonts
+of a given design size (e.g., \f(CW\*(C`cmtt10\*(C'\fR, \f(CW\*(C`cmsltt10\*(C'\fR, and \f(CW\*(C`cmitt10\*(C'\fR)
+use exactly the same widths for all characters. Human assistance is
+generally needed to guide \fBpkfix-helper\fR's font-matching procedures.
+.SH "NOTES"
+.IX Header "NOTES"
+Files produced using the \fB\-\-tex\fR option are Plain TeX files and
+therefore must be compiled with \fItex\fR (or a variation such as
+\&\fIpdftex\fR, \fIluatex\fR, etc.), \fInot\fR with \fIlatex\fR.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fIpkfix\fR\|(1), \fIdvips\fR\|(1), \fItex\fR\|(1), \fIgs\fR\|(1)
+.PP
+PostScript Language Reference, Third Edition.
+Published by Addison-Wesley, \s-1ISBN\s0 0\-201\-37922\-8,
+http://www.adobe.com/products/postscript/pdfs/PLRM.pdf.
+.SH "AUTHOR"
+.IX Header "AUTHOR"
+Scott Pakin, \fIscott+pkfh@pakin.org\fR
+.SH "COPYRIGHT AND LICENSE"
+.IX Header "COPYRIGHT AND LICENSE"
+Copyright (C) 2011, Scott Pakin
+.PP
+This file may be distributed and/or modified under the conditions of
+the LaTeX Project Public License, either version 1.3c 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.3c or later is part of all distributions of LaTeX version 2006/05/20
+or later.
Files old/texmf-dist/doc/man/man1/pkfix-helper.man1.pdf and new/texmf-dist/doc/man/man1/pkfix-helper.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pkfix-helper.doc.tlpobj new/tlpkg/tlpobj/pkfix-helper.doc.tlpobj
--- old/tlpkg/tlpobj/pkfix-helper.doc.tlpobj 2011-06-15 04:15:26.000000000 +0200
+++ new/tlpkg/tlpobj/pkfix-helper.doc.tlpobj 2013-04-08 21:26:44.000000000 +0200
@@ -1,10 +1,10 @@
name pkfix-helper.doc
category Package
-revision 22981
+revision 29725
shortdesc doc files of pkfix-helper
docfiles size=189
+ texmf-dist/doc/man/man1/pkfix-helper.1
+ texmf-dist/doc/man/man1/pkfix-helper.man1.pdf
texmf-dist/doc/support/pkfix-helper/README
texmf-dist/doc/support/pkfix-helper/encoding-samples.pdf
texmf-dist/doc/support/pkfix-helper/encoding-samples.tex
- texmf/doc/man/man1/pkfix-helper.1
- texmf/doc/man/man1/pkfix-helper.man1.pdf
++++++ pkfix-helper.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pkfix-helper.tlpobj new/tlpkg/tlpobj/pkfix-helper.tlpobj
--- old/tlpkg/tlpobj/pkfix-helper.tlpobj 2011-06-15 04:15:26.000000000 +0200
+++ new/tlpkg/tlpobj/pkfix-helper.tlpobj 2013-04-08 21:26:45.000000000 +0200
@@ -1,6 +1,6 @@
name pkfix-helper
category Package
-revision 22981
+revision 29725
shortdesc Make PostScript files accessible to pkfix.
longdesc Pkfix is a useful utility for replacing resolution-dependent
longdesc bitmapped fonts in a dvips-produced PostScript file with the
@@ -18,6 +18,6 @@
runfiles size=14
texmf-dist/scripts/pkfix-helper/pkfix-helper
catalogue-ctan /support/pkfix-helper
-catalogue-date 2011-06-13 21:57:04 +0200
+catalogue-date 2012-06-08 16:04:26 +0200
catalogue-license lppl
catalogue-version 1.4
++++++ plain-doc.doc.tar.xz ++++++
++++ 2205 lines of diff (skipped)
++++++ plain.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/config/luatex.ini new/tex/plain/config/luatex.ini
--- old/tex/plain/config/luatex.ini 2010-10-08 14:06:28.000000000 +0200
+++ new/tex/plain/config/luatex.ini 2012-05-25 01:54:05.000000000 +0200
@@ -1,4 +1,4 @@
-% $Id: luatex.ini 20014 2010-10-08 12:06:28Z mpg $
+% $Id: luatex.ini 26647 2012-05-24 23:54:05Z karl $
% Karl Berry, originally written 2008. Public domain.
% PDF output by default.
@@ -6,5 +6,4 @@
\input luatexiniconfig.tex
\input luatex-unicode-letters.tex
-\input pdftexconfig.tex
-\input etex.ini
+\input pdfetex.ini
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/config/xetex.ini new/tex/plain/config/xetex.ini
--- old/tex/plain/config/xetex.ini 2009-06-28 13:59:44.000000000 +0200
+++ new/tex/plain/config/xetex.ini 2012-05-14 20:25:55.000000000 +0200
@@ -1,7 +1,5 @@
-% xetex.ini
-% jonathan kew
-% public domain
-% updated: 28 June 2009
+% $Id: xetex.ini 26376 2012-05-14 18:25:55Z karl $
+% Public domain. Originally by Jonathan Kew.
%% Disable the \font\preloaded=... entries from plain.tex
%% as xetex is primarily intended for use with other fonts
@@ -52,6 +50,7 @@
\catcode`\@=12
\XeTeXuseglyphmetrics=1
+\XeTeXdashbreakstate=1
\errorstopmode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/plain.tlpobj new/tlpkg/tlpobj/plain.tlpobj
--- old/tlpkg/tlpobj/plain.tlpobj 2010-11-24 04:11:39.000000000 +0100
+++ new/tlpkg/tlpobj/plain.tlpobj 2012-05-25 04:38:59.000000000 +0200
@@ -1,11 +1,7 @@
name plain
category Package
-revision 20544
-shortdesc The Plain TeX format.
+revision 26647
relocated 1
-longdesc Contains files used to build the Plain TeX format, as described
-longdesc in the TeXbook, together with various supporting files (some
-longdesc also discussed in the book).
runfiles size=57
RELOC/makeindex/plain/plaintex.ist
RELOC/tex/plain/base/fontchart.tex
@@ -33,7 +29,3 @@
RELOC/tex/plain/config/pdftexmagfix.tex
RELOC/tex/plain/config/tex.ini
RELOC/tex/plain/config/xetex.ini
-catalogue-ctan /macros/plain/base
-catalogue-date 2009-06-23 17:13:15 +0200
-catalogue-license knuth
-catalogue-version 3.141592653
++++++ plantslabels.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/plantslabels.doc.tlpobj new/tlpkg/tlpobj/plantslabels.doc.tlpobj
--- old/tlpkg/tlpobj/plantslabels.doc.tlpobj 2010-06-10 18:41:45.000000000 +0200
+++ new/tlpkg/tlpobj/plantslabels.doc.tlpobj 2013-04-10 21:08:16.000000000 +0200
@@ -1,6 +1,6 @@
name plantslabels.doc
category Package
-revision 17831
+revision 29803
shortdesc doc files of plantslabels
relocated 1
docfiles size=94
++++++ plantslabels.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/plantslabels.tlpobj new/tlpkg/tlpobj/plantslabels.tlpobj
--- old/tlpkg/tlpobj/plantslabels.tlpobj 2010-06-10 18:41:45.000000000 +0200
+++ new/tlpkg/tlpobj/plantslabels.tlpobj 2013-04-10 21:08:16.000000000 +0200
@@ -1,6 +1,6 @@
name plantslabels
category Package
-revision 17831
+revision 29803
shortdesc Write labels for plants.
relocated 1
longdesc The package defines a command \plant, which has three mandatory
@@ -8,6 +8,6 @@
runfiles size=1
RELOC/tex/latex/plantslabels/plantslabels.sty
catalogue-ctan /macros/latex/contrib/plantslabels
-catalogue-date 2010-04-14 18:13:33 +0200
+catalogue-date 2012-06-08 17:19:18 +0200
catalogue-license lppl
catalogue-version 1.0
++++++ poemscol.doc.tar.xz ++++++
Files old/doc/latex/poemscol/poemscol.pdf and new/doc/latex/poemscol/poemscol.pdf differ
Files old/doc/latex/poemscol/poemscolcheatsheet.pdf and new/doc/latex/poemscol/poemscolcheatsheet.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/poemscol.doc.tlpobj new/tlpkg/tlpobj/poemscol.doc.tlpobj
--- old/tlpkg/tlpobj/poemscol.doc.tlpobj 2011-09-01 04:26:01.000000000 +0200
+++ new/tlpkg/tlpobj/poemscol.doc.tlpobj 2013-05-28 17:08:10.000000000 +0200
@@ -1,9 +1,9 @@
name poemscol.doc
category Package
-revision 23762
+revision 30706
shortdesc doc files of poemscol
relocated 1
-docfiles size=144
+docfiles size=152
RELOC/doc/latex/poemscol/README
RELOC/doc/latex/poemscol/poemscol.pdf
RELOC/doc/latex/poemscol/poemscolcheatsheet.pdf
++++++ poemscol.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/poemscol/poemscol.sty new/tex/latex/poemscol/poemscol.sty
--- old/tex/latex/poemscol/poemscol.sty 2011-08-31 23:21:06.000000000 +0200
+++ new/tex/latex/poemscol/poemscol.sty 2013-05-27 03:44:40.000000000 +0200
@@ -22,8 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}[1997/12/01]
\ProvidesPackage{poemscol}
- [2011/08/30 v2.54 poemscol file]
-
+ [2013/03/24 v2.62 poemscol file]
@@ -89,6 +88,7 @@
\newcommand{\notesvolumetitlepenalty}{\penalty-1500}
\hfuzz=2pt
\newcommand{\verseindent}{\hspace{2em}}
+\setlength{\columnsep}{15pt}
\newdimen\titleindentamount \titleindentamount=1pc
\newdimen\titleindenttwoamount \titleindenttwoamount=2pc
\newdimen\titleindentthreeamount \titleindentthreeamount=3pc
@@ -121,19 +121,28 @@
\newcommand{\runoverindent}[1]{\global\edef\runoverindentvalue{#1}
}
\runoverindent{6em}
-\newenvironment{pmclverse}{%
+\newenvironment{pmclverse}[1][\linewidth]{%
\let\\=\@centercr%
-\list{}{\itemsep\z@ \itemindent -\runoverindentvalue\listparindent \itemindent
- \rightmargin 1sp\leftmargin 1sp\advance\leftmargin
+\list{}{\itemsep\z@
+\itemindent -\runoverindentvalue
+\listparindent \itemindent
+ \ifdim #1 < \linewidth
+ \rightmargin \z@
+ \setlength{\leftmargin}{\linewidth}%
+ \addtolength{\leftmargin}{-#1}%
+ \addtolength{\leftmargin}{-0.5\leftmargin}%
+ \else
+ \rightmargin \leftmargin
+ \fi
+\advance\leftmargin\runoverindentvalue}
+\item[]}
+{\endlist}
+\newenvironment{quotedverse}{%
+\let\\=\@centercr%
+\list{}{\itemsep\z@ \itemindent 0pt\listparindent \itemindent
+ \rightmargin 0sp\leftmargin 0sp\advance\leftmargin
\runoverindentvalue}\item[]}
{\endlist}
-\newif\ifrfv
-\rfvfalse
-\newcommand{\rightflushrunoververse}{\global\rfvtrue}
-\newcommand{\indentrunoververse}{\global\rfvfalse}
-\newenvironment{rfoverse}{\begin{pmclverse}}{\end{pmclverse}}
-\renewenvironment{verse}{\ifrfv\begin{rfoverse}\else\begin{pmclverse}\fi}
-{\ifrfv\end{rfoverse}\else\end{pmclverse}\fi}
\newcounter{verselinenumber}
\newcounter{printlineindex}
@@ -317,14 +326,16 @@
\itemsep\z@ \itemindent -\titleentryoverrun\listparindent \itemindent
\rightmargin 1sp\leftmargin 1sp\advance\leftmargin
\titleentryoverrun}\item[]}{\endlist}
-\newenvironment{poem}{\raggedright%
+\newlength{\versewidth}
+\newenvironment{poem}[1][\linewidth]
+{\raggedright%
\language=255%no hyphenation in verse
\noemendyettrue%
\noexplainyettrue%
\setcounter{verselinenumber}{0}\setcounter{printlineindex}{0}%
- \nobreak\begin{verse}%
+ \nobreak\begin{pmclverse}[#1]%
\inpoemtrue\nobreak\mark{\relax}%
- }{\end{verse}%
+ }{\end{pmclverse}%
\inpoemfalse\mark{\relax}%
\goodbreak\afterpoemskip%\bigskip
}
@@ -455,24 +466,20 @@
\numbersgutterfalse}
\newcommand{\putverselinenumber}{\nolinebreak\begin{marginenvironment}%
\nolinebreak%
- \ifnumbersswitch\pmclsidepar{\textrm{\scriptsize\theverselinenumber}}%
+ \ifnumbersswitch\pmclsidepar{\hfil\textrm{\scriptsize\theverselinenumber}}%
\else%
- \ifnumbersright\pmclrightsidepar{\textrm{\scriptsize\theverselinenumber}}%
+ \ifnumbersright\pmclrightsidepar{\hfil\textrm{\scriptsize\theverselinenumber}}%
\else%
- \pmclleftsidepar{\textrm{\scriptsize\theverselinenumber}}%
+ \pmclleftsidepar
+{\textrm{\scriptsize\theverselinenumber}\hfil}%
\fi%
\fi%
\nolinebreak%
\end{marginenvironment}%
\nolinebreak%
}
-
\newif\ifspeciallinelock
\speciallinelockfalse
-\newcounter{margnumbegin}
-\setcounter{margnumbegin}{0}
-\newcommand{\setmargnumbegin}[1]{\setcounter{margnumbegin}{#1}%
-\addtocounter{margnumbegin}{-1}}
\newcommand{\verseline}{\ifspeciallinelock%
\relax\else%
\nolinebreak\incrementverselinenumber%
@@ -483,13 +490,12 @@
\newcommand{\incrementverselinenumber}{%
\nolinebreak\addtocounter{verselinenumber}{1}%
\addtocounter{printlineindex}{1}%
-\ifnum\theverselinenumber>\themargnumbegin
\ifnum\theprintlineindex>\thelineindexrepeat%
\ifverselinenumbers\nobreak%
\putverselinenumber\nobreak%
\fi\nobreak%
\setcounter{printlineindex}{0}%
- \fi\fi%
+ \fi%
}
\newcommand{\setverselinemodulo}[1]{%
\setcounter{lineindexrepeat}{#1}%
@@ -580,6 +586,36 @@
\lefthyphenmin=2\backmatterafterheadersink\tolerance=500\language=0}
\literalcontents{ \relax}}
+\newcommand{\setendnotessectiontitledefaults}[6]{%
+#2%
+#3 \begin{titleentryenvironment}%
+{\ifcentertitleson\begin{center}#4 #1\end{center}\else #4 #1\fi}%
+\end{titleentryenvironment}%
+#5%
+\label{#6}
+}
+\newcommand{\setendnotessectiontitle}[2]{
+\setendnotessectiontitledefaults{#1}{\poemtitlepenalty\backmattersink\begin{center}}{\backmatterheaderfont}
+{\relax}{\end{center}\lefthyphenmin=2\backmatterafterheadersink}{#2}}
+\newcommand{\contentsendnotesdefaults}[4]{\ifpoemcontentson
+\immediate\write\poemcontents{\string\begin\string{contentsentryenvironment\string}}%
+\literalcontents{#2{#3#1}}%
+ \ifputpagenumberincontents
+\immediate\write\poemcontents{\string\contentsleaders}%
+\immediate\write\poemcontents{\string\pageref
+\string{#4\string}}%
+ \else
+ \literalcontents{\relax}%
+ \fi
+\immediate\write\poemcontents{\string\end\string{contentsentryenvironment\string}}%
+\immediate\write\poemcontents{\string\par}%
+\fi
+}
+\newcommand{\contentsendnotesindent}{\contentsindentone}
+\newcommand{\contentsendnotesfont}{\contentspoemtitlefont}
+\newcommand{\contentsendnotestitle}[2]{%
+\contentsendnotesdefaults{#1}{\contentsendnotesindent}{\contentsendnotesfont}{#2}%
+}
\newtoks{\pmclnotesname}
\pmclnotesname={TEXTUAL NOTES}
\newcommand{\changenotesname}[1]{\pmclnotesname={#1}}
@@ -589,6 +625,8 @@
\newtoks{\textnotescontentsname}
\textnotescontentsname={Textual Notes}
\newcommand{\changetextnotescontentsname}[1]{\textnotescontentsname={#1}}
+\newif\iftextnotestwocol
+\textnotestwocolfalse
\newcommand{\maketextnotes}{\global\textnotesontrue
\global\verselinenumberstrue
\newwrite\textnotes
@@ -603,12 +641,16 @@
\fancyhead[CE]{{\small{\em \the\notesheadername~\mymarks}}}
\fancyfoot[C]{}
\mark{3}
-\backmattersink
-\begin{center}{\normalfont \backmatterheaderfont \the\pmclnotesname}\end{center}
-\label{textualnotes}
-\lefthyphenmin=2\backmatterafterheadersink\tolerance=500\language=0
-\normalfont \backmattertextfont}
+\setendnotessectiontitle{\the\pmclnotesname}{textualnotes}
+\tolerance=500\language=0
+\normalfont \backmattertextfont
+\iftextnotestwocol
+\begin{multicols}{2}
+\fi
+\setlength{\parindent}{-10pt}
}
+}
+
\newtoks{\emendationsname}
\emendationsname={EMENDATIONS}
@@ -620,6 +662,8 @@
\emendationscontentsname={Emendations}
\newcommand{\changeemendationscontentsname}[1]{%
\emendationscontentsname={#1}}
+\newif\ifemendationstwocol
+\emendationstwocolfalse
\newcommand{\makeemendations}{\global\emendationsontrue
\newwrite\emendations
\global\verselinenumberstrue
@@ -633,12 +677,14 @@
\fancyhead[CE]{{\small{\em \the\emendationsheadername~\mymarks}}}
\fancyfoot{}
\mark{3}
-\backmattersink
-\begin{center}{\normalfont \backmatterheaderfont
-\the\emendationsname}\end{center}
-\label{emendationnotes}
-\lefthyphenmin=2\backmatterafterheadersink\tolerance=500\language=0
-\normalfont \backmattertextfont}
+\setendnotessectiontitle{\the\emendationsname}{emendationnotes}
+\tolerance=500\language=0
+\normalfont \backmattertextfont
+\ifemendationstwocol
+\begin{multicols}{2}
+\fi
+\setlength{\parindent}{-10pt}
+}
}
\newtoks{\explanationsname}
@@ -651,6 +697,8 @@
\explanationscontentsname={Explanatory Notes}
\newcommand{\changeexplanationscontentsname}[1]{%
\explanationscontentsname={#1}}
+\newif\ifexplanationstwocol
+\explanationstwocolfalse
\newcommand{\makeexplanatorynotes}{\global\explanontrue
\global\verselinenumberstrue
\newwrite\explanations
@@ -663,13 +711,16 @@
\fancyhead[CE]{{\small{\em \the\explanationsheadername~\mymarks}}}
\fancyfoot{}
\mark{3}
-\backmattersink
-\begin{center}{\normalfont \backmatterheaderfont
-\the\explanationsname}\end{center}
-\label{explanatorynotes}
-\lefthyphenmin=2\backmatterafterheadersink\tolerance=500\language=0
-\normalfont \backmattertextfont }
+\setendnotessectiontitle{\the\explanationsname}{explanatorynotes}
+\tolerance=500\language=0
+\normalfont \backmattertextfont
+\ifexplanationstwocol
+\begin{multicols}{2}
+\fi
+\setlength{\parindent}{-10pt}
}
+}
+
\newcommand{\@pagemarktotextnotes}[1]{%
\immediate\write\textnotes{\string\setcounterfrompageref\string{notepageholdertitle\string}%
@@ -798,15 +849,20 @@
\fi
\fi
}
-
+\newif\ifcentertitleson
+\newcommand{\centertitles}{\centertitlesontrue}
+\makeatletter
\newcommand{\set@p@emtitle}[6]{\setlength{\titleentryoverrun}{#6}%
{#2}%
-{#3 \begin{titleentryenvironment}{#4 #1}\end{titleentryenvironment}}%
+{#3 \begin{titleentryenvironment}%
+{\ifcentertitleson\begin{center}#4 #1\end{center}\else #4 #1\fi}%
+\end{titleentryenvironment}}%
{#5}%
\m@kep@emlabel
\m@ken@teholder{#1}%
\setlength{\titleentryoverrun}{\z@}}
+
\newcommand{\setcontentsleaders}[1]{%
\def\contentsleaders{#1\nobreak%
}}
@@ -828,14 +884,17 @@
\string{\string\contentsindentoneamount\string}}%
\fi
}
-
+\newif\ifputtitleinnotes
+\puttitleinnotestrue
\newcommand{\t@xtnotesinfo}[1]{\iftextnoteson
\iftextnotesatend
\immediate\write\textnotes{\string\notespoemclubpenalty}%
\ifputpagenumberinnotes
\@poempagetotextnotes{poem\thepoemnumber}%
\fi
+\ifputtitleinnotes
\@poemtitletotextnotes{#1}%
+\fi
\fi\fi
}
\newcommand{\poemtitle}[1]{%
@@ -1323,6 +1382,13 @@
\newcommand{\JHepigraph}[2]{\nopagebreak\afterpoemtitleskip\begin{epigraphquote}%
\emph{#1}\JHlabel{#2}\end{epigraphquote}%
\sources{\label{#2}}\afterpoemtitleskip\nopagebreak}
+\newcommand{\backmattersectiontitle}[1]{%
+\set@p@emtitle{#1}{\poemtitlepenalty}{\volumetitlefont}%
+{\relax}{\backmattersink}{\z@}%
+\c@ntentsinfo{#1}{contentsindentone}{\contentspoemtitlefont}%
+{\contentsindenttwoamount}%
+\t@xtnotesinfo{#1}
+}
\newcounter{margrefnumber}
\setcounter{margrefnumber}{1}
\newtoks{\margrefmarker}
@@ -1454,11 +1520,15 @@
\string{\string\mark\string{\string\thenotepageholdertitle\string}\string}\string\unskip
\string\unskip\string\relax\ \citerange :\string~\string\nolinebreak}%
+\newif\iftextnotessinglepar
\newcommand{\textnote}[2][0]{%
\iftextnoteson
\setlemmarange{#1}%
\immediate\write\textnotes{\checknoteheaders}%
\literaltextnote{#2}%
+ \iftextnotessinglepar%
+ \literaltextnote{\par}%
+ \fi%
\fi
\resetlemmacounters
}
@@ -1468,6 +1538,9 @@
\iftextnotesatend\immediate\write\textnotes{\string\nobreak}\fi%
\textnote{#1}%
\iftextnotesatend\immediate\write\textnotes{\string\nobreak}\fi%
+ \iftextnotessinglepar%
+ \literaltextnote{\par}%
+ \fi%
\fi\fi
}
\newcommand{\tsvariant}[2][0]{%
@@ -1489,6 +1562,9 @@
\def\next{#1}%
\immediate\write\textnotes{\expandafter\strip\meaning\next}%
\endgroup
+ \iftextnotessinglepar%
+ \literaltextnote{\par}%
+ \fi%
\fi
}
\newcommand{\titletoothernotes}{\string\par
@@ -1496,6 +1572,7 @@
\string\setcounterfrompageref\string{notepageholdertitle\string}%
\string{\@compoundlabelscratch\string}%
\string\textbf\string{\ \the\fulltitleholder\string}}%
+\newif\ifemendationssinglepar
\newcommand{\emendation}[2][0]{
\ifemendationson
\setlemmarange{#1}%
@@ -1506,6 +1583,9 @@
\else
\textnote{#2}%
\fi % ifrangelemma}
+ \iftextnotessinglepar%
+ \literaltextnote{\par}%
+ \fi% iftextnotesinglepar
\fi %iftextnoteson
\fi % ifredundantemendations
\ifnoemendyet % firstemendation
@@ -1514,12 +1594,16 @@
\global\noemendyetfalse
\immediate\write\emendations{\checknoteheaders}%
\literalemend{#2}%
+ \ifemendationssinglepar%
+ \literalemend{\par}%
+ \fi% ifemendationssinglepar
\fi % ifemendationson
\resetlemmacounters
}
\newcommand{\firstemendation}{\ifemendationsatend
\immediate\write\emendations{\titletoothernotes}\fi
}
+\newif\ifexplanationssinglepar
\newcommand{\explanatory}[2][0]{%
\ifexplanon
\setlemmarange{#1}%
@@ -1529,7 +1613,10 @@
\global\noexplainyetfalse
\immediate\write\explanations{\checknoteheaders}%
\literalexplain{#2}%
-\fi % ifexplanon
+ \ifexplanationssinglepar%
+ \literalexplain{\par}%
+ \fi%
+ \fi % ifexplanon
\resetlemmacounters
}
@@ -1549,6 +1636,10 @@
\global\csname #1sontrue\endcsname
\expandafter\newif\csname ifno#1yet\endcsname
\csname no#1yettrue\endcsname
+\expandafter\newif\csname if#1ssinglepar\endcsname
+\csname #1singleparfalse\endcsname
+\expandafter\newif\csname if#1stwocol\endcsname
+\csname #1stwocolfalse\endcsname
\expandafter\newwrite\csname #1s\endcsname
\immediate\expandafter\openout\csname #1s\endcsname=\expandafter\jobname .#2
\expandafter\newcommand\csname literal#1\endcsname[1]{
@@ -1571,24 +1662,30 @@
\mark{3}
\backmattersink}
\immediate\write\csname #1s\endcsname{
-\string\begin\string{center\string}
-\string{\string\normalfont \string\backmatterheaderfont\ #4\string}
-\string\end\string{center\string}}
-\immediate\write\csname #1s\endcsname{
-\string\label\string{#1notes\string}}
+\string\setendnotessectiontitle\string{#4\string}\string{#1notes\string}}
\csname literal#1\endcsname{\lefthyphenmin=2\backmatterafterheadersink
\tolerance=500\language=0
\normalfont \backmattertextfont}
+\immediate\write\csname #1s\endcsname{\string\if#1stwocol}
+\csname
+literal#1\endcsname{\begin{multicols}{2}\fi\setlength{\parindent}{-10pt}}%
\expandafter\newcommand\csname first#1\endcsname{
-\immediate\write\expandafter\csname#1s\endcsname{\titletoothernotes}}
+\immediate\write\expandafter\csname #1s\endcsname{\titletoothernotes}
+\immediate\write\csname #1s\endcsname{\string\if#1ssinglepar}
+\immediate\write\csname #1s\endcsname{\string\par}
+\immediate\write\csname #1s\endcsname{\string\fi}}
\expandafter\newcommand\csname #1\endcsname[2][0]{%
- \setlemmarange{##1}%
- \csname ifno#1yet\endcsname%
- \csname first#1\endcsname%
- \fi%
+\setlemmarange{##1}%
+\csname ifno#1yet\endcsname%
+ \csname first#1\endcsname%
+ \fi%
\global\csname no#1yetfalse\endcsname%
-\immediate\write\expandafter\csname #1s\endcsname{\checknoteheaders}%
+\immediate\write\expandafter\csname
+#1s\endcsname{\string\nobreak\string\nobreak\checknoteheaders}%
\csname literal#1\endcsname{##2}%
+\csname if#1ssinglepar\endcsname%
+\csname literal#1\endcsname{\par}%
+\fi%
\resetlemmacounters%
}
\expandafter\newcommand\csname prose#1\endcsname[3][0]{% %
@@ -1600,6 +1697,9 @@
\global\csname no#1yetfalse\endcsname%
\immediate\write\expandafter\csname #1s\endcsname{\checkprosenoteheaders}%
\csname literal#1\endcsname{##3}%
+\csname if#1ssinglepar\endcsname%
+\csname literal#1\endcsname{\par}%
+\fi%
\resetlemmacounters\unskip%
}
\expandafter\newcommand\csname pm#1\endcsname[2][0]{%
@@ -1611,27 +1711,30 @@
\immediate\write\expandafter\csname #1s\endcsname{\pmchecknoteheaders\string~}%
\immediate\write\expandafter\csname #1s\endcsname{\pmciterange}%
\csname literal#1\endcsname{##2}%
+\csname if#1ssinglepar\endcsname%
+\csname literal#1\endcsname{\par}%
+\fi%
\pmresetlemmacounters\unskip%
}
\makeatletter
-\appendtomacro{\poem}{\global\expandafter\csname no#1yettrue\endcsname}
+\appendtomacro{\endpoem}{\global\expandafter\csname no#1yettrue\endcsname}
\makeatother
\makeatletter
-\appendtomacro{\prosesection}{\global\expandafter\csname no#1yettrue\endcsname}
+\appendtomacro{\endprosesection}{\global\expandafter\csname no#1yettrue\endcsname}
\makeatother
\makeatletter
-\appendtomacro{\pmsection}{\global\expandafter\csname no#1yettrue\endcsname}
+\appendtomacro{\endpmsection}{\global\expandafter\csname no#1yettrue\endcsname}
\makeatother
\expandafter\newcommand\csname put#1s\endcsname{
\newpage\hyphenationforsmall
+\csname if#1stwocol\endcsname%
+\csname literal#1\endcsname{\end{multicols}}%
+\fi %\iftwocol
\immediate\expandafter\closeout\csname #1s\endcsname
\expandafter\input \jobname.#2
\ifpoemcontentson
- \immediate\write\poemcontents{\string\contentspoemtitlefont\ #5}
- \immediate\write\poemcontents{\string~ \string\contentsleaders
- \string~\ \string\pageref{#1notes} \string\par}
- \immediate\write\poemcontents{\string\par \string\smallskip}
+ \contentsendnotestitle{#5}{#1notes}
\fi
}
\expandafter\newcommand\csname margref#1\endcsname{%
@@ -1754,6 +1857,9 @@
\setproselemmarange{#2}{#1}%
\immediate\write\textnotes{\checkprosenoteheaders}%
\literaltextnote{#3}%
+\iftextnotessinglepar%
+\literaltextnote{\par}%
+\fi%
\resetlemmacounters%
\fi\unskip%
}
@@ -1769,6 +1875,9 @@
\prosetextnote{#2}{#3}%
\fi % ifrangelemma}
\fi %iftextnoteson
+\iftextnotessinglepar%
+\literaltextnote{\par}%
+\fi% iftextnotessinglepar
\fi % ifredundantemendations
\ifnoemendyet % firstemendation
\firstemendation
@@ -1776,7 +1885,10 @@
\global\noemendyetfalse
\immediate\write\emendations{\checkprosenoteheaders}%
\literalemend{#3}%
-\resetlemmacounters%
+\ifemendationssinglepar%
+\literalemend{\par}%
+\fi% ifemendationssinglep
+ \resetlemmacounters%
\fi\unskip%
}
\newcommand{\proseexplanatory}[3][0]{%
@@ -1789,7 +1901,10 @@
\global\noexplainyetfalse%
\immediate\write\explanations{\checkprosenoteheaders}%
\literalexplain{#3}%
-\resetlemmacounters%
+\ifexplanationssinglepar%
+ \literalexplain{\par}%
+ \fi% ifexplanationssinglepar
+ \resetlemmacounters%
\fi\unskip%
}
\newcommand{\proseaccidental}[2]{
@@ -1798,7 +1913,10 @@
\immediate\write\textnotes{\string\nobreak}%
\prosetextnote{#1}{#2}%
\immediate\write\textnotes{\string\nobreak}%
- \fi\fi
+ \iftextnotessinglepar%
+ \literaltextnote{\par}%
+ \fi%
+\fi\fi
}
\newcommand{\prosetsvariant}[3][0]{\iftextnoteson
\ifincludetypescripts
@@ -1806,7 +1924,10 @@
\textnotes{\string\nobreak}%
\prosetextnote[#1]{#2}{#3}%
\immediate\write\textnotes{\string\nobreak}%
- \fi\fi
+ \iftextnotessinglepar%
+ \literaltextnote{\par}%
+ \fi%
+\fi\fi
}
\newcommand{\prosetsaccidental}[2]{\iftextnoteson
\ifincludetypescripts\proseaccidental{#1}{#2}\fi\fi}
@@ -2038,6 +2159,9 @@
\immediate\write\textnotes{\pmchecknoteheaders\string~}%
\immediate\write\textnotes{\pmciterange}%
\literaltextnote{#2}%
+ \iftextnotessinglepar%
+ \literaltextnote{\par}%
+ \fi%
\fi%
\pmresetlemmacounters%
\unskip}
@@ -2051,7 +2175,10 @@
\immediate\write\explanations{\pmchecknoteheaders\string~}%
\immediate\write\explanations{\pmciterange}%
\literalexplain{#2}%
-\fi % ifexplanon
+ \ifexplanationssinglepar%
+ \literalexplain{\par}%
+ \fi %ifexplanationssinglepar
+ \fi % ifexplanon
\pmresetlemmacounters%
\unskip%
}
@@ -2074,7 +2201,10 @@
\immediate\write\emendations{\pmchecknoteheaders\string~}%
\immediate\write\emendations{\pmciterange}%
\literalemend{#2}%
-\fi % ifemendationson
+\ifemendationssinglepar%
+ \literalemend{\par}%
+ \fi% ifemendationssinglepar
+ \fi % ifemendationson
\pmresetlemmacounters%
}
\newcommand{\pmaccidental}[1]{%
@@ -2083,14 +2213,20 @@
\immediate\write\textnotes{\string\nobreak}%
\pmtextnote{#1}%
\immediate\write\textnotes{\string\nobreak}%
- \fi\fi%
+ \iftextnotessinglepar%
+ \literaltextnote{\par}%
+ \fi%
+\fi\fi%
}
\newcommand{\pmtsvariant}[2][0]{\iftextnoteson%
\ifincludetypescripts%
\immediate\write\textnotes{\string\nobreak}%
\pmtextnote[#1]{#2}%
\immediate\write\textnotes{\string\nobreak}%
- \fi\fi%
+ \iftextnotessinglepar%
+ \literaltextnote{\par}%
+ \fi%
+\fi\fi%
}
\newcommand{\pmtsaccidental}[1]{\iftextnoteson\ifincludetypescripts\pmaccidental{#1}\fi\fi}
\newcommand{\textnotesatfoot}{% first redefine textnotes
@@ -2266,7 +2402,7 @@
\noemendyettrue
\noexplainyettrue
\setcounter{verselinenumber}{0}\setcounter{printlineindex}{0}
- \nobreak\begin{verse}
+ \nobreak\begin{pmclverse}
\inpoemtrue\nobreak\mark{\relax}}
% must end poem if parallel text. Don't worry,
% begin recto page and begin verso page will
@@ -2274,14 +2410,14 @@
% if it was finish recto page or finish verso page
% that closed the poem rather than your own declaration.
{\ifversopoemstillopen
- \end{verse}
+ \end{pmclverse}
\inpoemfalse\mark{\relax}
\else
\ifrectopoemstillopen
- \end{verse}
+ \end{pmclverse}
\inpoemfalse\mark{\relax}
\else
-\end{verse}
+\end{pmclverse}
\inpoemfalse\mark{\relax}
\goodbreak\afterpoemskip%\bigskip
\fi\fi }
@@ -2523,55 +2659,44 @@
}
\newcommand{\putemendations}{
\ifemendationson
+\ifemendationstwocol
+\literalemend{\end{multicols}}
+\fi %\iftextnotetwocol
\newpage
\hyphenationforsmall
\immediate\closeout\emendations
\input \jobname.emd
- \ifpoemcontentson
- \ifemendationson
-\immediate\write\poemcontents{\string\contentspoemtitlefont\ \the\emendationscontentsname}
-\immediate\write
- \poemcontents{\string~ \string\contentsleaders \string~\
- \string\pageref{emendationnotes} \string\par}
-\immediate\write\poemcontents{\string\par \string\smallskip}
- \fi
-\fi
+\contentsendnotestitle{\the\emendationscontentsname}{emendationnotes}
\else
\relax
\fi}
\newcommand{\putexplanatory}{
\ifexplanon
+\ifexplanationstwocol
+\literalexplain{\end{multicols}}
+\fi %\iftextnotetwocol
\newpage
\hyphenationforsmall
\immediate\closeout\explanations
\input \jobname.enx
- \ifpoemcontentson
- \ifexplanon
-\immediate\write\poemcontents{\string\contentspoemtitlefont\ \the\explanationscontentsname}
-\immediate\write
- \poemcontents{\string~ \string\contentsleaders \string~\
- \string\pageref{explanatorynotes} \string\par}
-\immediate\write\poemcontents{\string\par \string\smallskip}
- \fi
+\ifpoemcontentson
+ \ifexplanon
+\contentsendnotestitle{\the\explanationscontentsname}{explanatorynotes}
+ \fi
\fi
\else
\relax
\fi}
\newcommand{\puttextnotes}{
\iftextnoteson
+\iftextnotestwocol
+\literaltextnote{\end{multicols}}
+\fi %\iftextnotetwocol
\newpage
\hyphenationforsmall
\immediate\closeout\textnotes
\input \jobname.ent
- \ifpoemcontentson
- \iftextnoteson
-\immediate\write\poemcontents{\string\contentspoemtitlefont\ \the\textnotescontentsname}
-\immediate\write
- \poemcontents{\string~ \string\contentsleaders \string~\
- \string\pageref{textualnotes} \string\par}
-\immediate\write\poemcontents{\string\par \string\smallskip}
- \fi
-\fi
+\contentsendnotestitle{\the\textnotescontentsname}{textualnotes}
\else
\relax
\fi}
@@ -2665,8 +2790,12 @@
\let\item\pmclidxitem}
{\end{multicols}\clearpage}
\makeatother
-\newenvironment{epigraphquote}{\list{}{\rightmargin 1.5em%
- \leftmargin 1.5em%
+\newlength{\epigraphquoteleftmargin}
+\newlength{\epigraphquoterightmargin}
+\setlength{\epigraphquoteleftmargin}{1.5em}
+\setlength{\epigraphquoterightmargin}{1.5em}
+\newenvironment{epigraphquote}{\list{}{\rightmargin\epigraphquoterightmargin%
+ \leftmargin\epigraphquoteleftmargin%
\topsep 0pt%
\partopsep 0pt%
\listparindent 0pt%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/poemscol.tlpobj new/tlpkg/tlpobj/poemscol.tlpobj
--- old/tlpkg/tlpobj/poemscol.tlpobj 2011-09-01 04:26:01.000000000 +0200
+++ new/tlpkg/tlpobj/poemscol.tlpobj 2013-05-28 17:08:10.000000000 +0200
@@ -1,9 +1,9 @@
name poemscol
category Package
-revision 23762
+revision 30706
shortdesc Typesetting Critical Editions of Poetry.
relocated 1
-longdesc Poemscol is a package of LaTeX macros for typesetting critical
+longdesc The package offers LaTeX macros for typesetting critical
longdesc editions of poetry. Its features include automatic
longdesc linenumbering, generation of separate endnotes sections for
longdesc emendations, textual collations, and explanatory notes, special
@@ -11,9 +11,9 @@
longdesc breaks, running headers of the form 'Notes to pp. xx-yy' for
longdesc the notes sections, index of titles and first lines, and
longdesc automatic generation of a table of contents.
-runfiles size=22
+runfiles size=23
RELOC/tex/latex/poemscol/poemscol.sty
catalogue-ctan /macros/latex/contrib/poemscol
-catalogue-date 2011-08-31 08:15:30 +0200
-catalogue-license lppl
-catalogue-version 2.54
+catalogue-date 2013-05-25 17:03:59 +0200
+catalogue-license lppl1.2
+catalogue-version 2.62
++++++ polyglossia.doc.tar.xz ++++++
++++ 2540 lines of diff (skipped)
++++++ polyglossia.tar.xz ++++++
++++ 17802 lines of diff (skipped)
++++++ preprint.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/preprint/00readme.txt new/doc/latex/preprint/00readme.txt
--- old/doc/latex/preprint/00readme.txt 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/preprint/00readme.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,79 +0,0 @@
-Preprint Collection: (April 2001)
-~~~~~~~~~~~~~~~~~~~~
-This directory contains some packages written by Patrick W. Daly. The
-primary distribution site is:
-
-http://www.linmpi.mpg.de/english/services/software/latex/localtex/localltx.h...
-
-I (Arash Esbati) just mentioned balance.sty in comp.text.tex, was invited
-to put in on CTAN, asked Patrick W. Daly for permission, wrote this readme
-for your convenience and made a CTAN submission.
-
-
-Legal stuff:
-~~~~~~~~~~~~~~~~~~~~
-The copyright holder of these packages is Patrick W. Daly. They can be
-redistributed and/or modified under the terms of the LaTeX Project Public
-License Distributed from CTAN archives in directory
-macros/latex/base/lppl.txt; either version 1 of the License, or any later
-version.
-
-
-Important note:
-~~~~~~~~~~~~~~~~~~~~
-Unfortunatly, the author of these packages doesn't have the time for
-further development, bug fixes, "wishes" etc. Hence, they are provided
-"as is". If you run into problems, you are on your own.
-
-
-Brief description:
-~~~~~~~~~~~~~~~~~~~~
-1. appendix.sty: (version 2.1 from 1999/02/23)
- Adding this package redefines \appendix so that main counters for
- figures, tables, equations are subnumbered under the appendix. The
- plate counter is also subnumbered. A \noappendix command is included so
- that things like bibliographies may be called after the appendix with
- \section*. This package is only useful with article documentclass for
- obvious reasons.
-
-2. authblk.sty: (version 1.3 from 2001/02/27)
- A LaTeX2e package to redefine the \author command to work as normal or
- to allow a footnote style of author/affiliation input.
-
-3. balance.sty: (version 4.3 from 1999/02/23)
- When writing a document with LaTeX two-column mode, the columns on the
- last page, or those before a \cleardoublepage command, will be of
- unequal height. balance.sty solves this problem by modifying the output
- routines in two-column mode.
-
-4. figcaps.sty: (version 4.7 from 1999/02/23)
- This package allows the figure captions to be collected throughout the
- paper and printed on a separate page at the end. The figures themselves
- will not appear in the text. This is for purposes of a manuscript for
- submission. Similarly, tables are not printed in the text, but are
- outputted at the end, after the figure captions. This package may
- optionally be used with the longtable environment defined in the package
- of the same name.
-
-5. fullpage.sty: (version 1.1 from 1999/02/23)
- This package sets all 4 margins to be either 1 inch or 1.5 cm, and
- specifies the page style.
-
-6. sublabel.sty (version 4.5 from 1999/02/23)
- The macros in this package allow all counters to be subnumbered, as for
- example 4a, 4b, 4c, simply by bracketting the objects to be so numbered
- with appropriate on/off commands. They will work with any user-defined
- counters too.
-
-
-Installation:
-~~~~~~~~~~~~~~~~~~~~
-Just run LaTeX on (package).ins, which generates (package).sty. If you
-want the documentation as a dvi, run LaTeX on (package).dtx, otherwise use
-the provided formats. Move the .sty-files to a directory where LaTeX looks
-for the input files. Update your file name database and you're done.
-Check your local guide for more Information.
-
-
-Happy TeXing!
- Arash Esbati (esbati@gmx.de)
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/preprint/00readme.unix new/doc/latex/preprint/00readme.unix
--- old/doc/latex/preprint/00readme.unix 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/preprint/00readme.unix 1970-01-01 01:00:00.000000000 +0100
@@ -1,79 +0,0 @@
-Preprint Collection: (April 2001)
-~~~~~~~~~~~~~~~~~~~~
-This directory contains some packages written by Patrick W. Daly. The
-primary distribution site is:
-
-http://www.linmpi.mpg.de/english/services/software/latex/localtex/localltx.h...
-
-I (Arash Esbati) just mentioned balance.sty in comp.text.tex, was invited
-to put in on CTAN, asked Patrick W. Daly for permission, wrote this readme
-for your convenience and made a CTAN submission.
-
-
-Legal stuff:
-~~~~~~~~~~~~~~~~~~~~
-The copyright holder of these packages is Patrick W. Daly. They can be
-redistributed and/or modified under the terms of the LaTeX Project Public
-License Distributed from CTAN archives in directory
-macros/latex/base/lppl.txt; either version 1 of the License, or any later
-version.
-
-
-Important note:
-~~~~~~~~~~~~~~~~~~~~
-Unfortunatly, the author of these packages doesn't have the time for
-further development, bug fixes, "wishes" etc. Hence, they are provided
-"as is". If you run into problems, you are on your own.
-
-
-Brief description:
-~~~~~~~~~~~~~~~~~~~~
-1. appendix.sty: (version 2.1 from 1999/02/23)
- Adding this package redefines \appendix so that main counters for
- figures, tables, equations are subnumbered under the appendix. The
- plate counter is also subnumbered. A \noappendix command is included so
- that things like bibliographies may be called after the appendix with
- \section*. This package is only useful with article documentclass for
- obvious reasons.
-
-2. authblk.sty: (version 1.3 from 2001/02/27)
- A LaTeX2e package to redefine the \author command to work as normal or
- to allow a footnote style of author/affiliation input.
-
-3. balance.sty: (version 4.3 from 1999/02/23)
- When writing a document with LaTeX two-column mode, the columns on the
- last page, or those before a \cleardoublepage command, will be of
- unequal height. balance.sty solves this problem by modifying the output
- routines in two-column mode.
-
-4. figcaps.sty: (version 4.7 from 1999/02/23)
- This package allows the figure captions to be collected throughout the
- paper and printed on a separate page at the end. The figures themselves
- will not appear in the text. This is for purposes of a manuscript for
- submission. Similarly, tables are not printed in the text, but are
- outputted at the end, after the figure captions. This package may
- optionally be used with the longtable environment defined in the package
- of the same name.
-
-5. fullpage.sty: (version 1.1 from 1999/02/23)
- This package sets all 4 margins to be either 1 inch or 1.5 cm, and
- specifies the page style.
-
-6. sublabel.sty (version 4.5 from 1999/02/23)
- The macros in this package allow all counters to be subnumbered, as for
- example 4a, 4b, 4c, simply by bracketting the objects to be so numbered
- with appropriate on/off commands. They will work with any user-defined
- counters too.
-
-
-Installation:
-~~~~~~~~~~~~~~~~~~~~
-Just run LaTeX on (package).ins, which generates (package).sty. If you
-want the documentation as a dvi, run LaTeX on (package).dtx, otherwise use
-the provided formats. Move the .sty-files to a directory where LaTeX looks
-for the input files. Update your file name database and you're done.
-Check your local guide for more Information.
-
-
-Happy TeXing!
- Arash Esbati (esbati@gmx.de)
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/preprint/README new/doc/latex/preprint/README
--- old/doc/latex/preprint/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/preprint/README 2013-05-14 01:43:30.000000000 +0200
@@ -0,0 +1,88 @@
+Preprint Collection: (May 2013)
+~~~~~~~~~~~~~~~~~~~~
+This directory contains some packages written by Patrick W. Daly. The
+primary distribution site is:
+
+http://www.mps.mpg.de/software/latex/localtex/localltx.html
+
+I (Arash Esbati) mentioned balance.sty in comp.text.tex, was invited
+to put in on CTAN, asked Patrick W. Daly for permission, wrote this
+readme for your convenience and made a CTAN submission.
+
+
+Legal stuff:
+~~~~~~~~~~~~~~~~~~~~
+The copyright holder of these packages is Patrick W. Daly. They can be
+redistributed and/or modified under the terms of the LaTeX Project Public
+License Distributed from CTAN archives in directory
+macros/latex/base/lppl.txt; either version 1 of the License, or any later
+version.
+
+
+Important note:
+~~~~~~~~~~~~~~~~~~~~
+Unfortunately, the author of these packages doesn't have the time for
+further development, bug fixes, "wishes" etc. Hence, they are provided
+"as is". If you run into problems, you are on your own.
+
+
+Brief description:
+~~~~~~~~~~~~~~~~~~~~
+1. authblk.sty: (version 1.3 from 2001/02/27)
+ A LaTeX2e package to redefine the \author command to work as normal or
+ to allow a footnote style of author/affiliation input.
+
+2. balance.sty: (version 4.3 from 1999/02/23)
+ When writing a document with LaTeX two-column mode, the columns on the
+ last page, or those before a \cleardoublepage command, will be of
+ unequal height. balance.sty solves this problem by modifying the output
+ routines in two-column mode.
+
+3. figcaps.sty: (version 4.7 from 1999/02/23)
+ This package allows the figure captions to be collected throughout the
+ paper and printed on a separate page at the end. The figures themselves
+ will not appear in the text. This is for purposes of a manuscript for
+ submission. Similarly, tables are not printed in the text, but are
+ outputted at the end, after the figure captions. This package may
+ optionally be used with the longtable environment defined in the package
+ of the same name.
+
+4. fullpage.sty: (version 1.1 from 1999/02/23)
+ This package sets all 4 margins to be either 1 inch or 1.5 cm, and
+ specifies the page style.
+
+5. sublabel.sty (version 4.5 from 1999/02/23)
+ The macros in this package allow all counters to be subnumbered, as for
+ example 4a, 4b, 4c, simply by bracketting the objects to be so numbered
+ with appropriate on/off commands. They will work with any user-defined
+ counters too.
+
+6. appendix.sty: (version 2.2 from 2005/10/30)
+ Adding this package redefines \appendix so that main counters for
+ figures, tables, equations are subnumbered under the appendix. The
+ plate counter is also subnumbered. A \noappendix command is included so
+ that things like bibliographies may be called after the appendix with
+ \section*. This package is only useful with article documentclass for
+ obvious reasons.
+
+ N.B.: This package is not available on CTAN due to a name clash. You
+ have to fetch it from the site mentioned above.
+
+
+Installation:
+~~~~~~~~~~~~~~~~~~~~
+Just run LaTeX on (package).ins, which generates (package).sty. If you
+want the documentation as a dvi, run LaTeX on (package).dtx, otherwise use
+the provided format. Move the .sty-files to a directory where LaTeX looks
+for the input files. Update your file name database and you're done.
+Check your local guide for more Information.
+
+
+Happy TeXing!
+ Arash Esbati
+
+
+;; Local Variables:
+;; mode: text
+;; fill-column: 75
+;; End:
Files old/doc/latex/preprint/authblk.pdf and new/doc/latex/preprint/authblk.pdf differ
Files old/doc/latex/preprint/balance.pdf and new/doc/latex/preprint/balance.pdf differ
Files old/doc/latex/preprint/figcaps.pdf and new/doc/latex/preprint/figcaps.pdf differ
Files old/doc/latex/preprint/fullpage.pdf and new/doc/latex/preprint/fullpage.pdf differ
Files old/doc/latex/preprint/sublabel.pdf and new/doc/latex/preprint/sublabel.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/preprint.doc.tlpobj new/tlpkg/tlpobj/preprint.doc.tlpobj
--- old/tlpkg/tlpobj/preprint.doc.tlpobj 2010-06-10 18:41:57.000000000 +0200
+++ new/tlpkg/tlpobj/preprint.doc.tlpobj 2013-05-14 03:51:16.000000000 +0200
@@ -1,11 +1,10 @@
name preprint.doc
category Package
-revision 16085
+revision 30447
shortdesc doc files of preprint
relocated 1
-docfiles size=106
- RELOC/doc/latex/preprint/00readme.txt
- RELOC/doc/latex/preprint/00readme.unix
+docfiles size=189
+ RELOC/doc/latex/preprint/README
RELOC/doc/latex/preprint/authblk.pdf
RELOC/doc/latex/preprint/balance.pdf
RELOC/doc/latex/preprint/figcaps.pdf
++++++ preprint.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/preprint/authblk.sty new/tex/latex/preprint/authblk.sty
--- old/tex/latex/preprint/authblk.sty 2009-11-20 02:46:57.000000000 +0100
+++ new/tex/latex/preprint/authblk.sty 2013-05-14 01:43:30.000000000 +0200
@@ -19,7 +19,7 @@
%% Full documentation can be obtained by LaTeXing that original file.
%% Only a few abbreviated comments remain here to describe the usage.
%% =============================================
-%% Copyright 1997-1999, 2009 Patrick W Daly
+%% Copyright 1997-1999 Patrick W Daly
%% Max-Planck-Institut f\"ur Aeronomie
%% Max-Planck-Str. 2
%% D-37191 Katlenburg-Lindau
@@ -27,7 +27,16 @@
%% E-mail: daly@linmpi.mpg.de
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{authblk}
- [2009/11/18 1.3 (PWD)]
+ [2001/02/27 1.3 (PWD)]
+ %-------------------------------------------------------------------
+ % NOTICE:
+ % This file may be used for non-profit purposes.
+ % It may not be distributed in exchange for money,
+ % other than distribution costs.
+ %
+ % The author provides it `as is' and does not guarantee it in any way.
+ %
+%% authblk coding copyright (C) 1997 Patrick W. Daly
% Max-Planck-Institut f\"ur Aeronomie
% Max-Planck-Str. 2
% D-37191 Katlenburg-Lindau
@@ -41,7 +50,7 @@
%
% Three methods of input:
% 1. Standard LaTeX
- % \author{Name1//Affil1 /and Name2 and Name3//Affil2 . . .}
+ % \author{Name1\\Affil1 /and Name2 and Name3\\Affil2 . . .}
% (use \authorcr, not \\, to force new line within the author text)
% 2. Automatic mode (selects modes 1 or 3 depending on number of affiliations)
% \author{Name1}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/preprint.tlpobj new/tlpkg/tlpobj/preprint.tlpobj
--- old/tlpkg/tlpobj/preprint.tlpobj 2010-06-10 18:41:57.000000000 +0200
+++ new/tlpkg/tlpobj/preprint.tlpobj 2013-05-14 03:51:16.000000000 +0200
@@ -1,6 +1,6 @@
name preprint
category Package
-revision 16085
+revision 30447
shortdesc A bundle of packages provided "as is".
relocated 1
longdesc The bundle comprises: - authblk, which permits footnote style
@@ -16,5 +16,6 @@
RELOC/tex/latex/preprint/fullpage.sty
RELOC/tex/latex/preprint/sublabel.sty
catalogue-ctan /macros/latex/contrib/preprint
-catalogue-date 2007-01-06 21:10:04 +0100
-catalogue-license lppl
+catalogue-date 2013-05-13 11:38:32 +0200
+catalogue-license collection
+catalogue-version 2011
++++++ prerex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/prerex/README new/doc/latex/prerex/README
--- old/doc/latex/prerex/README 2012-04-19 18:18:33.000000000 +0200
+++ new/doc/latex/prerex/README 2012-08-23 01:07:19.000000000 +0200
@@ -1,4 +1,4 @@
-prerex, version 6.4.2: Macros for prerequisite charts, with associated
+prerex, version 6.5.2: Macros for prerequisite charts, with associated
editor and viewer applications.
This package consists of
@@ -13,10 +13,9 @@
vprerex ("visual prerex") a GUI and previewer for prerex.
-The implementation of prerex.sty is built on pgf, so that it may
-be used equally happily with latex or pdflatex; prerex is written in C
-and vprerex is written in C++ using the Qt-4 toolkit and the poppler
-library.
+The implementation of prerex.sty is built on pgf, so that it may be
+used equally happily with latex or pdflatex; prerex is written in C and
+vprerex is written in C++ using the Qt-4 and poppler libraries.
See chart.{pdf,html} for a small example of a prerequisite chart and
real-life examples at
@@ -68,18 +67,22 @@
operations on course boxes and arrows, and vertical or horizontal shifts
of the whole diagram or selected sets of course boxes. When a course box
is moved, the arrows into and out of it automatically follow. To install
-on any Unix-like system, including OS-X and Cygwin on Windows:
+on most Unix-like platforms, including OS-X and Cygwin on Windows:
- tar zxvf prerex-6.4.2.tar.gz
- cd prerex-6.4.2
+ tar zxvf prerex-6.5.1.tar.gz
+ cd prerex-6.5.1
./configure [--prefix=$HOME]
make
make install (as root if necessary)
+The prerex editor will also build on the MinGW platform on Windows if
+the readline package in the gnuwin32.sourceforge.net repository has been
+installed.
+
The effects of editing operations may be observed in any PDF viewer.
The vprerex (visual prerex) application included in the prerex suite
is a GUI and viewer for the prerex editor. It may be used just as a
-minimalistic viewer of arbitrary PDF files but supports editing of
+minimalist viewer of arbitrary PDF files but supports editing of
charts generated using prerex.sty by allowing coordinates of course
boxes, arrows, and background points to be conveyed back to the prerex
editor command-line using the clipboard. See the INSTALL in the tarball
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/prerex/chart.html new/doc/latex/prerex/chart.html
--- old/doc/latex/prerex/chart.html 2011-08-15 01:07:00.000000000 +0200
+++ new/doc/latex/prerex/chart.html 2012-08-23 01:07:19.000000000 +0200
@@ -1,22 +1,67 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html><head><title>A Simple Prerequisite Chart</title></head><body>
-<div class="center"><img src="chart.png" usemap="#chart" ismap border=0></div>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
+<html >
+<head><title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta name="generator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)">
+<meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)">
+<!-- html -->
+<meta name="src" content="chart.tex">
+<meta name="date" content="2012-07-18 15:12:00">
+<link rel="stylesheet" type="text/css" href="chart.css">
+<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Open+Sans:600">
+</head>
+
+<!--l. 4--><p class="noindent" >
+
+<!--l. 5--><p class="noindent" >
</div>
+
+<!--l. 1--><p class="noindent" >
+<div class="minipage"> <ul class="itemize1">
+ <li class="itemize">A solid arrow
indicates a required prerequisite, a dotted arrow
indicates
+ a corequisite (to be taken before or concurrently), and a dashed arrow
indicates a
+ recommended prerequisite. Core courses are in
boxes; other courses (i.e., options or
+ prerequisites) are in
boxes.
+ </li>
+ <li class="itemize">Timetabling abbreviations: M, T, W, Th, F=Mon, Tue, Wed, Thur, Fri, resp.; eve=7:00–9:50 pm;
+ no=not offered.</li></ul></div></div>
+
<map name="chart">
-<area shape=rect coords="548,225,628,125" href="file:1083.html" target="_new" alt="1083">
-<area shape=rect coords="298,245,378,205" href="file:1303.html" target="_new" alt="1303">
-<area shape=rect coords="348,345,428,305" href="file:2813.html" target="_new" alt="2813">
-<area shape=rect coords="498,345,578,305" href="file:2023.html" target="_new" alt="2023">
-<area shape=rect coords="698,345,778,305" href="file:2513.html" target="_new" alt="2513">
-<area shape=rect coords="168,375,208,355" href="file:1083.html" target="_new" alt="1083">
-<area shape=rect coords="148,445,228,405" href="file:2333.html" target="_new" alt="2333">
-<area shape=rect coords="498,445,578,405" href="file:2013.html" target="_new" alt="2013">
-<area shape=rect coords="598,445,678,405" href="file:2685.html" target="_new" alt="2685">
-<area shape=rect coords="278,475,318,455" href="file:2013.html" target="_new" alt="2013">
-<area shape=rect coords="198,545,278,505" href="file:3323.html" target="_new" alt="3323">
-<area shape=rect coords="298,545,378,505" href="file:3813.html" target="_new" alt="3813">
-<area shape=rect coords="398,545,478,505" href="file:3413.html" target="_new" alt="3413">
-<area shape=rect coords="498,545,578,505" href="file:3013.html" target="_new" alt="3013">
-<area shape=rect coords="628,545,708,505" href="file:3513.html" target="_new" alt="3513">
-<area shape=rect coords="748,545,828,505" href="file:3503.html" target="_new" alt="3503">
+<area shape=rect coords="548,225,628,125" href="file:1083.html" target="new" alt="1083">
+<area shape=rect coords="298,245,378,205" href="file:1303.html" target="new" alt="1303">
+<area shape=rect coords="348,345,428,305" href="file:2813.html" target="new" alt="2813">
+<area shape=rect coords="498,345,578,305" href="file:2023.html" target="new" alt="2023">
+<area shape=rect coords="698,345,778,305" href="file:2513.html" target="new" alt="2513">
+<area shape=rect coords="168,375,208,355" href="file:1083.html" target="new" alt="1083">
+<area shape=rect coords="148,445,228,405" href="file:2333.html" target="new" alt="2333">
+<area shape=rect coords="498,445,578,405" href="file:2013.html" target="new" alt="2013">
+<area shape=rect coords="598,445,678,405" href="file:2685.html" target="new" alt="2685">
+<area shape=rect coords="278,475,318,455" href="file:2013.html" target="new" alt="2013">
+<area shape=rect coords="198,545,278,505" href="file:3323.html" target="new" alt="3323">
+<area shape=rect coords="298,545,378,505" href="file:3813.html" target="new" alt="3813">
+<area shape=rect coords="398,545,478,505" href="file:3413.html" target="new" alt="3413">
+<area shape=rect coords="498,545,578,505" href="file:3013.html" target="new" alt="3013">
+<area shape=rect coords="628,545,708,505" href="file:3513.html" target="new" alt="3513">
+<area shape=rect coords="748,545,828,505" href="file:3503.html" target="new" alt="3503">
</map>
-</body></html>
+
+</body></html>
+
+
+
+
Files old/doc/latex/prerex/chart.pdf and new/doc/latex/prerex/chart.pdf differ
Files old/doc/latex/prerex/chart.png and new/doc/latex/prerex/chart.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/prerex/chart.tex new/doc/latex/prerex/chart.tex
--- old/doc/latex/prerex/chart.tex 2012-01-03 01:13:45.000000000 +0100
+++ new/doc/latex/prerex/chart.tex 2012-08-23 01:07:19.000000000 +0200
@@ -3,10 +3,10 @@
\geometry{noheadfoot, vmargin=1.0in, hmargin=0.5in}
\usepackage{prerex}
-%\renewcommand{\sfdefault}{phv} % uncomment to use Helvetica
-%\renewcommand{\sfdefault}{uop} % uncomment to use URW Optima
+\usepackage[default,scale=0.92]{opensans}
+\renewcommand{\seriesdefault}{sb}
+\renewcommand{\ttfamily}{\fontfamily{cmtt}\fontseries{m}\selectfont}
-\renewcommand{\rmdefault}{\sfdefault}
\begin{document}
Files old/doc/latex/prerex/doc/intro.pdf and new/doc/latex/prerex/doc/intro.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/prerex/doc/intro.tex new/doc/latex/prerex/doc/intro.tex
--- old/doc/latex/prerex/doc/intro.tex 2012-04-14 00:25:49.000000000 +0200
+++ new/doc/latex/prerex/doc/intro.tex 2012-08-23 01:07:19.000000000 +0200
@@ -8,10 +8,7 @@
\renewcommand{\bottomfraction}{1.00}
\usepackage[osf]{mathpazo}
-% \usepackage[scaled=0.8]{helvet} % Helvetica scaled down 20%
-\renewcommand{\sfdefault}{uop} % URW clone of Optima
-
-\renewcommand{\ttdefault}{cmtt}
+\usepackage[defaultsans,scale=0.82]{opensans}
\definecolor{light}{gray}{0.5}
\definecolor{bg}{rgb}{0.99,0.96,0.90}
@@ -200,9 +197,8 @@
than the course name. The latter is centered and the former are left-
and right-justified, respectively. Arbitrary \LaTeX\ formatting can be used
for the text.
-\item Any available Type 1 (Postscript) or TrueType format fonts may be used;
- in the chart in Figure~\ref{chart}, the typeface used is Optima, an elegant
- \emph{sans serif} face designed by Hermann Zapf. The professional-quality
+\item Any available Type 1 (Postscript) or TrueType format fonts may be used.
+ The professional-quality
typesetting engine takes advantage of kerns and ligatures in the fonts.
\item Line thickness for boxes may be varied; in the example diagram, heavier
boxes (and bold-face text) are used to indicate that a course is
@@ -457,6 +453,14 @@
(or the command is commented out by preceding
it with a \verb|%| character), Computer Modern Sans will be used.
+The Open Sans family\footnote{%
+\myurl{
http://www.google.com/webfonts/specimen/Open+Sans}}
+of fonts, designed by Steve Matteson of
+Ascender, is supported for use in LaTeX by the \texttt{opensans} package,
+available from CTAN\footnote{%
+\myurl{
http://www.ctan.org/tex-archive/fonts/opensans}}
+and in most distributions. The chart in Figure~\ref{chart} on page~\pageref{chart} uses Open Sans.
+
Futura, Gill Sans, Frutiger and Optima are commercial fonts available from
font vendors such as \texttt{myfonts.com}.
The \LaTeX\ support files and instructions for installation
@@ -464,7 +468,7 @@
at CTAN\footnote{%
\myurl{
http://www.ctan.org/tex-archive/fonts/psfonts/w-a-schmidt/}};
otherwise you will have to follow the instructions
-in the Font Installation Guide\footnote{%
+in the Font Installation Guide.\footnote{%
\myurl{
http://www.ctan.org/tex-archive/info/Type1fonts/fontinstallationguide/}}
Less expensive alternatives may be available to you.
@@ -473,7 +477,7 @@
These fonts are available from commercial vendors but have been bundled with
Corel applications such as \mbox{WordPerfect}, and so you may
already have them. Windows\textsuperscript{\textregistered}\ systems come
-with several fonts, some of which might be suitable for use in prerequisite charts.
+with several fonts, some of which (Arial, Verdana, Calibri) are suitable for use in prerequisite charts.
Four URW-Classico fonts, a fairly good clone of Optima, are available in a package
of 79~fonts in Type~1 format that may be legally downloaded for non-commercial use
@@ -487,6 +491,7 @@
before re-distributing them. This restriction does not prevent you from distributing documents
that \emph{use} the fonts.
+
\section{Conversion to Portable Network Graphic (PNG) Format}
Although PDF is currently the best available format for distributing
@@ -582,7 +587,7 @@
on GNU/Linux, Solaris, the Cygwin\footnote{\myurl{
http://www.cygwin.com/}}
platform on Windows,
and the Fink\footnote{\myurl{
http://fink.sourceforge.net/}} platform
-on OS~X, if the GNU \texttt{readline} library is installed.
+on OS~X.
The editor supports add, remove, cut-and-paste, and edit operations
on course boxes, minis, text-lines, and arrows, and shifts of specified diagram elements or an entire diagram.
@@ -785,9 +790,9 @@
\verb|\solidarrow| & \solidarrow \\
\verb|\dottedarrow| & \dottedarrow \\
\verb|\dashedarrow| & \dashedarrow \\
-\verb|\lightbox| & \lightbox \\
+\verb|\lightbox| & \fontseries{sb}\selectfont\lightbox \\
\verb|\boldbox| & \boldbox \\
-\verb|\dottedbox| & \dottedbox
+\verb|\dottedbox| & \fontseries{sb}\selectfont\dottedbox
\end{tabular}
\renewcommand{\arraystretch}{1.0}
\end{list}
Files old/doc/latex/prerex/doc/introFonts.png and new/doc/latex/prerex/doc/introFonts.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/prerex/doc/introchart1.tex new/doc/latex/prerex/doc/introchart1.tex
--- old/doc/latex/prerex/doc/introchart1.tex 2011-08-15 01:07:00.000000000 +0200
+++ new/doc/latex/prerex/doc/introchart1.tex 2012-08-23 01:07:19.000000000 +0200
@@ -1,8 +1,9 @@
\begin{figure}
-\renewcommand{\rmdefault}{\sfdefault}
+\renewcommand{\bfdefault}{b}
+\renewcommand{\seriesdefault}{sb}
\setcounter{diagheight}{50}
\textwidth6.25in
-\begin{chart}
+\begin{chart}\sf
\text 20,50:{\textsf{\textbf{\Large Computer Science}}}
\reqfullcourse 50,45:{1083}{Comput.\,Sci.\\Concepts}{TTh 10:00}
\reqhalfcourse 25,40:{1303}{Discrete\\Structures}{MWF 9:30}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/prerex/doc/introchart2.tex new/doc/latex/prerex/doc/introchart2.tex
--- old/doc/latex/prerex/doc/introchart2.tex 2011-08-15 01:07:00.000000000 +0200
+++ new/doc/latex/prerex/doc/introchart2.tex 2012-08-23 01:07:19.000000000 +0200
@@ -1,8 +1,9 @@
\begin{figure}
-\renewcommand{\rmdefault}{\sfdefault}
+\renewcommand{\bfdefault}{b}
+\renewcommand{\seriesdefault}{sb}
\textwidth6.25in
\setcounter{diagheight}{50}
-\begin{chart}
+\begin{chart}\sf
\grid
\text 20,50:{\textsf{\textbf{\Large Computer Science}}}
\reqfullcourse 50,45:{1083}{Comput.\,Sci.\\Concepts}{TTh 10:00}
Files old/doc/latex/prerex/doc/prerex.pdf and new/doc/latex/prerex/doc/prerex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/prerex/doc/prerex.tex new/doc/latex/prerex/doc/prerex.tex
--- old/doc/latex/prerex/doc/prerex.tex 2012-04-01 00:27:14.000000000 +0200
+++ new/doc/latex/prerex/doc/prerex.tex 2012-08-23 01:07:19.000000000 +0200
@@ -1,6 +1,6 @@
\documentclass[10pt]{article}
-\usepackage{mathpazo}
-\usepackage[scaled=0.9]{helvet}
+\usepackage[osf]{mathpazo}
+\usepackage[defaultsans,scale=0.82]{opensans}
\usepackage{fullpage}
\usepackage{prerex}
%\def\LaTeX{\mbox{LaTeX}}
@@ -34,8 +34,9 @@
interactive editor (as well as any conventional text editor).
\begin{figure}
+\renewcommand{\seriesdefault}{sb}
\setcounter{diagheight}{40}
-\begin{chart}
+\begin{chart}\sf
\text 15,40:{\textsf{\textbf{\Large Computer Science}}}
\reqfullcourse 50,35:{1083}{Comput.\,Sci.\\Concepts}{TTh 10:00}
\reqhalfcourse 25,30:{1303}{Discrete\\Structures}{MWF 9:30}
@@ -306,7 +307,8 @@
\begin{figure}
\setcounter{diagheight}{40}
-\begin{chart}
+\renewcommand{\seriesdefault}{sb}
+\begin{chart}\sf
\grid
\text 15,40:{\textsf{\textbf{\Large Computer Science}}}
\reqfullcourse 50,35:{1083}{Comput.\,Sci.\\Concepts}{TTh 10:00}
Files old/doc/latex/prerex/prerex-6.4.2.tar.gz and new/doc/latex/prerex/prerex-6.4.2.tar.gz differ
Files old/doc/latex/prerex/prerex-6.5.1.tar.gz and new/doc/latex/prerex/prerex-6.5.1.tar.gz differ
Files old/doc/latex/prerex/vprerex-6.4.0.tar.gz and new/doc/latex/prerex/vprerex-6.4.0.tar.gz differ
Files old/doc/latex/prerex/vprerex-6.4.2.tar.gz and new/doc/latex/prerex/vprerex-6.4.2.tar.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/prerex.doc.tlpobj new/tlpkg/tlpobj/prerex.doc.tlpobj
--- old/tlpkg/tlpobj/prerex.doc.tlpobj 2012-04-20 04:43:18.000000000 +0200
+++ new/tlpkg/tlpobj/prerex.doc.tlpobj 2012-08-23 04:33:44.000000000 +0200
@@ -1,9 +1,9 @@
name prerex.doc
category Package
-revision 26041
+revision 27495
shortdesc doc files of prerex
relocated 1
-docfiles size=179
+docfiles size=174
RELOC/doc/latex/prerex/README
RELOC/doc/latex/prerex/chart.html
RELOC/doc/latex/prerex/chart.pdf
@@ -17,5 +17,5 @@
RELOC/doc/latex/prerex/doc/prerex.pdf
RELOC/doc/latex/prerex/doc/prerex.sty.7
RELOC/doc/latex/prerex/doc/prerex.tex
- RELOC/doc/latex/prerex/prerex-6.4.2.tar.gz
- RELOC/doc/latex/prerex/vprerex-6.4.0.tar.gz
+ RELOC/doc/latex/prerex/prerex-6.5.1.tar.gz
+ RELOC/doc/latex/prerex/vprerex-6.4.2.tar.gz
++++++ prerex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/prerex/prerex.sty new/tex/latex/prerex/prerex.sty
--- old/tex/latex/prerex/prerex.sty 2012-04-01 00:27:14.000000000 +0200
+++ new/tex/latex/prerex/prerex.sty 2012-08-23 01:07:19.000000000 +0200
@@ -57,16 +57,25 @@
% \newcommand{\dottedwidth}{0.8pt}
% \newcommand{\dashedwidth}{0.5pt}
% \newcommand{\boldwidth}{1.0pt}
-% \newcommand{\smallersize}{\relsize{-3}}
+% \newcommand{\smallersize}{\relsize{-2}}
% \newcommand{\baselineAdj}{-0.5ex}
%
% The nominal diagram width is 10 + (\textwidth divided by \unit).
%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{prerex}[2012/03/29 v6.3.2 LaTeX style for prerequisite charts, pgf version]
+\ProvidesPackage{prerex}[2012/06/28 v6.3.4 LaTeX style for prerequisite charts, pgf version]
% Changelog:
%
+% Version 6.3.4
+%
+% Timetable and course code in bold for required boxes.
+%
+% Version 6.3.3
+%
+% Remove background colour from standalone boxes.
+% \smallersize increased to \relsize{-2}.
+%
% Version 6.3.2
%
% Use pgf layers to keep grid below arrows below boxes (thanks to Ryan Kavanagh).
@@ -240,7 +249,7 @@
\newcommand{\boldwidth}{1.0pt}
\newcommand{\dottedwidth}{0.8pt}
\newcommand{\dashedwidth}{0.5pt}
-\newcommand{\smallersize}{\relsize{-3}}
+\newcommand{\smallersize}{\relsize{-2}}
\newcommand{\baselineAdj}{-0.5ex}
\newcounter{@myangle}
@@ -307,19 +316,19 @@
}
\def\lightbox{%
-\tikz[thin,baseline=\baselineAdj]\node[draw,fill=\background,rounded corners=2pt,inner xsep=1.8pt]
+\tikz[thin,baseline=\baselineAdj]\node[draw,rounded corners=2pt,inner xsep=1.8pt]
{\rule[-2pt]{0pt}{4pt}\textsf{light}};
}
\def\boldbox{%
-\tikz[baseline=\baselineAdj]\node[draw,line width=\boldwidth,fill=\background,rounded corners=2pt,inner xsep=1.8pt]
+\tikz[baseline=\baselineAdj]\node[draw,line width=\boldwidth,rounded corners=2pt,inner xsep=1.8pt]
{\rule[-2pt]{0pt}{4pt}\textsf{\textbf{bold}}};
}
\def\dottedbox{%
-\tikz[baseline=\baselineAdj]\node[draw,dotted,line width=\boldwidth,fill=\background,rounded corners=2pt,inner xsep=1.8pt]
-{\rule[-2pt]{0pt}{4pt}\textsf{\textsf{dotted}}};
+\tikz[baseline=\baselineAdj]\node[draw,dotted,line width=\boldwidth,rounded corners=2pt,inner xsep=1.8pt]
+{\rule[-2pt]{0pt}{4pt}\textsf{dotted}};
}
\pgfdeclarelayer{arrows}
@@ -330,14 +339,14 @@
\def\@halfcourse#1,#2:#3#4#5{%
\begin{pgfonlayer}{courses}%
\node[draw,thin,fill=\background,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize#3}%
\,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
-\end{tabular}}}%
+\end{tabular}}%
};%
\@outputImapData#1,#2:{#3}{4}{2}%
\end{pgfonlayer}%
@@ -346,14 +355,14 @@
\def\@halfcoursec#1,#2:#3#4#5#6{%
\begin{pgfonlayer}{courses}%
\node[draw,thin,fill=#6,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize\selectfont{#3}}%
\,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize{\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}}%
\\ #4%
-\end{tabular}}}%
+\end{tabular}}%
};%
\@outputImapData#1,#2:{#3}{4}{2}%
\end{pgfonlayer}%
@@ -362,14 +371,14 @@
\def\@reqhalfcourse#1,#2:#3#4#5{%
\begin{pgfonlayer}{courses}%
\node[draw,line width=\boldwidth,fill=\background,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\textsf{\textbf{%
+{\fontfamily{\sfdefault}\fontseries{\bfdefault}\selectfont
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize\fontseries{\bfdefault}\selectfont#3}%
\,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\fontseries{\bfdefault}\selectfont\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
-\end{tabular}}}%
+\end{tabular}%
}};%
\@outputImapData#1,#2:{#3}{4}{2}%
\end{pgfonlayer}%
@@ -378,14 +387,14 @@
\def\@reqhalfcoursec#1,#2:#3#4#5#6{%
\begin{pgfonlayer}{courses}%
\node[draw,line width=\boldwidth,fill=#6,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\textsf{\textbf{%
+{\fontfamily{\sfdefault}\fontseries{\bfdefault}\selectfont
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize\fontseries{\bfdefault}\selectfont#3}%
\,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\fontseries{\bfdefault}\selectfont\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
-\end{tabular}}}%
+\end{tabular}%
}};%
\@outputImapData#1,#2:{#3}{4}{2}%
\end{pgfonlayer}%
@@ -395,14 +404,14 @@
\def\@opthalfcourse#1,#2:#3#4#5{%
\begin{pgfonlayer}{courses}%
\node[draw,dotted,line width=\boldwidth,fill=\background,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize#3}%
\,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
-\end{tabular}}}%
+\end{tabular}}%
};%
\@outputImapData#1,#2:{#3}{4}{2}%
\end{pgfonlayer}%
@@ -411,14 +420,14 @@
\def\@opthalfcoursec#1,#2:#3#4#5#6{%
\begin{pgfonlayer}{courses}%
\node[draw,dotted,line width=\boldwidth,fill=#6,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize#3}%
\,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
-\end{tabular}}}%
+\end{tabular}}%
};%
\@outputImapData#1,#2:{#3}{4}{2}%
\end{pgfonlayer}%
@@ -427,14 +436,14 @@
\def\@fullcourse#1,#2:#3#4#5{%
\begin{pgfonlayer}{courses}%
\node[draw,thin,fill=\background,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize#3}%
\,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
-\end{tabular}}}%
+\end{tabular}}%
};%
\@outputImapData#1,#2:{#3}{4}{5}%
\end{pgfonlayer}%
@@ -443,14 +452,14 @@
\def\@fullcoursec#1,#2:#3#4#5#6{%
\begin{pgfonlayer}{courses}%
\node[draw,thin,fill=#6,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize#3}%
\,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
-\end{tabular}}}%
+\end{tabular}}%
};%
\end{pgfonlayer}%
\@outputImapData#1,#2:{#3}{4}{5}%
@@ -459,14 +468,14 @@
\def\@reqfullcourse#1,#2:#3#4#5{%
\begin{pgfonlayer}{courses}%
\node[draw,line width=\boldwidth,fill=\background,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\textsf{\textbf{%
+{\fontfamily{\sfdefault}\fontseries{\bfdefault}\selectfont
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize\fontseries{\bfdefault}\selectfont#3}%
\,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\fontseries{\bfdefault}\selectfont\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
-\end{tabular}}}}%
+\end{tabular}}%
};%
\@outputImapData#1,#2:{#3}{4}{5}%
\end{pgfonlayer}%
@@ -475,14 +484,14 @@
\def\@reqfullcoursec#1,#2:#3#4#5#6{%
\begin{pgfonlayer}{courses}%
\node[draw,line width=\boldwidth,fill=#6,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\textsf{\textbf{%
+{\fontfamily{\sfdefault}\fontseries{\bfdefault}\selectfont
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize\fontseries{\bfdefault}\selectfont#3}%
\,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\fontseries{\bfdefault}\selectfont\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
-\end{tabular}}}}%
+\end{tabular}}%
};%
\@outputImapData#1,#2:{#3}{4}{5}%
\end{pgfonlayer}%
@@ -491,14 +500,14 @@
\def\@fullcoursec#1,#2:#3#4#5#6{%
\begin{pgfonlayer}{courses}%
\node[draw,thin,fill=#6,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize#3}%
\,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
-\end{tabular}}}%
+\end{tabular}}%
};%
\@outputImapData#1,#2:{#3}{4}{5}%
\end{pgfonlayer}%
@@ -507,14 +516,14 @@
\def\@optfullcourse#1,#2:#3#4#5{%
\begin{pgfonlayer}{courses}%
\node[draw,dotted,line width=\boldwidth,fill=\background,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize#3}%
\,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
-\end{tabular}}}%
+\end{tabular}}%
};%
\@outputImapData#1,#2:{#3}{4}{5}%
\end{pgfonlayer}%
@@ -524,14 +533,14 @@
\def\@optfullcoursec#1,#2:#3#4#5#6{%
\begin{pgfonlayer}{courses}%
\node[draw,dotted,line width=\boldwidth,fill=#6,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize#3}%
\,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
-\end{tabular}}}%
+\end{tabular}}%
};%
\@outputImapData#1,#2:{#3}{4}{5}%
\end{pgfonlayer}%
@@ -541,14 +550,14 @@
\begin{pgfonlayer}{courses}%
\ifgridon
\node[fill=white,draw=white,inner ysep=1.8pt](x#1y#2) at (#1,#2)%
- {\textsf{%
+ {\fontfamily{\sfdefault}\selectfont
\href{\CourseURL{#1}{#2}{#3}}{%
- \mbox{\smallersize#3}}}};%
+ {\smallersize#3}}};%
\else
\node[fill=none,draw=none,inner ysep=1.8pt](x#1y#2) at (#1,#2)%
- {\textsf{%
+ {\fontfamily{\sfdefault}\selectfont
\href{\CourseURL{#1}{#2}{#3}}{%
- \mbox{\smallersize#3}}}};%
+ {\smallersize#3}}};%
\fi
\@outputImapData#1,#2:{#3}{2}{1}%
\end{pgfonlayer}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/prerex.tlpobj new/tlpkg/tlpobj/prerex.tlpobj
--- old/tlpkg/tlpobj/prerex.tlpobj 2012-04-20 04:43:19.000000000 +0200
+++ new/tlpkg/tlpobj/prerex.tlpobj 2012-08-23 04:33:44.000000000 +0200
@@ -1,6 +1,6 @@
name prerex
category Package
-revision 26041
+revision 27495
shortdesc Interactive editor and macro support for prerequisite charts.
relocated 1
longdesc This package consists of prerex.sty, a LaTeX package for
@@ -14,6 +14,6 @@
runfiles size=7
RELOC/tex/latex/prerex/prerex.sty
catalogue-ctan /graphics/prerex
-catalogue-date 2012-04-18 19:23:59 +0200
+catalogue-date 2012-08-22 19:18:22 +0200
catalogue-license gpl
-catalogue-version 6.4.2
+catalogue-version 6.5.2
++++++ preview.doc.tar.xz ++++++
Files old/doc/latex/preview/preview.pdf and new/doc/latex/preview/preview.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/preview.doc.tlpobj new/tlpkg/tlpobj/preview.doc.tlpobj
--- old/tlpkg/tlpobj/preview.doc.tlpobj 2010-06-10 18:42:05.000000000 +0200
+++ new/tlpkg/tlpobj/preview.doc.tlpobj 2012-12-04 04:36:42.000000000 +0100
@@ -1,8 +1,8 @@
name preview.doc
category Package
-revision 17118
+revision 28438
shortdesc doc files of preview
relocated 1
-docfiles size=46
+docfiles size=43
RELOC/doc/latex/preview/README
RELOC/doc/latex/preview/preview.pdf
++++++ preview.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/preview.tlpobj new/tlpkg/tlpobj/preview.tlpobj
--- old/tlpkg/tlpobj/preview.tlpobj 2010-06-10 18:42:05.000000000 +0200
+++ new/tlpkg/tlpobj/preview.tlpobj 2012-12-04 04:36:42.000000000 +0100
@@ -1,6 +1,6 @@
name preview
category Package
-revision 17118
+revision 28438
shortdesc Extract bits of a LaTeX source for output.
relocated 1
longdesc The package is a free-standing part of the preview-latex
@@ -20,6 +20,6 @@
RELOC/tex/latex/preview/prtightpage.def
RELOC/tex/latex/preview/prtracingall.def
catalogue-ctan /macros/latex/contrib/preview
-catalogue-date 2010-02-22 08:57:39 +0100
+catalogue-date 2012-12-02 22:39:14 +0100
catalogue-license gpl
-catalogue-version 11.86
+catalogue-version 11.87
++++++ probsoln.doc.tar.xz ++++++
++++ 4508 lines of diff (skipped)
++++++ probsoln.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/probsoln/probsoln.sty new/tex/latex/probsoln/probsoln.sty
--- old/tex/latex/probsoln/probsoln.sty 2012-01-15 00:23:39.000000000 +0100
+++ new/tex/latex/probsoln/probsoln.sty 2013-03-13 23:35:46.000000000 +0100
@@ -7,7 +7,7 @@
%% probsoln.dtx (with options: `probsoln.sty,package')
%%
%% probsoln.dtx
-%% Copyright 2011 Nicola Talbot
+%% Copyright 2013 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files probsoln.dtx and probsoln.ins and the derived files probsoln.sty, sample.tex, sample2.tex, sample3.tex, sample4.tex, sample5.tex, sample6.tex, sample7.tex, sample8.tex, prob-1stprncp.tex, prob-args.tex, prob-easy.tex, prob-easy2.tex, prob-implicit.tex, prob-mchoice.tex, prob-mixed.tex, prob-newdata.tex, prob-nosoln.tex, prob-probspaces.tex, prob-probspaces2.tex, prob-tabmchoice.tex, prob-verb.tex.
+%% This work consists of the files probsoln.dtx and probsoln.ins and the derived files probsoln.sty, sample-exclude.tex, sample.tex, sample2.tex, sample3.tex, sample4.tex, sample5.tex, sample6.tex, sample7.tex, sample8.tex, prob-1stprncp.tex, prob-args.tex, prob-easy.tex, prob-easy2.tex, prob-implicit.tex, prob-mchoice.tex, prob-mixed.tex, prob-newdata.tex, prob-nosoln.tex, prob-probspaces.tex, prob-probspaces2.tex, prob-tabmchoice.tex, prob-verb.tex.
%%
%% \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
@@ -47,9 +47,10 @@
%% Display the problems
%% You may need to change \theenumi back here
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{probsoln}[2011/12/10 v3.02 (NLCT)]
+\ProvidesPackage{probsoln}[2012/08/23 v3.04 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{amsmath}
+\RequirePackage{etoolbox}
\newif\ifshowanswers
\showanswersfalse
\let\showanswers\showanswerstrue
@@ -72,16 +73,195 @@
\newcommand*{\ProbSolnFragileExt}{vrb}
\newcommand*{\ProbSolnFragileFile}{\jobname}
\newwrite\probsoln@write
+\newcount\probsoln@startyear
+\newcommand*{\SetStartYear}[1]{%
+ \probsoln@startyear=#1\relax
+ \renewcommand\SetStartMonth[1]{%
+ \PackageError{probsoln}{\string\SetStartMonth\space
+ can't be used after \string\SetStartYear}{}}%
+}
+\newcommand*{\GetStartYear}{\probsoln@startyear}
+\newcount\probsoln@startmonth
+\newcommand*{\SetStartMonth}[1]{%
+ \probsoln@startmonth=#1\relax
+ \probsoln@startyear=\year\relax
+ \ifnum\month<\probsoln@startmonth
+ \advance\probsoln@startyear by -1\relax
+ \fi
+}
+\SetStartMonth{9}
+\newwrite\probsoln@prev
+\newwrite\probsoln@used
+\newcount\probsoln@prev@cutoff
+\newcommand*{\@probsoln@usedfilename}{\jobname.prb}
+\newcommand*{\SetUsedFileName}[1]{%
+ \renewcommand*{\@probsoln@usedfilename}{#1}%
+}
+\newcommand*{\ClearUsedFile}[1]{%
+ \probsoln@prev@cutoff=0\relax
+ \@probsoln@readprev{#1}%
+ \@for\@this@db:=\prob@databases\do{%
+ {%
+ \edef\@prev@list{\csname probsoln@prev@list@\@this@db\endcsname}%
+ \ifdefempty{\@prev@list}%
+ {}%
+ {%
+ \@for\@this@label:=\@prev@list\do{%
+ \ifcsundef{@used@problem@\@this@db @\@this@label}%
+ {%
+ \immediate\write\probsoln@prev{%
+ \string\previousproblem{\@this@label}{\@this@db}%
+ {\csname @prev@problem@\@this@db @\@this@label\endcsname}}%
+ }%
+ {}%
+ }%
+ }%
+ }%
+ }%
+ \immediate\closeout\probsoln@prev
+ \immediate\closeout\probsoln@used
+ \@disable@exclude@prev
+}
+\newcommand*{\ExcludePreviousFile}[2][3]{%
+ \probsoln@prev@cutoff=\probsoln@startyear\relax
+ \advance\probsoln@prev@cutoff by -#1\relax
+ \@probsoln@readprev{#2}%
+ \@write@prev
+ \def\ExcludePreviousFile[2][3]{\PackageError{probsoln}{Only one
+ instance of \string\ExcludePreviousFile\space allowed}{You've
+ already used this command. You are only allowed to use it once}}%
+ \def\ClearUsedFile[1]{%
+ \PackageError{probsoln}%
+ {\string\ClearUsedFile\space may not be used after
+ \string\ExcludePreviousFile}{}}%
+}
+\newcommand*{\@probsoln@readprev}[1]{%
+ \@enable@exclude@prev
+ \InputIfFileExists{#1}%
+ {\PackageInfo{probsoln}%
+ {Excluded problem file `#1' found}}%
+ {\PackageInfo{probsoln}%
+ {Excluded problem file `#1' not found. A new one will be
+ created}}%
+ \InputIfFileExists{\@probsoln@usedfilename}%
+ {\PackageInfo{probsoln}%
+ {Current problems file `\@probsoln@usedfilename' found}}%
+ {\PackageInfo{probsoln}%
+ {No current problem file `\@probsoln@usedfilename' found. A new one will be created}}%
+ \immediate\openout\probsoln@prev=#1
+ \immediate\openout\probsoln@used=\@probsoln@usedfilename
+}
+\newcommand*{\probsoln@prev@list@default}{}
+\newcommand*{\@write@prev}{%
+ \@for\@this@db:=\prob@databases\do{%
+ {%
+ \edef\@prev@list{\csname probsoln@prev@list@\@this@db\endcsname}%
+ \ifdefempty{\@prev@list}%
+ {}%
+ {%
+ \@for\@this@label:=\@prev@list\do{%
+ \immediate\write\probsoln@prev{%
+ \string\previousproblem{\@this@label}{\@this@db}%
+ {\csname @prev@problem@\@this@db @\@this@label\endcsname}}%
+ }%
+ }%
+ }%
+ }%
+}
+\newcommand*{\@enable@exclude@prev}{%
+ \renewcommand*{\@add@used@problem}[2]{%
+ \immediate\write\probsoln@used{\string\usedproblem{##1}{##2}{\number\probsoln@startyear}}%
+ \ifcsundef{@prev@problem@##2@##1}%
+ {%
+ \immediate\write\probsoln@prev{%
+ \string\previousproblem{##1}{##2}{\number\probsoln@startyear}}%
+ \expandafter\xdef\csname @prev@problem@##2@##1\endcsname{%
+ \number\probsoln@startyear}%
+ }%
+ {%
+ \expandafter\ifnum\csname @prev@problem@##2@##1\endcsname
+ <\probsoln@startyear
+ \immediate\write\probsoln@prev{%
+ \string\previousproblem{##1}{##2}{\number\probsoln@startyear}}%
+ \expandafter\xdef\csname @prev@problem@##2@##1\endcsname{%
+ \number\probsoln@startyear}%
+ \fi
+ }%
+ }%
+ \renewcommand*{\@fetch@excluded@list}[2]{%
+ \def##1{}%
+ \ifcsdef{probsoln@prev@list@##2}%
+ {%
+ \edef\@prev@list{\csname probsoln@prev@list@##2\endcsname}%
+ \@for\@this@label:=\@prev@list\do{%
+ \ifcsundef{@used@problem@##2@\@this@label}%
+ {%
+ \ifcsempty{##1}%
+ {\edef##1{\@this@label}}%
+ {\edef##1{##1,\@this@label}}%
+ }%
+ {}%
+ }%
+ }%
+ {}%
+ }%
+ \renewcommand*{\@add@newprevlist}[1]{%
+ \expandafter\gdef\csname probsoln@prev@list@##1\endcsname{}%
+ }%
+ \renewcommand*{\close@probsoln@prev}{%
+ \closeout\probsoln@prev
+ \closeout\probsoln@used
+ }%
+}
+\newcommand*{\@disable@exclude@prev}{%
+ \renewcommand*{\@add@used@problem}[2]{}%
+ \renewcommand*{\@fetch@excluded@list}[2]{\def##1{}}%
+ \renewcommand*{\@add@newprevlist}[1]{}%
+ \renewcommand*{\close@probsoln@prev}{}%
+}
+\newcommand*{\@add@used@problem}[2]{}
+\newcommand*{\@fetch@excluded@list}[2]{%
+ \def#1{}%
+}
+\newcommand*{\@add@newprevlist}[1]{}
+\newcommand*{\close@probsoln@prev}{}
+\AtEndDocument{\close@probsoln@prev}
+\newcommand*{\previousproblem}[3]{%
+ \ifnum#3>\probsoln@prev@cutoff
+ \ifcsundef{prob@db@#2}{\prob@newdb{#2}}{}%
+ \expandafter\gdef\csname @prev@problem@#2@#1\endcsname{#3}%
+ \edef\@prev@list{\csname probsoln@prev@list@#2\endcsname}%
+ \ifdefempty{\@prev@list}%
+ {%
+ \expandafter\xdef\csname probsoln@prev@list@#2\endcsname{#1}%
+ }%
+ {%
+ \expandafter\xdef\csname probsoln@prev@list@#2\endcsname{%
+ \@prev@list,#1}%
+ }%
+ \fi
+}
+\newcommand*{\usedproblem}[3]{%
+ \ifnum#3=\probsoln@startyear
+ \expandafter\def\csname @used@problem@#2@#1\endcsname{#3}%
+ \fi
+}
\newcommand*{\prob@db@default}{}
\newcommand*{\prob@databases}{default}
\newcommand*{\prob@db@default@solutions}{}
\newcommand*{\prob@newdb}[1]{%
-\@ifundefined{prob@db@#1}{%
- \expandafter\gdef\csname prob@db@#1\endcsname{}%
- \xdef\prob@databases{\prob@databases,#1}%
- \expandafter\gdef\csname prob@db@#1@solutions\endcsname{}%
- }{%
- \PackageError{probsoln}{Data set `#1' is already defined}{}}}
+ \ifcsundef{prob@db@#1}%
+ {%
+ \expandafter\gdef\csname prob@db@#1\endcsname{}%
+ \xdef\prob@databases{\prob@databases,#1}%
+ \expandafter\gdef\csname prob@db@#1@solutions\endcsname{}%
+ \@add@newprevlist{#1}%
+ }%
+ {%
+ \PackageError{probsoln}{Data set `#1' is already defined}%
+ {Data set names must be unique}%
+ }%
+}
\newcommand*{\prob@currentdb}{default}
\newcommand{\moveproblem}[3]{%
\@moveproblem{#1}{#2}{#3}%
@@ -101,12 +281,14 @@
}%
}
\newcommand*{\@moveproblem}[3]{%
- \expandafter\ifx\csname prob@db@#3\endcsname\@empty
+ \ifcsempty{prob@db@#3}%
+ {%
\expandafter\xdef\csname prob@db@#3\endcsname{#1}%
- \else
+ }%
+ {%
\expandafter\xdef\csname prob@db@#3\endcsname{%
\csname prob@db@#3\endcsname,#1}%
- \fi
+ }%
\edef\do@movedata{%
\noexpand\global\noexpand\let\expandafter\noexpand
\csname prob@data@#3@#1\endcsname=%
@@ -402,6 +584,7 @@
\def\@prob@currentlabel{#2}%
\def\prob@currentdb{#1}%
\prob@showdraftlabel{#1}{#2}%
+ \@add@used@problem{#2}{#1}%
\let\@useprob@next=\relax
\@ifundefined{prob@data@#1@#2}%
{%
@@ -462,7 +645,8 @@
\newif\iffirstpass
\firstpasstrue
\newcommand{\loadrandomproblems}[3][default]{%
- \@loadrandomproblems{#1}{#2}{#3}{}%
+ \@fetch@excluded@list{\@excl@list}{#1}%
+ \@loadrandomproblems{#1}{#2}{#3}{\@excl@list}%
}
\newcommand{\loadrandomexcept}[4][default]{%
\@loadrandomproblems{#1}{#2}{#3}{#4}%
@@ -478,8 +662,9 @@
\input{#3}%
\@probselN=0\relax
\@for\@thislabel:=\prob@selectedlabels\do{%
- \expandafter\DTLifinlist\expandafter
- {\@thislabel}{#4}{}%
+ \edef\@if@in@list{\noexpand\DTLifinlist{\@thislabel}{#4}}%
+ \@if@in@list
+ {}%
{%
\advance\@probselN by 1\relax
\expandafter
@@ -487,13 +672,32 @@
\@thislabel}%
}%
}%
- \shuffle{@prob@tmp@}{\@probselN}%
- \ifnum\@probselN<#2\relax
- \PackageWarning{probsoln}{You have requested
- \number#2\space\space problem(s) but `#3' only contains
- \number\@probselN\space problems. All problems will be selected}%
+ \edef\@do@excludedlist{#4}%
+ \ifdefempty{\@do@excludedlist}%
+ {}%
+ {\def\@do@excludedlist{(Excluded list: #4.) }}%
+ \ifnum\@probselN=0\relax
+ \PackageWarning{probsoln}{You have requested
+ \number#2\space\space problem(s) but there are no available
+ problems in `#3'. \@do@excludedlist No problems will be selected}%
\else
- \@probselN=#2\relax
+ \shuffle{@prob@tmp@}{\@probselN}%
+ \ifnum\@probselN<#2\relax
+ \ifnum\@probselN=1\relax
+ \PackageWarning{probsoln}{You have requested
+ \number#2\space\space problem(s) but there is only
+ 1 problem available in `#3'. \@do@excludedlist
+ Only 1 problem will be selected}%
+ \else
+ \PackageWarning{probsoln}{You have requested
+ \number#2\space\space problem(s) but there are only
+ \number\@probselN\space problems available in `#3'.
+ \@do@excludedlist
+ Only \number\@probselN\space problems will be selected}%
+ \fi
+ \else
+ \@probselN=#2\relax
+ \fi
\fi
\@probN=0\relax
\def\prob@selectedlabels{}%
@@ -652,31 +856,34 @@
}%
}
\newcount\@ps@forrand
+\newcount\@ps@forrand@level
\newcommand{\doforrandN}[4]{%
+ \global\advance\@ps@forrand@level by 1\relax
{%
\@ps@forrand=0\relax
\@for#2:=#3\do{%
\advance\@ps@forrand by 1\relax
\expandafter
- \edef\csname @doforrandN@\romannumeral\@ps@forrand\endcsname{#2}%
+ \edef\csname @doforrandN@\number\@ps@forrand@level @\romannumeral\@ps@forrand\endcsname{#2}%
}%
\ifnum\@ps@forrand<#1\relax
- \PackageError{probsoln}{Can't randomly select \number#1 item(s)}{You
- have requested \number#1 item(s), but there
- are only \number\@ps@forrand item(s) in the list}%
+ \PackageError{probsoln}{Can't randomly select \number#1\space item(s)}{You
+ have requested \number#1\space item(s), but there
+ are only \number\@ps@forrand\space item(s) in the list: #3}%
\else
- \shuffle{@doforrandN@}{\@ps@forrand}%
+ \shuffle{@doforrandN@\number\@ps@forrand@level @}{\@ps@forrand}%
\ifnum#1>0\relax
\@ps@forrand=0\relax
\loop
\advance\@ps@forrand by 1\relax
- \edef#2{\csname @doforrandN@\romannumeral\@ps@forrand\endcsname}%
+ \edef#2{\csname @doforrandN@\number\@ps@forrand@level @\romannumeral\@ps@forrand\endcsname}%
#4%
\ifnum\@ps@forrand<#1\relax
\repeat
\fi
\fi
}%
+ \global\advance\@ps@forrand@level by -1\relax
}
\newcommand*{\newproblem}{\@ifstar\@snewproblem\@newproblem}
\newcommand{\@snewproblem}[1][0]{%
@@ -718,7 +925,7 @@
\ifnum\@enumdepth>\thr@@
\@toodeep
\else
- \advance\@enumdepth\@ne\relax
+ \advance\@enumdepth by 1\relax
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
\let\@item\@textitem
\def\@itemlabel{%
@@ -730,7 +937,6 @@
\ignorespaces
}%
{%
- \global\advance\@enumdepth\m@ne\relax
}
\def\@textitem[#1]{#1\space\ignorespaces}
\newcommand*{\correctitemformat}[1]{\fbox{#1}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/probsoln.tlpobj new/tlpkg/tlpobj/probsoln.tlpobj
--- old/tlpkg/tlpobj/probsoln.tlpobj 2012-01-15 04:26:54.000000000 +0100
+++ new/tlpkg/tlpobj/probsoln.tlpobj 2013-03-14 04:37:48.000000000 +0100
@@ -1,6 +1,6 @@
name probsoln
category Package
-revision 25106
+revision 29371
shortdesc Generate problem sheets and their solution sheets.
relocated 1
longdesc The package is designed for lecturers who have to generate new
@@ -15,9 +15,9 @@
longdesc from the same source code; problems may be reused within a
longdesc document, so that solutions may appear in a different section
longdesc of the same document as the problems they cover.
-runfiles size=6
+runfiles size=8
RELOC/tex/latex/probsoln/probsoln.sty
catalogue-ctan /macros/latex/contrib/probsoln
-catalogue-date 2012-01-14 16:28:43 +0100
+catalogue-date 2012-11-17 10:29:25 +0100
catalogue-license lppl
catalogue-version 3.02
++++++ progressbar.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/progressbar/README new/doc/latex/progressbar/README
--- old/doc/latex/progressbar/README 2012-02-20 00:32:34.000000000 +0100
+++ new/doc/latex/progressbar/README 2013-01-07 00:58:34.000000000 +0100
@@ -9,6 +9,7 @@
Changelog
=========
+2013/01/06 v.1.0b~3: replaced \progressbar@LoadFile@IfExist with \RequirePackage
2012/02/18 v.1.0b~2: added version control for kvoptions
2010/10/02 v1.0b: first release - all basic functionality
@@ -26,4 +27,4 @@
The Current Maintainer of this work is Marcel Jira.
-This work consists of the files progressbar.sty and progressbar.tex.
\ No newline at end of file
+This work consists of the files progressbar.sty and progressbar.tex.
Files old/doc/latex/progressbar/progressbar.pdf and new/doc/latex/progressbar/progressbar.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/progressbar/progressbar.tex new/doc/latex/progressbar/progressbar.tex
--- old/doc/latex/progressbar/progressbar.tex 2012-02-20 00:32:34.000000000 +0100
+++ new/doc/latex/progressbar/progressbar.tex 2013-01-07 00:58:34.000000000 +0100
@@ -1,5 +1,5 @@
%% progressbar.tex
-%% Copyright 2012 Marcel Jira
+%% Copyright 2010-2013 Marcel Jira
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -30,7 +30,7 @@
\title{\texttt{progressbar}}
\author{by Marcel Jira}
-\date{2012/02/18}
+\date{2013/01/06}
\begin{document}
@@ -224,13 +224,16 @@
\section{Changelog}
\begin{tabbing}
-\texttt{2012/02/18 v.1.0b\~{}2} \= added version control for kvoptions\\
+\texttt{2013/01/06 v.1.0b\~{}3} \= replaced \lstinline+\progressbar@LoadFile@IfExist+ with\\ \> \lstinline+\RequirePackage+\\
+\texttt{2012/02/18 v.1.0b\~{}2} \> added version control for kvoptions\\
\texttt{2010/10/02 v1.0b} \> first release - all basic functionality
\end{tabbing}
\section{Acknoledgment}
A big shoutout to the pros from \url{
http://www.mrunix.de/} (it's german). They helped me a lot and made \texttt{progressbar} possible.
+I also want to thank Robin Schneider (\url{
https://ypid.wordpress.com/}) and Heiko Oberdiek who called my attention to the problems with\\ \lstinline+\progressbar@LoadFile@IfExist+.
+
\section{Contact}
If you have any question concerning \texttt{progressbar} or if you miss a feature, please write me a mail: \href{mailto:mails4me@gmx.at}{\texttt{mails4me@gmx.at}}.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/progressbar.doc.tlpobj new/tlpkg/tlpobj/progressbar.doc.tlpobj
--- old/tlpkg/tlpobj/progressbar.doc.tlpobj 2012-02-20 04:43:22.000000000 +0100
+++ new/tlpkg/tlpobj/progressbar.doc.tlpobj 2013-01-07 04:35:01.000000000 +0100
@@ -1,9 +1,9 @@
name progressbar.doc
category Package
-revision 25431
+revision 28753
shortdesc doc files of progressbar
relocated 1
-docfiles size=95
+docfiles size=97
RELOC/doc/latex/progressbar/README
RELOC/doc/latex/progressbar/progressbar.pdf
RELOC/doc/latex/progressbar/progressbar.tex
++++++ progressbar.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/progressbar/progressbar.sty new/tex/latex/progressbar/progressbar.sty
--- old/tex/latex/progressbar/progressbar.sty 2012-02-20 00:32:34.000000000 +0100
+++ new/tex/latex/progressbar/progressbar.sty 2013-01-07 00:58:34.000000000 +0100
@@ -3,7 +3,7 @@
% kindly supported by mrunix-forum:
http://www.mrunix.de/
%
%% progressbar.sty
-%% Copyright 2012 Marcel Jira
+%% Copyright 2010-2013 Marcel Jira
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -21,28 +21,12 @@
%
\NeedsTeXFormat{LaTeX2e}%
%
-\ProvidesPackage{progressbar}[2012/02/18 v1.0b~2: progressbar]%
+\ProvidesPackage{progressbar}[2013/01/06 v1.0b~3: progressbar]%
%
-\newcommand{\progressbarpackagename}{progressbar}%
-\newcommand{\progressbar@PackageWarning}[1]{\PackageWarning{\progressbarpackagename}{#1}}%
-\newcommand{\progressbar@LoadFile@IfExist}[2][]{%
- \IfFileExists{#2.sty}{%
- \@ifpackagelater{#2}{#1}{%
- \RequirePackage{#2}%
- }{%
- \progressbar@PackageWarning{The package #2 is older than #1\MessageBreak%
- but a version from or newer #1 is required by \progressbarname}%
- }%
- }{%
- \progressbar@PackageWarning{The package #2 does not exist\MessageBreak%
- but it is required by \progressbarname}%
- }%
-}%
-%
-\progressbar@LoadFile@IfExist{calc}%
-\progressbar@LoadFile@IfExist{tikz}%
-\progressbar@LoadFile@IfExist[2011/08/03]{kvoptions}%
-\progressbar@LoadFile@IfExist{kvsetkeys}%
+\RequirePackage{calc}%
+\RequirePackage{tikz}%
+\RequirePackage{kvoptions}[2011/08/03]%
+\RequirePackage{kvsetkeys}%
%
% Define lengths for later use
\newlength{\BarWidth}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/progressbar.tlpobj new/tlpkg/tlpobj/progressbar.tlpobj
--- old/tlpkg/tlpobj/progressbar.tlpobj 2012-02-20 04:43:22.000000000 +0100
+++ new/tlpkg/tlpobj/progressbar.tlpobj 2013-01-07 04:35:01.000000000 +0100
@@ -1,6 +1,6 @@
name progressbar
category Package
-revision 25431
+revision 28753
shortdesc Visualize shares of total amounts in the form of a (progress-)bar.
relocated 1
longdesc This package allows you to easily visualize shares of total
@@ -8,10 +8,10 @@
longdesc number between 0 and 1 to a progressbar using the command
longdesc \progressbar{<number>}. Also a lot of customizations are
longdesc possible, allowing you to create an unique progressbar on your
-longdesc own.
+longdesc own. The package uses TikZ to produce its graphics.
runfiles size=2
RELOC/tex/latex/progressbar/progressbar.sty
catalogue-ctan /macros/latex/contrib/progressbar
-catalogue-date 2012-02-19 15:32:47 +0100
+catalogue-date 2013-01-06 18:12:17 +0100
catalogue-license lppl
-catalogue-version v1.0b~2
+catalogue-version v1.0b~3
++++++ ps2pkm.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/mag.1 new/texmf/doc/man/man1/mag.1
--- old/texmf/doc/man/man1/mag.1 2006-01-03 01:00:18.000000000 +0100
+++ new/texmf/doc/man/man1/mag.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,68 +0,0 @@
-.\" e
-.TH MAG 1 UMFT
-.de EX
-.sp
-.in +5
-.nf
-.ft CW
-..
-.de EE
-.in -5
-.ft R
-.sp
-.fi
-..
-.SH NAME
-mag \- computes fontsizes and magsteps
-.SH SYNOPSIS
-.B
-mag
-[-\fBR\fIdpi\fP\fP] magstep . . .
-
-.B
-mag
-[-\fBr\fP] [-\fBR\fP\fIdpi\fP] fontsize . . .
-
-.SH DESCRIPTION
-.EQ
-delim $$
-.EN
-This tool calculates fontsizes given magsteps. TeXfonts are provided as
-true sized fonts or as magnifications. The fontsize of a true sized
-font equals the resolution of the printer (ex. 300). The fontsize
-of a font magnified $n$ \fImagsteps\fP equals:
-.EQ
-1.2 sup{n} times 300
-delim off
-.EN
-rounded to its nearest integer value. Fontnames for TeX fonts normally
-consists of the name (\fIcmr\fP), pointsize (\fI10\fP), type (\fIpk\fP)
-and fontsize (\fI360\fP), for example: \fIcmr10.360pk\fP.
-
-.SH EXAMPLES
-The result of \fImag -R240 -2 0 0.5 1\fP will be:
-.EX
-167 240 263 288
-.EE
-
-The inverse function is computed with the \fI-r\fP option. The result of
-\fImag -r -R240 167 240 263 288\fP
-will be the fontsteps:
-.EX
--2 0 0.5 1
-.EE
-
-The UNIX shells allow command substitution. One can write:
-.EX
-mag -r -R240 `mag -R240 -2 0 0.5 1`
-.EE
-
-.SH DATE
-18 December, 1989
-
-.SH AUTHOR
-.nf
-Piet Tutelaers
-University of Technology Eindhoven
-
-
Files old/texmf/doc/man/man1/mag.man1.pdf and new/texmf/doc/man/man1/mag.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/pfb2pfa.1 new/texmf/doc/man/man1/pfb2pfa.1
--- old/texmf/doc/man/man1/pfb2pfa.1 2006-01-03 01:00:18.000000000 +0100
+++ new/texmf/doc/man/man1/pfb2pfa.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-.TH PFB2PFA 1 TeX
-.SH NAME
-pfb2pfa \- convert a type1 pfb file (binary MSDOS) into a pfa (ASCII)
-.SH SYNOPSIS
-pfb2pfa [-v] pfbfile [pfafile]
-.SH DESCRIPTION
-Program converts a binary MSDOS representation for a type1 PostScript
-font into a readable ASCII version. The MSDOS newline (\\r) is converted
-into the UNIX newline (\\n). The output is written in a file whose name
-is the name that is provided on the command line or the basename of the
-input file plus extension ".pfa".
-.PP
-With the -v option you get some information about what the
-program is doing.
-.SH AUTHOR
-.nf
-Piet Tutelaers
-
-
Files old/texmf/doc/man/man1/pfb2pfa.man1.pdf and new/texmf/doc/man/man1/pfb2pfa.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/pk2bm.1 new/texmf/doc/man/man1/pk2bm.1
--- old/texmf/doc/man/man1/pk2bm.1 2006-01-03 01:00:18.000000000 +0100
+++ new/texmf/doc/man/man1/pk2bm.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-.TH PK2BM 1 TeX
-.SH NAME
-pk2bm \- create a bitmap from a TeX pkfont
-.SH SYNOPSIS:
-pk2bm [-bh] [-W\fIwidth\fP] [-H\fIheight\fP] -c\fIchar\fP pkfont
-
-pk2bm [-bh] [-W\fIwidth\fP] [-H\fIheight\fP] -o\fIoctchar\fP pkfont
-.SH DESCRIPTION
-This program generates a bitmap (ASCII file) which can be used
-to create X11 applications. The bitmap file consists of all pixels
-of the specified character (via the -c or -o option) from
-the given pkfont. The format is described in bitmap(X11).
-.PP
-The pkfont is a packed fontfile generated by gftopk(TeX) from a
-gffont. A gffont is the output of METAFONT a program to design fonts
-in a device independant way.
-.PP
-With the -b flag a bitmap is generated in which all black pixels are
-drawn as a `*' and all white bits as a `.'. With the -h flag a
-hexadecimal bitmap dump is generated.
-.PP
-The -W and/or -H options can be used to create a bitmap of
-respectivally `width' and `height' pixels. The pk-bitmap will in
-this case be centered according to these new dimensions.
-.PP
-The output is written to the standard output.
-.SH SEE ALSO
-.nf
-`METAFONT', Donald Knuth.
-`The PKtype processor', belonging to the METAFONTware.
-bitmap(X11),
-gftopk(TeX),
-pktype(TeX),
-ps2pk(1)
-
-.SH AUTHOR
-.nf
-Piet Tutelaers
-
Files old/texmf/doc/man/man1/pk2bm.man1.pdf and new/texmf/doc/man/man1/pk2bm.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/ps2pk.1 new/texmf/doc/man/man1/ps2pk.1
--- old/texmf/doc/man/man1/ps2pk.1 2006-01-03 01:00:18.000000000 +0100
+++ new/texmf/doc/man/man1/ps2pk.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,156 +0,0 @@
-.TH PS2PK 1 TeX
-.SH NAME
-ps2pk \- creates a TeX pkfont from a type1 PostScript font
-.SH SYNOPSIS
-ps2pk
-[ -v ]
-[ -e\fIenc\fP ]
-[ -X\fIxres\fP ]
-[ -E\fIexpansion\fP ]
-[ -S\fIslant\fP ]
-[ -P\fIpointsize\fP ]
-[ -R\fIbaseres\fP ]
-[ -r\fIaspectratio\fP ]
-[ -Y\fIyres\fP ]
-[ -a\fIAFMfile\fP ]
-[ -m\fImodename\fP ]
-type1 [pkfont]
-.SH DESCRIPTION
-This program renders a given type1 PostScript font at a given pointsize
-(default 10.0 points) and resolution (default 300dpi) into a TeX pkfont.
-.PP
-To generate the pkfont ps2pk needs a valid type1 font file (for
-example Utopia-Regular, Utopia-Regula.pfb or Utopia-Regula.pfa) and
-its corresponding AFM-file (Utopia-Regular.afm) with the font metrics.
-The program accepts both the binary type1 format (Utopia-Regula.pfb)
-and its ASCII equivalent (Utopia-Regular or Utopia-Regula.pfa). To
-locate the files, ps2pk uses the kpathsea library (see the info page
-on kpathsea). Additionally, pfb and pfa files are searched for in the
-directory specified in the environment variable T1INPUTS, and afm
-files are searched in AFMFONTS, if they are set (the -v flag will
-report which filenames are looked for).
-.PP
-The program will make a pkfont in which the character codes are derived
-from their AFM (Adobe Font Metrics) defined values. This can be
-overruled by specifying an explicit encoding file via the -e option.
-The encoding file \fIenc\fP
-should contain a valid PostScript encoding containing PostScript names
-like /hyphen. Here is an incomplete example (see afm2tfm for complete
-syntax):
-
-.RS
-.nf
-% This is the EC encoding.
-/ECEncoding [ % now 256 chars follow
-% 0x00
- /grave /acute /circumflex /tilde /dieresis /hungarumlaut
- /ring /caron /breve /macron /dotaccent /cedilla
- /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-
- (Rest of lines omitted.)
-
-% 0xF0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde
- /odieresis /oe /oslash /ugrave /uacute /ucircumflex
- /udieresis /yacute /thorn /germandbls ] def
-.fi
-.RE
-.PP
-Options and arguments:
-.IP -a\fIAFMfile\fP 12
-Overrules the name that is used to locate the AFM file.
-
-.IP -e\fIenc\fP 12
-Name of a file containing an encoding scheme
-(default \- the encoding named in the AFM-file is used).
-The actual PostScript name of the encoding scheme is written
-as a "special" at the end of the pkfont.
-
-.IP -E\fIextension\fP 12
-The extension factor (real value, default 1.0).
-
-.IP -m\fImodename\fP 12
-A modename such as would be used by METAFONT (default "Unknown mode").
-
-.IP -P\fIpointsize\fP 12
-The desired pointsize (real value, default 10.0 points).
-
-.IP -R\fIbaseres\fP 12
-The desired base resolution (integer value, default 300 dpi).
-If this differs from the value of \fIxres\fP, the appropriate
-magnification will be shown in the "specials" at the end
-of the pkfont. If possible, this will be expressed as a
-magstep, otherwise as a real number. For example, a pkfont with an \fIxres\fP
-of 329, using the default base resolution of 300,
-will include the "special" text "mag=magstep(0.5)" at the
-end of the font.
-
-.IP -r\fIaspectratio\fP 12
-The desired aspect ratio (expression, integerY/integerX, default 300/300).
-This will be shown in the "specials" at the end
-of the pkfont. Setting the aspect ratio creates a value for
-\fIyres\fP but an explicit \fIyres\fP value will take precedence.
-Argument must be in "" if spaces are left around `/'.
-
-.IP -S\fIslant\fP 12
-The slant (real value, default 0.0).
-
-.IP -X\fIxres\fP 12
-The resolution in the X direction (integer value, default 300 dpi).
-
-.IP -Y\fIyres\fP 12
-The resolution in the Y direction (integer value, default the value
-of \fIxres\fP). If \fIyres\fP differs from \fIxres\fP, a "special"
-text giving the aspect ratio will be written at the end of the
-pkfont.
-
-.IP -v 12
-Verbose flag. (Tells what the program is doing.)
-
-.IP type1 12
-The name of the PostScript type1 font. The name of the AFM-file will be
-constructed from this name by removing the extension (if suplied) and
-adding ".afm". The PostScript "FontName" is extracted from the
-AFM-file and written into a "special" at the end of the pkfont.
-
-.IP [pkfont] 12
-The name of the resulting pkfont can be overruled with this name. The
-default name of pkfont is derived from the basename of the type1
-font, the pointsize and \fIxres\fP. For example
-`ps2pk -P17.28 Utopia-Regular' will result in `Utopia-Regular17.300pk'.
-An explicit value for the name of the pkfont is necessary when
-the type1 font name already shows the point size, otherwise
-the \fIpointsize\fP value is catenated on to the pkfont basename
-which is usually not what is wanted.
-
-.PP
-The following PK "specials" provide an internal check on the
-characteristics of the pkfont, in accordance with the recommendations
-of the TeX Working Group on the TeX Directory Standard (TWG-TDS):
-.br
-"fontid=\fIFontName\fP", "codingscheme=\fIEncoding\fP", "fontfacebyte", "mag",
-"mode=(ps2pk)\fImodename\fP", "pixels-per-inch", and "aspect-ratio" if it
-is other than unity.
-
-.SH ACKNOWLEDGEMENT
-This program uses the type1 hinting and rendering software IBM
-has donated to the X-consortium.
-
-.SH SEE ALSO
-.nf
-`METAFONT: The Program', Donald Knuth.
-`The GFtoPK processor', belonging to the METAFONTware.
-`Adobe Font Metric Files', Version 3.0, PostScript Developer
-Support Group.
-afm2tfm(1)
-pk2bm(1)
-kpsewhich(1)
-info kpathsea
-
-.SH VERSION
-1.4 (January 1994)
-
-.SH AUTHOR
-Piet Tutelaers .
-Modified for ps2pkm by Pierre A. Mackay ,
-This manpage was adapted to teTeX by Frank Kuester .
Files old/texmf/doc/man/man1/ps2pk.man1.pdf and new/texmf/doc/man/man1/ps2pk.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mag.1 new/texmf-dist/doc/man/man1/mag.1
--- old/texmf-dist/doc/man/man1/mag.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/mag.1 2006-01-03 01:00:18.000000000 +0100
@@ -0,0 +1,68 @@
+.\" e
+.TH MAG 1 UMFT
+.de EX
+.sp
+.in +5
+.nf
+.ft CW
+..
+.de EE
+.in -5
+.ft R
+.sp
+.fi
+..
+.SH NAME
+mag \- computes fontsizes and magsteps
+.SH SYNOPSIS
+.B
+mag
+[-\fBR\fIdpi\fP\fP] magstep . . .
+
+.B
+mag
+[-\fBr\fP] [-\fBR\fP\fIdpi\fP] fontsize . . .
+
+.SH DESCRIPTION
+.EQ
+delim $$
+.EN
+This tool calculates fontsizes given magsteps. TeXfonts are provided as
+true sized fonts or as magnifications. The fontsize of a true sized
+font equals the resolution of the printer (ex. 300). The fontsize
+of a font magnified $n$ \fImagsteps\fP equals:
+.EQ
+1.2 sup{n} times 300
+delim off
+.EN
+rounded to its nearest integer value. Fontnames for TeX fonts normally
+consists of the name (\fIcmr\fP), pointsize (\fI10\fP), type (\fIpk\fP)
+and fontsize (\fI360\fP), for example: \fIcmr10.360pk\fP.
+
+.SH EXAMPLES
+The result of \fImag -R240 -2 0 0.5 1\fP will be:
+.EX
+167 240 263 288
+.EE
+
+The inverse function is computed with the \fI-r\fP option. The result of
+\fImag -r -R240 167 240 263 288\fP
+will be the fontsteps:
+.EX
+-2 0 0.5 1
+.EE
+
+The UNIX shells allow command substitution. One can write:
+.EX
+mag -r -R240 `mag -R240 -2 0 0.5 1`
+.EE
+
+.SH DATE
+18 December, 1989
+
+.SH AUTHOR
+.nf
+Piet Tutelaers
+University of Technology Eindhoven
+
+
Files old/texmf-dist/doc/man/man1/mag.man1.pdf and new/texmf-dist/doc/man/man1/mag.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pfb2pfa.1 new/texmf-dist/doc/man/man1/pfb2pfa.1
--- old/texmf-dist/doc/man/man1/pfb2pfa.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/pfb2pfa.1 2006-01-03 01:00:18.000000000 +0100
@@ -0,0 +1,19 @@
+.TH PFB2PFA 1 TeX
+.SH NAME
+pfb2pfa \- convert a type1 pfb file (binary MSDOS) into a pfa (ASCII)
+.SH SYNOPSIS
+pfb2pfa [-v] pfbfile [pfafile]
+.SH DESCRIPTION
+Program converts a binary MSDOS representation for a type1 PostScript
+font into a readable ASCII version. The MSDOS newline (\\r) is converted
+into the UNIX newline (\\n). The output is written in a file whose name
+is the name that is provided on the command line or the basename of the
+input file plus extension ".pfa".
+.PP
+With the -v option you get some information about what the
+program is doing.
+.SH AUTHOR
+.nf
+Piet Tutelaers
+
+
Files old/texmf-dist/doc/man/man1/pfb2pfa.man1.pdf and new/texmf-dist/doc/man/man1/pfb2pfa.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pk2bm.1 new/texmf-dist/doc/man/man1/pk2bm.1
--- old/texmf-dist/doc/man/man1/pk2bm.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/pk2bm.1 2006-01-03 01:00:18.000000000 +0100
@@ -0,0 +1,39 @@
+.TH PK2BM 1 TeX
+.SH NAME
+pk2bm \- create a bitmap from a TeX pkfont
+.SH SYNOPSIS:
+pk2bm [-bh] [-W\fIwidth\fP] [-H\fIheight\fP] -c\fIchar\fP pkfont
+
+pk2bm [-bh] [-W\fIwidth\fP] [-H\fIheight\fP] -o\fIoctchar\fP pkfont
+.SH DESCRIPTION
+This program generates a bitmap (ASCII file) which can be used
+to create X11 applications. The bitmap file consists of all pixels
+of the specified character (via the -c or -o option) from
+the given pkfont. The format is described in bitmap(X11).
+.PP
+The pkfont is a packed fontfile generated by gftopk(TeX) from a
+gffont. A gffont is the output of METAFONT a program to design fonts
+in a device independant way.
+.PP
+With the -b flag a bitmap is generated in which all black pixels are
+drawn as a `*' and all white bits as a `.'. With the -h flag a
+hexadecimal bitmap dump is generated.
+.PP
+The -W and/or -H options can be used to create a bitmap of
+respectivally `width' and `height' pixels. The pk-bitmap will in
+this case be centered according to these new dimensions.
+.PP
+The output is written to the standard output.
+.SH SEE ALSO
+.nf
+`METAFONT', Donald Knuth.
+`The PKtype processor', belonging to the METAFONTware.
+bitmap(X11),
+gftopk(TeX),
+pktype(TeX),
+ps2pk(1)
+
+.SH AUTHOR
+.nf
+Piet Tutelaers
+
Files old/texmf-dist/doc/man/man1/pk2bm.man1.pdf and new/texmf-dist/doc/man/man1/pk2bm.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ps2pk.1 new/texmf-dist/doc/man/man1/ps2pk.1
--- old/texmf-dist/doc/man/man1/ps2pk.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ps2pk.1 2006-01-03 01:00:18.000000000 +0100
@@ -0,0 +1,156 @@
+.TH PS2PK 1 TeX
+.SH NAME
+ps2pk \- creates a TeX pkfont from a type1 PostScript font
+.SH SYNOPSIS
+ps2pk
+[ -v ]
+[ -e\fIenc\fP ]
+[ -X\fIxres\fP ]
+[ -E\fIexpansion\fP ]
+[ -S\fIslant\fP ]
+[ -P\fIpointsize\fP ]
+[ -R\fIbaseres\fP ]
+[ -r\fIaspectratio\fP ]
+[ -Y\fIyres\fP ]
+[ -a\fIAFMfile\fP ]
+[ -m\fImodename\fP ]
+type1 [pkfont]
+.SH DESCRIPTION
+This program renders a given type1 PostScript font at a given pointsize
+(default 10.0 points) and resolution (default 300dpi) into a TeX pkfont.
+.PP
+To generate the pkfont ps2pk needs a valid type1 font file (for
+example Utopia-Regular, Utopia-Regula.pfb or Utopia-Regula.pfa) and
+its corresponding AFM-file (Utopia-Regular.afm) with the font metrics.
+The program accepts both the binary type1 format (Utopia-Regula.pfb)
+and its ASCII equivalent (Utopia-Regular or Utopia-Regula.pfa). To
+locate the files, ps2pk uses the kpathsea library (see the info page
+on kpathsea). Additionally, pfb and pfa files are searched for in the
+directory specified in the environment variable T1INPUTS, and afm
+files are searched in AFMFONTS, if they are set (the -v flag will
+report which filenames are looked for).
+.PP
+The program will make a pkfont in which the character codes are derived
+from their AFM (Adobe Font Metrics) defined values. This can be
+overruled by specifying an explicit encoding file via the -e option.
+The encoding file \fIenc\fP
+should contain a valid PostScript encoding containing PostScript names
+like /hyphen. Here is an incomplete example (see afm2tfm for complete
+syntax):
+
+.RS
+.nf
+% This is the EC encoding.
+/ECEncoding [ % now 256 chars follow
+% 0x00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut
+ /ring /caron /breve /macron /dotaccent /cedilla
+ /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+
+ (Rest of lines omitted.)
+
+% 0xF0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde
+ /odieresis /oe /oslash /ugrave /uacute /ucircumflex
+ /udieresis /yacute /thorn /germandbls ] def
+.fi
+.RE
+.PP
+Options and arguments:
+.IP -a\fIAFMfile\fP 12
+Overrules the name that is used to locate the AFM file.
+
+.IP -e\fIenc\fP 12
+Name of a file containing an encoding scheme
+(default \- the encoding named in the AFM-file is used).
+The actual PostScript name of the encoding scheme is written
+as a "special" at the end of the pkfont.
+
+.IP -E\fIextension\fP 12
+The extension factor (real value, default 1.0).
+
+.IP -m\fImodename\fP 12
+A modename such as would be used by METAFONT (default "Unknown mode").
+
+.IP -P\fIpointsize\fP 12
+The desired pointsize (real value, default 10.0 points).
+
+.IP -R\fIbaseres\fP 12
+The desired base resolution (integer value, default 300 dpi).
+If this differs from the value of \fIxres\fP, the appropriate
+magnification will be shown in the "specials" at the end
+of the pkfont. If possible, this will be expressed as a
+magstep, otherwise as a real number. For example, a pkfont with an \fIxres\fP
+of 329, using the default base resolution of 300,
+will include the "special" text "mag=magstep(0.5)" at the
+end of the font.
+
+.IP -r\fIaspectratio\fP 12
+The desired aspect ratio (expression, integerY/integerX, default 300/300).
+This will be shown in the "specials" at the end
+of the pkfont. Setting the aspect ratio creates a value for
+\fIyres\fP but an explicit \fIyres\fP value will take precedence.
+Argument must be in "" if spaces are left around `/'.
+
+.IP -S\fIslant\fP 12
+The slant (real value, default 0.0).
+
+.IP -X\fIxres\fP 12
+The resolution in the X direction (integer value, default 300 dpi).
+
+.IP -Y\fIyres\fP 12
+The resolution in the Y direction (integer value, default the value
+of \fIxres\fP). If \fIyres\fP differs from \fIxres\fP, a "special"
+text giving the aspect ratio will be written at the end of the
+pkfont.
+
+.IP -v 12
+Verbose flag. (Tells what the program is doing.)
+
+.IP type1 12
+The name of the PostScript type1 font. The name of the AFM-file will be
+constructed from this name by removing the extension (if suplied) and
+adding ".afm". The PostScript "FontName" is extracted from the
+AFM-file and written into a "special" at the end of the pkfont.
+
+.IP [pkfont] 12
+The name of the resulting pkfont can be overruled with this name. The
+default name of pkfont is derived from the basename of the type1
+font, the pointsize and \fIxres\fP. For example
+`ps2pk -P17.28 Utopia-Regular' will result in `Utopia-Regular17.300pk'.
+An explicit value for the name of the pkfont is necessary when
+the type1 font name already shows the point size, otherwise
+the \fIpointsize\fP value is catenated on to the pkfont basename
+which is usually not what is wanted.
+
+.PP
+The following PK "specials" provide an internal check on the
+characteristics of the pkfont, in accordance with the recommendations
+of the TeX Working Group on the TeX Directory Standard (TWG-TDS):
+.br
+"fontid=\fIFontName\fP", "codingscheme=\fIEncoding\fP", "fontfacebyte", "mag",
+"mode=(ps2pk)\fImodename\fP", "pixels-per-inch", and "aspect-ratio" if it
+is other than unity.
+
+.SH ACKNOWLEDGEMENT
+This program uses the type1 hinting and rendering software IBM
+has donated to the X-consortium.
+
+.SH SEE ALSO
+.nf
+`METAFONT: The Program', Donald Knuth.
+`The GFtoPK processor', belonging to the METAFONTware.
+`Adobe Font Metric Files', Version 3.0, PostScript Developer
+Support Group.
+afm2tfm(1)
+pk2bm(1)
+kpsewhich(1)
+info kpathsea
+
+.SH VERSION
+1.4 (January 1994)
+
+.SH AUTHOR
+Piet Tutelaers .
+Modified for ps2pkm by Pierre A. Mackay ,
+This manpage was adapted to teTeX by Frank Kuester .
Files old/texmf-dist/doc/man/man1/ps2pk.man1.pdf and new/texmf-dist/doc/man/man1/ps2pk.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ps2pkm.tlpobj new/tlpkg/tlpobj/ps2pkm.tlpobj
--- old/tlpkg/tlpobj/ps2pkm.tlpobj 2011-06-23 04:16:06.000000000 +0200
+++ new/tlpkg/tlpobj/ps2pkm.tlpobj 2013-04-09 03:40:40.000000000 +0200
@@ -1,6 +1,6 @@
name ps2pkm
category TLCore
-revision 23089
+revision 29764
catalogue ps2pk
shortdesc Generate a PK font from an Adobe Type 1 font.
longdesc Generates a PK file from an Adobe Type 1 font. PK fonts are (or
@@ -9,15 +9,15 @@
longdesc donated to the X consortium by IBM.
depend ps2pkm.ARCH
runfiles size=13
- texmf/doc/man/man1/mag.1
- texmf/doc/man/man1/mag.man1.pdf
- texmf/doc/man/man1/pfb2pfa.1
- texmf/doc/man/man1/pfb2pfa.man1.pdf
- texmf/doc/man/man1/pk2bm.1
- texmf/doc/man/man1/pk2bm.man1.pdf
- texmf/doc/man/man1/ps2pk.1
- texmf/doc/man/man1/ps2pk.man1.pdf
+ texmf-dist/doc/man/man1/mag.1
+ texmf-dist/doc/man/man1/mag.man1.pdf
+ texmf-dist/doc/man/man1/pfb2pfa.1
+ texmf-dist/doc/man/man1/pfb2pfa.man1.pdf
+ texmf-dist/doc/man/man1/pk2bm.1
+ texmf-dist/doc/man/man1/pk2bm.man1.pdf
+ texmf-dist/doc/man/man1/ps2pk.1
+ texmf-dist/doc/man/man1/ps2pk.man1.pdf
catalogue-ctan /fonts/utilities/ps2pk
-catalogue-date 2011-05-31 11:59:42 +0200
+catalogue-date 2012-07-20 20:39:39 +0200
catalogue-license other-free
catalogue-version 1.6 beta 1
++++++ pst-3dplot.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-3dplot/Changes new/doc/generic/pst-3dplot/Changes
--- old/doc/generic/pst-3dplot/Changes 2011-03-03 01:38:36.000000000 +0100
+++ new/doc/generic/pst-3dplot/Changes 2012-07-29 19:07:14.000000000 +0200
@@ -17,6 +17,9 @@
pst-3dplot.tex --------
+1.97 2012-06-07 - fixed viewpoint for coorType>0
+1.96 2011-12-10 - added \pstThreeDPrism
+1.95 2011-08-10 - fix bug with setting drawstyle for htlatex
1.94 2011-03-01 - fix bug with \pstThreeDSquare and filling/drawCoor
1.93 2010-09-27 - experimental \psplotImpIIID
1.92 2010-04-14 - enable the IIIDshowgrid optional argument
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-3dplot/pst-3dplot-doc.bib new/doc/generic/pst-3dplot/pst-3dplot-doc.bib
--- old/doc/generic/pst-3dplot/pst-3dplot-doc.bib 2008-11-14 20:41:50.000000000 +0100
+++ new/doc/generic/pst-3dplot/pst-3dplot-doc.bib 2012-07-29 19:07:14.000000000 +0200
@@ -100,19 +100,29 @@
}
@Book{PSTricks2,
- author = {Herbert Vo\ss},
+ author = {Herbert Vo\ss{}},
title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {5.},
+ edition = {6.},
publisher = {DANTE -- Lehmanns},
- year = {2008},
+ year = {2010},
address = {Heidelberg/Hamburg}
}
-@Book{LaTeXRef,
- author = {Herbert Vo\ss},
- title = {\LaTeX\ Referenz},
+@Book{PSTricksE,
+ author = {Herbert Vo\ss{}},
+ title = {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX},
edition = {1.},
- publisher = {DANTE -- Lehmanns},
- year = {2007},
- address = {Heidelberg/Hamburg}
+ publisher = {UIT},
+ year = {2011},
+ address = {Cambridge -- UK}
+}
+
+@Book{LTXquick,
+ author = {Herbert Vo\ss{}},
+ title = {{\LaTeX} quick reference},
+ edition = {1.},
+ publisher = {UIT},
+ year = {2012},
+ address = {Cambridge -- UK}
}
+
Files old/doc/generic/pst-3dplot/pst-3dplot-doc.pdf and new/doc/generic/pst-3dplot/pst-3dplot-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-3dplot/pst-3dplot-doc.tex new/doc/generic/pst-3dplot/pst-3dplot-doc.tex
--- old/doc/generic/pst-3dplot/pst-3dplot-doc.tex 2011-03-03 01:38:36.000000000 +0100
+++ new/doc/generic/pst-3dplot/pst-3dplot-doc.tex 2012-07-29 19:07:14.000000000 +0200
@@ -1,6 +1,6 @@
\input{pst-3dplot-doc.dat}
-%% $Id: pst-3dplot-doc.tex 294 2010-02-18 21:15:47Z herbert $
+%% $Id: pst-3dplot-doc.tex 467 2011-03-01 21:04:36Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc}
\listfiles
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-3dplot.doc.tlpobj new/tlpkg/tlpobj/pst-3dplot.doc.tlpobj
--- old/tlpkg/tlpobj/pst-3dplot.doc.tlpobj 2011-03-03 04:13:16.000000000 +0100
+++ new/tlpkg/tlpobj/pst-3dplot.doc.tlpobj 2012-07-30 04:42:18.000000000 +0200
@@ -1,6 +1,6 @@
name pst-3dplot.doc
category Package
-revision 21588
+revision 27233
shortdesc doc files of pst-3dplot
relocated 1
docfiles size=889
++++++ pst-3dplot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pst-3dplot/pst-3dplot.pro new/dvips/pst-3dplot/pst-3dplot.pro
--- old/dvips/pst-3dplot/pst-3dplot.pro 2011-03-03 01:38:36.000000000 +0100
+++ new/dvips/pst-3dplot/pst-3dplot.pro 2012-07-29 19:07:14.000000000 +0200
@@ -1,4 +1,4 @@
-%% $Id: pst-3dplot.pro 298 2010-03-13 08:46:53Z herbert $
+%% $Id: pst-3dplot.pro 467 2011-03-01 21:04:36Z herbert $
%%
%% This is file `pst-3dplot.pro',
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-3dplot/pst-3dplot.tex new/tex/generic/pst-3dplot/pst-3dplot.tex
--- old/tex/generic/pst-3dplot/pst-3dplot.tex 2011-03-03 01:38:36.000000000 +0100
+++ new/tex/generic/pst-3dplot/pst-3dplot.tex 2012-07-29 19:07:14.000000000 +0200
@@ -1,4 +1,4 @@
-%% $Id: pst-3dplot.tex 298 2010-03-13 08:46:53Z herbert $
+%% $Id: pst-3dplot.tex 694 2012-06-07 12:07:50Z herbert $
%%
%% This is file `pst-3dplot.tex',
%%
@@ -27,8 +27,8 @@
\ifx\PSTMultidoLoaded\endinput\else \input multido.tex\fi
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
%
-\def\fileversion{1.94}
-\def\filedate{2011/03/01}
+\def\fileversion{1.97}
+\def\filedate{2012/06/07}
\message{`PST-3dplot' v\fileversion, \filedate\space (HV,DL)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -114,11 +114,11 @@
\def\drawStyle@xyLines{xyLines}% 2
\def\drawStyle@yxLines{yxLines}% 3
\define@key[psset]{pst-3dplot}{drawStyle}[xLines]{% how to draw 3D functions
- \def\pst@tempa{#1}%
- \ifx\pst@tempa\drawStyle@xLines\let\psk@ThreeDplot@drawStyle\z@\else%
- \ifx\pst@tempa\drawStyle@yLines\let\psk@ThreeDplot@drawStyle\@ne\else%
- \ifx\pst@tempa\drawStyle@xyLines\let\psk@ThreeDplot@drawStyle\tw@\else%
- \ifx\pst@tempa\drawStyle@yxLines\let\psk@ThreeDplot@drawStyle\thr@@\else%
+ \def\pst@tempA{#1}%
+ \ifx\pst@tempA\drawStyle@xLines\let\psk@ThreeDplot@drawStyle\z@\else%
+ \ifx\pst@tempA\drawStyle@yLines\let\psk@ThreeDplot@drawStyle\@ne\else%
+ \ifx\pst@tempA\drawStyle@xyLines\let\psk@ThreeDplot@drawStyle\tw@\else%
+ \ifx\pst@tempA\drawStyle@yxLines\let\psk@ThreeDplot@drawStyle\thr@@\else%
\@pstrickserr{Bad draw style: `\pst@tempa'}\@ehpa%
\fi\fi\fi\fi%
% \typeout{drawStyle: \the\psk@ThreeDplot@drawStyle}
@@ -943,6 +943,58 @@
\endgroup%
\ignorespaces%
}
+
+\define@key[psset]{pst-3dplot}{height}[5]{\def\psk@height{#1 }}
+\define@key[psset]{pst-3dplot}{move}[0 0]{\def\psk@move{#1 }}
+\psset{height=5,move=0 0}
+\def\pstThreeDPrism{\NormalIIIDCoor\def\pst@par{}\pst@object{prismIIID}}
+\def\prismIIID@i{%
+ \pst@killglue%
+ \pst@getarrows{%
+ \begin@OpenObj%
+ \pst@getcoors[\prismIIID@ii}}
+\def\prismIIID@ii{%
+ \addto@pscode{%
+ \pst@3ddict
+ \IIIDplot@variables
+ /dxUnit \psk@ThreeDplot@xThreeDunit\space def
+ /dyUnit \psk@ThreeDplot@yThreeDunit\space def
+ /dzUnit \psk@ThreeDplot@zThreeDunit\space def
+ \ifPst@SphericalCoor /SphericalCoor true def
+ \else /SphericalCoor false def
+ \fi %
+ /xUnit { \pst@number\psxunit\space mul } def
+ /yUnit { \pst@number\psyunit\space mul } def
+ counttomark array astore /3dValues ED
+ 3dValues aload pop
+ convertStackTo2D
+ end
+ \pst@cp\space \psline@iii\space \tx@Line
+ \pst@3ddict
+ \psk@move /y0 ED /x0 ED
+ [ 3dValues aload length dup /n ED 3 div cvi
+ { \psk@height add 3 1 roll y0 add 3 1 roll x0 add 3 1 roll
+ n -3 roll } repeat
+ n array astore /3dValuesMove ED
+ 3dValuesMove aload pop
+ convertStackTo2D
+ end
+ \pst@cp\space \psline@iii\space \tx@Line
+ \pst@3ddict
+ 0 3 n {
+ /Index ED
+ 3dValues Index 3 getinterval aload pop
+ SphericalCoor { ConvertToCartesian } { saveCoor } ifelse
+ ConvertTo2D x2D xUnit y2D yUnit moveto
+ 3dValuesMove Index 3 getinterval aload pop
+ SphericalCoor { ConvertToCartesian } { saveCoor } ifelse
+ ConvertTo2D x2D xUnit y2D yUnit lineto
+ } for
+ end
+ }%
+ \end@OpenObj%
+ \ignorespaces%
+ \SpecialCoor}
%
% set a 3d ellipse/circle
%
@@ -1234,11 +1286,13 @@
\psk@ThreeDplot@Alpha\space cos add \psk@ThreeDplot@Beta\space cos mul 3 1 roll
\psk@ThreeDplot@Alpha\space sin add \psk@ThreeDplot@Beta\space cos mul 3 1 roll
\or
- 3 1 roll
+ \psk@ThreeDplot@Beta\space sin add 3 1 roll
\psk@ThreeDplot@Alpha\space cos add 3 1 roll
\psk@ThreeDplot@Alpha\space sin add 3 1 roll
\else
- 3 1 roll 45 cos add 3 1 roll 45 sin add 3 1 roll
+ \psk@ThreeDplot@Beta\space sin add 3 1 roll
+ 45 cos add 3 1 roll
+ 45 sin add 3 1 roll
\fi
} def
0 viewpoint 0 \tx@SetMatrixThreeD
@@ -1266,7 +1320,8 @@
\IIIDplot@variables
#1 #2 #3 \ifPst@CylindricalCoor \tx@ConvCylToCartesian \fi
saveCoor
- ConvertTo2DWithoutRotating
+ ConvertTo2D
+% ConvertTo2DWithoutRotating
x2D \pst@number\psxunit mul y2D \pst@number\psyunit mul
translate % the lower center
#4 \pst@number\psunit mul dup 0 360 false
@@ -1276,13 +1331,14 @@
}% end of pscode
\end@ClosedObj
\let\pst@par\pst@parOrig
- \begin@SpecialObj
+ \begin@SpecialObj % bottom
\addto@pscode{%
tx@3DPlotDict begin
\IIIDplot@variables
#1 #2 #3 \ifPst@CylindricalCoor \tx@ConvCylToCartesian \fi
saveCoor
- ConvertTo2DWithoutRotating
+ ConvertTo2D
+% ConvertTo2DWithoutRotating
x2D \pst@number\psxunit mul y2D \pst@number\psyunit mul
translate
#4 \pst@number\psunit mul % radius
@@ -1295,13 +1351,14 @@
}% end of pscode
\end@SpecialObj
\let\pst@par\pst@parOrig
- \begin@ClosedObj
+ \begin@ClosedObj % top
\addto@pscode{%
tx@3DPlotDict begin
\IIIDplot@variables
#1 #2 #3 #5 add \ifPst@CylindricalCoor \tx@ConvCylToCartesian \fi
- saveCoor
- ConvertTo2DWithoutRotating
+ saveCoor
+ ConvertTo2D
+% ConvertTo2DWithoutRotating
x2D \pst@number\psxunit mul y2D \pst@number\psyunit mul
translate
#4 \pst@number\psunit mul dup 0 360 false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-3dplot.tlpobj new/tlpkg/tlpobj/pst-3dplot.tlpobj
--- old/tlpkg/tlpobj/pst-3dplot.tlpobj 2011-03-03 04:13:18.000000000 +0100
+++ new/tlpkg/tlpobj/pst-3dplot.tlpobj 2012-07-30 04:42:20.000000000 +0200
@@ -1,7 +1,7 @@
name pst-3dplot
category Package
-revision 21588
-shortdesc Draw 3d curves and graphs using PSTricks.
+revision 27233
+shortdesc Draw 3D objects in parallel projection, using PSTricks.
relocated 1
longdesc A package using PSTricks to draw a large variety of graphs and
longdesc plots, including 3D maths functions. Data can be read from
@@ -12,6 +12,6 @@
RELOC/tex/generic/pst-3dplot/pst-3dplot.tex
RELOC/tex/latex/pst-3dplot/pst-3dplot.sty
catalogue-ctan /graphics/pstricks/contrib/pst-3dplot
-catalogue-date 2011-03-01 23:10:08 +0100
+catalogue-date 2012-06-07 14:36:18 +0200
catalogue-license lppl
-catalogue-version 1.94
+catalogue-version 1.97
++++++ pst-barcode.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-barcode/Changes new/doc/generic/pst-barcode/Changes
--- old/doc/generic/pst-barcode/Changes 2011-03-15 00:44:19.000000000 +0100
+++ new/doc/generic/pst-barcode/Changes 2012-11-17 00:22:47.000000000 +0100
@@ -1,4 +1,5 @@
----- pst-barcode.tex
+0.09 2012-06-25 - using another code for loading the ps code
0.08 2011-03-10 - take care of the function interface of the pro file
0.07 2009-08-12 - take care of the function interface of the pro file
0.04 2006-07-23 - adding support for the ISBN-13 code
@@ -14,7 +15,34 @@
----- pst-barcode.pro
-2011-03-12 - The error correction code for Maxicode symbols was improved.
+2012-11-15 - renlinear was modified to avoid a clash with a
+ predefined name in Distiller.
+2012-06-26 - The QR Code encoder was modified so that Micro QR Code
+ symbols do not require the use of raw mode.
+ - Support for the alphanumeric, numeric, and kanji encodings
+ was added to the QR Code encoder.
+ - The PZN symbology was extended with support
+ for PZN8.
+ - Support for the GS1 DataMatrix symbology was added.
+ - A bug in double digit ASCII encodation of the Data Matrix
+ symbology was fixed.
+ - The EDIFACT, C40, TEXT, and X12 encodation schemes were
+ removed from the Data Matrix symbology, as
+ these were buggy.
+ - Support for FNC1 character as added to the Data Matrix symbology.
+2012-06-25 - The QR Code encoder was modified to select an
+ optimal encoder based on the data.
+ - A bug in the symbol size selection for
+ QR Code was fixed.
+ - The QR Code encoder was optimised by
+ allowing the terminator pattern to be trimmed.
+ - Support for the alphanumeric, numeric and
+ kanji encodings was added to the qrcode encoder.
+ - The PZN symbology was extended with support for PZN8.
+ - The 1.5 scale factor was removed from the
+ DataMatrix encoder.
+
+2011-03-10 - The error correction code for Maxicode symbols was improved.
- Codablock F was fixed for short data inputs.
- Support for the Codablock F symbology was added.
- Support for the HIBC Codablock F symbology was added.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-barcode/pst-barcode-doc.bib new/doc/generic/pst-barcode/pst-barcode-doc.bib
--- old/doc/generic/pst-barcode/pst-barcode-doc.bib 2011-03-15 00:44:19.000000000 +0100
+++ new/doc/generic/pst-barcode/pst-barcode-doc.bib 2012-07-12 01:31:41.000000000 +0200
@@ -171,11 +171,37 @@
year = 2004
}
-@book{voss06,
- Title = {Mathematiksatz in \LaTeX{}},
- Author = {Herbert Vo\ss},
- Publisher = {Lehmanns Media/DANTE},
- Edition= {first},
- Address= {Berlin/Heidelberg},
- Year= {2009},
+@Book{presentations,
+ author = {Herbert Vo\ss},
+ title = {Presentations with \LaTeX},
+ edition = {1.},
+ publisher = {DANTE -- Lehmanns Media},
+ year = {2012},
+ address = {Heidelberg/Berlin}
+}
+
+@Book{PSTricksE,
+ author = {Herbert Vo\ss},
+ title = {\texttt{PSTricks} -- {G}raphics for \LaTeX},
+ edition = {1.},
+ publisher = {UIT},
+ year = {2011},
+ address = {Cambridge/UK}
+}
+
+@Book{LaTeXRef,
+ author = {Herbert Vo\ss},
+ title = {\LaTeX\ Referenz},
+ edition = {2.},
+ publisher = {DANTE -- lehmanns media},
+ year = {2010},
+ address = {Heidelberg/Hamburg}
+}
+@Book{LaTeXRefE,
+ author = {Herbert Vo\ss},
+ title = {\LaTeX\ Quick Reference},
+ edition = {1.},
+ publisher = {UIT},
+ year = {2011},
+ address = {Cambridge/UK}
}
Files old/doc/generic/pst-barcode/pst-barcode-doc.pdf and new/doc/generic/pst-barcode/pst-barcode-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-barcode/pst-barcode-doc.tex new/doc/generic/pst-barcode/pst-barcode-doc.tex
--- old/doc/generic/pst-barcode/pst-barcode-doc.tex 2011-03-15 00:44:19.000000000 +0100
+++ new/doc/generic/pst-barcode/pst-barcode-doc.tex 2012-07-12 01:31:41.000000000 +0200
@@ -720,8 +720,8 @@
\item[Data] Variable number characters
\end{description}
-\begin{LTXexample}[pos=l,width=1in,wide]
-\begin{pspicture}(1in,1in)
+\begin{LTXexample}[pos=l,width=1.6in,wide]
+\begin{pspicture}(1.5in,1.5in)
\psbarcode{Herbert Voss ^142^164^186}{rows=48 columns=48 parse}{datamatrix}
\end{pspicture}
\end{LTXexample}
@@ -776,22 +776,6 @@
\end{LTXexample}
-\subsection{QR Code}
-A QR Code (Quick Response) is a 2 dimensional matrix code created by Japanese
-corporation Denso-Wave in 1994 (\url{http://de.wikipedia.org/wiki/QR_Code}).
-
-
-\begin{description}
-\item[Characters] \verb!0123456789!
-\item[Data] Variable number characters
-\end{description}
-
-\begin{LTXexample}[pos=l,width=1in,wide]
-\begin{pspicture}(1in,1in)
-\psbarcode{http://www.dante.de}{}{qrcode}
-\end{pspicture}
-\end{LTXexample}
-
\subsection{Aztec Code}
Aztec Code is a 2 dimensional matrix style bar code symbology.
@@ -833,10 +817,9 @@
\end{LTXexample}
-\subsection{qrcode}
-%Aztec Code is a 2 dimensional matrix style bar code symbology.
-%Aztec Code was invented by Andrew Longacre (USA) in 1995
-%(\url{http://de.wikipedia.org/wiki/Aztec_Code}).
+\subsection{QR Code}
+A QR Code (Quick Response) is a 2 dimensional matrix code created by Japanese
+corporation Denso-Wave in 1994 (\url{http://de.wikipedia.org/wiki/QR_Code}).
\begin{description}
@@ -844,13 +827,86 @@
\item[Data] Variable number characters
\end{description}
-\begin{LTXexample}[width=1.5in,wide]
+The data field can contain any extended ASCII data.
+When the parse option is specified, any instances of \verb|^NNN| in the data field are
+replaced with their equivalent ASCII value, useful for specifying unprintable characters.
+
+ The eclevel option is used to specify the error correction level:
+\begin{description}
+\item[eclevel=L] - Low (default for micro format symbols)
+\item[eclevel=M] - Medium (default for full format symbols)
+\item[eclevel=Q] - Quality
+\item[eclevel=H] - High
+\end{description}
+
+The eclevel will be opportunistically raised when this does not result in an increased symbol size.
+The encoding option is used to specify a desired encoding for the input data which can sometimes result in a more optimal symbol size:
+
+\begin{description}
+\item[encoding=alphanumeric] - Alphanumeric data
+\item[encoding=numeric] - Numeric data
+\item[encoding=byte] - Byte based encoding
+\item[encoding=kanji] - Kanji characters based on Shift JIS
+\item[encoding=raw] - Equivalent to the raw option
+ If left unspecified the optimal available encoding will be chosen for the given data in
+ the following order of preference: numeric, alphanumeric, kanji, byte.
+ The version option is used to specify the size of the symbol, 1 to 40 for full
+ format symbols or \verb|version=M1|, \verb|version=M2|, \verb|version=M3| or \verb|version=M4|
+ for micro format symbols.
+ If unspecified, the encoder will select the version of the symbol that is the minimum
+ size to represent the given data at the selected error correction level.
+ The format option is used to select between format=full and format=micro symbol
+ types. By default, full format symbols will be generated.
+ The raw option denotes that the data field is providing the input as a pre-encoded
+ bitstream (excluding the terminator bits) suitable for direct low-level encoding.
+\end{description}
+
+
+\begin{LTXexample}[pos=l,width=1in]
+\begin{pspicture}(1in,1in)
+\psbarcode{http://www.dante.de}{}{qrcode}
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=1.5in]
\begin{pspicture}(1in,1in)
\psbarcode{http://www.dante.de}{eclevel=M}{qrcode}
\end{pspicture}
\end{LTXexample}
+\begin{LTXexample}[width=1.5in]
+\begin{pspicture}(1in,1in)
+\psbarcode{QR ^067ode}{parse}{qrcode}
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=1.5in]
+\begin{pspicture}(2in,2in)
+\psbarcode{QR CODE 1234}{version=10 eclevel=Q}{qrcode}
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=1.5in]
+\begin{pspicture}(0.5in,0.5in)
+\psbarcode{01234567}{format=micro}{qrcode}
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=1.5in]
+\begin{pspicture}(1in,1in)
+\psbarcode{000100000010000000001100010101100110000110000}{raw}{qrcode}
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=1in,wide]
+\begin{pspicture}(0.5in,0.5in)
+\psbarcode{0010000000000110001010110011010100110111000010100111010100101}{format=micro raw}{qrcode}
+\end{pspicture}
+\end{LTXexample}
+
+
+
\section{Code Commentary}
This commentary assumes familiarity with the PostScript
language\footnote{The PostScript Language Tutorial and Cookbook
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-barcode.doc.tlpobj new/tlpkg/tlpobj/pst-barcode.doc.tlpobj
--- old/tlpkg/tlpobj/pst-barcode.doc.tlpobj 2011-03-15 04:19:38.000000000 +0100
+++ new/tlpkg/tlpobj/pst-barcode.doc.tlpobj 2012-11-17 04:36:28.000000000 +0100
@@ -1,9 +1,9 @@
name pst-barcode.doc
category Package
-revision 21716
+revision 28278
shortdesc doc files of pst-barcode
relocated 1
-docfiles size=74
+docfiles size=79
RELOC/doc/generic/pst-barcode/Changes
RELOC/doc/generic/pst-barcode/README
RELOC/doc/generic/pst-barcode/pst-barcode-doc.bib
++++++ pst-barcode.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pst-barcode/pst-barcode.pro new/dvips/pst-barcode/pst-barcode.pro
--- old/dvips/pst-barcode/pst-barcode.pro 2011-03-15 00:44:19.000000000 +0100
+++ new/dvips/pst-barcode/pst-barcode.pro 2012-11-17 00:22:47.000000000 +0100
@@ -3,10 +3,12 @@
%%DocumentPaperSizes: a4
%%EndComments
-% Barcode Writer in Pure PostScript - Version 2011-03-09
+% Barcode Writer in Pure PostScript - Version 2012-11-15
% http://www.terryburton.co.uk/barcodewriter/
%
-% Copyright (c) 2004-2011 Terry Burton
+% Copyright (c) 2004-2012 Terry Burton
+%
+% $Id: barcode.ps 2399 2012-11-15 13:18:46Z terry.burton $
%
% Permission is hereby granted, free of charge, to any
% person obtaining a copy of this software and associated
@@ -205,11 +207,11 @@
textcolor (unset) ne { textcolor setanycolor } if
includetext {
textxalign (unset) eq textyalign (unset) eq and alttext () eq and {
- /s 0 def /f () def
+ /s 0 def /fn () def
txt {
{} forall
- 2 copy s ne exch f ne or {
- 2 copy /s exch def /f exch def
+ 2 copy s ne exch fn ne or {
+ 2 copy /s exch def /fn exch def
exch findfont exch scalefont setfont
} {
pop pop
@@ -666,7 +668,7 @@
% --BEGIN ENCODER ean13--
% --SUGGESTS ean5 ean2--
% --DESC: EAN-13
-% --EXAM: 977147396801
+% --EXAM: 2071473968010
% --EXOP: includetext guardwhitespace
% --RNDR: renlinear
/setpacking where {pop currentpacking true setpacking} if
@@ -1033,7 +1035,7 @@
% --BEGIN ENCODER upca--
% --SUGGESTS ean5 ean2--
% --DESC: UPC-A
-% --EXAM: 78858101497
+% --EXAM: 488581014973
% --EXOP: includetext
% --RNDR: renlinear
/setpacking where {pop currentpacking true setpacking} if
@@ -1214,7 +1216,7 @@
% --BEGIN ENCODER upce--
% --SUGGESTS ean5 ean2--
% --DESC: UPC-E
-% --EXAM: 0123456
+% --EXAM: 00123457
% --EXOP: includetext height=0.4
% --RNDR: renlinear
/setpacking where {pop currentpacking true setpacking} if
@@ -3011,6 +3013,7 @@
/textyoffset -7 def
/textxoffset 0 def
/height 1 def
+ /pzn8 false def
% Parse the input options
options type /stringtype eq {
@@ -3028,28 +3031,26 @@
/textyoffset textyoffset cvr def
/textxoffset textxoffset cvr def
/height height cvr def
-
- /text 13 string def
- text 0 barcode 0 6 getinterval putinterval
+
+ /msg pzn8 {9} {8} ifelse string def
+ /msglen msg length def
+ msg 0 45 put
+ msg 1 barcode 0 msglen 2 sub getinterval putinterval
% calculate check digit
- text 6 0
- 0 1 5 {
- dup text exch get 48 sub exch 2 add mul add
- } for
- 11 mod 48 add put
-
- /barcode 8 string def
- barcode 1 text 0 7 getinterval putinterval
- barcode 0 45 put
+ 0
+ 1 1 msglen 2 sub {dup msg exch get 48 sub exch pzn8 not {1 add} if mul add} for
+ 11 mod 48 add
+ msg exch msglen 1 sub exch put
% Get the result of encoding with code39
options (dontdraw) true put
- /args barcode options //code39 exec def
+ /args msg options //code39 exec def
% format HRI
- text 6 text 0 7 getinterval putinterval
+ /text msglen 5 add string def
text 0 (PZN - ) putinterval
+ text 6 msg 1 msglen 1 sub getinterval putinterval
args (txt) [ [text textxoffset textyoffset textfont textsize] ] put
args (textxalign) (center) put
@@ -8335,7 +8336,7 @@
% --BEGIN ENCODER codablockf--
% --DESC: Codablock F
% --EXAM: CODABLOCK F 34567890123456789010040digit
-% --EXOP: cols=8
+% --EXOP: columns=8
% --RNDR: renmatrix
/setpacking where {pop currentpacking true setpacking} if
1 dict
@@ -8350,7 +8351,7 @@
/dontdraw false def
/rows -1 def
- /cols 8 def
+ /columns 8 def
/rowheight 10 def
/sepheight 1 def
/encoding (auto) def
@@ -8369,12 +8370,12 @@
options {def} forall
/rows rows cvi def
- /cols cols cvi def
+ /columns columns cvi def
/rowheight rowheight cvi def
/sepheight sepheight cvi def
- cols 4 ge cols 62 le and
- rows 2 ge rows 44 le and rows -1 eq or and {/c cols def} if
+ columns 4 ge columns 62 le and
+ rows 2 ge rows 44 le and rows -1 eq or and {/c columns def} if
% Parse ordinals of the form ^NNN to ASCII
parse {
@@ -11028,6 +11029,17 @@
/dontdraw false def
+ % Parse the input options
+ options type /stringtype eq {
+ 1 dict begin
+ options {
+ token false eq {exit} if dup length string cvs (=) search
+ true eq {cvlit exch pop exch def} {cvlit true def} ifelse
+ } loop
+ currentdict end /options exch def
+ } if
+ options {def} forall
+
barcode (fima) eq {
/sbs [2.25 2.25 2.25 11.25 2.25 11.25 2.25 2.25 2.25] def
/bhs [.625 .625 .625 .625 .625] def
@@ -11774,8 +11786,8 @@
/i 0 def
{ % loop
/m metrics i get def
- /c m 0 get def % Rows in symbol
- /r m 1 get def % Columns in symbol
+ /c m 0 get def % Columns in symbol
+ /r m 1 get def % Rows in symbol
/k m 2 get def % Error correction codewords
/rapl m 3 get def % Left row address pattern
/rapc m 4 get def % Centre row address pattern
@@ -12192,9 +12204,10 @@
/dontdraw false def
/columns 0 def
/rows 0 def
- /encoding (byte) def
+ /encoding (ascii) def
/raw false def
/parse false def
+ /parsefnc false def
% Parse the input options
options type /stringtype eq {
@@ -12248,29 +12261,44 @@
/cws cws 0 j getinterval def
} if
- encoding (byte) eq {
- barlen 250 lt {
- /cws [231 barlen barcode {} forall] def
- } {
- /cws [231 barlen 250 idiv 249 add barlen 250 mod barcode {} forall] def
- } ifelse
- 1 1 cws length 1 sub {
- /i exch def
- i 1 add 149 mul 255 mod 1 add cws i get add
- dup 256 ge {256 sub} if
- cws exch i exch put
- } for
- } if
+ % Special function characters
+ /fn1 -1 def
encoding (ascii) eq {
- /cws barlen 2 mul array def
- /i 0 def /j 0 def
- { % loop
+ /fncvals <<
+ (FNC1) fn1
+ >> def
+ /msg barlen array def
+ /i 0 def /j 0 def {
i barlen eq {exit} if
/char barcode i get def
- char 48 ge char 57 le and i barlen 1 sub lt and {
- barcode i 1 add get dup 48 ge exch 57 le and { % Digit pair
- cws j barcode i 2 getinterval cvi 130 add put
+ parsefnc char 94 eq and i barlen 4 sub lt and {
+ barcode i 1 add get 94 ne {
+ /char fncvals barcode i 1 add 4 getinterval get def
+ /i i 4 add def
+ } {
+ /i i 1 add def
+ } ifelse
+ } if
+ msg j char put
+ /i i 1 add def
+ /j j 1 add def
+ } loop
+ /msg msg 0 j getinterval def
+ /msglen msg length def
+
+ /cws msglen 2 mul array def
+ /i 0 def /j 0 def
+ { % loop
+ i msglen eq {exit} if
+ /char msg i get def
+ char fn1 eq { % FNC1
+ cws j 232 put
+ /i i 1 add def
+ /j j 1 add def
+ } { char 48 ge char 57 le and i msglen 1 sub lt and {
+ msg i 1 add get dup 48 ge exch 57 le and { % Digit pair
+ cws j msg i get 48 sub 10 mul msg i 1 add get 48 sub add 130 add put
/i i 2 add def
/j j 1 add def
} { % Singular digit
@@ -12287,146 +12315,11 @@
cws j 1 add char 127 sub put
/i i 1 add def
/j j 2 add def
- } ifelse } ifelse
+ } ifelse } ifelse } ifelse
} loop
/cws cws 0 j getinterval def
} if
- encoding (edifact) eq {
- /cws 1558 array def
- /i 0 def /j 1 def /k 0 def
- cws 0 240 put
- { % loop
- i barlen gt {exit} if
- /k 0 def /v 0 def
- { % loop until triplet is full or beyond end of data
- k 4 eq i barlen gt or {exit} if
- /cval (unset) def
- i barlen lt {
- /char barcode i get def
- char 32 ge char 94 le and {
- /cval char 63 and def
- } if
- } { % Unlatch at end of data
- /cval 31 def
- } ifelse
- /v v cval 3 k sub 6 mul bitshift or def
- /k k 1 add def
- /i i 1 add def
- } loop
- cws j [ v -16 bitshift v -8 bitshift 255 and v 255 and ] putinterval
- /j j 3 add def
- } loop
- /cws cws 0 j getinterval def
- } if
-
- encoding (c40) eq encoding (text) eq or encoding (x12) eq or {
-
- /s1 0 def /s2 1 def /s3 2 def /us 30 def
-
- encoding (c40) eq {
- /latch 230 def
- /charmap [
- 0 1 31 { [ exch s1 exch ] } for % 0-31
- [ 3 ] % 32
- 0 1 14 { [ exch s2 exch ] } for % 33-47
- 4 1 13 { [ exch ] } for % 48-57
- 15 1 21 { [ exch s2 exch ] } for % 58-64
- 14 1 39 { [ exch ] } for % 65-90
- 22 1 26 { [ exch s2 exch ] } for % 91-95
- [ s3 0 ] % 96
- 1 1 26 { [ exch s3 exch ] } for % 97-122
- 27 1 31 { [ exch s3 exch ] } for % 123-127
- 0 1 31 { [ s2 us 4 -1 roll s1 exch ] } for % 128-159
- [ s2 us 3 ] % 160
- 0 1 14 { [ s2 us 4 -1 roll s2 exch ] } for % 161-175
- 4 1 13 { [ s2 us 4 -1 roll ] } for % 176-185
- 15 1 21 { [ s2 us 4 -1 roll s2 exch ] } for % 186-192
- 14 1 39 { [ s2 us 4 -1 roll ] } for % 193-218
- 22 1 26 { [ s2 us 4 -1 roll s2 exch ] } for % 219-223
- [ s2 us s3 0 ] % 224
- 1 1 26 { [ s2 us 4 -1 roll s3 exch ] } for % 225-250
- 27 1 31 { [ s2 us 4 -1 roll s3 exch ] } for % 251-255
- ] def
- } if
-
- encoding (text) eq {
- /latch 239 def
- /charmap [
- 0 1 31 { [ exch s1 exch ] } for % 0-31
- [ 3 ] % 32
- 0 1 14 { [ exch s2 exch ] } for % 33-47
- 4 1 13 { [ exch ] } for % 48-57
- 15 1 21 { [ exch s2 exch ] } for % 58-64
- 1 1 26 { [ exch s3 exch ] } for % 65-90
- 22 1 26 { [ exch s2 exch ] } for % 91-95
- [ s3 0 ] % 96
- 14 1 39 { [ exch ] } for % 97-122
- 27 1 31 { [ exch s3 exch ] } for % 123-127
- 0 1 31 { [ s2 us 4 -1 roll s1 exch ] } for % 128-159
- [ s2 us 3 ] % 160
- 0 1 14 { [ s2 us 4 -1 roll s2 exch ] } for % 161-175
- 4 1 13 { [ s2 us 4 -1 roll ] } for % 176-185
- 15 1 21 { [ s2 us 4 -1 roll s2 exch ] } for % 186-192
- 1 1 26 { [ s2 us 4 -1 roll s3 exch ] } for % 193-218
- 22 1 26 { [ s2 us 4 -1 roll s2 exch ] } for % 219-223
- [ s2 us s3 0 ] % 224
- 14 1 39 { [ s2 us 4 -1 roll ] } for % 225-250
- 27 1 31 { [ s2 us 4 -1 roll s3 exch ] } for % 251-255
- ] def
- } if
-
- encoding (x12) eq {
- /latch 238 def
- /charmap [
- 13 { [ () ] } repeat % 0-12
- [ 0 ] % 13
- 18 { [ () ] } repeat % 14-31
- [ 3 ] % 32
- 9 { [ () ] } repeat % 33-41
- [ 1 ] % 42
- 5 { [ () ] } repeat % 43-47
- 4 1 13 { [ exch ] } for % 48-57
- 4 { [ () ] } repeat % 58-61
- [ 2 ] % 62
- 2 { [ () ] } repeat % 63-64
- 14 1 39 { [ exch ] } for % 65-90
- 165 { [ () ] } repeat % 91-255
- ] def
- } if
-
- % Derive the encoded character stream
- /encstr barlen 4 mul array def
- /j 0 def
- 0 1 barlen 1 sub {
- barcode exch get charmap exch get
- dup encstr exch j exch putinterval
- length j add /j exch def
- } for
- /encstr encstr 0 j getinterval def
- /enclen j def
-
- % Compress triples into doubles
- /cws 1558 array def
- /i 0 def /j 1 def /k 0 def
- cws 0 latch put
- { % loop
- i enclen ge {exit} if
- /k 0 def /v 1 def
- { % loop until triple is full or end of data
- k 3 eq i enclen ge or {exit} if
- /v v encstr i get 40 2 k sub exp cvi mul add def
- /k k 1 add def
- /i i 1 add def
- } loop
- cws j [ v -8 bitshift v 255 and ] putinterval
- /j j 2 add def
- } loop
- cws j 254 put
- /cws cws 0 j 1 add getinterval def
-
- } if
-
% Basic metrics for the each symbol
% rows cols regh regv rscw rsbl
/metrics [
@@ -12710,8 +12603,8 @@
/pixs pixs
/pixx cols
/pixy rows
- /height rows 72 div 1.5 mul
- /width cols 72 div 1.5 mul
+ /height rows 2 mul 72 div
+ /width cols 2 mul 72 div
/opt options
>>
@@ -12745,6 +12638,7 @@
/format (full) def % full or micro
/version (unset) def
/eclevel (unset) def % L, M, Q or H
+ /encoding (unset) def
/raw false def
/parse false def
@@ -12780,75 +12674,293 @@
} loop
} if
- % Force raw mode for micro format symbols
- format (micro) eq {/raw true def} if
+ /barlen barcode length def
- % Default to error correction level M
- eclevel (unset) eq {/eclevel (M) def} if
+ % Default error correction level
+ eclevel (unset) eq {/eclevel format (full) eq {(M)} {(L)} ifelse def} if
% Convert from input into message bitstream
- raw {
+ raw {/encoding (raw) def} if
+ encoding (raw) eq {
/msgbits barcode def
- } { % Simple autoencoder from input to bitstream using byte mode only for full format symbols
+ } {
- /barlen barcode length def
- eclevel (unset) eq {/eclevel (M) def} if
+ % Symbol capacities
+ /fullcaps <<
+ /numeric <<
+ /L [ 41 77 127 187 255 322 370 461 552 652 % 1-L - 10-L
+ 772 883 1022 1101 1250 1408 1548 1725 1903 2061 % 11-L - 20-L
+ 2232 2409 2620 2812 3057 3283 3517 3669 3909 4158 % 21-L - 30-L
+ 4417 4686 4965 5253 5529 5836 6153 6479 6743 7089 ] % 31-L - 40-L
+ /M [ 34 63 101 149 202 255 293 365 432 513 % 1-M - 10-M
+ 604 691 796 871 991 1082 1212 1346 1500 1600 % 11-M - 20-M
+ 1708 1872 2059 2188 2395 2544 2701 2857 3035 3289 % 21-M - 30-M
+ 3486 3693 3909 4134 4343 4588 4775 5039 5313 5596 ] % 31-M - 40-M
+ /Q [ 27 48 77 111 144 178 207 259 312 364 % 1-Q - 10-Q
+ 427 489 580 621 703 775 876 948 1063 1159 % 11-Q - 20-Q
+ 1224 1358 1468 1588 1718 1804 1933 2085 2181 2358 % 21-Q - 30-Q
+ 2473 2670 2805 2949 3081 3244 3417 3599 3791 3993 ] % 31-Q - 40-Q
+ /H [ 17 34 58 82 106 139 154 202 235 288 % 1-H - 10-H
+ 331 374 427 468 530 602 674 746 813 919 % 11-H - 20-H
+ 969 1056 1108 1228 1286 1425 1501 1581 1677 1782 % 21-H - 30-H
+ 1897 2022 2157 2301 2361 2524 2625 2735 2927 3057 ] % 31-H - 40-H
+ >>
+ /alphanumeric <<
+ /L [ 25 47 77 114 154 195 224 279 335 395 % 1-L - 10-L
+ 468 535 619 667 758 854 938 1046 1153 1249 % 11-L - 20-L
+ 1352 1460 1588 1704 1853 1990 2132 2223 2369 2520 % 21-L - 30-L
+ 2677 2840 3009 3183 3351 3537 3729 3927 4087 4296 ] % 31-L - 40-L
+ /M [ 20 38 61 90 122 154 178 221 262 311 % 1-M - 10-M
+ 366 419 483 528 600 656 734 816 909 970 % 11-M - 20-M
+ 1035 1134 1248 1326 1451 1542 1637 1732 1839 1994 % 21-M - 30-M
+ 2113 2238 2369 2506 2632 2780 2894 3054 3220 3391 ] % 31-M - 40-M
+ /Q [ 16 29 47 67 87 108 125 157 189 221 % 1-Q - 10-Q
+ 259 296 352 376 426 470 531 574 644 702 % 11-Q - 20-Q
+ 742 823 890 963 1041 1094 1172 1263 1322 1429 % 21-Q - 30-Q
+ 1499 1618 1700 1787 1867 1966 2071 2181 2298 2420 ] % 31-Q - 40-Q
+ /H [ 10 20 35 50 64 84 93 122 143 174 % 1-H - 10-H
+ 200 227 259 283 321 365 408 452 493 557 % 11-H - 20-H
+ 587 640 672 744 779 864 910 958 1016 1080 % 21-H - 30-H
+ 1150 1226 1307 1394 1431 1530 1591 1658 1774 1852 ] % 31-H - 40-H
+ >>
+ /byte <<
+ /L [ 17 32 53 78 106 134 154 192 230 271 % 1-L - 10-L
+ 321 367 425 458 520 586 644 718 792 858 % 11-L - 20-L
+ 929 1003 1091 1171 1273 1367 1465 1528 1628 1732 % 21-L - 30-L
+ 1840 1952 2068 2188 2303 2431 2563 2699 2809 2953 ] % 31-L - 40-L
+ /M [ 14 26 42 62 84 106 122 152 180 213 % 1-M - 10-M
+ 251 287 331 362 412 450 504 560 624 666 % 11-M - 20-M
+ 711 779 857 911 997 1059 1125 1190 1264 1370 % 21-M - 30-M
+ 1452 1538 1628 1722 1809 1911 1989 2099 2213 2331 ] % 31-M - 40-M
+ /Q [ 11 20 32 46 60 74 86 108 130 151 % 1-Q - 10-Q
+ 177 203 241 258 292 322 364 394 442 482 % 11-Q - 20-Q
+ 509 565 611 661 715 751 805 868 908 982 % 21-Q - 30-Q
+ 1030 1112 1168 1228 1283 1351 1423 1499 1579 1663 ] % 31-Q - 40-Q
+ /H [ 7 14 24 34 44 58 64 84 98 119 % 1-H - 10-H
+ 137 155 177 194 220 250 280 310 338 382 % 11-H - 20-H
+ 403 439 461 511 535 593 625 658 698 742 % 21-H - 30-H
+ 790 842 898 958 983 1051 1093 1139 1219 1273 ] % 31-H - 40-H
+ >>
+ /kanji <<
+ /L [ 10 20 32 48 65 82 95 118 141 167 % 1-L - 10-L
+ 198 226 262 282 320 361 397 442 488 528 % 11-L - 20-L
+ 572 618 672 721 784 842 902 940 1002 1066 % 21-L - 30-L
+ 1132 1201 1273 1347 1417 1496 1577 1661 1729 1817 ] % 31-L - 40-L
+ /M [ 8 16 26 38 52 65 75 93 111 131 % 1-M - 10-M
+ 155 177 204 223 254 277 310 345 384 410 % 11-M - 20-M
+ 438 480 528 561 614 652 692 732 778 843 % 21-M - 30-M
+ 894 947 1002 1060 1113 1176 1224 1292 1362 1435 ] % 31-M - 40-M
+ /Q [ 7 12 20 28 37 45 53 66 80 93 % 1-Q - 10-Q
+ 109 125 149 159 180 198 224 243 272 297 % 11-Q - 20-Q
+ 314 348 376 407 440 462 496 534 559 604 % 21-Q - 30-Q
+ 634 684 719 756 790 832 876 923 972 1024 ] % 31-Q - 40-Q
+ /H [ 4 8 15 21 27 36 39 52 60 74 % 1-H - 10-H
+ 85 96 109 120 136 154 173 191 208 235 % 11-H - 20-H
+ 248 270 284 315 330 365 385 405 430 457 % 21-H - 30-H
+ 486 518 553 590 605 647 673 701 750 784 ] % 31-H - 40-H
+ >>
+ >> def
+
+ % M1 M2 M3 M4 M1 M2 M3 M4 M1 M2 M3 M4 M1 M2 M3 M4
+ /microcaps <<
+ /numeric <<
+ /L [ 5 10 23 35 ] /M [ -1 8 18 30 ] /Q [ -1 -1 -1 21 ] /H [ -1 -1 -1 -1 ]
+ >>
+ /alphanumeric <<
+ /L [ -1 6 14 21 ] /M [ -1 5 11 18 ] /Q [ -1 -1 -1 13 ] /H [ -1 -1 -1 -1 ]
+ >>
+ /byte <<
+ /L [ -1 -1 9 15 ] /M [ -1 -1 7 13 ] /Q [ -1 -1 -1 9 ] /H [ -1 -1 -1 -1 ]
+ >>
+ /kanji <<
+ /L [ -1 -1 6 9 ] /M [ -1 -1 4 8 ] /Q [ -1 -1 -1 5 ] /H [ -1 -1 -1 -1 ]
+ >>
+ >> def
+
+ /encvals <<
+ /numeric 0
+ /alphanumeric 1
+ /byte 2
+ /kanji 3
+ >> def
+
+ /encs <<
+ /numeric /encnumeric
+ /alphanumeric /encalphanumeric
+ /byte /encbyte
+ /kanji /enckanji
+ >> def
+
+ % N A B K
+ /mids [ (0001) (0010) (0100) (1000) ] def
+ /mids <<
+ /M1 [ () -1 -1 -1 ]
+ /M2 [ (0) (1) -1 -1 ]
+ /M3 [ (00) (01) (10) (11) ]
+ /M4 [ (000) (001) (010) (011) ]
+ 1 1 40 {2 string 10 exch cvrs mids} for
+ >> def
+
+ % N A B K
+ /cc1to9 [ 10 9 8 8 ] def
+ /cc10to26 [ 12 11 16 10 ] def
+ /cc27to40 [ 14 13 16 12 ] def
+ /cclens <<
+ /M1 [ 3 -1 -1 -1 ]
+ /M2 [ 4 3 -1 -1 ]
+ /M3 [ 5 4 4 3 ]
+ /M4 [ 6 5 5 4 ]
+ 1 1 9 { 2 string 10 exch cvrs cc1to9 } for
+ 10 1 26 { 2 string 10 exch cvrs cc10to26 } for
+ 27 1 40 { 2 string 10 exch cvrs cc27to40 } for
+ >> def
+
+ % Alphanumeric character to value map
+ /charmap (0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:) def
+ /charvals 44 dict def
+ 0 1 44 {dup charmap exch get exch charvals 3 1 roll put} for
+
+ /encnumeric {
+ /in exch def
+ /out in length 10 mul 3 idiv 1 add string def
+ /i 0 def /j 0 def {
+ i in length eq {exit} if
+ i in length 2 sub lt {
+ (0000000000) 10 string copy
+ dup in i 3 getinterval cvi
+ 2 10 string cvrs dup length 10 exch sub exch putinterval
+ /i i 3 add def
+ } {
+ i in length 2 sub eq { % Two final digits
+ (0000000) 7 string copy
+ dup in i 2 getinterval cvi
+ 2 7 string cvrs dup length 7 exch sub exch putinterval
+ /i i 2 add def
+ } { % One final digit
+ (0000) 4 string copy
+ dup in i 1 getinterval cvi
+ 2 4 string cvrs dup length 4 exch sub exch putinterval
+ /i i 1 add def
+ } ifelse
+ } ifelse
+ dup out exch j exch putinterval
+ length j add /j exch def
+ } loop
+ out 0 j getinterval
+ } bind def
+
+ /encalphanumeric {
+ /in exch def
+ /out in length 11 mul 2 idiv 1 add string def
+ /i 0 def /j 0 def {
+ i in length eq {exit} if
+ i in length 1 sub lt {
+ (00000000000) 11 string copy
+ dup charvals in i get get 45 mul charvals in i 1 add get get add
+ 2 11 string cvrs dup length 11 exch sub exch putinterval
+ /i i 2 add def
+ } {
+ (000000) 6 string copy
+ dup charvals in i get get
+ 2 6 string cvrs dup length 6 exch sub exch putinterval
+ /i i 1 add def
+ } ifelse
+ dup out exch j exch putinterval
+ length j add /j exch def
+ } loop
+ out 0 j getinterval
+ } bind def
+
+ /encbyte {
+ /in exch def
+ /out in length 8 mul string def
+ 0 1 in length 1 sub {
+ /i exch def
+ (00000000) 8 string copy
+ dup in i get cvi
+ 2 8 string cvrs dup length 8 exch sub exch putinterval
+ out i 8 mul 3 -1 roll putinterval
+ } for
+ out
+ } bind def
+
+ /enckanji {
+ /in exch def
+ /out in length 2 idiv 13 mul string def
+ /i 0 def /j 0 def {
+ i in length eq {exit} if
+ in i get 256 mul in i 1 add get add
+ dup 16#E040 lt {16#8140} {16#C140} ifelse sub
+ dup -8 bitshift 16#C0 mul exch 16#00FF and add
+ (0000000000000) 13 string copy
+ dup 3 -1 roll 2 13 string cvrs dup length 13 exch sub exch putinterval
+ dup out exch j exch putinterval
+ length j add /j exch def
+ /i i 2 add def
+ } loop
+ out
+ } bind def
+
+ % Determine a compact encoding for the data
+ encoding (unset) eq {
+ /numericokay true def
+ /alphanumericokay true def
+ /kanjiokay true def
+ /byteokay true def
+ barlen 2 mod 0 ne {/kanjiokay false def} if
+ 0 1 barlen 1 sub {
+ /i exch def
+ /barchar barcode i get def
+ barchar 48 lt barchar 57 gt or {/numericokay false def} if
+ charvals barchar known not {/alphanumericokay false def} if
+ i 2 mod 0 eq {
+ barchar 16#81 lt barchar 16#9F gt or
+ barchar 16#E0 lt barchar 16#EB gt or and {
+ /kanjiokay false def
+ } if
+ } if
+ } for
+ byteokay {/encoding (byte) def} if
+ kanjiokay {/encoding (kanji) def} if
+ alphanumericokay {/encoding (alphanumeric) def} if
+ numericokay {/encoding (numeric) def} if
+ } if
- % Determine smallest symbol version to hold given amount of byte-encoded data
+ % Determine smallest symbol version to hold given amount of data
+ /numchars barlen encoding (kanji) eq {2 idiv} if def
version (unset) eq {
- /caps [
- [
- 17 32 53 78 106 134 154 192 230 271 % 1-L - 10-L
- 321 367 425 458 520 586 644 718 792 858 % 11-L - 20-L
- 929 1003 1091 1171 1273 1367 1465 1528 1628 1732 % 21-L - 30-L
- 1840 1952 2068 2188 2303 2431 2563 2699 2809 2953 % 31-L - 40-L
- ] [
- 14 26 42 62 84 106 122 152 180 213 % 1-M - 10-M
- 251 287 331 362 412 450 504 560 624 666 % 11-M - 20-M
- 711 779 857 911 997 1059 1125 1190 1264 1370 % 21-M - 30-M
- 1452 1538 1628 1722 1809 1911 1989 2099 2213 2331 % 31-M - 40-M
- ] [
- 11 20 32 46 60 74 86 108 130 151 % 1-Q - 10-Q
- 177 203 241 258 292 322 364 394 442 482 % 11-Q - 20-Q
- 509 565 611 661 715 751 805 868 908 982 % 21-Q - 30-Q
- 1030 1112 1168 1228 1283 1351 1423 1499 1579 1663 % 31-Q - 40-Q
- ] [
- 7 14 24 34 44 58 64 84 98 119 % 1-H - 10-H
- 137 155 177 194 220 250 280 310 338 382 % 11-H - 20-H
- 403 439 461 511 535 593 625 658 698 742 % 21-H - 30-H
- 790 842 898 958 983 1051 1093 1139 1219 1273 % 31-H - 40-H
- ]
- ] def
- /caps caps (LMQH) eclevel search pop length exch pop exch pop get def
- /i 1 def
- {
- barlen caps i 1 sub get le {exit} if
+ /caps format (full) eq {fullcaps} {microcaps} ifelse encoding get eclevel get def
+ /i 1 def {
+ numchars caps i 1 sub get le {exit} if
/i i 1 add def
} loop
/version i 10 2 string cvrs def
+ format (micro) eq {
+ /version (M ) 2 string copy dup version 1 exch putinterval def
+ } if
} if
- % Set the control character data for the version
- /mid (0100) def /term (0000) def /cclen 8 def
- version 0 1 getinterval (M) ne { % Version 10 and above
- version cvi 10 ge {/cclen 16 def} if
- } if
- /midlen mid length def
- /termlen term length def
+ % Opportunistically raise the error correction level for a fit to the same symbol
+ /caps format (full) eq {fullcaps} {microcaps} ifelse encoding get def
+ /verval format (full) eq {version cvi 1 sub} {version 1 get 49 sub} ifelse def
+ eclevel (L) eq {numchars caps /M get verval get le {/eclevel (M) def} if} if
+ eclevel (M) eq {numchars caps /Q get verval get le {/eclevel (Q) def} if} if
+ eclevel (Q) eq {numchars caps /H get verval get le {/eclevel (H) def} if} if
- % Create the bitstream as byte_mode_id character_count data_bytes term
- /msgbits midlen cclen add barlen 8 mul add termlen add string def
- msgbits 0 mid putinterval
+ % Set the control character data for the version
+ /mid mids version get encvals encoding get get def
+ /cclen cclens version get encvals encoding get get def
+
+ % Create the bitstream as mode_id character_count encoded_data
+ /enc barcode encs encoding get load exec def
(0000000000000000) 0 cclen getinterval cclen string copy
- dup barlen cvi 2 cclen string cvrs dup length cclen exch sub exch putinterval
+ dup barlen encoding (kanji) eq {2 idiv} if cvi
+ 2 cclen string cvrs dup length cclen exch sub exch putinterval
/cc exch def
- msgbits midlen cc putinterval
- 0 1 barlen 1 sub {
- /i exch def
- (00000000) 8 string copy dup barcode i get cvi 2 8 string cvrs dup length 8 exch sub exch putinterval
- msgbits midlen cclen add i 8 mul add 3 -1 roll putinterval
- } for
- msgbits midlen cclen add barlen 8 mul add term putinterval
+ /msgbits mid length cclen add enc length add string def
+ msgbits 0 mid putinterval
+ msgbits mid length cc putinterval
+ msgbits mid length cclen add enc putinterval
} ifelse
@@ -12932,14 +13044,29 @@
okay {exit} if
/i i 1 add def
} loop
+
/format frmt def
/version vers def
/dcpb dcws ecb1 ecb2 add idiv def % Base data codewords per block
/ecpb ncws ecb1 ecb2 add idiv dcpb sub def % Error correction codewords per block
+ % Complete the message bits by adding the terminator, truncated if neccessary
+ /terms <<
+ /M1 (000)
+ /M2 (00000)
+ /M3 (0000000)
+ /M4 (000000000)
+ >> def
+ /term terms version known {terms version get} {(0000)} ifelse def
+ /term term 0 dmod msgbits length sub term length 2 copy gt {exch} if pop getinterval def
+ msgbits length term length add string
+ dup 0 msgbits putinterval
+ dup msgbits length term putinterval
+ /msgbits exch def
+
% Expand the message bits by adding padding as necessary
/pad dmod string def
- 0 4 dmod 1 sub {pad exch (0000) putinterval} for
+ 0 1 pad length 1 sub {pad exch 48 put} for
pad 0 msgbits putinterval
/padstrs [ (11101100) (00010001) ] def
/padnum 0 def
@@ -13433,7 +13560,7 @@
% --BEGIN ENCODER maxicode--
% --DESC: MaxiCode
-% --EXAM: [\)>^03001^02996152382802^029840^029001^0291Z00004951^029UPSN^02906X610^029159^0291234567^0291/1^029^029Y^029634 ALPHA DR^029PITTSBURGH^029PA^029^004
+% --EXAM: [)>^03001^02996152382802^029840^029001^0291Z00004951^029UPSN^02906X610^029159^0291234567^0291/1^029^029Y^029634 ALPHA DR^029PITTSBURGH^029PA^029^004
% --EXOP: mode=2 parse
% --RNDR: renmaximatrix
/setpacking where {pop currentpacking true setpacking} if
@@ -14734,8 +14861,8 @@
/pixs pixs
/pixx cols
/pixy rows
- /height rows 72 div 1.5 mul
- /width cols 72 div 1.5 mul
+ /height rows 72 div 2 mul
+ /width cols 72 div 2 mul
/opt options
>>
@@ -15408,7 +15535,7 @@
% --REQUIRES ean13 micropdf417 pdf417 gs1-cc--
% --SUGGESTS ean5 ean2--
% --DESC: EAN-13 Composite
-% --EXAM: 331234567890|(99)1234-abcd
+% --EXAM: 2112345678900|(99)1234-abcd
% --EXOP: includetext
% --RNDR: renlinear renmatrix
/setpacking where {pop currentpacking true setpacking} if
@@ -15488,7 +15615,7 @@
% --REQUIRES ean8 micropdf417 pdf417 gs1-cc--
% --SUGGESTS ean5 ean2--
% --DESC: EAN-8 Composite
-% --EXAM: 12345670|(21)A12345678
+% --EXAM: 02345673|(21)A12345678
% --EXOP: includetext
% --RNDR: renlinear renmatrix
/setpacking where {pop currentpacking true setpacking} if
@@ -15571,7 +15698,7 @@
% --REQUIRES upca micropdf417 pdf417 gs1-cc--
% --SUGGESTS ean5 ean2--
% --DESC: UPC-A Composite
-% --EXAM: 01600033610|(99)1234-abcd
+% --EXAM: 416000336108|(99)1234-abcd
% --EXOP: includetext
% --RNDR: renlinear renmatrix
/setpacking where {pop currentpacking true setpacking} if
@@ -15651,7 +15778,7 @@
% --REQUIRES upce micropdf417 pdf417 gs1-cc--
% --SUGGESTS ean5 ean2--
% --DESC: UPC-E Composite
-% --EXAM: 0121230|(15)021231
+% --EXAM: 00123457|(15)021231
% --EXOP: includetext
% --RNDR: renlinear renmatrix
/setpacking where {pop currentpacking true setpacking} if
@@ -16562,6 +16689,147 @@
/setpacking where {pop setpacking} if
% --END ENCODER gs1-128composite--
+% --BEGIN ENCODER gs1datamatrix--
+% --REQUIRES datamatrix--
+% --DESC: GS1 Data Matrix
+% --EXAM: (01)03453120000011(17)120508(10)ABCD1234(410)9501101020917
+% --EXOP:
+% --RNDR: renmatrix
+/setpacking where {pop currentpacking true setpacking} if
+1 dict
+dup /renmatrix dup /uk.co.terryburton.bwipp findresource put
+dup /datamatrix dup /uk.co.terryburton.bwipp findresource put
+begin
+/gs1datamatrix {
+
+ 20 dict begin % Confine variables to local scope
+
+ /options exch def % We are given an option string
+ /barcode exch def % We are given a barcode string
+
+ /dontdraw false def
+
+ % Parse the input options
+ options type /stringtype eq {
+ 1 dict begin
+ options {
+ token false eq {exit} if dup length string cvs (=) search
+ true eq {cvlit exch pop exch def} {cvlit true def} ifelse
+ } loop
+ currentdict end /options exch def
+ } if
+ options {def} forall
+
+ % Expand ordinals of the form ^NNN to ASCII
+ /expand {
+ /in exch def
+ /out in length string def
+ /j 0 def
+ in
+ { % loop
+ (^) search {
+ dup out exch j exch putinterval
+ length j add 1 add /j exch def
+ pop
+ dup 0 3 getinterval cvi out exch j 1 sub exch put
+ dup length 3 sub 3 exch getinterval
+ } {
+ dup out exch j exch putinterval
+ length j add /j exch def
+ out 0 j getinterval exit
+ } ifelse
+ } loop
+ } bind def
+
+ % Parse out AIs
+ /ais [] def
+ /aival 2 dict def
+ barcode dup length 1 sub 1 exch getinterval
+ { % loop
+ dup () eq {exit} if
+ (\)) search pop
+ exch pop
+ exch (\() search {
+ exch pop exch 3 1 roll
+ } {
+ () 3 1 roll
+ } ifelse
+ [ ais aload pop counttomark 2 add index ] /ais exch def
+ aival 3 1 roll expand put
+ } loop
+ pop
+
+ % Pre-defined fixed length data field AIs
+ % any AI whose prefix is not included in this table must be
+ % terminated with "FNC1", even if it's fixed length
+ /aifixed 23 dict def
+ [
+ 0 1 4 {} for
+ ] {
+ (00) 2 string copy dup dup 1 5 -1 roll 48 add put aifixed 3 1 roll put
+ } forall
+ [
+ 11 1 20 {} for
+ 23
+ 31 1 36 {} for
+ 41
+ ] {
+ 10 2 string cvrs dup aifixed 3 1 roll put
+ } forall
+
+ % Create the datamatrix data
+ /fnc1 -1 def
+ /dmtx [ fnc1 ] def
+ 0 1 ais length 1 sub {
+ /i exch def
+ /ai ais i get def
+ /val aival ai get def
+ dmtx length ai length add val length add array
+ dup 0 dmtx putinterval
+ dup dmtx length ai [ exch {} forall ] putinterval
+ dup dmtx length ai length add val [ exch {} forall ] putinterval
+ /dmtx exch def
+ i ais length 1 sub ne aifixed ai 0 2 getinterval known not and { % Append FNC1
+ dmtx length 1 add array
+ dup 0 dmtx putinterval
+ dup dmtx length fnc1 put
+ /dmtx exch def
+ } if
+ } for
+
+ % Compose input to datamatrix
+ /barcode dmtx length 1 add 5 mul string def
+ /i 0 def /j 0 def {
+ i dmtx length eq {exit} if
+ dmtx i get dup fnc1 eq {
+ pop barcode j (^FNC1) putinterval
+ /j j 4 add def
+ } {
+ barcode exch j exch put
+ } ifelse
+ /i i 1 add def
+ /j j 1 add def
+ } loop
+ /barcode barcode 0 j getinterval def
+
+ % Get the result of encoding with code128
+ options (dontdraw) true put
+ options (parsefnc) true put
+ /args barcode options //datamatrix exec def
+
+ args (opt) options put
+ args
+
+ dontdraw not //renmatrix if
+
+ end
+
+} bind def
+/gs1datamatrix dup load /uk.co.terryburton.bwipp defineresource pop
+end
+/setpacking where {pop setpacking} if
+% --END ENCODER gs1datamatrix--
+
% --BEGIN ENCODER hibccode39--
% --REQUIRES code39--
% --DESC: HIBC Code 39
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-barcode/pst-barcode.tex new/tex/generic/pst-barcode/pst-barcode.tex
--- old/tex/generic/pst-barcode/pst-barcode.tex 2011-03-15 00:44:19.000000000 +0100
+++ new/tex/generic/pst-barcode/pst-barcode.tex 2012-11-17 00:22:47.000000000 +0100
@@ -19,8 +19,8 @@
\let\PSTBarcodeLoaded\endinput
\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
%
-\def\fileversion{0.08}
-\def\filedate{2011/03/10}
+\def\fileversion{0.10}
+\def\filedate{2012/11/16}
\message{`PST-barcode' v\fileversion, \filedate\space (tb,hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pst-barcode/pst-barcode.sty new/tex/latex/pst-barcode/pst-barcode.sty
--- old/tex/latex/pst-barcode/pst-barcode.sty 2011-03-15 00:44:19.000000000 +0100
+++ new/tex/latex/pst-barcode/pst-barcode.sty 2012-11-17 00:22:47.000000000 +0100
@@ -1,5 +1,5 @@
\RequirePackage{pstricks}
-\ProvidesPackage{pst-barcode}[2006/07/23 package wrapper for
+\ProvidesPackage{pst-barcode}[2012/11/16 package wrapper for
pst-barcode.tex (hv)]
\input{pst-barcode.tex}
\ProvidesFile{pst-barcode.tex}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-barcode.tlpobj new/tlpkg/tlpobj/pst-barcode.tlpobj
--- old/tlpkg/tlpobj/pst-barcode.tlpobj 2011-03-15 04:19:38.000000000 +0100
+++ new/tlpkg/tlpobj/pst-barcode.tlpobj 2012-11-17 04:36:28.000000000 +0100
@@ -1,18 +1,18 @@
name pst-barcode
category Package
-revision 21716
+revision 28278
shortdesc Print barcodes using PostScript.
relocated 1
longdesc The pst-barcode package allows printing of barcodes, in a huge
longdesc variety of formats (see documentation for details). As a
-longdesc pstricks package, pst-barcode requires pstricks. The package
+longdesc pstricks package, the package requires pstricks. The package
longdesc uses PostScript for calculating the bars. For PDF output use a
longdesc multi-pass mechansism such as pst-pdf.
-runfiles size=152
+runfiles size=155
RELOC/dvips/pst-barcode/pst-barcode.pro
RELOC/tex/generic/pst-barcode/pst-barcode.tex
RELOC/tex/latex/pst-barcode/pst-barcode.sty
catalogue-ctan /graphics/pstricks/contrib/pst-barcode
-catalogue-date 2011-03-12 22:14:05 +0100
+catalogue-date 2012-11-16 20:45:05 +0100
catalogue-license lppl
-catalogue-version 0.08
+catalogue-version 0.10
++++++ pst-circ.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-circ/Changes new/doc/generic/pst-circ/Changes
--- old/doc/generic/pst-circ/Changes 2011-03-04 01:32:36.000000000 +0100
+++ new/doc/generic/pst-circ/Changes 2013-05-18 00:25:16.000000000 +0200
@@ -1,3 +1,5 @@
+2.03 2013-05-15 - added new symbol newSwitch and new option ison (cs)
+2.02 2011-05-11 - fix bug with \psdot in transistor module
2.01 2011-03-03 - typos
2.00 2011-01-28 - new IEEE symbols for integrated circuits
- some more new symbols
Files old/doc/generic/pst-circ/pst-circ-doc.pdf and new/doc/generic/pst-circ/pst-circ-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-circ/pst-circ-doc.tex new/doc/generic/pst-circ/pst-circ-doc.tex
--- old/doc/generic/pst-circ/pst-circ-doc.tex 2011-03-04 01:32:36.000000000 +0100
+++ new/doc/generic/pst-circ/pst-circ-doc.tex 2013-05-18 00:25:16.000000000 +0200
@@ -1,4 +1,4 @@
-%% $Id: pst-circ-doc.tex 468 2011-03-03 18:04:29Z herbert $
+%% $Id: pst-circ-doc.tex 780 2013-05-15 06:35:30Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\usepackage[utf8]{inputenc}
@@ -97,8 +97,8 @@
of having older versions, go to \url{http://www.CTAN.org/} and load the newest version.
\vfill\noindent
-\begingroup\setlength\emergencystretch{3em}\raggedright
-\sloppy
+\raggedright
+\begin{sloppypar}
Thanks to: \\
\mbox{Rafal Bartczuk},
\mbox{Christoph Bersch},
@@ -116,9 +116,11 @@
\mbox{Steven P. McPherson},
\mbox{Ted Pavlic},
\mbox{Alan Ristow},
+ \mbox{Uwe Siart},
+ \mbox{Carlos Marcelo de Oliveira Stein},
\mbox{Douglas Waud}, and
\mbox{Richard Weissnar}.
-\endgroup
+\end{sloppypar}
\end{abstract}
\clearpage
@@ -1308,9 +1310,136 @@
\end{pspicture}
\end{LTXexample}
+%
+% Modified pst-circ Components
+%
+\section{Modified default symbols}
-\subsection{Examples}
+\subsection{Dipole}
+
+%
+% New Diode
+%
+\subsubsection{New Diode}
+\xLcs{NewDiode}
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}[showgrid=false](3,4)
+ \pnode(0,1){A}
+ \pnode(3,1){B}
+ \pnode(0,3){C}
+ \pnode(3,3){D}
+ \newdiode(C)(D){$D_1$}
+ \newdiode[ison=false](A)(B){$D_2$}
+\end{pspicture}
+\end{LTXexample}
+
+%
+% New Zener
+%
+\subsubsection{New Zener}
+\xLcs{NewZener}
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}[showgrid=false](3,4)
+ \pnode(0,1){A}
+ \pnode(3,1){B}
+ \pnode(0,3){C}
+ \pnode(3,3){D}
+ \newZener(C)(D){$D_1$}
+ \newZener[ison=false](A)(B){$D_2$}
+\end{pspicture}
+\end{LTXexample}
+
+%
+% New LED
+%
+\subsubsection{New LED}
+\xLcs{NewLED}
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}[showgrid=false](3,4)
+ \pnode(0,1){A}
+ \pnode(3,1){B}
+ \pnode(0,3){C}
+ \pnode(3,3){D}
+ \newLED(C)(D){$D_1$}
+ \newLED[ison=false](A)(B){$D_2$}
+\end{pspicture}
+\end{LTXexample}
+
+%
+% New Ideal Switch
+%
+\subsubsection{New Ideal Switch}
+\xLcs{NewSwitch}
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}[showgrid=false](3,4)
+ \pnode(0,1){A}
+ \pnode(3,1){B}
+ \pnode(0,3){C}
+ \pnode(3,3){D}
+ \newSwitch(C)(D){$S_1$}
+ \newSwitch[ison=false](A)(B){$S_2$}
+\end{pspicture}
+\end{LTXexample}
+
+%
+% New Capacitor
+%
+\subsubsection{New Capacitor}
+\xLcs{RFLine}
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}[showgrid=false](3,2)
+ \pnode(0,1){A}
+ \pnode(3,1){B}
+ \newcapacitor(A)(B){$C_1$}
+\end{pspicture}
+\end{LTXexample}
+
+%
+% New Armature
+%
+\subsubsection{New Armature (motor or generator)}
+\xLcs{RFLine}
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}[showgrid=false](3,4)
+ \pnode(0,1){A}
+ \pnode(3,1){B}
+ \pnode(0,3){C}
+ \pnode(3,3){D}
+ \newarmature[labelInside=1](C)(D){$M_{CC}$}
+ \newarmature[labelInside=2](A)(B){$G_{CC}$}
+\end{pspicture}
+\end{LTXexample}
+
+%
+% VDC
+%
+\subsubsection{V DC}
+\xLcs{RFLine}
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}[showgrid=false](3,2)
+ \pnode(0,1){A}
+ \pnode(3,1){B}
+ \vdc(A)(B){$V_{DC}$}
+\end{pspicture}
+\end{LTXexample}
+
+%
+% VAC
+%
+\subsubsection{V AC}
+\xLcs{RFLine}
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}[showgrid=false](3,2)
+ \pnode(0,1){A}
+ \pnode(3,1){B}
+ \vac(A)(B){$V_{AC}$}
+\end{pspicture}
+\end{LTXexample}
+
+
+
+\section{Examples}
\begin{LTXexample}[pos=t]
\begin{pspicture}(-1.5,-1)(6,5)
@@ -1575,7 +1704,7 @@
\begin{LTXexample}[pos=t]
\begin{pspicture}(0,-0.5)(14,4)
% [subgriddiv=1,griddots=10]
- \pnode(0,0){B}\pnode(0,3){A}
+ \pnode(0,-0.50){B}\pnode(0,3){A}
\pnode(2.5,3.5){C}\pnode(2.5,-0.5){D}\pnode(5,3){E}\pnode(6.5,1.5){F}
\pnode(5,0){G}\pnode(3.5,1.5){H} \pnode(8,2.5){I}\pnode(8,1){J}
\pnode(10,2.5){K}\pnode(10,1){L} \pnode(14,2.5){M}\pnode(12,1){N}
@@ -3163,6 +3292,7 @@
%
% IC Example 8-pins
%
+\clearpage
\subsubsection{8-Pin DIP IC}
\begin{LTXexample}[pos=t]
\begin{pspicture}(-1,-2)(5,4)
@@ -3208,6 +3338,7 @@
%
% IC Example 14-pin
%
+\clearpage
\subsubsection{14-Pin DIP IC}
\begin{LTXexample}[pos=t]
\begin{pspicture}(-1,-2)(5,6)
@@ -3233,6 +3364,7 @@
\end{LTXexample}
%
+\clearpage
\subsubsection{14-Pin DIP IC all inverted}
% IC Example 14-pin all inverted
%
@@ -3266,6 +3398,7 @@
%
% IC Example 16-pin
%
+\clearpage
\subsubsection{16-Pin DIP IC}
\begin{LTXexample}[pos=t]
\begin{pspicture}(-1,-2)(5,6)
@@ -3292,6 +3425,7 @@
% IC Example 16-pin all inverted
%
+\clearpage
\subsubsection{16-Pin DIP IC all inverted}
\begin{LTXexample}[pos=t]
\begin{pspicture}(-1,-2)(5,6)
@@ -3323,6 +3457,7 @@
%
% IC Example 20-pin
%
+\clearpage
\subsubsection{20-Pin DIP IC}
\begin{LTXexample}[pos=t]
\begin{pspicture}(-1,-2)(5,7)
@@ -3352,6 +3487,7 @@
%
% IC Example 20-pin all inverted
%
+\clearpage
\subsubsection{20-Pin DIP IC all inverted}
\begin{LTXexample}[pos=t]
\begin{pspicture}(-1,-2)(5,7)
@@ -3386,78 +3522,72 @@
%
% IC Example 32-pin
%
+\clearpage
\subsubsection{32-Pin DIP IC}
\begin{LTXexample}[pos=t]
\begin{pspicture}(-1,-2)(6,9.5)
- \logicic[nicpins=32,%
- pintl=true,pintllabel=tl,pintlnumber=1,%
- pintc=true,pintclabel=tc,pintcnumber=2,%
- pintr=true,pintrlabel=tr,pintrnumber=3,%
- invertpintl=true,invertpintc=true,invertpintr=true,%
- pinbl=true,pinbllabel=bl,pinblnumber=1,%
- pinbc=true,pinbclabel=bc,pinbcnumber=2,%
- pinbr=true,pinbrlabel=br,pinbrnumber=3,%
- invertpinbl=true,invertpinbc=true,invertpinbr=true,%
- pinalabel=a,pinblabel=b,pinclabel=c,pindlabel=d,%
- pinelabel=e,pinflabel=f,pinglabel=g,pinhlabel=h,%
- pinilabel=i,pinjlabel=j,pinklabel=k,pinllabel=l,%
- pinmlabel=m,pinnlabel=n,pinolabel=o,pinplabel=p,%
- pinqlabel=q,pinrlabel=r,pinslabel=s,pintlabel=t,%
- pinulabel=u,pinvlabel=v,pinwlabel=w,pinxlabel=x,%
- pinylabel=y,pinzlabel=z,pinaalabel=aa,pinablabel=ab,%
- pinaclabel=ac,pinadlabel=ad,pinaelabel=ae,pinaflabel=af,%
- pinanumber=1,pinbnumber=2,pincnumber=3,pindnumber=4,%
- pinenumber=5,pinfnumber=6,pingnumber=7,pinhnumber=8,
- pininumber=9,pinjnumber=10,pinknumber=11,pinlnumber=12,%
- pinmnumber=13,pinnnumber=14,pinonumber=15,pinpnumber=16,%
- pinqnumber=17,pinrnumber=18,pinsnumber=19,pintnumber=20,%
- pinunumber=21,pinvnumber=22,pinwnumber=23,pinxnumber=24,%
- pinynumber=25,pinznumber=26,pinaanumber=27,pinabnumber=28,%
- pinacnumber=29,pinadnumber=30,pinaenumber=31,pinafnumber=32]%
- (0,0){Name}
+\logicic[nicpins=32, pintl=true,pintllabel=tl,pintlnumber=1,
+ pintc=true,pintclabel=tc,pintcnumber=2,pintr=true,pintrlabel=tr,pintrnumber=3,%
+ invertpintl=true,invertpintc=true,invertpintr=true,
+ pinbl=true,pinbllabel=bl,pinblnumber=1,pinbc=true,pinbclabel=bc,pinbcnumber=2,%
+ pinbr=true,pinbrlabel=br,pinbrnumber=3,%
+ invertpinbl=true,invertpinbc=true,invertpinbr=true,%
+ pinalabel=a,pinblabel=b,pinclabel=c,pindlabel=d,%
+ pinelabel=e,pinflabel=f,pinglabel=g,pinhlabel=h,%
+ pinilabel=i,pinjlabel=j,pinklabel=k,pinllabel=l,%
+ pinmlabel=m,pinnlabel=n,pinolabel=o,pinplabel=p,%
+ pinqlabel=q,pinrlabel=r,pinslabel=s,pintlabel=t,%
+ pinulabel=u,pinvlabel=v,pinwlabel=w,pinxlabel=x,%
+ pinylabel=y,pinzlabel=z,pinaalabel=aa,pinablabel=ab,%
+ pinaclabel=ac,pinadlabel=ad,pinaelabel=ae,pinaflabel=af,%
+ pinanumber=1,pinbnumber=2,pincnumber=3,pindnumber=4,%
+ pinenumber=5,pinfnumber=6,pingnumber=7,pinhnumber=8,
+ pininumber=9,pinjnumber=10,pinknumber=11,pinlnumber=12,%
+ pinmnumber=13,pinnnumber=14,pinonumber=15,pinpnumber=16,%
+ pinqnumber=17,pinrnumber=18,pinsnumber=19,pintnumber=20,%
+ pinunumber=21,pinvnumber=22,pinwnumber=23,pinxnumber=24,%
+ pinynumber=25,pinznumber=26,pinaanumber=27,pinabnumber=28,%
+ pinacnumber=29,pinadnumber=30,pinaenumber=31,pinafnumber=32](0,0){Name}
\end{pspicture}
\end{LTXexample}
%
% IC Example 32-pin all inverted
%
+\clearpage
\subsubsection{32-Pin DIP IC all inverted}
\begin{center}
\begin{pspicture}(-1,-2)(6,9.5)
- \logicic[nicpins=32,%
- pintl=true,pintllabel=tl,pintlnumber=1,%
- pintc=true,pintclabel=tc,pintcnumber=2,%
- pintr=true,pintrlabel=tr,pintrnumber=3,%
- invertpintl=true,invertpintc=true,invertpintr=true,%
- pinbl=true,pinbllabel=bl,pinblnumber=1,%
- pinbc=true,pinbclabel=bc,pinbcnumber=2,%
- pinbr=true,pinbrlabel=br,pinbrnumber=3,%
- invertpinbl=true,invertpinbc=true,invertpinbr=true,%
- pinalabel=a,pinblabel=b,pinclabel=c,pindlabel=d,%
- pinelabel=e,pinflabel=f,pinglabel=g,pinhlabel=h,%
- pinilabel=i,pinjlabel=j,pinklabel=k,pinllabel=l,%
- pinmlabel=m,pinnlabel=n,pinolabel=o,pinplabel=p,%
- pinqlabel=q,pinrlabel=r,pinslabel=s,pintlabel=t,%
- pinulabel=u,pinvlabel=v,pinwlabel=w,pinxlabel=x,%
- pinylabel=y,pinzlabel=z,pinaalabel=aa,pinablabel=ab,%
- pinaclabel=ac,pinadlabel=ad,pinaelabel=ae,pinaflabel=af,%
- pinanumber=1,pinbnumber=2,pincnumber=3,pindnumber=4,%
- pinenumber=5,pinfnumber=6,pingnumber=7,pinhnumber=8,
- pininumber=9,pinjnumber=10,pinknumber=11,pinlnumber=12,%
- pinmnumber=13,pinnnumber=14,pinonumber=15,pinpnumber=16,%
- pinqnumber=17,pinrnumber=18,pinsnumber=19,pintnumber=20,%
- pinunumber=21,pinvnumber=22,pinwnumber=23,pinxnumber=24,%
- pinynumber=25,pinznumber=26,pinaanumber=27,pinabnumber=28,%
- pinacnumber=29,pinadnumber=30,pinaenumber=31,pinafnumber=32,%
- invertpina=true,invertpinb=true,invertpinc=true,invertpind=true,%
- invertpine=true,invertpinf=true,invertping=true,invertpinh=true,%
- invertpini=true,invertpinj=true,invertpink=true,invertpinl=true,%
- invertpinm=true,invertpinn=true,invertpino=true,invertpinp=true,%
- invertpinq=true,invertpinr=true,invertpins=true,invertpint=true,%
- invertpinu=true,invertpinv=true,invertpinw=true,invertpinx=true,%
- invertpiny=true,invertpinz=true,invertpinaa=true,invertpinab=true,%
- invertpinac=true,invertpinad=true,invertpinae=true,invertpinaf=true]%
- (0,0){Name}
+\logicic[nicpins=32,pintl=true,pintllabel=tl,pintlnumber=1,
+ pintc=true,pintclabel=tc,pintcnumber=2,pintr=true,pintrlabel=tr,pintrnumber=3,
+ invertpintl=true,invertpintc=true,invertpintr=true,%
+ pinbl=true,pinbllabel=bl,pinblnumber=1,pinbc=true,pinbclabel=bc,pinbcnumber=2,%
+ pinbr=true,pinbrlabel=br,pinbrnumber=3,
+ invertpinbl=true,invertpinbc=true,invertpinbr=true,%
+ pinalabel=a,pinblabel=b,pinclabel=c,pindlabel=d,%
+ pinelabel=e,pinflabel=f,pinglabel=g,pinhlabel=h,%
+ pinilabel=i,pinjlabel=j,pinklabel=k,pinllabel=l,%
+ pinmlabel=m,pinnlabel=n,pinolabel=o,pinplabel=p,%
+ pinqlabel=q,pinrlabel=r,pinslabel=s,pintlabel=t,%
+ pinulabel=u,pinvlabel=v,pinwlabel=w,pinxlabel=x,%
+ pinylabel=y,pinzlabel=z,pinaalabel=aa,pinablabel=ab,%
+ pinaclabel=ac,pinadlabel=ad,pinaelabel=ae,pinaflabel=af,%
+ pinanumber=1,pinbnumber=2,pincnumber=3,pindnumber=4,%
+ pinenumber=5,pinfnumber=6,pingnumber=7,pinhnumber=8,
+ pininumber=9,pinjnumber=10,pinknumber=11,pinlnumber=12,%
+ pinmnumber=13,pinnnumber=14,pinonumber=15,pinpnumber=16,%
+ pinqnumber=17,pinrnumber=18,pinsnumber=19,pintnumber=20,%
+ pinunumber=21,pinvnumber=22,pinwnumber=23,pinxnumber=24,%
+ pinynumber=25,pinznumber=26,pinaanumber=27,pinabnumber=28,%
+ pinacnumber=29,pinadnumber=30,pinaenumber=31,pinafnumber=32,%
+ invertpina=true,invertpinb=true,invertpinc=true,invertpind=true,%
+ invertpine=true,invertpinf=true,invertping=true,invertpinh=true,%
+ invertpini=true,invertpinj=true,invertpink=true,invertpinl=true,%
+ invertpinm=true,invertpinn=true,invertpino=true,invertpinp=true,%
+ invertpinq=true,invertpinr=true,invertpins=true,invertpint=true,%
+ invertpinu=true,invertpinv=true,invertpinw=true,invertpinx=true,%
+ invertpiny=true,invertpinz=true,invertpinaa=true,invertpinab=true,%
+ invertpinac=true,invertpinad=true,invertpinae=true,invertpinaf=true](0,0){Name}
\end{pspicture}
\end{center}
@@ -3501,6 +3631,8 @@
\end{pspicture}
\end{lstlisting}
+\clearpage
+\section{Relay Ladder Logic}
%
% XIC
@@ -3651,35 +3783,50 @@
\end{pspicture}
\end{LTXexample}
-%
-% Modified pst-circ Components
-%
-\subsubsection{Modified default symbols}
+
+\clearpage
+
+\subsection{Examples}
+
\begin{LTXexample}[pos=t]
-\begin{pspicture}(-1,-1)(5,10)
-\newdiode[labeloffset=-0.8](0,0)(4,0){$\backslash$newdiode}
-\newLED[labeloffset=-0.8](0,2)(4,2){$\backslash$newLED}
-\newZener[labeloffset=-0.8](0,4)(4,4){$\backslash$newZener}
-\newcapacitor[labeloffset=-0.8](0,6)(4,6){$\backslash$newcapacitor}
-\newcapacitor[labeloffset=-0.8](0,6)(4,6){$\backslash$newcapacitor}
-\newcapacitor[labeloffset=-0.8](0,6)(4,6){$\backslash$newcapacitor}
-\vdc[labeloffset=-0.8](0,8)(4,8){$\backslash$vdc}
-\vac[labeloffset=-0.8](0,10)(4,10){$\backslash$vac}
+\begin{pspicture}(0,0)(15,6)
+ \pnode(0.5,0){A} \pnode(0.5,2.75){B} \pnode(0.5,5.5){C}
+ \pnode(3,0){D} \pnode(3,2.75){E} \pnode(3,5.5){F}
+ \pnode(4.75,0){G} \pnode(4.75,5.50){H}
+ \pnode(6.5,0){I} \pnode(6.5,5.5){J}
+ \vac(B)(E){$V$}
+ \newdiode(B)(C){$D_1$}
+ \newdiode[ison=false](E)(F){$D_2$}
+ \newdiode[ison=false](A)(B){$D_3$}
+ \newdiode(D)(E){$D_4$}
+ \capacitor(G)(H){$C$}
+ \newarmature[labelInside=1](I)(J){}
+ \wire(C)(F) \wire(A)(D) \wire(D)(G) \wire(I)(G) \wire(F)(H) \wire(H)(J)
+
+ \pnode(9,0){K} \pnode(9,2.75){L} \pnode(9,5.5){M}
+ \pnode(11.5,0){N} \pnode(11.5,2.75){O}
+ \pnode(11.5,5.5){P}
+ \pnode(13.25,0){Q} \pnode(13.25,5.5){R}
+ \pnode(15,0){S} \pnode(15,5.5){T}
+ \vac(L)(O){$V$}
+ \newdiode[ison=false](L)(M){$D_1$}
+ \newdiode(O)(P){$D_2$}
+ \newdiode(K)(L){$D_3$}
+ \newdiode[ison=false](N)(O){$D_4$}
+ \newcapacitor(Q)(R){$C$}
+ \newarmature[labelInside=1](S)(T){}
+ \wire(M)(P) \wire(K)(N) \wire(N)(Q) \wire(S)(Q) \wire(P)(R) \wire(R)(T)
\end{pspicture}
\end{LTXexample}
-%
-% \vac
-%
\begin{LTXexample}[pos=l]
-\begin{pspicture}(-1,-1)(5,4)
+\begin{pspicture}(-1,-1)(4,4)
\vac[labeloffset=-0.7](0,0)(4,0){$\backslash$vac}
\vac[labeloffset=1](0,0)(2,3.464){$\backslash$vac}
\vac[labeloffset=1](2,3.464)(4,0){$\backslash$vac}
\end{pspicture}
\end{LTXexample}
-
\section{Adding new components}
Adding new components is not simple unless you need only a simple dipole. For dipoles a macro is provided that generates all helping macros for a new component so that you need to write only the actual drawing code.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-circ.doc.tlpobj new/tlpkg/tlpobj/pst-circ.doc.tlpobj
--- old/tlpkg/tlpobj/pst-circ.doc.tlpobj 2011-05-13 04:19:58.000000000 +0200
+++ new/tlpkg/tlpobj/pst-circ.doc.tlpobj 2013-05-18 03:42:40.000000000 +0200
@@ -1,9 +1,9 @@
name pst-circ.doc
category Package
-revision 22444
+revision 30527
shortdesc doc files of pst-circ
relocated 1
-docfiles size=256
+docfiles size=265
RELOC/doc/generic/pst-circ/Changes
RELOC/doc/generic/pst-circ/README
RELOC/doc/generic/pst-circ/more_docs/dtk03-3.pdf
++++++ pst-circ.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-circ/pst-circ.tex new/tex/generic/pst-circ/pst-circ.tex
--- old/tex/generic/pst-circ/pst-circ.tex 2011-05-13 00:54:37.000000000 +0200
+++ new/tex/generic/pst-circ/pst-circ.tex 2013-05-18 00:25:16.000000000 +0200
@@ -1,4 +1,5 @@
-%% This is file `pst-circ.tex',
+%% $Id: pst-circ.tex 780 2013-05-15 06:35:30Z herbert $
+%% This is file `pst-circ.tex'
%%
%% IMPORTANT NOTICE:
%%
@@ -25,8 +26,8 @@
\ifx\PSTXKeyLoaded\endinput \else\input pst-xkey \fi
\ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
%
-\def\fileversion{2.02}
-\def\filedate{2011/05/11}
+\def\fileversion{2.03}
+\def\filedate{2013/05/15}
\message{`pst-circ' v\fileversion (hv)}
%
\edef\PstAtCode{\the\catcode`\@}
@@ -389,6 +390,9 @@
% Bipole If Statements
\newif\ifPst@polarized
+% Diodes
+\newif\ifPst@ison
+
% Define Integer Keys
\define@choicekey[psset]{pst-circ}{ninputs}{0,1,2,3,4}[2]{\def\psk@ninputs{#1}}
\define@choicekey[psset]{pst-circ}{segmentdisplay}{0,1,2,3,4,5,6,7,8,9,10}[10]{\def\psk@segmentdisplay{#1}}
@@ -696,10 +700,6 @@
\define@key[psset]{pst-circ}{pinaf}[true]{\@nameuse{Pst@pinaf#1}}
\define@key[psset]{pst-circ}{invertpinaf}[false]{\@nameuse{Pst@invertpinaf#1}}
-
-
-
-
\define@key[psset]{pst-circ}{pinla}[true]{\@nameuse{Pst@pinla#1}}
\define@key[psset]{pst-circ}{invertpinla}[false]{\@nameuse{Pst@invertpinla#1}}
\define@key[psset]{pst-circ}{pinlb}[true]{\@nameuse{Pst@pinlb#1}}
@@ -768,10 +768,6 @@
\define@key[psset]{pst-circ}{pinrp}[true]{\@nameuse{Pst@pinrp#1}}
\define@key[psset]{pst-circ}{invertpinrp}[false]{\@nameuse{Pst@invertpinrp#1}}
-
-
-
-
\define@key[psset]{pst-circ}{pintl}[false]{\@nameuse{Pst@pintl#1}}
\define@key[psset]{pst-circ}{invertpintl}[false]{\@nameuse{Pst@invertpintl#1}}
\define@key[psset]{pst-circ}{pintc}[false]{\@nameuse{Pst@pintc#1}}
@@ -819,6 +815,9 @@
% Define Ladder Bipole Keys
\define@key[psset]{pst-circ}{polarized}[false]{\@nameuse{Pst@polarized#1}}
+% Define Diodes
+\define@key[psset]{pst-circ}{ison}[true]{\@nameuse{Pst@ison#1}}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -909,7 +908,8 @@
pintb=false,invertpintb=false,pintc=false,invertpintc=false,pintd=false,invertpintd=false,
pinte=false,invertpinte=false,pinba=false,invertpinba=false,pinbb=false,invertpinbb=false,
pinbc=false,invertpinbc=false,pinbd=false,invertpinbd=false,pinbe=false,invertpinbe=false,
- dpleft=false,dpright=true,latch=false,unlatch=false,contactclosed=false,polarized=false
+ dpleft=false,dpright=true,latch=false,unlatch=false,contactclosed=false,polarized=false,
+ ison=true
}% hv
%\psset[pstricks]{radius=0.5}
@@ -4103,7 +4103,7 @@
\def\logicor{\@ifnextchar[{\pst@logicor}{\pst@logicor[]}}
\def\pst@logicor[#1]{\@ifnextchar({\pst@logicori[#1]{0}}{\pst@logicori[#1]}}
\def\pst@logicori[#1]#2(#3)#4{{%
- \psset{#1}%
+ \psset{#1}%
\rput{#2}(#3){
% Inputs
\ifcase\psk@ninputs\or
@@ -4218,7 +4218,7 @@
\def\pst@logicxor[#1]{\@ifnextchar({\pst@logicxori[#1]{0}}{\pst@logicxori[#1]}}
\def\pst@logicxori[#1]#2(#3)#4{{%
\psset{#1}%
- \rput{#2}(#3){
+ \rput{#2}(#3){%
% Inputs
\ifcase\psk@ninputs\or
\ifPst@inputa
@@ -5017,8 +5017,13 @@
\psline[arrows=-,linewidth=1.5\pslinewidth](0.25,-0.4)(0.25,0.4)
\psline[arrows=-,linewidth=\pslinewidth](0.25,-0.2)(0.5,-0.3)(0.5,-0.6)
\else
- \pspolygon[arrows=-,linewidth=1.5\pslinewidth,%
+ \ifPst@ison%
+ \pspolygon[arrows=-,linewidth=1.5\pslinewidth,%
fillstyle=solid,fillcolor=black](-0.25,-0.3)(-0.25,0.3)(0.25,0)
+ \else
+ \pspolygon[arrows=-,linewidth=1.5\pslinewidth]%
+ (-0.25,-0.3)(-0.25,0.3)(0.25,0)
+ \fi
\psline[arrows=-,linewidth=1.5\pslinewidth](0.25,0.3)(0.25,-0.3)
\ifx\psk@Dstyle\pst@Dstyle@thyristor
\psline[arrows=-,linewidth=1.5\pslinewidth](0,-0.1)(0,-0.35)
@@ -5041,8 +5046,13 @@
\ignorespaces}
%
\def\pst@draw@newZener{{%
- \pspolygon[arrows=-,linewidth=1.5\pslinewidth,%
+ \ifPst@ison%
+ \pspolygon[arrows=-,linewidth=1.5\pslinewidth,%
fillstyle=solid,fillcolor=black](-0.25,-0.3)(-0.25,0.3)(0.25,0)
+ \else
+ \pspolygon[arrows=-,linewidth=1.5\pslinewidth]%
+ (-0.25,-0.3)(-0.25,0.3)(0.25,0)
+ \fi
\psline[arrows=-,linewidth=1.5\pslinewidth](0.1,0.4)(0.25,0.3)(0.25,-0.3)(0.4,-0.4)
\pnode(-0.25,0){dipole@1}
\pnode(0.25,0){dipole@2}
@@ -5059,8 +5069,13 @@
\ignorespaces}
%
\def\pst@draw@newLED{{%
- \pspolygon[arrows=-,linewidth=1.5\pslinewidth,%
+ \ifPst@ison%
+ \pspolygon[arrows=-,linewidth=1.5\pslinewidth,%
fillstyle=solid,fillcolor=black](-0.25,-0.3)(-0.25,0.3)(0.25,0)
+ \else
+ \pspolygon[arrows=-,linewidth=1.5\pslinewidth]%
+ (-0.25,-0.3)(-0.25,0.3)(0.25,0)
+ \fi
\psline[arrows=-,linewidth=1.5\pslinewidth](0.25,0.3)(0.25,-0.3)
\multips(-0.15,0.35)(0.2,0){2}{\psline[arrows=->](0,0)(0.2,0.25)}
\pnode(-0.25,0){dipole@1}
@@ -5068,6 +5083,30 @@
}}
%
+% \newarmature
+%
+\def\newarmature{\@ifnextchar[{\pst@newarmature}{\pst@newarmature[]}}
+\def\pst@newarmature[#1](#2)(#3)#4{{%
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@newarmature}\ignorespaces}
+%
+\def\pst@draw@newarmature{{%
+ \pnode(-1,0){dipole@1}
+ \pnode(1,0){dipole@2}
+ % Input
+ \psline(-1,0)(-0.7,0)
+ % Body
+ \psline(-0.7,0.2)(0.7,0.2)(0.7,-0.2)(-0.7,-0.2)(-0.7,0.2)
+ \pscircle[fillstyle=solid](0,0){0.5}
+ % Output
+ \psline(1,0)(0.7,0)
+ % Name
+ \ifcase\psk@labelInside\or% do nothing
+ \rput(0,0){\large\bf M}\or% case 1 - motor
+ \rput(0,0){\large\bf G}% case 2 - generator
+ \fi
+}}
+
+%
% \vdc
%
\def\vdc{\@ifnextchar[{\pst@vdc}{\pst@vdc[]}}
@@ -5109,9 +5148,32 @@
\pscircle[linewidth=1.5\pslinewidth](0,0){0.5}
}}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\catcode`\@=\PstAtCode\relax
%
-\endinput
+% \newSwitch (New Switch)
+%
+\def\newSwitch{\@ifnextchar[{\pst@newSwitch}{\pst@newSwitch[]}}
+\def\pst@newSwitch[#1](#2)(#3)#4{{%
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@newSwitch}
+ \pst@getcoor{#2}\pst@tempa
+ \pst@getcoor{#3}\pst@tempb
+ \ignorespaces}
+%
+\def\pst@draw@newSwitch{{%
+ \ifPst@ison
+ \pnode(-0.6,0){dipole@1}
+ \pnode(0.6,0){dipole@2}
+ \psline[arrows=-,linewidth=4\pslinewidth](-0.5,-0.005)(0.5,-0.005)
+ \pscircle[fillstyle=solid,fillcolor=black](-0.5,0){0.1}
+ \pscircle[fillstyle=solid,fillcolor=black](0.5,0){0.1}
+ \else
+ \pnode(-0.6,0){dipole@1}
+ \pnode(0.6,0){dipole@2}
+ \psline[arrows=-,linewidth=2\pslinewidth](-0.5,0)(0.5,0.5)
+ \pscircle[fillstyle=solid](-0.5,0){0.1}
+ \pscircle[fillstyle=solid](0.5,0){0.1}
+ \fi
+}}
+%
+\catcode`\@=\PstAtCode\relax
%
+\endinput
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-circ.tlpobj new/tlpkg/tlpobj/pst-circ.tlpobj
--- old/tlpkg/tlpobj/pst-circ.tlpobj 2011-05-13 04:19:59.000000000 +0200
+++ new/tlpkg/tlpobj/pst-circ.tlpobj 2013-05-18 03:42:41.000000000 +0200
@@ -1,20 +1,20 @@
name pst-circ
category Package
-revision 22444
+revision 30527
shortdesc PSTricks package for drawing electric circuits.
relocated 1
-longdesc Pst-circ is a package built using PSTricks and in particular
-longdesc pst-node. It can easily draw current 2-terminal devices and
-longdesc some 3- and 4-terminal devices used in electronic or electric
-longdesc theory. The package's macros are designed with a view to
-longdesc 'logical' representation of circuits, as far as possible, so as
-longdesc to relieve the user of purely graphical considerations when
+longdesc The package is built using PSTricks and in particular pst-node.
+longdesc It can easily draw current 2-terminal devices and some 3- and
+longdesc 4-terminal devices used in electronic or electric theory. The
+longdesc package's macros are designed with a view to 'logical'
+longdesc representation of circuits, as far as possible, so as to
+longdesc relieve the user of purely graphical considerations when
longdesc expressing a circuit.
-runfiles size=50
+runfiles size=51
RELOC/dvips/pst-circ/pst-circ.pro
RELOC/tex/generic/pst-circ/pst-circ.tex
RELOC/tex/latex/pst-circ/pst-circ.sty
catalogue-ctan /graphics/pstricks/contrib/pst-circ
-catalogue-date 2011-05-12 00:58:47 +0200
+catalogue-date 2013-05-17 14:10:30 +0200
catalogue-license lppl
-catalogue-version 2.02
+catalogue-version 2.03
++++++ pst-electricfield.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-electricfield.doc.tlpobj new/tlpkg/tlpobj/pst-electricfield.doc.tlpobj
--- old/tlpkg/tlpobj/pst-electricfield.doc.tlpobj 2011-03-29 04:19:06.000000000 +0200
+++ new/tlpkg/tlpobj/pst-electricfield.doc.tlpobj 2013-04-10 21:08:27.000000000 +0200
@@ -1,6 +1,6 @@
name pst-electricfield.doc
category Package
-revision 21864
+revision 29803
shortdesc doc files of pst-electricfield
relocated 1
docfiles size=2007
++++++ pst-electricfield.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-electricfield.tlpobj new/tlpkg/tlpobj/pst-electricfield.tlpobj
--- old/tlpkg/tlpobj/pst-electricfield.tlpobj 2011-03-29 04:19:10.000000000 +0200
+++ new/tlpkg/tlpobj/pst-electricfield.tlpobj 2013-04-10 21:08:32.000000000 +0200
@@ -1,6 +1,6 @@
name pst-electricfield
category Package
-revision 21864
+revision 29803
shortdesc Draw electric field and equipotential lines with PStricks.
relocated 1
longdesc The package provides macros to plot electric field and
@@ -12,6 +12,6 @@
RELOC/tex/generic/pst-electricfield/pst-electricfield.tex
RELOC/tex/latex/pst-electricfield/pst-electricfield.sty
catalogue-ctan /graphics/pstricks/contrib/pst-electricfield
-catalogue-date 2011-03-28 22:21:58 +0200
+catalogue-date 2012-06-17 01:47:14 +0200
catalogue-license lppl
catalogue-version 0.14
++++++ pst-eucl.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-eucl/Changes new/doc/generic/pst-eucl/Changes
--- old/doc/generic/pst-eucl/Changes 2011-12-24 01:28:58.000000000 +0100
+++ new/doc/generic/pst-eucl/Changes 2013-03-12 23:32:19.000000000 +0100
@@ -1,8 +1,15 @@
pst-eucl.pro --------
+1.01 2012/09/21 - fix for introduced bug
1.00 2011/08/05 - fix bug in /InterLines
pst-eucl.tex --------
+1.47 2013/03/12 - insert \ignorespaces in \pstRightAngle (hv)
+1.46 2013/01/09 - use the eucl dictionary when only needed (hv)
+1.45 2012/12/31 - fixed introduced bug with PtoC (hv)
+ moved loading of pst-xkey to the beginning
+1.44 2012/09/28 - allow filling of angles (hv)
+1.43 2012/08/22 - delete the node macro from pst-node (hv)
1.42 2011/12/22 - modified code for marks (hv)
1.41 2011/11/19 - added different marks for angles (hv)
1.40 2011/11/16 - fix for \pstMarkAngle (hv)
Files old/doc/generic/pst-eucl/pst-eucl-doc.pdf and new/doc/generic/pst-eucl/pst-eucl-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-eucl.doc.tlpobj new/tlpkg/tlpobj/pst-eucl.doc.tlpobj
--- old/tlpkg/tlpobj/pst-eucl.doc.tlpobj 2011-12-24 04:31:55.000000000 +0100
+++ new/tlpkg/tlpobj/pst-eucl.doc.tlpobj 2013-03-13 04:39:37.000000000 +0100
@@ -1,9 +1,9 @@
name pst-eucl.doc
category Package
-revision 24926
+revision 29356
shortdesc doc files of pst-eucl
relocated 1
-docfiles size=225
+docfiles size=220
RELOC/doc/generic/pst-eucl/Changes
RELOC/doc/generic/pst-eucl/README
RELOC/doc/generic/pst-eucl/doc/Examples/abscur.tex
++++++ pst-eucl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pst-eucl/pst-eucl.pro new/dvips/pst-eucl/pst-eucl.pro
--- old/dvips/pst-eucl/pst-eucl.pro 2011-08-13 01:13:08.000000000 +0200
+++ new/dvips/pst-eucl/pst-eucl.pro 2013-01-02 23:55:57.000000000 +0100
@@ -1,6 +1,6 @@
%!
% PostScript prologue for pst-eucl.tex.
-% Version 1.00 2011/08/04
+% Version 1.01 2012/09/21
% For distribution, see pstricks.tex.
%
/tx@EcldDict 40 dict def tx@EcldDict begin
@@ -42,8 +42,9 @@
%% x1 y1 x2 y2 -> Dist
/ABDist { 3 -1 roll sub dup mul 3 1 roll sub dup mul add sqrt } bind def
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% x1 y1 x2 y2 -> x1-x2 y1-y2
+%% x1 y1 x2 y2 -> x2-x1 y2-y1
/ABVect { 3 -1 roll exch sub 3 1 roll sub exch } bind def
+%/ABVect { 3 -1 roll sub 3 1 roll exch sub exch } bind def %% wrong version
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% x1 y1 x2 y2 x3 y3 x4 y4 -> x y
/InterLines {
@@ -64,7 +65,7 @@
ABVect /Vy exch def /Vx exch def
%% Dc==0 then O belong to the line
%% First project O on the line -> M (-ca;-cb)
- %% l'abscisse de M sur (OM) divis�e par R donne le cosinus
+ %% l'abscisse de M sur (OM) divisee par R donne le cosinus
%Dc neg dup Db mul exch Da mul 2 copy 0 0
%ABDist dup CR gt { pop pop pop 0 0 0 0 }
%{ ZeroEq { pop pop Db Da } if Atan /alpha exch def
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-eucl/pst-eucl.tex new/tex/generic/pst-eucl/pst-eucl.tex
--- old/tex/generic/pst-eucl/pst-eucl.tex 2011-12-24 01:28:58.000000000 +0100
+++ new/tex/generic/pst-eucl/pst-eucl.tex 2013-03-12 23:32:19.000000000 +0100
@@ -11,9 +11,13 @@
% Require PSTricks and pst-node packages
\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
\ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi
+\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey\fi
\ifx\MultidoLoaded\endinput \else\input multido.tex \fi
-\def\fileversion{1.42}
-\def\filedate{2011/12/22}%
+\csname PSTEuclideLoaded\endcsname
+\let\PSTEuclideLoaded\endinput
+\def\fileversion{1.47}
+\def\filedate{2013/03/12
+}%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
%% archives in directory macros/latex/base/lppl.txt.
@@ -21,15 +25,11 @@
\message{ This version uses the pst-xkey package for managing parameters}%
\message{ Please read the doc, some macros have a new syntax}%
\message{ use option old for upward compatibility}%
-\csname PSTEuclideLoaded\endcsname
-\let\PSTEuclideLoaded\endinput
%% prologue for postcript
\pstheader{pst-eucl.pro}%
-% interface to the `xkeyval' package
-\input pst-xkey.tex
-\pst@addfams{pst-eucl}
\edef\PstAtCode{\the\catcode`\@}%
\catcode`\@=11\relax
+\pst@addfams{pst-eucl}
% Definition of the parameters
% ----------------------------
% symbol used for the point
@@ -142,8 +142,9 @@
\def\@polygon{polygon}
\def\@polyline{polyline}
\def\@curve{curve}
+\def\tx@PtoC{ tx@Dict begin PtoC end }
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% CORRECTION OF BUG
+\iffalse %%%%%%%%%% \pst@newnode is already defined in pst-node
\def\pst@newnode#1#2#3#4{%
% DG/SR modification begin - Nov. 9, 2000 - Patch 11
\pst@killglue
@@ -162,6 +163,8 @@
\global\let\psk@name\relax
\pstree@nodehook
\global\let\pstree@nodehook\relax}
+\fi
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% list for marking segment
\def\SegSymLst{MarkHash,MarkHashh,MarkHashhh,MarkCros,MarkCross,pstslash,pstslashh,pstslashhh,circ,times,cup,triangle,wedge}
@@ -345,30 +348,28 @@
\bgroup\psset{#1}% % Affectation of local parameters
%% not good at all, but \rput{0}(#3){\rput{(#2)}{stuff}} doesn't work...
\rput(#3){%
- \ifx\psk@RightAngleType\@default
+ \ifx\psk@RightAngleType\@default%
\pspolygon(0,0)%%modif 12/2004
- (!tx@EcldDict begin /N@#4 GetNode exch Atan end \psk@RightAngleSize\space exch PtoC)
- (!tx@EcldDict begin /N@#4 GetNode exch Atan /N@#2 GetNode exch Atan end
+ (!tx@EcldDict begin /N@#4 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end)%
+ (!tx@EcldDict begin /N@#4 GetNode exch Atan /N@#2 GetNode exch Atan
2 copy sub abs 91 gt
{ 2 copy lt { exch 360 add exch } { 360 add } ifelse } if %%DR 2005/01/14
%%2 copy lt { exch 360 sub exch } if
- add 2 div 2 sqrt \psk@RightAngleSize\space mul exch PtoC)
- (!tx@EcldDict begin /N@#2 GetNode exch Atan end \psk@RightAngleSize\space
- exch PtoC)
- \else\ifx\psk@RightAngleType\@german
- \pstMarkAngle[MarkAngleRadius=\psk@RightAngleSize,
- LabelSep=\psk@RightAngleSize\space .5 mul]{#2}{#3}{#4}
- {\psscalebox{\psk@RightAngleSize}{\pscircle*{.08}}}
- \else\ifx\psk@RightAngleType\@suisseromand
- \rput{*0}
- (!tx@EcldDict begin /N@#4 GetNode exch Atan /N@#2 GetNode exch Atan end
- 2 copy lt { exch 360 sub exch } if add 2 div .45 \psk@RightAngleSize\space mul exch PtoC)
- {\psscalebox{\psk@RightAngleSize}{\pscircle*{.08}}}
- \pspolygon(0,0)
- (!tx@EcldDict begin /N@#4 GetNode exch Atan end \psk@RightAngleSize\space exch PtoC)
- (!tx@EcldDict begin /N@#2 GetNode exch Atan end \psk@RightAngleSize\space exch PtoC)
- \fi\fi\fi}
- \egroup%
+ add 2 div 2 sqrt \psk@RightAngleSize\space mul exch PtoC end)%
+ (!tx@EcldDict begin /N@#2 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end)%
+ \else\ifx\psk@RightAngleType\@german%
+ \pstMarkAngle[MarkAngleRadius=\psk@RightAngleSize,LabelSep=\psk@RightAngleSize\space .5 mul]{#2}{#3}{#4}%
+ {\psscalebox{\psk@RightAngleSize}{\pscircle*{.08}}}%
+ \else\ifx\psk@RightAngleType\@suisseromand%
+ \rput{*0}%
+ (!tx@EcldDict begin /N@#4 GetNode exch Atan /N@#2 GetNode exch Atan
+ 2 copy lt { exch 360 sub exch } if add 2 div .45 \psk@RightAngleSize\space mul exch PtoC end)%
+ {\psscalebox{\psk@RightAngleSize}{\pscircle*{.08}}}%
+ \pspolygon(0,0)%
+ (!tx@EcldDict begin /N@#4 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )%
+ (!tx@EcldDict begin /N@#2 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )%
+ \fi\fi\fi}%
+ \egroup\ignorespaces% hv 20130312
}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% #2 #3 #4 -> 3 nodes for defining the angle
@@ -388,11 +389,16 @@
/N@#4 GetNode exch Atan /N@#2 GetNode exch Atan end
2 copy lt { exch 360 sub exch } if
add 2 div dup /psRawLabelPos ED
- \psk@LabelAngleOffset\space add dup /psAngle ED
+ \psk@LabelAngleOffset\space add
\psk@LabelSep\space exch PtoC%
){#5}%
\def\pst@tempA{Angleundef}%
- \rput[\psk@LabelRefPt]{! psAngle }%
+%% define \pst@rot@angle to make it compatible with xelatex for later use
+ \edef\pst@rot@angle{ tx@EcldDict begin % expand the #4 and #2
+ /N@#4 GetNode exch Atan /N@#2 GetNode exch Atan end
+ 2 copy lt \pslbrace exch 360 sub exch \psrbrace if
+ add 2 div \psk@LabelAngleOffset\space add }%
+ \rput[\psk@LabelRefPt]{!\pst@rot@angle}%
(! \psk@MarkAngleRadius\space psRawLabelPos PtoC )%
{\ifx\psk@mark\pst@tempA\csname\psk@Mark\endcsname\else\csname\psk@mark\endcsname\fi}%
}}}%
@@ -408,17 +414,25 @@
%\pst@killglue% <------------------------------------------------- hv - DR 050315
\bgroup\pst@killglue% <------------------------------------------- DR 050315
%%begin modif alaindelplanque 11/2003
- \pst@@getcoor{#1}\xdef\@@coordi{\pst@coor}%% <-------------------- hv
- \pst@@getcoor{#3}\xdef\@@coordiii{\pst@coor}%% <------------------ hv
- \pst@@getcoor{#5}\xdef\@@coordv{\pst@coor}%% <-------------------- hv
+ \pst@@getcoor{#1}\xdef\@@coordi{\pst@coor}%% A<------------------ hv
+ \pst@@getcoor{#3}\xdef\@@coordiii{\pst@coor}%% B<------------------ hv
+ \pst@@getcoor{#5}\xdef\@@coordv{\pst@coor}%% C<- ---------------- hv
+ \pstVerb{
+ \@@coordi\space\@@coordiii\space exch 4 1 roll \@@coordv\space exch 6 1 roll % x x x y y y
+ add add 3 div /YS exch def add add 3 div /XS exch def
+ }
%%end modif alaindelplanque 11/2003
%\bgroup\use@par% % Affectation of local parameters<---- DR 050315
\use@par% % Affectation of local parameters<---- DR 050315
%%begin modif alaindelplanque 11/2003
\bgroup\ifx\psk@PosAngleA\@undef
- \psset{PosAngle={!tx@EcldDict begin \@@coordiii\space\@@coordi\space ABVect exch Atan dup
- \@@coordv\space\@@coordi\space ABVect exch Atan exch sub dup abs 180 gt { dup
- dup abs div 360 mul sub } if 2 div add 180 add end}}%% <------ hv
+ \psset{PosAngleA={!
+ /AngleAB \@@coordi\space\@@coordiii\space tx@EcldDict begin ABVect end exch Atan def
+ /AngleAC \@@coordi\space\@@coordv\space tx@EcldDict begin ABVect end exch Atan def
+ AngleAB AngleAC add 2 div dup
+ 1 exch \tx@PtoC exch \@@coordi\space 4 1 roll add 3 1 roll add XS YS Pyth2 % test if inside/outside
+ \@@coordi\space XS YS Pyth2 le { 180 add } if
+ }}%% <------ hv
\else\psset{PosAngle=\psk@PosAngleA}\fi
%%end modif alaindelplanque 11/2003
\ifx\psk@PosAngleA\@undef\else\psset{PosAngle=\psk@PosAngleA}\fi
@@ -427,9 +441,12 @@
\Pst@Geonode@i[](#1){#2}\egroup%%NEW DR 15112001
%%begin modif alaindelplanque 11/2003
\bgroup\ifx\psk@PosAngleB\@undef
- \psset{PosAngle={!tx@EcldDict begin \@@coordi\space\@@coordiii\space ABVect exch Atan dup
- \@@coordv\space\@@coordiii\space ABVect exch Atan exch sub dup abs 180 gt { dup
- dup abs div 360 mul sub } if 2 div add 180 add end}}%% <------ hv
+ \psset{PosAngleB={!
+ /AngleBC \@@coordiii\space\@@coordv\space tx@EcldDict begin ABVect end exch Atan def
+ /AngleBA \@@coordiii\space\@@coordi\space tx@EcldDict begin ABVect end exch Atan def
+ AngleBA AngleBC add 2 div dup 1 exch \tx@PtoC exch \@@coordiii\space 4 1 roll add 3 1 roll add XS YS Pyth2
+ \@@coordiii\space XS YS Pyth2 le { 180 add } if
+ }}%% <------ hv
\else\psset{PosAngle=\psk@PosAngleB}\fi
%%end modif alaindelplanque 11/2003
\ifx\psk@PosAngleB\@undef\else\psset{PosAngle=\psk@PosAngleB}\fi
@@ -438,9 +455,12 @@
\Pst@Geonode@i[](#3){#4}\egroup%%NEW DR 15112001
%%begin modif alaindelplanque 11/2003
\ifx\psk@PosAngleC\@undef
- \psset{PosAngle={!tx@EcldDict begin \@@coordiii\space\@@coordv\space ABVect exch Atan dup
- \@@coordi\space\@@coordv\space ABVect exch Atan exch sub dup abs 180 gt { dup
- dup abs div 360 mul sub } if 2 div add 180 add end}}%% <------ hv
+ \psset{PosAngleC={!
+ /AngleCB \@@coordv\space\@@coordiii\space tx@EcldDict begin ABVect end exch Atan def
+ /AngleCA \@@coordv\space\@@coordi\space tx@EcldDict begin ABVect end exch Atan def
+ AngleCB AngleCA add 2 div dup 1 exch \tx@PtoC exch \@@coordv\space 4 1 roll add 3 1 roll add XS YS Pyth2
+ \@@coordv\space XS YS Pyth2 le { 180 add } if
+ }}%% <------ hv
\else\psset{PosAngle=\psk@PosAngleC}\fi%% <----------------------- hv
%%end modif alaindelplanque 11/2003
\ifx\psk@PosAngleC\@undef\else\psset{PosAngle=\psk@PosAngleC}\fi
@@ -538,7 +558,7 @@
\ifcase \psarc@type sub \or add \fi def
%ifshowpoints\psarc@showpoints\fi
\ifx\psk@arrowA\@empty
- \ifnum\psk@liftpen=2 r angleA \tx@PtoC
+ \ifnum\psk@liftpen=2 r angleA PtoC
y add exch x add exch
moveto
\fi
@@ -1468,6 +1488,11 @@
\psk@AngleCoef\space mul
\fi
}
+\catcode`\@=\PstAtCode\relax
+
+\endinput
+%%
+%% END pst-eps.tex
%% END: pst-euclide.tex
%%% Local Variables:
%%% mode: latex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pst-eucl/pst-eucl.sty new/tex/latex/pst-eucl/pst-eucl.sty
--- old/tex/latex/pst-eucl/pst-eucl.sty 2011-08-13 01:13:08.000000000 +0200
+++ new/tex/latex/pst-eucl/pst-eucl.sty 2012-09-24 23:47:27.000000000 +0200
@@ -1,4 +1,5 @@
\RequirePackage{pstricks}
+\RequirePackage{pst-node}
\ProvidesPackage{pst-eucl}[2011/08/04 package wrapper for PSTricks pst-eucl.tex]
\DeclareOption{old}{\gdef\psteucl@old{}}% DR 10/05/2005
\ProcessOptions
@@ -7,6 +8,6 @@
[\filedate\space v\fileversion\space `PST-eucl' (dr)]
\IfFileExists{pst-eucl.pro}{%
\ProvidesFile{pst-eucl.pro}
- [2011/08/04 v. 1.00, PostScript prologue file (hv)]
+ [2012/09/21 v. 1.01, PostScript prologue file (hv)]
\@addtofilelist{pst-eucl.pro}}{}%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-eucl.tlpobj new/tlpkg/tlpobj/pst-eucl.tlpobj
--- old/tlpkg/tlpobj/pst-eucl.tlpobj 2011-12-24 04:31:56.000000000 +0100
+++ new/tlpkg/tlpobj/pst-eucl.tlpobj 2013-03-13 04:39:37.000000000 +0100
@@ -1,10 +1,10 @@
name pst-eucl
category Package
-revision 24926
+revision 29356
shortdesc Euclidian geometry with pstricks.
relocated 1
-longdesc The pst-eucl package allow the drawing of Euclidean geometric
-longdesc figures using TeX pstricks macros for specifying mathematical
+longdesc The package allows the drawing of Euclidean geometric figures
+longdesc using TeX pstricks macros for specifying mathematical
longdesc constraints. It is thus possible to build point using common
longdesc transformations or intersections. The use of coordinates is
longdesc limited to points which controlled the figure.
@@ -13,6 +13,6 @@
RELOC/tex/generic/pst-eucl/pst-eucl.tex
RELOC/tex/latex/pst-eucl/pst-eucl.sty
catalogue-ctan /graphics/pstricks/contrib/pst-eucl
-catalogue-date 2011-12-23 12:25:21 +0100
+catalogue-date 2013-03-12 20:16:10 +0100
catalogue-license lppl
-catalogue-version 1.42
+catalogue-version 1.47
++++++ pst-func.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-func/pst-func-doc.bib new/doc/generic/pst-func/pst-func-doc.bib
--- old/doc/generic/pst-func/pst-func-doc.bib 2012-01-02 00:08:23.000000000 +0100
+++ new/doc/generic/pst-func/pst-func-doc.bib 2013-04-19 01:07:03.000000000 +0200
@@ -172,3 +172,10 @@
address = {\url{http://mathworld.wolfram.com}}
}
+@Manual{pst-tools,
+ author = {Herbert Voß},
+ title = {\texttt{pst-tools} -- Helper functions},
+ publisher = {CTAN},
+ year = {2012},
+ address = {\url{CTAN:/graphics/pstricks/contrib/pst-tools}}
+}
Files old/doc/generic/pst-func/pst-func-doc.pdf and new/doc/generic/pst-func/pst-func-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-func/pst-func-doc.tex new/doc/generic/pst-func/pst-func-doc.tex
--- old/doc/generic/pst-func/pst-func-doc.tex 2012-04-14 00:35:46.000000000 +0200
+++ new/doc/generic/pst-func/pst-func-doc.tex 2013-04-19 01:07:03.000000000 +0200
@@ -1,4 +1,4 @@
-%% $Id: pst-func-doc.tex 621 2012-01-01 15:26:33Z herbert $
+%% $Id: pst-func-doc.tex 769 2013-04-18 08:53:32Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,
smallheadings, headexclude,footexclude,oneside]{pst-doc}
\usepackage[utf8]{inputenc}
@@ -6,6 +6,7 @@
\let\pstFuncFV\fileversion
\usepackage{pst-math}
\usepackage{pstricks-add}
+\usepackage{animate}
\renewcommand\bgImage{%
\psset{yunit=4cm,xunit=3}
\begin{pspicture}(-2,-0.2)(2,1.4)
@@ -22,8 +23,9 @@
\lstset{language=PSTricks,
morekeywords={psGammaDist,psChiIIDist,psTDist,psFDist,psBetaDist,psPlotImpl},basicstyle=\footnotesize\ttfamily}
%
-\def\pshlabel#1{\footnotesize#1}
-\def\psvlabel#1{\footnotesize#1}
+\psset{labelFontSize=\scriptstyle}% for mathmode
+%\def\pshlabel#1{\footnotesize#1}
+%\def\psvlabel#1{\footnotesize#1}
%
\begin{document}
@@ -47,8 +49,8 @@
of having older versions, go to \url{http://www.CTAN.org/} and load the newest version.
\vfill\noindent
-Thanks to: \\
-Rafal Bartczuk,
+Thanks to \\
+ Rafal Bartczuk,
Jean-C\^ome Charpentier,
Martin Chicoine,
Gerry Coombes,
@@ -62,28 +64,30 @@
Buddy Ledger,
Manuel Luque,
Patrice Mégret,
+ Svend Mortensen,
Matthias Rüss,
Jose-Emilio Vila-Forcen,
-Timothy Van Zandt,
-Michael Zedler,
-and last but not least \url{http://mathworld.wolfram.com}
+ Timothy Van Zandt,
+ Michael Zedler,
+and last but not least
+ \url{http://mathworld.wolfram.com}.
\end{abstract}
\section{\nxLcs{psBezier\#}}
-This macro can plot a B\'ezier spline from order 1 up to 9 which needs
-(order+1) pairs of given coordinates.
+This macro can plot a B\'ezier spline from order $1$ up to $9$ which needs
+(order+$1$) pairs of given coordinates.
-Given a set of $n+1$ control points $P_0$, $P_1$, \ldots, $P_n$, the corresponding \Index{B\'ezier} curve
-(or \Index{Bernstein-B\'ezier} curve) is given by
+Given a set of $n+1$ control points $P_0$, $P_1$, \ldots, $P_n$,
+the corresponding \Index{B\'ezier} curve (or \Index{Bernstein-B\'ezier} curve) is given by
%
\begin{align}
C(t)=\sum_{i=0}^n P_i B_{i,n}(t)
\end{align}
%
-Where $B_{i,n}(t)$ is a Bernstein polynomial $B_{i,n}(t)=\binom{n}{i}t^i(1-t)^{n-i}$,
- and $t \in [0,1]$.
+where $B_{i,n}(t)$ is a Bernstein polynomial $B_{i,n}(t)=\binom{n}{i}t^i(1-t)^{n-i}$,
+and $t \in [0,1]$.
The Bézier curve starts through the first and last given point and
lies within the convex hull of all control points. The curve is tangent
to $P_1-P_0$ and $P_n-P_{n-1}$ at the endpoint.
@@ -93,17 +97,16 @@
by smoothly patching together low-order Bézier curves.
The macro \Lcs{psBezier} (note the upper case B) expects the number of the order
-and $n=order+1$ pairs of coordinates:
+and $n=\text{order}+1$ pairs of coordinates:
\begin{BDef}
\Lcs{psBezier}\Larg{\#}\OptArgs\coord0\coord1\coordn
\end{BDef}
The number of steps between the first and last control points is given
-by the keyword \Lkeyword{plotpoints} and preset to 200. It can be
+by the keyword \Lkeyword{plotpoints} and preset to $200$. It can be
changed in the usual way.
-
\begin{lstlisting}
\psset{showpoints=true,linewidth=1.5pt}
\begin{pspicture}(-2,-2)(2,2)% order 1 -- linear
@@ -145,7 +148,6 @@
\end{pspicture}
\end{lstlisting}
-
\begingroup
\psset{showpoints=true,linewidth=1.5pt}
\begin{pspicture}(-2,-2)(2,2)% order 1 -- linear
@@ -191,7 +193,6 @@
\section{Polynomials}
\subsection{Chebyshev polynomials}
-
The polynomials of the first (\Lps{ChebyshevT}) kind are defined through the identity
\[ T_n(\cos\theta)=\cos(n\theta)\]
@@ -216,8 +217,8 @@
&= \sum_{n=0}^\infty U_n(x)t^n
\end{align}
-\LPack{pst-func} defines the \TeX-macros \Lcs{ChebyshevT} for the
-first kind and \Lcs{ChebyshevU} for the second kind of \Index{Chebyshev polynomials}.
+\LPack{pst-func} defines the \TeX-macros \Lcs{ChebyshevT} for the first kind
+and \Lcs{ChebyshevU} for the second kind of \Index{Chebyshev polynomials}.
These \TeX-macros cannot be used outside of PostScript, they are only wrappers
for \verb+tx@FuncDict begin ChebyshevT end+ and the same for \Lcs{ChebyshevU}.
@@ -270,8 +271,6 @@
\egroup
\end{center}
-
-
\begin{lstlisting}
\psset{xunit=4cm,yunit=3cm,plotpoints=1000}
\begin{pspicture}(-1.2,-2)(2,1.5)
@@ -299,8 +298,6 @@
\egroup
\end{center}
-
-
\begin{lstlisting}
\psset{xunit=4cm,yunit=3cm,plotpoints=1000}
\begin{pspicture*}(-1.5,-1.5)(1.5,1.5)
@@ -309,8 +306,8 @@
\psset{linewidth=1.5pt}
\psplot[linecolor=black]{-1}{1}{2 x \ChebyshevU}
\psplot[linecolor=black]{-1}{1}{3 x \ChebyshevU}
- \psplot[linecolor=blue]{-1}{1}{4 x \ChebyshevU }
- \psplot[linecolor=red]{-1}{1}{5 x \ChebyshevU }
+ \psplot[linecolor=blue]{-1}{1}{4 x \ChebyshevU}
+ \psplot[linecolor=red]{-1}{1}{5 x \ChebyshevU}
\end{pspicture*}
\end{lstlisting}
@@ -349,18 +346,16 @@
f^{\prime\prime}(x) &= 2a_2 + 6a_3x + \ldots +(n-1)(n-2)a_{n-1}x^{n-3} + n(n-1)a_nx^{n-2}
\end{align}
-
-\noindent so \LPack{pst-func} needs only the \Index{coefficients} of the
-polynomial to calculate the function. The syntax is
+\noindent so \LPack{pst-func} needs only the \Index{coefficients}
+of the polynomial to calculate the function. The syntax is
\begin{BDef}
\Lcs{psPolynomial}\OptArgs\Largb{xStart}\Largb{xEnd}
\end{BDef}
-With the option \Lkeyword{xShift} one can do a horizontal shift to the graph of the function. With another
-than the predefined value the macro replaces $x$ by $x-x\mathrm{Shift}$; \Lkeyword{xShift}=1
-moves the graph of the \Index{polynomial function} one unit to the right.
-
+With the option \Lkeyword{xShift} one can do a horizontal shift to the graph of the function.
+With another than the predefined value the macro replaces $x$ by $x-x\mathrm{Shift}$;
+\Lkeyword{xShift}=1 moves the graph of the \Index{polynomial function} one unit to the right.
\begin{center}
\bgroup
@@ -379,7 +374,6 @@
\egroup
\end{center}
-
\begin{lstlisting}
\psset{yunit=0.5cm,xunit=1cm}
\begin{pspicture*}(-3,-5)(5,10)
@@ -395,7 +389,6 @@
\end{pspicture*}
\end{lstlisting}
-
The plot is easily clipped using the star version of the
\Lenv{pspicture} environment, so that points whose coordinates
are outside of the desired range are not plotted.
@@ -436,14 +429,11 @@
\end{tabularx}
}
-
-
\bigskip
The above parameters are only
valid for the \Lcs{psPolynomial} macro, except \verb+x0+, which can also be used for the Gauss function. All
options can be set in the usual way with \Lcs{psset}.
-
\bigskip
\begin{LTXexample}
\psset{yunit=0.5cm,xunit=2cm}
@@ -461,8 +451,6 @@
\end{pspicture*}
\end{LTXexample}
%$
-
-
\begin{LTXexample}
\psset{yunit=0.5cm,xunit=2cm}
\begin{pspicture*}(-3,-5)(3,10)
@@ -479,7 +467,6 @@
\end{pspicture*}
\end{LTXexample}
%$
-
\begin{LTXexample}
\begin{pspicture*}(-5,-5)(5,5)
\psaxes{->}(0,0)(-5,-5)(5,5)%
@@ -532,9 +519,9 @@
\Lcs{psBernstein}\OptArgs\Largr{tStart,tEnd}\Largr{i,n}
\end{BDef}
-The (\Lkeyword{tStart}, \Lkeyword{tEnd}) are \emph{optional} and preset by \verb=(0,1)=. The only new optional
-argument is the boolean key \Lkeyword{envelope}, which plots the envelope curve instead
-of the Bernstein polynomial.
+The (\Lkeyword{tStart}, \Lkeyword{tEnd}) are \emph{optional} and preset by \verb=(0,1)=.
+The only new optional argument is the boolean key \Lkeyword{envelope},
+which plots the envelope curve instead of the Bernstein polynomial.
\begin{LTXexample}[width=5cm,pos=l]
\psset{xunit=4.5cm,yunit=3cm}
@@ -599,11 +586,9 @@
\end{pspicture*}
\end{LTXexample}
-
\psset{unit=1cm}
\clearpage
\section{\Lcs{psFourier}}
-
A Fourier sum has the form:
%
\begin{align}
@@ -680,14 +665,14 @@
There are two special parameters for the Bessel function, and also the
settings of many \LPack{pst-plot} or \LPack{pstricks} parameters
affect the plot.
-These two ,,constants`` have the following meaning:
+These two ``constants'' have the following meaning:
%
\[
f(t) = constI \cdot J_n + constII
\]
%
\noindent
-where \Lkeyword{constI} and \Lkeyword{constII} must be real PostScript expressions, e.g.:
+where \Lkeyword{constI} and \Lkeyword{constII} must be real PostScript expressions, e.g.
\begin{lstlisting}[style=syntax]
\psset{constI=2.3,constII=t k sin 1.2 mul 0.37 add}
@@ -695,15 +680,14 @@
The Bessel function is plotted with the parametricplot macro, this is the
reason why the variable is named \verb+t+. The internal procedure \verb+k+
-converts the value t from radian into degrees. The above setting is
-the same as
+converts the value t from radian into degrees. The above setting is the same as
%
\[
f(t) = 2.3 \cdot J_n + 1.2\cdot \sin t + 0.37
\]
%
In particular, note that the default for
-\Lkeyword{plotpoints} is $500$. If the plotting computations are too
+\Lkeyword{plotpoints} is 500. If the plotting computations are too
time consuming at this setting, it can be decreased in the usual
way, at the cost of some reduction in graphics resolution.
@@ -724,7 +708,6 @@
}
\end{LTXexample}
-
\begin{LTXexample}
{
\psset{xunit=0.25,yunit=2.5}
@@ -759,7 +742,6 @@
The only valid optional argument for the function is \Lkeyword{nue}, which
is preset to 0, it shows $I_0$.
-
\begin{LTXexample}
\begin{pspicture}(0,-0.5)(5,5)
\psaxes[ticksize=-5pt 0]{->}(5,5)
@@ -770,7 +752,6 @@
\end{pspicture}
\end{LTXexample}
-
\clearpage
\section{\Lcs{psSi}, \Lcs{pssi} and \Lcs{psCi}}
The integral sin and cosin are defined as
@@ -789,9 +770,7 @@
\Lcs{psCi}\OptArgs\Largb{xStart}\Largb{xEnd}
\end{BDef}
-
\begin{LTXexample}[pos=t]
-\def\pshlabel#1{\footnotesize#1} \def\psvlabel#1{\footnotesize#1}
\psset{xunit=0.5}
\begin{pspicture}(-15,-4.5)(15,2)
\psaxes[dx=1cm,Dx=2]{->}(0,0)(-15.1,-4)(15,2)
@@ -807,7 +786,6 @@
\begin{LTXexample}[pos=t]
-\def\pshlabel#1{\footnotesize#1} \def\psvlabel#1{\footnotesize#1}
\psset{xunit=0.5}
\begin{pspicture*}(-15,-4.2)(15,4.2)
\psaxes[dx=1cm,Dx=2]{->}(0,0)(-15.1,-4)(15,4)
@@ -819,15 +797,14 @@
\end{pspicture*}
\end{LTXexample}
-
\clearpage
\section{\nxLcs{psIntegral}, \nxLcs{psCumIntegral}, and \nxLcs{psConv}}
These new macros\footnote{Created by Jose-Emilio Vila-Forcen}
allows to plot the result of an integral using the Simpson numerical integration rule.
The first one is the result of the integral of a function with two variables, and
the integral is performed over one of them. The second one is the cumulative
-integral of a function (similar to \Lcs{psGaussI} but valid for all functions). The third
-one is the result of a convolution. They are defined as:
+integral of a function (similar to \Lcs{psGaussI} but valid for all functions).
+The third one is the result of a convolution. They are defined as:
%
\begin{align}
\text{\Lcs{psIntegral}}(x) &= \int\limits_a^b f(x,t)\mathrm{d}t \\
@@ -874,7 +851,7 @@
In the example, the cumulative integral of a Gaussian is presented in black. In red, a
Gaussian is varying its mean from -10 to 10, and the result is the integral from -4 to 6.
Finally, in green it is presented the integral of a Gaussian from -3 to 3, where the
-variance is varying from .1 to 10.
+variance is varying from 0.1 to 10.
\begin{LTXexample}
\psset{xunit=1cm,yunit=4cm}
@@ -895,7 +872,7 @@
All distributions which use the $\Gamma$- or $\ln\Gamma$-function need the \LPack{pst-math} package,
it defines the PostScript functions \Lps{GAMMA} and \Lps{GAMMALN}. \LPack{pst-func} reads by default the PostScript
file \LFile{pst-math.pro}. It is part of any \TeX\ distribution and should also be on
-your system, otherwise install or update it from \textsc{CTAN}. It must the latest version.
+your system, otherwise install or update it from \textsc{CTAN}. It must be the latest version.
\begin{LTXexample}[pos=l,width=7cm]
\begin{pspicture*}(-0.5,-0.5)(6.2,5.2)
@@ -906,8 +883,6 @@
\end{pspicture*}
\end{LTXexample}
-
-
\clearpage
\subsection{Normal distribution (Gauss)}
The Gauss function is defined as
@@ -923,15 +898,13 @@
\Lcs{psGaussI}\OptArgs\Largb{xStart}\Largb{xEnd}
\end{BDef}
-\noindent where the only new parameter are \Lkeyword{sigma}=<value>+ and \Lkeyword{mue}=<value>+ for the
-horizontal shift,
-which can also be set in the usual way with \Lcs{psset}. It is
-significant only for the \Lcs{psGauss}- and \Lcs{psGaussI}-macro. The default is
+\noindent where the only new parameter are \Lkeyword{sigma}=<value>+ and \Lkeyword{mue}=<value>+
+for the horizontal shift, which can also be set in the usual way with \Lcs{psset}.
+It is significant only for the \Lcs{psGauss} and \Lcs{psGaussI} macro. The default is
\Lkeyword{sigma}=0.5 and \Lkeyword{mue}=0. The integral is caclulated wuth the Simson algorithm
-and has one special option, called \Lkeyword{Simpson}, which defines the number of intervalls per step
+and has one special option, called \Lkeyword{Simpson}, which defines the number of intervals per step
and is predefined with 5.
-
\begin{LTXexample}[pos=t,preset=\centering,wide=true]
\psset{yunit=4cm,xunit=3}
\begin{pspicture}(-2,-0.2)(2,1.4)
@@ -952,21 +925,21 @@
\clearpage
\subsection{Binomial distribution}\label{sec:bindistri}
-
-These two macros plot binomial distribution, \Lcs{psBinomialN} the normalized one. It is always
-done in the $x$-Intervall $[0;1]$.
+These two macros plot binomial distribution, \Lcs{psBinomialN} the normalized one.
+It is always done in the $x$-Intervall $[0;1]$.
Rescaling to another one can be done by setting the \Lkeyword{xunit} option
to any other value.
The binomial distribution gives the discrete probability distribution $P_p(n|N)$ of obtaining
exactly $n$ successes out of $N$ Bernoulli trials (where the result of each
Bernoulli trial is true with probability $p$ and false with probability
-$q=1-p$. The binomial distribution is therefore given by
+$q=1-p$. The binomial distribution is therefore given by
\begin{align}
P_p(n|N) &= \binom{N}{n}p^nq^{N-n} \\
&= \frac{N!}{n!(N-n)!}p^n(1-p)^{N-n},
\end{align}
+
where $(N; n)$ is a binomial coefficient and $P$ the probability.
The syntax is quite easy:
@@ -991,8 +964,12 @@
be no graph printed. This happens on PostScript side, so \TeX\ doesn't report any problem in
the log file. The valid options for the macros are \Lkeyword{markZeros} to draw rectangles instead
of a continous line and \Lkeyword{printValue} for printing the $y$-values on top of the lines,
-rotated by 90\textdegree. For this option all other options from section~\ref{sec:printValue}
-for the macro \Lcs{psPrintValue} are valid, too. The only special option is \Lkeyword{barwidth},
+rotated by 90\textdegree. For this option all other options from section~1
+for the macro \Lcs{psPrintValue} are valid, too.~ \cite{pst-tools} Important is the keyword \Lkeyword{valuewidth}
+which is preset to 10. If your value has more characters when converting into a string, it will
+not be printed or cause an GhostScript error.
+
+The only special option is \Lkeyword{barwidth},
which is a factor (no dimension) and set by default to 1. This option is only valid for
the macro \Lcs{psBinomial} and not for the normalized one!
@@ -1016,7 +993,6 @@
\end{pspicture}
\end{LTXexample}
-
\begin{LTXexample}[pos=t,preset=\centering]
\psset{xunit=1cm,yunit=10cm}%
\begin{pspicture}(-1,-0.05)(8,0.6)%
@@ -1028,7 +1004,6 @@
\end{pspicture}
\end{LTXexample}
-
\begin{LTXexample}[pos=t,preset=\centering]
\psset{xunit=0.25cm,yunit=10cm}
\begin{pspicture*}(-1,-0.05)(61,0.52)
@@ -1042,17 +1017,16 @@
\end{pspicture*}
\end{LTXexample}
-The default binomial distribution has the mean of $\mu=E(X)=N\cdot p$ and a variant of $\sigma^2=\mu\cdot(1-p)$.
-The normalized distribution has a mean of $0$. Instead of $P(X=k)$ we use $P(Z=z)$ with $Z=\dfrac{X-E(X)}{\sigma(X)}$
-and $P\leftarrow P\cdot\sigma$.
-The macros use the rekursive definition of the binomial distribution:
+The default binomial distribution has the mean of $\mu=E(X)=N\cdot p$
+and a variant of $\sigma^2=\mu\cdot(1-p)$.
+The normalized distribution has a mean of $0$. Instead of $P(X=k)$
+we use $P(Z=z)$ with $Z=\dfrac{X-E(X)}{\sigma(X)}$ and $P\leftarrow P\cdot\sigma$.
+The macros use the recursive definition of the binomial distribution:
%
\begin{align}
-P(k) &= P(k-1)\cdot\frac{N-k+1}{k}\cdot\frac{p}{1-p}
+P(k) = P(k-1)\cdot\frac{N-k+1}{k}\cdot\frac{p}{1-p}
\end{align}
-
-
\begin{LTXexample}[pos=t,preset=\centering]
\psset{xunit=1cm,yunit=5cm}%
\begin{pspicture}(-3,-0.15)(4,0.55)%
@@ -1062,8 +1036,6 @@
\end{pspicture}
\end{LTXexample}
-
-
\begin{LTXexample}[pos=t,preset=\centering]
\psset{yunit=10}
\begin{pspicture*}(-8,-0.07)(8.1,0.55)
@@ -1086,12 +1058,9 @@
\end{pspicture*}
\end{LTXexample}
-
-
For the normalized distribution the plotstyle can be set to \Lkeyval{curve} (\Lkeyset{plotstyle=curve}),
then the binomial distribution looks like a normal distribution. This option is only
-valid vor \Lcs{psBinomialN}. The option \Lkeyword{showpoints} is valid if \Lkeyval{curve} was chosen.
-
+valid for \Lcs{psBinomialN}. The option \Lkeyword{showpoints} is valid if \Lkeyval{curve} was chosen.
\begin{LTXexample}[pos=t,preset=\centering]
\psset{xunit=1cm,yunit=10cm}%
@@ -1103,7 +1072,6 @@
\end{pspicture*}
\end{LTXexample}
-
\begin{LTXexample}[pos=t,preset=\centering]
\psset{xunit=1cm,yunit=10cm}%
\begin{pspicture*}(-4,-0.06)(4.2,0.57)%
@@ -1114,7 +1082,6 @@
\end{pspicture*}
\end{LTXexample}
-
\clearpage
\subsection{Poisson distribution}
Given a Poisson process\footnote{\url{http://mathworld.wolfram.com/PoissonProcess.html}},
@@ -1122,28 +1089,28 @@
limit of a binomial distribution (see Section~\ref{sec:bindistri})
%
\begin{align}
-P_p(n|N) &= \frac{N!}{n!(N-n)!}\cdot p^n(1-p)^{N-n}\label{eq:normaldistri}
+P_p(n|N) = \frac{N!}{n!(N-n)!}\cdot p^n(1-p)^{N-n}\label{eq:normaldistri}
\end{align}
%
-Viewing the distribution as a function of the expected number of successes
+Viewing the distribution as a function of the expected number of successes;
%
\begin{align}\label{eq:nu}
-\lambda &= N\cdot p
+\lambda = N\cdot p
\end{align}
%
instead of the sample size $N$ for fixed $p$, equation (2) then becomes
-eq.~\ref{eq:normaldistri}
+\eqref{eq:normaldistri};
%
\begin{align}\label{eq:nuN}
-P_{\frac{\lambda}{n}}(n|N) &= \frac{N!}{n!(N-n)!}{\frac{\lambda}{N}}^n {\frac{1-\lambda}{N}}^{N-n}
+P_{\frac{\lambda}{n}}(n|N) = \frac{N!}{n!(N-n)!}{\frac{\lambda}{N}}^n {\frac{1-\lambda}{N}}^{N-n}
\end{align}
%
-Viewing the distribution as a function of the expected number of successes
+Viewing the distribution as a function of the expected number of successes;
%
-\[ P_\lambda(X=k)=\frac{\lambda^k}{k!}\,e^{-\lambda} \]
+\[ P_\lambda(X=k)=\frac{\lambda^k}{k!}\,e^{-\lambda} \].
%
-Letting the sample size become large ($N\to\infty$), the distribution then
-approaches (with $p=\frac{\lambda}{n}$)
+Letting the sample size become large ($N\to\infty$), the distribution then
+approaches (with $p=\frac{\lambda}{n}$):
%
\begin{align}
\lim_{n\to\infty} P(X=k) &= \lim_{n\to\infty}\frac{n!}{(n-k)!\,k!}
@@ -1161,7 +1128,6 @@
%
which is known as the Poisson distribution and has the follwing syntax:
-
\begin{BDef}
\Lcs{psPoisson}\OptArgs\Largb{N}\Largb{lambda}\\
\Lcs{psPoisson}\OptArgs\Largb{M,N}\Largb{lambda}
@@ -1169,7 +1135,6 @@
in which \texttt{M} is an optional argument with a default of 0.
-
\begin{LTXexample}[pos=t,preset=\centering]
\psset{xunit=1cm,yunit=20cm}%
\begin{pspicture}(-1,-0.05)(14,0.25)%
@@ -1190,7 +1155,6 @@
\end{pspicture}
\end{LTXexample}
-
\begin{LTXexample}[pos=t,preset=\centering]
\psset{xunit=1cm,yunit=20cm}%
\begin{pspicture}(-1,-0.05)(14,0.25)%
@@ -1200,14 +1164,12 @@
\end{pspicture}
\end{LTXexample}
-
-
\clearpage
\subsection{Gamma distribution}
A gamma distribution is a general type of statistical distribution that is related
to the beta distribution and arises naturally in processes for which the waiting
times between Poisson distributed events are relevant. Gamma distributions have
-two free parameters, labeled $alpha$ and $beta$. It is defined as
+two free parameters, labeled $\alpha$ and $\beta$. It is defined as
%
\[
f(x)=\frac{\beta(\beta x)^{\alpha-1}e^{-\beta x}}{\Gamma(\alpha)} \qquad
@@ -1229,7 +1191,6 @@
\end{pspicture*}
\end{LTXexample}
-
\clearpage
\subsection{$\chi^2$-distribution}
The $\chi^2$-distribution is a continuous probability distribution. It
@@ -1253,7 +1214,7 @@
\fi
The $\chi^2$ with parameter $\nu$ is the same as a Gamma distribution
- with $\alpha=\nu/2$ and $\beta=1/2$ and the syntax
+with $\alpha=\nu/2$ and $\beta=1/2$ and the syntax
\begin{BDef}
\Lcs{psChiIIDist}\OptArgs\Largb{x0}\Largb{x1}
@@ -1272,19 +1233,17 @@
The cumulative distribution function is
%
\begin{align*}
-D_r(\chi^2) &= int_0^{\chi^2}\frac{t^{r/2-1}e^{-t/2}\mathrm{d}t}{\Gamma(1/2r)2^{r/2}} \\
+D_r(\chi^2) &= int_0^{\chi^2}\frac{t^{r/2-1}e^{-t/2}\mathrm{d}t}{\Gamma(1/2r)2^{r/2}\\
&= 1-\frac{\Gamma(1/2r,1/2\chi^2)}{\Gamma(1/2r)}
\end{align*}
\fi
-
-
-
\clearpage
\subsection{Student's $t$-distribution}
-A \Index{statistical distribution} published by \Index{William Gosset} in 1908 under his
-pseudonym ,,Student``. The $t$-distribution with parameter $\nu$ has the \Index{density function}
+A \Index{statistical distribution} published by \Index{William Gosset} in 1908
+under his pseudonym ``Student''. The $t$-distribution with parameter $\nu$ has
+the \Index{density function}
%
\[
f(x)=\frac1{\sqrt{\nu\pi}}\cdot
@@ -1298,7 +1257,6 @@
\Lcs{psTDist}\OptArgs\Largb{x0}\Largb{x1}
\end{BDef}
-
\begin{LTXexample}[pos=t,preset=\centering]
\psset{xunit=1.25cm,yunit=10cm}
\begin{pspicture}(-6,-0.1)(6,.5)
@@ -1310,7 +1268,6 @@
\end{pspicture}
\end{LTXexample}
-
%The $t_\nu$-distribution has mode 0.
\clearpage
@@ -1318,9 +1275,9 @@
A continuous statistical distribution which arises in the testing of
whether two observed samples have the same variance.
-The F-distribution with parameters $\mu$ and $\nu$ has the probability function
+The $F$-distribution with parameters $\mu$ and $\nu$ has the probability function
\[
-f_{n,m}(x)=\frac{\Gamma[(\mu+\nu)/2]}{\Gamma(\mu/2)\Gamma(\nu/2)}\cdot
+f_{\mu,\nu}(x)=\frac{\Gamma[(\mu+\nu)/2]}{\Gamma(\mu/2)\Gamma(\nu/2)}\cdot
\left(\mu/\nu\right)^{\mu/2}\frac{x^{(\mu/2)-1}}{[1+(\mu x/\nu)]^{(\mu+\nu)/2}}\quad
\text{ for $x>0$ and $\mu$, $\nu>0$}\]
%
@@ -1345,7 +1302,6 @@
\end{pspicture*}
\end{LTXexample}
-
\clearpage
\subsection{Beta distribution}
@@ -1360,7 +1316,7 @@
The domain is $[0,1]$, and the probability function $P(x)$ is given by
%
\[
-P(x) = \frac{\Gamma(\alpha+\beta)}{\Gamma(\alpha)\Gamma(\beta)}(1-x)^{\beta-1}x^{\alpha-1}
+P(x) = \frac{\Gamma(\alpha+\beta)}{\Gamma(\alpha)\Gamma(\beta)}(1-x)^{\beta-1}x^{\alpha-1}
\quad\text{ $\alpha,\beta>0$}
\]
%
@@ -1370,8 +1326,6 @@
\Lcs{psBetaDist}\OptArgs\Largb{x0}\Largb{x1}
\end{BDef}
%
-
-
\begin{LTXexample}[pos=t,preset=\centering]
\psset{xunit=10cm,yunit=5cm}
\begin{pspicture*}(-0.1,-0.1)(1.1,2.05)
@@ -1382,7 +1336,6 @@
\end{pspicture*}
\end{LTXexample}
-
\clearpage
\subsection{Cauchy distribution}
The \Index{Cauchy distribution}, also called the \Index{Lorentz distribution}, is a continuous distribution
@@ -1415,17 +1368,15 @@
\psaxes[Dy=0.4,dy=0.4,Dx=0.5,dx=0.5]{->}(0,0)(-3,0)(3,2)
\end{pspicture*}
\end{LTXexample}
-
-
-
\iffalse
+
\clearpage
\subsection{Bose-Einstein distribution}
A distribution which arises in the study of integer \Index{spin particles} in physics,
\[
-P(x)=\frac{x^s}{e^{x-mu}-1}\qquad\text{with $s\in\mathbb{Z}$ and $\mu\in\mathbb{R}}
+P(x)=\frac{x^s}{e^{x-\mu}-1}\qquad\text{with $s\in\mathbb{Z}$ and $\mu\in\mathbb{R}$}
\]
-%
+%$
and has the syntax (with a default setting of $s=1$ and $\mu=1$):
\begin{BDef}
@@ -1433,13 +1384,10 @@
\end{BDef}
\fi
-
\clearpage
\subsection{Weibull distribution}
-
In probability theory and statistics, the Weibull distribution is a continuous probability
-distribution. The probability density function of a
-Weibull random variable $x$ is:
+distribution. The probability density function of a Weibull random variable $x$ is:
\begin{align}
P(x) &= \alpha\beta^{-\alpha} x^{\alpha-1} e^{-\left(\frac{x}{\beta}\right)^\alpha}\\
@@ -1453,15 +1401,15 @@
D(x) &= 1 - e^{-\frac{x^\alpha}{\beta}}
\end{align}
-always for $x\in[0;\infty)$.
-where $\alpha > 0$ is the shape parameter and $\beta > 0$ is the scale parameter of the distribution.
+always for $x\in[0;\infty)$, where $\alpha > 0$ is the shape parameter
+and $\beta > 0$ is the scale parameter of the distribution.
$D(x)$ is the cumulative distribution function of the Weibull distribution. The values for
$\alpha$ and $\beta$ are preset to 1, but can be changed in the usual way.
The Weibull distribution is related to a number of other probability distributions; in
-particular, it interpolates between the exponential distribution $(\alpha = 1)$ and the
-Rayleigh distribution $(\alpha = 2)$.
+particular, it interpolates between the exponential distribution $(\alpha = 1)$ and
+the Rayleigh distribution $(\alpha = 2)$.
\begin{center}
\psset{unit=2}
@@ -1507,21 +1455,18 @@
For a homogenous portfolio of infinite granularity the portfolio loss
distribution is given by
-
\[
\mathbb{P}(L(P)2$ is sometimes also made. The following
-table summarizes a few special cases. \Index{Piet Hein} used $\frac{5}{2}$ with a number of different
-$\frac{a}{b}$ ratios for various of his projects. For example, he used $\frac{a}{b}=\frac{6}{5}$
-for Sergels Torg
+\Index{Superellipses} with $a=b$ are also known as \Index{Lam\'e} curves
+or Lam\'e ovals and the restriction to $r>2$ is sometimes also made.
+The following table summarizes a few special cases.
+\Index{Piet Hein} used $\frac{5}{2}$ with a number of different
+$\frac{a}{b}$ ratios for various of his projects.
+For example, he used $\frac{a}{b}=\frac{6}{5}$ for Sergels Torg
(Sergel's Square) in Stockholm, and $\frac{a}{b}=\frac{3}{2}$ for his table.
\begin{center}
@@ -1639,10 +1581,8 @@
\end{LTXexample}
\egroup
-
\clearpage
\section{\nxLcs{psThomae} -- the popcorn function}
-
\Index{Thomae's function}, also known as the \Index{popcorn function},
the \Index{raindrop function}, the \Index{ruler function} or the
\Index{Riemann function}, is a modification of the \Index{Dirichlet} function.
@@ -1672,17 +1612,15 @@
\end{pspicture}
\end{LTXexample}
-
\clearpage
\section{\nxLcs{psplotImp} -- plotting implicit defined functions}
-For a given area, the macro calculates in a
-first step row by row for every pixel (1pt) the function $f(x,y)$ and checks for a
-changing of the value from $f(x,y)<0$ to $f(x,y)>0$ or vice versa. If this happens,
-then the pixel must be part of the curve of the function $f(x,y)=0$. In a second step the same is
-done column by column. This may take some time because an area of $400\times 300$
-pixel needs $120$ thousand calculations of the function value. The user still defines
-this area in his own coordinates, the translation into pixel (pt) is done internally by the
-macro itself.
+For a given area, the macro calculates in a first step row by row for every pixel (1pt)
+the function $f(x,y)$ and checks for avchanging of the value from $f(x,y)<0$ to $f(x,y)>0$
+or vice versa. If this happens, then the pixel must be part of the curve of
+the function $f(x,y)=0$. In a second step the same is done column by column.
+This may take some time because an area of $400\times 300$ pixel needs 120 thousand calculations
+of the function value. The user still defines this area in his own coordinates,
+the translation into pixel (pt) is done internally by the macro itself.
The only special keyword is \Lkeyword{stepFactor} which is preset to 0.67 and controls the horizontal
and vertical step width.
@@ -1691,8 +1629,9 @@
\end{BDef}
The function must be of $f(x,y)=0$ and described in \PS code, or alternatively with
-the option \Lkeyword{algebraic} (\LPack{pstricks-add}) in an algebraic form. No other value names than $x$ and $y$
-are possible. In general, a starred \Lenv{pspicture*} environment maybe a good choice here.
+the option \Lkeyword{algebraic} (\LPack{pstricks-add}) in an algebraic form.
+No other value names than $x$ and $y$ are possible. In general, a starred \Lenv{pspicture*} environment
+maybe a good choice here.
\medskip
\noindent
@@ -1732,7 +1671,6 @@
\end{pspicture*}
\end{LTXexample}
-
\begin{LTXexample}[preset=\centering]
\begin{pspicture*}(-5,-3.2)(5.5,4.5)
\psaxes{->}(0,0)(-5,-3)(5.2,4)%
@@ -1741,8 +1679,6 @@
\end{pspicture*}
\end{LTXexample}
-
-
Using the \Lkeyword{polarplot} option implies using the variables $r$ and $phi$ for describing
the function, $y$ and $x$ are not respected in this case. Using the \Lkeyword{algebraic} option
for polar plots are also possible (see next example).
@@ -1773,12 +1709,12 @@
\end{pspicture*}
\end{LTXexample}
-
The data of an implicit plot can be written into an external file for further purposes.
Use the optional argument \Lkeyword[pstricks-add]{saveData} to write the $x|y$ values
-into the file \nxLcs{jobname.data}. The file name can be changed with the keyword {\Lkeyword[pstricks-add]{filename}.
-When running a \TeX\ file from within a GUI it may be possible that you get a writeaccess error from GhostScript, because
-it prevents writing into a file when called from another program. In this case run GhostScript on the \PS-output from
+into the file \nxLcs{jobname.data}. The file name can be changed with
+the keyword {\Lkeyword[pstricks-add]{filename}. When running a \TeX\ file from within a GUI
+it may be possible that you get a writeaccess error from GhostScript, because it prevents writing
+into a file when called from another program. In this case run GhostScript on the \PS-output from
the command line.
\psset{mathLabel}
@@ -1826,11 +1762,9 @@
\end{LTXexample}
\fi
-
\clearpage
\section{\nxLcs{psVolume} -- Rotating functions around the x-axis}
-
-This macro shows the behaviour of a \Index{rotated function} around the x-axis.
+This macro shows the behaviour of a \Index{rotated function} around the $x$-axis.
\begin{BDef}
\Lcs{psVolume}\OptArgs\Largr{xMin,xMax}\Largb{steps}\Largb{function $f(x)$}
@@ -1916,7 +1850,6 @@
\end{pspicture}
\end{lstlisting}
-
\psset{xunit=2}
\makebox[\linewidth]{%
\begin{pspicture}(-0.5,-4)(3,4)
@@ -1950,10 +1883,10 @@
\end{pspicture}
\end{lstlisting}
-\clearpage
+\clearpage
\section{Examples}
-
+\subsection{Filling an area under a distribution curve}
\begin{LTXexample}[preset=\centering]
\psset{xunit=0.5cm,yunit=20cm,arrowscale=1.5}
\begin{pspicture}(-1,-0.1)(21,0.2)
@@ -1965,14 +1898,57 @@
\end{pspicture}
\end{LTXexample}
-\clearpage
-\section{List of all optional arguments for \texttt{pst-func}}
-\xkvview{family=pst-func,columns={key,type,default}}
+\subsection{An animation of a distribution}
+\psset{xunit=0.9cm,yunit=9cm}
+\newcommand*\studentT[1]{%
+ \begin{pspicture}(-6,-0.1)(6,0.5)
+ \psaxes[Dy=0.1]{->}(0,0)(-5,0)(5.5,0.45)[$x$,0][$y$,90]
+ \pscustom[fillstyle=solid,fillcolor=blue!40,opacity=0.4,linecolor=red,linestyle=none]{%
+ \psline(0,0)(-5,0)
+ \psTDist[nue=#1]{-5}{5}
+ \psline(5,0)(0,0)
+ }
+ \psTDist[nue=#1,linecolor=red,linewidth=1pt]{-5}{5}
+ \rput(3,0.3){$\nu = #1$}
+ \end{pspicture}}
+\begin{center}
+ \begin{animateinline}[poster=first,controls,palindrome]{10}
+ \multiframe{50}{rA=0.02+0.02}{\studentT{\rA}}
+ \end{animateinline}
+ \captionof{figure}{Student's $t$-distribution.}
+\end{center}
+\begin{lstlisting}
+\psset{xunit=0.9cm,yunit=9cm}
+\newcommand*\studentT[1]{%
+ \begin{pspicture}(-6,-0.1)(6,0.5)
+ \psaxes[Dy=0.1]{->}(0,0)(-5,0)(5.5,0.45)[$x$,0][$y$,90]
+ \pscustom[fillstyle=solid,fillcolor=blue!40,opacity=0.4,linecolor=red,linestyle=none]{%
+ \psline(0,0)(-5,0)
+ \psTDist[nue=#1]{-5}{5}
+ \psline(5,0)(0,0)
+ }
+ \psTDist[nue=#1,linecolor=red,linewidth=1pt]{-5}{5}
+ \rput(3,0.3){$\nu = #1$}
+ \end{pspicture}}
+
+\begin{center}
+ \begin{animateinline}[poster=first,controls,palindrome]{10}
+ \multiframe{50}{rA=0.02+0.02}{\studentT{\rA}}
+ \end{animateinline}
+ \captionof{figure}{Student's $t$-distribution.}
+\end{center}
+\end{lstlisting}
+
+
+\clearpage
+\section{List of all optional arguments for \texttt{pst-func}}
+\xkvview{family=pst-func,columns={key,type,default}}
+
\bgroup
\raggedright
\nocite{*}
@@ -1982,8 +1958,4 @@
\printindex
-
-
\end{document}
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-func.doc.tlpobj new/tlpkg/tlpobj/pst-func.doc.tlpobj
--- old/tlpkg/tlpobj/pst-func.doc.tlpobj 2012-04-14 04:31:00.000000000 +0200
+++ new/tlpkg/tlpobj/pst-func.doc.tlpobj 2013-04-19 03:47:27.000000000 +0200
@@ -1,9 +1,9 @@
name pst-func.doc
category Package
-revision 25961
+revision 30023
shortdesc doc files of pst-func
relocated 1
-docfiles size=784
+docfiles size=852
RELOC/doc/generic/pst-func/Changes
RELOC/doc/generic/pst-func/README
RELOC/doc/generic/pst-func/pst-func-doc.bib
++++++ pst-func.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-func.tlpobj new/tlpkg/tlpobj/pst-func.tlpobj
--- old/tlpkg/tlpobj/pst-func.tlpobj 2012-04-14 04:31:02.000000000 +0200
+++ new/tlpkg/tlpobj/pst-func.tlpobj 2013-04-19 03:47:29.000000000 +0200
@@ -1,6 +1,6 @@
name pst-func
category Package
-revision 25961
+revision 30023
shortdesc PSTricks package for plotting mathematical functions.
relocated 1
longdesc pst-func is a package built for use with PSTricks. It provides
++++++ pst-layout.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-layout.doc.tlpobj new/tlpkg/tlpobj/pst-layout.doc.tlpobj
--- old/tlpkg/tlpobj/pst-layout.doc.tlpobj 2012-02-22 04:27:22.000000000 +0100
+++ new/tlpkg/tlpobj/pst-layout.doc.tlpobj 2013-04-10 21:08:32.000000000 +0200
@@ -1,6 +1,6 @@
name pst-layout.doc
category Package
-revision 25467
+revision 29803
shortdesc doc files of pst-layout
relocated 1
docfiles size=29
++++++ pst-layout.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-layout.tlpobj new/tlpkg/tlpobj/pst-layout.tlpobj
--- old/tlpkg/tlpobj/pst-layout.tlpobj 2012-02-22 04:27:23.000000000 +0100
+++ new/tlpkg/tlpobj/pst-layout.tlpobj 2013-04-10 21:08:32.000000000 +0200
@@ -1,6 +1,6 @@
name pst-layout
category Package
-revision 25467
+revision 29803
shortdesc Page layout macros based on PStricks packages.
relocated 1
longdesc The package provides a means of creating elaborate ("pseudo-
@@ -10,6 +10,6 @@
runfiles size=3
RELOC/tex/latex/pst-layout/pst-layout.sty
catalogue-ctan /graphics/pstricks/contrib/pst-layout
-catalogue-date 2011-05-27 12:35:46 +0200
+catalogue-date 2012-04-27 12:45:13 +0200
catalogue-license lppl
catalogue-version .95
++++++ pst-node.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-node/Changes new/doc/generic/pst-node/Changes
--- old/doc/generic/pst-node/Changes 2012-02-13 02:15:53.000000000 +0100
+++ new/doc/generic/pst-node/Changes 2013-04-14 00:58:53.000000000 +0200
@@ -1,4 +1,13 @@
----- pst-node.tex
+1.27 2013-04-12 - added macro \Cnodeput which takes radius=...
+ into account
+1.26 2013-04-09 - added macros \psncurve and \psnccurve
+ for a sequence of nodes created by \curvepnodes
+1.25 2012-09-21 - Global node coordinates only with
+ saveNodeCoors
+1.24 2012-09-18 - fix introduced bug with \pst@thenode
+1.23 2012-09-15 - add global defined N-<name>.x and N-<name>.y
+ for user nodes
1.22 2012-02-12 - fix introduced bug for \rnode with
commented out the \pst@boxpar
1.21 2011-11-21 - fix bug for xelatex and scaling
@@ -24,11 +33,13 @@
----- pst-node.sty
+1.01 2012-09-18 - update package versions (hv)
1.00 2011-06-05 - make ancient variant 97 available (hv)
2008-12-12 first version (hv)
----- pst-node.pro
+1.14 2012-09-18 - add subroutines for global dict
1.13 2011-11-21 - fix bug for xelatex and scaling
1.12 2010-04-30 - small changes to the code
1.11 2010-04-22 - added function /concatstringarray (ms)
Files old/doc/generic/pst-node/pst-node-doc.pdf and new/doc/generic/pst-node/pst-node-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-node/pst-node-doc.tex new/doc/generic/pst-node/pst-node-doc.tex
--- old/doc/generic/pst-node/pst-node-doc.tex 2011-08-23 18:24:47.000000000 +0200
+++ new/doc/generic/pst-node/pst-node-doc.tex 2013-04-14 00:58:53.000000000 +0200
@@ -1,4 +1,4 @@
-%% $Id: pst-node-doc.tex 568 2011-08-20 08:15:04Z herbert $
+%% $Id: pst-node-doc.tex 765 2013-04-09 15:32:28Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
@@ -250,13 +250,15 @@
circle.
\begin{BDef}
- \LcsStar{cnodeput}\OptArgs\Largb{angle}\Largr{\CAny}\Largb{name}\Largb{stuff}
+ \LcsStar{cnodeput}\OptArgs\Largb{angle}\Largr{\CAny}\Largb{name}\Largb{stuff}\\
+ \LcsStar{Cnodeput}\OptArgs\Largb{angle}\Largr{\CAny}\Largb{name}\Largb{stuff}
\end{BDef}
- This is a variant of \Lcs{cput} that gives the node the shape of the
+ This is a variant of \Lcs{cput} (or \Lcs{Cput}) that gives the node the shape of the
circle. That is, it is like
\begin{lstlisting}
\rput{<angle>}(<x>,<y>){\circlenode{<name>}{<stuff>}}
+ \rput[radius=...]{<angle>}(<x>,<y>){\Circlenode{<name>}{<stuff>}}
\end{lstlisting}
@@ -1546,7 +1548,7 @@
\clearpage
%--------------------------------------------------------------------------------------
-\section{Relative nodes with \nxLcs{psGetNodeCenter}}
+\section{Relative nodes with \nxLcs{psGetNodeCenter} or \texttt{N-<name>.x|y}}
%--------------------------------------------------------------------------------------
\begin{BDef}
@@ -1559,7 +1561,9 @@
and \Larg{node.y} which can be used to define relative nodes. The
following example defines the node \verb+MyNode+ and a second one
relative to the first one, with 4 units left and 4 units up.
-\Larg{node} must be an existing node name.
+\Larg{node} must be an existing node name. Nodes are saved in an own
+dictionary with the current transformation matrix, which is reset when
+using the macro \Lcs{psGetNodeCenter}.
\begin{LTXexample}[width=5cm]
\begin{pspicture}[showgrid=true,arrowscale=2](5,5)
@@ -1583,7 +1587,40 @@
\end{pspicture}
\end{LTXexample}
-\clearpage
+
+The coordinates of the nodes can also be saved with \Lkeyset{saveNodeCoors=true} in global defined names
+\texttt{N-<name>.x} and \texttt{N-<name>.y}. The forgoing examples can be simplified if you
+do not need the resetting of the transformation matrix:
+
+
+
+\begin{LTXexample}[width=5cm]
+\begin{pspicture}[showgrid,arrowscale=2,
+ saveNodeCoors](5,5)
+\pnode(4.5,0.5){MyNode}
+\psdot(MyNode)
+\pnode(! N-MyNode.x 4 sub N-MyNode.y 4 add){MySecondNode}
+\psdot(MySecondNode)
+\ncline[linecolor=red]{<->}{MyNode}{MySecondNode}
+\end{pspicture}
+\end{LTXexample}
+
+
+\bigskip
+In the following example it doesn't work because the relative node setting via \Lcs{rput}
+is not taken into account.
+
+\begin{LTXexample}[width=5cm]
+\begin{pspicture}[showgrid,saveNodeCoors](5,5)
+\rput(1.5,0.5){\trinode{CN}{NodeA}}
+\rput(3.5,2.5){\trinode{EN}{NodeB}}
+\pnode(! N-CN.x 2 add N-CN.y 1 add ){MyCNode}
+\ncline[linecolor=red]{<->}{MyCNode}{EN}
+\ncline[linecolor=blue]{<->}{CN}{EN}
+\end{pspicture}
+\end{LTXexample}
+
+
%--------------------------------------------------------------------------------------
@@ -2156,6 +2193,31 @@
\end{LTXexample}
\vspace{2pc}
+\begin{BDef}
+\Lcs{psncurve}\OptArgs\Largb{arrows}\Largr{coors}\Largb{name}
+\end{BDef}
+ for example, expects that there are nodes named P3..P8, and gives the same result as
+\begin{verbatim}
+\pscurve[linewidth=1pt]{->}(P3)(P4)(P5)(P6)(P7)(P8)
+\end{verbatim}
+
+\begin{LTXexample}[width=.35\textwidth]
+\begin{pspicture}[showgrid=true,algebraic](-.5,-.5)(2.5,2)
+\pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4)
+%defines P0..P3--now join them
+\psncurve[arrowscale=2]{-D>}(0,3){P}
+\end{pspicture}
+\end{LTXexample}
+\vspace{2pc}
+
+\begin{LTXexample}[width=.35\textwidth]
+\begin{pspicture}[showgrid=true,algebraic](-.5,-.5)(2.5,2)
+\pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4)
+%defines P0..P3--now join them
+\psnccurve[arrowscale=2]{-D>}(0,3){P}
+\end{pspicture}
+\end{LTXexample}
+\vspace{2pc}
\begin{BDef}
\Lcs{psLCNodeVar}\Largr{node A}\Largr{node B}\Largr{factorA,factorB}\Largb{node name}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-node.doc.tlpobj new/tlpkg/tlpobj/pst-node.doc.tlpobj
--- old/tlpkg/tlpobj/pst-node.doc.tlpobj 2012-02-13 04:40:06.000000000 +0100
+++ new/tlpkg/tlpobj/pst-node.doc.tlpobj 2013-04-15 16:56:41.000000000 +0200
@@ -1,9 +1,9 @@
name pst-node.doc
category Package
-revision 25380
+revision 29899
shortdesc doc files of pst-node
relocated 1
-docfiles size=221
+docfiles size=226
RELOC/doc/generic/pst-node/Changes
RELOC/doc/generic/pst-node/README
RELOC/doc/generic/pst-node/more_docs/Makefile
++++++ pst-node.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pst-node/pst-node.pro new/dvips/pst-node/pst-node.pro
--- old/dvips/pst-node/pst-node.pro 2012-02-13 02:15:53.000000000 +0100
+++ new/dvips/pst-node/pst-node.pro 2013-04-09 18:33:31.000000000 +0200
@@ -1,17 +1,19 @@
-% $Id: pst-node.pro 645 2012-02-12 09:09:51Z herbert $
+% $Id: pst-node.pro 765 2013-04-09 15:32:28Z herbert $
%%
%% PostScript prologue for pst-node.tex.
-%% Version 1.13, 2011/11/21.
+%% Version 1.14, 2012/09/18.
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
%% in directory macros/latex/base/lppl.txt.
%
-/tx@NodeDict 400 dict def tx@NodeDict begin
tx@Dict begin % from main pstricks dict
/T /translate load def
/CP /currentpoint load def
+ /startGlobal { true setglobal globaldict begin } bind def
+ /endGlobal { end false setglobal } bind def
end
+/tx@NodeDict 400 dict def tx@NodeDict begin
/NewNode { % on stack: { x y } boolean N@name type InitXnode
gsave
NodeScale % a bugfix for xelatex, it's empty for dvips
@@ -224,10 +226,17 @@
/HPutCurve { gsave newpath /SaveLPutVar /LPutVar load def LPutVar 8 -2
roll moveto curveto flattenpath /LPutVar [ {} {} {} {} pathforall ] cvx
def grestore exec /LPutVar /SaveLPutVar load def } def
-/NCCoor { /AngleA yB yA sub xB xA sub Atan def /AngleB AngleA 180 add def
-GetEdgeA GetEdgeB /LPutVar [ xB1 yB1 xA1 yA1 ] cvx def /LPutPos {
-LPutVar LPutLine } def /HPutPos { LPutVar HPutLine } def /VPutPos {
-LPutVar VPutLine } def LPutVar } def
+
+/NCCoor {
+ /AngleA yB yA sub xB xA sub Atan def
+ /AngleB AngleA 180 add def
+ GetEdgeA GetEdgeB
+ /LPutVar [ xB1 yB1 xA1 yA1 ] cvx def
+ /LPutPos { LPutVar LPutLine } def
+ /HPutPos { LPutVar HPutLine } def
+ /VPutPos { LPutVar VPutLine } def
+ LPutVar
+} def
%
/NCLine {
NCCoor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-node/pst-node.tex new/tex/generic/pst-node/pst-node.tex
--- old/tex/generic/pst-node/pst-node.tex 2012-02-13 02:15:53.000000000 +0100
+++ new/tex/generic/pst-node/pst-node.tex 2013-04-14 00:58:53.000000000 +0200
@@ -1,4 +1,4 @@
-% $Id: pst-node.tex 645 2012-02-12 09:09:51Z herbert $
+% $Id: pst-node.tex 765 2013-04-09 15:32:28Z herbert $
%% BEGIN pst-node.tex
%%
%% Nodes with PSTricks.
@@ -6,7 +6,7 @@
%% This uses the header file `pst-node.pro'.
%%
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
-%% COPYRIGHT 2009/10 by Herbert Voss, hvoss tug.org.
+%% COPYRIGHT 2009-2013 by Herbert Voss, hvoss tug.org.
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
@@ -18,8 +18,8 @@
\ifx\PSTricksLoaded\endinput\else\input pstricks.tex \fi\relax
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
%
-\def\fileversion{1.22}
-\def\filedate{2012/02/12}
+\def\fileversion{1.27}
+\def\filedate{2013/04/12}
\message{ v\fileversion, \filedate}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -54,14 +54,22 @@
%
% bug fix for xelatex, dvipdfmx uses the wrong scaling
\def\tx@NewNode{/NodeScale {\ifx\pstnodescale\@undefined \else\pstnodescale \fi} def NewNode }
+%
+\define@boolkey[psset]{pst-node}[Pst@]{saveNodeCoors}[true]{}
+\psset[pst-node]{saveNodeCoors=false}
+%
\def\pst@newnode#1#2#3#4{%
-% DG/SR modification begin - Nov. 9, 2000 - Patch 11
\pst@killglue
-% DG/SR modification end
\leavevmode
\pst@getnode{#1}\pst@thenode
-%\typeout{====\pst@thenode}%
-\pst@Verb{%
+\pst@Verb{
+ \ifPst@saveNodeCoors
+ \ifx\relax#3\relax 0 0 \else #3 \tx@UserCoor \fi
+% startGlobal
+ /N-#1.y\space exch def
+ /N-#1.x\space exch def
+% endGlobal
+ \fi
\pst@nodedict
{#3}
\ifx\psk@name\relax false \else \psk@name true \fi
@@ -71,9 +79,10 @@
\tx@NewNode
end }%
%
-\global\let\psk@name\relax
-\pstree@nodehook
+\global\let\psk@name\relax%
+\pstree@nodehook%
\global\let\pstree@nodehook\relax}
+%
\let\pstree@nodehook\relax
\define@boolkey[psset]{pst-node}[Pst@]{nodealign}[true]{}
\psset[pst-node]{nodealign=false}
@@ -152,7 +161,7 @@
\pst@killglue
\@fixedradiustrue
\def\pst@nodehook{\Cnodeput@iv{#2}}%
-\pst@makebox{\cput@iv{#1}}}
+\pst@makebox{\cput@v{#1}}}
\def\Cnodeput@iv#1{%
\pst@newnode{#1}{11}{%
\pst@number{\wd\pst@hbox} 2 div \pst@number\pst@dima % x y
@@ -775,6 +784,7 @@
\def\naput@i{\pst@killglue\pst@makebox{\naput@ii{NAngle 90 add}}}
\def\naput@ii#1{%
\begingroup
+% \addto@par{labelsep=15pt}%
\use@par
\if@star\pst@starbox\fi
\def\psk@refangle{#1 }%
@@ -1295,25 +1305,25 @@
}
%
\def\psDefBoxNodes#1#2{\rnode[tl]{#1:tl}{\rnode[Bl]{#1:Bl}{\rnode[tr]{#1:tr}{%
- \rnode[bl]{#1:bl}{\rnode[Br]{#1:Br}{\rnode[br]{#1:br}{#2}}}}}}%
- \pnode(!\psGetNodeCenter{#1:bl}
+\rnode[bl]{#1:bl}{\rnode[Br]{#1:Br}{\rnode[br]{#1:br}{#2}}}}}}%
+\pnode(!\psGetNodeCenter{#1:bl}
\psGetNodeCenter{#1:tl}
#1:bl.x #1:tl.x add 2 div #1:bl.y #1:tl.y add 2 div ){#1:Cl}%
- \pnode(!\psGetNodeCenter{#1:tr}
+\pnode(!\psGetNodeCenter{#1:tr}
\psGetNodeCenter{#1:br}
#1:tr.x #1:br.x add 2 div #1:tr.y #1:br.y add 2 div ){#1:Cr}%
- \pnode(!\psGetNodeCenter{#1:Cl}
+\pnode(!\psGetNodeCenter{#1:Cl}
\psGetNodeCenter{#1:Cr}
#1:Cl.x #1:Cr.x add 2 div #1:Cl.y #1:Cr.y add 2 div ){#1:C}%
- \pnode(!\psGetNodeCenter{#1:Br}
+\pnode(!\psGetNodeCenter{#1:Br}
\psGetNodeCenter{#1:Bl}
#1:Br.x #1:Bl.x add 2 div #1:Br.y #1:Bl.y add 2 div ){#1:BC}%
- \pnode(!\psGetNodeCenter{#1:tr}
+\pnode(!\psGetNodeCenter{#1:tr}
\psGetNodeCenter{#1:tl}
#1:tr.x #1:tl.x add 2 div #1:tr.y #1:tl.y add 2 div ){#1:tC}%
- \pnode(!\psGetNodeCenter{#1:br}
+\pnode(!\psGetNodeCenter{#1:br}
\psGetNodeCenter{#1:bl}
- #1:br.x #1:bl.x add 2 div #1:br.y #1:bl.y add 2 div ){#1:bC}}
+ #1:br.x #1:bl.x add 2 div #1:br.y #1:bl.y add 2 div ){#1:bC}}%
%
%% Author: Michael Sharpe (msharpe at ucsd.edu)
% Macros defined in this file:
@@ -1544,11 +1554,8 @@
\def\midAB(#1)(#2)#3{\psLCNodeVar(#1)(#2)(.5,.5){#3}}
%
\def\psnline{\pst@object{psnline}}%line of nodes
-\def\psnline@i{\@ifnextchar({\psnline@iii}{\psnline@ii}}%
-\def\psnline@ii#1{%
-\addto@par{arrows=#1}%
-\psnline@iii}%
-\def\psnline@iii(#1,#2)#3{{%
+\def\psnline@i{\pst@getarrows{\psnline@ii}}
+\def\psnline@ii(#1,#2)#3{{%
\pst@killglue%
\use@par%
\pst@cnta=#2 \relax\advance\pst@cnta by 1
@@ -1557,6 +1564,28 @@
\expandafter\psline\@tmp}%
\ignorespaces}%
%
+\def\psncurve{\pst@object{psncurve}}%line of nodes
+\def\psncurve@i{\pst@getarrows{\psncurve@ii}}
+\def\psncurve@ii(#1,#2)#3{{%
+\pst@killglue%
+\use@par%
+\pst@cnta=#2 \relax\advance\pst@cnta by 1
+\edef\@tmp{}%
+\multido{\i=#1+1}{\pst@cnta}{\xdef\@tmp{\@tmp(#3\i)}}%
+\expandafter\pscurve\@tmp}%
+\ignorespaces}%
+%
+\def\psnccurve{\pst@object{psnccurve}}%line of nodes
+\def\psnccurve@i{\pst@getarrows{\psnccurve@ii}}
+\def\psnccurve@ii(#1,#2)#3{{%
+\pst@killglue%
+\use@par%
+\pst@cnta=#2 \relax\advance\pst@cnta by 1
+\xdef\@tmp{}%
+\multido{\i=#1+1}{\pst@cnta}{\xdef\@tmp{\@tmp(#3\i)}}%
+\expandafter\psccurve\@tmp}%
+\ignorespaces}%
+%
\def\shownode(#1){%display node user coords in console
\pst@killglue%
\pstVerb{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pst-node/pst-node.sty new/tex/latex/pst-node/pst-node.sty
--- old/tex/latex/pst-node/pst-node.sty 2011-07-29 16:12:10.000000000 +0200
+++ new/tex/latex/pst-node/pst-node.sty 2012-09-19 01:40:26.000000000 +0200
@@ -1,10 +1,10 @@
-% $Id: pst-node.sty 510 2011-06-05 07:08:38Z herbert $
+% $Id: pst-node.sty 703 2012-09-15 18:54:16Z herbert $
%%
%% This is file `pst-node.sty'.
%%
%% IMPORTANT NOTICE:
%%
-%% pstricks.sty Copyright (C) 2004-2011 Herbert Voss
+%% pstricks.sty Copyright (C) 2004-2012 Herbert Voss
%% Rolf Niepraschk
%%
%% This package may be distributed under the terms of the LaTeX Project
@@ -14,7 +14,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pst-node}
- [2011/06/05 v1.00 LaTeX wrapper for `pst-node' (HV)]
+ [2012/09/18 v1.01 LaTeX wrapper for `pst-node' (HV)]
%
\newif\ifpst@OldVersion\pst@OldVersionfalse
\DeclareOption{97}{\pst@OldVersiontrue}
@@ -35,10 +35,10 @@
\ProvidesPackage{pst-node}[2010/04/22 package wrapper for pst-node.tex]
\input{pst-node.tex}
\ProvidesFile{pst-node.tex}
- [\filedate\space \fileversion\space `pst-node' (tvz)]
+ [\filedate\space \fileversion\space `pst-node' (tvz,hv)]
\IfFileExists{pst-node.pro}{%
\ProvidesFile{pst-node.pro}
- [2010/04/30 v. 1.12, PostScript prologue file (hv)]
+ [2011/09/18 v. 1.14, PostScript prologue file (hv)]
\@addtofilelist{pst-node.pro}}{}%
\fi
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-node.tlpobj new/tlpkg/tlpobj/pst-node.tlpobj
--- old/tlpkg/tlpobj/pst-node.tlpobj 2012-02-13 04:40:06.000000000 +0100
+++ new/tlpkg/tlpobj/pst-node.tlpobj 2013-04-15 16:56:42.000000000 +0200
@@ -1,7 +1,7 @@
name pst-node
category Package
-revision 25380
-shortdesc Draw connections using pstricks.
+revision 29899
+shortdesc Nodes and node connections in pstricks.
relocated 1
longdesc The package enables the user to connect information, and to
longdesc place labels, without knowing (in advance) the actual positions
@@ -16,6 +16,6 @@
RELOC/tex/generic/pst-node/pst-node.tex
RELOC/tex/latex/pst-node/pst-node.sty
catalogue-ctan /graphics/pstricks/contrib/pst-node
-catalogue-date 2012-02-12 10:52:54 +0100
+catalogue-date 2013-04-14 10:19:50 +0200
catalogue-license lppl
-catalogue-version 1.22
+catalogue-version 1.27
++++++ pst-optexp.doc.tar.xz ++++++
++++ 2744 lines of diff (skipped)
++++++ pst-optexp.tar.xz ++++++
++++ 9453 lines of diff (skipped)
++++++ pst-pdf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-pdf.doc.tlpobj new/tlpkg/tlpobj/pst-pdf.doc.tlpobj
--- old/tlpkg/tlpobj/pst-pdf.doc.tlpobj 2010-06-10 18:43:12.000000000 +0200
+++ new/tlpkg/tlpobj/pst-pdf.doc.tlpobj 2013-03-12 04:38:52.000000000 +0100
@@ -1,6 +1,6 @@
name pst-pdf.doc
category Package
-revision 15878
+revision 29349
shortdesc doc files of pst-pdf
relocated 1
docfiles size=379
++++++ pst-pdf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-pdf.tlpobj new/tlpkg/tlpobj/pst-pdf.tlpobj
--- old/tlpkg/tlpobj/pst-pdf.tlpobj 2010-06-10 18:43:12.000000000 +0200
+++ new/tlpkg/tlpobj/pst-pdf.tlpobj 2013-03-12 04:38:52.000000000 +0100
@@ -1,17 +1,16 @@
name pst-pdf
category Package
-revision 15878
+revision 29349
shortdesc Make PDF versions of graphics by processing between runs.
relocated 1
longdesc The package pst-pdf simplifies the use of graphics from
longdesc PSTricks and other PostScript code in PDF documents. As in
-longdesc building a bibliography with BibTEX additional external
-longdesc programmes are being invoked. In this case they are used to
-longdesc create a PDF file (\PDFcontainer) that will contain all this
-longdesc graphics material. In the final document this contents will be
-longdesc inserted instead of the original PostScript code. The package
-longdesc works with pstricks and requires a recent version of the
-longdesc preview package.
+longdesc building a bibliography with BibTEX, additional external
+longdesc programmes are invoked. In this case they are used to create a
+longdesc PDF file (\PDFcontainer) that will contain all the graphics
+longdesc material. In the final document these contents will be inserted
+longdesc instead of the original PostScript code. The package works with
+longdesc pstricks and requires a recent version of the preview package.
runfiles size=9
RELOC/scripts/pst-pdf/ps4pdf
RELOC/scripts/pst-pdf/ps4pdf.bat
@@ -19,6 +18,6 @@
RELOC/scripts/pst-pdf/ps4pdf.bat.w95
RELOC/tex/latex/pst-pdf/pst-pdf.sty
catalogue-ctan /macros/latex/contrib/pst-pdf
-catalogue-date 2008-10-09 22:29:15 +0200
+catalogue-date 2012-06-18 13:20:48 +0200
catalogue-license lppl
catalogue-version 1.1v
++++++ pst-plot.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-plot/Changes new/doc/generic/pst-plot/Changes
--- old/doc/generic/pst-plot/Changes 2012-05-06 00:01:58.000000000 +0200
+++ new/doc/generic/pst-plot/Changes 2013-04-30 01:26:35.000000000 +0200
@@ -1,4 +1,8 @@
----- pst-plot.tex
+1.45 2013-04-29 - fix for loglines with subticks>10 (pm)
+1.44 2013-01-03 - take fontstyle into account for xLabels and yLabels
+1.43 2012-11-17 - added keyword interrupt for interrupted
+ plots with plotstyle=bar
1.42 2012-05-03 - another fix for loglines
1.41 2012-05-02 - fix for loglines
1.40 2012-03-14 - do not use etex extensions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-plot/pst-plot-doc.bib new/doc/generic/pst-plot/pst-plot-doc.bib
--- old/doc/generic/pst-plot/pst-plot-doc.bib 2012-02-24 01:16:51.000000000 +0100
+++ new/doc/generic/pst-plot/pst-plot-doc.bib 2012-11-20 02:03:45.000000000 +0100
@@ -76,3 +76,11 @@
address = {Cambridge -- UK}
}
+@Book{presentations,
+ author = {Herbert Vo\ss},
+ title = {Presentations with \LaTeX},
+ edition = {1.},
+ publisher = {DANTE -- Lehmanns Media},
+ year = {2012},
+ address = {Heidelberg/Berlin}
+}
Files old/doc/generic/pst-plot/pst-plot-doc.pdf and new/doc/generic/pst-plot/pst-plot-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-plot/pst-plot-doc.tex new/doc/generic/pst-plot/pst-plot-doc.tex
--- old/doc/generic/pst-plot/pst-plot-doc.tex 2012-05-06 00:01:58.000000000 +0200
+++ new/doc/generic/pst-plot/pst-plot-doc.tex 2013-04-30 01:26:35.000000000 +0200
@@ -55,6 +55,7 @@
Christophe Jorssen;
Uwe Kern;
Manuel Luque;
+Patrice Mégret;
Jens-Uwe Morawski;
Tobias N\"ahring;
Rolf Niepraschk;
@@ -2831,6 +2832,73 @@
\end{pspicture}
\end{LTXexample}
+
+\subsubsection{Interrupted bar plot}
+
+The new keywords \Lkeyword{interrupt} takes three comma separated values:
+the value, when the interrupted $y$ axis is interruptes, the separation for the
+drawn tilde and the value for the inrrupted section, e.g. \verb|interrupt={15,1,30}|.
+
+
+\psset{xunit=.44cm,yunit=.3cm}
+\begin{pspicture}(-2,-3)(29,32)
+\psaxes[axesstyle=axes,ticksize=-4pt 0,Dy=2,Dx=2](29,15)
+\rput(0,15.4){\textbf{\huge$\approx$}}
+\rput(0,16){\psaxes[xAxis=false,ticksize=-4pt 0,
+ Dy=2,Oy=46,Dx=2](29,15)}
+\psset{interrupt={15,1,30}}
+\listplot[linecolor=red,plotstyle=bar,barwidth=0.3cm,
+ fillcolor=red!30,fillstyle=solid]{
+0 0 1 0 2 0 3 0 4 0 5 0 6 0 7 0 8 0 9 1 10 2
+11 1 12 50 13 55 14 14 15 7 16 9 17 7 18 4
+19 2 20 3 21 0 22 0 23 0 24 1 25 2 % 1st example
+}
+\listplot[linecolor=blue,plotstyle=bar,barwidth=0.3cm,
+ fillcolor=blue!30,fillstyle=solid,opacity=0.5]{
+0 0 1 0 2 0 3 0 4 0 5 0 6 0 7 0 8 0 9 3 10 10
+11 11 12 8 13 61 14 10 15 13 16 3 17 1 18 0
+19 0 20 2 21 0 22 0 23 0 24 0 25 0 % 2nd exa
+}
+\listplot[linecolor=green,plotstyle=bar,barwidth=0.3cm,
+ fillcolor=green!30,fillstyle=solid,opacity=0.5]{
+0 0 1 0 2 0 3 0 4 1 5 0 6 0 7 0 8 0 9 3 10 4
+11 11 12 59 13 11 14 12 15 7 16 3 17 1 18 0
+19 0 20 2 21 0 22 1 23 0 24 0 25 0 % 3rd exa
+}
+\end{pspicture}
+
+\begin{lstlisting}
+\psset{xunit=.44cm,yunit=.3cm}
+\begin{pspicture}(-2,-3)(29,32)
+\psaxes[axesstyle=axes,ticksize=-4pt 0,Dy=2,Dx=2](29,15)
+\rput(0,15.4){\textbf{\huge$\approx$}}
+\rput(0,16){\psaxes[xAxis=false,ticksize=-4pt 0,
+ Dy=2,Oy=46,Dx=2](29,15)}
+\psset{interrupt={15,1,30}}
+\listplot[linecolor=red,plotstyle=bar,barwidth=0.3cm,
+ fillcolor=red!30,fillstyle=solid]{
+0 0 1 0 2 0 3 0 4 0 5 0 6 0 7 0 8 0 9 1 10 2
+11 1 12 50 13 55 14 14 15 7 16 9 17 7 18 4
+19 2 20 3 21 0 22 0 23 0 24 1 25 2 % 1st example
+}
+\listplot[linecolor=blue,plotstyle=bar,barwidth=0.3cm,
+ fillcolor=blue!30,fillstyle=solid,opacity=0.5]{
+0 0 1 0 2 0 3 0 4 0 5 0 6 0 7 0 8 0 9 3 10 10
+11 11 12 8 13 61 14 10 15 13 16 3 17 1 18 0
+19 0 20 2 21 0 22 0 23 0 24 0 25 0 % 2nd exa
+}
+\listplot[linecolor=green,plotstyle=bar,barwidth=0.3cm,
+ fillcolor=green!30,fillstyle=solid,opacity=0.5]{
+0 0 1 0 2 0 3 0 4 1 5 0 6 0 7 0 8 0 9 3 10 4
+11 11 12 59 13 11 14 12 15 7 16 3 17 1 18 0
+19 0 20 2 21 0 22 1 23 0 24 0 25 0 % 3rd exa
+}
+\end{pspicture}
+\end{lstlisting}
+
+\psset{unit=1cm}
+
+
%--------------------------------------------------------------------------------------
\subsection{Plot style \nxLkeyword{ybar}}\label{options:ybar}
%--------------------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-plot.doc.tlpobj new/tlpkg/tlpobj/pst-plot.doc.tlpobj
--- old/tlpkg/tlpobj/pst-plot.doc.tlpobj 2012-05-06 04:36:23.000000000 +0200
+++ new/tlpkg/tlpobj/pst-plot.doc.tlpobj 2013-04-30 03:49:50.000000000 +0200
@@ -1,9 +1,9 @@
name pst-plot.doc
category Package
-revision 26218
+revision 30162
shortdesc doc files of pst-plot
relocated 1
-docfiles size=697
+docfiles size=702
RELOC/doc/generic/pst-plot/Changes
RELOC/doc/generic/pst-plot/README
RELOC/doc/generic/pst-plot/more_docs/README
++++++ pst-plot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-plot/pst-plot.tex new/tex/generic/pst-plot/pst-plot.tex
--- old/tex/generic/pst-plot/pst-plot.tex 2012-05-06 00:01:58.000000000 +0200
+++ new/tex/generic/pst-plot/pst-plot.tex 2013-04-30 01:26:35.000000000 +0200
@@ -1,11 +1,11 @@
-% $Id: pst-plot.tex 687 2012-05-03 12:06:21Z herbert $
+% $Id: pst-plot.tex 776 2013-04-29 10:10:22Z herbert $
%% BEGIN pst-plot.tex
%%
%% plotting functions and data with PSTricks.
%% See the betadoc documentation for usage.
%%
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
-%% COPYRIGHT 2009-2012 by Herbert Voss, hvoss@tug.org.
+%% COPYRIGHT 2009-2013 by Herbert Voss, hvoss@tug.org.
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
@@ -20,8 +20,8 @@
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi
\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
%
-\def\fileversion{1.42}
-\def\filedate{2012/05/03}
+\def\fileversion{1.45}
+\def\filedate{2013/04/29}
\message{ v\fileversion, \filedate\space (tvz,hv)}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -214,18 +214,71 @@
\let\endqp@LineToXAxis\endqp@line
\let\testqp@LineToXAxis\testqp@line
%
+\newif\ifPst@interrupt \Pst@interruptfalse
\define@key[psset]{pst-plot}{barwidth}[0.25cm]{\pst@getlength{#1}\Add@barwidth}
\psset[pst-plot]{barwidth=0.25cm}
+\define@key[psset]{pst-plot}{interrupt}[]{\expandafter\pst@interrupt#1,,,\@nil}
+\def\pst@interrupt#1,#2,#3,#4\@nil{%
+ \ifx\relax#1\relax \Pst@interruptfalse
+ \else
+ \Pst@interrupttrue
+ \def\pst@interrupt@YMax{#1 }%
+ \def\pst@interrupt@YMaxSep{#2 }%
+ \def\pst@interrupt@YMaxDiff{#3 }%
+ \fi
+}
%
\def\psbar@ii{\addto@pscode{false \tx@NArray \psbar@iii}}
+
\def\psbar@iii{%
- newpath
- n {
- /Yval exch def /Xval exch def
- Xval \number\Add@barwidth 0.5 mul sub 0 moveto
- 0 Yval rlineto \number\Add@barwidth 0 rlineto
- 0 Yval neg rlineto \number\Add@barwidth neg 0 rlineto
- } repeat
+ \ifPst@interrupt
+ /YMax \pst@interrupt@YMax \strip@pt\psyunit\space mul def
+ /YMaxSep \pst@interrupt@YMaxSep \strip@pt\psyunit\space mul def
+ /YMaxDiff \pst@interrupt@YMaxDiff \strip@pt\psyunit\space mul def
+ /Tilde { % on stack DX
+ /Op ED % add or sub
+ /DX ED
+ currentpoint 2 copy
+ /Y ED /X ED % x y
+ X DX add Y YMaxSep 2 div Op
+ X DX dup add add Y
+ curveto
+ currentpoint 2 copy pop /X ED
+ X DX add Y YMaxSep 2 div neg Op
+ X DX dup add add Y
+ curveto
+ } def
+ newpath
+ n {
+ /Yval exch def /Xval exch def
+ Xval \number\Add@barwidth 0.5 mul sub 0 moveto
+ Yval YMax le {
+ 0 Yval rlineto \number\Add@barwidth 0 rlineto
+ 0 Yval neg rlineto \number\Add@barwidth neg 0 rlineto
+ }{
+ 0 YMax rlineto
+ \number\Add@barwidth 4 div
+ { add } Tilde
+ 0 YMax neg rlineto
+ \number\Add@barwidth neg 0 rlineto
+ closepath
+ Xval \number\Add@barwidth 0.5 mul sub YMax YMaxSep add moveto
+ 0 Yval YMax sub YMaxSep sub YMaxDiff sub rlineto
+ \number\Add@barwidth 0 rlineto
+ 0 Yval YMax YMaxSep add sub YMaxDiff sub neg rlineto
+ \number\Add@barwidth 4 div neg
+ { sub } Tilde
+ } ifelse
+ } repeat
+ \else
+ newpath
+ n {
+ /Yval exch def /Xval exch def
+ Xval \number\Add@barwidth 0.5 mul sub 0 moveto
+ 0 Yval rlineto \number\Add@barwidth 0 rlineto
+ 0 Yval neg rlineto \number\Add@barwidth neg 0 rlineto
+ } repeat
+ \fi
}%
\def\beginplot@bar{\begin@SpecialObj}
\def\endplot@bar{%
@@ -1794,7 +1847,8 @@
1 1 DT {
1 sub /OffSet exch def
% 1 10 subTNo div 9.99 { % do not write a line for 1
- 10 subTNo 1 add div dup 10 { % do not write a line for 1
+% 10 subTNo 1 add div dup 10 { % do not write a line for 1
+ -10 subTNo 1 add div dup 10 add exch dup -0.1 mul 1 add { % do not write a line for 10 and 1, trace lines between 10 and 1 by steps of 10/subTno
/dx exch def % save index
% /x cntTick dT dx log mul add def %
/x dx log OffSet add \ifis@yAxis\pst@number\psyunit\else\pst@number\psxunit\fi\space mul cntTick add def %
@@ -1870,7 +1924,8 @@
gsave
1 1 DT cvi {
1 sub /OffSet exch def
- 10 subTNo 1 add div dup 10 { % do not write a line for 1
+ -10 subTNo 1 add div dup 10 add exch dup -0.1 mul 1 add { % do not write a line for 10 and 1, trace lines between 10 and 1 by steps of 10/subTno
+% 10 subTNo 1 add div dup 10 { % do not write a line for 1
% 1 10 subTNo div 9.99 { % do not write a line for 1
/dx exch def % save index
% /x cntTick dT dx log mul add def %
@@ -1931,6 +1986,8 @@
}%
%
%
+%
+%
\def\psxs@frame{%
\begin@SpecialObj%
\addto@pscode{ % the frame
@@ -2028,7 +2085,7 @@
\edef\pst@tempB{\pst@int{\pst@tempA}}
% \divide\pst@cnta\psk@dx\relax% % Number of ticks/labels
\multido{\nA=#3+1}{\pst@tempB}{\uput{\psxlabelsep}[-90]{\pst@xLabelsRot}(\nA,0)%\psxlabelsep)
- {\strut\psPutXLabel{\nA}}}%
+ {\strut\pshlabel{\psPutXLabel{\nA}}}}%
\fi%
}
% Knows \pst@dimb and \pst@cnta
@@ -2073,7 +2130,8 @@
\pstFPadd\pst@tempA{1.55}{\pst@tempA} % to prevent rounding errors
\edef\pst@tempB{\pst@int{\pst@tempA}}
% \divide\pst@cnta\psk@dy\relax% % Number of ticks/labels
- \multido{\nA=#3+1}{\pst@tempB}{\uput{\psylabelsep}[180]{\pst@yLabelsRot}(0,\nA){\strut\psPutYLabel{\nA}}}%
+ \multido{\nA=#3+1}{\pst@tempB}{\uput{\psylabelsep}[180]{\pst@yLabelsRot}(0,\nA){%
+ \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nA}}}}%
\fi%
}
% \pst@dima: the width between two labels in pt
@@ -2290,19 +2348,19 @@
\@namedef{endpsgraph*}{\endpsgraph}
%
\def\psPutXLabel#1{%
- \global\pst@cntm=0\relax
- \global\pst@cntn=#1\relax
+ \global\pst@cnto=0\relax
+ \global\pst@cntp=#1\relax
\expandafter\get@Label\psk@xLabels,\@nil
}
\def\psPutYLabel#1{%
- \global\pst@cntm=0\relax
- \global\pst@cntn=#1\relax
+ \global\pst@cnto=0\relax
+ \global\pst@cntp=#1\relax
\expandafter\get@Label\psk@yLabels,\@nil
}
\def\get@Label#1,#2\@nil{%
- \ifnum\the\pst@cntm=\the\pst@cntn
+ \ifnum\the\pst@cnto=\the\pst@cntp
#1
- \else\global\advance\pst@cntm by \@ne
+ \else\global\advance\pst@cnto by \@ne
\expandafter\get@Label#2,\@nil
\fi%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-plot.tlpobj new/tlpkg/tlpobj/pst-plot.tlpobj
--- old/tlpkg/tlpobj/pst-plot.tlpobj 2012-05-06 04:36:25.000000000 +0200
+++ new/tlpkg/tlpobj/pst-plot.tlpobj 2013-04-30 03:49:52.000000000 +0200
@@ -1,6 +1,6 @@
name pst-plot
category Package
-revision 26218
+revision 30162
shortdesc Plot data using PSTricks.
relocated 1
longdesc The package provides plotting of data (typically from external
@@ -10,6 +10,6 @@
RELOC/tex/generic/pst-plot/pst-plot.tex
RELOC/tex/latex/pst-plot/pst-plot.sty
catalogue-ctan /graphics/pstricks/contrib/pst-plot
-catalogue-date 2012-03-26 15:52:21 +0200
+catalogue-date 2013-01-04 14:21:22 +0100
catalogue-license lppl
-catalogue-version 1.40
+catalogue-version 1.44
++++++ pst-solides3d.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-solides3d/Changes new/doc/generic/pst-solides3d/Changes
--- old/doc/generic/pst-solides3d/Changes 2010-10-01 00:52:51.000000000 +0200
+++ new/doc/generic/pst-solides3d/Changes 2012-12-20 01:31:48.000000000 +0100
@@ -1,4 +1,5 @@
pst-solides3d.tex ---
+4.24 2011-07-13 - take value of resolution into account
4.23 2010-09-22 - add option axisemph to the axesboxed option
4.22 2010-08-06 - reset boolean solidmemory to false, when closing
a pspicture environemnt.
@@ -20,6 +21,8 @@
solides.pro ---
+4.22 2012-12-18 - translate french color names to english
+4.21 2011-07-13 - take value of resolution into account
4.16 2010-01-07 - fix bug with pst-surfaceparametre and function def
4.15 2009-07-03 - allow names for the origin coordidates for \psSolid (hv)
4.14 2009-02-27 - Ajout de la coloration en fonction de la hauteur z. (jpv)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-solides3d/doc-en/Letter.ist new/doc/generic/pst-solides3d/doc-en/Letter.ist
--- old/doc/generic/pst-solides3d/doc-en/Letter.ist 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/generic/pst-solides3d/doc-en/Letter.ist 2012-11-17 00:23:31.000000000 +0100
@@ -0,0 +1,36 @@
+%%
+%% This is file `Letter.ist',
+%%
+%% The idea is from Ingo Kloeckl, Latex2e:
+%% Herbert Voss 000726
+%%
+%% This is a MAKEINDEX style file which should be used to
+%% generate the formatted change history for use with the doc
+%% package. The TeX commands used below are defined in
+%% doc.sty. The commands for MAKEINDEX like `level'
+%% `item_x1' are described in `` Makeindex, A General
+%% Purpose, Formatter-Independent Index Processor'' by
+%% Pehong Chen.
+%%
+headings_flag 1 % headings yes
+heading_prefix "\\textbf{" % boldfont
+heading_suffix "}\n" % newline
+quote '"'
+%%level '>'
+preamble
+ "\\begin{theindex}\n"
+item_1
+ "\\par\\leavevmode\\hangindent10pt\\makebox[10pt][l]{--}"
+item_01
+ "\\par\\leavevmode\\hangindent10pt\\makebox[10pt][l]{--}"
+item_x1
+ "\\par\\leavevmode\\hangindent10pt\\makebox[10pt][l]{--}"
+item_2
+ "\\par\\leavevmode\\hangindent20pt\\makebox[20pt][l]{-- -- }"
+item_12
+ "\\par\\leavevmode\\hangindent20pt\\makebox[20pt][l]{-- -- }"
+item_x2
+ "\\par\\leavevmode\\hangindent20pt\\makebox[20pt][l]{-- -- }"
+%%
+%%
+%% End of file `Letter.ist'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-solides3d/doc-en/par-keywords-en.tex new/doc/generic/pst-solides3d/doc-en/par-keywords-en.tex
--- old/doc/generic/pst-solides3d/doc-en/par-keywords-en.tex 2010-10-01 00:52:51.000000000 +0200
+++ new/doc/generic/pst-solides3d/doc-en/par-keywords-en.tex 2012-11-17 00:23:31.000000000 +0100
@@ -484,17 +484,22 @@
r&
\textbackslash{}psSolid&&\\[.5em]
- &object=courbe&length&2\\
+ &object=anneau\|courbe&length&2\\
+ \hline
+
+R&
+ \textbackslash{}psSolid&&\\[.5em]
+ &object=anneau&length&4\\
\hline
r0&
\textbackslash{}psSolid&&\\[.5em]
- &object=anneau\|tore\|troncone\|troncconecreux&length&1.5\\
+ &object=tore\|troncone\|troncconecreux&length&1.5\\
\hline
r1&
\textbackslash{}psSolid&&\\[.5em]
- &object=anneau\|tore\|troncone\|troncconecreux&length&4\\
+ &object=tore\|troncone\|troncconecreux&length&4\\
\hline
range&
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-solides3d/doc-en/par-solidespredefinis-en.tex new/doc/generic/pst-solides3d/doc-en/par-solidespredefinis-en.tex
--- old/doc/generic/pst-solides3d/doc-en/par-solidespredefinis-en.tex 2010-05-01 00:55:34.000000000 +0200
+++ new/doc/generic/pst-solides3d/doc-en/par-solidespredefinis-en.tex 2012-11-17 00:23:31.000000000 +0100
@@ -407,7 +407,7 @@
\end{tabular}
&
\begin{tabular}{c}
- \texttt{[r1=2.5,r0=1.5,}\\
+ \texttt{[R=4,r=3}\\
inner and outer radius\\
\texttt{h=6,section=...]}\\
height\\
@@ -419,7 +419,7 @@
%\psset{unit=0.44cm}
\psset{lightsrc=42 24 13,viewpoint=50 30 15 rtp2xyz}
\psset{Decran=30}
-\psSolid[object=anneau,fillcolor=yellow,h=1.5,r1=4,r0=3]%
+\psSolid[object=anneau,fillcolor=yellow,h=1.5,R=4,r=3]%
\axesIIID(4,4,0)(5,5,4)
\end{pspicture}
&
@@ -428,7 +428,7 @@
\psSolid[
object=anneau,
fillcolor=yellow,
- h=1.5,r1=4,r0=3]%
+ h=1.5,R=4,r=3]%
\end{verbatim}
\end{minipage}
\\\hline
Files old/doc/generic/pst-solides3d/doc-en/tex-files-all.zip and new/doc/generic/pst-solides3d/doc-en/tex-files-all.zip differ
Files old/doc/generic/pst-solides3d/pst-solides3d-doc.pdf and new/doc/generic/pst-solides3d/pst-solides3d-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-solides3d.doc.tlpobj new/tlpkg/tlpobj/pst-solides3d.doc.tlpobj
--- old/tlpkg/tlpobj/pst-solides3d.doc.tlpobj 2010-10-01 04:10:53.000000000 +0200
+++ new/tlpkg/tlpobj/pst-solides3d.doc.tlpobj 2012-12-20 04:33:04.000000000 +0100
@@ -1,12 +1,13 @@
name pst-solides3d.doc
category Package
-revision 19959
+revision 28581
shortdesc doc files of pst-solides3d
relocated 1
-docfiles size=2063
+docfiles size=2060
RELOC/doc/generic/pst-solides3d/Changes
RELOC/doc/generic/pst-solides3d/README
RELOC/doc/generic/pst-solides3d/doc-en/Changes
+ RELOC/doc/generic/pst-solides3d/doc-en/Letter.ist
RELOC/doc/generic/pst-solides3d/doc-en/Makefile
RELOC/doc/generic/pst-solides3d/doc-en/Pyramid-couleurs.dat
RELOC/doc/generic/pst-solides3d/doc-en/Pyramid-faces.dat
@@ -108,6 +109,7 @@
RELOC/doc/generic/pst-solides3d/doc-en/paraboloid-io.dat
RELOC/doc/generic/pst-solides3d/doc-en/paraboloid-sommets.dat
RELOC/doc/generic/pst-solides3d/doc-en/pst-solides3d-doc.bib
+ RELOC/doc/generic/pst-solides3d/doc-en/pst-solides3d-doc.brf
RELOC/doc/generic/pst-solides3d/doc-en/pst-solides3d-doc.tex
RELOC/doc/generic/pst-solides3d/doc-en/rocket.obj
RELOC/doc/generic/pst-solides3d/doc-en/slicePyramid-couleurs.dat
@@ -116,7 +118,6 @@
RELOC/doc/generic/pst-solides3d/doc-en/slicePyramid-sommets.dat
RELOC/doc/generic/pst-solides3d/doc-en/sommets_nefer.dat
RELOC/doc/generic/pst-solides3d/doc-en/sommets_nefer0.dat
- RELOC/doc/generic/pst-solides3d/doc-en/tex-files-all.zip
RELOC/doc/generic/pst-solides3d/doc-en/tore1836-couleurs.dat
RELOC/doc/generic/pst-solides3d/doc-en/tore1836-faces.dat
RELOC/doc/generic/pst-solides3d/doc-en/tore1836-io.dat
++++++ pst-solides3d.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pst-solides3d/pst-solides3d.pro new/dvips/pst-solides3d/pst-solides3d.pro
--- old/dvips/pst-solides3d/pst-solides3d.pro 2010-05-01 00:55:34.000000000 +0200
+++ new/dvips/pst-solides3d/pst-solides3d.pro 2012-12-20 01:31:48.000000000 +0100
@@ -1,8 +1,8 @@
%!
% PostScript prologue for pst-solides3d.tex.
-% Version 4.20, 2010/04/27
+% Version 4.22, 2012/12/18
%
-%% COPYRIGHT 2009/10 by Jean-Paul Vignault
+%% COPYRIGHT 2009-2013 by Jean-Paul Vignault
%% opacity changes by Herbert Voss
%%
%% This program can be redistributed and/or modified under the terms
@@ -162,6 +162,21 @@
/cyan {1 0 0 0 setcmykcolor} def
/magenta {0 1 0 0 setcmykcolor} def
+/blue /bleu load def
+/red /rouge load def
+/green /vert load def
+/gray /gris load def
+/yellow /jaune load def
+/black /noir load def
+/white /blanc load def
+%/orange {1 .65 0 setrgbcolor} def
+/pink /rose load def
+%/cyan {1 0 0 0 setcmykcolor} def
+%/magenta {0 1 0 0 setcmykcolor} def
+
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% definition du point de vue %%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2169,7 +2184,7 @@
/setresolution {
/resolution exch def
} def
-/resolution 200 def
+%/resolution 200 def % ---- hv 20110713
/courbe_dic 2 dict def
courbe_dic /X {} put
@@ -4719,7 +4734,7 @@
%% /couleurlignedeniveau {rouge} def
%% /linewidthlignedeniveau 4 def
-/solidgridOn {
+/solidgridOn {
/solidgrid true def
} def
/solidgridOff {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-solides3d/pst-solides3d.tex new/tex/generic/pst-solides3d/pst-solides3d.tex
--- old/tex/generic/pst-solides3d/pst-solides3d.tex 2010-10-01 00:52:51.000000000 +0200
+++ new/tex/generic/pst-solides3d/pst-solides3d.tex 2012-12-20 01:31:48.000000000 +0100
@@ -33,8 +33,8 @@
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
% JPV & ML & AS & HV
-\def\fileversion{4.23}
-\def\filedate{2010/09/22}
+\def\fileversion{4.24}
+\def\filedate{2011/07/13}
\message{`PSTSOLIDESIIID' v\fileversion, \filedate}
%
\pstheader{pst-solides3d.pro}
@@ -60,17 +60,17 @@
\define@key[psset]{pst-solides3d}{RotZ}{\def\psk@solides@RotZ{#1}}% rotation autour de Oz en degres
\psset[pst-solides3d]{RotZ=0,RotX=0,RotY=0,Decran=50}% valeurs par defaut
% parametres propres a chaque objet
-\define@key[psset]{pst-solides3d}{resolution}{\def\pst@solides@resolution{#1}} % nb points par courbe
-\define@key[psset]{pst-solides3d}{no}{\def\pst@solides@no{#1}} % numero face du solide
-\define@key[psset]{pst-solides3d}{phi}{\def\pst@solides@phi{#1}} % angle calotte sphere
-\define@key[psset]{pst-solides3d}{theta}{\def\pst@solides@theta{#1}} % angle calotte sphere
+\define@key[psset]{pst-solides3d}{resolution}{\def\pst@solides@resolution{#1 }} % nb points par courbe
+\define@key[psset]{pst-solides3d}{no}{\def\pst@solides@no{#1 }} % numero face du solide
+\define@key[psset]{pst-solides3d}{phi}{\def\pst@solides@phi{#1 }} % angle calotte sphere
+\define@key[psset]{pst-solides3d}{theta}{\def\pst@solides@theta{#1 }} % angle calotte sphere
\define@key[psset]{pst-solides3d}{r0}{\def\pst@solides@rO{#1}} % rayon interieur tore
\define@key[psset]{pst-solides3d}{r1}{\def\pst@solides@rI{#1}} % rayon moyen tore
\define@key[psset]{pst-solides3d}{R}{\def\pst@solides@R{#1}} % rayon moyen tore
\define@key[psset]{pst-solides3d}{r}{\def\pst@solides@r{#1}} % rayon de la sphere circonscrite
\define@key[psset]{pst-solides3d}{a}{\def\pst@solides@a{#1}} % arete du cube (1 du parallelepipede)
\define@key[psset]{pst-solides3d}{b}{\def\pst@solides@b{#1}} % arete 2 du parallelepipede
-\define@key[psset]{pst-solides3d}{c}{\def\pst@solides@c{#1}} % arete 3 du parallelepipede
+\define@key[psset]{pst-solides3d}{c}{\def\pst@solides@c{#1 }} % arete 3 du parallelepipede
\define@key[psset]{pst-solides3d}{h}{\def\pst@solides@h{#1}} % hauteur du cylindre, du cone, du prisme
\define@key[psset]{pst-solides3d}{chanfreincoeff}{\def\pst@solides@chanfreincoeff{#1}} % coeff de chanfreinage
\define@key[psset]{pst-solides3d}{trunccoeff}{\def\pst@solides@trunccoeff{#1}} % coeff de troncature
@@ -79,7 +79,7 @@
\define@key[psset]{pst-solides3d}{intersectiontype}{\def\pst@solides@intersectiontype{#1}} %
%
%% les affectations par defaut
-\psset[pst-solides3d]{R=4,r1=4,r0=1.5,r=2,no=0,a=4,b=a,c=a,h=6,phi=0,theta=90,resolution=36,%
+\psset[pst-solides3d]{R=4,r1=4,r0=1.5,r=2,no=0,a=4,b=a,c=a,h=6,phi=0,theta=90,resolution=36,
trunccoeff=.25,chanfreincoeff=.8,affinagecoeff=.8,dualregcoeff=1,intersectiontype=-1}
%
%%%%%%%%%%%%%%%%% variables complexes %%%%%%%%%%%%%%%%%
@@ -341,6 +341,7 @@
\@ifnextchar[{\gridIIID@ii(#1,#2)(#3,#4)}{\gridIIID@ii(#1,#2)(#3,#4)[2,2,3]}}
\def\gridIIID@ii(#1,#2)(#3,#4)[#5,#6,#7]{%
\pst@killglue%
+ \addbefore@par{planmarks}%
\begingroup%
\use@par%
\psSolid[object=parallelepiped,
@@ -434,7 +435,7 @@
%% code insere dans le .ps
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
-\pst@def{optionssolides}<%
+\pst@def{optionssolides}<
/PSfont {\pst@solides@PSfont} def
/pst@fill { \psk@opacityalpha .setopacityalpha fill } def
/strokeopacity \psk@opacityalpha def
@@ -443,21 +444,22 @@
%% /cm {\pst@number\psunit mul} def
%% /cm_1 {\pst@number\psunit div} def
/decal \pst@solides@decal\space def % decalage
- /viewpointXYZ {\pst@solides@viewpoint} def
+ /viewpointXYZ { \pst@solides@viewpoint } def
/Decran \pst@solides@Decran\space def % distance de l'ecran
%
-/RotX \psk@solides@RotX\space def
-/RotY \psk@solides@RotY\space def
-/RotZ \psk@solides@RotZ\space def
+ /RotX \psk@solides@RotX\space def
+ /RotY \psk@solides@RotY\space def
+ /RotZ \psk@solides@RotZ\space def
%
-/fontsize {\pst@solides@fontsize\space \pst@number\psunit mul 28.45 div } bind def
+ /fontsize \pst@solides@fontsize\space \pst@number\psunit mul 28.45 div def
%
-/projectionsifacevisible \ifPst@visibility true \else false \fi def
+ /projectionsifacevisible \ifPst@visibility true \else false \fi def
%
/R \pst@solides@R\space def % pour le tore
/r1 \pst@solides@rI\space def % pour le tore
/r0 \pst@solides@rO\space def % pour le tore
-/resolution \pst@solides@resolution\space def % pour le nb de points par courbe
+%/resolution \pst@solides@resolution\space def % pour le nb de points par courbe
+\pst@solides@resolution setresolution % ------ hv 20110713
/phi \pst@solides@phi\space def % pour la calotte spherique
/theta \pst@solides@theta\space def % pour la calotte spherique
/r \pst@solides@r\space def % rayon sphere circonscrite
@@ -567,7 +569,7 @@
\let\endpspictureS@lid\endpspicture% redefine \endpspicture (hv)
\def\endpspicture{\ifPst@solidmemory\use@pscode\fi\endpspictureS@lid\global\Pst@solidmemoryfalse}
%
-\def\psSolid{\pst@object{psSolid}}
+\def\psSolid{\def\pst@par{}\pst@object{psSolid}}
\def\psSolid@i{\@ifnextchar({\psSolid@ii}{\psSolid@iv{ 0. 0. 0. }}}
\def\psSolid@ii(#1){\expandafter\psSolid@iii#1,,,\@nil}
\def\psSolid@iii#1,#2,#3,#4\@nil{%
@@ -578,7 +580,7 @@
\addto@pscode{
\tx@setTransparency
1 setlinejoin
- \tx@optionssolides
+ \tx@optionssolides
SolidesDict begin
#1
/CZ exch def
@@ -848,7 +850,7 @@
/solidlinewidth {\pst@number\pslinewidth} def
/PSfont {\pst@solides@PSfont} def
/normale {\pst@solides@normal} bind def
-/fontsize {\pst@solides@fontsize\space \pst@number\psunit mul 28.45 div } bind def
+/fontsize {\pst@solides@fontsize\space \pst@number\psunit mul 28.45 div } def
/origin {\pst@solides@origin} def
/RotationAngleText {\pst@solides@RotationAngleText} def
/range [ \pst@solides@range ] def
@@ -863,7 +865,8 @@
\ifx\pst@solides@plan\@empty \else/planprojpst \pst@solides@plan \space def \fi
\ifx\pst@solides@solidname\@empty\else/solidprojname {\pst@solides@solidname\space} def \fi
/noface \pst@solides@no\space def % no de la face du solide
-/resolution \pst@solides@resolution\space def % pour le nb de points par courbe
+%/resolution \pst@solides@resolution\space def % pour le nb de points par courbe
+\pst@solides@resolution setresolution % ------ hv 20110713
%\makeatletter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-solides3d.tlpobj new/tlpkg/tlpobj/pst-solides3d.tlpobj
--- old/tlpkg/tlpobj/pst-solides3d.tlpobj 2010-10-01 04:10:58.000000000 +0200
+++ new/tlpkg/tlpobj/pst-solides3d.tlpobj 2012-12-20 04:33:08.000000000 +0100
@@ -1,6 +1,6 @@
name pst-solides3d
category Package
-revision 19959
+revision 28581
shortdesc Draw perspective views of 3D solids.
relocated 1
longdesc The package is designed to draw solids in 3d perspective.
@@ -17,6 +17,6 @@
RELOC/tex/generic/pst-solides3d/pst-solides3d.tex
RELOC/tex/latex/pst-solides3d/pst-solides3d.sty
catalogue-ctan /graphics/pstricks/contrib/pst-solides3d
-catalogue-date 2010-09-29 09:03:07 +0200
+catalogue-date 2012-11-16 20:45:05 +0100
catalogue-license lppl1.3
-catalogue-version 4.23
+catalogue-version 4.24
++++++ pst-tools.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-tools/Changes new/doc/generic/pst-tools/Changes
--- old/doc/generic/pst-tools/Changes 2012-01-05 01:05:06.000000000 +0100
+++ new/doc/generic/pst-tools/Changes 2012-10-17 02:54:25.000000000 +0200
@@ -1,4 +1,6 @@
..... pst-tools.tex
+0.02 2012-10-16 - added option postString and stripSpaces
+ to macro \psPrintValue
0.01 2012-01-01 - first CTAN version
@@ -6,5 +8,10 @@
2012-01-01 first version
-..... pst-tools.pro
-0.01 2012-01-01 first version
+---- pst-tools.pro
+0.03 2012-10-16 - added function /rightTrim
+ - moved file from pstricks base to pst-tools
+0.02 2012-01-01 moved some stuff from pst-func.pro
+0.01 2011-04-23 initial version (hv)
+
+
Files old/doc/generic/pst-tools/pst-tools-doc.pdf and new/doc/generic/pst-tools/pst-tools-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-tools/pst-tools-doc.tex new/doc/generic/pst-tools/pst-tools-doc.tex
--- old/doc/generic/pst-tools/pst-tools-doc.tex 2012-01-05 01:05:06.000000000 +0100
+++ new/doc/generic/pst-tools/pst-tools-doc.tex 2012-10-17 02:54:25.000000000 +0200
@@ -41,6 +41,8 @@
\textrm{name} & \textrm{value} & \textrm{default}\\\hline
\Lkeyword{PSfont} & PS font name & Times & only valid \PS font names are possible, e.g.
\Lps{Times-Roman}, \Lps{Helvetica}, \Lps{Courier}, \Lps{AvantGard}, \Lps{Bookman}\\
+\Lkeyword{postString} & <string> & \{\} & will be appended to the number string\\
+\Lkeyword{trimSpaces} & <boolean> & false & will strip spaces on the right\\
\Lkeyword{fontscale} & <number> & 10 & the font scale in pt\\
\Lkeyword{valuewidth} & <number> & 10 & the width of the string for the converted
real number; if it is too small, no value is printed\\
@@ -109,6 +111,31 @@
\makebox[6em]{\psPrintValue[PSfont=Palatino-Roman]{\rA,sin(x)^2+cos(x)^2}}\\}
\end{lstlisting}
+
+
+\begin{center}
+foo \makebox[2em][l]{\psPrintValue[dot]{3.14 10 mul round 10 div}}bar\\3pt
+foo \makebox[2em][l]{\psPrintValue[dot,PSfont=Symbol,
+ postString=\string\260]{3.14 10 mul round 10 div}}bar\\3pt
+foo \makebox[3.5em][l]{\psPrintValue[dot,PSfont=Symbol,decimals=6,
+ postString=\string\260]{3.14 dup mul}}bar
+\end{center}
+
+\bigskip
+
+\begin{lstlisting}
+foo \makebox[2em][l]{\psPrintValue[dot]{3.14 10 mul round 10 div}}bar\\3pt
+foo \makebox[2em][l]{\psPrintValue[dot,PSfont=Symbol,
+ postString=\string\260]{3.14 10 mul round 10 div}}bar\\3pt
+foo \makebox[3.5em][l]{\psPrintValue[dot,PSfont=Symbol,decimals=6,
+ postString=\string\260]{3.14 dup mul}}bar
+\end{lstlisting}
+
+
+
+
+
+
\clearpage
\section{List of all optional arguments for \texttt{pst-tools}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-tools.doc.tlpobj new/tlpkg/tlpobj/pst-tools.doc.tlpobj
--- old/tlpkg/tlpobj/pst-tools.doc.tlpobj 2012-01-06 04:28:33.000000000 +0100
+++ new/tlpkg/tlpobj/pst-tools.doc.tlpobj 2012-10-17 04:37:14.000000000 +0200
@@ -1,9 +1,9 @@
name pst-tools.doc
category Package
-revision 25024
+revision 27986
shortdesc doc files of pst-tools
relocated 1
-docfiles size=22
+docfiles size=23
RELOC/doc/generic/pst-tools/Changes
RELOC/doc/generic/pst-tools/README
RELOC/doc/generic/pst-tools/pst-tools-doc.bib
++++++ pst-tools.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pst-tools/pst-tools.pro new/dvips/pst-tools/pst-tools.pro
--- old/dvips/pst-tools/pst-tools.pro 1970-01-01 01:00:00.000000000 +0100
+++ new/dvips/pst-tools/pst-tools.pro 2012-10-17 02:54:25.000000000 +0200
@@ -0,0 +1,231 @@
+% $Id: pst-tools.pro 713 2012-10-16 14:25:00Z herbert $
+%
+%% PostScript tools prologue for pstricks.tex.
+%% Version 0.03, 2012/10/16
+%%
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License Distributed from CTAN archives
+%% in directory macros/latex/base/lppl.txt.
+%
+%
+/Pi2 1.57079632679489661925640 def
+/factorial { % n on stack, returns n!
+ dup 0 eq { 1 }{
+ dup 1 gt { dup 1 sub factorial mul } if }
+ ifelse } def
+%
+/MoverN { % m n on stack, returns the binomial coefficient m over n
+ 2 dict begin
+ /n exch def /m exch def
+ n 0 eq { 1 }{
+ m n eq { 1 }{
+ m factorial n factorial m n sub factorial mul div } ifelse } ifelse
+ end
+} def
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% subroutines for complex numbers, given as an array [a b]
+% which is a+bi = Real+i Imag
+%
+/cxadd { % [a1 b1] [a2 b2] = [a1+a2 b1+b2]
+ dup 0 get % [a1 b1] [a2 b2] a2
+ 3 -1 roll % [a2 b2] a2 [a1 b1]
+ dup 0 get % [a2 b2] a2 [a1 b1] a1
+ 3 -1 roll % [a2 b2] [a1 b1] a1 a2
+ add % [a2 b2] [a1 b1] a1+a2
+ 3 1 roll % a1+a2 [a2 b2] [a1 b1]
+ 1 get % a1+a2 [a2 b2] b1
+ exch 1 get % a1+a2 b1 b2
+ add 2 array astore
+} def
+%
+/cxneg { % [a b]
+ dup 1 get % [a b] b
+ exch 0 get % b a
+ neg exch neg % -a -b
+ 2 array astore
+} def
+%
+/cxsub { cxneg cxadd } def % same as negative addition
+%
+% [a1 b1][a2 b2] = [a1a2-b1b2 a1b2+b1a2] = [a3 b3]
+/cxmul { % [a1 b1] [a2 b2]
+ dup 0 get % [a1 b1] [a2 b2] a2
+ exch 1 get % [a1 b1] a2 b2
+ 3 -1 roll % a2 b2 [a1 b1]
+ dup 0 get % a2 b2 [a1 b1] a1
+ exch 1 get % a2 b2 a1 b1
+ dup % a2 b2 a1 b1 b1
+ 5 -1 roll dup % b2 a1 b1 b1 a2 a2
+ 3 1 roll mul % b2 a1 b1 a2 b1a2
+ 5 -2 roll dup % b1 a2 b1a2 b2 a1 a1
+ 3 -1 roll dup % b1 a2 b1a2 a1 a1 b2 b2
+ 3 1 roll mul % b1 a2 b1a2 a1 b2 a1b2
+ 4 -1 roll add % b1 a2 a1 b2 b3
+ 4 2 roll mul % b1 b2 b3 a1a2
+ 4 2 roll mul sub % b3 a3
+ exch 2 array astore
+} def
+%
+% [a b]^2 = [a^2-b^2 2ab] = [a2 b2]
+/cxsqr { % [a b] square root
+ dup 0 get exch 1 get % a b
+ dup dup mul % a b b^2
+ 3 -1 roll % b b^2 a
+ dup dup mul % b b^2 a a^2
+ 3 -1 roll sub % b a a2
+ 3 1 roll mul 2 mul % a2 b2
+ 2 array astore
+} def
+%
+/cxsqrt { % [a b]
+% dup cxnorm sqrt /r exch def
+% cxarg 2 div RadtoDeg dup cos r mul exch sin r mul cxmake2
+ cxlog % log[a b]
+ 2 cxrdiv % log[a b]/2
+ aload pop exch % b a
+ 2.781 exch exp % b exp(a)
+ exch cxconv exch % [Re +iIm] exp(a)
+ cxrmul %
+} def
+%
+/cxarg { % [a b]
+ aload pop % a b
+ exch atan % arctan b/a
+ DegtoRad % arg(z)=atan(b/a)
+} def
+%
+% log[a b] = [a^2-b^2 2ab] = [a2 b2]
+/cxlog { % [a b]
+ dup % [a b][a b]
+ cxnorm % [a b] |z|
+ log % [a b] log|z|
+ exch % log|z|[a b]
+ cxarg % log|z| Theta
+ cxmake2 % [log|z| Theta]
+} def
+%
+% square of magnitude of complex number
+/cxnorm2 { % [a b]
+ dup 0 get exch 1 get % a b
+ dup mul % a b^2
+ exch dup mul add % a^2+b^2
+} def
+%
+/cxnorm { % [a b]
+ cxnorm2 sqrt
+} def
+%
+/cxconj { % conjugent complex
+ dup 0 get exch 1 get % a b
+ neg 2 array astore % [a -b]
+} def
+%
+/cxre { 0 get } def % real value
+/cxim { 1 get } def % imag value
+%
+% 1/[a b] = ([a -b]/(a^2+b^2)
+/cxrecip { % [a b]
+ dup cxnorm2 exch % n2 [a b]
+ dup 0 get exch 1 get % n2 a b
+ 3 -1 roll % a b n2
+ dup % a b n2 n2
+ 4 -1 roll exch div % b n2 a/n2
+ 3 1 roll div % a/n2 b/n2
+ neg 2 array astore
+} def
+%
+/cxmake1 { 0 2 array astore } def % make a complex number, real given
+/cxmake2 { 2 array astore } def % dito, both given
+%
+/cxdiv { cxrecip cxmul } def
+%
+% multiplikation by a real number
+/cxrmul { % [a b] r
+ exch aload pop % r a b
+ 3 -1 roll dup % a b r r
+ 3 1 roll mul % a r b*r
+ 3 1 roll mul % b*r a*r
+ exch 2 array astore % [a*r b*r]
+} def
+%
+% division by a real number
+/cxrdiv { % [a b] r
+ 1 exch div % [a b] 1/r
+ cxrmul
+} def
+%
+% exp(i theta) = cos(theta)+i sin(theta) polar<->cartesian
+/cxconv { % theta
+ RadtoDeg dup sin exch cos cxmake2
+} def
+
+%%%%% ### bubblesort ###
+%% syntax : array bubblesort --> array2 trie par ordre croissant
+%% code de Bill Casselman
+%% http://www.math.ubc.ca/people/faculty/cass/graphics/text/www/
+/bubblesort { % on stack must be an array [ ... ]
+4 dict begin
+ /a exch def
+ /n a length 1 sub def
+ n 0 gt {
+ % at this point only the n+1 items in the bottom of a remain to
+ % the sorted largest item in that blocks is to be moved up into
+ % position n
+ n {
+ 0 1 n 1 sub {
+ /i exch def
+ a i get a i 1 add get gt {
+ % if a[i] > a[i+1] swap a[i] and a[i+1]
+ a i 1 add
+ a i get
+ a i a i 1 add get
+ % set new a[i] = old a[i+1]
+ put
+ % set new a[i+1] = old a[i]
+ put
+ } if
+ } for
+ /n n 1 sub def
+ } repeat
+ } if
+ a % return the sorted array
+end
+} def
+%
+/concatstringarray{ % [(a) (b) ... (z)] --> (ab...z) 20100422
+ 0 1 index { length add } forall
+ string
+ 0 3 2 roll
+ { 3 copy putinterval length add }forall
+ pop
+} bind def
+%
+/dot2comma {% on stack a string (...)
+ 2 dict begin
+ /Output exch def
+ 0 1 Output length 1 sub {
+ /Index exch def
+ Output Index get 46 eq { Output Index 44 put } if
+ } for
+ Output
+ end
+} def
+%
+/rightTrim {
+ dup
+ length 1 sub -1 0 {
+ /i exch def dup i get 32 ne { exit } if
+ } for
+ 0 i 1 add getinterval
+ dup length string copy
+} bind def
+
+/psStringwidth /stringwidth load def
+/psShow /show load def
+
+%/stringwidth{ rightTrim psStringwidth } bind def
+
+%/show { rightTrim psShow } bind def
+%-----------------------------------------------------------------------------%
+% END pst-tools.pro
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-tools/pst-tools.tex new/tex/generic/pst-tools/pst-tools.tex
--- old/tex/generic/pst-tools/pst-tools.tex 2012-01-05 01:05:06.000000000 +0100
+++ new/tex/generic/pst-tools/pst-tools.tex 2012-10-17 02:54:25.000000000 +0200
@@ -26,17 +26,20 @@
% interface to the `xkeyval' package
\pst@addfams{pst-tools}
%
-\def\fileversion{0.1}
-\def\filedate{2012/01/01}
+\def\fileversion{0.02}
+\def\filedate{2012/10/16}
\message{`PST-tools' v\fileversion, \filedate\space (hv)}
%
\define@boolkey[psset]{pst-tools}[Pst@]{dot}[true]{}
+\define@boolkey[psset]{pst-tools}[Pst@]{trimSpaces}[true]{}
\define@key[psset]{pst-tools}{xShift}[0]{\def\psk@xShift{#1}}
+\define@key[psset]{pst-tools}{postString}[]{\def\psk@postString{#1}}
\define@key[psset]{pst-tools}{PSfont}[Times-Roman]{\def\psk@PSfont{/#1 }}
\define@key[psset]{pst-tools}{valuewidth}[10]{\pst@getint{#1}\psk@valuewidth }
\define@key[psset]{pst-tools}{fontscale}[10]{\pst@checknum{#1}\psk@fontscale }
\define@key[psset]{pst-tools}{decimals}[-1]{\pst@getint{#1}\psk@decimals }
-\psset[pst-tools]{PSfont=Times-Roman,fontscale=10,valuewidth=10,decimals=-1,xShift=0,dot}
+\psset[pst-tools]{PSfont=Times-Roman,fontscale=10,valuewidth=10,decimals=-1,
+ xShift=0,dot,trimSpaces=false,postString={}}
%
\def\psPrintValue{\pst@object{psPrintValue}}
\def\psPrintValue@i#1{\expandafter\psPrintValue@ii#1,,\@nil}
@@ -51,6 +54,9 @@
\else #1 \fi
\psk@decimals -1 gt { 10 \psk@decimals exp dup 3 1 roll mul cvi exch div } if
\psk@valuewidth string cvs %/Output exch def % save output
+%/concatstringarray{ % [(a) (b) ... (z)] --> (ab...z) 20100422
+ \ifx\relax\psk@postString\relax\else [ exch (\psk@postString) ] concatstringarray \fi
+ \ifPst@trimSpaces rightTrim \fi
\ifPst@dot dot2comma \fi % do we have to change dot to comma
\psk@xShift\space 0 moveto %Output
show grestore
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-tools.tlpobj new/tlpkg/tlpobj/pst-tools.tlpobj
--- old/tlpkg/tlpobj/pst-tools.tlpobj 2012-01-06 04:28:33.000000000 +0100
+++ new/tlpkg/tlpobj/pst-tools.tlpobj 2012-10-17 04:37:15.000000000 +0200
@@ -1,14 +1,15 @@
name pst-tools
category Package
-revision 25024
+revision 27986
shortdesc PStricks support functions.
relocated 1
longdesc The package provides helper functions for other PSTricks
longdesc related packages.
-runfiles size=3
+runfiles size=5
+ RELOC/dvips/pst-tools/pst-tools.pro
RELOC/tex/generic/pst-tools/pst-tools.tex
RELOC/tex/latex/pst-tools/pst-tools.sty
catalogue-ctan /graphics/pstricks/contrib/pst-tools
-catalogue-date 2012-01-04 09:11:42 +0100
+catalogue-date 2012-10-16 22:55:53 +0200
catalogue-license lppl
-catalogue-version 0.1
+catalogue-version 0.02
++++++ pst2pdf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/pst2pdf/Changes new/texmf-dist/doc/latex/pst2pdf/Changes
--- old/texmf-dist/doc/latex/pst2pdf/Changes 2011-12-15 03:01:37.000000000 +0100
+++ new/texmf-dist/doc/latex/pst2pdf/Changes 2013-03-10 23:38:10.000000000 +0100
@@ -1,4 +1,5 @@
pst2pdf.pl --------
+0.14 2013-02-27 - suport xelatex and -help from command line
0.13 2011-12-12 - some more improvements to the code
0.12 2011-01-19 - new optional arguments for running
bibtex or biber
@@ -6,9 +7,9 @@
allow working with Windows
- test for pst-exa to write \psset in the
pdf file
-0.10 2010-01-04 allow using the package pst-exa
-0.09 2009-10-01 allow pspicture*
-0.08 2009-08-28 test for png files (only for Linux)
+0.10 2010-01-04 - allow using the package pst-exa
+0.09 2009-10-01 - allow pspicture*
+0.08 2009-08-28 - test for png files (only for Linux)
0.07 2009-07-24 - fix bug with \begin{postscript} and following
pspicture environment
- add some more documentation
@@ -17,7 +18,7 @@
e.g. tex, ltx
- ignore verbatim environment
- better log file support
-0.04 2007-07-04 allow all \begin ..\end sequences anywhere
- in a line, see testcase
-0.03 2007-06-21 fix nested environments
-0.02 2007-06-20 first (public) version
+0.04 2007-07-04 - allow all \begin ..\end sequences anywhere
+ in a line, see testcase
+0.03 2007-06-21 - fix nested environments
+0.02 2007-06-20 - first (public) version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/pst2pdf/Makefile new/texmf-dist/doc/latex/pst2pdf/Makefile
--- old/texmf-dist/doc/latex/pst2pdf/Makefile 2011-01-20 22:39:35.000000000 +0100
+++ new/texmf-dist/doc/latex/pst2pdf/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,62 +0,0 @@
-# `Makefile' for `pst2pdf.pdf', hv, 2006/08/11
-
-.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
-
-PACKAGE = pst2pdf
-
-MAIN = $(PACKAGE)-doc
-
-LATEX = latex
-
-ARCHNAME = $(MAIN)-$(shell date +%y%m%d)
-
-ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile
-
-TDS = ~/PSTricks/PSTricks-TDS
-
-all : doc clean
-
-doc: $(MAIN).pdf
-
-$(MAIN).pdf : $(MAIN).ps
- GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $<
-
-$(MAIN).ps : $(MAIN).dvi
- dvips $<
-
-$(MAIN).dvi : $(MAIN).tex
- $(LATEX) $<
- $(LATEX) $<
- if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi
- if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi
- makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \
- $(basename $<).glo
- makeindex -t $(basename $<).ilg -o $(basename $<).ind \
- $(basename $<).idx
- bibtex $(basename $<)
- $(LATEX) $<
- $(LATEX) $<
-
-clean :
- $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out )
- $(RM) $(addprefix $(MAIN), .dvi .ps)
-
-veryclean : clean
- $(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
-
-arch :
- zip $(ARCHNAME).zip $(ARCHFILES)
-
-tds:
- cp -u Changes $(TDS)/scripts/$(PACKAGE)/
- cp -u README $(TDS)/scripts/$(PACKAGE)/
- cp -u $(MAIN).pdf $(TDS)/scripts/$(PACKAGE)/
- cp -u $(MAIN).tex $(TDS)/scripts/$(PACKAGE)/
- cp -u $(MAIN).bib $(TDS)/scripts/$(PACKAGE)/
- cp -u Makefile $(TDS)/scripts/$(PACKAGE)/
- cp -u test?.tex $(TDS)/scripts/$(PACKAGE)/
- cp -u test?-pdf.pdf $(TDS)/scripts/$(PACKAGE)/
- cp -u pst2pdf.pl $(TDS)/scripts/$(PACKAGE)/
-
-
-# EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/pst2pdf/Makefile.doc new/texmf-dist/doc/latex/pst2pdf/Makefile.doc
--- old/texmf-dist/doc/latex/pst2pdf/Makefile.doc 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/latex/pst2pdf/Makefile.doc 2013-03-10 23:38:10.000000000 +0100
@@ -0,0 +1,62 @@
+# `Makefile' for `pst2pdf.pdf', hv, 2006/08/11
+
+.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
+
+PACKAGE = pst2pdf
+
+MAIN = $(PACKAGE)-doc
+
+LATEX = latex
+
+ARCHNAME = $(MAIN)-$(shell date +%y%m%d)
+
+ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile
+
+TDS = ~/PSTricks/PSTricks-TDS
+
+all : doc clean
+
+doc: $(MAIN).pdf
+
+$(MAIN).pdf : $(MAIN).ps
+ GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $<
+
+$(MAIN).ps : $(MAIN).dvi
+ dvips $<
+
+$(MAIN).dvi : $(MAIN).tex
+ $(LATEX) $<
+ $(LATEX) $<
+ if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi
+ if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi
+ makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \
+ $(basename $<).glo
+ makeindex -t $(basename $<).ilg -o $(basename $<).ind \
+ $(basename $<).idx
+ bibtex $(basename $<)
+ $(LATEX) $<
+ $(LATEX) $<
+
+clean :
+ $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out )
+ $(RM) $(addprefix $(MAIN), .dvi .ps)
+
+veryclean : clean
+ $(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
+
+arch :
+ zip $(ARCHNAME).zip $(ARCHFILES)
+
+tds:
+ cp -u Changes $(TDS)/scripts/$(PACKAGE)/
+ cp -u README $(TDS)/scripts/$(PACKAGE)/
+ cp -u $(MAIN).pdf $(TDS)/scripts/$(PACKAGE)/
+ cp -u $(MAIN).tex $(TDS)/scripts/$(PACKAGE)/
+ cp -u $(MAIN).bib $(TDS)/scripts/$(PACKAGE)/
+ cp -u Makefile $(TDS)/scripts/$(PACKAGE)/
+ cp -u test?.tex $(TDS)/scripts/$(PACKAGE)/
+ cp -u test?-pdf.pdf $(TDS)/scripts/$(PACKAGE)/
+ cp -u pst2pdf.pl $(TDS)/scripts/$(PACKAGE)/
+
+
+# EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/pst2pdf/README new/texmf-dist/doc/latex/pst2pdf/README
--- old/texmf-dist/doc/latex/pst2pdf/README 2011-01-20 22:39:35.000000000 +0100
+++ new/texmf-dist/doc/latex/pst2pdf/README 2013-03-10 23:38:10.000000000 +0100
@@ -6,9 +6,9 @@
for the pdf output of the main document. The eps and
pdf files are saved in a subdirectory images.
-Syntax: pst2pdf.pl file[.tex] [options]
+Syntax: pst2pdf.pl file[.tex] [-options]
-alternative: perl pst2pdf.pl file[.tex] [options]
+alternative: perl pst2pdf.pl file[.tex] [-options]
Some restrictions:
@@ -30,22 +30,10 @@
pst2pdf creates a document file-pdf.tex for use with
pdflatex, which then creates file-pdf.pdf. The created
-images are named file-tmp-<No>.pdf
+images are named file-pst-<No>.pdf
-Options:
---imageDir=<path>
---Iext=<.ext>
---DPI=<int>
---Iscale=<real>
---tempDir=<dir>
---verbose
---clear
---noImages
---runBibtex
---runBiber
-
-for more documentation => perldoc pst2pdf or read the documentation
+for more documentation => pst2pdf --help or read the documentation
--
Herbert Voss 2010-01-04
-</pre>
\ No newline at end of file
+</pre>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.bib new/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.bib
--- old/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.bib 2011-01-20 22:39:35.000000000 +0100
+++ new/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.bib 2013-03-10 23:38:10.000000000 +0100
@@ -125,10 +125,10 @@
@Book{PSTricks2,
author = {Herbert Vo\ss},
- title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {6.},
- publisher = {DANTE -- Lehmanns},
+ title = {\texttt{PSTricks} -- {G}rafics for \TeX{} and \LaTeX},
+ edition = {1.},
+ publisher = {UIT},
year = {2011},
- address = {Heidelberg/Hamburg}
+ address = {Cambridge}
}
Files old/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.pdf and new/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.tex new/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.tex
--- old/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.tex 2011-12-15 03:01:37.000000000 +0100
+++ new/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.tex 2013-03-10 23:38:10.000000000 +0100
@@ -1,8 +1,8 @@
-%% $Id: pst-func-doc.tex 245 2010-01-04 17:07:30Z herbert $
-\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,
- smallheadings, headexclude,footexclude,oneside]{pst-doc}
+\documentclass[10pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
+ headexclude,footexclude,oneside]{pst-doc}
\usepackage[utf8]{inputenc}
-\usepackage{pst-text,pst-grad,pst-exa}
+\RequirePackage{xspace}
+\usepackage{pst-text,pst-grad}
\let\pstFV\fileversion
\DeclareFixedFont{\RM}{T1}{ptm}{b}{n}{4cm}
\renewcommand\bgImage{\pscharpath[fillstyle=gradient,
@@ -16,8 +16,8 @@
\begin{document}
\title{\texttt{pst2pdf}}
-\subtitle{Running a PSTricks document with pdflatex;\\ \small v. 0.13}
-\author{Herbert Vo\ss \\ Pablo Gonzales Luengo}
+\subtitle{Running a PSTricks document with pdflatex;\\ \small v. 0.14}
+\author{Herbert Vo\ss \\ Pablo Gonz\'{a}lez Luengo}
\docauthor{}
\date{\today}
\maketitle
@@ -26,131 +26,163 @@
\clearpage
-\begin{abstract}
-\noindent
-\Lprog{pst2pdf} is a Perl script for running a PSTricks document in a last run
-with pdflatex.
-%\LPack{pst-exa} is a package that supports the printing of
-%code and output of PSTricks examples when running in pdf mode.
-
-\vfill\noindent
-Thanks to:
-Rolf Niepraschk
+%\begin{abstract}
+%\noindent
+%\Lprog{pst2pdf} is a \Lprog{perl} \emph{script} for running a PSTricks document in a last run
+%with pdflatex.
+
+%\vfill\noindent
+%Thanks to:
+%Rolf Niepraschk
-\end{abstract}
+%\end{abstract}
+
+%\clearpage
-\clearpage
\section{Introduction}
-\PST as \PS-related package uses the programming language \PS for internal
-calculations. This is an important adavantage, because floating point arithmetic is no
+\PST\ as \PS\ related package uses the programming language \PS\ for internal
+calculations. This is an important advantage, because floating point arithmetic is no
problem. Nearly all mathematical calculation can be done when running the \DVI-file
-with \gs. However, creating a \PDF file in a direct way with \Lprog{pdflatex} is
-not possible. \Lprog{pdflatex} cannot understand the \PS related stuff. Instead
-of running \Lprog{pdflatex} one can use the Perl script \Lprog{pdf2eps}, it extracts
-all \PST-related code into single documents with the same preamble as the original
-main document. Then the script runs this document, clips all whitespace arounf the
-image and creates a \Lext{pdf}, \Lext{eps}, and \Lext{png} image of the \PST
-related code. In a last run which is the \Lprog{pdflatex} the \PST code in the
-main dcouemnt is replaced by the created images.
+with \gs. However, creating a \PDF\ file in a direct way with \Lprog{pdflatex} is
+not possible. \Lprog{pdflatex} cannot understand the \PS\ related stuff.
-\section{Running the Perl script}
-The genral syntax for the Perl script is simple
+Instead of running \Lprog{pdflatex} one can use the \Lprog{perl} \emph{script} \Lprog{pst2pdf}, it extracts
+all \PST\ related code into single documents with the same preamble as the original
+main document.
+
+The \nxLprog{pst2pdf} \emph{script} runs document, clips all whitespace around the
+image and creates a \Lext{pdf} (and \Lext{eps},\Lext{ppm}) image of the \PST\
+related code. In a last run which is the \Lprog{pdflatex} the \PST\ code in the
+main document is replaced by the created images.
+
+\section{Requirements}
+\subsection{Programs needed}
+\nxLprog{pst2pdf} needs \Lprog{pdftk}, \Lprog{ImageMagick} and \Lprog{poppler-utils} (or \Lprog{xpdf-utils}) for the process file in usual way. If you need a create .pdf image files (whitout related software) use single mode (see \ref{single}).
+
+\subsection{Preparating file}
+The script scan the file for \Lenv{pspicture} and \Lenv{postscript} environments,
+which are then taken with its contents from the main file to create stand alone documents
+with the same preamble as the main document. The \Lenv{pspicture} environment can be nested,
+the \Lenv{postscript} one not! But it can contain an environment \Lenv{pspicture}, but not vice versa.
+The \Lenv{postscript} environment should always be used, when there is some code before a \Lenv{pspicture}
+environment or for some code which is not inside of a \Lenv{pspicture} environment.
+
+Put all related \PST\ package in separate lines in your preamble, \nxLprog{pst2pdf} delete al lines contains \PST\ package before last run.
+
+This is an example of environments that support for \nxLprog{pst2pdf}:
+
+\vspace{10pt}
+\begin{minipage}[c]{0.25\textwidth}
+\begin{verbatim}
+\pspicture*
+\psset{...}
+pstricks code
+\endpspicture
+\end{verbatim}
+\end{minipage}
+\begin{minipage}[c]{0.25\textwidth}
+\begin{verbatim}
+\begin{pspicture}
+\psset{...}
+pstricks code
+\end{pspicture}
+\end{verbatim}
+\end{minipage}
+\begin{minipage}[c]{0.25\textwidth}
+\begin{verbatim}
+\begin{pspicture*}
+\psset{...}
+pstricks code
+\end{pspicture*}
+\end{verbatim}
+\end{minipage}
+\begin{minipage}[c]{0.25\textwidth}
+\begin{verbatim}
+\begin{postscript}
+\psset{...}
+pstricks code
+\end{postscript}
+\end{verbatim}
+\end{minipage}
+
+\section{Running the script}
+\subsection{Default mode}
+The general syntax for the \Lprog{perl} \emph{script} is simple:
\begin{BDef}
-\Lprog{pst2pdf} \Larg{file}\OptArg*{\Lext{tex}} \OptArg*{options}
+\nxLprog{perl} \nxLprog{pst2pdf} \Larg{file.tex} \OptArg*{--options}
\end{BDef}
-The options listed in Table~\ref{perloptions} refer only to the script and not the \LaTeX\ file.
+For \TeX Live users:
-\begin{table}
-\caption{Possible optional arguments for the Perl script \nxLprog{pst2pdf}}\label{perloptions}
+\begin{BDef}
+\nxLprog{pst2pdf} \Larg{file.tex} \OptArg*{--options}
+\end{BDef}
+
+\subsection{Single mode}
+\label{single}
+If \nxLprog{pst2pdf} can not process a file, used the option \Loption{--single} this process will create the file, whiout pdftk
+(take a more time to create images files) by default create PDF files. For exampple:
+
+\begin{BDef}
+\nxLprog{pst2pdf} \Larg{file.tex} \OptArg*{--pdf} \OptArg*{--single}
+\end{BDef}
+
+create file-pdf.pdf and file-pst-1.pdf, file-pst-2.pdf, file-pst-\dots.pdf for all \Lenv{pspicture} and \Lenv{postscript} environments in the directory for the created images (see \ref{options}).
+
+\section{Options}
+\label{options}
+The options listed in Table~\ref{perloptions} refer only to the \emph{script} and not the \LaTeX\ file.
+
+\begin{table}[htp]
+\caption{Optional arguments for \nxLprog{pst2pdf}}\label{perloptions}
\begin{tabularx}{\linewidth}{@{} l l >{\ttfamily}l X @{}}\\\toprule
\emph{name} & \emph{values} & \textrm{\emph{default}} & \emph{description}\\\midrule
-\Loption{--imageDir} & literal & imgages/ & the directory for the created images\\
-\Loption{--Iext} & literal & .pdf & the extension for \Lcs{includegraphics}, can be empty, then
- \Lcs{includegraphics} decides which image is used.\\
-\Loption{--DPI} & integer & 75 & the dots per inch for a created png file, if possible\\
-\Loption{--Iscale} & real & 1 & the value for the option \Loption{scale} in \Lcs{includegraphics}.
- Important when using a greater dpi value.\\
-\Loption{--tempDir} & literal & . & the temporary directory for the temp files\\
-\Loption{--verbose} & boolean & 1 & for a long \Lprog{pst2pdf} log\\
-\Loption{--clear} & boolean & 0 & delete all temporary files\\
-\Loption{--noImages} & boolean & 0 & create no images, build only the pdf with the alread existing images\\
-\Loption{--runBibTeX} & boolean & 0 & runs \Lprog{bibtex} \\
+\Loption{--imageDir} & literal & images/ & the directory for the created images.\\
+\Loption{--Iext} & literal & .pdf & the extension for \Loption{PrependGraphicsExtensions}.\\
+\Loption{--DPI} & integer & 75 & the dots per inch for a created \Lext{ppm} file.\\
+\Loption{--Iscale} & real & 1 & the value for the option \Loption{scale} in \Lcs{includegraphics}.\\
+\Loption{--eps} & boolean & 0 & creates \Lext{eps} images files (need pdftops).\\
+\Loption{--ppm} & boolean & 0 & creates \Lext{ppm} images files (need pdftoppm).\\
+\Loption{--files} & boolean & 0 & creates \Lext{tex} for all images.\\
+\Loption{--verbose} & boolean & 1 & for a long \nxLprog{pst2pdf} log.\\
+\Loption{--norun} & boolean & 0 & create files, but no compile.\\
+\Loption{--clear} & boolean & 0 & delete all temporary files.\\
+\Loption{--help} & boolean & 1 & print help and exit.\\
+\Loption{--single} & boolean & 0 & create images type (whitout pdftk).\\
+\Loption{--all} & boolean & 0 & generte all image type (.pdf, .eps, .tex).\\
+\Loption{--version} & boolean & 0 & print version and exit.\\
+\Loption{--license} & boolean & 0 & print license and exit.\\
+\Loption{--xetex} & boolean & 0 & using \Lprog{xelatex} instead of \Lprog{latex} for the process.\\
+\Loption{--noImages} & boolean & 0 & generate files but no images (need \Loption{--norun}).\\
+\Loption{--runBibTeX}& boolean & 0 & runs \Lprog{bibtex} \\
\Loption{--runBiber} & boolean & 0 & runs \Lprog{biber} if a file with extension \Lext{bcf} exists \\\bottomrule
\end{tabularx}
\end{table}
-After the \Lprog{pst2pdf} run there exists a pdf file called \texttt{\Lcs{jobname}-pdf.pdf}. And when not using
-the \Loption{--clear} option also the corresponding \TeX{} file \texttt{\Lcs{jobname}-pdf.tex}.
-The preamble of the document should contain all code which is important to the \PST code.
+For Help in command line use:
-\section{\PST\ code}
-The per scripts scans the files for \Lenv{pspicture} and \Lenv{postscript} environments,
-which are then taken with its contents from the main file to create stand alone documents
-with the same preamble as the main document. The \Lenv{pspicture} environment can be nested,
-the \Lenv{postscript} one not! But it can contain an environment \Lenv{pspicture}, but not vice versa.
-The \Lenv{postscript} environment should always be used, when there is some code before a \Lenv{pspicture}
-environment or for some code which is not inside of a \Lenv{pspicture} environment.
+\begin{BDef}
+\nxLprog{pst2pdf} \OptArg*{--help}
+\end{BDef}
+\section{Other image format}
+If your need \Lext{png}, \Lext{jpg} or other image type use \nxLprog{pst2pdf} \Larg{file.tex} \OptArg*{--ppm} , than move to images dir and use \nxLprog{mogrify} command (from \Lprog{ImageMagick}), for examples:\\
+\begin{BDef}
+\nxLprog{mogrify} -format \OptArg*{png *.ppm}
+\end{BDef}
+generate PNG images files and \\
+\begin{BDef}
+\nxLprog{mogrify} -format \OptArg*{jpg *.ppm}
+\end{BDef}
+generate JPG images files.
\bgroup
\raggedright
\nocite{*}
\bibliographystyle{plain}
\bibliography{pst2pdf-doc}
\egroup
-
\printindex
-
-
\end{document}
-
-
-
-\section{The package \nxLPack{pst-exa}}
-The package \LPack{pst-exa} was created to realize examples with printed code and output
-side by side or on top of each other. The package looks in the image directory for the source
-code of the examples and inserts only the code between the environment \Lenv{document},
-which is the sequence \LBEG{document} \ldots\ \LEND{document}.
-
-The package provides the environment \Lenv{PSTexample} with the optional
-arguments listed in Table~\ref{pst-exaoptions}.
-
-\begin{table}
-\caption{Possible optional arguments for the package \LPack{pst-exa}}\label{pst-exaoptions}
-\begin{tabularx}{\linewidth}{@{} l l l X @{}}\\\toprule
-\emph{name} & \emph{values} & \textrm{\emph{default}} & \emph{description}\\\midrule
-\Lkeyword{pos} & \Lkeyval{l},\Lkeyval{r},\Lkeyval{b},\Lkeyval{t} & \Lkeyval{l} & position of the image, maybe left, right, bottom ot top of the code.\\
-\Lkeyword{halign} & \Lkeyval{l},\Lkeyval{r},\Lkeyval{c} & \Lkeyval{c} & the horizontal alignment of the image.\\
-\Lkeyword{valign} & \Lkeyval{l},\Lkeyval{r},\Lkeyval{c} & \Lkeyval{c} & the vertical alignment of the image.\\
-\Lkeyword{frame} & see lst & & option is passed to \Lcs{lstinputlisting} from the package \LPack{listings}.\\
-\Lkeyword{width} & length &0.5\Ldim{linewidth} & the width of the example box.\\
-\Lkeyword{sep} & length &1em & separation between image and code.\\
-\Lkeyword{imageDir} & literal &images/ & directory for the created images and tex files.\\\bottomrule
-\end{tabularx}
-\end{table}
-
-
-
-
-
-
-
-\section{Examples}
-The package contains some example files for running the script without and
-with the package \LPack{pst-exa}.
-
-\begin{compactdesc}
-\item[test1.tex] running \verb=pst2pdf test1=. The test file contains a jpg-image, which is only possible with pdflatex.
-\item[test2.tex] same as \LFile{test1}, but with using \LPack{pst-exa} and example--code combination.
-\item[test3.tex] another example
-\end{compactdesc}
-
-%\section{List of all optional arguments for \texttt{pst-exa}}
-%
-%\xkvview{family=pst-exa,columns={key,type,default}}
-
-
-
Files old/texmf-dist/doc/latex/pst2pdf/test.pdf and new/texmf-dist/doc/latex/pst2pdf/test.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/pst2pdf/test.tex new/texmf-dist/doc/latex/pst2pdf/test.tex
--- old/texmf-dist/doc/latex/pst2pdf/test.tex 2011-12-15 03:01:37.000000000 +0100
+++ new/texmf-dist/doc/latex/pst2pdf/test.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,408 +0,0 @@
-\documentclass{article}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-\usepackage{lmodern}
-\usepackage[dvipsnames]{xcolor}
-\usepackage{pst-solides3d}
-\usepackage{psgo}
-\usepackage{pst-text}
-\usepackage{pst-blur}
-\usepackage[tiling]{pst-fill}
-\usepackage{pst-calendar}
-\usepackage{pst-eucl}
-\usepackage{pst-labo}
-\usepackage{pst-3d}
-\usepackage{psfrag}
-\usepackage{pst-bar}
-\usepackage{pst-barcode}
-\usepackage{pst-gr3d}
-\usepackage{pst-ob3d}
-\usepackage{pst-3dplot}
-\usepackage{pst-tree}
-\usepackage{pst-coil}
-\usepackage{pst-bezier}
-\usepackage{pst-coxeterp}
-\usepackage{pst-circ}
-\usepackage{pst-func}
-\usepackage{pstricks-add}
-\usepackage{pst-plot,pst-math}
-\usepackage{pst-slpe}
-\usepackage{pst-fr3d}
-\usepackage{vaucanson-g}
-\usepackage{blindtext}
-\usepackage{multido}
-\usepackage{pst-grad}
-\usepackage{pstricks-add}
-%\usepackage[pspdf={-dPDFSETTINGS=/prepress}]{auto-pst-pdf}
-\begin{document}
-A test for pst2pdf ...
-\texttt{blindtext,pst-node}
-\begin{postscript}
-\SpecialCoor
-\rnode{A}{The beginning of it all:}
-\blindtext
-\rnode{E}{And this is the end my friend.}
-\nccurve[linewidth=5pt,strokeopacity=0 .4,ncurvB=0.9,arrowscale=1.5,arrows=->]{A}{E}
-\end{postscript}
-
-\texttt{pstricks-add}
-\begin{pspicture}(-0.04,-0.04)(1,1)
-\psset{unit=5}
-\psgrid[subgriddiv=5,subgridcolor=lightgray]
-\psplotDiffEqn[whichabs=0,whichord=1,linecolor=red,
-method=rk4,algebraic,plotpoints=400,
-showpoints=true]{0}{10}{0 0}%
-{cos(Pi*x^2/2)|sin(Pi*x^2/2)}
-\end{pspicture}
-
-\texttt{pst-solides3d}
-\begin{pspicture}[solidmemory](-4,-5)(7,4)
-\psset{viewpoint=50 -40 10 rtp2xyz,Decran=50,
-linecolor=darkgray,lightsrc=viewpoint}
-\psSolid[object=grille,action=draw,base=-3 5 -3 5,
-linecolor=Salmon!40](0,0,-3)
-\psSolid[object=cylindre,r=2,h=6,ngrid=6 24,
-plansepare={[0.707 0 0.707 0]},name=Zylinder,
-action=none](0,0,-3)
-\psSolid[object=load,load=Zylinder1,
-fillcolor=black!5,fcol=0 (Goldenrod)]
-\psSolid[object=load,load=Zylinder0,RotZ=90,
-fillcolor=black!5,rm=0,hollow,incolor=Goldenrod](0,4,0)
-\psSolid[object=plan,action=draw,definition=equation,
-args={[0.707 0 0.707 0] 90},base=-2 2 -3 3,planmarks]
-\psSolid[object=line,args=0 0 0 0 5.5 0,
-linecolor=blue]% first half of y axis
-\color{white}\axesIIID[showOrigin=false,
-linecolor=blue](0,6.8,0)(3.5,8,3.5)
-\end{pspicture}
-
-\texttt{pstricks}
-\begin{postscript}
-\psset{unit=0.05mm}% 1:20,or=0.1mm for 1:10
-\begin{pspicture}(-100,-100)(1000,650)
-\pspolygon[linewidth=2pt,fillcolor=gray!10,
-fillstyle=solid](0,0)(0,470)(860,625)(860,0)
-\psset{linewidth=0.2pt,arrowscale=2,tbarsize=10pt}
-\psline{|<->|}(0,-100)(860,-100)
-\rput*(430,-100){430mm}
-\psline{|<->|}(960,0)(960,625)
-\rput*{90}(960,312.5){625mm}
-\psline{|<->|}(-100,0)(-100,470)
-\rput*{90}(-100,235){470mm}
-\end{pspicture}
-\end{postscript}
-
-\texttt{pstricks, pst-node, and pst-plot}
-\begin{pspicture}(-1,-3)(4.75,3)
-\psscalebox{0.75}{
-\psaxes{->}(0,0)(-1,-3)(5,3)
-\psplot[polarplot,linewidth=2pt,algebraic,
-plotpoints=500]{0}{6.289}{2*(1+cos(x))}
-\multido{\r=0.000+0.314}{21}{ %
-\psplotTangent[polarplot,Derive=-2*sin(x),
-algebraic,arrows=<->]{\r}{1.5}{2*(1+cos(x))}}
-}
-\end{pspicture}
-
-\texttt{pst-plot}
-\begin{pspicture}[showgrid=true](-1.1,-1.1)(1.1,1.1)
-\psset{xunit=1.5cm,yunit=1.5cm}
-\psparametricplot[plotstyle=curve,linewidth=1.5pt,
-plotpoints=200]{-360}{360}%
-{t 1.5 mul sin t 2 mul 60 add sin}
-\end{pspicture}
-
-\texttt{pst-tree}
-\begin{postscript}
-\pstree[levelsep=1cm,radius=3pt]{\Toval{Wurzel}}{%
-\pstree{\TC}{%
-\TC
-\pstree{\TC*}{\TC\TC\TC\TC}%
-\TC\TC}}
-\end{postscript}
-
-\texttt{pst-bezier}
-\begin{pspicture}[showgrid=true](5,3)
-\psset{showpoints=true}
-\psbcurve[linecolor=blue,linewidth=0.01](1,1)%
-(2,2)(3,1)(4,2)
-\psbcurve(1,1)(2,2)l(2,1)(3,1)(4,2)
-\uput[-90](2,1){$\vec{l}_{2}$}
-\end{pspicture}
-
-\texttt{pst-text}
-\begin{pspicture}(0,0)(.25\linewidth,8)
-\DeclareFixedFont{\ps}{U}{psy}{m}{n}{8cm}
-\psboxfill{\footnotesize$\pi$}
-\pscharpath[fillstyle=solid,
-fillcolor=cyan!20,
-addfillstyle=boxfill,fillangle=30,
-fillsep=0.6mm]{%
-\rput[b](-0.5,0){\ps\char112}}
-\end{pspicture}
-
-\texttt{pst-fill}
-\begin{postscript}
-\psset{unit=1.5,dimen=middle}
-\begin{pspicture*}(3,3)
-\psboxfill{\begin{pspicture}(1,1)
-\psframe(1,1)\end{pspicture}}
-\psframe[fillstyle=boxfill](3,3)
-\psboxfill{\begin{pspicture}(1,1)
-\rput{-37}{\psframe[linecolor=red](0.8,0.8)}
-\end{pspicture}}
-\psframe[fillstyle=boxfill](3,4)
-\pspolygon[fillstyle=hlines,hatchangle=90](1,2)(1.64,1.53)(2,2)
-\end{pspicture*}
-\end{postscript}
-
-
-\texttt{pst-coils}
-\begin{pspicture}(4,3)
-\cnode*(0.5,0.5){0.5}{A}
-\cnode*(3.5,2.5){0.5}{B}
-\pccoil[coilwidth=0.4,coilaspect=35,coilheight=0.5,linecolor=white]{<->}(A)(B)
-\nccoil[coilwidth=0.4,coilaspect=35,coilheight=0.5]{A}{B}
-\end{pspicture}
-
-
-\texttt{pst-grad}
-\begin{pspicture}(5,3.5)
-\psframe[fillstyle=gradient,gradbegin=white](5,1.5)
-\newrgbcolor{gradbegin}{0 1 1}
-\psframe[fillstyle=gradient](0,2)(5,3.5)
-\end{pspicture}
-
-\texttt{pst-slpe}
-\begin{pspicture}(2.5,2.5)
-\def\st#1{\makebox[2.75cm]{$\vcenter to 55pt{}#1$}}
-\psset{fading,endfading=0.75,linecolor=black!40}
-\psframe*(-0.3,-0.25)(3.5,20pt)
-\psframebox[fillstyle=slope]{\LARGE\st{slope}}
-\end{pspicture}
-
-\texttt{pst-blur}
-\begin{postscript}
-\DeclareFixedFont{\RM}{T1}{ptm}{b}{n}{1.75cm}
-\psset{shadow=true,blur=true,shadowsize=10pt,blurradius=5pt}
-\pscharpath{\RM PSTricks}
-\end{postscript}
-
-\texttt{pst-3d}
-
-\begin{pspicture}(-4.5,-3)(3,4.75)
-\psset{viewpoint=1 1.5 0.8}
-{\psset{gridlabels=0pt,subgriddiv=0,gridcolor=black!50}
-\ThreeDput[normal=0 0 1]{\psgrid(5,5)}
-\ThreeDput[normal=0 -1 0] {\ psgrid(5,5)}
-\ThreeDput[normal=1 0 0]{\psgrid(5,5)}}
-\ThreeDput[normal=0 0 1] {%
-\psline[linewidth=3pt,linecolor=blue]{->}(4,4)(4,5.5)
-\uput[90](4,5.5){%
-\psrotateleft{\textcolor{blue}{$\vec{n}_A$}}}}%$%xy
-\ThreeDput[normal=0 -1 0]{%
-\psline[linewidth=3pt,linecolor=green]{->}(4,0)(5.5,0)
-\uput[90](5.5,0){ \ psscalebox{-1 1}{%
-\textcolor{green}{$\vec{n}_B$}}}}%$%xz
-\ThreeDput[normal=1 0 0]{%
-\psline[linewidth=3pt,linecolor=red]{->}(0,4)(0,5.5)
-\uput[0](0,5.5){$\vec{n}_{top}$}} %yz
-\ThreeDput[normal=0 0 1] (0,0,4){%
-\psframe*[linecolor=gray!25] (4,4)
-\rput(2,2){\Huge\textbf{TOP}}}
-\ThreeDput[normal=0 1 0](4,4,0){%
-\psframe*[linecolor=gray!5](4,4)
-\rput(2,2){\Huge\textbf{side A}}}
-\ThreeDput[normal=1 0 0] (4,0,0){%
-\psframe*[linecolor=gray!15](4,4)
-\rput(2,2){\Huge\textbf{side B}}}
-% Die kleinen Achsen
-\ThreeDput[normal=0 0 1](0,0,4){%
-\psline(4,0)\uput[90](3,0){X$_{top}$}
-\psline(0,4)\uput[0] (0,3){Y$_{top}$}}
-\ThreeDput[normal=0 1 0](4,4,0){%
-\psline(4,0)\uput[90](3,0){X$_{A}$}
-\psline(0,4)\uput[0] (0,3){Y$_{A}$}}
-\ThreeDput[normal=1 0 0] (4,0,0){%
-\psline(4,0)\uput[90](3,0){X$_{B}$}
-\psline(0,4)\uput[0](0,3){Y$_{B}$}}
-\end{pspicture}
-
-\texttt{pst-ob3d}
-\begin{pspicture}(-1,-0.5)(3,1.7)
-\psset{fillstyle=solid,fillcolor=yellow,RandomFaces=true}
-\PstDie[viewpoint=1 -3 1]
-\rput(1.5,0){\PstCube[Corners=true,CornersColor=blue,
-fillstyle=solid,fillcolor=cyan,viewpoint=1 2 1]
-{1}{1}{1}}
-\end{pspicture}
-
-\texttt{pst-gr3d}
-\begin{postscript}
-\psscalebox{0.5}{\footnotesize
-\PstGridThreeD[GridThreeDNodes,unit=2.5](2,3,2)
-\multido{\ix=0+1}{3}{%
-\multido{\iy=0+1}{4}{%
-\multido{\iz=0+1}{3}{%
-\rput*(Gr3dNode\ix\iy\iz){$\ix\iy\iz$}}}}
-\psset{linecolor=blue,linestyle=dashed,
-linewidth=0.3pt,arrowscale=2,nodesep=8pt}
-\pcline{->}(Gr3dNode000)(Gr3dNode202)
-\pccurve{->}(Gr3dNode000)(Gr3dNode232)}
-\end{postscript}
-
-\texttt{pst-fr3d}
-\begin{postscript}
-\PstFrameBoxThreeD[FrameBoxThreeDOn=false]
-{\Large Off}
-\quad
-\PstFrameBoxThreeD{\Large On}% default
-\end{postscript}
-
-\texttt{pst-3dplot}
-\begin{pspicture}(-4.8,-1.75)(4.8,3.75)
-\psset{unit=4cm,drawCoor,beginAngle=90,endAngle=180,linestyle=dotted}
-\def\oA{\pstThreeDLine[linecolor=blue,linewidth=3pt,
-arrows=c-> ](0,0,0)(1,60,70)}
-\def\oB{\pstThreeDLine[linecolor=red,linewidth=3pt,
-arrows=c->](0,0,0)(1,10,50)}
-\def\oAB{\pstThreeDEllipse[beginAngle=58,
-endAngle=90](0,0,0)(1,140,40)(1,10,50)}
-
-\pstThreeDCoor[drawing,linewidth=1pt,linecolor=black,
-linestyle=solid,xMin=0,xMax=1.1,yMin=0,yMax=1.1,
-zMin=0,zMax=1.1]
-\pstThreeDEllipse(0,0,0)(-1,0,0)(0,1,0)
-\pstThreeDEllipse(0,0,0)(-1,0,0)(0,0,1)
-\pstThreeDEllipse[beginAngle=0,
-endAngle=90](0,0,0)(0,0,1)(0,1,0)
-\psset{SphericalCoor,linestyle=solid}
-\pstThreeDDot[dotstyle=none](1,10,50)
-\pstThreeDDot[dotstyle=none](1,60,70)
-\pscustom[fillstyle=solid,fillcolor=black!20,
-linestyle=none]{\oB\oAB\oA} \oA\oB\oAB
-\pstThreeDPut[origin=lb](1.1,60,70){$\vec\Omega_1$}
-\pstThreeDPut[origin=rb](1.2,10,50){$\vec\Omega_2$}
-\pstThreeDPut[origin=lb](1,10,65){$\gamma_{12}$}
-\end{pspicture}
-
-\texttt{pst-solides3d}
-\begin{pspicture}(-2,-2)(2,2)
-\psset{viewpoint=100 50 20 rtp2xyz,
-Decran=60,lightsrc=10 15 10}
-\defFunction[algebraic]{corne}(u,v)%
-{(2 + u*cos(v))*sin(2*pi*u)}%
-{(2 + u*cos(v))*cos(2*pi*u)+2*u}%
-{u *sin(v)}
-\psSolid[object=surfaceparametree,base=0 1 0 2 pi mul,function=corne,ngrid=20]
-\end{pspicture}
-
-\texttt{pst-circ}
-\begin{pspicture}(4,3.5)
-\pnode(0,3){A}\pnode(0,0){B}
-\pnode(4,1.5){C}
-\OA[OAperfect=false,OAiplus,
-OAiminus,OAiout,
-OAipluslabel=$i_P$,
-OAiminuslabel=$i_M$,
-OAioutlabel=$i_A$,
-intensitycolor=red,
-intensitylabelcolor=red](A)(B)(C)
-\end{pspicture}
-
-
-
-\texttt{pst-barcode}
-\begin{postscript}
-\psframebox{\begin{pspicture}(2.5,1in)
-\psbarcode{12345678}{includetext}{ean8}
-\end{pspicture}}
-\end{postscript}
-
-\texttt{pst-bar}
-\begin{postscript}
-\psset{unit=0.5in}%
-\begin{pspicture}(0,-0.5)(3,4.5)%
-\psgrid[xunit=1.5in,gridlabels=0,%
-subgriddiv=0,griddots=30](0,0)(1,4)%
-\psaxes[axesstyle=frame,Ox=0,Dx=1,labels=y,%
-ticks=y](0,0)(3,4)%
-\readpsbardata{\data}{example2.csv}%
-\psbarchart[barstyle={red,blue}]{\data}%
-\end{pspicture}
-\end{postscript}
-
-\texttt{pst-math}
-\begin{pspicture*}(-0.75,-.75)(6,5)
-\psaxes{->}(6,5)
-\psset{linewidth=1.5pt,plotpoints=200}
-\psplot{.1}{6}{x GAMMA}
-\psplot{.1}{6}{x GAMMALN}
-\end{pspicture*}
-
-\texttt{pst-func}
-\begin{pspicture*}(-3,-2.2)(3.6,2.5)
-\psaxes{->}(0,0)(-3,-2)(3.2,2)[$x$,0][$y$,90]
-\psplotImp[linewidth=2pt,algebraic](-5,-2.2)(5,2.4){%
-(x^2+y^2)^2-8*(x^2-y^2)}
-\rput*(2,1.5){$\left(x^2+y^2\right)^2-8(x^2-y^2)=0$}
-\psplotImp[linewidth=1pt,linecolor=red,
-algebraic](-5,-2.2)(5,2.4){(x^2+y^2)^2-4*(x^2-y^2)}
-\end{pspicture*}
-
-\texttt{pst-eucl}
-\begin{postscript}
-\pstGeonode[PosAngle={0,90}](2,2){A_0}(-2,2){B_0}%
-\psset{RotAngle=90}
-\pstRotation[PosAngle=270]{A_0}{B_0}[D_0]
-\pstRotation[PosAngle=180]{D_0}{A_0}[C_0]
-\pspolygon(A_0)(B_0)(C_0)(D_0)%
-\psset{PointSymbol=none, PointName=none, HomCoef=.2}
-\multido{\n=1+1,\i=0+1}{20}{%
-\pstHomO[PosAngle=0]{B_\i}{A_\i}[A_\n]
-\pstHomO[PosAngle=90]{C_\i}{B_\i}[B_\n]
-\pstHomO[PosAngle=180]{D_\i}{C_\i}[C_\n]
-\pstHomO[PosAngle=270]{A_\i}{D_\i}[D_\n]
-\pspolygon(A_\n)(B_\n)(C_\n)(D_\n)}% fin multido
-\end{postscript}
-
-\texttt{pst-labo}
-\begin{postscript}
-\psset{unit=0.5cm,
-glassType=becher,
-burette=false}
-\pstDosage[phmetre]
-\end{postscript}
-
-\texttt{psgo}
-\begin{postscript}
-\psscalebox{0.7}{%
-\begin{psgopartialboard}[9]{(4,1)(9,6)}
-\stone{white}{c}{3} \stone{white}{e}{3}
-\stone{white}{d}{2} \stone{white}{d}{4}
-\stone{black}{f}{3} \stone{black}{e}{2}
-\stone{black}{e}{4}
-\end{psgopartialboard}}
-\end{postscript}
-
-\texttt{vaucanson-g}
-\begin{postscript}
-\begin{VCPicture}{(0,-2)(5.5,2)}
-\State[p]{(0,0)}{A} \State{(2.5,0)}{B}
-\State[r]{(5.5,0)}{C}\Initial{A} \Final{C}
-\EdgeL{A}{B}{a} \ArcL{B}{C}{b}
-\ArcL{C}{B}{b} \LoopN{A}{a} \LoopS{C}{d}
-\end{VCPicture}
-\end{postscript}
-
-Example for PSFRAG (from auto-pst-pdf)
-psfrag example with replacements defined in example-psfrag.tex:\par
-\begin{postscript}
-\psfragfig{example}
-\end{postscript}
-The same example with a psfrag override (bottom left):
-\begin{postscript}
-\psfragfig{example}[\psfrag{[Mp]}{$N_Q*$}]
-\end{postscript}
-\end{document}
Files old/texmf-dist/doc/latex/pst2pdf/test2.pdf and new/texmf-dist/doc/latex/pst2pdf/test2.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst2pdf.doc.tlpobj new/tlpkg/tlpobj/pst2pdf.doc.tlpobj
--- old/tlpkg/tlpobj/pst2pdf.doc.tlpobj 2011-12-15 04:34:55.000000000 +0100
+++ new/tlpkg/tlpobj/pst2pdf.doc.tlpobj 2013-03-11 04:37:24.000000000 +0100
@@ -1,20 +1,17 @@
name pst2pdf.doc
category Package
-revision 24845
+revision 29333
shortdesc doc files of pst2pdf
-docfiles size=152
+docfiles size=129
texmf-dist/doc/latex/pst2pdf/Changes
- texmf-dist/doc/latex/pst2pdf/Makefile
+ texmf-dist/doc/latex/pst2pdf/Makefile.doc
texmf-dist/doc/latex/pst2pdf/README
texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.bib
texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.pdf
texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.tex
- texmf-dist/doc/latex/pst2pdf/test.pdf
- texmf-dist/doc/latex/pst2pdf/test.tex
texmf-dist/doc/latex/pst2pdf/test1-pdf.pdf
texmf-dist/doc/latex/pst2pdf/test1.tex
texmf-dist/doc/latex/pst2pdf/test2-pdf.pdf
- texmf-dist/doc/latex/pst2pdf/test2.pdf
texmf-dist/doc/latex/pst2pdf/test2.tex
texmf-dist/doc/latex/pst2pdf/test3-pdf.pdf
texmf-dist/doc/latex/pst2pdf/test3.tex
++++++ pst2pdf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pst2pdf/pst2pdf new/texmf-dist/scripts/pst2pdf/pst2pdf
--- old/texmf-dist/scripts/pst2pdf/pst2pdf 2011-12-15 03:01:37.000000000 +0100
+++ new/texmf-dist/scripts/pst2pdf/pst2pdf 1970-01-01 01:00:00.000000000 +0100
@@ -1,524 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
- if 0;
-
-use strict; # to be sure, that all is safe ... :-)
-
-# $Id: pst2pdf.pl 611 2011-12-14 08:41:35Z herbert $
-# v. 0.13 simplify the use of PSTricks with pdf
-# 2011-12-12 (c) Herbert Voss
-# Pablo González Luengo and http://perlenespanol.com
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-use File::Path; # creating/removing dirs
-use File::Copy; # copying files
-use File::Basename; # scan argument
-use IO::File; # simple IO operation
-use Getopt::Long; # read parameter
-#----------------------- User part begin ------------------------
-my $imageDir = "images"; # where to save the images
-my $Iext = ".pdf"; # leave empty, if not a special one
-my $tempDir = "."; # temporary directory
-my $verbose = 1; # 0 or 1, logfile
-my $clear = 0; # 0 or 1, clears all temporary files
-my $DPI = 75; # very low value for the png's
-my $Iscale = 1; # for \includegraphics
-my $noImages = 0; # 1->create no images
-my $runBibTeX = 0; # 1->runs bibtex
-my $runBiber = 0; # 1->runs biber and sets $runBibTeX=0
-my $ppm = 0; # 1->create .ppm files
-my $norun = 0; # 1->runs pdflatex
-my $miktex = 0; # 1->runs pdlatex for miktex
-my $eps = 0; # 1->create .eps files
-#----------------------- User part end ---------------------------
-#----------------------- program identification, options and help
-my $program = "pst2pdf";
-my $ident = '$Id: pst2pdf.pl 611 2011-12-14 08:41:35Z herbert $';
-my $copyright = <
-END_COPYRIGHT
-my $licensetxt= < [Options]
-pst2pdf run a TeX source, and convert all PS-related part as
- single images (pdf and/or eps and/or png and/or ...)
- and then runs pdflatex. See pst2pdf documentation for more info
-Options:
- --help - display this help and exit
- --version - display version information and exit
- --license - display license information and exit
- --imageDir - the dir for the created images (default images)
- --DPI=<int> - the dots per inch for a cretaed ppm files (default 75)
- --ppm - create .ppm files
- --eps - create .eps files
- --Iscale=<real> - the value for [scale=] in \\includegraphics
- --verbose - long log
- --clear - delete all temp files
- --norun - create file-pdf.tex, but, no run pdflatex
- --runBibTeX - run bibtex on the aux file, if exists
- --runBiber - run biber on the bcf file, if exists
- --miktex - for miktex users -enable-write18
-Examples:
-* $program test.tex --clear --ppm --eps
-* produce test-pdf.tex and .ppm,.eps,.tex and .pdf for all images in image dir
-END_OF_USAGE
-#
-my $result=GetOptions (
- "help",
- "version",
- "license",
- "DPI=i" => \$DPI, # numeric
- "Iscale=f" => \$Iscale, # real
- "imageDir=s" => \$imageDir, # string
- "tempDir=s" => \$tempDir, # string
- "Iext=s" => \$Iext, # string
- "clear" => \$clear, # flag
- "noImages" => \$noImages, # flag
- "runBibTeX" => \$runBibTeX, # flag
- "ppm" => \$ppm, # flag
- "norun" => \$norun, # flag
- "miktex" => \$miktex, # flag
- "eps" => \$eps, # flag
- "runBiber" => \$runBiber, # flag
- "verbose" => \$verbose,
-) or die $usage;
-# help functions
-sub debug { print STDERR "* @_\n" if $::opt_debug; }
-sub warning { print STDERR "==> Warning: @_\n"; }
-sub error { die "$title!!! Error: @_\n"; }
-sub errorUsage { die "Error: @_ (try --help for more information)\n"; }
-# options for command line
-if ($::opt_help) {
- print $usage;
- exit (0);
-}
-if ($::opt_version) {
- print $title;
- print $copyright;
- exit (0);
-}
-if ($::opt_license) {
- print $licensetxt;
- exit (0);
-}
-# open file
-my $InputFilename = "";
-if ($::opt_filter) {
- @ARGV == 0 or
- errorUsage "Input file cannot be used with filter option";
- debug "Filtering: will read standard input";
-} else {
- @ARGV > 0 or errorUsage "Input filename missing";
- @ARGV < 2 or errorUsage "Unknown option or too many input files";
- $InputFilename = $ARGV[0];
- debug "Input filename:", $InputFilename;
-}
-my @SuffixList = (".tex","",".ltx"); # possible extensions
-my ($name,$path,$ext) = fileparse($ARGV[0],@SuffixList);
-if ($ext eq "") { $ext = ".tex"; } # me need the extension as well
-my $TeXfile = "$path$name$ext";
-my $Logfile = "$tempDir/$name.plog"; # our own log file
-open (LOGfile,">$Logfile") or die "cannot open $Logfile!";
-LOG ("Parameters:");
-LOG ("==> imageDir = $imageDir");
-LOG ("==> Iext = $Iext");
-LOG ("==> DPI = $DPI");
-LOG ("==> Iscale = $Iscale");
-LOG ("==> tempDir = $tempDir");
-LOG ("==> verbose = $verbose");
-LOG ("==> clear = $clear");
-LOG ("==> noImages = $noImages");
-LOG ("==> runBibTeX= $runBibTeX");
-LOG ("==> runBiber = $runBiber");
-LOG ("==> ppm = $ppm");
-LOG ("==> norun = $norun");
-LOG ("==> miktex = $miktex");
-LOG ("==> eps = $eps");
-
-if ($runBibTeX && $runBiber) {
- LOG ("!!! you cannot run BibTeX and Biber at the same document ...");
- LOG ("!!! Assuming to run Biber");
- $runBibTeX = 0;
-}
-if ($ppm) {
- LOG ("Generate .ppm files ...");
- $ppm = 1;
-}
-if ($norun) {
- LOG ("no compile file-pdf.tex");
- $norun = 1;
-}
-if ($miktex) {
- LOG ("enable write 18 ...");
- $miktex = 1;
-}
-if ($eps) {
- LOG ("Generate .eps files ...");
- $eps = 1;
-}
-
-my $imgNo = 1; # internal image counter
-my $pstExaLoaded = 0; # Document loads pst-exa
-
-LOG ("Running on [$path][$name][$ext]");
-open (FILE, "<$TeXfile") or die "cannot open source file $TeXfile!"; # the source
-if (!$noImages ) {
- if (-d $imageDir) { LOG ("$imageDir exists") }
- else { mkdir("$imageDir", 0744) || die "cannot mkdir $imageDir: $!";
-LOG ("Imagedir created"); }
-LOG ("go to savePreamble ... ");
-savePreamble($name);
-runBurst("$tempDir");
-LOG ("done!\n go to runFile ...");
-runFile($name);
-LOG ("done!");
-close FILE; # close source file
-}# !noImages
-
-#------------ Create filename-pics.pdf, split and generate .ppm
-sub runBurst{
-if ($miktex){system("pdflatex -enable-write18 -interaction=nonstopmode $tempDir/$name");}
-else{system("pdflatex -shell-escape -interaction=nonstopmode $tempDir/$name");}
-system("pdftk $name-pics.pdf burst output $imageDir/$name-tmp-\%1d.pdf");
-if ($ppm){system("pdftoppm -r $DPI $name-pics.pdf $imageDir/$name-tmp");
-# Renaming .ppm neded for windows
-if ($^O eq 'MSWin32') {
-my $dren = "$tempDir/$imageDir";
-my $fichero = '';
-my $ppmren = '';
-my $renNo = 1;
-if(opendir(DIR,$dren)){
- foreach (readdir DIR){
- $fichero = $_;
- if ($fichero =~ /([^\d]+)(\d+).ppm/){
- my $renNo=int($2);
- my $newname="$1$renNo.ppm";
- $ppmren = rename("$dren/$fichero","$dren/$newname");
- }
- }
- }
- else
- {
- print "dont open".$dren;
- }
-closedir DIR;
-}
-# end renaming
-}
-}
-#------------ end pdftk burst
-LOG ("runpdfTeX ... ");
-runpdfTeX("$path$name",$name);
-LOG ("all finished ... :-)");
-close LOGfile;
-
-if ( $clear ) {
-unlink "$path$name.txt";
-unlink "$path$name.log";
-unlink "$path$name.plog";
-unlink "$path$name.preamble";
-unlink "$path$name.pdf";
- }
-# create a preamble file
-# if we have a \input command inside the preamble, it doesn't hurt, we need
-# it anyway for the postscript files and the pdf one.
-sub savePreamble {
- my $filename = pop; # get the file name
- LOG ("----- Start Preamble -----");
- open (FILEp, ">$tempDir/$filename.preamble")
- or die "cannot open preamble file $tempDir/$filename.preamble!";
- while (<FILE>) { # read all until \begin{document}
- $pstExaLoaded = index($_,"usepackage{pst-exa}");
- my $i = index($_,"begin{document}");
- if ($i > 0) {
- if ($i > 1) { print FILEp substr($_,0,--$i); } # write all until \begin{document}
- close(FILEp); # close preamble
- LOG ("----- Close Preamble ------");
- return;
- } else {
- print FILEp "$_"; # write into preamble
- LOG ("$_");
- }
- }
- close(FILEp);
- if ( $verbose ) { LOG("<-----Preamble<----"); }
- return;
-}
-
-sub searchPS { # search the PostScript parts
- my @PS = (); # single PS sequence
- my @PStotal = (); # all PS sequences as list of arrays
- my $depth = -1; # counts nested macros
- my $type = -1; # -1-> none; 1->PST; 2->PS;
- my $EndDocument = 0; # ignore all after \end{document}
- my $iVerb = 0; # test for verbatim or lstlisting environment, must be ignored
- while (<FILE>) { # scan the input file
- if (!$EndDocument) {
- chomp; # delete EOL character
- my $line = $_; # save line
- if ( !$iVerb ) {
- $iVerb = ((index($line,"begin{verbatim}") > 0) or (index($line,"begin{lstlisting}") > 0));
- } # do nothing until \end{verbatim}
- if ( !$iVerb ) {
- my $iPS = index($line,"begin{postscript}");
- my $iPST = index($line,"begin{pspicture*}");
- if ($iPST < 0) { $iPST = index($line,"begin{pspicture}"); } # alternative
- if ($iPST < 0) { $iPST = index($line,"pspicture"); } # alternative \pspicture...
- if (($iPS > 0) && ( $type == 1 )){ print "postscript environment must be of outer level!\n"; exit 1; }
- if ( $type < 0 ) { # no active environment
- if ($iPS > 0) { # we have \begin{postscript}
- $type = 2;
- $line = substr($line,$iPS-1); # add rest of the line
- LOG("PS-Zeile: $line");
- }
- elsif ( $iPST > 0 ) { # we have \begin{pspicture} or \pspicture
- $type = 1;
- $depth++;
- $line = substr($line,$iPST-1); # add all unitl pspicture
- LOG("PST-Zeile: $line");
- }
- }
-# we have now \begin{pspicture} or \begin{postscript}
- if ($type > 0) { # start Scan, we have an environment
- LOG ("searchPS: set \$type=$type");
- $iPST = index($line,"end{pspicture*}");
- if ($iPST < 0) { $iPST = index($line,"end{pspicture}"); } # alternative
- if ($iPST < 0) { $iPST = index($line,"endpspicture"); } # alternative \endpspicture...
- $iPS = index($line,"end{postscript}");
- if ($iPST > 0) { # test, we can have postscript and pspicture in one line
- if ( $type < 2) { # found end of pspicture environment
- LOG ("searchPS: $line");
- $depth--;
- if ($depth < 0) {
- $type = -1;
- if (index($line,"endpspicture") > 0) # add line, depends to type
- { push @PS,substr($line,0,$iPST+12); } # \endpspicture
- elsif (index($line,"pspicture*") > 0)
- { push @PS,substr($line,0,$iPST+15); }# \end{pspicture}
- else { push @PS,substr($line,0,$iPST+14); } # \end{pspicture}
- LOG ("searchPS: set \$type=$type");
- push @PStotal,[@PS]; # add PS sequence
- LOG ("---->PS---->\n@PS\n<----PS<----");
- @PS = (); # start new PS sequence
- } # no pspicture env left
- } else { push @PS,$line; } # pspicture inside postscript
- } elsif ($iPS > 0) { # must be type=1 -> stop Scan
- LOG ("searchPS: $line");
- $type = -1;
- push @PS,substr($line,0,$iPS+15); # add line
- LOG ("searchPS: set \$type=$type");
- push @PStotal,[@PS]; # add PS sequence
- LOG ("---->PS---->\n@PS\n<----PS<----");
- @PS =(); # start new PS sequence
- } else { push @PS,$line; } # add line
- }
- my $i = index($line,"end{document}");
- if ($i > 0) { $EndDocument++; LOG("EndDocument in searchPS"); }
- } # if ( $iVerb )
- if (( index($line,"end{verbatim}") > 0 ) or ( index($line,"end{lstlisting}") > 0 )) { $iVerb = 0; }
- }}
- if ( $verbose ) {
- LOG("---->PStotal---->");
- for my $aref ( @PStotal ) {
- my @a = @$aref;
- my $i = 0;
- foreach ( @a ) { LOG ($a[$i]); $i++; }
- }
- LOG ("<----PStotal<----");
- }
- close(FILE);
- return @PStotal; # return all PS sequences
-}
-
-# Creating subfiles.tex and .eps for images
-sub runTeX{
- my $filename = pop;
- my $name = "$filename";
- copy("$filename.tex", "$imageDir/$filename-$imgNo.tex") or die "Cannot copy Source file!";
- if ($eps){
- system("pdftops -level3 -eps $imageDir/$filename-$imgNo.pdf $imageDir/$filename-$imgNo.eps");
- }
-$imgNo=$imgNo+1;
-}
-
-sub runFile {
- my $filename = pop;
- my @PSarray = searchPS();
- if ( $verbose ) {
- LOG("---->PSarray---->");
- for my $aref ( @PSarray ) {
- my @a = @$aref;
- my $i = 0;
- foreach ( @a ) { print LOG $a[$i]."\n"; $i++; }
- }
- LOG("<----PSarray<----");
- my $no = @PSarray;
- LOG("PS: ".$no." PS sequence(s)");
- }
- for my $aref ( @PSarray ) {
- my @PS = @$aref;
- open (FILEp,"<$tempDir/$filename.preamble") or die "cannot open $tempDir/$filename.preamble!";
- open (FILEsub,">$tempDir/$filename-tmp.tex") or die "cannot open $tempDir/$filename-tmp.tex!";
- while (<FILEp>) {print FILEsub $_; }
- print FILEsub "\\pagestyle{empty}\n";
- print FILEsub "\\begin{document}\n";
- if ( $verbose ) { LOG("\@PS: $_"); }
- foreach ( @PS ) { print FILEsub "$_\n"; }
- print FILEsub "\\end{document}\n";
- close (FILEsub);
- close (FILEp);
- runTeX("$tempDir/$filename-tmp");
- }
-}
-# Replace files
-sub runpdfTeX() {
- my ($name,$pdfname) = @_;
- open (PDF, ">$tempDir/$pdfname-pdf.tex") or die "cannot open $tempDir/$pdfname-pdf.tex!";
- open (FILE, "<$name.tex") or die "cannot open $name!";
- my $ignore = 0;
- my $IMGno = 1;
- my $depth = -1;
- my $type = -1;
- my $EndDocument = 0; # ignore all after \end{document}
- my $iVerb = 0;
- while (<FILE>) { # scan the input file
- if ( !$iVerb ) {
- $iVerb = ((index($_,"begin{verbatim}") > 0) or (index($_,"begin{lstlisting}") > 0));
- } # do nothing until \end{verbatim}|| \end{lstlisting}
- if ( !$iVerb ) {
- my $i = index($_,"end{document}");
- if ($i > 0) { print PDF $_; $EndDocument++; LOG("EndDocument in runpdfTeX"); }
- if ( !$EndDocument ) {
- my $iPS = index($_,"begin{postscript}");
- if ( $iPS > 0 ) {
- $type = 2;
- $ignore = 1;
- if ($iPS > 1) { print PDF substr($_,0,--$iPS); } # add preceeding text
- print PDF "\\includegraphics[scale=$Iscale]{$pdfname-tmp-$IMGno}"; # use pdfname
- $IMGno=$IMGno+1;
- } # postscript env
- if ( $type < 2 ) {
- my $iPST = index($_,"begin{pspicture*}");
- if ($iPST < 0) { $iPST = index($_,"begin{pspicture}"); } # alternative ...
- if ($iPST < 0) { $iPST = index($_,"\\pspicture"); } # alternative \endpspicture...
- if ( $iPST >= 0 ) { # start Scan
- $ignore = 1;
- $type = 1;
- $depth++; # pspicture env
- LOG("Increase depth: $depth");
- if ( $depth == 0 ) {
- if ($iPST > 1) { print PDF substr($_,0,--$iPST); } # add preceeding text
- print PDF "\\includegraphics[scale=$Iscale]{$pdfname-tmp-$IMGno}"; # use \graphicspath
- $IMGno=$IMGno+1;
- LOG("Increase Image counter: $IMGno");
- }
- }
- }
- if ( !$ignore ) { print PDF "$_"; } # default line
- if ( $type == 2 ) { # postscript env
- my $iPS = index($_,"end{postscript}");
- if ($iPS > 0) {
- print PDF substr($_,$iPS+15); # rest of line
- $ignore = 0;
- $type=-1;
- } # end Scan
- } elsif ( $type == 1 ) { # pspicture env
- my $iPST = index($_,"end{pspicture*}");
- if ($iPST < 0) { $iPST = index($_,"end{pspicture}"); } # alternative ...
- if ($iPST < 0) { $iPST = index($_,"endpspicture"); } # alternative \endpspicture...
- if ($iPST > 0) { # end Scan
- if (index($_,"endpspicture") > 0) # add rest of line, depends to type
- { print PDF substr($_,$iPST+12); } # \endpspicture
- elsif (index($_,"pspicture*") > 0)
- { print PDF substr($_,$iPST+15); } # \end{pspicture*}
- else { print PDF substr($_,$iPST+14); } # \end{pspicture}
- $depth--;
- LOG("Decrease depth: $depth");
- if ($depth < 0) { $ignore = 0; }
- }
- }
- } # if ( !$EndDocument )
- } else { print PDF $_; } # if ( $iVerb )
- if (( index($_,"end{verbatim}") > 0 ) or ( index($_,"end{lstlisting}") > 0 )) { $iVerb = 0; }
- } # while (<FILE>)
- close (FILE);
- close (PDF);
-# Coment pst-package
- open (IPDF, "<$tempDir/$pdfname-pdf.tex");
- undef $/; # read all file
- my ($uno,$dos) = split(/\\begin\{document\}/,<IPDF>,2);
- close IPDF;
-
- my @coment = split /\n/, $uno; # split in two
- my @preamb;
-
- foreach my $line (@coment) {
- chomp($line);
- $line =~ s/\\usepackage(?:\[.+?\])?\{pst.+?}//g; # delete
- $line =~ s/\\usepackage(?:\[.+?\])?\{psfr.+?}//g; # delete
- $line =~ s/(\\usepackage(?:\[.+?\])?)\{auto-pst.+?}//g; # delete
- $line =~ s/(\\usepackage(?:\[.+?\])?)\{vaucanson-.+?}//g; # delete
- $line =~ s/(\\usepackage(?:\[.+?\])?)\{psgo}//g; # delete
- $line =~ s/(\\usepackage(?:\[.+?\])?)\{graph/\%$1\{graph/g; # comment
- next if $line =~ m/^\s*$/;
- push(@preamb,$line); # adding changes
-}
-my $clean = join("\n", @preamb, "\\usepackage{grfext}\n\\\PrependGraphicsExtensions*{$Iext}\n\\usepackage{graphicx}\n\\graphicspath{{$imageDir/}}\n\\begin{document}\n". $dos);
-
-open (OPDF,">$tempDir/$pdfname-pdf.tex"); # write changes
-print OPDF $clean;
-close OPDF;
-# close coment pst-package
-
-my $runAgain = 0;
-if ($norun){print "Done\n";}
-else {system("pdflatex -interaction=nonstopmode $pdfname-pdf");}
-if (-e "$tempDir/$pdfname-pdf.idx") { system("makeindex $tempDir/$pdfname-pdf.idx"); $runAgain++; }
-if ($runBibTeX && -e "$tempDir/$pdfname-pdf.aux") { system("bibtex $tempDir/$pdfname-pdf"); $runAgain++; }
-if ($runBiber && -e "$tempDir/$pdfname-pdf.bcf") { system("biber $tempDir/$pdfname-pdf"); $runAgain++; }
-if ($runAgain) { system("pdflatex $tempDir/$pdfname-pdf"); }
-if ( $clear ) {
- unlink "$name.txt";
- unlink "$tempDir/$name.aux";
- unlink "$tempDir/$pdfname-pdf.log";
- unlink "$tempDir/$pdfname-pdf.aux";
- unlink "$tempDir/$pdfname-pdf-autopp.txt";
- unlink "$tempDir/$pdfname-pics.pdf";
- unlink "$tempDir/doc_data.txt";
- unlink "$tempDir/$pdfname-tmp.tex";
- }
-}
-
-sub LOG() {
- if ( $verbose ) { print LOGfile "@_\n"; }
-}
-__END__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pst2pdf/pst2pdf.pl new/texmf-dist/scripts/pst2pdf/pst2pdf.pl
--- old/texmf-dist/scripts/pst2pdf/pst2pdf.pl 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/scripts/pst2pdf/pst2pdf.pl 2013-03-10 23:38:10.000000000 +0100
@@ -0,0 +1,659 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
+ if 0;
+
+use strict; # to be sure, that all is safe ... :-)
+
+# $Id: pst2pdf.pl 611 2011-12-14 08:41:35Z herbert $
+# v. 0.14 simplify the use of PSTricks with pdf
+# 2011-12-12 (c) Herbert Voss
+# Pablo González Luengo
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+use File::Path; # creating/removing dirs
+use File::Copy; # copying files
+use File::Basename; # scan argument
+use IO::File; # simple IO operation
+use Getopt::Long; # read parameter
+use autodie;
+#----------------------- User part begin ------------------------
+my $imageDir = "images";# where to save the images
+my $Iext = ".pdf"; # leave empty, if not a special one
+my $tempDir = "."; # temporary directory
+my $verbose = 0; # 0 or 1, logfile
+my $clear = 0; # 0 or 1, clears all temporary files
+my $DPI = 75; # very low value for the png's
+my $Iscale = 1; # for \includegraphics
+my $noImages = 0; # 1->create no images
+my $single = 0; # 1->single create images
+my $runBibTeX = 0; # 1->runs bibtex
+my $runBiber = 0; # 1->runs biber and sets $runBibTeX=0
+my $ppm = 0; # 1->create .ppm files
+my $norun = 0; # 1->runs pdflatex
+my $eps = 0; # 1->create .eps files
+my $files = 0; # 1->create image files .tex
+my $all = 0; # 1->create all images and files for type
+my $nopdftk = 0; # 1->create all images and files for type in single mode
+my $xetex = 0; # 1->Using XeLaTeX for compilation.
+#----------------------- User part end ---------------------------
+#-------------- program identification, options and help ---------
+my $program = "pst2pdf";
+my $ident = '$Id: pst2pdf.pl 611 2011-12-14 08:41:35Z herbert $';
+my $copyright = <
+END_COPYRIGHT
+my $licensetxt= < [Options]
+pst2pdf run a TeX source, and convert all PS-related part as
+ single images (pdf or eps or ppm, default pdf)
+ and then runs pdflatex. See pst2pdf documentation for more info
+Options:
+ --help - display this help and exit
+ --version - display version information and exit
+ --license - display license information and exit
+ --imageDir - the dir for the created images (default images)
+ --DPI=<int> - the dots per inch for a cretaed ppm files (default 75)
+ --ppm - create .ppm files
+ --eps - create .eps files
+ --Iscale=<real> - the value for [scale=] in \\includegraphics
+ --noImages - generate files without compile (need -norun)
+ --verbose - creates long log
+ --clear - delete all temp files
+ --norun - create file-pdf.tex, but, no run pdflatex
+ --runBibTeX - run bibtex on the aux file, if exists
+ --runBiber - run biber on the bcf file, if exists
+ --files - create images files (.tex) for all pst enviroment
+ --single - create images whitout pdftk and auto-pst-pdf
+ --all - create all image type and images.tex
+ --nopdftk - create all image type and images.tex in single mode
+ --xetex - using XeLaTeX for compilation.
+Examples:
+* $program test.tex --all
+* produce test-pdf.tex and ppm,eps,tex and pdf for pst-enviroment in image dir
+END_OF_USAGE
+#
+my $result=GetOptions (
+ "help",
+ "version",
+ "license",
+ "DPI=i" => \$DPI, # numeric
+ "Iscale=f" => \$Iscale, # real
+ "imageDir=s" => \$imageDir, # string
+ "tempDir=s" => \$tempDir, # string
+ "Iext=s" => \$Iext, # string
+ "clear" => \$clear, # flag
+ "noImages" => \$noImages, # flag
+ "single" => \$single, # flag
+ "runBibTeX" => \$runBibTeX, # flag
+ "ppm" => \$ppm, # flag
+ "norun" => \$norun, # flag
+ "eps" => \$eps, # flag
+ "files" => \$files, # flag
+ "all" => \$all, # flag
+ "nopdftk" => \$nopdftk, # flag
+ "xetex" => \$xetex, # flag
+ "runBiber" => \$runBiber, # flag
+ "verbose" => \$verbose,
+) or die $usage;
+#---------------- help functions --------------------------------
+sub errorUsage { die "Error: @_ (try --help for more information)\n"; }
+# options for command line
+if ($::opt_help) {
+print $usage;
+ exit (0);
+}
+if ($::opt_version) {
+ print $title;
+ print $copyright;
+ exit (0);
+}
+if ($::opt_license) {
+ print $licensetxt;
+ exit (0);
+}
+# open file
+my $InputFilename = "";
+ @ARGV > 0 or errorUsage "Input filename missing";
+ @ARGV < 2 or errorUsage "Unknown option or too many input files";
+ $InputFilename = $ARGV[0];
+
+my @SuffixList = (".tex","",".ltx"); # possible extensions
+my ($name,$path,$ext) = fileparse($ARGV[0],@SuffixList);
+if ($ext eq "") { $ext = ".tex"; } # me need the extension as well
+my $TeXfile = "$path$name$ext";
+open my $LOGfile,'>', "$tempDir/$name.plog"; # our own log file
+ LOG ("Parameters:");
+ LOG ("==> imageDir = $imageDir");
+ LOG ("==> Iext = $Iext");
+ LOG ("==> DPI = $DPI");
+ LOG ("==> Iscale = $Iscale");
+ LOG ("==> tempDir = $tempDir");
+ LOG ("==> verbose = $verbose");
+ LOG ("==> clear = $clear");
+ LOG ("==> noImages = $noImages");
+ LOG ("==> single = $single");
+ LOG ("==> runBibTeX= $runBibTeX");
+ LOG ("==> runBiber = $runBiber");
+ LOG ("==> ppm = $ppm");
+ LOG ("==> norun = $norun");
+ LOG ("==> eps = $eps");
+ LOG ("==> files = $files");
+ LOG ("==> xetex = $xetex");
+
+if ($runBibTeX && $runBiber) {
+ LOG ("!!! you cannot run BibTeX and Biber at the same document ...");
+ LOG ("!!! Assuming to run Biber");
+ $runBibTeX = 0;
+}
+if ($ppm) {
+ LOG ("Generate .ppm files ...");
+ $ppm = 1;
+}
+if ($norun) {
+ LOG ("no compile $name-pdf.tex");
+ $norun = 1;
+}
+if ($eps) {
+ LOG ("Generate .eps files ...");
+ $eps = 1;
+}
+if ($files) {
+ LOG ("Generate .tex images files ...");
+ $files=1;
+}
+if ($all) {
+ LOG ("Generate all images files ...");
+ $files=$eps = $ppm = $clear = 1;
+}
+if ($nopdftk) {
+ LOG ("single mode generate all images files ...");
+ $single=$files=$eps = $ppm = $clear = 1;
+}
+if ($xetex) {
+ LOG ("Compiling using XeLaTeX ...");
+ $xetex=1;
+}
+
+my $imgNo = 1; # internal image counter
+#----------- single mode no need pdftk and auto-pst-pdf ----------------------
+if ($single) {
+LOG ("Running on [$path][$name][$ext]");
+open my $FILE,'<', "$TeXfile" ; # the source
+LOG ("single mode generate images...");
+if (-d $imageDir) { LOG ("$imageDir exists") }
+else { mkdir("$imageDir", 0744) ;}
+savePreamble($name);
+runFile($name);
+close $FILE; # close source file
+close $LOGfile;
+}
+#---------------- end single --------------
+else{
+LOG ("Running on [$path][$name][$ext]");
+open my $FILE,'<', "$TeXfile" ; # the source
+if (!$noImages ) {
+if (-d $imageDir) { LOG ("$imageDir exists") }
+else { mkdir("$imageDir", 0744) ;
+LOG ("Imagedir created"); }
+LOG ("go to savePreamble ... ");
+runBurst($tempDir);
+savePreamble($name);
+runFile($name);
+LOG ("done!\n go to runFile ...");
+LOG ("done!");
+close $FILE; # close source file
+close $LOGfile;
+}# !noImages
+}
+#------------ Create filename-pics.pdf, split and generate .ppm
+sub runBurst{
+if ($single){ print "single mode";}
+else{
+my $entrada = "$TeXfile";
+my $salida = "$name-pics.tex";
+ open my $ENTRADA,'<', "$entrada";
+ open my $SALIDA,'>',"$salida";
+ print $SALIDA "\\AtBeginDocument\{\n";
+if ($xetex){
+ print $SALIDA "\\RequirePackage\[xetex,active,tightpage\]\{preview\}\n";}
+else{
+ print $SALIDA "\\RequirePackage\[active,dvips,tightpage\]\{preview\}\n";}
+ print $SALIDA "\\renewcommand\\PreviewBbAdjust\{-600pt -600pt 600pt 600pt\}\n";
+ print $SALIDA "\\newenvironment{postscript}{}{}\n";
+ print $SALIDA "\\PreviewEnvironment\{postscript\}\n";
+ print $SALIDA "\\PreviewEnvironment\{pspicture\}\}\n";
+ while ( my $linea = <$ENTRADA> ) {
+ print $SALIDA $linea;}
+ close $ENTRADA;
+ close $SALIDA;
+# --------------------Compiling File --------------------------
+if ($xetex){
+ system("xelatex -interaction=batchmode $tempDir/$name-pics.tex");
+ system("pdfcrop -xetex $tempDir/$name-pics.pdf $tempDir/$name-pics.pdf");}
+else{
+ system("latex -interaction=batchmode $tempDir/$name-pics.tex");
+ system("dvips $tempDir/$name-pics.dvi");
+ system("ps2pdf -dProcessColorModel=/DeviceCMYK -dPDFSETTINGS=/prepress $tempDir/$name-pics.ps");
+ system("pdfcrop $tempDir/$name-pics.pdf $tempDir/$name-pics.pdf");}
+ system("pdftk $tempDir/$name-pics.pdf burst output $imageDir/$name-fig-\%1d.pdf");
+if ($ppm){
+ system("pdftoppm -r $DPI $tempDir/$name-pics.pdf $imageDir/$name-fig");}
+ }
+}
+#------------ end pdftk burst
+LOG ("runpdfTeX ... ");
+runpdfTeX("$path$name",$name);
+LOG ("all finished ... :-)");
+# create a preamble file
+# if we have a \input command inside the preamble, it doesn't hurt, we need
+# it anyway for the postscript files and the pdf one.
+# ----------------- Save Preamble ----------------------------------------
+sub savePreamble {
+my $filename = pop; # get the file name
+ LOG ("----- Start Preamble -----");
+open my $FILEp,'>',"$tempDir/$filename.preamble";
+open my $FILE, '<', "$name.tex";
+ while (<$FILE>) { # read all until \begin{document}
+ my $i = index($_,"begin{document}");
+ if ($i > 0) {
+ if ($i > 1) { print $FILEp substr($_,0,--$i); } # write all until \begin{document}
+ if ($single) {
+ print $FILEp "\\newenvironment{postscript}{}{}\n";
+ print $FILEp "\\pagestyle{empty}\n";
+ }
+close $FILEp; # close preamble
+ LOG ("----- Close Preamble ------");
+ return;
+ }
+else {
+ print $FILEp "$_"; # write into preamble
+ LOG ("$_");
+ }
+}
+close $FILE;
+close $FILEp;
+ if ( $verbose ) { LOG("<-----Preamble<----"); }
+ return;
+}
+
+sub searchPS { # search the PostScript parts
+ my @PS = (); # single PS sequence
+ my @PStotal = (); # all PS sequences as list of arrays
+ my $depth = -1; # counts nested macros
+ my $type = -1; # -1-> none; 1->PST; 2->PS;
+ my $EndDocument = 0;# ignore all after \end{document}
+ my $iVerb = 0; # test for verbatim or lstlisting environment, must be ignored
+ open my $FILE, '<', "$name.tex";
+ while (<$FILE>) { # scan the input file
+ if (!$EndDocument) {
+ chomp; # delete EOL character
+ my $line = $_; # save line
+ if ( !$iVerb ) {
+ $iVerb = ((index($line,"begin{verbatim}") > 0)
+ or (index($line,"begin{lstlisting}") > 0)
+ or (index($line,"begin{Verbatim}") > 0)
+ or (index($line,"begin{verbatim*}") > 0));
+ } # do nothing until \end{verbatim}
+ if ( !$iVerb ) {
+ my $iPS = index($line,"begin{postscript}");
+ my $iPST = index($line,"begin{pspicture*}");
+ if ($iPST < 0) { $iPST = index($line,"begin{pspicture}"); } # alternative
+ if ($iPST < 0) { $iPST = index($line,"pspicture"); } # alternative \pspicture...
+ if (($iPS > 0) && ( $type == 1 )){ print "postscript environment must be of outer level!\n"; exit 1; }
+ if ( $type < 0 ) { # no active environment
+ if ($iPS > 0) { # we have \begin{postscript}
+ $type = 2;
+ $line = substr($line,$iPS-1); # add rest of the line
+ LOG("PS-Zeile: $line");
+ }
+ elsif ( $iPST > 0 ) { # we have \begin{pspicture} or \pspicture
+ $type = 1;
+ $depth++;
+ $line = substr($line,$iPST-1);# add all unitl pspicture
+ LOG("PST-Zeile: $line");
+ }
+ }
+# we have now \begin{pspicture} or \begin{postscript}
+ if ($type > 0) { # start Scan, we have an environment
+ LOG ("searchPS: set \$type=$type");
+ $iPST = index($line,"end{pspicture*}");
+ if ($iPST < 0) { $iPST = index($line,"end{pspicture}"); } # alternative
+ if ($iPST < 0) { $iPST = index($line,"endpspicture"); } # alternative \endpspicture...
+ $iPS = index($line,"end{postscript}");
+ if ($iPST > 0) { # test, we can have postscript and pspicture in one line
+ if ( $type < 2) { # found end of pspicture environment
+ LOG ("searchPS: $line");
+ $depth--;
+ if ($depth < 0) {
+ $type = -1;
+ if (index($line,"endpspicture") > 0) # add line, depends to type
+ { push @PS,substr($line,0,$iPST+12); } # \endpspicture
+ elsif (index($line,"pspicture*") > 0)
+ { push @PS,substr($line,0,$iPST+15); }# \end{pspicture}
+ else { push @PS,substr($line,0,$iPST+14); } # \end{pspicture}
+ LOG ("searchPS: set \$type=$type");
+ push @PStotal,[@PS]; # add PS sequence
+ LOG ("---->PS---->\n@PS\n<----PS<----");
+ @PS = (); # start new PS sequence
+ } # no pspicture env left
+ } else { push @PS,$line; } # pspicture inside postscript
+ } elsif ($iPS > 0) { # must be type=1 -> stop Scan
+ LOG ("searchPS: $line");
+ $type = -1;
+ push @PS,substr($line,0,$iPS+15); # add line
+ LOG ("searchPS: set \$type=$type");
+ push @PStotal,[@PS]; # add PS sequence
+ LOG ("---->PS---->\n@PS\n<----PS<----");
+ @PS =(); # start new PS sequence
+ } else { push @PS,$line; } # add line
+ }
+ my $i = index($line,"end{document}");
+ if ($i > 0) { $EndDocument++; LOG("EndDocument in searchPS"); }
+ } # if ( $iVerb )
+ if (( index($line,"end{verbatim}") > 0 )
+ or ( index($line,"end{lstlisting}") > 0 )
+ or ( index($line,"end{Verbatim}") > 0 )
+ or ( index($line,"end{verbatim*}") > 0 )) { $iVerb = 0; }
+ }}
+ if ( $verbose ) {
+ LOG("---->PStotal---->");
+ for my $aref ( @PStotal ) {
+ my @a = @$aref;
+ my $i = 1;
+ foreach ( @a ) { LOG ($a[$i]); $i=$i+1; }
+ }
+ LOG ("<----PStotal<----");
+ }
+ close $FILE;
+ return @PStotal; # return all PS sequences
+}
+# Creating ifile.tex and eps, pdf and ppm for images
+if ($single){
+sub runsingle{
+ my $filename = pop;
+ if ($xetex){
+ system("xelatex -interaction=batchmode $tempDir/$filename-fig");
+ system("pdfcrop -xetex $tempDir/$filename-fig.pdf $imageDir/$filename-fig-$imgNo.pdf");}
+ else{
+ system("latex -interaction=batchmode $tempDir/$filename-fig");
+ system("dvips $tempDir/$filename-fig");
+ system("ps2pdf -dProcessColorModel=/DeviceCMYK -dPDFSETTINGS=/prepress $tempDir/$filename-fig.ps");
+ system("pdfcrop $tempDir/$filename-fig.pdf $imageDir/$filename-fig-$imgNo.pdf");}
+ if ($files){
+ copy("$filename-fig.tex", "$imageDir/$filename-fig-$imgNo.tex");}
+ system("pdfcrop $tempDir/$filename-fig.pdf $imageDir/$filename-fig-$imgNo.pdf");
+ if ($eps) {
+ system("pdftops -level3 -eps $imageDir/$filename-fig-$imgNo.pdf $imageDir/$filename-fig-$imgNo.eps");}
+ if ($ppm) {
+ system("pdftoppm -r $DPI $imageDir/$filename-fig-$imgNo.pdf $imageDir/$filename-fig-$imgNo");}
+ $imgNo=$imgNo+1;
+ }
+}
+else{
+#----------------- Creating files.tex and .eps for images --------------
+sub runTeX{
+ my $filename = pop;
+ if ($eps){
+ system("pdftops -level3 -eps $imageDir/$filename-$imgNo.pdf $imageDir/$filename-$imgNo.eps");
+ }
+ if ($files){
+ copy("$filename.tex", "$imageDir/$filename-$imgNo.tex");
+}
+ $imgNo=$imgNo+1;
+}
+}
+sub runFile {
+ my $filename = pop;
+ my @PSarray = searchPS();
+ if ( $verbose ) {
+ LOG("---->PSarray---->");
+ for my $aref ( @PSarray ) {
+ my @a = @$aref;
+ my $i = 1;
+ foreach ( @a ) { print LOG $a[$i]."\n"; $i=$i+1; }
+ }
+ LOG("<----PSarray<----");
+ my $no = @PSarray;
+ LOG("PS: ".$no." PS sequence(s)");
+ }
+ for my $aref ( @PSarray ) {
+ my @PS = @$aref;
+ open my $FILEp,'<',"$tempDir/$filename.preamble";
+ open my $FILEsub,'>',"$tempDir/$filename-fig.tex";
+ while (<$FILEp>) {print $FILEsub $_; }
+ print $FILEsub "\\begin{document}\n";
+ if ( $verbose ) { LOG("\@PS: $_"); }
+ foreach ( @PS ) { print $FILEsub "$_\n"; }
+ print $FILEsub "\\end{document}";
+ close $FILEsub;
+ close $FILEp;
+ if ($single) {
+ runsingle("$name");
+ }
+ else{
+ runTeX("$tempDir/$name-fig");
+ }
+}
+}
+# ----------------Renaming ppm need for correct name
+if(!$noImages){
+ my $dren = "$tempDir/$imageDir";
+ my $fichero = '';
+ my $ppmren = '';
+ my $renNo = 1;
+ if(opendir(DIR,$dren)){
+ foreach (readdir DIR){
+ $fichero = $_;
+ if ( $fichero =~ /($name-fig-)(\d+|\d+[-]\d+).ppm/) {
+ my $renNo = int($2);
+ my $newname="$1$renNo.ppm";
+ $ppmren = rename("$dren/$fichero","$dren/$newname");
+ }
+ }
+}
+closedir DIR;
+}# end renaming
+#--------------------------- Replace files----------------------
+sub runpdfTeX() {
+ my ($name,$pdfname) = @_;
+ open my $PDF,'>',"$tempDir/$pdfname-pdf.tex";
+ open my $FILE,'<',"$name.tex";
+ my $ignore = 0;
+ my $IMGno = 1;
+ my $depth = -1;
+ my $type = -1;
+ my $EndDocument = 0; # ignore all after \end{document}
+ my $iVerb = 0;
+ while (<$FILE>) { # scan the input file
+ if ( !$iVerb ) {
+ $iVerb = ((index($_,"begin{verbatim}") > 0)
+ or (index($_,"begin{lstlisting}") > 0)
+ or (index($_,"begin{Verbatim}") > 0)
+ or (index($_,"begin{verbatim*}") > 0));
+ } # do nothing until \end{verbatim}|| \end{lstlisting}
+ if ( !$iVerb ) {
+ my $i = index($_,"end{document}");
+ if ($i > 0) { print $PDF $_; $EndDocument++; LOG("EndDocument in runpdfTeX"); }
+ if ( !$EndDocument ) {
+ my $iPS = index($_,"begin{postscript}");
+ if ( $iPS > 0 ) {
+ $type = 2;
+ $ignore = 1;
+ if ($iPS > 1) { print $PDF substr($_,0,--$iPS); } # add preceeding text
+ print $PDF "\\includegraphics[scale=$Iscale]{$pdfname-fig-$IMGno}"; # use pdfname
+ $IMGno=$IMGno+1;
+ } # postscript env
+ if ( $type < 2 ) {
+ my $iPST = index($_,"begin{pspicture*}");
+ if ($iPST < 0) { $iPST = index($_,"begin{pspicture}"); } # alternative ...
+ if ($iPST < 0) { $iPST = index($_,"\\pspicture"); } # alternative \\pspicture...
+ if ( $iPST >= 0 ) { # start Scan
+ $ignore = 1;
+ $type = 1;
+ $depth++; # pspicture env
+ LOG("Increase depth: $depth");
+ if ( $depth == 0 ) {
+ if ($iPST > 1) { print $PDF substr($_,0,--$iPST); } # add preceeding text
+ print $PDF "\\includegraphics[scale=$Iscale]{$pdfname-fig-$IMGno}"; # use \graphicspath
+ $IMGno=$IMGno+1;
+ LOG("Increase Image counter: $IMGno");
+ }
+ }
+ }
+ if ( !$ignore ) { print $PDF "$_"; } # default line
+ if ( $type == 2 ) { # postscript env
+ my $iPS = index($_,"end{postscript}");
+ if ($iPS > 0) {
+ print $PDF substr($_,$iPS+15); # rest of line
+ $ignore = 0;
+ $type=-1;
+ } # end Scan
+ }
+ elsif ( $type == 1 ) { # pspicture env
+ my $iPST = index($_,"end{pspicture*}");
+ if ($iPST < 0) { $iPST = index($_,"end{pspicture}"); } # alternative ...
+ if ($iPST < 0) { $iPST = index($_,"endpspicture"); } # alternative \endpspicture...
+ if ($iPST > 0) { # end Scan
+ if (index($_,"endpspicture") > 0) # add rest of line, depends to type
+ { print $PDF substr($_,$iPST+12); } # \endpspicture
+ elsif (index($_,"pspicture*") > 0)
+ { print $PDF substr($_,$iPST+15); } # \end{pspicture*}
+ else{ print $PDF substr($_,$iPST+14); } # \end{pspicture}
+ $depth--;
+ LOG("Decrease depth: $depth");
+ if ($depth < 0) { $ignore = 0; }
+ }
+ }
+ } # if ( !$EndDocument )
+ }
+ else { print $PDF $_; } # if ( $iVerb )
+ if (( index($_,"end{verbatim}") > 0 )
+ or ( index($_,"end{lstlisting}") > 0 )
+ or ( index($_,"end{Verbatim}") > 0 )
+ or ( index($_,"end{verbatim*}") > 0 )) { $iVerb = 0; }
+ } # while (<$FILE>)
+ close $FILE;
+ close $PDF;
+#------------------- Coment pst-package for pdfLaTeX --------------------
+ open my $IPDF,'<', "$tempDir/$pdfname-pdf.tex";
+ undef $/; # read all file
+ my ($uno,$dos) = split(/\\begin\{document\}/,<$IPDF>,2);
+ close $IPDF;
+
+ my @coment = split /\n/, $uno; # split in two
+ my @preamb;
+
+ foreach my $line (@coment) {
+ chomp($line);
+ if(!$xetex){
+ $line =~ s/\\usepackage(?:\[.+?\])?\{pst.+?}//g; # delete
+ $line =~ s/\\usepackage(?:\[.+?\])?\{psfr.+?}//g; # delete
+ $line =~ s/(\\usepackage(?:\[.+?\])?)\{auto-pst.+?}//g; # delete
+ $line =~ s/(\\usepackage(?:\[.+?\])?)\{vaucanson-.+?}//g; # delete
+ $line =~ s/(\\usepackage(?:\[.+?\])?)\{psgo}//g; # delete
+ }
+ $line =~ s/(\\usepackage(?:\[.+?\])?)\{graph/\%$1\{graph/g; # comment
+ next if $line =~ m/^\s*$/;
+ push(@preamb,$line);} # adding changes
+
+my $clean = join("\n", @preamb, "\\usepackage{grfext}\n\\\PrependGraphicsExtensions*{$Iext}\n\\usepackage{graphicx}\n\\graphicspath{{$imageDir/}}\n\\begin{document}". $dos);
+
+ open my $OPDF,'>',"$tempDir/$pdfname-pdf.tex"; # write changes
+ print $OPDF $clean;
+ close $OPDF;
+# ------------------------- close coment pst-package ------------------------------
+my $runAgain = 0;
+ if ($norun){print "Done\n";}
+ else {
+ if($xetex){
+ system("xelatex -interaction=batchmode $tempDir/$pdfname-pdf"); print "Done\n";}
+ else{
+ system("pdflatex -interaction=batchmode $tempDir/$pdfname-pdf"); print "Done\n";}
+ }
+ if (-e "$tempDir/$pdfname-pdf.idx") {
+ system("makeindex $tempDir/$pdfname-pdf.idx"); $runAgain++;}
+ if ($runBibTeX && -e "$tempDir/$pdfname-pdf.aux") {
+ system("bibtex $tempDir/$pdfname-pdf"); $runAgain++; }
+ if ($runBiber && -e "$tempDir/$pdfname-pdf.bcf") {
+ system("biber $tempDir/$pdfname-pdf"); $runAgain++; }
+ if ($runAgain){
+ if($xetex){
+ system("xelatex -interaction=batchmode $tempDir/$pdfname-pdf");}
+ else{
+ system("pdflatex -interaction=batchmode $tempDir/$pdfname-pdf");}
+ }
+ if ($ppm){
+ print "If you need to create jpg/png/svg type cd $imageDir and run\n";
+ print "mogrify -format [ext] *.ppm\n";
+ }
+ if ($clear) {
+ if ($norun){}
+ if ($single) {
+ unlink "$tempDir/$name-fig.pdf";
+ if(!$xetex){
+ unlink "$tempDir/$name-fig.dvi";
+ unlink "$tempDir/$name-fig.ps";
+ }
+ unlink "$tempDir/$name-fig.aux";
+ unlink "$tempDir/$name-fig.log";
+ unlink "$tempDir/$name-fig.tex";
+ if(!$verbose) {
+ unlink "$tempDir/$name.plog";
+ }
+ unlink "$tempDir/$name.preamble";
+ unlink "$tempDir/$name-pdf.aux";
+ unlink "$tempDir/$name-pdf.log";
+ }
+ else{
+ if(!$verbose) {
+ unlink "$tempDir/$name.plog";
+ }
+ unlink "$tempDir/$name.preamble";
+ unlink "$tempDir/$name-pdf.aux";
+ unlink "$tempDir/$name-pdf.log";
+ unlink "$tempDir/$name-pics.pdf";
+ unlink "$tempDir/$name-pics.tex";
+ unlink "$tempDir/$name-pics.aux";
+ if(!$xetex){
+ unlink "$tempDir/$name-pics.dvi";
+ unlink "$tempDir/$name-pics.ps";}
+ unlink "$tempDir/$name-pics.log";
+ unlink "$tempDir/$name-fig.tex";
+ }
+ }
+ }
+
+sub LOG() {
+ if ( $verbose ) { print $LOGfile "@_\n"; }
+ }
+__END__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst2pdf.tlpobj new/tlpkg/tlpobj/pst2pdf.tlpobj
--- old/tlpkg/tlpobj/pst2pdf.tlpobj 2011-12-15 04:34:55.000000000 +0100
+++ new/tlpkg/tlpobj/pst2pdf.tlpobj 2013-03-11 04:37:24.000000000 +0100
@@ -1,6 +1,6 @@
name pst2pdf
category Package
-revision 24845
+revision 29333
shortdesc A script to compile pstricks documents via pdftex.
longdesc The script extracts the preamble of the document and runs all
longdesc \begin{postscript}...\end{postscript}
@@ -12,9 +12,9 @@
longdesc include the processed snippets. Detail documentation is
longdesc acquired from the document itself via Perldoc.
depend pst2pdf.ARCH
-runfiles size=5
- texmf-dist/scripts/pst2pdf/pst2pdf
+runfiles size=6
+ texmf-dist/scripts/pst2pdf/pst2pdf.pl
catalogue-ctan /graphics/pstricks/scripts/pst2pdf
-catalogue-date 2011-12-14 17:37:45 +0100
+catalogue-date 2013-03-10 15:10:17 +0100
catalogue-license gpl
-catalogue-version 0.12
+catalogue-version 0.14
++++++ pstool.doc.tar.xz ++++++
++++ 16295 lines of diff (skipped)
++++++ pstool.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pstool/pstool.sty new/tex/latex/pstool/pstool.sty
--- old/tex/latex/pstool/pstool.sty 2009-07-23 00:47:33.000000000 +0200
+++ new/tex/latex/pstool/pstool.sty 2013-03-12 00:21:52.000000000 +0100
@@ -1,23 +1,35 @@
-%% LaTeX2e file `pstool.sty'
-%% generated by the `filecontents' environment
-%% from source `pstool' on 2009/07/21.
-%%
-\ProvidesPackage{pstool}[2009/07/17 v1.3
+% TODO: convert this package into expl3 syntax (will save many lines of code).
+
+\ProvidesPackage{pstool}[2013/03/11 v1.5a
Wrapper for processing PostScript/psfrag figures]
-% External packages
-\RequirePackage{%
- catchfile,color,ifpdf,ifplatform,
- graphicx,pdftexcmds,psfrag,suffix,xkeyval}
-
-% Allocations
-\newif\if@pstool@pdfcrop@
-\newif\if@pstool@verbose@
+% External packages:
+\RequirePackage{
+ catchfile,color,ifpdf,ifplatform,filemod,
+ graphicx,psfrag,suffix,trimspaces,xkeyval,expl3
+}
+
+% Add an additional command before trimspaces.sty is updated formally:
+\providecommand*{\trim@multiple@spaces@in}[1]{%
+ \let\trim@temp#1%
+ \trim@spaces@in#1%
+ \ifx\trim@temp#1%
+ \else
+ \expandafter\trim@multiple@spaces@in\expandafter#1%
+ \fi
+}
+
+% \subsection{Allocations}
+\expandafter\newif\csname if@pstool@pdfcrop@\endcsname
+\expandafter\newif\csname if@pstool@verbose@\endcsname
+\expandafter\newif\csname if@pstool@write@aux\endcsname
+
\newwrite\pstool@out
+\newread\pstool@mainfile@ior
+\newread\pstool@auxfile@ior
-% These are cute
-\providecommand\OnlyIfFileExists[2]{\IfFileExists{#1}{#2}{}}
-\providecommand\NotIfFileExists[2]{\IfFileExists{#1}{}{#2}}
+% Macro used to store the name of the graphic's macro file:
+\let\pstool@tex\@empty
% \subsection{Package options}
@@ -47,51 +59,63 @@
\ExecuteOptionsX{mode=batch}
\DeclareOptionX{cleanup}{\def\pstool@rm@files{#1}}
-\ExecuteOptionsX{cleanup={.tex,.dvi,.ps,.pdf,.log,.aux}}
+\ExecuteOptionsX{cleanup={.tex,.dvi,.ps,.pdf,.log}}
\DeclareOptionX{suffix}{\def\pstool@suffix{#1}}
\ExecuteOptionsX{suffix={-pstool}}
-% There is an implicit |\space| after the bitmap options.
+% There is an implicit \cs{space} after the bitmap options.
\define@choicekey*{pstool.sty}{bitmap}
[\@tempa\@tempb]{auto,lossless,lossy}{%
\ifcase\@tempb
\let\pstool@bitmap@opts\@empty
\or
\def\pstool@bitmap@opts{%
- "-dAutoFilterColorImages=false"
- "-dAutoFilterGrayImages=false"
- "-dColorImageFilter=/FlateEncode"
- "-dGrayImageFilter=/FlateEncode" % space
+ -dAutoFilterColorImages=false
+ -dAutoFilterGrayImages=false
+ -dColorImageFilter=/FlateEncode
+ -dGrayImageFilter=/FlateEncode % space
}
\or
\def\pstool@bitmap@opts{%
- "-dAutoFilterColorImages=false"
- "-dAutoFilterGrayImages=false"
- "-dColorImageFilter=/DCTEncode"
- "-dGrayImageFilter=/DCTEncode" % space
+ -dAutoFilterColorImages=false
+ -dAutoFilterGrayImages=false
+ -dColorImageFilter=/DCTEncode
+ -dGrayImageFilter=/DCTEncode % space
}
\fi
}
\ExecuteOptionsX{bitmap=lossless}
-% \HideAllDefining
-% \Define*{latex-options}
-% \Define*{dvips-options}
-% \Define*{ps2pdf-options}
-% \Define*{pdfcrop-options}
\DeclareOptionX{latex-options}{\def\pstool@latex@opts{#1}}
\DeclareOptionX{dvips-options}{\def\pstool@dvips@opts{#1}}
\DeclareOptionX{ps2pdf-options}{\def\pstool@pspdf@opts{#1}}
\DeclareOptionX{pdfcrop-options}{\def\pstool@pdfcrop@opts{#1}}
-% \ResumeAllDefining
+
\ExecuteOptionsX{
latex-options={},
dvips-options={},
- ps2pdf-options={"-dPDFSETTINGS=/prepress"},
+ ps2pdf-options={-dPDFSETTINGS=/prepress},
pdfcrop-options={}
}
+\DeclareOptionX{macro-file}{%
+ \IfFileExists{#1}
+ {\def\pstool@macrofile{#1}}
+ {%
+ \let\pstool@macrofile\@empty
+ \PackageError{pstool}{^^J\space\space%
+ No file `#1' found for "macro-file" package option.^^J
+ This warning occurred}
+ }
+}
+
+% Default:
+\IfFileExists{\jobname-pstool.tex}
+ {\edef\pstool@macrofile{\jobname-pstool.tex}}
+ {\let\pstool@macrofile\@empty}
+
+
\ifpdf
\ifshellescape\else
\ExecuteOptionsX{process=none}
@@ -110,10 +134,9 @@
}
% \section{Macros}
-
% Used to echo information to the console output.
-% Can't use |\typeout| because it's asynchronous with
-% any |\immediate\write18| processes (for some reason).
+% Can't use \cs{typeout} because it's asynchronous with
+% any \cs{immediate}\cs{write18} processes (for some reason).
\def\pstool@echo#1{%
\if@pstool@verbose@
\pstool@echo@verbose{#1}%
@@ -129,29 +152,32 @@
% Command line abstractions between platforms:
\edef\pstool@cmdsep{\ifwindows\string&\else\string;\fi\space}
\edef\pstool@rm@cmd{\ifwindows del \else rm -- \fi}
+\edef\pstool@cp@cmd{\ifwindows copy \else cp -- \fi}
-% Delete a file if it exists:\\
-% |#1|: path\\
-% |#2|: filename
+% Delete a file if it exists:
+% #1: path
+% #2: filename
\newcommand\pstool@rm[2]{%
- \OnlyIfFileExists{#1#2}{%
+ \IfFileExists{#1#2}{%
\immediate\write18{%
cd "#1"\pstool@cmdsep\pstool@rm@cmd "#2"
}%
- }%
+ }{}%
}
% Generic function to execute a command on the shell and pass its exit status back into \LaTeX. Any number of \cmd\pstool@exe\ statements can be made consecutively followed by \cmd\pstool@endprocess, which also takes an argument. If \emph{any} of the shell calls failed, then the execution immediately skips to the end and expands \cmd\pstool@error\ instead of the argument to \cmd\pstool@endprocess.
-%
-% |#1|: `name' of process\\
-% |#2|: relative path where to execute the command\\
-% |#3|: the command itself
+% #1: `name' of process
+% #2: relative path where to execute the command
+% #3: the command itself
\newcommand\pstool@exe[3]{%
\pstool@echo{^^J=== pstool: #1 ===}%
\pstool@shellexecute{#2}{#3}%
\pstool@retrievestatus{#2}%
\ifnum\pstool@status > \z@
- \PackageWarning{pstool}{Execution failed during process:^^J\space\space#3^^JThis warning occurred}%
+ \PackageWarning{pstool}{%
+ Execution failed during process:^^J\space\space
+ #3^^JThis warning occurred%
+ }%
\expandafter\pstool@abort
\fi
}
@@ -160,9 +186,18 @@
\def\pstool@error{%
\fbox{%
\parbox{0.8\linewidth}{%
- \color{red}\raggedright\ttfamily\scshape\small
- An error occured processing graphic
- \upshape`\pstool@path\pstool@filestub'%
+ \color{red}\centering\ttfamily\scshape\small
+ An error occured processing graphic:\\
+ \upshape`%
+ \detokenize\expandafter{\pstool@path}%
+ \detokenize\expandafter{\pstool@filestub}.eps%
+ '\\\bigskip
+ \tiny
+ Check the log file for compilation errors:\\
+ `%
+ \detokenize\expandafter{\pstool@path}%
+ \detokenize\expandafter{\pstool@filestub}-pstool.log%
+ '\\
}%
}%
}
@@ -170,7 +205,7 @@
\def\pstool@abort#1\pstool@endprocess{\pstool@error\@gobble}
\let\pstool@endprocess\@firstofone
-% It is necessary while executing commands on the shell to write the exit status to a temporary file to test for failures in processing. (If all versions of |pdflatex| supported input pipes, things might be different.)
+% It is necessary while executing commands on the shell to write the exit status to a temporary file to test for failures in processing. (If all versions of \texttt{pdflatex} supported input pipes, things might be different.)
\def\pstool@shellexecute#1#2{%
\immediate\write18{%
cd "#1" \pstool@cmdsep
@@ -190,8 +225,8 @@
}
\def\pstool@statusfile{pstool-statusfile.txt}
-% Read the exit status from the temporary file and delete it.\\
-% |#1| is the path\\
+% Read the exit status from the temporary file and delete it.
+% #1 is the path
% Status is recorded in \cmd\pstool@status.
\def\pstool@retrievestatus#1{%
\CatchFileEdef{\pstool@status}{#1\pstool@statusfile}{}%
@@ -205,17 +240,6 @@
}
\def\pstool@statusfail{\par }% what results when \TeX\ reads an empty file
-% \subsection{File age detection}
-\def\pstool@IfnewerEPS{%
- \ifnum\pdf@strcmp{\pdf@filemoddate{\pstool@path\pstool@filestub.pdf}}
- {\pdf@filemoddate{\pstool@path\pstool@filestub.eps}}
- < \z@
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
-}
-
% Grab filename and filepath. Always need a relative path to a filename even if it's in the same directory.
\def\pstool@getpaths#1{%
\filename@parse{#1}%
@@ -227,8 +251,13 @@
\let\pstool@filestub\filename@base
}
+% The filename of the figure stripped of its path, if any:
+% (analogous to standard \cs{jobname})
+\def\pstool@jobname{\pstool@filestub\pstool@suffix}
+
+
% \section{Command parsing}
-% User input is \cmd\pstool\ (with optional |*| or |!| suffix) which turns into one of the following three macros depending on the mode.
+% User input is \cmd\pstool\ (with optional \texttt{*} or \texttt{!} suffix) which turns into one of the following three macros depending on the mode.
\newcommand\pstool@alwaysprocess[3][]{%
\pstool@getpaths{#2}%
@@ -249,23 +278,50 @@
}
\fi
-% For regular operation, which processes the figure only if
-% the command is starred, or the PDF doesn't exist.
-\newcommand\pstool@maybeprocess[3][]{%
- \pstool@getpaths{#2}%
- \IfFileExists{#2.pdf}{%
- \pstool@IfnewerEPS{% needs info from |\pstool@getpaths|
- \pstool@process{#1}{#3}%
- }{%
- \pstool@includegraphics{#2}%
- }%
- }{%
- \pstool@process{#1}{#3}%
- }%
-}
+% Process the figure when:
+% -- the PDF file doesn't exist, or
+% -- the EPS is newer than the PDF, or
+% -- the TeX file is new than the PDF.
+\ExplSyntaxOn
+\newcommand\pstool@maybeprocess[3][]
+ {
+ \pstool_if_should_process:nTF {#2}
+ { \pstool@process{#1}{#3} }
+ { \pstool@includegraphics{#2} }
+ }
+
+\prg_set_conditional:Nnn \pstool_if_should_process:n {TF}
+ {
+ \pstool@getpaths{#1}
+
+ \file_if_exist:nF { #1.pdf }
+ { \use_i_delimit_by_q_stop:nw \prg_return_true: }
+
+ \filemodCmp {\pstool@path\pstool@filestub.eps}
+ {\pstool@path\pstool@filestub.pdf}
+ { \use_i_delimit_by_q_stop:nw \prg_return_true: } {}
+
+ \exp_args:Nx \clist_map_inline:nn { \pstool@macrofile , \pstool@tex }
+ % empty entries are ignored in clist mappings, so no need to filter here
+ {
+ \filemodCmp {##1} {\pstool@path\pstool@filestub.pdf}
+ {
+ \clist_map_break:n { \use_i_delimit_by_q_stop:nw \prg_return_true: }
+ }
+ {}
+ }
+
+ \filemodCmp {\pstool@path\pstool@filestub.tex}
+ {\pstool@path\pstool@filestub.pdf}
+ { \use_i_delimit_by_q_stop:nw \prg_return_true: } {}
+
+ \use_i_delimit_by_q_stop:nw \prg_return_false:
+ \q_stop
+ }
+\ExplSyntaxOff
% \section{User commands}
-% Finally, define \cmd\pstool\ as appropriate for the mode: (|all|, |none|, |auto|, respectively)
+% Finally, define \cmd\pstool\ as appropriate for the mode: (\texttt{all}, \texttt{none}, \texttt{auto}, respectively)
\ifpdf
\newcommand\pstool{%
\ifcase\pstool@process@choice\relax
@@ -296,9 +352,6 @@
% \section{The figure processing}
-% \cmd\pstool@filestub\ is the filename of the figure stripped of its path (if any)
-\def\pstool@jobname{\pstool@filestub\pstool@suffix}
-
% And this is the main macro.
\newcommand\pstool@process[2]{%
\begingroup
@@ -315,10 +368,14 @@
-interaction=\pstool@mode\space
\pstool@latex@opts\space
"\pstool@jobname.tex"}%
-% Execute |dvips| in quiet mode if |latex| is not run in (non/error)stop mode:
+% Execute \texttt{dvips} in quiet mode if \texttt{latex} is not run in (non/error)stop mode:
\pstool@exe{dvips}{\pstool@path}{%
dvips \if@pstool@verbose@\else -q \fi -Ppdf
\pstool@dvips@opts\space "\pstool@jobname.dvi"}%
+% Pre-process \texttt{ps2pdf} options for Windows (sigh):
+ \pstool@pspdf@opts@preprocess \pstool@bitmap@opts
+ \pstool@pspdf@opts@preprocess \pstool@pspdf@opts
+% Generate the PDF:
\if@pstool@pdfcrop@
\pstool@exe{ps2pdf}{\pstool@path}{%
ps2pdf \pstool@bitmap@opts \pstool@pspdf@opts \space
@@ -331,53 +388,146 @@
ps2pdf \pstool@bitmap@opts \pstool@pspdf@opts \space
"\pstool@jobname.ps" "\pstool@filestub.pdf"}%
\fi
+% Finish up: (implies success!)
\pstool@endprocess{%
\pstool@cleanup
- \pstool@includegraphics{%
- \pstool@path\pstool@filestub}%
+ \pstool@includegraphics{\pstool@path\pstool@filestub}%
+% Emulate \cs{include} (sort of) and have the main document load the auxiliary aux file, in a manner of speaking:
+ \pstool@write@aux
}%
\pstool@echo@verbose{^^J=== pstool: end processing ===^^J}%
\endgroup
}
+\newcommand\pstool@write@aux{%
+ \endlinechar=-1
+ \@tempswatrue
+ \@pstool@write@auxfalse
+ \in@false
+ \openin \pstool@auxfile@ior "\pstool@path\pstool@jobname.aux"\relax
+ \@whilesw \if@tempswa \fi {%
+ \readline \pstool@auxfile@ior to \@tempa
+ \ifeof \pstool@auxfile@ior
+ \@tempswafalse
+ \else
+ \edef\@tempb{\detokenize\expandafter{\pstool@auxmarker@text/}}%
+ \ifx\@tempa\@tempb
+ \@tempswafalse
+ \else
+ \if@pstool@write@aux
+ \immediate\write\@mainaux{\unexpanded\expandafter{\@tempa}}%
+ \fi
+ \edef\@tempb{\detokenize\expandafter{\pstool@auxmarker@text*}}%
+ \ifx\@tempa\@tempb
+ \@pstool@write@auxtrue
+ \fi
+ \fi
+ \fi
+ }
+ \closein \pstool@auxfile@ior
+}
+
+\ExplSyntaxOn
+\cs_new:Npn \pstool@pspdf@opts@preprocess #1
+ {
+ \ifwindows
+ \exp_args:NNnx \tl_replace_all:Nnn #1 {=} { \cs_to_str:N \# }
+ \fi
+ }
+\ExplSyntaxOff
+
+% For what's coming next.
+\edef\@begindocument@str{\detokenize\expandafter{\string\begin{document}}}
+\edef\@endpreamble@str{\string\EndPreamble}
+\def\in@first#1#2{\in@{NEVEROCCUR!#1}{NEVEROCCUR!#2}}
+
+% We need to cache the aux file, so here goes.
+% This is because the aux file is cleared for writing after \cs{begin{document}}.
+\IfFileExists{\jobname.oldaux}{\immediate\write18{\pstool@rm@cmd \jobname.oldaux}}{}
+\immediate\write18{\pstool@cp@cmd \jobname.aux \jobname.oldaux}
+\AtEndDocument{\immediate\write18{\pstool@rm@cmd \jobname.oldaux}}
+
+\edef\pstool@auxmarker#1{\string\@percentchar\space <#1PSTOOLLABELS>}
+\edef\pstool@auxmarker@text#1{\@percentchar <#1PSTOOLLABELS>}
+
% The file that is written for processing is set up to read the preamble of the original document and set the graphic on an empty page (cropping to size is done either here with \pkg{preview} or later with \pkg{pdfcrop}).
\def\pstool@write@processfile#1#2#3{%
\immediate\openout\pstool@out #2\pstool@suffix.tex\relax
+% Put down a label so we can pass through the current page number:
+ \edef\pstool@label{pstool-\pstool@path\pstool@filestub}%
+ \protected@write\@auxout{}%
+ {\string\newlabel{\pstool@label}{{\@currentlabel}{\the\c@page}}}%
+% And copy the main file's bbl file too: (necessary only for biblatex)
+ \IfFileExists{\jobname.bbl}{%
+ \IfFileExists{\pstool@path\pstool@jobname.bbl}{%
+ \immediate\write18{\pstool@rm@cmd \pstool@path\pstool@jobname.bbl}%
+ }{}%
+ \immediate\write18{\pstool@cp@cmd \jobname.bbl \pstool@path\pstool@jobname.bbl}%
+ }{}%
+% Scan the main document line by line; print preamble into auxiliary file until the document begins or \cs{EndPreamble} is found:
+ \endlinechar=-1
+ \def\@tempa{\pdfoutput=0\relax}%
+ \in@false
+ \openin\pstool@mainfile@ior "\jobname"\relax
+ \@whilesw \unless\ifin@ \fi {%
+ \immediate\write\pstool@out{\unexpanded\expandafter{\@tempa}}%
+ \readline\pstool@mainfile@ior to\@tempa
+ \let\@tempc\@tempa
+ \trim@multiple@spaces@in\@tempa
+ \expandafter\expandafter\expandafter\in@first
+ \expandafter\expandafter\expandafter{%
+ \expandafter\@begindocument@str
+ \expandafter}%
+ \expandafter{\@tempa}%
+ \unless\ifin@
+ \expandafter\expandafter\expandafter\in@first
+ \expandafter\expandafter\expandafter{%
+ \expandafter\@endpreamble@str
+ \expandafter}%
+ \expandafter{\@tempa}%
+ \fi
+ }
+ \closein\pstool@mainfile@ior
+% Now the preamble of the process file:
\immediate\write\pstool@out{%
-% Input the main document; redefine the document environment so only the preamble is read:
- \unexpanded{%
- \pdfoutput=0^^J% force DVI mode if not already
- \let\origdocument\document^^J%
- \let\EndPreamble\endinput^^J%
- \def\document{\endgroup\endinput}^^J%
- }%
- \noexpand\input{\jobname}^^J%
-%
-% Now the preamble of the process file: (restoring document's original meaning; empty \cmd\pagestyle\ removes the page number)
\if@pstool@pdfcrop@\else
\noexpand\usepackage[active,tightpage]{preview}^^J%
\fi
\unexpanded{%
- \let\document\origdocument^^J%
- \pagestyle{empty}^^J%
+ \pagestyle{empty}^^J^^J% remove the page number
}%
-%
+ \noexpand\makeatletter^^J%
+% Sort out the page numbering here.
+% Force the pagestyle locally to output an integer so it can be written to the external file inside a \cs{setcounter} command.
+ \expandafter\ifx\csname r@\pstool@label\endcsname\relax\else
+ \def\noexpand\thepage{\unexpanded\expandafter{\thepage}}^^J%
+ \noexpand\setcounter{page}{%
+ \expandafter\expandafter\expandafter
+ \@secondoftwo\csname r@\pstool@label\endcsname
+ }^^J%
+ \fi
% And the document body to place the graphic on a page of its own:
+ \noexpand\@input{\jobname.oldaux}^^J^^J%
+ \noexpand\begin{document}^^J%
+ \unexpanded{\immediate\write\@mainaux}{\pstool@auxmarker*}^^J%
+ \noexpand\makeatother^^J%
\unexpanded{%
- \begin{document}^^J%
\centering\null\vfill^^J%
}%
+ ^^J%
\if@pstool@pdfcrop@\else
\noexpand\begin{preview}^^J%
\fi
- \unexpanded{#3^^J}% this is the "psfrag" material
+ \unexpanded{#3^^J}
\noexpand\includegraphics
[\unexpanded\expandafter{\XKV@rm}]
{\pstool@filestub}^^J%
\if@pstool@pdfcrop@\else
\noexpand\end{preview}^^J%
\fi
- \unexpanded{\vfill\end{document}}^^J%
+ ^^J%
+ \unexpanded{\vfill^^J^^J\makeatletter^^J\immediate\write\@mainaux}{\pstool@auxmarker/}^^J%
+ \unexpanded{\makeatother^^J\end{document}}^^J%
}%
\immediate\closeout\pstool@out
}
@@ -391,10 +541,9 @@
\providecommand\EndPreamble{}
% \section{User commands}
-%
-% These all support the suffixes |*| and |!|, so each user command is defined as a wrapper to \cmd\pstool.
+% These all support the suffixes \texttt{*} and \texttt{!}, so each user command is defined as a wrapper to \cmd\pstool.
-% for EPS figures with psfrag:
+% For EPS figures with psfrag:
\newcommand\psfragfig[2][]{\pstool@psfragfig{#1}{#2}{}}
\WithSuffix\newcommand\psfragfig*[2][]{%
\pstool@psfragfig{#1}{#2}{*}%
@@ -403,7 +552,7 @@
\pstool@psfragfig{#1}{#2}{!}%
}
-% Parse optional \<input definitions>
+% Parse optional input definitions:
\newcommand\pstool@psfragfig[3]{%
\@ifnextchar\bgroup{%
\pstool@@psfragfig{#1}{#2}{#3}%
@@ -412,19 +561,21 @@
}%
}
-% Search for both \<filename> and \<filename>|-psfrag| inputs.
+% Search for both `filename' and `filename'-psfrag inputs.
%
-% |#1|: possible graphicx options\\
-% |#2|: graphic name (possibly with path)\\
-% |#3|: |\pstool| suffix (i.e., |!| or |*| or \<empty>)\\
-% |#4|: possible \pkg{psfrag} (or other) macros
+% #1: possible graphicx options
+% #2: graphic name (possibly with path)
+% #3: \cs{pstool} suffix (i.e., \texttt{!} or \texttt{*} or `empty')
+% #4: possible \pkg{psfrag} (or other) macros
\newcommand\pstool@@psfragfig[4]{%
% Find the .eps file to use.
\IfFileExists{#2-psfrag.eps}{%
\edef\pstool@eps{#2-psfrag}%
- \OnlyIfFileExists{#2.eps}{%
- \PackageWarning{pstool}{Graphic "#2.eps" exists but "#2-psfrag.eps" is being used}%
- }%
+ \IfFileExists{#2.eps}{%
+ \PackageWarning{pstool}{%
+ Graphic "#2.eps" exists but "#2-psfrag.eps" is being used%
+ }%
+ }{}%
}{%
\IfFileExists{#2.eps}{%
\edef\pstool@eps{#2}%
@@ -439,38 +590,37 @@
% Find the .tex file to use.
\IfFileExists{#2-psfrag.tex}{%
\edef\pstool@tex{#2-psfrag.tex}%
- \OnlyIfFileExists{#2.tex}{%
+ \IfFileExists{#2.tex}{%
\PackageWarning{pstool}{%
File "#2.tex" exists that may contain macros
for "\pstool@eps.eps"^^J%
But file "#2-psfrag.tex" is being used instead.%
}%
- }%
+ }{}%
}{%
\IfFileExists{#2.tex}{%
\edef\pstool@tex{#2.tex}%
}{%
- \let\pstool@tex\@empty
\PackageWarning{pstool}{%
No file "#2.tex" or "#2-psfrag.tex" can be found
that may contain macros for "\pstool@eps.eps"%
}%
}%
}%
- \ifx\pstool@tex\@empty
- \pstool#3[#1]{\pstool@eps}{#4}%
- \else
- \expandafter\pstool@@@psfragfig
- \expandafter{\pstool@tex}{#3[#1]}{#4}%
+ % Perform the actual processing step, skipping it entirely if an EPS file hasn't been found.
+ % (In which case an error would have been called above; this is to clean up nicely in scrollmode, for example.)
+ \ifx\pstool@eps\@undefined\else
+ \edef\@tempa{%
+ \unexpanded{\pstool#3[#1]}{\pstool@eps}{%
+ \ifx\pstool@macrofile\@empty\else
+ \unexpanded{\csname @input\endcsname}{\pstool@macrofile}%
+ \fi
+ \ifx\pstool@tex\@empty\else
+ \unexpanded{\csname @input\endcsname}{\pstool@tex}%
+ \fi
+ \unexpanded{#4}%
+ }%
+ }\@tempa
\fi
}
-
-% Break out the separate function in order to expand |\pstool@tex| before writing it.
-\newcommand\pstool@@@psfragfig[3]{%
- \pstool#2{\pstool@eps}{%
- \csname @input\endcsname{#1}%
- #3%
- }%
-}
-
-% That's it.
+% \centerline{\itshape ---The End---}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pstool.tlpobj new/tlpkg/tlpobj/pstool.tlpobj
--- old/tlpkg/tlpobj/pstool.tlpobj 2010-06-10 18:43:27.000000000 +0200
+++ new/tlpkg/tlpobj/pstool.tlpobj 2013-03-12 04:38:53.000000000 +0100
@@ -1,20 +1,22 @@
name pstool
category Package
-revision 15878
+revision 29343
shortdesc Support for psfrag within pdfLaTeX.
relocated 1
-longdesc The package works in the same sort of way as pst-pdf,
-longdesc processing PostScript graphics with psfrag labels within
-longdesc documents running with pdfLaTeX. Pstool ensures that each
-longdesc version of each graphic is compiled once only (the graphic is
-longdesc (re-)compiled only if it has changed since the previous
-longdesc compilation of the document). This drastically speeds up the
-longdesc running of the package in the typical case (though the first
-longdesc run of any document is inevitably just as slow as with any
-longdesc similar package).
-runfiles size=4
+longdesc The package works in the same sort of way as pst-pdf, but it
+longdesc also processes the PostScript graphics with psfrag to add
+longdesc labels within the graphic, before conversion. Thus the bundle
+longdesc replaces two steps of an ordinary workflow. (Naturally, the
+longdesc package requires that \write 18 is enabled.) Pstool ensures
+longdesc that each version of each graphic is compiled once only (the
+longdesc graphic is (re-)compiled only if it has changed since the
+longdesc previous compilation of the document). This drastically speeds
+longdesc up the running of the package in the typical case (though the
+longdesc first run of any document is inevitably just as slow as with
+longdesc any similar package).
+runfiles size=5
RELOC/tex/latex/pstool/pstool.sty
catalogue-ctan /macros/latex/contrib/pstool
-catalogue-date 2009-08-04 11:31:22 +0200
+catalogue-date 2013-03-11 10:36:18 +0100
catalogue-license lppl
-catalogue-version 1.3
+catalogue-version 1.5a
++++++ pstools.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/bbox.1 new/texmf/doc/man/man1/bbox.1
--- old/texmf/doc/man/man1/bbox.1 2011-02-07 10:10:40.000000000 +0100
+++ new/texmf/doc/man/man1/bbox.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-.\" This manpage has been automatically generated by docbook2man
-.\" from a DocBook document. This tool can be found at:
-.\" http://shell.ipoline.com/~elmert/comp/docbook2X/
-.\" Please send any bug reports, improvements, comments, patches,
-.\" etc. to Steve Cheng .
-.TH "BBOX" "1" "31 August 2010" "" ""
-
-.SH NAME
-bbox \- prints out the bounding box of a rawppm or rawpbm image
-.SH SYNOPSIS
-
-\fBbbox\fR [ \fB-l\fR ] [ \fB-r\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB\fIrawpbmfile\fB\fR ]
-
-.SH "DESCRIPTION"
-.PP
-\fBbbox\fR reads a rawppm or rawpbm file
-and prints out the bounding box of the image (as postscript comment and
-in postscript points, i.e. 1/72dpi) as well as the high resolution
-bounding box. Input is read from standard input if no filename is
-specified.
-Example output:
-
-.nf
- %%BoundingBox: 12 253 829 837
- %%HiResBoundingBox: 12.500000 253.000000 828.500000 837.00000
-
-.fi
-.PP
-\fBbbox\fR has only very limited memory requirements
-as it reads the input line by line and thus needs to store only one picture
-line in memory.
-.SH "OPTIONS"
-.TP
-\fB-h | --help \fR
-Show summary of options.
-.TP
-\fB-V \fR
-Show version of program.
-.TP
-\fB-r \fR
-resolution of picture in dpi
-.TP
-\fB-l \fR
-loose bounding box (integer bounding box is expanded by 1
-point, hires bounding box is expanded by 0.5 points)
-.SH "SEE ALSO"
-.PP
-ps2eps (1)
-.SH "AUTHOR"
-.PP
-\fBbbox\fR was written by Roland Bless.
-.SS "ACKNOWLEDGMENTS"
-.PP
-Special thanks goes to Michael Sharpe from UCSD who suggested a lot of improvements for
-bbox to become more precise and robust, especially for small drawings.
-.PP
-An earlier version of this manual page was originally written by
-Rafael Laboissiere for
-the Debian system. Thank you Rafael! Permission is
-granted to copy, distribute and/or modify this document under
-the terms of the GNU Free Documentation
-License, Version 1.1 or any later version published by the Free
-Software Foundation; with no Invariant Sections, no Front-Cover
-Texts and no Back-Cover Texts.
-.SH "BUGS"
-.PP
-Though the code is quite small and the probability for bugs
-is now small, there may be some left somewhere between the lines.
-In case you find one, please send a short description with
-\fBbbox\fR version number to (please allow some time
-to reply).
Files old/texmf/doc/man/man1/bbox.man1.pdf and new/texmf/doc/man/man1/bbox.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/ps2eps.1 new/texmf/doc/man/man1/ps2eps.1
--- old/texmf/doc/man/man1/ps2eps.1 2011-02-07 10:10:40.000000000 +0100
+++ new/texmf/doc/man/man1/ps2eps.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,366 +0,0 @@
-.\" This manpage has been automatically generated by docbook2man
-.\" from a DocBook document. This tool can be found at:
-.\" http://shell.ipoline.com/~elmert/comp/docbook2X/
-.\" Please send any bug reports, improvements, comments, patches,
-.\" etc. to Steve Cheng .
-.TH "PS2EPS" "1" "31 August 2010" "" ""
-
-.SH NAME
-ps2eps \- convert PostScript to EPS (Encapsulated PostScript) files
-.SH SYNOPSIS
-
-\fBps2eps\fR [ \fB-f\fR ] [ \fB-q\fR ] [ \fB-N\fR ] [ \fB-O\fR ] [ \fB-n\fR ] [ \fB-P\fR ] [ \fB-c\fR ] [ \fB-C\fR ] [ \fB-m\fR ] [ \fB-B\fR ] [ \fB-E\fR ] [ \fB-s \fIpagedim\fB\fR ] [ \fB-t \fIoffset\fB\fR ] [ \fB-r \fIresolution\fB\fR ] [ \fB-R \fI+|-|^\fB\fR ] [ \fB-l\fR ] [ \fB-g\fR ] [ \fB-H\fR ] [ \fB-d\fR ] [ \fB-h|--help\fR ] [ \fB-a\fR ] [ \fB-W\fR ] [ \fB-L\fR ] [ \fB-V|--version\fR ] [ \fB--\fR ] [ \fB\fIpsfile1\fB\fR ] [ \fB\fIpsfile2\fB\fR ] [ \fB\fI\&...\fB\fR ]
-
-.SH "DESCRIPTION"
-.PP
-This manual page documents \fBps2eps\fR version 1.68.
-.PP
-\fBps2eps\fR is a tool (written in Perl) to produce
-Encapsulated PostScript Files (EPS/EPSF) from usual one-paged Postscript
-documents. It calculates correct Bounding Boxes for those EPS files and
-filters some special postscript command sequences that can produce
-erroneous results on printers. EPS files are often needed for including
-(scalable) graphics of high quality into TeX/LaTeX (or even Word) documents.
-.PP
-Without any argument, ps2eps reads from standard input
-and writes to standard output.
-If filenames are given as arguments they are processed
-one by one and output files are written to filenames
-with extension \fI\&.eps\fR\&. If input filenames have the
-extension \fI\&.ps\fR or \fI\&.prn\fR, this extension is replaced with \fI\&.eps\fR\&.
-In all other cases \fI\&.eps\fR is appended to the input filename.
-Please note that PostScript files for input should contain
-only one single page (you can possibly use the \fBpsselect\fR from the
-psutils package to extract a single page from a document that
-contains multiple pages).
-.PP
-If BoundingBox in output seems to be wrong, please try options \fB--size\fR or
-\fB--ignoreBB\fR\&. See also section TROUBLESHOOTING.
-.SH "OPTIONS"
-.PP
-\fBps2eps\fR follows the usual GNU command line syntax,
-with long options starting with two dashes (`-'). A summary of
-options is included below.
-.TP
-\fB-h, --help \fR
-Show summary of options.
-.TP
-\fB-V, --version \fR
-Show version of program.
-.TP
-\fB-f, --force \fR
-Force overwriting existing files. \fBps2eps\fR
-will not overwrite files by default to avoid deleting original EPS
-files accidently.
-.TP
-\fB-q, --quiet \fR
-quiet operation (no output while processing files, except errors).
-.TP
-\fB-N, --noinsert \fR
-do not insert any postscript code. Normally a few postscript
-instructions are added around the original postscript code by
-\fBps2eps\fR which can be turned off by this option.
-.TP
-\fB-O, --preserveorientation \fR
-do not filter %%Orientation: header comment.
-.TP
-\fB-n, --nofix \fR
-do not try to fix postscript code by filtering some instructions.
-.TP
-\fB-P, --removepreview \fR
-remove preview image (smaller file, but no preview anymore).
-.TP
-\fB-F, --fixps \fR
-fix postscript code unconditionally. Otherwise, filtering is
-usually triggered by detection of certain drivers only.
-.TP
-\fB-c, --comments \fR
-preserve document structure comments.
-.TP
-\fB-C, --clip \fR
-insert postscript code for clipping. Unless
-\fB--nohires\fR is specified, the HiResBoundingBox
-(enlarged by 0.1 points) is used for clipping.
-.TP
-\fB-m, --mono \fR
-use black/white bitmap as base for calculation (default: off).
-.TP
-\fB-s, --size=pagedim \fR
-where pagedim is a pre-defined standard page size
-(e.g., a4,a0,b0,letter,...) or explicitly specified in a
-format pagedim:=\fIX\fRx\fIY\fR[cm|in],
-where \fIX\fR and \fIY\fR are numbers (floating points are accepted) followed by
-units centimeter (cm) or inch (in), (default: cm).
-Use \fB--size=list\fR to list pre-defined pagesizes.
-See also environment variable PS2EPS_SIZE\&.
-.TP
-\fB-t, --translate=x,y \fR
-specify an x,y offset (may be negative) in postscript points
-(1/72 dpi) for drawing. This option may be required
-if your drawing has negative coordinates which usually lets ghostscript
-cut the negative part of your picture, because it starts to render
-at positive coordinates. The resulting output will
-also be shifted.
-.TP
-\fB-r, --resolution=dpi \fR
-specify a resolution in dpi (dots per inch) for drawing under
-ghostscript. Default
-resolution is 144 dpi which is the double of the typical 72 dpi.
-This option may help if there is a hardware dependent resolution
-encoded in the postscript, e.g., 600dpi. Example:
-\fBps2eps -l -r 600 test.ps\fR
-.TP
-\fB-R, --rotate=direction \fR
-This option rotates the resulting EPS output.
-The parameter direction determines the direction of
-rotation: + means +90 degrees (clockwise),- means -90 degrees
-(counter-clockwise), and ^ means 180 degrees (up-side down).
-.TP
-\fB-l, --loose \fR
-expand the original tight bounding box by one point in each
-direction.
-.TP
-\fB-B, --ignoreBB \fR
-do not use existing bounding box as page size for
-rendering.
-.TP
-\fB-E, --ignoreEOF \fR
-do not use %%EOF as hint for end of file. Otherwise, \fBps2eps\fR assumes
-that postscript code ends after the last %%EOF comment, because
-some drivers add trailing binary ``garbage'' code which gets deleted
-by \fBps2eps\fR by default.
-.TP
-\fB-g, --gsbbox \fR
-use internal bbox device of ghostscript instead of the external C
-program \fBbbox\fR\&. The internal bbox device of ghostscript
-generates different values (sometimes even incorrect),
-so using the provided \fBbbox\fR should be more robust.
-See also environment variable PS2EPS_GSBBOX\&.
-.TP
-\fB-H, --nohires \fR
-do not generate a %%HiResBoundingBox comment for output.
-.TP
-\fB-a, --accuracy \fR
-increase the accuracy by turning subsample antialiasing on (may be slower)
-.TP
-\fB-L, --license \fR
-show licensing information.
-.TP
-\fB-d, --debuggs \fR
-show ghostscript call. This may be helpful for solving problems that
-occur during a ghostscript call.
-.TP
-\fB-W, --warnings \fR
-show warnings about sanity of generated EPS file. Certain
-postscript commands should not be contained in an EPS file.
-With this option set \fBps2eps\fR will issue a warning if it
-detects at least one of them.
-.SH "TROUBLESHOOTING"
-.PP
-Based on the given postscript source code (in most cases generated by
-some postscript printer driver) there are many potential obstacles or
-problems that may occur when trying to create proper EPS files. Please
-read this section carefully to be aware of common pitfalls.
-.SS "INCOMPLETE/CLIPPED IMAGES"
-.PP
-or how to determine the right size for ghostscript.
-.PP
-If you have documents that are larger than your
-ghostscript default (usually A4 or US letter), you have to
-specify the page dimensions explicitly using the
-\fB-s\fR option. Otherwise your EPS
-might be cut off during rasterizing by ghostscript resulting
-in a wrongly calculated bounding box. You can pass
-all pre-defined page sizes to \fB-s\fR that ghostscript understands. These are
-currently: 11x17, ledger, legal, letter, lettersmall, archA, archB, archC, archD, archE
-a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, isob0, isob1, isob2, isob3, isob4, isob5, isob6,
-b0, b1, b2, b3, b4, b5, c0, c1, c2, c3, c4, c5, c6, jisb0, jisb1,
-jisb2, jisb3, jisb4, jisb5, jisb6, flsa, flse, halfletter.
-Unfortunately, all sizes are currently only available in portrait
-orientation (not landscape).
-.PP
-By default, \fBps2eps\fR uses an already given %%BoundingBox
-from the source file, which often corresponds to the size of
-the physical page format for which the document was
-printed. However, you should be aware that this already
-specified bounding box may be not correct, thus resulting in a
-wrongly cropped (or even no usable) \fI\&.eps\fR-file.
-\fBps2eps\fR can only do as good as ghostscript does in rendering the original
-postscript file (though \fBps2eps\fR even works with negative and
-fractional values are contained in the original bounding box by using
-automatic translation). Therefore, if the given bounding box is to
-small or incorrect anyway, you can ignore the existing bounding box with the \fB-B\fR
-option, which will cause ghostscript to use its internal
-default size (or use \fB-s\fR). However, if the
-BoundingBox has negative coordinates, which is not allowed by
-the specification, \fBps2eps\fR will shift the output to positive values.
-.PP
-Hint: to avoid rotating the picture
-if you have the original drawing in landscape format, you may
-use the ``Encapsulated Postscript'' option in the printer driver
-which should generate an EPS file (but with a bounding box of
-the sheet size!). But some Windows printer drivers are drawing
-the image with an offset from the bottom of the portrait page,
-so that a part of it is drawn outside the landscape oriented
-page. In this case, you'll have to specify a square size of
-the page using the maximum length, e.g., 29.7cm x 29.7cm for
-an A4 page.
-.SS "CLIPPING"
-.PP
-or why gets some of my text deleted above the included \fI\&.eps\fR file?
-.PP
-Some postscript drivers draw a white rectangle from the top left
-corner of the page to the right lower corner of the object. This may
-erase some or even all text above your imported/included EPS file,
-which is very annoying. In order to prevent this, most programs have a
-clipping option for imported \fI\&.eps\fR files (within LaTeX you can use
-\\includegraphics*{}) for this purpose. If this is unfortunately not
-the case, you can use the \fB-C\fR option of \fBps2eps\fR which will (hopefully)
-do it for you. Unfortunately, PScript.dll 5.2 (Windows XP) introduced
-new very badly behaving Postscript code (initclip) which will even
-override the outer clipping! Thus, a new filter had to be installed
-in \fBps2eps\fR which will fix it.
-.PP
-However, because most programs clip directly on the bounding box,
-you still may loose some pixels of your image, because the bounding
-box is described in the coarse resolution of postscript points,
-i.e. 72 dpi. In order to prevent this, you can use the \fB-l\fR
-option or \fB-C\fR option (for the latter, clipping by the importing program
-should be disabled then) to allow for a 1 point larger bounding box.
-\fB-C\fR clips around a 1 point enlarged bounding box and \fB-l\fR enlarges the
-bounding box values by 1 point (you can also combine both options).
-.SS "INCLUDED FILTERS"
-.PP
-Some postscript sequences, e.g., for using specific printer
-features (featurebegin ...), are not working well within an \fI\&.eps\fR
-file, so \fBps2eps\fR tries to filter them out. But please note that
-filters for postscript code may not work properly for your printer
-driver (\fBps2eps\fR was mainly tested with HP and Adobe printer
-drivers, although it may work for all printers using the
-PScript.dll). In this case you can try to turn of filtering by
-using option \fB-n\fR, or try to find the bad sequence in the postscript
-code and adapt the filter rule in the \fBps2eps\fR script (variables
-$linefilter, $rangefilter_begin, $rangefilter_end; linefilter is
-an expression for filtering single lines, rangefilter_... are
-expressions that filter all lines between a pattern matching
-$rangefilter_begin and $rangefilter_end; drop me an e-mail with
-your modifications). However, things may change as the printer
-drivers (e.g., PScript.dll) or postscript language evolve.
-.PP
-Some applications or drivers generate postscript code with leading
-or trailing binary code, which often confuses older postscript
-interpreters. \fBps2eps\fR tries to remove such code, but it may
-sometimes make a wrong guess about start and end of the real
-postscript code (drop me an e-mail with a zipped postscript
-source, see section BUGS).
-.PP
-Comment lines or even blank lines are removed
-(which is the default to make .eps files smaller), which may corrupt your
-output. Please check the next section how to fix this.
-\fBps2eps\fR removes blank lines and also <CR> (carriage ceturn
-``\\r'') at the end of lines. However, nicely formatted postscript code
-gives a hint by using ``%%BeginBinary'' ``%%EndBinary'' comments. When
-\fBps2eps\fR detects these comments it will refrain from any filtering
-action within the marked binary sections.
-.PP
-\fBps2eps\fR filters also %%Orientation: comments by
-default (you can use option \fB-O\fR to turn off filtering),
-because ghostscript may ``automagically'' rotate images when generating PDF
-images, which is not desired in most cases. Hint: you can turn off that
-feature in ghostscript unconditionally by specifying -dAutoRotatePages=/None.
-.SS "CORRUPTED OUTPUT"
-.PP
-Some postscript code may get corrupted when comment lines or even blank
-lines are removed (which is the default to make .eps files smaller),
-because those files may contain encoded images
-which also have a % as first character in a line or use a special
-comment as end of image delimiter. If this is the case, use the \fB-c\fR
-option to prevent filtering comments.
-.SS "COLOR AND MEMORY"
-.PP
-\fBps2eps\fR supports colored postscript, consequently
-letting ghostscript consume more resources for drawing its bitmap
-(roughly 6MBytes for an A4 page). \fBbbox\fR is reading
-the bitmap line by line so it consumes only minimal memory. If you experience problems
-with memory consumption of ghostscript, you may use the \fB-m\fR option
-for using a monochrome image. But this will probably result in wrongly
-determined bounding boxes with colored
-images, because ghostscript has to do black/white dithering and may thus suppress
-objects drawn in light colors.
-.PP
-Another option in case of memory problems and too long run times
-is to use the much more memory efficient internal ghostscript bbox by using the
-\fB-g\fR option.
-.SH "ENVIRONMENT VARIABLES"
-.PP
-Please note that a command line option always takes precedence over
-the related environment variable.
-.PP
-The environment variable PS2EPS_SIZE can be used
-to specify a default page size and take any argument that
-\fB--size\fR accepts. Examples: \fBexport PS2EPS_SIZE=a0\fR (bash-like syntax)
-or \fBsetenv PS2EPS_SIZE letter\fR (csh syntax).
-.PP
-If the environment variable PS2EPS_GSBBOX is set
-the internal bbox device of ghostscript will be used instead of the external
-command \fBbbox\fR\&. Examples: \fBexport PS2EPS_GSBBOX=true\fR (bash-like syntax)
-or \fBsetenv PS2EPS_GSBBOX 1\fR (csh syntax).
-.SH "EXAMPLES"
-.PP
-The usual call is simply:
-\fBps2eps -l \fIfile\fB\fR
-.PP
-A relatively failsafe call would be (if your postscript is smaller
-than iso b0 [100cm x 141.4cm] and you have a fast computer with enough memory):
-\fBps2eps -l -B -s b0 -c -n \fIfile\fB\fR
-.PP
-If output is not correct try:
-\fBps2eps -l -B -s b0 -F \fIfile\fB\fR
-.SH "AUTHOR"
-.PP
-\fBps2eps\fR was written by Roland Bless.
-.SS "WHY?"
-.PP
-Other programs like \fBps2epsi\fR do not calculate the
-bounding box always correctly (because the values are put on the
-postscript stack which may get corrupted by bad postscript code) or
-rounded it off so that clipping the EPS cut off some part of the
-image. \fBps2eps\fR uses a double precision resolution
-of 144 dpi and appropriate rounding to get a proper bounding
-box. The internal bbox device of ghostscript generates different values
-(sometimes even incorrect), so using the provided \fBbbox\fR
-should be more robust.
-However, because normal clipping has only a resolution of 1/72dpi
-(postscript point), the clipping process may still erase parts of your
-EPS image. In this case please use the \fB-l\fR option to add
-an additional point of white space around the tight bounding box.
-.SS "ACKNOWLEDGMENTS"
-.PP
-Some people contributed code or suggestions to improve \fBps2eps\fR\&. Here
-are at least some names (sorry if I forgot your name):
-Christophe Druet, Hans Ecke, Berend Hasselman, Erik Joergensen, Koji Nakamaru, Hans Fredrik Nordhaug, Michael Sharpe.
-Special thanks goes to Michael Sharpe from UCSD who suggested a lot of useful features for ps2eps and
-who fixed bbox to become more precise and robust.
-.PP
-An earlier version of this manual page was originally written by
-Rafael Laboissiere <rafael at debian.org> for
-the Debian system. Thank you Rafael!
-.PP
-Permission is granted to copy, distribute and/or modify this document under
-the terms of the GNU Free Documentation
-License, Version 1.1 or any later version published by the Free
-Software Foundation; with no Invariant Sections, no Front-Cover
-Texts and no Back-Cover Texts.
-.SH "BUGS"
-.PP
-If you experience problems, please check carefully all hints in the section
-TROUBLESHOOTING
-first. Otherwise, check for an updated
-version at URL:http://www.tm.uka.de/~bless/ps2eps
-or send a gzipped file of
-relevant postscript source code with your error description
-and \fBps2eps\fR version number to <roland at bless.de> (please allow some time
-to reply).
-.SH "SEE ALSO"
-.PP
-bbox (1), gs (1), ps2epsi (1)
Files old/texmf/doc/man/man1/ps2eps.man1.pdf and new/texmf/doc/man/man1/ps2eps.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/ps2frag.1 new/texmf/doc/man/man1/ps2frag.1
--- old/texmf/doc/man/man1/ps2frag.1 2006-01-03 01:00:18.000000000 +0100
+++ new/texmf/doc/man/man1/ps2frag.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-.TH ps2frag 1 "Feb 95" TeXware
-.SH NAME
-ps2frag - obsolete shell script for the PSfrag system.
-.SH IMPORTANT NOTICE
-The new PSfrag system no longer requires the ps2frag script; instead, it
-handles the processing entirely within TeX/LaTeX and DVIPS. I'm sure you
-will agree that never needing to run ps2frag again is a nice convenience!
-.P
-However, there are two significant differences in the way this new version
-of PSfrag works. Please make yourself aware of them:
-.P
-1) XDvi is no longer able to determine where your PSfrag replacements
-should
-go, so instead it lines them up in a vertical list to the left of the
-figure. This allows you to confirm that they have been typeset properly, at
-least. However, to confirm that PSfrag
-.B positions
-your replacements properly, you will have to view the PostScript
-version of your file with a viewer like GhostView, or print it out.
-This seems to be the
-only disadvantage to the elimination of the pre-processing step.
-.P
-2) If you embed '\\tex' commands inside your figures, you now need to
-explicitly _tell_ PSfrag to process these commands. To do so, use
-\\usepackage[scanall]{psfrag}
-instead of
-\\usepackage{psfrag}
-at the beginning of your LaTeX file.
-.P
-If you only use '\\tex' commands in a small number of figures, then a
-more efficient might be to turn on '\\tex'-scanning only for those
-figures. To do that, add the command '\\psfragscanon' immediately before
-each relevant \\includegraphics or \\epsfbox command.
-.P
-.SH NOTES
-See the PSfrag documentation for further information.
-.SH "SEE ALSO"
-dvips(1), gs(1), ghostview(1), latex(1)
-.SH AUTHORS
-.IP psfrag@rascals.stanford.edu
-The PSfrag maintainer's mailing list.
Files old/texmf/doc/man/man1/ps2frag.man1.pdf and new/texmf/doc/man/man1/ps2frag.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/pslatex.1 new/texmf/doc/man/man1/pslatex.1
--- old/texmf/doc/man/man1/pslatex.1 2006-01-03 01:00:18.000000000 +0100
+++ new/texmf/doc/man/man1/pslatex.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-.TH "pslatex" "1" "September 2000" "teTeX" "teTeX"
-.PP
-.SH "NAME"
-pslatex \- utility to typeset LaTeX files using PostScript fonts
-.PP
-.SH "SYNOPSIS"
-.PP
-\fBpslatex\fP [\fILATEXARGS\fP] \fILATEXFILE\fP[\&.tex]
-.PP
-.SH "DESCRIPTION"
-.PP
-\fBpslatex\fP allows you to typeset a LaTeX source file using basic
-Adobe Type 1 PostScript fonts (Times, Helvetica, and Courier)
-\fIwithout\fP editing the file to load the necessary packages\&.
-.PP
-It takes any arguments that \fBlatex\fP(1) can take\&.
-.PP
-.SH "OPTIONS"
-.PP
-None\&.
-.PP
-.SH "FILES"
-.PP
-Many\&. See the readme file for \fIpslatex\&.sty\fP\&.
-.PP
-.SH "SEE ALSO"
-.PP
-\fBlatex\fP(1), \fI\fITEXMF\fP/latex/pslatex/00readme\&.txt\fP
-.PP
-.SH "BUGS"
-.PP
-None known\&. Report any found to the author\&.
-.PP
-.SH "AUTHOR"
-.PP
-\fBpslatex\fP was written by David Carlisle
-\&.
-.PP
-This manual page was written by C\&.M\&. Connelly
-, for
-the Debian GNU/Linux system\&. It may be used by other distributions
-without contacting the author\&. Any mistakes or omissions in the
-manual page are my fault; inquiries about or corrections to this
-manual page should be directed to me (and not to the primary author)\&.
Files old/texmf/doc/man/man1/pslatex.man1.pdf and new/texmf/doc/man/man1/pslatex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/bbox.1 new/texmf-dist/doc/man/man1/bbox.1
--- old/texmf-dist/doc/man/man1/bbox.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/bbox.1 2011-02-07 10:10:40.000000000 +0100
@@ -0,0 +1,71 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" http://shell.ipoline.com/~elmert/comp/docbook2X/
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng .
+.TH "BBOX" "1" "31 August 2010" "" ""
+
+.SH NAME
+bbox \- prints out the bounding box of a rawppm or rawpbm image
+.SH SYNOPSIS
+
+\fBbbox\fR [ \fB-l\fR ] [ \fB-r\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB\fIrawpbmfile\fB\fR ]
+
+.SH "DESCRIPTION"
+.PP
+\fBbbox\fR reads a rawppm or rawpbm file
+and prints out the bounding box of the image (as postscript comment and
+in postscript points, i.e. 1/72dpi) as well as the high resolution
+bounding box. Input is read from standard input if no filename is
+specified.
+Example output:
+
+.nf
+ %%BoundingBox: 12 253 829 837
+ %%HiResBoundingBox: 12.500000 253.000000 828.500000 837.00000
+
+.fi
+.PP
+\fBbbox\fR has only very limited memory requirements
+as it reads the input line by line and thus needs to store only one picture
+line in memory.
+.SH "OPTIONS"
+.TP
+\fB-h | --help \fR
+Show summary of options.
+.TP
+\fB-V \fR
+Show version of program.
+.TP
+\fB-r \fR
+resolution of picture in dpi
+.TP
+\fB-l \fR
+loose bounding box (integer bounding box is expanded by 1
+point, hires bounding box is expanded by 0.5 points)
+.SH "SEE ALSO"
+.PP
+ps2eps (1)
+.SH "AUTHOR"
+.PP
+\fBbbox\fR was written by Roland Bless.
+.SS "ACKNOWLEDGMENTS"
+.PP
+Special thanks goes to Michael Sharpe from UCSD who suggested a lot of improvements for
+bbox to become more precise and robust, especially for small drawings.
+.PP
+An earlier version of this manual page was originally written by
+Rafael Laboissiere for
+the Debian system. Thank you Rafael! Permission is
+granted to copy, distribute and/or modify this document under
+the terms of the GNU Free Documentation
+License, Version 1.1 or any later version published by the Free
+Software Foundation; with no Invariant Sections, no Front-Cover
+Texts and no Back-Cover Texts.
+.SH "BUGS"
+.PP
+Though the code is quite small and the probability for bugs
+is now small, there may be some left somewhere between the lines.
+In case you find one, please send a short description with
+\fBbbox\fR version number to (please allow some time
+to reply).
Files old/texmf-dist/doc/man/man1/bbox.man1.pdf and new/texmf-dist/doc/man/man1/bbox.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ps2eps.1 new/texmf-dist/doc/man/man1/ps2eps.1
--- old/texmf-dist/doc/man/man1/ps2eps.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ps2eps.1 2011-02-07 10:10:40.000000000 +0100
@@ -0,0 +1,366 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" http://shell.ipoline.com/~elmert/comp/docbook2X/
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng .
+.TH "PS2EPS" "1" "31 August 2010" "" ""
+
+.SH NAME
+ps2eps \- convert PostScript to EPS (Encapsulated PostScript) files
+.SH SYNOPSIS
+
+\fBps2eps\fR [ \fB-f\fR ] [ \fB-q\fR ] [ \fB-N\fR ] [ \fB-O\fR ] [ \fB-n\fR ] [ \fB-P\fR ] [ \fB-c\fR ] [ \fB-C\fR ] [ \fB-m\fR ] [ \fB-B\fR ] [ \fB-E\fR ] [ \fB-s \fIpagedim\fB\fR ] [ \fB-t \fIoffset\fB\fR ] [ \fB-r \fIresolution\fB\fR ] [ \fB-R \fI+|-|^\fB\fR ] [ \fB-l\fR ] [ \fB-g\fR ] [ \fB-H\fR ] [ \fB-d\fR ] [ \fB-h|--help\fR ] [ \fB-a\fR ] [ \fB-W\fR ] [ \fB-L\fR ] [ \fB-V|--version\fR ] [ \fB--\fR ] [ \fB\fIpsfile1\fB\fR ] [ \fB\fIpsfile2\fB\fR ] [ \fB\fI\&...\fB\fR ]
+
+.SH "DESCRIPTION"
+.PP
+This manual page documents \fBps2eps\fR version 1.68.
+.PP
+\fBps2eps\fR is a tool (written in Perl) to produce
+Encapsulated PostScript Files (EPS/EPSF) from usual one-paged Postscript
+documents. It calculates correct Bounding Boxes for those EPS files and
+filters some special postscript command sequences that can produce
+erroneous results on printers. EPS files are often needed for including
+(scalable) graphics of high quality into TeX/LaTeX (or even Word) documents.
+.PP
+Without any argument, ps2eps reads from standard input
+and writes to standard output.
+If filenames are given as arguments they are processed
+one by one and output files are written to filenames
+with extension \fI\&.eps\fR\&. If input filenames have the
+extension \fI\&.ps\fR or \fI\&.prn\fR, this extension is replaced with \fI\&.eps\fR\&.
+In all other cases \fI\&.eps\fR is appended to the input filename.
+Please note that PostScript files for input should contain
+only one single page (you can possibly use the \fBpsselect\fR from the
+psutils package to extract a single page from a document that
+contains multiple pages).
+.PP
+If BoundingBox in output seems to be wrong, please try options \fB--size\fR or
+\fB--ignoreBB\fR\&. See also section TROUBLESHOOTING.
+.SH "OPTIONS"
+.PP
+\fBps2eps\fR follows the usual GNU command line syntax,
+with long options starting with two dashes (`-'). A summary of
+options is included below.
+.TP
+\fB-h, --help \fR
+Show summary of options.
+.TP
+\fB-V, --version \fR
+Show version of program.
+.TP
+\fB-f, --force \fR
+Force overwriting existing files. \fBps2eps\fR
+will not overwrite files by default to avoid deleting original EPS
+files accidently.
+.TP
+\fB-q, --quiet \fR
+quiet operation (no output while processing files, except errors).
+.TP
+\fB-N, --noinsert \fR
+do not insert any postscript code. Normally a few postscript
+instructions are added around the original postscript code by
+\fBps2eps\fR which can be turned off by this option.
+.TP
+\fB-O, --preserveorientation \fR
+do not filter %%Orientation: header comment.
+.TP
+\fB-n, --nofix \fR
+do not try to fix postscript code by filtering some instructions.
+.TP
+\fB-P, --removepreview \fR
+remove preview image (smaller file, but no preview anymore).
+.TP
+\fB-F, --fixps \fR
+fix postscript code unconditionally. Otherwise, filtering is
+usually triggered by detection of certain drivers only.
+.TP
+\fB-c, --comments \fR
+preserve document structure comments.
+.TP
+\fB-C, --clip \fR
+insert postscript code for clipping. Unless
+\fB--nohires\fR is specified, the HiResBoundingBox
+(enlarged by 0.1 points) is used for clipping.
+.TP
+\fB-m, --mono \fR
+use black/white bitmap as base for calculation (default: off).
+.TP
+\fB-s, --size=pagedim \fR
+where pagedim is a pre-defined standard page size
+(e.g., a4,a0,b0,letter,...) or explicitly specified in a
+format pagedim:=\fIX\fRx\fIY\fR[cm|in],
+where \fIX\fR and \fIY\fR are numbers (floating points are accepted) followed by
+units centimeter (cm) or inch (in), (default: cm).
+Use \fB--size=list\fR to list pre-defined pagesizes.
+See also environment variable PS2EPS_SIZE\&.
+.TP
+\fB-t, --translate=x,y \fR
+specify an x,y offset (may be negative) in postscript points
+(1/72 dpi) for drawing. This option may be required
+if your drawing has negative coordinates which usually lets ghostscript
+cut the negative part of your picture, because it starts to render
+at positive coordinates. The resulting output will
+also be shifted.
+.TP
+\fB-r, --resolution=dpi \fR
+specify a resolution in dpi (dots per inch) for drawing under
+ghostscript. Default
+resolution is 144 dpi which is the double of the typical 72 dpi.
+This option may help if there is a hardware dependent resolution
+encoded in the postscript, e.g., 600dpi. Example:
+\fBps2eps -l -r 600 test.ps\fR
+.TP
+\fB-R, --rotate=direction \fR
+This option rotates the resulting EPS output.
+The parameter direction determines the direction of
+rotation: + means +90 degrees (clockwise),- means -90 degrees
+(counter-clockwise), and ^ means 180 degrees (up-side down).
+.TP
+\fB-l, --loose \fR
+expand the original tight bounding box by one point in each
+direction.
+.TP
+\fB-B, --ignoreBB \fR
+do not use existing bounding box as page size for
+rendering.
+.TP
+\fB-E, --ignoreEOF \fR
+do not use %%EOF as hint for end of file. Otherwise, \fBps2eps\fR assumes
+that postscript code ends after the last %%EOF comment, because
+some drivers add trailing binary ``garbage'' code which gets deleted
+by \fBps2eps\fR by default.
+.TP
+\fB-g, --gsbbox \fR
+use internal bbox device of ghostscript instead of the external C
+program \fBbbox\fR\&. The internal bbox device of ghostscript
+generates different values (sometimes even incorrect),
+so using the provided \fBbbox\fR should be more robust.
+See also environment variable PS2EPS_GSBBOX\&.
+.TP
+\fB-H, --nohires \fR
+do not generate a %%HiResBoundingBox comment for output.
+.TP
+\fB-a, --accuracy \fR
+increase the accuracy by turning subsample antialiasing on (may be slower)
+.TP
+\fB-L, --license \fR
+show licensing information.
+.TP
+\fB-d, --debuggs \fR
+show ghostscript call. This may be helpful for solving problems that
+occur during a ghostscript call.
+.TP
+\fB-W, --warnings \fR
+show warnings about sanity of generated EPS file. Certain
+postscript commands should not be contained in an EPS file.
+With this option set \fBps2eps\fR will issue a warning if it
+detects at least one of them.
+.SH "TROUBLESHOOTING"
+.PP
+Based on the given postscript source code (in most cases generated by
+some postscript printer driver) there are many potential obstacles or
+problems that may occur when trying to create proper EPS files. Please
+read this section carefully to be aware of common pitfalls.
+.SS "INCOMPLETE/CLIPPED IMAGES"
+.PP
+or how to determine the right size for ghostscript.
+.PP
+If you have documents that are larger than your
+ghostscript default (usually A4 or US letter), you have to
+specify the page dimensions explicitly using the
+\fB-s\fR option. Otherwise your EPS
+might be cut off during rasterizing by ghostscript resulting
+in a wrongly calculated bounding box. You can pass
+all pre-defined page sizes to \fB-s\fR that ghostscript understands. These are
+currently: 11x17, ledger, legal, letter, lettersmall, archA, archB, archC, archD, archE
+a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, isob0, isob1, isob2, isob3, isob4, isob5, isob6,
+b0, b1, b2, b3, b4, b5, c0, c1, c2, c3, c4, c5, c6, jisb0, jisb1,
+jisb2, jisb3, jisb4, jisb5, jisb6, flsa, flse, halfletter.
+Unfortunately, all sizes are currently only available in portrait
+orientation (not landscape).
+.PP
+By default, \fBps2eps\fR uses an already given %%BoundingBox
+from the source file, which often corresponds to the size of
+the physical page format for which the document was
+printed. However, you should be aware that this already
+specified bounding box may be not correct, thus resulting in a
+wrongly cropped (or even no usable) \fI\&.eps\fR-file.
+\fBps2eps\fR can only do as good as ghostscript does in rendering the original
+postscript file (though \fBps2eps\fR even works with negative and
+fractional values are contained in the original bounding box by using
+automatic translation). Therefore, if the given bounding box is to
+small or incorrect anyway, you can ignore the existing bounding box with the \fB-B\fR
+option, which will cause ghostscript to use its internal
+default size (or use \fB-s\fR). However, if the
+BoundingBox has negative coordinates, which is not allowed by
+the specification, \fBps2eps\fR will shift the output to positive values.
+.PP
+Hint: to avoid rotating the picture
+if you have the original drawing in landscape format, you may
+use the ``Encapsulated Postscript'' option in the printer driver
+which should generate an EPS file (but with a bounding box of
+the sheet size!). But some Windows printer drivers are drawing
+the image with an offset from the bottom of the portrait page,
+so that a part of it is drawn outside the landscape oriented
+page. In this case, you'll have to specify a square size of
+the page using the maximum length, e.g., 29.7cm x 29.7cm for
+an A4 page.
+.SS "CLIPPING"
+.PP
+or why gets some of my text deleted above the included \fI\&.eps\fR file?
+.PP
+Some postscript drivers draw a white rectangle from the top left
+corner of the page to the right lower corner of the object. This may
+erase some or even all text above your imported/included EPS file,
+which is very annoying. In order to prevent this, most programs have a
+clipping option for imported \fI\&.eps\fR files (within LaTeX you can use
+\\includegraphics*{}) for this purpose. If this is unfortunately not
+the case, you can use the \fB-C\fR option of \fBps2eps\fR which will (hopefully)
+do it for you. Unfortunately, PScript.dll 5.2 (Windows XP) introduced
+new very badly behaving Postscript code (initclip) which will even
+override the outer clipping! Thus, a new filter had to be installed
+in \fBps2eps\fR which will fix it.
+.PP
+However, because most programs clip directly on the bounding box,
+you still may loose some pixels of your image, because the bounding
+box is described in the coarse resolution of postscript points,
+i.e. 72 dpi. In order to prevent this, you can use the \fB-l\fR
+option or \fB-C\fR option (for the latter, clipping by the importing program
+should be disabled then) to allow for a 1 point larger bounding box.
+\fB-C\fR clips around a 1 point enlarged bounding box and \fB-l\fR enlarges the
+bounding box values by 1 point (you can also combine both options).
+.SS "INCLUDED FILTERS"
+.PP
+Some postscript sequences, e.g., for using specific printer
+features (featurebegin ...), are not working well within an \fI\&.eps\fR
+file, so \fBps2eps\fR tries to filter them out. But please note that
+filters for postscript code may not work properly for your printer
+driver (\fBps2eps\fR was mainly tested with HP and Adobe printer
+drivers, although it may work for all printers using the
+PScript.dll). In this case you can try to turn of filtering by
+using option \fB-n\fR, or try to find the bad sequence in the postscript
+code and adapt the filter rule in the \fBps2eps\fR script (variables
+$linefilter, $rangefilter_begin, $rangefilter_end; linefilter is
+an expression for filtering single lines, rangefilter_... are
+expressions that filter all lines between a pattern matching
+$rangefilter_begin and $rangefilter_end; drop me an e-mail with
+your modifications). However, things may change as the printer
+drivers (e.g., PScript.dll) or postscript language evolve.
+.PP
+Some applications or drivers generate postscript code with leading
+or trailing binary code, which often confuses older postscript
+interpreters. \fBps2eps\fR tries to remove such code, but it may
+sometimes make a wrong guess about start and end of the real
+postscript code (drop me an e-mail with a zipped postscript
+source, see section BUGS).
+.PP
+Comment lines or even blank lines are removed
+(which is the default to make .eps files smaller), which may corrupt your
+output. Please check the next section how to fix this.
+\fBps2eps\fR removes blank lines and also <CR> (carriage ceturn
+``\\r'') at the end of lines. However, nicely formatted postscript code
+gives a hint by using ``%%BeginBinary'' ``%%EndBinary'' comments. When
+\fBps2eps\fR detects these comments it will refrain from any filtering
+action within the marked binary sections.
+.PP
+\fBps2eps\fR filters also %%Orientation: comments by
+default (you can use option \fB-O\fR to turn off filtering),
+because ghostscript may ``automagically'' rotate images when generating PDF
+images, which is not desired in most cases. Hint: you can turn off that
+feature in ghostscript unconditionally by specifying -dAutoRotatePages=/None.
+.SS "CORRUPTED OUTPUT"
+.PP
+Some postscript code may get corrupted when comment lines or even blank
+lines are removed (which is the default to make .eps files smaller),
+because those files may contain encoded images
+which also have a % as first character in a line or use a special
+comment as end of image delimiter. If this is the case, use the \fB-c\fR
+option to prevent filtering comments.
+.SS "COLOR AND MEMORY"
+.PP
+\fBps2eps\fR supports colored postscript, consequently
+letting ghostscript consume more resources for drawing its bitmap
+(roughly 6MBytes for an A4 page). \fBbbox\fR is reading
+the bitmap line by line so it consumes only minimal memory. If you experience problems
+with memory consumption of ghostscript, you may use the \fB-m\fR option
+for using a monochrome image. But this will probably result in wrongly
+determined bounding boxes with colored
+images, because ghostscript has to do black/white dithering and may thus suppress
+objects drawn in light colors.
+.PP
+Another option in case of memory problems and too long run times
+is to use the much more memory efficient internal ghostscript bbox by using the
+\fB-g\fR option.
+.SH "ENVIRONMENT VARIABLES"
+.PP
+Please note that a command line option always takes precedence over
+the related environment variable.
+.PP
+The environment variable PS2EPS_SIZE can be used
+to specify a default page size and take any argument that
+\fB--size\fR accepts. Examples: \fBexport PS2EPS_SIZE=a0\fR (bash-like syntax)
+or \fBsetenv PS2EPS_SIZE letter\fR (csh syntax).
+.PP
+If the environment variable PS2EPS_GSBBOX is set
+the internal bbox device of ghostscript will be used instead of the external
+command \fBbbox\fR\&. Examples: \fBexport PS2EPS_GSBBOX=true\fR (bash-like syntax)
+or \fBsetenv PS2EPS_GSBBOX 1\fR (csh syntax).
+.SH "EXAMPLES"
+.PP
+The usual call is simply:
+\fBps2eps -l \fIfile\fB\fR
+.PP
+A relatively failsafe call would be (if your postscript is smaller
+than iso b0 [100cm x 141.4cm] and you have a fast computer with enough memory):
+\fBps2eps -l -B -s b0 -c -n \fIfile\fB\fR
+.PP
+If output is not correct try:
+\fBps2eps -l -B -s b0 -F \fIfile\fB\fR
+.SH "AUTHOR"
+.PP
+\fBps2eps\fR was written by Roland Bless.
+.SS "WHY?"
+.PP
+Other programs like \fBps2epsi\fR do not calculate the
+bounding box always correctly (because the values are put on the
+postscript stack which may get corrupted by bad postscript code) or
+rounded it off so that clipping the EPS cut off some part of the
+image. \fBps2eps\fR uses a double precision resolution
+of 144 dpi and appropriate rounding to get a proper bounding
+box. The internal bbox device of ghostscript generates different values
+(sometimes even incorrect), so using the provided \fBbbox\fR
+should be more robust.
+However, because normal clipping has only a resolution of 1/72dpi
+(postscript point), the clipping process may still erase parts of your
+EPS image. In this case please use the \fB-l\fR option to add
+an additional point of white space around the tight bounding box.
+.SS "ACKNOWLEDGMENTS"
+.PP
+Some people contributed code or suggestions to improve \fBps2eps\fR\&. Here
+are at least some names (sorry if I forgot your name):
+Christophe Druet, Hans Ecke, Berend Hasselman, Erik Joergensen, Koji Nakamaru, Hans Fredrik Nordhaug, Michael Sharpe.
+Special thanks goes to Michael Sharpe from UCSD who suggested a lot of useful features for ps2eps and
+who fixed bbox to become more precise and robust.
+.PP
+An earlier version of this manual page was originally written by
+Rafael Laboissiere <rafael at debian.org> for
+the Debian system. Thank you Rafael!
+.PP
+Permission is granted to copy, distribute and/or modify this document under
+the terms of the GNU Free Documentation
+License, Version 1.1 or any later version published by the Free
+Software Foundation; with no Invariant Sections, no Front-Cover
+Texts and no Back-Cover Texts.
+.SH "BUGS"
+.PP
+If you experience problems, please check carefully all hints in the section
+TROUBLESHOOTING
+first. Otherwise, check for an updated
+version at URL:http://www.tm.uka.de/~bless/ps2eps
+or send a gzipped file of
+relevant postscript source code with your error description
+and \fBps2eps\fR version number to <roland at bless.de> (please allow some time
+to reply).
+.SH "SEE ALSO"
+.PP
+bbox (1), gs (1), ps2epsi (1)
Files old/texmf-dist/doc/man/man1/ps2eps.man1.pdf and new/texmf-dist/doc/man/man1/ps2eps.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ps2frag.1 new/texmf-dist/doc/man/man1/ps2frag.1
--- old/texmf-dist/doc/man/man1/ps2frag.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ps2frag.1 2006-01-03 01:00:18.000000000 +0100
@@ -0,0 +1,41 @@
+.TH ps2frag 1 "Feb 95" TeXware
+.SH NAME
+ps2frag - obsolete shell script for the PSfrag system.
+.SH IMPORTANT NOTICE
+The new PSfrag system no longer requires the ps2frag script; instead, it
+handles the processing entirely within TeX/LaTeX and DVIPS. I'm sure you
+will agree that never needing to run ps2frag again is a nice convenience!
+.P
+However, there are two significant differences in the way this new version
+of PSfrag works. Please make yourself aware of them:
+.P
+1) XDvi is no longer able to determine where your PSfrag replacements
+should
+go, so instead it lines them up in a vertical list to the left of the
+figure. This allows you to confirm that they have been typeset properly, at
+least. However, to confirm that PSfrag
+.B positions
+your replacements properly, you will have to view the PostScript
+version of your file with a viewer like GhostView, or print it out.
+This seems to be the
+only disadvantage to the elimination of the pre-processing step.
+.P
+2) If you embed '\\tex' commands inside your figures, you now need to
+explicitly _tell_ PSfrag to process these commands. To do so, use
+\\usepackage[scanall]{psfrag}
+instead of
+\\usepackage{psfrag}
+at the beginning of your LaTeX file.
+.P
+If you only use '\\tex' commands in a small number of figures, then a
+more efficient might be to turn on '\\tex'-scanning only for those
+figures. To do that, add the command '\\psfragscanon' immediately before
+each relevant \\includegraphics or \\epsfbox command.
+.P
+.SH NOTES
+See the PSfrag documentation for further information.
+.SH "SEE ALSO"
+dvips(1), gs(1), ghostview(1), latex(1)
+.SH AUTHORS
+.IP psfrag@rascals.stanford.edu
+The PSfrag maintainer's mailing list.
Files old/texmf-dist/doc/man/man1/ps2frag.man1.pdf and new/texmf-dist/doc/man/man1/ps2frag.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pslatex.1 new/texmf-dist/doc/man/man1/pslatex.1
--- old/texmf-dist/doc/man/man1/pslatex.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/pslatex.1 2006-01-03 01:00:18.000000000 +0100
@@ -0,0 +1,44 @@
+.TH "pslatex" "1" "September 2000" "teTeX" "teTeX"
+.PP
+.SH "NAME"
+pslatex \- utility to typeset LaTeX files using PostScript fonts
+.PP
+.SH "SYNOPSIS"
+.PP
+\fBpslatex\fP [\fILATEXARGS\fP] \fILATEXFILE\fP[\&.tex]
+.PP
+.SH "DESCRIPTION"
+.PP
+\fBpslatex\fP allows you to typeset a LaTeX source file using basic
+Adobe Type 1 PostScript fonts (Times, Helvetica, and Courier)
+\fIwithout\fP editing the file to load the necessary packages\&.
+.PP
+It takes any arguments that \fBlatex\fP(1) can take\&.
+.PP
+.SH "OPTIONS"
+.PP
+None\&.
+.PP
+.SH "FILES"
+.PP
+Many\&. See the readme file for \fIpslatex\&.sty\fP\&.
+.PP
+.SH "SEE ALSO"
+.PP
+\fBlatex\fP(1), \fI\fITEXMF\fP/latex/pslatex/00readme\&.txt\fP
+.PP
+.SH "BUGS"
+.PP
+None known\&. Report any found to the author\&.
+.PP
+.SH "AUTHOR"
+.PP
+\fBpslatex\fP was written by David Carlisle
+\&.
+.PP
+This manual page was written by C\&.M\&. Connelly
+, for
+the Debian GNU/Linux system\&. It may be used by other distributions
+without contacting the author\&. Any mistakes or omissions in the
+manual page are my fault; inquiries about or corrections to this
+manual page should be directed to me (and not to the primary author)\&.
Files old/texmf-dist/doc/man/man1/pslatex.man1.pdf and new/texmf-dist/doc/man/man1/pslatex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pstools.doc.tlpobj new/tlpkg/tlpobj/pstools.doc.tlpobj
--- old/tlpkg/tlpobj/pstools.doc.tlpobj 2011-06-23 04:16:06.000000000 +0200
+++ new/tlpkg/tlpobj/pstools.doc.tlpobj 2013-04-09 03:40:40.000000000 +0200
@@ -1,13 +1,13 @@
name pstools.doc
category TLCore
-revision 23089
+revision 29764
shortdesc doc files of pstools
docfiles size=20
- texmf/doc/man/man1/bbox.1
- texmf/doc/man/man1/bbox.man1.pdf
- texmf/doc/man/man1/ps2eps.1
- texmf/doc/man/man1/ps2eps.man1.pdf
- texmf/doc/man/man1/ps2frag.1
- texmf/doc/man/man1/ps2frag.man1.pdf
- texmf/doc/man/man1/pslatex.1
- texmf/doc/man/man1/pslatex.man1.pdf
+ texmf-dist/doc/man/man1/bbox.1
+ texmf-dist/doc/man/man1/bbox.man1.pdf
+ texmf-dist/doc/man/man1/ps2eps.1
+ texmf-dist/doc/man/man1/ps2eps.man1.pdf
+ texmf-dist/doc/man/man1/ps2frag.1
+ texmf-dist/doc/man/man1/ps2frag.man1.pdf
+ texmf-dist/doc/man/man1/pslatex.1
+ texmf-dist/doc/man/man1/pslatex.man1.pdf
++++++ pstools.tar.xz ++++++
++++ 2002 lines of diff (skipped)
++++++ pstricks-add.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pstricks-add/Changes new/doc/generic/pstricks-add/Changes
--- old/doc/generic/pstricks-add/Changes 2011-12-11 23:40:37.000000000 +0100
+++ new/doc/generic/pstricks-add/Changes 2013-01-07 00:51:31.000000000 +0100
@@ -1,4 +1,4 @@
-%% $Id: Changes 606 2011-12-11 17:32:58Z herbert $
+%% $Id: Changes 741 2013-01-01 16:08:58Z herbert $
%%
pstricks-add.pro -----------
0.23 2009-12-17 - add RGBtoGRAY and WavelengthToGRAY
@@ -39,6 +39,11 @@
pstricks-add.tex ----------- (Dominik Rodriguez/hv)
+ v 3.60 2013-01-01 - fix bug with correct angle in \psPlotTangent
+ v 3.59 2012-09-27 - added uselinecolor option for \psChart
+ v 3.58 2012-06-04 - don't close data file
+ v 3.57 2011-12-20 - added \psparallelogrambox
+ v 3.56 2011-12-12 - added node definitions for \psTangentLine
v 3.55 2011-12-11 - fix bug in \psplotTangent for arrows and linewidth
v 3.54 2011-08-20 - new optional argument for the vee arrow line style
v 3.53 2011-08-03 - use setting of \Pst@Debug for shownode()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pstricks-add/README new/doc/generic/pstricks-add/README
--- old/doc/generic/pstricks-add/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/generic/pstricks-add/README 2013-01-07 00:51:31.000000000 +0100
@@ -0,0 +1,41 @@
+pstricks-add redefines a lot of the pstricks macros.
+#
+# Do not load another PSTricks related package after pstricks-add!!
+#
+pstricks-add collects a lot of the code which was posted
+to the pstricks mailing list and has some more new features:
+
+- pstricks
+ o random dots
+ O braces
+ o define and calculate colors on PS side
+ o Gouraud shading
+ o braces as node connection/linestyle
+ o line style bar
+ o lines, drawn "by hand"
+ o arrows, arrows, arrows, ...
+
+- pst-plot
+ o new syntax for \psplot and \psparametricplot
+ o new macro psTangentLine
+ o new macro psplotTangent
+ o new macro psplotDiffEqn
+
+- pst-node
+ o new option lineAngle for ncdiag
+ o new macros for interpolation nodes
+ and linear combination of two vectors
+ o new macro ncbarr (line with 5 segments)
+
+
+pstricks-add.pro : the prolog file for pstricks-add
+pstricks-add-doc.tex: the included doc file
+
+Save the files pstricks-add.sty|pro|tex in a directory,
+which is part of your local TeX tree. The pro file should go
+into $TEXMF/dvips/pstricks/
+Then do not forget to run texhash to update this tree.
+For more information see the documentation of your LATEX distribution
+on installing packages into your local TeX system or read the
+TeX Frequently Asked Questions:
+(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages).
Files old/doc/generic/pstricks-add/pstricks-add-doc.pdf and new/doc/generic/pstricks-add/pstricks-add-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pstricks-add/pstricks-add-doc.tex new/doc/generic/pstricks-add/pstricks-add-doc.tex
--- old/doc/generic/pstricks-add/pstricks-add-doc.tex 2011-08-23 18:24:26.000000000 +0200
+++ new/doc/generic/pstricks-add/pstricks-add-doc.tex 2012-09-29 00:44:57.000000000 +0200
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add-doc.tex 566 2011-08-20 07:19:32Z herbert $
+%% $Id: pstricks-add-doc.tex 710 2012-09-28 07:27:01Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
@@ -660,6 +660,47 @@
\end{lstlisting}
+The linecolor of the pies is by default identical to the fillcolor. If you want another line color
+for all pies then use the optional argument \Lkeyword{uselinecolor}. In this case the current
+setting of \Lkeyword{linecolor} is taken into account:
+
+
+%\begin{LTXexample}[pos=t]
+\psset{unit=1.5}
+\begin{pspicture}(-3,-3)(3,3)
+\psChart[chartSep=30pt,shadow=true,shadowsize=5pt,
+ uselinecolor,linecolor=black!20]{34.5,17.2,20.7,15.5,5.2,6.9}{6}{2}
+\psset{nodesepA=5pt,nodesepB=-10pt}
+\ncline{psChartO1}{psChart1}\nput{0}{psChartO1}{1000 (34.5\%)}
+\ncline{psChartO2}{psChart2}\nput{150}{psChartO2}{500 (17.2\%)}
+\ncline{psChartO3}{psChart3}\nput{-90}{psChartO3}{600 (20.7\%)}
+\ncline{psChartO4}{psChart4}\nput{0}{psChartO4}{450 (15.5\%)}
+\ncline{psChartO5}{psChart5}\nput{0}{psChartO5}{150 (5.2\%)}
+\ncline{psChartO6}{psChart6}\nput{0}{psChartO6}{200 (6.9\%)}
+\bfseries\color{white}%
+\rput(psChartI1){Taxes}\rput(psChartI2){Rent}\rput(psChartI3){Bills}
+\rput(psChartI4){Car}\rput(psChartI5){Gas}\rput(psChartI6){Food}
+\end{pspicture}
+%\end{LTXexample}
+\psset{unit=1cm}
+
+\begin{lstlisting}
+\psset{unit=1.5}
+\begin{pspicture}(-3,-3)(3,3)
+\psChart[chartSep=30pt,shadow=true,shadowsize=5pt,
+ uselinecolor,linecolor=black!20]{34.5,17.2,20.7,15.5,5.2,6.9}{6}{2}
+\psset{nodesepA=5pt,nodesepB=-10pt}
+\ncline{psChartO1}{psChart1}\nput{0}{psChartO1}{1000 (34.5\%)}
+\ncline{psChartO2}{psChart2}\nput{150}{psChartO2}{500 (17.2\%)}
+\ncline{psChartO3}{psChart3}\nput{-90}{psChartO3}{600 (20.7\%)}
+\ncline{psChartO4}{psChart4}\nput{0}{psChartO4}{450 (15.5\%)}
+\ncline{psChartO5}{psChart5}\nput{0}{psChartO5}{150 (5.2\%)}
+\ncline{psChartO6}{psChart6}\nput{0}{psChartO6}{200 (6.9\%)}
+\bfseries\color{white}%
+\rput(psChartI1){Taxes}\rput(psChartI2){Rent}\rput(psChartI3){Bills}
+\rput(psChartI4){Car}\rput(psChartI5){Gas}\rput(psChartI6){Food}
+\end{pspicture}
+\end{lstlisting}
\clearpage
%--------------------------------------------------------------------------------------
@@ -1577,6 +1618,21 @@
\end{pspicture}
\end{LTXexample}
+
+The end points are saved as nodes \verb=OCurve=, \verb=ETangent=, and \verb=ENormal=. They can
+be used in the default ways for nodes:
+
+\begin{LTXexample}[pos=t,preset=\centering,wide]
+\psset{unit=4,arrowscale=2}
+\begin{pspicture}(0.1,-0.1)(4,1)
+\pscurve[showpoints=true](2.1,-0.2)(2.5,0.2)(3.2,0.4)(3.8,-0.2)
+\psTangentLine[Tnormal,arrows=->,linecolor=red](2.5,0.2)(3.2,0.4)(3.8,-0.2){3.5}{0.5}
+\psTangentLine[arrows=->,linecolor=blue](2.5,0.2)(3.2,0.4)(3.8,-0.2){3.5}{0.5}
+\pcline[linestyle=dashed]{->}(OCurve)(ETangent|OCurve)\naput{$v_x$}
+\pcline[linestyle=dashed]{->}(ETangent|OCurve)(ETangent)\naput{$v_y$}% double coordinate (x,y|x,y)
+\end{pspicture}
+\end{LTXexample}
+
\subsection{\nxLcs{psplotTangent} and option \nxLkeyword{Tnormal}}
%--------------------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pstricks-add.doc.tlpobj new/tlpkg/tlpobj/pstricks-add.doc.tlpobj
--- old/tlpkg/tlpobj/pstricks-add.doc.tlpobj 2011-12-12 04:30:40.000000000 +0100
+++ new/tlpkg/tlpobj/pstricks-add.doc.tlpobj 2013-01-07 04:35:01.000000000 +0100
@@ -1,10 +1,11 @@
name pstricks-add.doc
category Package
-revision 24826
+revision 28750
shortdesc doc files of pstricks-add
relocated 1
-docfiles size=717
+docfiles size=723
RELOC/doc/generic/pstricks-add/Changes
+ RELOC/doc/generic/pstricks-add/README
RELOC/doc/generic/pstricks-add/pstricks-add-doc.bib
RELOC/doc/generic/pstricks-add/pstricks-add-doc.dat
RELOC/doc/generic/pstricks-add/pstricks-add-doc.pdf
++++++ pstricks-add.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pstricks-add/pstricks-add.pro new/dvips/pstricks-add/pstricks-add.pro
--- old/dvips/pstricks-add/pstricks-add.pro 2010-06-12 02:11:41.000000000 +0200
+++ new/dvips/pstricks-add/pstricks-add.pro 2012-09-29 00:44:57.000000000 +0200
@@ -1,5 +1,7 @@
-%% $Id: pstricks-add.pro 328 2010-05-24 15:56:43Z herbert $
+%% $Id: pstricks-add.pro 692 2012-06-04 06:47:40Z herbert $
+%%
% PostScript prologue for pstricks-add.tex.
+%
% Version 0.23, 2009/12/17
%
/tx@addDict 410 dict def tx@addDict begin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pstricks-add/pstricks-add.tex new/tex/generic/pstricks-add/pstricks-add.tex
--- old/tex/generic/pstricks-add/pstricks-add.tex 2011-12-11 23:40:37.000000000 +0100
+++ new/tex/generic/pstricks-add/pstricks-add.tex 2013-01-07 00:51:31.000000000 +0100
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add.tex 606 2011-12-11 17:32:58Z herbert $
+%% $Id: pstricks-add.tex 741 2013-01-01 16:08:58Z herbert $
%%
%%
%% This is file `pstricks-add.tex',
@@ -31,8 +31,8 @@
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
\ifx\PSTmathLoaded\endinput\else \input pst-math \fi
%
-\def\fileversion{3.55}
-\def\filedate{2011/12/11}
+\def\fileversion{3.60}
+\def\filedate{2013/01/01}
\message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -218,6 +218,127 @@
exch \tx@UserCoor ){#3}
\end@SpecialObj}
%
+\def\psBrace{\def\pst@par{}\pst@object{psBrace}}
+\def\psBrace@i(#1)(#2){%
+ \begin@ClosedObj
+ \if@star\def\pst@tempC{true }\else\def\pst@tempC{false }\fi
+% \ifx\psk@rot\empty\def\psk@@rot{0}\else\let\psk@@rot\psk@rot\fi
+% \def\psk@rot{Alpha \psk@@rot\space add 90 sub}%
+ \pst@getcoor{#1}\pst@tempA
+ \pst@getcoor{#2}\pst@tempB
+ \addto@pscode{
+ /ifStar \pst@tempC def
+ /radius1 \psk@braceWidthOuter def
+ /radius2 \psk@braceWidthInner def
+ /Alpha \pst@tempA \pst@tempB 3 -1 roll sub 3 1 roll exch sub atan def
+% gsave STV CP T /ps@rot \psk@rot\space def grestore
+ /Length \pst@tempA \pst@tempB Pyth2 def
+ /Left { Length \psk@bracePos\space mul } bind def
+ /Right { Length Left sub } bind def
+ /Width \psk@braceWidth def
+ /pop4 { pop pop pop pop } def
+ [ Alpha cos Alpha sin Alpha sin neg Alpha cos \pst@tempA ] concat
+ 0 0 moveto
+ 0 radius2 neg radius2 radius2 neg radius2 arcto pop4
+ Left radius2 sub radius1 sub 0 rlineto
+ Left radius2 neg Left radius2 radius1 add neg radius1 arcto pop4
+ currentpoint /y@Label ED /x@Label ED
+ Left radius2 neg Left radius1 add radius2 neg radius1 arcto pop4
+ Right radius2 sub radius1 sub 0 rlineto
+ Length radius2 neg Length 0 radius2 arcto pop4
+% 0 Width neg rlineto
+ Length radius2 Width add neg Length radius2 sub radius2 Width add neg radius2 arcto pop4
+ Right radius2 sub radius1 sub neg 0 rlineto
+ Left radius1 add Width radius1 add radius2 add neg radius1 90 180 arc
+ Left radius1 sub Width radius1 add radius2 add neg radius1 0 90 arc
+ Left radius2 sub radius1 sub neg 0 rlineto
+ radius2 Width neg radius2 270 180 arcn
+ 0 0 lineto }
+ \end@ClosedObj
+ \ignorespaces}
+%
+\newdimen\psparallelogramsep
+\define@key[psset]{pstricks-add}{parallelogramsep}[3mm]{\pssetlength\psparallelogramsep{#1}}
+\psset[pstricks-add]{parallelogramsep=3mm}
+%
+\def\psparallelogrambox{\pst@object{psparallelogrambox}}
+\def\psparallelogrambox@i{\pst@makebox\psparallelogrambox@ii}
+\def\psparallelogrambox@ii{%
+ \begingroup
+ \pst@useboxpar
+ \pst@dima=\pslinewidth
+ \advance\pst@dima by \psframesep
+ \pst@dimc=\wd\pst@hbox\advance\pst@dimc by \pst@dima
+ \pst@dimb=\dp\pst@hbox\advance\pst@dimb by \pst@dima
+ \pst@dimd=\ht\pst@hbox\advance\pst@dimd by \pst@dima
+% Dirk Osburg modification begin - Jul. 16, 2011
+ \divide\psparallelogramsep by 2
+ \advance\pst@dima by \psparallelogramsep
+ \advance\pst@dimc by \psparallelogramsep
+% Dirk Osburg modification end
+ \setbox\pst@hbox=\hbox{%
+ \ifpsboxsep\kern\pst@dima\fi
+ \begin@ClosedObj
+ \addto@pscode{%
+ \psk@cornersize
+ \pst@number\pst@dima neg % left
+ \pst@number\pst@dimb neg % lower
+ \pst@number\pst@dimc % right
+ \pst@number\pst@dimd % upper
+ .5
+% D.G. modification begin - Nov. 28, 2001
+%\tx@Frame}%
+ \pst@number\psparallelogramsep
+ \tx@Parallelogram}%
+% D.G. modification end
+
+ \def\pst@linetype{2}%
+ \showpointsfalse
+ \end@ClosedObj
+ \box\pst@hbox
+ \ifpsboxsep\kern\pst@dima\fi%
+ }%
+ \ifpsboxsep\dp\pst@hbox=\pst@dimb\ht\pst@hbox=\pst@dimd\fi
+ \leavevmode\box\pst@hbox
+ \endgroup%
+}
+
+% From the Frame and Rect PostScript macros
+\pst@def{Parallelogram}<{%
+ /ParallelogramA {
+% Dirk Osburg modification begin - Jul. 16, 2011
+%%%% old stuff: %%%
+%x1 pgs sub y1 moveto
+%x1 y2 lineto
+%x2 pgs add y2 lineto
+%x2 y1 lineto
+%x1 pgs sub y1 lineto
+%%%% replaced by: %%%
+ x1 pgs sub y1 moveto
+ x1 pgs add y2 lineto
+ x2 pgs add y2 lineto
+ x2 pgs sub y1 lineto
+ x1 pgs sub y1 lineto
+% Dirk Osburg modification end
+ closepath} def
+%
+/pgs ED
+CLW mul
+/a ED
+3 -1 roll
+2 copy gt { exch } if
+a sub
+/y2 ED
+a add
+/y1 ED
+2 copy gt { exch } if
+a sub
+/x2 ED
+a add
+/x1 ED
+1 index 0 eq {pop pop ParallelogramA } { OvalFrame } ifelse}>
+%
+%
% -------------- the arrow part -------------
% the original table
% \def\pst@arrowtable{,<->,<<->>,>-<,>>-<<,(-),[-],)-(,]-[,|>-<|}
@@ -1272,8 +1393,46 @@
/Lineto /lineto load def
\ifshowpoints true \else false \fi
\tx@setlinejoin %
- \tx@Line }%
- \end@OpenObj\ignorespaces}
+ \tx@Line
+ }%
+ \end@OpenObj%
+ \pnode(!
+ [[#1 dup dup mul exch 1 #2][#3 dup dup mul exch 1 #4][#5 dup dup mul exch 1 #6]]
+ SolveLinEqSystem /abc ED
+ abc aload pop % a b c on stack
+ exch #7 % a c b x
+ mul add exch % c+b*x a
+ #7 dup mul mul add % a*x^2+b*x+c
+ /y0 ED % save value
+ #7 y0 ){OCurve}%
+ \pnode(!
+ [[#1 dup dup mul exch 1 #2][#3 dup dup mul exch 1 #4][#5 dup dup mul exch 1 #6]]
+ SolveLinEqSystem /abc ED
+ abc aload pop % a b c on stack
+ exch #7 % a c b x
+ mul add exch % c+b*x a
+ #7 dup mul mul add % a*x^2+b*x+c
+ /y0 ED % save value
+ abc aload pop pop exch % b a
+ #7 mul 2 mul add % b+2*a*x0=mTan
+ neg 1 exch div % -1/mTan=mOrth
+ #8 mul /dy ED % mOrth*dx=dy
+ #7 #8 add y0 dy add % x0+dx y0 +dy
+ ){ENormal}%
+ \pnode(!
+ [[#1 dup dup mul exch 1 #2][#3 dup dup mul exch 1 #4][#5 dup dup mul exch 1 #6]]
+ SolveLinEqSystem
+ /abc ED
+ abc aload pop % a b c on stack
+ exch #7 % a c b x
+ mul add exch % c+b*x a
+ #7 dup mul mul add % a*x^2+b*x+c
+ /y0 ED % save value
+ abc aload pop pop exch % b a
+ #7 mul 2 mul add % b+2*a*x0=mTan
+ #8 mul /dy1 ED % mTan*dx
+ #7 #8 add y0 dy1 add ){ETangent}%
+\ignorespaces}
\def\psplotTangent@x#1,#2,#3\@nil{%
\def\pst@tempLeft{#1}%
@@ -1285,12 +1444,12 @@
\def\psplotTangent@i*{\@ifnextchar[{\psplotTangent@ii}{\psplotTangent@ii[]}}
\def\psplotTangent@ii[#1]#2#3#4{%
\pst@killglue%
- \expandafter\psplotTangent@x#3,,\@nil\relax
+ \expandafter\psplotTangent@x#3,,\@nil\relax%
\begingroup%
- \ifx\relax#1\relax\else\psset{linestyle=solid,#1}\fi
+ \ifx\relax#1\relax\else\psset{linestyle=solid,#1}\fi%
\ifx\psk@Derive\@empty\ifPst@algebraic\def\psk@Derive{NOT@EMPTY}\fi\fi%%dr 0606 hv 1003
- \pst@addarrowdef
- \addto@pscode{
+ \pst@addarrowdef%
+ \addto@pscode{%
/F@pstplot \ifPst@algebraic (#4) tx@addDict begin AlgParser end cvx \else { #4 } \fi def % define function
\ifx\psk@Derive\@empty\else
\ifx\psk@Derive\@NOTEMPTY\else%%dr 0606
@@ -1305,11 +1464,11 @@
{ /y ED /x ED /@parametric true def } % if yes, then we have 2 values%%dr 0606
{ \ifPst@polarplot x \ifPst@algebraic RadtoDeg \fi PtoC /y ED /x ED \else /y ED \fi } ifelse
cleartomark
- \ifx\psk@Derive\@NOTEMPTY%%begin dr 0606
+ \ifx\psk@Derive\@NOTEMPTY %%begin dr 0606
%% algebraic we can use the derivative machine
/FDer@pstplot (#4) @parametric { (t) } { (x) } ifelse
tx@Derive begin Derive end tx@addDict begin AlgParser end cvx def
- \fi%%end dr 0606
+ \fi %%end dr 0606
x \pst@number\psxunit mul y \pst@number\psyunit mul
translate % define the temporary origin
% now we calculate the slope of the tangent
@@ -1352,7 +1511,8 @@
y \pst@number\psyunit mul x \pst@number\psxunit mul Atan \ifPST@Tnormal 90 add \fi
% y ATAN1 % we have the slope angle of the tangent. ATAN is defined int the pstricks.pro, patch 6
\fi
- cvi 180 mod dup 90 gt { 180 sub } if % -90 <= angle <= 90
+ dup % to prevent rounding errors use original value
+ cvi 180 mod 90 gt { 180 sub } if % -90 <= angle <= 90
rotate % rotate, depending to the origin
/Lineto /lineto load def % the pro file needs /Lineto
\pst@cp % kill the currentpoint, if any
@@ -1385,7 +1545,7 @@
grestore
\fi
}%
- \use@pscode
+ \use@pscode%
\endgroup%
\@starfalse%
\ignorespaces}
@@ -1588,7 +1748,6 @@
20 string cvs Pst@data exch writestring
Pst@data (\space) writestring
20 string cvs Pst@data exch writestring
-% Pst@data (\string\]) writestring
Pst@data (\string\n) writestring
\fi
} def
@@ -1597,7 +1756,7 @@
\@pstfalse
\@nameuse{testqp@\psplotstyle}%
\if@pst\psplot@ii\else\psplot@iii\fi
- \addto@pscode{\ifPst@saveData Pst@data closefile \fi}
+% \addto@pscode{\ifPst@saveData Pst@data closefile \fi}
\endgroup%
\ignorespaces%
}
@@ -1745,6 +1904,9 @@
\psset[pstricks-add]{chartSep=10pt,chartStack=0,chartStackDepth=2cm,chartStackWidth=2cm,%
chartHeight=5mm}
%
+\define@boolkey[psset]{pstricks-add}[Pst@]{uselinecolor}[true]{}
+\psset[pstricks-add]{uselinecolor=false}
+%
\define@key[psset]{pstricks-add}{userColor}{%
\chart@Toggle=0\relax%
\def\chart@option{#1}%
@@ -1838,9 +2000,14 @@
\if$\psk@chartSepValues$\else%
\psForeach{\chart@tempC}{\psk@chartSepValues}{\ifnum\chart@tempC=\the\pst@cnta\relax\global\@chartSeptrue\fi}%
\fi%
- \if@chartSep%
- \pswedge[linecolor={chartFillColor\the\pst@cnta},fillstyle=solid,fillcolor={chartFillColor\the\pst@cnta}]%
- (\psk@chartSep\p@;\pst@number\pst@dimo){\pst@chartRadius}{\pst@number\pst@dimn}{\pst@number\pst@dimm}%
+ \if@chartSep
+ \ifPst@uselinecolor
+ \pswedge[linecolor=\pslinecolor,fillstyle=solid,fillcolor={chartFillColor\the\pst@cnta}]%
+ (\psk@chartSep\p@;\pst@number\pst@dimo){\pst@chartRadius}{\pst@number\pst@dimn}{\pst@number\pst@dimm}%
+ \else
+ \pswedge[linecolor={chartFillColor\the\pst@cnta},fillstyle=solid,fillcolor={chartFillColor\the\pst@cnta}]%
+ (\psk@chartSep\p@;\pst@number\pst@dimo){\pst@chartRadius}{\pst@number\pst@dimn}{\pst@number\pst@dimm}%
+ \fi
\pst@dima=\pst@chartRadius\advance\pst@dima by \psk@chartSep\p@%
\pnode(\pst@dima;\pst@number\pst@dimo){psChart\the\pst@cnta}%
\pst@dimb=\psk@chartNodeI\pst@dima%
@@ -1848,8 +2015,13 @@
\pnode(\pst@dimb;\pst@number\pst@dimo){psChartI\the\pst@cnta}%
\pnode(\pst@dimc;\pst@number\pst@dimo){psChartO\the\pst@cnta}%
\else%
- \pswedge[linecolor={chartFillColor\the\pst@cnta},fillstyle=solid,fillcolor={chartFillColor\the\pst@cnta}](0,0)%
- {\pst@chartRadius}{\pst@number\pst@dimn}{\pst@number\pst@dimm}%
+ \ifPst@uselinecolor
+ \pswedge[linecolor=\pslinecolor,fillstyle=solid,fillcolor={chartFillColor\the\pst@cnta}](0,0)%
+ {\pst@chartRadius}{\pst@number\pst@dimn}{\pst@number\pst@dimm}%
+ \else
+ \pswedge[linecolor={chartFillColor\the\pst@cnta},fillstyle=solid,fillcolor={chartFillColor\the\pst@cnta}](0,0)%
+ {\pst@chartRadius}{\pst@number\pst@dimn}{\pst@number\pst@dimm}%
+ \fi
\pnode(\pst@chartRadius;\pst@number\pst@dimo){psChart\the\pst@cnta}%
\pst@dima=\pst@chartRadius%
\pst@dimb=\psk@chartNodeI\pst@dima%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pstricks-add.tlpobj new/tlpkg/tlpobj/pstricks-add.tlpobj
--- old/tlpkg/tlpobj/pstricks-add.tlpobj 2011-12-12 04:30:42.000000000 +0100
+++ new/tlpkg/tlpobj/pstricks-add.tlpobj 2013-01-07 04:35:03.000000000 +0100
@@ -1,6 +1,6 @@
name pstricks-add
category Package
-revision 24826
+revision 28750
shortdesc A collection of add-ons and bugfixes for PSTricks.
relocated 1
longdesc Collects together examples that have been posted to the
@@ -13,11 +13,11 @@
longdesc differential equationd; - box plots; - matrix plots; and - pie
longdesc charts. The package makes use of PostScript routines provided
longdesc by pst-math.
-runfiles size=24
+runfiles size=26
RELOC/dvips/pstricks-add/pstricks-add.pro
RELOC/tex/generic/pstricks-add/pstricks-add.tex
RELOC/tex/latex/pstricks-add/pstricks-add.sty
catalogue-ctan /graphics/pstricks/contrib/pstricks-add
-catalogue-date 2011-12-11 19:04:10 +0100
+catalogue-date 2012-09-28 14:00:56 +0200
catalogue-license lppl
-catalogue-version 3.55
+catalogue-version 3.59
++++++ pstricks-examples-en.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pstricks-examples-en.doc.tlpobj new/tlpkg/tlpobj/pstricks-examples-en.doc.tlpobj
--- old/tlpkg/tlpobj/pstricks-examples-en.doc.tlpobj 2011-10-15 04:26:43.000000000 +0200
+++ new/tlpkg/tlpobj/pstricks-examples-en.doc.tlpobj 2013-03-12 04:38:54.000000000 +0100
@@ -1,6 +1,6 @@
name pstricks-examples-en.doc
category Package
-revision 24289
+revision 29349
shortdesc doc files of pstricks-examples-en
relocated 1
docfiles size=2651
++++++ pstricks.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-p/pstricks.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-p.new/pstricks.doc.tar.xz differ: char 26, line 1
++++++ pstricks.tar.xz ++++++
++++ 1912 lines of diff (skipped)
++++++ ptex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/mendex.1 new/texmf/doc/man/man1/mendex.1
--- old/texmf/doc/man/man1/mendex.1 2011-06-22 17:33:05.000000000 +0200
+++ new/texmf/doc/man/man1/mendex.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,496 +0,0 @@
-.if t .ds TX "T\h'-.15m'\v'.2v'E\v'-.2v'\h'-.12m'X
-.if t .ds LX L\v'-.22m'a\v'.22m'T\h'-.1667m'\v'.22m'E\h'-.125m'\v'-.22m'X
-.TH MENDEX L
-.SH ̾��
-mendex \- ���������ġ���
-.SH ����ˡ
-\fBmendex\fR [-ilqrcg] [\fB-s\fI sty\fR] [\fB-d\fI dic\fR] [\fB-o\fI ind\fR] [\fB-d\fI dic\fR] [\fB-t\fI log\fR] [\fB-p\fI no\fR] [\fI idx0 idx1 idx2 ...\fR]
-.SH ����
-.PP
-\fImendex\fR ��ʸ��κ������������ġ���Ǥ��� LaTeX �ˤ����Ф��줿�����ꥹ�ȥե�����(\fI.idx\fR)���¤��ؤ����ºݤκ����Υ������ե�����η����������ޤ��� \fImakeindex\fR �ȸߴ��������ꡢ����ˡ��ɤߡפΰ����μ�֤餹�褦���ü첽����Ƥ��ޤ���
-.RE
-���Ϥ��������η����ϡ���������ե�����˽��äƷ��ꤵ��ޤ����ޤ�������ե������Ϳ���뤳�Ȥˤ�ꡢ������νϸ���ɤߤ���Ͽ����ޤ���
-.RE
-�����γ��ؤϣ��ʳ��ޤǺ������뤳�Ȥ��Ǥ��ޤ���
-.SH ���ץ����
-.PP
-.TP 10
-\fB-i\fR
-�����ꥹ�ȥե����뤬���ꤵ��Ƥ�����Ǥ⡢ɸ�����Ϥ�����ꥹ�ȤȤ��ƻ��Ѥ��ޤ���
-.TP 10
-\fB-l\fR
-�����Υ����Ȥ�ʸ����ǹԤ��ޤ������ꤵ��ʤ����ñ���Υ����Ȥˤʤ�ޤ�(��������ˡ�ˤĤ��Ƥϸ��)��
-.TP 10
-\fB-q\fR
-�Žͥ⡼�ɤǤ������顼����ӷٹ�ʳ���ɸ�२�顼���Ϥ˽��Ϥ��ޤ���
-.TP 10
-\fB-r\fR
-�ڡ����ϰ�ɽ����̵���ˤ��ޤ������ꤷ�ʤ��ȡ�Ϣ³���ƽФƤ�������ˤĤ��Ƥ� "1--5" �Τ褦�˥ڡ����ϰϤ�ɽ������ޤ���
-.TP 10
-\fB-c\fR
-���ڡ����䥿�֤Ȥ��ä��֥��û�̤��ơ����٤ƣ��Ĥ�Ⱦ�ѥ��ڡ����ˤ��ޤ����ޤ�������Υ֥�Ϻ������ޤ���
-.TP 10
-\fB-g\fR
-���ܸ��Ƭʸ���ζ��ڤ�� "����������������" �ˤ��ޤ������ꤷ�ʤ��� "������������������" �ˤʤ�ޤ���
-.TP 10
-\fB-f\fR
-����ե�����ˤʤ��������Ū�˽��Ϥ���⡼�ɤǤ���
-.TP 10
-\fB-s\fI sty\fR
-\fIsty\fR �ե����������ե�����ȸ��ʤ��ޤ�����������ե��������ꤷ�ʤ���С��ǥե���Ȥκ��������Ǻ������ޤ���
-.TP 10
-\fB-d\fI dic\fR
-\fIdic\fR �ե������ե�����ȸ��ʤ��ޤ�������ե���������ܸ�� <\fI�ϸ�\fR\ \fI�ɤ�\fR> �Υꥹ�Ȥǹ�������ޤ���
-.TP 10
-\fB-o\fI ind\fR
-\fIind\fR �ե��������ϥե�����ȸ��ʤ��ޤ������꤬�ʤ����Ϻǽ�����ϥե�����γ�ĥ�Ҥ�.ind�Ȥ�����Ρ����ϥե����뤬ɸ�����ϤΤߤǤ����ɸ����Ϥ˽��Ϥ��ޤ���
-.TP 10
-\fB-t\fI log\fR
-\fIlog\fR �ե����������ե�����ȸ��ʤ��ޤ������꤬�ʤ����Ϻǽ�����ϥե�����γ�ĥ�Ҥ�.ilg�Ȥ�����Ρ����ϥե����뤬ɸ�����ϤΤߤǤ����ɸ�२�顼���ϤΤߤ˽��Ϥ���ޤ���
-.TP 10
-\fB-p\fI no\fR
-\fIno\fR ������ڡ�������Ƭ�ڡ����Ȥ��ƻ��ꤷ�ޤ����ޤ���TeX��.log �ե�����Ȥ��뤳�Ȥˤ�� \fIany\fR(�ǽ��ڡ����μ��Υڡ�������)��\fIodd\fR(�ǽ��ڡ����μ��δ���ڡ�������)��\fIeven\fR(�ǽ��ڡ����μ��ζ����ڡ�������)�Ȥ��ä�����λ������ǽ�Ǥ���
-.TP 10
-\fB-E\fR
-���������ɤ�EUC�˻��ꤷ�ޤ������ϥե����롢���ϥե�����Ȥ�EUC�Ȥ��ư����ޤ���
-.TP 10
-\fB-J\fR
-���������ɤ�JIS�˻��ꤷ�ޤ������ϥե����롢���ϥե�����Ȥ�JIS�Ȥ��ư����ޤ���
-.TP 10
-\fB-S\fR
-���������ɤ�ShiftJIS�˻��ꤷ�ޤ������ϥե����롢���ϥե�����Ȥ�ShiftJIS�Ȥ��ư����ޤ���
-.TP 10
-\fB-U\fR
-���������ɤ�UTF-8�˻��ꤷ�ޤ������ϥե����롢���ϥե�����Ȥ�UTF-8�Ȥ��ư����ޤ���
-
-
-.SH ��������ե�����
-��������ե������ makeindex �Τ�ΤȾ�̸ߴ��Ǥ��� ������ <\fI��������ѥ���\fR\ \fI����\fR> �Υꥹ�Ȥǹ�������ޤ����ѥ����ν���ϼ�ͳ�Ǥ���
-�ʲ��˥�������ѥ����ΰ������ޤ���
-`%'�ʹߤϥ����Ȥȸ��ʤ���ޤ���
-.PP
-\fB ���ϥե����륹������ѥ���\fR
-.TP 30
-\fBkeyword\fR <ʸ����>
-"\\\\indexentry"
-.RS
-��������ȥ������Ȥ��ƻ��ĥ��ޥ�ɡ�
-.RE
-.TP 30
-\fBarg_open\fR <ʸ��>
-\'{\'
-.RS
-��������ȥ�ʸ���Ϥ�ɽ��ʸ����
-.RE
-.TP 30
-\fBarg_close\fR <ʸ��>
-\'}\'
-.RS
-��������ȥ�ʸ����λ��ɽ��ʸ����
-.RE
-.TP 30
-\fBrange_open\fR <ʸ��>
-\'(\'
-.RS
-�ڡ����ϰϤγ��Ϥ�ʸ����
-.RE
-.TP 30
-\fBrange_close\fR <ʸ��>
-\')\'
-.RS
-�ڡ����ϰϤν�λ��ʸ����
-.RE
-.TP 30
-\fBlevel\fR <ʸ��>
-\'!\'
-.RS
-��°��٥�Ǥ��뤳�Ȥ�ʸ����
-.RE
-.TP 30
-\fBactual\fR <ʸ��>
-\'@\'
-.RS
-���Υ���ܥ��³��ʸ���ºݤκ���ʸ����Ȥ��ƽ��ϥե�����˽�롣
-.RE
-.TP 30
-\fBencap\fR <ʸ��>
-\'|\'
-.RS
-���Υ���ܥ��³��ʸ�����ڡ����ֹ���դ����ޥ��̾�Ȥ��ƻȤ��롣
-.RE
-.TP 30
-\fBpage_compositor\fR <ʸ����>
-"-"
-.RS
-���ز����줿�ڡ����ֹ�ˤ����볬�ش֤ζ��ڤ�ʸ����
-.RE
-.TP 30
-\fBpage_precedence\fR <ʸ����>
-"rnaRA"
-.RS
-�ڡ����ֹ�ε�ˡ��ͥ���̡�\'R\'�����\'r\'�ϥ���������\'n\'�ϥ���ӥ�������\'A\'�����\'a\'�ϥ���ե��٥åȤˤ�뵭ˡ��ɽ����
-.RE
-.TP 30
-\fBquote\fR <ʸ��>
-\'"\'
-.RS
-mendex�Υѥ���ʸ�����Ф��륨�������ץ���饯����
-.RE
-.TP 30
-\fBescape\fR <ʸ��>
-\'\\\\\'
-.RS
-����Ū��ʸ�����Ф��륨�������ץ���饯����
-.RE
-
-\fB ���ϥե����륹������ѥ���\fR
-
-\fBpreamble\fR <ʸ����>
-"\\\\begin{theindex}\\n"
-.RS
-���ϥե������ʸ����
-.RE
-.TP 30
-\fBpostamble\fR <ʸ����>
-"\\n\\n\\\\end{theindex}\\n"
-.RS
-���ϥե������������ʸ����
-.RE
-.TP 30
-\fBsetpage_prefix\fR <ʸ����>
-"\\n \\\\setcounter{page}{"
-.RS
-���ϥڡ��������ꤹ��Ȥ��Ρ��ڡ����ֹ�������դ���ʸ����
-.RE
-.TP 30
-\fBsetpage_suffix\fR <ʸ����>
-"}\\n"
-.RS
-���ϥڡ��������ꤹ��Ȥ��Ρ��ڡ����ֹ�θ���դ���ʸ����
-.RE
-.TP 30
-\fBgroup_skip\fR <ʸ����>
-"\\n\\n \\\\indexsapce\\n"
-.RS
-������(Ƭʸ��)��������������ĥ��ڡ�����ɽ��ʸ����
-.RE
-.TP 30
-\fBlethead_prefix\fR <ʸ����>
-""
-.RS
-Ƭʸ���������դ��륳�ޥ��ʸ����
-.RE
-.TP 30
-\fBheading_prefix\fR <ʸ����>
-""
-.RS
-lethead_prefix��Ʊ����
-.RE
-.TP 30
-\fBlethead_suffix\fR <ʸ����>
-""
-.RS
-Ƭʸ���θ���դ��륳�ޥ��ʸ����
-.RE
-.TP 30
-\fBheading_suffix\fR <ʸ����>
-""
-.RS
-lethead_suffix��Ʊ����
-.RE
-.TP 30
-\fBlethead_flag\fR <ʸ����>
-0
-.RS
-Ƭʸ���ν��ϤΥե饰��0�ΤȤ����Ϥ��ʤ���0����礭���Ȥ��ϱѻ�����ʸ���ǡ�0��꾮�����Ȥ��Ͼ�ʸ���ǽ��Ϥ��롣
-.RE
-.TP 30
-\fBheading_flag\fR <ʸ����>
-0
-.RS
-lethead_flag��Ʊ����
-.RE
-.TP 30
-\fBitem_0\fR <ʸ����>
-"\\n \\\\item "
-.RS
-�票��ȥ�֤��������륳�ޥ�ɡ�
-.RE
-.TP 30
-\fBitem_1\fR <ʸ����>
-"\\n \\\\subitem "
-.RS
-���֥���ȥ�֤��������륳�ޥ�ɡ�
-.RE
-.TP 30
-\fBitem_2\fR <ʸ����>
-"\\n \\\\subsubitem "
-.RS
-���֥��֥���ȥ�֤��������륳�ޥ�ɡ�
-.RE
-.TP 30
-\fBitem_01\fR <ʸ����>
-"\\n \\\\subitem "
-.RS
-������֥���ȥ�֤��������륳�ޥ�ɡ�
-.RE
-.TP 30
-\fBitem_x1\fR <ʸ����>
-"\\n \\\\subitem "
-.RS
-������֥���ȥ�֤��������륳�ޥ�ɡ�(�票��ȥ�˥ڡ����ֹ椬�ʤ��Ȥ�)
-.RE
-.TP 30
-\fBitem_12\fR <ʸ����>
-"\\n \\\\subsubitem "
-.RS
-���֡����֥��֥���ȥ�֤��������륳�ޥ�ɡ�
-.RE
-.TP 30
-\fBitem_x2\fR <ʸ����>
-"\\n \\\\subsubitem "
-.RS
-���֡����֥��֥���ȥ�֤��������륳�ޥ�ɡ�(���֥���ȥ�˥ڡ����ֹ椬�ʤ��Ȥ�)
-.RE
-.TP 30
-\fBdelim_0\fR <ʸ����>
-", "
-.RS
-�票��ȥ�Ⱥǽ�Υڡ����ֹ�δ֤ζ��ڤ�ʸ����
-.RE
-.TP 30
-\fBdelim_1\fR <ʸ����>
-", "
-.RS
-���֥���ȥ�Ⱥǽ�Υڡ����ֹ�δ֤ζ��ڤ�ʸ����
-.RE
-.TP 30
-\fBdelim_2\fR <ʸ����>
-", "
-.RS
-���֥��֥���ȥ�Ⱥǽ�Υڡ����ֹ�δ֤ζ��ڤ�ʸ����
-.RE
-.TP 30
-\fBdelim_n\fR <ʸ����>
-", "
-.RS
-�ڡ����ֹ�֤ζ��ڤ�ʸ���ɤΥ���ȥ��٥�ˤⶦ�̡�
-.RE
-.TP 30
-\fBdelim_r\fR <ʸ����>
-"--"
-.RS
-�ڡ����ϰϤ��Ȥ��Ρ��ڡ����ֹ�֤ζ��ڤ�ʸ����
-.RE
-.TP 30
-\fBdelim_t\fR <ʸ����>
-""
-.RS
-�ڡ����ֹ�Υꥹ�Ȥν�ü�˽��Ϥ���ʸ����
-.RE
-.TP 30
-\fBsuffix_2p\fR <ʸ����>
-""
-.RS
-�ڡ����ֹ椬2�ڡ���Ϣ³������ˡ�delim_n ��2�ڡ����ܤ��ֹ��������ղä���ʸ����
-.RE
-ʸ�����������Ƥ�����ˤΤ�ͭ����
-.RE
-.TP 30
-\fBsuffix_3p\fR <ʸ����>
-""
-.RS
-�ڡ����ֹ椬3�ڡ���Ϣ³������ˡ�delim_r ��3�ڡ����ܤ��ֹ��������ղä���ʸ����suffix_mp ���ͥ�褵��롣
-.RE
-ʸ�����������Ƥ�����ˤΤ�ͭ����
-.RE
-.TP 30
-\fBsuffix_mp\fR <ʸ����>
-""
-.RS
-�ڡ����ֹ椬3�ڡ����ޤ��Ϥ���ʾ�Ϣ³������ˡ�delim_r �������Υڡ����ֹ��������ղä���ʸ����
-.RE
-ʸ�����������Ƥ�����ˤΤ�ͭ����
-.RE
-.TP 30
-\fBencap_prefix\fR <ʸ����>
-"\\\\"
-.RS
-�ڡ����ֹ�˥��ޥ�ɤ��դ���Ȥ��Ρ����ޥ��̾�������դ���ʸ����
-.RE
-.TP 30
-\fBencap_infix\fR <ʸ����>
-"{"
-.RS
-�ڡ����ֹ�˥��ޥ�ɤ��դ���Ȥ��Ρ��ڡ����ֹ�������դ���ʸ����
-.RE
-.TP 30
-\fBencap_suffix\fR <ʸ����>
-"}".
-.RS
-�ڡ����ֹ�˥��ޥ�ɤ��դ���Ȥ��Ρ��ڡ����ֹ�θ���դ���ʸ����
-.RE
-.TP 30
-\fBline_max\fR <����>
-72
-.RS
-���Ԥκ���ʸ�����������Ķ������ޤ��֤���
-.RE
-.TP 30
-\fBindent_space\fR <ʸ����>
-"\t\t"
-.RS
-�ޤ��֤����Ԥ�Ƭ���������륹�ڡ�����
-.RE
-.TP 30
-\fBindent_length\fR <����>
-16
-.RS
-�ޤ��֤����Ԥ�Ƭ����������륹�ڡ�����Ĺ����
-.RE
-.TP 30
-\fBsymhead_positive\fR <ʸ����>
-"Symbols"
-.RS
-lethead_flag �ޤ��� heading_flag �������ξ��˿����������Ƭʸ���Ȥ��ƽ��Ϥ���ʸ����
-.RE
-.TP 30
-\fBsymhead_negative\fR <ʸ����>
-"symbols"
-.RS
-lethead_flag �ޤ��� heading_flag ������ξ��˿����������Ƭʸ���Ȥ��ƽ��Ϥ���ʸ����
-.RE
-.TP 30
-\fBsymbol\fR <ʸ����>
-""
-.RS
-symbol_flag ��0�Ǥʤ����ˡ������������Ƭʸ���Ȥ��ƽ��Ϥ���ʸ����
-.RE
-ʸ�����������Ƥ���С�symhead_positive ����� symhead_negative ���ͥ�褵��롣(mendex����)
-.RE
-���Υѥ�����������줿��硢symhead_positive ����� symhead_negative ���ͥ�褵��롣(mendex����)
-.RE
-.TP 30
-\fBsymbol_flag\fR <����>
-1
-.RS
-�����������Ƭʸ���ν��ϥե饰��0�ΤȤ����Ϥ��ʤ���(mendex����)
-.RE
-.TP 30
-\fBletter_head\fR <����>
-1
-.RS
-���ܸ��Ƭʸ���ν��ϤΥե饰��0�ΤȤ����Ϥ��ʤ���1�ΤȤ��������ʡ�2�ΤȤ��Ҥ餬�ʤǽ��Ϥ��롣(mendex����)
-.RE
-.TP 30
-\fBpriority\fR <����>
-0
-.RS
-�ѻ������ܸ�Ȥκ��ߤ���������Υ�������ˡ�ˤĤ��ƤΥե饰��0�Ǥʤ���бѻ������ܸ�Ȥδ֤�Ⱦ�ѥ��ڡ��������줿���֤ǥ����Ȥ��롣(mendex����)
-.RE
-.TP 30
-\fBcharacter_order\fR <ʸ����>
-"SEJ"
-.RS
-���桢�ѻ������ܸ��ͥ���̡�\'S\'�ϵ��桢\'E\'�ϱѻ���\'J\'�����ܸ��ɽ����(mendex����)
-.RE
-.PP
-.SH ���ܸ�ΰ����ˤĤ���
-.PP
-\fImendex\fR �����ܸ�κ�����Ǥ�������ڤ˰�����褦�ˤʤäƤ��ޤ���
-.RE
-makeindex�Ǥ����ܸ�κ����������������˥����Ȥ��뤿��ˤϤҤ餬�ʤޤ��ϥ������ʤ�·����ٹ����������������������ɤߤ��դ��ʤ���Фʤ�ޤ���Ǥ���(��ưŪ��·����С������⤢��)��
-.RE
-mendex�Ǥϥ��ʤˤĤ��ƤϤ��٤Ƽ�ưŪ��·�����ޤ������ˤĤ��Ƥϼ���ե���������ꤹ�뤳�Ȥˤ��ƺ����줴�Ȥ��ɤߤ��դ����Ȥʤ��äǤ��ޤ���
-
-.LP
-�ʲ��������ǤΥ��ʤ��Ѵ�����ޤ���
-.PP
-.RS
-.br
-���֤����������� ���դ�����������
-.br
-�ޥå���ȥå��� �ޤĤ���ȤĤ���
-.br
-��ץ� �濫�դ�
-.RE
-.LP
-����ե������<\fI�ϸ�\ \ �ɤ�\fR>�Υꥹ�Ȥǹ�������ޤ���
-�ϸ���ɤߤζ��ڤ�ϥ��֤ޤ��ϥ��ڡ����Ǥ���
-.RE
-�ʲ��˼��������ޤ���
-.PP
-.RS
-.br
-���� ����
-.br
-�ɤ� ���
-.br
-�Ķ� ���礦
-.br
-�� ����ե�
-.RE
-.LP
-�������Ͽ����ϸ�ˤĤ��Ƥϡ��ɤ��������̤�ˤʤ�褦���겾̾���դ��Ƥ���������
-��ɽ�ס��������פΤ褦�����겾̾�ˤ�餺���̤���ɤ������Ǥ����ˤĤ��ƤϤɤ��餫���Ĥ�����Ͽ�Ǥ��ޤ���¾���ɤ����ˤĤ��Ƥϳƺ�������ɤߤ��դ��뤳�Ȥ��б����Ƥ���������
-.RE
-�ޤ����Ķ��ѿ�<\fIINDEXDEFAULTDICTIONARY\fR>�˼���ե��������Ͽ���뤳�Ȥˤ�ꡢ��ưŪ�˼���Ȥ��ޤ����Ķ��ѿ�����Ͽ��������� -d �ǻ��ꤷ�������ʻ�ѤǤ��ޤ���
-.PP
-.SH ��������ˡ�ˤĤ���
-.PP
-\fImendex\fR ���̾�����Ϥ��줿������Τޤޥ����Ȥ��ޤ���\fI-l\fR���ץ�����դ���줿��硢ʣ����ñ��ǹ�������������ˤĤ��Ƥϡ������Ȥ���Ȥ���ñ���ñ��δ֤Υ��ڡ�����ͤ�ƥ����Ȥ��ޤ���
-�����Ǥ����Ԥ�ñ��祽���ȡ���Ԥ�ʸ���祽���ȤȸƤ֤��Ȥˤ��ޤ���
-.RE
-ʸ���祽���Ȥξ�硢�ºݤ˽��Ϥ����ʸ����ϥ��ڡ�����ޤ�����֤Τ�ΤǤ��Τǡ������켫�Τ��Ѳ����뤳�ȤϤ���ޤ���
-.RE
-�ʲ�������ޤ���
-.PP
-.RS
-\fIñ��祽���� ʸ���祽����\fR
-.br
-X Window Xlib
-.br
-Xlib XView
-.br
-XView X Window
-.RE
-.LP
-�ޤ������ܸ���ѻ��֤Ǥ�����褦�ʥ�������ˡ������ޤ�����������ե������\fIpriority\fR�ʳ��˻��ꤷ����硢���ܤ������ܸ�ȱѻ��δ֤˥��ڡ���������ƥ����Ȥ��ޤ���
-.RE
-�ʲ�������ޤ���
-.PP
-.RS
-\fIpriority=0 priority=1\fR
-.br
-index sort ind�ե�����
-.br
-ind�ե����� index sort
-.RE
-.PP
-.SH �Ķ��ѿ�
-\fImendex\fR �Ǥϰʲ��Τ褦�ʴĶ��ѿ�����Ѥ��Ƥ��ޤ���
-.PP
-.TP 10
-\fIINDEXSTYLE\fR
-������������ե����뤬����ǥ��쥯�ȥ�
-.TP 10
-\fIINDEXDEFAULTSTYLE\fR
-�ǥե���Ȥǻ��Ȥ��������������ե�����
-.TP 10
-\fIINDEXDICTIONARY\fR
-������ǥ��쥯�ȥ�
-.TP 10
-\fIINDEXDEFAULTDICTIONARY\fR
-��˻��Ȥ��뼭��ե�����
-.PP
-.SH �ܺ٤ˤĤ���
-����¾���ܺ٤ˤĤ��Ƥ� \fImakeindex\fR �˽��
-.PP
-.SH ��������
-�ե�����̾����Ƭ��ʸ���� '-' �Ǥ���ե�����ϰ����ޤ���
-
-ʣ���Υڡ�����ˡ����Ѥ����硢�ڡ������.idx�ե������Ϳ���ʤ��ȥڡ����ֹ���ǧ���뤳�Ȥ�����ޤ���
-.PP
-.SH ����
-tex(l), latex(l), makeindex(l)
-.RE
Files old/texmf/doc/man/man1/mendex.man1.pdf and new/texmf/doc/man/man1/mendex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mendex.1 new/texmf-dist/doc/man/man1/mendex.1
--- old/texmf-dist/doc/man/man1/mendex.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/mendex.1 2011-06-22 17:33:05.000000000 +0200
@@ -0,0 +1,496 @@
+.if t .ds TX "T\h'-.15m'\v'.2v'E\v'-.2v'\h'-.12m'X
+.if t .ds LX L\v'-.22m'a\v'.22m'T\h'-.1667m'\v'.22m'E\h'-.125m'\v'-.22m'X
+.TH MENDEX L
+.SH ̾��
+mendex \- ���������ġ���
+.SH ����ˡ
+\fBmendex\fR [-ilqrcg] [\fB-s\fI sty\fR] [\fB-d\fI dic\fR] [\fB-o\fI ind\fR] [\fB-d\fI dic\fR] [\fB-t\fI log\fR] [\fB-p\fI no\fR] [\fI idx0 idx1 idx2 ...\fR]
+.SH ����
+.PP
+\fImendex\fR ��ʸ��κ������������ġ���Ǥ��� LaTeX �ˤ����Ф��줿�����ꥹ�ȥե�����(\fI.idx\fR)���¤��ؤ����ºݤκ����Υ������ե�����η����������ޤ��� \fImakeindex\fR �ȸߴ��������ꡢ����ˡ��ɤߡפΰ����μ�֤餹�褦���ü첽����Ƥ��ޤ���
+.RE
+���Ϥ��������η����ϡ���������ե�����˽��äƷ��ꤵ��ޤ����ޤ�������ե������Ϳ���뤳�Ȥˤ�ꡢ������νϸ���ɤߤ���Ͽ����ޤ���
+.RE
+�����γ��ؤϣ��ʳ��ޤǺ������뤳�Ȥ��Ǥ��ޤ���
+.SH ���ץ����
+.PP
+.TP 10
+\fB-i\fR
+�����ꥹ�ȥե����뤬���ꤵ��Ƥ�����Ǥ⡢ɸ�����Ϥ�����ꥹ�ȤȤ��ƻ��Ѥ��ޤ���
+.TP 10
+\fB-l\fR
+�����Υ����Ȥ�ʸ����ǹԤ��ޤ������ꤵ��ʤ����ñ���Υ����Ȥˤʤ�ޤ�(��������ˡ�ˤĤ��Ƥϸ��)��
+.TP 10
+\fB-q\fR
+�Žͥ⡼�ɤǤ������顼����ӷٹ�ʳ���ɸ�२�顼���Ϥ˽��Ϥ��ޤ���
+.TP 10
+\fB-r\fR
+�ڡ����ϰ�ɽ����̵���ˤ��ޤ������ꤷ�ʤ��ȡ�Ϣ³���ƽФƤ�������ˤĤ��Ƥ� "1--5" �Τ褦�˥ڡ����ϰϤ�ɽ������ޤ���
+.TP 10
+\fB-c\fR
+���ڡ����䥿�֤Ȥ��ä��֥��û�̤��ơ����٤ƣ��Ĥ�Ⱦ�ѥ��ڡ����ˤ��ޤ����ޤ�������Υ֥�Ϻ������ޤ���
+.TP 10
+\fB-g\fR
+���ܸ��Ƭʸ���ζ��ڤ�� "����������������" �ˤ��ޤ������ꤷ�ʤ��� "������������������" �ˤʤ�ޤ���
+.TP 10
+\fB-f\fR
+����ե�����ˤʤ��������Ū�˽��Ϥ���⡼�ɤǤ���
+.TP 10
+\fB-s\fI sty\fR
+\fIsty\fR �ե����������ե�����ȸ��ʤ��ޤ�����������ե��������ꤷ�ʤ���С��ǥե���Ȥκ��������Ǻ������ޤ���
+.TP 10
+\fB-d\fI dic\fR
+\fIdic\fR �ե������ե�����ȸ��ʤ��ޤ�������ե���������ܸ�� <\fI�ϸ�\fR\ \fI�ɤ�\fR> �Υꥹ�Ȥǹ�������ޤ���
+.TP 10
+\fB-o\fI ind\fR
+\fIind\fR �ե��������ϥե�����ȸ��ʤ��ޤ������꤬�ʤ����Ϻǽ�����ϥե�����γ�ĥ�Ҥ�.ind�Ȥ�����Ρ����ϥե����뤬ɸ�����ϤΤߤǤ����ɸ����Ϥ˽��Ϥ��ޤ���
+.TP 10
+\fB-t\fI log\fR
+\fIlog\fR �ե����������ե�����ȸ��ʤ��ޤ������꤬�ʤ����Ϻǽ�����ϥե�����γ�ĥ�Ҥ�.ilg�Ȥ�����Ρ����ϥե����뤬ɸ�����ϤΤߤǤ����ɸ�२�顼���ϤΤߤ˽��Ϥ���ޤ���
+.TP 10
+\fB-p\fI no\fR
+\fIno\fR ������ڡ�������Ƭ�ڡ����Ȥ��ƻ��ꤷ�ޤ����ޤ���TeX��.log �ե�����Ȥ��뤳�Ȥˤ�� \fIany\fR(�ǽ��ڡ����μ��Υڡ�������)��\fIodd\fR(�ǽ��ڡ����μ��δ���ڡ�������)��\fIeven\fR(�ǽ��ڡ����μ��ζ����ڡ�������)�Ȥ��ä�����λ������ǽ�Ǥ���
+.TP 10
+\fB-E\fR
+���������ɤ�EUC�˻��ꤷ�ޤ������ϥե����롢���ϥե�����Ȥ�EUC�Ȥ��ư����ޤ���
+.TP 10
+\fB-J\fR
+���������ɤ�JIS�˻��ꤷ�ޤ������ϥե����롢���ϥե�����Ȥ�JIS�Ȥ��ư����ޤ���
+.TP 10
+\fB-S\fR
+���������ɤ�ShiftJIS�˻��ꤷ�ޤ������ϥե����롢���ϥե�����Ȥ�ShiftJIS�Ȥ��ư����ޤ���
+.TP 10
+\fB-U\fR
+���������ɤ�UTF-8�˻��ꤷ�ޤ������ϥե����롢���ϥե�����Ȥ�UTF-8�Ȥ��ư����ޤ���
+
+
+.SH ��������ե�����
+��������ե������ makeindex �Τ�ΤȾ�̸ߴ��Ǥ��� ������ <\fI��������ѥ���\fR\ \fI����\fR> �Υꥹ�Ȥǹ�������ޤ����ѥ����ν���ϼ�ͳ�Ǥ���
+�ʲ��˥�������ѥ����ΰ������ޤ���
+`%'�ʹߤϥ����Ȥȸ��ʤ���ޤ���
+.PP
+\fB ���ϥե����륹������ѥ���\fR
+.TP 30
+\fBkeyword\fR <ʸ����>
+"\\\\indexentry"
+.RS
+��������ȥ������Ȥ��ƻ��ĥ��ޥ�ɡ�
+.RE
+.TP 30
+\fBarg_open\fR <ʸ��>
+\'{\'
+.RS
+��������ȥ�ʸ���Ϥ�ɽ��ʸ����
+.RE
+.TP 30
+\fBarg_close\fR <ʸ��>
+\'}\'
+.RS
+��������ȥ�ʸ����λ��ɽ��ʸ����
+.RE
+.TP 30
+\fBrange_open\fR <ʸ��>
+\'(\'
+.RS
+�ڡ����ϰϤγ��Ϥ�ʸ����
+.RE
+.TP 30
+\fBrange_close\fR <ʸ��>
+\')\'
+.RS
+�ڡ����ϰϤν�λ��ʸ����
+.RE
+.TP 30
+\fBlevel\fR <ʸ��>
+\'!\'
+.RS
+��°��٥�Ǥ��뤳�Ȥ�ʸ����
+.RE
+.TP 30
+\fBactual\fR <ʸ��>
+\'@\'
+.RS
+���Υ���ܥ��³��ʸ���ºݤκ���ʸ����Ȥ��ƽ��ϥե�����˽�롣
+.RE
+.TP 30
+\fBencap\fR <ʸ��>
+\'|\'
+.RS
+���Υ���ܥ��³��ʸ�����ڡ����ֹ���դ����ޥ��̾�Ȥ��ƻȤ��롣
+.RE
+.TP 30
+\fBpage_compositor\fR <ʸ����>
+"-"
+.RS
+���ز����줿�ڡ����ֹ�ˤ����볬�ش֤ζ��ڤ�ʸ����
+.RE
+.TP 30
+\fBpage_precedence\fR <ʸ����>
+"rnaRA"
+.RS
+�ڡ����ֹ�ε�ˡ��ͥ���̡�\'R\'�����\'r\'�ϥ���������\'n\'�ϥ���ӥ�������\'A\'�����\'a\'�ϥ���ե��٥åȤˤ�뵭ˡ��ɽ����
+.RE
+.TP 30
+\fBquote\fR <ʸ��>
+\'"\'
+.RS
+mendex�Υѥ���ʸ�����Ф��륨�������ץ���饯����
+.RE
+.TP 30
+\fBescape\fR <ʸ��>
+\'\\\\\'
+.RS
+����Ū��ʸ�����Ф��륨�������ץ���饯����
+.RE
+
+\fB ���ϥե����륹������ѥ���\fR
+
+\fBpreamble\fR <ʸ����>
+"\\\\begin{theindex}\\n"
+.RS
+���ϥե������ʸ����
+.RE
+.TP 30
+\fBpostamble\fR <ʸ����>
+"\\n\\n\\\\end{theindex}\\n"
+.RS
+���ϥե������������ʸ����
+.RE
+.TP 30
+\fBsetpage_prefix\fR <ʸ����>
+"\\n \\\\setcounter{page}{"
+.RS
+���ϥڡ��������ꤹ��Ȥ��Ρ��ڡ����ֹ�������դ���ʸ����
+.RE
+.TP 30
+\fBsetpage_suffix\fR <ʸ����>
+"}\\n"
+.RS
+���ϥڡ��������ꤹ��Ȥ��Ρ��ڡ����ֹ�θ���դ���ʸ����
+.RE
+.TP 30
+\fBgroup_skip\fR <ʸ����>
+"\\n\\n \\\\indexsapce\\n"
+.RS
+������(Ƭʸ��)��������������ĥ��ڡ�����ɽ��ʸ����
+.RE
+.TP 30
+\fBlethead_prefix\fR <ʸ����>
+""
+.RS
+Ƭʸ���������դ��륳�ޥ��ʸ����
+.RE
+.TP 30
+\fBheading_prefix\fR <ʸ����>
+""
+.RS
+lethead_prefix��Ʊ����
+.RE
+.TP 30
+\fBlethead_suffix\fR <ʸ����>
+""
+.RS
+Ƭʸ���θ���դ��륳�ޥ��ʸ����
+.RE
+.TP 30
+\fBheading_suffix\fR <ʸ����>
+""
+.RS
+lethead_suffix��Ʊ����
+.RE
+.TP 30
+\fBlethead_flag\fR <ʸ����>
+0
+.RS
+Ƭʸ���ν��ϤΥե饰��0�ΤȤ����Ϥ��ʤ���0����礭���Ȥ��ϱѻ�����ʸ���ǡ�0��꾮�����Ȥ��Ͼ�ʸ���ǽ��Ϥ��롣
+.RE
+.TP 30
+\fBheading_flag\fR <ʸ����>
+0
+.RS
+lethead_flag��Ʊ����
+.RE
+.TP 30
+\fBitem_0\fR <ʸ����>
+"\\n \\\\item "
+.RS
+�票��ȥ�֤��������륳�ޥ�ɡ�
+.RE
+.TP 30
+\fBitem_1\fR <ʸ����>
+"\\n \\\\subitem "
+.RS
+���֥���ȥ�֤��������륳�ޥ�ɡ�
+.RE
+.TP 30
+\fBitem_2\fR <ʸ����>
+"\\n \\\\subsubitem "
+.RS
+���֥��֥���ȥ�֤��������륳�ޥ�ɡ�
+.RE
+.TP 30
+\fBitem_01\fR <ʸ����>
+"\\n \\\\subitem "
+.RS
+������֥���ȥ�֤��������륳�ޥ�ɡ�
+.RE
+.TP 30
+\fBitem_x1\fR <ʸ����>
+"\\n \\\\subitem "
+.RS
+������֥���ȥ�֤��������륳�ޥ�ɡ�(�票��ȥ�˥ڡ����ֹ椬�ʤ��Ȥ�)
+.RE
+.TP 30
+\fBitem_12\fR <ʸ����>
+"\\n \\\\subsubitem "
+.RS
+���֡����֥��֥���ȥ�֤��������륳�ޥ�ɡ�
+.RE
+.TP 30
+\fBitem_x2\fR <ʸ����>
+"\\n \\\\subsubitem "
+.RS
+���֡����֥��֥���ȥ�֤��������륳�ޥ�ɡ�(���֥���ȥ�˥ڡ����ֹ椬�ʤ��Ȥ�)
+.RE
+.TP 30
+\fBdelim_0\fR <ʸ����>
+", "
+.RS
+�票��ȥ�Ⱥǽ�Υڡ����ֹ�δ֤ζ��ڤ�ʸ����
+.RE
+.TP 30
+\fBdelim_1\fR <ʸ����>
+", "
+.RS
+���֥���ȥ�Ⱥǽ�Υڡ����ֹ�δ֤ζ��ڤ�ʸ����
+.RE
+.TP 30
+\fBdelim_2\fR <ʸ����>
+", "
+.RS
+���֥��֥���ȥ�Ⱥǽ�Υڡ����ֹ�δ֤ζ��ڤ�ʸ����
+.RE
+.TP 30
+\fBdelim_n\fR <ʸ����>
+", "
+.RS
+�ڡ����ֹ�֤ζ��ڤ�ʸ���ɤΥ���ȥ��٥�ˤⶦ�̡�
+.RE
+.TP 30
+\fBdelim_r\fR <ʸ����>
+"--"
+.RS
+�ڡ����ϰϤ��Ȥ��Ρ��ڡ����ֹ�֤ζ��ڤ�ʸ����
+.RE
+.TP 30
+\fBdelim_t\fR <ʸ����>
+""
+.RS
+�ڡ����ֹ�Υꥹ�Ȥν�ü�˽��Ϥ���ʸ����
+.RE
+.TP 30
+\fBsuffix_2p\fR <ʸ����>
+""
+.RS
+�ڡ����ֹ椬2�ڡ���Ϣ³������ˡ�delim_n ��2�ڡ����ܤ��ֹ��������ղä���ʸ����
+.RE
+ʸ�����������Ƥ�����ˤΤ�ͭ����
+.RE
+.TP 30
+\fBsuffix_3p\fR <ʸ����>
+""
+.RS
+�ڡ����ֹ椬3�ڡ���Ϣ³������ˡ�delim_r ��3�ڡ����ܤ��ֹ��������ղä���ʸ����suffix_mp ���ͥ�褵��롣
+.RE
+ʸ�����������Ƥ�����ˤΤ�ͭ����
+.RE
+.TP 30
+\fBsuffix_mp\fR <ʸ����>
+""
+.RS
+�ڡ����ֹ椬3�ڡ����ޤ��Ϥ���ʾ�Ϣ³������ˡ�delim_r �������Υڡ����ֹ��������ղä���ʸ����
+.RE
+ʸ�����������Ƥ�����ˤΤ�ͭ����
+.RE
+.TP 30
+\fBencap_prefix\fR <ʸ����>
+"\\\\"
+.RS
+�ڡ����ֹ�˥��ޥ�ɤ��դ���Ȥ��Ρ����ޥ��̾�������դ���ʸ����
+.RE
+.TP 30
+\fBencap_infix\fR <ʸ����>
+"{"
+.RS
+�ڡ����ֹ�˥��ޥ�ɤ��դ���Ȥ��Ρ��ڡ����ֹ�������դ���ʸ����
+.RE
+.TP 30
+\fBencap_suffix\fR <ʸ����>
+"}".
+.RS
+�ڡ����ֹ�˥��ޥ�ɤ��դ���Ȥ��Ρ��ڡ����ֹ�θ���դ���ʸ����
+.RE
+.TP 30
+\fBline_max\fR <����>
+72
+.RS
+���Ԥκ���ʸ�����������Ķ������ޤ��֤���
+.RE
+.TP 30
+\fBindent_space\fR <ʸ����>
+"\t\t"
+.RS
+�ޤ��֤����Ԥ�Ƭ���������륹�ڡ�����
+.RE
+.TP 30
+\fBindent_length\fR <����>
+16
+.RS
+�ޤ��֤����Ԥ�Ƭ����������륹�ڡ�����Ĺ����
+.RE
+.TP 30
+\fBsymhead_positive\fR <ʸ����>
+"Symbols"
+.RS
+lethead_flag �ޤ��� heading_flag �������ξ��˿����������Ƭʸ���Ȥ��ƽ��Ϥ���ʸ����
+.RE
+.TP 30
+\fBsymhead_negative\fR <ʸ����>
+"symbols"
+.RS
+lethead_flag �ޤ��� heading_flag ������ξ��˿����������Ƭʸ���Ȥ��ƽ��Ϥ���ʸ����
+.RE
+.TP 30
+\fBsymbol\fR <ʸ����>
+""
+.RS
+symbol_flag ��0�Ǥʤ����ˡ������������Ƭʸ���Ȥ��ƽ��Ϥ���ʸ����
+.RE
+ʸ�����������Ƥ���С�symhead_positive ����� symhead_negative ���ͥ�褵��롣(mendex����)
+.RE
+���Υѥ�����������줿��硢symhead_positive ����� symhead_negative ���ͥ�褵��롣(mendex����)
+.RE
+.TP 30
+\fBsymbol_flag\fR <����>
+1
+.RS
+�����������Ƭʸ���ν��ϥե饰��0�ΤȤ����Ϥ��ʤ���(mendex����)
+.RE
+.TP 30
+\fBletter_head\fR <����>
+1
+.RS
+���ܸ��Ƭʸ���ν��ϤΥե饰��0�ΤȤ����Ϥ��ʤ���1�ΤȤ��������ʡ�2�ΤȤ��Ҥ餬�ʤǽ��Ϥ��롣(mendex����)
+.RE
+.TP 30
+\fBpriority\fR <����>
+0
+.RS
+�ѻ������ܸ�Ȥκ��ߤ���������Υ�������ˡ�ˤĤ��ƤΥե饰��0�Ǥʤ���бѻ������ܸ�Ȥδ֤�Ⱦ�ѥ��ڡ��������줿���֤ǥ����Ȥ��롣(mendex����)
+.RE
+.TP 30
+\fBcharacter_order\fR <ʸ����>
+"SEJ"
+.RS
+���桢�ѻ������ܸ��ͥ���̡�\'S\'�ϵ��桢\'E\'�ϱѻ���\'J\'�����ܸ��ɽ����(mendex����)
+.RE
+.PP
+.SH ���ܸ�ΰ����ˤĤ���
+.PP
+\fImendex\fR �����ܸ�κ�����Ǥ�������ڤ˰�����褦�ˤʤäƤ��ޤ���
+.RE
+makeindex�Ǥ����ܸ�κ����������������˥����Ȥ��뤿��ˤϤҤ餬�ʤޤ��ϥ������ʤ�·����ٹ����������������������ɤߤ��դ��ʤ���Фʤ�ޤ���Ǥ���(��ưŪ��·����С������⤢��)��
+.RE
+mendex�Ǥϥ��ʤˤĤ��ƤϤ��٤Ƽ�ưŪ��·�����ޤ������ˤĤ��Ƥϼ���ե���������ꤹ�뤳�Ȥˤ��ƺ����줴�Ȥ��ɤߤ��դ����Ȥʤ��äǤ��ޤ���
+
+.LP
+�ʲ��������ǤΥ��ʤ��Ѵ�����ޤ���
+.PP
+.RS
+.br
+���֤����������� ���դ�����������
+.br
+�ޥå���ȥå��� �ޤĤ���ȤĤ���
+.br
+��ץ� �濫�դ�
+.RE
+.LP
+����ե������<\fI�ϸ�\ \ �ɤ�\fR>�Υꥹ�Ȥǹ�������ޤ���
+�ϸ���ɤߤζ��ڤ�ϥ��֤ޤ��ϥ��ڡ����Ǥ���
+.RE
+�ʲ��˼��������ޤ���
+.PP
+.RS
+.br
+���� ����
+.br
+�ɤ� ���
+.br
+�Ķ� ���礦
+.br
+�� ����ե�
+.RE
+.LP
+�������Ͽ����ϸ�ˤĤ��Ƥϡ��ɤ��������̤�ˤʤ�褦���겾̾���դ��Ƥ���������
+��ɽ�ס��������פΤ褦�����겾̾�ˤ�餺���̤���ɤ������Ǥ����ˤĤ��ƤϤɤ��餫���Ĥ�����Ͽ�Ǥ��ޤ���¾���ɤ����ˤĤ��Ƥϳƺ�������ɤߤ��դ��뤳�Ȥ��б����Ƥ���������
+.RE
+�ޤ����Ķ��ѿ�<\fIINDEXDEFAULTDICTIONARY\fR>�˼���ե��������Ͽ���뤳�Ȥˤ�ꡢ��ưŪ�˼���Ȥ��ޤ����Ķ��ѿ�����Ͽ��������� -d �ǻ��ꤷ�������ʻ�ѤǤ��ޤ���
+.PP
+.SH ��������ˡ�ˤĤ���
+.PP
+\fImendex\fR ���̾�����Ϥ��줿������Τޤޥ����Ȥ��ޤ���\fI-l\fR���ץ�����դ���줿��硢ʣ����ñ��ǹ�������������ˤĤ��Ƥϡ������Ȥ���Ȥ���ñ���ñ��δ֤Υ��ڡ�����ͤ�ƥ����Ȥ��ޤ���
+�����Ǥ����Ԥ�ñ��祽���ȡ���Ԥ�ʸ���祽���ȤȸƤ֤��Ȥˤ��ޤ���
+.RE
+ʸ���祽���Ȥξ�硢�ºݤ˽��Ϥ����ʸ����ϥ��ڡ�����ޤ�����֤Τ�ΤǤ��Τǡ������켫�Τ��Ѳ����뤳�ȤϤ���ޤ���
+.RE
+�ʲ�������ޤ���
+.PP
+.RS
+\fIñ��祽���� ʸ���祽����\fR
+.br
+X Window Xlib
+.br
+Xlib XView
+.br
+XView X Window
+.RE
+.LP
+�ޤ������ܸ���ѻ��֤Ǥ�����褦�ʥ�������ˡ������ޤ�����������ե������\fIpriority\fR�ʳ��˻��ꤷ����硢���ܤ������ܸ�ȱѻ��δ֤˥��ڡ���������ƥ����Ȥ��ޤ���
+.RE
+�ʲ�������ޤ���
+.PP
+.RS
+\fIpriority=0 priority=1\fR
+.br
+index sort ind�ե�����
+.br
+ind�ե����� index sort
+.RE
+.PP
+.SH �Ķ��ѿ�
+\fImendex\fR �Ǥϰʲ��Τ褦�ʴĶ��ѿ�����Ѥ��Ƥ��ޤ���
+.PP
+.TP 10
+\fIINDEXSTYLE\fR
+������������ե����뤬����ǥ��쥯�ȥ�
+.TP 10
+\fIINDEXDEFAULTSTYLE\fR
+�ǥե���Ȥǻ��Ȥ��������������ե�����
+.TP 10
+\fIINDEXDICTIONARY\fR
+������ǥ��쥯�ȥ�
+.TP 10
+\fIINDEXDEFAULTDICTIONARY\fR
+��˻��Ȥ��뼭��ե�����
+.PP
+.SH �ܺ٤ˤĤ���
+����¾���ܺ٤ˤĤ��Ƥ� \fImakeindex\fR �˽��
+.PP
+.SH ��������
+�ե�����̾����Ƭ��ʸ���� '-' �Ǥ���ե�����ϰ����ޤ���
+
+ʣ���Υڡ�����ˡ����Ѥ����硢�ڡ������.idx�ե������Ϳ���ʤ��ȥڡ����ֹ���ǧ���뤳�Ȥ�����ޤ���
+.PP
+.SH ����
+tex(l), latex(l), makeindex(l)
+.RE
Files old/texmf-dist/doc/man/man1/mendex.man1.pdf and new/texmf-dist/doc/man/man1/mendex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ptex.doc.tlpobj new/tlpkg/tlpobj/ptex.doc.tlpobj
--- old/tlpkg/tlpobj/ptex.doc.tlpobj 2012-04-20 04:43:19.000000000 +0200
+++ new/tlpkg/tlpobj/ptex.doc.tlpobj 2013-05-18 03:42:42.000000000 +0200
@@ -1,8 +1,10 @@
name ptex.doc
category Package
-revision 26050
+revision 30518
shortdesc doc files of ptex
docfiles size=534
+ texmf-dist/doc/man/man1/mendex.1
+ texmf-dist/doc/man/man1/mendex.man1.pdf
texmf-dist/doc/ptex/base/COPYRIGHT
texmf-dist/doc/ptex/base/COPYRIGHT.txt
texmf-dist/doc/ptex/base/Changes.txt
@@ -33,5 +35,3 @@
texmf-dist/doc/ptex/pbibtex/jbtxdoc.tex
texmf-dist/doc/ptex/pbibtex/jbtxhak.pdf
texmf-dist/doc/ptex/pbibtex/jbtxhak.tex
- texmf/doc/man/man1/mendex.1
- texmf/doc/man/man1/mendex.man1.pdf
++++++ ptex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-noEmbed.map new/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-noEmbed.map
--- old/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-noEmbed.map 2011-11-20 13:47:56.000000000 +0100
+++ new/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-noEmbed.map 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-%%
-%% ASCII pTeX
-%%
-
-rml H !Ryumin-Light
-rmlv V !Ryumin-Light
-gbm H !GothicBBB-Medium
-gbmv V !GothicBBB-Medium
-
-%%
-%% upTeX
-%%
-
-urml UniJIS-UTF16-H !Ryumin-Light
-urmlv UniJIS-UTF16-V !Ryumin-Light
-ugbm UniJIS-UTF16-H !GothicBBB-Medium
-ugbmv UniJIS-UTF16-V !GothicBBB-Medium
-
-uprml-h UniJIS-UTF16-H !Ryumin-Light
-uprml-v UniJIS-UTF16-V !Ryumin-Light
-upgbm-h UniJIS-UTF16-H !GothicBBB-Medium
-upgbm-v UniJIS-UTF16-V !GothicBBB-Medium
-uprml-hq UniJIS-UCS2-H !Ryumin-Light
-upgbm-hq UniJIS-UCS2-H !GothicBBB-Medium
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/platex/config/hyphen.cfg new/texmf-dist/tex/platex/config/hyphen.cfg
--- old/texmf-dist/tex/platex/config/hyphen.cfg 2012-04-17 06:19:20.000000000 +0200
+++ new/texmf-dist/tex/platex/config/hyphen.cfg 2013-05-17 05:46:02.000000000 +0200
@@ -4,9 +4,10 @@
%%
%% The original source files were:
%%
-%% babel.dtx (with options: `kernel,patterns')
+%% babel.dtx (with options: `patterns')
%% This is a generated file.
%%
+%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams.
%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
@@ -23,7 +24,7 @@
%%
%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainer of this work is Johannes Braams.
+%% The Current Maintainer of this work is Javier Bezos.
%%
%% This file may only be distributed together with a copy of the Babel
%% system. You may however distribute the Babel system without
@@ -36,45 +37,28 @@
%% The list of derived (unpacked) files belonging to the distribution
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
-%%
%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2008/07/08 v3.8m The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/05/16 v3.9f The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
-%% Please report errors to: J.L. Braams
-%% babel at braams.xs4all.nl
+%% Copyright (C) 2013 by Johannes Braams
+%% TeXniek
+%% by Javier Bezos
+%% all rights reserved.
+\xdef\bbl@format{\jobname}
\ifx\ProvidesFile\@undefined
\def\ProvidesFile#1[#2 #3 #4]{%
\wlog{File: #1 #4 #3 <#2>}%
- \toks8{Babel <#3> and hyphenation patterns for }%
\let\ProvidesFile\@undefined
}
- \def\ProvidesLanguage#1[#2 #3 #4]{%
- \wlog{Language: #1 #4 #3 <#2>}%
- }
-\else
- \let\bbl@tempa\ProvidesFile
- \def\ProvidesFile#1[#2 #3 #4]{%
- \toks8{Babel <#3> and hyphenation patterns for }%
- \bbl@tempa#1[#2 #3 #4]%
- \let\ProvidesFile\bbl@tempa}
- \def\ProvidesLanguage#1{%
- \begingroup
- \catcode`\ 10 %
- \@makeother\/%
- \@ifnextchar[%]
- {\@provideslanguage{#1}}{\@provideslanguage{#1}[]}}
- \def\@provideslanguage#1[#2]{%
- \wlog{Language: #1 #2}%
- \expandafter\xdef\csname ver@#1.ldf\endcsname{#2}%
- \endgroup}
\fi
\ProvidesFile{hyphen.cfg}
- [2008/07/08 v3.8m %
- Babel language switching mechanism]
+ [2013/05/16 v3.9f %
+ Babel language switching mechanism]
\ifx\AtBeginDocument\@undefined
+ \let\orig@dump\dump
\input plain.def\relax
\fi
\ifx\language\@undefined
@@ -82,12 +66,8 @@
\fi
\ifx\newlanguage\@undefined
\csname newcount\endcsname\last@language
-\else
- \countdef\last@language=19
-\fi
-\ifx\newlanguage\@undefined
\def\addlanguage#1{%
- \global\advance\last@language \@ne
+ \global\advance\last@language\@ne
\ifnum\last@language<\@cclvi
\else
\errmessage{No room for a new \string\language!}%
@@ -95,232 +75,52 @@
\global\chardef#1\last@language
\wlog{\string#1 = \string\language\the\last@language}}
\else
+ \countdef\last@language=19
\def\addlanguage{\alloc@9\language\chardef\@cclvi}
\fi
-\def\adddialect#1#2{%
- \global\chardef#1#2\relax
- \wlog{\string#1 = a dialect from \string\language#2}}
-\def\iflanguage#1{%
- \expandafter\ifx\csname l@#1\endcsname\relax
- \@nolanerr{#1}%
- \else
- \bbl@afterfi{\ifnum\csname l@#1\endcsname=\language
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi}%
- \fi}
-\edef\selectlanguage{%
- \noexpand\protect
- \expandafter\noexpand\csname selectlanguage \endcsname
- }
-\ifx\@undefined\protect\let\protect\relax\fi
-\ifx\documentclass\@undefined
- \def\xstring{\string\string\string}
-\else
- \let\xstring\string
-\fi
-\xdef\bbl@language@stack{}
-\def\bbl@push@language{%
- \xdef\bbl@language@stack{\languagename+\bbl@language@stack}%
- }
-\def\bbl@pop@lang#1+#2-#3{%
- \def\languagename{#1}\xdef#3{#2}%
- }
-\def\bbl@pop@language{%
- \expandafter\bbl@pop@lang\bbl@language@stack-\bbl@language@stack
- \expandafter\bbl@set@language\expandafter{\languagename}%
- }
-\expandafter\def\csname selectlanguage \endcsname#1{%
- \bbl@push@language
- \aftergroup\bbl@pop@language
- \bbl@set@language{#1}}
-\def\bbl@set@language#1{%
- \edef\languagename{%
- \ifnum\escapechar=\expandafter`\string#1\@empty
- \else \string#1\@empty\fi}%
- \select@language{\languagename}%
- \if@filesw
- \protected@write\@auxout{}{\string\select@language{\languagename}}%
- \addtocontents{toc}{\xstring\select@language{\languagename}}%
- \addtocontents{lof}{\xstring\select@language{\languagename}}%
- \addtocontents{lot}{\xstring\select@language{\languagename}}%
- \fi}
-\def\select@language#1{%
- \expandafter\ifx\csname l@#1\endcsname\relax
- \@nolanerr{#1}%
+\toks8{Babel <3.9f> and hyphenation patterns for }%
+\def\process@line#1#2 #3 #4 {%
+ \ifx=#1%
+ \process@synonym{#2}%
\else
- \expandafter\ifx\csname date#1\endcsname\relax
- \@noopterr{#1}%
- \else
- \bbl@patterns{\languagename}%
- \originalTeX
- \expandafter\def\expandafter\originalTeX
- \expandafter{\csname noextras#1\endcsname
- \let\originalTeX\@empty}%
- \languageshorthands{none}%
- \babel@beginsave
- \csname captions#1\endcsname
- \csname date#1\endcsname
- \csname extras#1\endcsname\relax
- \babel@savevariable\lefthyphenmin
- \babel@savevariable\righthyphenmin
- \expandafter\ifx\csname #1hyphenmins\endcsname\relax
- \set@hyphenmins\tw@\thr@@\relax
- \else
- \expandafter\expandafter\expandafter\set@hyphenmins
- \csname #1hyphenmins\endcsname\relax
- \fi
- \fi
- \fi}
-\long\def\otherlanguage#1{%
- \csname selectlanguage \endcsname{#1}%
- \ignorespaces
- }
-\long\def\endotherlanguage{%
- \originalTeX
- \global\@ignoretrue\ignorespaces
- }
-\expandafter\def\csname otherlanguage*\endcsname#1{%
- \foreign@language{#1}%
- }
-\expandafter\def\csname endotherlanguage*\endcsname{%
- \csname noextras\languagename\endcsname
- }
-\def\foreignlanguage{\protect\csname foreignlanguage \endcsname}
-\expandafter\def\csname foreignlanguage \endcsname#1#2{%
- \begingroup
- \originalTeX
- \foreign@language{#1}%
- #2%
- \csname noextras#1\endcsname
- \endgroup
- }
-\def\foreign@language#1{%
- \def\languagename{#1}%
- \expandafter\ifx\csname l@#1\endcsname\relax
- \@nolanerr{#1}%
- \else
- \bbl@patterns{\languagename}%
- \languageshorthands{none}%
- \csname extras#1\endcsname
- \expandafter\ifx\csname #1hyphenmins\endcsname\relax
- \set@hyphenmins\tw@\thr@@\relax
- \else
- \expandafter\expandafter\expandafter\set@hyphenmins
- \csname #1hyphenmins\endcsname\relax
- \fi
- \fi
- }
-\def\bbl@patterns#1{%
- \language=\expandafter\ifx\csname l@#1:\f@encoding\endcsname\relax
- \csname l@#1\endcsname
- \else
- \csname l@#1:\f@encoding\endcsname
- \fi\relax
-}
-\def\hyphenrules#1{%
- \expandafter\ifx\csname l@#1\endcsname\@undefined
- \@nolanerr{#1}%
- \else
- \bbl@patterns{#1}%
- \languageshorthands{none}%
- \expandafter\ifx\csname #1hyphenmins\endcsname\relax
- \set@hyphenmins\tw@\thr@@\relax
- \else
- \expandafter\expandafter\expandafter\set@hyphenmins
- \csname #1hyphenmins\endcsname\relax
- \fi
+ \process@language{#1#2}{#3}{#4}%
\fi
- }
-\def\endhyphenrules{}
-\def\providehyphenmins#1#2{%
- \expandafter\ifx\csname #1hyphenmins\endcsname\relax
- \@namedef{#1hyphenmins}{#2}%
- \fi}
-\def\set@hyphenmins#1#2{\lefthyphenmin#1\righthyphenmin#2}
-\def\LdfInit{%
- \chardef\atcatcode=\catcode`\@
- \catcode`\@=11\relax
- \input babel.def\relax
- \catcode`\@=\atcatcode \let\atcatcode\relax
- \LdfInit}
-\ifx\originalTeX\@undefined\let\originalTeX\@empty\fi
-\ifx\babel@beginsave\@undefined\let\babel@beginsave\relax\fi
-\ifx\PackageError\@undefined
- \def\@nolanerr#1{%
- \errhelp{Your command will be ignored, type <return> to proceed}%
- \errmessage{You haven't defined the language #1\space yet}}
- \def\@nopatterns#1{%
- \message{No hyphenation patterns were loaded for}%
- \message{the language `#1'}%
- \message{I will use the patterns loaded for \string\language=0
- instead}}
- \def\@noopterr#1{%
- \errmessage{The option #1 was not specified in \string\usepackage}
- \errhelp{You may continue, but expect unexpected results}}
- \def\@activated#1{%
- \wlog{Package babel Info: Making #1 an active character}}
-\else
- \newcommand*{\@nolanerr}[1]{%
- \PackageError{babel}%
- {You haven't defined the language #1\space yet}%
- {Your command will be ignored, type <return> to proceed}}
- \newcommand*{\@nopatterns}[1]{%
- \PackageWarningNoLine{babel}%
- {No hyphenation patterns were loaded for\MessageBreak
- the language `#1'\MessageBreak
- I will use the patterns loaded for \string\language=0
- instead}}
- \newcommand*{\@noopterr}[1]{%
- \PackageError{babel}%
- {You haven't loaded the option #1\space yet}%
- {You may proceed, but expect unexpected results}}
- \newcommand*{\@activated}[1]{%
- \PackageInfo{babel}{%
- Making #1 an active character}}
-\fi
-\def\process@line#1#2 #3/{%
- \ifx=#1
- \process@synonym#2 /
- \else
- \process@language#1#2 #3/%
- \fi
- }
+ \ignorespaces}
\toks@{}
-\def\process@synonym#1 /{%
+\def\bbl@languages{}
+\def\process@synonym#1{%
\ifnum\last@language=\m@ne
- \expandafter\chardef\csname l@#1\endcsname0\relax
- \wlog{\string\l@#1=\string\language0}
- \toks@\expandafter{\the\toks@
- \expandafter\let\csname #1hyphenmins\expandafter\endcsname
- \csname\languagename hyphenmins\endcsname}%
+ \toks@\expandafter{\the\toks@\relax\process@synonym{#1}}%
\else
\expandafter\chardef\csname l@#1\endcsname\last@language
- \wlog{\string\l@#1=\string\language\the\last@language}
+ \wlog{\string\l@#1=\string\language\the\last@language}%
\expandafter\let\csname #1hyphenmins\expandafter\endcsname
- \csname\languagename hyphenmins\endcsname
- \fi
- }
-\def\process@language#1 #2 #3/{%
+ \csname\languagename hyphenmins\endcsname
+ \let\bbl@elt\relax
+ \edef\bbl@languages{\bbl@languages\bbl@elt{#1}{\the\last@language}{}{}}%
+ \fi}
+\def\process@language#1#2#3{%
\expandafter\addlanguage\csname l@#1\endcsname
\expandafter\language\csname l@#1\endcsname
- \def\languagename{#1}%
- \global\toks8\expandafter{\the\toks8#1, }%
+ \edef\languagename{#1}%
+ \bbl@hook@everylanguage{#1}%
+ \bbl@get@enc#1::\@@@
\begingroup
- \bbl@get@enc#1:\@@@
- \ifx\bbl@hyph@enc\@empty
- \else
- \fontencoding{\bbl@hyph@enc}\selectfont
- \fi
\lefthyphenmin\m@ne
- \input #2\relax
+ \bbl@hook@loadpatterns{#2}%
\ifnum\lefthyphenmin=\m@ne
\else
\expandafter\xdef\csname #1hyphenmins\endcsname{%
\the\lefthyphenmin\the\righthyphenmin}%
\fi
\endgroup
+ \def\bbl@tempa{#3}%
+ \ifx\bbl@tempa\@empty\else
+ \bbl@hook@loadexceptions{#3}%
+ \fi
+ \let\bbl@elt\relax
+ \edef\bbl@languages{%
+ \bbl@languages\bbl@elt{#1}{\the\language}{#2}{\bbl@tempa}}%
\ifnum\the\language=\z@
\expandafter\ifx\csname #1hyphenmins\endcsname\relax
\set@hyphenmins\tw@\thr@@\relax
@@ -329,73 +129,91 @@
\csname #1hyphenmins\endcsname
\fi
\the\toks@
- \fi
- \toks@{}%
- \def\bbl@tempa{#3}%
- \ifx\bbl@tempa\@empty
- \else
- \ifx\bbl@tempa\space
- \else
- \input #3\relax
- \fi
- \fi
- }
-\def\bbl@get@enc#1:#2\@@@{%
- \def\bbl@tempa{#1}%
- \def\bbl@tempb{#2}%
- \ifx\bbl@tempb\@empty
- \let\bbl@hyph@enc\@empty
- \else
- \bbl@get@enc#2\@@@
- \edef\bbl@hyph@enc{\bbl@tempa}%
+ \toks@{}%
\fi}
+\def\bbl@get@enc#1:#2:#3\@@@{\def\bbl@hyph@enc{#2}}
+\def\bbl@hook@everylanguage#1{}
+\def\bbl@hook@loadpatterns#1{\input #1\relax}
+\let\bbl@hook@loadexceptions\bbl@hook@loadpatterns
+\let\bbl@hook@loadkernel\bbl@hook@loadpatterns
+\begingroup
+ \def\AddBabelHook#1#2{%
+ \expandafter\ifx\csname bbl@hook@#2\endcsname\relax
+ \def\next{\toks1}%
+ \else
+ \def\next{\expandafter\gdef\csname bbl@hook@#2\endcsname####1}%
+ \fi
+ \next}
+ \ifx\directlua\@undefined
+ \ifx\XeTeXinputencoding\@undefined\else
+ \input xebabel.def
+ \fi
+ \else
+ \input luababel.def
+ \fi
+ \openin1 = babel-\bbl@format.cfg
+ \ifeof1
+ \else
+ \input babel-\bbl@format.cfg\relax
+ \fi
+ \closein1
+\endgroup
+\bbl@hook@loadkernel{switch.def}
\openin1 = language.dat
+\def\languagename{english}%
\ifeof1
\message{I couldn't find the file language.dat,\space
I will try the file hyphen.tex}
\input hyphen.tex\relax
- \def\l@english{0}%
- \def\languagename{english}%
+ \chardef\l@english\z@
\else
\last@language\m@ne
\loop
\endlinechar\m@ne
\read1 to \bbl@line
\endlinechar`\^^M
- \ifx\bbl@line\@empty
- \else
- \edef\bbl@line{\bbl@line\space/}%
- \expandafter\process@line\bbl@line
- \ifx\bbl@defaultlanguage\@undefined
- \let\bbl@defaultlanguage\languagename
+ \if T\ifeof1F\fi T\relax
+ \ifx\bbl@line\@empty\else
+ \edef\bbl@line{\bbl@line\space\space\space}%
+ \expandafter\process@line\bbl@line\relax
\fi
- \fi
- \iftrue \csname fi\endcsname
- \csname if\ifeof1 false\else true\fi\endcsname
\repeat
- \language=0
- \let\languagename\bbl@defaultlanguage
- \let\bbl@defaultlanguage\@undefined
+ \begingroup
+ \def\bbl@elt#1#2#3#4{%
+ \global\language=#2\relax
+ \gdef\languagename{#1}%
+ \def\bbl@elt##1##2##3##4{}}%
+ \bbl@languages
+ \endgroup
\fi
\closein1
-\let\process@language\@undefined
-\let\process@synonym\@undefined
-\let\process@line\@undefined
-\let\bbl@tempa\@undefined
-\let\bbl@tempb\@undefined
-\let\bbl@eq@\@undefined
-\let\bbl@line\@undefined
-\let\bbl@get@enc\@undefined
+\if/\the\toks@/\else
+ \errhelp{language.dat loads no language, only synonyms}
+ \errmessage{Orphan language synonym}
+\fi
\ifx\addto@hook\@undefined
\else
- \expandafter\addto@hook\expandafter\everyjob\expandafter{%
- \expandafter\typeout\expandafter{\the\toks8 loaded.}}
+ \edef\bbl@tempa{%
+ \noexpand\typeout{\the\toks8 \the\last@language\space languages
+ loaded.}}%
+ \expandafter\addto@hook\expandafter\everyjob\expandafter{\bbl@tempa}
\fi
+\let\bbl@line\@undefined
+\let\process@line\@undefined
+\let\process@synonym\@undefined
+\let\process@language\@undefined
+\let\bbl@get@enc\@undefined
+\let\bbl@hyph@enc\@undefined
+\let\bbl@tempa\@undefined
+\let\bbl@hook@loadkernel\@undefined
+\let\bbl@hook@everylanguage\@undefined
+\let\bbl@hook@loadpatterns\@undefined
+\let\bbl@hook@loadexceptions\@undefined
%%
%% ( written by Tono san )
%%
\ifx\platexDUMP\@undefined\else
- \edef\platexBANNER{\the\toks8 }%
+ \edef\platexBANNER{\the\toks8 \the\last@language\space languages\space}%
\fi%%
%%
%% \CharacterTable
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ptex.tlpobj new/tlpkg/tlpobj/ptex.tlpobj
--- old/tlpkg/tlpobj/ptex.tlpobj 2012-04-20 04:43:20.000000000 +0200
+++ new/tlpkg/tlpobj/ptex.tlpobj 2013-05-18 03:42:43.000000000 +0200
@@ -1,6 +1,6 @@
name ptex
category Package
-revision 26050
+revision 30518
shortdesc A TeX system for publishing in Japanese.
longdesc PTeX adds features related to vertical writing, and deals with
longdesc other problems in typesetting Japanese. A set of additions to a
@@ -19,9 +19,8 @@
execute AddFormat name=platex engine=eptex options="*platex.ini" patterns=language.dat
execute addKanjiMap ptex-@kanjiEmbed@@kanjiVariant@.map
execute addKanjiMap morisawa.map
-runfiles size=2488
+runfiles size=2485
texmf-dist/fonts/map/dvipdfmx/ptex/morisawa.map
- texmf-dist/fonts/map/dvipdfmx/ptex/ptex-noEmbed.map
texmf-dist/fonts/source/ptex/ascgrp/ascgrp.mf
texmf-dist/fonts/source/ptex/ascgrp/ascii.mf
texmf-dist/fonts/source/ptex/ascgrp/ascii10.mf
++++++ punk.tar.xz ++++++
Files old/fonts/tfm/public/punk/punk10.tfm and new/fonts/tfm/public/punk/punk10.tfm differ
Files old/fonts/tfm/public/punk/punk12.tfm and new/fonts/tfm/public/punk/punk12.tfm differ
Files old/fonts/tfm/public/punk/punk20.tfm and new/fonts/tfm/public/punk/punk20.tfm differ
Files old/fonts/tfm/public/punk/punkbx20.tfm and new/fonts/tfm/public/punk/punkbx20.tfm differ
Files old/fonts/tfm/public/punk/punksl20.tfm and new/fonts/tfm/public/punk/punksl20.tfm differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/punk.tlpobj new/tlpkg/tlpobj/punk.tlpobj
--- old/tlpkg/tlpobj/punk.tlpobj 2010-06-10 18:44:11.000000000 +0200
+++ new/tlpkg/tlpobj/punk.tlpobj 2012-08-14 04:33:26.000000000 +0200
@@ -1,13 +1,13 @@
name punk
category Package
-revision 13293
+revision 27388
shortdesc Donald Knuth's punk font.
relocated 1
longdesc A response to the assertion in a lecture that "typography tends
longdesc to lag behind other stylistic changes by about 10 years". Knuth
longdesc felt it was (in 1988) time to design a replacement for his
longdesc designs of the 1970s, and came up with this font! The fonts are
-longdesc distributed as MetaFont source. The package offers LaTeX
+longdesc distributed as Metafont source. The package offers LaTeX
longdesc support by Rohit Grover, from an original by Sebastian Rahtz,
longdesc which is slightly odd in claiming that the fonts are T1-
longdesc encoded. A (possibly) more rational support package is to be
@@ -32,5 +32,5 @@
RELOC/fonts/tfm/public/punk/punkbx20.tfm
RELOC/fonts/tfm/public/punk/punksl20.tfm
catalogue-ctan /fonts/punk
-catalogue-date 2008-11-30 13:31:17 +0100
+catalogue-date 2012-05-30 14:49:05 +0200
catalogue-license knuth
++++++ purifyeps.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf/doc/man/man1/purifyeps.1 new/texmf/doc/man/man1/purifyeps.1
--- old/texmf/doc/man/man1/purifyeps.1 2010-12-02 18:59:38.000000000 +0100
+++ new/texmf/doc/man/man1/purifyeps.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,350 +0,0 @@
-.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings. \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-. ds -- \(*W-
-. ds PI pi
-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-. ds L" ""
-. ds R" ""
-. ds C` ""
-. ds C' ""
-'br\}
-.el\{\
-. ds -- \|\(em\|
-. ds PI \(*p
-. ds L" ``
-. ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD. Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
-..
-. nr % 0
-. rr F
-.\}
-.el \{\
-. de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear. Run. Save yourself. No user-serviceable parts.
-. \" fudge factors for nroff and troff
-.if n \{\
-. ds #H 0
-. ds #V .8m
-. ds #F .3m
-. ds #[ \f1
-. ds #] \fP
-.\}
-.if t \{\
-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-. ds #V .6m
-. ds #F 0
-. ds #[ \&
-. ds #] \&
-.\}
-. \" simple accents for nroff and troff
-.if n \{\
-. ds ' \&
-. ds ` \&
-. ds ^ \&
-. ds , \&
-. ds ~ ~
-. ds /
-.\}
-.if t \{\
-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-. \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-. \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-. \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-. ds : e
-. ds 8 ss
-. ds o a
-. ds d- d\h'-1'\(ga
-. ds D- D\h'-1'\(hy
-. ds th \o'bp'
-. ds Th \o'LP'
-. ds ae ae
-. ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "PURIFYEPS 1"
-.TH PURIFYEPS 1 "2010-11-28" "v1.1" ""
-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-purifyeps \- make an Encapsulated PostScript file work with both dvips and
-pdflatex
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-purifyeps
-\&\fB\-\-help\fR
-.PP
-purifyeps
-\&\fB\-\-version\fR
-.PP
-purifyeps
-[\fB\-\-fontmap\fR=\fI.fmp file\fR]
-[\fI.eps input file\fR [\fI.eps output file\fR]]
-.PP
-purifyeps
-\&\fB\-\-make\-man\fR[=\fIfilename\fR] [\fB\-\-section\fR=\fIsection\fR]
-.PP
-purifyeps
-\&\fB\-\-make\-ps\-man\fR[=\fIfilename\fR] [\fB\-\-section\fR=\fIsection\fR]
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-While \fBpdflatex\fR has a number of nice features, its primary
-shortcoming relative to standard \fBlatex\fR+\fBdvips\fR is that it is
-unable to read ordinary Encapsulated PostScript (\s-1EPS\s0) files, the most
-common graphics format in the LaTeX world. \fBpdflatex\fR can read only
-the following types of graphics files:
-.IP "\s-1PDF\s0" 4
-.IX Item "PDF"
-Most people who use \fBpdflatex\fR convert their documents to \s-1PDF\s0 using a
-utility such as \fBepstopdf\fR. This works well and preserves the vector
-nature of the original \s-1EPS\s0. Unfortunately, \fBdvips\fR does not read
-\&\s-1PDF\s0, so two versions of the graphic must be maintained if the document
-is to be processed with both \fBlatex\fR+\fBdvips\fR and \fBpdflatex\fR.
-.IP "\s-1PNG\s0" 4
-.IX Item "PNG"
-\&\s-1PNG\s0 is a bitmap format and therefore scales poorly. Also, \fBdvips\fR
-does not read \s-1PNG\s0, so two versions of the graphic must be maintained
-if the document is to be processed with both \fBlatex\fR+\fBdvips\fR and
-\&\fBpdflatex\fR.
-.IP "\s-1JPEG\s0" 4
-.IX Item "JPEG"
-\&\s-1JPEG\s0 is a bitmap format and therefore scales poorly. Also, \fBdvips\fR
-does not read \s-1JPEG\s0, so two versions of the graphic must be maintained
-if the document is to be processed with both \fBlatex\fR+\fBdvips\fR and
-\&\fBpdflatex\fR.
-.IP "\s-1MPS\s0" 4
-.IX Item "MPS"
-This is probably the least-used \fBpdflatex\fR\-compatible graphics
-format. \s-1MPS\s0 is actually a stylized version of \s-1EPS\s0 that MetaPost
-outputs. Like \s-1PDF\s0, \s-1MPS\s0 is a vector format and remains as such when
-imported into a \fBpdflatex\fR document. Also like \s-1PDF\s0, \fBdvips\fR does
-not read \s-1MPS\s0, so two versions of the graphic must be maintained if the
-document is to be processed with both \fBlatex\fR+\fBdvips\fR and
-\&\fBpdflatex\fR.
-.PP
-The insight behind \fBpurifyeps\fR is that there are only a few, small
-differences between \s-1MPS\s0 and \s-1EPS\s0 and that a file can be converted into
-a format that matches both the \s-1MPS\s0 and \s-1EPS\s0 specifications
-simultaneously. \fBpurifyeps\fR inputs an \s-1EPS\s0 file, uses \fBpstoedit\fR's
-\&\f(CW\*(C`mpost\*(C'\fR filter to convert the file to MetaPost (\fI.mp\fR), runs
-\&\fBmpost\fR on the file to convert it to \s-1MPS\s0, and finally performs some
-touchups on the result to convert the file back to \s-1EPS\s0, while
-preserving its ability to be parsed by \fBpdflatex\fR.
-.SH "OPTIONS"
-.IX Header "OPTIONS"
-.IP "\fB\-\-help\fR" 4
-.IX Item "--help"
-Display \*(L"Usage\*(R" and \*(L"Options\*(R" from the \fBpurifyeps\fR documentation.
-.IP "\fB\-V\fR, \fB\-\-version\fR" 4
-.IX Item "-V, --version"
-Display the \fBpurifyeps\fR version number, copyright, and license.
-.IP "\fB\-\-fontmap\fR=\fI.fmp file\fR" 4
-.IX Item "--fontmap=.fmp file"
-Specify the name of a file that tells \fBpurifyeps\fR how to map from TeX
-font names to PostScript font names. [Default: \fImpost.fmp\fR]
-.IP "\fB\-\-make\-man\fR [=\fIfilename\fR]] [\fB\-\-section\fR=\fIsection\fR]" 4
-.IX Item "--make-man [=filename]] [--section=section]"
-Automatically create a Unix man page for \fBpurifyeps\fR. \fIsection\fR
-specifies the section [default: \f(CW1\fR (User Commands)]. \fIfilename\fR
-defaults to \fIpurifyeps.1\fR or an analogous filename if \fIsection\fR is
-specified.
-.IP "\fB\-\-make\-ps\-man\fR [=\fIfilename\fR]] [\fB\-\-section\fR=\fIsection\fR]" 4
-.IX Item "--make-ps-man [=filename]] [--section=section]"
-Automatically create a PostScript version of the \fBpurifyeps\fR
-documentation. The documentation is formatted like a Unix man page.
-\&\fIsection\fR specifies the section [default: \f(CW1\fR (User Commands)].
-\&\fIfilename\fR defaults to \fIpurifyeps.ps\fR.
-.PP
-In normal operation (i.e., when not run with \f(CW\*(C`\-\-help\*(C'\fR, \f(CW\*(C`\-\-make\-man\*(C'\fR,
-or \f(CW\*(C`\-\-make\-ps\-man\*(C'\fR), \fBpurifyeps\fR takes the name of an input file and
-output file. The same filename can safely be used for both files. If
-the output filename is omitted, output will go to the standard output
-device. If the input filename is omitted, \fBpurifyeps\fR will read from
-the standard input device.
-.SH "EXAMPLES"
-.IX Header "EXAMPLES"
-Create a PostScript version of the \fBpurifyeps\fR documentation, but
-call it \fIhappydoc.ps\fR instead of the default, \fIpurifyeps.ps\fR:
-.PP
-.Vb 1
-\& purifyeps \-\-make\-ps\-man=happydoc.ps
-.Ve
-.PP
-Create a Unix man page for \fBpurifyeps\fR (in the usual roff format),
-but indicate that it belongs in section \f(CW\*(C`LOCAL\*(C'\fR instead of the
-default of section \f(CW1\fR:
-.PP
-.Vb 1
-\& purifyeps \-\-make\-man \-\-section=LOCAL
-.Ve
-.PP
-Purify \fIsample.eps\fR (\fImpost.fmp\fR is in the current directory):
-.PP
-.Vb 1
-\& purifyeps sample.eps sample.eps
-.Ve
-.PP
-Purify \fIsample.eps\fR (\fImpost.fmp\fR is in a different location):
-.PP
-.Vb 1
-\& purifyeps \-\-fontmap=/usr/share/pstoedit/mpost.fmp sample.eps sample.eps
-.Ve
-.PP
-Rename the purified version while purifying:
-.PP
-.Vb 1
-\& purifyeps sample.eps sample\-pure.eps
-.Ve
-.PP
-Do the same, but in a Unix pipeline:
-.PP
-.Vb 1
-\& cat sample.eps | purifyeps > sample\-pure.eps
-.Ve
-.PP
-When you run \fBpurifyeps\fR, you should see the output from both
-\&\fBpstoedit\fR and \fBmpost\fR, followed by a success message from
-\&\fBpurifyeps\fR:
-.PP
-.Vb 8
-\& % cat sample.eps | purifyeps > sample\-pure.eps
-\& pstoedit: version 3.30 / DLL interface 107 (build Mar 14 2002) :
-\& Copyright (C) 1993 \- 2001 Wolfgang Glunz
-\& Interpreter finished. Return status 0
-\& This is MetaPost, Version 0.641 (Web2C 7.3.1)
-\& (/tmp/purifyeps\-jdeGPkh9.mp [1] )
-\& 1 output file written: purifyeps\-jdeGPkh9.1
-\& Transcript written on purifyeps\-jdeGPkh9.log.
-\&
-\& File seems to have been purified successfully.
-.Ve
-.SH "FILES"
-.IX Header "FILES"
-.IP "\fImpost.fmp\fR" 4
-.IX Item "mpost.fmp"
-File containing mappings between TeX and PostScript font names. See
-\&\*(L"\s-1NOTES\s0\*(R" for a description of this file's contents.
-.SH "BUGS"
-.IX Header "BUGS"
-Error reporting could definitely stand to be improved. Error messages
-produced by \fBpstoedit\fR and \fBmpost\fR are sometimes silently ignored.
-Also, errors sometimes cause \fBpurifyeps\fR to leave temporary files
-(\fIpurifyeps\-\fR\fI#####\fR) lying around.
-.PP
-\&\fBpurifyeps\fR is subject to all of the limitations that affect
-\&\fBpstoedit\fR and especially the \f(CW\*(C`mpost\*(C'\fR backend to \fBpstoedit\fR. As a
-result, \fBpurifyeps\fR ignores certain PostScript constructs, such as
-nonuniformly scaled text.
-.SH "NOTES"
-.IX Header "NOTES"
-\&\fBpurifyeps\fR needs a file that tells it how to map from TeX font names
-to PostScript font names. This file must contain two, space-separated
-columns. The first lists a PostScript font name, and the second lists
-the TeX equivalent. Blank lines and lines that start with \f(CW\*(C`%\*(C'\fR are
-ignored. The following is a sample \fI.fmp\fR file:
-.PP
-.Vb 10
-\& % This is a sample font map for purifyeps.
-\& Times\-Bold ptmb
-\& Times\-Italic ptmri
-\& Times\-Roman ptmr
-\& Helvetica phvr
-\& Helvetica\-Bold phvb
-\& Helvetica\-Oblique phvro
-\& Courier pcrr
-\& Courier\-Bold pcrb
-\& Courier\-Oblique pcrro
-.Ve
-.PP
-Note that this is exactly the same format that \fBpstoedit\fR uses. By
-default, \fBpurifyeps\fR looks in the current directory for a font map
-called \fImpost.fmp\fR. The \f(CW\*(C`\-\-fontmap\*(C'\fR command-line option tells
-\&\fBpurifyeps\fR to use a different font map, which will typically be the
-\&\fImpost.fmp\fR file that comes with \fBpstoedit\fR.
-.PP
-Once you create purified \s-1EPS\s0 files with \fBpurifyeps\fR, you need to
-instruct \fBpdflatex\fR to use them. The pdfLaTeX configuration of the
-\&\f(CW\*(C`graphics\*(C'\fR and \f(CW\*(C`graphicx\*(C'\fR packages (\fIpdftex.def\fR) normally ignores
-\&\fI.eps\fR files. Putting the following LaTeX code in your document's
-preamble tells \fBpdflatex\fR that all \fI.eps\fR files are in \s-1MPS\s0 format:
-.PP
-.Vb 9
-\& % Tell pdfLaTeX that all .eps files were produced by MetaPost.
-\& \eusepackage{graphicx} % or graphics
-\& \eusepackage{ifpdf}
-\& \eifpdf
-\& \eDeclareGraphicsRule{.eps}{mps}{*}{}
-\& \emakeatletter
-\& \eg@addto@macro\eGin@extensions{,.eps}
-\& \emakeatother
-\& \efi
-.Ve
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-\&\fIdvips\fR\|(1), \fIepstopdf\fR\|(1), \fIlatex\fR\|(1), \fImpost\fR\|(1), \fIpdflatex\fR\|(1), \fIpstoedit\fR\|(1)
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Scott Pakin, \fIscott+peps@pakin.org\fR
Files old/texmf/doc/man/man1/purifyeps.man1.pdf and new/texmf/doc/man/man1/purifyeps.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/purifyeps.1 new/texmf-dist/doc/man/man1/purifyeps.1
--- old/texmf-dist/doc/man/man1/purifyeps.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/purifyeps.1 2010-12-02 18:59:38.000000000 +0100
@@ -0,0 +1,350 @@
+.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings. \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote. \*(C+ will
+.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+. ds -- \(*W-
+. ds PI pi
+. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
+. ds L" ""
+. ds R" ""
+. ds C` ""
+. ds C' ""
+'br\}
+.el\{\
+. ds -- \|\(em\|
+. ds PI \(*p
+. ds L" ``
+. ds R" ''
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD. Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
+..
+. nr % 0
+. rr F
+.\}
+.el \{\
+. de IX
+..
+.\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear. Run. Save yourself. No user-serviceable parts.
+. \" fudge factors for nroff and troff
+.if n \{\
+. ds #H 0
+. ds #V .8m
+. ds #F .3m
+. ds #[ \f1
+. ds #] \fP
+.\}
+.if t \{\
+. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+. ds #V .6m
+. ds #F 0
+. ds #[ \&
+. ds #] \&
+.\}
+. \" simple accents for nroff and troff
+.if n \{\
+. ds ' \&
+. ds ` \&
+. ds ^ \&
+. ds , \&
+. ds ~ ~
+. ds /
+.\}
+.if t \{\
+. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+. \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+. \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+. \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+. ds : e
+. ds 8 ss
+. ds o a
+. ds d- d\h'-1'\(ga
+. ds D- D\h'-1'\(hy
+. ds th \o'bp'
+. ds Th \o'LP'
+. ds ae ae
+. ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "PURIFYEPS 1"
+.TH PURIFYEPS 1 "2010-11-28" "v1.1" ""
+.\" For nroff, turn off justification. Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+purifyeps \- make an Encapsulated PostScript file work with both dvips and
+pdflatex
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+purifyeps
+\&\fB\-\-help\fR
+.PP
+purifyeps
+\&\fB\-\-version\fR
+.PP
+purifyeps
+[\fB\-\-fontmap\fR=\fI.fmp file\fR]
+[\fI.eps input file\fR [\fI.eps output file\fR]]
+.PP
+purifyeps
+\&\fB\-\-make\-man\fR[=\fIfilename\fR] [\fB\-\-section\fR=\fIsection\fR]
+.PP
+purifyeps
+\&\fB\-\-make\-ps\-man\fR[=\fIfilename\fR] [\fB\-\-section\fR=\fIsection\fR]
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+While \fBpdflatex\fR has a number of nice features, its primary
+shortcoming relative to standard \fBlatex\fR+\fBdvips\fR is that it is
+unable to read ordinary Encapsulated PostScript (\s-1EPS\s0) files, the most
+common graphics format in the LaTeX world. \fBpdflatex\fR can read only
+the following types of graphics files:
+.IP "\s-1PDF\s0" 4
+.IX Item "PDF"
+Most people who use \fBpdflatex\fR convert their documents to \s-1PDF\s0 using a
+utility such as \fBepstopdf\fR. This works well and preserves the vector
+nature of the original \s-1EPS\s0. Unfortunately, \fBdvips\fR does not read
+\&\s-1PDF\s0, so two versions of the graphic must be maintained if the document
+is to be processed with both \fBlatex\fR+\fBdvips\fR and \fBpdflatex\fR.
+.IP "\s-1PNG\s0" 4
+.IX Item "PNG"
+\&\s-1PNG\s0 is a bitmap format and therefore scales poorly. Also, \fBdvips\fR
+does not read \s-1PNG\s0, so two versions of the graphic must be maintained
+if the document is to be processed with both \fBlatex\fR+\fBdvips\fR and
+\&\fBpdflatex\fR.
+.IP "\s-1JPEG\s0" 4
+.IX Item "JPEG"
+\&\s-1JPEG\s0 is a bitmap format and therefore scales poorly. Also, \fBdvips\fR
+does not read \s-1JPEG\s0, so two versions of the graphic must be maintained
+if the document is to be processed with both \fBlatex\fR+\fBdvips\fR and
+\&\fBpdflatex\fR.
+.IP "\s-1MPS\s0" 4
+.IX Item "MPS"
+This is probably the least-used \fBpdflatex\fR\-compatible graphics
+format. \s-1MPS\s0 is actually a stylized version of \s-1EPS\s0 that MetaPost
+outputs. Like \s-1PDF\s0, \s-1MPS\s0 is a vector format and remains as such when
+imported into a \fBpdflatex\fR document. Also like \s-1PDF\s0, \fBdvips\fR does
+not read \s-1MPS\s0, so two versions of the graphic must be maintained if the
+document is to be processed with both \fBlatex\fR+\fBdvips\fR and
+\&\fBpdflatex\fR.
+.PP
+The insight behind \fBpurifyeps\fR is that there are only a few, small
+differences between \s-1MPS\s0 and \s-1EPS\s0 and that a file can be converted into
+a format that matches both the \s-1MPS\s0 and \s-1EPS\s0 specifications
+simultaneously. \fBpurifyeps\fR inputs an \s-1EPS\s0 file, uses \fBpstoedit\fR's
+\&\f(CW\*(C`mpost\*(C'\fR filter to convert the file to MetaPost (\fI.mp\fR), runs
+\&\fBmpost\fR on the file to convert it to \s-1MPS\s0, and finally performs some
+touchups on the result to convert the file back to \s-1EPS\s0, while
+preserving its ability to be parsed by \fBpdflatex\fR.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-\-help\fR" 4
+.IX Item "--help"
+Display \*(L"Usage\*(R" and \*(L"Options\*(R" from the \fBpurifyeps\fR documentation.
+.IP "\fB\-V\fR, \fB\-\-version\fR" 4
+.IX Item "-V, --version"
+Display the \fBpurifyeps\fR version number, copyright, and license.
+.IP "\fB\-\-fontmap\fR=\fI.fmp file\fR" 4
+.IX Item "--fontmap=.fmp file"
+Specify the name of a file that tells \fBpurifyeps\fR how to map from TeX
+font names to PostScript font names. [Default: \fImpost.fmp\fR]
+.IP "\fB\-\-make\-man\fR [=\fIfilename\fR]] [\fB\-\-section\fR=\fIsection\fR]" 4
+.IX Item "--make-man [=filename]] [--section=section]"
+Automatically create a Unix man page for \fBpurifyeps\fR. \fIsection\fR
+specifies the section [default: \f(CW1\fR (User Commands)]. \fIfilename\fR
+defaults to \fIpurifyeps.1\fR or an analogous filename if \fIsection\fR is
+specified.
+.IP "\fB\-\-make\-ps\-man\fR [=\fIfilename\fR]] [\fB\-\-section\fR=\fIsection\fR]" 4
+.IX Item "--make-ps-man [=filename]] [--section=section]"
+Automatically create a PostScript version of the \fBpurifyeps\fR
+documentation. The documentation is formatted like a Unix man page.
+\&\fIsection\fR specifies the section [default: \f(CW1\fR (User Commands)].
+\&\fIfilename\fR defaults to \fIpurifyeps.ps\fR.
+.PP
+In normal operation (i.e., when not run with \f(CW\*(C`\-\-help\*(C'\fR, \f(CW\*(C`\-\-make\-man\*(C'\fR,
+or \f(CW\*(C`\-\-make\-ps\-man\*(C'\fR), \fBpurifyeps\fR takes the name of an input file and
+output file. The same filename can safely be used for both files. If
+the output filename is omitted, output will go to the standard output
+device. If the input filename is omitted, \fBpurifyeps\fR will read from
+the standard input device.
+.SH "EXAMPLES"
+.IX Header "EXAMPLES"
+Create a PostScript version of the \fBpurifyeps\fR documentation, but
+call it \fIhappydoc.ps\fR instead of the default, \fIpurifyeps.ps\fR:
+.PP
+.Vb 1
+\& purifyeps \-\-make\-ps\-man=happydoc.ps
+.Ve
+.PP
+Create a Unix man page for \fBpurifyeps\fR (in the usual roff format),
+but indicate that it belongs in section \f(CW\*(C`LOCAL\*(C'\fR instead of the
+default of section \f(CW1\fR:
+.PP
+.Vb 1
+\& purifyeps \-\-make\-man \-\-section=LOCAL
+.Ve
+.PP
+Purify \fIsample.eps\fR (\fImpost.fmp\fR is in the current directory):
+.PP
+.Vb 1
+\& purifyeps sample.eps sample.eps
+.Ve
+.PP
+Purify \fIsample.eps\fR (\fImpost.fmp\fR is in a different location):
+.PP
+.Vb 1
+\& purifyeps \-\-fontmap=/usr/share/pstoedit/mpost.fmp sample.eps sample.eps
+.Ve
+.PP
+Rename the purified version while purifying:
+.PP
+.Vb 1
+\& purifyeps sample.eps sample\-pure.eps
+.Ve
+.PP
+Do the same, but in a Unix pipeline:
+.PP
+.Vb 1
+\& cat sample.eps | purifyeps > sample\-pure.eps
+.Ve
+.PP
+When you run \fBpurifyeps\fR, you should see the output from both
+\&\fBpstoedit\fR and \fBmpost\fR, followed by a success message from
+\&\fBpurifyeps\fR:
+.PP
+.Vb 8
+\& % cat sample.eps | purifyeps > sample\-pure.eps
+\& pstoedit: version 3.30 / DLL interface 107 (build Mar 14 2002) :
+\& Copyright (C) 1993 \- 2001 Wolfgang Glunz
+\& Interpreter finished. Return status 0
+\& This is MetaPost, Version 0.641 (Web2C 7.3.1)
+\& (/tmp/purifyeps\-jdeGPkh9.mp [1] )
+\& 1 output file written: purifyeps\-jdeGPkh9.1
+\& Transcript written on purifyeps\-jdeGPkh9.log.
+\&
+\& File seems to have been purified successfully.
+.Ve
+.SH "FILES"
+.IX Header "FILES"
+.IP "\fImpost.fmp\fR" 4
+.IX Item "mpost.fmp"
+File containing mappings between TeX and PostScript font names. See
+\&\*(L"\s-1NOTES\s0\*(R" for a description of this file's contents.
+.SH "BUGS"
+.IX Header "BUGS"
+Error reporting could definitely stand to be improved. Error messages
+produced by \fBpstoedit\fR and \fBmpost\fR are sometimes silently ignored.
+Also, errors sometimes cause \fBpurifyeps\fR to leave temporary files
+(\fIpurifyeps\-\fR\fI#####\fR) lying around.
+.PP
+\&\fBpurifyeps\fR is subject to all of the limitations that affect
+\&\fBpstoedit\fR and especially the \f(CW\*(C`mpost\*(C'\fR backend to \fBpstoedit\fR. As a
+result, \fBpurifyeps\fR ignores certain PostScript constructs, such as
+nonuniformly scaled text.
+.SH "NOTES"
+.IX Header "NOTES"
+\&\fBpurifyeps\fR needs a file that tells it how to map from TeX font names
+to PostScript font names. This file must contain two, space-separated
+columns. The first lists a PostScript font name, and the second lists
+the TeX equivalent. Blank lines and lines that start with \f(CW\*(C`%\*(C'\fR are
+ignored. The following is a sample \fI.fmp\fR file:
+.PP
+.Vb 10
+\& % This is a sample font map for purifyeps.
+\& Times\-Bold ptmb
+\& Times\-Italic ptmri
+\& Times\-Roman ptmr
+\& Helvetica phvr
+\& Helvetica\-Bold phvb
+\& Helvetica\-Oblique phvro
+\& Courier pcrr
+\& Courier\-Bold pcrb
+\& Courier\-Oblique pcrro
+.Ve
+.PP
+Note that this is exactly the same format that \fBpstoedit\fR uses. By
+default, \fBpurifyeps\fR looks in the current directory for a font map
+called \fImpost.fmp\fR. The \f(CW\*(C`\-\-fontmap\*(C'\fR command-line option tells
+\&\fBpurifyeps\fR to use a different font map, which will typically be the
+\&\fImpost.fmp\fR file that comes with \fBpstoedit\fR.
+.PP
+Once you create purified \s-1EPS\s0 files with \fBpurifyeps\fR, you need to
+instruct \fBpdflatex\fR to use them. The pdfLaTeX configuration of the
+\&\f(CW\*(C`graphics\*(C'\fR and \f(CW\*(C`graphicx\*(C'\fR packages (\fIpdftex.def\fR) normally ignores
+\&\fI.eps\fR files. Putting the following LaTeX code in your document's
+preamble tells \fBpdflatex\fR that all \fI.eps\fR files are in \s-1MPS\s0 format:
+.PP
+.Vb 9
+\& % Tell pdfLaTeX that all .eps files were produced by MetaPost.
+\& \eusepackage{graphicx} % or graphics
+\& \eusepackage{ifpdf}
+\& \eifpdf
+\& \eDeclareGraphicsRule{.eps}{mps}{*}{}
+\& \emakeatletter
+\& \eg@addto@macro\eGin@extensions{,.eps}
+\& \emakeatother
+\& \efi
+.Ve
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fIdvips\fR\|(1), \fIepstopdf\fR\|(1), \fIlatex\fR\|(1), \fImpost\fR\|(1), \fIpdflatex\fR\|(1), \fIpstoedit\fR\|(1)
+.SH "AUTHOR"
+.IX Header "AUTHOR"
+Scott Pakin, \fIscott+peps@pakin.org\fR
Files old/texmf-dist/doc/man/man1/purifyeps.man1.pdf and new/texmf-dist/doc/man/man1/purifyeps.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/purifyeps.doc.tlpobj new/tlpkg/tlpobj/purifyeps.doc.tlpobj
--- old/tlpkg/tlpobj/purifyeps.doc.tlpobj 2010-12-03 04:13:32.000000000 +0100
+++ new/tlpkg/tlpobj/purifyeps.doc.tlpobj 2013-04-08 21:26:58.000000000 +0200
@@ -1,8 +1,8 @@
name purifyeps.doc
category Package
-revision 20636
+revision 29725
shortdesc doc files of purifyeps
docfiles size=9
+ texmf-dist/doc/man/man1/purifyeps.1
+ texmf-dist/doc/man/man1/purifyeps.man1.pdf
texmf-dist/doc/support/purifyeps/README
- texmf/doc/man/man1/purifyeps.1
- texmf/doc/man/man1/purifyeps.man1.pdf
++++++ purifyeps.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/purifyeps.tlpobj new/tlpkg/tlpobj/purifyeps.tlpobj
--- old/tlpkg/tlpobj/purifyeps.tlpobj 2010-12-03 04:13:32.000000000 +0100
+++ new/tlpkg/tlpobj/purifyeps.tlpobj 2013-04-08 21:26:58.000000000 +0200
@@ -1,6 +1,6 @@
name purifyeps
category Package
-revision 20636
+revision 29725
shortdesc Make EPS work with both LaTeX/dvips and pdfLaTeX.
longdesc While pdfLaTeX has a number of nice features, its primary
longdesc shortcoming relative to standard LaTeX+dvips is that it is
@@ -15,6 +15,6 @@
runfiles size=5
texmf-dist/scripts/purifyeps/purifyeps
catalogue-ctan /support/purifyeps
-catalogue-date 2009-03-25 09:03:02 +0100
+catalogue-date 2012-05-07 16:41:43 +0200
catalogue-license lppl
-catalogue-version 1.0a
+catalogue-version 1.1
++++++ texlive-specs.tar.xz ++++++
++++ 335945 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org