diff options
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-bspline/README | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-bspline/pst-bspline-doc.pdf | bin | 94795 -> 88723 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-bspline/pst-bspline-doc.tex | 38 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/pst-bspline/pst-bspline.tex | 332 | ||||
| -rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 3 |
5 files changed, 173 insertions, 202 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-bspline/README b/Master/texmf-dist/doc/generic/pst-bspline/README index d1bd117b148..df0f5ffeafc 100644 --- a/Master/texmf-dist/doc/generic/pst-bspline/README +++ b/Master/texmf-dist/doc/generic/pst-bspline/README @@ -2,7 +2,7 @@ %% %% Michael Sharpe <msharpe@ucsd.edu> %% -%% Version 1.13, 2008/12/13 +%% Version 1.2, 2010/06/12 %% %% License: Free diff --git a/Master/texmf-dist/doc/generic/pst-bspline/pst-bspline-doc.pdf b/Master/texmf-dist/doc/generic/pst-bspline/pst-bspline-doc.pdf Binary files differindex c322867e406..a72c26b22c8 100644 --- a/Master/texmf-dist/doc/generic/pst-bspline/pst-bspline-doc.pdf +++ b/Master/texmf-dist/doc/generic/pst-bspline/pst-bspline-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pst-bspline/pst-bspline-doc.tex b/Master/texmf-dist/doc/generic/pst-bspline/pst-bspline-doc.tex index 5df2756a987..f991acd10e4 100644 --- a/Master/texmf-dist/doc/generic/pst-bspline/pst-bspline-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-bspline/pst-bspline-doc.tex @@ -44,7 +44,7 @@ There is another optional argument that can be applied if you wish to be able to \noindent sets the root of the naming scheme to {\tt B}, the effect of which is that the B-spline control points will be nodes of type \verb|\pnode| with names {\tt B0}, {\tt B1} and so on, the other points being similarly named {\tt BL0}, {\tt BL1}, ... , {\tt BR0}, {\tt BR1}, ... , {\tt BS0}, {\tt BS1}, ... . For example, to draw a line between {\tt BL1} and {\tt BS4}, just use \verb|\ncline(BL1)(BS4)|. -The algorithm is implemented entirely in PSTricks code, without any PostScript programming at all, depending for the most part on the flexibility of nodes, and above all the \verb|\multido| macro, which allows one to construct with relative ease items that look and feel like arrays. Use of \verb|\SpecialCoor| is essential. +The algorithm is implemented entirely in PSTricks code with PostScript specials, but no PostScript header file, depending for the most part on the flexibility of nodes, and above all the \verb|\multido| macro, which allows one to construct with relative ease items that look and feel like arrays. Use of \verb|\SpecialCoor| is essential. There is a closely related macro \verb|\psBsplineE| which removes the first and last B\'ezier segments, much as \verb|\psecurve| acts in relation to \verb|\pscurve|, allowing one one to draw B-splines with non-zero curvature at the endpoints. @@ -205,7 +205,7 @@ for the $B_k$. In matrix form, this becomes the tridiagonal system &1&4&1\\ &&\cdots&&1\\ &&&1&4\end{pmatrix} -\begin{pmatrix}B_1\\B_2\\B_3\\ \cdots\\ B_{n-1}\end{pmatrix}=§ +\begin{pmatrix}B_1\\B_2\\B_3\\ \cdots\\ B_{n-1}\end{pmatrix}=ß \begin{pmatrix}6S_1-S_0\\6S_2\\6S_3\\ \cdots\\6S_{n-1}-S_{n}\end{pmatrix} \] The LU decomposition of the tridiagonal matrix may be seen to take the form @@ -262,7 +262,7 @@ for the $B_k$, $1\le k\le n$. In matrix form, this becomes the system &1&4&1\\ &&\cdots&&1\\ 1&&&1&4\end{pmatrix} -\begin{pmatrix}B_1\\B_2\\B_3\\ \cdots\\ B_{n}\end{pmatrix}=§ +\begin{pmatrix}B_1\\B_2\\B_3\\ \cdots\\ B_{n}\end{pmatrix}=ß \begin{pmatrix}6S_1\\6S_2\\6S_3\\ \cdots\\6S_{n}\end{pmatrix} \] Let $(x_k,y_k)=6S_k$. We perform Gaussian elimination on the matrix @@ -337,9 +337,9 @@ The following example illustrates that there is a difference between \verb|\pscc \usepackage{pst-bspline,pstricks-add} \begin{document} \begin{pspicture}[showgrid=true](-.5,-.5)(6,5) -\pnodes{P}(0,1)(2,0)(5,2)(6,4)(4,5)(2,4) -\psBsplineInterpC{P}{5} -\psBsplineNodesC*[linecolor=gray!40]{PB}{5} +\pnodes{P}(0,1)(2,0)(5,2)(6,4)(4,5)(2,4)% +\psBsplineInterpC{P}{5}% +\psBsplineNodesC*[linecolor=gray!40]{PB}{5}% \psccurve[linecolor=red,showpoints=true](0,1)(2,0)(5,2)(6,4)(4,5)(2,4) \end{pspicture} \end{document} @@ -350,14 +350,32 @@ The following example illustrates that there is a difference between \verb|\pscc Slight difference between psccurve and B-spline interpolation\\ \vspace*{2pc} \begin{pspicture}[showgrid=true](-.5,-.5)(6,5) -\pnodes{P}(0,1)(2,0)(5,2)(6,4)(4,5)(2,4) -\psBsplineInterpC{P}{5} -\psBsplineNodesC*[linecolor=gray!40]{PB}{5} +\pnodes{P}(0,1)(2,0)(5,2)(6,4)(4,5)(2,4)% +\psBsplineInterpC{P}{5}% +\psBsplineNodesC*[linecolor=gray!40]{PB}{5}% \psccurve[linecolor=red,showpoints=true](0,1)(2,0)(5,2)(6,4)(4,5)(2,4) \end{pspicture} \end{center} +A B-spline curve can in many cases provide a good function interpolation mechanism, but the result is not guaranteed to be the graph of a function. +\begin{verbatim} +\begin{center} +\begin{pspicture}[showgrid=true](-.5,-.5)(6,4) +\psdots(0,3.5)(1,.5)(3,2.5)(4,0)(5,2)(6,.5) +\psaxes(0,0)(-.5,-.5)(6,4) +\psbspline(0,3.5)(1,.5)(3,2.5)(4,0)(5,2)(6,.5) +\end{pspicture} +\end{center} +\end{verbatim} + +\begin{center} +\begin{pspicture}(-.5,-.5)(6,4) +\psdots(0,3.5)(1,.5)(3,2.5)(4,0)(5,2)(6,.5) +\psbspline(0,3.5)(1,.5)(3,2.5)(4,0)(5,2)(6,.5) +\psaxes(0,0)(-.5,-.5)(6,4) +\end{pspicture} +\end{center} +\vspace{12pt} -\newpage \begin{verbatim} \documentclass{article} \usepackage{graphicx} diff --git a/Master/texmf-dist/tex/generic/pst-bspline/pst-bspline.tex b/Master/texmf-dist/tex/generic/pst-bspline/pst-bspline.tex index 398a42827d1..633a463f474 100644 --- a/Master/texmf-dist/tex/generic/pst-bspline/pst-bspline.tex +++ b/Master/texmf-dist/tex/generic/pst-bspline/pst-bspline.tex @@ -1,63 +1,24 @@ %% BEGIN pst-bspline.tex %% Author: Michael Sharpe (msharpe at ucsd.edu) -\def\fileversion{1.13} -\def\filedate{2008/12/13} +\def\fileversion{1.2} +\def\filedate{2010/06/12} %% -\message{ v\fileversion, \filedate} +%\message{ v\fileversion, \filedate} \csname PSTBsplineLoaded\endcsname \let\PSTBsplineLoaded\endinput +\ProvidesFile{pst-bspline.tex}[\filedate\space v\fileversion\space Bspline routines for pstricks] \ifx\PSTnodesLoaded\endinput\else\input pst-node.tex \fi\relax \edef\TheAtCode{\the\catcode`\@}\catcode`\@=11 % -% Utility macros -% Build the linear combination #3[1]]*#1+#3[[2]]*#2=#4 -% #4 can be same as #1, #2 or #3--eg, \psLCNodeVar(A)(B)(3,4){A}. -% #3 may use Postscript code -\def\psLCNodeVar(#1)(#2)(#3)#4{% -\pst@getcoor{#1}\pst@tempA% -\pst@getcoor{#2}\pst@tempB% -\pnode(#3){tmpLCn@de}% -\pnode(!% - \pst@tempA /YA exch \pst@number\psyunit div def - /XA exch \pst@number\psxunit div def - \pst@tempB /YB exch \pst@number\psyunit div def - /XB exch \pst@number\psxunit div def %stack now empty - \psGetNodeCenter{tmpLCn@de}\space - XA tmpLCn@de.x mul XB tmpLCn@de.y mul add - YA tmpLCn@de.x mul YB tmpLCn@de.y mul add){tmpLCn@deA}% -\pnode(tmpLCn@deA){#4}% -} -% Useful for debugging a node location -\def\shownode(#1){%display node user coords in console -\pnode(! /nodecoors 2 array def \psGetNodeCenter{#1} - nodecoors 1 #1.y put nodecoors 0 #1.x put end nodecoors == #1.x #1.y ){temp@} -} -% Use to construct a sequence of nodes -% Eg, \pnodes{P}(0,1)(2;5)(3,4) defines nodes P0, P1, P2 with respective locations -\def\pnodes#1{% -\newcount\bsp@args\bsp@args=0\relax% -\def\bsp@root{#1}% -\next@Node}% -% -\def\next@Node{\@ifnextchar({\next@Node@i}{\advance\bsp@args by -1\typeout{Defined nodes \bsp@root0 .. \bsp@root\the\bsp@args.}}}% -% -\def\next@Node@i(#1){% -\pnode(#1){\bsp@root\the\bsp@args}% -\advance\bsp@args by 1\relax% -\next@Node} -% -%\def\nextpt#1#2#3{\typeout{Next points:#1:#2:#3:}} -\def\nextfour#1#2#3#4{\newwrite\foo \immediate\openout\foo=foo.txt \immediate\write\foo{Next chars:#1:#2:#3:#4:}\closeout\foo} -%end utility macros -\newcount\PST@args%used in several macros +%\newcount\pst@args%used in several macros--now defined in pst-node.tex \def\PST@root{} \newcount\bsp@args \newcount\bsp@cntA \newcount\bsp@cntB \newif\ifbsp@omitends \newif\ifbsp@closed -\newif\ifbsp@showpoints -\newif\ifbsp@doubleline +%\newif\ifbsp@showpoints +%\newif\ifbsp@doubleline \newif\ifbsp@seq % \def\bsp@init{%these items are used only within the plotting macros @@ -65,217 +26,207 @@ \def\bsp@arrowB{}% }% \def\refreshbspopts{% -\bsp@doublelinefalse -\bsp@closedfalse -\bsp@showpointsfalse -\bsp@omitendsfalse -\bsp@seqfalse +\bsp@closedfalse% +\bsp@omitendsfalse% +\bsp@seqfalse% }% -\def\saveparams{ -\let\save@linecolor\pslinecolor -% \let\save@arrowA\psk@arrowA -% \let\save@arrowB\psk@arrowB - \let\save@linestyle\pslinestyle} -\def\restoreparams{% settings for linestyle, arrows, linecolor may have changed - \let\pslinecolor\save@linecolor -% \let\psk@arrowA\save@arrowA -% \let\psk@arrowB\save@arrowB - \let\pslinestyle\save@linestyle} % showframe key and its default are global -\newif\ifshowframe -\def\psset@showframe#1{\@nameuse{showframe#1}} -\psset@showframe{false} +\newif\ifshowframe% +\def\psset@showframe#1{\@nameuse{showframe#1}}% +\psset@showframe{false}% % %Bspline drawing macros -\def\psBsplineNodes{\pst@object{psBsplineNodes}}% -\def\psBsplineNodesC{\pst@object{psBsplineCNodes}}% -\def\psBsplineNodesE{\pst@object{psBsplineENodes}}% -\def\psBsplineC{\pst@object{psBsplineC}}% -\def\psBsplineE{\pst@object{psBsplineE}}% -\def\psBspline{\pst@object{psBspline}}% +\def\psBsplineNodes{\def\pst@par{}\pst@object{psBsplineNodes}}% +\def\psBsplineNodesC{\def\pst@par{}\pst@object{psBsplineCNodes}}% +\def\psBsplineNodesE{\def\pst@par{}\pst@object{psBsplineENodes}}% +\def\psBsplineC{\def\pst@par{}\pst@object{psBsplineC}}% +\def\psBsplineE{\def\pst@par{}\pst@object{psBsplineE}}% +\def\psBspline{\def\pst@par{}\pst@object{psBspline}}% %Bspline internal macros, level 1 -\def\psBsplineC@i{\bsp@init\refreshbspopts\bsp@closedtrue\ps@bspline} -\def\psBsplineE@i{\bsp@init\refreshbspopts\bsp@omitendstrue\ps@bspline} -\def\psBspline@i{\bsp@init\refreshbspopts\ps@bspline} -\def\psBsplineNodes@i{\bsp@init\refreshbspopts\bsp@seqtrue\ps@bsplineNodes} -\def\psBsplineCNodes@i{\bsp@init\refreshbspopts\bsp@seqtrue\bsp@closedtrue\ps@bsplineNodes} -\def\psBsplineENodes@i{\bsp@init\refreshbspopts\bsp@seqtrue\bsp@omitendstrue\ps@bsplineNodes} +\def\psBsplineC@i{\bsp@init\refreshbspopts\bsp@closedtrue\ps@bspline}% +\def\psBsplineE@i{\bsp@init\refreshbspopts\bsp@omitendstrue\ps@bspline}% +\def\psBspline@i{\bsp@init\refreshbspopts\ps@bspline}% +\def\psBsplineNodes@i{\bsp@init\refreshbspopts\bsp@seqtrue\ps@bsplineNodes}% +\def\psBsplineCNodes@i{\bsp@init\refreshbspopts\bsp@seqtrue\bsp@closedtrue% +\ps@bsplineNodes}% +\def\psBsplineENodes@i{\bsp@init\refreshbspopts\bsp@seqtrue\bsp@omitendstrue% +\ps@bsplineNodes}% %Bspline internal macros, level 2 \def\ps@bsplineNodes#1#2{%noderoot, endindex -\def\bsp@root{#1} -\bsp@args=#2 -\psBsplineMain} +\def\bsp@root{#1}% +\bsp@args=#2\relax% +\next@Point% +}% % \def\ps@bspline{\bsp@args=0\relax% -\@ifnextchar({\psBspline@read{pn@de}}{\psBspline@read}} +\@ifnextchar({\psBspline@read{pn@de}}{\psBspline@read}}% % \def\psBspline@read#1{% \def\bsp@root{#1}% -%\show\bsp@root -\psBsplineMain}% +\next@Point% +}% % -\def\psBsplineMain{% - \ifshowpoints \bsp@showpointstrue \fi% +\def\next@Point{\@ifnextchar({\next@Point@i}{\psBsplineMain}}% +\def\next@Point@i(#1){% +\pnode(#1){\bsp@root\the\bsp@args}% +\advance\bsp@args by \@ne% +\next@Point}% +% The main drawing routine +\def\psBsplineMain{%done reading nodes +\pst@killglue% +\begingroup% +\use@par% \ifbsp@closed\begin@ClosedObj \else \begin@OpenObj \fi% -% \ifshowpoints \bsp@showpointstrue \showpointsfalse \fi -\ifpsdoubleline \bsp@doublelinetrue \fi% \let\bsp@linecolor\pslinecolor% \let\bsp@arrowA\psk@arrowA% \let\bsp@arrowB\psk@arrowB% \let\bsp@linestyle\pslinestyle% -%\tracingcommands=2\tracingmacros=2 -%\ifbsp@seq\next@Point@ii \else -\next@Point%omit the \fi or it becomes the nextchar -}% -% -\def\next@Point{\@ifnextchar({\next@Point@i}{\next@Point@ii}}% -\def\next@Point@i(#1){% -\pnode(#1){\bsp@root\the\bsp@args} -\advance\bsp@args by 1 \relax -\next@Point} -\def\next@Point@ii{%done reading nodes -%\tracingcommands=0\tracingmacros=0 -\ifbsp@seq\advance\bsp@args by 1\fi -\ifbsp@closed - \psset{doubleline=false} - \pnode(\bsp@root0){\bsp@root\the\bsp@args} - \advance\bsp@args by 1 \relax - \pnode(\bsp@root1){\bsp@root\the\bsp@args} - \advance\bsp@args by 1 \relax -\fi -\advance\bsp@args by -1 +\ifbsp@seq\advance\bsp@args by \@ne\fi% +\ifbsp@closed% + \psset{doubleline=false}% + \pnode(\bsp@root0){\bsp@root\the\bsp@args}% + \advance\bsp@args by \@ne% + \pnode(\bsp@root1){\bsp@root\the\bsp@args}% + \advance\bsp@args by \@ne% +\fi% +\advance\bsp@args by \m@ne% % Define the left and right bezier control points in each interval. These are % denoted (root+) R0, L1, R1, L2, R2, etc -\ifshowframe - \psset{linestyle=dashed,linecolor=gray,arrows=*-*} -\else - \psset{linestyle=none,linecolor=white,arrows=-} -\fi -%2008/9/20---change \ncline{*-*} to just \ncline -\multido{\ia=0+1,\ib=1+1}{\bsp@args}{\ncline{\bsp@root\ia}{\bsp@root\ib}\ncput[npos=.3333]{\pnode{\bsp@root R\ia}}\ncput[npos=.6667]{\pnode{\bsp@root L\ib}}} +\multido{\ia=0+1,\ib=1+1}{\bsp@args}{% +\ifshowframe% + \ncline[linestyle=dashed,linecolor=gray,arrows=*-*]{\bsp@root\ia}{\bsp@root\ib}% +\fi% + \nodexn{.667(\bsp@root\ia)+.333(\bsp@root\ib)}{\bsp@root R\ia}% + \nodexn{.333(\bsp@root\ia)+.667(\bsp@root\ib)}{\bsp@root L\ib}% + }% %Finally, define the bezier endpoints for each interval -\advance\bsp@args by -1 -\ifshowframe - \psset{linestyle=solid,linecolor=red} -\else - \psset{linestyle=none,linecolor=white} -\fi -%2008/9/20---change \ncline{*-*} to just \ncline -\mmultido{\ia=0+1}{\bsp@args}{\ncline{\bsp@root L\ia}{\bsp@root R\ia}\ncput[npos=.5]{\pnode{\bsp@root S\ia}}\ifshowframe \psdot[linecolor=red](\bsp@root S\ia)\fi -} -% -\ifbsp@closed - \pnode(\bsp@root S\the\bsp@args){\bsp@root S0} - \else - \advance\bsp@args by 1 \relax - \pnode(\bsp@root0){\bsp@root S0} - \pnode(\bsp@root\the\bsp@args){\bsp@root S\the\bsp@args} - \fi -\advance\bsp@args by -1 \relax +\advance\bsp@args by \m@ne% +\mmultido{\ia=0+1}{\bsp@args}{% +\ifshowframe% + \ncline[linestyle=solid,linecolor=red]{\bsp@root L\ia}{\bsp@root R\ia}% +\fi% +\midAB(\bsp@root L\ia)(\bsp@root R\ia){\bsp@root S\ia}% +\ifshowframe% + \psdot[linecolor=red](\bsp@root S\ia)% +\fi% +}% +\ifbsp@closed% + \pnode(\bsp@root S\the\bsp@args){\bsp@root S0}% + \else% + \advance\bsp@args by \@ne% + \pnode(\bsp@root0){\bsp@root S0}% + \pnode(\bsp@root\the\bsp@args){\bsp@root S\the\bsp@args}% + \fi% +\advance\bsp@args by \m@ne% %the pieces of bezier curve -\let\pslinecolor\bsp@linecolor -\let\pslinestyle\bsp@linestyle -\ifbsp@closed +\ifbsp@closed% \pscustom[arrows=-]{% -\psbezier[showpoints=false](\bsp@root S0)(\bsp@root R0)(\bsp@root L1)(\bsp@root S1) -\multido{\ia=1+1,\ib=2+1}{\bsp@args}{\psbezier(\bsp@root R\ia)(\bsp@root L\ib)(\bsp@root S\ib)}%within \pscustom, \psbezier takes 3 args, using last point of previous +\psbezier[showpoints=false](\bsp@root S0)(\bsp@root R0)(\bsp@root L1)(\bsp@root S1)% +\multido{\ia=1+1,\ib=2+1}{\bsp@args}{\psbezier(\bsp@root R\ia)(\bsp@root L\ib)% +(\bsp@root S\ib)}% +%within \pscustom, \psbezier takes 3 args, using last point of previous }% \else %open curve---make arrows, don't use \pscustom - \ifbsp@doubleline \psset{doubleline=true} \fi - \advance\bsp@args by -1 - \ifbsp@omitends \bsp@cntA=2 \bsp@cntB=1 \advance\bsp@args by -2 \else \bsp@cntA=1\bsp@cntB=0 \fi - \psbezier[arrows=-\bsp@arrowA,showpoints=flse](\bsp@root S\the\bsp@cntA)(\bsp@root L\the\bsp@cntA)(\bsp@root R\the\bsp@cntB)(\bsp@root S\the\bsp@cntB) - \mmultido{\ia=\the\bsp@cntA+1,\ib=\the\bsp@cntB+1}{\bsp@args}{\psbezier[arrows=-,showpoints=false](\bsp@root S\ib)(\bsp@root R\ib)(\bsp@root L\ia)(\bsp@root S\ia)} + \advance\bsp@args by \m@ne% + \ifbsp@omitends \bsp@cntA=2\relax \bsp@cntB=\@ne \advance\bsp@args by -2\relax% + \else \bsp@cntA=\@ne\bsp@cntB=\z@ \fi% + \psbezier[arrows=-\bsp@arrowA,showpoints=false](\bsp@root S\the\bsp@cntA)% + (\bsp@root L\the\bsp@cntA)(\bsp@root R\the\bsp@cntB)(\bsp@root S\the\bsp@cntB)% + \mmultido{\ia=\the\bsp@cntA+1,\ib=\the\bsp@cntB+1}{\bsp@args}% + {\psbezier[arrows=-,showpoints=false](\bsp@root S\ib)(\bsp@root R\ib)% + (\bsp@root L\ia)(\bsp@root S\ia)}% % - \ifbsp@omitends \advance\bsp@args by 1 \fi - \advance\bsp@args by 1 \relax - \bsp@cntA=\bsp@args - \bsp@cntB=\bsp@cntA - \advance\bsp@cntB by 1 \relax - \psbezier[arrows=-\bsp@arrowB,showpoints=false](\bsp@root S\the\bsp@cntA)(\bsp@root R\the\bsp@cntA)(\bsp@root L\the\bsp@cntB)(\bsp@root S\the\bsp@cntB) - \ifshowframe \psdot[linecolor=red](\bsp@root L\the\bsp@cntB) \fi -\fi % end \ifbsp@closed -\ifshowframe - \psdot[linecolor=red](\bsp@root R0) - \psdot[linecolor=red](\bsp@root L\the\bsp@args) -\fi -\ifshowpoints - \multido{\i=0+1}{\bsp@args}{\psdot(\bsp@root S\i)} -\fi - \ifbsp@closed + \ifbsp@omitends \advance\bsp@args by \@ne \fi% + \advance\bsp@args by \@ne% + \bsp@cntA=\bsp@args% + \bsp@cntB=\bsp@cntA% + \advance\bsp@cntB by \@ne% + \psbezier[arrows=-\bsp@arrowB,showpoints=false](\bsp@root S\the\bsp@cntA)% + (\bsp@root R\the\bsp@cntA)(\bsp@root L\the\bsp@cntB)(\bsp@root S\the\bsp@cntB)% + \ifshowframe \psdot[linecolor=red](\bsp@root L\the\bsp@cntB) \fi% +\fi% end \ifbsp@closed +\ifshowframe% + \psdot[linecolor=red](\bsp@root R0)% + \psdot[linecolor=red](\bsp@root L\the\bsp@args)% +\fi% +\ifshowpoints% + \multido{\i=0+1}{\bsp@args}{\psdot(\bsp@root S\i)}% +\fi% + \ifbsp@closed% \end@ClosedObj% - \else + \else% \end@OpenObj% - \fi -\ifbsp@showpoints \showpointstrue \fi -%\restoreparams -\ignorespaces + \fi% +\endgroup% +\ignorespaces% } % -\def\psbspline{\pst@object{psbspline}}% +\def\psbspline{\def\pst@par{}\pst@object{psbspline}}% \def\psbspline@i{\pst@getarrows\psbspline@ii}% \def\psbspline@ii{% \pnodesX%make the following sequences into nodes named S@0,... -%last index=\PST@args +%last index=\pst@args }% \def\psbspline@iii{% -\psBsplineInterp{S@}{\the\PST@args}%creates S@B0... +\pst@killglue% +\psBsplineInterp{S@}{\the\pst@args}%creates S@B0... \begingroup% \use@par% -\psBsplineNodes{S@B}{\the\PST@args}%draw curve -\endgroup}% +\psBsplineNodes{S@B}{\the\pst@args}%draw curve +\endgroup\ignorespaces}% % \def\pnodesX{%version of \pnodes where the last step moves to \psbspline@iii -\PST@args=0\relax% +\pst@args=\z@% \def\PST@root{S@}% \next@NodeX}% % -\def\next@NodeX{\@ifnextchar({\next@NodeX@i}{\advance\PST@args by -1\typeout{Defined nodes \PST@root0 .. \PST@root\the\PST@args.}\psbspline@iii}}% +\def\next@NodeX{\@ifnextchar({\next@NodeX@i}{\advance\pst@args by \m@ne\typeout{Defined nodes \PST@root0 .. \PST@root\the\pst@args.}\psbspline@iii}}% % \def\next@NodeX@i(#1){% -\pnode(#1){\PST@root\the\PST@args}% -\advance\PST@args by 1\relax% -\next@NodeX} +\pnode(#1){\PST@root\the\pst@args}% +\advance\pst@args\@ne% +\next@NodeX}% % \def\make@mcoeff#1{% -\pstVerb{ /mcoeff #1\space 1 add array def - mcoeff 1 0.25 put - 1 1 #1\space 1 sub +\pstVerb{ /mcoeff #1\space 1 add array def % + mcoeff 1 0.25 put % + 1 1 #1\space 1 sub % {/j exch def %j is counter - mcoeff j 1 add 1 4 mcoeff j get sub div put } for }} + mcoeff j 1 add 1 4 mcoeff j get sub div put } for }}% % - \def\psBsplineInterp#1#2{% - % #1=node name root to interpolate, #2=end index, - % eg, if we want to interpolate S0,..., S100, #1=S, #2=100, +\def\psBsplineInterp#1#2{% +% #1=node name root to interpolate, #2=end index, +% eg, if we want to interpolate S0,..., S100, #1=S, #2=100, \newcount\top@mone \top@mone=#2\relax%100 \newcount\top@ndx \top@ndx=\top@mone% \advance\top@ndx by -1\relax%99 \advance\top@mone by -2\relax%98 -\newcount\top@mtwo \top@mtwo=\top@mone \advance\top@mtwo by -1\relax%97 +\newcount\top@mtwo \top@mtwo=\top@mone \advance\top@mtwo by \m@ne%97 \make@mcoeff{#2}% \def\noderoot{#1}% \pnode(\noderoot 0){\noderoot B0}% \pnode(\noderoot #2){\noderoot B#2}% \psLCNode(\noderoot 1){6}(\noderoot 0){-1}{\noderoot B1}% 6*S1-S0->SB1 \multido{\iA=2+1,\iAA=1+1}{\top@mone}{\psLCNodeVar(\noderoot\iA)(\noderoot B\iAA)(! 6 mcoeff \iAA\space get neg ){\noderoot B\iA}}%2 to n-2, 6*S_k-m_{k-1}*SB_{k-1}->SB_k -\psLCNodeVar(\noderoot \the\top@ndx)(\noderoot #2)(! mcoeff \the\top@ndx\space get dup 6 mul exch neg ){tmp@node} %m_{99}*(6*S99-S100)->tmp@node +\psLCNodeVar(\noderoot \the\top@ndx)(\noderoot #2)(! mcoeff \the\top@ndx\space get dup 6 mul exch neg ){tmp@node}%m_{99}*(6*S99-S100)->tmp@node \psLCNodeVar(tmp@node)(\noderoot B\the\top@mone)(! 1 mcoeff \the\top@ndx\space get mcoeff \the\top@mone\space get mul neg ){\noderoot B\the\top@ndx}% temp@node -m_{98}*m_{99}*SB98->SB99 \multido{\iA=\the\top@mone+-1,\iAA=\the\top@ndx+-1}{\the\top@mone}{\psLCNodeVar(\noderoot B\iA)(\noderoot B\iAA)(! mcoeff \iA\space get dup neg ){\noderoot B\iA}% m_k*SB_k-m_k*SB_{k+1}->SB_k, k=98 downto 1 }% end multido }% end def - \def\psBsplineInterpC#1#2{% +\def\psBsplineInterpC#1#2{% % #1=node name root, #2=top index, % eg, if we want to interpolate S0,..., S100, #1=100, #2=S % interpolation in this case is periodic (closed curve) -\newcount\top@mone \top@mone=#2 % +\pst@killglue +\newcount\top@mone \top@mone=#2\relax% \newcount\top@ndx \top@ndx=\top@mone% -\advance\top@ndx by 1\relax%number of nodes to interpolate -\newcount\top@mtwo \top@mtwo=\top@mone \advance\top@mtwo by -1\relax% +\advance\top@ndx by \@ne%number of nodes to interpolate +\newcount\top@mtwo \top@mtwo=\top@mone \advance\top@mtwo\m@ne% % After copying S0 to S101, \top@ndx, \top@mone, \top@mtwo are top index, top index-1, top index-two---101, 100, 99 in the example \make@mcoeff{\the\top@ndx}% \def\noderoot{#1}% \pstVerb{ /bcoeff #2\space 2 add array def /ccoeff #2\space 2 add array def /xcoeff #2\space 2 add array def /ycoeff #2\space 2 add array def -% initialize b, c, x ,y values +%% initialize b, c, x ,y values 1 1 \the\top@ndx\space %1 add {/j exch def %j is counter ccoeff j 0 put bcoeff j 0 put } for @@ -283,7 +234,7 @@ bcoeff 1 1 put bcoeff #2\space 1 put bcoeff #2\space 1 add 4 put ccoeff 1 0.25 put ccoeff #2\space 1 put }% %end \pstVerb \pnode(\noderoot 0){\noderoot\the\top@ndx}%copy node 0 to top end -%\pstVerb{ xcoeff 1 1 put ycoeff 1 1.5 put } +\pstVerb{ xcoeff 1 1 put ycoeff 1 1.5 put } \pnode(! \psGetNodeCenter{\noderoot 1} xcoeff 1 \noderoot 1.x 1.5 mul put ycoeff 1 \noderoot 1.y 1.5 mul put 1 1){temp@}% 1.5=6*0.25 \multido{\iA=2+1}{\the\top@mone}{\pnode(! ycoeff \iA\space xcoeff \iA\space \psGetNodeCenter{#1\iA} #1\iA.x 6 mul put #1\iA.y 6 mul put 1 1){temp@}}% move x, y coords times 6 to arrays \multido{\iA=2+1,\iB=1+1}{\the\top@mtwo}{\pstVerb{% @@ -308,8 +259,9 @@ ycoeff \the\top@mone\space ycoeff \the\top@mone\space get ycoeff \the\top@ndx\sp \pstVerb{ xcoeff \iA\space xcoeff \iA\space get mcoeff \iA\space get xcoeff \iB\space get mul sub ccoeff \iA\space get xcoeff \the\top@ndx\space get mul sub put % x(k)=x(k)-m(k)*x(k+1)-c(k)*x(n) ycoeff \iA\space ycoeff \iA\space get mcoeff \iA\space get ycoeff \iB\space get mul sub ccoeff \iA\space get ycoeff \the\top@ndx\space get mul sub put }}%y(k)=... -\multido{\iA=1+1}{\the\top@ndx}{\pnode(! xcoeff \iA\space get ycoeff \iA\space get ){\noderoot B\iA}}% +\multido{\iA=1+1}{\the\top@ndx}{\pnode(! xcoeff \iA\space get ycoeff \iA\space get )% +{\noderoot B\iA}}% \pnode(\noderoot B\the\top@ndx){\noderoot B0}% -} +\ignorespaces}% \catcode`\@=\TheAtCode\relax \endinput
\ No newline at end of file diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index d186b198027..a8bfd2bd2b3 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -133,6 +133,7 @@ $Master = "$mydir/../.."; 'cassette', "die 'skipping, nonfree license'", 'cassette-shipunov', "die 'skipping, use shipunov'", 'cassette209', "die 'skipping, latex 2.09'", + 'casslbl', "die 'skipping, license unclear, ancient'", 'catalogue', "die 'skipping, goes stale too soon'", 'cbfonts', "&MAKEflatten", 'cc-pl', "&MAKEflatten", @@ -641,7 +642,7 @@ $Master = "$mydir/../.."; 'tkz-tab', "&MAKEflatten", 'tolkienfonts',"die 'skipping, ttf fonts which are not packaged'", 'tpcmfont', "die 'skipping, ?'", - 'translator', "&MAKEflatten", + 'translator', "die 'skipping, now part of beamer'", 'turkishintro',"die 'skipping, nosource'", 'turnstile', "&MAKEflatten", 'tpx', "die 'skipping, nosource, Windows'", |