summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-10-07 21:07:48 +0000
committerKarl Berry <karl@freefriends.org>2018-10-07 21:07:48 +0000
commit88e78a3dbb44de879dd8b875991f337d6994fc1c (patch)
treec95cd55386971ef20724b033ce00847e362f181e /Master/texmf-dist
parent445a8612db2fdd4258927e38c3b66dff7e493931 (diff)
pst-eucl (7oct18)
git-svn-id: svn://tug.org/texlive/trunk@48851 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/generic/pst-eucl/Changes6
-rw-r--r--Master/texmf-dist/doc/generic/pst-eucl/README6
-rw-r--r--Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.pdfbin540222 -> 541847 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.tex2
-rw-r--r--Master/texmf-dist/source/generic/pst-eucl/Makefile89
-rw-r--r--Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex15
-rw-r--r--Master/texmf-dist/tex/latex/pst-eucl/pst-eucl.sty1
7 files changed, 22 insertions, 97 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-eucl/Changes b/Master/texmf-dist/doc/generic/pst-eucl/Changes
index f053998935a..5b44e5f182d 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.60 2018/10/06 - added \pstDistCalc, which usee algebraic
+ notation for the argument
+ - fix for PointSymbol=none, PointName=Z
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
@@ -65,4 +68,5 @@ pst-eucl.tex --------
pst-eucl.sty --------
-2006/01/28 - write some infos into the file list (hv)
+2018/09/28 - added pst-calculate (hv)
+2006/01/28 - write some infos into the file list (hv)
diff --git a/Master/texmf-dist/doc/generic/pst-eucl/README b/Master/texmf-dist/doc/generic/pst-eucl/README
index 26f4033039c..e81d9dc5b01 100644
--- a/Master/texmf-dist/doc/generic/pst-eucl/README
+++ b/Master/texmf-dist/doc/generic/pst-eucl/README
@@ -1,15 +1,17 @@
pst-eucl package
+Euklidian geometry
+
+
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.
INSTALLATION
------------
-
If you want to just test it quickly, keep the files:
- pst-eucl.pro, pst-eucl.tex and pst-eucl.sty
+pst-eucl.pro, pst-eucl.tex and pst-eucl.sty
in the directory where you work.
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 2657d5c00f6..e9434113027 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 1e1571dd98d..fa955a41e78 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
@@ -1,4 +1,4 @@
-\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
+\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings,
headexclude,footexclude,oneside,english]{pst-doc}
\usepackage[utf8]{inputenc}
\usepackage{pst-eucl}
diff --git a/Master/texmf-dist/source/generic/pst-eucl/Makefile b/Master/texmf-dist/source/generic/pst-eucl/Makefile
deleted file mode 100644
index bdc5824372c..00000000000
--- a/Master/texmf-dist/source/generic/pst-eucl/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-
-# `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 50aed785dce..25d40e2ddce 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.59}
-\def\filedate{2018/09/01}
+\def\fileversion{1.60}
+\def\filedate{2018/10/06}
%% 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.
@@ -259,6 +259,7 @@
%% #1 -> point coordinates
\def\Pst@geonodelabel#1{% % {nodename}
\ifx\psk@PointSymbol\@none
+ \ifx\psk@PointName\@none\else \Pst@PutPointLabel{#1}\fi
\else
% \ifx\psk@PointSymbol\@default \def\psk@PointSymbol{*}\fi%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\psdot[dotstyle=\psk@PointSymbol](#1)%
@@ -1530,8 +1531,14 @@
\fi
}
%% Distance specified with a number
-\def\pstDistVal#1{
- #1 \pst@number\psxunit mul
+\def\pstDistVal#1{%
+ #1 \pst@number\psxunit mul
+ \ifx\psk@DistCoef\@none\else
+ \psk@DistCoef\space mul
+ \fi
+}
+\def\pstDistCalc#1{%
+ \pscalculate{#1} \pst@number\psxunit mul
\ifx\psk@DistCoef\@none\else
\psk@DistCoef\space mul
\fi
diff --git a/Master/texmf-dist/tex/latex/pst-eucl/pst-eucl.sty b/Master/texmf-dist/tex/latex/pst-eucl/pst-eucl.sty
index 7168d0f5bb7..8b4a2c0e3c9 100644
--- a/Master/texmf-dist/tex/latex/pst-eucl/pst-eucl.sty
+++ b/Master/texmf-dist/tex/latex/pst-eucl/pst-eucl.sty
@@ -1,6 +1,7 @@
\RequirePackage{pstricks}
\RequirePackage{pst-node}
\RequirePackage{pst-tools}
+\RequirePackage{pst-calculate}
\ProvidesPackage{pst-eucl}[2014/05/17 package wrapper for PSTricks pst-eucl.tex]
\DeclareOption{old}{\gdef\psteucl@old{}}% DR 10/05/2005
\ProcessOptions