From 28f6ece66333fc35cf1ff4299d8c4a8e50bb03f4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 9 Nov 2023 22:19:57 +0000 Subject: pst-osci (5nov23) git-svn-id: svn://tug.org/texlive/trunk@68781 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/pst-osci/pst-osci.tex | 23 +++++++++++----------- Master/texmf-dist/tex/latex/pst-osci/pst-osci.sty | 5 +++-- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/generic/pst-osci/pst-osci.tex b/Master/texmf-dist/tex/generic/pst-osci/pst-osci.tex index 18185953838..a15bce643f7 100644 --- a/Master/texmf-dist/tex/generic/pst-osci/pst-osci.tex +++ b/Master/texmf-dist/tex/generic/pst-osci/pst-osci.tex @@ -15,7 +15,7 @@ %% DESCRIPTION: %% `pst-osci' is a PSTricks package to plot oscilloscope diagrams %% -%% AllColor=false (true par défaut) Raoul HATTERER +%% AllColor=false (true by default) Raoul HATTERER %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % \csname PSTOscilloLoaded\endcsname @@ -26,12 +26,12 @@ \ifx\MultidoLoaded\endinput\else\input multido.tex\fi \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi % hv -\def\fileversion{2.82}% modifié -\def\filedate{2005/10/17} +\def\fileversion{2.82b} +\def\filedate{2023/11/04} \message{`PST-osci' v\fileversion, \filedate\space (ML/CJ)} %%Last mod. by : Raoul HATTERER 2003/11/02 -%%Last mod. by : Herbert Voss 2005/11/07 +%%Last mod. by : Herbert Voss 2023/11/04 % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax \pst@addfams{pst-osci} @@ -43,15 +43,16 @@ \newrgbcolor{LightGray}{0.8 0.8 0.8} \newrgbcolor{VeryLightGray}{0.9 0.9 0.9} \newcmykcolor{PaleOrange}{0 0.2 0.4 0} -\newcmykcolor{LightBlue}{0.1 0 0 0} +%\newrgbcolor{LightBlue}{0.68 0.85 0.90} +\newrgbcolor{LightBlue}{0.975 0.975 1} \newrgbcolor{ACredA}{1 0 0} \newrgbcolor{ACgreenA}{0 1 0} \newrgbcolor{ACmagentaA}{1 0 1} \newrgbcolor{ACred}{0 0 0} -\newrgbcolor{ACgreen}{.25 .25 .25}% green or Darkgray +\newrgbcolor{ACgreen}{0 1 0}% green or Darkgray +%\newrgbcolor{ACgreen}{.25 .25 .25}% green or Darkgray \newrgbcolor{ACmagenta}{0 0 0}% magenta or black -% -% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \define@key[psset]{pst-osci}{period1}{\edef\psk@Oscillo@PeriodA{#1}} \define@key[psset]{pst-osci}{period2}{\edef\psk@Oscillo@PeriodB{#1}} @@ -228,10 +229,8 @@ e t AR2 mul neg exp mul SB div CC2 add} \pspicture(0,-5)(10,5) \psframe*[linecolor=LightBlue](0,-4)(10,4) \psgrid[gridlabels=0,subgriddiv=0](0,-4)(10,4) - \multido{\nxDiv=0+0.2}{50}{% - \psline(\nxDiv,-.1)(\nxDiv,0.1)} - \multido{\nyDiv=-4.0+0.2}{40}{% - \psline(4.9,\nyDiv)(5.1,\nyDiv)} + \multido{\nxDiv=0+0.2}{50}{\psline(\nxDiv,-.1)(\nxDiv,0.1)} + \multido{\nyDiv=-4.0+0.2}{40}{\psline(4.9,\nyDiv)(5.1,\nyDiv)} \psframe[fillcolor=VeryLightGray,fillstyle=solid,dimen=middle](0,4)(10,5) \rput(1.5,4.8){\ssf timeDiv :} \rput(1.5,4.3){\ssf\psk@Oscillo@TimeDiv{}ms/div} \rput(4,4.8){\ssf Channel A :} \rput(4,4.3){\ssf\psk@ChannelA{} V/div} diff --git a/Master/texmf-dist/tex/latex/pst-osci/pst-osci.sty b/Master/texmf-dist/tex/latex/pst-osci/pst-osci.sty index 8601ac17fba..9073bcc0cc7 100644 --- a/Master/texmf-dist/tex/latex/pst-osci/pst-osci.sty +++ b/Master/texmf-dist/tex/latex/pst-osci/pst-osci.sty @@ -1,6 +1,7 @@ -\RequirePackage{pstricks} -\ProvidesPackage{pst-osci}[2005/10/10 package wrapper for `pst-osci.tex'] +\ProvidesPackage{pst-osci}[2023/11/03 package wrapper for `pst-osci.tex'] % +\RequirePackage{pstricks} +%\RequirePackage{xcolor} \input{pst-osci.tex} \ProvidesFile{pst-osci.tex} [\filedate\space v\fileversion\space `pst-osci' (ML,CJ)] -- cgit v1.2.3