summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/pict2e
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-01-09 22:30:43 +0000
committerKarl Berry <karl@freefriends.org>2016-01-09 22:30:43 +0000
commit64399a1600fa8e39de85e76ad4ac6511e8acf053 (patch)
tree502e17ca9c8b9a8686612ed416957a0b0da5a3f8 /Master/texmf-dist/tex/latex/pict2e
parentf750724d397d398ab52b4c0daaa3f2997fc353ba (diff)
pict2e (9jan16)
git-svn-id: svn://tug.org/texlive/trunk@39336 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pict2e')
-rw-r--r--Master/texmf-dist/tex/latex/pict2e/pict2e.sty38
1 files changed, 18 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/pict2e/pict2e.sty b/Master/texmf-dist/tex/latex/pict2e/pict2e.sty
index e4f8a364182..745f5e63ddd 100644
--- a/Master/texmf-dist/tex/latex/pict2e/pict2e.sty
+++ b/Master/texmf-dist/tex/latex/pict2e/pict2e.sty
@@ -25,7 +25,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{pict2e}
- [2014/01/12 v0.2z Improved picture commands (HjG,RN,JT)]
+ [2016/01/09 v0.2z Improved picture commands (HjG,RN,JT)]
\edef\Gin@codes{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax
\catcode`\noexpand\"\the\catcode`\"\relax
@@ -200,8 +200,9 @@
\if@tempswa
\edef\y{\pIIe@fill@op}%
\else
- \edef\x{\x\space\strip@pt\@wholewidth
- \space\pIIe@setlinewidth@op}%
+ \edef\x{\x\space
+ \strip@pt\@wholewidth\space\pIIe@setlinewidth@op
+ \pIIe@linecap\pIIe@linejoin\space}%
\edef\y{\pIIe@stroke@op}%
\fi
\expandafter\pIIe@code\expandafter{%
@@ -509,14 +510,11 @@
\ifdim\@tempdima<\z@ \pIIe@badcircarg \fi
\divide\@tempdima\tw@
\pIIe@circle\@tempdima
- \if@tempswa \pIIe@fillGraph \else \pIIe@strokeGraph \fi
+ \if@tempswa \pIIe@fillGraph \else \buttcap \pIIe@strokeGraph \fi
\endgroup}
\newcommand*\pIIe@circle[1]{%
- \begingroup
- \pIIe@buttcap
\pIIe@qcircle[1]\z@{#1}\pIIe@qcircle \@ne{#1}%
- \pIIe@qcircle \tw@{#1}\pIIe@qcircle\thr@@{#1}%
- \endgroup}
+ \pIIe@qcircle \tw@{#1}\pIIe@qcircle\thr@@{#1}\pIIe@closepath}
\newcommand*\pIIe@qcircle[3][0]{%
\begingroup
\@ovro#3\relax \@ovri0.55228474983\@ovro
@@ -726,20 +724,20 @@
\def\fillpath{\pIIe@fillGraph}
\ifcase\pIIe@mode\relax
\or
- \def\buttcap{\special{ps:: 0 setlinecap}}
- \def\roundcap{\special{ps:: 1 setlinecap}}
- \def\squarecap{\special{ps:: 2 setlinecap}}
- \def\miterjoin{\special{ps:: 0 setlinejoin}}
- \def\roundjoin{\special{ps:: 1 setlinejoin}}
- \def\beveljoin{\special{ps:: 2 setlinejoin}}
+ \newcommand*\pIIe@linecap@op{setlinecap}
+ \newcommand*\pIIe@linejoin@op{setlinejoin}
\or
- \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}}%
+ \newcommand*\pIIe@linecap@op{J}
+ \newcommand*\pIIe@linejoin@op{j}
\fi
+ \def\pIIe@linecap{}
+ \def\pIIe@linejoin{}
+ \def\buttcap{\edef\pIIe@linecap{ 0 \pIIe@linecap@op}}
+ \def\roundcap{\edef\pIIe@linecap{ 1 \pIIe@linecap@op}}
+ \def\squarecap{\edef\pIIe@linecap{ 2 \pIIe@linecap@op}}
+ \def\miterjoin{\edef\pIIe@linejoin{ 0 \pIIe@linejoin@op}}
+ \def\roundjoin{\edef\pIIe@linejoin{ 1 \pIIe@linejoin@op}}
+ \def\beveljoin{\edef\pIIe@linejoin{ 2 \pIIe@linejoin@op}}
\AtBeginDocument{\@ifundefined{cbezier}{\newcommand}{\renewcommand}*%
\cbezier[2][0]{\pIIe@@cbezier[#1]#2}%
\@ifdefinable\pIIe@@cbezier{}%