pst-geometrictools (28dec21)

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

8 files changed, 193 insertions, 195 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-geometrictools/Changes b/Master/texmf-dist/doc/generic/pst-geometrictools/Changes
new file mode 100644
index 00000000000..535e2ec7f60
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-geometrictools/Changes
@@ -0,0 +1,6 @@
+pst-geometrictools.tex ----------------
+
+1.3 2021/12/28  - more fixes for lualatex (hv)
+1.2 2021/11/17  - fixes for lualatex (hv)
+1.1 2017/09/16  - choose fonts for some tools
+1.0 2017/06/29
diff --git a/Master/texmf-dist/doc/generic/pst-geometrictools/Changes.txt b/Master/texmf-dist/doc/generic/pst-geometrictools/Changes.txt
deleted file mode 100644
index ce16d2fcb1e..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geometrictools/Changes.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-pst-geometrictools.tex ----------------
-
-1.1 2017/09/16
-- choose fonts for some tools
-1.0 2017/06/29
diff --git a/Master/texmf-dist/doc/generic/pst-geometrictools/README.md b/Master/texmf-dist/doc/generic/pst-geometrictools/README.md
index c8bd792060e..c3b26509dbe 100644
--- a/Master/texmf-dist/doc/generic/pst-geometrictools/README.md
+++ b/Master/texmf-dist/doc/generic/pst-geometrictools/README.md
@@ -1,8 +1,8 @@
 The pst-geometrictools package Author: Thomas Söll
 
