texlive[46636] Master/texmf-dist: archaeologie (14feb18)
commits+karl at tug.org
commits+karl at tug.org
Wed Feb 14 22:32:17 CET 2018
Revision: 46636
http://tug.org/svn/texlive?view=revision&revision=46636
Author: karl
Date: 2018-02-14 22:32:16 +0100 (Wed, 14 Feb 2018)
Log Message:
-----------
archaeologie (14feb18)
Modified Paths:
--------------
trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib
trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib
trunk/Master/texmf-dist/doc/latex/archaeologie/README.md
trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf
trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex
trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf
trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex
trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
trunk/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx
Modified: trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib
===================================================================
--- trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib 2018-02-14 21:31:49 UTC (rev 46635)
+++ trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib 2018-02-14 21:32:16 UTC (rev 46636)
@@ -11,22 +11,23 @@
crossref = {EAOR},
}
- at InBook{Ganzert1984,
-author = {Herz, Peter},
-title = {Gaius Caesar und Artavasdes},
-bookauthor = {Ganzert, Joachim},
-booktitle = {Das Kenotaph für Gaius Caesar in Limyra},
-booksubtitle = {Architektur und Bauornamentik},
-pages = {118--126},
-publisher = {Wasmuth},
-location = Tuebingen,
-year = {1984},
-zenon = {000042874},
-series = IstForsch,
-shortseries = IstForsch-short,
-number = {35}
+ at Inbook{Ganzert1984,
+ author = {Herz, Peter},
+ title = {Gaius Caesar und Artavasdes},
+ booktitle = {Das Kenotaph für Gaius Caesar in Limyra},
+ date = {1984},
+ bookauthor = {Ganzert, Joachim},
+ booksubtitle = {Architektur und Bauornamentik},
+ publisher = {Wasmuth},
+ pages = {118--126},
+ series = IstForsch,
+ number = {35},
+ location = Tuebingen,
+ shortseries = IstForsch-short,
+ zenon = {000042874},
}
+
@Book{EAOR-02,
editor = {Gregori, Gian Luca},
title = {Regiones Italiae VI--XI},
@@ -167,7 +168,7 @@
location = {New Haven and } # London,
year = {1986},
maintitle = {The Architecture of the Roman Empire},
- volume = {II},
+ volume = {2},
series = {Yale Publications in the History of Art},
number = {35},
}
@@ -186,7 +187,7 @@
author = {K. Parlasca},
booktitle = {Helbig},
year = {1969},
- volume = {III},
+ volume = {3},
edition = {4},
pages = {98\psq\ Nr. 2176},
location = Tuebingen,
@@ -234,7 +235,7 @@
publisher = UMP,
location = {Ann Arbor, Mich.},
year = {2003},
- volume = {V},
+ volume = {5},
series = MemAmAc,
number = {2},
maintitle = {Cosa},
@@ -551,7 +552,7 @@
booktitle = {Die politischen Reden},
year = {1993},
editor = {Fuhrmann, Manfred},
- volume = {II},
+ volume = {2},
publisher = AWi,
pages = {110--185},
origlanguage = {latin},
@@ -761,7 +762,7 @@
title = {De L'Architecture},
publisher = {Les belles lettres},
location = Paris,
- volume = {I--X},
+ volumes = {10},
series = {Collection des Universités de France},
origtitle = {De architectura},
origlanguage = {latin},
Modified: trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib
===================================================================
--- trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib 2018-02-14 21:31:49 UTC (rev 46635)
+++ trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib 2018-02-14 21:32:16 UTC (rev 46636)
@@ -259,7 +259,7 @@
@String {ARadRaspr-short = {ARadRaspr}}
@String {ArbFBerSaechs-short = {ArbFBerSaechs}}
@String {Archaeographie-short = {Archäographie}}%*Abweichung!
- @String {Archaeologia-short = {Archäographie}}
+ @String {Archaeologia-short = {Archaeologia}}
@String {Archaeology-short = {Archaeology}}
@String {Archaeometry-short = {Archaeometry}}
@String {Archaiognosia-short = {Archaiognosia}}
Modified: trunk/Master/texmf-dist/doc/latex/archaeologie/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/archaeologie/README.md 2018-02-14 21:31:49 UTC (rev 46635)
+++ trunk/Master/texmf-dist/doc/latex/archaeologie/README.md 2018-02-14 21:32:16 UTC (rev 46636)
@@ -5,10 +5,10 @@
bibLaTeX-style for archaeologists, historians and philologists.
---
-_2017/11/19 v2.3.4_
+_2018/02/13 v2.3.5_
-Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl
+Copyright (c) 2016-2018 Lukas C. Bossert | Johannes Friedl
* Email: [info at biblatex-archaeologie.de](mailto:info at biblatex-archaeologie.de)
* Website: [www.biblatex-archaeologie.de](http://www.biblatex-archaeologie.de)
@@ -66,7 +66,20 @@
This project **does not** adhere to [Semantic Versioning](http://semver.org/).
The markdown syntax is inspired by the conventions proposed by [keepachangelog.com](http://keepachangelog.com/).
-## v2.3.4 (2017-11-19) --> [current release]
+## v2.3.5 (2018-02-13) --> [current release]
+
+#### *fixed*
+* `\citereset` for author names (https://github.com/LukasCBossert/biblatex-archaeologie/issues/122)
+* `\citetitle` will give the original title of a work which has the option `ancient`;
+`\citetitle*` instead will always give title without year.
+* no comma before `in:` if title is missing (got wrong in last version)
+* `volume`/`volumes` are now shown for `book` etc.
+* `daterange` for a sequence of two years (now delimited by `\`)
+* Short-journal for `Archaeologia`
+#### *changed*
+* `volume` is now automatically a Roman numeral for `book`, `inbook`, `collection`, `incollection`, `proceedings`, `inproceedings`, you only insert the Arabic number.
+
+## v2.3.4 (2017-11-19)
This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
#### *fixed*
@@ -80,7 +93,7 @@
#### *added*
* `@MvBook` and its children can be listed in the bibliography together; see [#118](https://github.com/LukasCBossert/biblatex-archaeologie/issues/118)
-* `\citetitle*` for showing the publication title without year of publication
+* `\citetitle*` for showing the publication title without year of publication.
* You can use the namefield `bookauthor` now, then no *(ed.)* will be printed.
Modified: trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex 2018-02-14 21:31:49 UTC (rev 46635)
+++ trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex 2018-02-14 21:32:16 UTC (rev 46636)
@@ -1,7 +1,7 @@
% archaeologie --%
% biblatex for archaeologists,
% historians and philologists
-% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl
+% Copyright (c) 2016-2018 Lukas C. Bossert | Johannes Friedl
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
Modified: trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex 2018-02-14 21:31:49 UTC (rev 46635)
+++ trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex 2018-02-14 21:32:16 UTC (rev 46636)
@@ -18,17 +18,27 @@
spanish,
italian,
ngerman,
-english
+english,
]{ltxdoc}
\input{archaeologie-preamble.tex}
+\hyphenation{}
\externaldocument{archaeologie-ger}[archaeologie-ger.pdf]% <- full or relative path
+% \makeatletter
+% \patchcmd{\@mpfootnotetext}%
+% {\color at begingroup}
+% {\color at begingroup\toggletrue{blx at footnote}}
+% {}
+% {}
+% \makeatother
+
+
\begin{document}
\pdfbookmark[1]{Titlepage}{title}
\title{\texttt{archaeologie} -- \\\texttt{bib\LaTeX} for archaeologists\footnote{Also very handy for (ancient) History or Classics, too.
For further information about the code visit \href{http://www.biblatex-archaeologie.de}{biblatex-archaeologie.de}:
Comments and criticisms are welcome.
-We thank \href{https://tex.stackexchange.com/users/35864/moewe}{moewe} and \href{https://tex.stackexchange.com/users/2478/herbert}{herbert} for their big help on the code.%
+We thank especially \href{https://tex.stackexchange.com/users/35864/moewe}{moewe} and \href{https://tex.stackexchange.com/users/2478/herbert}{herbert} for their great help with the code.%
}}
\author{Lukas C. Bossert\\{\small \href{mailto:info at biblatex-archaeologie.de}{info at biblatex-archaeologie.de}}
\and Johannes Friedl}
@@ -200,7 +210,9 @@
\changes{v1.1}{2015/06/04}{New options added in summary.}
-\subsection{Cite commands}\label{cite-commands}
+\subsection{Cite commands}
+\label{cite-commands}
+\subsubsection{cite and cites}
\DescribeMacro{\cite}
As always citing is done with \cs{cite}:
\begin{code}
@@ -217,6 +229,7 @@
\begin{example}
Public space is part of a city says \cite{Osland2016}.
\end{example}
+
\DescribeMacro{\cites}
If one wants to cite several authors or works a very convenient way is the following using the \cs{cites}-command:
\begin{code}
@@ -229,6 +242,7 @@
Public space is part of a city say \cites(cf.)(){Osland2016}{Evangelidis2014}.
\end{example}
+ \subsubsection{parencite and parencites}
\DescribeMacro{\parencite}
Sometimes a citation has to be put in parentheses.
Therefore we implemented the command \cs{parencite}:
@@ -255,6 +269,7 @@
Public space is part of a city \parencites(cf.)(){Osland2016}{Evangelidis2014}.
\end{example}
+\subsubsection{textcite and textcites}
\DescribeMacro{\textcite}
Beside the listed \cs{cite} commands above there is a third way of citing:
\cs{textcite} is useful if the author should be mentioned in the text and
@@ -280,6 +295,7 @@
\end{example}
Just be aware that using \oarg{prenote} may be give a odd sounding sentence depending what you use \oarg{prenote} for.
+\subsubsection{footcite}
\DescribeMacro{\footcite}
Beside the listed \cs{cite} commands above there are more possibilities citing:
There is also the possibility to put the citation into a footnote at once with \cs{footcite}:
@@ -295,7 +311,8 @@
Public space is part of a city.\footcites(cf.)(){Osland2016}{Evangelidis2014}
\end{example}
-
+ \subsubsection{smartcite and smartcites}
+
\DescribeMacro{\smartcite}
And there is also a clever way citing with \cs{smartcite}.
\cs{smartcite} depends on its environment it is used in. If it is your normal text it behaves like \cs{footcite} and will print the citation within a footnote.
@@ -324,6 +341,8 @@
And sometimes more than that.\footnote{\smartcites{Osland2016}[cf.][]{Evangelidis2014}.}
\end{example}
+\subsubsection{autocite}
+
\DescribeMacro{\autocite}
With \cs{autocite} there is a flexible way of citing.
We set up \cs{autocite} as \cs{footcite} by default.
@@ -336,6 +355,7 @@
Public space is part of a city.\autocite{Osland2016}
\end{example}
+\subsubsection{fullcite and footfullcite}
\DescribeMacro{\fullcite}\DescribeMacro{\footfullcite}
With \cs{fullcite} and \cs{footfullcite} you can print the complete entry in your current text.
\begin{code}
@@ -349,8 +369,10 @@
\end{example}
+\subsubsection{citeauthor and citetitle}
-\DescribeMacro{\citeauthor}\DescribeMacro{\citetitle}\label{citeauthor}%
+\DescribeMacro{\citeauthor}
+\DescribeMacro{\citetitle}\label{citeauthor}%
Furthermore and in addition to the ›normal‹ \cs{cite}-commands one can also cite only the author or the work title in the text and in the footnotes.
\begin{code}
\citeauthor*@\oarg{prenote}\oarg{postnote}\marg{bibtex-key}%@*
@@ -365,8 +387,12 @@
\end{example}
For further information cf. \cref{citeauthorformat}.
+Note that the |\citetitle|-command works differently with ancient works (for all those who have |option={ancient}|).
+First the field |origtitle| will be shown if this field is empty it will show its |title| instead.
+
\DescribeMacro{\citetitle*}
-Sometimes you don’t need the year of publication but still want the published title. Then |\citetitle*| is what you need:
+Sometimes you don’t need the year of publication but still want the published title.
+Then |\citetitle*| is what you need:
\archversion{2.3.4}
\begin{example}
In 2016 \citeauthor{Osland2016} says in \citetitle*{Osland2016}
@@ -373,7 +399,9 @@
public space is part of a city.
\end{example}
+Note that the |\citetitle*|-command will always show the field |title| without the year of publication it doesn’t matter if there is |option={ancient}|.
+\subsubsection{citetranslator}
\DescribeMacro{\citetranslator}\label{citetranslator}%
\archversion{2.3.0}
Addionally there is also a \cs{cite}-command which can be used to print the translator of an (ancient) publication.
@@ -1231,7 +1259,7 @@
booktitle = {Die politischen Reden},
year = {1993},
editor = {Fuhrmann, Manfred},
- volume = {II},
+ volume = {2},
publisher = AWi, %@String used
pages = {110--185},
origlanguage = {latin},
@@ -1346,7 +1374,7 @@
title = {De L'Architecture},
publisher = {Les belles lettres},
location = Paris, %@String used
- volume = {I--X},
+ volumes = {10},
series = {Collection des Universités de France},
origtitle = {De architectura},
origlanguage = {latin},
@@ -1571,7 +1599,7 @@
location = {New Haven and }# London, %@String used
year = {1986},
maintitle = {The Architecture of the Roman Empire},
- volume = {II},
+ volume = {2},
series = {Yale Publications in the History of Art},
number = {35},
}
@@ -1651,7 +1679,7 @@
publisher = UMP, %@String used
location = {Ann Arbor, Mich.},
year = {2003},
- volume = {V},
+ volume = {5},
series = MemAmAc, %@String used
number = {2},
maintitle = {Cosa},
@@ -1689,7 +1717,7 @@
author = {K. Parlasca},
booktitle = {Helbig},
year = {1969},
- volume = {III},
+ volume = {3},
edition = {4},
pages = {98\psq\ Nr. 2176},
location = Tuebingen, %@String used
@@ -2578,7 +2606,9 @@
}
\end{bibexample}
This time the article appeared in an issue which covers two years (\citedate{DeVisscher1951-1952}) and we want them to appear in the label.
-That is why we have to use the field |date| instead of |year|.
+That is why we have to use the field |date| instead of |year|.
+Note that if the date range consists out of only two sequent years, the delimiter will be a slash |/|.
+If the range is bigger than two years it will be an em-dash |–|.
\printbib[11em]{DeVisscher1951-1952}
By the way, if you want to cite only the year of publication use |\citedate|\marg{bibtex-key} and not |\citeyear|\marg{bibtex-key} since the field |year| will only give you the first year.
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx 2018-02-14 21:31:49 UTC (rev 46635)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx 2018-02-14 21:32:16 UTC (rev 46636)
@@ -1,8 +1,8 @@
% archaeologie --%
-% biblatex for archaeologists,
+% biblatex for archaeologists,
% historians and philologists
-% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl
-%
+% Copyright (c) 2018 Lukas C. Bossert | Johannes Friedl
+%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
% of this license or (at your option) any later version.
@@ -10,8 +10,8 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-\def\arch at date{2017/11/19}
-\def\arch at version{2.3.4}
+\def\arch at date{2018/02/13}
+\def\arch at version{2.3.5}
\def\arch at bbxid{\arch at date\space v\arch at version\space biblatex-archaeologie bibliography style (LCB/JF)}
\def\arch at cbxid{\arch at date\space v\arch at version\space biblatex-archaeologie citation style (LCB/JF)}
\def\arch at lbxid{\arch at date\space v\arch at version\space biblatex-archaeologie localization (LCB/JF)}
@@ -21,7 +21,7 @@
\RequireBibliographyStyle{standard}
\AtBeginDocument{%
\urlstyle{sf}%
- \typeout{* * * archaeologie * * *
+ \typeout{* * * archaeologie * * *
biblatex for archaeologists,
historians and philologists}
}
@@ -34,12 +34,11 @@
citecounter=true,%
sortlocale=auto,%
language=auto,%
- autolang=other,%
bibencoding=utf8,%
dateabbrev=false, %
sorting=nyt,%
labeldateparts=true,
- maxnames=2,%
+ maxnames=2,%
minnames=1,%
maxitems=1,%
maxbibnames=999,%
@@ -49,12 +48,12 @@
%-----------------------
\newbool{bbx:edby}
\newbool{bbx:width}
-\newbool{bbx:yearseries}
+\newbool{bbx:yearseries}
\newbool{bbx:bibfullname}
\newbool{bbx:inreferences}
\newbool{bbx:noabbrv}
\newbool{bbx:translation}
-\newbool{bbx:publisher}
+\newbool{bbx:publisher}
\newbool{bbx:initials}
\newbool{bbx:counter}
\newbool{cbx:ancient}
@@ -102,12 +101,12 @@
\ExecuteBibliographyOptions{%
jstor,%
urn,%
- }
+}
%-----------------------
\DeclareBibliographyOption{edby}[true]{\csuse{bool#1}{bbx:edby}}
\DeclareBibliographyOption{initials}[true]{\csuse{bool#1}{bbx:initials}}
\DeclareBibliographyOption{width}[]{%
- \csuse{booltrue}{bbx:width}%
+ \csuse{booltrue}{bbx:width}%
\setlength{\labwidthsameline}{#1}%
\def\labwidthsamelineVALUE{#1}}
\DeclareBibliographyOption{yearseries}[true]{\csuse{bool#1}{bbx:yearseries}}
@@ -124,10 +123,12 @@
\DeclareBibliographyOption{scshape}[true]{%
\ifstrequal{#1}{true}%
{\AtEveryCite{\renewcommand*{\mkbibnamefamily}[1]{\textsc{##1}}}}%
- {}%
- }
+ {}}
%-----------------------
-\ExecuteBibliographyOptions{initials=true}
+\ExecuteBibliographyOptions{%
+ initials=true,
+ autolang=other,%
+}
%-----------------------
\DeclareEntryOption{ancient}[true]{\csuse{bool#1}{cbx:ancient}}
\DeclareEntryOption{frgancient}[true]{%
@@ -140,7 +141,7 @@
\newcommand{\archaeologieoptions}[1][]{%
\ifstrempty{#1}{%
\iflanguage{ngerman}%
- {Zusätzlich geladene oder \xout{deaktivierte} Optionen
+ {Zusätzlich geladene oder \xout{deaktivierte} Optionen
von \textsc{bib}\LaTeX-\textsf{archaeologie} (Version \archaeologieversion~| \archaeologiedate):}%
{Additional options of \textsc{bib}\LaTeX-\textsf{archaeologie} (version \archaeologieversion~| \archaeologiedate) used or \xout{omitted}:}\addspace}%
{\ifthenelse{\equal{#1}{plain}}{}{{\PackageError{biblatex-archaeologie}%
@@ -177,7 +178,7 @@
{for further information see \url{http://biblatex-archaeologie.de}}
}
%-----------------------
-\DeclareFieldFormat*{title}{#1}
+\DeclareFieldFormat*{title}{#1\isdot}
\DeclareFieldFormat{subtitle}{#1}
\DeclareFieldFormat{booktitle}{#1}
\DeclareFieldFormat{editortype}{\mkbibparens{#1}}
@@ -190,6 +191,7 @@
\DeclareFieldFormat{edition}{#1}
\DeclareFieldFormat{volumes}{#1}
\DeclareFieldFormat{volume}{#1}
+\DeclareFieldFormat[book,collection,proceedings,inproceedings,inbook,incollection]{volume}{\RN{#1}}
\DeclareFieldFormat{part}{#1}
\DeclareFieldFormat[article]{date}{\iffieldundef{number}{#1}{\iffieldundef{volume}{#1\yearnumdelim\printfield{number}}{#1}}}
\DeclareFieldFormat[inreference]{number}{\mkbibbrackets{#1}}
@@ -202,7 +204,6 @@
\DeclareFieldFormat{note}{\mkbibparens{#1}\nopunct}
\DeclareFieldFormat{shorthandwidth}{#1}
\DeclareFieldFormat{origtitle}{#1}
-%\DeclareFieldFormat{origtitle}{\iffieldequalstr{origlanguage}{greek}{#1}{\mkbibemph{#1}}}
\DeclareFieldFormat{eprint:urn}{%
\textsc{urn}%
\addcolon\space%
@@ -246,7 +247,7 @@
\renewcommand{\finalnamedelim}{\multinamedelim}
\renewcommand*\relateddelim{\addnbspace\textendash\addspace}%
\newcommand*{\relateddelimmultivolume}{\addcomma\par\nobreak}
-\newcommand*{\volnumdelim}{\addcomma}
+\newcommand*{\volnumdelim}{\addcomma\space}
\newcommand*{\yearnumdelim}{\addslash}
\newcommand*{\jourvoldelim}{\addnbspace}
\renewcommand{\finentrypunct}{%http://tex.stackexchange.com/a/14159/98739
@@ -256,7 +257,7 @@
{wurde \ifnumequal{\value{citecounter}}
{0}
{{\color{red}{keinmal}}}
- {\arabic{citecounter}-mal}
+ {\arabic{citecounter}-mal}
zitiert.}
{cited \ifnumequal{\value{citecounter}}
{0}
@@ -266,6 +267,207 @@
{s}}.%
}}%
{}}
+
+\newrobustcmd*{\bibdatesubseqesep}{\slash}
+\newrobustcmd*{\bibdaterangesepx}[1]{%
+ \ifboolexpr{test {\iffieldint{#1year}} and test {\iffieldint{#1endyear}}}
+ {\ifnumequal{\thefield{#1endyear}-\thefield{#1year}}{1}
+ {\bibdatesubseqesep}
+ {\bibdaterangesep}}
+ {\bibdaterangesep}}
+
+\renewrobustcmd*{\mkdaterangefull}[2]{%
+ \blx at metadateinfo{#2}%
+ \iffieldundef{#2year}
+ {}
+ {\datecircaprint
+ \printtext[#2date]{%
+ % Such a season component can only come from an ISO8601 season which replaces
+ % a normal month so if it exists, we know that a normal date print is ruled out
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+ % Optionally print the time after the date
+ \blx at printtime{#2}{}}
+ {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+ \dateuncertainprint
+ \dateeraprint{#2year}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdaterangesep}}
+ {\bibdaterangesepx{#2}%
+ \enddatecircaprint
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ % Optionally print the time after the date
+ \blx at printtime{#2}{end}}
+ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+ \enddateuncertainprint
+ \dateeraprint{#2endyear}}}}}}
+
+\renewrobustcmd*{\mkdaterangetrunc}[2]{%
+ \blx at metadateinfo{#2}%
+ \iffieldundef{#2year}
+ {}
+ {\datecircaprint
+ \printtext[#2date]{%
+ % Such a season component can only come from an ISO8601 season which replaces
+ % a normal month so if it exists, we know that a normal date print is ruled out
+ \iffieldundef{#2season}
+ {\iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{}{}{#2day}}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+ \iffieldsequal{#2dateera}{#2enddateera}{}
+ {\dateeraprint{#2year}}}}
+ {\iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibseasondate#1}{}{#2season}}
+ {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+ \iffieldsequal{#2dateera}{#2enddateera}{}
+ {\dateeraprint{#2year}}}}%
+ \dateuncertainprint
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdaterangesep}}
+ {\bibdaterangesepx{#2}%
+ \enddatecircaprint
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
+ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+ \enddateuncertainprint
+ \dateeraprint{#2endyear}}}}}}
+
+\renewrobustcmd*{\mkdaterangefullextra}[2]{%
+ \blx at metadateinfo{#2}%
+ \iffieldundef{#2year}
+ {}
+ {\datecircaprint
+ \printtext[#2date]{%
+ \printtext{%
+ % Such a season component can only come from an ISO8601 season which replaces
+ % a normal month so if it exists, we know that a normal date print is ruled out
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+ % Optionally print the time after the date
+ \blx at printtime{#2}{}}
+ {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+ \dateuncertainprint
+ \dateeraprint{#2year}%
+ \iffieldundef{#2endyear}
+ {\printfield{extradate}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extradate}%
+ \printtext{\mbox{\bibdaterangesep}}}
+ {\printtext{%
+ \bibdaterangesepx{#2}%
+ \enddatecircaprint
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ % Optionally print the time after the date
+ \blx at printtime{#2}{end}}
+ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}%
+ \printfield{extradate}%
+ \enddateuncertainprint
+ \dateeraprint{#2endyear}}}}}}}
+
+\renewrobustcmd*{\mkdaterangetruncextra}[2]{%
+ \blx at metadateinfo{#2}%
+ \iffieldundef{#2year}
+ {}
+ {\datecircaprint
+ \printtext[#2date]{%
+ \printtext{%
+ % Such a season component can only come from an ISO8601 season which replaces
+ % a normal month so if it exists, we know that a normal date print is ruled out
+ \iffieldundef{#2season}
+ {\iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{}{}{#2day}}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+ \iffieldsequal{#2dateera}{#2enddateera}{}
+ {\dateeraprint{#2year}}}}
+ {\iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibseasondate#1}{}{#2season}}
+ {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+ \iffieldsequal{#2dateera}{#2enddateera}{}
+ {\dateeraprint{#2year}}}}%
+ \dateuncertainprint
+ \iffieldundef{#2endyear}
+ {\printfield{extradate}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extradate}%
+ \printtext{\mbox{\bibdaterangesep}}}
+ {\printtext{%
+ \bibdaterangesepx{#2}%
+ \enddatecircaprint
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
+ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}%
+ \printfield{extradate}%
+ \enddateuncertainprint
+ \dateeraprint{#2endyear}}}}}}}
+
+\renewrobustcmd*{\mkdaterangeymd}[1]{%
+ \blx at metadateinfo{#1}%
+ \iffieldundef{#1year}
+ {}
+ {\datecircaprint
+ \printtext[#1date]{%
+ % Such a season component can only come from an ISO8601 season which replaces
+ % a normal month so if it exists, we know that a normal date print is ruled out
+ \iffieldundef{#1season}
+ {\blx at ymddate{#1}{}%
+ % Optionally print the time after the date
+ \blx at printtime{#1}{}}
+ {\csuse{mkbibseasondateshort}{#1year}{#1season}}%
+ \dateuncertainprint
+ \dateeraprint{#1year}%
+ \iffieldundef{#1endyear}
+ {}
+ {\iffieldequalstr{#1endyear}{}
+ {\mbox{\bibdaterangesep}}
+ {\bibdaterangesepx{#1}%
+ \enddatecircaprint
+ \iffieldundef{#1season}
+ {\blx at ymddate{#1}{end}%
+ % Optionally print the time after the date
+ \blx at printtime{#1}{end}}
+ {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}%
+ \enddateuncertainprint
+ \dateeraprint{#1endyear}}}}}}
+
+\renewrobustcmd*{\mkdaterangeymdextra}[1]{%
+ \blx at metadateinfo{#1}%
+ \iffieldundef{#1year}
+ {}
+ {\datecircaprint
+ \printtext[#1date]{%
+ % Such a season component can only come from an ISO8601 season which replaces
+ % a normal month so if it exists, we know that a normal date print is ruled out
+ \iffieldundef{#1season}
+ {\blx at ymddate[extradate]{#1}{}%
+ % Optionally print the time after the date
+ \blx at printtime{#1}{}}
+ {\csuse{mkbibseasondateshort}{#1year}{#1season}}%
+ \dateuncertainprint
+ \dateeraprint{#1year}%
+ \iffieldundef{#1endyear}
+ {}
+ {\iffieldequalstr{#1endyear}{}
+ {\mbox{\bibdaterangesep}}
+ {\printtext{%
+ \bibdaterangesepx{#1}%
+ \enddatecircaprint
+ \iffieldundef{#1season}
+ {\blx at ymddate{#1}{end}%
+ % Optionally print the time after the date
+ \blx at printtime{#1}{end}}
+ {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}}%
+ \enddateuncertainprint
+ \dateeraprint{#1endyear}}}}}}
%-----------------------
\DeclareBibliographyAlias{collection}{book}
\DeclareBibliographyAlias{reference}{book}
@@ -273,7 +475,7 @@
\DeclareBibliographyAlias{maintitle}{booktitle}
\DeclareBibliographyAlias{incollection}{inbook}
\DeclareBibliographyAlias{manual}{book}
-%-----------------------
+%-----------------------
\DeclareSortingTemplate{nyt}{
\sort{
@@ -309,17 +511,16 @@
\DeclareSortingTemplate{shortseries}{\sort{\field{shortseries}}}
\DeclareSortingTemplate{shortjournal}{\sort{\field{shortjournal}}}
%-----------------------
-\defbibcheck{shortseries}{%
+\defbibcheck{shortseries}{%
\iffieldundef{shortseries}%
{\skipentry}%
{}%
- \iffieldundef{series}%
- {\skipentry}%
- {\ifcsdef{\strfield{series}}%
+ \iffieldundef{series}%
{\skipentry}%
- {\savefieldcs{series}{\strfield{series}}}%
- }%
-}
+ {\ifcsdef{\strfield{series}}%
+ {\skipentry}%
+ {\savefieldcs{series}{\strfield{series}}}}%
+}
\defbibcheck{shortjournal}{%
\iffieldundef{shortjournal}%
{\skipentry}%
@@ -327,11 +528,10 @@
\iffieldundef{journaltitle}%
{\skipentry}%
{\ifcsdef{\strfield{journaltitle}}%
- {\skipentry}%
- {\savefieldcs{journaltitle}{\strfield{journaltitle}}}%
- }%
+ {\skipentry}%
+ {\savefieldcs{journaltitle}{\strfield{journaltitle}}}}%
}
-%-----------------------
+%-----------------------
\DeclareNameAlias{name:initials}{default}
\DeclareNameAlias{author}{name:initials}
\DeclareNameAlias{editor}{author}
@@ -350,46 +550,46 @@
%-----------------------
\AtEveryBibitem{%
\iffieldequalstr{relatedtype}{translationof}%
- {\savename{translator}{\savedrelatedtranslator}%
- \clearname{translator}}%
- {}%
+ {\savename{translator}{\savedrelatedtranslator}%
+ \clearname{translator}}%
+ {}%
\ifboolexpr{bool {bbx:translation}%
- or bool {cbx:ancient}%
- or bool {cbx:frgancient}}%
- {}%
- {\clearname{translator}%
- \clearfield{origtitle}%
- }%
-}
+ or bool {cbx:ancient}%
+ or bool {cbx:frgancient}}%
+ {}%
+ {\clearname{translator}%
+ \clearfield{origtitle}}}
%-----------------------
\AtBeginDocument{%
- \ifbool{bbx:initials}{%http://tex.stackexchange.com/a/295486/98739
- \DeclareStyleSourcemap{%
- \maps[datatype=bibtex]{%
- \map{%
- % Author field
- \step[fieldsource=author,%
- match={\regexp{\b(Chr|Ch|Th|Ph|St)(\S*,)}},%
- replace={\regexp{\{$1\}$2}}]% Protect last names (first last)
- \step[fieldsource=author,%
- match={\regexp{([^,]\s)\b(Chr|Ch|Th|Ph|St)}},%
- replace={\regexp{$1\{$2\}}}]% Protect last names (last, first)
- \step[fieldsource=author,%
- match={\regexp{\b(Chr|Ch|Th|Ph|St)([^\}])}},%
- replace={\regexp{\{\\relax\{\}$1\}$2}}]% Insert \relax after abbreviating
- % Editor field
- \step[fieldsource=editor,%
- match={\regexp{\b(Chr|Ch|Th|Ph|St)(\S*,)}},%
- replace={\regexp{\{$1\}$2}}]% Protect last names (first last)
- \step[fieldsource=editor,%
- match={\regexp{([^,]\s)\b(Chr|Ch|Th|Ph|St)}},%
- replace={\regexp{$1\{$2\}}}]% Protect last names (last, first)
- \step[fieldsource=editor,%
- match={\regexp{\b(Chr|Ch|Th|Ph|St)([^\}])}},%
- replace={\regexp{\{\\relax\{\}$1\}$2}}]% Insert \relax after abbreviating
- }}}%
- }{}%
-}
+ \ifbool{bbx:initials}{%http://tex.stackexchange.com/a/295486/98739
+ \DeclareStyleSourcemap{%
+ \maps[datatype=bibtex]{%
+ \map{%
+ % Author field
+ \step[fieldsource=author,%
+ match={\regexp{\b(Chr|Ch|Th|Ph|St)(\S*,)}},%
+ replace={\regexp{\{$1\}$2}}]% Protect last names (first last)
+ \step[fieldsource=author,%
+ match={\regexp{([^,]\s)\b(Chr|Ch|Th|Ph|St)}},%
+ replace={\regexp{$1\{$2\}}}]% Protect last names (last, first)
+ \step[fieldsource=author,%
+ match={\regexp{\b(Chr|Ch|Th|Ph|St)([^\}])}},%
+ replace={\regexp{\{\\relax\{\}$1\}$2}}]% Insert \relax after abbreviating
+ % Editor field
+ \step[fieldsource=editor,%
+ match={\regexp{\b(Chr|Ch|Th|Ph|St)(\S*,)}},%
+ replace={\regexp{\{$1\}$2}}]% Protect last names (first last)
+ \step[fieldsource=editor,%
+ match={\regexp{([^,]\s)\b(Chr|Ch|Th|Ph|St)}},%
+ replace={\regexp{$1\{$2\}}}]% Protect last names (last, first)
+ \step[fieldsource=editor,%
+ match={\regexp{\b(Chr|Ch|Th|Ph|St)([^\}])}},%
+ replace={\regexp{\{\\relax\{\}$1\}$2}}]% Insert \relax after abbreviating
+ }
+ }
+ }%
+ }
+ {}}
%-----------------------
%% provide macros to deal with intranslator, withincommentator, withinannotator, withinintroduction, withinforeword, withinafterword
%% that is fields referring to the title work and not the booktitle work in inbook etc. works
@@ -396,165 +596,163 @@
% these macros are essentially the same as the standard macros without the "in"
\newbibmacro*{byineditor+others}{%
\ifnameundef{ineditor}
- {}
- {\usebibmacro{byeditor+othersstrg}%
- \setunit{\addspace}%
- \printnames[author]{ineditor}%
- \clearname{ineditor}%
- \newunit}%
+ {}
+ {\usebibmacro{byeditor+othersstrg}%
+ \setunit{\addspace}%
+ \printnames[author]{ineditor}%
+ \clearname{ineditor}%
+ \newunit}%
\usebibmacro{byintranslator+others}}
%-----------------------
\newbibmacro*{byintranslator+others}{%
\ifnameundef{intranslator}
- {}
- {\usebibmacro{bytranslator+othersstrg}%
- \setunit{\addspace}%
- \printnames[author]{intranslator}%
- \clearname{intranslator}%
- \newunit}%
- \usebibmacro{withinothers}}
+ {}
+ {\usebibmacro{bytranslator+othersstrg}%
+ \setunit{\addspace}%
+ \printnames[author]{intranslator}%
+ \clearname{intranslator}%
+ \newunit}%
+ \usebibmacro{withinothers}}
%-----------------------
\newbibmacro*{withincommentator}{%
\ifnameundef{incommentator}
- {}
- {\bibstring{withcommentator}%
- \setunit{\addspace}%
- \printnames[author]{incommentator}}}
+ {}
+ {\bibstring{withcommentator}%
+ \setunit{\addspace}%
+ \printnames[author]{incommentator}}}
%-----------------------
\newbibmacro*{withinannotator}{%
\ifnameundef{inannotator}
- {}
- {\bibstring{withannotator}%
- \setunit{\addspace}%
- \printnames[author]{inannotator}}}
+ {}
+ {\bibstring{withannotator}%
+ \setunit{\addspace}%
+ \printnames[author]{inannotator}}}
%-----------------------
\newbibmacro*{withinintroduction}{%
\ifnameundef{inintroduction}
- {}
- {\bibstring{withintroduction}%
- \setunit{\addspace}%
- \printnames[author]{inintroduction}}}
+ {}
+ {\bibstring{withintroduction}%
+ \setunit{\addspace}%
+ \printnames[author]{inintroduction}}}
%-----------------------
\newbibmacro*{withinforeword}{%
\ifnameundef{inforeword}
- {}
- {\bibstring{withforeword}%
- \setunit{\addspace}%
- \printnames[author]{inforeword}}}
+ {}
+ {\bibstring{withforeword}%
+ \setunit{\addspace}%
+ \printnames[author]{inforeword}}}
%-----------------------
\newbibmacro*{withinafterword}{%
\ifnameundef{inafterword}
- {}
- {\bibstring{withafterword}%
- \setunit{\addspace}%
- \printnames[author]{inafterword}}}
+ {}
+ {\bibstring{withafterword}%
+ \setunit{\addspace}%
+ \printnames[author]{inafterword}}}
%-----------------------
\newbibmacro*{withinothers}{%
- \usebibmacro{withincommentator}%
- \clearname{incommentator}%
- \newunit%
- \usebibmacro{withinannotator}%
- \clearname{inannotator}%
- \newunit%
- \usebibmacro{withinintroduction}%
- \clearname{inintroduction}%
- \newunit%
- \usebibmacro{withinforeword}%
- \clearname{inforeword}%
- \newunit%
- \usebibmacro{withinafterword}%
- \clearname{inafterword}%
+ \usebibmacro{withincommentator}%
+ \clearname{incommentator}%
+ \newunit
+ \usebibmacro{withinannotator}%
+ \clearname{inannotator}%
+ \newunit
+ \usebibmacro{withinintroduction}%
+ \clearname{inintroduction}%
+ \newunit
+ \usebibmacro{withinforeword}%
+ \clearname{inforeword}%
+ \newunit
+ \usebibmacro{withinafterword}%
+ \clearname{inafterword}%
}
%-----------------------
\newbibmacro{labelwidthbib}{%
\begingroup%
- \DeclareFieldFormat{bibhyperref}{##1}%
- \csuse{blx at hook@cite}%
- \csuse{blx at hook@citekey}%
- \defcounter{maxnames}{\blx at maxcitenames}%
- \usebibmacro{cite}%
+ \DeclareFieldFormat{bibhyperref}{##1}%
+ \csuse{blx at hook@cite}%
+ \csuse{blx at hook@citekey}%
+ \defcounter{maxnames}{\blx at maxcitenames}%
+ \usebibmacro{cite}%
\endgroup%
-}
+}
%-----------------------
-\newbibmacro{kicklabel}{%
+\newbibmacro{kicklabel}{%
\sbox\arch at labelbox{\usebibmacro{labelwidthbib}}%
\global\togglefalse{blx at insert}%
\ifdim1.1\wd\arch at labelbox>%
- \labwidthsameline\leavevmode\newline\fi%
+ \labwidthsameline\leavevmode\newline
+ \fi%
}
%-----------------------
\newbibmacro{labelwidthfield}[1]{%
\begingroup
- \DeclareFieldFormat{bibhyperref}{##1}%
- \csuse{blx at hook@cite}%
- \csuse{blx at hook@citekey}%
- \defcounter{maxnames}{\blx at maxcitenames}%
- \printfield{#1}%
+ \DeclareFieldFormat{bibhyperref}{##1}%
+ \csuse{blx at hook@cite}%
+ \csuse{blx at hook@citekey}%
+ \defcounter{maxnames}{\blx at maxcitenames}%
+ \printfield{#1}%
\endgroup
-}
+}
%-----------------------
-\newbibmacro{kicklabelfield}[1]{%
+\newbibmacro{kicklabelfield}[1]{%
\sbox\arch at labelbox{\usebibmacro{labelwidthfield}{#1}}%
\global\togglefalse{blx at insert}%
\ifdim.9\wd\arch at labelbox>%
- \labwidthsameline\leavevmode\newline\fi
+ \labwidthsameline\leavevmode\newline
+ \fi
}
%-----------------------
-\renewbibmacro{in:}{%
- \ifthenelse{%
- \ifentrytype{article}%
- \OR%
- \ifentrytype{review}%
- }%
- {}%
- {\setunit{\isdot\addcomma\addspace}%
- \printtext{\bibstring{in}\intitlepunct}}}
-%-----------------------
+% \renewbibmacro{in:}{%
+% \setunit{\isdot%
+% \iffieldundef{title}
+% {}
+% {\addcomma}%
+% \addspace}%
+% \printtext{\bibstring{in}\intitlepunct}}
+%-----------------------
\renewbibmacro*{pageref}{%
\iflistundef{pageref}
{}
- { \setunit{\addcomma\newline\nobreak}%
- \printtext{%
+ {\setunit{\addcomma\newline\nobreak}%
+ \printtext{%
\ifnumgreater{\value{pageref}}{1}
{\bibstring{backrefpages}\ppspace}
{\bibstring{backrefpage}\ppspace}%
\printlist[pageref][-\value{listtotal}]{pageref}}}}
-%-----------------------
+%-----------------------
\newbibmacro*{bbx:parunit}{%
- \ifbibliography{%
- \setunit{\bibpagerefpunct}%
- \newblock
- \usebibmacro{pageref}%
- \clearlist{pageref}%
- \setunit{\addcomma\newline\nobreak}%
- }%
- {\newunit}%
+ \ifbibliography{%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \clearlist{pageref}%
+ \setunit{\addcomma\newline\nobreak}}%
+ {\newunit}%
}
- %-----------------------
+ %-----------------------
\renewbibmacro*{eprint}{%
- \usebibmacro{bbx:parunit}%
- \iffieldundef{eprinttype}%
- {\printfield{eprint}}%
- {\printfield[eprint:\strfield{eprinttype}]{eprint}}%
+ \usebibmacro{bbx:parunit}%
+ \iffieldundef{eprinttype}%
+ {\printfield{eprint}}%
+ {\printfield[eprint:\strfield{eprinttype}]{eprint}}%
}
-%-----------------------
+%-----------------------
\newbibmacro*{zenon}{%
\iffieldundef{zenon}
- {}%
- {\usebibmacro{bbx:parunit}%
- \printfield{zenon}}}
-%-----------------------
+ {}%
+ {\usebibmacro{bbx:parunit}%
+ \printfield{zenon}}}
+%-----------------------
\newbibmacro*{jstor}{%
\iffieldundef{jstor}
- {}
- {\usebibmacro{bbx:parunit}%
- \printfield{jstor}}}
-%-----------------------
+ {}
+ {\usebibmacro{bbx:parunit}%
+ \printfield{jstor}}}
+%-----------------------
\newbibmacro*{urn}{%
\iffieldundef{urn}
- {}
- {\usebibmacro{bbx:parunit}%
- \printfield{urn}}}
+ {}
+ {\usebibmacro{bbx:parunit}%
+ \printfield{urn}}}
%-----------------------
\renewbibmacro*{url+urldate}{%
\usebibmacro{bbx:parunit}%
@@ -563,15 +761,15 @@
{\printfield{url}%
\setunit*{\addspace}%
\printtext{\printurldate}}}
-%-----------------------
+%-----------------------
\renewbibmacro*{doi+eprint+url}{%
- \usebibmacro{bbx:parunit}%
- \iftoggle{bbx:doi}{\printfield{doi}}{}%
- \iftoggle{bbx:eprint}{\usebibmacro{eprint}}{}%
- \iftoggle{bbx:jstor}{\usebibmacro{jstor}}{}%
- \iftoggle{bbx:urn}{\usebibmacro{urn}}{}%
- \iftoggle{bbx:zenon}{\usebibmacro{zenon}}{}%
- \iftoggle{bbx:url}{\usebibmacro{url+urldate}}{}%
+ \usebibmacro{bbx:parunit}%
+ \iftoggle{bbx:doi}{\printfield{doi}}{}%
+ \iftoggle{bbx:eprint}{\usebibmacro{eprint}}{}%
+ \iftoggle{bbx:jstor}{\usebibmacro{jstor}}{}%
+ \iftoggle{bbx:urn}{\usebibmacro{urn}}{}%
+ \iftoggle{bbx:zenon}{\usebibmacro{zenon}}{}%
+ \iftoggle{bbx:url}{\usebibmacro{url+urldate}}{}%
}
%-----------------------
\renewbibmacro*{editor}{%
@@ -579,341 +777,309 @@
test \ifuseeditor %
and %
not test {\ifnameundef{editor}}}%
- {\printnames{editor}%
- \setunit{\addspace}%
- \printtext[parens]{\bibstring{editor}}%
- \clearname{editor}}%
- {}}
-%-----------------------
+ {\printnames{editor}%
+ \setunit{\addspace}%
+ \printtext[parens]{\bibstring{editor}}%
+ \clearname{editor}}%
+ {}}
+%-----------------------
\newbibmacro*{bookauthor}{%
\printnames{bookauthor}%
\newunit}
-%-----------------------
+%-----------------------
\DeclareLabeldate{%
+ \field{year}
\field{date}
- \field{year}
- \field{eventdate}
\field{origdate}
\field{urldate}
\field{pubstate}
+ \field{eventdate}
\literal{nodate}
}
-%-----------------------
+%-----------------------
\newbibmacro*{series}{%
\ifboolexpr{test {\iffieldundef{shortseries}} %
- or bool {bbx:noabbrv}}%
- {\printtext[seriestitle]{\printfield[titlecase]{series}}}%
- {\printfield{shortseries}}%
+ or bool {bbx:noabbrv}}%
+ {\printtext[seriestitle]{\printfield[titlecase]{series}}}%
+ {\printfield{shortseries}}%
}
%-----------------------
\renewbibmacro*{series+number}{%
- \iffieldundef{series}%
- {}%
- {\usebibmacro{series}%
- \setunit*{\addspace}%
- \printfield{number}%
- \ifbool{bbx:yearseries}%
- {\newunit}%
- {\setunit{\addspace}}}}
+ \iffieldundef{series}%
+ {}%
+ {\usebibmacro{series}%
+ \setunit*{\addspace}%
+ \printfield{number}%
+ \ifbool{bbx:yearseries}%
+ {\newunit}%
+ {\setunit{\addspace}}}}
%-----------------------
\renewbibmacro*{journal}{%
- \ifboolexpr{test {\iffieldundef{shortjournal}}%
- or bool {bbx:noabbrv}}%
- {\printtext[journaltitle]{%
- \printfield[titlecase]{journaltitle}%
- \setunit{\subtitlepunct}%
- \printfield[titlecase]{journalsubtitle}%
- }%
- }%
- {\printfield{shortjournal}}}
+ \ifboolexpr{test {\iffieldundef{shortjournal}}%
+ or bool {bbx:noabbrv}}%
+ {\printtext[journaltitle]{%
+ \printfield[titlecase]{journaltitle}%
+ \setunit{\subtitlepunct}%
+ \printfield[titlecase]{journalsubtitle}}}%
+ {\printfield{shortjournal}}}
%-----------------------
\newbibmacro{journal+number+year}{%
- \usebibmacro{journal}%
- \setunit{\jourvoldelim}%
- \iffieldundef{volume}%
- {}
- {\printfield{volume}%
- \iffieldundef{number}%
- {}%
- {\setunit{\volnumdelim}%
- \printfield{number}}%
- \newunit}%
-\usebibmacro{pubstate+year}}
+ \usebibmacro{journal}%
+ \setunit{\jourvoldelim}%
+ \iffieldundef{volume}%
+ {}
+ {\printfield{volume}%
+ \iffieldundef{number}%
+ {}%
+ {\setunit{\volnumdelim}%
+ \printfield{number}}%
+ \newunit}%
+ \usebibmacro{pubstate+year}}
%-----------------------
\newbibmacro{pubstate+year}{%
- \iffieldundef{pubstate}%
- {\usebibmacro{date}}%
- {\printfield{pubstate}}}
+ \iffieldundef{pubstate}%
+ {\usebibmacro{date}}%
+ {\printfield{pubstate}}}
%-----------------------
\newbibmacro*{pages}{%
- \printfield{pages}%
- \isdot}
+ \printfield{pages}%
+ \isdot}
%-----------------------
\newbibmacro{translation}{%
- \printfield{origtitle}%
- \setunit{\addcomma\space}%
- \usebibmacro{byeditor+others}}
-%-----------------------
+ \printfield{origtitle}%
+ \setunit{\addcomma\space}%
+ \usebibmacro{byeditor+others}}
+%-----------------------
\newbibmacro{intranslation}{%
- \printfield{origtitle}%
- \setunit{\addcomma\space}%
- \usebibmacro{byineditor+others}}
-%-----------------------
+ \printfield{origtitle}%
+ \setunit{\addcomma\space}%
+ \usebibmacro{byineditor+others}}
+%-----------------------
\newbibmacro*{related:reviewof}[1]{%
\usebibmacro*{related:default}{#1}}
%-----------------------
\newbibmacro*{related:translationof}[1]{%
- \entrydata*{#1}{%
- \restorename{savedtranslator}{\savedrelatedtranslator}%
- \printtext[emph]{\usebibmacro{title}}%
- \usebibmacro{location+edition+year}%
- \ifnameundef{savedtranslator}%
- {}%
- {\newunit
- \bibstring{bytranslator}%keine Sprache ausgegeben?
- \setunit{\addspace}%
- \printnames{savedtranslator}}}}
-%-----------------------
-\newbibmacro*{inreference:title+author}{%
- \iffieldundef{title}%
- {}%
- {\setunit{\addspace}%
- \bibstring{subvoce}%
- \setunit{\addspace}%
- \printfield{title}%
- \setunit*{\addspace}%
- \printfield{number}}%
- \setunit{\addspace}%
- \ifnameundef{author}%
- {}
- {\printtext[parens]{\printnames[name:initials]{labelname}}}}
-%-----------------------
-\newbibmacro*{maintitle+title+volumes}{%
- \iffieldsequal{maintitle}{title}%
- {\clearfield{maintitle}%
- \clearfield{mainsubtitle}%
- \clearfield{maintitleaddon}%
- }%
- {\iffieldundef{maintitle}%
- {}%
- {\usebibmacro{maintitle}%
- \usebibmacro{volume}%
- \clearfield{volume}%
- }%
+ \entrydata*{#1}{%
+ \restorename{savedtranslator}{\savedrelatedtranslator}%
+ \printtext[emph]{\usebibmacro{title}}%
+ \usebibmacro{location+edition+year}%
+ \ifnameundef{savedtranslator}%
+ {}%
+ {\newunit
+ \bibstring{bytranslator}%keine Sprache ausgegeben?
+ \setunit{\addspace}%
+ \printnames{savedtranslator}}}}
+%-----------------------
+\newbibmacro*{inreference:title+author}{%
\iffieldundef{title}%
- {}%
- {\usebibmacro{title}}%
- \ifbool{cbx:ancient}%
- {\usebibmacro{translation}%
- \usebibmacro{volume}%
- }%
{}%
- }%
+ {\setunit{\addspace}%
+ \bibstring{subvoce}%
+ \setunit{\addspace}%
+ \printfield{title}%
+ \setunit*{\addspace}%
+ \printfield{number}}%
+ \setunit{\addspace}%
+ \ifnameundef{author}%
+ {}
+ {\printtext[parens]{\printnames[name:initials]{labelname}}}}
+%-----------------------
+\newbibmacro*{maintitle+title+volumes}{%
+ \iffieldsequal{maintitle}{title}%
+ {\clearfield{maintitle}%
+ \clearfield{mainsubtitle}%
+ \clearfield{maintitleaddon}}%
+ {\iffieldundef{maintitle}%
+ {}%
+ {\usebibmacro{maintitle}%
+ \usebibmacro{volume}%
+ \clearfield{volume}}%
+ \iffieldundef{title}%
+ {}%
+ {\usebibmacro{title}}%
+ \ifbool{cbx:ancient}%
+ {\usebibmacro{translation}}%
+ {\usebibmacro{volume}}}%
\newunit}
%-----------------------
\renewbibmacro{event+venue+date}{%
- \setunit{\adddot\addspace}%
- \printfield{eventtitle}%
- \setunit*{\addspace}%
- \printfield{venue}%
- \setunit*{\addspace}%
- \printeventdate%
- \newunit%
+ \setunit{\adddot\addspace}%
+ \printfield{eventtitle}%
+ \setunit*{\addspace}%
+ \printfield{venue}%
+ \setunit*{\addspace}%
+ \printeventdate%
+ \newunit
}
-%-----------------------
+%-----------------------
\renewbibmacro*{title}{%
- \ifboolexpr{%
- test {\iffieldundef{title}}%
- and%
- test {\iffieldundef{subtitle}}}%
- {}%
- {\printtext[title]{%
- \printfield[titlecase]{title}%
- \setunit{\subtitlepunct}%
- \printfield[titlecase]{subtitle}}%
- }%
- \iffieldundef{titleaddon}
- {\newunit}
- {\setunit*{\subtitlepunct}%
- \printfield{titleaddon}}%
+ \ifboolexpr{%
+ test {\iffieldundef{title}}%
+ and%
+ test {\iffieldundef{subtitle}}}%
+ {}%
+ {\printtext[title]{%
+ \printfield[titlecase]{title}%
+ \setunit{\subtitlepunct}%
+ \printfield[titlecase]{subtitle}}}%
+ \iffieldundef{titleaddon}
+ {\newunit}
+ {\setunit*{\subtitlepunct}%
+ \printfield{titleaddon}}
}
-%-----------------------
+%-----------------------
\renewbibmacro*{booktitle}{%
- \ifboolexpr{%
- test {\iffieldundef{booktitle}}%
- and%
- test {\iffieldundef{booksubtitle}}}%
- {}%
- {\printtext[booktitle]{%
- \printfield[titlecase]{booktitle}%
- \setunit{\subtitlepunct}%
- \printfield[titlecase]{booksubtitle}}%
- \setunit{\subtitlepunct}%
- }%
- \printfield{booktitleaddon}%
+ \ifboolexpr{%
+ test {\iffieldundef{booktitle}}%
+ and%
+ test {\iffieldundef{booksubtitle}}}%
+ {}%
+ {\printtext[booktitle]{%
+ \printfield[titlecase]{booktitle}%
+ \setunit{\subtitlepunct}%
+ \printfield[titlecase]{booksubtitle}}%
+ \setunit{\subtitlepunct}}%
+ \printfield{booktitleaddon}%
}
-%-----------------------
+%-----------------------
\renewbibmacro*{maintitle}{%
- \ifboolexpr{%
- test {\iffieldundef{maintitle}}%
- and%
- test {\iffieldundef{mainsubtitle}}}%
- {}%
- {\printtext[maintitle]{%
- \printfield[titlecase]{maintitle}%
- \setunit{\subtitlepunct}%
- \printfield[titlecase]{mainsubtitle}}%
- \setunit{\subtitlepunct}%
- }%
- \printfield{maintitleaddon}%
+ \ifboolexpr{%
+ test {\iffieldundef{maintitle}}%
+ and%
+ test {\iffieldundef{mainsubtitle}}}%
+ {}%
+ {\printtext[maintitle]{%
+ \printfield[titlecase]{maintitle}%
+ \setunit{\subtitlepunct}%
+ \printfield[titlecase]{mainsubtitle}}%
+ \setunit{\subtitlepunct}}%
+ \printfield{maintitleaddon}%
}
%-----------------------
\newbibmacro*{edition}{%
- \iffieldint{edition}%
- {\setunit*{\addspace}%
- \mkbibsuperscript{\printfield{edition}}\kern -1pt}%
- {\newunit%
- \printfield{edition}%
- \setunit{\addspace}}}
+ \iffieldint{edition}%
+ {\setunit*{\addspace}%
+ \mkbibsuperscript{\printfield{edition}}\kern -1pt}%
+ {\newunit
+ \printfield{edition}%
+ \setunit{\addspace}}}
%-----------------------
\newbibmacro*{location+edition+year}{%
\ifboolexpr{%
- test {\iflistundef{location}}%
- and test {\iflistundef{publisher}}%
- and test {\iffieldundef{year}}}%
- {}%
- {\ifbool{bbx:publisher}%
- {\printtext[parens]{%
- \printlist{location}%
- \setunit*{\addcolon\addspace}%
- \printlist{publisher}%
- \iffieldint{edition}%
- {\setunit{\addspace}}%
- {\newunit}%
- \usebibmacro{edition}%
- \usebibmacro{pubstate+year}%
- \setunit*{\addspace}%
- \ifboolexpr{%
- test {\iflistundef{origlocation}}%
- and test {\iflistundef{origpublisher}}%
- and test {\iffieldundef{origyear}}}%
+ test {\iflistundef{location}}%
+ and test {\iflistundef{publisher}}%
+ and test {\iffieldundef{year}}}%
{}%
- {\printtext[parens]{%
- \printlist{origlocation}%
- \iflistundef{origpublisher}%
- {}%
- {\setunit*{\addcolon\addspace}%
- \printlist{origpublisher}%
- }%
- \setunit{\addspace}%
- \printfield{origyear}%
- }%
- }%
- }%
- }%
- {\usebibmacro{edition}%
- \printtext[parens]{%
- \ifboolexpr{%
- test {\iflistundef{origlocation}}%
- and test {\iffieldundef{origyear}}%
- }%
- {}%
- {\iflistundef{origlocation}%
- {\printlist{location}}%
- {\printlist{origlocation}}%
- \setunit{\addspace}%
- \printfield{origyear}%
- \setunit*{\addsemicolon\addspace}%
- \iffieldundef{origyear}%
- {}%
- {\bibstring{reprint}%
- \setunit*{\addspace}%
- }%
- }%
+ {\ifbool{bbx:publisher}%
+ {\printtext[parens]{%
+ \printlist{location}%
+ \setunit*{\addcolon\addspace}%
+ \printlist{publisher}%
+ \iffieldint{edition}%
+ {\setunit{\addspace}}%
+ {\newunit}%
+ \usebibmacro{edition}%
+ \usebibmacro{pubstate+year}%
+ \setunit*{\addspace}%
+ \ifboolexpr{%
+ test {\iflistundef{origlocation}}%
+ and test {\iflistundef{origpublisher}}%
+ and test {\iffieldundef{origyear}}}%
+ {}%
+ {\printtext[parens]{%
+ \printlist{origlocation}%
+ \iflistundef{origpublisher}%
+ {}%
+ {\setunit*{\addcolon\addspace}%
+ \printlist{origpublisher}}%
+ \setunit{\addspace}%
+ \printfield{origyear}}}}}%
+ {\usebibmacro{edition}%
+ \printtext[parens]{%
+ \ifboolexpr{%
+ test {\iflistundef{origlocation}}%
+ and test {\iffieldundef{origyear}}}%
+ {}%
+ {\iflistundef{origlocation}%
+ {\printlist{location}}%
+ {\printlist{origlocation}}%
+ \setunit*{\addspace}%
+ \printfield{origyear}%
+ \setunit*{\addsemicolon\addspace}%
+ \iffieldundef{origyear}%
+ {}%
+ {\bibstring{reprint}%
+ \setunit*{\addspace}}}%
+ \printlist{location}%
+ \setunit*{\addspace}%
+ \usebibmacro{pubstate+year}}}}}
+%-----------------------
+\renewbibmacro*{institution+location+date}{%
\printlist{location}%
\setunit*{\addspace}%
- \usebibmacro{pubstate+year}%
- }%
- }%
- }%
-}
-%-----------------------
-\renewbibmacro*{institution+location+date}{%
- \printlist{location}%
- \printlist{institution}%
- \setunit*{\addspace}%
-\usebibmacro{pubstate+year}%
-}
+ \printlist{institution}%
+ \setunit*{\addspace}%
+ \usebibmacro{pubstate+year}}
%-----------------------
\newbibmacro{signatur}{%
- \printfield{note}%
-}
-%-----------------------
+ \printfield{note}}
+%-----------------------
\newbibmacro*{volume}{%
- \iffieldundef{volume}%
- {\iffieldundef{volumes}%
- {}%
- {\printfield{volumes}%
- \setunit*{\addspace}%
- \bibstring{volumes}%
- \setunit{\addspace}}}%
- {\setunit{\addspace}%
- \printfield{volume}%
- \clearfield{volume}%
- \iffieldundef{part}
- {}
- {\setunit{\addspace}%
- \printfield{part}}%
- }%
- \newunit%
-}
-%-----------------------
+ \iffieldundef{volume}%
+ {\iffieldundef{volumes}%
+ {}%
+ {\printfield{volumes}%
+ \setunit*{\addspace}%
+ \bibstring{volumes}%
+ \setunit{\addspace}}}%
+ {\setunit{\addspace}%
+ \printfield{volume}%
+ \clearfield{volume}%
+ \iffieldundef{part}
+ {}
+ {\setunit{\addspace}%
+ \printfield{part}}}%
+ \newunit}
+%-----------------------
\renewbibmacro*{maintitle+booktitle}{%
- \iffieldundef{maintitle}%
- {}%
- {\usebibmacro{maintitle}%
- \usebibmacro{volume}%
- \setunit{\maintitlepunct}
- }%
- \usebibmacro{booktitle}%
- \usebibmacro{volume}%
- \newunit%
+ \iffieldundef{maintitle}%
+ {}%
+ {\usebibmacro{maintitle}%
+ \usebibmacro{volume}%
+ \setunit{\maintitlepunct}}%
+ \usebibmacro{booktitle}%
+ \usebibmacro{volume}%
+ \newunit
}
-%-----------------------
+%-----------------------
\newbibmacro*{booktitle+volume+editor}{%
\ifnameundef{editor}%
- {\usebibmacro{bookauthor}%
- \usebibmacro{maintitle+booktitle}%
- \newunit%
- }%
- {\ifbool{bbx:edby}%
- {\usebibmacro{maintitle+booktitle}%
- \newunit%
- \bibstring{byeditor}%
- \setunit{\addspace}%
- \printnames{editor}%
- }%
- {\usebibmacro{editor}%
- \newunit\newblock%
- \usebibmacro{maintitle+booktitle}%
- \newunit%
- }%
- }%
+ {\usebibmacro{bookauthor}%
+ \usebibmacro{maintitle+booktitle}%
+ \newunit}%
+ {\ifbool{bbx:edby}%
+ {\usebibmacro{maintitle+booktitle}%
+ \newunit
+ \bibstring{byeditor}%
+ \setunit{\addspace}%
+ \printnames{editor}}%
+ {\usebibmacro{editor}%
+ \newunit\newblock
+ \usebibmacro{maintitle+booktitle}%
+ \newunit}}%
}
%-----------------------
\newbibmacro*{reftitle}{%
- \iffieldundef{title}%
- {}%
- {\bibstring{reference}%
- \setunit{\addspace}%
- \printtext[emph]{%
- \usebibmacro{title}%
- \setunit{\addspace}%
- \iffieldundef{number}%
- {}%
- {\printfield[brackets]{number}}%
- }%
- }%
+ \iffieldundef{title}%
+ {}%
+ {\bibstring{reference}%
+ \setunit{\addspace}%
+ \printtext[emph]{%
+ \usebibmacro{title}%
+ \setunit{\addspace}%
+ \iffieldundef{number}%
+ {}%
+ {\printfield[brackets]{number}}}}%
}
%-----------------------
\DeclareBibliographyDriver{shortjournal}{%
@@ -929,294 +1095,269 @@
\blx at initunit}
%-----------------------
\DeclareDataInheritance{reference}{inreference}{%
- \inherit{shorthand}{booktitle}%
- \noinherit{volumes}%
+ \inherit{shorthand}{booktitle}%
+ \noinherit{volumes}%
}
%-----------------------
\DeclareBibliographyDriver{shorthand}{%
- \iffieldundef{title}%
- {\printfield{booktitle}}%
- {\printfield{title}}%
-}
-%-----------------------
+ \iffieldundef{title}%
+ {\printfield{booktitle}}%
+ {\printfield{title}}%
+}
+%-----------------------
\DeclareBibliographyDriver{article}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author}%
- \setunit*{\labelnamepunct}%
- \newblock%
- \usebibmacro{title}%
- \newunit\newblock%
- \usebibmacro{translation}%
- \usebibmacro{journal+number+year}%
- \newunit\newblock%
- \usebibmacro{pages}%
- \setunit{\addspace}%
- \usebibmacro{doi+eprint+url}%
- \newblock%
- \usebibmacro{signatur}%
- \newblock%
- \usebibmacro{pageref}%
- \newunit\newblock%
- \iftoggle{bbx:related}%
- {\usebibmacro{related:init}%
- \usebibmacro{related}%
- }%
- {}%
- \usebibmacro{finentry}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author}%
+ \setunit*{\labelnamepunct}\newblock
+ \usebibmacro{title}%
+ \newunit\newblock
+ \usebibmacro{translation}%
+ \usebibmacro{journal+number+year}%
+ \newunit\newblock
+ \usebibmacro{pages}%
+ \setunit{\addspace}%
+ \usebibmacro{doi+eprint+url}%
+ \newblock
+ \usebibmacro{signatur}%
+ \newblock
+ \usebibmacro{pageref}%
+ \newunit\newblock
+ \iftoggle{bbx:related}%
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}%
+ {}%
+ \usebibmacro{finentry}%
}
%-----------------------
\DeclareBibliographyDriver{book}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}%
- \newblock%
- \usebibmacro{maintitle+title+volumes}%
- \newunit\newblock%
- \ifbool{bbx:yearseries}%
- {}%
- {\newunit\usebibmacro{series+number}}%
- \ifbool{cbx:ancient}%
- {}%
- {\usebibmacro{translation}}%
- \setunit{\addspace}%
- \newblock%
- \usebibmacro{location+edition+year}%
- \setunit*{\addspace}%
- \newblock%
- \ifbool{bbx:yearseries}%
- {\usebibmacro{series+number}}%
- {}%
- \newunit\newblock%
- \usebibmacro{doi+eprint+url}%
- \setunit*{\addperiod\addspace}%
- \usebibmacro{signatur}%
- \newunit\newblock%
- \iftoggle{bbx:related}%
- {\usebibmacro{related:init}%
- \usebibmacro{related}%
- }%
- {}%
- \usebibmacro{finentry}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor}%
+ \setunit*{\labelnamepunct}\newblock
+ \usebibmacro{maintitle+title+volumes}%
+ \newunit\newblock
+ \ifbool{bbx:yearseries}%
+ {}%
+ {\newunit\usebibmacro{series+number}}%
+ \ifbool{cbx:ancient}%
+ {}%
+ {\usebibmacro{translation}}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{location+edition+year}%
+ \setunit*{\addspace}\newblock
+ \ifbool{bbx:yearseries}%
+ {\usebibmacro{series+number}}%
+ {}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \setunit*{\addperiod\addspace}%
+ \usebibmacro{signatur}%
+ \newunit\newblock
+ \iftoggle{bbx:related}%
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}%
+ {}%
+ \usebibmacro{finentry}%
}
%-----------------------
-\DeclareBibliographyDriver{thesis}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}%
- \newblock%
- \usebibmacro{title}%
- \setunit{\addspace}
- \printtext[parens]{\printfield{type}%
- \setunit*{\addspace}%
- \usebibmacro{institution+location+date}}%
- \newunit\newblock%
- \usebibmacro{doi+eprint+url}%
- \setunit*{\addperiod\addspace}%
- \usebibmacro{signatur}%
- \newunit\newblock%
- \iftoggle{bbx:related}%
- {\usebibmacro{related:init}%
- \usebibmacro{related}%
- }%
- {}%
- \usebibmacro{finentry}%
+\DeclareBibliographyDriver{thesis}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor}%
+ \setunit*{\labelnamepunct}\newblock
+ \usebibmacro{title}%
+ \setunit{\addspace}
+ \printtext[parens]{\printfield{type}%
+ \setunit*{\addspace}%
+ \usebibmacro{institution+location+date}}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \setunit*{\addperiod\addspace}%
+ \usebibmacro{signatur}%
+ \newunit\newblock
+ \iftoggle{bbx:related}%
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}%
+ {}%
+ \usebibmacro{finentry}%
}
%-----------------------
-\DeclareBibliographyDriver{proceedings}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}%
- \newblock%
- \usebibmacro{maintitle+title+volumes}%
- \usebibmacro{event+venue+date}%
- \setunit*{\addspace}%
- \ifbool{bbx:yearseries}%
- {}%
- {\newunit%
- \usebibmacro{series+number}%
- }%
- \setunit{\addspace}%
- \newblock%
- \usebibmacro{location+edition+year}%
- \setunit*{\addspace}%
- \newblock%
- \ifbool{bbx:yearseries}%
- {\usebibmacro{series+number}}%
- {}%
- \newunit\newblock%
- \usebibmacro{doi+eprint+url}%
- \setunit{\addperiod\addspace}%
- \usebibmacro{signatur}%
- \newunit\newblock%
- \iftoggle{bbx:related}%
- {\usebibmacro{related:init}%
- \usebibmacro{related}}%
- {}%
- \usebibmacro{finentry}%
+\DeclareBibliographyDriver{proceedings}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor}%
+ \setunit*{\labelnamepunct}\newblock
+ \usebibmacro{maintitle+title+volumes}%
+ \usebibmacro{event+venue+date}%
+ \setunit*{\addspace}%
+ \ifbool{bbx:yearseries}%
+ {}%
+ {\newunit
+ \usebibmacro{series+number}}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{location+edition+year}%
+ \setunit*{\addspace}\newblock
+ \ifbool{bbx:yearseries}%
+ {\usebibmacro{series+number}}%
+ {}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \setunit{\addperiod\addspace}%
+ \usebibmacro{signatur}%
+ \newunit\newblock
+ \iftoggle{bbx:related}%
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}%
+ {}%
+ \usebibmacro{finentry}%
}
%-----------------------
-\DeclareBibliographyDriver{inproceedings}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}%
- \newblock%
- \usebibmacro{title}%
- \newunit\newblock%
- \usebibmacro{intranslation}%
- \newunit\newblock%
- \usebibmacro{in:}%
- \usebibmacro{booktitle+volume+editor}%
- \usebibmacro{event+venue+date}%
- \setunit{\addspace}%
- \ifbool{bbx:yearseries}%
- {}%
- {\newunit%
- \usebibmacro{series+number}%
- }%
- \setunit{\addspace}%
- \newblock%
- \usebibmacro{location+edition+year}%
- \setunit*{\addspace}%
- \newblock%
- \ifbool{bbx:yearseries}%
- {\usebibmacro{series+number}}%
- {}%
- \usebibmacro{pages}%
- \newunit\newblock%
- \usebibmacro{doi+eprint+url}%
- \setunit{\addperiod\addspace}%
- \usebibmacro{signatur}%
- \newunit\newblock%
- \iftoggle{bbx:related}%
- {\usebibmacro{related:init}%
- \usebibmacro{related}%
- }%
- {}%
- \usebibmacro{finentry}%
+\DeclareBibliographyDriver{inproceedings}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor}%
+ \setunit*{\labelnamepunct}\newblock
+ \usebibmacro{title}%
+ \newunit\newblock
+ \usebibmacro{intranslation}%
+ \newunit\newblock
+ \usebibmacro{in:}%
+ \usebibmacro{booktitle+volume+editor}%
+ \usebibmacro{event+venue+date}%
+ \setunit{\addspace}%
+ \ifbool{bbx:yearseries}%
+ {}%
+ {\newunit
+ \usebibmacro{series+number}}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{location+edition+year}%
+ \setunit*{\addspace}\newblock
+ \ifbool{bbx:yearseries}%
+ {\usebibmacro{series+number}}%
+ {}%
+ \usebibmacro{pages}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \setunit{\addperiod\addspace}%
+ \usebibmacro{signatur}%
+ \newunit\newblock
+ \iftoggle{bbx:related}%
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}%
+ {}%
+ \usebibmacro{finentry}%
}
%-----------------------
-\DeclareBibliographyDriver{talk}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}%
- \newblock%
- \usebibmacro{title}%
- \newunit\newblock%
- \bibstring{talk}%
- \setunit{\addspace}%
- \printdate%
- \newunit\newblock%
- \printlist{institution}%
- \newunit\newblock%
- \usebibmacro{event+venue+date}%
- \setunit{\addspace}%
- \newunit\newblock%
- \usebibmacro{doi+eprint+url}%
- \setunit{\addperiod\addspace}%
- \usebibmacro{signatur}%
- \newunit\newblock%
- \iftoggle{bbx:related}%
- {\usebibmacro{related:init}%
- \usebibmacro{related}%
- }%
- {}%
+\DeclareBibliographyDriver{talk}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor}%
+ \setunit*{\labelnamepunct}\newblock
+ \usebibmacro{title}%
+ \newunit\newblock
+ \bibstring{talk}%
+ \setunit{\addspace}%
+ \printdate%
+ \newunit\newblock
+ \printlist{institution}%
+ \newunit\newblock
+ \usebibmacro{event+venue+date}%
+ \setunit{\addspace}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \setunit{\addperiod\addspace}%
+ \usebibmacro{signatur}%
+ \newunit\newblock
+ \iftoggle{bbx:related}%
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}%
+ {}%
\usebibmacro{finentry}%
}
%-----------------------
-\DeclareBibliographyDriver{inbook}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}%
- \newblock%
- \usebibmacro{title}%
- \newunit\newblock%
- \usebibmacro{intranslation}%
- \iffieldundef{title}%
- {\setunit{\addspace}}%
- {\newunit\newblock}%
- \usebibmacro{in:}%
- \usebibmacro{booktitle+volume+editor}%
- \setunit{\addspace}%
- \ifbool{bbx:yearseries}%
- {}%
- {\newunit%
- \usebibmacro{series+number}%
- }%
- \setunit{\addspace}%
- \newblock%
- \usebibmacro{location+edition+year}%
- \setunit*{\addspace}%
- \newblock%
- \ifbool{bbx:yearseries}%
- {\usebibmacro{series+number}}%
- {}%
- \usebibmacro{pages}%
- \newunit\newblock%
- \usebibmacro{doi+eprint+url}%
- \setunit{\addperiod\addspace}%
- \usebibmacro{signatur}%
- \newunit\newblock%
- \iftoggle{bbx:related}%
- {\usebibmacro{related:init}%
- \usebibmacro{related}%
- }%
- {}%
- \usebibmacro{finentry}%
+\DeclareBibliographyDriver{inbook}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor}%
+ \setunit*{\labelnamepunct}\newblock
+ \usebibmacro{title}%
+ \newunit\newblock
+ \usebibmacro{intranslation}%
+ \iffieldundef{title}%
+ {\setunit{\addspace}}%
+ {\newunit\newblock}%
+ \usebibmacro{in:}%
+ \usebibmacro{booktitle+volume+editor}%
+ \setunit{\addspace}%
+ \ifbool{bbx:yearseries}%
+ {}%
+ {\newunit
+ \usebibmacro{series+number}}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{location+edition+year}%
+ \setunit*{\addspace}\newblock
+ \ifbool{bbx:yearseries}%
+ {\usebibmacro{series+number}}%
+ {}%
+ \usebibmacro{pages}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \setunit{\addperiod\addspace}%
+ \usebibmacro{signatur}%
+ \newunit\newblock
+ \iftoggle{bbx:related}%
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}%
+ {}%
+ \usebibmacro{finentry}%
}
%-----------------------
\DeclareBibliographyDriver{inreference}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \printfield{booktitle}%
- \setunit{\addspace}%
- \printfield{volume}%
- \setunit{\addspace}%
- \printfield[parens]{year}%
- \setunit{\addspace}%
- \usebibmacro{pages}%
- \usebibmacro{inreference:title+author}%
- \newunit\newblock%
- \usebibmacro{doi+eprint+url}%
- \setunit{\addperiod\addspace}%
- \usebibmacro{signatur}%
- \newunit\newblock%
- \usebibmacro{finentry}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \printfield{booktitle}%
+ \setunit{\addspace}%
+ \printfield{volume}%
+ \setunit{\addspace}%
+ \printfield[parens]{year}%
+ \setunit{\addspace}%
+ \usebibmacro{pages}%
+ \usebibmacro{inreference:title+author}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \setunit{\addperiod\addspace}%
+ \usebibmacro{signatur}%
+ \newunit\newblock
+ \usebibmacro{finentry}%
}
%-----------------------
\DeclareBibliographyDriver{review}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}%
- \newblock%
- \iffieldundef{title}%
- {}%
- {\usebibmacro{title}}%
- \newunit\newblock%
- \usebibmacro{related:init}%
- \usebibmacro{related}%
- \newunit\newblock%
- \usebibmacro{journal+number+year}%
- \newunit\newblock%
- \usebibmacro{pages}%
- \newunit\newblock%
- \usebibmacro{doi+eprint+url}%
- \usebibmacro{signatur}%
- \newunit\newblock%
- \usebibmacro{finentry}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor}%
+ \setunit*{\labelnamepunct}\newblock
+ \iffieldundef{title}%
+ {}%
+ {\usebibmacro{title}}%
+ \newunit\newblock
+ \usebibmacro{related:init}%
+ \usebibmacro{related}%
+ \newunit\newblock
+ \usebibmacro{journal+number+year}%
+ \newunit\newblock
+ \usebibmacro{pages}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \usebibmacro{signatur}%
+ \newunit\newblock
+ \usebibmacro{finentry}%
}
%-----------------------
\defbibenvironment{bibliography}%
{\list%
- {\usebibmacro{labelwidthbib}}%
- {\setlength{\labelwidth}{\labwidthsameline}%
+ {\usebibmacro{labelwidthbib}}%
+ {\setlength{\labelwidth}{\labwidthsameline}%
\setlength{\leftmargin}{\labelwidth}%
\setlength{\labelsep}{\biblabelsep}%
\addtolength{\leftmargin}{\labelsep}%
@@ -1223,8 +1364,8 @@
\setlength{\itemsep}{\bibitemsep}%
\setlength{\parsep}{\bibparsep}%
\renewcommand*{\makelabel}[1]{##1\hss}}}%
- {\endlist}%
- {\item\usebibmacro{kicklabel}}
+ {\endlist}%
+ {\item\usebibmacro{kicklabel}}
%-----------------------
\def\do#1{%
\defbibenvironment{#1}
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx 2018-02-14 21:31:49 UTC (rev 46635)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx 2018-02-14 21:32:16 UTC (rev 46636)
@@ -1,8 +1,8 @@
% archaeologie --%
-% biblatex for archaeologists,
+% biblatex for archaeologists,
% historians and philologists
% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl
-%
+%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
% of this license or (at your option) any later version.
@@ -26,37 +26,90 @@
bool {cbx:ancient}%
or bool {cbx:frgancient}%
or bool {cbx:corpus}%
- }%
- {\addspace}%
- {\newunitpunct}}
-\newcommand*{\cbx at fseen@names}{}
-\newcommand*{\cbx at tseen@names}{}
-\newrobustcmd*{\cbx at nameseen}[1]{%
+ }%
+ {\addspace}%
+ {\newunitpunct}}
+
+\newrobustcmd*{\cbx at nametracker@global}[1]{%
+ \xifinlistcs{#1}{cbx at bseen@names@\the\c at refsection}
+ {}
+ {\listcsxadd{cbx at bseen@names@\the\c at refsection}{#1}}}
+
+\newrobustcmd*{\cbx at nametracker@context}[1]{%
\iftoggle{blx at footnote}
- {\listcsxadd{cbx at fseen@names}{#1}}
- {\listcsxadd{cbx at tseen@names}{#1}}}
-\newrobustcmd*{\cbx at ifnameseen}[1]{%
+ {\xifinlistcs{#1}{cbx at fseen@names@\the\c at refsection}
+ {}
+ {\listcsxadd{cbx at fseen@names@\the\c at refsection}{#1}}}
+ {\xifinlistcs{#1}{cbx at bseen@names@\the\c at refsection}
+ {}
+ {\listcsxadd{cbx at bseen@names@\the\c at refsection}{#1}}}}
+
+\newrobustcmd*{\cbx at ifnameseen@global}[1]{%
+ \xifinlistcs{#1}{cbx at bseen@names@\the\c at refsection}}
+
+\newrobustcmd*{\cbx at ifnameseen@context}[1]{%
\iftoggle{blx at footnote}%
- {\xifinlistcs{#1}{cbx at fseen@names}}%
- {\xifinlistcs{#1}{cbx at tseen@names}}}
+ {\xifinlistcs{#1}{cbx at fseen@names@\the\c at refsection}}%
+ {\xifinlistcs{#1}{cbx at bseen@names@\the\c at refsection}}}
+
+\DeclareBibliographyOption[boolean]{nametracker}[true]{%
+ \ifcsdef{blx at opt@nametracker@#1}
+ {\csuse{blx at opt@nametracker@#1}}
+ {\blx at err@invopt{nametracker=#1}{}}}
+
+\def\blx at opt@nametracker at true{%
+ \let\cbx at ifnameseen\cbx at ifnameseen@global
+ \let\cbx at nametracker\cbx at nametracker@global}
+
+\def\blx at opt@nametracker at false{%
+ \protected\long\def\cbx at ifnameseen##1##2##3{##3}%
+ \let\cbx at nametracker\relax}
+
+\def\blx at opt@nametracker at context{%
+ \let\cbx at ifnameseen\cbx at ifnameseen@context
+ \let\cbx at nametracker\cbx at nametracker@context}
+
+\appto\blx at secinit{
+ \ifcsundef{cbx at bseen@names@\the\c at refsection}
+ {\global\cslet{cbx at bseen@names@\the\c at refsection}\@empty}
+ {}%
+ \ifcsundef{cbx at fseen@names@\the\c at refsection}
+ {\global\cslet{cbx at fseen@names@\the\c at refsection}\@empty}
+ {}}
+
+\InitializeCitationStyle{%
+ \global\cslet{cbx at bseen@names@\the\c at refsection}\@empty
+ \global\cslet{cbx at fseen@names@\the\c at refsection}\@empty}
+
+%\renewrobustcmd*{\citereset}{%
+% \csuse{blx at hook@cbxinit}%
+% \@ifstar
+% {}
+% {\global\cslet{blx at bsee@\the\c at refsection}\@empty
+% \global\cslet{blx at fsee@\the\c at refsection}\@empty
+% \global\cslet{cbx at bseen@names@\the\c at refsection}\@empty
+% \global\cslet{cbx at fseen@names@\the\c at refsection}\@empty
+% \blx at ibidreset@force
+% \blx at idemreset@force
+% \blx at opcitreset@force
+% \blx at loccitreset@force}}
+
%-----------------------
\DeclareBibliographyOption{yearinparens}[true]{%
\ifstrequal{#1}{true}%
- {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}%
- \csuse{bool#1}{cbx:yearinparens}}%
- {\DeclareFieldFormat{citeyear}{##1}}}%
+ {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}%
+ \csuse{bool#1}{cbx:yearinparens}}%
+ {\DeclareFieldFormat{citeyear}{##1}}}%
\DeclareBibliographyOption{seenote}[true]{%
\csuse{bool#1}{cbx:seenote}%
- \ExecuteBibliographyOptions{maxnames=999}%
- }%
+ \ExecuteBibliographyOptions{maxnames=999}}%
\DeclareBibliographyOption[string]{citeauthorformat}{%
\ifcsdef{cbx at arch@citeauthorformat@#1}%
- {\csuse{cbx at arch@citeauthorformat@#1}}%
- {\PackageError{biblatex-archaeologie}%
- {Option 'citeauthorformat=#1' invalid.\MessageBreak
- Use one of the values 'initials', 'full', 'family' or 'firstfull'.}{}}%
-\def\citeauthorformatVALUE{#1}%
-}
+ {\csuse{cbx at arch@citeauthorformat@#1}}%
+ {\PackageError{biblatex-archaeologie}%
+ {Option 'citeauthorformat=#1' invalid.\MessageBreak
+ Use one of the values 'initials', 'full', 'family' or 'firstfull'.}{}}%
+ \def\citeauthorformatVALUE{#1}}
\DeclareEntryOption{uniqueme}[true]{\csuse{bool#1}{cbx:uniqueme}}
%-----------------------
\DeclareFieldFormat{citeyear}{#1}
@@ -67,83 +120,83 @@
\DeclareNameFormat{labelname}{%
\ifcase\value{uniquename}%
- \usebibmacro{name:family}
- {\namepartfamily}
- {\namepartgiven}
- {\namepartprefix}
- {\namepartsuffix}%
+ \usebibmacro{name:family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
\or
- \ifuseprefix
- {\usebibmacro{name:family-given}
- {\namepartfamily}
- {\namepartgiveni}
- {\namepartprefix}
- {\namepartsuffixi}}
- {\usebibmacro{name:family-given}
- {\namepartfamily}
- {\namepartgiveni}
- {\namepartprefixi}
- {\namepartsuffixi}}%
+ \ifuseprefix
+ {\usebibmacro{name:family-given}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefix}
+ {\namepartsuffixi}}
+ {\usebibmacro{name:family-given}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefixi}
+ {\namepartsuffixi}}%
\or
- \usebibmacro{name:family-given}
- {\namepartfamily}
- {\namepartgiven}
- {\namepartprefix}
- {\namepartsuffix}%
+ \usebibmacro{name:family-given}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
\fi
\usebibmacro{name:andothers}}
-
+
\DeclareNameFormat{name:family}{%
\ifcase\value{uniquename}%
- \usebibmacro{name:family}
- {\namepartfamily}
- {\namepartgiven}
- {\namepartprefix}
- {\namepartsuffix}%
+ \usebibmacro{name:family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
\or
- \ifuseprefix
- {\usebibmacro{name:given-family}
- {\namepartfamily}
- {\namepartgiveni}
- {\namepartprefix}
- {\namepartsuffixi}}
- {\usebibmacro{name:given-family}
- {\namepartfamily}
- {\namepartgiveni}
- {\namepartprefixi}
- {\namepartsuffixi}}%
+ \ifuseprefix
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefix}
+ {\namepartsuffixi}}
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefixi}
+ {\namepartsuffixi}}%
\or
- \usebibmacro{name:given-family}
- {\namepartfamily}
- {\namepartgiven}
- {\namepartprefix}
- {\namepartsuffix}%
+ \usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
\fi
\usebibmacro{name:andothers}}
-
+
\DeclareNameFormat{name:initials}{%
\ifnum\value{uniquename}=2%
- \usebibmacro{name:given-family}
- {\namepartfamily}
- {\namepartgiven}
- {\namepartprefix}
- {\namepartsuffix}%
+ \usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
\else
- \ifuseprefix
- {\usebibmacro{name:given-family}
- {\namepartfamily}
- {\namepartgiveni}
- {\namepartprefix}
- {\namepartsuffixi}}
- {\usebibmacro{name:given-family}
- {\namepartfamily}
- {\namepartgiveni}
- {\namepartprefixi}
- {\namepartsuffixi}}%
+ \ifuseprefix
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefix}
+ {\namepartsuffixi}}
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefixi}
+ {\namepartsuffixi}}%
\fi
\usebibmacro{name:andothers}}
-
-
+
+
\def\cbx at arch@citeauthorformat at family{%
\DeclareNameAlias{citeauthor}{name:family}}
@@ -179,45 +232,46 @@
{\namepartgiven}
{\namepartprefix}
{\namepartsuffix}%
- \cbx at nameseen{\thefield{hash}}}%
+ \cbx at nametracker{\thefield{hash}}}%
\usebibmacro{name:andothers}}
\def\cbx at arch@citeauthorformat at firstfull{%
\DeclareNameAlias{citeauthor}{citeauthor:fancy}}
-%-----------------------
+%-----------------------
\ExecuteBibliographyOptions{%
- citetracker=true,%
- idemtracker=true,%
- ibidtracker=true,%
- opcittracker=true,%
- loccittracker=true,%
- alldates=comp,%
+ citetracker=true,
+ idemtracker=true,
+ ibidtracker=true,
+ opcittracker=true,
+ loccittracker=true,
+ nametracker=context,
+ alldates=comp,
dateuncertain=true,
datecirca=true,
- citeauthorformat=initials,%
- uniquename=minfull,%
+ citeauthorformat=initials,
+ uniquename=minfull,
autocite=footnote,
}
%-----------------------
\newbibmacro*{uniqueshorthand}{%
\printtext[brackets]{%
- \ifnameundef{translator}
- {\ifnameundef{intranslator}%
+ \ifnameundef{translator}
+ {\ifnameundef{intranslator}%
{\iffieldundef{series}%
- {\printnames[name:family]{editor}}%
- {\usebibmacro{series}}%
- }%
+ {\printnames[name:family]{editor}}%
+ {\usebibmacro{series}}}%
{\printnames[name:family]{intranslator}}}%
- {\printnames[name:family]{translator}}}}
+ {\printnames[name:family]{translator}}}}
%-----------------------
\renewbibmacro*{citeindex}{%
\ifciteindex%
{\ifboolexpr{%
bool {cbx:ancient}%
- or bool {cbx:frgancient}}%
- {}%
- {\indexnames{labelname}}}%
- {}%
+ or bool {cbx:frgancient}
+ }%
+ {}%
+ {\indexnames{labelname}}}%
+ {}%
}
%-----------------------
\renewbibmacro*{postnote}{%
@@ -224,21 +278,22 @@
\ifboolexpr{
bool{bbx:inreferences}
and
- test{\ifentrytype{inreference}}}
- {}
- {\iffieldundef{postnote}%
- {}%
- {\setunit{\postnotedelim}%
- \printfield{postnote}%
- \ifbool{cbx:frgancient}%
- {\setunit{\addspace}%
- \usebibmacro{cite:frgname}}%
- {}}}}
+ test{\ifentrytype{inreference}}
+ }
+ {}
+ {\iffieldundef{postnote}%
+ {}%
+ {\setunit{\postnotedelim}%
+ \printfield{postnote}%
+ \ifbool{cbx:frgancient}%
+ {\setunit{\addspace}%
+ \usebibmacro{cite:frgname}}%
+ {}}}}
%-----------------------
\newbibmacro*{cite:frgname}{%
\ifnameundef{shorteditor}%
- {\printnames[name:family]{editor}}%
- {\printnames{shorteditor}}%
+ {\printnames[name:family]{editor}}%
+ {\printnames{shorteditor}}%
}
%-----------------------
\newbibmacro*{seenote}{%
@@ -251,17 +306,20 @@
\printtext[parens]{\bibstring{seenote}%
\addspace%
\ref{footref:\thefield{entrykey}}}%
- \renewcommand{\postnotedelim}{\addspace}%
-}%
+ \renewcommand{\postnotedelim}{\addspace}}
%-----------------------
-\newbibmacro*{cite:title}{\printfield{labeltitle}}%
+\newbibmacro*{cite:title}{\printfield{labeltitle}}
%-----------------------
-\newbibmacro*{cite:year}{%
- \iffieldundef{labelyear}%
- {}%
- {\printtext[citeyear]{\usebibmacro{cite:labelyear+extradate}}}%
-}
+\newbibmacro*{cite:origtitle}{%
+ \iffieldundef{origtitle}
+ {\usebibmacro{cite:title}}
+ {\printfield{origtitle}}}
%-----------------------
+\newbibmacro*{cite:year}{%
+ \iffieldundef{labelyear}
+ {}
+ {\printtext[citeyear]{\usebibmacro{cite:labeldate+extradate}}}}
+%-----------------------
\newbibmacro*{cite:lexikon}{%
\printfield{booktitle}%
\setunit{\addspace}%
@@ -270,186 +328,159 @@
\printfield[parens]{year}%
\setunit{\addspace}%
\iffieldundef{postnote}%
- {\printfield{pages}}%
- {\printfield{postnote}}%
+ {\printfield{pages}}%
+ {\printfield{postnote}}%
\usebibmacro{inreference:title+author}%
}
%-----------------------
\newbibmacro{cite:seenote}{%
-\ifboolexpr{bool{cbx:ancient}%
- or bool{cbx:frgancient}%
- or bool{cbx:corpus}}%
- {\usebibmacro{cite:shorthand}}%
- {\ifciteseen%
- {\usebibmacro{seenote}}%
- {\bibhypertarget{ref:\thefield{entrykey}}%
- {\usedriver%
- {\DeclareNameAlias{sortname}{default}}%
- {\thefield{entrytype}}%
- \iffootnote{\label{footref:\thefield{entrykey}}}}%
-}}}
+ \ifboolexpr{bool{cbx:ancient}%
+ or bool{cbx:frgancient}%
+ or bool{cbx:corpus}
+ }%
+ {\usebibmacro{cite:shorthand}}%
+ {\ifciteseen%
+ {\usebibmacro{seenote}}%
+ {\bibhypertarget{ref:\thefield{entrykey}}%
+ {\usedriver%
+ {\DeclareNameAlias{sortname}{default}}%
+ {\thefield{entrytype}}%
+ \iffootnote{\label{footref:\thefield{entrykey}}}}}}}
%-----------------------
\newbibmacro{cite}{%
\ifboolexpr{
bool{bbx:inreferences}
and
- test{\ifentrytype{inreference}}}
- {\usebibmacro{cite:lexikon}}%
- {\ifbool{cbx:seenote}%
- {\usebibmacro{cite:seenote}}%
- {\printtext[bibhyperref]{%
- \iffieldundef{shorthand}%
- {\ifnameundef{labelname}%
- {\usebibmacro{cite:label}%
- \setunit{\labelyeardelim}}%
- {\printnames{labelname}%
- \setunit{\nameyeardelim}}%
- \usebibmacro{cite:year}}%
- {\usebibmacro{cite:shorthand}}%
- }}}}
+ test{\ifentrytype{inreference}}
+ }
+ {\usebibmacro{cite:lexikon}}%
+ {\ifbool{cbx:seenote}%
+ {\usebibmacro{cite:seenote}}%
+ {\printtext[bibhyperref]{%
+ \iffieldundef{shorthand}%
+ {\ifnameundef{labelname}%
+ {\usebibmacro{cite:label}%
+ \setunit{\labelyeardelim}}%
+ {\printnames{labelname}%
+ \setunit{\nameyeardelim}}%
+ \usebibmacro{cite:year}}%
+ {\usebibmacro{cite:shorthand}}}}}}
%-----------------------
\newbibmacro*{citeyear}{%
\iffieldundef{shorthand}%
- {\iffieldundef{labelyear}%
- {\usebibmacro{cite:label}}%
- {\usebibmacro{cite:labelyear+extradate}}}%
- {\usebibmacro{cite}}}
+ {\iffieldundef{labelyear}%
+ {\usebibmacro{cite:label}}%
+ {\usebibmacro{cite:labeldate+extradate}}}%
+ {\usebibmacro{cite}}}
%-----------------------
\newbibmacro*{textcite}{%
\ifnameundef{labelname}%
- {\iffieldundef{shorthand}%
- {\usebibmacro{cite:label}%
- \setunit{%
- \global\booltrue{cbx:yearinparens}%
- \nonameyeardelim\bibopenparen}%
- \ifnumequal{\value{citecount}}{1}%
- {\usebibmacro{prenote}}%
- {}%
- \usebibmacro{cite:labelyear+extradate}}%
- {\usebibmacro{cite}}}%
- {\printnames{labelname}%
- \setunit{%
- \global\booltrue{cbx:yearinparens}%
- \nameyeardelim\bibopenparen}%
- \usebibmacro{citeyear}}}
+ {\iffieldundef{shorthand}%
+ {\usebibmacro{cite:label}%
+ \setunit{%
+ \global\booltrue{cbx:yearinparens}%
+ \nonameyeardelim\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}%
+ {\usebibmacro{prenote}}%
+ {}%
+ \usebibmacro{cite:labeldate+extradate}}%
+ {\usebibmacro{cite}}}%
+ {\printnames{labelname}%
+ \setunit{%
+ \global\booltrue{cbx:yearinparens}%
+ \nameyeardelim\bibopenparen}%
+ \usebibmacro{citeyear}}}
%-----------------------
\newbibmacro*{cite:shorthand}{%
\ifbool{cbx:seenote}%
- {\printtext{\printfield{shorthand}}}%
- {\printtext[bibhyperref]{\printfield{shorthand}%
- \ifbool{cbx:uniqueme}
- {\setunit*{\addspace}%
- \usebibmacro*{uniqueshorthand}}%
- {}%
-}}}
+ {\printtext{\printfield{shorthand}}}%
+ {\printtext[bibhyperref]{%
+ \printfield{shorthand}%
+ \ifbool{cbx:uniqueme}
+ {\setunit*{\addspace}%
+ \usebibmacro*{uniqueshorthand}}%
+ {}}}}
%-----------------------
\newbibmacro*{cite:label}{%
\iffieldundef{label}%
- {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}%
- {\printtext[bibhyperref]{\printfield{label}}}}
+ {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}%
+ {\printtext[bibhyperref]{\printfield{label}}}}
%-----------------------
-\newbibmacro*{cite:labelyear+extradate}{%
+\newbibmacro*{cite:labeldate+extradate}{%
\iffieldundef{labelyear}
{}
- {\printtext[bibhyperref]{%
- \ifdefstring\blx at dateformat@labeldate{edtf}
- {}
- {\datecircaprint}%
- \dateeraprintpre{labelyear}%
- \iffieldnums{labelyear}%
- {\mkyearzeros{\thefield{labelyear}}}%
- {\printfield{labelyear}}%
- \printfield{extradate}%
- \iffieldsequal{labeldateera}{labelenddateera}{}%
- {\dateeraprint{labelyear}}%
- \dateuncertainprint%
- \ifdefstring\blx at dateformat@labeldate{edtf}%
- {\datecircaprintedtf}%
- {}%
- \iffieldundef{labelendyear}%
- {}
- {\iffieldsequal{labelyear}{labelendyear}{}%
- {\ifdefstring\blx at dateformat@labeldate{edtf}%
- {\slash}% strict EDTF
- {\bibdaterangesep%
- \enddatecircaprint}%
- \dateeraprintpre{labelendyear}%
- \mkyearzeros{\thefield{labelendyear}}%
- \enddateuncertainprint%
- \ifdefstring\blx at dateformat@labeldate{edtf}%
- {\enddatecircaprintedtf}%
- {}%
- \dateeraprint{labelendyear}}}}}}
+ {\printtext[bibhyperref]{\printlabeldateextra}}}
%-----------------------
\newbibmacro*{textcite:postnote}{%
\iffieldundef{postnote}%
- {\ifbool{cbx:yearinparens}%
- {\bibcloseparen}%
- {}}%
- {\ifbool{cbx:yearinparens}%
- {\setunit{\postnotedelim}}%
- {\setunit{\extpostnotedelim\bibopenparen}}%
- \printfield{postnote}%
- \ifbool{cbx:frgancient}%
- {\setunit{\addthinspace}%
- \usebibmacro{cite:frgname}%
- \bibcloseparen}%
- \bibcloseparen}}
+ {\ifbool{cbx:yearinparens}%
+ {\bibcloseparen}%
+ {}}%
+ {\ifbool{cbx:yearinparens}%
+ {\setunit{\postnotedelim}}%
+ {\setunit{\extpostnotedelim\bibopenparen}}%
+ \printfield{postnote}%
+ \ifbool{cbx:frgancient}%
+ {\setunit{\addthinspace}%
+ \usebibmacro{cite:frgname}%
+ \bibcloseparen}%
+ \bibcloseparen}}
%-----------------------
-\DeclareCiteCommand{\cite}%
+\DeclareCiteCommand{\cite}%
{\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
- \usebibmacro{cite}}%
+ \usebibmacro{cite}}%
{\multicitedelim}%
{\usebibmacro{postnote}}
%-----------------------
- \DeclareCiteCommand{\footcite}[\mkbibfootnote]
+\DeclareCiteCommand{\footcite}[\mkbibfootnote]
{\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
- \usebibmacro{cite}}%
+ \usebibmacro{cite}}%
{\multicitedelim}%
{\usebibmacro{postnote}}
%-----------------------
\DeclareCiteCommand{\textcite}%
{\boolfalse{cbx:yearinparens}%
- \renewcommand*{\multinamedelim}{\addcomma\space}%
+ \renewcommand*{\multinamedelim}{\addcomma\space}%
\renewcommand*{\finalnamedelim}{%
\ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
- \addspace\bibstring{and}\space}%
- }%
+ \addspace\bibstring{and}\space}}%
{\usebibmacro{citeindex}%
\iffirstcitekey%
- {\setcounter{textcitetotal}{1}}%
- {\stepcounter{textcitetotal}%
- \textcitedelim%
- \usebibmacro{prenote}}%
- \ifbool{cbx:seenote}{\usebibmacro{cite:seenote}}%
- {\usebibmacro{textcite}}}%
+ {\setcounter{textcitetotal}{1}}%
+ {\stepcounter{textcitetotal}%
+ \textcitedelim%
+ \usebibmacro{prenote}}%
+ \ifbool{cbx:seenote}
+ {\usebibmacro{cite:seenote}}%
+ {\usebibmacro{textcite}}}%
{\ifbool{cbx:yearinparens}%
- {\bibcloseparen\global\boolfalse{cbx:yearinparens}}%
- {}}%
- {\ifbool{cbx:seenote}{\usebibmacro{postnote}}%
- {\usebibmacro{textcite:postnote}}}
-%-----------------------
+ {\bibcloseparen\global\boolfalse{cbx:yearinparens}}%
+ {}}%
+ {\ifbool{cbx:seenote}
+ {\usebibmacro{postnote}}%
+ {\usebibmacro{textcite:postnote}}}
+%-----------------------
\DeclareCiteCommand{\parencite}[\mkbibparens]%
{\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
- \usebibmacro{cite}}%
+ \usebibmacro{cite}}%
{\multicitedelim}%
{\usebibmacro{postnote}}
-%-----------------------
+%-----------------------
\DeclareCiteCommand{\smartcite}[\iffootnote\textnormal\mkbibfootnote]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
- {\ifboolexpr{
+ {\ifboolexpr{
bool{bbx:inreferences}
and
test{\ifentrytype{inreference}}}
- {}
- {\usebibmacro{postnote}}}%
-%-----------------------
+ {}
+ {\usebibmacro{postnote}}}%
+%-----------------------
\DeclareCiteCommand{\fullcite}
{\usebibmacro{prenote}}
{\usedriver
@@ -457,7 +488,7 @@
{\thefield{entrytype}}}
{\multicitedelim}
{\usebibmacro{postnote}}
-%-----------------------
+%-----------------------
\DeclareCiteCommand{\footfullcite}[\mkbibfootnote]
{\usebibmacro{prenote}}
{\usedriver
@@ -465,19 +496,19 @@
{\thefield{entrytype}}}
{\multicitedelim}
{\usebibmacro{postnote}}
-%-----------------------
+%-----------------------
\DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim}
\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\textcites}{\textcite}{}
\DeclareMultiCiteCommand{\smartcites}[\iffootnote\textnormal\mkbibfootnote]{\smartcite}{\multicitedelim}
-%-----------------------
+%-----------------------
\DeclareCiteCommand{\citeauthor}
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
\renewcommand*{\multinamedelim}{\addcomma\space}%
\renewcommand*{\finalnamedelim}{%
- \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
- \addspace\bibstring{and}\space}%
+ \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
+ \addspace\bibstring{and}\space}%
\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
\ifboolexpr{
@@ -484,12 +515,12 @@
bool{bbx:inreferences}
and
test{\ifentrytype{inreference}}}
- {\printtext}%
- {\printtext[bibhyperref]}%
- {\printnames[citeauthor]{labelname}}}%
+ {\printtext}%
+ {\printtext[bibhyperref]}%
+ {\printnames[citeauthor]{labelname}}}%
{\multicitedelim}%
- {\usebibmacro{postnote}}
-%-----------------------
+ {\usebibmacro{postnote}}
+%-----------------------
\DeclareCiteCommand{\citetranslator}
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
@@ -496,10 +527,10 @@
\renewcommand*{\multinamedelim}{\addcomma\space}%
\renewcommand*{\finalnamedelim}{%
\ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
- \addspace\bibstring{and}\space}%
+ \addspace\bibstring{and}\space}%
\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
- \ifboolexpr{%
+ \ifboolexpr{%
test {\ifentrytype{incollection}}
or
test {\ifentrytype{inbook}}
@@ -517,8 +548,8 @@
{\printnames[citeauthor]{translator}}
{\printtext[bibhyperref]{\printnames[citeauthor]{translator}}}}}}
{\multicitedelim}%
- {\usebibmacro{postnote}}
-%-----------------------
+ {\usebibmacro{postnote}}
+%-----------------------
\DeclareCiteCommand*{\citetranslator}
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
@@ -535,20 +566,20 @@
test{\ifentrytype{inreference}}}
{\printtext}%
{\printtext[bibhyperref]}%
- {\ifthenelse{%
- \ifentrytype{incollection}%
- \OR%
- \ifentrytype{inbook}%
- }%
- {\ifnameundef{intranslator}%
- {\bibstring{owntranslation}}%
- {\usebibmacro{byintranslator+others}}}%
- {\ifnameundef{translator}%
- {\bibstring{owntranslation}}%
- {\usebibmacro{bytranslator+others}}}}}%
+ {\ifthenelse{%
+ \ifentrytype{incollection}%
+ \OR%
+ \ifentrytype{inbook}%
+ }%
+ {\ifnameundef{intranslator}%
+ {\bibstring{owntranslation}}%
+ {\usebibmacro{byintranslator+others}}}%
+ {\ifnameundef{translator}%
+ {\bibstring{owntranslation}}%
+ {\usebibmacro{bytranslator+others}}}}}%
{\multicitedelim}%
{\usebibmacro{postnote}}
-%-----------------------
+%-----------------------
\DeclareCiteCommand*{\citeauthor}
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
@@ -558,7 +589,7 @@
{\multicitedelim}
{\usebibmacro{postnote}}
%-----------------------
-\DeclareCiteCommand{\citetitle} %
+\DeclareCiteCommand{\citetitle}
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
\usebibmacro{prenote}}%
@@ -566,36 +597,35 @@
bool{bbx:inreferences}
and
test{\ifentrytype{inreference}}}
- {\printtext}%
- {\printtext[bibhyperref]}{%
- \ifbool{cbx:ancient}{\printtext[emph]{\usebibmacro{cite:title}}}%
- {\printtext[emph]{\usebibmacro{cite:title}}%
- \iffieldundef{year}
- {}
- {\setunit{\addspace}%
- \printtext[parens]{%
- \printfield{year}%
- \iffieldundef{origyear}
- {}%
- {\addspace\printfield[parens]{origyear}}}%
- }}}}%
+ {\printtext}%
+ {\printtext[bibhyperref]}{%
+ \ifbool{cbx:ancient}
+ {\printtext[emph]{\usebibmacro{cite:origtitle}}}%
+ {\printtext[emph]{\usebibmacro{cite:title}}%
+ \iffieldundef{year}
+ {}
+ {\setunit{\addspace}%
+ \printtext[parens]{%
+ \printfield{year}%
+ \iffieldundef{origyear}
+ {}%
+ {\addspace\printfield[parens]{origyear}}}}}}}%
{\multicitedelim}%
{\usebibmacro{postnote}}%
-\DeclareCiteCommand{\citetitle*} %
+\DeclareCiteCommand*{\citetitle}
{\boolfalse{citetracker}%
- \boolfalse{pagetracker}%
- \usebibmacro{prenote}}%
- {\ifboolexpr{
+ \boolfalse{pagetracker}%
+ \usebibmacro{prenote}}%
+ {\ifboolexpr{%
bool{bbx:inreferences}
and
test{\ifentrytype{inreference}}}
- {\printtext}%
- {\printtext[bibhyperref]}{%
- \ifbool{cbx:ancient}{\printtext[emph]{\usebibmacro{cite:title}}}%
- {\printtext[emph]{\usebibmacro{cite:title}}}}}%
+ {\printtext}%
+ {\printtext[bibhyperref]}
+ {\printtext[emph]{\usebibmacro{cite:title}}}}%
{\multicitedelim}%
{\usebibmacro{postnote}}%
-
+
\endinput
%% End of file `archaeologie.cbx'.
\ No newline at end of file
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx 2018-02-14 21:31:49 UTC (rev 46635)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx 2018-02-14 21:32:16 UTC (rev 46636)
@@ -1,8 +1,8 @@
% archaeologie --%
-% biblatex for archaeologists,
+% biblatex for archaeologists,
% historians and philologists
% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl
-%
+%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
% of this license or (at your option) any later version.
@@ -47,6 +47,125 @@
fromrussian = {{from\addspace Russian}{from\addspace Russian}},
fromspanish = {{from\addspace Spanish}{from\addspace Spanish}},
fromswedish = {{from\addspace Swedish}{from\addspace Swedish}},
- owntranslation = {{own\addspace trans\adddot}{own\addspace translation}},
+ owntranslation = {{own\addspace trans\adddot}{own\addspace translation}},
}
+
+\protected\gdef\lbx at us@mkdaterangetrunc at long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\datecircaprint
+ \printtext[#2date]{%
+ \iffieldundef{#2season}
+ {\iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+ \dateeraprint{#2}}}
+ {\iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibseasondate#1}{}{#2season}}
+ {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+ \dateeraprint{#2}}%
+ \dateuncertainprint
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdaterangesep}}
+ {\bibdaterangesepx{#2}%
+ \enddatecircaprint
+ \iffieldundef{#2season}
+ {\iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+ \enddateuncertainprint
+ \dateeraprint{#2}}}}}}
+
+\protected\gdef\lbx at us@mkdaterangetrunc at short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\datecircaprint
+ \printtext[#2date]{%
+ \iffieldundef{#2season}
+ {\iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}
+ \dateeraprint{#2}}}
+ {\iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibseasondate#1}{}{#2season}}
+ {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+ \dateeraprint{#2}}%
+ \dateuncertainprint
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdaterangesep}}
+ {\bibdaterangesepx{#2}%
+ \enddatecircaprint
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
+ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+ \enddateuncertainprint
+ \dateeraprint{#2}}}}}}
+
+\protected\gdef\lbx at us@mkdaterangetruncextra at long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\datecircaprint
+ \printtext[#2date]{%
+ \iffieldundef{#2season}
+ {\iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}
+ {\iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibseasondate#1}{}{#2season}}
+ {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+ \dateeraprint{#2}}%
+ \dateuncertainprint
+ \iffieldundef{#2endyear}
+ {\printfield{extradate}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extradate}%
+ \mbox{\bibdaterangesep}}
+ {\bibdaterangesepx{#2}%
+ \enddatecircaprint
+ \iffieldundef{#2season}
+ {\iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+ \printfield{extradate}%
+ \enddateuncertainprint
+ \dateeraprint{#2}}}}}}
+
+\protected\gdef\lbx at us@mkdaterangetruncextra at short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\datecircaprint
+ \printtext[#2date]{%
+ \iffieldundef{#2season}
+ {\iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}
+ {\iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibseasondate#1}{}{#2season}}
+ {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+ \dateeraprint{#2}}%
+ \dateuncertainprint
+ \iffieldundef{#2endyear}
+ {\printfield{extradate}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extradate}%
+ \mbox{\bibdaterangesep}}
+ {\bibdaterangesepx{#2}%
+ \enddatecircaprint
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
+ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+ \printfield{extradate}%
+ \enddateuncertainprint
+ \dateeraprint{#2}}}}}}
+
\endinput
\ No newline at end of file
More information about the tex-live-commits
mailing list