pst-text update (11dec08)

git-svn-id: svn://tug.org/texlive/trunk@11596 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 178 insertions, 210 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.bib b/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.bib
index 04745cd2ae2..cf3e360a431 100644
--- a/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.bib
@@ -3,11 +3,11 @@
 @STRING{dtk	= {{D}ie {\TeX}nische {K}om{\"o}die} }
 
 @Book{companion,
-  author	= {Michel Goosens and Frank Mittelbach and Alexander
-		  Samarin},
+  author	= {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Vo\ss},
   title		= {The {\LaTeX} {G}raphics {C}ompanion},
   publisher	= {{Addison-Wesley Publishing Company}},
-  year		= {1997},
+  edition	= {second},
+  year		= {2007},
   address	= {Reading, Mass.}
 }
 
@@ -40,24 +40,6 @@
   year           = 1989,
 }
 
-@Manual{pstricks,
-  Title          = {PSTricks - {\PS} macros for generic {\TeX}},
-  Author         = {{Timothy Van} Zandt},
-  Organization   = {},
-  Address        = {\url{http://www.tug.org/application/PSTricks}},
-  Note           = {},
-  year           = 1993
-}
-
-@Manual{pst-coil,
-  Title          = {\texttt{pst-coil}: Coils and zigzags},
-  Author         = {{Timothy Van} Zandt},
-  Organization   = {},
-  Address        = {\url{CTAN:graphics/pstricks/generic/}},
-  Note           = {},
-  year           = 1999
-}
-
 @Manual{multido,
   Title          = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
   Author         = {{Timothy Van} Zandt},
@@ -70,9 +52,9 @@
 @Book{PSTricks2,
   author	= {Herbert Vo\ss{}},
   title		= {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
-  edition	= {third},
+  edition	= {fifth},
   publisher	= {DANTE -- Lehmanns},
-  year		= {2006},
+  year		= {2008},
   address	= {Heidelberg/Hamburg}
 }
 
diff --git a/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.pdf b/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.pdf
index fe6df784704..c09315682e7 100644
--- a/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.tex b/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.tex
index 8c068aba7b2..ccd11a4fd31 100644
--- a/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.tex
@@ -1,85 +1,54 @@
-\documentclass[english]{article}
+%% $Id: pst-func-doc.tex 64 2008-12-08 22:14:27Z herbert $
+\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
+    headexclude,footexclude,oneside]{pst-doc}
+\usepackage[utf8]{inputenc}
+\usepackage{pst-plot,pst-text,pst-grad}
+\let\pstTextFV\fileversion
+\lstset{pos=t,language=PSTricks,
+    morekeywords={psGammaDist,psChiIIDist,psTDist,psFDist,psBetaDist,psPlotImpl},basicstyle=\footnotesize\ttfamily}
 %
-\usepackage[T1]{fontenc}
-\usepackage[latin9]{inputenc}
-\listfiles
-\usepackage[scaled]{luximono}
-\usepackage{lmodern}
-\usepackage{xspace}
-\usepackage[bottom]{footmisc}
-\usepackage{tabularx}
-\usepackage{longtable,setspace}
-\usepackage[NewCommands,NewParameters]{ragged2e}
-\usepackage[dvipsnames]{pstricks}
-\usepackage{pst-plot}
-\usepackage{pst-text,pst-grad}
-%
-\def\PST{{\texttt{PSTricks}}\xspace}
-\def\PDF{{\texttt{PDF}}\xspace}
-\def\pst{{\texttt{pstricks}}\xspace}
-\def\PS{PostScript\xspace}
-\newcommand*\CMD[1]{{\UrlFont\texttt{\textbackslash #1}}}
-%
-\def\tIndex#1{\index{#1@{\UrlFont\texttt{#1}}}}
-\def\cIndex#1{\index{#1@\CMD{#1}}}
-\def\pIndex#1{\index{Parameter@\textbf{Parameter}!{\UrlFont\texttt{#1}}}}
-\def\ppIndex#1{\index{Parameter@\textbf{Parameter}!{#1}}}
-\def\sIndex#1{\index{Syntax@\textbf{Syntax}!\CMD{#1}}}
-\def\csIndex#1{\sIndex{#1}\cIndex{#1}}
-\def\PIndex#1{\index{Paket@\textbf{Paket}!\texttt{#1}}}
-\def\mIndex#1{\texttt{#1}\tIndex{#1}\pIndex{#1}}
-%
-\pretolerance=500
-\tolerance=1000 
-\hbadness=3000
-\vbadness=3000
-\hyphenpenalty=400
-
-\usepackage{showexpl}% not a real PSTricks package
-\usepackage{babel}
-\usepackage{makeidx}
-\makeindex
-\usepackage[dvips,colorlinks,linktocpage]{hyperref} % PDF-support
-%
-\renewcommand{\ttdefault}{ul9}% Luxi Mono
-\lstset{keywordstyle=\small\fontfamily{ul9}\bfseries} 
-\lstset{language=PSTricks,moredelim=**[is][\bf\color{blue}]{§}{§}}% oder andere Begrenzer
-%
-
 \begin{document}
-%
-\title{\texttt{pst-text}: Manipulate text and characters}
-\author{Herbert Voß\thanks{Thanks to Lars Kotthoff and Geoff Mercer for translating this documentation!}}
+
+\title{\texttt{pst-text}}
+\subtitle{Manipulate text and characters; v.\pstTextFV}
+\author{Timothy Van Zandt\\Herbert Vo\ss}
+\docauthor{Herbert Vo\ss}
+\date{\today}
 \maketitle
 
+\tableofcontents
+
+\clearpage% 
+
 \begin{abstract}
-\PS principally does not know lines in the proper meaning of the word, but only
+In general \PS does not know lines in the proper meaning of the word, but only
 paths\index{path} and those can have any arbitrary form. Along such paths
 arbitrary text may be arranged. The package
-\verb+pst-text+\tIndex{pst-text} supports the setting of text along a path
+\LPack{pst-text} supports the setting of text along a path
 and other character manipulations, where several characters 
 naturally result in a text again of course.
 
-It should be noted that the correct result is not guaranteed with every  \verb+DVI-PS+\tIndex{DVI-PS} driver.
+It should be noted that the correct result is not guaranteed with every \Lprog{dvips} driver.
 This package was written for Rokicki's\index{Rokicki} 
-\verb+dvips+\tIndex{dvips} programme, which is practically part of every \TeX{}
+\Lprog{dvips} programme, which is practically part of every \TeX{}
 distribution.
-\end{abstract}
 
-\tableofcontents
+\vfill
+Thanks to: Lars Kotthoff, Geoff Mercer
+\end{abstract}
 
 \clearpage
 
 % ---------------------------------------------------------------------------------------
 \section{Text manipulations}\label{sec:psttext:Textmanipulationen}
 % ---------------------------------------------------------------------------------------
-The package \verb+pst-text+ principally defines only one macro.
-\begin{verbatim}
-\pstextpath[<position>](<x,y>){<graphic object>}{<text>}
-\end{verbatim}
+The package \LPack{pst-text} defines only one macro for text manipulations.
+\begin{BDef}
+\Lcs{pstextpath}\OptArg\Largr{x,y}\Largb{Graphic object}\Largb{Text}
+\end{BDef}
 
 \begin{description}
-\item[<position>] specifies the alignment of the text referring to the path.
+\item[\texttt{position}] specifies the alignment of the text referring to the path.
 \begin{description}
 \item[\texttt{l}] text starts at the beginning of the path (default).
 \item[\texttt{c}] text is aligned symmetrically to the middle of the path.
@@ -88,24 +57,22 @@ The package \verb+pst-text+ principally defines only one macro.
 As a basic principle it is to be kept in mind that when the text is longer 
 than the path this option has no effect since the path is filled with text 
 and any overflowing text disappears.
-\item[<x,y>] is an offset\index{offset} and denotes the values by which the
+\item[(x,y)] is an offset\index{offset} and denotes the values by which the
 	particular characters shall be translated in $x$ and $y$ direction 
 	relative to the path.
-	\verb+(<x,y>)+ have to be cartesian coordinates as the support for special
+	\verb+(x,y)+ have to be cartesian coordinates as the support for special
 	coordinates allowed by \PST is not
 	possible here. The dimensions of  $x$ and $y$ refer to the current scale. The default is
-	\verb+(0,\TPoffset)+,\cIndex{TPoffset} where \verb+TPoffset+ is set to a
-	length of \verb+-0.7ex+.
-\item[<graphic object>] any arbitrary object which creates a path.
-\item[<text>] the text to set, which may only consist of alphanumeric
+	\verb+(0,\TPoffset)+, where \Ldim{TPoffset} is set to a length of \verb+-0.7ex+.
+\item[Graphic object] any arbitrary object which creates a path.
+\item[Text] the text to set, which may only consist of alphanumeric
 	characters. No macros are possible within the text, 
-	but the text may be put into a \verb+\parbox+.
+	but the text may be put into a \Lcs{parbox}.
 \end{description}
 
 \PS does not reserve any space for the output, so that the current text
 is overwritten if corresponding white space has not been  provided by \TeX.
-This can be achieved with a vertical feed (\verb+\vspace+\cIndex{vspace}) or
-with a \verb+pspicture+ environment\tIndex{pspicture}.
+This can be achieved with a vertical feed (\Lcs{vspace}) or with a \Lenv{pspicture} environment.
 
 \begin{minipage}{4.5cm}
 \begin{pspicture}(-2,-2.5)(2,2.5)
@@ -125,14 +92,14 @@ with a \verb+pspicture+ environment\tIndex{pspicture}.
 \end{minipage}
 
 This first example shows the relatively easy use of the macro. If the path 
-is not required to be drawn the line style\index{line style} can be set to \verb+none+.
+is not required to be drawn the line style\index{line style} can be set to \Lkeyval{none}.
 The following example shows the use of the offset option. It is clear that
 every single character is translated, because the beginning and the end of the
 text stayed the same. Since the text was written in a circle, a positive
 specification for \verb+TPoffset+ causes a translation towards the centre of the circle.
 
 \medskip\noindent
-\begin{LTXexample}[width=4.5cm]
+\begin{LTXexample}[width=4.5cm,pos=l]
 \begin{pspicture}(-2,-2.5)(2,2.5)
 \psset{linewidth=0.2pt}
 \pstextpath[c](0,2ex){\pscircle{2}}%
@@ -140,15 +107,10 @@ specification for \verb+TPoffset+ causes a translation towards the centre of the
 \end{pspicture}
 \end{LTXexample}
 
-% The following example was first published in \cite{girou:01} and represents
-% the original form of the poem ``La colombe poignard� et le jet d'au'' by
-% Guillaume Appolinaire.
-
 % ---------------------------------------------------------------------------------------
-\medskip
 \subsection{Examples}
 % ---------------------------------------------------------------------------------------
-With \verb+\pscustom+ one is offered unlimited
+With \Lcs{pscustom} one is offered unlimited
 possibilities for paths. The following example uses the circle again, but
 forms an eight, which is composed of four circle parts to get a continuous path. In
 the second example a square has been appended to a circle. The starting point of the
@@ -156,7 +118,7 @@ path is always the circle at $0$, here marked by $\Rightarrow$.
 
 
 \medskip\noindent
-\begin{LTXexample}[width=4cm]
+\begin{LTXexample}[width=4cm,pos=l]
 \psset{unit=0.75,linestyle=none}
 \begin{pspicture}(-2,-4)(2,4)
 \pstextpath[l](0,0){%
@@ -180,7 +142,7 @@ change in direction.
 
 
 \medskip\noindent
-\begin{LTXexample}[width=4cm]
+\begin{LTXexample}[width=4cm,pos=l]
 \begin{pspicture}(-2,-3.25)(2,3.25)
 \psset{linestyle=none}
 \pstextpath[l](0,0){%
@@ -191,7 +153,7 @@ change in direction.
     }%
 }{\large $\Rightarrow$Jetzt wollen wir
    einfach mal einen Text in einer 
-   ziemlich gro�n ACHT  schreiben, 
+   ziemlich gro\ss en ACHT schreiben, 
    aber richtig rum.}
 \end{pspicture}
 \end{LTXexample}
@@ -199,9 +161,8 @@ change in direction.
 \medskip\noindent
 The setting of the text along a path is very memory and calculation intensive on the
 \PS side, so that with longer texts some seconds may pass until the desired
-result appears even on faster computers. This is shown in the following example,
-where the text is the beginning of the song ``Into the shining sun''{} by Pink
-Floyd.  Note how the text is truncated as the path is too short to fit the entire text in.
+result appears even on faster computers. This is shown in the following example.  
+Note how the text is truncated as the path is too short to fit the entire text in.
 
 \medskip\noindent
 \begin{center}
@@ -212,18 +173,21 @@ Floyd.  Note how the text is truncated as the path is too short to fit the entir
      plotpoints=500]{0}{3000}{%
        /r {t 1000 div} def t sin r mul t cos r mul } 
 }{
-Where were you when I was burned and broken -
-While the days slipped by from my window watching -
-Where were you when I was hurt and I was helpless -
-Because the things you say and the things you do surround me -
-While you were hanging yourself on someones else's words -
-Dying to believe in what you heard -
-I was staring straight into the shining sun -
-
-Lost in thought and lost in time -
-While the seeds of life and the seeds of change were planted
-Outside the rain fell dark and slow
-While I pondered on this dangerous but irresistible pastime
+Du nimmst alles wahr, die Augen sind offen -
+Doch Du verstehst nichts, du bist zu betroffen -
+Die Angst bestimmt dein Handeln - 
+Es ist, als w\"urdest du dich verwandeln -
+Ein anderer Mensch scheint es sehr - 
+Bist du nun und es geht gar nichts mehr -
+Verzweifelt legst du dich nieder -
+Doch der Frieden, er kommt nicht wieder -
+Die Augen sind hellwach -
+Es beginnt doch erst die Nacht -
+Leicht d\"mmerst du in den Schlaf -
+und kommst dir vor, wie in einem Grab -
+Mit einem Mal bist du hellwach -
+Es ist, als h\"ttest du dauernd gedacht, -
+Nun verstehst du alles, wie es war \ldots
 }
 \end{pspicture}
 \end{center}
@@ -238,18 +202,21 @@ While I pondered on this dangerous but irresistible pastime
      plotpoints=500]{0}{3000}{%
        /r {t 1000 div} def t sin r mul t cos r mul } 
 }{
-Where were you when I was burned and broken -
-While the days slipped by from my window watching -
-Where were you when I was hurt and I was helpless -
-Because the things you say and the things you do surround me -
-While you were hanging yourself on someones else's words -
-Dying to believe in what you heard -
-I was staring straight into the shining sun -
-
-Lost in thought and lost in time -
-While the seeds of life and the seeds of change were planted
-Outside the rain fell dark and slow
-While I pondered on this dangerous but irresistible pastime
+Du nimmst alles wahr, die Augen sind offen -
+Doch Du verstehst nichts, du bist zu betroffen -
+Die Angst bestimmt dein Handeln - 
+Es ist, als w\"urdest du dich verwandeln -
+Ein anderer Mensch scheint es sehr - 
+Bist du nun und es geht gar nichts mehr -
+Verzweifelt legst du dich nieder -
+Doch der Frieden, er kommt nicht wieder -
+Die Augen sind hellwach -
+Es beginnt doch erst die Nacht -
+Leicht d\"mmerst du in den Schlaf -
+und kommst dir vor, wie in einem Grab -
+Mit einem Mal bist du hellwach -
+Es ist, als h\"ttest du dauernd gedacht, -
+Nun verstehst du alles, wie es war \ldots
 }
 \end{pspicture}
 \end{lstlisting}
@@ -257,33 +224,35 @@ While I pondered on this dangerous but irresistible pastime
 
 \section{Character manipulations}\label{sec:psttext:Zeichenmanipulationen}
 % ---------------------------------------------------------------------------------------
-With character manipulations the same issue with the \verb+DVI-PS+ driver applies, namely that the results are only guaranteed for Rokicki's\index{Rokicki} 
-\verb+dvips+\tIndex{dvips} programme.\index{outline font}
+With character manipulations the same issue with the \verb+DVI-PS+ driver applies, 
+namely that the results are only guaranteed for Rokicki's\index{Rokicki} 
+\Lprog{dvips} programme.\index{outline font}
 
 % ---------------------------------------------------------------------------------------
-\subsection{\CMD{pscharpath}}\label{sec:psttext:pscharpath}
+\subsection{\nxLcs{pscharpath}}\label{sec:psttext:pscharpath}
 % ---------------------------------------------------------------------------------------
-\csIndex{pscharpath}Although this macro has a name similar to
-\verb+\pstextpath+, it has a completely different meaning.
+Although the macro \Lcs{pscharpath} has a name similar to \Lcs{pstextpath}, it has a 
+completely different meaning.
 %
-\begin{verbatim}
-\pscharpath[<parameters>]{<text>}
-\pscharpath*[<parameters>]{<text>}
-\end{verbatim}
+\begin{BDef}
+\Lcs{pscharpath}\OptArgs\Largb{Text}\\
+\Lcs{pscharpath*}\OptArgs\Largb{Text}
+\end{BDef}
 
 \begin{description}
-\item[<parameters>] All \PST parameters, insofar as they make sense, may be
+\item[Options] All \PST parameters, insofar as they make sense, may be
 	specified here.
-\item[<text>] The text to set, which may only consist of alphanumeric
+\item[Text] The text to set, which may only consist of alphanumeric
 	characters, therefore no macros are possible within the text.
 \end{description}
 
 Normally, one will define ones own font size, which is best  done with 
-\verb+\DeclareFixedFont+\cIndex{DeclareFixedFont}, since this macro is very
+\Lcs{DeclareFixedFont}, since this macro is very
 fast because it simply sets the size without having to look up any font tables.
 
 \medskip\noindent
-\begin{LTXexample}[width=6.5cm]
+\begin{LTXexample}[width=6.5cm,pos=l]
+%\usepackage{pst-grad}
 \DeclareFixedFont{\RM}{T1}{ptm}{b}{n}{2cm}
 \pscharpath{\RM TeXnik}\\
 \pscharpath[linecolor=lightgray]{\RM TeXnik}\\
@@ -294,82 +263,83 @@ fast because it simply sets the size without having to look up any font tables.
 
 \medskip\noindent
 Normally the path, here the outer line of the characters, is deleted after the
-macro \verb+\pscharpath+ has ended. With the asterisk version it is preserved
-and can be used for other ``baubles''{}, for instance for \verb+\pstextpath+,
+macro \Lcs{pscharpath} has ended. With the asterisk version it is preserved
+and can be used for other ``baubles''{}, for instance for \Lcs{pstextpath},
 where the saved path can be used as input for the text to set.
 
 
 \medskip\noindent
 \DeclareFixedFont{\SF}{T1}{phv}{b}{n}{2.45cm}
 \begin{center}
-\pstextpath(0,-1ex){\pscharpath*[linestyle=none]{\SF Pink Floyd}}{
-\scriptsize Where were you when I was burned and broken -
-While the days slipped by from my window watching -
-Where were you when I was hurt and I was helpless -
-Because the things you say and the things you do surround me -
-While you were hanging yourself on someones else's words -
-Dying to believe in what you heard -
-I was staring straight into the shining sun -
-
-Lost in thought and lost in time -
-While the seeds of life and the seeds of change were planted
-Outside the rain fell dark and slow
-While I pondered on this dangerous but irresistible pastime
+\pstextpath(0,-1ex){\pscharpath*[linestyle=none]{\SF Herbert Vo\ss}}{
+\scriptsize Du nimmst alles wahr, die Augen sind offen -
+Doch Du verstehst nichts, du bist zu betroffen -
+Die Angst bestimmt dein Handeln - 
+Es ist, als w\"urdest du dich verwandeln -
+Ein anderer Mensch scheint es sehr - 
+Bist du nun und es geht gar nichts mehr -
+Verzweifelt legst du dich nieder -
+Doch der Frieden, er kommt nicht wieder -
+Die Augen sind hellwach -
+Es beginnt doch erst die Nacht -
+Leicht d\"mmerst du in den Schlaf -
+und kommst dir vor, wie in einem Grab -
+Mit einem Mal bist du hellwach -
+Es ist, als h\"ttest du dauernd gedacht, -
+Nun verstehst du alles, wie es war \ldots
 }
 \end{center}
 
 \begin{lstlisting}
 \DeclareFixedFont{\SF}{T1}{phv}{b}{n}{2.5cm}
 \pstextpath(0,-1ex){%
-  \pscharpath*[linestyle=none]{\SF Pink Floyd}}{
+  \pscharpath*[linestyle=none]{\SF Herbert Vo\ss}}{
     \scriptsize < ... Text ... > 
   }
 \end{lstlisting}
 
 % ---------------------------------------------------------------------------------------
-\subsection{\CMD{pscharclip}}\label{sec:psttext:pscharclip}
+\subsection{\nxLcs{pscharclip}}\label{sec:psttext:pscharclip}
 % ---------------------------------------------------------------------------------------
-\csIndex{pscharclip}\verb+\pscharclip+ is practically identical to
-\verb+\pscharpath+ with the only difference being that it sets the clipping
+\Lcs{pscharclip} is practically identical to
+\Lcs{pscharpath} with the only difference being that it sets the clipping
 path\index{clipping path} to the current path.
 %
-\begin{verbatim}
-\pscharclip[<parameters>]{<text>} %  TeX example
- ... 
-\endpscharclip
-\pscharclip*[<parameters>]{<text>}%  TeX example
- ... 
-\endpscharclip
-\begin{pscharclip}[<parameters>]{<text>} %  LaTeX example
- ... 
-\end{pscharclip}
-\begin{pscharclip*}[<parameters>]{<text>}%  LaTeX example
- ... 
-\end{pscharclip}
-\end{verbatim}
+\begin{BDef}
+\Lcs{pscharclip}\OptArgs\Largb{<text>} \%  TeX example\\
+\quad\ldots\\
+\Lcs{endpscharclip}\\
+\Lcs{pscharclip*}\OptArgs\Largb{<text>}\%  TeX example\\
+\quad\ldots\\
+\Lcs{endpscharclip}\\
+\LBEG{pscharclip}\OptArgs\Largb{<text>} \%  LaTeX example\\
+\quad\ldots\\
+\LEND{pscharclip}\\
+\LBEG{pscharclip*}\OptArgs\Largb{<text>}\%  LaTeX example\\
+\quad\ldots\\
+\LEND{pscharclip}
+\end{BDef}
 %
 Using this one can ``write''{} \emph{within} a font, whereas it is not really
 easy to get the ``base''{} congruent. How to deal with this best shall is shown
 in the following worked example. 
 
-The base is best formed as a \verb+minipage+\tIndex{minipage},
+The base is best formed as a \Lenv{minipage},
 thus enabling it to be moved to arbitrary spots. To have clear coordinates on one hand
 and only the interesting area shown on the other hand, one uses a
-\verb+pspicture*+ environment\tIndex{pspicture*}. Let us presume that we use a
+\Lenv{pspicture*} environment. Let us presume that we use a
 font size of $3$cm and want to use the width of the whole page.
 %
-\begin{verbatim}
-\begin{pspicture*}(\linewidth,3cm)
-...
-\end{pspicture}
-\end{verbatim}
+\begin{BDef}
+\LBEG{pspicture*}\Largr{\Ldim{linewidth},3cm}\\
+\quad\ldots\\
+\LEND{pspicture}
+\end{BDef}
 %
-The text can be set exactly into the centre with a \verb+\rput+
-instruction\cIndex{rput}.
+The text can be set exactly into the centre with a \Lcs{rput} instruction.
 
 \DeclareFixedFont{\RM}{T1}{ptm}{b}{n}{3cm}
-\begin{pspicture*}(\linewidth,3cm)
-  \psgrid%
+\begin{pspicture*}[showgrid=true](\linewidth,3cm)
   \begin{pscharclip}[linewidth=0.1pt]{%
     \rput(0.5\linewidth,1.5){\RM PSTricks}}%
   \end{pscharclip}
@@ -377,8 +347,7 @@ instruction\cIndex{rput}.
 
 \begin{lstlisting}
 \DeclareFixedFont{\RM}{T1}{ptm}{b}{n}{3cm}
-\begin{pspicture*}(\linewidth,3cm)
-  \psgrid%
+\begin{pspicture*}[showgrid=true](\linewidth,3cm)
   \begin{pscharclip}[linewidth=0.1pt]{%
     \rput(0.5\linewidth,1.5){\RM PSTricks}}%
   \end{pscharclip}
@@ -386,16 +355,16 @@ instruction\cIndex{rput}.
 \end{lstlisting}
 
 \medskip
-The text ``lying below''{} the font is put into a \verb+minipage+\tIndex{minipage} of the
-width \verb+\linewidth+\cIndex{linewidth}. Since this text underlies the
+The text ``lying below''{} the font is put into a \Lenv{minipage} of the
+width \Ldim{linewidth}. Since this text underlies the
 clipping path, it does not matter how long it really is, the essential thing is that the
-the whole area is covered. This is especially important when the text is further manipulated such as rotated.  So one may view the following example with
+the whole area is covered. This is especially important when the text is further 
+manipulated such as rotated.  So one may view the following example with
 \verb+\begin{minipage}{\linewidth}+.
 
 \medskip
 \DeclareFixedFont{\Rm}{T1}{ptm}{m}{n}{2mm}
-\begin{pspicture*}(\linewidth,3cm)
-  \psgrid%
+\begin{pspicture*}[showgrid=true](\linewidth,3cm)
   \rput{60}(0.5\linewidth,1.5){%
     \begin{minipage}{0.6\linewidth}
        \setstretch{0.5}
@@ -408,8 +377,7 @@ the whole area is covered. This is especially important when the text is further
 
 \begin{lstlisting}
 \DeclareFixedFont{\Rm}{T1}{ptm}{m}{n}{2mm}
-\begin{pspicture*}(\linewidth,3cm)
-  \psgrid%
+\begin{pspicture*}[showgrid=true](\linewidth,3cm)
   \rput{60}(0.5\linewidth,1.5){%
     \begin{minipage}{0.6\linewidth}
        \setstretch{0.5}
@@ -423,9 +391,9 @@ the whole area is covered. This is especially important when the text is further
 \medskip
 Both of these can be overlaid where, because of the clipping
 path,\index{clipping path} only the inner of the large letters seems transparent.
-In the second example the \verb+minipage+ has been additionally rotated, the
-line colour was ignored and the line spacing within the \verb+minipage+ was
-halved (package \verb+setspace+\tIndex{setspace}).
+In the second example the \Lenv{minipage} has been additionally rotated, the
+line colour was ignored and the line spacing within the \Lenv{minipage} was
+halved (package \LPack{setspace}).
 
 \medskip
 \begin{pspicture*}(\linewidth,3cm)
@@ -485,14 +453,10 @@ halved (package \verb+setspace+\tIndex{setspace}).
 
 
 \medskip
-Generally it is not of interest what one bases \verb+\pscharclip+ on.  
+Generally it is not of interest what one bases \Lcs{pscharclip} on.  
 Using things sucha as a graphic can lead to some interesting possibilities. 
-It should be kept in mind 
-that alternatively \verb+pscharpath+\cIndex{pscharpath} may be
-used in conjunction with \verb+psboxfill+\cIndex{psboxfill}.
-
-
-
+It should be kept in mind that alternatively \Lcs{pscharpath} may be
+used in conjunction with \Lcs{psboxfill}.
 
 
 \nocite{*}
diff --git a/Master/texmf-dist/source/generic/pst-text/Makefile b/Master/texmf-dist/source/generic/pst-text/Makefile
index e9339b26ce4..f6caa012fbf 100644
--- a/Master/texmf-dist/source/generic/pst-text/Makefile
+++ b/Master/texmf-dist/source/generic/pst-text/Makefile
@@ -1,4 +1,3 @@
-
 # `Makefile' for `pst-text.pdf', hv, 2006/08/11
 
 .SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
@@ -13,8 +12,10 @@ ARCHNAME = $(MAIN)-$(shell date +%y%m%d)
 
 ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile
 
-all : doc 
-# clean
+TDS = ~/PSTricks/PSTricks-TDS
+
+all : doc clean tds
+
 doc: $(MAIN).pdf
 
 $(MAIN).pdf : $(MAIN).ps
@@ -46,4 +47,24 @@ veryclean : clean
 arch :
 	zip $(ARCHNAME).zip $(ARCHFILES)
 
+tds:
+	cp -u Changes     $(TDS)/doc/generic/$(PACKAGE)/
+	cp -u README      $(TDS)/doc/generic/$(PACKAGE)/
+	cp -u $(MAIN).pdf $(TDS)/doc/generic/$(PACKAGE)/
+#
+	cp -u Changes        $(TDS)/tex/latex/$(PACKAGE)/
+	cp -u $(PACKAGE).sty $(TDS)/tex/latex/$(PACKAGE)/
+#
+	cp -u Changes        $(TDS)/tex/generic/$(PACKAGE)/
+	cp -u $(PACKAGE).tex $(TDS)/tex/generic/$(PACKAGE)/
+#
+	cp -u Changes        $(TDS)/dvips/$(PACKAGE)/
+	cp -u $(PACKAGE).pro $(TDS)/dvips/$(PACKAGE)/
+#
+	cp -u Changes     $(TDS)/source/$(PACKAGE)/
+	cp -u $(MAIN).tex $(TDS)/source/$(PACKAGE)/
+	cp -u $(MAIN).bib $(TDS)/source/$(PACKAGE)/
+	cp -u Makefile    $(TDS)/source/$(PACKAGE)/
+
+
 # EOF
diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index 76a7010180f..df28b789357 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -825,6 +825,7 @@ $standardtex='\.(cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
  'pst-cox',	'pst-cox(coor|eterp)\.tex',
  'pst-geo',	'pst-map.*\.tex|pst-map.*\.sty',
  'pst-infixplot', 'infix-RPN\.tex|pst-infixplot\.tex',
+ 'pst-text',	'pst-(char|text)\.(tex|sty)',
  'qobitree',	'qobitree.tex',
  'r_und_s',	'\.tex|\.sty',
  'realcalc',	'realcalc.tex',