From b0b816931ede90b5237dcb504755552bd5db7387 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 5 Feb 2016 23:35:03 +0000 Subject: pict2e (5feb16) git-svn-id: svn://tug.org/texlive/trunk@39591 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfm.def | 8 +-- .../texmf-dist/tex/latex/pict2e/p2e-dvipdfmx.def | 8 +-- Master/texmf-dist/tex/latex/pict2e/p2e-dvips.def | 8 +-- Master/texmf-dist/tex/latex/pict2e/p2e-luatex.def | 40 +++++++++++++++ Master/texmf-dist/tex/latex/pict2e/p2e-pctex32.def | 8 +-- Master/texmf-dist/tex/latex/pict2e/p2e-pctexps.def | 8 +-- Master/texmf-dist/tex/latex/pict2e/p2e-pdftex.def | 8 +-- .../texmf-dist/tex/latex/pict2e/p2e-textures.def | 8 +-- Master/texmf-dist/tex/latex/pict2e/p2e-vtex.def | 8 +-- Master/texmf-dist/tex/latex/pict2e/p2e-xetex.def | 8 +-- Master/texmf-dist/tex/latex/pict2e/pict2e.cfg | 60 ++++++++++++++-------- Master/texmf-dist/tex/latex/pict2e/pict2e.sty | 10 ++-- 12 files changed, 119 insertions(+), 63 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/pict2e/p2e-luatex.def (limited to 'Master/texmf-dist/tex/latex/pict2e') diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfm.def b/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfm.def index 0ff32159bbc..99f9e01aed7 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfm.def @@ -6,9 +6,9 @@ %% %% p2e-drivers.dtx (with options: `dvipdfm') %% -%% 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 @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-dvipdfm.def} - [2011/04/05 v0.1t + [2016/02/05 v0.1u Driver-dependant file (RN,HjG,JT)] \def\pIIe@mode{2} \def\pIIe@code#1{\special{pdf: content #1}} diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfmx.def b/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfmx.def index 78d9496622b..d784c23eebc 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfmx.def @@ -6,9 +6,9 @@ %% %% p2e-drivers.dtx (with options: `dvipdfmx') %% -%% 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 @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-dvipdfmx.def} - [2011/04/05 v0.1t + [2016/02/05 v0.1u Driver-dependant file (RN,HjG,JT)] \def\pIIe@mode{2} \def\pIIe@code#1{\special{pdf: content #1}} diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-dvips.def b/Master/texmf-dist/tex/latex/pict2e/p2e-dvips.def index 0ed1e8d8b83..e3e6aa6d0a5 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-dvips.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-dvips.def @@ -6,9 +6,9 @@ %% %% p2e-drivers.dtx (with options: `dvips') %% -%% 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 @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-dvips.def} - [2011/04/05 v0.1t + [2016/02/05 v0.1u Driver-dependant file (RN,HjG,JT)] \def\pIIe@mode{1} \def\pIIe@code#1{% diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-luatex.def b/Master/texmf-dist/tex/latex/pict2e/p2e-luatex.def new file mode 100644 index 00000000000..7b23452e2ff --- /dev/null +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-luatex.def @@ -0,0 +1,40 @@ +%% +%% This is file `p2e-luatex.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% p2e-drivers.dtx (with options: `luatex') +%% +%% 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 +%% 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 2003/12/01 or later. +%% +%% This work has the LPPL maintenance status "author-maintained". +%% +%% This work consists of all files listed in `manifest.txt'. +%% +\ProvidesFile{p2e-luatex.def} + [2016/02/05 v0.1u + Driver-dependant file (RN,HjG,JT)] +\begingroup + \ifnum\outputmode>0\relax + \gdef\pIIe@mode{2} + \fi +\endgroup +\ifcase\pIIe@mode\relax \or\or + \def\pIIe@code#1{\pdfextension literal{ q #1 Q }} + \protected\edef\pIIe@pdfliteral{\pdfextension literal} +\fi +\endinput +%% +%% End of file `p2e-luatex.def'. diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-pctex32.def b/Master/texmf-dist/tex/latex/pict2e/p2e-pctex32.def index f27cf7cad60..5f1afadeb54 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-pctex32.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-pctex32.def @@ -6,9 +6,9 @@ %% %% p2e-drivers.dtx (with options: `pctex32') %% -%% 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 @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-pctex32.def} - [2011/04/05 v0.1t + [2016/02/05 v0.1u Driver-dependant file (RN,HjG,JT)] % \def\pIIe@mode{-1} % \def\pIIe@code#1{} diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-pctexps.def b/Master/texmf-dist/tex/latex/pict2e/p2e-pctexps.def index 8a3daa8e976..325d28f708c 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-pctexps.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-pctexps.def @@ -6,9 +6,9 @@ %% %% p2e-drivers.dtx (with options: `pctexps') %% -%% 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 @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-pctexps.def} - [2011/04/05 v0.1t + [2016/02/05 v0.1u Driver-dependant file (RN,HjG,JT)] % \def\pIIe@mode{-1} % \def\pIIe@code#1{} diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-pdftex.def b/Master/texmf-dist/tex/latex/pict2e/p2e-pdftex.def index cc5a2d1c639..df09e096f43 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-pdftex.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-pdftex.def @@ -6,9 +6,9 @@ %% %% p2e-drivers.dtx (with options: `pdftex') %% -%% 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 @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-pdftex.def} - [2011/04/05 v0.1t + [2016/02/05 v0.1u Driver-dependant file (RN,HjG,JT)] \begingroup \@ifundefined{pdfoutput}{}{% diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-textures.def b/Master/texmf-dist/tex/latex/pict2e/p2e-textures.def index 1360bbbc015..57dfceca511 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-textures.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-textures.def @@ -6,9 +6,9 @@ %% %% p2e-drivers.dtx (with options: `textures') %% -%% 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 @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-textures.def} - [2011/04/05 v0.1t + [2016/02/05 v0.1u Driver-dependant file (RN,HjG,JT)] % \def\pIIe@mode{-1} % \def\pIIe@code#1{} diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-vtex.def b/Master/texmf-dist/tex/latex/pict2e/p2e-vtex.def index a20fc85ff62..a9804fe4df2 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-vtex.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-vtex.def @@ -6,9 +6,9 @@ %% %% p2e-drivers.dtx (with options: `vtex') %% -%% 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 @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-vtex.def} - [2011/04/05 v0.1t + [2016/02/05 v0.1u Driver-dependant file (RN,HjG,JT)] \begingroup \@ifundefined{VTeXversion}{}{% diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-xetex.def b/Master/texmf-dist/tex/latex/pict2e/p2e-xetex.def index e1546aa6883..00201f8d66c 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-xetex.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-xetex.def @@ -6,9 +6,9 @@ %% %% p2e-drivers.dtx (with options: `xetex') %% -%% 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 @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-xetex.def} - [2011/04/05 v0.1t + [2016/02/05 v0.1u Driver-dependant file (RN,HjG,JT)] \def\pIIe@mode{2} \def\pIIe@code#1{\special{pdf: literal q #1 Q}} diff --git a/Master/texmf-dist/tex/latex/pict2e/pict2e.cfg b/Master/texmf-dist/tex/latex/pict2e/pict2e.cfg index 5669b4eb746..81f901972ac 100644 --- a/Master/texmf-dist/tex/latex/pict2e/pict2e.cfg +++ b/Master/texmf-dist/tex/latex/pict2e/pict2e.cfg @@ -6,9 +6,9 @@ %% %% p2e-drivers.dtx (with options: `cfg') %% -%% 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 @@ -24,39 +24,55 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{pict2e.cfg}% - [2011/04/05 v0.1t + [2016/02/05 v0.1u pict2e configuration for teTeX/TeXLive] %% 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 %% \ExecuteOptions{pstarrows} \endinput diff --git a/Master/texmf-dist/tex/latex/pict2e/pict2e.sty b/Master/texmf-dist/tex/latex/pict2e/pict2e.sty index 745f5e63ddd..dc5bde7f581 100644 --- a/Master/texmf-dist/tex/latex/pict2e/pict2e.sty +++ b/Master/texmf-dist/tex/latex/pict2e/pict2e.sty @@ -6,9 +6,9 @@ %% %% pict2e.dtx (with options: `package') %% -%% 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 @@ -24,8 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{pict2e} - [2016/01/09 v0.2z Improved picture commands (HjG,RN,JT)] +\ProvidesPackage{pict2e}[2016/02/05 v0.3b Improved picture commands (HjG,RN,JT)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -47,6 +46,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}} -- cgit v1.2.3