summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-04-15 20:03:31 +0000
committerKarl Berry <karl@freefriends.org>2024-04-15 20:03:31 +0000
commit47834360824ae6fd899f9eb150f540c4657c4894 (patch)
tree80e49f7cd0c9861b724cfd3975dd248c6bdc4d78 /Master
parentc32e9a69424faf98a8cafd1a79879fbda6dbfae7 (diff)
pst-geometrictools (15apr24)
git-svn-id: svn://tug.org/texlive/trunk@70953 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pst-geometrictools/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pst-geometrictools/README.md4
-rw-r--r--Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-doc.pdfbin228546 -> 264885 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-doc.tex48
-rw-r--r--Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-fr-doc.pdfbin233412 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-fr-doc.tex409
-rw-r--r--Master/texmf-dist/tex/generic/pst-geometrictools/pst-geometrictools.tex134
-rw-r--r--Master/texmf-dist/tex/latex/pst-geometrictools/pst-geometrictools.sty4
8 files changed, 114 insertions, 486 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-geometrictools/Changes b/Master/texmf-dist/doc/generic/pst-geometrictools/Changes
index 535e2ec7f60..ba4253e188d 100644
--- a/Master/texmf-dist/doc/generic/pst-geometrictools/Changes
+++ b/Master/texmf-dist/doc/generic/pst-geometrictools/Changes
@@ -1,5 +1,6 @@
pst-geometrictools.tex ----------------
+1.4 2024/04/15 - fix for unbalanced gsave ... grestore (hv)
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
diff --git a/Master/texmf-dist/doc/generic/pst-geometrictools/README.md b/Master/texmf-dist/doc/generic/pst-geometrictools/README.md
index c3b26509dbe..dff697e8a2f 100644
--- a/Master/texmf-dist/doc/generic/pst-geometrictools/README.md
+++ b/Master/texmf-dist/doc/generic/pst-geometrictools/README.md
@@ -2,7 +2,7 @@ The pst-geometrictools package Author: Thomas Söll
"pst-geometrictools" is a PSTricks package to draw a protractor, a ruler, a compass and pencils
-Dated: 2021/12/28 Version 1.3
+Dated: 2024/04/11 Version 1.4
pst-geometrictools contains the following:
@@ -28,5 +28,5 @@ 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
+H. Voß hvoss@tug.org (bugfixes)
-(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 ce1b9782c27..72bcd6e8010 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
Binary files differ
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 47b04b6f2d8..7d14e2626e4 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
@@ -5,7 +5,7 @@
%%
%% Package `pst-geometrictools.tex'
%%
-%% Thomas Söll
+%% Thomas Söll, Herert Voß
%%
%% This program can redistributed and/or modified under %%
%% the terms of the LaTeX Project Public License %%
@@ -20,8 +20,7 @@
\listfiles
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{}
+\DocumentMetadata{}
%% $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}
@@ -54,9 +53,9 @@
\begin{document}
-\title{pst-geometrictools v 1.3}
+\title{pst-geometrictools v 1.4}
\subtitle{A PSTricks package to draw a protractor, a ruler, a compass and pencils}
-\author{Thomas Söll\\Herbert Voß (bugfix)}
+\author{Thomas Söll\\Herbert Voß (bugfixes)}
\date{\today}
\settitle
@@ -127,6 +126,9 @@ The command \Lcs{psProtractor} offers a positioning
\end{itemize}
+
+
+
\subsection{\textbackslash psRuler}
\begin{BDef}
@@ -154,6 +156,26 @@ The command \Lcs{psRuler} offers a positioning
\end{itemize}
+\definecolor{BrickRed}{rgb}{.702,0.1333,0.1333}
+\definecolor{SeaGreen}{rgb}{.1804,.5451,.34117647}
+
+\begin{pspicture*}[showgrid](-4.0,-10)(6,4.5)
+\psline[linewidth=1pt](-1,0)(5,0)
+\psline[linewidth=0.6pt](4,-.2)(4,.2)\psline[linewidth=0.6pt](0,-.2)(0,.2)
+\rput(3.7,.3){$A$}\rput(0.4,.3){$A'$}
+\rput(2.6,-3.4){$M$}\rput(2.6,3.4){$N$}\rput(2.3,.3){$O$}
+\pnode(4,0){A}\pnode(0,0){B}\pnode(2,-1.5){M}\pnode(2.61,3.76){N1}\pnode(1.41,3.76){N2}
+\pscircle[linewidth=1pt](2,0){2}
+\psarc[linewidth=1pt,linecolor=BrickRed](4,0){4}{110}{250}
+\psarc[linewidth=1pt,linecolor=blue](0,0){4}{-70}{70}
+\psPencil[pencilColA=green,PenLength=3]{-120}(2,4)
+\psRuler[opacity=0.15]{0}(1.96,4)(1.96,-3)
+\psline[linewidth=1pt,linecolor=green](2,-4)(2,4)
+\end{pspicture*}
+
+
+
+
\newpage
@@ -193,6 +215,22 @@ When you like to use a radius other than the distance between the two points tha
\end{itemize}
+\begin{pspicture}[showgrid](-6,-4)(8,4.5)
+\psline[linewidth=1pt](-1,0)(5,0)
+\psline[linewidth=0.6pt](4,-.2)(4,.2)\psline[linewidth=0.6pt](0,-.2)(0,.2)
+\rput(3.7,.3){$A$}\rput(0.4,.3){$A'$}
+\rput(2.6,-3.4){$M$}\rput(2.6,3.4){$N$}\rput(2.3,.3){$O$}\psdot[dotsize=3pt](2,0)
+\pnode(4,0){A}\pnode(0,0){B}\pnode(2,-1.5){M}\pnode(2.61,3.76){N1}\pnode(1.41,3.76){N2}
+\pscircle[linewidth=1pt](2,0){2}
+\psarc[linewidth=1pt,linecolor=BrickRed](4,0){4}{110}{250}
+\psarc[linewidth=1pt,linecolor=blue](0,0){4}{-70}{70}
+\psscalebox{-1 1}{\psCompass[PoCScale=0.8]{2}(A)(N1)}
+\psCompass[PoCScale=0.8,PoCFillCol=blue]{2}(B)(N2)
+\end{pspicture}
+
+
+
+
\subsection{\textbackslash psPencil}
\begin{BDef}
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
deleted file mode 100644
index 2d8390e783f..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-fr-doc.pdf
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 4e36c902d14..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geometrictools/pst-geometrictools-fr-doc.tex
+++ /dev/null
@@ -1,409 +0,0 @@
-%%
-%% This is file `pst-geometrictools-fr-doc.tex',
-%%
-%% IMPORTANT NOTICE:
-%%
-%% Package `pst-geometrictools.tex'
-%%
-%% Thomas S\"{o}ll
-%%
-%% 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. %%
-%%
-%% DESCRIPTION:
-%% `pst-geometrictools' is a PSTricks package to draw a protractor, a ruler, a compass and pencils
-%%
-%%
-
-
-\listfiles
-
-\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}
-\let\pstgeometrictoolsFV\fileversion
-\usepackage{pst-geometrictools,pst-node,pstricks-add}
-
-\let\belowcaptionskip\abovecaptionskip
-
-\parindent0pt
-
-\psset{arrowlength=2.8,arrowinset=0.1}
-
-\def\bgImage{%
-\begin{pspicture}(-7,-3)(7,7)%
-\psProtractor[ProScale=0.75]{-5}(-2,2)%
-\psRuler[RulerFillCol=Blue!80,RulerScale=0.75]{190}(1,5)
-\psPencil[pencilColA=Green,PenScale=0.75]{10}(-2,2)
-\psPencil[PenLength=2,pencilColA=red,PenScale=0.75]{-20}(1,5)
-\psCompass[PoCScale=1.25,PoCFillCol=Yellow,PoCAngle=0,PoCMineCol=Green]{5}(3.5,-3.5)(7.5,-3.5)
-\end{pspicture}
-}
-
-\lstset{language=PSTricks,morekeywords={psdot,psIntersectionPoint,psProtractor,psPencil,psRuler,psParallels,psGetAngleABC,pstRightAngle,psline}\footnotesize\ttfamily}
-
-\newpsstyle{Parallelen}{country=G,ProScale=0.5,ProLineCol=cyan,ProFillCol=gray!50,OwnerTxt=Pythagoras,MadeTxt={Geodreieck},RulerFillCol=cyan!40}
-
-\begin{document}
-
-\title{pst-geometrictools v 1.3}
-\subtitle{Package de PSTricks pour dessiner un rapporteur, une r\'{e}glette et un crayon}
-\author{Thomas Söll\\Herbert Voß (bugfixes)}
-\date{\today}
-
-\settitle
-
-\tableofcontents
-
-\begin{abstract}
-Pour illustrer des notions de g\'{e}om\'{e}trie \'{e}l\'{e}mentaire le package pst-geometrictools dispose des outils suivants :
-\begin{itemize}
- \item r\`{e}gle gradu\'{e}e ;
- \item \'{e}querre-rapporteur ;
- \item crayon.
-\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.
-
-\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
-
-
-\section{Comment utiliser les commandes}
-
-\subsection{\textbackslash psProtractor}
-
-\begin{BDef}
-\Lcs{psProtractor}\OptArgs\Largb{angle}\Largr{coordonn\'{e}es de l'origine}%
-\\
-\Lcs{psProtractor}\OptArgs\Largb{angle}\Largr{coordonn\'{e}es de l'origine}\Largr{coordonn\'{e}es du second point}
-\end{BDef}
-
-
-La commande \Lcs{psProtractor} est munie des options \nxLkeyword{ProScale=}, \nxLkeyword{ProLineCol=}, \nxLkeyword{ProFillCol=}, \nxLkeyword{OwnerTxt=}, \nxLkeyword{MadeTxt=}, \nxLkeyword{PSfontO=}, \nxLkeyword{fontsizeO=}, \nxLkeyword{PSfontM=}, \nxLkeyword{fontsizeM=}, \nxLkeyword{country=} and \nxLkeyword{Ghost=}.
-
-\begin{quote}
-\begin{tabularx}{\linewidth}{ @{} l >{\ttfamily}l X @{} }\toprule
-\emph{Nom} & \emph{D\'{e}faut} & \emph{action} \\\midrule
-\Lkeyword{ProScale} & 1 & facteur d'\'{e}chelle\\
-\Lkeyword{ProFillCol} & gray!60 & couleur de transparence \\
-\Lkeyword{ProLineCol} & cyan & couleur de l'arc en demi-cercle\\
-\Lkeyword{OwnerTxt} & T.S. & Nom du propri\'{e}taire\\
-\Lkeyword{MadeTxt} & Made in NES & Lieu de fabrication\\
-\Lkeyword{PSfontO} & Symbol & PSfont pour le nom du propri\'{e}taire\\
-\Lkeyword{fontsizeO} & 10pt & fontsize pour le nom du propri\'{e}taire\\
-\Lkeyword{PSfontM} & Times-Roman & PSfont pour le lieu de fabrication\\
-\Lkeyword{fontsizeM} & 6pt & fontsize pour le lieu de fabrication\\
-\Lkeyword{country} & Germany & options permises : Germany, France\\
-\Lkeyword{Ghost} & false & true : ne trace pas le rapporteur, mais calcule les n\oe{}uds des sommets\\
-\bottomrule
-\end{tabularx}
-\end{quote}
-
-La commande \Lcs{psProtractor} fournit automatiquement les 3 n\oe{}uds des sommets du rapporteur, ils sont nomm\'{e}s : \texttt{GeodrA}, \texttt{GeodrB}, \texttt{GeodrC}
-
-Ces n\oe{}uds peuvent \^{e}tre tr\`{e}s utiles.
-
-\subsection{\textbackslash psRuler}
-
-\begin{BDef}
-\Lcs{psRuler}\OptArgs\Largb{angle}\Largr{coordonn\'{e}es de l'origine}
-\\
-\Lcs{psRuler}\OptArgs\Largb{angle}\Largr{coordonn\'{e}es de l'origine}\Largr{coordonn\'{e}es du second point}
-\end{BDef}
-
- Cette commande \Lcs{psRuler} est munie des options \nxLkeyword{RulerScale=} et \nxLkeyword{RulerFillCol=}.
-\begin{quote}
-\begin{tabularx}{\linewidth}{ @{} l >{\ttfamily}l X @{} }\toprule
-\emph{Nom} & \emph{D\'{e}faut} & \emph{action} \\\midrule
-\Lkeyword{RulerScale} & 1 & facteur d'\'{e}chelle de la r\`{e}glette\\
-\Lkeyword{RulerFillCol} & gray & couleur de la r\'{e}glette\\
-\bottomrule
-\end{tabularx}
-\end{quote}
-
-
-
-\subsection{\textbackslash psPencil}
-
-\begin{BDef}
-\Lcs{psPencil}\OptArgs\Largb{angle}\Largr{coordonn\'{e}es de la pointe du crayon}
-\end{BDef}
-
-Cette \Lcs{psPencil} est munie des options \nxLkeyword{PenScale=}, \nxLkeyword{PenLength=}, \nxLkeyword{pencilColA=} and \nxLkeyword{pencilColB=}.
-
-\begin{quote}
-\begin{tabularx}{\linewidth}{ @{} l >{\ttfamily}l X @{} }\toprule
-\emph{Nom} & \emph{D\'{e}faut} & \emph{action} \\\midrule
-\Lkeyword{PenScale} & 1 & facteur d'\'{e}chelle\\
-\Lkeyword{PenLength} & 5 & longueur du crayon\\
-\Lkeyword{pencilColA} & red & couleur du corps du crayon\\
-\Lkeyword{pencilColB} & HolzCol & couleur de la mine\\
-\bottomrule
-\end{tabularx}
-\end{quote}
-
-
-\subsection{\textbackslash psCompass}
-
-\begin{BDef}
-\Lcs{psCompass}\OptArgs\Largb{radius}\Largr{coordonn\'{e}es de l'origine : pointe du compas}
-\\
-\Lcs{psCompass}\OptArgs\Largb{radius}\Largr{coordonn\'{e}es de l'origine}\Largr{ccoordonn\'{e}es du second point}
-\end{BDef}
-
-Cette commande \Lcs{psCompass} poss\`{e}de les options \nxLkeyword{PoCAngle=}, \nxLkeyword{PoCLength}, \nxLkeyword{PoCFillCol=}, \nxLkeyword{PoCMineCol=} and \nxLkeyword{PoCScale=}.
-
-\begin{quote}
-\begin{tabularx}{\linewidth}{ @{} l >{\ttfamily}l X @{} }\toprule
-\emph{Nom} & \emph{D\'{e}faut} & \emph{action} \\\midrule
-\Lkeyword{PoCAngle} & 0 & angle de rotation\\
-\Lkeyword{PoCLength} & 5 & longueur des bras du compas\\
-\Lkeyword{PoCFillCol} & gray!60 & couleur des bras\\
-\Lkeyword{PoCMineCol} & gray!60 & couleur de la mine\\
-\Lkeyword{PoCScale} & 1 & facteur d'\'{e}chelle \\
-\bottomrule
-\end{tabularx}
-\end{quote}
-La commande \Lcs{psCompass} permet de placer le compas :
-\begin{itemize}
-\item soit par un point et le rayon ;
-\item ou par deux points (le rayon est ensuite calcul\'{e} automatiquement).
-\end{itemize}
-
-\subsection{\textbackslash psParallels}
-
-\begin{BDef}
-\Lcs{psParallels}\OptArgs\Largr{pointA}\Largr{pointB}\Largr{pointC}
-\end{BDef}
-
-La commande \Lcs{psParallels} dispose des options \nxLkeyword{Ruler=}, \nxLkeyword{Ppoint=}, \nxLkeyword{pencilColA=} et \nxLkeyword{AddAngle=}.
-
-\begin{quote}
-\begin{tabularx}{\linewidth}{ @{} l >{\ttfamily}l X @{} }\toprule
-\emph{Nom} & \emph{D\'{e}faut} & \emph{action} \\\midrule
-\Lkeyword{Ruler} & true & dessine la r\'{e}glette gradu\'{e}e\\
-\Lkeyword{Ppoint} & false & Si \Lkeyword{Ppoint}=true] : l'origine du rapporteur est plac\'{e}e en C, son hypot\'{e}nuse \'{e}tant parall\'{e}le \`{a} (AB).\\
-\Lkeyword{AddAngle} & 0 & Angle suppl\'{e}mentaire pour inverser le rapporteur (0 or 180)\\
-\bottomrule
-\end{tabularx}
-\end{quote}
-
-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=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}
-
-
-\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}%
-}
-\end{verbatim}
-
-Remarque : Si [Ppoint=true] : l'origine du rapporteur est plac\'{e}e en C, son hypot\'{e}nuse \'{e}tant parall\`{e}le \`{a} (AB). La r\`{e}gle n'est plus plac\'{e}e automatiquement \`{a} sa position exacte sous le rapporteur.
-Il la placer soi-m\^{e}me.
-\section{Exemples de base}
-
-Les outils avec les options par d\'{e}faut.
-\begin{LTXexample}[pos=t,width=11cm]
-\begin{pspicture}(-6,-8.5)(5,4)
-\psProtractor{0}(0,0)
-\psRuler{0}(0,0)
-\psPencil{-30}(0,0)
-\end{pspicture}
-\end{LTXexample}
-
-
-
-Nous voyons que pour le rapporteur, la r\`{e}gle, et la pointe de la mine du crayon (son origine) sont positionn\'{e}es \`{a} $(0|0)$. L'ajout d'un angle tourne les objets autour de leur origine.
-
-Pour le rapporteur et la r\`{e}gle, il existe deux fa\c{c}ons de les positionner :
-\begin{itemize}
-\item Un point et un angle, comme :
-
-\Lcs{psProtractor}\OptArgs\Largb{<angle>}\Largr{<point>}
-
-C'est tout \`{a} fait explicite. L'origine est positionn\'{e}e au point et l'outil est tourn\'{e} autour de ce point de l'angle choisi.
-
-\item deux points et un angle suppl\'{e}mentaire, comme:
-\Lcs{psProtractor}\OptArgs\Largb{<angle additionnel>}\Largr{<pointA>}\Largr{<pointB>}
-
- L'origine de l'outil est d\'{e}finie sur pointA. L'hypot\'{e}nuse du rapporteur est align\'{e}e sur la droite joignant pointA et pointB, lorsque l'angle vaut $0$.
-\end{itemize}
-
-
-\begin{LTXexample}[pos=t,width=16cm]
-\begin{pspicture}[showgrid](-8,-6.5)(8,2)
-\pnode(-2,-1){A}\psdot[linecolor=Green,dotsize=5pt](A)\uput[90](A){A}
-\pnode(5,-2){B}\psdot[linecolor=Green,dotsize=5pt](B)\uput[180](B){B}
-\psProtractor[ProScale=0.5]{30}(A)
-\psProtractor[ProLineCol=Yellow,ProScale=0.5]{90}(B)
-\end{pspicture}
-\end{LTXexample}
-
-\begin{LTXexample}[pos=t,width=13cm]
-\begin{pspicture}[showgrid](-8,-6.5)(5,2)
-\pnode(-2,-2){A}\psdot[linecolor=Green,dotsize=5pt](A)\uput[45](A){A}
-\pnode(5,-4){B}\psdot[linecolor=Green,dotsize=5pt](B)\uput[45](B){B}
-\pcline[linecolor=Green](A)(B)
-\psProtractor[ProScale=0.5]{0}(A)(B)
-\psProtractor[ProLineCol=Yellow,ProScale=0.5]{190}(A)(B)
-\end{pspicture}
-\end{LTXexample}
-
-
-
-
-Les n\oe{}uds pr\'{e}d\'{e}finis du rapporteur.
-\begin{LTXexample}[pos=t,width=13cm]
-\begin{pspicture}(-8,-8.5)(5,2)
-\psProtractor{0}(0,0)
-\psdot[linecolor=Green,dotsize=10pt](GeodrA)\uput[45](GeodrA){GeodrA}
-\psdot[linecolor=Blue,dotsize=10pt](GeodrB)\uput[135](GeodrB){GeodrB}
-\psdot[linecolor=BrickRed,dotsize=10pt](GeodrC)\uput[-90](GeodrC){GeodrC}
-\end{pspicture}
-\end{LTXexample}
-
-
-
-A pair of compasses
-
-\begin{LTXexample}[pos=t,width=12cm]
-\begin{pspicture}[showgrid](-6,-2)(6,6)%
-\pnode(-1,0){A}\psdot[dotsize=3pt,linecolor=red](A)
-\pnode(1,0){B}\psdot[dotsize=3pt,linecolor=Green](B)
-\pscircle(A){2}
-\pcline[linecolor=BrickRed,nodesepA=-9,nodesepB=-6](A)(B)
-\psCompass[PoCAngle=70,PoCScale=0.8]{2}(A)
-\pnode(2,0){A}\psdot[dotsize=3pt,linecolor=red](A)
-\pnode(6,0){B}\psdot[dotsize=3pt,linecolor=Green](B)
-\psCompass[PoCScale=1,PoCFillCol=Yellow,PoCAngle=0,PoCMineCol=Green]{5}(A)(B)
-\end{pspicture}
-\end{LTXexample}
-
-\section{Exemples avanc\'{e}s}
-
-Mesurer les angles d'un triangle.
-
-\begin{LTXexample}[pos=t,width=17cm]
-\newpsstyle{WkMessung}{linestyle=none,AngleValue=true,ArcColor=Green,arrows=->,WedgeOpacity=0.6,WedgeColor=Green!30,LabelSep=1.6,MarkAngleRadius=2.8,linecolor=Green,decimals=1,comma}
-\newpsstyle{GeoDrG}{country=G,ProScale=1,ProLineCol=Green,ProFillCol=Green!50,OwnerTxt={Pythagoras},MadeTxt={Geodreieck}}
-\begin{pspicture}(0,-1)(17,10)
-\pnode(8,0){S}\uput[d](S){S}\psdot(S)
-\pnode(17,0){B}%\uput[l](B){B}
-\rput(S){\pnode(7;35){C}}%\uput[l](C){C}
-\pcline[linecolor=blue,nodesepB=-0](S)(B)
-\pcline[linecolor=red,nodesepB=-2](S)(C)
-\psProtractor[style=GeoDrG]{0}(S)(B)%
-\psIntersectionPoint(S)(C)(GeodrB)(GeodrC){D}
-%\psLDNode(A)(C){5.65}{D}
-\pcline[linecolor=Green,arrowinset=0.1,arrowlength=2,linewidth=2pt]{->}([offset=1.5cm]D)(D)
-\psGetAngleABC[style=WkMessung,xShift=-6,yShift=9](B)(S)(C){\Large\color{Green}$\alpha$}
-%\rput(8,9){\psframebox[framesep=6pt,framearc=0.2]{Winkel messen mit dem Geodreieck}}
-\rput([offset=4.5]D){\psframebox[framesep=6pt,framearc=0.2]{
-\begin{minipage}[t]{5.5cm}
-Lege das Geodreieck auf den blauen Schenkel, so dass die Null auf dem Scheitel S liegt. Lies nun am \"{a}u{\ss}eren Rand den Winkel ab (gr\"{u}ner Pfeil).
-\end{minipage}
-}}
-\end{pspicture}
-\end{LTXexample}
-
-
-
-\begin{LTXexample}[pos=t,width=16cm]
-\begin{pspicture}(-9,-6)(7,10)
-\pnode(1,7){A}
-\pnode(-5,0){B}
-\pnode(5,-2){C}
-\pspolygon[linecolor=red](A)(B)(C)
-\psProtractor[ProScale=0.5]{0}(A)(B)
-\psProtractor[ProScale=0.5]{0}(B)(C)
-\psProtractor[ProScale=0.5]{0}(C)(A)
-\end{pspicture}
-\end{LTXexample}
-
-\newpage
-
-Construction des hauteurs d'un triangle
-
-\begin{LTXexample}[pos=t,width=16cm]
-\begin{pspicture}(-6,-4.5)(5,8)
-\pnode(1,7){A}
-\pnode(-5,1){B}
-\pnode(3,2){C}
-\uput[ur](A){A}\uput[d](B){B}\uput[d](C){C}
-\pspolygon(A)(B)(C)
-\pstProjection{B}{C}{A}[A']
-\psProtractor[ProScale=0.8,OwnerTxt={Height of a triangle},MadeTxt={Made in NES},PSfontO=Helvetica,PSfontM=Times-Roman,fontsizeO=8,fontsizeM=6]{0}(A')(A)
-\pcline[linecolor=red,linestyle=dashed,linewidth=2pt](GeodrC)(A')
-\pstRightAngle[RightAngleType=german]{C}{A'}{A}
-\end{pspicture}
-\end{LTXexample}
-
-
-
-
-\clearpage
-
-
-
-\section{Liste de tous les options pour \texttt{pst-geometrictools}}
-\xkvview{family=pst-geometrictools,columns={key,type,default}}
-
-
-\clearpage
-
-
-%\nocite{*}
-%\bgroup
-%\RaggedRight
-%\printbibliography
-%\egroup
-
-
-\printindex
-\end{document} \ No newline at end of file
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 608e29ef560..bcd397f26ca 100644
--- a/Master/texmf-dist/tex/generic/pst-geometrictools/pst-geometrictools.tex
+++ b/Master/texmf-dist/tex/generic/pst-geometrictools/pst-geometrictools.tex
@@ -1,7 +1,7 @@
%% This is file `pst-geometrictools.tex',
%%
%% Thomas Söll
-%% fixes for lualatex by Herbert Voß
+%% fixes by Herbert Voß
%%
%% This program can redistributed and/or modified under %%
%% the terms of the LaTeX Project Public License %%
@@ -10,7 +10,8 @@
%% the License, or (at your option) any later version. %%
%%
%% DESCRIPTION:
-%% `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
%%
%%
\csname PSTgeometrictoolsLoaded\endcsname
@@ -20,8 +21,8 @@
\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}
+\def\fileversion{1.4}
+\def\filedate{2024/04/15}
\message{`PST' v\fileversion, \filedate}
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -39,7 +40,7 @@
\define@key[psset]{pst-geometrictools}{fontsizeM}[6]{\def\pst@fontsizeM{#1 }}
\define@key[psset]{pst-geometrictools}{country}[Germany]{\def\pst@country{#1}}
\psset[pst-geometrictools]{ProScale=1,OwnerTxt={Euklid},MadeTxt={made in NES},
- country=Germany,PSfontO=StandardSymL,PSfontM=NimbusRomNo9L-Regu,fontsizeO=10,fontsizeM=6,
+ country=Germany,PSfontO=StandardSymbolsPS,PSfontM=NimbusRomNo9L-Regu,fontsizeO=10,fontsizeM=6,
ProFillCol=gray!60,ProLineCol=cyan,Ghost=false}
@@ -49,7 +50,6 @@
\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
@@ -472,7 +472,6 @@ 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
}%
@@ -766,30 +765,29 @@ grestore
\psset[pst-geometrictools]{PoCScale=1,PoCFillCol=PoCRed,PoCAngle=0,PoCMineCol=black!80,PoCLength=5,MCAngle=true,RadVS=RVS,AngleVS=AVS,RadMul=1}
\def\psCompass{\def\pst@par{}\pst@object{psCompass}}% Pair of Compasses
-\def\psCompass@i#1(#2){\@ifnextchar(%
-{\psCompass@ii{0}(#2)}%
-{\psCompass@ii{#1}(#2)(#2)}}%
+\def\psCompass@i#1(#2){\@ifnextchar({\psCompass@ii{0}(#2)}{\psCompass@ii{#1}(#2)(#2)}}%
+
\def\psCompass@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{%
+ \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{%
\pst@RadMul /faktor ED
\pst@PoCScale /skal ED
#1 skal div 2 div /Radius ED
skal dup scale % -------- Skaliere das ganze Geodreieck
- /sysfill {systemdict /fill get exec} def
- /SLg \pst@PoCLength 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)
- \pst@tempA\pst@coor /@y3 ED /@x3 ED
- @y1 @y2 sub dup mul @x1 @x2 sub dup mul add faktor dup mul mul /quadlg ED
+ /sysfill {systemdict /fill get exec} def
+ /SLg \pst@PoCLength 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)
+ \pst@tempA\pst@coor /@y3 ED /@x3 ED
+ @y1 @y2 sub dup mul @x1 @x2 sub dup mul add faktor dup mul mul /quadlg ED
quadlg 0 eq { 180 } { @y1 @y2 sub @x1 @x2 sub atan } ifelse /@delta ED %------------ Winkelberechnung
quadlg sqrt 2 div /RadiusPktB ED %------------ Radiusberechnung mit zweitem Punkt
SLg RadiusPktB Radius add gt { RadiusPktB Radius add } { SLg } ifelse /RadPoC ED
@@ -798,10 +796,10 @@ grestore
@x3 @y3 T % ------------------------------------------------------------------------------- Transformiere den Koordinatenursprung in P
\pst@PoCAngle\space \ifPst@MCAngle\space @delta add 180 add \fi rotate % ------------------------------ Drehe das gesamte Geodreieck
%-------------------------------------------------------------------------------------------------------------
-gsave
+ gsave
%-------------------------------------------------------------------------------------------------------------
%-------------- Linke Zirkelspitze----------------------------------------------- 0 cm 0 cm 0.15 cm 0 360 arc
-gsave
+ gsave
newpath
phiS neg rotate
0 cm 0 cm moveto
@@ -812,9 +810,9 @@ gsave
0.5 setgray
fill
grestore
-grestore
+ grestore
%---------------------------------------- rechte Zirkel-Mine --------------------------------------
-gsave
+ gsave
newpath
phiS neg rotate
0 cm SLg cm T
@@ -828,9 +826,9 @@ gsave
\pst@usecolor\PoCMineCol
fill
grestore
-grestore
+ grestore
%---------------------------------------- Spindel --------------------------------------
-gsave
+ gsave
newpath
phiS neg rotate
0 cm SLg cm moveto
@@ -843,8 +841,8 @@ gsave
1.6 setlinewidth
stroke
grestore
-grestore
-gsave
+ grestore
+ gsave
newpath
phiS neg rotate
0 cm SLg cm moveto
@@ -859,9 +857,9 @@ gsave
0.2 setlinewidth
stroke
grestore
-grestore
+ grestore
%---------------------------------------- Drehrad an der Spindel --------------------------------------
-gsave
+ gsave
newpath
phiS neg rotate
0 cm SLg cm moveto
@@ -874,9 +872,9 @@ gsave
0.08 cm setlinewidth
stroke
grestore
-grestore
-gsave
-gsave
+ grestore
+ gsave
+% gsave
newpath
phiS neg rotate
0 cm SLg cm moveto
@@ -890,10 +888,10 @@ gsave
0.2 setlinewidth
stroke
grestore
-grestore
-gsave
+ grestore
+% gsave
%---------------------------------------- Halterung zum Anfassen --------------------------------------
-gsave
+ gsave
newpath
phiS neg rotate
0 cm SLg cm moveto
@@ -906,8 +904,8 @@ gsave
3 setlinewidth
stroke
grestore
-grestore
-gsave
+ grestore
+ gsave
newpath
phiS neg rotate
0 cm SLg cm moveto
@@ -920,8 +918,8 @@ gsave
5 setlinewidth
stroke
grestore
-grestore
-gsave
+ grestore
+ gsave
newpath
phiS neg rotate
0 cm SLg cm moveto
@@ -934,8 +932,8 @@ gsave
5 setlinewidth
stroke
grestore
-grestore
-gsave
+ grestore
+ gsave
newpath
phiS neg rotate
0 cm SLg cm moveto
@@ -950,8 +948,8 @@ gsave
0.15 setlinewidth
stroke
grestore
-grestore
-gsave
+ grestore
+ gsave
newpath
phiS neg rotate
0 cm SLg cm moveto
@@ -966,9 +964,9 @@ gsave
0.2 setlinewidth
stroke
grestore
-grestore
+ grestore
%---------------------------------------- Kreis um oberen Teil --------------------------------------
-gsave
+ gsave
newpath
phiS neg rotate
0 cm SLg cm moveto
@@ -982,9 +980,9 @@ gsave
1.3 setlinewidth
stroke
grestore
-grestore
+ grestore
%---------------------------------------- Kreis zwischen den Schenkeln --------------------------------------
-gsave
+ gsave
newpath
phiS neg rotate
0 cm SLg cm moveto
@@ -994,9 +992,9 @@ gsave
0.1 setgray
fill
grestore
-grestore
+ grestore
%---------------------------------------- Schenkel des Zirkels ----------------------------------------------------
-gsave
+ gsave
newpath
phiS neg rotate
0 cm 0.3 cm moveto
@@ -1012,8 +1010,8 @@ gsave
\pst@usecolor\PoCFillCol
stroke
grestore
-grestore
-gsave
+ grestore
+ gsave
newpath
phiS neg rotate
-0.17 cm SLg 0.6 mul cm moveto
@@ -1029,9 +1027,9 @@ gsave
0.4 setgray
stroke
grestore
-grestore
+ grestore
%---------------------------------------- Kreis an der linken Spitze --------------------------------------
-gsave
+ gsave
newpath
phiS neg rotate
-0.03 cm 0.8 cm moveto
@@ -1041,8 +1039,8 @@ gsave
0.25 setgray
fill
grestore
-grestore
-gsave
+ grestore
+ gsave
newpath
phiS neg rotate
-0.03 cm 0.8 cm moveto
@@ -1052,9 +1050,9 @@ gsave
0.8 setgray
fill
grestore
-grestore
+ grestore
%---------------------------------------- Kreis an der rechten Spitze --------------------------------------
-gsave
+ gsave
newpath
phiS neg rotate
0 cm SLg cm T
@@ -1067,8 +1065,8 @@ gsave
0.25 setgray
fill
grestore
-grestore
-gsave
+ grestore
+ gsave
newpath
phiS neg rotate
0 cm SLg cm T
@@ -1081,10 +1079,10 @@ gsave
0.8 setgray
fill
grestore
-grestore
+ grestore
%--------------------------------------------------------------------------------------------------------------------------------------------------
%--------------- Ende nur grestore von gsave ganz am Anfang ------------------
-grestore
+ grestore
}%
\pnode(!
\pst@tempA \tx@UserCoor /@@y1 ED /@@x1 ED
diff --git a/Master/texmf-dist/tex/latex/pst-geometrictools/pst-geometrictools.sty b/Master/texmf-dist/tex/latex/pst-geometrictools/pst-geometrictools.sty
index 2f1cd2e24c8..496c7a2e727 100644
--- a/Master/texmf-dist/tex/latex/pst-geometrictools/pst-geometrictools.sty
+++ b/Master/texmf-dist/tex/latex/pst-geometrictools/pst-geometrictools.sty
@@ -4,7 +4,7 @@
%%
%% Package `pst-geometrictools.tex'
%%
-%% Thomas S\"{O}LL
+%% Thomas SöLL, Herbert Voß
%%
%% This program can redistributed and/or modified under %%
%% the terms of the LaTeX Project Public License %%
@@ -16,7 +16,7 @@
%% `pst-geometrictools' is a PSTricks package to draw a protractor, a ruler, a compass and pencils
%%
\RequirePackage{pstricks}
-\ProvidesPackage{pst-geometrictools}[2017/06/29 package wrapper for pst-geometrictools.tex]
+\ProvidesPackage{pst-geometrictools}[2024/04/15 package wrapper for pst-geometrictools.tex]
\input{pst-geometrictools.tex}
\ProvidesFile{pst-geometrictools.tex}
[\filedate\space v\fileversion\space `PST-geometrictools']