oberdiek (13may16)

git-svn-id: svn://tug.org/texlive/trunk@41097 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 27 insertions, 26 deletions

diff --git a/Master/texmf-dist/scripts/oberdiek/luacolor-pre065.lua b/Master/texmf-dist/scripts/oberdiek/luacolor-pre065.lua
index 5590cfe8fb4..f57aca97665 100644
--- a/Master/texmf-dist/scripts/oberdiek/luacolor-pre065.lua
+++ b/Master/texmf-dist/scripts/oberdiek/luacolor-pre065.lua
@@ -9,7 +9,7 @@
 --  This is a generated file.
 --  
 --  Project: luacolor
---  Version: 2011/11/01 v1.8
+--  Version: 2016/05/13 v1.9
 --  
 --  Copyright (C) 2007, 2009-2011 by
 --     Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -37,10 +37,10 @@
 --  
 module("oberdiek.luacolor", package.seeall)
 function getversion()
-  tex.write("2011/11/01 v1.8")
+  tex.write("2016/05/13 v1.9")
 end
 local ifpdf
-if tonumber(tex.pdfoutput) > 0 then
+if tonumber(tex.outputmode or tex.pdfoutput) > 0 then
   ifpdf = true
 else
   ifpdf = false
@@ -126,7 +126,7 @@ local node_types = {
   [node.id("whatsit")] = {
     [node.subtype("special")] = COLOR,
     [node.subtype("pdf_literal")] = COLOR,
-    [node.subtype("pdf_refximage")] = COLOR,
+-- TODO (DPC)    [node.subtype("pdf_refximage")] = COLOR,
   },
   [node.id("glue")] =
     function(n)
@@ -151,8 +151,8 @@ local function get_type(n)
 end
 local mode = 2 -- luatex.pdfliteral.direct
 local WHATSIT = node.id("whatsit")
-local SPECIAL = 3
-local PDFLITERAL = 8
+local SPECIAL = node.subtype("special")
+local PDFLITERAL = node.subtype("pdf_literal")
 local DRY_FALSE = false
 local DRY_TRUE = true
 local function traverse(list, color, dry)
diff --git a/Master/texmf-dist/scripts/oberdiek/luacolor.lua b/Master/texmf-dist/scripts/oberdiek/luacolor.lua
index f05a4a0bf8f..d7241a03379 100644
--- a/Master/texmf-dist/scripts/oberdiek/luacolor.lua
+++ b/Master/texmf-dist/scripts/oberdiek/luacolor.lua
@@ -9,7 +9,7 @@
 --  This is a generated file.
 --  
 --  Project: luacolor
---  Version: 2011/11/01 v1.8
+--  Version: 2016/05/13 v1.9
 --  
 --  Copyright (C) 2007, 2009-2011 by
 --     Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -37,10 +37,10 @@
 --  
 module("oberdiek.luacolor", package.seeall)
 function getversion()
-  tex.write("2011/11/01 v1.8")
+  tex.write("2016/05/13 v1.9")
 end
 local ifpdf
-if tonumber(tex.pdfoutput) > 0 then
+if tonumber(tex.outputmode or tex.pdfoutput) > 0 then
   ifpdf = true
 else
   ifpdf = false
@@ -126,7 +126,7 @@ local node_types = {
   [node.id("whatsit")] = {
     [node.subtype("special")] = COLOR,
     [node.subtype("pdf_literal")] = COLOR,
-    [node.subtype("pdf_refximage")] = COLOR,
+-- TODO (DPC)    [node.subtype("pdf_refximage")] = COLOR,
   },
   [node.id("glue")] =
     function(n)
@@ -151,8 +151,8 @@ local function get_type(n)
 end
 local mode = 2 -- luatex.pdfliteral.direct
 local WHATSIT = node.id("whatsit")
-local SPECIAL = 3
-local PDFLITERAL = 8
+local SPECIAL = node.subtype("special")
+local PDFLITERAL = node.subtype("pdf_literal")
 local DRY_FALSE = false
 local DRY_TRUE = true
 local function traverse(list, color, dry)
diff --git a/Master/texmf-dist/scripts/oberdiek/oberdiek.luacolor-pre065.lua b/Master/texmf-dist/scripts/oberdiek/oberdiek.luacolor-pre065.lua
index b999773c2ac..b04dcc6770e 100644
--- a/Master/texmf-dist/scripts/oberdiek/oberdiek.luacolor-pre065.lua
+++ b/Master/texmf-dist/scripts/oberdiek/oberdiek.luacolor-pre065.lua
@@ -9,7 +9,7 @@
 --  This is a generated file.
 --  
 --  Project: luacolor
---  Version: 2011/11/01 v1.8
+--  Version: 2016/05/13 v1.9
 --  
 --  Copyright (C) 2007, 2009-2011 by
 --     Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -37,10 +37,10 @@
 --  
 module("oberdiek.luacolor", package.seeall)
 function getversion()
-  tex.write("2011/11/01 v1.8")
+  tex.write("2016/05/13 v1.9")
 end
 local ifpdf
-if tonumber(tex.pdfoutput) > 0 then
+if tonumber(tex.outputmode or tex.pdfoutput) > 0 then
   ifpdf = true
 else
   ifpdf = false
@@ -126,7 +126,7 @@ local node_types = {
   [node.id("whatsit")] = {
     [node.subtype("special")] = COLOR,
     [node.subtype("pdf_literal")] = COLOR,
-    [node.subtype("pdf_refximage")] = COLOR,
+-- TODO (DPC)    [node.subtype("pdf_refximage")] = COLOR,
   },
   [node.id("glue")] =
     function(n)
@@ -151,8 +151,8 @@ local function get_type(n)
 end
 local mode = 2 -- luatex.pdfliteral.direct
 local WHATSIT = node.id("whatsit")
-local SPECIAL = 3
-local PDFLITERAL = 8
+local SPECIAL = node.subtype("special")
+local PDFLITERAL = node.subtype("pdf_literal")
 local DRY_FALSE = false
 local DRY_TRUE = true
 local function traverse(list, color, dry)
diff --git a/Master/texmf-dist/scripts/oberdiek/oberdiek.luacolor.lua b/Master/texmf-dist/scripts/oberdiek/oberdiek.luacolor.lua
index c7bf3deb8a9..39494a5ef6c 100644
--- a/Master/texmf-dist/scripts/oberdiek/oberdiek.luacolor.lua
+++ b/Master/texmf-dist/scripts/oberdiek/oberdiek.luacolor.lua
@@ -9,7 +9,7 @@
 --  This is a generated file.
 --  
 --  Project: luacolor
---  Version: 2011/11/01 v1.8
+--  Version: 2016/05/13 v1.9
 --  
 --  Copyright (C) 2007, 2009-2011 by
 --     Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -37,10 +37,10 @@
 --  
 module("oberdiek.luacolor", package.seeall)
 function getversion()
-  tex.write("2011/11/01 v1.8")
+  tex.write("2016/05/13 v1.9")
 end
 local ifpdf
-if tonumber(tex.pdfoutput) > 0 then
+if tonumber(tex.outputmode or tex.pdfoutput) > 0 then
   ifpdf = true
 else
   ifpdf = false
@@ -126,7 +126,7 @@ local node_types = {
   [node.id("whatsit")] = {
     [node.subtype("special")] = COLOR,
     [node.subtype("pdf_literal")] = COLOR,
-    [node.subtype("pdf_refximage")] = COLOR,
+-- TODO (DPC)    [node.subtype("pdf_refximage")] = COLOR,
   },
   [node.id("glue")] =
     function(n)
@@ -151,8 +151,8 @@ local function get_type(n)
 end
 local mode = 2 -- luatex.pdfliteral.direct
 local WHATSIT = node.id("whatsit")
-local SPECIAL = 3
-local PDFLITERAL = 8
+local SPECIAL = node.subtype("special")
+local PDFLITERAL = node.subtype("pdf_literal")
 local DRY_FALSE = false
 local DRY_TRUE = true
 local function traverse(list, color, dry)
diff --git a/Master/texmf-dist/scripts/oberdiek/oberdiek.pdftexcmds.lua b/Master/texmf-dist/scripts/oberdiek/oberdiek.pdftexcmds.lua
index 2ebf1179d98..f2855cc4513 100644
--- a/Master/texmf-dist/scripts/oberdiek/oberdiek.pdftexcmds.lua
+++ b/Master/texmf-dist/scripts/oberdiek/oberdiek.pdftexcmds.lua
@@ -9,7 +9,7 @@
 --  This is a generated file.
 --  
 --  Project: pdftexcmds
---  Version: 2011/11/29 v0.20
+--  Version: 2016/05/10 v0.21
 --  
 --  Copyright (C) 2007, 2009-2011 by
 --     Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -41,7 +41,7 @@
 module("oberdiek.pdftexcmds", package.seeall)
 local systemexitstatus
 function getversion()
-  tex.write("2011/11/29 v0.20")
+  tex.write("2016/05/10 v0.21")
 end
 function strcmp(A, B)
   if A == B then
@@ -150,6 +150,7 @@ function unescapehex(str, mode, patch)
     end
     result = utf8
   end
+  local unpack = _G["unpack"] or table.unpack
   tex.settoks(toks, string.char(unpack(result)))
 end
 function escapestring(str, mode)