summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-06-18 03:02:56 +0000
committerNorbert Preining <norbert@preining.info>2020-06-18 03:02:56 +0000
commit7a78c3b8b21b6842d27bb48f37197f8c380ccc5e (patch)
treeaaa0da455d5784ca3b21e12a88b6a739bb543e84 /graphics
parentda248962ebaf9445ca3c9dde54c05c3baa8715ab (diff)
CTAN sync 202006180302
Diffstat (limited to 'graphics')
-rw-r--r--graphics/pstricks/contrib/pst-eucl/Changes1
-rw-r--r--graphics/pstricks/contrib/pst-eucl/doc/pst-eucl-doc.pdfbin1740981 -> 1733912 bytes
-rw-r--r--graphics/pstricks/contrib/pst-eucl/doc/pst-eucl-doc.tex10
-rw-r--r--graphics/pstricks/contrib/pst-eucl/tex/pst-eucl.tex25
4 files changed, 20 insertions, 16 deletions
diff --git a/graphics/pstricks/contrib/pst-eucl/Changes b/graphics/pstricks/contrib/pst-eucl/Changes
index d439487e66..101f759b4b 100644
--- a/graphics/pstricks/contrib/pst-eucl/Changes
+++ b/graphics/pstricks/contrib/pst-eucl/Changes
@@ -6,6 +6,7 @@ pst-eucl.pro --------
pst-eucl.tex --------
+1.73 2020/06/07 - Allow the star version for \pstLabelAB to use \cput* or \cput for the label
1.72a 2020/06/07 - fix a typo in the macro definition \pstMarkAngle
1.72 2020/04/18 - revert the change of \pstTriangle in v1.69, we should use \pst@object to clear \pst@par.
- add macro to draw the Lemonie Point of the given triangle, \pstTriangleLC.
diff --git a/graphics/pstricks/contrib/pst-eucl/doc/pst-eucl-doc.pdf b/graphics/pstricks/contrib/pst-eucl/doc/pst-eucl-doc.pdf
index 5e45e5fa21..0f792fb875 100644
--- a/graphics/pstricks/contrib/pst-eucl/doc/pst-eucl-doc.pdf
+++ b/graphics/pstricks/contrib/pst-eucl/doc/pst-eucl-doc.pdf
Binary files differ
diff --git a/graphics/pstricks/contrib/pst-eucl/doc/pst-eucl-doc.tex b/graphics/pstricks/contrib/pst-eucl/doc/pst-eucl-doc.tex
index 897236a8b8..cf38bc251e 100644
--- a/graphics/pstricks/contrib/pst-eucl/doc/pst-eucl-doc.tex
+++ b/graphics/pstricks/contrib/pst-eucl/doc/pst-eucl-doc.tex
@@ -339,7 +339,7 @@ to put the label \textit{above}, \textit{cover}, \textit{below} the segment. The
just use them to draw a ruler bar and put the label on the ruler bar.
\begin{BDef}
-\Lcs{pstLabelAB}\OptArgs\Largb{A}\Largb{B}\Largb{label}
+\Lcs{pstLabelAB}\OptArg{*}\OptArgs\Largb{A}\Largb{B}\Largb{label}
\end{BDef}
You can use the parameters of \Lcs{ncline} to control the ruler bar,
@@ -350,7 +350,7 @@ there is another parameter \Lkeyword{offset} to control the separation between
the rule bar and the segment.
It does not display the ruler bar as default, and you need to setup \Lkeyword{linestyle}
-to display it.
+to display it. The star version uses also the star version of the put macro (white background).
\begin{LTXexample}[width=6cm,pos=l]
\begin{pspicture}[showgrid=true](-1,-1)(4,4)
@@ -363,11 +363,11 @@ to display it.
\pstLabelAB[linestyle=dashed]{C}{D}{$\sqrt{a^2+b^2}$}
\pstGeonode[PosAngle=190](-1,-1){E}
\pstGeonode[PosAngle=10](3,0){F}\pstLineAB{E}{F}
-\pstLabelAB[linestyle=dashed,arrows=|-|,offset=10pt,linecolor=blue!50]{E}{F}{$\sqrt{a^2+b^2}$}
-\pstLabelAB[linestyle=dashed,arrows=|<->|,offset=10pt,nrot=:D]{F}{E}{$\sqrt{a^2+b^2}$}
+\pstLabelAB*[linestyle=dashed,arrows=|-|,offset=10pt,linecolor=blue!50]{E}{F}{$\sqrt{a^2+b^2}$}
+\pstLabelAB*[linestyle=dashed,arrows=|<->|,offset=10pt,nrot=:D]{F}{E}{$\sqrt{a^2+b^2}$}
\pstGeonode[PosAngle=100](0,4){G}
\pstGeonode[PosAngle=-50](4,2){H}\pstLineAB{G}{H}
-\pstLabelAB[linestyle=solid,linecolor=red!50,arrows=|-|,offset=15pt,nrot=:U,npos=0.7]{G}{H}{\textcolor{red!50}{$\dfrac{a}{b}$}}
+\pstLabelAB*[linestyle=solid,linecolor=red!50,arrows=|-|,offset=15pt,nrot=:U,npos=0.7]{G}{H}{\textcolor{red!50}{$\dfrac{a}{b}$}}
\end{pspicture}
\end{LTXexample}
diff --git a/graphics/pstricks/contrib/pst-eucl/tex/pst-eucl.tex b/graphics/pstricks/contrib/pst-eucl/tex/pst-eucl.tex
index c821347f8c..8abea6715b 100644
--- a/graphics/pstricks/contrib/pst-eucl/tex/pst-eucl.tex
+++ b/graphics/pstricks/contrib/pst-eucl/tex/pst-eucl.tex
@@ -20,8 +20,8 @@
\csname PSTEuclideLoaded\endcsname
\let\PSTEuclideLoaded\endinput
%
-\def\fileversion{1.72a}
-\def\filedate{2020/06/07}
+\def\fileversion{1.73}
+\def\filedate{2020/06/17}
%%
\message{`PST-Euclide v\fileversion, \filedate\space (dr,hv)}%
%% prologue for postcript
@@ -284,7 +284,8 @@
\pnode(#1){#2}
\xdef\@@GenCourbe{\@@GenCourbe(#2)}%%for accumulating points% DR 22032005
\Pst@ManageParamList{#2}%
- \@ifnextchar(\Pst@Geonode@ii{\pst@MngTransformCurve\endgroup}}% DR 22032005
+ \@ifnextchar(\Pst@Geonode@ii{\pst@MngTransformCurve\endgroup
+ }}% DR 22032005
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% \pstPolygon[options](A)(B)(C)(D)...
@@ -3011,15 +3012,17 @@
%% - offset: the seperation between label and segment
%% - nrot: the rotation of the label
%% - npos: the proportion of the label
-\def\pstLabelAB{\@ifnextchar[\Pst@LabelAB{\Pst@LabelAB[]}}
-\def\Pst@LabelAB[#1]#2#3#4{%
+\def\pstLabelAB{\pst@object{pstLabelAB}}
+\def\pstLabelAB@i#1#2#3{%
\begingroup
- \psset{linestyle=none} % default not show the rule bar.
- \psset{offset=10pt} % default offset is 10pt
- \psset{nrot=:U} % default rotation is :U
- \psset{npos=0.5} % default label proportion from A to B is 0.5
- \psset{#1}\ncline{#2}{#3}\ncput*{#4}
- \endgroup%
+ \addbefore@par{linestyle=none,offset=10pt,nrot=:U,npos=0.5}% the defaults
+ \use@par
+ \if@star
+ \ncline{#1}{#2}\ncput*{#3}%
+ \else
+ \ncline{#1}{#2}\ncput{#3}%
+ \fi
+ \endgroup
}%
%% \pstExtendAB[Options]{A}{B}{distance}{C}
%% Extend AB to C such that |BC|=distance, then create node C.