diff options
Diffstat (limited to 'Master/texmf-dist/doc/latex/pst-cie/tex/pst-cie.tex')
-rw-r--r-- | Master/texmf-dist/doc/latex/pst-cie/tex/pst-cie.tex | 78 |
1 files changed, 48 insertions, 30 deletions
diff --git a/Master/texmf-dist/doc/latex/pst-cie/tex/pst-cie.tex b/Master/texmf-dist/doc/latex/pst-cie/tex/pst-cie.tex index 719b9890f6a..e875087e47c 100644 --- a/Master/texmf-dist/doc/latex/pst-cie/tex/pst-cie.tex +++ b/Master/texmf-dist/doc/latex/pst-cie/tex/pst-cie.tex @@ -23,8 +23,8 @@ \ifx\PSTnodesLoaded\endinput\else \input pst-node \fi %\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi % -\def\fileversion{1.02} -\def\filedate{2016/04/24} +\def\fileversion{1.04} +\def\filedate{2016/05/01} \message{`PST-cie' v\fileversion, \filedate\space (hv)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -40,7 +40,8 @@ \define@key[psset]{pst-cie}{Tfontsize}{\pst@getlength{#1}\psk@Tfontsize} \define@boolkey[psset]{pst-cie}[Pst@]{Planck}[true]{} \define@boolkey[psset]{pst-cie}[Pst@]{showcontour}[true]{} -\psset[pst-cie]{primaries,Planck=false,showcontour=false,Tfontsize=4pt} % primary illuminants +\psset[pst-cie]{primaries,Planck=false,showcontour=false,Tfontsize=4pt} +% primary illuminants % systems = Adobe, CIE, SMPTE, sRGB,Pal-Secam, NTSC % #1=type de reservation (action, object...) associee a une liste qui % doit forcement etre du type pst@cie@list@#1 @@ -77,35 +78,52 @@ % \def\psChromaticityDiagram{\def\pst@par{}\pst@object{psChromaticityDiagram}} \def\psChromaticityDiagram@i{% + \addbefore@par{PSfont=Helvetica-Bold,fontscale=5} \begin@SpecialObj %\pstVerb{\ifPst@primaries /primaries {true} def \else /primaries {false} def \fi}% \addto@pscode{ \ifPst@primaries /primaries {true} def \else /primaries {false} def \fi /gamma \psk@psCIE@GAM def - /contrast \psk@psCIE@contrast def + /contrast \psk@psCIE@contrast def /ColorSpace (\pst@cie@ColorSpace) def /datas (\pst@cie@datas) def -% }% -% \addto@pscode{ - /cie-bgcolor { \pst@usecolor\pst@psCIE@bgcolor } def - /cie-textcolor { \pst@usecolor\pst@psCIE@textcolor } def + /cie-bgcolor { \pst@usecolor\pst@psCIE@bgcolor } def + /cie-textcolor { \pst@usecolor\pst@psCIE@textcolor } def /cie-unit \pst@number\psunit 10 mul def + /cie-U \pst@number\psunit 28.45274 div def + /setFont { \psk@PSfont findfont \psk@fontscale scalefont setfont } bind def \txCIEdictBegin SCREEN {datas cvx exec} {ColorSpace cvx exec} gamma contrast traceGamut end }% - \ifPst@Planck\gdef\ps@next{\pstPlanck}\else\gdef\ps@next{}\fi% options are local + \ifPst@Planck\gdef\ps@next{\pstPlanck}\else\gdef\ps@next{}\fi% options are local \end@SpecialObj \ps@next }% +% \def\pstCIEcontour{\pst@object{pstCIEcontour}}% \def\pstCIEcontour@i{% - \begingroup - \addbefore@par{unit=10,linecolor=red}% - \use@par - \listplot{ - \txCIEdictBegin \ifx\pst@cie@datas\CIEdefaultYear CIEXYZ_1931_table \else CIEXYZ_1964_table \fi - tabxy end }% - \endgroup + \addbefore@par{PSfont=Helvetica-Bold,fontscale=5} + \begin@SpecialObj + \addto@pscode{ + \ifPst@primaries /primaries {true} def \else /primaries {false} def \fi + /gamma \psk@psCIE@GAM def + /contrast \psk@psCIE@contrast def + /ColorSpace (\pst@cie@ColorSpace) def + /datas (\pst@cie@datas) def + /cie-bgcolor { \pst@usecolor\pst@psCIE@bgcolor } def + /cie-textcolor { \pst@usecolor\pst@psCIE@textcolor } def + /cie-unit \pst@number\psunit 10 mul def + /cie-U cie-unit 28.45274 div def + /setFont { \psk@PSfont findfont \psk@fontscale scalefont setfont } bind def + \txCIEdictBegin {datas cvx exec} /TAB exch def ColorSpace cvx exec %/system exch def +% system + gsave primaries {CouleursPrimaires} if grestore + TAB contour stroke + contourTriangle stroke + end + }% + \end@SpecialObj } +% \txCIEdictBegin \ifx\pst@cie@datas\CIEdefaultYear CIEXYZ_1931_table \else CIEXYZ_1964_table \fi % \def\pstPlanck{\pst@object{pstPlanck}}% \def\pstPlanck@i{% @@ -114,21 +132,21 @@ \font\CMSS=cmss10 at \psk@Tfontsize pt \ifPst@showcontour\pstCIEcontour\fi % lieu des points blancs (Planckian locus) - \parametricplot[unit=10,plotpoints=3000]{1000}{500000}{ - \txCIEdictBegin t \ifx\pst@cie@datas\CIEdefaultYear CIEXYZ_1931_table \else CIEXYZ_1964_table \fi - BLKBOD Y X X Y Z end - add add /S ED S div exch S div }% - \parametricplot[unit=10,plotpoints=2,arrows=-|]{500000}{502000}{ - \txCIEdictBegin t \ifx\pst@cie@datas\CIEdefaultYear CIEXYZ_1931_table \else CIEXYZ_1964_table \fi - BLKBOD Y X X Y Z end - add add /S ED S div exch S div }% + \parametricplot[plotpoints=3000]{1000}{500000}{ + \txCIEdictBegin t \ifx\pst@cie@datas\CIEdefaultYear CIEXYZ_1931_table \else CIEXYZ_1964_table \fi + BLKBOD Y X X Y Z end + add add /S ED S div 10 mul exch S div 10 mul }% + \parametricplot[plotpoints=2,arrows=-|]{500000}{502000}{ + \txCIEdictBegin t \ifx\pst@cie@datas\CIEdefaultYear CIEXYZ_1931_table \else CIEXYZ_1964_table \fi + BLKBOD Y X X Y Z end + add add /S ED S div 10 mul exch S div 10 mul }% % point de concours des normales : R.Sève : physique de la couleur (.332,.186) %\psdot[linecolor=red](3.32,1.86) \pnode(3.320,1.858){O}% \psforeach{\iA}{5000,7000,8000,9000,11000,12000,13000}{% \pnode(! \txCIEdictBegin \iA\space \ifx\pst@cie@datas\CIEdefaultYear CIEXYZ_1931_table \else CIEXYZ_1964_table \fi - BLKBOD Y X X Y Z end + BLKBOD Y X X Y Z end add add /S ED S div 10 mul exch S div 10 mul){D\iA}% \psRelNode(O)(D\iA){0.96}{d0}\psRelNode(O)(D\iA){1.04}{d1}% @@ -136,18 +154,18 @@ }% \psforeach{\iA}{1500,2000,2500,3000,4000,6000,10000}{% \pnode(! - \txCIEdictBegin \iA\space + \txCIEdictBegin \iA\space \ifx\pst@cie@datas\CIEdefaultYear CIEXYZ_1931_table \else CIEXYZ_1964_table \fi - BLKBOD Y X X Y Z end + BLKBOD Y X X Y Z end add add /S ED S div 10 mul exch S div 10 mul){D\iA}% \psRelNode(O)(D\iA){1 3.2e-5 \iA\space mul sub}{d0}\psRelNode(O)(D\iA){1 3.2e-5 \iA\space mul add}{d1}% \pcline(d0)(d1)\ncput[npos=1.15]{\CMSS\iA}% }% \uput[-125](! - 1e5 + 1e5 \txCIEdictBegin \ifx\pst@cie@datas\CIEdefaultYear CIEXYZ_1931_table \else CIEXYZ_1964_table \fi - BLKBOD Y X X Y Z end + BLKBOD Y X X Y Z end add add /S ED S div 10 mul exch S div 10 mul){$\scriptstyle\infty$}% \endgroup @@ -155,4 +173,4 @@ % \catcode`\@=\PstAtCode\relax \endinput -%% END pst-cie.tex
\ No newline at end of file +%% END pst-cie.tex \def\pstCIEcontour{\pst@object{pstCIEcontour}}% |