luatexbase (2oct15)

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

8 files changed, 30 insertions, 16 deletions

diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty
index ac46ebea69f..d511a7199c7 100644
--- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty
+++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty
@@ -4,7 +4,7 @@
   #1#2[#3]{\endgroup\immediate\write-1{Package: #1 #3}}
 \fi
 \ProvidesPackage{luatexbase-attr}
-[2015/10/01 v1.0
+[2015/10/02 v1.1
   luatexbase interface to LuaTeX (legacy subpackage)
 ]
 \ifx\RequirePackage\undefined
diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty
index 098c6442667..a677bf5d025 100644
--- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty
+++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty
@@ -4,7 +4,7 @@
   #1#2[#3]{\endgroup\immediate\write-1{Package: #1 #3}}
 \fi
 \ProvidesPackage{luatexbase-cctb}
-[2015/10/01 v1.0
+[2015/10/02 v1.1
   luatexbase interface to LuaTeX (legacy subpackage)
 ]
 \ifx\RequirePackage\undefined
diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty
index 42fe852fc12..2423d5dd5ec 100644
--- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty
+++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty
@@ -4,7 +4,7 @@
   #1#2[#3]{\endgroup\immediate\write-1{Package: #1 #3}}
 \fi
 \ProvidesPackage{luatexbase-compat}
-[2015/10/01 v1.0
+[2015/10/02 v1.1
   luatexbase interface to LuaTeX (legacy subpackage)
 ]
 \ifx\RequirePackage\undefined
diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty
index 0f58870b475..f02f10d868b 100644
--- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty
+++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty
@@ -4,7 +4,7 @@
   #1#2[#3]{\endgroup\immediate\write-1{Package: #1 #3}}
 \fi
 \ProvidesPackage{luatexbase-loader}
-[2015/10/01 v1.0
+[2015/10/02 v1.1
   luatexbase interface to LuaTeX (legacy subpackage)
 ]
 \ifx\RequirePackage\undefined
diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-mcb.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-mcb.sty
index 5defd977263..45a44b22d61 100644
--- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-mcb.sty
+++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-mcb.sty
@@ -4,7 +4,7 @@
   #1#2[#3]{\endgroup\immediate\write-1{Package: #1 #3}}
 \fi
 \ProvidesPackage{luatexbase-mcb}
-[2015/10/01 v1.0
+[2015/10/02 v1.1
   luatexbase interface to LuaTeX (legacy subpackage)
 ]
 \ifx\RequirePackage\undefined
diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-modutils.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-modutils.sty
index cd6cb4d0e6c..908dc1fe983 100644
--- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-modutils.sty
+++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-modutils.sty
@@ -4,7 +4,7 @@
   #1#2[#3]{\endgroup\immediate\write-1{Package: #1 #3}}
 \fi
 \ProvidesPackage{luatexbase-modutils}
-[2015/10/01 v1.0
+[2015/10/02 v1.1
   luatexbase interface to LuaTeX (legacy subpackage)
 ]
 \ifx\RequirePackage\undefined
diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-regs.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-regs.sty
index 53e03cc877d..7e0207c20ec 100644
--- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-regs.sty
+++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-regs.sty
@@ -4,7 +4,7 @@
   #1#2[#3]{\endgroup\immediate\write-1{Package: #1 #3}}
 \fi
 \ProvidesPackage{luatexbase-regs}
-[2015/10/01 v1.0
+[2015/10/02 v1.1
   luatexbase interface to LuaTeX (legacy subpackage)
 ]
 \ifx\RequirePackage\undefined
diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty
index bc985aab9ab..8581588df51 100644
--- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty
+++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty
@@ -5,7 +5,7 @@
   #1#2[#3]{\endgroup\immediate\write-1{Package: #1 #3}}
 \fi
 \ProvidesPackage{luatexbase}
-[2015/10/01 v1.0
+[2015/10/02 v1.1
   luatexbase interface to LuaTeX
 ]
 \edef\emuatcatcode{\the\catcode`\@}
@@ -62,15 +62,29 @@ function luatexbase.reset_callback(name,make_false)
 end
 luatexbase.base_add_to_callback=luatexbase.add_to_callback
 function luatexbase.add_to_callback(name,fun,description,priority)
-if(luatexbase.callbacktypes[name] == 3 and
-   priority == 1 and
-   \string#luatexbase.callback_descriptions(name)==1) then
-  luatexbase.module_warning("luatexbase",
-                            "resetting exclusive callback: " .. name)
-  luatexbase.reset_callback(name)
-end
-return
+  local priority= priority
+  if priority==nil then
+   priority=\string#luatexbase.callback_descriptions(name)+1
+  end
+  if(luatexbase.callbacktypes[name] == 3 and
+     priority == 1 and
+     \string#luatexbase.callback_descriptions(name)==1) then
+    luatexbase.module_warning("luatexbase",
+                              "resetting exclusive callback: " .. name)
+    luatexbase.reset_callback(name)
+  end
+  local saved_callback={},ff,dd
+  for k,v in pairs(luatexbase.callback_descriptions(name)) do
+    if k >= priority then
+      ff,dd= luatexbase.remove_from_callback(name, v)
+      saved_callback[k]={ff,dd}
+    end
+  end
   luatexbase.base_add_to_callback(name,fun,description)
+  for k,v in pairs(saved_callback) do
+    luatexbase.base_add_to_callback(name,v[1],v[2])
+  end
+  return
 end
 luatexbase.catcodetables=setmetatable(
  {['latex-package'] = \number\CatcodeTableLaTeXAtLetter,