From b94dba90d83866ccb6db5273d214512e859c3179 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 20 Feb 2021 03:00:53 +0000 Subject: CTAN sync 202102200300 --- .../biblatex-contrib/biblatex-ext/biblatex-ext.tex | 104 +++++++++++++-------- 1 file changed, 66 insertions(+), 38 deletions(-) (limited to 'macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex') diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex index c0603c4856..05161f93f8 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex @@ -24,10 +24,16 @@ \usepackage[scaled=0.78]{beramono} \usepackage{bm} \fi -\usepackage[%verbose, +\usepackage[verbose, + top=33mm, left=3.5cm, right=3.5cm, - marginparwidth=2.5cm + marginparwidth=2.5cm, + height=21cm, + footskip=47.6pt, + headheight=17pt, + headsep=20.40001pt, ]{geometry} +\setlength\parindent{1em} \usepackage{microtype} \usepackage{ragged2e} \usepackage{hyphenat} @@ -278,10 +284,10 @@ \renewcommand\tableofcontents{% + \pdfbookmark[1]{\contentsname}{contents}% \section*{\contentsname \@mkboth{% \MakeUppercase\contentsname}{\MakeUppercase\contentsname}}% - \pdfbookmark[1]{\contentsname}{contents}% \@starttoc{toc}% } \def\@starttoc#1{% @@ -350,7 +356,22 @@ \renewcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}% {3.25ex \@plus1ex \@minus .2ex}% {-1em}% - {\normalfont\normalsize\bfseries\allsectionsfont}} + {\normalfont\normalsize\bfseries\allsectionsfont}} + +% from KOMA-Script +\newcommand*{\@list@extra}{% + \ifdim\parskip>\z@ + \topsep\z@ + \parsep\parskip + \itemsep\z@ + \fi +} +\appto\@listi{\@list@extra} +\appto\@listii{\@list@extra} +\appto\@listiii{\@list@extra} +\appto\@listiv{\@list@extra} +\appto\@listv{\@list@extra} +\appto\@listvi{\@list@extra} \renewcommand*{\verbatimfont}{\ttfamily} \renewcommand*{\displayverbfont}{\ttfamily} @@ -519,7 +540,7 @@ \newcommand*{\ctan}{\mkbibacro{CTAN}} \newcommand*{\gitbaseurl}{https://github.com/moewew/biblatex-ext} -\newcommand*{\extblxversion}{0.10} +\newcommand*{\extblxversion}{0.11} \newcommand*{\biber}{Biber} \newcommand*{\gitissuelink}[1]{% \href{\gitbaseurl/issues/#1}{issue \##1 on github}} @@ -592,7 +613,7 @@ author = {Moritz Wemheuer}, link = {mwemheu@posteo.de},% revision = {\extblxversion}, - date = {\DTMDate{2021-01-01}}, + date = {\DTMDate{2021-02-19}}, } \hypersetup{% @@ -1110,7 +1131,7 @@ Sigfridsson and Ryde \quad Knuth 1984, 1986 \styleitem{ext-authoryear-tecomp} A compact author-year citation style that combines -\blxstyle{ext-authoryear-tcomp} and \blxstyle{ext-author\-year-ecomp}. +\blxstyle{ext-authoryear-tcomp} and \blxstyle{ext-authoryear-ecomp}. \begin{bibexample} \begin{lstlisting}[style=extblxstylelatex] \usepackage[style=ext-authoryear-tecomp]{biblatex} @@ -1701,7 +1722,8 @@ versatile than the outer citation delimiter feature (see the discussion in \cref{sec:opt:citedelims}). The default settings for \cmd{bbx@introcite} emulate the output of \cmd{cite}. -\begin{bibexample}[title={Example customisations for \kvopt{introcite}{plain}}] +\begin{bibexample}[breakable, + title={Example customisations for \kvopt{introcite}{plain}}] \begin{lstlisting}[style=extblxstylelatex] %\usepackage[..., introcite=plain]{biblatex} \DeclareFieldFormat{bbx@introcite}{\mkbibbrackets{#1}} @@ -1719,7 +1741,8 @@ The default settings for \cmd{bbx@introcite} emulate the output of \cmd{cite}. \exampleprintbib{sigfridsson} \end{bibexample} -\begin{bibexample}[title={Example customisations for \kvopt{introcite}{plain}}] +\begin{bibexample}[breakable, + title={Example customisations for \kvopt{introcite}{plain}}] \begin{lstlisting}[style=extblxstylelatex] %\usepackage[..., introcite=plain]{biblatex} \DeclareFieldFormat{bbx@introcite}{\mkbibbold{#1}} @@ -1733,7 +1756,8 @@ The default settings for \cmd{bbx@introcite} emulate the output of \cmd{cite}. \exampleprintbib{sigfridsson} \end{bibexample} -\begin{bibexample}[title={Example customisations for \kvopt{introcite}{label}}] +\begin{bibexample}[breakable, + title={Example customisations for \kvopt{introcite}{label}}] \begin{lstlisting}[style=extblxstylelatex] %\usepackage[..., introcite=label]{biblatex} \DeclareFieldFormat{bbx@introcite}{\mkbibbold{#1}} @@ -1761,7 +1785,7 @@ If you are using an author-year citation style together with combining this with \kvopt{bibstyle}{ext-authortitle} instead to move the year back to the end of the entry. \makeatletter -\begin{bibexample}[enhanced, title={\kvopt{introcite}{label} with +\begin{bibexample}[breakable, enhanced, title={\kvopt{introcite}{label} with \kvopt{style}{ext-authoryear} and \kvopt{bibstyle}{ext-authortitle}}] \begin{lstlisting}[style=extblxstylelatex] %\usepackage[ @@ -1838,7 +1862,7 @@ Field formats can be modified with \cmd{DeclareFieldFormat}. \togglefalse{bbx:doi} \DeclareFieldFormat{biblabeldate}{\highlight[1]{#1}} \DeclareDelimFormat[bib]{nameyeardelim}{\highlight[2]{\textbf{% - \addperiod}\textvisiblespace}\bibsentence} + \addperiod}}\space\bibsentence} \exampleprintbib{sigfridsson} \end{bibexample} @@ -2030,11 +2054,11 @@ The punctuation between \bibfield{title}\slash\bibfield{subtitle} and \end{bibexample} \begin{bibexample}[title={Example customisation of \cmd{titleaddonpunct}}] \begin{lstlisting}[style=extblxstylelatex] -\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{#1}} +\DeclareFieldFormat{booktitleaddon}{|1\mkbibbrackets{#1}1|} \renewcommand*{\titleaddonpunct}{\addspace} \end{lstlisting} \tcblower -\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{#1}} +\DeclareFieldFormat{booktitleaddon}{\highlight{\mkbibbrackets{#1}}} \renewcommand*{\titleaddonpunct}{\addspace} \renewbibmacro*{event+venue+date}{} \exampleprintbib{salam} @@ -2054,17 +2078,17 @@ The default is a space. \begin{bibexample}[title={Example customisation of \cmd{jourvoldelim} and \cmd{volnumdelim}}] \begin{lstlisting}[style=extblxstylelatex] -\DeclareFieldFormat[article,periodical]{volume}{\bibstring{jourvol}~#1} -\DeclareFieldFormat[article,periodical]{number}{\bibstring{number}~#1} -\renewcommand*{\jourvoldelim}{\addcomma\space} -\renewcommand*{\volnumdelim}{\addcomma\space} +\DeclareFieldFormat[article,periodical]{volume}{|1\bibstring{jourvol}~#11|} +\DeclareFieldFormat[article,periodical]{number}{|2\bibstring{number}~#12|} +\renewcommand*{\jourvoldelim}{|1\addcomma\space1|} +\renewcommand*{\volnumdelim}{|2\addcomma\space2|} \end{lstlisting} \tcblower \togglefalse{bbx:doi} -\DeclareFieldFormat[article,periodical]{volume}{\bibstring{jourvol}~#1} -\DeclareFieldFormat[article,periodical]{number}{\bibstring{number}~#1} -\renewcommand*{\jourvoldelim}{\addcomma\space} -\renewcommand*{\volnumdelim}{\addcomma\space} +\DeclareFieldFormat[article,periodical]{volume}{\highlight[1]{\bibstring{jourvol}~#1}} +\DeclareFieldFormat[article,periodical]{number}{\highlight[2]{\bibstring{number}~#1}} +\renewcommand*{\jourvoldelim}{\highlight[1]{\addcomma\space}} +\renewcommand*{\volnumdelim}{\highlight[2]{\addcomma\space}} \csuse{bbx@opt@mergedate@false}% \exampleprintbib{sigfridsson} \end{bibexample} @@ -2105,14 +2129,14 @@ The default is a space. \end{bibexample} \begin{bibexample}[title={Example customisation of \cmd{volnumdatedelim}}] \begin{lstlisting}[style=extblxstylelatex] -\DeclareFieldFormat{issuedate}{#1} -\renewcommand*{\volnumdatedelim}{\addcomma\space} +\DeclareFieldFormat{issuedate}{|1#11|} +\renewcommand*{\volnumdatedelim}{|2\addcomma\space2|} \end{lstlisting} \tcblower \togglefalse{bbx:doi} \csuse{bbx@opt@mergedate@false}% -\DeclareFieldFormat{issuedate}{#1} -\renewcommand*{\volnumdatedelim}{\addcomma\space} +\DeclareFieldFormat{issuedate}{\highlight[1]{#1}} +\renewcommand*{\volnumdatedelim}{\highlight[2]{\addcomma\space}} \exampleprintbib{sigfridsson} \end{bibexample} @@ -2129,12 +2153,12 @@ The default is a dot. \begin{bibexample}[title={Example customisation of~\cmd{volnumdelim}}] \begin{lstlisting}[style=extblxstylelatex] -\DeclareFieldFormat[article,periodical]{number}{\mkbibparens{#1}} +\DeclareFieldFormat[article,periodical]{number}{|1\mkbibparens{#1}1|} \renewcommand*{\volnumdelim}{} \end{lstlisting} \tcblower \togglefalse{bbx:doi} -\DeclareFieldFormat[article,periodical]{number}{\mkbibparens{#1}} +\DeclareFieldFormat[article,periodical]{number}{\highlight{\mkbibparens{#1}}} \renewcommand*{\volnumdelim}{} \exampleprintbib{sigfridsson} \end{bibexample} @@ -2631,8 +2655,8 @@ By default the macro is defined and used as follows. \usebibmacro{pubinstorg+location+date}{|organization|}} \end{biblatexcode} -An example use of the \bibmacro{pubinstorg+location+date} is shown -in the descriotion of~\hypercmd{publocdelim}. +An example use of \bibmacro{pubinstorg+location+date} is shown +in the description of~\hypercmd{publocdelim}. \keyitem[type+number] A bibliography macro to print the \bibfield{type} and \bibfield{number} fields. @@ -2776,6 +2800,7 @@ The package also defines two helpful bibliography macros. want to use. \end{remindbox} + For the common case of two-column tabular bibliographies there is a thin wrapper around \hypercmd{defbibtabular} that might turn out a bit easier to use. \begin{ltxsyntax} @@ -2800,8 +2825,10 @@ is equivalent to {(*@\prm{begin code}@*)}{(*@\prm{end code}@*)} {\anchorlang{(*@\prm{anchor code}@*)} & \driver{(*@\prm{driver precode}@*)} \\} \end{biblatexcode} +\end{ltxsyntax} -Usage examples are shown on the next page +An annotated example document with a simple tabular bibliography can +be found on the following pages. \clearpage \begin{bibexample}[breakable, @@ -2886,7 +2913,6 @@ to avoid duplication. The anchor is set to the first column, so that a viewer jumps there if a link to the entry is followed. - Using \cmd{defbibtabulartwocolumn} the example from above could be written as \begin{biblatexcode} \documentclass[british]{article} @@ -2923,7 +2949,7 @@ ipsum \autocite{geer}. \printbibtabular \end{document} \end{biblatexcode} -\end{ltxsyntax} + \clearpage \section{Open Access Symbols}\label{sec:oa} @@ -3579,10 +3605,9 @@ Aside from the main package \sty{expl3}\fnurl{https://ctan.org/pkg/expl3} it loads \sty{xparse}\fnurl{https://ctan.org/pkg/xparse}, and \sty{l3keys2e}\fnurl{https://ctan.org/pkg/l3keys2e}. Drawing is performed with the (still experimental) -\sty{l3draw}\fnurl{https://ctan.org/pkg/l3experimental} and -\sty{l3color}\fnurl{https://ctan.org/pkg/l3experimental} packages. -The code works best with version 2020-08-07 or above -of~\sty{l3draw}/\sty{l3color}. +\sty{l3draw}\fnurl{https://ctan.org/pkg/l3experimental} packages. +The code works best with version 2021-02-18 or above +of~\sty{l3draw}. If used as a stand-alone package, \sty{biblatex-ext-oasymb-l3draw} has one load-time option, namely \hyperopt{symbol}, and defines one command besides @@ -3604,6 +3629,9 @@ See also \filename{CHANGES.md}. The numbers on the right indicate the relevant section of the manual. \begin{changelog} +\begin{release}{0.11}{2021-02-19} + \item Synced with \sty{l3draw} changes. +\end{release} \begin{release}{0.10}{2021-01-01} \item Synced with \sty{biblatex} 3.16 changes. \end{release} @@ -3702,7 +3730,7 @@ The numbers on the right indicate the relevant section of the manual. \see{sec:opt:style} \item Added \hypercmd{jourvoldelim}, \hypercmd{jourserdelim} and \hypercmd{servoldelim}\see{sec:opt:punct} - \item Improve documentation + \item Improved documentation \end{release} \begin{release}{0.2}{2018-03-28} \item Rework lengths for \hyperkvopt{introcite}{label}\see{sec:opt:style} -- cgit v1.2.3