texlive[74872] Master/texmf-dist: pst-labo (6apr25)

commits+karl at tug.org commits+karl at tug.org
Mon Apr 7 21:48:00 CEST 2025 

Revision: 74872
          https://tug.org/svn/texlive?view=revision&revision=74872
Author:   karl
Date:     2025-04-07 21:48:00 +0200 (Mon, 07 Apr 2025)
Log Message:
-----------
pst-labo (6apr25)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/generic/pst-labo/Changes
    trunk/Master/texmf-dist/doc/generic/pst-labo/README
    trunk/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib
    trunk/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.pdf
    trunk/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.tex
    trunk/Master/texmf-dist/doc/generic/pst-labo/pst-labo8-tab1.tex
    trunk/Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex
    trunk/Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex

Modified: trunk/Master/texmf-dist/doc/generic/pst-labo/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-labo/Changes	2025-04-07 19:47:49 UTC (rev 74871)
+++ trunk/Master/texmf-dist/doc/generic/pst-labo/Changes	2025-04-07 19:48:00 UTC (rev 74872)
@@ -1,4 +1,5 @@
 pst-labo.tex -----------------------------------
+2.07  2025-03-07  put macro \pscolon outside of \pstDistillation
 2.06  2023-05-17  added object \pstSeparateFunnel (ml)
 2.05  2023-05-12  fix for missing Verre option (Frédéric Bréal)
 2.04  2015-12-09  fix trailing space in \pst at Ballon@Reflux (ml)

Modified: trunk/Master/texmf-dist/doc/generic/pst-labo/README
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-labo/README	2025-04-07 19:47:49 UTC (rev 74871)
+++ trunk/Master/texmf-dist/doc/generic/pst-labo/README	2025-04-07 19:48:00 UTC (rev 74872)
@@ -7,7 +7,7 @@
 
 
 Pay attention, that you cannot run the documentation with
-pdflatex, PSTricks is PosTScript Tricks.
+pdflatex, PSTricks is PostScript Tricks.
 Use latex->dvips->ps2pdf or xelatex or lualatex
 
 hvoss at tug.org
\ No newline at end of file

Modified: trunk/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib	2025-04-07 19:47:49 UTC (rev 74871)
+++ trunk/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib	2025-04-07 19:48:00 UTC (rev 74872)
@@ -99,10 +99,3 @@
    url = {CTAN:~graphics/pstricks/doc/lgc/}
 }  
 
- at Manual{pst-labo,
-  Title          = {\texttt{pst-labo} -- a {PST}ricks package for chemical Objects},
-  Author         = {Denis Girou and Christoph Jorssen and Manuel Luque and Herbert Voß},
-  Organization   = {},
-  url        = {CTAN: /graphics/pstricks/contrib/pst-labo/},
-  year           = 2005,
-}

Modified: trunk/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.tex	2025-04-07 19:47:49 UTC (rev 74871)
+++ trunk/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.tex	2025-04-07 19:48:00 UTC (rev 74872)
@@ -1,7 +1,7 @@
-\RequirePackage{pdfmanagement-testphase}
 \DeclareDocumentMetadata{}
-% $Id: pst-labo-doc.tex 724 2023-05-17 17:57:02Z herbert $
-\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
+% $Id: pst-labo-doc.tex 1082 2025-04-07 06:37:14Z herbert $
+\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,
+    parskip=false,headings=small,
     headinclude=false,footinclude=false,oneside]{pst-doc}
 \usepackage{pst-labo}
 \let\pstLaboFV\fileversion
@@ -17,7 +17,6 @@
 \usepackage{xltabular}
 \usepackage{varioref}
 \usepackage{makeidx}\makeindex
-
 %
 \usepackage{pstricks}
 \colorlet{tableheadcolor}{gray!25}
@@ -894,9 +893,28 @@
 % ---------------------------------------------------------------------------------------
 \subsection{\CMD{pstDistillation}}\label{sec:pstlabo8:pstDistillation}
 % ---------------------------------------------------------------------------------------
