From fb7ada71d4660b83b9e047eb4105554f2f36127f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 20 Jan 2011 00:15:35 +0000 Subject: register 1.6 (19jan11) git-svn-id: svn://tug.org/texlive/trunk@21127 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/register/register.pdf | Bin 154557 -> 187312 bytes .../texmf-dist/source/latex/register/register.dtx | 13 ++++++++----- Master/texmf-dist/tex/latex/register/register.sty | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Master/texmf-dist/doc/latex/register/register.pdf b/Master/texmf-dist/doc/latex/register/register.pdf index 33f15a32092..7d0df274d75 100644 Binary files a/Master/texmf-dist/doc/latex/register/register.pdf and b/Master/texmf-dist/doc/latex/register/register.pdf differ diff --git a/Master/texmf-dist/source/latex/register/register.dtx b/Master/texmf-dist/source/latex/register/register.dtx index 2d8f3131b03..5d66e87a1ce 100644 --- a/Master/texmf-dist/source/latex/register/register.dtx +++ b/Master/texmf-dist/source/latex/register/register.dtx @@ -20,7 +20,7 @@ \ProvidesFile{register.dtx} % % \fi -% \CheckSum{589} +% \CheckSum{593} % % \changes{v0.1}{1999/03/29}{First release} % \changes{v0.2}{2000/01/29}{Added regdesc environment, for use under LyX} @@ -38,9 +38,10 @@ % \changes{v1.3}{2003/11/24}{Changed how center is handled within register environment} % \changes{v1.4}{2004/08/16}{Now provide a boolean set only in register context} % \changes{v1.5}{2007/03/08}{Corrected use of conditionals used in spreading register reset value} +% \changes{v1.6}{2011/01/11}{Mainmatter correction suggested by Kjetil Oftedal} % -% \def\fileversion{v1.5} -% \def\filedate{2007/03/08} +% \def\fileversion{v1.6} +% \def\filedate{2011/01/11} % \title{Register diagrams with field descriptions} % \author{Matthew Lovell\\ % \texttt{lovell@indra.com} @@ -498,7 +499,7 @@ % % Announce the name and load required packages: % \begin{macrocode} -\ProvidesPackage{register} [2007/03/08 v1.5 Register macros with +\ProvidesPackage{register} [2011/01/11 v1.6 Register macros with hyperref/LyX support] \RequirePackage{ifthen}[1997/11/02] @@ -992,8 +993,10 @@ hyperref/LyX support] % % The |\chapter| command, if present, is also redefined in order % to get identical chapter-related spacing in the list of registers -% as appears in the LoF and LoT. +% as appears in the LoF and LoT. Kjetil Oftedal provided a fix +% wherein we test that @mainmatter is defined prior to using it. % \begin{macrocode} +\@ifundefined{@mainmatter}{\newif\if@mainmatter \@mainmattertrue}{} \@ifundefined{chapter}{} {% Adjust chapter definition slightly for Regfloats \def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne diff --git a/Master/texmf-dist/tex/latex/register/register.sty b/Master/texmf-dist/tex/latex/register/register.sty index 3e1755abd56..7c3b5721834 100644 --- a/Master/texmf-dist/tex/latex/register/register.sty +++ b/Master/texmf-dist/tex/latex/register/register.sty @@ -16,7 +16,7 @@ -\ProvidesPackage{register} [2007/03/08 v1.5 Register macros with +\ProvidesPackage{register} [2011/01/11 v1.6 Register macros with hyperref/LyX support] \RequirePackage{ifthen}[1997/11/02] @@ -279,6 +279,7 @@ hyperref/LyX support] \addcontentsline{toc}{chapter}{List of Registers}% \@starttoc{\@nameuse{ext@Regfloat}}}} \newcommand\l@Regfloat{\@dottedtocline{1}{1.5em}{2.3em}} +\@ifundefined{@mainmatter}{\newif\if@mainmatter \@mainmattertrue}{} \@ifundefined{chapter}{} {% Adjust chapter definition slightly for Regfloats \def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne -- cgit v1.2.3