From 14d9a09517cc5a3a16f279ac3f64c172f8dae030 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 7 Mar 2022 03:03:04 +0000 Subject: CTAN sync 202203070303 --- .../biblatex-contrib/biblatex-ext/CHANGES.md | 10 + .../biblatex-contrib/biblatex-ext/README.md | 11 +- .../biblatex-ext/biblatex-ext-oa-doiapi.sty | 2 +- .../biblatex-ext/biblatex-ext-oa.sty | 2 +- .../biblatex-ext/biblatex-ext-oasymb-l3draw.sty | 2 +- .../biblatex-ext/biblatex-ext-oasymb-pict2e.sty | 2 +- .../biblatex-ext/biblatex-ext-oasymb-tikz.sty | 2 +- .../biblatex-ext/biblatex-ext-tabular.sty | 2 +- .../biblatex-contrib/biblatex-ext/biblatex-ext.pdf | Bin 834577 -> 841856 bytes .../biblatex-contrib/biblatex-ext/biblatex-ext.tex | 145 ++++++- .../biblatex-contrib/biblatex-ext/blxextdoiapi.lua | 4 +- .../biblatex-ext/ext-alphabetic-verb.bbx | 2 +- .../biblatex-ext/ext-alphabetic-verb.cbx | 2 +- .../biblatex-ext/ext-alphabetic.bbx | 2 +- .../biblatex-ext/ext-alphabetic.cbx | 2 +- .../biblatex-ext/ext-authornumber-comp.bbx | 19 + .../biblatex-ext/ext-authornumber-comp.cbx | 320 +++++++++++++++ .../biblatex-ext/ext-authornumber-ecomp.bbx | 19 + .../biblatex-ext/ext-authornumber-ecomp.cbx | 430 +++++++++++++++++++++ .../biblatex-ext/ext-authornumber-tcomp.bbx | 19 + .../biblatex-ext/ext-authornumber-tcomp.cbx | 92 +++++ .../biblatex-ext/ext-authornumber-tecomp.bbx | 19 + .../biblatex-ext/ext-authornumber-tecomp.cbx | 124 ++++++ .../biblatex-ext/ext-authornumber-terse.bbx | 26 ++ .../biblatex-ext/ext-authornumber-terse.cbx | 57 +++ .../biblatex-ext/ext-authornumber.bbx | 96 +++++ .../biblatex-ext/ext-authornumber.cbx | 203 ++++++++++ .../biblatex-ext/ext-authortitle-common.bbx | 2 +- .../biblatex-ext/ext-authortitle-comp.bbx | 2 +- .../biblatex-ext/ext-authortitle-comp.cbx | 2 +- .../biblatex-ext/ext-authortitle-ibid.bbx | 2 +- .../biblatex-ext/ext-authortitle-ibid.cbx | 2 +- .../biblatex-ext/ext-authortitle-icomp.bbx | 2 +- .../biblatex-ext/ext-authortitle-icomp.cbx | 2 +- .../biblatex-ext/ext-authortitle-tcomp.bbx | 2 +- .../biblatex-ext/ext-authortitle-tcomp.cbx | 2 +- .../biblatex-ext/ext-authortitle-terse.bbx | 2 +- .../biblatex-ext/ext-authortitle-terse.cbx | 2 +- .../biblatex-ext/ext-authortitle-ticomp.bbx | 2 +- .../biblatex-ext/ext-authortitle-ticomp.cbx | 2 +- .../biblatex-ext/ext-authortitle.bbx | 2 +- .../biblatex-ext/ext-authortitle.cbx | 2 +- .../biblatex-ext/ext-authoryear-common.bbx | 2 +- .../biblatex-ext/ext-authoryear-comp.bbx | 2 +- .../biblatex-ext/ext-authoryear-comp.cbx | 2 +- .../biblatex-ext/ext-authoryear-ecomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-ecomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-ibid.bbx | 2 +- .../biblatex-ext/ext-authoryear-ibid.cbx | 2 +- .../biblatex-ext/ext-authoryear-icomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-icomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-iecomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-iecomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-tcomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-tcomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-tecomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-tecomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-terse.bbx | 2 +- .../biblatex-ext/ext-authoryear-terse.cbx | 2 +- .../biblatex-ext/ext-authoryear-ticomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-ticomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-tiecomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-tiecomp.cbx | 2 +- .../biblatex-ext/ext-authoryear.bbx | 2 +- .../biblatex-ext/ext-authoryear.cbx | 2 +- .../biblatex-ext/ext-biblatex-aux.def | 6 +- .../biblatex-ext/ext-dashed-common.bbx | 2 +- .../biblatex-ext/ext-numeric-comp.bbx | 2 +- .../biblatex-ext/ext-numeric-comp.cbx | 2 +- .../biblatex-ext/ext-numeric-verb.bbx | 2 +- .../biblatex-ext/ext-numeric-verb.cbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-numeric.bbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-numeric.cbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-standard.bbx | 12 +- .../biblatex-ext/ext-verbose-common.cbx | 2 +- .../biblatex-ext/ext-verbose-ibid.bbx | 2 +- .../biblatex-ext/ext-verbose-ibid.cbx | 2 +- .../biblatex-ext/ext-verbose-inote.bbx | 2 +- .../biblatex-ext/ext-verbose-inote.cbx | 2 +- .../biblatex-ext/ext-verbose-note-common.cbx | 2 +- .../biblatex-ext/ext-verbose-note.bbx | 2 +- .../biblatex-ext/ext-verbose-note.cbx | 2 +- .../biblatex-ext/ext-verbose-trad1.bbx | 2 +- .../biblatex-ext/ext-verbose-trad1.cbx | 2 +- .../biblatex-ext/ext-verbose-trad2.bbx | 2 +- .../biblatex-ext/ext-verbose-trad2.cbx | 2 +- .../biblatex-ext/ext-verbose-trad3.bbx | 2 +- .../biblatex-ext/ext-verbose-trad3.cbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-verbose.bbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-verbose.cbx | 2 +- macros/latex/contrib/buctthesis/README.md | 37 +- macros/latex/contrib/buctthesis/doc/buctthesis.pdf | Bin 448464 -> 438059 bytes .../contrib/buctthesis/doc/chapter/chapter1.tex | 12 +- .../contrib/buctthesis/doc/chapter/chapter2.tex | 2 +- .../contrib/buctthesis/doc/cover/BUCT-badge.pdf | Bin 64254 -> 60939 bytes .../doc/figure/declare-master-doctor.png | Bin 0 -> 187456 bytes .../buctthesis/doc/figure/declare-master.png | Bin 187456 -> 0 bytes macros/latex/contrib/buctthesis/doc/mycfg.sty | 2 +- .../latex/contrib/buctthesis/source/buctthesis.dtx | 36 +- macros/latex/contrib/easybook/README.md | 2 +- macros/latex/contrib/easybook/easybook.dtx | 14 +- macros/latex/contrib/easybook/easybook.pdf | Bin 582618 -> 582635 bytes macros/latex/contrib/easybook/easybook.tex | 42 +- 103 files changed, 1742 insertions(+), 159 deletions(-) create mode 100644 macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-comp.bbx create mode 100644 macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-comp.cbx create mode 100644 macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-ecomp.bbx create mode 100644 macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-ecomp.cbx create mode 100644 macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tcomp.bbx create mode 100644 macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tcomp.cbx create mode 100644 macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tecomp.bbx create mode 100644 macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tecomp.cbx create mode 100644 macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-terse.bbx create mode 100644 macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-terse.cbx create mode 100644 macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber.bbx create mode 100644 macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber.cbx create mode 100644 macros/latex/contrib/buctthesis/doc/figure/declare-master-doctor.png delete mode 100644 macros/latex/contrib/buctthesis/doc/figure/declare-master.png (limited to 'macros/latex/contrib') diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md index 4eddff4931..c6a95f4351 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md @@ -1,5 +1,15 @@ # Changelog +## Version 0.15 (2022-03-06) + +See + +### Added +- New `authornumber` style family. + +### Changed +- Updated for `biblatex` v3.17 (2022/02/02). + ## Version 0.14 (2021-08-31) See diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md index 17c9cb55e8..12adbae3f8 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md @@ -32,7 +32,13 @@ files - The `alphabetic` style family - `ext-alphabetic.bbx` and `ext-alphabetic.cbx` - `ext-alphabetic-verb.bbx` and `ext-alphabetic-verb.cbx` -- The `authoryear`/`authortitle` helper file `ext-dashed-common.bbx` +- The `authornumber` style family + - `ext-authornumber.bbx` and `ext-authornumber.cbx` + - `ext-authornumber-comp.bbx` and `ext-authornumber-comp.cbx` + - `ext-authornumber-ecomp.bbx` and `ext-authornumber-ecomp.cbx` + - `ext-authornumber-terse.bbx` and `ext-authornumber-terse.cbx` + - `ext-authornumber-tcomp.bbx` and `ext-authornumber-tcomp.cbx` + - `ext-authornumber-tecomp.bbx` and `ext-authornumber-tecomp.cbx` - The `authortitle` style family - `ext-authortitle-common.bbx` - `ext-authortitle.bbx` and `ext-authortitle.cbx` @@ -42,6 +48,7 @@ files - `ext-authortitle-terse.bbx` and `ext-authortitle-terse.cbx` - `ext-authortitle-tcomp.bbx` and `ext-authortitle-tcomp.cbx` - `ext-authortitle-ticomp.bbx` and `ext-authortitle-ticomp.cbx` +- The `authoryear`/`authortitle` helper file `ext-dashed-common.bbx` - The `authoryear` style family - `ext-authoryear-common.bbx` - `ext-authoryear.bbx` and `ext-authoryear.cbx` @@ -84,7 +91,7 @@ installation instructions. ## Licence -Copyright 2017-2021 Moritz Wemheuer +Copyright 2017-2022 Moritz Wemheuer This work consists of the `.bbx`, `.cbx`, `.def`, `.sty` and `.lua` files mentioned above. diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty index 8822d6e000..9a044048b3 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty @@ -1,5 +1,5 @@ \ProvidesPackage{biblatex-ext-oa-doiapi} - [2021/08/31 v0.14 Obtain open access information from DOI via + [2022/03/06 v0.15 Obtain open access information from DOI via unpaywall.org and doi.org (MW)] \RequirePackage{etoolbox} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty index b64fec05dd..6d1ae6bb77 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty @@ -1,5 +1,5 @@ \ProvidesPackage{biblatex-ext-oa} - [2021/08/31 v0.14 mark open access in biblatex bibliographies (MW)] + [2022/03/06 v0.15 mark open access in biblatex bibliographies (MW)] \RequirePackage{etoolbox} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty index bdafcd02a9..0c7d1cc69f 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty @@ -1,7 +1,7 @@ \RequirePackage{expl3} \ProvidesExplPackage {biblatex-ext-oasymb-l3draw} - {2021/08/31} {0.14} + {2022/03/06} {0.15} {open access symbols with l3draw (MW)} \RequirePackage{xparse} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty index 95697fb624..f60d985a38 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty @@ -1,5 +1,5 @@ \ProvidesPackage{biblatex-ext-oasymb-pict2e} - [2021/08/31 v0.14 open access symbols with pict2e (MW)] + [2022/03/06 v0.15 open access symbols with pict2e (MW)] \RequirePackage{etoolbox} \RequirePackage{kvoptions} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty index 22ea6648b0..c7e5aad228 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty @@ -1,5 +1,5 @@ \ProvidesPackage{biblatex-ext-oasymb-tikz} - [2021/08/31 v0.14 open access symbols with TikZ (MW)] + [2022/03/06 v0.15 open access symbols with TikZ (MW)] \RequirePackage{etoolbox} \RequirePackage{kvoptions} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty index 7e8a039af8..e3c4c4f88c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty @@ -1,5 +1,5 @@ \ProvidesPackage{biblatex-ext-tabular} - [2021/08/31 v0.14 tabular bibliographies for biblatex (MW)] + [2022/03/06 v0.15 tabular bibliographies for biblatex (MW)] % Code based on Audrey's % (https://tex.stackexchange.com/users/4483/audrey) diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf index 075c68cfcf..f5d9a3af2b 100644 Binary files a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf and b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf differ 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 28969eb88c..bc7c16c3ad 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex @@ -586,7 +586,7 @@ \newcommand*{\ctan}{\mkbibacro{CTAN}} \newcommand*{\gitbaseurl}{https://github.com/moewew/biblatex-ext} -\newcommand*{\extblxversion}{0.14} +\newcommand*{\extblxversion}{0.15} \newcommand*{\biber}{Biber} \newcommand*{\gitissuelink}[1]{% \href{\gitbaseurl/issues/#1}{issue \##1 on github}} @@ -659,7 +659,7 @@ author = {Moritz Wemheuer}, email = {mwemheu@posteo.de},% revision = {\extblxversion}, - date = {\DTMDate{2021-08-31}}, + date = {\DTMDate{2022-03-06}}, } \hypersetup{% @@ -824,7 +824,7 @@ under the terms of the \lppl, version 1.3c% \fnurl{https://www.latex-project.org/lppl/lppl-1-3c.txt} or (at your option) any later version% \fnurl{https://www.latex-project.org/lppl.txt}. -This bundle is maintained by Moritz Wemheuer (\textcopyright 2017--2021). +This bundle is maintained by Moritz Wemheuer (\textcopyright 2017--2022). \subsection{Feedback}\label{sec:feedback} @@ -1210,6 +1210,81 @@ A compact author-year citation style that combines Sigfridsson and Ryde \quad ibid. \quad Knuth 1984, 1986a\bibrangedash c \end{bibexample} + +\styleitem{ext-authornumber} +An author-number citation style. +The number is taken from the \bibfield{extraname} field +which increases separately for each labelname list. +\begin{bibexample} +\begin{lstlisting}[style=extblxstylelatex] +\usepackage[style=ext-authornumber]{biblatex} +\end{lstlisting} +\tcblower +Knuth [1]; Knuth [2]; Knuth [3]; Sigfridsson and Ryde [1] +\end{bibexample} + +\styleitem{ext-authornumber-comp} +A more compact version of \blxstyle{ext-authornumber} that prints +the author only once if subsequent references in the same citation +share the same author. +This style will print +\enquote{Knuth [1, 2]} instead of +\blxstyle{ext-authornumber}'s \enquote{Knuth [1]; Knuth [2]}. +The style will enable the \opt{sortcites} option. +\begin{bibexample} +\begin{lstlisting}[style=extblxstylelatex] +\usepackage[style=ext-authornumber-comp]{biblatex} +\end{lstlisting} +\tcblower +Knuth [1, 2, 3]; Sigfridsson and Ryde [1] +\end{bibexample} + +\styleitem{ext-authornumber-ecomp} +An even more compact version of \blxstyle{ext-authornumber-comp} +that also compresses the citation numbers if appropriate. +\enquote{Knuth [1--3]} instead of +\blxstyle{ext-authornumber-comp}'s \enquote{Knuth [1, 2, 3]}. +\begin{bibexample} +\begin{lstlisting}[style=extblxstylelatex] +\usepackage[style=ext-authornumber-ecomp]{biblatex} +\end{lstlisting} +\tcblower +Knuth [1--3]; Sigfridsson and Ryde [1] +\end{bibexample} + +\styleitem{ext-authornumber-terse} +A version of \blxstyle{ext-authornumber} which drops the number +if there is only one work by that author. +\begin{bibexample} +\begin{lstlisting}[style=extblxstylelatex] +\usepackage[style=authornumber-terse]{biblatex} +\end{lstlisting} +\tcblower +Knuth [1]; Knuth [2]; Knuth [3]; Sigfridsson and Ryde +\end{bibexample} + +\styleitem{ext-authornumber-tcomp} +A combination of \blxstyle{ext-authornumber-terse} +and \blxstyle{ext-authornumber-comp}. +\begin{bibexample} +\begin{lstlisting}[style=extblxstylelatex] +\usepackage[style=authornumber-comp]{biblatex} +\end{lstlisting} +\tcblower +Knuth [1, 2, 3]; Sigfridsson and Ryde +\end{bibexample} + +\styleitem{ext-authornumber-tecomp} +A combination of \blxstyle{ext-authornumber-terse} +and \blxstyle{ext-authornumber-ecomp}. +\begin{bibexample} +\begin{lstlisting}[style=extblxstylelatex] +\usepackage[style=authornumber-tecomp]{biblatex} +\end{lstlisting} +\tcblower +Knuth [1--3]; Sigfridsson and Ryde +\end{bibexample} + \end{stylelist} \clearpage @@ -1727,8 +1802,10 @@ be printed with the \hyperbibfieldformat{volumeof} format. \optitem[true]{dashed}{\optval{true}, \optval{false}, \optval{fullhash}, \optval{bibnamehash}} -The \opt{dashed} option of the \hyperblxstyle[ext-authoryear]{authoryear}- and -\hyperblxstyle[ext-authortitle]{authortitle}-like bibliography styles allows for +The \opt{dashed} option of the \hyperblxstyle[ext-authoryear]{authoryear}-, +\hyperblxstyle[ext-authortitle]{authortitle}- +and \hyperblxstyle[ext-authornumber]{ext-authornumber}-like +bibliography styles allows for finer control over the dashes than in the standard styles. The option is available globally and additionally on a per-type and per-entry level. @@ -1819,8 +1896,9 @@ lists are only replaced if they are indistinguishable in the data source. \begin{warnbox} The \opt{introcite} option is available for the bibliography styles of the -\hyperblxstyle[ext-authoryear]{authoryear} and -\hyperblxstyle[ext-authortitle]{authortitle} family. +\hyperblxstyle[ext-authoryear]{authoryear}, +\hyperblxstyle[ext-authortitle]{authortitle} +and \hyperblxstyle[ext-authornumber]{ext-authornumber} family. It cannot be used with citation styles of the \hyperblxstyle[ext-verbose]{verbose} family, where it may produce undesired output or errors. @@ -2131,6 +2209,18 @@ Field formats can be modified with \cmd{DeclareFieldFormat}. \begin{bibfieldformatlist} +\bibfieldformatitem{bibextraname} +The format for the number added to the name in +\hyperblxstyle[ext-authornumber]{ext-authornumber}-like styles. +The default is to wrap the number in square brackets. + \begin{bibexample} + \togglefalse{bbx:doi} + % VERY hacky, but we can't easily switch styles + \DeclareFieldFormat{biblabeldate}{\highlight{\bibopenbracket}\highlight[2]{1}% + \highlight{\bibclosebracket}} + \exampleprintbib{sigfridsson} + \end{bibexample} + \bibfieldformatitem{biblabeldate} The format for the labeldate in the bibliography for \hyperblxstyle[ext-authoryear]{authoryear}-like styles. The default is to wrap the date in round brackets. @@ -2258,6 +2348,24 @@ A short overview over common punctuation commands defined by \sty{biblatex-ext} as well as standard \sty{biblatex} in an example bibliography can be found in \cref{sec:punctinuse}. \begin{ltxsyntax} +\csitem{namenumberdelim}\CSdelimMark +Similar to \cmd{nametitledelim}, but for the punctuation between +the name and the label number in +\hyperblxstyle[ext-authornumber]{ext-authornumber} styles. +The default is a space. + \begin{bibexample} + \togglefalse{bbx:doi} + % VERY hacky, but we can't easily switch styles + \DeclareFieldFormat{biblabeldate}{\mkbibbrackets{1}} + \DeclareDelimFormat[bib]{nameyeardelim}{\highlight{\textvisiblespace}} + \exampleprintbib{sigfridsson} + \end{bibexample} + +\csitem{nonamenumberdelim}\CSdelimMark +The replacement for \hypercmd{namenumberdelim} if the labelname +does not exist and is replaced by a fallback. +By default this is an alias of \hypercmd{namenumberdelim}. + \csitem{innametitledelim}\CSdelimMark Similar to \cmd{nametitledelim}, but for names after the \enquote{in:} if \hyperopt{innamebeforetitle} is \optval{true}. @@ -2555,7 +2663,7 @@ The default is a comma followed by a space. \csitem{extradateonlycompcitedelim}\CSdelimMark Similar to \cmd{compcitedelim}, but indended for use between compressed -citations where the second is an \bibfield{extradate} only. +author-year citations where the second is an \bibfield{extradate} only. The default is a comma (\emph{not} followed by a space). \begin{bibexample} \DeclareDelimFormat{extradateonlycompcitedelim}{\highlightbf{\addcomma}} @@ -2572,6 +2680,17 @@ The default is \cmd{bibrangedash}. \highlightbf{\bibrangedash}} \cite{knuth:ct:b,knuth:ct:c,knuth:ct:d} \end{bibexample} + + +\csitem{extranameonlycompcitedelim}\CSdelimMark +Similar to \cmd{compcitedelim}, but indended for use between compressed +author-number citations. +The default is a comma (\emph{not} followed by a space). + +\csitem{extranameonlycompciterangedelim}\CSdelimMark +Similar to \hypercmd{extranameonlycompcitedelim}, but indended for use in a +compressed list of \bibfield{extraname}s in the \blxstyle{-ecomp} styles. +The default is \cmd{bibrangedash}. \end{ltxsyntax} \subsection{Delimiters for citation commands}\label{sec:opt:citedelims} @@ -2639,6 +2758,12 @@ Style family & \cmd{cite} & \cmd{parencite} & \cmd{textcite}\\ \highlightbf[2]{\hmpdl}1984\highlightbf[2]{\hmpdr}% \highlightbf[1]{)} & \highlightbf[1]{\hmpdl}Knuth \highlightbf[2]{(}1984\highlightbf[2]{)}\highlightbf[1]{\hmpdr}\\ +\blxstyle{authornumber} & \highlightbf[1]{\hmpdl}Knuth + \highlightbf[2]{[}1\highlightbf[2]{]}% + \highlightbf[1]{\hmpdr} & \highlightbf[1]{(}Knuth + \highlightbf[2]{\hmpdl}1\highlightbf[2]{\hmpdr}% + \highlightbf[1]{)} & \highlightbf[1]{\hmpdl}Knuth + \highlightbf[2]{[}1\highlightbf[2]{]}\highlightbf[1]{\hmpdr}\\ \bottomrule \end{tabular} \end{table} @@ -3937,6 +4062,10 @@ See also \filename{CHANGES.md}. The numbers on the right indicate the relevant section of the manual. \begin{changelog} +\begin{release}{0.15}{2022-03-06} + \item New \hyperblxstyle[ext-authornumber]{ext-authornumber-*} style + subfamily\see{sec:styles:new} +\end{release} \begin{release}{0.14}{2021-08-31} \item Use \hyperbibmacro{language} bibmacro also in \bibtype{dataset} driver\see{sec:opt:bibmacros} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua b/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua index b3a891a0a7..20e5f7e9ed 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua @@ -2,8 +2,8 @@ blxextdoiapi = blxextdoiapi or {} local blxextdoiapi_module = { name = "blxextdoiapi", - version = "v0.14", - date = "2021/08/31", + version = "v0.15", + date = "2022/03/06", description = "Obtain open access information from DOI via unpaywall.org", author = "Moritz Wemheuer", license = "LPPL v1.3c", diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx index 3dee92a2bc..d0c9285e1f 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-alphabetic-verb.bbx} - [2021/08/31 v0.14 extended biblatex alphabetic-verb + [2022/03/06 v0.15 extended biblatex alphabetic-verb bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx index a46d86834c..327df9ac59 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-alphabetic-verb.cbx} - [2021/08/31 v0.14 extended biblatex alphabetic-verb citation style + [2022/03/06 v0.15 extended biblatex alphabetic-verb citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx index c84dde210c..aed09a1ca9 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-alphabetic.bbx} - [2021/08/31 v0.14 extended biblatex alphabetic bibliography style (MW)] + [2022/03/06 v0.15 extended biblatex alphabetic bibliography style (MW)] \RequireBibliographyStyle{ext-standard} \RequireBibliographyStyle{alphabetic} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx index 3f9883a07f..e973036d8e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-alphabetic.cbx} - [2021/08/31 v0.14 extended biblatex alphabetic citation style (MW)] + [2022/03/06 v0.15 extended biblatex alphabetic citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-comp.bbx new file mode 100644 index 0000000000..4235479377 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-comp.bbx @@ -0,0 +1,19 @@ +\ProvidesFile{ext-authornumber-comp.bbx} + [2022/03/06 v0.15 extended biblatex authoryear bibliography style (MW)] + +\RequireBibliographyStyle{ext-authornumber} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in +% README.md or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-comp.cbx new file mode 100644 index 0000000000..1cf8e3b510 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-comp.cbx @@ -0,0 +1,320 @@ +\ProvidesFile{ext-authornumber-comp.cbx} + [2022/03/06 v0.15 extended biblatex authoryear citation style (MW)] + +\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} + {}{}{}{} + +\ExecuteBibliographyOptions{uniquename,uniquelist,sortcites,autocite=plain} + +\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen} +\DeclareInnerCiteDelims{cite}{\bibopenbracket}{\bibclosebracket} +\DeclareInnerCiteDelims{footcite}{\bibopenbracket}{\bibclosebracket} +\DeclareInnerCiteDelims{textcite}{\bibopenbracket}{\bibclosebracket} + + +\DeclareFieldFormat{extblx@innercitedelims}{#1} +\DeclareFieldFormat{extblx@innerparencitedelims}{#1} +\DeclareFieldFormat{extblx@innertextcitedelims}{#1} +\DeclareFieldFormat{extblx@innerfootcitedelims}{#1} +\DeclareFieldAlias + {extblx@innerfootcitetextdelims} + {extblx@innerfootcitedelims} +\DeclareFieldFormat{extblx@innerbbx@xrefcitedelims}{#1} + + +\renewcommand*{\iffinalcitedelim}{% + \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}} + +\newbool{cbx:parens} + +\newbibmacro*{cite:init}{% + \ifnumless{\value{multicitecount}}{2} + {\global\boolfalse{cbx:parens}% + \global\undef\cbx@lasthash} + {\iffieldundef{prenote} + {} + {\global\undef\cbx@lasthash}}} + +\newbibmacro*{cite:reinit}{% + \global\undef\cbx@lasthash} + +\DeclareDelimFormat{namenumberdelim}{\addspace} +\DeclareDelimAlias{nonamenumberdelim}{namenumberdelim} + +\newbibmacro*{cite}{% + \iffieldundef{shorthand} + {\ifnameundef{labelname} + {\usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonamenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \usebibmacro{cite:extraname}% + \usebibmacro{cite:reinit}} + {\iffieldequals{namehash}{\cbx@lasthash} + {\setunit{\compcitedelim}% + \usebibmacro{cite:extraname}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{namenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \usebibmacro{cite:extraname}% + \savefield{namehash}{\cbx@lasthash}}}} + {\usebibmacro{cite:shorthand}% + \usebibmacro{cite:reinit}}% + \setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \multicitedelim}} + +\newbibmacro*{cite:extraname}{% + \printtext[extblx@inner\blx@delimcontext delims]{% + \printtext[bibhyperref]{% + \iffieldundef{extraname} + {\printtext[extraname]{1}} + {\printfield{extraname}}}}} + +\newbibmacro*{cite:shorthand}{% + \printtext[bibhyperref]{\printfield{shorthand}}} + +\newbibmacro*{cite:label}{% + \iffieldundef{label} + {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} + {\printtext[bibhyperref]{\printfield{label}}}} + +\newbibmacro*{citenum}{% + \iffieldundef{shorthand} + {\iffieldequals{namehash}{\cbx@lasthash} + {\setunit{\compcitedelim}} + {\ifundef\cbx@lasthash + {} + {\extblx@warning{% + Headless citation to different labelnames\MessageBreak + may lead to weird results}}}% + \usebibmacro{cite:extraname}% + \savefield{namehash}{\cbx@lasthash}} + {\usebibmacro{cite:shorthand}% + \usebibmacro{cite:reinit}}% + \setunit{\multicitedelim}} + +\newbibmacro*{cite:postnote}{% + \setunit{}% + \printtext{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}}% + \usebibmacro{postnote}} + +\newbibmacro*{textcite}{% + \iffieldequals{namehash}{\cbx@lasthash} + {\setunit{\compcitedelim}% + \iffieldundef{shorthand} + {\usebibmacro{cite:extraname}} + {\usebibmacro{cite:shorthand}}} + {\ifnameundef{labelname} + {\iffieldundef{shorthand} + {\usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonamenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite:extraname}} + {\usebibmacro{cite:shorthand}}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{namenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\usebibmacro{cite:extraname}} + {\usebibmacro{cite:shorthand}}% + \stepcounter{textcitecount}% + \savefield{namehash}{\cbx@lasthash}}}% + \setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}} + +\newbibmacro*{textcite:postnote}{% + \usebibmacro{postnote}% + \ifnumequal{\value{multicitecount}}{\value{multicitetotal}} + {\setunit{}% + \printtext{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}}} + {\setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}}} + +\DeclareCiteCommand{\cite}[\mkoutercitedelims] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand*{\cite}[\mkoutercitedelims] + {\delimcontext{cite}% + \usebibmacro{cite:init}% + \usebibmacro{prenote}% + \printtext{% + \global\booltrue{cbx:parens}% + \printdelim{nonamenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}} + {\usebibmacro{citeindex}% + \usebibmacro{citenum}} + {} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\parencite}[\mkouterparencitedelims] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims] + {\delimcontext{parencite}% + \usebibmacro{cite:init}% + \usebibmacro{prenote}% + \printtext{% + \global\booltrue{cbx:parens}% + \printdelim{nonamenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}} + {\usebibmacro{citeindex}% + \usebibmacro{citenum}} + {} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcite] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:postnote}} + +% smartcite's delimcontext needs special attention +% (see ext-biblatex-aux.def) +\DeclareCiteCommand{\smartcite}[\mksmartcite] + {\delimcontext{\extblx@thisdelimcontext}% + \usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims] + {\usebibmacro{cite:init}} + {\usebibmacro{citeindex}% + \usebibmacro{textcite}} + {} + {\usebibmacro{textcite:postnote}} + +\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite] + {\gdef\cbx@savedkeys{}% + \citetrackerfalse% + \pagetrackerfalse% + \DeferNextCitekeyHook% + \usebibmacro{cite:init}} + {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0} + {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}% + \global\clearfield{multipostnote}} + {}% + \xappto\cbx@savedkeys{\thefield{entrykey},}% + \iffieldequals{namehash}{\cbx@lasthash} + {} + {\stepcounter{textcitetotal}% + \savefield{namehash}{\cbx@lasthash}}} + {} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + +% textcite has nested \DeclareCiteCommand definitions for textcite and we want to use +% the normal textcite context +\DeclareDelimcontextAlias{cbx@textcite}{textcite} + +\newrobustcmd{\cbx@textcite@init}[2]{% + \setcounter{textcitetotal}{0}% + \setcounter{textcitecount}{0}% + \def\cbx@savedcites{#1}#2\cbx@savedcites\empty} + +\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{} +\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{} + +\let\cbx@textcites@init\cbx@textcite@init +\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{} + +\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims] + {\cbx@textcite}{} + +\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims] + {\cite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] + {\parencite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\smartcites}[\mksmartcite] + {\smartcite}{\setunit{\multicitedelim}} + +\DeclareFieldFormat{extblx@innerbbx@introcitedelims}{% + \csuse{mkinner\blx@delimcontext delims}{#1}} + +\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims] + {\boolfalse{citetracker}% + \boolfalse{pagetracker}% + \boolfalse{backtracker}% + \usebibmacro{cite:init}} + {\usebibmacro{bbx:inxrefcite}} + {} + {\usebibmacro{cite:postnote}} + +\renewbibmacro*{bbx:introcite}{% + \usebibmacro{cite}% + \clearfield{postnote}% + \usebibmacro{cite:postnote}} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in +% README.md or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-ecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-ecomp.bbx new file mode 100644 index 0000000000..4235479377 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-ecomp.bbx @@ -0,0 +1,19 @@ +\ProvidesFile{ext-authornumber-comp.bbx} + [2022/03/06 v0.15 extended biblatex authoryear bibliography style (MW)] + +\RequireBibliographyStyle{ext-authornumber} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in +% README.md or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-ecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-ecomp.cbx new file mode 100644 index 0000000000..e24aa2f56a --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-ecomp.cbx @@ -0,0 +1,430 @@ +\ProvidesFile{ext-authornumber-ecomp.cbx} + [2022/03/06 v0.15 extended biblatex authoryear citation style (MW)] + +\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} + {}{}{}{} + +\ExecuteBibliographyOptions{uniquename,uniquelist,sortcites,autocite=plain} + +\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen} +\DeclareInnerCiteDelims{cite}{\bibopenbracket}{\bibclosebracket} +\DeclareInnerCiteDelims{footcite}{\bibopenbracket}{\bibclosebracket} +\DeclareInnerCiteDelims{textcite}{\bibopenbracket}{\bibclosebracket} + + +\DeclareFieldFormat{extblx@innercitedelims}{#1} +\DeclareFieldFormat{extblx@innerparencitedelims}{#1} +\DeclareFieldFormat{extblx@innertextcitedelims}{#1} +\DeclareFieldFormat{extblx@innerfootcitedelims}{#1} +\DeclareFieldAlias + {extblx@innerfootcitetextdelims} + {extblx@innerfootcitedelims} +\DeclareFieldFormat{extblx@innerbbx@xrefcitedelims}{#1} + + +\renewcommand*{\iffinalcitedelim}{% + \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}} + +\newbool{cbx:parens} + +\newcounter{cbx@extranamecount} + +\newbibmacro*{cite:init}{% + \ifnumless{\value{multicitecount}}{2} + {\global\boolfalse{cbx:parens}% + \global\undef\cbx@lastkey + \global\undef\cbx@lasthash + \global\undef\cbx@lastextraname + \setcounter{cbx@extranamecount}{0}} + {\iffieldundef{prenote} + {} + {\global\undef\cbx@lastkey + \global\undef\cbx@lasthash + \global\undef\cbx@lastextraname + \setcounter{cbx@extranamecount}{0}}}} + +\newbibmacro*{cite:reinit}{% + \global\undef\cbx@lastkey + \global\undef\cbx@lasthash + \global\undef\cbx@lastextraname + \setcounter{cbx@extranamecount}{0}} + +\DeclareDelimFormat{namenumberdelim}{\addspace} +\DeclareDelimAlias{nonamenumberdelim}{namenumberdelim} + +\DeclareDelimFormat{extranameonlycompcitedelim}{\addcomma} +\DeclareDelimFormat{extranameonlycompciterangedelim}{\bibrangedash} + +\newbibmacro*{generic:dump:extraname}{% + \ifundef\cbx@lastkey + {} + {\entrydata{\cbx@lastkey} + {\ifnumless{\value{cbx@extranamecount}}{1} + {\extblx@warning{% This should not happen + Uh-oh!\MessageBreak + The extraname compression is quite likely\MessageBreak + wrong for \cbx@lastkey.\MessageBreak + This should not happen.\MessageBreak + Please report this as a bug}}% + {}% + \ifnumgreater{\value{cbx@extranamecount}}{1} + {\setunit{\printdelim{extranameonlycompciterangedelim}}} + {\setunit{\printdelim{extranameonlycompcitedelim}}}% + \usebibmacro{cite:extraname}}% + \setunit{\cbx@thiscitedelim}}% + \global\undef\cbx@lastkey + \setcounter{cbx@extranamecount}{0}% +} + +\newbibmacro*{cite:dump:extraname}{% + \def\cbx@thiscitedelim{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \multicitedelim}% + \usebibmacro{generic:dump:extraname}} + +\newbibmacro*{textcite:dump:extraname}{% + \def\cbx@thiscitedelim{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}% + \usebibmacro{generic:dump:extraname}} + +\newbibmacro*{cite:comp:extraname}{% + \ifnumequal{\cbx@lastextraname+1}{0\thefield{extraname}} + {\stepcounter{cbx@extranamecount}% + \savefield{entrykey}{\cbx@lastkey}} + {\usebibmacro{cite:dump:extraname}% + \setunit{\extranameonlycompcitedelim}% + \usebibmacro{cite:extraname}}% + \iffieldundef{extraname} + {\gdef\cbx@lastextraname{1}} + {\savefield{extraname}{\cbx@lastextraname}}% +} + +\newbibmacro*{cite}{% + \iffieldundef{shorthand} + {\ifnameundef{labelname} + {\usebibmacro{cite:dump:extraname}% + \usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonamenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \usebibmacro{cite:extraname}% + \usebibmacro{cite:reinit}} + {\iffieldequals{namehash}{\cbx@lasthash} + {\ifboolexpr{ + ( test {\ifnumequal{\value{multicitecount}}{0}} + or test {\iffieldundef{postnote}})} + {\usebibmacro{cite:comp:extraname}} + {\usebibmacro{cite:dump:extraname}% + \setunit{\compcitedelim}% + \usebibmacro{cite:extraname}% + \iffieldundef{extraname} + {\gdef\cbx@lastextraname{1}} + {\savefield{extraname}{\cbx@lastextraname}}% + \setcounter{cbx@extranamecount}{0}}} + {\usebibmacro{cite:dump:extraname}% + \printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{namenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \usebibmacro{cite:extraname}% + \savefield{namehash}{\cbx@lasthash}% + \iffieldundef{extraname} + {\gdef\cbx@lastextraname{1}} + {\savefield{extraname}{\cbx@lastextraname}}% + \setcounter{cbx@extranamecount}{0}}}} + {\usebibmacro{cite:dump:extraname}% + \usebibmacro{cite:shorthand}% + \usebibmacro{cite:reinit}}% + \setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \multicitedelim}} + +\newbibmacro*{cite:extraname}{% + \printtext[extblx@inner\blx@delimcontext delims]{% + \printtext[bibhyperref]{% + \iffieldundef{extraname} + {\printtext[extraname]{1}} + {\printfield{extraname}}}}} + +\newbibmacro*{cite:shorthand}{% + \printtext[bibhyperref]{\printfield{shorthand}}} + +\newbibmacro*{cite:label}{% + \iffieldundef{label} + {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} + {\printtext[bibhyperref]{\printfield{label}}}} + +\newbibmacro*{citenum}{% + \iffieldundef{shorthand} + {\iffieldequals{namehash}{\cbx@lasthash} + {\setunit{\compcitedelim}% + \usebibmacro{cite:comp:extraname}} + {\ifundef\cbx@lasthash + {} + {\extblx@warning{% + Headless citation to different labelnames\MessageBreak + may lead to weird results}}% + \usebibmacro{cite:dump:extraname}% + \usebibmacro{cite:extraname}% + \savefield{namehash}{\cbx@lasthash}% + \iffieldundef{extraname} + {\gdef\cbx@lastextraname{1}} + {\savefield{extraname}{\cbx@lastextraname}}% + \setcounter{cbx@extranamecount}{0}% + \savefield{namehash}{\cbx@lasthash}}} + {\usebibmacro{cite:shorthand}% + \usebibmacro{cite:reinit}}% + \setunit{\multicitedelim}} + +\newbibmacro*{cite:postnote}{% + \setunit{}% + \printtext{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}}% + \usebibmacro{postnote}} + +\newbibmacro*{textcite}{% + \iffieldequals{namehash}{\cbx@lasthash} + {\iffieldundef{shorthand} + {\ifboolexpr{(test {\ifnumequal{\value{multicitecount}}{0}} + or test {\iffieldundef{postnote}})} + {\usebibmacro{cite:comp:extraname}} + {\usebibmacro{textcite:dump:extraname}% + \setunit{\compcitedelim}% + \usebibmacro{cite:extraname}% + \iffieldundef{extraname} + {\gdef\cbx@lastextraname{1}} + {\savefield{extraname}{\cbx@lastextraname}}% + \setcounter{cbx@extranamecount}{0}}} + {\usebibmacro{textcite:dump:extraname} + \setunit{\compcitedelim}% + \usebibmacro{cite:shorthand}}} + {\usebibmacro{textcite:dump:extraname}% + \ifnameundef{labelname} + {\iffieldundef{shorthand} + {\usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonamenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite:extraname}} + {\usebibmacro{cite:shorthand}}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{namenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\usebibmacro{cite:extraname}% + \iffieldundef{extraname} + {\gdef\cbx@lastextraname{1}} + {\savefield{extraname}{\cbx@lastextraname}}% + \setcounter{cbx@extranamecount}{0}} + {\usebibmacro{cite:shorthand}}}% + \stepcounter{textcitecount}% + \savefield{namehash}{\cbx@lasthash}}% + \setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}} + +\newbibmacro*{textcite:postnote}{% + \usebibmacro{postnote}% + \ifnumequal{\value{multicitecount}}{\value{multicitetotal}} + {\setunit{}% + \printtext{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}}} + {\setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}}} + +\DeclareCiteCommand{\cite}[\mkoutercitedelims] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:dump:extraname}% + \usebibmacro{cite:postnote}} + +\DeclareCiteCommand*{\cite}[\mkoutercitedelims] + {\delimcontext{cite}% + \usebibmacro{cite:init}% + \usebibmacro{prenote}% + \printtext{% + \global\booltrue{cbx:parens}% + \printdelim{nonamenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}} + {\usebibmacro{citeindex}% + \usebibmacro{citenum}} + {} + {\usebibmacro{cite:dump:extraname}% + \usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\parencite}[\mkouterparencitedelims] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:dump:extraname}% + \usebibmacro{cite:postnote}} + +\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims] + {\delimcontext{parencite}% + \usebibmacro{cite:init}% + \usebibmacro{prenote}% + \printtext{% + \global\booltrue{cbx:parens}% + \printdelim{nonamenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}} + {\usebibmacro{citeindex}% + \usebibmacro{citenum}} + {} + {\usebibmacro{cite:dump:extraname}% + \usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcite] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:dump:extraname}% + \usebibmacro{cite:postnote}} + +% smartcite's delimcontext needs special attention +% (see ext-biblatex-aux.def) +\DeclareCiteCommand{\smartcite}[\mksmartcite] + {\delimcontext{\extblx@thisdelimcontext}% + \usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:dump:extraname}% + \usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims] + {\usebibmacro{cite:init}} + {\usebibmacro{citeindex}% + \usebibmacro{textcite}} + {} + {\usebibmacro{cite:dump:extraname}% + \usebibmacro{textcite:postnote}} + +\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite] + {\gdef\cbx@savedkeys{}% + \citetrackerfalse% + \pagetrackerfalse% + \DeferNextCitekeyHook% + \usebibmacro{cite:init}} + {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0} + {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}% + \global\clearfield{multipostnote}} + {}% + \xappto\cbx@savedkeys{\thefield{entrykey},}% + \iffieldequals{namehash}{\cbx@lasthash} + {} + {\stepcounter{textcitetotal}% + \savefield{namehash}{\cbx@lasthash}}} + {} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + +% textcite has nested \DeclareCiteCommand definitions for textcite and we want to use +% the normal textcite context +\DeclareDelimcontextAlias{cbx@textcite}{textcite} + +\newrobustcmd{\cbx@textcite@init}[2]{% + \setcounter{textcitetotal}{0}% + \setcounter{textcitecount}{0}% + \def\cbx@savedcites{#1}#2\cbx@savedcites\empty} + +\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{} +\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{} + +\let\cbx@textcites@init\cbx@textcite@init +\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{} + +\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims] + {\cbx@textcite}{} + +\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims] + {\cite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] + {\parencite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\smartcites}[\mksmartcite] + {\smartcite}{\setunit{\multicitedelim}} + +\DeclareFieldFormat{extblx@innerbbx@introcitedelims}{% + \csuse{mkinner\blx@delimcontext delims}{#1}} + +\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims] + {\boolfalse{citetracker}% + \boolfalse{pagetracker}% + \boolfalse{backtracker}% + \usebibmacro{cite:init}} + {\usebibmacro{bbx:inxrefcite}} + {} + {\usebibmacro{cite:postnote}} + +\renewbibmacro*{bbx:introcite}{% + \usebibmacro{cite}% + \clearfield{postnote}% + \usebibmacro{cite:postnote}} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in +% README.md or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tcomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tcomp.bbx new file mode 100644 index 0000000000..0dd1bcdaa9 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tcomp.bbx @@ -0,0 +1,19 @@ +\ProvidesFile{ext-authornumber-tcomp.bbx} + [2022/03/06 v0.15 extended biblatex authoryear bibliography style (MW)] + +\RequireBibliographyStyle{ext-authornumber-terse} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in +% README.md or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tcomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tcomp.cbx new file mode 100644 index 0000000000..31b461d569 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tcomp.cbx @@ -0,0 +1,92 @@ +\ProvidesFile{ext-authornumber-tcomp.cbx} + [2022/03/06 v0.15 extended biblatex authoryear citation style (MW)] + +\RequireCitationStyle{ext-authornumber-comp} + +\renewbibmacro*{cite}{% + \iffieldundef{shorthand} + {\ifnameundef{labelname} + {\usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonamenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \usebibmacro{cite:extraname}% + \usebibmacro{cite:reinit}} + {\iffieldequals{namehash}{\cbx@lasthash} + {\setunit{\compcitedelim}% + \usebibmacro{cite:extraname}} + {\iffieldundef{extraname} + {\printtext[bibhyperref]{\printnames{labelname}}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \usebibmacro{cite:extraname}% + \savefield{namehash}{\cbx@lasthash}}}}} + {\usebibmacro{cite:shorthand}% + \usebibmacro{cite:reinit}}% + \setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \multicitedelim}} + +\renewbibmacro*{textcite}{% + \iffieldequals{namehash}{\cbx@lasthash} + {\setunit{\compcitedelim}% + \iffieldundef{shorthand} + {\usebibmacro{cite:extraname}} + {\usebibmacro{cite:shorthand}}} + {\ifnameundef{labelname} + {\iffieldundef{shorthand} + {\usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonamenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite:extraname}} + {\usebibmacro{cite:shorthand}}} + {\ifthenelse{\iffieldundef{extraname}\AND + \(\iffieldundef{prenote}\OR\value{citecount}>1\)} + {\printtext[bibhyperref]{\printnames{labelname}}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{namenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\usebibmacro{cite:extraname}} + {\usebibmacro{cite:shorthand}}% + \stepcounter{textcitecount}% + \savefield{namehash}{\cbx@lasthash}}}}% + \setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}} + + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in +% README.md or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tecomp.bbx new file mode 100644 index 0000000000..59d5e17a9e --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tecomp.bbx @@ -0,0 +1,19 @@ +\ProvidesFile{ext-authornumber-tecomp.bbx} + [2022/03/06 v0.15 extended biblatex authoryear bibliography style (MW)] + +\RequireBibliographyStyle{ext-authornumber-terse} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in +% README.md or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tecomp.cbx new file mode 100644 index 0000000000..92781ee713 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tecomp.cbx @@ -0,0 +1,124 @@ +\ProvidesFile{ext-authornumber-tecomp.cbx} + [2022/03/06 v0.15 extended biblatex authoryear citation style (MW)] + +\RequireCitationStyle{ext-authornumber-ecomp} + +\renewbibmacro*{cite}{% + \iffieldundef{shorthand} + {\ifnameundef{labelname} + {\usebibmacro{cite:dump:extraname}% + \usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonamenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \usebibmacro{cite:extraname}% + \usebibmacro{cite:reinit}} + {\iffieldequals{namehash}{\cbx@lasthash} + {\ifboolexpr{ + ( test {\ifnumequal{\value{multicitecount}}{0}} + or test {\iffieldundef{postnote}})} + {\usebibmacro{cite:comp:extraname}} + {\usebibmacro{cite:dump:extraname}% + \setunit{\compcitedelim}% + \usebibmacro{cite:extraname}% + \iffieldundef{extraname} + {\gdef\cbx@lastextraname{1}} + {\savefield{extraname}{\cbx@lastextraname}}% + \setcounter{cbx@extranamecount}{0}}} + {\usebibmacro{cite:dump:extraname}% + \iffieldundef{extraname} + {\printtext[bibhyperref]{\printnames{labelname}}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{namenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \usebibmacro{cite:extraname}}% + \savefield{namehash}{\cbx@lasthash}% + \iffieldundef{extraname} + {\gdef\cbx@lastextraname{1}} + {\savefield{extraname}{\cbx@lastextraname}}% + \setcounter{cbx@extranamecount}{0}}}} + {\usebibmacro{cite:dump:extraname}% + \usebibmacro{cite:shorthand}% + \usebibmacro{cite:reinit}}% + \setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \multicitedelim}} + + +\renewbibmacro*{textcite}{% + \iffieldequals{namehash}{\cbx@lasthash} + {\iffieldundef{shorthand} + {\ifboolexpr{(test {\ifnumequal{\value{multicitecount}}{0}} + or test {\iffieldundef{postnote}})} + {\usebibmacro{cite:comp:extraname}} + {\usebibmacro{textcite:dump:extraname}% + \setunit{\compcitedelim}% + \usebibmacro{cite:extraname}% + \iffieldundef{extraname} + {\gdef\cbx@lastextraname{1}} + {\savefield{extraname}{\cbx@lastextraname}}% + \setcounter{cbx@extranamecount}{0}}} + {\usebibmacro{textcite:dump:extraname} + \setunit{\compcitedelim}% + \usebibmacro{cite:shorthand}}} + {\usebibmacro{textcite:dump:extraname}% + \ifnameundef{labelname} + {\iffieldundef{shorthand} + {\usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonamenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite:extraname}} + {\usebibmacro{cite:shorthand}}} + {\ifthenelse{\iffieldundef{extraname}\AND + \(\iffieldundef{prenote}\OR\value{citecount}>1\)} + {\printtext[bibhyperref]{\printnames{labelname}}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{namenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\usebibmacro{cite:extraname}% + \iffieldundef{extraname} + {\gdef\cbx@lastextraname{1}} + {\savefield{extraname}{\cbx@lastextraname}}% + \setcounter{cbx@extranamecount}{0}} + {\usebibmacro{cite:shorthand}% + \usebibmacro{cite:reinit}}}}% + \stepcounter{textcitecount}% + \savefield{namehash}{\cbx@lasthash}}% + \setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in +% README.md or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-terse.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-terse.bbx new file mode 100644 index 0000000000..4fbb237f01 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-terse.bbx @@ -0,0 +1,26 @@ +\ProvidesFile{ext-authornumber-terse.bbx} + [2022/03/06 v0.15 extended biblatex authoryear bibliography style (MW)] + +\RequireBibliographyStyle{ext-authornumber} + +\renewbibmacro{extraname}{% + \iffieldundef{shorthand} + {\iffieldundef{extraname} + {} + {\printtext[bibextraname]{\printfield{extraname}}}} + {\printtext[bibextraname]{\printfield{shorthand}}}} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in +% README.md or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-terse.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-terse.cbx new file mode 100644 index 0000000000..3060f24e95 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-terse.cbx @@ -0,0 +1,57 @@ +\ProvidesFile{ext-authornumber-terse.cbx} + [2022/03/06 v0.15 extended biblatex authoryear citation style (MW)] + +\RequireCitationStyle{ext-authornumber} + +\renewbibmacro*{cite}{% + \iffieldundef{shorthand} + {\ifthenelse{\ifnameundef{labelname}} + {\usebibmacro{cite:label}% + \setunit{\printdelim{nonamenumberdelim}}} + {\iffieldundef{extraname} + {\printtext[bibhyperref]{\printnames{labelname}}} + {\printnames{labelname}% + \setunit{\printdelim{namenumberdelim}}% + \usebibmacro{cite:extraname}}}}% + {\usebibmacro{cite:shorthand}}} + +\renewbibmacro*{textcite}{% + \ifnameundef{labelname} + {\iffieldundef{shorthand} + {\usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonamenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite:extraname}} + {\usebibmacro{cite:shorthand}}} + {\ifthenelse{\iffieldundef{extraname}\AND + \(\iffieldundef{prenote}\OR\value{citecount}>1\)} + {\printtext[bibhyperref]{\printnames{labelname}}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{namenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{citenum}}}} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in +% README.md or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber.bbx new file mode 100644 index 0000000000..6eb1bbee2e --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber.bbx @@ -0,0 +1,96 @@ +\ProvidesFile{ext-authornumber.bbx} + [2022/03/06 v0.15 extended biblatex authoryear bibliography style (MW)] + +\RequireBibliographyStyle{ext-standard} +\RequireBibliographyStyle{ext-authortitle} + +\ExecuteBibliographyOptions{sorting=nyt} + +\DeclareDelimFormat{namenumberdelim}{\addspace} +\DeclareDelimAlias{nonamenumberdelim}{namenumberdelim} + +\renewbibmacro*{author}{% + \ifboolexpr{ + test \ifuseauthor + and + not test {\ifnameundef{author}} + } + {\usebibmacro{bbx:dashcheck} + {\bibnamedash} + {\usebibmacro{bbx:savehash}% + \printnames{author}% + \iffieldundef{authortype} + {\setunit{\printdelim{namenumberdelim}}} + {\setunit{\printdelim{authortypedelim}}}}% + \iffieldundef{authortype} + {} + {\usebibmacro{authorstrg}% + \setunit{\printdelim{namenumberdelim}}}}% + {\global\undef\bbx@lasthash + \usebibmacro{labeltitle}% + \setunit*{\printdelim{nonamenumberdelim}}}% + \usebibmacro{extraname}} + +\renewbibmacro*{bbx:editor}[1]{% + \ifboolexpr{ + test \ifuseeditor + and + not test {\ifnameundef{editor}} + } + {\usebibmacro{bbx:dashcheck} + {\bibnamedash} + {\printnames{editor}% + \setunit{\printdelim{editortypedelim}}% + \usebibmacro{bbx:savehash}}% + \usebibmacro{#1}% + \clearname{editor}% + \setunit{\printdelim{namenumberdelim}}}% + {\global\undef\bbx@lasthash + \usebibmacro{labeltitle}% + \setunit*{\printdelim{nonamenumberdelim}}}% + \usebibmacro{extraname}} + +\renewbibmacro*{bbx:translator}[1]{% + \ifboolexpr{ + test \ifusetranslator + and + not test {\ifnameundef{translator}} + } + {\usebibmacro{bbx:dashcheck} + {\bibnamedash} + {\printnames{translator}% + \setunit{\printdelim{translatortypedelim}}% + \usebibmacro{bbx:savehash}}% + \usebibmacro{#1}% + \clearname{translator}% + \setunit{\printdelim{namenumberdelim}}}% + {\global\undef\bbx@lasthash + \usebibmacro{labeltitle}% + \setunit*{\printdelim{nonamenumberdelim}}}% + \usebibmacro{extraname}} + + +\DeclareFieldFormat{bibextraname}{\mkbibbrackets{#1}} +\newbibmacro{extraname}{% + \printtext[bibextraname]{% + \iffieldundef{shorthand} + {\iffieldundef{extraname} + {\printtext[extraname]{1}} + {\printfield{extraname}}} + {\printfield{shorthand}}}} + + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in +% README.md or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber.cbx new file mode 100644 index 0000000000..7891e7fe48 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber.cbx @@ -0,0 +1,203 @@ +\ProvidesFile{ext-authornumber.cbx} + [2022/03/06 v0.15 extended biblatex authoryear citation style (MW)] + +\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} + {}{}{}{} + +\ExecuteBibliographyOptions{uniquename,uniquelist,autocite=plain} + +\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen} +\DeclareInnerCiteDelims{cite}{\bibopenbracket}{\bibclosebracket} +\DeclareInnerCiteDelims{footcite}{\bibopenbracket}{\bibclosebracket} +\DeclareInnerCiteDelims{textcite}{\bibopenbracket}{\bibclosebracket} + + +\DeclareFieldFormat{extblx@innercitedelims}{% + \csuse{mkinner\blx@delimcontext delims}{#1}} +\DeclareFieldFormat{extblx@innerparencitedelims}{% + \csuse{mkinner\blx@delimcontext delims}{#1}} +\DeclareFieldFormat{extblx@innertextcitedelims}{#1} +\DeclareFieldFormat{extblx@innerfootcitedelims}{% + \csuse{mkinner\blx@delimcontext delims}{#1}} +\DeclareFieldAlias + {extblx@innerfootcitetextdelims} + {extblx@innerfootcitedelims} +\DeclareFieldFormat{extblx@innerbbx@xrefcitedelims}{% + \csuse{mkinner\blx@delimcontext delims}{#1}} + +\DeclareFieldFormat{citelabeldate}{#1} +\DeclareFieldFormat{parencitelabeldate}{#1} +\DeclareFieldFormat{textcitelabeldate}{#1} +\DeclareFieldFormat{footcitelabeldate}{#1} +\DeclareFieldAlias{footcitetextlabeldate}{footcitelabeldate} + + +\renewcommand*{\iffinalcitedelim}{\iflastcitekey} + +\newbool{cbx:parens} + +\DeclareDelimFormat{namenumberdelim}{\addspace} +\DeclareDelimAlias{nonamenumberdelim}{namenumberdelim} + +\newbibmacro*{cite}{% + \iffieldundef{shorthand} + {\ifnameundef{labelname} + {\usebibmacro{cite:label}% + \setunit{\printdelim{nonamenumberdelim}}} + {\printnames{labelname}% + \setunit{\printdelim{namenumberdelim}}}% + \usebibmacro{cite:extraname}} + {\usebibmacro{cite:shorthand}}} + +\newbibmacro*{cite:extraname}{% + \printtext[extblx@inner\blx@delimcontext delims]{% + \printtext[bibhyperref]{% + \iffieldundef{extraname} + {\printtext[extraname]{1}} + {\printfield{extraname}}}}} + +\newbibmacro*{cite:shorthand}{% + \printtext[bibhyperref]{\printfield{shorthand}}} + +\newbibmacro*{cite:label}{% + \iffieldundef{label} + {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} + {\printtext[bibhyperref]{\printfield{label}}}} + +\newbibmacro*{citenum}{% + \iffieldundef{shorthand} + {\usebibmacro{cite:extraname}} + {\usebibmacro{cite:shorthand}}} + +\newbibmacro*{textcite}{% + \ifnameundef{labelname} + {\iffieldundef{shorthand} + {\usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonamenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite:extraname}} + {\usebibmacro{cite:shorthand}}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{namenumberdelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{citenum}}} + +\newbibmacro*{textcite:postnote}{% + \iffieldundef{postnote} + {\ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}} + {}} + {\ifbool{cbx:parens} + {\setunit{\printdelim{postnotedelim}}} + {\setunit{\printdelim{extpostnotedelim}% + \csuse{extblx@citedelim@\blx@delimcontext + @inner@open}}}% + \printfield{postnote}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@close}}} + +\DeclareCiteCommand{\cite}[\mkoutercitedelims] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + +\DeclareCiteCommand*{\cite}[\mkoutercitedelims] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{citenum}} + {\multicitedelim} + {\usebibmacro{postnote}} + +\DeclareCiteCommand{\parencite}[\mkouterparencitedelims] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + +\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{citenum}} + {\multicitedelim} + {\usebibmacro{postnote}} + +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + +% smartcite's delimcontext needs special attention +% (see ext-biblatex-aux.def) +\DeclareCiteCommand{\smartcite}[\mksmartcite] + {\delimcontext{\extblx@thisdelimcontext}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + +\DeclareCiteCommand{\textcite}[\mkoutertextcitedelims] + {\boolfalse{cbx:parens}} + {\usebibmacro{citeindex}% + \iffirstcitekey + {\setcounter{textcitetotal}{1}} + {\stepcounter{textcitetotal}% + \textcitedelim}% + \usebibmacro{textcite}} + {\ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}} + {\usebibmacro{textcite:postnote}} + +\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims] + {\cite}{\multicitedelim} +\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] + {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\multicitedelim} +\DeclareMultiCiteCommand{\smartcites}[\mksmartcite] + {\smartcite}{\multicitedelim} +\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims] + {\textcite}{} + +\DeclareFieldFormat{extblx@innerbbx@introcitedelims}{% + \csuse{mkinner\blx@delimcontext delims}{#1}} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in +% README.md or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx index f22e131fd0..fc127a7417 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-common.bbx} - [2021/08/31 v0.14 common files for extended biblatex + [2022/03/06 v0.15 common files for extended biblatex authortitle bibliography styles (MW)] \RequireBibliographyStyle{ext-dashed-common} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx index 0d5bc47f50..0c54384902 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-comp.bbx} - [2021/08/31 v0.14 extended biblatex authortitle-comp + [2022/03/06 v0.15 extended biblatex authortitle-comp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx index 4a5919e24c..40abc2c08e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-comp.cbx} - [2021/08/31 v0.14 extended biblatex authortitle-comp + [2022/03/06 v0.15 extended biblatex authortitle-comp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx index 771435d2e0..100f2a339e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-ibid.bbx} - [2021/08/31 v0.14 extended biblatex authortitle-ibid + [2022/03/06 v0.15 extended biblatex authortitle-ibid bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx index 4e5c905f68..373674d144 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-ibid.cbx} - [2021/08/31 v0.14 extended biblatex authortitle-ibid + [2022/03/06 v0.15 extended biblatex authortitle-ibid citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx index d63019e0cf..cf6faf5e60 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-icomp.bbx} - [2021/08/31 v0.14 extended biblatex authortitle-icomp + [2022/03/06 v0.15 extended biblatex authortitle-icomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx index 17fffafea9..e78197f0dc 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-icomp.cbx} - [2021/08/31 v0.14 extended biblatex authortitle-icomp + [2022/03/06 v0.15 extended biblatex authortitle-icomp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx index f189f64116..71fe81c6af 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-tcomp.bbx} - [2021/08/31 v0.14 extended biblatex authortitle-tcomp + [2022/03/06 v0.15 extended biblatex authortitle-tcomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx index 1ca2289999..adf6cab2af 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-tcomp.cbx} - [2021/08/31 v0.14 extended biblatex authortitle-tcomp + [2022/03/06 v0.15 extended biblatex authortitle-tcomp citation style (MW)] \RequireCitationStyle{ext-authortitle-comp} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx index c16a6193f5..ca4505cb00 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-terse.bbx} - [2021/08/31 v0.14 extended biblatex authortitle-terse + [2022/03/06 v0.15 extended biblatex authortitle-terse bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx index 872872860f..2cb08da66e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-terse.cbx} - [2021/08/31 v0.14 extended biblatex authortitle-terse + [2022/03/06 v0.15 extended biblatex authortitle-terse citation style (MW)] \RequireCitationStyle{ext-authortitle} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx index d04a19a073..0ee08470c8 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-ticomp.bbx} - [2021/08/31 v0.14 extended biblatex authortitle-ticomp + [2022/03/06 v0.15 extended biblatex authortitle-ticomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx index ae4a378612..26452f3a5b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-ticomp.cbx} - [2021/08/31 v0.14 extended biblatex authortitle-ticomp citation style + [2022/03/06 v0.15 extended biblatex authortitle-ticomp citation style (MW)] \RequireCitationStyle{ext-authortitle-icomp} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx index 184c389fac..457c64d036 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle.bbx} - [2021/08/31 v0.14 extended biblatex authortitle + [2022/03/06 v0.15 extended biblatex authortitle bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx index efdd18d612..f6aa3afd6b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle.cbx} - [2021/08/31 v0.14 extended biblatex authortitle citation style (MW)] + [2022/03/06 v0.15 extended biblatex authortitle citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx index 208b02428d..0a69324f5c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-common.bbx} - [2021/08/31 v0.14 common files for extended biblatex + [2022/03/06 v0.15 common files for extended biblatex authoryear bibliography styles (MW)] \RequireBibliographyStyle{ext-dashed-common} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx index 6774ecba64..116dea8692 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-comp.bbx} - [2021/08/31 v0.14 extended biblatex authoryear-comp + [2022/03/06 v0.15 extended biblatex authoryear-comp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx index 5185971fef..37420d524f 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-comp.cbx} - [2021/08/31 v0.14 extended biblatex authoryear-comp + [2022/03/06 v0.15 extended biblatex authoryear-comp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx index e3ff65386c..bb8ec16f93 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ecomp.bbx} - [2021/08/31 v0.14 biblatex authoryear-ecomp + [2022/03/06 v0.15 biblatex authoryear-ecomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx index 638c13e51e..c224da0f32 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ecomp.cbx} - [2021/08/31 v0.14 biblatex authoryear-ecomp + [2022/03/06 v0.15 biblatex authoryear-ecomp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx index d67ec295ac..91d6f9172d 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ibid.bbx} - [2021/08/31 v0.14 extended biblatex authoryear-ibid + [2022/03/06 v0.15 extended biblatex authoryear-ibid bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx index 729dfa5f45..279818515b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ibid.cbx} - [2021/08/31 v0.14 extended biblatex authoryear-ibid + [2022/03/06 v0.15 extended biblatex authoryear-ibid citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx index b851ee725f..64199a2c26 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-icomp.bbx} - [2021/08/31 v0.14 extended biblatex authoryear-icomp + [2022/03/06 v0.15 extended biblatex authoryear-icomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx index e98cc96707..aac13b26c3 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-icomp.cbx} - [2021/08/31 v0.14 extended biblatex authoryear-icomp + [2022/03/06 v0.15 extended biblatex authoryear-icomp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx index c0dc7e484c..21238f2daf 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-iecomp.bbx} - [2021/08/31 v0.14 biblatex authoryear-iecomp + [2022/03/06 v0.15 biblatex authoryear-iecomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx index 29c6a17919..5e5b200948 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-iecomp.cbx} - [2021/08/31 v0.14 biblatex authoryear-iecomp + [2022/03/06 v0.15 biblatex authoryear-iecomp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx index e8eb31a122..7d63c228c9 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tcomp.bbx} - [2021/08/31 v0.14 extended biblatex authoryear-tcomp + [2022/03/06 v0.15 extended biblatex authoryear-tcomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx index acdc3aaaca..7576214936 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tcomp.cbx} - [2021/08/31 v0.14 extended biblatex authoryear-tcomp + [2022/03/06 v0.15 extended biblatex authoryear-tcomp citation style (MW)] \RequireCitationStyle{ext-authoryear-comp} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx index 9bdb017bba..0a630ac107 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tecomp.bbx} - [2021/08/31 v0.14 extended biblatex authoryear-tecomp + [2022/03/06 v0.15 extended biblatex authoryear-tecomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx index 233e05bff3..84000da6f5 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tecomp.cbx} - [2021/08/31 v0.14 extended biblatex authoryear-tecomp + [2022/03/06 v0.15 extended biblatex authoryear-tecomp citation style (MW)] \RequireCitationStyle{ext-authoryear-ecomp} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx index 4a315a300c..184a05b9c1 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-terse.bbx} - [2021/08/31 v0.14 extended biblatex authoryear-terse + [2022/03/06 v0.15 extended biblatex authoryear-terse bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx index f2e332625c..9b4d66f251 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-terse.cbx} - [2021/08/31 v0.14 extended biblatex authoryear-terse + [2022/03/06 v0.15 extended biblatex authoryear-terse citation style (MW)] \RequireCitationStyle{ext-authoryear} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx index df3d4f9013..c30b987831 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ticomp.bbx} - [2021/08/31 v0.14 extended biblatex authoryear-ticomp + [2022/03/06 v0.15 extended biblatex authoryear-ticomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx index 4049a09357..b6b3877b78 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ticomp.cbx} - [2021/08/31 v0.14 extended biblatex authoryear-ticomp citation style + [2022/03/06 v0.15 extended biblatex authoryear-ticomp citation style (MW)] \RequireCitationStyle{ext-authoryear-icomp} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx index 11617e4fc3..38cb0b787f 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tiecomp.bbx} - [2021/08/31 v0.14 extended biblatex authoryear-tiecomp + [2022/03/06 v0.15 extended biblatex authoryear-tiecomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx index f53e1771a1..d9c66b0ccd 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tiecomp.cbx} - [2021/08/31 v0.14 extended biblatex authoryear-tiecomp citation style + [2022/03/06 v0.15 extended biblatex authoryear-tiecomp citation style (MW)] \RequireCitationStyle{ext-authoryear-iecomp} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx index 04eafe29cb..ef87abaf85 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear.bbx} - [2021/08/31 v0.14 extended biblatex authoryear bibliography style (MW)] + [2022/03/06 v0.15 extended biblatex authoryear bibliography style (MW)] \RequireBibliographyStyle{ext-standard} \RequireBibliographyStyle{authoryear} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx index 7bee70bb26..db3a906660 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear.cbx} - [2021/08/31 v0.14 extended biblatex authoryear citation style (MW)] + [2022/03/06 v0.15 extended biblatex authoryear citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def index 5faf08e154..924a5b1007 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def @@ -1,9 +1,9 @@ \ProvidesFile{ext-biblatex-aux.def} - [2021/08/31 v0.14 auxiliaries for extended biblatex citation style + [2022/03/06 v0.15 auxiliaries for extended biblatex citation style (MW)] -\def\extblx@requiredbiblatexversion{3.16} -\def\extblx@requiredbiblatexdate{2020/12/31} +\def\extblx@requiredbiblatexversion{3.17} +\def\extblx@requiredbiblatexdate{2022/02/02} \protected\def\extblx@info{\PackageInfo{biblatex-ext}} \protected\def\extblx@warning{\PackageWarning{biblatex-ext}} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx index 7103a96f3f..f850065207 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-dashed-common.bbx} - [2021/08/31 v0.14 common files for extended biblatex + [2022/03/06 v0.15 common files for extended biblatex dashed bibliography styles (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx index 5fd583c082..2f3b119a47 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric-comp.bbx} - [2021/08/31 v0.14 extended biblatex numeric-comp + [2022/03/06 v0.15 extended biblatex numeric-comp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx index 99c666662e..5c8b8d1ee5 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric-comp.cbx} - [2021/08/31 v0.14 extended biblatex numeric-comp citation style (MW)] + [2022/03/06 v0.15 extended biblatex numeric-comp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx index 18c4e607e0..c2c43d0615 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric-verb.bbx} - [2021/08/31 v0.14 extended biblatex numeric-verb + [2022/03/06 v0.15 extended biblatex numeric-verb bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx index 69450a8636..8dcf14b5ba 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric-verb.cbx} - [2021/08/31 v0.14 extended biblatex numeric-verb citation style (MW)] + [2022/03/06 v0.15 extended biblatex numeric-verb citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx index 6771ab4945..03d5fc9297 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric.bbx} - [2021/08/31 v0.14 extended biblatex numeric bibliography style (MW)] + [2022/03/06 v0.15 extended biblatex numeric bibliography style (MW)] \RequireBibliographyStyle{ext-standard} \RequireBibliographyStyle{numeric} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx index 17770dd4d8..8145c2f8a1 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric.cbx} - [2021/08/31 v0.14 extended biblatex numeric citation style (MW)] + [2022/03/06 v0.15 extended biblatex numeric citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx index 1c36a02519..9ff2154745 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx @@ -1,9 +1,9 @@ -% biblatex-ext v0.14 (2021-08-31) +% biblatex-ext v0.15 (2022-03-06) % Maintainer: Moritz Wemheuer % Licence: LaTeX Project Public License v1.3c or later % \ProvidesFile{ext-standard.bbx} - [2021/08/31 v0.14 extended biblatex standard style (MW)] + [2022/03/06 v0.15 extended biblatex standard style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} @@ -1307,7 +1307,7 @@ \endinput -% Copyright 2017-2021 Moritz Wemheuer +% Copyright 2017-2022 Moritz Wemheuer % % This work consists of the `.bbx`, `.cbx`, `.def`, `.sty` and `.lua` % files @@ -1319,6 +1319,12 @@ % ext-authoryear-common.bbx % ext-alphabetic.bbx ext-alphabetic.cbx % ext-alphabetic-verb.bbx ext-alphabetic-verb.cbx +% ext-authornumber.bbx ext-authornumber.cbx +% ext-authornumber-comp.bbx ext-authornumber-comp.cbx +% ext-authornumber-ecomp.bbx ext-authornumber-ecomp.cbx +% ext-authornumber-terse.bbx ext-authornumber-terse.cbx +% ext-authornumber-tcomp.bbx ext-authornumber-tcomp.cbx +% ext-authornumber-tecomp.bbx ext-authornumber-tecomp.cbx % ext-authortitle.bbx ext-authortitle.cbx % ext-authortitle-comp.bbx ext-authortitle-comp.cbx % ext-authortitle-ibid.bbx ext-authortitle-ibid.cbx diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx index d89cbcb911..a28af1e7bf 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-common.cbx} - [2021/08/31 v0.14 extended biblatex verbose citation style (MW)] + [2022/03/06 v0.15 extended biblatex verbose citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx index 5f0239676d..c798840e1e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-ibid.bbx} - [2021/08/31 v0.14 extended biblatex verbose-ibid + [2022/03/06 v0.15 extended biblatex verbose-ibid bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx index 484cf74968..b8ddd1f3ab 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-ibid.cbx} - [2021/08/31 v0.14 extended biblatex verbose-ibid citation style (MW)] + [2022/03/06 v0.15 extended biblatex verbose-ibid citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx index 392694a91f..0554c8036f 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-inote.bbx} - [2021/08/31 v0.14 extended biblatex verbose-inote + [2022/03/06 v0.15 extended biblatex verbose-inote bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx index f4c0f214df..998c09bdf8 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-inote.cbx} - [2021/08/31 v0.14 extended biblatex verbose-inote citation style (MW)] + [2022/03/06 v0.15 extended biblatex verbose-inote citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx index 4e17e1e711..5ebc671f6a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-note-common.cbx} - [2021/08/31 v0.14 extended biblatex verbose citation style (MW)] + [2022/03/06 v0.15 extended biblatex verbose citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx index 71c7205583..16d1ac927d 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-note.bbx} - [2021/08/31 v0.14 extended biblatex verbose-note + [2022/03/06 v0.15 extended biblatex verbose-note bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx index 65941b148f..e11f86b9e1 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-note.cbx} - [2021/08/31 v0.14 extended biblatex verbose-note citation style (MW)] + [2022/03/06 v0.15 extended biblatex verbose-note citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx index 906cf86f05..d6696f6ba4 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad1.bbx} - [2021/08/31 v0.14 extended biblatex verbose-trad1 + [2022/03/06 v0.15 extended biblatex verbose-trad1 bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx index 988cda81fc..4b5fe5e66e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad1.cbx} - [2021/08/31 v0.14 extended biblatex verbose-trad1 citation style (MW)] + [2022/03/06 v0.15 extended biblatex verbose-trad1 citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx index 24c2361c8a..af6d549ef5 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad2.bbx} - [2021/08/31 v0.14 extended biblatex verbose-trad2 + [2022/03/06 v0.15 extended biblatex verbose-trad2 bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx index 418e92ef9f..5df26759e2 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad2.cbx} - [2021/08/31 v0.14 extended biblatex verbose-trad2 citation style (MW)] + [2022/03/06 v0.15 extended biblatex verbose-trad2 citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx index 9062b843e4..277c7229bf 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad3.bbx} - [2021/08/31 v0.14 extended biblatex verbose-trad3 + [2022/03/06 v0.15 extended biblatex verbose-trad3 bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx index c75f0f8ed0..579a87aee6 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad3.cbx} - [2021/08/31 v0.14 extended biblatex verbose-trad3 citation style (MW)] + [2022/03/06 v0.15 extended biblatex verbose-trad3 citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx index 7d56e01b6e..47c21fd91b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose.bbx} - [2021/08/31 v0.14 extended biblatex verbose + [2022/03/06 v0.15 extended biblatex verbose bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx index 4bdd0bd8df..d9bd674b06 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose.cbx} - [2021/08/31 v0.14 extended biblatex verbose citation style (MW)] + [2022/03/06 v0.15 extended biblatex verbose citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/buctthesis/README.md b/macros/latex/contrib/buctthesis/README.md index 93f39c2526..b019dd7dba 100644 --- a/macros/latex/contrib/buctthesis/README.md +++ b/macros/latex/contrib/buctthesis/README.md @@ -25,58 +25,55 @@ of LaTeX version 1999/12/01 or later. ## BUCTthesis 是什么？ -本项目为北京化工大学学位论文的 LaTeX 模板，包括本科毕业设计（论文）与硕士、博士研究生学位论文。 +BUCTthesis （**B**eijing **U**niversity of **C**hemical **T**echnology LaTeX **Thesis** template）是北京化工大学学位论文的 LaTeX 模板，包括本科毕业设计（论文）与硕士、博士研究生学位论文。 ## 快速使用 1. 安装 TeX 发行版，推荐使用 TeX Live。 2. [在这里下载](https://github.com/Miracle0565/BUCTthesis/releases) 模板最新发行版的压缩文件。 -3. 于全英文路径下解压缩后，可在 `demo` 文件夹中找到本科、硕博两种论文类型所对应的示例文件夹；将所选论文类型文件夹中的所有文件与文件夹移动至模板的根目录。 -4. 对 `main.tex` 文件执行 `latexmk` 或 `xelatex -> bibtex -> xelatex -> xelatex` 的全编译。 -5. 阅读本模板的说明文档 `buctthesis.pdf`，该文档简要地说明了模板的使用方法。 -6. 相比于重建文件，直接在示例文件上修改会更加方便： +3. 解压缩后，可在 `demo` 文件夹中找到本科、硕博两种论文类型所对应的示例文件夹；**将所选论文类型文件夹中的所有内容移动至模板的根目录**。（例如，对本科而言，需将 `demo/bachelor` 中的所有内容复制或移动到根目录， `demo` 文件夹中的剩余内容可删除。） +4. 阅读本模板的说明文档 `buctthesis.pdf`，该文档简要地说明了模板的使用方法。 +5. 相比于重建文件，直接在示例文件上修改会更加方便： - `main.tex` 用于定义作者与论文信息，并组织论文结构； - `mycfg.sty` 用于自定义命令等； - `thesisbib.bib` 文件中插入参考文献条目； - `chapter` 文件夹用于存放各部分内容，并在 `main.tex` 调用； - `figure` 和 `code` 文件夹下分别保存插图和源代码，以方便写作时调用； -7. 按第 4 步执行全编译。 -8. 在 `cover` 文件夹中可生成硕博论文的封面，使用方法请阅读说明文档 `buctthesis.pdf`。 +6. 对 `main.tex` 文件执行 `latexmk` 或 `xelatex -> bibtex -> xelatex -> xelatex` 的全编译。 +7. 在 `cover` 文件夹中可生成硕博论文的封面，使用方法请阅读说明文档 `buctthesis.pdf`。（本科可直接删除该文件夹） ## 注意事项 - 北京化工大学教务处与研究生院仅提供了写作规范（见下）而**未对本模板做任何测试或授权**。模板作者自当尽力，但限于软件等各种因素，由本模板生成的文档可能仍与要求有所出入。所以使用本模板类造成（包括但不限于）论文审核不通过等问题作者不负责，请使用时慎酌。 -- 模板仅在 TeX Live 2020 顺利编译，可能不兼容于低版本。**不支持** CTeX 套装。 -- 模板仅在 Windows 10 系统下做编译测试，故不能保证在其他系统或平台上正确。 -- 学校会统一印制论文封面，使用本模板生成的硕博论文封面与学校有少许不同。 +- 模板在 TeX Live 2020 及更新版本、[Overleaf](https://www.overleaf.com/) 上可顺利编译，可能不兼容于低版本。**不支持** CTeX 套装。 +- 学校会统一印制论文封面，而其中包括标题和作者的内容需要用笔填写。为保证论文的完整性，本模板仿制了研究生论文的封面，且与实物相比有少许差别。 ## 写作规范 -- 本科：[《北京化工大学本科毕业环节工作规定》](https://jiaowuchu.buct.edu.cn/2019/0222/c515a22047/page.htm) -- 本科：[《本科生毕业设计（论文）撰写规范》](https://jiaowuchu.buct.edu.cn/2018/1009/c515a22046/page.htm) +- 本科：[《北京化工大学本科毕业环节工作规定》](https://jiaowuchu.buct.edu.cn/2019/0222/c515a22047/page.htm)、[《本科生毕业设计（论文）撰写规范》](https://jiaowuchu.buct.edu.cn/2018/1009/c515a22046/page.htm) - 硕博：[《北京化工大学研究生学位论文撰写规范（修订）》](https://xxgk.buct.edu.cn/2017/1107/c2835a39437/page.htm) -- 参考文献（链接为非校方源）：[GB/T 7714—2015 信息与文献 参考文献著录规则](http://www.cessp.org.cn/uploads/1/file/public/201607/20160708142456_8mqgu0dpgk.pdf) +- 参考文献（非校方链接）：[GB/T 7714—2015 信息与文献 参考文献著录规则](http://www.cessp.org.cn/uploads/1/file/public/201607/20160708142456_8mqgu0dpgk.pdf) -## 勘误 +## 《规范》勘误 ### 本科 学校教务处提供了两份文件，而二者之间有出入之处，以及有少许笔误之处和歧义之处。模板作如下统一： -- 二者间以后者（ Word 文档）为准，如图、表编号中的分隔符使用 `-`（ U+002D ） ； +- 二者间以后者（ Word 文档）为准，如图、表编号中的分隔符使用 `-`（ U+002D ）； - 标题 `诚信申明` 改为 `诚信声明`； - 章节编号 `均以罗马数字表示顺序` 改为 `均以阿拉伯数字表示顺序`； -- 对章节 `标题加黑` ，“加黑”一词理解为 `使用（伪）粗体` 而非 `标题为黑体`。 +- 对章节 `标题加黑` ，“加黑”一词理解为“使用（伪）粗体”而非“标题为黑体”。 ### 硕博 -- 英文摘要中的 `KEY WORDS：`，模板将字母后的全角冒号 `：`（ U+FF1A ）改为半角冒号 `:` （ U+003A ）； -- 正文、参考文献条目的 `行间距20磅` 改为 `行距20磅` 。 +- 英文摘要中的 `KEY WORDS：`，模板将字母后的全角冒号 `：`（ U+FF1A ）改为半角冒号 `:`（ U+003A ）； +- 正文、参考文献条目的 `行间距20磅` 改为 `行距20磅`。 ## 提问 -关于模板的任何问题或新功能需求，欢迎提交 [GitHub Issues](https://github.com/Miracle0565/BUCTthesis/issues) 。 +关于模板的任何问题或新功能需求，欢迎提交 [GitHub Issues](https://github.com/Miracle0565/BUCTthesis/issues)。 ## 开源许可 -本项目基于 [LaTeX Project Public License](http://www.latex-project.org/lppl.txt)（版本 1.3c 或更高）开源于 [GitHub](https://github.com/Miracle0565/BUCTthesis) 。同时为了方便国内用户，在 [Gitee](https://gitee.com/Miracle0565/BUCTthesis) 建有代码的镜像。 +本项目的代码部分基于 [LaTeX Project Public License](http://www.latex-project.org/lppl.txt)（版本 1.3c 或更高）开源于 [GitHub](https://github.com/Miracle0565/BUCTthesis) 。同时为了方便国内用户，在 [Gitee](https://gitee.com/Miracle0565/BUCTthesis) 建有代码的镜像。 diff --git a/macros/latex/contrib/buctthesis/doc/buctthesis.pdf b/macros/latex/contrib/buctthesis/doc/buctthesis.pdf index 170b49620a..72c0e5976a 100644 Binary files a/macros/latex/contrib/buctthesis/doc/buctthesis.pdf and b/macros/latex/contrib/buctthesis/doc/buctthesis.pdf differ diff --git a/macros/latex/contrib/buctthesis/doc/chapter/chapter1.tex b/macros/latex/contrib/buctthesis/doc/chapter/chapter1.tex index 3cc3830a4a..806f9417b8 100644 --- a/macros/latex/contrib/buctthesis/doc/chapter/chapter1.tex +++ b/macros/latex/contrib/buctthesis/doc/chapter/chapter1.tex @@ -2,11 +2,9 @@ \chapter{绪论} \section{字体} \subsection{字体配置} +模板配置了两种字库，以 \opt{fontset = windows} 为例： \begin{enumerate} - \item 中文：主字体（衬线字体）为宋体，无衬线字体族为黑体，% - \footnote{这里指中易宋体（SimSun）和中易黑体（SimHei），二者均为 Windows 系统的预装字体。 - 对于不方便安装该字体的系统，可定位至 \file{buctthesis.cls} - 文件中的 \cs{setCJKmainfont}\{SimSun\} 处，将 SimSun 替换为合适的衬线字体；无衬线字体同理。} + \item 中文：主字体（衬线字体）为中易宋体，无衬线字体族为中易黑体，% 且二者均可加粗为对应的伪粗体；《规范》中未规定的楷体和仿宋均为 \pkg{ctex} 宏集的预设，为避免格式审查问题，应当减少使用； \item 西文：除英文摘要的关键词使用中易黑体、除公式中的西文（数字、字母等）使用特殊字体，其它一律使用 Times New Roman； \item 公式：模板会根据实际字体安装情况，选择 $LibertinusMath$ 字体或使用 \LaTeX\ 的默认字体。 @@ -128,7 +126,7 @@ \file{thesisbib.bib} & \BibTeX{}参考文献数据库\\ \file{mycfg.sty} & 自定义配置文件\\ \file{README.md} & 项目自述文件\\ - \file{buctthesis.pdf} & 写作指南，即本文\\ + \file{buctthesis.pdf} & 写作指南\\ \bottomrule \end{tabular} \end{table} @@ -191,11 +189,11 @@ \begin{longtable}[c]{*{5}{l}r} \caption{带有塑化剂的PEO-基聚合物电解质举例}\label{tab:longtab}\\ \toprule - \textbf{Entry} & \textbf{聚合物基体} & \textbf{锂盐} & \textbf{塑化剂} & \textbf{$T$ (\si{\degreeCelsius})} & \textbf{离子电导率 (\si{S.cm^{-1}})}\\ \midrule + \textbf{条目} & \textbf{聚合物基体} & \textbf{锂盐} & \textbf{塑化剂} & \textbf{$T$ (\si{\degreeCelsius})} & \textbf{离子电导率 (\si{S.cm^{-1}})}\\ \midrule \endfirsthead \multicolumn{6}{c}{\small 续表 \thetable\quad 带有塑化剂的PEO-基聚合物电解质举例} \\ \toprule - \textbf{Entry} & \textbf{聚合物基体} & \textbf{锂盐} & \textbf{塑化剂} & \textbf{$T$ (\si{\degreeCelsius})} & \textbf{离子电导率 (\si{S.cm^{-1}})}\\ \midrule + \textbf{条目} & \textbf{聚合物基体} & \textbf{锂盐} & \textbf{塑化剂} & \textbf{$T$ (\si{\degreeCelsius})} & \textbf{离子电导率 (\si{S.cm^{-1}})}\\ \midrule \endhead \bottomrule \endfoot\endlastfoot diff --git a/macros/latex/contrib/buctthesis/doc/chapter/chapter2.tex b/macros/latex/contrib/buctthesis/doc/chapter/chapter2.tex index bafdf9b27b..25f950001c 100644 --- a/macros/latex/contrib/buctthesis/doc/chapter/chapter2.tex +++ b/macros/latex/contrib/buctthesis/doc/chapter/chapter2.tex @@ -180,7 +180,7 @@ int main() \end{equation} \end{itemize} -至于有机化学结构式等，尽管有一些宏包可以绘制，但使用图片插入可能是一个更好 +至于有机化学的结构式等，尽管有一些宏包可以绘制，但使用图片插入可能是一个更好 的选择。 \section{文献引用和参考文献}\label{sec:bib} diff --git a/macros/latex/contrib/buctthesis/doc/cover/BUCT-badge.pdf b/macros/latex/contrib/buctthesis/doc/cover/BUCT-badge.pdf index 71640782b7..663feec77f 100644 Binary files a/macros/latex/contrib/buctthesis/doc/cover/BUCT-badge.pdf and b/macros/latex/contrib/buctthesis/doc/cover/BUCT-badge.pdf differ diff --git a/macros/latex/contrib/buctthesis/doc/figure/declare-master-doctor.png b/macros/latex/contrib/buctthesis/doc/figure/declare-master-doctor.png new file mode 100644 index 0000000000..a03c3a76d3 Binary files /dev/null and b/macros/latex/contrib/buctthesis/doc/figure/declare-master-doctor.png differ diff --git a/macros/latex/contrib/buctthesis/doc/figure/declare-master.png b/macros/latex/contrib/buctthesis/doc/figure/declare-master.png deleted file mode 100644 index a03c3a76d3..0000000000 Binary files a/macros/latex/contrib/buctthesis/doc/figure/declare-master.png and /dev/null differ diff --git a/macros/latex/contrib/buctthesis/doc/mycfg.sty b/macros/latex/contrib/buctthesis/doc/mycfg.sty index eacb380ffb..966e5b113b 100644 --- a/macros/latex/contrib/buctthesis/doc/mycfg.sty +++ b/macros/latex/contrib/buctthesis/doc/mycfg.sty @@ -16,7 +16,7 @@ \caption{#3}\label{#4} \end{figure} } -\newcommand{\version}{v1.2} +\newcommand{\version}{v1.3} \newcommand{\cs}[1]{\texttt{\textbackslash#1}} \newcommand{\file}{\textsf} \newcommand{\pkg}{\textsf} diff --git a/macros/latex/contrib/buctthesis/source/buctthesis.dtx b/macros/latex/contrib/buctthesis/source/buctthesis.dtx index ce1f4b1f46..159ada51c8 100644 --- a/macros/latex/contrib/buctthesis/source/buctthesis.dtx +++ b/macros/latex/contrib/buctthesis/source/buctthesis.dtx @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % \iffalse %<*driver> -\ProvidesFile{buctthesis.dtx}[2021/09/10 v1.2 BUCT Thesis Template] +\ProvidesFile{buctthesis.dtx}[2022/03/04 v1.3 BUCT Thesis Template] \documentclass{ltxdoc} \usepackage{manual} \begin{document} @@ -59,10 +59,11 @@ % % \title{\textsf{BUCTthesis}：北京化工大学学位论文模板} % \author{Miracle0565\\ \texttt{https://github.com/Miracle0565}} -% \date{\filedate} +% \date{\fileversion （\filedate）} % +% \newgeometry{hcentering} % \maketitle -% \tableofcontents\clearpage +% \tableofcontents\restoregeometry\clearpage % % \section{欢迎！} % BUCTthesis是北京化工大学本科与硕士、博士研究生毕业论文的 \LaTeX\ 写作模板，版本号~\fileversion。 @@ -107,9 +108,13 @@ % % \section{开始使用}\label{sec:start} % \subsection{准备工作} -% 开始之前，您需要安装一个合适的 \TeX\ 发行版，以及需要一些必要的 \TeX\ 技能。 +% 开始之前，您需要选择一个合适的 \TeX\ 发行版，以及需要一些必要的 \TeX\ 技能。 % \begin{enumerate} -% \item \TeX\ 发行版：建议完整安装 \TeX\ Live 2020 或更新版本。模板\emph{不支持} \CTeX\ 套装。安装 \TeX 发行版的详细步骤可参考\href{https://github.com/OsbertWang/install-latex-guide-zh-cn}{《一份简短的关于 \LaTeX 安装的介绍》}。此外，该文档简要地介绍了几款常见的文本编辑器，可根据喜好自行选择。 +% \item \TeX\ 发行版： +% \begin{description} +% \item[本地编译] 建议完整安装 \TeX\ Live 2020 或更新版本。模板\emph{不支持} \CTeX\ 套装。安装 \TeX 发行版的详细步骤可参考\href{https://github.com/OsbertWang/install-latex-guide-zh-cn}{《一份简短的关于 \LaTeX 安装的介绍》}。此外，该文档简要地介绍了几款常见的文本编辑器，可根据喜好自行选择。 +% \item[在线编译] 推荐 \href{https://www.overleaf.com/}{Overleaf}，它提供了 Ubuntu 系统下的 \TeX\ Live，目前为 2021 版。免费版本足以应对模板的正常编译，至于完整的文档历史和协作编辑等功能则需付费订阅。 +% \end{description} % \item \TeX\ 技能：本文档不是一份 \LaTeX\ 零基础教程，使用本模板需要对 \LaTeX\ 和参考文献管理工具 \BibTeX 有一定的熟练度。若您是新手，我们建议您先阅读一些入门文档，如\href{http://mirror.ctan.org/info/lshort/chinese/lshort-zh-cn.pdf}{《一份不太简短的 \LaTeXe 介绍》}。 % \end{enumerate} % @@ -244,8 +249,8 @@ % % \DescribeOpt{openright} % \DescribeOpt{openany} -% 对于书籍而言，一般章都只出现在右边的页面（奇数页），之前不足的页面用空白补足。 -% 这也是打开模板 \opt{openright} 选项的结果，这会在适当处插入一完全空白页。 +% 对于书籍而言，一般章标题都只出现在右边的页面（奇数页），之前不足的页面用空白补足。 +% 这也是打开模板 \opt{openright} 选项的结果：将会在适当处插入一完全空白页。 % 而 \opt{openany} 则允许在任意页开启新的一章。 % % 其它选项：多余的选项将传递给 \pkg{ctexbook} 文档类，如 \opt{draft} 将关闭插图和部分宏包的渲染，从而加快编译速度。 @@ -316,7 +321,7 @@ % \oarg{文件路径} % \end{syntax} % -% 直接使用 \cs{makedeclare} 会根据所选 \opt{type} 生成对应内容。 +% 直接使用而不带任何参数的 \cs{makedeclare} 会根据所选 \opt{type} 生成对应内容。 % % 此外，考虑到有时需要插入扫描页，所以该命令可跟一个可选参数，如： % \begin{latex} @@ -642,7 +647,7 @@ % 除此之外，封面使用的方正系列字体未预装于一些操作系统上， % 可访问\href{https://www.foundertype.com}{方正字库官网}下载和安装，具体步骤从略。 % -% 所使用的字体清单： +% 封面所使用的中文字体清单： % \begin{enumerate} % \item SimSun，中易宋体 % \item SimHei，中易黑体 @@ -827,7 +832,7 @@ % % 关于化学式排版的宏包有很多，但这里载入 \pkg{mhchem}。 % 它容易上手，偏向于无机和分析化学（方程）式的排版。 -% 至于有机化学结构式等，使用图片插入可能是一个更好的选择；若时间充裕可学习如 \pkg{chemfig} 等宏包。 +% 至于有机化学的结构式等，使用图片插入可能是一个更好的选择；若时间充裕可学习如 \pkg{chemfig} 等宏包。 % \begin{macrocode} \RequirePackage[version = 4]{mhchem} % \end{macrocode} @@ -1795,6 +1800,7 @@ % \end{macrocode} % % \subsubsection{浮动体} +% \begin{environment}{dfigure} % 本科： % 使用 \pkg{float} 宏包新定义浮动体环境 \env{dfigure}，用于排版设计图纸。 % 设计图纸与普通插图的区别在于： @@ -1804,12 +1810,17 @@ % \item 仅设计图纸编入目录，且此目录独立于主目录。 % \end{itemize} % -% 硕博： -% 使用 \pkg{bicaption} 宏包设置双语标题，其中第二语言为英语。 % \begin{macrocode} \ifbuct@bachelor \newfloat{dfigure}{htbp}{lodf}[chapter] \floatname{dfigure}{\buct@dfigurename} +% \end{macrocode} +% \end{environment} +% +% 硕博： +% 使用 \pkg{bicaption} 宏包设置双语标题，其中第二语言为英语。 +% +% \begin{macrocode} \else \DeclareCaptionOption{english}[]{ \renewcommand\figurename{\buct@bifigure@name} @@ -2350,6 +2361,7 @@ a4paper, hmargin={40mm,20mm},vmargin={25mm,15mm},footskip=7mm, ]{geometry} + \ctexset{ fontset, abstractname = 简介, diff --git a/macros/latex/contrib/easybook/README.md b/macros/latex/contrib/easybook/README.md index 7300ee08f9..0a22e71b49 100644 --- a/macros/latex/contrib/easybook/README.md +++ b/macros/latex/contrib/easybook/README.md @@ -1,6 +1,6 @@ # Easybook document class -`easybook` is a pure academic template created based on the `ctexbook` book document class. It also has the functions of book and article document class. Combined with the general framework design of the dissertation of many universities in China, providing multiple commands and interfaces allows users to easily customize the thesis template. Its basic macro package `easybase` can also be used with `ctex` and standard document classes. +`easybook` is a pure academic template created based on the `ctexbook` book document class. It also has the functions of `book` and `article` document class. Combined with the general framework design of the dissertation of many universities in China, providing multiple commands and interfaces allows users to easily customize the thesis template. Its basic macro package `easybase` can also be used with `ctex` and standard document classes. ## License diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 7978bddf98..c767f8a591 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2022/03/05}{1.639} +\ProvidesExplClass{easybook}{2022/03/06}{1.64} {Easily typesetting Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -303,7 +303,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2022/03/05}{1.639} +\ProvidesExplPackage{easybase}{2022/03/06}{1.64} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1626,7 +1626,6 @@ { \eb_toc_title_level_cmd:n {#1} \cs_set_eq:NN \thispagestyle \use_none:n - \cs_undefine:N \imki@firstpagestyle } \imki@putindex{#4} \group_end: @@ -1924,8 +1923,7 @@ tcbwrap .code:n = { }, unknown .code:n = \eb_msg_deprecated_option:n { thmset } } - \cs_undefine:N \proof - \declaretheoremstyle{fancy}[ + \declaretheoremstyle{default}[ spaceabove = 0ex plus .1ex, spacebelow = 0ex plus .1ex, headindent = 0em, @@ -1935,6 +1933,8 @@ bodyfont = \normalfont, postheadspace = 1em ] + \theoremstyle{default} + \cs_undefine:N \proof } \setchemformula @@ -2021,7 +2021,7 @@ { \bibliographystyle{gbt7714-author-year} } } { \cs_set_eq:NN \cite \citep } - { \exp_args:NV \bibliographystyle \l__eb_bib_otherstyle_tl } + { \exp_args:NV \bibliographystyle \l__eb_bib_both_style_tl } \tl_if_blank:VF \l__eb_bib_cite_style_tl { \exp_args:NV \setcitestyle \l__eb_bib_cite_style_tl } \NewDocumentCommand{\printbibliography}{st+o} @@ -2302,7 +2302,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/05}{1.639} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/06}{1.64} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf index 3905c58b5a..2de13178dc 100644 Binary files a/macros/latex/contrib/easybook/easybook.pdf and b/macros/latex/contrib/easybook/easybook.pdf differ diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index f4042c30ec..fc6d6ec086 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -21,8 +21,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK使用手册, - version = v1.639, - date = 2022/03/05, + version = v1.64, + date = 2022/03/06, authors = 瞿毅, info = 简便地排版中文学位论文或书籍, email = q1jx@foxmail.com, @@ -220,15 +220,15 @@ 以下为 \pkg*{easybase} 直接调用的关键宏包清单，通常情况下它们是常用且稳定的。棕色背景的宏包表示修改了或依赖它们的内部命令。青色背景的宏包表示并未调用它们，但做了一些预配置，可在导言区手动载入以实现相关的功能。 \insertblr { - colspec = @{}*{5}{c}@{}, - cells = {cmd = \pkg*}, - cell{1}{3,4} = brown8, - cell{2}{5} = brown8, - cell{3}{2,4} = brown8, - cell{5}{1} = brown8, - cell{1}{2} = cyan8, - cell{3}{1,4} = cyan8, - cell{5}{2} = cyan8 + colspec = @{}*{5}{c}@{}, + cells = {cmd = \pkg*}, + cell{1}{3,4} = brown8, + cell{2}{5} = brown8, + cell{3}{2,4} = brown8, + cell{5}{1} = brown8, + cell{1}{2} = cyan8, + cell{3}{1,4} = cyan8, + cell{5}{2} = cyan8 }{ amsthm & bicaption & ctex & caption & chemformula \\ enumitem & etoolbox & fancyhdr & geometry & hyperref \\ @@ -279,9 +279,9 @@ 预置的英文字体相关配置方案如下表所示。这些字体已经包含在了 \TeX Live 发行版中，所以通常不需要再专门安装。如果您想使用其它英文字体，可以使用 \pkg*{fontspec} 宏包的相关命令进行设置。 \insertblr { - colspec = @{}*{4}{c}@{}, - hline{2} = {0.5pt,Blue}, - row{1} = {font = \sffamily}, + colspec = @{}*{4}{c}@{}, + hline{2} = {0.5pt,Blue}, + row{1} = {font = \sffamily}, column{1} = {cmd = \code} }{ & 正文字体 & 无衬线字体 & 等宽字体 \\ @@ -396,11 +396,11 @@ \subsection{上标和下标} 上标和下标的功能来自 \pkg*{spbmark} 宏包，下面有三个命令可以用于输出上标和下标。可以使用键值列表的形式对上下标格式进行局部或全局设置，下面命令中两个可选参数的键值列表是等效的。全局设置的详情见\ref{subsubsec:super-sub-script}。 \begin{commands} - \command{super}[\oarg{键值列表1}\marg{内容}\oarg{键值列表2}] + \command{super}[\sarg\oarg{键值列表1}\marg{内容}\oarg{键值列表2}] 输出上标的命令，与简短命令 \cs{sp} 等效。 - \command{sub}[\oarg{键值列表1}\marg{内容}\oarg{键值列表2}] + \command{sub}[\sarg\oarg{键值列表1}\marg{内容}\oarg{键值列表2}] 输出下标的命令，与简短命令 \cs{sb} 等效。用法和参数与上标命令 \cs{super} 类似。 - \command{supersub}[\oarg{键值列表1}\marg{上标内容}\marg{下标内容}\oarg{键值列表2}] + \command{supersub}[\sarg\oarg{键值列表1}\marg{上标内容}\marg{下标内容}\oarg{键值列表2}] 同时输出上标和下标的命令，与简短命令 \cs{spb} 等效。 \command{spbifmath}[\marg{数学模式代码}\marg{文本模式代码}] 根据上下标处于数学还是文本模式分别设置不同的值，应当在格式命令或偏移距离选项中使用。 @@ -429,10 +429,10 @@ \cls*{easybook} 扩展了 \CTeX 宏集 \hologo{LaTeX3} 风格键值的通用控制命令 \cs*{ctexset}，接口选项同样可用它设置，原有的 \meta{键值列表} 仍然可用。本文档类目前有9个模块用于实现常规的排版功能，如下表所示。模块名也是统一接口 \cs*{ctexset} 的路径，不同模块单独接口的命令名\textbf{加上前缀} \code{eb}： \insertblr { - colspec = @{}*{5}{c}@{}, - hline{3} = {0.5pt,Blue}, - row{1,3} = {font = \sffamily,belowsep = 0pt}, - row{2,4} = {cmd = \module*} + colspec = @{}*{5}{c}@{}, + hline{3} = {0.5pt,Blue}, + row{1,3} = {font = \sffamily,belowsep = 0pt}, + row{2,4} = {cmd = \module*} }{ \hyperref[subsec:style]{风格} & \hyperref[subsec:other font]{其它字体} & \hyperref[subsec:spacing]{行距} & \hyperref[subsec:hyperlinks]{超链接} & \hyperref[subsec:reference]{参考文献} \\ style & subfont & spread & refset & bibset \\ -- cgit v1.2.3