From 9c7b9adb69a4e31ff84ed8a5876c6109488f4064 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 4 Jan 2020 22:05:15 +0000 Subject: fbox (4jan20) git-svn-id: svn://tug.org/texlive/trunk@53320 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/fbox/CHANGELOG | 1 + Master/texmf-dist/doc/latex/fbox/fbox.pdf | Bin 36174 -> 43022 bytes Master/texmf-dist/doc/latex/fbox/fbox.tex | 88 ++++++++++++++++++++++++++++- Master/texmf-dist/tex/latex/fbox/fbox.sty | 21 +++++-- 4 files changed, 104 insertions(+), 6 deletions(-) diff --git a/Master/texmf-dist/doc/latex/fbox/CHANGELOG b/Master/texmf-dist/doc/latex/fbox/CHANGELOG index 09a65590650..18d2e1fd7c4 100644 --- a/Master/texmf-dist/doc/latex/fbox/CHANGELOG +++ b/Master/texmf-dist/doc/latex/fbox/CHANGELOG @@ -1,3 +1,4 @@ +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 0.01 2019-03-08 - first CTAN version diff --git a/Master/texmf-dist/doc/latex/fbox/fbox.pdf b/Master/texmf-dist/doc/latex/fbox/fbox.pdf index 59716e6127a..43ff42d4266 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 2d931756deb..1f18a9de8b2 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 947 2019-03-08 17:06:20Z herbert $ +%% $Id: fbox.tex 1128 2020-01-03 20:57:59Z herbert $ % \listfiles\setcounter{errorcontextlines}{100} \documentclass[paper=a4,fontsize=11pt,DIV=13,parskip=half-, @@ -35,6 +35,9 @@ \def\Loption#1{\texttt{#1}\index{#1@\texttt{#1} package option}} \let\Ldim\Lcs +\def\demoText{DuckDuckGo! Time to spread the word!\par +Equipped with the talking points above, you’re ready to help anyone search and browse protected.} + %\usepackage[bibstyle=dtk]{biblatex} %\addbibresource{\jobname.bib} @@ -59,7 +62,7 @@ \def\setVersion#1{\setVVersion#1!!} \def\setVVersion#1=#2!!{\def\fboxVersion{#2}} -\setVersion{version = 0.03}% +\setVersion{version = 0.04}% \title{Package \texttt{fbox} \\--\\ \normalsize \fboxVersion\ (\today)} \author{Herbert Voß\thanks{\url{hvoss@tug.org}\newline Thanks to Rolf Niepraschk}} @@ -72,12 +75,22 @@ argument: \begin{verbatim} \fbox*[]{} +\fparbox*[]{} \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}. +\Lcs{fparbox} uses the current \Ldim{linewidth} minus two times the box sep and boxrule width. +It does \emph{not} a test for an existing paragraph indenting. It has do be done by the +user, e.g.: + +\begin{verbatim} +\noindent +\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 @@ -151,4 +164,75 @@ for the frame parts. A missing or an empty argument is the same as the default +\begin{LTXexample} +\fparbox{\demoText} +\end{LTXexample} + +\begin{LTXexample} +\fparbox[]{\demoText} +\end{LTXexample} + +\begin{LTXexample} +\fparbox[rbt]{\demoText} +\fparbox[brt]{\demoText} +\fparbox[bRT]{\demoText} +\end{LTXexample} + +\begin{LTXexample} +\fparbox*[rbt]{\demoText} +\fparbox*[brt]{\demoText} +\fparbox*[bRT]{\demoText} +\end{LTXexample} + +\begin{LTXexample} +\fparbox[lT]{\demoText} +\end{LTXexample} + +\begin{LTXexample} +\fparbox*[lT]{\demoText} +\end{LTXexample} + +\begin{LTXexample} +\fparbox[bT]{\demoText} +\end{LTXexample} + +\begin{LTXexample} +\fparbox*[bT]{\demoText} +\end{LTXexample} + +\begin{LTXexample} +\fparbox[Br]{\demoText} +\end{LTXexample} + +\begin{LTXexample} +\fparbox*[Br]{\demoText} +\end{LTXexample} + +\begin{LTXexample} +\setlength\fboxrule{5pt} +\fparbox[bT]{\demoText} +\end{LTXexample} + +\begin{LTXexample} +\setlength\fboxrule{5pt} +\fparbox*[bT]{\demoText} +\end{LTXexample} + + +\begin{LTXexample} +\setlength\fboxrule{5pt} +\fparbox[Br]{\demoText} +\end{LTXexample} + +\begin{LTXexample} +\setlength\fboxrule{5pt} +\fparbox*[Br]{\demoText} +\end{LTXexample} + + + + + + + \end{document} \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/fbox/fbox.sty b/Master/texmf-dist/tex/latex/fbox/fbox.sty index 01c90824356..24dd9a71064 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', %% -%% Copyright (C) 2019 +%% Copyright (C) 2019, 2020 %% Herbert Voss %% %% It may be distributed and/or modified under the @@ -11,10 +11,10 @@ %% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. % -% $Id: fbox.sty 947 2019-03-08 17:06:20Z herbert $ +% $Id: fbox.sty 1128 2020-01-03 20:57:59Z herbert $ % % ------------------------------------- -\ProvidesPackage{fbox}[2019/11/04 v. 0.03 allow parts of the frame (hv)] +\ProvidesPackage{fbox}[2020/01/03 v. 0.04 allow parts of the frame (hv)] % \let\orig@fbox\fbox \def\fb@lowerc@se#1{% make \lowercase expandable @@ -96,4 +96,17 @@ }% } -\endinput \ No newline at end of file +\newsavebox\fpar@b@x + +\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}}% + \FBox@i[#1]{\usebox\fpar@b@x}} +\long\def\FParBox@ii#1{% + \savebox\fpar@b@x{\parbox{\dimexpr\linewidth-2\fboxsep-2\fboxrule}{#1}}% + \orig@fbox{\usebox\fpar@b@x}} + + +\endinput + -- cgit v1.2.3