summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/Changes2
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/README2
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdfbin6497850 -> 6515897 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.tex7
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/text/par-fusionjps-en.tex4
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/text/par-keywords-en.tex2
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/text/par-point-en.tex4
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/text/par-transform-en.tex3
-rw-r--r--Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro23
-rw-r--r--Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex7
-rw-r--r--Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty2
11 files changed, 30 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/Changes b/Master/texmf-dist/doc/generic/pst-solides3d/Changes
index e6e403ce60d..afcb3a2c30e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/Changes
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/Changes
@@ -1,4 +1,5 @@
pst-solides3d.tex ---
+4.34a 2018-12-27 - fix for proj-pst-poinbt in pst-solides3d.pro
4.34 2017-08-23 - use always URW fonts instead of PostScript,
eg Helvetica->NimbusSanL
4.33 2017-08-21 - use always \psset[pst-solides3d]{...}
@@ -30,6 +31,7 @@ pst-solides3d.tex ---
pst-solides.pro ---
+4.27 2018-12-27 - fix for proj-pst-point
4.26 2017-08-23 - use always URW fonts instead of PostScript, eg Helvetica-NimbusSanL
4.25 2017-03-05 - fix for start values for solides*
4.24 2017-03-03 - added Xtrans and Ytrans for solides*
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/README b/Master/texmf-dist/doc/generic/pst-solides3d/README
index 42a33265eff..a8ce474089f 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/README
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/README
@@ -3,7 +3,7 @@
%% Manuel Luque, Arnaud Schmittbuhl,Jean-Paul Vignault,Jürgen Gilg,
%% Jean-Michel Sarlat, and Herbert Voss
%%
-%% 2017
+%% 2019
%%
If you are unable to install this package by your package manager
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf b/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf
index 8c5b8696778..1a88b4d3059 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.tex b/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.tex
index 3c603fd1dfb..d1be5cd6e9a 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.tex
@@ -13,7 +13,7 @@
% (deprecated, use: headings=small)
1.1headlines, % set head height to 1.1\baselineskip of \normalsize
% (deprecated, use: headlines=1.1)
- french,english
+ french,english,
]{scrbook}
@@ -318,6 +318,7 @@ Apricot&Aquamarine&Bittersweet&Black&Blue&BlueGreen&BlueViolet&BrickRed&Brown&Bu
\newpage
+
\chapter{Basics for the package}
\Input{chapter-1-en}
@@ -420,12 +421,14 @@ Apricot&Aquamarine&Bittersweet&Black&Blue&BlueGreen&BlueViolet&BrickRed&Brown&Bu
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
\chapter{Projections}
\Input{par-projpresentation-en}
\Input{par-projectionvisibility-en}
\Input{par-definirplanquelconque-en}
\Input{par-projectionpoint-en}
\Input{par-projectionvecteur-en}
+
\Input{par-projectiondroite-en}
%\newpage
@@ -437,6 +440,8 @@ Apricot&Aquamarine&Bittersweet&Black&Blue&BlueGreen&BlueViolet&BrickRed&Brown&Bu
\Input{par-projectioncourbe-en}
\Input{par-projectiontexte-en}
+
+
\Input{par-image2d-en}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/text/par-fusionjps-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-fusionjps-en.tex
index 0f6c965ee44..fea7590dc7e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/text/par-fusionjps-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-fusionjps-en.tex
@@ -656,8 +656,8 @@ S2O3 drawsolid**}
\lput*{:U}{\small 24,5 pm}
\pcline[linestyle=dotted]{<->}(O2)(S2)
\lput*{:U}{\small 28,8 pm}
-\pstMarkAngle[arrows=<->,MarkAngleRadius=0.8,linestyle=dotted]{O2}{O}{O3}{\footnotesize 109,4$^{\mathrm{o}}$}
-\pstMarkAngle[arrows=<->,MarkAngleRadius=0.8,linestyle=dotted]{O1}{O}{S2}{\footnotesize 109,5$^{\mathrm{o}}$}
+\pstMarkAngle[arrows=<->,MarkAngleRadius=0.8,linestyle=dotted]{O2}{O}{O3}{\footnotesize $109{,}4^{\mathrm{o}}$}
+\pstMarkAngle[arrows=<->,MarkAngleRadius=0.8,linestyle=dotted]{O1}{O}{S2}{\footnotesize $109{,}5^{\mathrm{o}}$}
\rput(0,-2.5){$\mathrm{S_2^{\phantom{2}}O_3^{2-}}$}
\end{pspicture}
\end{center}
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/text/par-keywords-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-keywords-en.tex
index 90d4a8db49f..bdc828f7dca 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/text/par-keywords-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-keywords-en.tex
@@ -114,7 +114,7 @@ args&
&object=point&$x$ $y$ $z$ \~ $P$&\\
&definition&&\\
&\£=addv3d&$x_1$ $y_1$ $z_1$ $x_2$ $y_2$ $z_2$ \~ u v&\\
- &\£=barycentre3d&\{\[$A$ $i_A$ $B$ $i_B$\]\}&\\
+ &\£=barycentre3d&$A$ $i_A$ $B$ $i_B$&\\
&\£=hompoint3d&$P$ $A$ $k$&\\
&\£=isobarycentre3d&\{\[$A_0$ $A_1$ ... $A_n$\]\}&\\
&\£=milieu3d&$A$ $B$&\\
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/text/par-point-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-point-en.tex
index 859d4a0f330..740ba116ab7 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/text/par-point-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-point-en.tex
@@ -28,9 +28,9 @@ The centre of the face with index $k$ of the solid $solid$.
\ldots ; (A_n, 1)]$.}
\item \texttt{\Lkeyword{definition}=\Lkeyval{barycentre3d}};
-\Lkeyword{args}= \{[ $A$ $a$ $B$ $b$ ] \}.
+\Lkeyword{args}= $A$ $a$ $B$ $b$.
- {The barycentre of the system $[(A, a) ; (B, b)]$.}
+ {The barycentre of the system $(A, a) ; (B, b)$.}
\item \texttt{\Lkeyword{definition}=\Lkeyval{hompoint3d}};
\texttt{\Lkeyword{args}={$M$ $A$ $\alpha $}}.
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/text/par-transform-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-transform-en.tex
index 3b536481f7c..631653ff68b 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/text/par-transform-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-transform-en.tex
@@ -105,7 +105,8 @@ end
\subsection{Bending and \Index{torsion} of beams}
The solid to the left is a prism of the height 10 cm with 20 floors
-(\texttt{\Lkeyword{ngrid}=20 2}). In every floor, an additional angle of rotation---for example 10$^{\mathrm{o}}$ around the $Oz$ axis is---given.
+(\texttt{\Lkeyword{ngrid}=20 2}). In every floor, an additional angle of rotation---for example
+10$^{\mathrm{o}}$ around the $Oz$ axis is---given.
Now that the adjacent floors have a distance of $0.5$~cm, one multiplies $z\times20$.
La flexion est envisag\'{e}e dans le plan $xOz$ sous l'action d'une force perpendiculaire \`{a} la poutre appliqu\'{e}e en son extr\'{e}mit\'{e}.
diff --git a/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro b/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro
index a18ceefa9aa..d65e0817167 100644
--- a/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro
+++ b/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro
@@ -1,9 +1,9 @@
%!
% PostScript prologue for pst-solides3d.tex.
-% Version 4.26, 2017/08/23
+% Version 4.27, 2018/12/27
%
%% COPYRIGHT 2009-2017 by Jean-Paul Vignault
-%% opacity changes by Herbert Voss
+%% opacity changes and fixes by Herbert Voss
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
@@ -10194,9 +10194,7 @@ end
setfont
} def
-/setTimes {
- setTimesRoman
-} def
+/setTimes { setTimesRoman } def
%% syntaxe : string x y cctext
/cctext {
@@ -11209,16 +11207,13 @@ end
} def
/proj-pst-point {
- [proj-args] length 0 eq {
- xorigine yorigine /proj-args defpoint
- } if
+ [proj-args] length 0 eq { xorigine yorigine /proj-args defpoint } if
/projname where {
pop
- [proj-args proj-definition cvx exec]
- dup 0 getp projname cvlit defpoint
- dup length 2 gt {
- 1 getp projname (0) append cvlit defpoint
- } if
+ [ proj-args proj-definition cvx exec ]
+ dup 0 getp
+ projname cvlit defpoint
+ dup length 2 gt { 1 getp projname (0) append cvlit defpoint } if
/projname where pop /projname undef
} if
proj-action (none) eqstring not {
@@ -11231,7 +11226,7 @@ end
% 1 1 0 0 1 1 Diamond
texte length 0 gt {
proj-fontsize setfontsize
-% setTimes %%%%%%%%%%%%%%%%%%%%%%%%%%%
+ %setTimes
solidlinewidth setlinewidth
newpath
linecolor
diff --git a/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex b/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
index b3db5f2148e..9620eefed11 100644
--- a/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
+++ b/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
@@ -24,8 +24,8 @@
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
% JPV & ML & AS & HV
-\def\fileversion{4.34}
-\def\filedate{2017/08/23}
+\def\fileversion{4.34a}
+\def\filedate{2018/12/27}
\message{`PSTSOLIDESIIID' v\fileversion, \filedate}
%
\pstheader{pst-solides3d.pro}
@@ -189,7 +189,7 @@ trunccoeff=.25,chanfreincoeff=.8,affinagecoeff=.8,dualregcoeff=1,intersectiontyp
\psset[pst-solides3d]{rm=}% pas de faces par defaut
%% nom de la variable de sauvegarde du solide considere
\define@key[psset]{pst-solides3d}{name}{\def\pst@solides@name{#1}}
-\psset[pst-solides3d]{name=}% pas de nom par defaut
+\psset[pst-solides3d]{name={}}% pas de nom par defaut
%% nom de la variable de sauvegarde du solide sur lequel on doit projeter
\define@key[psset]{pst-solides3d}{solidname}{\def\pst@solides@solidname{#1}}
\psset[pst-solides3d]{solidname=}% pas de nom par defaut
@@ -864,6 +864,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
/proj-definition (\pst@solides@definition) def
/proj-args { \pst@solides@args} def
/proj-action (\pst@solides@action) def
+\ifx\pst@solides@name\@empty \else/solidname (\pst@solides@name) def\fi
\ifx\pst@solides@name\@empty \else/projname (\pst@solides@name) def \fi
\ifx\pst@solides@plan\@empty \else/planprojpst \pst@solides@plan \space def \fi
\ifx\pst@solides@solidname\@empty\else/solidprojname {\pst@solides@solidname\space} def \fi
diff --git a/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty b/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty
index ac71c5435a3..8c04f965978 100644
--- a/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty
+++ b/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty
@@ -4,7 +4,7 @@
\ProvidesFile{pst-solides3d.tex}
[\filedate\space v\fileversion\space `PST-solides3D']
\IfFileExists{pst-solides3d.pro}{%
- \ProvidesFile{pst-solides3d.pro}[2017/08/23 v. 4.26, PostScript prologue file]
+ \ProvidesFile{pst-solides3d.pro}[2018/12/27 v. 4.27, PostScript prologue file]
\@addtofilelist{pst-solides3d.pro}}{}%
\IfFileExists{pst-implicitsurface.pro}{%
\ProvidesFile{pst-implicitsurface.pro}[2016/12/10 v. 0.01, PostScript prologue file]