From 3ecbf376e71759e258381ba5bdd32c1e2da07600 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 22 Jun 2020 20:52:37 +0000 Subject: fbox (22jun20) git-svn-id: svn://tug.org/texlive/trunk@55627 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/fbox/CHANGELOG | 1 + Master/texmf-dist/doc/latex/fbox/fbox.pdf | Bin 43022 -> 44756 bytes Master/texmf-dist/doc/latex/fbox/fbox.tex | 53 +++++++++++++++++------------ Master/texmf-dist/tex/latex/fbox/fbox.sty | 45 ++++++++++++++++-------- 4 files changed, 62 insertions(+), 37 deletions(-) diff --git a/Master/texmf-dist/doc/latex/fbox/CHANGELOG b/Master/texmf-dist/doc/latex/fbox/CHANGELOG index 18d2e1fd7c4..07945b1413d 100644 --- a/Master/texmf-dist/doc/latex/fbox/CHANGELOG +++ b/Master/texmf-dist/doc/latex/fbox/CHANGELOG @@ -1,3 +1,4 @@ +0.05 2020-06-22 - added optional arguments boxrule and boxsep 0.04 2020-01-03 - added \fparbox[]{} 0.03 2019-11-04 - added star version 0.02 2019-03-08 - modified version for expandable \lowercase diff --git a/Master/texmf-dist/doc/latex/fbox/fbox.pdf b/Master/texmf-dist/doc/latex/fbox/fbox.pdf index 43ff42d4266..a8a9986a54f 100644 Binary files a/Master/texmf-dist/doc/latex/fbox/fbox.pdf and b/Master/texmf-dist/doc/latex/fbox/fbox.pdf differ diff --git a/Master/texmf-dist/doc/latex/fbox/fbox.tex b/Master/texmf-dist/doc/latex/fbox/fbox.tex index 1f18a9de8b2..4cbfc2d36d7 100644 --- a/Master/texmf-dist/doc/latex/fbox/fbox.tex +++ b/Master/texmf-dist/doc/latex/fbox/fbox.tex @@ -1,4 +1,4 @@ -%% $Id: fbox.tex 1128 2020-01-03 20:57:59Z herbert $ +%% $Id: fbox.tex 10 2020-06-22 10:15:39Z herbert $ % \listfiles\setcounter{errorcontextlines}{100} \documentclass[paper=a4,fontsize=11pt,DIV=13,parskip=half-, @@ -62,7 +62,7 @@ Equipped with the talking points above, you’re ready to help anyone search and \def\setVersion#1{\setVVersion#1!!} \def\setVVersion#1=#2!!{\def\fboxVersion{#2}} -\setVersion{version = 0.04}% +\setVersion{version = 0.05}% \title{Package \texttt{fbox} \\--\\ \normalsize \fboxVersion\ (\today)} \author{Herbert Voß\thanks{\url{hvoss@tug.org}\newline Thanks to Rolf Niepraschk}} @@ -91,10 +91,15 @@ user, e.g.: \fparbox ... \end{verbatim} -The optional argument can be of any combination of the letters -l, r, b, and t or altenatively L, R, B, and T. This l)eft, r)right, b)ottom, and t)op -for the frame parts. A missing or an empty argument is the same as the default -\Lcs{fbox} from standard \LaTeX. +The optional argument can be +\begin{description} +\item[boxrule] The rule width is predefined to the current value of \Ldim{fboxrule} (0.4pt) +\item[boxsep] The box separation is predefined to the current value of \Ldim{fboxsep} (3pt) +\item[] Any combination of the letters +l, r, b, and t, or altenatively L, R, B, and T for l)eft, r)right, b)ottom, and t)op +of the frame parts. A missing or an empty argument is the same as the default +\Lcs{fbox} command from standard \LaTeX. +\end{description} \begin{LTXexample} @@ -142,24 +147,27 @@ for the frame parts. A missing or an empty argument is the same as the default \end{LTXexample} \begin{LTXexample} -\setlength\fboxrule{5pt} -\fbox[bT]{foo gar baz} +\fbox[bT,boxrule=5pt]{foo gar baz} \end{LTXexample} \begin{LTXexample} -\setlength\fboxrule{5pt} -\fbox*[bT]{foo gar baz} +\fbox*[bT,boxrule=5pt]{foo gar baz} \end{LTXexample} + \begin{LTXexample} -\setlength\fboxrule{5pt} -\fbox[Br]{foo gar baz} +\fbox[Br,boxrule=5pt]{foo gar baz} \end{LTXexample} + \begin{LTXexample} -\setlength\fboxrule{5pt} -\fbox*[Br]{foo gar baz} +\fbox*[boxrule=5pt,Br]{foo gar baz} +\end{LTXexample} + + +\begin{LTXexample} +\fbox*[boxsep=5mm,bT,boxrule=2pt]{foo gar baz} \end{LTXexample} @@ -172,6 +180,7 @@ for the frame parts. A missing or an empty argument is the same as the default \fparbox[]{\demoText} \end{LTXexample} + \begin{LTXexample} \fparbox[rbt]{\demoText} \fparbox[brt]{\demoText} @@ -209,24 +218,24 @@ for the frame parts. A missing or an empty argument is the same as the default \end{LTXexample} \begin{LTXexample} -\setlength\fboxrule{5pt} -\fparbox[bT]{\demoText} +\fparbox[bT,boxrule=5pt]{\demoText} \end{LTXexample} \begin{LTXexample} -\setlength\fboxrule{5pt} -\fparbox*[bT]{\demoText} +\fparbox*[bT,boxrule=5pt,boxsep=6pt]{\demoText} +\end{LTXexample} + +\begin{LTXexample} +\fparbox*[bT,boxrule=3pt,boxsep=10pt]{\demoText} \end{LTXexample} \begin{LTXexample} -\setlength\fboxrule{5pt} -\fparbox[Br]{\demoText} +\fparbox[Br,boxrule=5pt,boxsep=10pt]{\demoText} \end{LTXexample} \begin{LTXexample} -\setlength\fboxrule{5pt} -\fparbox*[Br]{\demoText} +\fparbox*[boxrule=5pt,Br]{\demoText} \end{LTXexample} diff --git a/Master/texmf-dist/tex/latex/fbox/fbox.sty b/Master/texmf-dist/tex/latex/fbox/fbox.sty index 24dd9a71064..9c6aa93fd49 100644 --- a/Master/texmf-dist/tex/latex/fbox/fbox.sty +++ b/Master/texmf-dist/tex/latex/fbox/fbox.sty @@ -11,11 +11,23 @@ %% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. % -% $Id: fbox.sty 1128 2020-01-03 20:57:59Z herbert $ +% $Id: fbox.sty 10 2020-06-22 10:15:39Z herbert $ % % ------------------------------------- -\ProvidesPackage{fbox}[2020/01/03 v. 0.04 allow parts of the frame (hv)] +\ProvidesPackage{fbox}[2020/06/22 v. 0.05 allow parts of the frame (hv)] % +\RequirePackage{xkeyval} + +\newlength\fbox@@rule +\newlength\fbox@@sep +\define@key{fbox}{boxrule}[3pt]{\setlength\fbox@@rule{#1}} +\define@key{fbox}{boxsep}[0.4pt]{\setlength\fbox@@sep{#1}} +\setkeys*{fbox}{boxrule=\fboxrule,boxsep=\fboxsep} + +% latex.ltx +%\fboxsep = 3pt +%\fboxrule = .4pt + \let\orig@fbox\fbox \def\fb@lowerc@se#1{% make \lowercase expandable \begingroup\edef\x{% @@ -30,6 +42,9 @@ \def\FBox@*{\@ifnextchar[\FBox@i\orig@fbox} % \def\FBox@i[#1]{% + \def\XKV@rm{}% + \setkeys*{fbox}{boxrule=\fboxrule, boxsep=\fboxsep, #1}% + \typeout{===>#1: \XKV@rm}% \if@fbox@star \@fbox@space@leftfalse \@fbox@space@rightfalse @@ -37,11 +52,11 @@ \@fbox@space@lefttrue \@fbox@space@righttrue \fi - \ifx\relax#1\relax + \expandafter\ifx\expandafter\relax\XKV@rm\relax \@tempcntb=15 \else \@tempcntb=\z@ - \fb@lowerc@se{#1}% + \expandafter\fb@lowerc@se\expandafter{\XKV@rm}% \expandafter\FBox@ii\@tempa\@nil\relax \fi \FBox@iii @@ -64,34 +79,34 @@ \leavevmode \setbox\@tempboxa\hbox{% \color@begingroup - \if@fbox@space@left\kern\fboxsep\fi{#1}\if@fbox@space@right\kern\fboxsep\fi + \if@fbox@space@left\kern\fbox@@sep\fi{#1}\if@fbox@space@right\kern\fbox@@sep\fi \color@endgroup}% \@FrameB@x\relax} % \def\@FrameB@x#1{% - \@tempdima\fboxrule - \advance\@tempdima\fboxsep + \@tempdima\fbox@@rule + \advance\@tempdima\fbox@@sep \advance\@tempdima\dp\@tempboxa \hbox{% \lower\@tempdima\hbox{% \vbox{% \ifnum\the\@tempcntb>8\relax \advance\@tempcntb by -8 - \hrule\@height\fboxrule % top + \hrule\@height\fbox@@rule % top \fi \hbox{% \ifnum\@tempcntb>3 \advance\@tempcntb by -4 - \vrule\@width\fboxrule + \vrule\@width\fbox@@rule \fi % left #1% \vbox{% - \vskip\fboxsep + \vskip\fbox@@sep \box\@tempboxa - \vskip\fboxsep}% + \vskip\fbox@@sep}% #1% - \ifnum\@tempcntb>1\vrule\@width\fboxrule\fi}% right - \ifodd\@tempcntb\hrule\@height\fboxrule\fi}% bottom + \ifnum\@tempcntb>1\vrule\@width\fbox@@rule\fi}% right + \ifodd\@tempcntb\hrule\@height\fbox@@rule\fi}% bottom }% }% } @@ -101,10 +116,10 @@ \long\def\fparbox{\@ifnextchar*{\@fbox@startrue\FParBox@}{\@fbox@starfalse\FParBox@*}} \def\FParBox@*{\@ifnextchar[\FParBox@i\FParBox@ii} \long\def\FParBox@i[#1]#2{% - \savebox\fpar@b@x{\parbox{\dimexpr\linewidth-2\fboxsep-2\fboxrule}{#2}}% + \savebox\fpar@b@x{\parbox{\dimexpr\linewidth-2\fbox@@sep-2\fbox@@rule}{#2}}% \FBox@i[#1]{\usebox\fpar@b@x}} \long\def\FParBox@ii#1{% - \savebox\fpar@b@x{\parbox{\dimexpr\linewidth-2\fboxsep-2\fboxrule}{#1}}% + \savebox\fpar@b@x{\parbox{\dimexpr\linewidth-2\fbox@@sep-2\fbox@@rule}{#1}}% \orig@fbox{\usebox\fpar@b@x}} -- cgit v1.2.3