diff options
Diffstat (limited to 'macros/latex')
15 files changed, 115 insertions, 48 deletions
diff --git a/macros/latex/contrib/bibleref/CHANGES b/macros/latex/contrib/bibleref/CHANGES index 29d7c6e962..57e8427525 100644 --- a/macros/latex/contrib/bibleref/CHANGES +++ b/macros/latex/contrib/bibleref/CHANGES @@ -1,5 +1,8 @@ +1.25 + * Add \ibible macro + * Add more abbreviations 1.24 - * Add more abbreviation + * Add more abbreviations * Add more \brthreeabbrvname 1.23 * Add Tt abbreviation diff --git a/macros/latex/contrib/bibleref/bibleref.dtx b/macros/latex/contrib/bibleref/bibleref.dtx index 0802fcf73b..1eb50d8004 100644 --- a/macros/latex/contrib/bibleref/bibleref.dtx +++ b/macros/latex/contrib/bibleref/bibleref.dtx @@ -220,9 +220,9 @@ %Note that \meta{name} must be the full name, not the %abbreviated name of the book. For example, to change %Revelation to Apoc, do -%\verb|\setbookname{Revelation}{Apoc}| +%\verb|\setbooktitle{Revelation}{Apoc}| %(\textbf{Note} that you shouldn't do -%\verb|\setbookname{Rev}{Apoc}|) +%\verb|\setbooktitle{Rev}{Apoc}|) % %If you want a different title for a book depending on whether it's %in the main body of the document or in the index, you can set the @@ -309,6 +309,12 @@ %This is similar to \cs{ibiblechvs} except that it only displays the %verse(s) in the text. % +%\begin{definition}[\DescribeMacro{\ibible}] +%\cs{ibible}\oarg{format}\marg{book title}\texttt(\marg{chapter}\texttt{:}\meta{verse(s)}\texttt) +%\end{definition} +%This is similar to \cs{ibiblech} except that it does not display the +%anything in the text. +% %You may need to create your own custom \app{makeindex} style file %as the default uses a comma and space to separate the item from %the page number, which may cause confusion. For example, you @@ -1008,7 +1014,7 @@ % Declare package % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bibleref}[2019/12/10 1.24 (NLCT and MR)] +\ProvidesPackage{bibleref}[2020/06/22 1.25 (NLCT and MR)] % \end{macrocode} % Need to do some conditional stuff % \begin{macrocode} @@ -1604,6 +1610,7 @@ \newcommand*\br@Wis{\br@Wisdom}% \newcommand*\br@Wisd{\br@Wisdom}% \newcommand*\br@Ecclus{\br@Ecclesiasticus}% +\newcommand*\br@Sir{\br@Ecclesiasticus}% \newcommand*\br@Isa{\br@Isaiah}% \newcommand*\br@Jer{\br@Jeremiah}% \newcommand*\br@Lam{\br@Lamentations}% @@ -2668,6 +2675,36 @@ defined}{}}} % \end{macrocode} %\end{macro} % +% \begin{macro}{\ibible} +%\changes{1.25}{2020/06/22}{new} +% Only displays verse(s) but indexes under the book and chapters. +% \begin{macrocode} +\newcommand*{\ibible}[1][\bvidxpgformat]{% + \let\@bv@current@titlestyle\BRbooktitlestyle + \let\@bv@current@chapterstyle\BRchapterstyle + \let\@bv@current@versestyle\BRversestyle% added on analogy with previous line + \let\@bv@current@bkchsep\BRbkchsep + \let\@bv@current@chvsep\BRchvsep + \let\@bv@current@vrsep\BRvrsep% add me, too! + \def\@bv@restore{% + \let\BRbooktitlestyle\@bv@current@titlestyle + \let\BRchapterstyle\@bv@current@chapterstyle + \let\BRversestyle\@bv@current@versestyle% added on analogy with previous line + \let\BRbkchsep\@bv@current@bkchsep + \let\BRchvsep\@bv@current@chvsep + \let\BRvrsep\@bv@current@vrsep% add me, too! + }% + \def\BRbooktitlestyle##1{}% + \def\BRchapterstyle##1{}% + \def\BRversestyle##1{}% added on analogy with previous line + \def\BRbkchsep{}% + \def\BRchvsep{}% + \def\BRvrsep{}% add me, too! + \def\@bv@idxpgformat{#1}% + \@bv@idxtrue\def\@bv@idxentry{}\@bible@verse +} +% \end{macrocode} +% \end{macro} %\begin{macro}{\bvidxpgformat} % Default page number format for bible verse index entries % \begin{macrocode} diff --git a/macros/latex/contrib/bibleref/bibleref.pdf b/macros/latex/contrib/bibleref/bibleref.pdf Binary files differindex 99a06b2011..d4ff6eaae5 100644 --- a/macros/latex/contrib/bibleref/bibleref.pdf +++ b/macros/latex/contrib/bibleref/bibleref.pdf diff --git a/macros/latex/contrib/bibleref/samples/sample-categories.pdf b/macros/latex/contrib/bibleref/samples/sample-categories.pdf Binary files differindex 4ccfb376e4..492e1feea3 100644 --- a/macros/latex/contrib/bibleref/samples/sample-categories.pdf +++ b/macros/latex/contrib/bibleref/samples/sample-categories.pdf diff --git a/macros/latex/contrib/bibleref/samples/sample-indextools.pdf b/macros/latex/contrib/bibleref/samples/sample-indextools.pdf Binary files differindex 21662c8438..de8d024b7e 100644 --- a/macros/latex/contrib/bibleref/samples/sample-indextools.pdf +++ b/macros/latex/contrib/bibleref/samples/sample-indextools.pdf diff --git a/macros/latex/contrib/bibleref/samples/sample-xidx.pdf b/macros/latex/contrib/bibleref/samples/sample-xidx.pdf Binary files differindex a4d31ce675..8fdf835425 100644 --- a/macros/latex/contrib/bibleref/samples/sample-xidx.pdf +++ b/macros/latex/contrib/bibleref/samples/sample-xidx.pdf diff --git a/macros/latex/contrib/bibleref/samples/sample.pdf b/macros/latex/contrib/bibleref/samples/sample.pdf Binary files differindex 3f58999daa..23b4900838 100644 --- a/macros/latex/contrib/bibleref/samples/sample.pdf +++ b/macros/latex/contrib/bibleref/samples/sample.pdf 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 Binary files differindex 43ff42d426..a8a9986a54 100644 --- a/macros/latex/contrib/fbox/doc/fbox.pdf +++ b/macros/latex/contrib/fbox/doc/fbox.pdf 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}} diff --git a/macros/latex/contrib/xfakebold/Changes b/macros/latex/contrib/xfakebold/Changes index 9750606c8f..54671b5a7b 100644 --- a/macros/latex/contrib/xfakebold/Changes +++ b/macros/latex/contrib/xfakebold/Changes @@ -1,5 +1,6 @@ xfakebold.sty ---------------- +v 0.07 2020-06-22 fix bug for pdflatex (thanks to Scott Pakin) v 0.06 2019-12-29 support for xetex and ptex with (x)dvipdfmx v 0.05 2019-09-21 fix pdflatex v 0.04 2018-08-21 typo in \fake@bold diff --git a/macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdf b/macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdf Binary files differindex f6522da142..54db165a54 100644 --- a/macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdf +++ b/macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdf diff --git a/macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex b/macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex index 973873ee2e..c7ac5d15d3 100644 --- a/macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex +++ b/macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex @@ -1,4 +1,4 @@ -% $Id: xfakebold-doc.tex 1125 2019-12-29 21:34:19Z herbert $ +% $Id: xfakebold-doc.tex 9 2020-06-22 07:46:03Z herbert $ \listfiles \documentclass[english]{article} \usepackage{dejavu-otf} @@ -12,7 +12,7 @@ \usepackage{babel} \usepackage[a4paper,tmargin=1cm,bmargin=1.5cm,includeheadfoot]{geometry} \usepackage{listings} -\title{\texttt{xfakebold}, v. 0.06\\ using bold characters with\\ \texttt{pdflatex}, \texttt{lualatex} or \texttt{xelatex}} +\title{\texttt{xfakebold}, v. 0.07\\ using bold characters with\\ \texttt{pdflatex}, \texttt{lualatex} or \texttt{xelatex}} \author{Herbert Voß} \lstset{basicstyle=\ttfamily\small,language={[LaTeX]TeX},frame=lrtb} @@ -22,6 +22,7 @@ \tableofcontents +\vspace{1cm} \begin{abstract} The package fakes a vector font with outline characters by the text render of PDF. It writes directly into the pdf output with \verb|\pdfliteral| (pdflatex ) or \verb|\pdfextension| \verb|literal| @@ -31,7 +32,7 @@ math mode where only some free math fonts provide a bold version. \end{abstract} \vfill -\small Thanks to: Will Robertson; Yusuke Terada; +\small Thanks to: Scott Pakin, Will Robertson; Yusuke Terada; %\meaning\setBold %\meaning\unsetBold diff --git a/macros/latex/contrib/xfakebold/latex/xfakebold.sty b/macros/latex/contrib/xfakebold/latex/xfakebold.sty index db10f5096a..0e0d5d4068 100644 --- a/macros/latex/contrib/xfakebold/latex/xfakebold.sty +++ b/macros/latex/contrib/xfakebold/latex/xfakebold.sty @@ -1,8 +1,8 @@ -% $Id: xfakebold.sty 1125 2019-12-29 21:34:19Z herbert $ +% $Id: xfakebold.sty 9 2020-06-22 07:46:03Z herbert $ %% %% This is file `xfakebold.sty', %% -%% Copyright (C) 1919, 2020 Herbert Voss +%% Copyright (C) 2019, 2020 Herbert Voss %% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -14,7 +14,7 @@ %% %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{xfakebold}[1919/12/29 v0.06 using bold characters] +\ProvidesPackage{xfakebold}[2020/06/22 v0.07 using bold characters] \RequirePackage{xkeyval} \@ifpackagelater{iftex}{2019/10/24}{% @@ -51,7 +51,7 @@ \else \ifpdftex \ifnum\pdfoutput=\@ne - \pdfliteral direct { 2 Tr #1 w }\relax + \pdfliteral direct { 2 Tr \fkbld@bold w }\relax \else \special{pdf:literal direct 2 Tr \fkbld@bold w }\relax \fi |