From 4534b7761399644b12ee2446c134bacebf4bdfda Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 22 Mar 2020 20:50:14 +0000 Subject: register (22mar20) git-svn-id: svn://tug.org/texlive/trunk@54485 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/register/register.sty | 37 +++++++++++++++-------- 1 file changed, 25 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/register/register.sty b/Master/texmf-dist/tex/latex/register/register.sty index 1f1500a1d89..15c42b02771 100644 --- a/Master/texmf-dist/tex/latex/register/register.sty +++ b/Master/texmf-dist/tex/latex/register/register.sty @@ -22,7 +22,7 @@ -\ProvidesPackage{register} [2019/01/01 v1.9 Register macros with +\ProvidesPackage{register} [2020/03/22 v2.0 Register macros with hyperref/LyX support] \RequirePackage{ifthen}[1997/11/02] @@ -34,22 +34,28 @@ hyperref/LyX support] \DeclareOption{TRflags}{\setboolean{RegisterTRFlags}{true}} \DeclareOption{TRboxed}{\setboolean{RegisterTRBoxed}{true}} \DeclareOption{color}{\setboolean{RegisterColors}{true}} +\DeclareOption{botcaption}{\setboolean{RegisterBottom}{true}} +\DeclareOption{nocaption}{\setboolean{RegisterNoCaption}{true}} \DeclareOption*{% Emit a warning for other options \PackageWarning{register}{Unknown option '\CurrentOption'}% } -\newboolean{RegisterLyX} -\newboolean{RegisterHyperref} -\newboolean{RegisterTRFlags} -\newboolean{RegisterTRBoxed} -\newboolean{RegisterColors} +\newboolean{RegisterLyX}% Work with LyX +\newboolean{RegisterHyperref}% Work with hyperref package +\newboolean{RegisterTRFlags}% TR release flags +\newboolean{RegisterTRBoxed}% Place frame around TR flags +\newboolean{RegisterColors}% Permit color-filling register fields +\newboolean{RegisterBottom}% Move caption location to beneath register +\newboolean{RegisterNoCaption}% Disable environment's built-in caption \setboolean{RegisterLyX}{false} \setboolean{RegisterHyperref}{false} \setboolean{RegisterTRFlags}{false} \setboolean{RegisterTRBoxed}{false} \setboolean{RegisterColors}{false} +\setboolean{RegisterBottom}{false} +\setboolean{RegisterNoCaption}{false} \ProcessOptions\relax % Process package options \ifthenelse{\boolean{RegisterColors}}{\RequirePackage{xcolor}[2007/01/21]}{} @@ -59,7 +65,8 @@ hyperref/LyX support] \newcommand{\regListName}{List of Registers} \newcommand{\regResetName}{Reset} -\floatstyle{plaintop} \@ifundefined{chapter} +\ifthenelse{\boolean{RegisterBottom}}{\floatstyle{plain}}{\floatstyle{plaintop}} +\@ifundefined{chapter} {\newfloat{Regfloat}{tbp}{rdf}[section]} {\newfloat{Regfloat}{tbp}{rdf}[chapter]} \floatname{Regfloat}{\regFloatName} @@ -80,7 +87,7 @@ hyperref/LyX support] \newcommand{\regResetSize}{\scriptsize} \newcommand{\regLabelSize}{\footnotesize} \newcommand{\regLabelFamily}{\rmfamily} -\newcommand{\regDescFamily}{\bf} +\newcommand{\regDescFamily}{\bfseries} \newlength{\regdescsep} \newlength{\oldregdescsep} \setlength{\regdescsep}{-\medskipamount} @@ -136,9 +143,11 @@ hyperref/LyX support] \setlength{\partopsep}{0pt}% \setlength{\topsep}{0pt}% \setboolean{RegisterContext}{true}% - \ifthenelse{\equal{#3}{}}% - {\caption[#2]{\textsc{#2}}}% else - {\caption[#2]{\textsc{#2} ({#3})}}% + \ifthenelse{\boolean{RegisterNoCaption}}{}% + {\ifthenelse{\equal{#3}{}}% + {\caption[#2]{\textsc{#2}}}% else + {\caption[#2]{\textsc{#2} ({#3})}}% + }% \centering} {% restore lengths \leftskip\z@% @@ -398,6 +407,10 @@ hyperref/LyX support] \@starttoc{\@nameuse{ext@Regfloat}}}} \newcommand\l@Regfloat{\@dottedtocline{1}{1.5em}{2.3em}} \@ifundefined{@mainmatter}{\newif\if@mainmatter \@mainmattertrue}{} +\@ifclassloaded{memoir}{% +\renewcommand{\memchapinfo}[4]{% + \addtocontents{rdf}{\protect\addvspace{10pt}}} +}{% \@ifundefined{chapter}{} {% Adjust chapter definition slightly for Regfloats \def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne @@ -422,7 +435,7 @@ hyperref/LyX support] \@makechapterhead{#2}% \@afterheading \fi} -} +}} \newcommand\@GetTRSecondParam{} \long\def\@GetTRSecondParam#1#2#3\@nil{#2} \newcommand*{\GetTRPageRef}[1]{% -- cgit v1.2.3