-`pst-geometrictools' is a PSTricks package to draw a protractor, a ruler, a compass and pencils 
+"pst-geometrictools" is a PSTricks package to draw a protractor, a ruler, a compass and pencils 
 
-Dated: 2017/09/16 Version 1.1
+Dated: 2021/12/28 Version 1.3
 
 pst-geometrictools contains the following:
 
@@ -18,15 +18,15 @@ Save the files pst-geometrictools.sty|tex in a directory, which is part of your
 local TeX tree.
 Then do not forget to run texhash to update this tree.
 For more information  see the documentation of your LATEX distribution 
-on installing packages into your local TeX system or read the 
-TeX Frequently Asked Questions:
-(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages).
+on installing packages into your local TeX system
 
 pst-geometrictools needs pst-eucl, pstricks-xkey and pstricks, which should 
 be part of your local TeX installation, otherwise get it from a 
-CTAN server, http://mirror.ctan.org
+CTAN server, https://mirror.ctan.org
 
-PSTricks is PostScript Tricks, the documentation cannot be run
-with pdftex, use the sequence latex->dvips->ps2pdf or latex->dvips->distiller.
+PSTricks is PostScript Tricks, the documentation cannot be run with pdftex, 
+use the sequence latex->dvips->ps2pdf or latex->dvips->distiller or lualatex.
 
 T. Söll
+
+(Bugfixes by Herbert Voß hvoss@tug.org)
diff --git a/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-doc.pdf b/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-doc.pdf
index 39234a81451..ce1b9782c27 100644
--- a/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-doc.tex b/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-doc.tex
index f646e7520f7..47b04b6f2d8 100644
--- a/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-doc.tex
@@ -20,33 +20,16 @@
 
 
 \listfiles
-
-\documentclass[%
-11pt,
-english,
-BCOR10mm,
-DIV12,
-bibliography=totoc,
-parskip=false,
-fleqn,
-smallheadings,
-headexclude,
-footexclude,
-oneside,
-dvipsnames,
-svgnames,
-x11names,
-distiller
-]{pst-doc}
+\RequirePackage{pdfmanagement-testphase}
+\DeclareDocumentMetadata{}
+%% $Id: pst-venn-doc.tex 848 2018-12-04 09:25:49Z herbert $
+\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
+    headinclude=false,footinclude=false,oneside]{pst-doc}
 
 \usepackage[autostyle]{csquotes}
-\usepackage{biblatex}
-%\usepackage[style=dtk]{biblatex}
-\addbibresource{pst-geometrictools-doc.bib}
-\usepackage[utf8]{inputenc}
+%\addbibresource{pst-geometrictools-doc.bib}
 \let\pstpersFV\fileversion
-\usepackage{pst-geometrictools,pst-node,pst-eucl,pst-pers,pstricks-add,animate}
-\usepackage{etex} % increase the number of registers  (otherwise only 256)
+\usepackage{pst-geometrictools,pst-node,pstricks-add,animate}
 
 \let\belowcaptionskip\abovecaptionskip
 
@@ -71,22 +54,18 @@ distiller
 
 \begin{document}
 
-\title{pst-geometrictools v 1.1}
+\title{pst-geometrictools v 1.3}
 \subtitle{A PSTricks package to draw a protractor, a ruler, a compass and pencils}
-\author{Thomas \textsc{Söll}}
+\author{Thomas Söll\\Herbert Voß (bugfix)}
 \date{\today}
 
-\maketitle
+\settitle
 
 \tableofcontents
-\psset{unit=1cm}
-
-
-\clearpage
-
 
 \begin{abstract}
-The package \LPack{pst-geometrictools} offers some customizable options to setup a \emph{protractor}, a \emph{ruler}, a \emph{compass} and \emph{pencils} to the users'  wishes. Some geometric tools are predefined
+The package \LPack{pst-geometrictools} offers some customizable options to setup a \emph{protractor}, a \emph{ruler}, 
+a \emph{compass} and \emph{pencils} to the users'  wishes. Some geometric tools are predefined
  and ready-to-use for the customer to be able to present some pixel-free graphics showing the handling of some geometric tools.
 
 The geometric tools can be scaled, rotated, positioned, colored as wanted, even labeled---if wanted.
@@ -97,12 +76,13 @@ We recommend to use the package \LPack{pst-eucl} (by \textit{Dominique Rodriguez
 
 Have fun to use it!
 
-\vfill
+\bigskip
 This program can redistributed and/or modified under the terms of the LaTeX Project Public License Distributed from CTAN archives in directory macros/latex/base/lppl.txt; 
 either version 1.3c of the License, or (at your option) any later version.
 \end{abstract}
 
 
+
 \clearpage
 
 
@@ -111,8 +91,7 @@ either version 1.3c of the License, or (at your option) any later version.
 \subsection{\textbackslash psProtractor}
 
 \begin{BDef}
-\Lcs{psProtractor}\OptArgs\Largb{angle}\Largr{coordinates of the origin}
-\\
+\Lcs{psProtractor}\OptArgs\Largb{angle}\Largr{coordinates of the origin}\\
 \Lcs{psProtractor}\OptArgs\Largb{angle}\Largr{coordinates of the origin}\Largr{coordinates of a second point}
 \end{BDef}
 
@@ -181,8 +160,7 @@ The command \Lcs{psRuler} offers a positioning
 \subsection{\textbackslash psCompass}
 
 \begin{BDef}
-\Lcs{psCompass}\OptArgs\Largb{radius}\Largr{coordinates of  origin}
-\\
+\Lcs{psCompass}\OptArgs\Largb{radius}\Largr{coordinates of  origin}\\
 \Lcs{psCompass}\OptArgs\Largb{radius}\Largr{coordinates of origin}\Largr{coordinates of a second point}
 \end{BDef}
 
@@ -238,13 +216,14 @@ The command \Lcs{psPencil} contains the options \nxLkeyword{PenScale=}, \nxLkeyw
 \newpage
 
 
+
 \subsection{\textbackslash psParallels (Idea and realization by \emph{Manuel Luque})}
 
 \begin{BDef}
-\Lcs{psParallels}\OptArgs\Largr{pointA}\Largr{pointB}\Largr{pointC}\Largb{angle}
+\Lcs{psParallels}\OptArgs\Largr{pointA}\Largr{pointB}\Largr{pointC}
 \end{BDef}
 
-The command \Lcs{psParallels} contains the option \nxLkeyword{DistCoeff=}.
+The command \Lcs{psParallels} contains the option \nxLkeyword{DistCoeff}.
 
 \begin{quote}
 \begin{tabularx}{\linewidth}{ @{} l >{\ttfamily}l X @{} }\toprule
@@ -254,18 +233,36 @@ The command \Lcs{psParallels} contains the option \nxLkeyword{DistCoeff=}.
 \end{tabularx}
 \end{quote}
 
-This command is made to directly draw a line parallel to the line containing \texttt{pointA} and \texttt{pointB} intersecting at point \texttt{pointC}.
-
-\begin{LTXexample}[pos=t,width=17cm]
-\begin{pspicture}(-11,-10)(6,2.5)
-\psParallels[DistCoeff=1](-6,-1)(1,2)(2,0)
-\end{pspicture}
+This command is made to directly draw a line parallel to the line containing \texttt{pointA} and \texttt{pointB} 
+intersecting at point \texttt{pointC}.
+
+
+\begin{LTXexample}[pos=t,width=\linewidth]
+\psscalebox{0.5}{%
+\begin{pspicture}[showgrid=false](-15,-10)(5,3)%
+  \pnode(-6,1){A}\uput[100](A){A}
+  \pnode(1,2){B}\uput[100](B){B}
+  \pnode(2,0){C}\uput[90](C){C}
+  \pcline[linecolor=BrickRed,nodesepA=-2,nodesepB=-2](A)(B)%
+  \psParallels[style=Parallelen,RulerScale=0.5,ProScale=1,DistCoeff=1](A)(B)(C)
+  \pcline[linecolor=BrickRed](GeodrB)(GeodrA)%
+  \midAB(GeodrB)(GeodrA){M}%
+  \psPencil[PenLength=5,pencilColA=red,PenScale=0.5]{60}(M)
+  \end{pspicture}}
 \end{LTXexample}
 
-The command \verb+\psParallels[DistCoeff=1](A)(B)(C){angle}+ allows to draw a parallel through the point C with the help of a ruler and protractor. The angle is the one between the pencil and the vertical. 
-The command uses the option [DistCoef=] as within pst-eucl. If [DistCoef=0] the hypotenuse of the protractor lays on the line (AB), the ruler automatically positions below the protractor.
 
-For an animation, we vary [DistCoef=0..1], the protractor moves along the ruler letting the hypotenuse parallel to the line (AB). If [DistCoef=1], the protractor intersects with the point C. We can now draw the parallel to (AB) intersecting C.
+The command \verb+\psParallels[DistCoeff=1](A)(B)(C){angle}+ allows to draw a parallel through the 
+point C with the help of a ruler and protractor. The angle is the one between the pencil and the vertical. 
+The command uses the option [DistCoef=] as within pst-eucl. If [DistCoef=0] the hypotenuse of the 
+protractor lays on the line (AB), the ruler automatically positions below the protractor.
+
+For an animation, we vary [DistCoef=0..1], the protractor moves along the ruler letting the 
+hypotenuse parallel to the line (AB). If [DistCoef=1], the protractor intersects with the point C. 
+We can now draw the parallel to (AB) intersecting C.
+
+
+
 
 
 \newpage
@@ -274,12 +271,13 @@ For an animation, we vary [DistCoef=0..1], the protractor moves along the ruler
 \section{Basic Examples}
 
 \begin{LTXexample}[pos=t,width=16cm]
-\begin{pspicture}*(-6,-5.5)(10,7)
+\psscalebox{0.7}{%
+\begin{pspicture}[showgrid=false](-6,-5.5)(10,7)
 \psProtractor{0}(0,0)% origin of the protractor
 \psRuler{0}(0,0)% origin of the ruler
 \psPencil{-30}(6,0)% origin of the pencil
 \psCompass{3}(2,0)% origin of the compass
-\end{pspicture}
+\end{pspicture}}
 \end{LTXexample}
 
 We see, that the origins of the \emph{protractor} and \emph{ruler}, \emph{compass} and respectively the \emph{cone end of the pencil} are positioned at $(0|0)$, $(2|0)$, $(6|0)$. Adding an angle rotates the objects around their origins.
@@ -473,11 +471,11 @@ Constructing the height of a given triangle.
 \clearpage
 
 
-\nocite{*}
-\bgroup
-\RaggedRight
-\printbibliography
-\egroup
+%\nocite{*}
+%\bgroup
+%\RaggedRight
+%\printbibliography
+%\egroup
 
 
 \printindex
diff --git a/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-fr-doc.pdf b/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-fr-doc.pdf
index 8b428e96016..2d8390e783f 100644
--- a/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-fr-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-fr-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-fr-doc.tex b/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-fr-doc.tex
index 18fcfab3b84..4e36c902d14 100644
--- a/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-fr-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-fr-doc.tex
@@ -21,32 +21,18 @@
 
 \listfiles
 
-\documentclass[%
-11pt,
-english,
-BCOR10mm,
-DIV12,
-bibliography=totoc,
-parskip=false,
-fleqn,
-smallheadings,
-headexclude,
-footexclude,
-oneside,
-dvipsnames,
-svgnames,
-x11names,
-distiller
-]{pst-doc}
+\RequirePackage{pdfmanagement-testphase}
+\DeclareDocumentMetadata{}
+%% $Id: pst-venn-doc.tex 848 2018-12-04 09:25:49Z herbert $
+\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
+    headinclude=false,footinclude=false,oneside]{pst-doc}
 
 \usepackage[autostyle]{csquotes}
 \usepackage{biblatex}
 %\usepackage[style=dtk]{biblatex}
-\addbibresource{pst-geometrictools-doc.bib}
-\usepackage[utf8]{inputenc}
+%\addbibresource{pst-geometrictools-doc.bib}
 \let\pstgeometrictoolsFV\fileversion
-\usepackage{pst-geometrictools,pst-node,pst-eucl,pstricks-add}
-\usepackage{etex} % increase the number of registers  (otherwise only 256)
+\usepackage{pst-geometrictools,pst-node,pstricks-add}
 
 \let\belowcaptionskip\abovecaptionskip
 
@@ -70,19 +56,14 @@ distiller
 
 \begin{document}
 
-\title{pst-geometrictools v 1.0}
+\title{pst-geometrictools v 1.3}
 \subtitle{Package de PSTricks pour dessiner un rapporteur, une r\'{e}glette et un crayon}
-\author{Thomas \textsc{S\"{o}ll}}
+\author{Thomas Söll\\Herbert Voß (bugfixes)}
 \date{\today}
 
-\maketitle
+\settitle
 
 \tableofcontents
-\psset{unit=1cm}
-
-
-\clearpage
-
 
 \begin{abstract}
 Pour illustrer des notions de g\'{e}om\'{e}trie \'{e}l\'{e}mentaire le package pst-geometrictools dispose des outils suivants :
@@ -93,7 +74,7 @@ Pour illustrer des notions de g\'{e}om\'{e}trie \'{e}l\'{e}mentaire le package p
 \end{itemize}
 Les arguments et options des commandes d\'{e}di\'{e}es permettent de les positionner ainsi que de les personnaliser. Vous remarquerez dans les exemples qui illustrent la documentation le soin tout professionnel qui a \'{e}t\'{e} apport\'{e} au dessin et aux d\'{e}tails des outils. L'utilisation du package pst-eucl de Dominique Rodriguez est vivement conseill\'{e} car ses commandes sont particuli\`{e}rement efficaces pour cr\'{e}er facilement des animations et des illustrations.
 
-\vfill
+\bigskip
 This program can redistributed and/or modified under the terms of the LaTeX Project Public License Distributed from CTAN archives in directory macros/latex/base/lppl.txt; either version 1.3c of the License, or (at your option) any later version.
 \end{abstract}
 
@@ -223,30 +204,43 @@ La commande \Lcs{psParallels} dispose des options \nxLkeyword{Ruler=}, \nxLkeywo
 
 Cette commande permet de tracer la parrall\`{e}le passant par le point \texttt{pointC} \`{a} la droite d\'{e}finie par les points \texttt{pointA} and \texttt{pointB}. Le rapporteur et la r`{e}gle sont plac\'{e}s automatiquement.
 
