diff options
author | Karl Berry <karl@freefriends.org> | 2023-05-18 20:06:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-05-18 20:06:25 +0000 |
commit | 7071b2a856a3fad52bed993cba367b9264dca238 (patch) | |
tree | c14037ac612cf675937edcfe0b090a0c0a5a98f9 | |
parent | e7a5ee225d97d72d870c82dee2944e8e96a35966 (diff) |
pst-labo (18may23)
git-svn-id: svn://tug.org/texlive/trunk@67147 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-labo/Changes | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib | 44 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.pdf | bin | 2579035 -> 2660405 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.tex | 257 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-labo/pst-labo8-tab1.tex | 62 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex | 7 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex | 127 |
7 files changed, 324 insertions, 174 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-labo/Changes b/Master/texmf-dist/doc/generic/pst-labo/Changes index 4521cf05a5d..e326a4a81ef 100644 --- a/Master/texmf-dist/doc/generic/pst-labo/Changes +++ b/Master/texmf-dist/doc/generic/pst-labo/Changes @@ -1,4 +1,5 @@ pst-labo.tex ----------------------------------- +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@Ballon@Reflux (ml) 2.03 2006-08-16 fix typo with middle (hv) diff --git a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib index 7167c24d309..02041bbf7e5 100644 --- a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib +++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib @@ -5,21 +5,31 @@ @String{j-TUGboat = "TUGboat"} @Book{PSTricks2, - author = {Herbert Vo\ss}, + author = {Herbert Voß}, title = {{\PST} {G}rafik f\"ur \TeX{} und \LaTeX}, - edition = 6, + edition = {7}, publisher = {DANTE -- Lehmanns}, - year = {2010}, - address = {Heidelberg/Hamburg} + year = {2017}, + address = {Heidelberg/Berlin} +} + +@Book{PSTricks-E, + author = {Herbert Voß}, + title = {{\PST} {G}raphics for \LaTeX}, + edition = {1}, + publisher = {UIT}, + year = {2011}, + address = {Cambridge} } @Book{companion, - author = {Frank Mittelbach and Michel Goosens et al}, + author = {Frank Mittelbach and Michel Goosens and Sebastian Rahtz and Denis Roegel and Herbert Voß}, title = {The {\LaTeX} {G}raphics {C}ompanion}, - edition = {second}, - publisher = {Addison-Wesley Publishing Company}, - year = {2004}, - address = {Boston} + edition = {2}, + publisher = {Lehmanns Media}, + year = {2022}, + location = {Heidelberg and Berlin}, + note = {Reprint}, } @Article{girou:01, @@ -46,8 +56,7 @@ Title = {{PST}ricks - {\PS} macros for {G}eneric \TeX}, Author = {Timothy {V}an Zandt}, Organization = {}, - Address = {\url{http://www.tug.org/application/PSTricks}}, - Note = {}, + url = {http://www.tug.org/application/PSTricks}, year = 1993, } @@ -55,7 +64,7 @@ Title = {{PST}ricks - {\PS} macros for {G}eneric \TeX, {D}ocumented {Code}}, Author = {Timothy {V}an Zandt}, Organization = {}, - Address = {\url{CTAN:/graphics/pstricks/obsolete/doc/src/pst-code.tex}}, + url = {CTAN:/graphics/pstricks/obsolete/doc/src/pst-code.tex}, Note = {}, year = 1997, } @@ -64,7 +73,7 @@ author = {Sebastian Rahtz}, title = {An introduction to {PST}ricks, part {I}}, journal = {Baskerville}, - address = {\url{CTAN: /usergrps/uktug/baskervi/}}, + url = {CTAN: /usergrps/uktug/baskervi/}, year = 1996, volume = 6, number = 1, @@ -75,7 +84,7 @@ author = {Sebastian Rahtz}, title = {An introduction to {PST}ricks, part {II}}, journal = {Baskerville}, - address = {\url{CTAN: /usergrps/uktug/baskervi/}}, + url = {CTAN: /usergrps/uktug/baskervi/}, year = 1996, volume = 6, number = 2, @@ -87,14 +96,13 @@ author = {Sebastian Rahtz}, title = {Most of the PSTricks examples of The \LaTeX{} Graphics Companion}, - howpublished = {CTAN:~\url{graphics/pstricks/doc/lgc/}} + url = {CTAN:~graphics/pstricks/doc/lgc/} } @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\ss}, + Author = {Denis Girou and Christoph Jorssen and Manuel Luque and Herbert Voß}, Organization = {}, - Address = {\url{CTAN: /graphics/pstricks/contrib/pst-labo/}}, - Note = {}, + url = {CTAN: /graphics/pstricks/contrib/pst-labo/}, year = 2005, } diff --git a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.pdf b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.pdf Binary files differindex ff3443006d0..849ec319255 100644 --- a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.pdf +++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.tex b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.tex index e2eb78c0f1c..1610d0678e1 100644 --- a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.tex @@ -1,41 +1,29 @@ -\DocumentMetadata{} -\documentclass[11pt,a4paper,english]{article} -%\usepackage[latin1]{inputenc}% -%\usepackage[T1]{fontenc} -\usepackage{babel} -\usepackage{libertinus} -\setmonofont{AnonymousPro}[Scale=MatchLowercase,FakeStretch=0.88] - -\usepackage{biblatex} -\addbibresource{\jobname.bib} +\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, + headinclude=false,footinclude=false,oneside]{pst-doc} +\usepackage{pst-labo} +\let\pstLaboFV\fileversion +\renewcommand\bgImage{% + \psset{unit=0.5cm,glassType=erlen,recuperationGaz,substance=\pstTournureCuivre}% + \pstChauffageBallon[tubeRecourbe]% +} +\lstset{pos=t,wide=false,language=PSTricks, + morekeywords={psKnot},basicstyle=\footnotesize\ttfamily} -\usepackage{enumerate,longtable,url} -\let\OldUrl=\url -\renewcommand\url[1]{\protect\OldUrl{#1}} +\addbibresource{\jobname.bib} -%\usepackage[scaled]{luximono} -% -\usepackage{xspace,nonfloat} -\usepackage[bottom]{footmisc} -% -\usepackage{tabularx} -\usepackage{longtable} -\usepackage{ltxtable} +\usepackage{xltabular} \usepackage{varioref} -\usepackage[NewCommands,NewParameters]{ragged2e} -\usepackage{url} -\def\UrlFont{\ttfamily} - \usepackage{makeidx}\makeindex % -\usepackage[dvipsnames,table]{pstricks} +\usepackage{pstricks} \colorlet{tableheadcolor}{gray!25} \colorlet{tablerowcolor}{gray!12} -\newcommand\XCBox[1]{\fcolorbox{black}{#1}{\phantom{aa}} \small #1} -\usepackage{pst-labo} -\let\PSTfileversion\fileversion \psset{griddots=10,subgriddiv=0,gridlabels=7pt} + % \definecolor{hellgelb}{rgb}{1,1,0.8} \definecolor{shadecolor}{rgb}{0.9,0.9,0.9} @@ -44,40 +32,10 @@ % ------------------------------- Namen Abkuerungen ---------------------- \def\pst{\texttt{pstricks}\xspace} \def\PST{\texttt{PSTricks}\xspace} -\def\PS{PostScript\xspace} -\newcommand*\CMD[1]{{\texttt{\textbackslash #1}}} -\newcommand\Paket[1]{\texttt{#1}} -\providecommand\Programm[1]{\textsf{#1}} -\providecommand\RaggedRight{\raggedright} -% +\let\CMD\Lcs + \def\Index#1{\index{#1}#1} -\index{Environment|see{Umgebung}} -\def\eIndex#1{\index{Umgebung!#1@\texttt{#1}}\index{#1@\texttt{#1}}} -\def\tIndex#1{\index{#1@\texttt{#1}}} -\def\cIndex#1{\index{#1@\protect\CMD{#1}}} -\def\pIndex#1{\index{Parameter@\textbf{Parameter}!#1@\texttt{#1}}\index{#1@\texttt{#1}}} -\def\ppIndex#1{\index{Parameter@\textbf{Parameter}!#1@\texttt{#1}}} -\def\sIndex#1{\index{Syntax@\textbf{Syntax}!\protect\CMD{#1}}} -\def\csIndex#1{\sIndex{#1}\cIndex{#1}} -\def\PIndex#1{\index{Paket@\textbf{Paket}!\texttt{#1}}} -\def\mIndex#1{\texttt{#1}\tIndex{#1}\pIndex{#1}} -\def\aref#1{$\rightarrow$\vref{#1}} -\def\PSindex#1{\index{PostScript!#1}} -\def\Makroindex#1{\index{Makro!#1@\protect\CMD{#1}}} -\def\Optindex#1{\index{Parameter@\textbf{Parameter}!\texttt{#1}}} -\def\ttindex#1{\index{#1@\texttt{#1}}} -\def\vert{\ensuremath{|}} % -\let\Olddegrees\textdegrees -\def\textdegrees{\ensuremath{\mbox{\Olddegrees}}} -\def\sa{\ensuremath{\sphericalangle}\xspace}% needs amssymb -% -% -%%-------------------------------- danger --------------------------------------------- -\usepackage{manfnt} -\usepackage{lettrine} -\newsavebox{\dBox} - %-------------------------------- Listings ------------------------------------- \usepackage{showexpl}% not a real PSTricks package % @@ -90,72 +48,30 @@ \providecommand\eV{e.V\kern-.18em\@ifnextchar.{}{.}} \def\textat{\protect\makeatletter\texttt{@}\protect\makeatother} -\def\lBrace{\texttt{\{}} -\def\rBrace{\texttt{\}}} -\def\lBracket{\texttt{[}} -\def\rBracket{\texttt{]}} -% -\def\PSTemph#1{\textit{\texttt{#1}}} -% -\def\LPack#1{\texttt{#1}} -\def\Lmenv#1{\texttt{#1}} -\def\Lmcs#1{\CMD{#1}\Makroindex{#1}\cIndex{#1}} -\let\xLcs\Lmcs -\let\Lcs\CMD -\let\Lit\texttt -\def\Loption#1{\texttt{#1}\Optindex{#1}\ttindex{#1}} -\def\LProg#1{\texttt{#1}\pIndex{#1}} -\let\Prog\LProg -\def\LFile#1{\texttt{#1}\tIndex{#1}} -\def\LColor#1{\texttt{#1}\index{Farbe!#1@\texttt{#1}}} -\def\Lindex#1{#1\index{#1}}% Ausgeben und in den Index -\def\Lext#1{\texttt{#1}\index{Dateiendung!#1@\texttt{#1}}} -\def\LClass#1{\texttt{#1}} -\def\Lmnotation#1{\texttt{#1}\tIndex{#1}} -\newcommand\Larga{} -\DeclareRobustCommand\Larga[1]{$\langle$\PSTemph{#1}$\rangle$} -\newcommand\LargA{} -\DeclareRobustCommand\LargA[1]{\lBrace$\langle$\PSTemph{#1}$\rangle$\rBrace} -\newcommand\Largs{} -\DeclareRobustCommand\Largs[1]{\lBracket$\langle$\PSTemph{#1}$\rangle$\rBracket} -\newcommand\Largb{} -\DeclareRobustCommand\Largb[1]{\lBrace$\langle$\PSTemph{#1}$\rangle$\rBrace} -\newcommand\Largr{} -\DeclareRobustCommand\Largr[1]{\PSTemph{({#1})}} -\DeclareRobustCommand\Largra[1]{(\Larga{#1})} -\newcommand\Larg{} -\DeclareRobustCommand\Larg[1]{\lBrace\texttt{#1}\rBrace} -\def\begEnv#1{\CMD{begin\{#1\}}\tIndex{#1}} -\def\endEnv#1{\CMD{end\{#1\}}} -\def\OptArg{\Largs{Optionen}} -\def\Largrao{($\langle x_0,y_0\rangle$)} -\def\Largrai{($\langle x_1,y_1\rangle$)} -\def\Largraii{($\langle x_2,y_2\rangle$)} -\def\Largraiii{($\langle x_3,y_3\rangle$)} -\def\Largran{($\langle x_n,y_n\rangle$)} -% \input random -%\def\cite#1{} -% -\begin{document} -% $Id: pst-labo-docEN.tex 295 2016-05-02 19:11:36Z herbert $ -\title{\texttt{PST-Labo} - chemical objects\thanks{The english translation was done by Patrick Drechsler}\\ -\footnotesize{version \PSTfileversion}} +\title{PSTricks package \texttt{pst-labo}} +\subtitle{Chemical objects. Version \pstLaboFV} + \author{% -Denis Girou\thanks{\url{Denis.Girou@idris.fr}}\and -Christophe Jorssen\thanks{\url{Christophe.Jorssen@wanadoo.fr}}\and -Manuel Luque\thanks{\url{ManuelLuque27@gmail.com}} \and -Herbert Vo\ss\thanks{\url{hvoss@tug.org}}} +Denis Girou\\ +Christophe Jorssen\\ +Manuel Luque\\ +Herbert Voß} +\docauthor{} \date{\today} -\maketitle + +\begin{document} + +\settitle + + \begin{abstract} \LPack{pst-labo} provides macros for a variety of devices used mainly for chemical applications.~\cite{pst-labo} Since most of these devices have a standardised design \LPack{pst-labo} spares you the - trouble of having to create them manually. Besides the usage of the - package \LPack{pst-osci} this document also describes how to create + trouble of having to create them manually. This document also describes how to create ``high-level'' objects using the command \PST.~\cite{PSTricks2} All basic objects are included in the file \LFile{pst-laboObj.tex} and are loaded during the start of \LPack{pst-labo}. These objects can @@ -163,6 +79,14 @@ Herbert Vo\ss\thanks{\url{hvoss@tug.org}}} gives an overview of all objects. \end{abstract} +\vfill +\noindent +Thanks to:\\ +Frédéric Bréal; Patrick Drechsler (English translation); + +\clearpage + + \tableofcontents \newpage @@ -173,7 +97,7 @@ Table~\ref{tab:pst-labo:Parameter} describes all parameters unique to \LPack{pst-labo}. \noindent -\LTXtable{\linewidth}{pst-labo8-tab1.tex}% +\input{pst-labo8-tab1.tex} @@ -296,7 +220,7 @@ there is less space needed in the vertical direction. % --------------------------------------------------------------------------------------- The option \Loption{tubeCoudeUB} is an extension of the U-shaped glass tube which is only useful if extending the tube to the bottom makes -sense, as shown for instance in the macro \Lmcs{pstChauffageBallon}. +sense, as shown for instance in the macro \Lcs{pstChauffageBallon}. \bgroup \begin{LTXexample}[pos=t,preset=\raggedright] @@ -344,12 +268,12 @@ horizontal. The angles must be within the interval of $-65\ldots \subsection{\texttt{tubeSeul}}\label{subsec-pstlabo-tubeSeul} % --------------------------------------------------------------------------------------- \Loption{tubeSeul} influences the size of the chosen box. This can be -advantageous as the following example using \Lmcs{psframebox} shows: +advantageous as the following example using \Lcs{psframebox} shows: If you do not wish to add a further container to the box on the right hand side the box would still have the same size as the one on the left. The option \verb+tubeSeul=true+ prevents this from happening. This option only has effects in combination with the macro -\Lmcs{pstChauffageTube} and glass containers of the type \verb+ballon+ +\Lcs{pstChauffageTube} and glass containers of the type \verb+ballon+ and \verb+tube+. \bgroup @@ -365,8 +289,8 @@ and \verb+tube+. % --------------------------------------------------------------------------------------- The option \Loption{becbunsen} toggles the drawing of a Bunsen burner. \Loption{becbunsen} is set to \verb+true+ by default for the macro -\Lmcs{pstChauffeTube} and to \verb+false+ for the macro -\Lmcs{pstChauffageBallon}. +\Lcs{pstChauffeTube} and to \verb+false+ for the macro +\Lcs{pstChauffageBallon}. \bgroup \begin{LTXexample}[width=0.5\linewidth] @@ -400,24 +324,24 @@ activated (see section~\vref{subsec-pstlabo-tubeSeul}) % --------------------------------------------------------------------------------------- The type of substance within the glass container can be selected by the option \Loption{substance}. The default value is a blue fluid -(\Lmcs{pstBullesChampagne}). The available macros are summarised in +(\Lcs{pstBullesChampagne}). The available macros are summarised in table~\ref{tab-pstlabo-substance}. It should be pointed out that -\Lmcs{pstFilaments} and \Lmcs{pstBULLES} are required parameters. +\Lcs{pstFilaments} and \Lcs{pstBULLES} are required parameters. \begin{table}[!htb] \caption{Summary of macros for the option \Loption{substance}}\label{tab-pstlabo-substance} \centering \begin{tabular}{@{}lcl@{}} \emph{macro} & \emph{default} & \emph{comment}\\\hline -\Lmcs{pstBullesChampagne}\Largs{value} & 25 & standard\\ -\Lmcs{pstFilaments}\Largs{value}\Largb{color} & 5\\ -\Lmcs{pstBilles}\Largs{value} & 50 & two dimensional\\ -\Lmcs{pstBULLES}\Largs{value}\Largb{color} & 20 & three dimensional +\Lcs{pstBullesChampagne}\Largs{value} & 25 & standard\\ +\Lcs{pstFilaments}\Largs{value}\Largb{color} & 5\\ +\Lcs{pstBilles}\Largs{value} & 50 & two dimensional\\ +\Lcs{pstBULLES}\Largs{value}\Largb{color} & 20 & three dimensional \end{tabular} \end{table} The optional value describes the number of passes for the internal -\Lmcs{multido}-loop. It is basically unlimited although values larger +\Lcs{multido}-loop. It is basically unlimited although values larger than $80$ can lead to problems with \TeX 's defined memory. The later can be modified in the \TeX\ configuration file. The location of this file can be acquired using \verb+kpsewhich texmf.cnf+. @@ -474,9 +398,9 @@ section~\ref{subsec-pstlabo-substance}. \centering \begin{tabular}{@{}lc@{}} \emph{macro} & \emph{default} \\\hline -\Lmcs{pstTournureCuivre}\Largs{value} & 30 \\ -\Lmcs{pstClouFer}\Largs{value} & 60\\ -\Lmcs{pstGrenailleZinc}\Largs{value} & 25 +\Lcs{pstTournureCuivre}\Largs{value} & 30 \\ +\Lcs{pstClouFer}\Largs{value} & 60\\ +\Lcs{pstGrenailleZinc}\Largs{value} & 25 \end{tabular} \end{table} @@ -578,7 +502,7 @@ that the geometrical origin is located in the centre of the setup. % --------------------------------------------------------------------------------------- \subsection{\texttt{burette}}\label{subsec-pstlabo-burette} % --------------------------------------------------------------------------------------- -The macro \Lmcs{pstDosage} displays a buret by default. This option +The macro \Lcs{pstDosage} displays a buret by default. This option suppresses its display. \bgroup @@ -636,7 +560,7 @@ distillate without this restriction. \subsection{\texttt{phmetre}}\label{subsec-pstlabo-phmetre} % --------------------------------------------------------------------------------------- \Loption{phmetre} displays a pH-meter. Note that this option is only -available with the macro \Lmcs{pstDosage}. +available with the macro \Lcs{pstDosage}. \bgroup \begin{LTXexample}[pos=t] @@ -798,7 +722,7 @@ value when used without further parameters is a normal test tube % --------------------------------------------------------------------------------------- \subsection{\CMD{pstChauffageTube}}\label{sec:pstlabo8:pstChauffageTube} % --------------------------------------------------------------------------------------- -\Lmcs{pstChauffageTube} enhances the previous macro to include either +\Lcs{pstChauffageTube} enhances the previous macro to include either a heat block, a Bunsen burner or a second narrow glass tube respectively. @@ -828,7 +752,7 @@ respectively. % --------------------------------------------------------------------------------------- \subsection{\CMD{pstBallon}}\label{sec:pstlabo8:pstBallon} % --------------------------------------------------------------------------------------- -\Lmcs{pstBallon} is basically identical to \Lmcs{pstTubeEssais} with +\Lcs{pstBallon} is basically identical to \Lcs{pstTubeEssais} with more possible options. \begin{center} @@ -852,7 +776,7 @@ more possible options. % --------------------------------------------------------------------------------------- \subsection{\CMD{pstChauffageBallon}}\label{sec:pstlabo8:pstChauffageBallon} % --------------------------------------------------------------------------------------- -\Lmcs{pstChauffageBallon} enhances the previous macro by displaying a +\Lcs{pstChauffageBallon} enhances the previous macro by displaying a Bunsen burner by default. \begin{center} @@ -895,9 +819,9 @@ Bunsen burner by default. % --------------------------------------------------------------------------------------- -\subsection{\CMD{pstEntonnoir}}\label{sec:pstlabo8:pstTubeEssais} +\subsection{\CMD{pstEntonnoir}}\label{sec:pstlabo8:pstEnnoir} % --------------------------------------------------------------------------------------- -\Lmcs{pstEntonnoir} displays a funnel. Called without any parameters +\Lcs{pstEntonnoir} displays a funnel. Called without any parameters it is combined with a test tube. It can be combined with any kind of setup. \bgroup @@ -913,7 +837,7 @@ it is combined with a test tube. It can be combined with any kind of setup. % --------------------------------------------------------------------------------------- \subsection{\CMD{pstEprouvette}}\label{sec:pstlabo8:pstEprouvette} % --------------------------------------------------------------------------------------- -\Lmcs{pstEprouvette} displays a measuring cylinder. Its size can by +\Lcs{pstEprouvette} displays a measuring cylinder. Its size can by changed using the \PST scaling factor. \bgroup @@ -928,7 +852,7 @@ changed using the \PST scaling factor. % --------------------------------------------------------------------------------------- \subsection{\CMD{pstpipette}}\label{sec:pstlabo8:pstpipette} % --------------------------------------------------------------------------------------- -\Lmcs{pstpipette} displays a pipette. Its scaling range can be altered +\Lcs{pstpipette} displays a pipette. Its scaling range can be altered by changing \PST scaling factors. \bgroup @@ -942,7 +866,7 @@ by changing \PST scaling factors. % --------------------------------------------------------------------------------------- \subsection{\CMD{pstDosage}}\label{sec:pstlabo8:pstDosage} % --------------------------------------------------------------------------------------- -\Lmcs{pstDosage} is normally used in combination with other +\Lcs{pstDosage} is normally used in combination with other devices. The buret has a maximal capacity of 25 mL. The current height and substrate can be changed by their options. An optional pH-meter (only with glass type \verb+becher+) or heat block can be selected. @@ -970,18 +894,18 @@ and substrate can be changed by their options. An optional pH-meter % --------------------------------------------------------------------------------------- \subsection{\CMD{pstDistillation}}\label{sec:pstlabo8:pstDistillation} % --------------------------------------------------------------------------------------- -The only macro which has be passed on to \Lmcs{pstDistillation} are -the dimensions of the \Lmenv{pspicture} environment. +The only macro which has be passed on to \Lcs{pstDistillation} are +the dimensions of the \Lenv{pspicture} environment. \medskip \noindent -\Lmcs{pstDistillation}\\ -\Lmcs{pstDistillation}\Largr{$x_{ll},y_{ll}$}\Largr{$x_{ur},y_{ur}$} % $ +\Lcs{pstDistillation}\\ +\Lcs{pstDistillation}\Largr{$x_{ll},y_{ll}$}\Largr{$x_{ur},y_{ur}$} % $ \medskip In case these coordinates are not supplied a rectangle of $(-4,-10)(8,7)$ is used, assuming that further objects will be -included using \Lmcs{rput}, +included using \Lcs{rput}, \bgroup \begin{LTXexample} @@ -991,6 +915,33 @@ included using \Lmcs{rput}, \egroup +\newpage + +% --------------------------------------------------------------------------------------- +\subsection{\CMD{pstSeparateFunnel}}\label{sec:pstlabo8:pstSeparateFunnel} +% --------------------------------------------------------------------------------------- + +\begin{LTXexample}[pos=b] +\psset{unit=0.5} +\begin{pspicture}(-2,-6)(6,16)%\psgrid% +\pstSupport +\pstSeparateFunnel[OpenTap=false,bouchon] +\end{pspicture} +\quad +\begin{pspicture}(-2,-6)(6,16)%\psgrid% +\pstSupport +\pstSeparateFunnel[OpenTap=false,bouchon=false,niveauLiquide1=-1,niveauLiquide2=10] +\rput(0,-3){\pstTubeEssais[glassType=becher,aspectLiquide1=AqueoPhase]} +\end{pspicture} +\quad +\begin{pspicture}(-2,-6)(6,16)%\psgrid% +\pstSeparateFunnel[OpenTap,bouchon=false,niveauLiquide1=1,niveauLiquide2=1] +\rput(0,-3){\pstTubeEssais[glassType=becher,aspectLiquide1=OrganicPhase,niveauLiquide1=30]} +\pstSupport +\end{pspicture} +\end{LTXexample} + + @@ -1005,8 +956,8 @@ objects. For lack of space they are not displayed here explicitly. \section{Examples}\label{sec:pstlabo:Beispiele} % --------------------------------------------------------------------------------------- Creating complex examples is eased significantly by using a coordinate -grid underlying the setup (\Lmcs{psgrid}) or the oprional argument \Loption{showgrid} -for the \Lmenv{pspicture} environment. +grid underlying the setup (\Lcs{psgrid}) or the oprional argument \Loption{showgrid} +for the \Lenv{pspicture} environment. \begin{figure} \centering @@ -1033,7 +984,7 @@ for the \Lmenv{pspicture} environment. \end{minipage}}} \end{pspicture} \egroup -\caption{Example usage of \Lmcs{pstDosage}} +\caption{Example usage of \Lcs{pstDosage}} \end{figure} \begin{figure} @@ -1052,7 +1003,7 @@ for the \Lmenv{pspicture} environment. \pstTubeEssais[Numero={\footnotesize Cu$^{2+}$}] \pstTubeEssais[niveauLiquide1=30,aspectLiquide1=Champagne,Numero={\footnotesize NaOH},unit=0.75] \egroup -\caption{Example usage of \Lmcs{pstTubeEssais}} +\caption{Example usage of \Lcs{pstTubeEssais}} \end{figure} diff --git a/Master/texmf-dist/doc/generic/pst-labo/pst-labo8-tab1.tex b/Master/texmf-dist/doc/generic/pst-labo/pst-labo8-tab1.tex new file mode 100644 index 00000000000..595d7d63745 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo8-tab1.tex @@ -0,0 +1,62 @@ +% $Id: pst-labo8-tab1.tex 720 2023-05-12 11:12:51Z 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 +\endfirsthead +\emph{\textrm{Name}} & \emph{\textrm{values}} & \emph{\textrm{default}} & \emph{comments} \\\hline +\endhead +%\multicolumn{3}{c}{\CMD{TubeEssais}} \\\hline + +\Loption{glassType} & tube|ballon| & tube & defines type of glass \\ + & becher|erlen|& & cylinder\\ + & \rlap{flacon|fioleJauge} \\ +\Loption{bouchon} & \Larga{false|true} & false & Container is sealed with a plug.\\ +\Loption{pince} & \Larga{false|true} & false & wooden clamp\\ +%\Loption{fioleJaugee} & \Larga{false|true} & false&\\ +\Loption{tubeDroit} & \Larga{false|true} & false & glass tube\\ +\Loption{tubeCoude} & \Larga{false|true} & false & glass tube with 90 degree twist\\ +\Loption{tubeCoudeU} & \Larga{false|true} & false& U-shaped glass tube\\ +\Loption{tubeCoudeUB} & \Larga{false|true} & false & extended version, % +only applies to glass containers of type \verb+ballon+ and \verb+erlen+\\ +\Loption{tubeRecourbe} & \Larga{false|true} & false & \\ +\Loption{tubeRecourbeCourt} & \Larga{false|true} & false & setup without Bunsen burner\\ +\Loption{tubePenche} & \Larga{$-65 \ldots 65$} & 0 & tilting angle\\ +\Loption{doubletube} & \Larga{false|true} & false & pour d'gagement gazeux sans chauffage\\%TODO +% +\Loption{etiquette} & \Larga{false|true} & false & \\ +\Loption{Numero} & \Larga{Text} & \{\} & number for the option \verb+etiquette+\\ +%\multicolumn{3}{c}{\CMD{ChauffeTube}}\\\hline +\Loption{tubeSeul} & \Larga{false|true} & false & wide/narrow \verb+pspicture+ box\\ +\Loption{becBunsen} & \Larga{false|true} & true & with/without Bunsen burner\\ +%\Loption{tubedegagamentDroit} & \Larga{false|true} &false&\\% nicht vorhanden +\Loption{barbotage} & \Larga{false|true} & false & attaches an additional glass tube to the original glass container\\ +\Loption{substance} & \Larga{Makro} & \CMD{relax} & \CMD{pstBullesChampagne}, \CMD{pstFilaments}, + \CMD{pstBilles}, \CMD{pstBULLES}, \CMD{pstClous}, \CMD{pstCuivre}\\ +\Loption{solide} & \Larga{Makro} & \CMD{relax} & \CMD{pstTournureCuivre}, \CMD{pstClouFer}, + \CMD{pstGrenailleZinc}\\ +\Loption{refrigerantBoulle} & \Larga{false|true} & false & pour chauffage à reflux\\%TODO +\Loption{recuperationGaz} & \Larga{false|true} & false & setup for collecting gas\\ +% +%\Loption{reactifBecher} & \{\} & bécher ou ballon ou flacon\\\hline +%\Loption{reactifBurette} & \{\} &Formule et/ou concentration du réactif\\ +\rlap{\Loption{couleurReactifBurette}}\\ + & \Larga{Farbe} & \rlap{OrangePale} & \\ +\rlap{\Loption{niveauReactifBurette}}\\ + & 20 & \Larga{$0\ldots 25$} & restriction of 25mL\\ +%\Loption{echelle} & \Larga{value} & 1 & echelle du schéma\\ +\Loption{AspectMelange} & \Larga{Stil} & \rlap{DiffusionBleue}\\ +\Loption{CouleurDistillat} & \Larga{Farbe} & yellow & \\ +% +\Loption{phmetre} & \Larga{false|true} & false & display pH-meter\\ +\rlap{\Loption{agitateurMagnetique}}\\ + & \Larga{false|true} & true & \\ +% +\Loption{aspectLiquide1} & \Larga{Stil} & cyan & defined as part of \CMD{newpsstyle}\ldots\\ +\Loption{aspectLiquide2} & \Larga{Stil} & yellow & dito\\ +\Loption{aspectLiquide3} & \Larga{Stil} & magenta & dito\\ +\Loption{niveauLiquide1} & \Larga{$0 \ldots 100$} & 50 &\\ +\Loption{niveauliquide2} & \Larga{$0 \ldots 100$} & 0 & < niveauLiquide1\\ +\Loption{niveauliquide3} & \Larga{$0 \ldots 100$} & 0 & < niveauLiquide2\\ +\end{xltabular} + + diff --git a/Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex b/Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex index 0eef0e2713f..ea8d3a59252 100644 --- a/Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex +++ b/Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex @@ -24,10 +24,11 @@ \ifx\PSTGradLoaded\endinput\else\input pst-grad.tex\fi \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex\fi % -\def\fileversion{2.05} -\def\filedate{2023/05/12} +\def\fileversion{2.06} +\def\filedate{2023/05/17} +\let\PSTLabofileversion\fileversion % -\message{`PST-labo8' v\fileversion, \filedate\space (ML/CJ/DG/HV)} +\message{`PST-labo' v\fileversion, \filedate\space (ML/CJ/DG/HV)} \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax % \pst@addfams{pst-labo} diff --git a/Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex b/Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex index 040286b662c..e82017c8328 100644 --- a/Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex +++ b/Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex @@ -689,3 +689,130 @@ gradbegin=OrangePale,gradend=yellow]% \endpsclip \pst@ballon } + +\newpsstyle{AqueoPhase}{linestyle=none,fillstyle=solid,fillcolor={[cmyk]{0.215686,0.062745,0,0}}} +\newpsstyle{OrganicPhase}{linestyle=none,fillstyle=solid,fillcolor={[cmyk]{0.223529,0.094118,0.501961,0}}} + +% robinet ouvert +\newif\ifPst@OpenTap +\define@key[psset]{pst-labo}{OpenTap}[true]{\@nameuse{Pst@OpenTap#1}}% +% +\def\pst@corpsAmpoule{% +% corps de l'ampoule + \psline(-0.65,15)(-0.55,13.75) + \psbezier(-0.55,13.75)(-1.55,13.54)( -1.92,12.7)(-1.92,11.65) + \psbezier(-1.92,11.65)(-1.92,10.6)(-0.3,9.55)(-0.3,8.5) + \psline(-0.3,8.5)(-0.3,2) + \psbezier(-0.3,2)(-0.3,1.5)(-0.14,1.5)(-0.14,1) + \psline(-0.14,1)(-0.14,-1) + \psline(0.14,-1)(0.14,1) + \psbezier(0.14,1)(0.14,1.5)(0.3,1.5)(0.3,2) + \psline(0.3,2)(0.3,8.5) + \psbezier(0.3,8.5)(0.3,9.55)(1.92,10.6)(1.92,11.65)% + \psbezier(1.92,11.65)( 1.92,12.7)(1.55,13.54)(0.55,13.75) + \psline(0.55,13.75)(0.65,15) +}% +% +% le contour pour contenir les liquides +\def\pst@contourAmpouleClip{% +% corps de l'ampoule pour clip + \moveto(-0.65,15) + \lineto(-0.55,13.75) + \curveto(-1.55,13.54)( -1.92,12.7)(-1.92,11.65) + \curveto(-1.92,10.6)(-0.3,9.55)(-0.3,8.5) + \lineto(-0.3,2) + \curveto(-0.3,1.5)(-0.14,1.5)(-0.14,1)% + \lineto(-0.14,-1) + \lineto(0.14,-1) + \lineto(0.14,1) + \curveto(0.14,1.5)(0.3,1.5)(0.3,2) + \lineto(0.3,8.5) + \curveto(0.3,9.55)(1.92,10.6)(1.92,11.65) + \curveto(1.92,12.7)(1.55,13.54)(0.55,13.75) + \lineto(0.65,15) +}% +% +% bouchon de l'ampoule à décanter +\def\pst@Bouchon{% + \pspolygon[linecap=1,linejoin=1,fillstyle=solid,fillcolor=gray!10,linecolor=gray](-0.67,15.25)(0.67,15.25)(0.57,14)(-0.57,14) + % oreille bouchon + \pscustom[linecap=1,linejoin=1,fillstyle=solid,fillcolor=gray!05,linecolor=gray]{% + \psarcn(0.555,15.365){0.1145}{-90}{180} + \psarc(0,15.92){0.67}{-45}{225} + \psarcn(-0.555,15.365){0.1145}{0}{-90} + \closepath + }}% +% robinet ouvert +% tap open +\def\pst@TapOpen{% + \psframe[fillstyle=solid](-.2,0.5)(.2,1) + \psframe(-.2,0.4)(-.3,1.1) + \psframe(.2,0.4)(.3,1.1) + \pspolygon[linejoin=1](.3,0.6)(.4,0.6)(.5,0.3)(.9,0.3)(.9,1.2)(.5,1.2)(.4,0.9)(.3,0.9) + \pspolygon[fillstyle=solid,fillcolor=cyan!50](-.6,0.4)(-.85,0.6)(-.85,0.9)(-.6,1.1)(-.3,1.1)(-.3,0.4) + \psline(-0.6,0.4)(-0.6,1.1) + \psline(0.5,0.3)(0.5,1.2) +}% + % robinet fermé + % tap open +\def\pst@TapClosed{% + \psframe[fillstyle=solid](-.2,0.5)(.2,1) + \psframe(-.2,0.4)(-.3,1.1) + \psframe(.2,0.4)(.3,1.1) + \pscustom[linejoin=1]{% + \psarcn(0.35,0.6){0.05}{180}{90} + \psline(0.4,0.65)(0.9,0.65)(0.9,0.85)(0.35,0.85) + \psarcn(0.35,0.9){0.05}{-90}{180} + \closepath + }% + \psline(0.5,0.65)(0.5,0.85) + \pspolygon[fillstyle=solid,fillcolor=cyan!50](-.6,0.4)(-.85,0.6)(-.85,0.9)(-.6,1.1)(-.3,1.1)(-.3,0.4) + \psline(-0.6,0.4)(-0.6,1.1) +}% +% la macro ampoule à decanter = pstSeparateFunnel +\def\pstSeparateFunnel{\pst@object{pst@SeparateFunnel}} +\def\pst@SeparateFunnel@i{% + \addbefore@par{dimen=middle,niveauLiquide1=11,niveauLiquide2=12,linewidth=0.04}% + \begin@SpecialObj +% les deux liquides + \psclip{\pscustom[linestyle=none]{\pst@contourAmpouleClip}}% + \psframe[style=AqueoPhase](-2,1)(2,\@nameuse{psk@TubeEssais@niveauLiquide1})% + \endpsclip% + \psclip{\pscustom[linestyle=none]{\pst@contourAmpouleClip}}% + \psframe[style=OrganicPhase](-2,\@nameuse{psk@TubeEssais@niveauLiquide1})(2,\@nameuse{psk@TubeEssais@niveauLiquide2})% + \endpsclip% + \ifPst@TubeEssais@bouchon\pst@Bouchon\fi + \pst@corpsAmpoule + \ifPst@OpenTap\pst@TapOpen\else\pst@TapClosed\fi +% ouverture tube de coulée + \psellipse[fillstyle=solid,fillcolor=white](0,-1)(0.15,0.25) +% rebord ampoule + \pscircle*[linecolor=darkgray](-0.675,15){0.03} + \pscircle*[linecolor=darkgray](0.675,15){0.03} + \psline[linecolor=darkgray](-0.65,15)(0.65,15) +% join entre le col et l'ampule + \psline[linecolor=gray](-0.55,13.75)(0.55,13.75) + \end@SpecialObj% + }% +% +\def\pstSupport{% + \psset{dimen=m,linewidth=0.04} + \definecolor{woodcolor}{rgb}{0.957 0.84 0.69} + \definecolor{darkcolorwood}{rgb}{0.5 0.25 0} + \newpsstyle{woodcolor}{fillstyle=solid,fillcolor=woodcolor,linejoin=1} + \psframe[style=woodcolor](-2,-6)(5,-5) + %\psline(-2.,-5.5)(5,-5.5) + \psframe[style=woodcolor](2.75,2)(3.25,16) + \pscustom[style=woodcolor]{\psarc(2.75,1.5){0.5}{90}{180} + \psline(2.25,1.5)(2.25,-5)(3.75,-5)(3.75,1.5) + \psarc(3.25,1.5){0.5}{0}{90}}% + %\psline(-2,11.5)(-1.55,10.5) + \psline(2,11.5)(1.55,10.5) + \pspolygon[style=woodcolor](-2.5,11.5)(-2,11.5)(-1.55,10.5)(-2.5,10.5) + \pspolygon[style=woodcolor](4,11.5)(2,11.5)(1.55,10.5)(4,10.5) + \psframe(-2.5,10.5)(4,11.5) + \pscustom[style=woodcolor]{ + \psline(4,11.2)(4.5,11.2)\psarcn(5,11){0.5385}{158.2}{-158.2} + \psline(4.5,10.8)(4,10.8)} + \psline(4.5,10.8)(4.5,11.2) +}% |