From f880ad74d5bc3708c4bf28d364e1e0551f1b652e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 Apr 2011 23:28:22 +0000 Subject: pict2e (5apr11) git-svn-id: svn://tug.org/texlive/trunk@21987 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfm.def | 4 +- .../texmf-dist/tex/latex/pict2e/p2e-dvipdfmx.def | 34 ++++++++++++++++ Master/texmf-dist/tex/latex/pict2e/p2e-dvips.def | 4 +- Master/texmf-dist/tex/latex/pict2e/p2e-pctex32.def | 4 +- Master/texmf-dist/tex/latex/pict2e/p2e-pctexps.def | 4 +- Master/texmf-dist/tex/latex/pict2e/p2e-pdftex.def | 4 +- .../texmf-dist/tex/latex/pict2e/p2e-textures.def | 4 +- Master/texmf-dist/tex/latex/pict2e/p2e-vtex.def | 4 +- Master/texmf-dist/tex/latex/pict2e/p2e-xetex.def | 5 ++- Master/texmf-dist/tex/latex/pict2e/pict2e.cfg | 4 +- Master/texmf-dist/tex/latex/pict2e/pict2e.sty | 47 +++++++++++++--------- 11 files changed, 81 insertions(+), 37 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfmx.def (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfm.def b/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfm.def index e4ec2b27300..0ff32159bbc 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfm.def @@ -6,7 +6,7 @@ %% %% p2e-drivers.dtx (with options: `dvipdfm') %% -%% Copyright (C) 2003, 2004, 2008, 2009 +%% Copyright (C) 2003, 2004, 2008, 2009, 2011 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de %% Hubert Gaesslein, HubertJG@open.mind.de %% Josef Tkadlec, j.tkadlec@email.cz @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-dvipdfm.def} - [2009/08/05 v0.1s + [2011/04/05 v0.1t 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 new file mode 100644 index 00000000000..78d9496622b --- /dev/null +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfmx.def @@ -0,0 +1,34 @@ +%% +%% This is file `p2e-dvipdfmx.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% 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 +%% 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-dvipdfmx.def} + [2011/04/05 v0.1t + Driver-dependant file (RN,HjG,JT)] +\def\pIIe@mode{2} +\def\pIIe@code#1{\special{pdf: content #1}} +\def\pIIe@pdfliteral#1{\special{pdf: literal #1}} +\endinput +%% +%% End of file `p2e-dvipdfmx.def'. diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-dvips.def b/Master/texmf-dist/tex/latex/pict2e/p2e-dvips.def index a0ac44fc9dc..0ed1e8d8b83 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-dvips.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-dvips.def @@ -6,7 +6,7 @@ %% %% p2e-drivers.dtx (with options: `dvips') %% -%% Copyright (C) 2003, 2004, 2008, 2009 +%% Copyright (C) 2003, 2004, 2008, 2009, 2011 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de %% Hubert Gaesslein, HubertJG@open.mind.de %% Josef Tkadlec, j.tkadlec@email.cz @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-dvips.def} - [2009/08/05 v0.1s + [2011/04/05 v0.1t Driver-dependant file (RN,HjG,JT)] \def\pIIe@mode{1} \def\pIIe@code#1{% diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-pctex32.def b/Master/texmf-dist/tex/latex/pict2e/p2e-pctex32.def index a621a618695..f27cf7cad60 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-pctex32.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-pctex32.def @@ -6,7 +6,7 @@ %% %% p2e-drivers.dtx (with options: `pctex32') %% -%% Copyright (C) 2003, 2004, 2008, 2009 +%% Copyright (C) 2003, 2004, 2008, 2009, 2011 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de %% Hubert Gaesslein, HubertJG@open.mind.de %% Josef Tkadlec, j.tkadlec@email.cz @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-pctex32.def} - [2009/08/05 v0.1s + [2011/04/05 v0.1t 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 50d3c813218..8a3daa8e976 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-pctexps.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-pctexps.def @@ -6,7 +6,7 @@ %% %% p2e-drivers.dtx (with options: `pctexps') %% -%% Copyright (C) 2003, 2004, 2008, 2009 +%% Copyright (C) 2003, 2004, 2008, 2009, 2011 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de %% Hubert Gaesslein, HubertJG@open.mind.de %% Josef Tkadlec, j.tkadlec@email.cz @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-pctexps.def} - [2009/08/05 v0.1s + [2011/04/05 v0.1t 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 3347fbf1c47..cc5a2d1c639 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-pdftex.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-pdftex.def @@ -6,7 +6,7 @@ %% %% p2e-drivers.dtx (with options: `pdftex') %% -%% Copyright (C) 2003, 2004, 2008, 2009 +%% Copyright (C) 2003, 2004, 2008, 2009, 2011 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de %% Hubert Gaesslein, HubertJG@open.mind.de %% Josef Tkadlec, j.tkadlec@email.cz @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-pdftex.def} - [2009/08/05 v0.1s + [2011/04/05 v0.1t 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 c7097ab1cfe..1360bbbc015 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-textures.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-textures.def @@ -6,7 +6,7 @@ %% %% p2e-drivers.dtx (with options: `textures') %% -%% Copyright (C) 2003, 2004, 2008, 2009 +%% Copyright (C) 2003, 2004, 2008, 2009, 2011 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de %% Hubert Gaesslein, HubertJG@open.mind.de %% Josef Tkadlec, j.tkadlec@email.cz @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-textures.def} - [2009/08/05 v0.1s + [2011/04/05 v0.1t 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 ef5a2e13722..a20fc85ff62 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-vtex.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-vtex.def @@ -6,7 +6,7 @@ %% %% p2e-drivers.dtx (with options: `vtex') %% -%% Copyright (C) 2003, 2004, 2008, 2009 +%% Copyright (C) 2003, 2004, 2008, 2009, 2011 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de %% Hubert Gaesslein, HubertJG@open.mind.de %% Josef Tkadlec, j.tkadlec@email.cz @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-vtex.def} - [2009/08/05 v0.1s + [2011/04/05 v0.1t 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 5a6611800ed..e1546aa6883 100644 --- a/Master/texmf-dist/tex/latex/pict2e/p2e-xetex.def +++ b/Master/texmf-dist/tex/latex/pict2e/p2e-xetex.def @@ -6,7 +6,7 @@ %% %% p2e-drivers.dtx (with options: `xetex') %% -%% Copyright (C) 2003, 2004, 2008, 2009 +%% Copyright (C) 2003, 2004, 2008, 2009, 2011 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de %% Hubert Gaesslein, HubertJG@open.mind.de %% Josef Tkadlec, j.tkadlec@email.cz @@ -24,10 +24,11 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{p2e-xetex.def} - [2009/08/05 v0.1s + [2011/04/05 v0.1t Driver-dependant file (RN,HjG,JT)] \def\pIIe@mode{2} \def\pIIe@code#1{\special{pdf: literal q #1 Q}} +\def\pIIe@pdfliteral#1{\special{pdf: literal #1}} \endinput %% %% End of file `p2e-xetex.def'. diff --git a/Master/texmf-dist/tex/latex/pict2e/pict2e.cfg b/Master/texmf-dist/tex/latex/pict2e/pict2e.cfg index 36d5a6c1467..5669b4eb746 100644 --- a/Master/texmf-dist/tex/latex/pict2e/pict2e.cfg +++ b/Master/texmf-dist/tex/latex/pict2e/pict2e.cfg @@ -6,7 +6,7 @@ %% %% p2e-drivers.dtx (with options: `cfg') %% -%% Copyright (C) 2003, 2004, 2008, 2009 +%% Copyright (C) 2003, 2004, 2008, 2009, 2011 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de %% Hubert Gaesslein, HubertJG@open.mind.de %% Josef Tkadlec, j.tkadlec@email.cz @@ -24,7 +24,7 @@ %% This work consists of all files listed in `manifest.txt'. %% \ProvidesFile{pict2e.cfg}% - [2009/08/05 v0.1s + [2011/04/05 v0.1t pict2e configuration for teTeX/TeXLive] %% Select an appropriate default driver. \begingroup diff --git a/Master/texmf-dist/tex/latex/pict2e/pict2e.sty b/Master/texmf-dist/tex/latex/pict2e/pict2e.sty index 50d676a2394..2f764d3d90a 100644 --- a/Master/texmf-dist/tex/latex/pict2e/pict2e.sty +++ b/Master/texmf-dist/tex/latex/pict2e/pict2e.sty @@ -6,7 +6,7 @@ %% %% pict2e.dtx (with options: `package') %% -%% Copyright (C) 2003, 2004, 2008, 2009 +%% Copyright (C) 2003, 2004, 2008, 2009, 2011 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de %% Hubert Gaesslein, HubertJG@open.mind.de %% Josef Tkadlec, j.tkadlec@email.cz @@ -25,7 +25,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{pict2e} - [2009/08/05 v0.2x Improved picture commands (HjG,RN,JT)] + [2011/04/05 v0.2y Improved picture commands (HjG,RN,JT)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -45,6 +45,7 @@ \DeclareOption{xdvi}{\ExecuteOptions{dvips}} \DeclareOption{dvipdf}{\def\Gin@driver{dvipdf.def}} \DeclareOption{dvipdfm}{\def\Gin@driver{dvipdfm.def}} +\DeclareOption{dvipdfmx}{\def\Gin@driver{dvipdfmx.def}} \DeclareOption{pdftex}{\def\Gin@driver{pdftex.def}} \DeclareOption{xetex}{\def\Gin@driver{xetex.def}} \DeclareOption{dvipsone}{\def\Gin@driver{dvipsone.def}} @@ -55,6 +56,23 @@ \DeclareOption{pctex32}{\def\Gin@driver{pctex32.def}} \DeclareOption{vtex}{\def\Gin@driver{vtex.def}} \DeclareOption{original}{\def\pIIe@mode{0}} +\newif\ifpIIe@pdfliteral@ok +\pIIe@pdfliteral@oktrue +\ifx\pIIe@pdfliteral\@undefined + \ifx\pdfliteral\@undefined + \pIIe@pdfliteral@okfalse + \def\pIIe@pdfliteral#1{% + \PackageWarning{pict2e}{pdfliteral not supported}% + }% + \else + \let\pIIe@pdfliteral\pdfliteral + \fi +\fi +\def\pIIe@buttcap{% + \ifpIIe@pdfliteral@ok + \buttcap + \fi +} \DeclareOption{ltxarrows}{\AtEndOfPackage{% \let\pIIe@vector=\pIIe@vector@ltx \def\pIIe@FAL{1.52}% @@ -495,7 +513,7 @@ \endgroup} \newcommand*\pIIe@circle[1]{% \begingroup - \buttcap + \pIIe@buttcap \pIIe@qcircle[1]\z@{#1}\pIIe@qcircle \@ne{#1}% \pIIe@qcircle \tw@{#1}\pIIe@qcircle\thr@@{#1}% \endgroup} @@ -540,7 +558,7 @@ \@xdim\@ovxx \advance\@xdim-\@tempdimc \@ydim\@ovyy \advance\@ydim-\@tempdimc \pIIe@get@quadrants{#3}% - \ifnum15=\@tempcnta \buttcap \fi + \ifnum15=\@tempcnta \pIIe@buttcap \fi \@tempswatrue \ifnum9=\@tempcnta \pIIe@qoval\z@{-\@ovyy}{\@xdim}{-\@ovyy}\thr@@\@tempdimc\@ovxx\z@ @@ -709,21 +727,12 @@ \def\roundjoin{\special{ps:: 1 setlinejoin}} \def\beveljoin{\special{ps:: 2 setlinejoin}} \or - \@ifundefined{XeTeXrevision}{% - \def\buttcap{\pdfliteral{0 J}}% - \def\roundcap{\pdfliteral{1 J}}% - \def\squarecap{\pdfliteral{2 J}}% - \def\miterjoin{\pdfliteral{0 j}}% - \def\roundjoin{\pdfliteral{1 j}}% - \def\beveljoin{\pdfliteral{2 j}}% - }{% - \def\buttcap{\special{pdf: literal 0 J}}% - \def\roundcap{\special{pdf: literal 1 J}}% - \def\squarecap{\special{pdf: literal 2 J}}% - \def\miterjoin{\special{pdf: literal 0 j}}% - \def\roundjoin{\special{pdf: literal 1 j}}% - \def\beveljoin{\special{pdf: literal 2 j}}% - }% + \def\buttcap{\pIIe@pdfliteral{0 J}}% + \def\roundcap{\pIIe@pdfliteral{1 J}}% + \def\squarecap{\pIIe@pdfliteral{2 J}}% + \def\miterjoin{\pIIe@pdfliteral{0 j}}% + \def\roundjoin{\pIIe@pdfliteral{1 j}}% + \def\beveljoin{\pIIe@pdfliteral{2 j}}% \fi \AtBeginDocument{\@ifundefined{cbezier}{\newcommand}{\renewcommand}*% \cbezier[2][0]{\pIIe@@cbezier[#1]#2}% -- cgit v1.2.3