summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-01 22:16:10 +0000
committerKarl Berry <karl@freefriends.org>2018-09-01 22:16:10 +0000
commit78a6ecd28b5c518a367acbd281a87f04c353a477 (patch)
tree02e4262b617de77ec4d5552522c67683f8bb41a6
parent4a2f96d8d387cc9311743a067e2c4f80b1b55a78 (diff)
pst-eucl (1sep18)
git-svn-id: svn://tug.org/texlive/trunk@48533 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pst-eucl/Changes3
-rw-r--r--Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.bib21
-rw-r--r--Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.pdfbin534172 -> 540222 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.tex18
-rw-r--r--Master/texmf-dist/source/generic/pst-eucl/Makefile89
-rw-r--r--Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex65
6 files changed, 147 insertions, 49 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-eucl/Changes b/Master/texmf-dist/doc/generic/pst-eucl/Changes
index 8cd5051d925..f053998935a 100644
--- a/Master/texmf-dist/doc/generic/pst-eucl/Changes
+++ b/Master/texmf-dist/doc/generic/pst-eucl/Changes
@@ -5,6 +5,9 @@ pst-eucl.pro --------
pst-eucl.tex --------
+1.59 2018/09/01 - fix introduced bug in \Pst@geonodelabel
+1.58 2018/08/07 - allow PointSymbol?=none
+1.57 2017/11/28 - fix bug with StandardSyml->StandardSymL
1.56 2017/04/18 - \psGetAngleABC:
- added dec -1 le { /dec 15 def } if
- added \pst@usecolor\pslinecolor in line 1616
diff --git a/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.bib b/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.bib
index bb9df6926c3..19eaf8f2ab5 100644
--- a/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.bib
@@ -39,15 +39,16 @@
year = 1989,
}
-@Manual{multido,
- Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
- Author = {{Timothy Van} Zandt},
- Organization = {},
- Address = {\url{CTAN:/macros/generic/multido.tex}},
- Note = {},
- year = 1997
+@ctan{multido,
+title = {The Multido package},
+subtitle = {A loop facility for Generic TeX},
+author = {Van Zandt, Timothy and Voß, Herbert and Niepraschk, Rolf},
+url = {macros/latex/multido},
+urldate = {2018-09-01},
+version = {1.42}
}
+
@Book{PSTricks2,
author = {Herbert Vo\ss{}},
title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
@@ -60,7 +61,7 @@
@Book{PSTricksE,
author = {Herbert Vo\ss{}},
title = {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX},
- edition = {1.},
+ edition = {1},
publisher = {UIT},
year = {2011},
address = {Cambridge -- UK}
@@ -69,7 +70,7 @@
@Book{LTXquick,
author = {Herbert Vo\ss{}},
title = {{\LaTeX} quick reference},
- edition = {1.},
+ edition = {1},
publisher = {UIT},
year = {2012},
address = {Cambridge -- UK}
@@ -78,7 +79,7 @@
@Book{presentations,
author = {Herbert Vo\ss},
title = {Presentations with \LaTeX},
- edition = {1.},
+ edition = {1},
publisher = {DANTE -- Lehmanns Media},
year = {2012},
address = {Heidelberg/Berlin}
diff --git a/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.pdf b/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.pdf
index 55cfb40e969..2657d5c00f6 100644
--- a/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.tex b/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.tex
index 547a2c167db..1e1571dd98d 100644
--- a/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.tex
@@ -65,7 +65,7 @@ Thomas Söll.
\part{The package}
\section{Special specifications}
-\subsection{\PST Options}
+\subsection{\PST\ Options}
The package activates the \Lcs{SpecialCoor} mode. This mode extend the
coordinates specification. Furthermore the plotting type is set to
@@ -148,7 +148,7 @@ several of these are :
\item their angle with parameter \Lkeyword{dotangle}.
\end{compactitem}
-Please consult the \PST documentation for further details.
+Please consult the \PST\ documentation for further details.
The
parameters \Lkeyword{PosAngle}, \Lkeyword{PointSymbol}, \Lkeyword{PointName} and
\Lkeyword{PointNameSep} can be set to :
@@ -183,7 +183,7 @@ draw a line between the points:
linestyle=dashed, CurveType=polygon,
PointNameSep={1em,2em,3mm}]
(1,2){M_1}(2,1){M_2}(1,0){M_3}
-\pstGeonode[PosAngle={50,100,90}, PointSymbol={*,x,default},
+\pstGeonode[PosAngle={50,100,90}, PointSymbol={*,x,*},
PointNameSep=3mm, CurveType=curve,
PointName={\alpha,\beta,\gamma,default}]
(-2,0){alpha}(-1,-2){beta}(0,-1){gamma}(2,-1.5){T}
@@ -191,7 +191,7 @@ draw a line between the points:
\end{LTXexample}
Obviously, the nodes appearing in the picture can be used as normal
-\PST nodes. Thus, it is possible to reference a point from
+\PST\ nodes. Thus, it is possible to reference a point from
\rnode{ici}{here}.
\nccurve[arrowscale=2]{->}{ici}{B_1}
@@ -356,7 +356,7 @@ The symbol used is controlled by the parameter \Lkeyword{RightAngleType}
\nxLkeyval{default}. Its possible values are :
\begin{compactitem}
-\item \Lkeyval{default} : standard symbol ;
+\item \Lkeyval{*} : standard symbol ;
\item \Lkeyval{german} : german symbol (given by U. Dirr) ;
\item \Lkeyval{suisseromand} : swiss romand symbol (given P. Schnewlin).
\end{compactitem}
@@ -1356,7 +1356,7 @@ Calculates and prints the values. This is only possible on PostScript level!
\begin{LTXexample}[width=5cm,pos=l]
\begin{pspicture}[showgrid](-1,-1)(4.4,5)
\psset{PointSymbol=none,PointName=none}
-\pstGeonode[PosAngle={180,130,-90},PointSymbol={default,none},
+\pstGeonode[PosAngle={180,130,-90},PointSymbol={*,none},
PointName=default](2,0){B}(0,1){O}(1,4){A}
\pstLineAB[nodesepB=-1,linecolor=red]{O}{A}
\pstLineAB[nodesepB=-1,linecolor=red]{O}{B}
@@ -1621,12 +1621,12 @@ The drawing of the circle tangents which crosses a given point.
\pstInterLC[Radius=\pstDistVal{1}]{O}{O'}{O'}{}{M'}{toto}
\pstRotation[RotAngle=30]{O}{M}[N]
\pstRotation[RotAngle=30]{O'}{M'}[N']
-\pstInterLL[PointSymbol=default, PointName=\Omega]{O}{O'}{N}{N'}{Omega}
+\pstInterLL[PointSymbol=*, PointName=\Omega]{O}{O'}{N}{N'}{Omega}
\pstMiddleAB{O}{Omega}{I} \pstInterCC{I}{O}{O}{M}{A}{B}
\psset{nodesepA=-1, nodesepB=-3, linecolor=blue, linewidth=1.3\pslinewidth}
\pstLineAB[nodesep=-2]{A}{Omega}\pstLineAB[nodesep=-2]{B}{Omega}
\pstRotation[RotAngle=-150]{O'}{M'}[N'']
-\pstInterLL[PointSymbol=default, PointName=\Omega']{O}{O'}{N}{N''}{Omega'}
+\pstInterLL[PointSymbol=*, PointName=\Omega']{O}{O'}{N}{N''}{Omega'}
\pstMiddleAB{O}{Omega'}{J}
\pstInterCC{J}{O}{O}{M}{A'}{B'}
\psset{nodesepA=-1, nodesepB=-3, linecolor=red}
@@ -2059,7 +2059,7 @@ crossing a given point.
\bgroup
\RaggedRight
%\bibliographystyle{plain}
-\printbibliography{pst-eucl-doc}
+\printbibliography
\egroup
\printindex
diff --git a/Master/texmf-dist/source/generic/pst-eucl/Makefile b/Master/texmf-dist/source/generic/pst-eucl/Makefile
new file mode 100644
index 00000000000..bdc5824372c
--- /dev/null
+++ b/Master/texmf-dist/source/generic/pst-eucl/Makefile
@@ -0,0 +1,89 @@
+
+# `Makefile' for `pst-3dplot.pdf', hv, 2007/03/17
+
+.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
+
+PACKAGE = pst-eucl
+
+MAIN = $(PACKAGE)-doc
+
+TDS = ~/PSTricks/PSTricks-TDS
+
+LATEX = latex
+
+ARCHNAME = $(MAIN)-$(shell date +%y%m%d)
+
+ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile
+
+all : doc clean tds
+doc: $(MAIN).pdf
+
+$(MAIN).pdf : $(MAIN).ps
+ GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $<
+
+$(MAIN).ps : $(MAIN).dvi
+ dvips $<
+
+$(MAIN).dvi : $(MAIN).tex
+ $(LATEX) $<
+ $(LATEX) $<
+ if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi
+ if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi
+ makeindex -t $(basename $<).ilg -s pst-doc.ist -o $(basename $<).ind $(basename $<).idx
+ makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls $(basename $<).glo
+ biber $(basename $<)
+ $(LATEX) $<
+ $(LATEX) $<
+
+clean :
+ $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .Roessler .bbl )
+ $(RM) $(addprefix $(MAIN), .dvi .ps .xcp .bcf .run.xml)
+
+veryclean : clean
+ $(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
+
+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)/
+
+ctan:
+ rm -f .ctan/$(PACKAGE)/latex/*
+ cp -u *.sty .ctan/$(PACKAGE)/latex/
+# cp -u *.cfg .ctan/$(PACKAGE)/latex/
+ rm -f .ctan/$(PACKAGE)/tex/*
+ cp -u $(PACKAGE).tex .ctan/$(PACKAGE)/tex/
+# cp -u $(PACKAGE)97.tex .ctan/$(PACKAGE)/tex/
+ cp -u *.pro .ctan/$(PACKAGE)/dvips/
+# cp -u more_docs/psmatrix* .ctan/$(PACKAGE)/doc/
+ rm -f .ctan/$(PACKAGE)/doc/*
+ cp -u $(PACKAGE)-doc.* .ctan/$(PACKAGE)/doc/
+# cp -u more_docs/* .ctan/$(PACKAGE)/doc/
+# rm -fr .ctan/$(PACKAGE)/.svn
+ cp -u Changes .ctan/$(PACKAGE)/
+ cp -u README .ctan/$(PACKAGE)/
+ chmod -R a+r .ctan/$(PACKAGE)
+# rm -f .ctan/pstricks-add.zip
+# cd .ctan
+# zip -r pstricks-add.zip *
+# cd ..
+
+
+# EOF
diff --git a/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex b/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
index 850f4cf860f..50aed785dce 100644
--- a/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
+++ b/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
@@ -17,8 +17,8 @@
\ifx\MultidoLoaded\endinput \else\input multido.tex \fi
\csname PSTEuclideLoaded\endcsname
\let\PSTEuclideLoaded\endinput
-\def\fileversion{1.56}
-\def\filedate{2017/04/18}
+\def\fileversion{1.59}
+\def\filedate{2018/09/01}
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
%% archives in directory macros/latex/base/lppl.txt.
@@ -34,10 +34,10 @@
% Definition of the parameters
% ----------------------------
% symbol used for the point
-\define@key[psset]{pst-eucl}{PointSymbol}[default]{\def\psk@PointSymbol{#1}}%
-\define@key[psset]{pst-eucl}{PointSymbolA}[undef]{\edef\psk@PointSymbolA{#1}}%
-\define@key[psset]{pst-eucl}{PointSymbolB}[undef]{\edef\psk@PointSymbolB{#1}}%
-\define@key[psset]{pst-eucl}{PointSymbolC}[undef]{\edef\psk@PointSymbolC{#1}}%
+\define@key[psset]{pst-eucl}{PointSymbol}[*]{\def\psk@PointSymbol{#1}}%
+\define@key[psset]{pst-eucl}{PointSymbolA}[*]{\edef\psk@PointSymbolA{#1}}%
+\define@key[psset]{pst-eucl}{PointSymbolB}[*]{\edef\psk@PointSymbolB{#1}}%
+\define@key[psset]{pst-eucl}{PointSymbolC}[*]{\edef\psk@PointSymbolC{#1}}%
% name used for the point
\define@key[psset]{pst-eucl}{PointName}[default]{\def\psk@PointName{#1}}%
@@ -132,7 +132,7 @@
% --------------
\def\resetEUCLvalues{%
\psset[pst-eucl]{%
- PointSymbol=default, PointSymbolA=undef, PointSymbolB=undef, PointSymbolC=undef,
+ PointSymbol=*, PointSymbolA=*, PointSymbolB=*, PointSymbolC=*,
PointName=default, PointNameA=undef, PointNameB=undef, PointNameC=undef,
PtNameMath=true, PointNameMathSize=\textstyle, PointNameSize=\normalsize,
PointNameSep=default, PosAngle=undef, PosAngleA=undef,
@@ -258,12 +258,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% #1 -> point coordinates
\def\Pst@geonodelabel#1{% % {nodename}
- \ifx\psk@PointSymbol\@none\else
- \ifx\psk@PointSymbol\@default \def\psk@PointSymbol{*}\fi
- \psdot[dotstyle=\psk@PointSymbol](#1)%
- \Pst@PutPointLabel{#1}%DR 041104
+ \ifx\psk@PointSymbol\@none
+ \else
+% \ifx\psk@PointSymbol\@default \def\psk@PointSymbol{*}\fi%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \psdot[dotstyle=\psk@PointSymbol](#1)%
+ \Pst@PutPointLabel{#1}%DR 041104
\fi%DR 02092004
- \ifx\psk@PointName\@none\else\Pst@PutPointLabel{#1}\fi%DR 041104
+% \ifx\psk@PointName\@none\else\Pst@PutPointLabel{#1}\fi%DR 041104
}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\Pst@PutPointLabel#1{%DR 041104
@@ -371,7 +372,7 @@
\def\pstRightAngle{\pst@object{pstRightAngle}}
\def\pstRightAngle@i#1#2#3{%
\begingroup
-% \addbefore@par{linestyle=solid,linecolor=black,linewidth=\pslinewidth}
+ \addbefore@par{dotscale=1}%linestyle=solid,linecolor=black,linewidth=\pslinewidth}
\use@par% % Affectation of local parameters
%% not good at all, but \rput{0}(#3){\rput{(#2)}{stuff}} doesn't work...
\rput(#2){%
@@ -388,7 +389,7 @@
\else
\ifx\psk@RightAngleType\@german
\pstMarkAngle[MarkAngleRadius=\psk@RightAngleSize,LabelSep=\psk@RightAngleSize\space .5 mul]{#1}{#2}{#3}%
- {\psscalebox{\psk@RightAngleSize}{\pscircle*{.08}}}%
+ {\psscalebox{\psk@RightAngleSize}{\pscircle*{!.08 \psk@xdotscale\space mul}}}%
\else
\ifx\psk@RightAngleType\@suisseromand
\rput{*0}%
@@ -422,7 +423,7 @@
2 copy lt { exch 360 sub exch } if
add 2 div dup /psRawLabelPos ED
\psk@LabelAngleOffset\space add
- \psk@LabelSep\space exch PtoC ){#5}%
+ \psk@LabelSep\space exch PtoC){#5}%
\def\pst@tempA{Angleundef}%
%% define \pst@rot@angle to make it compatible with xelatex for later use
\edef\pst@rot@angle{ tx@EcldDict begin % expand the #4 and #2
@@ -430,7 +431,7 @@
2 copy lt \pslbrace exch 360 sub exch \psrbrace if
add 2 div \psk@LabelAngleOffset\space add }%
\rput[\psk@LabelRefPt]{!\pst@rot@angle\space \ifx\psk@MarkAngle\@undef 0 \else\psk@MarkAngle\space\fi add }%
- (! \psk@MarkAngleRadius\space psRawLabelPos PtoC )%
+ (! \psk@MarkAngleRadius\space psRawLabelPos PtoC)%
{\ifx\psk@mark\pst@tempA\csname\psk@Mark\endcsname\else\csname\psk@mark\endcsname\fi}%
}}}
%
@@ -467,7 +468,7 @@
\else\psset{PosAngle=\psk@PosAngleA}\fi
%%end modif alaindelplanque 11/2003
\ifx\psk@PosAngleA\@undef\else\psset{PosAngle=\psk@PosAngleA}\fi
- \ifx\psk@PointSymbolA\@undef\else\psset{PointSymbol=\psk@PointSymbolA}\fi
+ \let\psk@PointSymbol=\psk@PointSymbolA
\ifx\psk@PointNameA\@undef\else\psset{PointName=\psk@PointNameA}\fi
\Pst@Geonode@i[](#1){#2}\egroup%%NEW DR 15112001
%%begin modif alaindelplanque 11/2003
@@ -481,7 +482,7 @@
\else\psset{PosAngle=\psk@PosAngleB}\fi
%%end modif alaindelplanque 11/2003
\ifx\psk@PosAngleB\@undef\else\psset{PosAngle=\psk@PosAngleB}\fi
- \ifx\psk@PointSymbolB\@undef\else\psset{PointSymbol=\psk@PointSymbolB}\fi
+ \let\PointSymbol=\psk@PointSymbolB
\ifx\psk@PointNameB\@undef\else\psset{PointName=\psk@PointNameB}\fi
\Pst@Geonode@i[](#3){#4}\egroup%%NEW DR 15112001
%%begin modif alaindelplanque 11/2003
@@ -495,7 +496,7 @@
\else\psset{PosAngle=\psk@PosAngleC}\fi%% <----------------------- hv
%%end modif alaindelplanque 11/2003
\ifx\psk@PosAngleC\@undef\else\psset{PosAngle=\psk@PosAngleC}\fi
- \ifx\psk@PointSymbolC\@undef\else\psset{PointSymbol=\psk@PointSymbolC}\fi
+ \let\PointSymbol=\psk@PointSymbolC
\ifx\psk@PointNameC\@undef\else\psset{PointName=\psk@PointNameC}\fi
\Pst@Geonode@i[](#5){#6}%%NEW DR 15112001
\pst@TraceTriangle{#2}{#4}{#6}%
@@ -1020,14 +1021,14 @@
Glbx \pst@number\psxunit div Glby \pst@number\psyunit div
end){\pnode{#6}}
}%
- \bgroup
- \ifx\psk@PosAngleA\@undef\else\psset{PosAngle=\psk@PosAngleA}\fi
- \ifx\psk@PointSymbolA\@undef\else\psset{PointSymbol=\psk@PointSymbolA}\fi
- \ifx\psk@PointNameA\@undef\else\psset{PointName=\psk@PointNameA}\fi
+ \begingroup
+ \ifx\psk@PosAngleA\@undef \else\psset{PosAngle=\psk@PosAngleA}\fi
+ \let\psk@PointSymbol\psk@PointSymbolA
+ \ifx\psk@PointNameA\@undef \else\psset{PointName=\psk@PointNameA}\fi
\Pst@geonodelabel{#5}
- \egroup
+ \endgroup
\ifx\psk@PosAngleB\@undef\else\psset{PosAngle=\psk@PosAngleB}\fi
- \ifx\psk@PointSymbolB\@undef\else\psset{PointSymbol=\psk@PointSymbolB}\fi
+ \let\psk@PointSymbol\psk@PointSymbolB
\ifx\psk@PointNameB\@undef\else\psset{PointName=\psk@PointNameB}\fi
\Pst@geonodelabel{#6}%
\endgroup
@@ -1089,7 +1090,7 @@
% \ifx\psk@PointSymbolA\@undef\else\psset{PointSymbol=\psk@PointSymbolA}\fi
% \ifx\psk@PointNameA\@undef\else\psset{PointName=\psk@PointNameA}\fi
\ifx\psk@PosAngleA\@undef\else\ifx\psk@PosAngleA\@none\else\psset{PosAngle=\psk@PosAngleA}\fi\fi
- \ifx\psk@PointSymbolA\@undef\else\ifx\psk@PointSymbolA\@none\else\psset{PointSymbol=\psk@PointSymbolA}\fi\fi
+ \ifx\psk@PointSymbolA\@none\else\let\PointSymbol=\psk@PointSymbolA\fi
\ifx\psk@PointNameA\@undef\else\ifx\psk@PointNameA\@none\else\psset{PointName=\psk@PointNameA}\fi\fi
\ifx\psk@PosAngleA\@undef\else\ifx\psk@PointSymbolA\@none\else\Pst@geonodelabel{#6}\fi\fi
\egroup
@@ -1098,7 +1099,7 @@
% \ifx\psk@PointSymbolB\@undef\else\psset{PointSymbol=\psk@PointSymbolB}\fi
% \ifx\psk@PointNameB\@undef\else\psset{PointName=\psk@PointNameB}\fi
\ifx\psk@PosAngleA\@undef\else\ifx\psk@PosAngleB\@none\else\psset{PosAngle=\psk@PosAngleB}\fi\fi
- \ifx\psk@PointSymbolB\@undef\else\ifx\psk@PointSymbolB\@none\else\psset{PointSymbol=\psk@PointSymbolB}\fi\fi
+ \ifx\psk@PointSymbolB\@none\else\let\PointSymbol=\psk@PointSymbolB\fi
\ifx\psk@PointNameB\@undef\else\ifx\psk@PointNameB\@none\else\psset{PointName=\psk@PointNameB}\fi\fi
\ifx\psk@PosAngleB\@undef\else\ifx\psk@PointSymbolB\@none\else\Pst@geonodelabel{#7}\fi\fi
\egroup
@@ -1384,13 +1385,13 @@
\def\Pst@MediatorAB[#1]#2#3#4#5{%
\bgroup\psset{#1}% % Affectation of local parameters
\bgroup
- \ifx\psk@PointSymbolA\@undef\else\psset{PointSymbol=\psk@PointSymbolA}\fi
+ \let\PointSymbol=\psk@PointSymbolA
\ifx\psk@PointNameA\@undef\else\psset{PointName=\psk@PointNameA}\fi
%\Pst@HomO[HomCoef=.5]{#2}{#3}{#4}
\Pst@MiddleAB[]{#2}{#3}{#4}
\egroup
\bgroup
- \ifx\psk@PointSymbolB\@undef\else\psset{PointSymbol=\psk@PointSymbolB}\fi
+ \let\PointSymbol=\psk@PointSymbolB
\ifx\psk@PointNameB\@undef\else\psset{PointName=\psk@PointNameB}\fi
\expandafter\ifx\csname psteucl@old\endcsname\relax%
\Pst@Rotation[RotAngle=90, CodeFig=false]{#4}{#3}[#5]%%%DR 26032005
@@ -1614,7 +1615,11 @@
\pnode(! %
/dec \psk@decimals\space def
\psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\pslinecolor
- /s1 { /Symbol findfont \psk@fontscale\space scalefont setfont } bind def
+ \ifpst@psfonts
+ /s1 { /Symbol findfont \psk@fontscale\space scalefont setfont } bind def
+ \else
+ /s1 { /StandardSymL findfont \psk@fontscale\space scalefont setfont } bind def
+ \fi
/laenge {10 dec exp mul round 10 dec exp div 15 string cvs stringwidth } def
/WertZeigen { dec -1 le { /dec 15 def } if 10 dec exp mul round 10 dec exp div dec 0 eq {cvi 15 string cvs} {15 string cvs } ifelse
\ifPst@comma dot2comma \fi show s1 (\string\260) show} def