From 16c738958746b33f77dbd0f4aa8ea47834f71914 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 3 Sep 2016 21:35:12 +0000 Subject: pst-bezier (3sep16) git-svn-id: svn://tug.org/texlive/trunk@41981 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/pst-bezier/pst-bezier.tex | 61 +++++++++++----------- 1 file changed, 30 insertions(+), 31 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/generic/pst-bezier/pst-bezier.tex b/Master/texmf-dist/tex/generic/pst-bezier/pst-bezier.tex index 36659287d1f..5a3a236b8c1 100644 --- a/Master/texmf-dist/tex/generic/pst-bezier/pst-bezier.tex +++ b/Master/texmf-dist/tex/generic/pst-bezier/pst-bezier.tex @@ -25,15 +25,15 @@ \ifx\PSTplotLoaded\endinput\else \input pst-plot \fi \ifx\PSTnodesLoaded\endinput\else\input pst-node \fi -\def\fileversion{0.02} -\def\filedate{2016/08/19} +\def\fileversion{0.03} +\def\filedate{2016/09/03} \message{ v\fileversion, \filedate} \edef\TheAtCode{\the\catcode`\@}\catcode`\@=11 \pst@addfams{pst-bezier} -%% We need this: +%% We need this if we do not have LaTeX: \expandafter\if\csname gobble\endcsname\relax\def\gobble#1{}\fi %% %% \newcommand is not native TeX. Therefore the following definition. @@ -189,7 +189,7 @@ %% The following macro declare the pstricks option psbcurveTension %% and set it to its default value. \define@key[psset]{pst-bezier}{bcurveTension}[0.25]{\def\psk@bcurveTension{#1}} -\psset{bcurveTension=0.25} +\psset[pst-bezier]{bcurveTension=0.25} %% Points of a spline that are not set yet %% to a certain value or action @@ -200,8 +200,8 @@ \def\psbcurve@pointSetDefaults{% \psbcurve@defIfVoid{l}{\psbcurve@ptNotDef}% \psbcurve@defIfVoid{r}{\psbcurve@ptNotDef}% - \psbcurve@defIfVoid{sl}{\code{ \psk@bcurveTension\space}}% - \psbcurve@defIfVoid{sr}{\code{ \psk@bcurveTension\space}}% + \psbcurve@defIfVoid{sl}{\code{ \psk@bcurveTension\space }}% + \psbcurve@defIfVoid{sr}{\code{ \psk@bcurveTension\space }}% \psbcurve@defIfVoid{addon}{}% } @@ -238,34 +238,34 @@ \def\psbcurve@tension#1{\futurelet\psbcurve@tmp\psbcurve@@tension} %% \def\psbcurve@@tension{% -\psbcurve@switch\psbcurve@tmp{% - l,\psbcurve@ltension,% - r,\psbcurve@rtension,% - s,\psbcurve@stension,% - \relax,\psbcurve@@@tension% + \psbcurve@switch\psbcurve@tmp{% + l,\psbcurve@ltension,% + r,\psbcurve@rtension,% + s,\psbcurve@stension,% + \relax,\psbcurve@@@tension }} %% the modifier t without further sub-modifiers \def\psbcurve@@@tension#1{% -\psbcurve@def{sr}{\code{ #1 }}% -\psbcurve@def{sl}{\code{ #1 }}% -\psbcurve@next} + \psbcurve@def{sr}{\code{ #1 }}% + \psbcurve@def{sl}{\code{ #1 }}% + \psbcurve@next} %% the modifier ts \def\psbcurve@stension#1#2{% symmetric -\psbcurve@def[-1]{sr}{\code{ #2 }}% -\psbcurve@def{sl}{\code{ #2 }}% -\psbcurve@next} + \psbcurve@def[-1]{sr}{\code{ #2 }}% + \psbcurve@def{sl}{\code{ #2 }}% + \psbcurve@next} %% the modifier tl \def\psbcurve@ltension#1#2{% left control point -\psbcurve@def{sl}{\code{ #2 }}% -\psbcurve@next} + \psbcurve@def{sl}{\code{ #2 }}% + \psbcurve@next} %% the modifier tr \def\psbcurve@rtension#1#2{% right control point -\psbcurve@def{sr}{\code{ #2 }}% -\psbcurve@next} + \psbcurve@def{sr}{\code{ #2 }}% + \psbcurve@next} %% This macro is called if the next token is %% no modifier but a point (x,y) @@ -323,13 +323,13 @@ \def\psbcurve@next{\futurelet\psbcurve@tmp\psbcurve@@next} \def\psbcurve@@next{% \psbcurve@switch\psbcurve@tmp{% -(,\psbcurve@nextPoint,%) -l,\psbcurve@lPoint,% -r,\psbcurve@rPoint,% -L,\psbcurve@LPoint,% -t,\psbcurve@tension,% -T,\psbcurve@Tension,% -\relax,\psbcurve@end}% + (,\psbcurve@nextPoint,%) + l,\psbcurve@lPoint,% + r,\psbcurve@rPoint,% + L,\psbcurve@LPoint,% + t,\psbcurve@tension,% + T,\psbcurve@Tension,% + \relax,\psbcurve@end}% } % \define@key[psset]{pst-bezier}{nPoints}{\def\psk@nPoints{#1 }} @@ -338,7 +338,7 @@ T,\psbcurve@Tension,% % valeurs par défaut % les coordonnées des points de contrôle P0= x0 y0, etc. %\psset[pst-RQBC]{P0=2 0,P1=2 2,P2=0 2,w=1 0.707 1,n=400,showPoints=true,showPolygon=false} -\psset{nPoints=400,showPolygon=false,autoTrace=false} +\psset[pst-bezier]{nPoints=400,showPolygon=false,autoTrace=false} % \def\pst@get@w#1,#2,#3\@nil{% \def\pst@@w{#1 #2 #3 }% @@ -406,8 +406,7 @@ T,\psbcurve@Tension,% \fi \fi \end@SpecialObj}\ignorespaces} - - +% \catcode`\@=\TheAtCode\relax \endinput -- cgit v1.2.3