summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/cdbuild/ctan2tds.pl4
-rw-r--r--Master/texmf-dist/doc/generic/pst-labo/Changes (renamed from Master/texmf-dist/doc/latex/pst-labo/Changes)2
-rw-r--r--Master/texmf-dist/doc/generic/pst-labo/README (renamed from Master/texmf-dist/doc/latex/pst-labo/README)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib (renamed from Master/texmf-dist/bibtex/bib/pst-labo/pst-labo-doc.bib)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.ltx (renamed from Master/texmf-dist/doc/latex/pst-labo/pst-labo-docDE.ltx)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.pdf (renamed from Master/texmf-dist/doc/latex/pst-labo/pst-labo-docDE.pdf)bin1127645 -> 1127645 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.tex (renamed from Master/texmf-dist/doc/latex/pst-labo/pst-labo-docDE.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.ltx (renamed from Master/texmf-dist/doc/latex/pst-labo/pst-labo-docEN.ltx)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.pdf (renamed from Master/texmf-dist/doc/latex/pst-labo/pst-labo-docEN.pdf)bin1239138 -> 1239138 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.tex (renamed from Master/texmf-dist/doc/latex/pst-labo/pst-labo-docEN.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.ltx (renamed from Master/texmf-dist/doc/latex/pst-labo/pst-labo-docFR.ltx)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.pdf (renamed from Master/texmf-dist/doc/latex/pst-labo/pst-labo-docFR.pdf)bin1074413 -> 1074413 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.tex (renamed from Master/texmf-dist/doc/latex/pst-labo/pst-labo-docFR.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-DE.tex (renamed from Master/texmf-dist/doc/latex/pst-labo/pstlabo8-tab1-DE.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-EN.tex (renamed from Master/texmf-dist/doc/latex/pst-labo/pstlabo8-tab1-EN.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-FR.tex (renamed from Master/texmf-dist/doc/latex/pst-labo/pstlabo8-tab1-FR.tex)0
-rw-r--r--Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex (renamed from Master/texmf-dist/doc/latex/pst-labo/pst-labo.tex)29
-rw-r--r--Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex (renamed from Master/texmf-dist/doc/latex/pst-labo/pst-laboObj.tex)0
-rw-r--r--Master/texmf-dist/tpm/pst-labo.tpm42
-rw-r--r--Master/texmf/lists/pst-labo34
20 files changed, 62 insertions, 49 deletions
diff --git a/Build/cdbuild/ctan2tds.pl b/Build/cdbuild/ctan2tds.pl
index dc4bd5e7f1b..d6fba732eef 100755
--- a/Build/cdbuild/ctan2tds.pl
+++ b/Build/cdbuild/ctan2tds.pl
@@ -228,6 +228,7 @@ chdir $startdir || die "chdir($startdir) failed: $!";
'pst-gr3d', "&MAKEpst",
'pst-infixplot',"&MAKEpst",
'pst-jftree', "&MAKEpst",
+ 'pst-labo', "&MAKEpst",
'pst-lens', "&MAKEpst",
'pst-light3d', "&MAKEpst",
'pst-math', "&MAKEpst",
@@ -848,6 +849,7 @@ $standardbst='\.bst';
'eplain', 'NULL',
'mslapa', 'NULL',
'munich', 'NULL',
+ 'pst-labo', 'NULL',
'ucthesis', 'NULL',
);
$standardbib='\.bib$'; # $ so we don't find README.bibtex in IEEEtran
@@ -2483,7 +2485,7 @@ sub MAKEbeebe {
#
sub MAKEpst {
print "\t SPECIAL pst $package starts\n";
- $standardtex = qq{^$package\.(tex|sty)};
+ $standardtex = qq{^$package(Obj)?\.(tex|sty)}; # for pst-laboObj.tex
$whichformat='generic';
$whichdocformat='generic';
$specialsourcefmt{$package}='generic';
diff --git a/Master/texmf-dist/doc/latex/pst-labo/Changes b/Master/texmf-dist/doc/generic/pst-labo/Changes
index aff34088a91..05308f3f681 100644
--- a/Master/texmf-dist/doc/latex/pst-labo/Changes
+++ b/Master/texmf-dist/doc/generic/pst-labo/Changes
@@ -1,5 +1,5 @@
pst-labo.tex -----------------------------------
-2.03 2006-04-22 fix bug with loading random (hv)
+2.03 2006-08-16 fix typo with middle (hv)
2.02 2005-10-08 new option glassType (hv)
2.01 2005-03-13 fix bug with pstcol loaded (HV)
diff --git a/Master/texmf-dist/doc/latex/pst-labo/README b/Master/texmf-dist/doc/generic/pst-labo/README
index 3b80a99749e..3b80a99749e 100644
--- a/Master/texmf-dist/doc/latex/pst-labo/README
+++ b/Master/texmf-dist/doc/generic/pst-labo/README
diff --git a/Master/texmf-dist/bibtex/bib/pst-labo/pst-labo-doc.bib b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib
index e217a66170f..e217a66170f 100644
--- a/Master/texmf-dist/bibtex/bib/pst-labo/pst-labo-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib
diff --git a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docDE.ltx b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.ltx
index 1f675cb7980..1f675cb7980 100644
--- a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docDE.ltx
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.ltx
diff --git a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docDE.pdf b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.pdf
index c19d650e1cc..c19d650e1cc 100644
--- a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docDE.pdf
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docDE.tex b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.tex
index b7f37fa750e..b7f37fa750e 100644
--- a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docDE.tex
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.tex
diff --git a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docEN.ltx b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.ltx
index 145a0f75fd6..145a0f75fd6 100644
--- a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docEN.ltx
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.ltx
diff --git a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docEN.pdf b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.pdf
index cbb5863f015..cbb5863f015 100644
--- a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docEN.pdf
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docEN.tex b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.tex
index 2028060ed4c..2028060ed4c 100644
--- a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docEN.tex
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.tex
diff --git a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docFR.ltx b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.ltx
index f52b7990c76..f52b7990c76 100644
--- a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docFR.ltx
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.ltx
diff --git a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docFR.pdf b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.pdf
index 697f04bb483..697f04bb483 100644
--- a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docFR.pdf
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docFR.tex b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.tex
index ec1762a69fb..ec1762a69fb 100644
--- a/Master/texmf-dist/doc/latex/pst-labo/pst-labo-docFR.tex
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.tex
diff --git a/Master/texmf-dist/doc/latex/pst-labo/pstlabo8-tab1-DE.tex b/Master/texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-DE.tex
index baa18da9ac0..baa18da9ac0 100644
--- a/Master/texmf-dist/doc/latex/pst-labo/pstlabo8-tab1-DE.tex
+++ b/Master/texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-DE.tex
diff --git a/Master/texmf-dist/doc/latex/pst-labo/pstlabo8-tab1-EN.tex b/Master/texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-EN.tex
index d2865ea0364..d2865ea0364 100644
--- a/Master/texmf-dist/doc/latex/pst-labo/pstlabo8-tab1-EN.tex
+++ b/Master/texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-EN.tex
diff --git a/Master/texmf-dist/doc/latex/pst-labo/pstlabo8-tab1-FR.tex b/Master/texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-FR.tex
index 68c1f7d8def..68c1f7d8def 100644
--- a/Master/texmf-dist/doc/latex/pst-labo/pstlabo8-tab1-FR.tex
+++ b/Master/texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-FR.tex
diff --git a/Master/texmf-dist/doc/latex/pst-labo/pst-labo.tex b/Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex
index 74ad284e0ad..a3cc93a870c 100644
--- a/Master/texmf-dist/doc/latex/pst-labo/pst-labo.tex
+++ b/Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex
@@ -25,7 +25,7 @@
\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex\fi
%
\def\fileversion{2.03}
-\def\filedate{06/04/22}
+\def\filedate{2006/08/16}
%
\message{`PST-labo8' v\fileversion, \filedate\space (ML/CJ/DG/HV)}
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -324,7 +324,7 @@
%
\def\pstTubeEssais{\pst@object{pst@TubeEssais}}
\def\pst@TubeEssais@i{{%
- \addbefore@par{dimen=midle}
+ \addbefore@par{dimen=middle}
\begin@SpecialObj
\ifPst@TubeEssais@tubeCoude\pspicture(-1,0)(6,4)\else
\ifnum\psk@TubeEssais@tubePenche=0 \pspicture(-1.5,0)(1.5,4)\else
@@ -402,15 +402,26 @@
%%%%%%%%%%%%%%%ù fin ChauffageTube %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% 0->TUBE 1->BALLON 2->BECHER 3->ERLEN 4->FLACON 5->fioleJauge 6->Verre
\def\pstChauffageBallon{\pst@object{pst@ChauffageBallon}}
+%\def\pst@ChauffageBallon@i{\@ifnextchar(\pst@ChauffageBallon@ii{\pst@ChauffageBallon@iii(\@empty)(\@empty)}}%
+%\def\pst@ChauffageBallon@ii(#1){\@ifnextchar({\pst@ChauffageBallon@iii(#1)}{\pst@ChauffageBallon@iii(0,0)(#1)}}
+%\def\pst@ChauffageBallon@iii(#1)(#2){%
+% \def\pst@tempA{#1}
\def\pst@ChauffageBallon@i{%
\begin@SpecialObj
- \ifpst@becBunsen\pst@cnth=-5 \else\pst@cnth=1 \fi
- \ifnum\psk@glassType=2 \pspicture(-2,\pst@cnth)(3,5)\else % becher
- \ifnum\psk@glassType=3 \pspicture(-2,\pst@cnth)(4,6)\else % erlen
- \ifpst@barbotage\pspicture(-2,\pst@cnth)(6,7)\else
- \ifPst@TubeEssais@tubeRecourbe@Court\pspicture(-2,0)(9,8)\else
- \ifPst@TubeEssais@DoubleTube\pspicture(-2,0)(9,8)\else\pspicture(-2,\pst@cnth)(10,7)
- \fi\fi\fi\fi\fi
+% \ifx\pst@tempA\@empty% no special coors
+ \ifpst@becBunsen\pst@cnth=-5 \else\pst@cnth=1 \fi
+ \ifnum\psk@glassType=2 \pspicture(-2,\pst@cnth)(3,5)\else % becher
+ \ifnum\psk@glassType=3 \pspicture(-2,\pst@cnth)(4,6)\else % erlen
+ \ifpst@barbotage\pspicture(-2,\pst@cnth)(6,7)\else
+ \ifPst@TubeEssais@tubeRecourbe@Court\pspicture(-2,0)(9,8)\else
+ \ifPst@TubeEssais@DoubleTube\pspicture(-2,0)(9,8)\else
+ \pspicture(-2,\pst@cnth)(4,6)
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ % \else\pspicture(#1)(#2)\fi
%\psgrid[subgriddiv=0,gridcolor=red]%
%\psset{aspectLiquide1=Champagne,substance={\pstBullesChampagne[20]}}%
\ifpst@recuperationGaz%
diff --git a/Master/texmf-dist/doc/latex/pst-labo/pst-laboObj.tex b/Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex
index 059de731dc6..059de731dc6 100644
--- a/Master/texmf-dist/doc/latex/pst-labo/pst-laboObj.tex
+++ b/Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex
diff --git a/Master/texmf-dist/tpm/pst-labo.tpm b/Master/texmf-dist/tpm/pst-labo.tpm
index e6a660c73cd..febcfbcc792 100644
--- a/Master/texmf-dist/tpm/pst-labo.tpm
+++ b/Master/texmf-dist/tpm/pst-labo.tpm
@@ -3,36 +3,36 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/pst-labo.zip">
<TPM:Name>pst-labo</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/04/22 16:40:00</TPM:Date>
+ <TPM:Date>1970/01/01 00:00:00</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>karl</TPM:Creator>
<TPM:Title>The pst-labo package.</TPM:Title>
<TPM:Description></TPM:Description>
<TPM:Author></TPM:Author>
- <TPM:Size>3637335</TPM:Size>
+ <TPM:Size>3637385</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="4563">
-texmf-dist/bibtex/bib/pst-labo/pst-labo-doc.bib
+ <TPM:RunFiles size="48149">
+texmf-dist/tex/generic/pst-labo/pst-labo.tex
+texmf-dist/tex/generic/pst-labo/pst-laboObj.tex
texmf-dist/tex/latex/pst-labo/pst-labo.sty
texmf-dist/tpm/pst-labo.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="3632822">
-texmf-dist/doc/latex/pst-labo/Changes
-texmf-dist/doc/latex/pst-labo/README
-texmf-dist/doc/latex/pst-labo/pst-labo-docDE.ltx
-texmf-dist/doc/latex/pst-labo/pst-labo-docDE.pdf
-texmf-dist/doc/latex/pst-labo/pst-labo-docDE.tex
-texmf-dist/doc/latex/pst-labo/pst-labo-docEN.ltx
-texmf-dist/doc/latex/pst-labo/pst-labo-docEN.pdf
-texmf-dist/doc/latex/pst-labo/pst-labo-docEN.tex
-texmf-dist/doc/latex/pst-labo/pst-labo-docFR.ltx
-texmf-dist/doc/latex/pst-labo/pst-labo-docFR.pdf
-texmf-dist/doc/latex/pst-labo/pst-labo-docFR.tex
-texmf-dist/doc/latex/pst-labo/pst-labo.tex
-texmf-dist/doc/latex/pst-labo/pst-laboObj.tex
-texmf-dist/doc/latex/pst-labo/pstlabo8-tab1-DE.tex
-texmf-dist/doc/latex/pst-labo/pstlabo8-tab1-EN.tex
-texmf-dist/doc/latex/pst-labo/pstlabo8-tab1-FR.tex
+ <TPM:DocFiles size="3589679">
+texmf-dist/doc/generic/pst-labo/Changes
+texmf-dist/doc/generic/pst-labo/README
+texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib
+texmf-dist/doc/generic/pst-labo/pst-labo-docDE.ltx
+texmf-dist/doc/generic/pst-labo/pst-labo-docDE.pdf
+texmf-dist/doc/generic/pst-labo/pst-labo-docDE.tex
+texmf-dist/doc/generic/pst-labo/pst-labo-docEN.ltx
+texmf-dist/doc/generic/pst-labo/pst-labo-docEN.pdf
+texmf-dist/doc/generic/pst-labo/pst-labo-docEN.tex
+texmf-dist/doc/generic/pst-labo/pst-labo-docFR.ltx
+texmf-dist/doc/generic/pst-labo/pst-labo-docFR.pdf
+texmf-dist/doc/generic/pst-labo/pst-labo-docFR.tex
+texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-DE.tex
+texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-EN.tex
+texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-FR.tex
</TPM:DocFiles>
<TPM:Provides>Package/pst-labo</TPM:Provides>
</rdf:Description>
diff --git a/Master/texmf/lists/pst-labo b/Master/texmf/lists/pst-labo
index 0a05a419d55..e1bf55e1a79 100644
--- a/Master/texmf/lists/pst-labo
+++ b/Master/texmf/lists/pst-labo
@@ -1,21 +1,21 @@
-texmf-dist/doc/latex/pst-labo/Changes
-texmf-dist/doc/latex/pst-labo/README
-texmf-dist/doc/latex/pst-labo/pst-labo-docDE.ltx
-texmf-dist/doc/latex/pst-labo/pst-labo-docDE.pdf
-texmf-dist/doc/latex/pst-labo/pst-labo-docDE.tex
-texmf-dist/doc/latex/pst-labo/pst-labo-docEN.ltx
-texmf-dist/doc/latex/pst-labo/pst-labo-docEN.pdf
-texmf-dist/doc/latex/pst-labo/pst-labo-docEN.tex
-texmf-dist/doc/latex/pst-labo/pst-labo-docFR.ltx
-texmf-dist/doc/latex/pst-labo/pst-labo-docFR.pdf
-texmf-dist/doc/latex/pst-labo/pst-labo-docFR.tex
-texmf-dist/doc/latex/pst-labo/pst-labo.tex
-texmf-dist/doc/latex/pst-labo/pst-laboObj.tex
-texmf-dist/doc/latex/pst-labo/pstlabo8-tab1-DE.tex
-texmf-dist/doc/latex/pst-labo/pstlabo8-tab1-EN.tex
-texmf-dist/doc/latex/pst-labo/pstlabo8-tab1-FR.tex
+texmf-dist/doc/generic/pst-labo/Changes
+texmf-dist/doc/generic/pst-labo/README
+texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib
+texmf-dist/doc/generic/pst-labo/pst-labo-docDE.ltx
+texmf-dist/doc/generic/pst-labo/pst-labo-docDE.pdf
+texmf-dist/doc/generic/pst-labo/pst-labo-docDE.tex
+texmf-dist/doc/generic/pst-labo/pst-labo-docEN.ltx
+texmf-dist/doc/generic/pst-labo/pst-labo-docEN.pdf
+texmf-dist/doc/generic/pst-labo/pst-labo-docEN.tex
+texmf-dist/doc/generic/pst-labo/pst-labo-docFR.ltx
+texmf-dist/doc/generic/pst-labo/pst-labo-docFR.pdf
+texmf-dist/doc/generic/pst-labo/pst-labo-docFR.tex
+texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-DE.tex
+texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-EN.tex
+texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-FR.tex
-texmf-dist/bibtex/bib/pst-labo/pst-labo-doc.bib
+texmf-dist/tex/generic/pst-labo/pst-labo.tex
+texmf-dist/tex/generic/pst-labo/pst-laboObj.tex
texmf-dist/tex/latex/pst-labo/pst-labo.sty
texmf-dist/tpm/pst-labo.tpm