9 files changed, 37 insertions, 31 deletions
diff --git a/Master/texmf-dist/doc/latex/regstats/README b/Master/texmf-dist/doc/latex/regstats/README
index 448055d631d..f5021dabd37 100644
--- a/Master/texmf-dist/doc/latex/regstats/README
+++ b/Master/texmf-dist/doc/latex/regstats/README
@@ -1,4 +1,4 @@
-README for regstats package, 2012/01/01, v1.0g
+README for regstats package, 2012/01/07, v1.0h
 
 
 TABLE OF CONTENTS
diff --git a/Master/texmf-dist/doc/latex/regstats/regstats-example.log b/Master/texmf-dist/doc/latex/regstats/regstats-example.log
index 1a325c51087..34bc48e7d0e 100644
--- a/Master/texmf-dist/doc/latex/regstats/regstats-example.log
+++ b/Master/texmf-dist/doc/latex/regstats/regstats-example.log
@@ -1,4 +1,4 @@
-This is pdfTeX, Version 3.1415926-2.3-1.40.12 (Web2C 2011) (format=pdflatex 2011.11.11)  1 JAN 2012 13:39
+This is pdfTeX, Version 3.1415926-2.3-1.40.12 (Web2C 2011) (format=pdflatex 2011.11.11)  7 JAN 2012 12:06
 entering extended mode
  restricted \write18 enabled.
  %&-line parsing enabled.