-The only macro which has be passed on to \Lcs{pstDistillation} are
-the dimensions of the \Lenv{pspicture} environment.
 
+
+You can use different macros for the distillation object:
+
+\psset{unit=0.5cm}
+\begin{pspicture}[showgrid](5,11)
+	\rput(2.5,0){\pscolon}
+\end{pspicture}
+
+\begin{lstlisting}[xrightmargin=-\marginparwidth]
+\psset{unit=0.5}
+\begin{pspicture}[showgrid](5,11)
+	\rput(2.5,0){\pscolon}
+\end{pspicture}
+\end{lstlisting}
+
+\psset{unit=1cm}
+
+
+The ozher macro needs coordinates which are passed on to \Lcs{pstDistillation}
+as \Lenv{pspicture} environment.
+
 \medskip
 \noindent
 \Lcs{pstDistillation}\\
@@ -1009,6 +1027,6 @@
 
 \nocite{*}
 \printbibliography
-%\bibliography{pst-labo-doc}
 
+\printindex
 \end{document}

Modified: trunk/Master/texmf-dist/doc/generic/pst-labo/pst-labo8-tab1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-labo/pst-labo8-tab1.tex	2025-04-07 19:47:49 UTC (rev 74871)
+++ trunk/Master/texmf-dist/doc/generic/pst-labo/pst-labo8-tab1.tex	2025-04-07 19:48:00 UTC (rev 74872)
@@ -1,4 +1,4 @@
-%	$Id: pst-labo8-tab1.tex 720 2023-05-12 11:12:51Z herbert $	
+%$Id: pst-labo8-tab1.tex 1082 2025-04-07 06:37:14Z herbert $	
 \begin{xltabular}{\linewidth}{@{}>{\ttfamily}l@{}>{\ttfamily}l>{\ttfamily}l>{\RaggedRight}X@{}}
 \caption{Summary of all parameters available with \texttt{pst-labo}}\label{tab:pst-labo:Parameter} \\
 \emph{\textrm{Name}} & \emph{\textrm{values}} & \emph{\textrm{default}} & \emph{comments}     \\\hline

Modified: trunk/Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex	2025-04-07 19:47:49 UTC (rev 74871)
+++ trunk/Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex	2025-04-07 19:48:00 UTC (rev 74872)
@@ -1,3 +1,4 @@
+% $Id: pst-labo.tex 1082 2025-04-07 06:37:14Z herbert $
 %% Package `pst-labo.tex'
 %%
 %% This program can be redistributed and/or modified under
@@ -24,8 +25,8 @@
 \ifx\PSTGradLoaded\endinput\else\input pst-grad.tex\fi
 \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex\fi
 %
-\def\fileversion{2.06}
-\def\filedate{2023/05/17}
+\def\fileversion{2.07}
+\def\filedate{2025/03/07}
 \let\PSTLabofileversion\fileversion
 %
 \message{`PST-labo' v\fileversion, \filedate\space (ML/CJ/DG/HV)}
@@ -263,9 +264,23 @@
   \psclip{%
     \pscustom[linestyle=none]{\pst at pipette@corps\pst at goutte}}
     \psframe*[linecolor=\psk at pipette@couleurReactif](-1,-2)(! 1 \the\pst at cntg\space 2 div)%
+  \endpsclip
+  \pst at pipette@corps
+  \pst at goutte
+  \endpspicture
+  \end at SpecialObj
+}%
+
+\def\pstBigPipette{\pst at object{pst at bigpipette}}
+\def\pst at bigpipette@i{%
+  \addbefore at par{dimen=middle}%
+  \begin at SpecialObj
+  \pspicture(-1,-1)(1,6)%\psgrid[subgriddiv=0,gridcolor=red]%
+  \psclip{%
+    \pscustom[linestyle=none]{\pst at pipette}}
+    \psframe*[linecolor=\psk at pipette@couleurReactif](-1,-2)(! 1 \the\pst at cntg\space 2 div)%
   \endpsclip%
-  \pst at pipette@corps%
-  \pst at goutte%
+  \pst at bigpipette
   \endpspicture
   \end at SpecialObj%
 }%