-\begin{LTXexample}[pos=t,width=18cm]
-\begin{pspicture}[showgrid](-11,-4)(7,8)%
-\pstGeonode[PosAngle=135,linecolor=red](5,5){A}
-\pstGeonode[PosAngle=135,linecolor=Green](-8,1){B}
-\pstGeonode[PosAngle=-45,linecolor=blue](3,3){C}
-\pcline[linecolor=BrickRed,nodesepA=-2,nodesepB=-2](A)(B)%
-\psParallels[style=Parallelen,RulerScale=0.75,ProScale=0.75](A)(B)(C)
-\pcline[linecolor=BrickRed](GeodrB)(GeodrA)%
-\midAB(GeodrB)(GeodrA){M}%
-\psPencil[PenLength=5,pencilColA=red,PenScale=0.5]{60}(M)
+
+\begin{LTXexample}[pos=t,width=17cm]
+\begin{pspicture}(-11,-10)(6,2.5)
+\psParallels[DistCoeff=1,ProScale=.75,RulerScale=0.7](-6,-1)(1,2)(2,0)
 \end{pspicture}
 \end{LTXexample}
 
-Pour une animation, on utilisera la commande \verb+\multido{}{N}{...+ en fixant uniquement le nombre de pas souhait\'{e} pour que l'hypoth\'{e}nuse du rapporteur passe de la position o\`{u} il est tout pr\`{e}s de (AB) et parall\'{e}le \`{a} celle-ci au point C.
+
+\psset{unit=1cm}
+
+\begin{LTXexample}[pos=t,width=18cm]
+\psscalebox{0.5}{%
+\begin{pspicture}[showgrid](-11,-1)(11,20)% 
+\pnode(5,5){A}\uput[90](A){A}
+\pnode(-8,1){B}\uput[90](B){B}
+\pnode(3,3){C}\uput[250](C){C} 
+\pcline[linecolor=BrickRed,nodesepA=-2,nodesepB=-2](A)(B) 
+\psParallels[style=Parallelen,RulerScale=0.75,ProScale=0.75](A)(B)(C) 
+\pcline[linecolor=BrickRed](GeodrB)(GeodrA)% 
+\midAB(GeodrB)(GeodrA){M}% 
+\psPencil[PenLength=5,pencilColA=red,PenScale=0.5]{60}(M) 
+\end{pspicture}}
+\end{LTXexample}
+
+Pour une animation, on utilisera la commande \verb+\multido{}{N}{...+ en fixant uniquement 
+le nombre de pas souhait\'{e} pour que l'hypothénuse du rapporteur passe de la position 
+où il est tout près de (AB) et parallèle à celle-ci au point C.
 
 \begin{verbatim}
-\multido{}{40}{
-\begin{pspicture}[showgrid](-11,-4)(7,8)%
-\pstGeonode[PosAngle=135,linecolor=red](-2,6){A}
-\pstGeonode[PosAngle=135,linecolor=Green](-8,1){B}
-\pstGeonode[PosAngle=-45,linecolor=blue](0,3){C}
-\pcline[linecolor=BrickRed,nodesepA=-2,nodesepB=-2](A)(B)%
-\psParallels[style=Parallelen,RulerScale=0.75,ProScale=0.75](A)(B)(C)
-\end{pspicture}
+\multido{}{40}{%
+  \begin{pspicture}[showgrid](-11,-4)(7,8)%
+  \pstGeonode[PosAngle=135,linecolor=red](-2,6){A}
+  \pstGeonode[PosAngle=135,linecolor=Green](-8,1){B}
+  \pstGeonode[PosAngle=-45,linecolor=blue](0,3){C}
+  \pcline[linecolor=BrickRed,nodesepA=-2,nodesepB=-2](A)(B)%
+  \psParallels[style=Parallelen,RulerScale=0.75,ProScale=0.75](A)(B)(C)
+  \end{pspicture}%
 }
 \end{verbatim}
 
@@ -404,11 +398,11 @@ Construction des hauteurs d'un triangle
 \clearpage
 
 
-\nocite{*}
-\bgroup
-\RaggedRight
-\printbibliography
-\egroup
+%\nocite{*}
+%\bgroup
+%\RaggedRight
+%\printbibliography
+%\egroup
 
 
 \printindex
diff --git a/Master/texmf-dist/tex/generic/pst-geometrictools/pst-geometrictools.tex b/Master/texmf-dist/tex/generic/pst-geometrictools/pst-geometrictools.tex
index cad64e8e3c2..608e29ef560 100644
--- a/Master/texmf-dist/tex/generic/pst-geometrictools/pst-geometrictools.tex
+++ b/Master/texmf-dist/tex/generic/pst-geometrictools/pst-geometrictools.tex
@@ -1,6 +1,7 @@
 %% This is file `pst-geometrictools.tex',
 %%
 %% Thomas Söll
+%% fixes for lualatex by Herbert Voß
 %%
 %% This program can redistributed and/or modified under %%
 %% the terms of the LaTeX Project Public License        %%
@@ -15,18 +16,17 @@
 \csname PSTgeometrictoolsLoaded\endcsname
 \let\PSTgeometrictoolsLoaded\endinput
 % Requires PSTricks, pst-xkey, pst-node packages
-\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
-\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex\fi
-\ifx\PSTnodeLoaded\endinput\else\input pst-node.tex\fi
-\def\fileversion{1.1}
-\def\filedate{2017/09/16}
+\ifx\PSTricksLoaded\endinput  \else\input pstricks.tex\fi
+\ifx\PSTXKeyLoaded\endinput   \else\input pst-xkey.tex\fi
+\ifx\PSTEuclideLoaded\endinput\else\input pst-eucl.tex\fi
+\ifx\PSTnodeLoaded\endinput   \else\input pst-node.tex\fi
+\def\fileversion{1.3}
+\def\filedate{2021/12/28}
 \message{`PST' v\fileversion, \filedate}
 
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
-
-
 \pst@addfams{pst-geometrictools}
-
+%
 \define@boolkey[psset]{pst-geometrictools}[Pst@]{Ghost}[true]{}
 \define@key[psset]{pst-geometrictools}{ProLineCol}[cyan]{\pst@getcolor{#1}\ProLineCol}
 \define@key[psset]{pst-geometrictools}{ProFillCol}[gray!60]{\pst@getcolor{#1}\ProFillCol}
@@ -44,62 +44,60 @@
 
 
 \def\psProtractor{\def\pst@par{}\pst@object{psProtractor}}
-\def\psProtractor@i#1(#2){\@ifnextchar(%
-{\psProtractor@ii{#1}(#2)}%
-{\psProtractor@ii{#1}(#2)(#2)}}%
+\def\psProtractor@i#1(#2){\@ifnextchar({\psProtractor@ii{#1}(#2)}{\psProtractor@ii{#1}(#2)(#2)}}%
+
 \def\psProtractor@ii#1(#2)(#3){%-------------------------------    #1 Winkel,  #2 Ursprung P,  zweiter Punkt Q für Winkel
-\begin@SpecialObj
-\pst@killglue
-\begingroup%
-\pnode(#2){@PGD}%
-\pnode(#3){@QGD}%
-\use@par%
-\pst@getcoor{@QGD}\pst@tempB % --------------------------   Hohle die Koordinaten und speichere sie in \pst@tempB
-\pst@getcoor{@PGD}\pst@tempA % --------------------------   Hohle die Koordinaten und speichere sie in \pst@tempA
-\addto@pscode{%
-/sysfill {systemdict /fill get exec} def
-/Country (\pst@country) def
+  \begin@SpecialObj
+  \pst@killglue
+%  \begingroup
+  \pnode(#2){@PGD}%
+  \pnode(#3){@QGD}%
+  \use@par
+  \pst@getcoor{@QGD}\pst@tempB % --------------------------   Hohle die Koordinaten und speichere sie in \pst@tempB
+  \pst@getcoor{@PGD}\pst@tempA % --------------------------   Hohle die Koordinaten und speichere sie in \pst@tempA
+  \addto@pscode{%
+    /sysfill {systemdict /fill get exec} def
+    /Country (\pst@country) def
     /cm {28.45274 mul} def %  ----------------------------------------  Definiere cm als Längeneinheit mit der multipliziert wird
     \pst@tempA \tx@UserCoor /@y1 ED /@x1 ED % ----------  Definiere die Koordinaten des Ursprungs (zur Winkelberechnung benötigt)
     \pst@tempB \tx@UserCoor /@y2 ED /@x2 ED % ----------  Definiere die Koordinaten des zweiten Punktes (zur Winkelberechnung benötigt)
-   @y1 @y2 sub @x1 @x2 sub Atan /@delta ED %------------   Winkelberechnung
+    @y1 @y2 sub @x1 @x2 sub Atan /@delta ED %------------   Winkelberechnung
     \pst@tempA \pst@coor T % ------------------------------------   Tranformiere den Koordinatenursprung in P
     @delta #1 add 180 add rotate % ------------------------------     Drehe das gesamte Geodreieck
-   \pst@ProScale dup scale % --------    Skaliere das ganze Geodreieck
-%-------------------------------------------------------------------------------------------------------------
-\ifPst@Ghost\else
-gsave
-%-------------------------------------------------------------------------------------------------------------
-%-------------- Äußere Begrenzung des Geodreiecks -----------------------------------------------
-gsave
-     newpath
+    \pst@ProScale dup scale % --------    Skaliere das ganze Geodreieck
+    %-------------------------------------------------------------------------------------------------------------
+    gsave
+    \ifPst@Ghost\else
+    %-------------- Äußere Begrenzung des Geodreiecks -----------------------------------------------
+    gsave
+    newpath
        -8 cm 0 moveto
        16 cm 0 rlineto
        -8 cm 8 cm rlineto
-       closepath
-     gsave
-       0.7 setlinewidth
-       0.1 setgray
-       stroke
+    closepath
+%     gsave
+    0.7 setlinewidth
+    0.1 setgray
+    stroke
+%   grestore
     grestore
-grestore
 %-------------------------------------------------------------------------------------------------------------
 %-------------- Gefüllter innerer Teil des Geodreiecks -----------------------------------------------
-gsave
+    gsave
     newpath
         -7.5 cm 0.5 22.5 tan mul cm moveto
        15 cm 0 rlineto
        -7.5 cm 7.5 cm rlineto
     closepath
-    gsave
+%    gsave
          \pst@usecolor\ProFillCol
-       [ /ca .1 /SetTransparency  pdfmark %    set  transparency
+%       [ /ca .1 /SetTransparency  pdfmark %    set  transparency
        0.1 .setopacityalpha sysfill
+%    grestore
     grestore
-grestore
 %-------------------------------------------------------------------------------------------------------------
 %-------------- Millimetereinteilung auf der Grundseite -------------------------------------------
- /mmBlinie { newpath
+    /mmBlinie { newpath
                    -7 cm 0 cm moveto
                     0 cm 0.17 cm rlineto
 %                   closepath
@@ -185,12 +183,12 @@ grestore
                       0 0 5.1 cm 6 174 arc
                       0 0 4.8 cm 174 6 arcn
                  closepath
-                   gsave
+%                   gsave
                     \pst@usecolor\ProLineCol
-                      [ /ca .4 /SetTransparency  pdfmark %    set  transparency
+%                      [ /ca .4 /SetTransparency  pdfmark %    set  transparency
                        0.4 .setopacityalpha
                        sysfill
-                 grestore
+%                 grestore
    grestore
 %---------------------------------------------------------------------------------------------------------------------------------------------
 %--------------- 1-Grad-Winkeleinteilung an der linken Kathete -----------------------------------------------------------------
@@ -428,7 +426,7 @@ grestore
                              0 -1 rlineto
                              closepath
                              setrgbcolor
-                             [ /ca .5 /SetTransparency  pdfmark %    set  transparency
+%                             [ /ca .5 /SetTransparency  pdfmark %    set  transparency
                               0.5 .setopacityalpha sysfill
                            } def
 Country (France) eq {
@@ -452,8 +450,8 @@ Country (Germany) eq {
   grestore
 %--------------------------------------------------------------------------------------------------------------------------------------------------
 %--------------- Ende nur grestore von gsave ganz am Anfang ------------------
-grestore
 \fi
+grestore
 }%
 \pnode(!
     /cm {28.45274 mul} def %  ----------------------------------------  Definiere cm als Längeneinheit mit der multipliziert wird
@@ -474,17 +472,18 @@ grestore
     @delta #1 add 180 add rotate % ------------------------------     Drehe die rechte untere Ecke des Geodreiecks
    \pst@ProScale\space \pst@ProScale\space scale % --------    Skalieren!
    8 0){GeodrB}%
-\endgroup%
-\end@SpecialObj\ignorespaces
+%\endgroup%
+  \end@SpecialObj
+  \ignorespaces
 }%
 
-
 \definecolor{HolzCol}{rgb}{1,0.937,0.835}%
 \define@key[psset]{pst-geometrictools}{PenScale}[1]{\def\pst@PenScale{#1 }}%
 \define@key[psset]{pst-geometrictools}{PenLength}[5]{\def\pst@PenLength{#1 }}%
 \define@key[psset]{pst-geometrictools}{pencilColA}[red]{\pst@getcolor{#1}\pencilColA}
 \define@key[psset]{pst-geometrictools}{pencilColB}[HolzCol]{\pst@getcolor{#1}\pencilColB}
 \psset[pst-geometrictools]{PenLength=5,pencilColA=red,pencilColB=HolzCol,PenScale=1}
+
 \def\psPencil{\def\pst@par{}\pst@object{psPencil}}
 \def\psPencil@i#1(#2){%-------------------------------    #1 Winkel,  #2 Ursprung P
 \begin@SpecialObj
@@ -659,7 +658,7 @@ gsave
        closepath
         gsave
          \pst@usecolor\RulerFillCol
-       [ /ca .25 /SetTransparency  pdfmark %    set  transparency
+%       [ /ca .25 /SetTransparency  pdfmark %    set  transparency
        0.25 .setopacityalpha sysfill
     grestore
 grestore
@@ -676,7 +675,7 @@ gsave
      closepath
     gsave
          \pst@usecolor\RulerFillCol
-       [ /ca .15 /SetTransparency  pdfmark %    set  transparency
+%       [ /ca .15 /SetTransparency  pdfmark %    set  transparency
        0.15 .setopacityalpha sysfill
     grestore
          gsave
@@ -1151,28 +1150,34 @@ grestore
 %
 \def\psParallels{\def\pst@par{}\pst@object{psParallels}}
 \def\psParallels@i(#1)(#2)(#3){%
-\begin@SpecialObj %
-\pnode(#1){pointA}%
-\pnode(#2){pointB}%
-\pnode(#3){pointC}%
-\pcline[nodesep=-3](pointA)(pointB)
-\psdots(pointA)(pointB)(pointC)
-\uput[l](pointA){A}
-\uput[l](pointB){B}
-\uput[r](pointC){C}
+%  \begin@SpecialObj
+  \pst@killglue
+  \begingroup
+  \use@par
+  \pnode(#1){pointA}%
+  \pnode(#2){pointB}%
+  \pnode(#3){pointC}%
+  \pcline[nodesep=-3](pointA)(pointB)
+  \psdots(pointA)(pointB)(pointC)
+%  \uput[l](pointA){A}\uput[l](pointB){B}\uput[r](pointC){C}
 %
-\psProtractor[Ghost]{0}(pointA)%
-\psAngleAB(pointA)(pointB){alpha1}
-\psAngleAB(pointA)(GeodrA){alpha2}
-\psProtractor[Ghost]{alpha1 alpha2 sub}(pointA)%
-\psRuler{0}(GeodrB)(GeodrC)
+  \psProtractor[Ghost]{0}(pointA)%
+  \psAngleAB(pointA)(pointB){alpha1}
+  \psAngleAB(pointA)(GeodrA){alpha2}
+%  \psdot(GeodrA)\uput[-90](GeodrA){A'}% right edge of triangle
+  \psProtractor[Ghost]{alpha1 alpha2 sub }(pointA)%
+%  \psdot(GeodrA)\uput[-90](GeodrA){A''}% right edge of triangle
+%  \psdot(GeodrB)\uput[-90](GeodrB){B''}% left edge of triangle
+%  \psdot(GeodrC)\uput[-90](GeodrC){C''}% bottom  edge of triangle
+  \psRuler{0}(GeodrB)(GeodrC)
 %
-\pstProjection[PointName={},PointSymbol=none]{pointA}{pointB}{pointC}[pointI]%
-\pstRotation[RotAngle=45,PointSymbol=none,PointName={}]{pointC}{pointI}[pointJ]%
-\pstInterLL[PointSymbol=none,PointName={}]{pointA}{pointB}{pointC}{pointJ}{pointK}%
-\pstTranslation[PointSymbol=none,PointName={},DistCoef=\pst@DistCoeff]{pointK}{pointC}{pointA}[pointA*]
-\psProtractor{alpha1 alpha2 sub}(pointA*)%
-\end@SpecialObj\ignorespaces%
+  \pstProjection[PointName={},PointSymbol=none]{pointA}{pointB}{pointC}[pointI]%
+  \pstRotation[RotAngle=45,PointSymbol=none,PointName={}]{pointC}{pointI}[pointJ]%
+  \pstInterLL[PointSymbol=none,PointName={}]{pointA}{pointB}{pointC}{pointJ}{pointK}%
+  \pstTranslation[PointSymbol=none,PointName={},DistCoef=\pst@DistCoeff]{pointK}{pointC}{pointA}[pointA*]
+  \psProtractor{alpha1 alpha2 sub}(pointA*)%
+  \endgroup
+  \ignorespaces%
 }%
 
 %\define@boolkey[psset]{pst-geometrictools}[Pst@]{Ruler}[true]{}