diff options
12 files changed, 190 insertions, 51 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.pdf b/Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.pdf Binary files differindex 10ee1e105b4..74a745f1e1c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.tex b/Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.tex index 5971cd93a17..f5eae36bdbe 100644 --- a/Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.tex +++ b/Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.tex @@ -1,28 +1,161 @@ -% TEX root = path/to/root_file.tex -% !TEX program = arara -% !TEX encoding = utf8 -% !TEX spellcheck = en_GB -% arara: pdflatex: {synctex: true} -%: Start Header -\documentclass{ltxdockit}[2011/03/25] -\usepackage{btxdockit} +\documentclass{article} \usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} \usepackage[british]{babel} \usepackage[strict]{csquotes} -\usepackage{libertine} -\usepackage[scaled=0.8]{beramono} +\usepackage[useregional]{datetime2} +\usepackage{libertinus} +\usepackage[scaled=0.78]{beramono} \usepackage{microtype} +\usepackage{multicol} +\usepackage{ragged2e} +\usepackage{btxdockit} + +\hypersetup{% + colorlinks=true, + allcolors=spot, + bookmarksopen=false, + bookmarksnumbered=false, + plainpages=false} + +\definecolor{spot}{rgb}{0,0.2,0.6} + \lstset{basicstyle=\ttfamily,keepspaces=true} -\KOMAoptions{numbers=noenddot} -\addtokomafont{paragraph}{\spotcolor} -\addtokomafont{section}{\spotcolor} -\addtokomafont{subsection}{\spotcolor} -\addtokomafont{subsubsection}{\spotcolor} -\addtokomafont{descriptionlabel}{\spotcolor} -\pretocmd{\cmd}{\sloppy}{}{} -\pretocmd{\bibfield}{\sloppy}{}{} -\pretocmd{\bibtype}{\sloppy}{}{} +\makeatletter +% this is taken from ltxdockit.cls, which is not loaded +\newrobustcmd*{\fnurl}[1][]{\hyper@normalise\ltd@fnurl{#1}} +\def\ltd@fnurl#1#2{\footnote{#1\hyper@linkurl{\Hurl{#2}}{#2}}} + +\newrobustcmd*{\email}{\hyper@normalise\ltd@email} +\def\ltd@email#1{\href{mailto:#1}{#1}} + +% title +\providecommand*{\titlepage}{} +\providecommand*{\titlefont}{} +\renewrobustcmd*{\titlepage}[1]{\setkeys{ltd@ttp}{#1}} +\renewcommand*{\titlefont}{\bfseries} +\define@key{ltd@ttp}{title}{\def\ltd@title@title{#1}} +\define@key{ltd@ttp}{subtitle}{\def\ltd@title@subtitle{#1}} +\define@key{ltd@ttp}{url}{\def\ltd@title@url{#1}} +\define@key{ltd@ttp}{author}{\def\ltd@title@author{#1}} +\define@key{ltd@ttp}{email}{\def\ltd@title@email{#1}} +\define@key{ltd@ttp}{revision}{\def\ltd@title@revision{#1}} +\define@key{ltd@ttp}{date}{\def\ltd@title@date{#1}} + +\providecommand*{\printtitlepage}{} +\renewrobustcmd*{\printtitlepage}{% + \begingroup + \centering\titlefont + \begingroup\LARGE + \ifundef\ltd@title@url + {\ltd@title@title} + {\href{\ltd@title@url}{\ltd@title@title}}% + \par + \endgroup + \vspace{0.25\baselineskip} + \begingroup\large + \ltd@title@subtitle\par + \endgroup + \expandafter\url\expandafter{\ltd@title@url}\par + \begin{multicols}{2} + \raggedleft + \ltd@title@author\par + \expandafter\email\expandafter{\ltd@title@email}\par + \raggedright + Version \ltd@title@revision\par\ltd@title@date + \end{multicols} + \endgroup} + + +\renewcommand\tableofcontents{% + \pdfbookmark[1]{\contentsname}{contents}% + \section*{\contentsname + \@mkboth{% + \MakeUppercase\contentsname}{\MakeUppercase\contentsname}}% + \@starttoc{toc}% + } +\def\@starttoc#1{% + \begingroup + \begin{multicols}{2} + \makeatletter + \RaggedRight + \@input{\jobname.#1}% + \if@filesw + \expandafter\newwrite\csname tf@#1\endcsname + \immediate\openout \csname tf@#1\endcsname \jobname.#1\relax + \fi + \end{multicols} + \@nobreakfalse + \endgroup} + +\let\accentcolour\spotcolor + +\newcommand*{\allsectionsfont}{\sffamily\accentcolour} + +\renewcommand\section{\@startsection {section}{1}{\z@}% + {-3.5ex \@plus -1ex \@minus -.2ex}% + {2.3ex \@plus.2ex}% + {\normalfont\Large\bfseries\allsectionsfont}} +\renewcommand\subsection{\@startsection{subsection}{2}{\z@}% + {-3.25ex\@plus -1ex \@minus -.2ex}% + {1.5ex \@plus .2ex}% + {\normalfont\large\bfseries\allsectionsfont}} +\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% + {-3.25ex\@plus -1ex \@minus -.2ex}% + {1.5ex \@plus .2ex}% + {\normalfont\normalsize\bfseries\allsectionsfont}} +\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}% + {3.25ex \@plus1ex \@minus.2ex}% + {-1em}% + {\normalfont\normalsize\bfseries\allsectionsfont}} +\renewcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}% + {3.25ex \@plus1ex \@minus .2ex}% + {-1em}% + {\normalfont\normalsize\bfseries\allsectionsfont}} + +% from KOMA-Script +\newcommand*{\@list@extra}{% + \ifdim\parskip>\z@ + \topsep\z@ + \parsep\parskip + \itemsep\z@ + \fi +} +\appto\@listi{\@list@extra} +\appto\@listii{\@list@extra} +\appto\@listiii{\@list@extra} +\appto\@listiv{\@list@extra} +\appto\@listv{\@list@extra} +\appto\@listvi{\@list@extra} +\makeatother + +\newrobustcmd*{\tex}{\TeX} +\newrobustcmd*{\etex}{\mbox{e-TeX}} +\newrobustcmd*{\pdftex}{pdf\-\tex} +\newrobustcmd*{\xetex}{Xe\-\tex} +\newrobustcmd*{\luatex}{Lua\-\tex} +\newrobustcmd*{\latex}{\LaTeX}%{La\kern-0.07em TeX} +\newrobustcmd*{\pdflatex}{pdf\-\latex} +\newrobustcmd*{\xelatex}{Xe\-\latex} +\newrobustcmd*{\lualatex}{Lua\-\latex} +\newrobustcmd*{\miktex}{Mik\-\tex} +\newrobustcmd*{\texlive}{\tex~live} +\newrobustcmd*{\bibtex}{Bib\kern-0.07em TeX} +\newrobustcmd*{\lppl}{\latex{} Project Public License} + +\renewcommand*{\verbatimfont}{\ttfamily} +\renewcommand*{\displayverbfont}{\ttfamily} +\renewcommand*{\marglistfont}{\accentcolour\sffamily\small} +\renewcommand*{\margnotefont}{\sffamily\small} +\renewcommand*{\optionlistfont}{\accentcolour\sffamily\displayverbfont} +\renewcommand*{\ltxsyntaxfont}{\ttfamily} +\renewcommand*{\ltxsyntaxlabelfont}{\accentcolour\displayverbfont} +\renewcommand*{\changelogfont}{\normalfont} +\renewcommand*{\changeloglabelfont}{\accentcolour\sffamily\bfseries} +\newcommand*{\stylelistlabelfont}{\accentcolour\sffamily\small} +\newcommand*{\bibfieldformatfont}{\sffamily} +\newcommand*{\bibfieldformatlabelfont}{\accentcolour\bibfieldformatfont\small} \MakeAutoQuote*{<}{>} @@ -30,11 +163,11 @@ \titlepage{% title={The \sty{biblatex-trad} Package}, subtitle={Traditional bibliography styles for \sty{biblatex}}, - url={}, + url={https://github.com/moewew/biblatex-trad/}, author={Marco Daniel\\Moritz Wemheuer}, - email={}, - revision={0.4a}, - date={17th February 2018}} + email={mwemheu@posteo.de}, + revision={0.5}, + date={\DTMDate{2021-03-06}}} \hypersetup{% pdftitle={The biblatex-trad Package}, @@ -77,7 +210,7 @@ The package is motivated by a question at \tex{} -- \latex Stack Exchange \subsection{Requirements} The use of the styles requires the \sty{biblatex} package. -It is tested with the current version of \sty{biblatex} (at the time of writing that is 3.10). +It is tested with the current version of \sty{biblatex} (at the time of writing that is v3.16). Care has been taken to retain backwards compatibility with older versions, but please do not expect the styles to work flawlessly with ancient versions of \sty{biblatex}. Note also that the style may fail silently with older versions, it need not necessarily emit noisy @@ -89,7 +222,7 @@ Some features of this style will only work properly if you use the default Biber \subsection{License} -Copyright \textcopyright\ 2012--2015 Marco Daniel, 2016--2018 Moritz Wemheuer. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c.\fnurl{http://www.latex-project.org/lppl.txt} +Copyright \textcopyright\ 2012--2015 Marco Daniel, 2016--2021 Moritz Wemheuer. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c.\fnurl{http://www.latex-project.org/lppl.txt} \subsection{Feedback}\label{subsec:int:feb} @@ -133,6 +266,10 @@ files handle those fields. \section{Revision History}\label{apx:log} \begin{changelog} +\begin{release}{0.5}{2021-03-06} +\item Synced with \sty{biblatex} v3.16 (2020-12-31) +\end{release} + \begin{release}{0.4a}{2018-02-17} \item Fixed alphabetic labels for names with prefix (\enquote{von} part) (\gitissuelink{34}) \end{release} diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.bbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.bbx index 6b7d144642b..b453cbed6ff 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.bbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-abbrv.bbx}[2018/02/17 v0.4a biblatex-trad abbrv bibliography style] +\ProvidesFile{trad-abbrv.bbx}[2021/03/06 v0.5 biblatex-trad abbrv bibliography style] \RequireBibliographyStyle{trad-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.cbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.cbx index 6a1fd33ceaf..3e8b6c65d46 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.cbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-abbrv.cbx}[2018/02/17 v0.4a biblatex-trad abbrv citation style] +\ProvidesFile{trad-abbrv.cbx}[2021/03/06 v0.5 biblatex-trad abbrv citation style] \RequireCitationStyle{numeric} diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.bbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.bbx index 3b00135b0cf..7c89f6935ab 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.bbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-alpha.bbx}[2018/02/17 v0.4a biblatex-trad alpha bibliograhy style] +\ProvidesFile{trad-alpha.bbx}[2021/03/06 v0.5 biblatex-trad alpha bibliograhy style] \RequireBibliographyStyle{trad-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.cbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.cbx index 172c00c3101..9940a8b2b21 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.cbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-alpha.cbx}[2018/02/17 v0.4a biblatex-trad alpha citation style] +\ProvidesFile{trad-alpha.cbx}[2021/03/06 v0.5 biblatex-trad alpha citation style] \RequireCitationStyle{alphabetic} diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.bbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.bbx index ae036f55861..cf76f4680b1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.bbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-plain.bbx}[2018/02/17 v0.4a biblatex-trad plain bibliography style] +\ProvidesFile{trad-plain.bbx}[2021/03/06 v0.5 biblatex-trad plain bibliography style] \RequireBibliographyStyle{trad-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.cbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.cbx index a9cd2dfcd4c..5f0ff0c9c79 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.cbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-plain.cbx}[2018/02/17 v0.4a biblatex-trad plain citation style] +\ProvidesFile{trad-plain.cbx}[2021/03/06 v0.5 biblatex-trad plain citation style] \RequireCitationStyle{numeric} diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.bbx index 196e87ec795..d8a10e38672 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.bbx @@ -1,11 +1,11 @@ %% Copyright (c) 2012 -- 2015 Marco Daniel -%% 2016 -- 2018 Moritz Wemheuer +%% 2016 -- 2021 Moritz Wemheuer %% %% This package is released under the terms of the %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-standard.bbx}[2018/02/17 v0.4a biblatex-trad base bibliography style] +\ProvidesFile{trad-standard.bbx}[2021/03/06 v0.5 biblatex-trad base bibliography style] %==========================================% %==========================================% %==========================================% @@ -20,8 +20,10 @@ %==========================================% %==========================================% \providebool{bbx:subentry} -\DeclareBibliographyOption[boolean]{subentry}[true]{% - \setbool{bbx:subentry}{#1}} +\ifundef\DeclareBiblatexOption + {\DeclareBibliographyOption[boolean]{subentry}[true]} + {\DeclareBiblatexOption{global,type,entry}[boolean]{subentry}[true]} + {\setbool{bbx:subentry}{#1}} \newbool{bbxtrad:doisequal} \newbool{bbxtrad:eprintsequal} \newbool{bbxtrad:urlsequal} @@ -33,6 +35,12 @@ \DeclareNameAlias{author}{default} \DeclareNameAlias{editor}{default} \DeclareNameAlias{translator}{default} + +\ifundef\DeclareNameWrapperAlias + {} + {\DeclareNameWrapperAlias{author}{default} + \DeclareNameWrapperAlias{editor}{default} + \DeclareNameWrapperAlias{translator}{default}} %==========================================% %==========================================% %==========================================% @@ -81,12 +89,11 @@ \OR\ifentrytype{reference}\OR\ifentrytype{mvreference}% \OR\ifentrytype{report}\OR\ifentrytype{thesis}} {#1} - {\MakeSentenceCase{#1}}} + {\MakeSentenceCase*{#1}}} \renewbibmacro*{in:}{% - \printtext{% - \bibstring{in}% - \printunit{\intitlepunct}}} + \bibstring{in}% + \printunit{\intitlepunct}} %==========================================% %==========================================% @@ -274,11 +281,7 @@ \newunit\newblock \usebibmacro{date}% \newunit\newblock - \iftoggle{bbx:eprint} - {\usebibmacro{eprint}} - {}% - \newunit\newblock - \usebibmacro{url+urldate}% + \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -486,9 +489,7 @@ \newcommaunit*% \usebibmacro{location+date}% \newunit\newblock - \iftoggle{bbx:url} - {\usebibmacro{url+urldate}} - {}% + \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock @@ -735,11 +736,12 @@ \usebibmacro{series+number:emphcond}% \newunit} +\providecommand*{\bibeidpunct}{\addcomma\space} \renewbibmacro*{volume+number+eid}{% \printfield{volume}% \setunit*{\volumenumberdelim}% \printfield{number}% - \setunit{\addcomma\space}% + \setunit{\bibeidpunct}% \printfield{eid}} \renewbibmacro*{publisher+location+date}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.cbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.cbx index c9b45419f84..b34acc02961 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.cbx @@ -5,6 +5,6 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-standard.cbx}[2018/02/17 v0.4a biblatex-trad base citation style] +\ProvidesFile{trad-standard.cbx}[2021/03/06 v0.5 biblatex-trad base citation style] \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.bbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.bbx index ee4f4bda0ab..3b3af90f47a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.bbx @@ -4,7 +4,7 @@ %% This package is released under the terms of the %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt -\ProvidesFile{trad-unsrt.bbx}[2018/02/17 v0.4a biblatex-trad unsrt bibliography style] +\ProvidesFile{trad-unsrt.bbx}[2021/03/06 v0.5 biblatex-trad unsrt bibliography style] \RequireBibliographyStyle{trad-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.cbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.cbx index 83ae2cd2f98..8f4224b913f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.cbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-unsrt.bbx}[2018/02/17 v0.4a biblatex-trad unsrt citation style] +\ProvidesFile{trad-unsrt.bbx}[2021/03/06 v0.5 biblatex-trad unsrt citation style] \RequireCitationStyle{numeric} |