oberdiek (1may12)

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

9 files changed, 96 insertions, 42 deletions

diff --git a/Master/texmf-dist/scripts/oberdiek/luacolor-pre065.lua b/Master/texmf-dist/scripts/oberdiek/luacolor-pre065.lua
index c564241b311..5590cfe8fb4 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/04/23 v1.6
+--  Version: 2011/11/01 v1.8
 --  
 --  Copyright (C) 2007, 2009-2011 by
 --     Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -37,7 +37,7 @@
 --  
 module("oberdiek.luacolor", package.seeall)
 function getversion()
-  tex.write("2011/04/23 v1.6")
+  tex.write("2011/11/01 v1.8")
 end
 local ifpdf
 if tonumber(tex.pdfoutput) > 0 then
@@ -75,7 +75,7 @@ function dvidetect()
   local v = tex.box[0]
   assert(v.id == node.id("hlist"))
   for v in node.traverse_id(node.id("whatsit"), v.list) do
-    if v and v.subtype == 3 then -- special
+    if v and v.subtype == node.subtype("special") then
       local data = v.data
       for pattern, driver in pairs(patterns) do
         if string.find(data, pattern) then
@@ -94,6 +94,9 @@ local map = {
   n = 0,
 }
 function get(color)
+  tex.write("" .. getvalue(color))
+end
+function getvalue(color)
   local n = map[color]
   if not n then
     n = map.n + 1
@@ -101,12 +104,15 @@ function get(color)
     map[n] = color
     map[color] = n
   end
-  tex.write("" .. n)
+  return n
 end
 local attribute
 function setattribute(attr)
   attribute = attr
 end
+function getattribute()
+  return attribute
+end
 local LIST = 1
 local LIST_LEADERS = 2
 local COLOR = 3
