From fa3dbdbd11bbc7da0c06e2871472419998e645c9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 11 Dec 2015 23:16:07 +0000 Subject: pst-labo (11dec15) git-svn-id: svn://tug.org/texlive/trunk@39077 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/pst-labo/pst-labo.tex | 12 ++--- .../tex/generic/pst-labo/pst-laboObj.tex | 57 ++++++++++++++-------- Master/texmf-dist/tex/latex/pst-labo/pst-labo.sty | 11 +++-- 3 files changed, 51 insertions(+), 29 deletions(-) (limited to 'Master/texmf-dist/tex') 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 a3cc93a870c..e23db23efa9 100644 --- a/Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex +++ b/Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex @@ -24,8 +24,8 @@ \ifx\PSTGradLoaded\endinput\else\input pst-grad.tex\fi \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex\fi % -\def\fileversion{2.03} -\def\filedate{2006/08/16} +\def\fileversion{2.04} +\def\filedate{2015/12/09} % \message{`PST-labo8' v\fileversion, \filedate\space (ML/CJ/DG/HV)} \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -35,13 +35,13 @@ \input random \input {pst-laboObj} % -\definecolor{Beige} {rgb}{0.96,0.96,0.86} -\definecolor{GrisClair} {rgb}{0.8,0.8,0.8} -\definecolor{GrisTresClair} {rgb}{0.9,0.9,0.9} +\definecolor{Beige}{cmyk}{0,0,0.1,0.04} +\definecolor{GrisClair}{cmyk}{0,0,0,0.2} +\definecolor{GrisTresClair}{cmyk}{0,0,0,0.1} \definecolor{OrangeTresPale}{cmyk}{0,0.1,0.3,0} \definecolor{OrangePale}{cmyk}{0,0.2,0.4,0} \definecolor{BleuClair}{cmyk}{0.2,0,0,0} -\definecolor{LightBlue}{rgb}{.68,.85,.9} +\definecolor{LightBlue}{cmyk}{0.22,0.05,0,0.1} \definecolor{Copper}{cmyk}{0,0.9,0.9,0.2} \definecolor{Marron}{cmyk}{0,0.3,0.5,.3} \SpecialCoor 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 059de731dc6..d678bdc450f 100644 --- a/Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex +++ b/Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex @@ -1,4 +1,21 @@ -%%%%%%%% Les Différents appareils de chimie %%%%%%%%%%%% +%% Package `pst-laboObj.tex' +%% +%% 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. +%% +%% DESCRIPTION: +%% `pst-labo' is a PSTricks package for +%% chemical objects. +%% +%% +%% Authors : Denis Girou +%% Christophe Jorsen +%% Manuel Luque +%% Herbert Voss +%% +%% version number --> pst-labo.tex +%%%%%%%% Les Différents appareils de chimie %%%%%%%%%%%% %%%%%%%%% Dosage %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \def\pst@burette@corps{% @@ -524,7 +541,7 @@ gradbegin=OrangePale,gradend=yellow]% (-1.5,0)(1.5,0)(0.5,2.5)(0.5,3.5)} \def\pst@Flacon@Corps{% -{\psset{linewidth=0.053} +{\psset{linewidth=0.053,arrows=-} \psarcn(-0.6,3.4){0.1}{90}{0} \psline(-0.5,3.4)(-0.5,3.1) \psarcn(-0.6,3.1){0.1}{0}{-90} @@ -642,22 +659,22 @@ gradbegin=OrangePale,gradend=yellow]% %%%%%%%%%%%% Fin de Chauffe-Ballon %%%%%%%%%%%%%%%%%%%%%% \def\pst@Ballon@Reflux{% -\psclip{% -\pscustom[linestyle=none]{\pst@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)% -(-.75,1.5)(-.625,1.45)% -(-.5,1.5)(-.375,1.55)% -(-.25,1.5)(-0.125,1.45)% -(0,1.5)(0.125,1.55)% -(.25,1.5)(0.375,1.45)% -(0.5,1.5)(0.625,1.55)% -(0.75,1.5)(0.875,1.45)% -(1,1.5)(1.125,1.55)% -(1.25,1.5)(1.375,1.45)(1.5,1.5)% -\psline(1.5,1.5)(1.5,0)(-1.5,0)(-1.5,1.5)} -\endpsclip% -\pst@ballon + \psclip{% + \pscustom[linestyle=none]{\pst@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)% + (-.75,1.5)(-.625,1.45)% + (-.5,1.5)(-.375,1.55)% + (-.25,1.5)(-0.125,1.45)% + (0,1.5)(0.125,1.55)% + (.25,1.5)(0.375,1.45)% + (0.5,1.5)(0.625,1.55)% + (0.75,1.5)(0.875,1.45)% + (1,1.5)(1.125,1.55)% + (1.25,1.5)(1.375,1.45)(1.5,1.5) + \psline(1.5,1.5)(1.5,0)(-1.5,0)(-1.5,1.5)}% + \endpsclip + \pst@ballon } diff --git a/Master/texmf-dist/tex/latex/pst-labo/pst-labo.sty b/Master/texmf-dist/tex/latex/pst-labo/pst-labo.sty index 7a4767ef81d..e03726c23bc 100644 --- a/Master/texmf-dist/tex/latex/pst-labo/pst-labo.sty +++ b/Master/texmf-dist/tex/latex/pst-labo/pst-labo.sty @@ -1,7 +1,12 @@ \RequirePackage{pstricks} -\ProvidesPackage{pst-labo}[2005/03/13 package wrapper for - pst-labo.tex (hv)] +\ProvidesPackage{pst-labo}[2015/12/09 package wrapper for pst-labo.tex (hv)] + \input{pst-labo.tex} \ProvidesFile{pst-labo.tex} [\filedate\space v\fileversion\space `PST-labo' (ML,DG,CJ,hv)] -\endinput \ No newline at end of file +\IfFileExists{pst-labo.pro}{% + \ProvidesFile{pst-labo.pro} + [2012/09/21 v. 1.01, PostScript prologue file (hv)] + \@addtofilelist{pst-labo.pro}}{}% +\endinput + -- cgit v1.2.3