summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/biblatex-contrib/archaeologie/archaeologie.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/biblatex-contrib/archaeologie/archaeologie.dtx')
-rw-r--r--macros/latex/contrib/biblatex-contrib/archaeologie/archaeologie.dtx158
1 files changed, 99 insertions, 59 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/archaeologie/archaeologie.dtx b/macros/latex/contrib/biblatex-contrib/archaeologie/archaeologie.dtx
index bf0085f0e0..5f056a3719 100644
--- a/macros/latex/contrib/biblatex-contrib/archaeologie/archaeologie.dtx
+++ b/macros/latex/contrib/biblatex-contrib/archaeologie/archaeologie.dtx
@@ -1,7 +1,7 @@
%\iffalse
%<*internal|bbx|cbx|dbx|lbx>
-\def\archDate{2019/12/03}
-\def\archVersion{2.4.3}
+\def\archDate{2020/02/15}
+\def\archVersion{2.4.4}
%</internal|bbx|cbx|dbx|lbx>
%<*internal>
\iffalse
@@ -64,13 +64,13 @@ bibLaTeX-__archaeologie__ Bundle
bibLaTeX-style for archaeologists, historians and philologists.
---
-Copyright (c) 2015-2019 Lukas C. Bossert
+Copyright (c) 2015-2020 Lukas C. Bossert
Copyright (c) 2015 Lukas C. Bossert | Johannes Friedl
-* Email: [info@biblatex-archaeologie.de](mailto:info@biblatex-archaeologie.de)
-* Website: [www.biblatex-archaeologie.de](http://www.biblatex-archaeologie.de)
+* Email: [info@biblatex.texografie.de](mailto:info@biblatex.texografie.de)
+* Website: [www.biblatex-archaeologie.texografie.de](http://www.biblatex-archaeologie.texografie.de)
This citation-style covers the citation and bibliography rules of
the [__German Archaeological Institute__ (DAI)](http://www.dainst.org/dai/meldungen).
@@ -198,7 +198,6 @@ The current maintainer of this work is [Lukas C. Bossert](https://github.com/Luk
zenon = {000042874},
}
-
@Book{EAOR-02,
editor = {Gregori, Gian Luca},
title = {Regiones Italiae VI--XI},
@@ -988,7 +987,7 @@ The current maintainer of this work is [Lukas C. Bossert](https://github.com/Luk
----------------------------------------------------------------
biblatex-archaeologie ---
Author: Lukas C. Bossert
-E-mail: info@biblatex-archaeologie.de
+E-mail: info@biblatex.texografie.de
License: Released under the LaTeX Project Public License v1.3c or later
See: http://www.latex-project.org/lppl.txt
----------------------------------------------------------------
@@ -1139,7 +1138,7 @@ draft=false,
\clearscrheadfoot
\ihead{\normalfont\footnotesize \texttt{bib}\LaTeX-style \texttt{archaeologie \archaeologieversion} \copyright\ by Lukas C. Bossert (2015--\the\year) | Johannes Friedl (2015)}%
\rofoot{\normalfont\footnotesize \textbf{\sffamily \thepage}}
-\lofoot{\normalfont\footnotesize \href{http://www.biblatex-archaeologie.de}{biblatex-archaeologie.de}}
+\lofoot{\normalfont\footnotesize \href{http://www.biblatex-archaeologie.texografie.de}{biblatex-archaeologie.de}}
\RequirePackage[%
% flushmargin, %
@@ -1465,7 +1464,7 @@ examplebox,
\begin{document}
\pdfbookmark[1]{Titlepage}{title}
\title{\texttt{archaeologie} -- \\\texttt{bib\LaTeX} for archaeologists\footnote{Also very handy for scholars of (ancient) history or classics, too.
-For further information about the code visit \href{http://www.biblatex-archaeologie.de}{biblatex-archaeologie.de}:
+For further information about the code visit \href{http://www.biblatex-archaeologie.texografie.de}{biblatex-archaeologie.de}:
Comments and criticisms are welcome.
We thank especially \href{https://tex.stackexchange.com/users/35864/moewe}{M. Wemheuer} and \href{https://tex.stackexchange.com/users/2478/herbert}{H. Voß} for their great help with the code.%
}}
@@ -1474,7 +1473,7 @@ We thank especially \href{https://tex.stackexchange.com/users/35864/moewe}{M. We
\footnotesize 2015--\the\year & Lukas C. Bossert\\
\footnotesize 2015 & \footnotesize Johannes Friedl \\
\end{tabular}\\\footnotesize
-\href{mailto:info@biblatex-archaeologie.de}{info@biblatex-archaeologie.de}}
+\href{mailto:info@biblatex.texografie.de}{info@biblatex.texografie.de}}
\date{Version: \archaeologieversion{} (\archaeologiedate)}
\maketitle
@@ -8106,6 +8105,11 @@ To see the long forms of journal titles or series you have to switch on the opti
% ██ ██████ ██████ ██████ ██████ ██ ██ ███████ ██ ████ ██
% */
%<*readme>
+## v2.4.4 (2020-02-15)
+### *Fixed*
+* corrected the use of the `maintitlepunct` in the bibmacro `maintitle+title+volumes`
+
+
## v2.4.3 (2019-12-03)
### *Fixed*
* Spelling error in Italian language for Dresden and München. Thanks to Matteo Turri. (Feedback always welcome!)
@@ -8389,7 +8393,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
\DeclareNameAlias{author}{given-family}}
\DeclareBibliographyOption{inreferences}[true]{%
\PackageWarningNoLine{biblatex-archaeologie}{%
- The option 'inreferences' for is deprecated,\MessageBreak
+ The option 'inreferences' is deprecated,\MessageBreak
use 'inreferencesasfullcite' instead.}%
\booltrue{bbx:inreferencesasfullcite}}
\DeclareBibliographyOption{inreferencesasfullcite}[true]{\csuse{bool#1}{bbx:inreferencesasfullcite}
@@ -8576,11 +8580,12 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
\newcommand*{\locationdelim}{\addnbspace\textendash\addspace}
\renewcommand{\multinamedelim}{\addnbspace\textendash\addspace}
\renewcommand{\finalnamedelim}{\multinamedelim}
-\renewcommand*\relateddelim{\addnbspace\textendash\addspace}%
+\renewcommand*{\relateddelim}{\addnbspace\textendash\addspace}%
\newcommand*{\relateddelimmultivolume}{\addcomma\par\nobreak}
\newcommand*{\volnumdelim}{\addcomma\space}
\newcommand*{\yearnumdelim}{\addslash}
\newcommand*{\jourvoldelim}{\addnbspace}
+\renewcommand*{\nametitledelim}{\addcomma\addspace}
\renewcommand{\finentrypunct}{%http://tex.stackexchange.com/a/14159/98739
\ifbool{bbx:counter}%
{\addspace\vrule\addspace\scshape%
@@ -9288,7 +9293,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
{\printnames[author]{labelname}}
{\printnames[name:initials]{labelname}}}}}
% \end{macrocode}
-%
+% This will take care of maintitle and others.
% \begin{macrocode}
\newbibmacro*{maintitle+title+volumes}{%
\iffieldsequal{maintitle}{title}%
@@ -9299,11 +9304,11 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
{}%
{\usebibmacro{maintitle}%
\usebibmacro{volume}%
- \clearfield{volume}}%
+ \clearfield{volume}%
\iffieldundef{title}%
{}%
- {\setunit*{\maintitlepunct}%
- \usebibmacro{title}}%
+ {\setunit*{\maintitlepunct}}}%
+ \usebibmacro{title}%
\ifbool{cbx:ancient}%
{\usebibmacro{translation}}%
{\usebibmacro{volume}}}%
@@ -9908,12 +9913,16 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
}%
{\addspace}%
{\newunitpunct}}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\newrobustcmd*{\cbx@nametracker@global}[1]{%
\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}
{}
{\listcsxadd{cbx@bseen@names@\the\c@refsection}{#1}}}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\newrobustcmd*{\cbx@nametracker@context}[1]{%
\iftoggle{blx@footnote}
{\xifinlistcs{#1}{cbx@fseen@names@\the\c@refsection}
@@ -9922,20 +9931,28 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
{\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}
{}
{\listcsxadd{cbx@bseen@names@\the\c@refsection}{#1}}}}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\newrobustcmd*{\cbx@ifnameseen@global}[1]{%
\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\newrobustcmd*{\cbx@ifnameseen@context}[1]{%
\iftoggle{blx@footnote}%
{\xifinlistcs{#1}{cbx@fseen@names@\the\c@refsection}}%
{\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}}}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareBibliographyOption[boolean]{nametracker}[true]{%
\ifcsdef{blx@opt@nametracker@#1}
{\csuse{blx@opt@nametracker@#1}}
{\blx@err@invopt{nametracker=#1}{}}}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\def\blx@opt@nametracker@true{%
\let\cbx@ifnameseen\cbx@ifnameseen@global
\let\cbx@nametracker\cbx@nametracker@global}
@@ -9947,7 +9964,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
\def\blx@opt@nametracker@context{%
\let\cbx@ifnameseen\cbx@ifnameseen@context
\let\cbx@nametracker\cbx@nametracker@context}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\appto\blx@secinit{
\ifcsundef{cbx@bseen@names@\the\c@refsection}
{\global\cslet{cbx@bseen@names@\the\c@refsection}\@empty}
@@ -9955,7 +9974,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
\ifcsundef{cbx@fseen@names@\the\c@refsection}
{\global\cslet{cbx@fseen@names@\the\c@refsection}\@empty}
{}}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\InitializeCitationStyle{%
\global\cslet{cbx@bseen@names@\the\c@refsection}\@empty
\global\cslet{cbx@fseen@names@\the\c@refsection}\@empty}
@@ -9988,7 +10009,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
\DeclareFieldFormat{multipostnote}{\mknormrange{#1}}
\DeclareFieldFormat{shorttitle}{#1}
\DeclareFieldFormat{pages}{#1}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareNameFormat{labelname}{%
\ifcase\value{uniquename}%
\usebibmacro{name:family}
@@ -10016,8 +10039,10 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
{\namepartsuffix}%
\fi
\usebibmacro{name:andothers}}
-
- \DeclareNameFormat{name:family}{%
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareNameFormat{name:family}{%
\ifcase\value{uniquename}%
\usebibmacro{name:family}
{\namepartfamily}
@@ -10044,8 +10069,10 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
{\namepartsuffix}%
\fi
\usebibmacro{name:andothers}}
-
- \DeclareNameFormat{name:initials}{%
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareNameFormat{name:initials}{%
\ifnum\value{uniquename}=2%
\usebibmacro{name:given-family}
{\namepartfamily}
@@ -10065,9 +10092,10 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
{\namepartprefixi}
{\namepartsuffixi}}%
\fi
- \usebibmacro{name:andothers}}
-
-
+\usebibmacro{name:andothers}}
+% \end{macrocode}
+%
+% \begin{macrocode}
\def\cbx@arch@citeauthorformat@family{%
\DeclareNameAlias{citeauthor}{name:family}}
@@ -10076,7 +10104,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
\def\cbx@arch@citeauthorformat@initials{%
\DeclareNameAlias{citeauthor}{name:initials}}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareNameFormat{citeauthor:firstfulltheninitials}{%
\cbx@ifnameseen{\thefield{hash}}
{\ifnum\value{uniquename}=2
@@ -10105,8 +10135,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
{\namepartsuffix}%
\cbx@nametracker{\thefield{hash}}}%
\usebibmacro{name:andothers}}
-
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareNameFormat{citeauthor:firstinitialsthenfamily}{%
\cbx@ifnameseen{\thefield{hash}}
{}
@@ -10140,7 +10171,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
{\namepartsuffix}%
\fi
\usebibmacro{name:andothers}}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareNameFormat{citeauthor:firstfullthenfamily}{%
\cbx@ifnameseen{\thefield{hash}}
{\ifcase\value{uniquename}%
@@ -10185,7 +10218,6 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
\def\cbx@arch@citeauthorformat@firstinitialsthenfamily{%
\DeclareNameAlias{citeauthor}{citeauthor:firstinitialsthenfamily}}
-
\def\cbx@arch@citeauthorformat@firstfull{%
\PackageWarningNoLine{biblatex-archaeologie}{%
Value 'firstfull' for 'citeauthorformat' is deprecated,\MessageBreak
@@ -10627,7 +10659,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
{\addspace\printfield[parens]{origyear}}}}}}}%
{\multicitedelim}%
{\usebibmacro{postnote}}%
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareCiteCommand*{\citetitle}
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
@@ -10641,7 +10675,6 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
{\printtext[emph]{\usebibmacro{cite:title}}}}%
{\multicitedelim}%
{\usebibmacro{postnote}}%
-
% \end{macrocode}
% \iffalse
% /*
@@ -10706,10 +10739,10 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
% We load the standard set of localization strings,
% then add our adjustments.
% \begin{macrocode}
-
-
\InheritBibliographyExtras{english}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareBibliographyStrings{%
inherit = {english},
magthesis = {{}{}},% FIXME!
@@ -10738,7 +10771,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
fromswedish = {{from\addspace Swedish}{from\addspace Swedish}},
owntranslation = {{own\addspace trans\adddot}{own\addspace translation}},
}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{%
\begingroup
\blx@metadateinfo{#2}%
@@ -10772,7 +10807,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
\enddateuncertainprint
\dateeraprint{#2endyear}}}}}%
\endgroup}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{%
\begingroup
\blx@metadateinfo{#2}%
@@ -10802,7 +10839,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
\enddateuncertainprint
\dateeraprint{#2endyear}}}}}%
\endgroup}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{%
\begingroup
\blx@metadateinfo{#2}%
@@ -10838,7 +10877,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
\enddateuncertainprint
\dateeraprint{#2endyear}}}}}%
\endgroup}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{%
\begingroup
\blx@metadateinfo{#2}%
@@ -10870,8 +10911,6 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
\enddateuncertainprint
\dateeraprint{#2endyear}}}}}%
\endgroup}
-
-
% \end{macrocode}
% \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%</en>
@@ -10883,11 +10922,10 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
% We load the standard set of localization strings,
% then add our adjustments.
% \begin{macrocode}
-
-
-
\InheritBibliographyExtras{ngerman}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareBibliographyStrings{%
inherit = {ngerman},
magthesis = {{Magisterarbeit}{Mag.-Arbeit}},%
@@ -10903,7 +10941,6 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
translationof = {{\"Ubersetzung\addspace von}{\"Ubers\adddot\addspace von}},
owntranslation = {{eigene\addspace\"Ubersetzung}{eig\adddot\addspace\"Ubers\adddot}},
}
-
% \end{macrocode}
% \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%</de>
@@ -10915,10 +10952,14 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
% We load the standard set of localization strings,
% then add our adjustments.
% \begin{macrocode}
-
\InheritBibliographyExtras{french}
+% \end{macrocode}
+%
+% \begin{macrocode}
\DefineBibliographyExtras{french}{\restorecommand\mkbibnamefamily}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareBibliographyStrings{%
inherit = {french},
magthesis = {{}{}},% FIXME!
@@ -10949,7 +10990,6 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
fromswedish = {{depuis\addspace le\addspace suédois}{depuis\addspace le\addspace suédois}},
owntranslation = {{??}{??}},% FIXME!
}
-
% \end{macrocode}
% \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%</fr>
@@ -10962,7 +11002,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
% then add our adjustments.
% \begin{macrocode}
\InheritBibliographyExtras{italian}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareBibliographyStrings{%
inherit = {italian},
magthesis = {{}{}},% FIXME!
@@ -10981,8 +11023,6 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
forthcoming = {{prossimo}{prossimo}},
owntranslation = {{??}{??}},% FIXME!
}
-
-
% \end{macrocode}
% \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%</it>