summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/pict2e
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-02-05 23:35:03 +0000
committerKarl Berry <karl@freefriends.org>2016-02-05 23:35:03 +0000
commitb0b816931ede90b5237dcb504755552bd5db7387 (patch)
tree009bfe55705d5030fb51fc18cdc0d4357de7a6c2 /Master/texmf-dist/source/latex/pict2e
parent3e2f80be0bc415e72916b61a0d3cbfcda0c48d89 (diff)
pict2e (5feb16)
git-svn-id: svn://tug.org/texlive/trunk@39591 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/pict2e')
-rw-r--r--Master/texmf-dist/source/latex/pict2e/p2e-drivers.dtx107
-rw-r--r--Master/texmf-dist/source/latex/pict2e/pict2e.dtx31
-rw-r--r--Master/texmf-dist/source/latex/pict2e/pict2e.ins14
3 files changed, 105 insertions, 47 deletions
diff --git a/Master/texmf-dist/source/latex/pict2e/p2e-drivers.dtx b/Master/texmf-dist/source/latex/pict2e/p2e-drivers.dtx
index 3766d98fc96..fb2141ffc8d 100644
--- a/Master/texmf-dist/source/latex/pict2e/p2e-drivers.dtx
+++ b/Master/texmf-dist/source/latex/pict2e/p2e-drivers.dtx
@@ -3,9 +3,9 @@
% p2e-drivers.dtx
%
%
-% Copyright (C) 2003, 2004, 2009, 2011
-% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
-% Hubert Gaesslein, HubertJG@open.mind.de
+% Copyright (C) 2003-2016
+% Rolf Niepraschk, Rolf.Niepraschk@gmx.de
+% Hubert Gaesslein
% Josef Tkadlec, j.tkadlec@email.cz
%
%
@@ -31,6 +31,7 @@
%<dvips, >\ProvidesFile{p2e-dvips.def}
%<xdvi, >\ProvidesFile{p2e-xdvi.def}
%<pdftex, >\ProvidesFile{p2e-pdftex.def}
+%<luatex, >\ProvidesFile{p2e-luatex.def}
%<vtex, >\ProvidesFile{p2e-vtex.def}
%<dvipdfm, >\ProvidesFile{p2e-dvipdfm.def}
%<dvipdfmx, >\ProvidesFile{p2e-dvipdfmx.def}
@@ -45,7 +46,7 @@
%</driver>
%
%<cfg>\ProvidesFile{pict2e.cfg}%
- [2011/04/05 v0.1t
+ [2016/02/05 v0.1u
%<*!cfg>
Driver-dependant file (RN,HjG,JT)]
%</!cfg>
@@ -54,13 +55,13 @@
%<*driver>
\documentclass{ltxdoc}
\GetFileInfo{p2e-drivers.dtx}
- \def\docdate{2011/04/05}
+ \def\docdate{2016/02/05}
\begin{document}
\title{Graphics drivers for \textsf{pict2e}\thanks
{This document corresponds to \textsf{\filename} \fileversion,
dated \filedate, documentation dated \docdate.}}
- \author{Rolf Niepraschk\thanks{\texttt{Rolf.Niepraschk@ptb.de}},
- Hubert G\"a{\ss}lein\thanks{\texttt{HubertJG@open.mind.de}}
+ \author{Rolf Niepraschk\thanks{\texttt{Rolf.Niepraschk@gmx.de}},
+ Hubert G\"a{\ss}lein,%\thanks{\texttt{HubertJG@open.mind.de}}
\,and Josef Tkadlec\thanks{\texttt{j.tkadlec@email.cz}}}
\date{\filedate}
% \maketitle
@@ -69,7 +70,7 @@
%</driver>
% \fi
%
-% \CheckSum{122}
+% \CheckSum{166}
%
% \changes{v0.1g}{2003/11/07}{Translated documentation to English (HjG)}
% \changes{v0.1g}{2003/11/07}{Added driver \texttt{dvipdfm} (RN)}
@@ -90,6 +91,8 @@
% \changes{v0.1r}{2004/06/25}{Small fixes in documentation (HjG)}
% \changes{v0.1s}{2009/08/05}{Support for xetex added (JT)}
% \changes{v0.1t}{2011/04/05}{Support for dvipdfmx added (JT)}
+% \changes{v0.1u}{2016/02/05}{Support for luatex >0.85
+% (suggested by David Carlisle) added (RN)}
%
% \newcommand*\PS{PostScript}
% \newcommand*\PDF{PDF}
@@ -262,7 +265,7 @@
% \end{macro}
%
%
-% \subsection{pdftex}
+% \subsection{pdfTeX}
%
% A \textsf{pict2e} driver file for the \textsf{pdftex} driver.
%
@@ -295,7 +298,39 @@
% \end{macro}
%
%
-% \subsection{vtex}
+% \subsection{Lua\TeX}
+%
+% A \textsf{pict2e} driver file for the \textsf{luatex} driver.
+%
+% \begin{macro}{\pIIe@mode}
+% We are about to generate \PDF\ code.
+% (Only, if Lua\TeX\ is actually generating \PDF;
+% otherwise nothing will be output.)
+% \begin{macrocode}
+%<*luatex>
+\begingroup
+ \ifnum\outputmode>0\relax
+ \gdef\pIIe@mode{2}
+ \fi
+\endgroup
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\pIIe@code}
+% The save\slash restore operators are necessary here to prevent the
+% change of the CTM (scaling and rotation operations) that
+% \textsf{pict2e} inserts from propagating.
+% \begin{macrocode}
+\ifcase\pIIe@mode\relax \or\or
+ \def\pIIe@code#1{\pdfextension literal{ q #1 Q }}
+ \protected\edef\pIIe@pdfliteral{\pdfextension literal}
+\fi
+%</luatex>
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \subsection{V\TeX}
%
% A \textsf{pict2e} driver file for the \textsf{vtex} driver.
%
@@ -544,34 +579,50 @@
%% Select an appropriate default driver.
\begingroup
\chardef\x=0 %
- % check pdfTeX
- \@ifundefined{pdfoutput}{}{%
- \ifcase\pdfoutput
+ % check luatex
+ \ifx\luatexversion\@undefined
+ % check pdfTeX
+ \@ifundefined{pdfoutput}{}{%
+ \ifcase\pdfoutput
+ \else
+ \chardef\x=1 %
+ \fi
+ }%
+ % check VTeX
+ \@ifundefined{OpMode}{}{%
+ \chardef\x=2 %
+ }%
+ % check XeTeX
+ \@ifundefined{XeTeXrevision}{}{%
+ \chardef\x=3 %
+ }%
+ \else
+ \ifnum\luatexversion>85
+ \ifnum\outputmode>0
+ \chardef\x=4\relax
+ \fi
\else
- \chardef\x=1 %
+ \ifnum\pdfoutput>0
+ \chardef\x=1\relax
+ \fi
\fi
- }%
- % check VTeX
- \@ifundefined{OpMode}{}{%
- \chardef\x=2 %
- }%
- % check XeTeX
- \@ifundefined{XeTeXrevision}{}{%
- \chardef\x=3 %
- }%
+ \fi
\expandafter\endgroup
\ifcase\x
- % default case
+ % 0: default case
\ExecuteOptions{dvips}%
\or
- % pdfTeX is running in pdf mode
+ % 1: pdfTeX is running in pdf mode
\ExecuteOptions{pdftex}%
\or
- % VTeX is running
+ % 2: VTeX is running
\ExecuteOptions{vtex}%
-\else
- % XeTeX is running
+\or
+ % 3: XeTeX is running
\ExecuteOptions{xetex}%
+\or
+ % 4: LuaTeX (> 0.85) is running
+ \ExecuteOptions{luatex}%
\fi
% \end{macrocode}
% You can also specify other options to the \textsf{pict2e} package in
diff --git a/Master/texmf-dist/source/latex/pict2e/pict2e.dtx b/Master/texmf-dist/source/latex/pict2e/pict2e.dtx
index accb46019eb..6fe6db0c5c7 100644
--- a/Master/texmf-dist/source/latex/pict2e/pict2e.dtx
+++ b/Master/texmf-dist/source/latex/pict2e/pict2e.dtx
@@ -3,7 +3,7 @@
%
%
% Copyright (C) 2003-2016
-% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
+% Rolf Niepraschk, Rolf.Niepraschk@gmx.de
% Hubert Gaesslein
% Josef Tkadlec, j.tkadlec@email.cz
%
@@ -21,9 +21,10 @@
% This work consists of all files listed in manifest.txt.
%
%
-%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{pict2e}
-%<package> [2016/01/09 v0.2z Improved picture commands (HjG,RN,JT)]
+%<*package>
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{pict2e}[2016/02/05 v0.3b Improved picture commands (HjG,RN,JT)]
+%</package>
%
%<*driver>
\listfiles
@@ -32,7 +33,7 @@
\usepackage{pict2e} % [pstarrows]
%%\usepackage[debug]{pict2e}
\IfFileExists{ebezier.sty}{\usepackage{ebezier}}{%
- } % \providecommand*\cbezier{}
+} % \providecommand*\cbezier{}
\usepackage{color}
\usepackage{graphicx}
\usepackage{array}
@@ -43,8 +44,8 @@
top=20mm,bottom=30mm]{geometry}}{}
\IfFileExists{url.sty}{\usepackage{url}}
{\newcommand*\url[1]{\texttt{#1}}}
-\OnlyDescription
-%\AlsoImplementation
+%\OnlyDescription
+\AlsoImplementation
\EnableCrossrefs
\CodelineIndex
\RecordChanges
@@ -61,7 +62,7 @@
% \GetFileInfo{pict2e.sty}
% \def\docdate{2016/01/09}
%
-% \CheckSum{2155}
+% \CheckSum{2158}
%
% ^^A ========
%
@@ -210,7 +211,8 @@
% (2011/04/05 v0.2z). (JT)}
% \changes{v0.3a}{2016/01/09}{11th release to CTAN
% (2016/01/09 v0.3a). (JT)}
-%
+% \changes{v0.3b}{2016/02/05}{12th release to CTAN
+% (2016/02/05 v0.3b). (RN)}
%
% \DoNotIndex{\newcommand,\renewcommand,\newenvironment,\renewenvironment}
% \DoNotIndex{\providecommand,\def,\edef,\let,\gdef,\xdef,\global,\newtoks}
@@ -599,8 +601,8 @@
% corresponds to \textsf{\filename} \fileversion,
% dated \filedate, documentation dated \docdate.}}
% \author{%
-% Hubert G\"a{\ss}lein\thanks{\texttt{HubertJG@open.mind.de}},
-% Rolf Niepraschk\thanks{\texttt{Rolf.Niepraschk@ptb.de}}
+% Hubert G\"a{\ss}lein,
+% Rolf Niepraschk\thanks{\texttt{Rolf.Niepraschk@gmx.de}}
% \,and
% Josef Tkadlec\thanks{\texttt{j.tkadlec@email.cz}}}
%
@@ -695,7 +697,8 @@
% vtex & x & dvipdf & x? \\
% dvipdfm & x & textures & x? \\
% dvipdfmx& x & pctexps & x? \\
-% xetex & x & pctex32 & x? \\ \hline
+% xetex & x & pctex32 & x? \\
+% luatex ($>0.85$) & x & ~ & ~ \\ \hline
% ^^A emtex & --
% \end{tabular}
%
@@ -1536,6 +1539,7 @@
% The driver options are not much of a surprise:
% they are similar to those of the \textsf{graphics} and
% \textsf{color} packages.
+% \changes{v0.3b}{2016/02/05}{New option `luatex' (RN)}
% \begin{macrocode}
\DeclareOption{dvips}{\def\Gin@driver{dvips.def}}
\DeclareOption{xdvi}{\ExecuteOptions{dvips}}
@@ -1543,6 +1547,7 @@
\DeclareOption{dvipdfm}{\def\Gin@driver{dvipdfm.def}}
\DeclareOption{dvipdfmx}{\def\Gin@driver{dvipdfmx.def}}
\DeclareOption{pdftex}{\def\Gin@driver{pdftex.def}}
+\DeclareOption{luatex}{\def\Gin@driver{luatex.def}}
\DeclareOption{xetex}{\def\Gin@driver{xetex.def}}
\DeclareOption{dvipsone}{\def\Gin@driver{dvipsone.def}}
\DeclareOption{dviwindo}{\ExecuteOptions{dvipsone}}
@@ -2887,7 +2892,7 @@
% of ends.
% \changes{v0.1g}{2003/08/23}{Changed code (using%
% \cmd{\pIIe@add@qcircle}). (HjG,RN)}
-% \changes{v03.a}{2016/01/09}{Changed code, closepath seems to be necessary.}
+% \changes{v0.3a}{2016/01/09}{Changed code, closepath seems to be necessary.}
% \begin{macrocode}
\newcommand*\pIIe@circle[1]{%
\pIIe@qcircle[1]\z@{#1}\pIIe@qcircle \@ne{#1}%
diff --git a/Master/texmf-dist/source/latex/pict2e/pict2e.ins b/Master/texmf-dist/source/latex/pict2e/pict2e.ins
index 486c5ace00b..5e15c84c01c 100644
--- a/Master/texmf-dist/source/latex/pict2e/pict2e.ins
+++ b/Master/texmf-dist/source/latex/pict2e/pict2e.ins
@@ -1,7 +1,7 @@
%%
-%% Copyright (C) 2003, 2004, 2008, 2009, 2011
-%% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
-%% Hubert Gaesslein, HubertJG@open.mind.de
+%% Copyright (C) 2003-2016
+%% Rolf Niepraschk, Rolf.Niepraschk@gmx.de
+%% Hubert Gaesslein,
%% Josef Tkadlec, j.tkadlec@email.cz
%%
%% This file is part of the LaTeX `pict2e' package.
@@ -31,9 +31,9 @@
\preamble
-Copyright (C) 2003, 2004, 2008, 2009, 2011
-Rolf Niepraschk, Rolf.Niepraschk@ptb.de
-Hubert Gaesslein, HubertJG@open.mind.de
+Copyright (C) 2003-2016
+Rolf Niepraschk, Rolf.Niepraschk@gmx.de
+Hubert Gaesslein,
Josef Tkadlec, j.tkadlec@email.cz
This work may be distributed and/or modified under the
@@ -83,6 +83,8 @@ This work consists of all files listed in `manifest.txt'.
\from{p2e-drivers.dtx}{pctexps}}
\file{p2e-pctex32.def}{%
\from{p2e-drivers.dtx}{pctex32}}
+ \file{p2e-luatex.def}{%
+ \from{p2e-drivers.dtx}{luatex}}
}