texlive[43357] Master/texmf-dist: archaeologie (28feb17)
commits+karl at tug.org
commits+karl at tug.org
Tue Feb 28 22:23:38 CET 2017
Revision: 43357
http://tug.org/svn/texlive?view=revision&revision=43357
Author: karl
Date: 2017-02-28 22:23:38 +0100 (Tue, 28 Feb 2017)
Log Message:
-----------
archaeologie (28feb17)
Modified Paths:
--------------
trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.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-english.lbx
trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx
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/archaeologie.dbx
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/archaeologie/CHANGELOG.md
trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-german.lbx
Removed Paths:
-------------
trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
Modified: trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib
===================================================================
--- trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib 2017-02-28 21:22:53 UTC (rev 43356)
+++ trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib 2017-02-28 21:23:38 UTC (rev 43357)
@@ -41,13 +41,14 @@
origyear = {1936},
origpublisher = {Mann},
}
+
@Book{Apul:met,
- author ={Apuleius Madaurensis, Lucius},
- title = {metamorphoses},
- shorthand = {Apul. met.},
- shortauthor = {Apuleius},
- keywords = {ancient},
- options = {ancient}
+ author = {Apuleius Madaurensis, Lucius},
+ title = {metamorphoses},
+ shorthand = {Apul. met.},
+ shortauthor = {Apuleius},
+ keywords = {ancient},
+ options = {ancient},
}
@Book{Mann2011,
Added: trunk/Master/texmf-dist/doc/latex/archaeologie/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/archaeologie/CHANGELOG.md (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/archaeologie/CHANGELOG.md 2017-02-28 21:23:38 UTC (rev 43357)
@@ -0,0 +1,31 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+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/).
+
+## [unreleased]
+
+
+## v2.3 (2017-02-27)
+#### *fixed*
+* empty space deleted after bibliography entries (has only been visible when using option `seenote`)
+* typo in the German documentation
+* related example in German documentation corrected
+
+#### *added*
+* get the translator of an ancient opus with `\citetranslator` or `\citetranslator*`
+* more citation commands (`\smartcite`; `\autocite`; `\fullcite`; `\footfullcite`)
+* support for `polyglossia`
+
+## v2.2b (2016-10-06) --> [current release]
+* *typo* <br> documentation with new style
+
+## v2.2 (2016-09-25)
+* *added* <br> `uniqueme` for variant translations of ancient works.
+* *added* <br> bibliography-file `archaeologie-examples.bib` included
+
+
+[current release]: http://www.biblatex-archaeologie.de
+[unreleased]: http://github.com/LukasCBossert/biblatex-archaeologie
+
Modified: trunk/Master/texmf-dist/doc/latex/archaeologie/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/archaeologie/README.md 2017-02-28 21:22:53 UTC (rev 43356)
+++ trunk/Master/texmf-dist/doc/latex/archaeologie/README.md 2017-02-28 21:23:38 UTC (rev 43357)
@@ -5,15 +5,15 @@
bibLaTeX-style for archaeologists, historians and philologists.
---
-_2016/10/06 v2.2b_
+_2017/02/27 v2.3_
-Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
+Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl
* Email: [info at biblatex-archaeologie.de](mailto:info at biblatex-archaeologie.de)
-* Website: [www.biblatex-archaeologie.de](www.biblatex-archaeologie.de)
+* Website: [www.biblatex-archaeologie.de](http://www.biblatex-archaeologie.de)
This citation-style covers the citation and bibliography rules of
-the [__German Archaeological Institute__ (DAI)](http://www.dainst.org/dai/meldungen).
+the [__Deutsches Archäologisches Institut__ (DAI)](http://www.dainst.org/dai/meldungen).
Various options are available to change and adjust
the outcome according to one’s own preferences.
(German, English, Italian, French, Spanish)
@@ -43,7 +43,7 @@
language files:
-- archaeologie-ngerman.lbx
+- archaeologie-german.lbx
- archaeologie-english.lbx
- archaeologie-french.lbx
- archaeologie-italian.lbx
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 2017-02-28 21:22:53 UTC (rev 43356)
+++ trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex 2017-02-28 21:23:38 UTC (rev 43357)
@@ -1,7 +1,7 @@
% archaeologie --%
% biblatex for archaeologists,
% historians and philologists
-% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
+% 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
@@ -10,7 +10,7 @@
% 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.
-%!TEX program = xelatex
+% !TEX program = lualatex
\documentclass[a4paper,10pt,ngerman]{ltxdoc}
\input{archaeologie-preamble.tex}
\externaldocument{archaeologie}[archaeologie.pdf]% <- full or relative path
@@ -26,9 +26,9 @@
\maketitle
\begin{abstract}
-\noindent Der Stil setzt die Zitations- und Bibliographievorgaben um, die das \textbf{Deutsche Archäologische Institut (DAI)} 2014 festgelegt hat.
+\noindent Der Stil setzt die Zitations- und Bibliographievorgaben um, die das \DAI (DAI) 2014 festgelegt hat.
Verschiedene zusätzliche Optionen erlauben jedoch, das Erscheinungsbild den eigenen Vorlieben anzupassen.
-Der Stil ist nicht nur für Dokumente in deutscher Sprache geeignet, sondern unterstützt ebenso die Sprachen Englisch, Italienisch und Französisch.
+Der Stil ist nicht nur für Dokumente in deutscher Sprache geeignet, sondern unterstützt ebenso die Sprachen Englisch, Italienisch, Spanisch und Französisch.
Dieses Dokument ist die deutsche Kurzfassung der englischen Hauptdokumentation: Für eine vollständige Anleitung siehe die englische Stilbeschreibung \href{http://mirrors.ctan.org/macros/latex/contrib/biblatex-contrib/archaeologie/archaeologie.pdf}{\textbf{online}} oder \href{file:archaeologie.pdf}{\textbf{lokal}}.
\end{abstract}
@@ -185,10 +185,16 @@
\DescribeMacro{\textcite} \DescribeMacro{\textcites} Zu den bisher aufgeführten \cs{cite}-Befehlen gibt es zusätzlich die Möglichkeit, einen Eintrag \enquote{fließtextgerecht} mit \cs{textcite} zu zitieren.
Der Unterschied zu \cs{cite} besteht darin, dass der Literaturverweis durch Klammern vom Autor getrennt wird: z.\,B. Emme (2013, 5).
\cs{textcite} und \cs{textcites} verhalten sich in der Bedienung analog zu \cs{cite} und \cs{cites}.
-
+
\DescribeMacro{\citeauthor} \DescribeMacro{\citetitle} Diese Befehle ermöglich, nur einzelne Elemente einer Publikation zu zitieren. Je nach Verwendung wird entweder nur der Titel oder der Autor eines Bibliographieeintrages ausgegeben. Ein Vorteil gegenüber des händischen Eintippens eines solchen Elementes ist, dass der Eintrag indiziert und referenziert wird. Dies kann z.\,B. für einen (Autoren-)Index, der auf die Textstelle verweisen soll, relevant sein.
+\DescribeMacro{\citetranslator} Zusätzlich gibt es noch die Möglichkeit den Übersetzer eines (insbesondere) antiken Werkes anzugeben.
+Besonders wenn man einen antiken Text in Übersetzung zitiert, ist es üblich den Urheber der Übersetzung anzugeben.
+Ist kein Übersetzer vorhanden, dann gibt der Befehl einen selbst als Übersetzer an.
+ \DescribeMacro{\citetranslator*} Die Sternchen-Variante gibt zusätzlich noch die Sprache an,
+ aus der übersetzt wurde.
+
\section{Publikationstypen}
Im folgenden werden die zur Verfügung stehenden Publikationstypen (\emph{Entry Type}) und ihre von |archaeologie| ausgelesenen Felder (\emph{Data Field}) aufgelistet.
@@ -206,7 +212,7 @@
\item[Optional:] |maintitle|, |mainsubtitle|, |maintitleaddon|, |related|, |relatedtype|, |publisher|, |series|, |number|, |edition|, |origyear|, |origlanguage|, |origlocation|, |translator|, |volume|, |doi|, |url|, |urldate|, |eprint|, |eprinttype|, |note|, |addendum|, |pubstate|
\end{description}
-\printbib[7em]{Fentress2003}
+\printbib[7em]{Emme2013}
\DescribeMacro{@inbook} \DescribeMacro{@incollection} Für Beiträge innerhalb eines Sammelbandes.
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 2017-02-28 21:22:53 UTC (rev 43356)
+++ trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex 2017-02-28 21:23:38 UTC (rev 43357)
@@ -1,7 +1,7 @@
% archaeologie --%
% biblatex for archaeologists,
% historians and philologists
-% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
+% 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
@@ -10,7 +10,7 @@
% 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.
-%!TEX program = xelatex
+% !TEX program = lualatex
\documentclass[a4paper,
10pt,
greek,
@@ -24,8 +24,8 @@
\externaldocument{archaeologie-ger}[archaeologie-ger.pdf]% <- full or relative path
\begin{document}
-\title{\texttt{archaeologie} -- \\\texttt{bib\LaTeX} for archaeologists\footnote{Also very handy as well for (ancient) History or Classics.
-Further information about the code online visit \href{http://www.biblatex-archaeologie.de}{www.biblatex-archaeologie.de}:
+\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 ›moewew‹ and Herbert Voß for their big help on the code.%
}}
@@ -35,11 +35,12 @@
\maketitle
\begin{abstract}
-\noindent This citation-style covers the citation and bibliography rules of the German Archaeological Institute (\textbf{Deutsches Archäologisches Institut}).
+\noindent This citation-style covers the citation and bibliography rules of the \DAI (DAI).
Various options are available to change and adjust the outcome according to one's own preferences.
The style is compatible with the English, German, Italian, Spanish and French languages, since all |bibstrings| used are defined in each language.
+\bigskip
-For a short introduction in German see \href{pdfdeu.biblatex-archaeologie.de}{\textbf{online}} or \href{file:archaeologie-ger.pdf}{\textbf{local}}.
+\noindent For a short introduction in German see \href{pdfdeu.biblatex-archaeologie.de}{\textbf{online}} or \href{file:archaeologie-ger.pdf}{\textbf{local}}.
\end{abstract}
@@ -82,7 +83,7 @@
\bibliography*@\marg{|bib|-file}@*
\end{code}
-Without any further options the style follows the rules of the German Archaeological Institute.
+Without any further options the style follows the rules of the \DAI.
No additional settings are needed,
but you can change the outcome by using some options which are explained below.\footnote{For an easy and unproblematic compiling we suggest to use \hologo{XeLaTeX} or \hologo{LuaTeX}.}
@@ -109,7 +110,7 @@
\DescribeMacro{lstabbrv}
Activates the additional bibliography file |archaeologie-lstabbrv.bib|.
It provides a list of journals and series according to the abbreviations of the
-German Archaeological Institute which can be used as |@String| macros in bibliography entries; cf. \cref{abbrv}.
+\DAI which can be used as |@String| macros in bibliography entries; cf. \cref{abbrv}.
\DescribeMacro{lstlocations}
Activates the additional bibliography file |archaeologie-lstlocations.bib|
@@ -144,7 +145,7 @@
\DescribeMacro{inreferences}
Each bibliography entry which is an |@Inreference| is fully referenced according to the special rules of the
-German Archaeological Institute for manuals and encyclopaedias; cf. \cref{inreferences}.
+\DAI for manuals and encyclopaedias; cf. \cref{inreferences}.
\DescribeMacro{noabbrv}
By default the short titles of journals and series (|shortjournal| and |shortseries|) are shown in the bibliography.
@@ -156,7 +157,7 @@
\DescribeMacro{seenote}
By default |archaeologie| prints author-year-system.
-With this option you can change it to a different outcome (but still according to the rules of the German Archaeological Institute).
+With this option you can change it to a different outcome (but still according to the rules of the \DAI).
So the first citation will be a full citation and all the following citations will refer to the first full citation; cf. \cref{seenote}
\DescribeMacro{translation}
@@ -226,22 +227,7 @@
\begin{example}
Public space is part of a city say \cites(cf.)(){Osland2016}{Evangelidis2014}.
\end{example}
-
- \DescribeMacro{\footcite}
- There is also the possibility to put the citation into a footnote at once with \cs{footcite}:
- \begin{code}
-\footcite*@\oarg{prenote}\oarg{postnote}\marg{bibtex-key}@*
-\end{code}
-\begin{example}
-Public space is part of a city.\footcite{Osland2016}
-\end{example}
-This is the equivalent to |\footnote{\cite{Osland2016}.}| but it saves you a lot of time typing.
- \DescribeMacro{\footcites} And there is as well \cs{footcites}:
-\begin{example}
-Public space is part of a city.\footcites(cf.)(){Osland2016}{Evangelidis2014}
-\end{example}
-
\DescribeMacro{\parencite}
Sometimes a citation has to be put in parentheses.
Therefore we implemented the command \cs{parencite}:
@@ -289,9 +275,80 @@
*@\oarg{prenote}\oarg{postnote}\marg{bibtex-key}\ldots@*
\end{code}
\begin{example}
-Public space is part of a city say \textcites{Osland2016}[cf.][]a{Evangelidis2014}.
+Public space is part of a city say \textcites{Osland2016}[cf.][]{Evangelidis2014}.
\end{example}
+
+ \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}:
+ \begin{code}
+\footcite*@\oarg{prenote}\oarg{postnote}\marg{bibtex-key}@*
+\end{code}
+\begin{example}
+Public space is part of a city.\footcite{Osland2016}
+\end{example}
+This is the equivalent to |\footnote{\cite{Osland2016}.}| but it saves you a lot of time typing.
+ \DescribeMacro{\footcites} And there is as well \cs{footcites}:
+\begin{example}
+Public space is part of a city.\footcites(cf.)(){Osland2016}{Evangelidis2014}
+\end{example}
+
+
+\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.
+If it is already within a footnote it will be handled like \cs{cite}.
+ is a clever
+\begin{code}
+\smartcite*@\oarg{postnote}\marg{bibtex-key}%@*
+\end{code}
+
+\begin{example}
+Public space is part of a city.\smartcite{Osland2016}
+And sometimes more than that.\footnote{\smartcite[cf.][]{Evangelidis2014}.}
+\end{example}
+
+
+\DescribeMacro{\smartcites}
+And again there is also a \cs{textcites} in case of several authors:
+\begin{code}
+\smartcites(pre-prenote)(post-postnote)%
+ *@\oarg{prenote}\oarg{postnote}\marg{bibtex-key}@*%
+ *@\oarg{prenote}\oarg{postnote}\marg{bibtex-key}@*%
+ *@\oarg{prenote}\oarg{postnote}\marg{bibtex-key}\ldots@*
+\end{code}
+\begin{example}
+Public space is part of a city.\smartcites{Osland2016}{Evangelidis2014}
+And sometimes more than that.\footnote{\smartcites{Osland2016}[cf.][]{Evangelidis2014}.}
+\end{example}
+
+\DescribeMacro{\autocite}
+With \cs{autocite} there is a flexible way of citing.
+We set up \cs{autocite} as \cs{footcite} by default.
+If you want to change it you can also write in the preamble e.\,g. |autocite=inline|.
+\begin{code}
+\autocite*@\oarg{prenote}\oarg{postnote}\marg{bibtex-key}%@*
+\end{code}
+
+\begin{example}
+Public space is part of a city.\autocite{Osland2016}
+\end{example}
+
+\DescribeMacro{\fullcite}\DescribeMacro{\footfullcite}
+With \cs{fullcite} and \cs{footfullcite} you can print the complete entry in your current text.
+\begin{code}
+\fullcite*@\oarg{prenote}\oarg{postnote}\marg{bibtex-key}@*
+\footfullcite*@\oarg{prenote}\oarg{postnote}\marg{bibtex-key}@*
+\end{code}
+
+\begin{example}
+Public space is part of a city.\footfullcite{Osland2016}
+As can be read in \fullcite{Evangelidis2014}
+\end{example}
+
+
+
\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}
@@ -307,13 +364,36 @@
\end{example}
For further information cf. \cref{citeauthorformat}.
+\DescribeMacro{\citetranslator}\label{citetranslator}%
+Addionally there is also a \cs{cite}-command which can be used to print the translator of an (ancient) work.
+\begin{code}
+\citetranslator*@\marg{bibtex-key}%@*
+\end{code}
+This will print the name(s) of the translator according to the chosen |citeauthorformat|.
+If there is no translator it will name you as translator (\enquote{own translation}).
+\begin{code}
+\citetranslator* *@\marg{bibtex-key}%@*
+\end{code}
+\newcommand\latquote[5]{\cite[#1][#2]{#3}: \emph{#4} -- \enquote{#5} \parentext{\citetranslator*{#3}}.}
+
+The starred version prints also the informtion from which language the text has been translated.
+For an efficient way of citing ancient texts we introduce a new command (only a suggestion):
+\begin{code}
+\newcommand\latquote[5]{\cite[#1][#2]{#3}: \emph{#4} -- \enquote{#5} \parentext{\citetranslator*{#3}}.}
+\end{code}
+\begin{example}
+\latquote{cf.}{12,25,1}{Cic:Att}{sed domus est, ut ais, forum}{Aber dein Heim ist das Forum.}
+\end{example}
+
+
+
\subsection{Entries with @String}\label{string}
-The citation rules of the German Archaeological Institute instruct to abbreviate journals and series according to a given list.\footnote{\url{http://www.dainst.org/documents/10180/70593/03_Liste+abzukürzender+Zeitschriften_quer.pdf/2646d351-8e5d-4e8b-8acd-54f3c272d3ff} <2016-06-06>}
+The citation rules of the \DAI instruct to abbreviate journals and series according to a given list.\footnote{\url{http://www.dainst.org/documents/10180/70593/03_Liste+abzukürzender+Zeitschriften_quer.pdf} <2016-06-06>}
For this purpose we provide a list with bibliography macros which refer to these abbreviations.
These abbreviations can be included by loading package option |lstabbrv| (cf. \cref{abbrv}).
Besides there are two further lists with |@String| macros cf. \cref{lstpublishers,lstlocations}.
-\DescribeMacro{@String} The style |archaeologie| respects the guidelines of the German Archaeological Institute
+\DescribeMacro{@String} The style |archaeologie| respects the guidelines of the \DAI
and is therefore compatible with the given abbreviations of journals and series.
To minimize the susceptibility to errors and to omit unnecessary typing of sometimes very long journal titles |archaeologie| works with so-called |@Strings|.
The advantage of these |@Strings| is that several bibliography entries can be defined by one globally given value.
@@ -321,7 +401,7 @@
To use this offer of simplification the following bibliography fields should be field with such a a |@String|: |journaltitle| and |shortjournal|,
(|series| and |shortseries|.
-In \cref{abbrv-lists} there is a list with all the abbreviations given by the German Archaeological Institute,
+In \cref{abbrv-lists} there is a list with all the abbreviations given by the \DAI,
in which the |@String| (with endings |-short| for |shortjournal| or |shortseries|) are listed in the left column.
An |@String| has to be written \emph{without} any curly brackets.\footnote{If you use \emph{JabRef} in its non-coding window,
then you have to write \#|AyasofyaMuezYil|\#.
@@ -394,8 +474,8 @@
Optional preferences in the preamble are loaded within the package |bib|\LaTeX:
\begin{code}
\usepackage[%
- backend=biber, % activates biber which is done by default anyway
- % (but will give an error if not done here)
+ backend=biber, % activates biber (default;
+ % but will give an error if not done)
style=archaeologie, % loads the style *@|archaeologie|@*
inreferences=true, % option *@|inreferences|@* is loaded
lstabbrv % option *@|lstabbrv|@* is loaded as well
@@ -501,7 +581,7 @@
\subsubsection{seenote}\label{seenote}
\DescribeMacro{seenote}
Even if author-year-citation seems to be commonly accepted in Ancient Studies in the meantime you may want to use a traditional citation style.
-For this purpose you can switch to the other allowed citation rule by the German Archaeological Institute
+For this purpose you can switch to the other allowed citation rule by the \DAI
which works like this:
If you cite a work for the first time in a footnote |archaeologie| will print a full cite which contains all bibliography elements.
Henceforward each following citation is printed as short cite and will additionally refer to the footnote where the first cite was done.
@@ -611,7 +691,7 @@
\begin{tcolorbox}[examplebox]
|\footnote{\cite{Nieddu1995}.}|
\tcblower
-\footnote{LTUR 2 (1995) 9f. s. v. Dei Consentes (G. Nieddu).}
+\footnote{LTUR 2 (1995) 9\,f. s. v. Dei Consentes (G. Nieddu).}
\end{tcolorbox}
\end{enumerate}
@@ -634,7 +714,7 @@
\begin{marker}
Activating |inreferences=true| causes the cited |@Inreference| entry to be automatically \emph{omitted} in the (final) bibliography,
-because the entry is fully cited before in the footnotes (also stated in the German Archaeological Institute rules).
+because the entry is fully cited before in the footnotes (also stated in the \DAI rules).
\end{marker}
If the option is not used (|inreferences=false|) the entry will look like this in the bibliography:
@@ -856,7 +936,7 @@
\begin{bibbox}{Ball2013}\footnotesize
\parbox[t]{3cm}{{\scshape \color{red}Ball – Dobbins} 2013}\parbox[t]{8.5cm}{%
-L. F. Ball – J. J. Dobbins, Pompeii Forum Project. Current Thinking on the Pompeii Forum, AJA 117/3, 2013, 461–492\newline
+L. F. Ball – J. J. Dobbins, Pompeii Forum Project. Current Thinking on the Pompeii Forum, AJA 117/3, 2013, 461–492,\newline
...}
\end{bibbox}
@@ -896,7 +976,7 @@
\subsubsection{noabbrv}\label{noabbrevs}
\DescribeMacro{noabbrv}
-According to the guidelines of the German Archaeological Institute journal titles and series have to be abbreviated.
+According to the guidelines of the \DAI journal titles and series have to be abbreviated.
Therefore the fields |shortjournal| or |shortseries| will be considered.
If you like to have printed full names of journals and series instead you can switch on the option |noabbrv|.
For an example see \cref{string,Koyunlu1990}.
@@ -1058,9 +1138,16 @@
This option is set to default, but you can --- of course --- deactivate it with |initials=false| in the preamble.
+With this default option you don’t have to change anything in your bibliographical-data.
+However you can switch off the option |initials| and do the abbreviation manually:
+\begin{code}
+author = {family=Mann, given=Christian, given-i={Chr}}
+author = {family=Hufschmid, given=Thomas, given-i={Th}}
+\end{code}
+
\subsection{Bibliography entry options}\label{options-bibentry}
\subsubsection{ancient}\label{ancient}
\DescribeMacro{ancient}
@@ -1503,7 +1590,7 @@
}
\end{bibexample}
-\printbib[10em]{Carter2014}
+\printbib[12em]{Carter2014}
You can also have contributions to a ›Festschrift‹ etc. set up as |@Incollection|,
but then notice the additional information in |booktitleaddon|.
@@ -1787,17 +1874,17 @@
\printbib{Neils1994}
\item\label{inreference:b}
-The German Archaeological Institute has a special rule for inreferences in the footnote.
+The \DAI has a special rule for inreferences in the footnote.
Then the output will be like:\\
|reference volume (year) pages s.v. title (author)| \\
and there will be no reference to the bibliography since the entry is fully described in the footnote.
\DescribeMacro{inreferences} If you prefer this method you have to use the preamble option called |inreferences|---cf. \cref{inreferences}
Then it will look like this in the footnote:
-\begin{tcolorbox}[examplebox]
+\begin{examplebox}
|\footnote{\cite{Neils1994}.}|
\tcblower
\footnote{LIMC 7.1 (1994) 922--951 s. v. Theseus (J. Neils).}
-\end{tcolorbox}
+\end{examplebox}
When you have the \oarg{postnote} filled out in a citation which belongs to an |@Inreference| then it won’t be printed in the end of the citation.
The |postnote| \oarg{930 Nr. 283} will be printed instead of the |pages|:
\begin{example}
@@ -2163,7 +2250,7 @@
\end{code}
\DescribeMacro{zenon}
-This eprint-form is especially designed for the OPAC (Online Public Access Catalogue) of the German Archaeological Institute.
+This eprint-form is especially designed for the OPAC (Online Public Access Catalogue) of the \DAI.
All bibliographical entries in this OPAC can be referred to via this link.
You only need to insert the individual Zenon-number of the entry, e.\,g. \emph{http://zenon.dainst.org/Record/001371402} where \emph{001371402} is the individual number---cf. \cref{Zanker2009}.
@@ -2494,7 +2581,7 @@
\item[YUP] Yale University Press
\end{description}
\end{multicols}
-\section{List of abbreviation according to the German Archaeological Institute-guidelines}\label{abbrv-lists}
+\section{List of abbreviation according to the \DAI-guidelines}\label{abbrv-lists}
We modified the lists with abbreviations of journals, corpora, etc. to make them usable with |bib|\LaTeX.
Below there are two lists with\DescribeMacro{@String} |@String| (in \textbf{bold} letters on the left),
one with the abbreviations (\cref{liste-kurz}), the other with the long forms (\cref{liste-lang}).
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx 2017-02-28 21:22:53 UTC (rev 43356)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx 2017-02-28 21:23:38 UTC (rev 43357)
@@ -1,7 +1,7 @@
% archaeologie --%
% biblatex for archaeologists,
% historians and philologists
-% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
+% 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
@@ -20,15 +20,17 @@
\NewBibliographyString{talk}
\NewBibliographyString{editor}
\NewBibliographyString{subvoce}
+\NewBibliographyString{owntranslation}
+
\DeclareBibliographyStrings{%
inherit = {english},
subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
- reference = {{Article}{Art\adddot}},
- origtitle = {{original title}{orig\adddot title}},
- firstprint = {{first\addspace edition}{first\addspace edition}},
- talk = {{talk}{talk}},
- fromamerican ={{from\addspace American} {from\addspace American}},
+ reference = {{Article}{Art\adddot}},
+ origtitle = {{original title}{orig\adddot title}},
+ firstprint = {{first\addspace edition}{first\addspace edition}},
+ talk = {{talk}{talk}},
+ fromamerican = {{from\addspace American} {from\addspace American}},
frombrazilian = {{from\addspace Brazilian}{from\addspace Brazilian}},
fromcroatian = {{from\addspace Croatian}{from\addspace Croatian}},
fromdanish = {{from\addspace Danish}{from\addspace Danish}},
@@ -35,8 +37,8 @@
fromdutch = {{from\addspace Dutch}{from\addspace Dutch}},
fromenglish = {{from\addspace English}{from\addspace English}},
fromfinnish = {{from\addspace Finnish}{from\addspace Finnish}},
- fromfrench = { {from\addspace French}{from\addspace French}},
- fromgerman ={{from\addspace German} {from\addspace German}},
+ fromfrench = {{from\addspace French}{from\addspace French}},
+ fromgerman = {{from\addspace German} {from\addspace German}},
fromgreek = {{from\addspace Greek}{from\addspace Greek}},
fromitalian = {{from\addspace Italian}{from\addspace Italian}},
fromlatin = {{from\addspace Latin}{from\addspace Latin}},
@@ -45,5 +47,6 @@
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}},
}
\endinput
\ No newline at end of file
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx 2017-02-28 21:22:53 UTC (rev 43356)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx 2017-02-28 21:23:38 UTC (rev 43357)
@@ -1,7 +1,7 @@
% archaeologie --%
% biblatex for archaeologists,
% historians and philologists
-% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
+% 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
@@ -24,6 +24,7 @@
\NewBibliographyString{translationof}
\NewBibliographyString{talk}
\NewBibliographyString{subvoce}
+\NewBibliographyString{owntranslation}
\DeclareBibliographyStrings{%
@@ -32,9 +33,9 @@
translationof = {{traduction\addspace de}{trad\adddot\addspace de}},
reference = {{article}{art\adddot}},
reviewof = {{recension\addspace de}{rec\adddot\addspace de}},
- origtitle = {{titre original}{titre orig.\adddot}},
+ origtitle = {{titre original}{titre orig.\adddot}},
firstprint = {{première\addspace édition}{première\addspace éd\adddot}},
- talk = {{conférence}{conf.}},
+ talk = {{conférence}{conf.}},
fromamerican = {{depuis\addspace l'anglais américain} {depuis\addspace l'anglais américain}},
frombrazilian = {{depuis\addspace le\addspace brésilien}{depuis\addspace le\addspace brésilien}},
fromcroatian = {{depuis\addspace le\addspace croatien}{depuis\addspace le\addspace croatien}},
@@ -52,4 +53,5 @@
fromrussian = {{depuis\addspace le\addspace russe}{depuis\addspace le\addspace russe}},
fromspanish = {{depuis\addspace l'espagnole}{depuis\addspace l'espagnol}},
fromswedish = {{depuis\addspace le\addspace suédois}{depuis\addspace le\addspace suédois}},
+ owntranslation = {{}{}},% FIX ME!
}
\ No newline at end of file
Added: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-german.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-german.lbx (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-german.lbx 2017-02-28 21:23:38 UTC (rev 43357)
@@ -0,0 +1,43 @@
+% archaeologie --%
+% 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.
+% The latest version of this license is in
+% 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.
+\ProvidesFile{archaeologie-german.lbx}%
+ [\arch at lbxid]
+\InheritBibliographyExtras{ngerman}
+
+\NewBibliographyString{origtitle}
+\NewBibliographyString{firstprint}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{reference}
+\NewBibliographyString{translationof}
+\NewBibliographyString{talk}
+
+\NewBibliographyString{seenote}
+\NewBibliographyString{loccit}
+\NewBibliographyString{subvoce}
+\NewBibliographyString{owntranslation}
+
+
+\DeclareBibliographyStrings{%
+ inherit = {ngerman},
+ subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
+ reference = {{Artikel}{Art\adddot}},
+ reviewof = {{Rezension\addspace zu}{Rez\adddot\addabthinspace zu}},
+ origtitle = {{Originaltitel}{Orig\adddot titel}},
+ firstprint = {{Erstauflage}{Erstaufl\adddot}},
+ talk = {{Vortrag}{Vortrag}},
+ seenote = {{Anmerkung}{Anm\adddot}},
+ loccit = {{am\addabthinspace Ort}{a\adddot\addabthinspace O\adddot}},
+ translationof = {{\"Ubersetzung\addspace von}{\"Ubers\adddot\addspace von}},
+ owntranslation = {{eigene\addspace\"Ubersetzung}{eig\adddot\addspace\"Ubers\adddot}},
+ }
+\endinput
\ No newline at end of file
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx 2017-02-28 21:22:53 UTC (rev 43356)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx 2017-02-28 21:23:38 UTC (rev 43357)
@@ -1,7 +1,7 @@
% archaeologie --%
% biblatex for archaeologists,
% historians and philologists
-% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
+% 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
@@ -28,21 +28,24 @@
\NewBibliographyString{inpress}
\NewBibliographyString{prepublished}
\NewBibliographyString{subvoce}
+\NewBibliographyString{owntranslation}
+
\DeclareBibliographyStrings{%
inherit = {italian},
subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
- translationof = {{traduzione\addspace di}{trad\adddot\addabthinspace di}},
- reference = {{articolo}{art\adddot}},
- reviewof = {{recensione\addspace di}{recens\adddot\addabthinspace di}},
- origtitle = {{titolo\addspace originale}{titolo\addspace orig\adddot}},
- firstprint = {{prima\addspace edizione}{prima\addspace edizione}},
- talk = {{presentazione}{presentazione}},
- inpreparation = {{in\addspace preparazione}{in prep\adddot}},
- submitted = {{}{}},
- inpress = {{in\addspace corso\addspace di\addspace stampa}{c\adddot\addabthinspace d\adddot\addabthinspace s\adddot}},
- prepublished = {{}{}},
- forthcoming = {{prossimo}{prossimo}},
+ translationof = {{traduzione\addspace di}{trad\adddot\addabthinspace di}},
+ reference = {{articolo}{art\adddot}},
+ reviewof = {{recensione\addspace di}{recens\adddot\addabthinspace di}},
+ origtitle = {{titolo\addspace originale}{titolo\addspace orig\adddot}},
+ firstprint = {{prima\addspace edizione}{prima\addspace edizione}},
+ talk = {{presentazione}{presentazione}},
+ inpreparation = {{in\addspace preparazione}{in prep\adddot}},
+ submitted = {{}{}},% FIX ME!
+ inpress = {{in\addspace corso\addspace di\addspace stampa}{c\adddot\addabthinspace d\adddot\addabthinspace s\adddot}},
+ prepublished = {{}{}},% FIX ME!
+ forthcoming = {{prossimo}{prossimo}},
+ owntranslation = {{}{}},% FIX ME!
}
\endinput
\ No newline at end of file
Deleted: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx 2017-02-28 21:22:53 UTC (rev 43356)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx 2017-02-28 21:23:38 UTC (rev 43357)
@@ -1,41 +0,0 @@
-% archaeologie --%
-% biblatex for archaeologists,
-% historians and philologists
-% Copyright (c) 2016 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.
-% The latest version of this license is in
-% 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.
-\ProvidesFile{archaeologie-ngerman.lbx}%
- [\arch at lbxid]
-\InheritBibliographyExtras{ngerman}
-
-\NewBibliographyString{origtitle}
-\NewBibliographyString{firstprint}
-\NewBibliographyString{reviewof}
-\NewBibliographyString{reference}
-\NewBibliographyString{translationof}
-\NewBibliographyString{talk}
-
-\NewBibliographyString{seenote}
-\NewBibliographyString{loccit}
-\NewBibliographyString{subvoce}
-
-
-\DeclareBibliographyStrings{%
- inherit = {ngerman},
- subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
- reference = {{Artikel}{Art\adddot}},
- reviewof = {{Rezension\addspace zu}{Rez\adddot\addabthinspace zu}},
- origtitle = {{Originaltitel}{Orig\adddot titel}},
- firstprint = {{Erstauflage}{Erstaufl\adddot}},
- talk = {{Vortrag}{Vortrag}},
- seenote = {{Anmerkung}{Anm\adddot}},
- loccit = {{am\addabthinspace Ort}{a\adddot\addabthinspace O\adddot}},
- translationof = {{\"Ubersetzung\addspace von}{\"Ubers\adddot\addspace von}},
- }
-\endinput
\ No newline at end of file
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx 2017-02-28 21:22:53 UTC (rev 43356)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx 2017-02-28 21:23:38 UTC (rev 43357)
@@ -1,7 +1,7 @@
% archaeologie --%
% biblatex for archaeologists,
% historians and philologists
-% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
+% 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
@@ -21,13 +21,15 @@
\NewBibliographyString{reference}
\NewBibliographyString{talk}
\NewBibliographyString{subvoce}
+\NewBibliographyString{owntranslation}
\DeclareBibliographyStrings{%
inherit = {spanish},
subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
- reference = {{Artículo}{Art\adddot}},
- origtitle = {{Título\addspace original}{Título\addspace original}},
- firstprint = {{Primera\addspace edición}{Primera\addspace edición}},
- talk = {{Conferencia}{Conferencia}},
+ reference = {{Artículo}{Art\adddot}},
+ origtitle = {{Título\addspace original}{Título\addspace original}},
+ firstprint = {{Primera\addspace edición}{Primera\addspace edición}},
+ talk = {{Conferencia}{Conferencia}},
+ owntranslation = {{}{}},% FIX ME!
}
\endinput
\ No newline at end of file
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx 2017-02-28 21:22:53 UTC (rev 43356)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx 2017-02-28 21:23:38 UTC (rev 43357)
@@ -1,7 +1,7 @@
% archaeologie --%
% biblatex for archaeologists,
% historians and philologists
-% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
+% 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
@@ -10,11 +10,10 @@
% 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{2016-10-06}
-\def\arch at version{2.2b}
+\def\arch at date{2017-02-27}
+\def\arch at version{2.3}
\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 dbxid{\arch at date\space v\arch at version\space biblatex-archaeologie data (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)}
\ProvidesFile{archaeologie.bbx}%
@@ -21,14 +20,13 @@
[\arch at bbxid]
\RequireBibliographyStyle{standard}
\AtBeginDocument{%
- \RequirePackage[normalem]{ulem}
- %\RequirePackage{csquotes}
\urlstyle{sf}%
\typeout{* * * archaeologie * * *
biblatex for archaeologists,
historians and philologists}
}
-
+\RequirePackage[normalem]{ulem}
+%\RequirePackage{csquotes}
\def\archaeologieversion{\arch at version}
\def\archaeologiedate{\arch at date}
\ExecuteBibliographyOptions{%
@@ -45,6 +43,7 @@
minnames=1,%
maxitems=1,%
maxbibnames=999,%
+ useprefix=true,%
}
%-----------------------
\newbool{bbx:edby}
@@ -171,6 +170,9 @@
\iftoggle{bbx:jstor}{}{\xout{jstor}\seperator}%
\iftoggle{bbx:urn}{}{\xout{urn}\seperator}%
\iftoggle{bbx:doi}{}{\xout{doi}\seperator}%
+ \iflanguage{ngerman}%
+ {weitere Informationen unter \url{http://biblatex-archaeologie.de}}
+ {further information see \url{http://biblatex-archaeologie.de}}
}
%-----------------------
\DeclareFieldFormat*{title}{#1}
@@ -186,6 +188,7 @@
\DeclareFieldFormat{edition}{#1}
\DeclareFieldFormat{volumes}{#1}
\DeclareFieldFormat{volume}{#1}
+\DeclareFieldFormat[article]{date}{\iffieldundef{number}{#1}{#1\setunit{\yearnumdelim}\printfield{number}}}
\DeclareFieldFormat[inreference]{number}{\mkbibbrackets{#1}}
\DeclareFieldFormat{parens}{\mkbibparens{#1}}
\DeclareFieldFormat{brackets}{\mkbibbrackets{#1}}
@@ -219,15 +222,16 @@
\DeclareFieldAlias{jstor}{eprint:jstor}
\DeclareFieldAlias{urn}{eprint:urn}
%-----------------------
-\DeclareRedundantLanguages{ngerman}{german,ngerman,austrian,naustrian}
+\DeclareRedundantLanguages{german}{german,ngerman,austrian,naustrian}
\DeclareRedundantLanguages{english,american}{english,american,british,%
canadian,australian,newzealand,USenglish,UKenglish}
-\DeclareLanguageMapping{ngerman}{archaeologie-ngerman}
+\DeclareLanguageMapping{german}{archaeologie-german}
\DeclareLanguageMapping{english}{archaeologie-english}
\DeclareLanguageMapping{french}{archaeologie-french}
\DeclareLanguageMapping{italian}{archaeologie-italian}
\DeclareLanguageMapping{spanish}{archaeologie-spanish}
%-----------------------
+\renewcommand*{\sqspace}{\addnbthinspace}
\renewcommand*{\subtitlepunct}{\addperiod\addspace}
\renewcommand*{\intitlepunct}{\addcolon\addspace}
\renewcommand*{\newunitpunct}{\addcomma\addspace}
@@ -252,7 +256,8 @@
\renewcommand{\multinamedelim}{\addnbspace\textendash\addspace}
\renewcommand{\finalnamedelim}{\multinamedelim}
\renewcommand*\relateddelim{\addnbspace\textendash\addspace}
-\newcommand*{\volnumdelim}{\addslash}
+\newcommand*{\volnumdelim}{\addcomma}
+\newcommand*{\yearnumdelim}{\addslash}
\newcommand*{\jourvoldelim}{\addnbspace}
%-----------------------
\DeclareBibliographyAlias{collection}{book}
@@ -331,10 +336,10 @@
}
%-----------------------
\AtEveryBibitem{%
- \iffieldequalstr{relatedtype}{translationof}
+ \iffieldequalstr{relatedtype}{translationof}%
{\savename{translator}{\savedrelatedtranslator}%
- \clearname{translator}}
- {}
+ \clearname{translator}}%
+ {}%
\ifboolexpr{bool {bbx:translation}%
or bool {cbx:ancient}%
or bool {cbx:frgancient}}%
@@ -377,73 +382,59 @@
%% that is fields referring to the title work and not the booktitle work in inbook etc. works
% these macros are essentially the same as the standard macros without the "in"
\newbibmacro*{byineditor+others}{%
- \ifnameundef{ineditor}%
- {}%
- {\usebibmacro{byeditor+othersstrg}%
- \setunit{\addspace}%
- \printnames[byeditor]{ineditor}%
- \clearname{ineditor}%
- \newunit%
- }%
- \usebibmacro{byintranslator+others}%
-}
+ \ifnameundef{ineditor}
+ {}
+ {\usebibmacro{byeditor+othersstrg}%
+ \setunit{\addspace}%
+ \printnames[byeditor]{ineditor}%
+ \clearname{ineditor}%
+ \newunit}%
+ \usebibmacro{byintranslator+others}}
%-----------------------
\newbibmacro*{byintranslator+others}{%
- \ifnameundef{intranslator}%
- {}%
- {\usebibmacro{bytranslator+othersstrg}%
- \setunit{\addspace}%
- \printnames[bytranslator]{intranslator}%
- \clearname{intranslator}%
- \newunit%
- }%
- \usebibmacro{withinothers}%
-}
+ \ifnameundef{intranslator}
+ {}
+ {\usebibmacro{bytranslator+othersstrg}%
+ \setunit{\addspace}%
+ \printnames[bytranslator]{intranslator}%
+ \clearname{intranslator}%
+ \newunit}%
+ \usebibmacro{withinothers}}
%-----------------------
\newbibmacro*{withincommentator}{%
- \ifnameundef{incommentator}%
- {}%
- {\bibstring{withcommentator}%
- \setunit{\addspace}%
- \printnames[withcommentator]{incommentator}%
- }%
-}
+ \ifnameundef{incommentator}
+ {}
+ {\bibstring{withcommentator}%
+ \setunit{\addspace}%
+ \printnames[withcommentator]{incommentator}}}
%-----------------------
\newbibmacro*{withinannotator}{%
- \ifnameundef{inannotator}%
- {}%
- {\bibstring{withannotator}%
- \setunit{\addspace}%
- \printnames[withannotator]{inannotator}%
- }%
- }
+ \ifnameundef{inannotator}
+ {}
+ {\bibstring{withannotator}%
+ \setunit{\addspace}%
+ \printnames[withannotator]{inannotator}}}
%-----------------------
\newbibmacro*{withinintroduction}{%
- \ifnameundef{inintroduction}
- {}%
- {\bibstring{withintroduction}%
- \setunit{\addspace}%
- \printnames[withintroduction]{inintroduction}%
- }%
-}
+ \ifnameundef{inintroduction}
+ {}
+ {\bibstring{withintroduction}%
+ \setunit{\addspace}%
+ \printnames[withintroduction]{inintroduction}}}
%-----------------------
\newbibmacro*{withinforeword}{%
- \ifnameundef{inforeword}%
- {}%
- {\bibstring{withforeword}%
- \setunit{\addspace}%
- \printnames[withforeword]{inforeword}%
- }%
-}
+ \ifnameundef{inforeword}
+ {}
+ {\bibstring{withforeword}%
+ \setunit{\addspace}%
+ \printnames[withforeword]{inforeword}}}
%-----------------------
\newbibmacro*{withinafterword}{%
- \ifnameundef{inafterword}
- {}
- {\bibstring{withafterword}%
- \setunit{\addspace}%
- \printnames[withafterword]{inafterword}%
- }%
-}
+ \ifnameundef{inafterword}
+ {}
+ {\bibstring{withafterword}%
+ \setunit{\addspace}%
+ \printnames[withafterword]{inafterword}}}
%-----------------------
\newbibmacro*{withinothers}{%
\usebibmacro{withincommentator}%
@@ -523,7 +514,7 @@
\clearlist{pageref}%
\setunit{\addcomma\newline\nobreak}%
}%
- {}%
+ {\newunit}%
}
%-----------------------
\renewbibmacro*{eprint}{%
@@ -534,35 +525,30 @@
}
%-----------------------
\newbibmacro*{zenon}{%
- \iffieldundef{zenon}%
- {}%
- {\usebibmacro{bbx:parunit}%
- \printfield{zenon}%
- }
-}
+ \iffieldundef{zenon}
+ {}%
+ {\usebibmacro{bbx:parunit}%
+ \printfield{zenon}}}
%-----------------------
\newbibmacro*{jstor}{%
- \iffieldundef{jstor}%
- {}%
- {\usebibmacro{bbx:parunit}%
- \printfield{jstor}%
- }
-}
+ \iffieldundef{jstor}
+ {}
+ {\usebibmacro{bbx:parunit}%
+ \printfield{jstor}}}
%-----------------------
\newbibmacro*{urn}{%
- \iffieldundef{urn}
- {}
- {\usebibmacro{bbx:parunit}%
- \printfield{urn}%
- }
-}
+ \iffieldundef{urn}
+ {}
+ {\usebibmacro{bbx:parunit}%
+ \printfield{urn}}}
%-----------------------
\renewbibmacro*{url+urldate}{%
- \usebibmacro{bbx:parunit}%
- \iffieldundef{url}{}{\printfield{url}%
- \setunit*{\addspace}%
- \printtext{\printurldate}%
-}}
+ \usebibmacro{bbx:parunit}%
+ \iffieldundef{url}
+ {}
+ {\printfield{url}%
+ \setunit*{\addspace}%
+ \printtext{\printurldate}}}
%-----------------------
\renewbibmacro*{doi+eprint+url}{%
\usebibmacro{bbx:parunit}%
@@ -575,25 +561,16 @@
}
%-----------------------
\renewbibmacro*{editor}{%
- \ifboolexpr{%
- test \ifuseeditor %
- and %
- not test {\ifnameundef{editor}}%
- }%
+ \ifboolexpr{%
+ test \ifuseeditor %
+ and %
+ not test {\ifnameundef{editor}}}%
{\printnames{editor}%
- \setunit{\addspace}%
- \printtext[parens]{\bibstring{editor}}%
- \clearname{editor}%
- }%
- {}%
-}
+ \setunit{\addspace}%
+ \printtext[parens]{\bibstring{editor}}%
+ \clearname{editor}}%
+ {}}
%-----------------------
-\newbibmacro{savestuff}{%
- \savename{editor}{\bbx at lasteditor}%
- \savefield{namehash}{\bbx at lasthash}%
- \savefield{booktitle}{\bbx at lastbooktitle}%
-}
-%-----------------------
\DeclareLabeldate{%
\field{date}
\field{year}
@@ -619,9 +596,7 @@
\printfield{number}%
\ifbool{bbx:yearseries}%
{\newunit}%
- {\setunit{\addspace}}%
- }%
-}
+ {\setunit{\addspace}}}}
%-----------------------
\renewbibmacro*{journal}{%
\ifboolexpr{test {\iffieldundef{shortjournal}}%
@@ -632,19 +607,19 @@
\printfield[titlecase]{journalsubtitle}%
}%
}%
- {\printfield{shortjournal}}%
-}
+ {\printfield{shortjournal}}}
%-----------------------
\newbibmacro{journal+number+year}{%
\usebibmacro{journal}%
\setunit{\jourvoldelim}%
\printfield{volume}%
+ \iffieldundef{number}
+ {}
{\setunit{\volnumdelim}%
\printfield{number}%
}%
\newunit%
-\usebibmacro{pubstate+year}%
-}
+\usebibmacro{pubstate+year}}
%-----------------------
\newbibmacro{pubstate+year}{%
\iffieldundef{pubstate}%
@@ -658,18 +633,15 @@
\newbibmacro{translation}{%
\printfield{origtitle}%
\setunit{\addcomma\space}%
- \usebibmacro{byeditor+others}%
-}
+ \usebibmacro{byeditor+others}}
%-----------------------
\newbibmacro{intranslation}{%
\printfield{origtitle}%
\setunit{\addcomma\space}%
- \usebibmacro{byineditor+others}%
-}
+ \usebibmacro{byineditor+others}}
%-----------------------
\newbibmacro*{related:reviewof}[1]{%
- \usebibmacro*{related:default}{#1}%
-}
+ \usebibmacro*{related:default}{#1}}
%-----------------------
\newbibmacro*{related:translationof}[1]{%
\entrydata*{#1}{%
@@ -681,10 +653,7 @@
{\newunit
\bibstring{bytranslator}%keine Sprache ausgegeben?
\setunit{\addspace}%
- \printnames{savedtranslator}%
- }%
- }%
-}
+ \printnames{savedtranslator}}}}
%-----------------------
\newbibmacro*{inreference:title+author}{%
\iffieldundef{title}%
@@ -696,8 +665,7 @@
\setunit*{\addspace}%
\printfield{number}}%
\setunit{\addspace}%
- \printtext[parens]{\printnames[name:initials]{labelname}}%
-}
+ \printtext[parens]{\printnames[name:initials]{labelname}}}
%-----------------------
\newbibmacro*{maintitle+title+volumes}{%
\iffieldsequal{maintitle}{title}%
@@ -710,31 +678,23 @@
{\usebibmacro{maintitle}%
\ifbool{cbx:ancient}%
{\usebibmacro{title}%
- \iffieldundef{volume}%
- {\newunit\newblock}%
- {}%
- }%
+ \iffieldundef{volume}%
+ {\newunit\newblock}%
+ {}}%
{\iffieldundef{volume}%
{\iffieldundef{volumes}%
- {}%
- {\printfield{volumes}%
- \setunit*{\addspace}%
- \bibstring{volumes}%
- \setunit{\addspace}%
- }%
- }%
- {\setunit{\addspace}%
- \printfield{volume}%
- \setunit*{\adddot\addspace}%
- }%
- }%
- }%
- }%
- \iffieldundef{volumes}%
- {\usebibmacro{title}}%
- {}%
- \newunit%
-}
+ {}%
+ {\printfield{volumes}%
+ \setunit*{\addspace}%
+ \bibstring{volumes}%
+ \setunit{\addspace}}}%
+ {\setunit{\addspace}%
+ \printfield{volume}%
+ \setunit*{\adddot\addspace}}}}}%
+ \iffieldundef{volumes}%
+ {\usebibmacro{title}}%
+ {}%
+ \newunit}
%-----------------------
\renewbibmacro{event+venue+date}{%
\setunit{\adddot\addspace}%
@@ -1017,9 +977,8 @@
\iftoggle{bbx:related}%
{\usebibmacro{related:init}%
\usebibmacro{related}%
- }
+ }%
{}%
- \usebibmacro{savestuff}%
\usebibmacro{finentry}%
}
%-----------------------
@@ -1044,7 +1003,6 @@
\usebibmacro{related}%
}%
{}%
- \usebibmacro{savestuff}%
\usebibmacro{finentry}%
}
%-----------------------
@@ -1074,12 +1032,10 @@
\usebibmacro{doi+eprint+url}%
\setunit{\addperiod\addspace}%
\usebibmacro{signatur}%
- \usebibmacro{savestuff}%
\newunit\newblock%
\iftoggle{bbx:related}%
{\usebibmacro{related:init}%
- \usebibmacro{related}%
- }%
+ \usebibmacro{related}}%
{}%
\usebibmacro{finentry}%
}
@@ -1122,7 +1078,6 @@
\usebibmacro{related}%
}%
{}%
- \usebibmacro{savestuff}%
\usebibmacro{finentry}%
}
%-----------------------
@@ -1152,7 +1107,6 @@
\usebibmacro{related}%
}%
{}%
- \usebibmacro{savestuff}%
\usebibmacro{finentry}%
}
%-----------------------
@@ -1195,7 +1149,6 @@
\usebibmacro{related}%
}%
{}%
- \usebibmacro{savestuff}%
\usebibmacro{finentry}%
}
%-----------------------
@@ -1215,7 +1168,6 @@
\setunit{\addperiod\addspace}%
\usebibmacro{signatur}%
\newunit\newblock%
- \usebibmacro{savestuff}%
\usebibmacro{finentry}%
}
%-----------------------
@@ -1239,7 +1191,6 @@
\usebibmacro{doi+eprint+url}%
\usebibmacro{signatur}%
\newunit\newblock%
- \usebibmacro{savestuff}%
\usebibmacro{finentry}%
}
%-----------------------
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx 2017-02-28 21:22:53 UTC (rev 43356)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx 2017-02-28 21:23:38 UTC (rev 43357)
@@ -1,7 +1,7 @@
% archaeologie --%
% biblatex for archaeologists,
% historians and philologists
-% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
+% 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
@@ -15,9 +15,19 @@
%-----------------------
\newbool{cbx:yearinparens}
\newbool{cbx:seenote}
-\newbool{cbx:seen}
\newbool{cbx:uniqueme}
%-----------------------
+%\renewcommand*{\multicitedelim}{\addsemicolon\addspace}
+\newcommand*{\labelyeardelim}{\addspace}
+%\renewcommand{\textcitedelim}{\addcomma\space}
+\renewcommand{\postnotedelim}{%
+ \ifboolexpr{%
+ 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]{%
@@ -28,18 +38,6 @@
\iftoggle{blx at footnote}%
{\xifinlistcs{#1}{cbx at fseen@names}}%
{\xifinlistcs{#1}{cbx at tseen@names}}}
-
-\renewcommand*{\multicitedelim}{\addsemicolon\addspace}
-\newcommand*{\labelyeardelim}{\addspace}
-\renewcommand{\textcitedelim}{\multicitedelim}
-\renewcommand{\postnotedelim}{%
- \ifboolexpr{bool {cbx:ancient}%
- or bool {cbx:frgancient}%
- or bool {cbx:corpus}%
- }%
- {\addspace}%
- {\newunitpunct}%
-}
%-----------------------
\DeclareBibliographyOption{yearinparens}[true]{%
\ifstrequal{#1}{true}%
@@ -46,8 +44,8 @@
{\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}%
\csuse{bool#1}{cbx:yearinparens}}%
{\DeclareFieldFormat{citeyear}{##1}}}%
-\DeclareBibliographyOption{seenote}[true]{\csuse{bool#1}%
- {cbx:seenote}%
+\DeclareBibliographyOption{seenote}[true]{%
+ \csuse{bool#1}{cbx:seenote}%
\ExecuteBibliographyOptions{maxnames=999}%
}%
\DeclareBibliographyOption[string]{citeauthorformat}{%
@@ -54,7 +52,7 @@
\ifcsdef{cbx at arch@citeauthorformat@#1}%
{\csuse{cbx at arch@citeauthorformat@#1}}%
{\PackageError{biblatex-archaeologie}%
- {Option 'citeauthorformat=#1' invalid.\MessageBreak%
+ {Option 'citeauthorformat=#1' invalid.\MessageBreak
Use one of the values 'initials', 'full', 'family' or 'firstfull'.}{}}%
\def\citeauthorformatVALUE{#1}%
}
@@ -197,6 +195,7 @@
datecirca=true,
citeauthorformat=initials,%
uniquename=minfull,%
+ autocite=footnote,
}
%-----------------------
\newbibmacro*{uniqueshorthand}{%
@@ -205,7 +204,7 @@
{\ifnameundef{intranslator}%
{\iffieldundef{series}%
{\printnames[name:family]{editor}}%
- {\usebibmacro*{series}}%
+ {\usebibmacro{series}}%
}%
{\printnames[name:family]{intranslator}}}%
{\printnames[name:family]{translator}}}}
@@ -221,14 +220,19 @@
}
%-----------------------
\renewbibmacro*{postnote}{%
-\iffieldundef{postnote}%
- {}%
- {\postnotedelim\printfield{postnote}%
- \ifbool{cbx:frgancient}%
- {\setunit{\addspace}%
- \usebibmacro{cite:frgname}}%
- }%
-}
+ \ifboolexpr{%
+ test{\ifbool{bbx:inreferences}}%
+ and%
+ test{\ifentrytype{inreference}}}
+ {}
+ {\iffieldundef{postnote}%
+ {}%
+ {\setunit{\postnotedelim}%
+ \printfield{postnote}%
+ \ifbool{cbx:frgancient}%
+ {\setunit{\addspace}%
+ \usebibmacro{cite:frgname}}%
+ {}}}}
%-----------------------
\newbibmacro*{cite:frgname}{%
\ifnameundef{shorteditor}%
@@ -237,16 +241,16 @@
}
%-----------------------
\newbibmacro*{seenote}{%
-\ifnameundef{labelname}%
- {\usebibmacro{cite:label}%
- \setunit{\labelyeardelim}}%
- {\printnames{labelname}%
- \setunit{\nameyeardelim}}%
-\setunit{\addspace}%
-\bibstring{loccit}\addspace%
-\printtext[parens]{\bibstring{seenote}\addspace%
-\ref{footref:\thefield{entrykey}}}%
-\renewcommand{\postnotedelim}{\addspace}%
+ \ifnameundef{labelname}%
+ {\usebibmacro{cite:label}}%
+ {\printnames{labelname}}%
+ \setunit{\labelyeardelim}%
+ \bibstring{loccit}%
+ \setunit{\addspace}%
+ \printtext[parens]{\bibstring{seenote}%
+ \addspace%
+ \ref{footref:\thefield{entrykey}}}%
+ \renewcommand{\postnotedelim}{\addspace}%
}%
%-----------------------
\newbibmacro*{cite:title}{\printfield{labeltitle}}%
@@ -275,19 +279,14 @@
or bool{cbx:frgancient}%
or bool{cbx:corpus}}%
{\usebibmacro{cite:shorthand}}%
- {\ifciteseen{\usebibmacro{seenote}}{%
- \ifboolexpr{%
- test {\ifentrytype{book}}%
- or %
- test {\ifentrytype{proceedings}}%
- or %
- test {\ifentrytype{inreference}}%
- }{\renewcommand{\postnotedelim}{\addspace}}{}%
- \bibhypertarget{ref:\thefield{entrykey}}{%
- \usedriver{}{\thefield{entrytype}}%
- \iffootnote{\label{footref:\thefield{entrykey}}}%
- }}}%
-}
+ {\ifciteseen%
+ {\usebibmacro{seenote}}%
+ {\bibhypertarget{ref:\thefield{entrykey}}%
+ {\usedriver%
+ {\DeclareNameAlias{sortname}{default}}%
+ {\thefield{entrytype}}%
+ \iffootnote{\label{footref:\thefield{entrykey}}}}%
+}}}
%-----------------------
\newbibmacro{cite}{%
\ifboolexpr{%
@@ -295,10 +294,10 @@
and %
test {\ifentrytype{inreference}}%
}%
- {\usebibmacro{cite:lexikon}}
- {\ifbool{cbx:seenote}
- {\usebibmacro{cite:seenote}}
- {\printtext[bibhyperref]{%
+ {\usebibmacro{cite:lexikon}}%
+ {\ifbool{cbx:seenote}%
+ {\usebibmacro{cite:seenote}}%
+ {\printtext[bibhyperref]{%
\iffieldundef{shorthand}%
{\ifnameundef{labelname}%
{\usebibmacro{cite:label}%
@@ -307,11 +306,7 @@
\setunit{\nameyeardelim}}%
\usebibmacro{cite:year}}%
{\usebibmacro{cite:shorthand}}%
- }}}%
- \ifciteseen{\global\booltrue{cbx:seen}}%
- {\global\boolfalse{cbx:seen}}%
- \usebibmacro{savestuff}%
-}
+ }}}}
%-----------------------
\newbibmacro*{citeyear}{%
\iffieldundef{shorthand}%
@@ -361,28 +356,28 @@
{}
{\datecircaprint}%
\dateeraprintpre{labelyear}%
- \iffieldnums{labelyear}
- {\mkyearzeros{\thefield{labelyear}}}
+ \iffieldnums{labelyear}%
+ {\mkyearzeros{\thefield{labelyear}}}%
{\printfield{labelyear}}%
\printfield{extrayear}%
- \iffieldsequal{labeldateera}{labelenddateera}{}
+ \iffieldsequal{labeldateera}{labelenddateera}{}%
{\dateeraprint{labelyear}}%
\dateuncertainprint%
- \ifdefstring\blx at dateformat@labeldate{edtf}
- {\datecircaprintedtf}
+ \ifdefstring\blx at dateformat@labeldate{edtf}%
+ {\datecircaprintedtf}%
{}%
- \iffieldundef{labelendyear}
+ \iffieldundef{labelendyear}%
{}
- {\iffieldsequal{labelyear}{labelendyear}{}
- {\ifdefstring\blx at dateformat@labeldate{edtf}
+ {\iffieldsequal{labelyear}{labelendyear}{}%
+ {\ifdefstring\blx at dateformat@labeldate{edtf}%
{\slash}% strict EDTF
- {\bibdaterangesep
+ {\bibdaterangesep%
\enddatecircaprint}%
\dateeraprintpre{labelendyear}%
\mkyearzeros{\thefield{labelendyear}}%
- \enddateuncertainprint
- \ifdefstring\blx at dateformat@labeldate{edtf}
- {\enddatecircaprintedtf}
+ \enddateuncertainprint%
+ \ifdefstring\blx at dateformat@labeldate{edtf}%
+ {\enddatecircaprintedtf}%
{}%
\dateeraprint{labelendyear}}}}}}
%-----------------------
@@ -406,11 +401,7 @@
{\usebibmacro{citeindex}%
\usebibmacro{cite}}%
{\multicitedelim}%
- {\ifboolexpr{%
- test{\ifbool{bbx:inreferences}}%
- and%
- test{\ifentrytype{inreference}}%
- }{}{\usebibmacro{postnote}}}%
+ {\usebibmacro{postnote}}
%-----------------------
\DeclareCiteCommand{\footcite}[\mkbibfootnote]
{\usebibmacro{prenote}}%
@@ -417,14 +408,14 @@
{\usebibmacro{citeindex}%
\usebibmacro{cite}}%
{\multicitedelim}%
- {\ifboolexpr{%
- test{\ifbool{bbx:inreferences}}%
- and%
- test{\ifentrytype{inreference}}%
- }{}{\usebibmacro{postnote}}}%
+ {\usebibmacro{postnote}}
%-----------------------
\DeclareCiteCommand{\textcite}%
{\boolfalse{cbx:yearinparens}%
+ \renewcommand*{\multinamedelim}{\addcomma\space}%
+ \renewcommand*{\finalnamedelim}{%
+ \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
+ \addspace\bibstring{and}\space}%
\usebibmacro{prenote}%
}%
{\usebibmacro{citeindex}%
@@ -445,18 +436,43 @@
{\usebibmacro{citeindex}%
\usebibmacro{cite}}%
{\multicitedelim}%
- {\ifboolexpr{%
+ {\usebibmacro{postnote}}
+%-----------------------
+\DeclareCiteCommand{\smartcite}[\iffootnote\textnormal\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\ifboolexpr{%
test{\ifbool{bbx:inreferences}}%
and%
test{\ifentrytype{inreference}}%
}{}{\usebibmacro{postnote}}}%
-%-----------------------
+%-----------------------
+ \DeclareCiteCommand{\fullcite}
+ {\usebibmacro{prenote}}
+ {\usedriver
+ {\DeclareNameAlias{sortname}{default}}
+ {\thefield{entrytype}}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+%-----------------------
+\DeclareCiteCommand{\footfullcite}[\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usedriver
+ {\DeclareNameAlias{sortname}{default}}
+ {\thefield{entrytype}}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+%-----------------------
\DeclareMultiCiteCommand{\cites}%
{\cite}{\multicitedelim}%
\DeclareMultiCiteCommand{\parencites}[\mkbibparens]%
{\parencite}{\multicitedelim}%
\DeclareMultiCiteCommand{\textcites}%
- {\textcite}{\textcitedelim}%
+ {\textcite}{\textcitedelim}
+\DeclareMultiCiteCommand{\smartcites}
+ [\iffootnote\textnormal\mkbibfootnote]{\smartcite}{\multicitedelim}
%-----------------------
\DeclareCiteCommand{\citeauthor}
{\boolfalse{citetracker}%
@@ -478,6 +494,64 @@
{\multicitedelim}%
{\usebibmacro{postnote}}
%-----------------------
+\DeclareCiteCommand{\citetranslator}
+ {\boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \renewcommand*{\multinamedelim}{\addcomma\space}%
+ \renewcommand*{\finalnamedelim}{%
+ \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
+ \addspace\bibstring{and}\space}%
+ \usebibmacro{prenote}}%
+ {\usebibmacro{citeindex}%
+\ifboolexpr{%
+ test {\ifbool{bbx:inreferences}}%
+ and %
+ test {\ifentrytype{inreference}}%
+ }%
+ {\printtext}%
+ {\printtext[bibhyperref]}%
+ {\ifthenelse{%
+ \ifentrytype{incollection}%
+ \OR%
+ \ifentrytype{inbook}%
+ }%
+ {\printnames[citeauthor]{intranslator}}%
+ {\printnames[citeauthor]{translator}}}%
+ }%
+ {\multicitedelim}%
+ {\usebibmacro{postnote}}
+%-----------------------
+\DeclareCiteCommand*{\citetranslator}
+ {\boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \DeclareNameAlias{bytranslator}{citeauthor}%
+ \renewcommand*{\multinamedelim}{\addcomma\space}%
+ \renewcommand*{\finalnamedelim}{%
+ \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
+ \addspace\bibstring{and}\space}%
+ \usebibmacro{prenote}}%
+ {\usebibmacro{citeindex}%
+ \ifboolexpr{%
+ test {\ifbool{bbx:inreferences}}%
+ and %
+ 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}}}}}%
+ {\multicitedelim}%
+ {\usebibmacro{postnote}}
+%-----------------------
\DeclareCiteCommand*{\citeauthor}
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx 2017-02-28 21:22:53 UTC (rev 43356)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx 2017-02-28 21:23:38 UTC (rev 43357)
@@ -1,7 +1,7 @@
% archaeologie --%
-% biblatex for archaeologists,
+% biblatex for archaeologists,
% historians and philologists
-% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
+% 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
@@ -13,7 +13,7 @@
\ProvidesFile{archaeologie.dbx}%
% [\arch at dbxid]
- % new translator etc. fields for "inner" work, that is translator of title (not booktitle) in @in...
+% new translator etc. fields for "inner" work, that is translator of title (not booktitle) in @in...
\DeclareDatamodelFields[type=list,datatype=name]{ineditor, intranslator, inannotator, incommentator, inintroduction, inforeword, inafterword}
\DeclareDatamodelEntryfields[inbook,incollection,inproceedings,inreference]{ineditor, intranslator, inannotator, incommentator, inintroduction, inforeword, inafterword}
\DeclareDatamodelEntrytypes{talk}
More information about the tex-live-commits
mailing list