diff options
| author | Hans Hagen <pragma@wxs.nl> | 2011-05-18 22:26:00 +0200 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2011-05-18 22:26:00 +0200 |
| commit | 819217701ac4baf8b6099c8f8475ae22597454d4 (patch) | |
| tree | 126d2efce6812cb8d8bd2f564e2699b9b2a77b5f /tex/context/base/colo-ini.lua | |
| parent | 1a4587e7d792561d779de21e88eb424539085090 (diff) | |
| download | context-819217701ac4baf8b6099c8f8475ae22597454d4.tar.gz | |
beta 2011.05.18 22:26
Diffstat (limited to 'tex/context/base/colo-ini.lua')
| -rw-r--r-- | tex/context/base/colo-ini.lua | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/tex/context/base/colo-ini.lua b/tex/context/base/colo-ini.lua index c4e802ff5..7e0a4ac76 100644 --- a/tex/context/base/colo-ini.lua +++ b/tex/context/base/colo-ini.lua @@ -445,7 +445,7 @@ function colors.mpcolor(model,ca,ta,default) -- will move to mlib-col elseif model == 4 then return format("transparent(%s,%s,cmyk(%s,%s,%s,%s))",tv[1],tv[2],cv[6],cv[7],cv[8],cv[9]) else - return format("transparent(%s,%s,multitonecolor(\"%s\",%s,\"%s\",\"%s\"))",tv[1],tv[2],cv[10],cv[11],cv[12],cv[13]) + return format('transparent(%s,%s,multitonecolor("%s",%s,"%s","%s"))',tv[1],tv[2],cv[10],cv[11],cv[12],cv[13]) end else if model == 2 then @@ -455,7 +455,7 @@ function colors.mpcolor(model,ca,ta,default) -- will move to mlib-col elseif model == 4 then return format("cmyk(%s,%s,%s,%s)",cv[6],cv[7],cv[8],cv[9]) else - return format("multitonecolor(\"%s\",%s,\"%s\",\"%s\")",cv[10],cv[11],cv[12],cv[13]) + return format('multitonecolor("%s",%s,"%s","%s")',cv[10],cv[11],cv[12],cv[13]) end end else @@ -464,6 +464,41 @@ function colors.mpcolor(model,ca,ta,default) -- will move to mlib-col end end +--~ function colors.mpcolor(model,ca,ta,default) -- will move to mlib-col +--~ local cv = colors.supported and colors.value(ca) -- faster when direct colors.values[ca] +--~ if cv then +--~ local tv = transparencies.supported and transparencies.value(ta) +--~ if model == 1 then +--~ model = cv[1] +--~ end +--~ model = forcedmodel(model) +--~ if tv then +--~ if model == 2 then +--~ return format("(%s,%s,%s) withtransparency (%s,%s)",tv[1],tv[2],cv[3],cv[4],cv[5]) +--~ elseif model == 3 then +--~ return format("(%s,%s,%s) withtransparency (%s,%s)",tv[1],tv[2],cv[3],cv[4],cv[5]) +--~ elseif model == 4 then +--~ return format("(%s,%s,%s,%s) withtransparency(%s,%s)",tv[1],tv[2],cv[6],cv[7],cv[8],cv[9]) +--~ else +--~ return format('multitonecolor("%s",%s,"%s","%s") withtransparency (%s,%s)',tv[1],tv[2],cv[10],cv[11],cv[12],cv[13]) +--~ end +--~ else +--~ if model == 2 then +--~ return format("(%s,%s,%s)",cv[3],cv[4],cv[5]) +--~ elseif model == 3 then +--~ return format("(%s,%s,%s)",cv[3],cv[4],cv[5]) +--~ elseif model == 4 then +--~ return format("cmyk(%s,%s,%s,%s)",cv[6],cv[7],cv[8],cv[9]) +--~ else +--~ return format('multitonecolor("%s",%s,"%s","%s")',cv[10],cv[11],cv[12],cv[13]) +--~ end +--~ end +--~ else +--~ default = default or 0 -- rgb ! +--~ return format("(%s,%s,%s)",default,default,default) +--~ end +--~ end + function colors.formatcolor(ca,separator) local cv = colors.value(ca) if cv then |