diff options
Diffstat (limited to 'tex/context/interface/mkiv/i-color.xml')
| -rw-r--r-- | tex/context/interface/mkiv/i-color.xml | 113 |
1 files changed, 63 insertions, 50 deletions
diff --git a/tex/context/interface/mkiv/i-color.xml b/tex/context/interface/mkiv/i-color.xml index 3f98914e4..4168216a9 100644 --- a/tex/context/interface/mkiv/i-color.xml +++ b/tex/context/interface/mkiv/i-color.xml @@ -39,7 +39,7 @@ </cd:arguments> </cd:command> - <cd:command name="definecolor" variant="1" file="colo-ini.mkiv"> + <cd:command name="definecolor" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -77,24 +77,7 @@ <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="a"> - <cd:constant type="cd:number"/> - <cd:constant type="none"/> - <cd:constant type="normal"/> - <cd:constant type="multiply"/> - <cd:constant type="screen"/> - <cd:constant type="overlay"/> - <cd:constant type="softlight"/> - <cd:constant type="hardlight"/> - <cd:constant type="colordodge"/> - <cd:constant type="colorburn"/> - <cd:constant type="darken"/> - <cd:constant type="lighten"/> - <cd:constant type="difference"/> - <cd:constant type="exclusion"/> - <cd:constant type="hue"/> - <cd:constant type="saturation"/> - <cd:constant type="color"/> - <cd:constant type="luminosity"/> + <cd:resolve name="value-transparency"/> </cd:parameter> <cd:parameter name="t"> <cd:constant type="cd:number"/> @@ -103,14 +86,14 @@ </cd:arguments> </cd:command> - <cd:command name="definecolor" variant="2" file="colo-ini.mkiv"> + <cd:command name="definecolor" variant="name" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="defineglobalcolor" variant="1" file="colo-ini.mkiv"> + <cd:command name="defineglobalcolor" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -119,14 +102,14 @@ </cd:arguments> </cd:command> - <cd:command name="defineglobalcolor" variant="2" file="colo-ini.mkiv"> + <cd:command name="defineglobalcolor" variant="name" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="definenamedcolor" variant="1" file="colo-ini.mkiv"> + <cd:command name="definenamedcolor" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -135,7 +118,7 @@ </cd:arguments> </cd:command> - <cd:command name="definenamedcolor" variant="2" file="colo-ini.mkiv"> + <cd:command name="definenamedcolor" variant="name" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-color"/> @@ -158,24 +141,7 @@ <cd:resolve name="keyword-color"/> <cd:assignments list="yes"> <cd:parameter name="a"> - <cd:constant type="cd:number"/> - <cd:constant type="none"/> - <cd:constant type="normal"/> - <cd:constant type="multiply"/> - <cd:constant type="screen"/> - <cd:constant type="overlay"/> - <cd:constant type="softlight"/> - <cd:constant type="hardlight"/> - <cd:constant type="colordodge"/> - <cd:constant type="colorburn"/> - <cd:constant type="darken"/> - <cd:constant type="lighten"/> - <cd:constant type="difference"/> - <cd:constant type="exclusion"/> - <cd:constant type="hue"/> - <cd:constant type="saturation"/> - <cd:constant type="color"/> - <cd:constant type="luminosity"/> + <cd:resolve name="value-transparency"/> </cd:parameter> <cd:parameter name="t"> <cd:constant type="cd:number"/> @@ -207,13 +173,34 @@ </cd:arguments> </cd:command> - <cd:command name="definetransparency" file="colo-ini.mkiv"> + <cd:command name="definetransparency" variant="1" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> + <cd:command name="definetransparency" variant="2" file="colo-ini.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:assignments list="yes"> + <cd:parameter name="a"> + <cd:resolve name="value-transparency"/> + </cd:parameter> + <cd:parameter name="t"> + <cd:constant type="cd:number"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="definetransparency" variant="3" file="colo-ini.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> + <cd:command name="switchtocolor" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> @@ -227,6 +214,20 @@ </cd:arguments> </cd:command> + <cd:command name="coloronly" file="colo-ini.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-color"/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="transparent" file="colo-ini.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-color"/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command name="graycolor" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> @@ -234,14 +235,14 @@ </cd:arguments> </cd:command> - <cd:command name="colored" variant="1" file="colo-ini.mkiv"> + <cd:command name="colored" variant="name" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="colored" variant="2" file="colo-ini.mkiv"> + <cd:command name="colored" file="colo-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="definecolor"/> @@ -256,19 +257,31 @@ </cd:arguments> </cd:command> + <cd:command name="coloronly" type="environment" file="colo-ini.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-color"/> + </cd:arguments> + </cd:command> + + <cd:command name="transparent" type="environment" file="colo-ini.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-color"/> + </cd:arguments> + </cd:command> + <cd:command name="directcolor" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="directcolored" variant="1" file="colo-ini.mkiv"> + <cd:command name="directcolored" variant="name" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="directcolored" variant="2" file="colo-ini.mkiv"> + <cd:command name="directcolored" file="colo-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="definecolor"/> @@ -353,7 +366,7 @@ <cd:command name="color" type="environment" begin="save" end="restore" file="colo-ini.mkiv"/> - <cd:command name="definepalet" variant="1" file="colo-ini.mkiv"> + <cd:command name="definepalet" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -364,7 +377,7 @@ </cd:arguments> </cd:command> - <cd:command name="definepalet" variant="2" file="colo-ini.mkiv"> + <cd:command name="definepalet" variant="name" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -594,4 +607,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> |