summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/fbox
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-11-05 03:01:03 +0000
committerNorbert Preining <norbert@preining.info>2019-11-05 03:01:03 +0000
commita78951f836b9edaab2dd593f38e33732f0d03cbd (patch)
tree2193c3bad6f85727c4d09d08941c437f4094537a /macros/latex/contrib/fbox
parent97106ae9313f56715ee9a7dd39d708158c1bedb9 (diff)
CTAN sync 201911050301
Diffstat (limited to 'macros/latex/contrib/fbox')
-rw-r--r--macros/latex/contrib/fbox/CHANGELOG2
-rw-r--r--macros/latex/contrib/fbox/README.md2
-rw-r--r--macros/latex/contrib/fbox/doc/fbox.pdfbin34505 -> 36174 bytes
-rw-r--r--macros/latex/contrib/fbox/doc/fbox.tex46
-rw-r--r--macros/latex/contrib/fbox/latex/fbox.sty35
5 files changed, 64 insertions, 21 deletions
diff --git a/macros/latex/contrib/fbox/CHANGELOG b/macros/latex/contrib/fbox/CHANGELOG
index a79a8d21b2..09a6559065 100644
--- a/macros/latex/contrib/fbox/CHANGELOG
+++ b/macros/latex/contrib/fbox/CHANGELOG
@@ -1 +1,3 @@
+0.03 2019-11-04 - added star version
+0.02 2019-03-08 - modified version for expandable \lowercase
0.01 2019-03-08 - first CTAN version
diff --git a/macros/latex/contrib/fbox/README.md b/macros/latex/contrib/fbox/README.md
index 50147f1126..8959404440 100644
--- a/macros/latex/contrib/fbox/README.md
+++ b/macros/latex/contrib/fbox/README.md
@@ -1,7 +1,7 @@
# fbox.sty
Redefines the macro \fbox{...} from standard
-LaTeX to \fbox[optarg]{...}
+LaTeX to \fbox*[optarg]{...}
optarg can be any combination of l, r, b, and t. For
example: \fbox[lt]{foo} or \fbox[Tlr]{...}
diff --git a/macros/latex/contrib/fbox/doc/fbox.pdf b/macros/latex/contrib/fbox/doc/fbox.pdf
index f331925e7a..59716e6127 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 1a7f4c1a95..2d931756de 100644
--- a/macros/latex/contrib/fbox/doc/fbox.tex
+++ b/macros/latex/contrib/fbox/doc/fbox.tex
@@ -1,4 +1,4 @@
-%% $Id: fbox.tex 946 2019-03-08 12:08:22Z herbert $
+%% $Id: fbox.tex 947 2019-03-08 17:06:20Z herbert $
%
\listfiles\setcounter{errorcontextlines}{100}
\documentclass[paper=a4,fontsize=11pt,DIV=13,parskip=half-,
@@ -33,6 +33,7 @@
\def\Lpack#1{\texttt{#1}\index{#1 package@\texttt{#1} package}}
\def\Lprog#1{\texttt{#1}\index{#1 program@\texttt{#1} program}}
\def\Loption#1{\texttt{#1}\index{#1@\texttt{#1} package option}}
+\let\Ldim\Lcs
%\usepackage[bibstyle=dtk]{biblatex}
%\addbibresource{\jobname.bib}
@@ -58,7 +59,7 @@
\def\setVersion#1{\setVVersion#1!!}
\def\setVVersion#1=#2!!{\def\fboxVersion{#2}}
-\setVersion{version = 0.01}%
+\setVersion{version = 0.03}%
\title{Package \texttt{fbox} \\--\\ \normalsize \fboxVersion\ (\today)}
\author{Herbert Voß\thanks{\url{hvoss@tug.org}\newline Thanks to Rolf Niepraschk}}
@@ -70,9 +71,12 @@ This package redefines the \LaTeX-macro \Lcs{fbox} to allow an optional
argument:
\begin{verbatim}
-\fbox[<optargs>]{<contents>}
+\fbox*[<optargs>]{<contents>}
\end{verbatim}
+The star version does not put any horizontal space before or behind the argument
+if no optional argument \texttt{l} or \texttt{r} is given. The non star version always inserts
+\Ldim{fboxsep}.
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
@@ -95,36 +99,56 @@ for the frame parts. A missing or an empty argument is the same as the default
\end{LTXexample}
\begin{LTXexample}
+\fbox*[rbt]{foo gar baz}
+\fbox*[brt]{foo gar baz}
+\fbox*[bRT]{foo gar baz}
+\end{LTXexample}
+
+\begin{LTXexample}
\fbox[lT]{foo gar baz}
\end{LTXexample}
\begin{LTXexample}
+\fbox*[lT]{foo gar baz}
+\end{LTXexample}
+
+\begin{LTXexample}
\fbox[bT]{foo gar baz}
\end{LTXexample}
\begin{LTXexample}
+\fbox*[bT]{foo gar baz}
+\end{LTXexample}
+
+\begin{LTXexample}
\fbox[Br]{foo gar baz}
\end{LTXexample}
\begin{LTXexample}
+\fbox*[Br]{foo gar baz}
+\end{LTXexample}
+
+\begin{LTXexample}
\setlength\fboxrule{5pt}
\fbox[bT]{foo gar baz}
\end{LTXexample}
\begin{LTXexample}
\setlength\fboxrule{5pt}
-\fbox[Br]{foo gar baz}
+\fbox*[bT]{foo gar baz}
\end{LTXexample}
+\begin{LTXexample}
+\setlength\fboxrule{5pt}
+\fbox[Br]{foo gar baz}
+\end{LTXexample}
-
-\end{document}
+\begin{LTXexample}
+\setlength\fboxrule{5pt}
+\fbox*[Br]{foo gar baz}
+\end{LTXexample}
-folium = {
- de = {"f", "ff"},
- en = {"f", "ff"},
- fr = {"sq","sqq"},
-}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/fbox/latex/fbox.sty b/macros/latex/contrib/fbox/latex/fbox.sty
index b3227b36ca..01c9082435 100644
--- a/macros/latex/contrib/fbox/latex/fbox.sty
+++ b/macros/latex/contrib/fbox/latex/fbox.sty
@@ -11,17 +11,32 @@
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%
-% $Id: fbox.sty 946 2019-03-08 12:08:22Z herbert $
+% $Id: fbox.sty 947 2019-03-08 17:06:20Z herbert $
%
% -------------------------------------
-\ProvidesPackage{fbox}[2019/03/00 v. 0.01 allow parts of the frame (hv)]
+\ProvidesPackage{fbox}[2019/11/04 v. 0.03 allow parts of the frame (hv)]
%
\let\orig@fbox\fbox
-\def\fb@lowerc@se#1{\lowercase{\edef\@tempa{#1}}}
+\def\fb@lowerc@se#1{% make \lowercase expandable
+ \begingroup\edef\x{%
+ \lowercase{\endgroup\def\noexpand\@tempa{#1}}}\x
+}
%
-\long\def\fbox{\@ifnextchar[\FBox@i\orig@fbox}
+\newif\if@fbox@star
+\newif\if@fbox@space@left
+\newif\if@fbox@space@right
+
+\long\def\fbox{\@ifnextchar*{\@fbox@startrue\FBox@}{\@fbox@starfalse\FBox@*}}
+\def\FBox@*{\@ifnextchar[\FBox@i\orig@fbox}
%
\def\FBox@i[#1]{%
+ \if@fbox@star
+ \@fbox@space@leftfalse
+ \@fbox@space@rightfalse
+ \else
+ \@fbox@space@lefttrue
+ \@fbox@space@righttrue
+ \fi
\ifx\relax#1\relax
\@tempcntb=15
\else
@@ -32,13 +47,15 @@
\FBox@iii
}
\def\FBox@ii#1#2\@nil{%
- \ifx#1t\advance\@tempcntb by 8% top
+ \ifx#1t\advance\@tempcntb by 8 % top
\else
- \ifx#1l\advance\@tempcntb by 4% left
+ \ifx#1l\advance\@tempcntb by 4 % left
+ \if@fbox@star\@fbox@space@lefttrue\fi
\else
- \ifx#1r\advance\@tempcntb by 2% right
+ \ifx#1r\advance\@tempcntb by 2 % right
+ \if@fbox@star\@fbox@space@righttrue\fi
\else
- \ifx#1b\advance\@tempcntb by 1% bottom
+ \ifx#1b\advance\@tempcntb by 1 % bottom
\fi\fi\fi\fi
\if\relax#2\relax\def\next{}\else\def\next{\FBox@ii#2\@nil}\fi
\next
@@ -47,7 +64,7 @@
\leavevmode
\setbox\@tempboxa\hbox{%
\color@begingroup
- \kern\fboxsep{#1}\kern\fboxsep
+ \if@fbox@space@left\kern\fboxsep\fi{#1}\if@fbox@space@right\kern\fboxsep\fi
\color@endgroup}%
\@FrameB@x\relax}
%