@@ -150,7 +150,7 @@ Package uniquecounter Info: New unique counter `rerunfilecheck' on input line 2
 \Hy@SectionHShift=\skip43
 )
 (./regstats.sty
-Package: regstats 2012/01/01 v1.0g Counting used registers (HMM)
+Package: regstats 2012/01/07 v1.0h Counting used registers (HMM)
 Package regstats Info: This package will not use registers itself,
 (regstats)             but packages used by this package
 (regstats)             (and packages loaded by those packages)
@@ -264,7 +264,7 @@ hyperref.cfg    2002/06/06 v1.2 hyperref configuration of TeXLive
      url.sty    2006/04/12 v3.3 Verb mode for urls, etc.
  hpdftex.def    2011/12/04 v6.82m Hyperref driver for pdfTeX
 rerunfilecheck.sty    2011/04/15 v1.7 Rerun checks for auxiliary files (HO)
-regstats.sty    2012/01/01 v1.0g Counting used registers (HMM)
+regstats.sty    2012/01/07 v1.0h Counting used registers (HMM)
  nameref.sty    2010/04/30 v2.40 Cross-referencing by name of section
 gettitlestring.sty    2010/12/03 v1.4 Cleanup title references (HO)
 regstats-example.out
@@ -302,7 +302,7 @@ Here is how much of TeX's registers you used
  0 insertions out of 101, left: 101
 
 Time elapsed for the last compiler run:
-about 0:00 (m:ss; 26607/65536 s).
+about 0:00 (m:ss; 25559/65536 s).
  ) 
 Here is how much of TeX's memory you used:
  4107 strings out of 493629
@@ -318,7 +318,7 @@ xmf-dist/fonts/type1/public/amsfonts/cm/cmr10.pfb><s:/TeXlive2011/texmf-dist/fo
 nts/type1/public/amsfonts/cm/cmr7.pfb><s:/TeXlive2011/texmf-dist/fonts/type1/pu
 blic/amsfonts/cm/cmss10.pfb><s:/TeXlive2011/texmf-dist/fonts/type1/public/amsfo
 nts/cm/cmtt10.pfb>
-Output written on regstats-example.pdf (1 page, 66827 bytes).
+Output written on regstats-example.pdf (1 page, 66974 bytes).
 PDF statistics:
  38 PDF objects out of 1000 (max. 8388607)
  28 compressed objects within 1 object stream
diff --git a/Master/texmf-dist/doc/latex/regstats/regstats-example.pdf b/Master/texmf-dist/doc/latex/regstats/regstats-example.pdf
index a1902192236..f7909773da1 100644
--- a/Master/texmf-dist/doc/latex/regstats/regstats-example.pdf
+++ b/Master/texmf-dist/doc/latex/regstats/regstats-example.pdf
diff --git a/Master/texmf-dist/doc/latex/regstats/regstats-example.tex b/Master/texmf-dist/doc/latex/regstats/regstats-example.tex
index cc26f04ef90..e3363358851 100644
--- a/Master/texmf-dist/doc/latex/regstats/regstats-example.tex
+++ b/Master/texmf-dist/doc/latex/regstats/regstats-example.tex
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: regstats
-%% Version: 2012/01/01 v1.0g
+%% Version: 2012/01/07 v1.0h
 %% 
 %% Copyright (C) 2011 - 2012 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -63,8 +63,8 @@
  pdfstartview=Fit,%
  pdfpagelayout=SinglePage%
 ]{hyperref}[2011/12/04]% v6.82m
-\usepackage[proof=false,left=true,timer=true]{regstats}[2012/01/01]%
-%%                                                              v1.0g
+\usepackage[proof=false,left=true,timer=true]{regstats}[2012/01/07]%
+%%                                                              v1.0h
 \gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}%
 \makeatletter
 \@ifundefined{eTeX}{\gdef\eTeX{$\m@th \varepsilon $-\TeX }}{%
@@ -77,7 +77,7 @@
 \section*{Example for regstats}
 
 This example demonstrates the use of package\newline
-\textsf{regstats}, v1.0g as of 2012/01/01 (HMM).\newline
+\textsf{regstats}, v1.0h as of 2012/01/07 (HMM).\newline
 The used options were \texttt{proof=false,left=true,timer=true}.\newline
 \texttt{proof=false} is the default, but neither \texttt{left=true}
 nor \texttt{timer=true} are defaults (\texttt{left=false,timer=false}
diff --git a/Master/texmf-dist/doc/latex/regstats/regstats.pdf b/Master/texmf-dist/doc/latex/regstats/regstats.pdf
index 996c3866d78..2cfc3203f1f 100644
--- a/Master/texmf-dist/doc/latex/regstats/regstats.pdf
+++ b/Master/texmf-dist/doc/latex/regstats/regstats.pdf
diff --git a/Master/texmf-dist/source/latex/regstats/regstats.drv b/Master/texmf-dist/source/latex/regstats/regstats.drv
index 77ab6366163..07aa2095bfb 100644
--- a/Master/texmf-dist/source/latex/regstats/regstats.drv
+++ b/Master/texmf-dist/source/latex/regstats/regstats.drv
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: regstats
-%% Version: 2012/01/01 v1.0g
+%% Version: 2012/01/07 v1.0h
 %% 
 %% Copyright (C) 2011 - 2012 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -42,7 +42,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2011/06/27]
 \ProvidesFile{regstats.drv}%
-  [2012/01/01 v1.0g Counting used registers (HMM)]
+  [2012/01/07 v1.0h Counting used registers (HMM)]
 \documentclass{ltxdoc}[2007/11/11]% v2.0u
 \usepackage{pdflscape}[2008/08/11]% v0.10
 \usepackage{holtxdoc}[2011/02/04]%  v0.21
diff --git a/Master/texmf-dist/source/latex/regstats/regstats.dtx b/Master/texmf-dist/source/latex/regstats/regstats.dtx
index 16111a26f80..903f08ab3d3 100644
--- a/Master/texmf-dist/source/latex/regstats/regstats.dtx
+++ b/Master/texmf-dist/source/latex/regstats/regstats.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % File: regstats.dtx
-% Version: 2012/01/01 v1.0g
+% Version: 2012/01/07 v1.0h
 %
 % Copyright (C) 2011 - 2012 by
 %    H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -86,7 +86,7 @@
 \input docstrip.tex
 \Msg{********************************************************************}
 \Msg{* Installation                                                     *}
-\Msg{* Package: regstats 2012/01/01 v1.0g Counting used registers (HMM) *}
+\Msg{* Package: regstats 2012/01/07 v1.0h Counting used registers (HMM) *}
 \Msg{********************************************************************}
 
 \keepsilent
@@ -98,7 +98,7 @@
 This is a generated file.
 
 Project: regstats
-Version: 2012/01/01 v1.0g
+Version: 2012/01/07 v1.0h
 
 Copyright (C) 2011 - 2012 by
     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -184,7 +184,7 @@ the README, and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}[2011/06/27]
 \ProvidesFile{regstats.drv}%
-  [2012/01/01 v1.0g Counting used registers (HMM)]
+  [2012/01/07 v1.0h Counting used registers (HMM)]
 \documentclass{ltxdoc}[2007/11/11]% v2.0u
 \usepackage{pdflscape}[2008/08/11]% v0.10
 \usepackage{holtxdoc}[2011/02/04]%  v0.21
@@ -276,7 +276,7 @@ the README, and the derived files
 % \DoNotIndex{\regstats@test}
 %
 % \title{The \xpackage{regstats} package}
-% \date{2012/01/01 v1.0g}
+% \date{2012/01/07 v1.0h}
 % \author{H.-Martin M\"{u}nch\\\xemail{Martin.Muench at Uni-Bonn.de}}
 %
 % \maketitle
@@ -425,8 +425,8 @@ the README, and the derived files
  pdfstartview=Fit,%
  pdfpagelayout=SinglePage%
 ]{hyperref}[2011/12/04]% v6.82m
-\usepackage[proof=false,left=true,timer=true]{regstats}[2012/01/01]%
-%%                                                              v1.0g
+\usepackage[proof=false,left=true,timer=true]{regstats}[2012/01/07]%
+%%                                                              v1.0h
 \gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}%
 \makeatletter
 \@ifundefined{eTeX}{\gdef\eTeX{$\m@th \varepsilon $-\TeX }}{%
@@ -439,7 +439,7 @@ the README, and the derived files
 \section*{Example for regstats}
 
 This example demonstrates the use of package\newline
-\textsf{regstats}, v1.0g as of 2012/01/01 (HMM).\newline
+\textsf{regstats}, v1.0h as of 2012/01/07 (HMM).\newline
 The used options were \texttt{proof=false,left=true,timer=true}.\newline
 \texttt{proof=false} is the default, but neither \texttt{left=true}
 nor \texttt{timer=true} are defaults (\texttt{left=false,timer=false}
@@ -481,7 +481,7 @@ option \texttt{timer} is not demonstrated very spectacular.
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[2011/06/27]
-\ProvidesPackage{regstats}[2012/01/01 v1.0g
+\ProvidesPackage{regstats}[2012/01/07 v1.0h
               Counting used registers (HMM)]
 
 %    \end{macrocode}
@@ -560,7 +560,6 @@ option \texttt{timer} is not demonstrated very spectacular.
   \RequirePackage{ifpdf}[2011/01/30]%    v2.3
 \fi
 
-\ifregstats@timer
 \newcommand{\regst@ts@timer}{%
   \message{^^J}
   \ifluatex
@@ -616,8 +615,10 @@ option \texttt{timer} is not demonstrated very spectacular.
       (m:ss; \regstatselapsedtime /65536 s).^^J}
   \fi
   }
+
+\ifregstats@timer
 \else
-\newcommand{\regst@ts@timer}{\relax}
+\renewcommand{\regst@ts@timer}{\relax}
 \fi
 
 \let\regst@ts@statistics\AtVeryVeryEnd%
@@ -1045,7 +1046,7 @@ option \texttt{timer} is not demonstrated very spectacular.
 % \item[-] class \xpackage{article}, 2007/10/19, v1.4h, from \xpackage{classes.dtx}:\\
 %           \CTAN{macros/latex/base/classes.dtx}
 %
-% \item[-] package \xpackage{regstats}, 2012/01/01, v1.0g,
+% \item[-] package \xpackage{regstats}, 2012/01/07, v1.0h,
 %           \url{http://ctan.org/pkg/regstats}\\
 %   (Well, it is the example file for this package, and because you are reading the
 %    documentation for the \xpackage{regstats} package, it can be assumed that you already
@@ -1333,6 +1334,10 @@ option \texttt{timer} is not demonstrated very spectacular.
 %             introduced.
 %     \item Quite some additional changes in the \xfile{dtx} and README files.
 %   \end{Version}
+%   \begin{Version}{2012/01/07 v1.0h}
+%     \item Bug fix: |\ifluatex| undefined without \xpackage{ifluatex} leads to wrong
+%            association of |\else|\ldots|\fi|. Fixed by moving |\ifregstats@timer|.
+%   \end{Version}
 % \end{History}
 %
 % \bigskip
diff --git a/Master/texmf-dist/source/latex/regstats/regstats.ins b/Master/texmf-dist/source/latex/regstats/regstats.ins
index cff84767497..c8afb86d871 100644
--- a/Master/texmf-dist/source/latex/regstats/regstats.ins
+++ b/Master/texmf-dist/source/latex/regstats/regstats.ins
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: regstats
-%% Version: 2012/01/01 v1.0g
+%% Version: 2012/01/07 v1.0h
 %% 
 %% Copyright (C) 2011 - 2012 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -43,7 +43,7 @@
 \input docstrip.tex
 \Msg{********************************************************************}
 \Msg{* Installation                                                     *}
-\Msg{* Package: regstats 2012/01/01 v1.0g Counting used registers (HMM) *}
+\Msg{* Package: regstats 2012/01/07 v1.0h Counting used registers (HMM) *}
 \Msg{********************************************************************}
 
 \keepsilent
@@ -55,7 +55,7 @@
 This is a generated file.
 
 Project: regstats
-Version: 2012/01/01 v1.0g
+Version: 2012/01/07 v1.0h
 
 Copyright (C) 2011 - 2012 by
     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
diff --git a/Master/texmf-dist/tex/latex/regstats/regstats.sty b/Master/texmf-dist/tex/latex/regstats/regstats.sty
index b729d234c0b..1d585979964 100644
--- a/Master/texmf-dist/tex/latex/regstats/regstats.sty
+++ b/Master/texmf-dist/tex/latex/regstats/regstats.sty
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: regstats
-%% Version: 2012/01/01 v1.0g
+%% Version: 2012/01/07 v1.0h
 %% 
 %% Copyright (C) 2011 - 2012 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -41,7 +41,7 @@
 %%    regstats-example.log.
 %% 
 \NeedsTeXFormat{LaTeX2e}[2011/06/27]
-\ProvidesPackage{regstats}[2012/01/01 v1.0g
+\ProvidesPackage{regstats}[2012/01/07 v1.0h
               Counting used registers (HMM)]
 
 %% Allows to count the number of used registers
@@ -89,7 +89,6 @@
   \RequirePackage{ifpdf}[2011/01/30]%    v2.3
 \fi
 
-\ifregstats@timer
 \newcommand{\regst@ts@timer}{%
   \message{^^J}
   \ifluatex
@@ -140,8 +139,10 @@
       (m:ss; \regstatselapsedtime /65536 s).^^J}
   \fi
   }
+
+\ifregstats@timer
 \else
-\newcommand{\regst@ts@timer}{\relax}
+\renewcommand{\regst@ts@timer}{\relax}
 \fi
 
 \let\regst@ts@statistics\AtVeryVeryEnd%