@@ -327,8 +342,15 @@
 \def\pst at TubeEssais@i{{%
   \addbefore at par{dimen=middle}
   \begin at SpecialObj
-  \ifPst at TubeEssais@tubeCoude\pspicture(-1,0)(6,4)\else
-    \ifnum\psk at TubeEssais@tubePenche=0 \pspicture(-1.5,0)(1.5,4)\else
+  \ifPst at TubeEssais@tubeCoude\pspicture(-1,0)(6,4)
+  \else
+    \ifnum\psk at TubeEssais@tubePenche=0\relax 
+      \ifnum\psk at glassType=2\relax
+        \pspicture(-0.5,0)(1,2.8)
+      \else
+        \pspicture(-1.5,0)(1.5,4)
+      \fi
+    \else
       \ifnum\psk at TubeEssais@tubePenche>0 \pspicture(-3,0)(1,4)\else
         \ifnum\psk at TubeEssais@tubePenche<0 \pspicture(-1,0)(3,4)\else
           \pspicture(-2,0)(2,4)%
@@ -337,9 +359,15 @@
   \psclip{%
     \rput{\psk at TubeEssais@tubePenche}{%
       \pscustom[linestyle=none]{%
-        \ifcase\psk at glassType\pst at TubeEssais@Corps\or  %0
-        \pst at ballon\or\pst at Becher@Corps\or\pst at Erlen@Corps\or\pst at Flacon@Corps\or
-          \pst at FIOLEJAUGE\or\pst at Verre@Corps\fi}}%
+        \ifcase\psk at glassType
+          \pst at TubeEssais@Corps
+          \or \pst at ballon
+          \or \pst at Becher@Corps
+          \or \pst at Erlen@Corps
+          \or \pst at Flacon@Corps
+          \or \pst at FIOLEJAUGE
+          \or \pst at Verre@Corps
+        \fi}}%
     \psframe[linestyle=none](-3,-1)(! 
       5 3 \@nameuse{psk at TubeEssais@niveauLiquide1}\space mul 100 div
       \psk at TubeEssais@tubePenche\space cos mul)%

Modified: trunk/Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex	2025-04-07 19:47:49 UTC (rev 74871)
+++ trunk/Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex	2025-04-07 19:48:00 UTC (rev 74872)
@@ -1,3 +1,4 @@
+% $Id: pst-laboObj.tex 1082 2025-04-07 06:37:14Z herbert $
 %% Package `pst-laboObj.tex'
 %%
 %% This program can be redistributed and/or modified under
@@ -76,6 +77,17 @@
 \psline[linewidth=0.02](0,\Niveau)(0.1,\Niveau)}
 \endgroup
 }
+
+\def\pst at bigpipette{%
+\begingroup%
+\psset{linewidth=0.053,linearc=0.05}%
+\pscustom{
+  \psline(0,0)(0,1)(-0.23,2.5)(-0.23,22.5)
+  \psarc[angleA=-80, angleB=80](0,22.5){0.45}
+}%
+\endgroup
+}
+
 \def\pst at goutte{%
 \psbezier[linewidth=0.01](0,0)(-0.04,-0.083)(-0.083,-0.22)%
 (0,-0.25)(0.083,-0.22)(0.04,-0.083)(0,0)}
@@ -84,6 +96,15 @@
 \def\pst at eprouvette@corps{%
 \psline(-0.5,5)(-0.5,0)(0.5,0)(0.5,4.9)(0.6,4.93)}
 
+%\def\pst at pipette{%
+%\draw (0,0) -- ++(0,1) -- ++(-0.23,1.5) -- ++(0,20) 
+%        arc[start angle=-80, end angle=80, x radius=-0.45, y radius=0.8] -- 
+%        ++(0,2) -- ++(0.7,0) -- ++(0,-2) 
+%        arc[start angle=80, end angle=-80, x radius=0.45, y radius=0.8] --
+%        ++(0,-20) -- ++(-0.23,-1.5) -- ++(0,-1);
+
+
+
 \def\pst at eprouvette@rebord{%
 \pscurve(0.6,-0.07)
 (0.498,0.008)
@@ -134,41 +155,53 @@
 
 %%%%%%%%%%% Distillation fractionn\xE9e %%%%%%%%%%%%%%%%
 
-\def\pst at DistillationFractionnee{
-\def\pst at goutte{\psset{unit=0.6}\psbezier[linewidth=0.017](0,0)(0.25,-.4)(-.25,-.4)(0,0)}%
-\def\colon{\psline[linearc=0.3](-.25,10.5)(-.25,8.5)(-.75,8)(-.75,2.5)(-.25,2)(-.25,0)%
-\psline[linearc=0.3](0.25,0)(0.25,2)(0.75,2.5)(.75,8)(0.25,8.5)(0.25,9.36)%
-\psline(0.25,8.5)(0.25,9.30)\psline(0.25,9.5)(0.25,10.5)%
-\def\pointeG{\psline[linewidth=0.4\pslinewidth](0,0)(0.5,-.5)(0,-.1)}%
-\multido{\i=3+1}{6}{\rput(-.75,\i){\pointeG}}%
-\def\pointeD{\psline[linewidth=0.4\pslinewidth](0,0)(-.5,-.5)(0,-.1)}%
-\multido{\i=3+1}{6}{\rput(0.75,\i){\pointeD}}%
-{\psset{linestyle=none,fillstyle=hlines,hatchwidth=0.01,hatchsep=0.03}\psframe(-.25,10)(-.05,10.5)%
-\psframe(.25,10)(0.05,10.5)}%
-\multido{\n=2.5+1.0}{6}{\rput(-.25,\n){\pst at goutte}}%
-\multido{\n=2.5+1.0}{6}{\rput(.25,\n){\pst at goutte}}
-\rput(-0.25,-.1){\pst at goutte}\rput(0.25,-.1){\pst at goutte}}%
-%r\xE9frig\xE9rant
-\def\refri{\psarc(3,0){0.5}{90}{270}\psarc(7,0){0.5}{270}{90}%
-\psframe[linestyle=none,fillstyle=solid](0,-.05)(9,0.05)%
-\begingroup
-\psset{linewidth=0.5\pslinewidth}
-\psline(-.075,.05)(9,0.05)
-\psline(0.02,-.05)(9,-.05)
-%\psline(0,0.05)(9,0.05)%
-\endgroup
-\psline(3,0.5)(3.5,0.5)
-\psline(3,-.5)(6.5,-.5)
-\psline(3.6,0.5)(7,0.5)%
-\begingroup
-\psset{linewidth=0.5\pslinewidth}
-\psline(3.5,0.5)(3.5,1.5)
-\psline(3.6,0.5)(3.6,1.5)%
-\psline(6.6,-.5)(6.6,-1.5)
-\psline(6.5,-.5)(6.5,-1.5)
-\endgroup
-\psline(6.6,-.5)(7,-.5)%
-\psset{arrowscale=2}\psline{->}(6.55,-2.5)(6.55,-1.5)\psline{->}(3.55,1.5)(3.55,2.5)}%
+\def\pst at goutte{%
+  \psset{unit=0.6}%
+  \psbezier[linewidth=0.017](0,0)(0.25,-.4)(-.25,-.4)(0,0)%
+}%
+
+\def\pscolon{%
+  \psline[linearc=0.3](-.25,10.5)(-.25,8.5)(-.75,8)(-.75,2.5)(-.25,2)(-.25,0)%
+  \psline[linearc=0.3](0.25,0)(0.25,2)(0.75,2.5)(.75,8)(0.25,8.5)(0.25,9.36)%
+  \psline(0.25,8.5)(0.25,9.30)\psline(0.25,9.5)(0.25,10.5)%
+  \def\pointeG{\psline[linewidth=0.4\pslinewidth](0,0)(0.5,-.5)(0,-.1)}%
+  \multido{\i=3+1}{6}{\rput(-.75,\i){\pointeG}}%
+  \def\pointeD{\psline[linewidth=0.4\pslinewidth](0,0)(-.5,-.5)(0,-.1)}%
+  \multido{\i=3+1}{6}{\rput(0.75,\i){\pointeD}}%
+  {\psset{linestyle=none,fillstyle=hlines,hatchwidth=0.01,hatchsep=0.03}\psframe(-.25,10)(-.05,10.5)%
+       \psframe(.25,10)(0.05,10.5)}%
+  \multido{\n=2.5+1.0}{6}{\rput(-.25,\n){\pst at goutte}}%
+  \multido{\n=2.5+1.0}{6}{\rput(.25,\n){\pst at goutte}}
+  \rput(-0.25,-.1){\pst at goutte}\rput(0.25,-.1){\pst at goutte}%
+}%
+
+%réfrigérant
+\def\psrefri{%
+  \psarc(3,0){0.5}{90}{270}\psarc(7,0){0.5}{270}{90}%
+  \psframe[linestyle=none,fillstyle=solid](0,-.05)(9,0.05)%
+  \begingroup
+  \psset{linewidth=0.5\pslinewidth}
+  \psline(-.075,.05)(9,0.05)
+  \psline(0.02,-.05)(9,-.05)
+  %\psline(0,0.05)(9,0.05)%
+  \endgroup
+  \psline(3,0.5)(3.5,0.5)
+  \psline(3,-.5)(6.5,-.5)
+  \psline(3.6,0.5)(7,0.5)%
+  \begingroup
+  \psset{linewidth=0.5\pslinewidth}
+  \psline(3.5,0.5)(3.5,1.5)
+  \psline(3.6,0.5)(3.6,1.5)%
+  \psline(6.6,-.5)(6.6,-1.5)
+  \psline(6.5,-.5)(6.5,-1.5)
+  \endgroup
+  \psline(6.6,-.5)(7,-.5)%
+  \psset{arrowscale=2}%
+  \psline{->}(6.55,-2.5)(6.55,-1.5)%
+  \psline{->}(3.55,1.5)(3.55,2.5)%
+}%
+
+\def\pst at DistillationFractionnee{%
 %ballon
 \def\ballon{{\psset{linestyle=none,fillstyle=hlines,hatchwidth=0.007,hatchsep=0.03}%
 \psframe(-.5,2.25)(-.25,3)\psframe(0.5,2.25)(0.25,3)}%
@@ -208,8 +241,8 @@
 \endpsclip}
 \rput(0,-3){\rput(2.75,13.5){\thermo}
 \rput(2.75,2.5){\ballon}
-\rput(2.75,4){\colon}%
-\rput(3,13.4){\rput{-45}(0,0){\refri}}
+\rput(2.75,4){\pscolon}%
+\rput(3,13.4){\rput{-45}(0,0){\psrefri}}
 \rput(0,0){\chauffe}
 \rput(9.4,0){\pst at eprouvette%
 \begingroup
@@ -670,9 +703,9 @@
 %%%%%%%%%%%% Fin de Chauffe-Ballon %%%%%%%%%%%%%%%%%%%%%%
 
 \def\pst at Ballon@Reflux{%
-  \psclip{%
-    \pscustom[linestyle=none]{\pst at ballon}}
-    \pscustom[fillstyle=gradient,gradbegin=cyan,gradend=white,gradmidpoint=0,linecolor=cyan]{%
+  \psclip{\pscustom[linestyle=none]{\pst at ballon}}
+    \pscustom[fillstyle=gradient,gradbegin=cyan,gradend=white,
+      gradmidpoint=0,linecolor=cyan]{%
       \pscurve(-1.5,1.5)(-1.375,1.55)%
 	(-1.25,1.5)(-1.125,1.45)%
 	(-1,1.5)(-.875,1.55)%
@@ -696,6 +729,7 @@
 % robinet ouvert
 \newif\ifPst at OpenTap
 \define at key[psset]{pst-labo}{OpenTap}[true]{\@nameuse{Pst at OpenTap#1}}%
+\psset{OpenTap=false}
 %
 \def\pst at corpsAmpoule{%
 % corps de l'ampoule

More information about the tex-live-commits mailing list.