summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/pst-cie/tex/pst-cie.tex
diff options
context:
space:
mode:
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.tex38
1 files changed, 26 insertions, 12 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 e875087e47c..1071fe21b4b 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.04}
-\def\filedate{2016/05/01}
+\def\fileversion{1.05}
+\def\filedate{2016/05/16}
\message{`PST-cie' v\fileversion, \filedate\space (hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -33,14 +33,16 @@
%
\define@key[psset]{pst-cie}{gamma}[2.2]{\def\psk@psCIE@GAM{#1 }}
\define@key[psset]{pst-cie}{contrast}[1]{\def\psk@psCIE@contrast{#1 }}
+\define@key[psset]{pst-cie}{chromaticityCoordinates}[xy]{\def\psk@psCIE@chromaticityCoordinates{#1}}
\define@key[psset]{pst-cie}{bgcolor}[black]{\pst@getcolor{#1}\pst@psCIE@bgcolor}
\define@key[psset]{pst-cie}{textcolor}[white]{\pst@getcolor{#1}\pst@psCIE@textcolor}
-\psset[pst-cie]{gamma=2.2,contrast=1,bgcolor=black,textcolor=white}
+\define@key[psset]{pst-cie}{trianglecolor}[black]{\pst@getcolor{#1}\pst@psCIE@trianglecolor}
+\psset[pst-cie]{gamma=2.2,contrast=1,bgcolor=black,textcolor=white,trianglecolor=black}
\define@boolkey[psset]{pst-cie}[Pst@]{primaries}[true]{}
\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}
+\psset[pst-cie]{primaries,Planck=false,showcontour=false,Tfontsize=4pt,chromaticityCoordinates={xy}}
% primary illuminants
% systems = Adobe, CIE, SMPTE, sRGB,Pal-Secam, NTSC
% #1=type de reservation (action, object...) associee a une liste qui
@@ -78,7 +80,6 @@
%
\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{
@@ -87,12 +88,13 @@
/contrast \psk@psCIE@contrast def
/ColorSpace (\pst@cie@ColorSpace) def
/datas (\pst@cie@datas) def
+ /chromaticityCoordinates (\psk@psCIE@chromaticityCoordinates) 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
+ \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
\end@SpecialObj
@@ -101,27 +103,39 @@
%
\def\pstCIEcontour{\pst@object{pstCIEcontour}}%
\def\pstCIEcontour@i{%
- \addbefore@par{PSfont=Helvetica-Bold,fontscale=5}
- \begin@SpecialObj
+ \begin@ClosedObj
\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
+ /chromaticityCoordinates (\psk@psCIE@chromaticityCoordinates) def
/cie-bgcolor { \pst@usecolor\pst@psCIE@bgcolor } def
/cie-textcolor { \pst@usecolor\pst@psCIE@textcolor } def
+ /cie-trianglecolor { \pst@usecolor\pst@psCIE@trianglecolor } 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
+ chromaticityCoordinates (xy) ne {/Tabuv [
+ 0 1 TAB length 1 sub {/i exch def
+ TAB i get /subarray exch def
+ /X subarray 0 get def /Y subarray 1 get def /Z 1 X sub Y sub def
+% [4 X mul X 15 Y mul add 3 Z mul add div % u
+% 6 Y mul X 15 Y mul add 3 Z mul add div] % v
+ [4 X mul X 15 Y mul add 3 Z mul add div % u'
+ 9 Y mul X 15 Y mul add 3 Z mul add div] % v'
+ } for
+ ] def
+ /TAB Tabuv def
+ } if
% system
gsave primaries {CouleursPrimaires} if grestore
TAB contour stroke
- contourTriangle stroke
+ contourTriangle cie-trianglecolor stroke
end
}%
- \end@SpecialObj
+ \end@ClosedObj
}
% \txCIEdictBegin \ifx\pst@cie@datas\CIEdefaultYear CIEXYZ_1931_table \else CIEXYZ_1964_table \fi
%