5 files changed, 24 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/latex/regexpatch/README b/Master/texmf-dist/doc/latex/regexpatch/README
index d4d6bd8c100..98f08c55783 100644
--- a/Master/texmf-dist/doc/latex/regexpatch/README
+++ b/Master/texmf-dist/doc/latex/regexpatch/README
@@ -4,11 +4,11 @@ package and its sibling `xpatch' is that this package sports a very
 powerful `\regexpatchcmd' based on the `l3regex' module of LaTeX3
 experimental packages.
 
-This version fixes a few bugs in the management of success/failure
-code arguments.
+This version fixes a few bugs in the macros related to patching
+biblatex "bib macros" (`\xpatchbibmacro' and friends).
 
 
-This is version 0.1a of the package
+This is version 0.1b of the package
 
  Copyright 2012 Enrico Gregorio
 
@@ -42,5 +42,5 @@ o move "regexpatch.sty" to locations where LaTeX will find
   it (the FAQ on CTAN in /help/uktug-FAQ gives more
   information about this magic place
 
-2012/06/07
+2012/07/24
 Enrico Gregorio
diff --git a/Master/texmf-dist/doc/latex/regexpatch/regexpatch.pdf b/Master/texmf-dist/doc/latex/regexpatch/regexpatch.pdf
index ffcb7cb453e..5b663518125 100644
--- a/Master/texmf-dist/doc/latex/regexpatch/regexpatch.pdf
+++ b/Master/texmf-dist/doc/latex/regexpatch/regexpatch.pdf
diff --git a/Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx b/Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx
index b886de5f228..0d09d90aa1b 100644
--- a/Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx
+++ b/Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx
@@ -25,7 +25,7 @@
 \newcommand{\sv}{[\texttt{*}]}
 %</driver>
 %<*driver|package>
-\GetIdInfo$Id: regexpatch.dtx 0.1a 2012-06-07 12:00:00Z Enrico $
+\GetIdInfo$Id: regexpatch.dtx 0.1b 2012-07-24 12:00:00Z Enrico $
           {Extending etoolbox patching commands}
 %</driver|package>
 %<*driver>
@@ -55,6 +55,7 @@
 %
 % \maketitle
 %
+% \changes{v0.1b}{2012/07/24}{Fixed bugs in the `bibmacro' functions}
 % \changes{v0.1a}{2012/06/07}{Fixed bugs in success/failure code}
 % \changes{v0.1}{2012-04-15}{First public release}
 % \begin{documentation}
@@ -1076,37 +1077,37 @@
       \group_end:
      }
   }
