diff options
Diffstat (limited to 'tex/context/interface/mkiv')
| -rw-r--r-- | tex/context/interface/mkiv/i-color.xml | 87 | ||||
| -rw-r--r-- | tex/context/interface/mkiv/i-common-value.xml | 23 | ||||
| -rw-r--r-- | tex/context/interface/mkiv/i-context.pdf | bin | 821565 -> 796268 bytes | |||
| -rw-r--r-- | tex/context/interface/mkiv/i-readme.pdf | bin | 60795 -> 60792 bytes |
4 files changed, 72 insertions, 38 deletions
diff --git a/tex/context/interface/mkiv/i-color.xml b/tex/context/interface/mkiv/i-color.xml index 157f56ea2..ffc9d338b 100644 --- a/tex/context/interface/mkiv/i-color.xml +++ b/tex/context/interface/mkiv/i-color.xml @@ -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"/> @@ -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"/> @@ -256,6 +257,18 @@ </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"/> diff --git a/tex/context/interface/mkiv/i-common-value.xml b/tex/context/interface/mkiv/i-common-value.xml index f111292b8..20079351f 100644 --- a/tex/context/interface/mkiv/i-common-value.xml +++ b/tex/context/interface/mkiv/i-common-value.xml @@ -11,6 +11,27 @@ <cd:constant type="cd:command"/> </cd:define> + <cd:define name="value-transparency"> + <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:define> + <!-- mathstyle = ... --> <cd:define name="value-mathstyle"> @@ -543,4 +564,4 @@ <cd:constant type="editor"/> </cd:define> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex 36e8d242e..ef3eda61d 100644 --- a/tex/context/interface/mkiv/i-context.pdf +++ b/tex/context/interface/mkiv/i-context.pdf diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex 06a6d30e9..1dc8b1bcd 100644 --- a/tex/context/interface/mkiv/i-readme.pdf +++ b/tex/context/interface/mkiv/i-readme.pdf |