summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-02-21 20:56:12 +0000
committerKarl Berry <karl@freefriends.org>2022-02-21 20:56:12 +0000
commitc0c9e4a4c9ecfaba8d7e79bd7b6bbfa64e323b07 (patch)
tree8eff6317b1a92cdc3e09eee450cd0d8313587ec9 /Master
parent84a7607c0cc87322f08ec14cd4fa2c7f84ce9d9c (diff)
fbox (21feb22)
git-svn-id: svn://tug.org/texlive/trunk@62126 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/fbox/CHANGELOG1
-rw-r--r--Master/texmf-dist/doc/latex/fbox/fbox.pdfbin44756 -> 46291 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fbox/fbox.tex26
-rw-r--r--Master/texmf-dist/tex/latex/fbox/fbox.sty30
4 files changed, 38 insertions, 19 deletions
diff --git a/Master/texmf-dist/doc/latex/fbox/CHANGELOG b/Master/texmf-dist/doc/latex/fbox/CHANGELOG
index 07945b1413d..d8eb3919fba 100644
--- a/Master/texmf-dist/doc/latex/fbox/CHANGELOG
+++ b/Master/texmf-dist/doc/latex/fbox/CHANGELOG
@@ -1,3 +1,4 @@
+0.06 2022-02-20 - added individual color option
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
diff --git a/Master/texmf-dist/doc/latex/fbox/fbox.pdf b/Master/texmf-dist/doc/latex/fbox/fbox.pdf
index a8a9986a54f..e4176b5bad0 100644
--- a/Master/texmf-dist/doc/latex/fbox/fbox.pdf
+++ b/Master/texmf-dist/doc/latex/fbox/fbox.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fbox/fbox.tex b/Master/texmf-dist/doc/latex/fbox/fbox.tex
index 4cbfc2d36d7..fad6aa50049 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 10 2020-06-22 10:15:39Z herbert $
+%% $Id: fbox.tex 449 2022-02-20 20:50:12Z 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.05}%
+\setVersion{version = 0.06}%
\title{Package \texttt{fbox} \\--\\ \normalsize \fboxVersion\ (\today)}
\author{Herbert Voß\thanks{\url{hvoss@tug.org}\newline Thanks to Rolf Niepraschk}}
@@ -95,6 +95,10 @@ 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[lcolor] Color for the left line (black)
+\item[tcolor] Color for the top line (black)
+\item[rcolor] Color for the right line (black)
+\item[bcolor] Color for the bottom line (black)
\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
@@ -112,12 +116,16 @@ of the frame parts. A missing or an empty argument is the same as the default
\begin{LTXexample}
\fbox[rbt]{foo gar baz}
+\fbox[rbt,boxrule=4pt,rcolor=red,
+ tcolor=green]{foo gar baz}
\fbox[brt]{foo gar baz}
\fbox[bRT]{foo gar baz}
\end{LTXexample}
\begin{LTXexample}
\fbox*[rbt]{foo gar baz}
+\fbox[rbt,boxrule=4pt,rcolor=red,
+ tcolor=green]{foo gar baz}
\fbox*[brt]{foo gar baz}
\fbox*[bRT]{foo gar baz}
\end{LTXexample}
@@ -157,7 +165,7 @@ of the frame parts. A missing or an empty argument is the same as the default
\begin{LTXexample}
-\fbox[Br,boxrule=5pt]{foo gar baz}
+\fbox[Br,boxrule=5pt,bcolor=red]{foo gar baz}
\end{LTXexample}
@@ -167,7 +175,8 @@ of the frame parts. A missing or an empty argument is the same as the default
\begin{LTXexample}
-\fbox*[boxsep=5mm,bT,boxrule=2pt]{foo gar baz}
+\fbox*[boxsep=5mm,bT,tcolor=green,
+ boxrule=2pt]{foo gar baz}
\end{LTXexample}
@@ -182,7 +191,8 @@ of the frame parts. A missing or an empty argument is the same as the default
\begin{LTXexample}
-\fparbox[rbt]{\demoText}
+\fparbox[rbt,bcolor=red,rcolor=blue,
+ tcolor=red]{\demoText}
\fparbox[brt]{\demoText}
\fparbox[bRT]{\demoText}
\end{LTXexample}
@@ -190,7 +200,8 @@ of the frame parts. A missing or an empty argument is the same as the default
\begin{LTXexample}
\fparbox*[rbt]{\demoText}
\fparbox*[brt]{\demoText}
-\fparbox*[bRT]{\demoText}
+\fparbox*[bRT,rcolor=blue,
+ tcolor=green]{\demoText}
\end{LTXexample}
\begin{LTXexample}
@@ -235,7 +246,8 @@ of the frame parts. A missing or an empty argument is the same as the default
\end{LTXexample}
\begin{LTXexample}
-\fparbox*[boxrule=5pt,Br]{\demoText}
+\fparbox*[boxrule=5pt,Br,
+ bcolor=red!40,rcolor=blue!40]{\demoText}
\end{LTXexample}
diff --git a/Master/texmf-dist/tex/latex/fbox/fbox.sty b/Master/texmf-dist/tex/latex/fbox/fbox.sty
index 9c6aa93fd49..b12207a78de 100644
--- a/Master/texmf-dist/tex/latex/fbox/fbox.sty
+++ b/Master/texmf-dist/tex/latex/fbox/fbox.sty
@@ -1,6 +1,6 @@
-%% This is file `fbox.sty',
+%% This is file `fbox.sty'
%%
-%% Copyright (C) 2019, 2020
+%% Copyright (C) 2019, 2022
%% Herbert Voss <hvoss@tug.org>
%%
%% It may be distributed and/or modified under the
@@ -11,18 +11,23 @@
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%
-% $Id: fbox.sty 10 2020-06-22 10:15:39Z herbert $
+% $Id: fbox.sty 449 2022-02-20 20:50:12Z herbert $
%
% -------------------------------------
-\ProvidesPackage{fbox}[2020/06/22 v. 0.05 allow parts of the frame (hv)]
+\ProvidesPackage{fbox}[2022/02/20 v. 0.06 allow parts of the frame (hv)]
%
\RequirePackage{xkeyval}
+\RequirePackage{xcolor}
\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}
+\define@key{fbox}{boxrule}[0.4pt]{\setlength\fbox@@rule{#1}}
+\define@key{fbox}{boxsep}[3pt]{\setlength\fbox@@sep{#1}}
+\define@key{fbox}{bcolor}[black]{\def\fbox@bcolor{#1}}
+\define@key{fbox}{tcolor}[black]{\def\fbox@tcolor{#1}}
+\define@key{fbox}{lcolor}[black]{\def\fbox@lcolor{#1}}
+\define@key{fbox}{rcolor}[black]{\def\fbox@rcolor{#1}}
+\setkeys*{fbox}{boxrule=\fboxrule,boxsep=\fboxsep,lcolor,rcolor,bcolor,tcolor}
% latex.ltx
%\fboxsep = 3pt
@@ -44,7 +49,7 @@
\def\FBox@i[#1]{%
\def\XKV@rm{}%
\setkeys*{fbox}{boxrule=\fboxrule, boxsep=\fboxsep, #1}%
- \typeout{===>#1: \XKV@rm}%
+% \typeout{===>#1: \XKV@rm}%
\if@fbox@star
\@fbox@space@leftfalse
\@fbox@space@rightfalse
@@ -92,12 +97,12 @@
\vbox{%
\ifnum\the\@tempcntb>8\relax
\advance\@tempcntb by -8
- \hrule\@height\fbox@@rule % top
+ {\color{\fbox@tcolor}\hrule\@height\fbox@@rule}% % top
\fi
\hbox{%
\ifnum\@tempcntb>3
\advance\@tempcntb by -4
- \vrule\@width\fbox@@rule
+ \textcolor{\fbox@lcolor}{\vrule\@width\fbox@@rule}%
\fi % left
#1%
\vbox{%
@@ -105,8 +110,9 @@
\box\@tempboxa
\vskip\fbox@@sep}%
#1%
- \ifnum\@tempcntb>1\vrule\@width\fbox@@rule\fi}% right
- \ifodd\@tempcntb\hrule\@height\fbox@@rule\fi}% bottom
+ \ifnum\@tempcntb>1\textcolor{\fbox@rcolor}{\vrule\@width\fbox@@rule}\fi}% right
+ \ifodd\@tempcntb{\color{\fbox@bcolor}\hrule\@height\fbox@@rule}\fi% bottom
+ }%
}%
}%
}