2016-07-08 17:24:00

2 files changed, 12 insertions, 12 deletions

diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index eacdb1b4e..178757a7d 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  : 07/07/16 23:58:34
+-- merge date  : 07/08/16 17:19:16
 
 do -- begin closure to overcome local limits and interference
 
diff --git a/tex/generic/context/luatex/luatex-mplib.lua b/tex/generic/context/luatex/luatex-mplib.lua
index fd6eb975c..976bb59f9 100644
--- a/tex/generic/context/luatex/luatex-mplib.lua
+++ b/tex/generic/context/luatex/luatex-mplib.lua
@@ -352,7 +352,7 @@ else
         return not (sx==1 and rx==0 and ry==0 and sy==1 and tx==0 and ty==0), t.width
     end
 
-    local function concat(px, py) -- no tx, ty here
+    local function concatinated(px, py) -- no tx, ty here
         return (sy*px-ry*py)/divider,(sx*py-rx*px)/divider
     end
 
@@ -401,29 +401,29 @@ else
         for i=1,#path do
             pth = path[i]
             if not ith then
-               pdf_literalcode("%f %f m",concat(pth.x_coord,pth.y_coord))
+               pdf_literalcode("%f %f m",concatinated(pth.x_coord,pth.y_coord))
             elseif curved(ith,pth) then
-                local a, b = concat(ith.right_x,ith.right_y)
-                local c, d = concat(pth.left_x,pth.left_y)
-                pdf_literalcode("%f %f %f %f %f %f c",a,b,c,d,concat(pth.x_coord, pth.y_coord))
+                local a, b = concatinated(ith.right_x,ith.right_y)
+                local c, d = concatinated(pth.left_x,pth.left_y)
+                pdf_literalcode("%f %f %f %f %f %f c",a,b,c,d,concatinated(pth.x_coord, pth.y_coord))
             else
-               pdf_literalcode("%f %f l",concat(pth.x_coord, pth.y_coord))
+               pdf_literalcode("%f %f l",concatinated(pth.x_coord, pth.y_coord))
             end
             ith = pth
         end
         if not open then
             local one = path[1]
             if curved(pth,one) then
-                local a, b = concat(pth.right_x,pth.right_y)
-                local c, d = concat(one.left_x,one.left_y)
-                pdf_literalcode("%f %f %f %f %f %f c",a,b,c,d,concat(one.x_coord, one.y_coord))
+                local a, b = concatinated(pth.right_x,pth.right_y)
+                local c, d = concatinated(one.left_x,one.left_y)
+                pdf_literalcode("%f %f %f %f %f %f c",a,b,c,d,concatinated(one.x_coord, one.y_coord))
             else
-                pdf_literalcode("%f %f l",concat(one.x_coord,one.y_coord))
+                pdf_literalcode("%f %f l",concatinated(one.x_coord,one.y_coord))
             end
         elseif #path == 1 then
             -- special case .. draw point
             local one = path[1]
-            pdf_literalcode("%f %f l",concat(one.x_coord,one.y_coord))
+            pdf_literalcode("%f %f l",concatinated(one.x_coord,one.y_coord))
         end
         return t
     end