-\NewDocumentCommand{\xpretobibmacro} { m m m }
+\NewDocumentCommand{\xpretobibmacro} { m }
   {
    \xpatch_main:NNc \xpatch_pretocmd:Nnnn \use_none:nn
      { abx@macro@ \tl_to_str:n {#1} }
   }
-\NewDocumentCommand{\xapptobibmacro} { m m m }
+\NewDocumentCommand{\xapptobibmacro} { m }
   {
    \xpatch_main:NNc \xpatch_apptocmd:Nnnn \use_none:nn
      { abx@macro@ \tl_to_str:n {#1} }
   }
-\NewDocumentCommand{\xpatchbibmacro} { s m m m }
+\NewDocumentCommand{\xpatchbibmacro} { s m }
   {
    \IfBooleanTF{#1}
      {
-      \xpatch_main:NcN \xpatch_patchcmd_all:Nnnnn \use_none:nnn
+      \xpatch_main:NNc \xpatch_patchcmd_all:Nnnnn \use_none:nnn
         { abx@macro@ \tl_to_str:n {#2} }
      }
      {
-      \xpatch_main:NcN \xpatch_patchcmd_once:Nnnnn \use_none:nnn
+      \xpatch_main:NNc \xpatch_patchcmd_once:Nnnnn \use_none:nnn
        { abx@macro@ \tl_to_str:n {#2} }
      }
   }
-\NewDocumentCommand{\regexpatchbibmacro} { s m m m }
+\NewDocumentCommand{\regexpatchbibmacro} { s m }
   {
    \IfBooleanTF{#1}
      {
-      \xpatch_main:NcN \xpatch_regexpatchcmd_all:Nnnnn \use_none:nnn
+      \xpatch_main:NNc \xpatch_regexpatchcmd_all:Nnnnn \use_none:nnn
         { abx@macro@ \tl_to_str:n {#2} }
      }
      {
-      \xpatch_main:NcN \xpatch_regexpatchcmd_once:Nnnnn \use_none:nnn
+      \xpatch_main:NNc \xpatch_regexpatchcmd_once:Nnnnn \use_none:nnn
         { abx@macro@ \tl_to_str:n {#2} }
      }
   }
diff --git a/Master/texmf-dist/tex/latex/regexpatch/regexpatch.sty b/Master/texmf-dist/tex/latex/regexpatch/regexpatch.sty
index 511e44ddd58..b6b65c512b4 100644
--- a/Master/texmf-dist/tex/latex/regexpatch/regexpatch.sty
+++ b/Master/texmf-dist/tex/latex/regexpatch/regexpatch.sty
@@ -24,7 +24,7 @@
 %% The released version of this bundle is available from CTAN.
 %%
 \RequirePackage{expl3}
-\GetIdInfo$Id: regexpatch.dtx 0.1a 2012-06-07 12:00:00Z Enrico $
+\GetIdInfo$Id: regexpatch.dtx 0.1b 2012-07-24 12:00:00Z Enrico $
           {Extending etoolbox patching commands}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -392,37 +392,37 @@
       \group_end:
      }
   }
-\NewDocumentCommand{\xpretobibmacro} { m m m }
+\NewDocumentCommand{\xpretobibmacro} { m }
   {
    \xpatch_main:NNc \xpatch_pretocmd:Nnnn \use_none:nn
      { abx@macro@ \tl_to_str:n {#1} }
   }
-\NewDocumentCommand{\xapptobibmacro} { m m m }
+\NewDocumentCommand{\xapptobibmacro} { m }
   {
    \xpatch_main:NNc \xpatch_apptocmd:Nnnn \use_none:nn
      { abx@macro@ \tl_to_str:n {#1} }
   }
-\NewDocumentCommand{\xpatchbibmacro} { s m m m }
+\NewDocumentCommand{\xpatchbibmacro} { s m }
   {
    \IfBooleanTF{#1}
      {
-      \xpatch_main:NcN \xpatch_patchcmd_all:Nnnnn \use_none:nnn
+      \xpatch_main:NNc \xpatch_patchcmd_all:Nnnnn \use_none:nnn
         { abx@macro@ \tl_to_str:n {#2} }
      }
      {
-      \xpatch_main:NcN \xpatch_patchcmd_once:Nnnnn \use_none:nnn
+      \xpatch_main:NNc \xpatch_patchcmd_once:Nnnnn \use_none:nnn
        { abx@macro@ \tl_to_str:n {#2} }
      }
   }
-\NewDocumentCommand{\regexpatchbibmacro} { s m m m }
+\NewDocumentCommand{\regexpatchbibmacro} { s m }
   {
    \IfBooleanTF{#1}
      {
-      \xpatch_main:NcN \xpatch_regexpatchcmd_all:Nnnnn \use_none:nnn
+      \xpatch_main:NNc \xpatch_regexpatchcmd_all:Nnnnn \use_none:nnn
         { abx@macro@ \tl_to_str:n {#2} }
      }
      {
-      \xpatch_main:NcN \xpatch_regexpatchcmd_once:Nnnnn \use_none:nnn
+      \xpatch_main:NNc \xpatch_regexpatchcmd_once:Nnnnn \use_none:nnn
         { abx@macro@ \tl_to_str:n {#2} }
      }
   }
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index a1b71240ef0..767d5192c32 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -208,6 +208,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'china2e',	"die 'skipping, too complicated, sorry'",
  'chitex',	"die 'skipping, nonfree'",
  'chklref',	"die 'skipping, needs configure, etc.'",
+ 'chktex',	"die 'skipping, merge into Build'",
  'chngpage',	"die 'skipping, use changepage'",
  'circle',	"die 'skipping, noinfo license, author unfindable'",
  'circuit_macros', "die 'skipping, needs m4'",