@@ -118,9 +124,9 @@ local node_types = {
   [node.id("glyph")] = COLOR,
   [node.id("disc")]  = COLOR,
   [node.id("whatsit")] = {
-    [3] = COLOR, -- special
-    [8] = COLOR, -- pdf_literal
-    [14] = COLOR, -- pdf_refximage
+    [node.subtype("special")] = COLOR,
+    [node.subtype("pdf_literal")] = COLOR,
+    [node.subtype("pdf_refximage")] = COLOR,
   },
   [node.id("glue")] =
     function(n)
diff --git a/Master/texmf-dist/scripts/oberdiek/luacolor.lua b/Master/texmf-dist/scripts/oberdiek/luacolor.lua
index 073eceb613d..f05a4a0bf8f 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/04/23 v1.6
+--  Version: 2011/11/01 v1.8
 --  
 --  Copyright (C) 2007, 2009-2011 by
 --     Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -37,7 +37,7 @@
 --  
 module("oberdiek.luacolor", package.seeall)
 function getversion()
-  tex.write("2011/04/23 v1.6")
+  tex.write("2011/11/01 v1.8")
 end
 local ifpdf
 if tonumber(tex.pdfoutput) > 0 then
@@ -75,7 +75,7 @@ function dvidetect()
   local v = tex.box[0]
   assert(v.id == node.id("hlist"))
   for v in node.traverse_id(node.id("whatsit"), v.head) do
-    if v and v.subtype == 3 then -- special
+    if v and v.subtype == node.subtype("special") then
       local data = v.data
       for pattern, driver in pairs(patterns) do
         if string.find(data, pattern) then
@@ -94,6 +94,9 @@ local map = {
   n = 0,
 }
 function get(color)
+  tex.write("" .. getvalue(color))
+end
+function getvalue(color)
   local n = map[color]
   if not n then
     n = map.n + 1
@@ -101,12 +104,15 @@ function get(color)
     map[n] = color
     map[color] = n
   end
-  tex.write("" .. n)
+  return n
 end
 local attribute
 function setattribute(attr)
   attribute = attr
 end
+function getattribute()
+  return attribute
+end
 local LIST = 1
 local LIST_LEADERS = 2
 local COLOR = 3
@@ -118,9 +124,9 @@ local node_types = {
   [node.id("glyph")] = COLOR,
   [node.id("disc")]  = COLOR,
   [node.id("whatsit")] = {
-    [3] = COLOR, -- special
-    [8] = COLOR, -- pdf_literal
-    [14] = COLOR, -- pdf_refximage
+    [node.subtype("special")] = COLOR,
+    [node.subtype("pdf_literal")] = COLOR,
+    [node.subtype("pdf_refximage")] = COLOR,
   },
   [node.id("glue")] =
     function(n)
diff --git a/Master/texmf-dist/scripts/oberdiek/magicnum.lua b/Master/texmf-dist/scripts/oberdiek/magicnum.lua
index cdbe6db7155..c96af570e70 100644
--- a/Master/texmf-dist/scripts/oberdiek/magicnum.lua
+++ b/Master/texmf-dist/scripts/oberdiek/magicnum.lua
@@ -11,7 +11,7 @@
 --  Project: magicnum
 --  Version: 2011/04/10 v1.4
 --  
---  Copyright (C) 2007, 2009, 2010, 2011 by
+--  Copyright (C) 2007, 2009-2011 by
 --     Heiko Oberdiek <heiko.oberdiek at googlemail.com>
 --  
 --  This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/scripts/oberdiek/oberdiek.luacolor-pre065.lua b/Master/texmf-dist/scripts/oberdiek/oberdiek.luacolor-pre065.lua
index 2377911fbdf..b999773c2ac 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/04/23 v1.6
+--  Version: 2011/11/01 v1.8
 --  
 --  Copyright (C) 2007, 2009-2011 by
 --     Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -37,7 +37,7 @@
 --  
 module("oberdiek.luacolor", package.seeall)
 function getversion()
-  tex.write("2011/04/23 v1.6")
+  tex.write("2011/11/01 v1.8")
 end
 local ifpdf
 if tonumber(tex.pdfoutput) > 0 then
@@ -75,7 +75,7 @@ function dvidetect()
   local v = tex.box[0]
   assert(v.id == node.id("hlist"))
   for v in node.traverse_id(node.id("whatsit"), v.list) do
-    if v and v.subtype == 3 then -- special
+    if v and v.subtype == node.subtype("special") then
       local data = v.data
       for pattern, driver in pairs(patterns) do
         if string.find(data, pattern) then
@@ -94,6 +94,9 @@ local map = {
   n = 0,
 }
 function get(color)
+  tex.write("" .. getvalue(color))
+end
+function getvalue(color)
   local n = map[color]
   if not n then
     n = map.n + 1
@@ -101,12 +104,15 @@ function get(color)
     map[n] = color
     map[color] = n
   end
-  tex.write("" .. n)
+  return n
 end
 local attribute
 function setattribute(attr)
   attribute = attr
 end
+function getattribute()
+  return attribute
+end
 local LIST = 1
 local LIST_LEADERS = 2
 local COLOR = 3
@@ -118,9 +124,9 @@ local node_types = {
   [node.id("glyph")] = COLOR,
   [node.id("disc")]  = COLOR,
   [node.id("whatsit")] = {
-    [3] = COLOR, -- special
-    [8] = COLOR, -- pdf_literal
-    [14] = COLOR, -- pdf_refximage
+    [node.subtype("special")] = COLOR,
+    [node.subtype("pdf_literal")] = COLOR,
+    [node.subtype("pdf_refximage")] = COLOR,
   },
   [node.id("glue")] =
     function(n)
diff --git a/Master/texmf-dist/scripts/oberdiek/oberdiek.luacolor.lua b/Master/texmf-dist/scripts/oberdiek/oberdiek.luacolor.lua
index b251322d45d..c7bf3deb8a9 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/04/23 v1.6
+--  Version: 2011/11/01 v1.8
 --  
 --  Copyright (C) 2007, 2009-2011 by
 --     Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -37,7 +37,7 @@
 --  
 module("oberdiek.luacolor", package.seeall)
 function getversion()
-  tex.write("2011/04/23 v1.6")
+  tex.write("2011/11/01 v1.8")
 end
 local ifpdf
 if tonumber(tex.pdfoutput) > 0 then
@@ -75,7 +75,7 @@ function dvidetect()
   local v = tex.box[0]
   assert(v.id == node.id("hlist"))
   for v in node.traverse_id(node.id("whatsit"), v.head) do
-    if v and v.subtype == 3 then -- special
+    if v and v.subtype == node.subtype("special") then
       local data = v.data
       for pattern, driver in pairs(patterns) do
         if string.find(data, pattern) then
@@ -94,6 +94,9 @@ local map = {
   n = 0,
 }
 function get(color)
+  tex.write("" .. getvalue(color))
+end
+function getvalue(color)
   local n = map[color]
   if not n then
     n = map.n + 1
@@ -101,12 +104,15 @@ function get(color)
     map[n] = color
     map[color] = n
   end
-  tex.write("" .. n)
+  return n
 end
 local attribute
 function setattribute(attr)
   attribute = attr
 end
+function getattribute()
+  return attribute
+end
 local LIST = 1
 local LIST_LEADERS = 2
 local COLOR = 3
@@ -118,9 +124,9 @@ local node_types = {
   [node.id("glyph")] = COLOR,
   [node.id("disc")]  = COLOR,
   [node.id("whatsit")] = {
-    [3] = COLOR, -- special
-    [8] = COLOR, -- pdf_literal
-    [14] = COLOR, -- pdf_refximage
+    [node.subtype("special")] = COLOR,
+    [node.subtype("pdf_literal")] = COLOR,
+    [node.subtype("pdf_refximage")] = COLOR,
   },
   [node.id("glue")] =
     function(n)
diff --git a/Master/texmf-dist/scripts/oberdiek/oberdiek.magicnum.lua b/Master/texmf-dist/scripts/oberdiek/oberdiek.magicnum.lua
index 904356bb468..a9672f478ec 100644
--- a/Master/texmf-dist/scripts/oberdiek/oberdiek.magicnum.lua
+++ b/Master/texmf-dist/scripts/oberdiek/oberdiek.magicnum.lua
@@ -11,7 +11,7 @@
 --  Project: magicnum
 --  Version: 2011/04/10 v1.4
 --  
---  Copyright (C) 2007, 2009, 2010, 2011 by
+--  Copyright (C) 2007, 2009-2011 by
 --     Heiko Oberdiek <heiko.oberdiek at googlemail.com>
 --  
 --  This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/scripts/oberdiek/oberdiek.pdftexcmds.lua b/Master/texmf-dist/scripts/oberdiek/oberdiek.pdftexcmds.lua
index 3fb036e8f53..2ebf1179d98 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/04/22 v0.16
+--  Version: 2011/11/29 v0.20
 --  
 --  Copyright (C) 2007, 2009-2011 by
 --     Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -34,14 +34,14 @@
 --  This work consists of the main source file pdftexcmds.dtx
 --  and the derived files
 --     pdftexcmds.sty, pdftexcmds.pdf, pdftexcmds.ins, pdftexcmds.drv,
---     pdftexcmds-test1.tex, pdftexcmds-test2.tex,
+--     pdftexcmds.bib, pdftexcmds-test1.tex, pdftexcmds-test2.tex,
 --     pdftexcmds-test-shell.tex, pdftexcmds-test-escape.tex,
 --     oberdiek.pdftexcmds.lua, pdftexcmds.lua.
 --  
 module("oberdiek.pdftexcmds", package.seeall)
 local systemexitstatus
 function getversion()
-  tex.write("2011/04/22 v0.16")
+  tex.write("2011/11/29 v0.20")
 end
 function strcmp(A, B)
   if A == B then
@@ -272,6 +272,17 @@ function filemdfivesum(filename)
     end
   end
 end
+local basetime = 0
+function resettimer()
+  basetime = os.clock()
+end
+function elapsedtime()
+  local val = (os.clock() - basetime) * 65536 + .5
+  if val > 2147483647 then
+    val = 2147483647
+  end
+  tex.write(string.format("%d", val))
+end
 function shellescape()
   if os.execute then
     if status
diff --git a/Master/texmf-dist/scripts/oberdiek/pdfatfi.pl b/Master/texmf-dist/scripts/oberdiek/pdfatfi.pl
index cd93fa66ddb..d2d2c284692 100755
--- a/Master/texmf-dist/scripts/oberdiek/pdfatfi.pl
+++ b/Master/texmf-dist/scripts/oberdiek/pdfatfi.pl
@@ -4,7 +4,7 @@ $^W=1; # turn warning on
 #
 # pdfatfi.pl
 #
-# Copyright (C) 2005-2010 Heiko Oberdiek.
+# Copyright (C) 2005-2010, 2012 Heiko Oberdiek.
 #
 # This work may be distributed and/or modified under the
 # conditions of the LaTeX Project Public License, either
@@ -26,17 +26,19 @@ $^W=1; # turn warning on
 # This file "pdfatfi.pl" may be renamed to "pdfatfi"
 # for installation purposes.
 #
-my $file        = "pdfatfi.pl";
+my $prj         = 'pdfatfi';
+my $file        = "$prj.pl";
 my $program     = uc($&) if $file =~ /^\w+/;
-my $version     = "2.6";
-my $date        = "2010/09/27";
+my $version     = "2.7";
+my $date        = "2012/04/18";
 my $author      = "Heiko Oberdiek";
-my $copyright   = "Copyright (c) 2005-2010 by $author.";
+my $copyright   = "Copyright (c) 2005-2010, 2012 by $author.";
 #
 # History:
 #   2005/05/21 v1.0: First release.
 #   2006/08/16 v2.2: Included in DTX file of attachfile2.dtx.
 #   2010/09/27 v2.6: Keys ModDateTZ and CreationDateTZ added.
+#   2012/04/18 v2.7: Option --version added.
 #
 
 use POSIX qw(strftime); # %z is used (GNU)
@@ -57,12 +59,14 @@ $::opt_help       = 0;
 $::opt_quiet      = 0;
 $::opt_debug      = 0;
 $::opt_verbose    = 0;
+$::opt_version    = 0;
 
 my $usage = <<"END_OF_USAGE";
 ${title}Syntax:   \L$program\E [options] <file[.atfi]>
 Function: Help program for LaTeX package "attachfile2".
 Options:                                    (defaults:)
   --help          print usage
+  --version       print version number
   --(no)quiet     suppress messages         ($bool[$::opt_quiet])
   --(no)verbose   verbose printing          ($bool[$::opt_verbose])
   --(no)debug     debug informations        ($bool[$::opt_debug])
@@ -73,11 +77,16 @@ my @OrgArgv = @ARGV;
 use Getopt::Long;
 GetOptions(
   "help!",
+  "version!",
   "quiet!",
   "debug!",
   "verbose!",
 ) or die $usage;
 !$::opt_help or die $usage;
+if ($::opt_version) {
+    print "$prj $date v$version\n";
+    exit(0);
+}
 @ARGV == 1 or die "$usage$Error Missing jobname!\n";
 
 $::opt_quiet = 0 if $::opt_verbose;
@@ -204,4 +213,3 @@ rename $tmpfile, $atfifile
 print "*** ready. ***\n" unless $::opt_quiet;
 
 __END__
-
diff --git a/Master/texmf-dist/scripts/oberdiek/pdftexcmds.lua b/Master/texmf-dist/scripts/oberdiek/pdftexcmds.lua
index 02570a68902..0bee48a1cc6 100644
--- a/Master/texmf-dist/scripts/oberdiek/pdftexcmds.lua
+++ b/Master/texmf-dist/scripts/oberdiek/pdftexcmds.lua
@@ -9,7 +9,7 @@
 --  This is a generated file.
 --  
 --  Project: pdftexcmds
---  Version: 2011/04/22 v0.16
+--  Version: 2011/11/29 v0.20
 --  
 --  Copyright (C) 2007, 2009-2011 by
 --     Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -34,14 +34,14 @@
 --  This work consists of the main source file pdftexcmds.dtx
 --  and the derived files
 --     pdftexcmds.sty, pdftexcmds.pdf, pdftexcmds.ins, pdftexcmds.drv,
---     pdftexcmds-test1.tex, pdftexcmds-test2.tex,
+--     pdftexcmds.bib, pdftexcmds-test1.tex, pdftexcmds-test2.tex,
 --     pdftexcmds-test-shell.tex, pdftexcmds-test-escape.tex,
 --     oberdiek.pdftexcmds.lua, pdftexcmds.lua.
 --  
 module("oberdiek.pdftexcmds", package.seeall)
 local systemexitstatus
 function getversion()
-  tex.write("2011/04/22 v0.16")
+  tex.write("2011/11/29 v0.20")
 end
 function strcmp(A, B)
   if A == B then
@@ -272,6 +272,17 @@ function filemdfivesum(filename)
     end
   end
 end
+local basetime = 0
+function resettimer()
+  basetime = os.clock()
+end
+function elapsedtime()
+  local val = (os.clock() - basetime) * 65536 + .5
+  if val > 2147483647 then
+    val = 2147483647
+  end
+  tex.write(string.format("%d", val))
+end
 function shellescape()
   if os.execute then
     if status