summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/fbox
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-06-23 03:01:27 +0000
committerNorbert Preining <norbert@preining.info>2020-06-23 03:01:27 +0000
commitf18fa52d41e3ef33839ba943fe4987a6825ed278 (patch)
treee6853c12006729af59f21ec57003fb182a8a9563 /macros/latex/contrib/fbox
parentc667de615db3c132e784c84cf43a0e9849ecd7e2 (diff)
CTAN sync 202006230301
Diffstat (limited to 'macros/latex/contrib/fbox')
-rw-r--r--macros/latex/contrib/fbox/CHANGELOG1
-rw-r--r--macros/latex/contrib/fbox/doc/fbox.pdfbin43022 -> 44756 bytes
-rw-r--r--macros/latex/contrib/fbox/doc/fbox.tex53
-rw-r--r--macros/latex/contrib/fbox/latex/fbox.sty45
4 files changed, 62 insertions, 37 deletions
diff --git a/macros/latex/contrib/fbox/CHANGELOG b/macros/latex/contrib/fbox/CHANGELOG
index 18d2e1fd7c..07945b1413 100644
--- a/macros/latex/contrib/fbox/CHANGELOG
+++ b/macros/latex/contrib/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/macros/latex/contrib/fbox/doc/fbox.pdf b/macros/latex/contrib/fbox/doc/fbox.pdf
index 43ff42d426..a8a9986a54 100644
--- a/macros/latex/contrib/fbox/doc/fbox.pdf
+++ b/macros/latex/contrib/fbox/doc/fbox.pdf
Binary files differ
diff --git a/macros/latex/contrib/fbox/doc/fbox.tex b/macros/latex/contrib/fbox/doc/fbox.tex
index 1f18a9de8b..4cbfc2d36d 100644
--- a/macros/latex/contrib/fbox/doc/fbox.tex
+++ b/macros/latex/contrib/fbox/doc/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[<letters>] 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/macros/latex/contrib/fbox/latex/fbox.sty b/macros/latex/contrib/fbox/latex/fbox.sty
index 24dd9a7106..9c6aa93fd4 100644
--- a/macros/latex/contrib/fbox/latex/fbox.sty
+++ b/macros/latex/contrib/fbox/latex/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}}