From 236690a6367b25187d37013e1e7fc196c5c44eb8 Mon Sep 17 00:00:00 2001
From: Context Git Mirror Bot <phg42.2a@gmail.com>
Date: Sat, 24 Sep 2016 13:11:46 +0200
Subject: 2016-09-24 12:45:00

---
 tex/generic/context/luatex/luatex-fonts-merged.lua | 56 ++++++++++++++--------
 1 file changed, 35 insertions(+), 21 deletions(-)

(limited to 'tex/generic')

diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index c0b459689..c93d2b104 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 09/23/16 10:13:56
+-- merge date  : 09/24/16 12:40:11
 
 do -- begin closure to overcome local limits and interference
 
@@ -23273,8 +23273,6 @@ local tostring,next,format=tostring,next,string.format
 local round,max=math.round,math.round
 local formatters=string.formatters
 local tounicode=fonts.mappings.tounicode
-local graytorgb=attributes.colors.graytorgb
-local cmyktorgb=attributes.colors.cmyktorgb
 local otf=fonts.handlers.otf
 local f_color=formatters["pdf:direct:%f %f %f rg"]
 local f_gray=formatters["pdf:direct:%f g"]
@@ -23298,27 +23296,43 @@ else
   end
 end
 local sharedpalettes={}
-function otf.registerpalette(name,values)
-  sharedpalettes[name]=values
-  for i=1,#values do
-    local v=values[i]
-    local r,g,b
-    local s=v.s
-    if s then
-      r,g,b=graytorgb(s)
-    else
-      local c,m,y,k=v.c,v.m,v.y,v.k
-      if c or m or y or k then
-        r,g,b=cmyktorgb(c or 0,m or 0,y or 0,k or 0)
+if context then
+  local graytorgb=attributes.colors.graytorgb
+  local cmyktorgb=attributes.colors.cmyktorgb
+  function otf.registerpalette(name,values)
+    sharedpalettes[name]=values
+    for i=1,#values do
+      local v=values[i]
+      local r,g,b
+      local s=v.s
+      if s then
+        r,g,b=graytorgb(s)
       else
-        r,g,b=v.r,v.g,v.b
+        local c,m,y,k=v.c,v.m,v.y,v.k
+        if c or m or y or k then
+          r,g,b=cmyktorgb(c or 0,m or 0,y or 0,k or 0)
+        else
+          r,g,b=v.r,v.g,v.b
+        end
       end
+      values[i]={
+        max(r and round(r*255) or 0,255),
+        max(g and round(g*255) or 0,255),
+        max(b and round(b*255) or 0,255)
+      }
+    end
+  end
+else 
+  function otf.registerpalette(name,values)
+    sharedpalettes[name]=values
+    for i=1,#values do
+      local v=values[i]
+      values[i]={
+        max(round((v.r or 0)*255),255),
+        max(round((v.g or 0)*255),255),
+        max(round((v.b or 0)*255),255)
+      }
     end
-    values[i]={
-      max(r and round(r*255) or 0,255),
-      max(g and round(g*255) or 0,255),
-      max(b and round(b*255) or 0,255)
-    }
   end
 end
 local function initializecolr(tfmdata,kind,value) 
-- 
cgit v1.2.3