texlive[41771] Master/texmf-dist: archaeologie (28jul16)
commits+karl at tug.org
commits+karl at tug.org
Sun Jul 31 01:09:45 CEST 2016
Revision: 41771
http://tug.org/svn/texlive?view=revision&revision=41771
Author: karl
Date: 2016-07-31 01:09:45 +0200 (Sun, 31 Jul 2016)
Log Message:
-----------
archaeologie (28jul16)
Modified Paths:
--------------
trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib
trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstpublishers.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
Modified: trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib
===================================================================
--- trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib 2016-07-30 23:09:29 UTC (rev 41770)
+++ trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib 2016-07-30 23:09:45 UTC (rev 41771)
@@ -2538,7 +2538,7 @@
@String {JRA = {Journal of Roman Archaeology}}
@String {JRomMilSt = {Journal of Roman Military Equipment Studies}}
@String {JRomPotSt = {Journal of Roman Pottery Studies}}
- @String {JRS = {The Journal of Roman Studies}}
+ @String {JRS = {Journal of Roman Studies}}
@String {JSav = {Journal des savants}}
@String {JSchrVgHalle = {Jahresschrift für mitteldeutsche Vorgeschichte}}
@String {JSS = {Journal of Semitic Studies}}
Modified: trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstpublishers.bib
===================================================================
--- trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstpublishers.bib 2016-07-30 23:09:29 UTC (rev 41770)
+++ trunk/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstpublishers.bib 2016-07-30 23:09:45 UTC (rev 41771)
@@ -14,6 +14,7 @@
@String { MI = {Michael Imhof} }
@String { MIT = {MIT Press} }
@String { OUP = {Oxford University Press} }
+ at String { PSUP = {Pennsylvania State University Press} }
@String { PUP = {Princeton University Press} }
@String { PvZ = {Philip von Zabern} }
@String { stw = {suhrkamp taschenbuch wissenschaft} }
Modified: trunk/Master/texmf-dist/doc/latex/archaeologie/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/archaeologie/README.md 2016-07-30 23:09:29 UTC (rev 41770)
+++ trunk/Master/texmf-dist/doc/latex/archaeologie/README.md 2016-07-30 23:09:45 UTC (rev 41771)
@@ -5,7 +5,7 @@
bibLaTeX-style for archaeologists, historians and philologists.
---
-_2016/07/15 v2.03_
+_2016/07/28 v2.04_
Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
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 2016-07-30 23:09:29 UTC (rev 41770)
+++ trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex 2016-07-30 23:09:45 UTC (rev 41771)
@@ -35,7 +35,7 @@
Dank an ›moewew‹ und Herbert Voß für ihre Hilfe.
}\\ --- {\scshape kurzanleitung} --\footnote{Für eine vollständige Anleitung siehe die englische Stilbeschreibung unter \url{http://mirrors.ctan.org/macros/latex/contrib/biblatex-contrib/archaeologie/archaeologie.pdf}} }
\author{Lukas C. Bossert\thanks{\url{lukas at digitales-altertum.de}} \and Johannes Friedl}
-\date{Version: 2.03 (2016-07-15)}
+\date{Version: \archaeologieversion{} (\archaeologiedate)}
\maketitle
\begin{abstract}
@@ -199,7 +199,7 @@
\item[Optional:] |doi|, |url|, |urldate|, |eprint|, |eprinttype|, |note|, |addendum|, |pubstate|
\end{description}
-\printbib[8em]{Ball2013}
+\printbib[10em]{Ball2013}
\DescribeMacro{@book} \DescribeMacro{@collection} Für Monographien und Sammelbände.
@@ -208,7 +208,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[9em]{Fentress2003}
\DescribeMacro{@inbook} \DescribeMacro{@incollection} Für Beiträge innerhalb eines Sammelbandes.
@@ -217,7 +217,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[5em]{Mundt2015}
+\printbib[7em]{Mundt2015}
\DescribeMacro{@proceedings} Für Konferenz-/Kolloquiumssammelbände, bei denen ein Datum angegeben ist.
@@ -226,7 +226,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]{Kurapkat2014}
+\printbib[9em]{Kurapkat2014}
\DescribeMacro{@inproceedings} Für Beiträge innerhalb eines Konferenz-/Kolloquiumssammelbandes, bei denen ein Datum angegeben ist.
@@ -235,7 +235,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]{Wulf-Rheidt2013}
+\printbib[9em]{Wulf-Rheidt2013}
\DescribeMacro{@talk} Für (mündliche) Vorträge (Kolloquium, Konferenz)
@@ -244,7 +244,7 @@
\item[Optional:] |doi|, |url|, |urldate|, |eprint|, |eprinttype|, |note|, |addendum|
\end{description}
-\printbib[6em]{Bergmann2015}
+\printbib[8em]{Bergmann2015}
\DescribeMacro{@review} Für Rezensionen.
@@ -253,7 +253,7 @@
\item[Optional:] |doi|, |url|, |urldate|, |eprint|, |eprinttype|, |note|, |addendum|, |pubstate|
\end{description}
-\printbib[5em]{Taylor2008}
+\printbib[7em]{Taylor2008}
\DescribeMacro{@reference} Für Lexika als Gesamtwerk.
@@ -273,7 +273,7 @@
|publisher|, |series|, |number|, |edition|, |origyear|, |doi|, |url|, |urldate|, |eprint|, |eprinttype|, |note|, |addendum|, |pubstate|
\end{description}
-\printbib[5em]{Nieddu1995}
+\printbib[7em]{Nieddu1995}
\DescribeMacro{@thesis} Für (unpublizierte) eingereichte Dissertationen oder Master/Magisterarbeiten.
@@ -284,7 +284,7 @@
Für eine Dissertation: |type = {phdthesis}|, \\ für eine Magister/Masterarbeit: |type={mathesis}|.
-\printbib[5em]{Arnolds2005}
+\printbib[7em]{Arnolds2005}
\section{Bibliographie}\label{bibliographie}
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 2016-07-30 23:09:29 UTC (rev 41770)
+++ trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex 2016-07-30 23:09:45 UTC (rev 41771)
@@ -20,6 +20,8 @@
ngerman,
english
]{ltxdoc}
+\def\thisarchaeologieversion{2.04}
+\def\thisarchaeologiedate{2016-07-28}
\input{archaeologie-preamble.tex}
\NewEnviron{bibbsp}[1]
{\par\medskip\noindent\footnotesize
@@ -46,7 +48,7 @@
We thank ›moewew‹ and Herbert Voß for their big help on the code.%
}}
\author{Lukas C. Bossert\thanks{\href{mailto:lukas at digitales-altertum.de}{lukas at digitales-altertum.de}} \and Johannes Friedl}
-\date{Version: 2.03 (2016-07-15)}
+\date{Version: \archaeologieversion{} (\archaeologiedate)}
\maketitle
\begin{abstract}
\noindent This citation-style covers the citation and bibliography rules of the German Archaeological Institute.
@@ -317,7 +319,7 @@
To save time looking for the special character and insert ›ı‹ manually
it is written in the |@String| with an ›i‹ (for further information see \cref{abbrv-lists}) but will be replaced after compiling with the correct character:
-\printbib[6em]{Koyunlu1990}
+\printbib[8em]{Koyunlu1990}
Whether using the provided abbreviation list with |lstabbrv| or filling the |journaltitle| and |shortjournal| fields manually,
|archaeologie| uses by default short titles if defined.
@@ -488,7 +490,7 @@
If the option is not used (|inreferences=false|) the entry will look like this in the bibliography:
\end{refsection}
-\printbib[6em]{Nieddu1995}
+\printbib[8em]{Nieddu1995}
\subsubsection{lstabbrv}\label{abbrv}
\DescribeMacro{lstabbrv}
@@ -576,7 +578,7 @@
\end{lstlisting}
The bibliography result is:
-\printbib[6em]{Lefebvre2011}
+\printbib[8em]{Lefebvre2011}
By activating option |translation| it will change to:
@@ -652,7 +654,7 @@
If the option is not used (|=false|) the entry will look like this in the bibliography:
\end{refsection}
-\printbib[6em]{Nieddu1995}
+\printbib[8em]{Nieddu1995}
\subsubsection{yearseries}\label{yearseries}
\DescribeMacro{yearseries}
@@ -679,7 +681,7 @@
\end{lstlisting}
Without any option activated it will look like this:
-\printbib[5em]{Mundt2015}
+\printbib[7em]{Mundt2015}
By activating |yearseries| it will change to:
\begin{bibbsp}{Mundt2015}
@@ -757,7 +759,7 @@
\end{refsection}
-\printbib[9.5em]{Boehmer1985}
+\printbib[11.5em]{Boehmer1985}
Two things are left to mention:
\begin{enumerate}
@@ -800,7 +802,7 @@
\end{bsp}
\end{refsection}
-\printbib[5em]{Quint:inst}
+\printbib[7em]{Quint:inst}
\subsubsection{yearinparens}\label{yearinparens}
\DescribeMacro{yearinparens}%
@@ -864,7 +866,7 @@
the output in the bibliography changes from:
-\printbib[8em]{Ball2013}
+\printbib[10em]{Ball2013}
to
@@ -899,7 +901,7 @@
looks like
-\printbib[5em]{Osland2016}
+\printbib[7em]{Osland2016}
and with |bibfullname| it will change to:
@@ -936,7 +938,7 @@
\begin{refsection}\end{refsection}
Default settings produce:
-\printbib[5em]{Emme2013}
+\printbib[7em]{Emme2013}
By activating option |publisher| you obtain:
@@ -961,7 +963,7 @@
}
\end{lstlisting}
-\printbib[5em]{Neufert2002}
+\printbib[7em]{Neufert2002}
\begin{bibbsp}{Neufert2002}
\parbox[t]{1.7cm}{Neufert 2002} \parbox[t]{9.4cm}{%
@@ -999,7 +1001,7 @@
Without option |edby| this |@Inproceedings| would look like:
-\printbib[7em]{Wulf-Rheidt2013}
+\printbib[9em]{Wulf-Rheidt2013}
But activating |edby| it changes to:
@@ -1171,7 +1173,7 @@
In the bibliography the reference differentiates slightly from |options = {ancient}| because of the missing ancient author of fragment collections,
so the editors name is printed in the first place:
-\printbib[3em]{Fest}
+\printbib[5em]{Fest}
\subsubsection{corpus}\label{corpus}
\DescribeMacro{corpus}
@@ -1259,7 +1261,7 @@
and it looks like this in footnotes\footnote{Vgl. Mann 2011, 142--144.}
and like this in the bibliography.
-\printbib[5em]{Mann2011}
+\printbib[7em]{Mann2011}
\subsubsection{›Festschrift‹, commemorative volume, catalogue, etc.}
To mark that the book or collection is a so-called ›Festschrift‹/ commemorative volume,
@@ -1276,7 +1278,7 @@
}
\end{lstlisting}
-\printbib[9em]{Boehm2001}
+\printbib[11em]{Boehm2001}
\subsubsection{Translated book}
If you cite a translated book you can link it to the original book and let display the translator as well as the original language.
@@ -1325,7 +1327,7 @@
You don't have to cite |Zanker2009| to have the information visible in the bibliography.
It will be included automatically. For the following bibliography we only use |\cite{Zanker1988}|:
-\printbiball[5em]{Zanker1988}
+\printbiball[7em]{Zanker1988}
\subsubsection{Multiple volumes of a monograph}
@@ -1349,7 +1351,7 @@
In the bibliography the main title of the monograph (|maintitle|)
and the title of the book (|title|) are shown separately so the volume (|volume|)
appears before the title of the book
-\printbib[7em]{MacDonald1986}
+\printbib[9em]{MacDonald1986}
\subsection{Type \texttt{@Inbook / @Incollection}}\label{inbook}
@@ -1386,7 +1388,7 @@
}
\end{lstlisting}
-\printbib[11em]{Carter2014}
+\printbib[13em]{Carter2014}
You can also have contributions to a ›Festschrift‹ etc. set up as |@Incollection|,
but then notice the additional information in |booktitleaddon|.
@@ -1404,7 +1406,7 @@
}
\end{lstlisting}
In the bibliography it will look like:
-\printbib[6em]{Hoelscher2001}
+\printbib[8em]{Hoelscher2001}
\subsubsection{Short series}
Some books or collections are part of a small series (not an ongoing series).
@@ -1434,7 +1436,7 @@
of the series \emph{MemAmAc} (|series|).
Notice the different language-based behaviour of ›et. al.‹ for more than two authors/editors.
-\printbiball[7em]{Fentress2003}
+\printbiball[9em]{Fentress2003}
\subsubsection{Inventory catalogue}
@@ -1467,9 +1469,9 @@
\end{lstlisting}
-\printbib[6em]{Kohlmeyer1983}
+\printbib[8em]{Kohlmeyer1983}
\begin{refsection}\end{refsection}
-\printbiball[6em]{Parlasca1969}
+\printbiball[8em]{Parlasca1969}
\subsection{Type \texttt{@Article}}\label{article}
@@ -1502,7 +1504,7 @@
}
\end{lstlisting}
In line 5 and 6 you can also write the full or abbreviated journal title in the fields |journaltitle| or |shorttitle| (e.\,g. |journaltitle = {British School of Athens}|, |shortjournal = {BSA}|), but we chose to use a |@String| (cf. \cref{list-bibancient,string}) again.
-\printbib[7em]{Evangelidis2014}
+\printbib[9em]{Evangelidis2014}
\subsection{Type \texttt{@Proceedings}}\label{proceedings}
@@ -1554,7 +1556,7 @@
a range has to be separated with a |/| (e.\,g. \emph{2012-02-08/2012-02-11}).
In the bibliography the information of these additional fields will be used (of course) as this, notice how the output of the date changes according to the chosen language.
-\printbiball[7em]{Kurapkat2014}
+\printbiball[9em]{Kurapkat2014}
\subsection{Type \texttt{@Inproceedings}}\label{inproceedings}
\DescribeMacro{@Inproceedings}
@@ -1599,7 +1601,7 @@
\end{lstlisting}
It will be printed as:
-\printbiball[4em]{Torelli1991}
+\printbiball[6em]{Torelli1991}
\subsection{Type \texttt{@Reference}}\label{reference}
\DescribeMacro{@Reference}
@@ -1715,7 +1717,8 @@
\printbibliography[notkeyword=corpus]
\end{lstlisting}
-\begin{refsection}
+\begin{refsection}\setlength{\labwidthsameline}{7em}
+
\begin{bibbsp}{Lexikon-der-Technik,Weinbrenner1914}
\nocite{Lexikon-der-Technik,Weinbrenner1914}
\printbibliography[keyword=corpus,title={Corpora}]
@@ -1801,7 +1804,7 @@
\end{lstlisting}
In the bibliography there will be first the individual title followed by the information of the reviewed work.
-\printbib[7em]{Hufschmid2010}
+\printbib[9em]{Hufschmid2010}
\subsubsection{multiple reviewed works in one review}
@@ -1843,7 +1846,7 @@
In the field |related| you can have several \meta{bibtex-keys} which have to be separated by a comma (see line 7).
Subsequently, all information is gathered in the bibliography:
-\printbib[5em]{Taylor2008}
+\printbib[7em]{Taylor2008}
\subsection{Type \texttt{@Thesis}}\label{thesis}
@@ -1879,7 +1882,7 @@
Here is the entry in the bibliography:
-\printbib[5.5em]{Arnolds2005}
+\printbib[7.5em]{Arnolds2005}
\changes{v1.1}{2015/06/04}{Umsetzung von |@thesis| im Stil.}
@@ -1917,7 +1920,7 @@
\end{lstlisting}
The bibliography will show the entry as:
- \printbib[6.5em]{Bergmann2015}
+ \printbib[8.5em]{Bergmann2015}
\changes{v1.5}{2016/05/31}{Rückverweis}
@@ -2079,6 +2082,8 @@
This eprint-form is especially designed for the OPAC (Online Public Access Catalogue) of the German Archaeological Institute.
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}.
+
+This option is set to |false| by default.
\begin{lstlisting}
eprint = *@\marg{Zenon-number}@*
eprinttype = {zenon}
@@ -2094,9 +2099,9 @@
doi = *@\marg{doi-number}@*
\end{lstlisting}
-If you don’t want to have the online references printed you can disable the fields with |jstor=false|,
+If you want or don’t want to have the online references printed you can enable or disable the fields with |jstor=false|,
|urn=false|,
-|zenon=false|,
+|zenon=true|,
|doi=false| etc. as preamble option.
\subsection{Brackets (with @Inreference)}\label{faq:inreference}
@@ -2200,8 +2205,34 @@
}
\end{lstlisting}
-\printbib[9em]{Bossert:forthcoming}
+\printbib[11em]{Bossert:forthcoming}
+
+\subsection{Print the used options}
+If you want to print the options of the |bib|\LaTeX -style |archaeologie| you used in your document you can use the command \cs{archaeologieoptions}.
+It will list all options used:
+\begin{bsp}
+\archaeologieoptions
+\end{bsp}
+\foreignlanguage{ngerman}{%
+\begin{bsp}
+\archaeologieoptions
+\end{bsp}
+}
+If you do not want to have the text in the beginning (which is defined in English and in German) you can get rid of them with the optional argument \cs{archaeologieoptions}\texttt{[plain]}
+\begin{bsp}
+\archaeologieoptions[plain]
+\end{bsp}
+
+You can also print the version of this style with |\archaeologieversion|
+\begin{bsp}
+\archaeologieversion
+\end{bsp}
+or the date of this version with |\archaeologiedate|.
+\begin{bsp}
+\archaeologiedate
+\end{bsp}
+
\clearpage
\begin{multicols}{2}\footnotesize
\lstlistoflistings
@@ -2294,6 +2325,7 @@
\item[MIT] MIT Press
\item[OUP] Oxford University Press
\item[PUP] Princeton University Press
+\item[PSUP] Pennsylvania State University Press
\item[PvZ] Philip von Zabern
\item[stw] suhrkamp taschenbuch wissenschaft
\item[TopoiB] Topoi. Berliner Studien der Alten Welt
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx 2016-07-30 23:09:29 UTC (rev 41770)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx 2016-07-30 23:09:45 UTC (rev 41771)
@@ -16,11 +16,15 @@
historians and philologists, bbx-file]
\RequireBibliographyStyle{standard}
\AtBeginDocument{%
+\RequirePackage[normalem]{ulem}
+%\RequirePackage{csquotes}
\urlstyle{sf}%
\typeout{* * * archaeologie * * *
- biblatex for archaeologists,
+ biblatex for archaeologists,
historians and philologists}
}
+\def\archaeologieversion{2.04}
+\def\archaeologiedate{2016-07-28}
\ExecuteBibliographyOptions{%
pagetracker=true,%
citecounter=true,%
@@ -56,12 +60,13 @@
\newbool{bib:lstpublishers}
\newsavebox\arch at labelbox
\newlength{\labwidthsameline}
- \setlength{\labwidthsameline}{4em}
+\setlength{\labwidthsameline}{4em}
\newtoggle{bbx:jstor}
\newtoggle{bbx:zenon}
\newtoggle{bbx:urn}
+\setlength{\biblabelsep}{0em}
%-----------------------
\DeclareBibliographyOption{lstabbrv}[true]{%
\csuse{bool#1}{bib:lstabbrv}%
@@ -68,6 +73,7 @@
\addbibresource{archaeologie-lstabbrv.bib}
}
\DeclareBibliographyOption{bibcorpora}[true]{%
+ \csuse{bool#1}{bib:bibcorpora}%
\addbibresource{archaeologie-bibcorpora.bib}%
\ifbool{bib:lstabbrv}%
{}%
@@ -74,24 +80,26 @@
{\addbibresource{archaeologie-lstabbrv.bib}}
}
\DeclareBibliographyOption{bibancient}[true]{%
+ \csuse{bool#1}{bib:bibancient}%
\addbibresource{archaeologie-bibancient.bib}%
}
\DeclareBibliographyOption{lstlocations}[true]{%
+ \csuse{bool#1}{bib:lstlocations}%
\addbibresource{archaeologie-lstlocations.bib}%
}
\DeclareBibliographyOption{lstpublishers}[true]{%
+ \csuse{bool#1}{bib:lstpublishers}%
\addbibresource{archaeologie-lstpublishers.bib}%
}
\DeclareBibliographyOption[boolean]{jstor}[true]{%
- \settoggle{bbx:jstor}{#1}}
+\settoggle{bbx:jstor}{#1}}
\DeclareBibliographyOption[boolean]{zenon}[true]{%
\settoggle{bbx:zenon}{#1}}
\DeclareBibliographyOption[boolean]{urn}[true]{%
- \settoggle{bbx:urn}{#1}}
+ \settoggle{bbx:urn}{#1}}
\ExecuteBibliographyOptions{%
jstor,%
- zenon,%
urn,%
}
%-----------------------
@@ -98,8 +106,9 @@
\DeclareBibliographyOption{edby}[true]{\csuse{bool#1}{bbx:edby}}
\DeclareBibliographyOption{initials}[true]{\csuse{bool#1}{bbx:initials}}
\DeclareBibliographyOption{width}[]{%
- \csuse{booltrue}{bbx:width}
- \setlength{\labwidthsameline}{#1}}
+ \csuse{booltrue}{bbx:width}%
+ \setlength{\labwidthsameline}{#1}%
+ \def\labwidthsamelineVALUE{#1}}
\DeclareBibliographyOption{yearseries}[true]{\csuse{bool#1}{bbx:yearseries}}
\DeclareBibliographyOption{counter}[true]{\csuse{bool#1}{bbx:counter}}
\DeclareBibliographyOption{bibfullname}[true]{\csuse{bool#1}{bbx:bibfullname}
@@ -111,9 +120,9 @@
\DeclareBibliographyOption{publisher}[true]{\csuse{bool#1}{bbx:publisher}
\ExecuteBibliographyOptions{maxitems=2}}
\DeclareBibliographyOption{scshape}[true]{%
- \ifstrequal{#1}{true}%
- {\AtEveryCite{\renewcommand*{\mkbibnamefamily}[1]{\textsc{##1}}}}%
- {}%
+ \ifstrequal{#1}{true}%
+ {\AtEveryCite{\renewcommand*{\mkbibnamefamily}[1]{\textsc{##1}}}}%
+ {}%
}
%-----------------------
\DeclareEntryOption{ancient}[true]{\csuse{bool#1}{cbx:ancient}}
@@ -124,10 +133,43 @@
\csuse{bool#1}{cbx:frgancient}%
}
\DeclareEntryOption{corpus}[true]{\csuse{bool#1}{cbx:corpus}}
+%----------
+\newcommand{\archaeologieoptions}[1][]{%
+\ifstrempty{#1}{%
+\iflanguage{ngerman}{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}%
+ {command 'archaeologieoptions[#1]' invalid.\MessageBreak%
+ Use 'archaeologieoptions[plain]' or omit the brackets.}{}}}}%
+\def\seperator{ | }%
+\ifbool{bib:bibancient}{bibancient\seperator}{}%
+\ifbool{bib:bibcorpora}{bibcorpora\seperator}{}%
+\ifbool{bib:lstabbrv}{lstabbrv\seperator}{}%
+\ifbool{bib:lstlocations}{lstlocations\seperator}{}%
+\ifbool{bib:lstpublishers}{lstpublishers\seperator}{}%
+\ifbool{bbx:bibfullname}{bibfullname\seperator}{}%
+\ifdefstring\citeauthorformatVALUE{initials}{}{citeauthorformat\,= \citeauthorformatVALUE\seperator}%
+\ifbool{bbx:counter}{counter\seperator}{}%
+\ifbool{bbx:edby}{edby\seperator}{}%
+\ifbool{bbx:inreferences}{inreferences\seperator}{}%
+\ifbool{bbx:initials}{initials\seperator}{}%
+\ifbool{bbx:noabbrv}{noabbrv\seperator}{}%
+\ifbool{bbx:publisher}{publisher\seperator}{}%
+\ifbool{cbx:seenote}{seenote\seperator}{}%
+\ifbool{bbx:translation}{translation\seperator}{}%
+\ifbool{bbx:width}{width=\labwidthsamelineVALUE\seperator}{}%
+\ifbool{cbx:yearinparens}{yearinparens\seperator}{}%
+\ifbool{bbx:yearseries}{yearseries\seperator}{}%
+\iftoggle{bbx:zenon}{zenon\seperator}{}%
+\iftoggle{bbx:jstor}{}{\xout{jstor}\seperator}%
+\iftoggle{bbx:urn}{}{\xout{urn}\seperator}%
+\iftoggle{bbx:doi}{}{\xout{doi}\seperator}%
+}
%-----------------------
\DeclareFieldFormat*{title}{#1}
\DeclareFieldFormat{subtitle}{#1}
\DeclareFieldFormat{booktitle}{#1}
+\DeclareFieldFormat{editortype}{\mkbibparens{#1}}
\DeclareFieldFormat{booksubtitle}{#1}
\DeclareFieldFormat{titlecase}{#1}
\DeclareFieldFormat*{maintitle}{#1}
@@ -155,24 +197,23 @@
{\nolinkurl{#1}}%
}
\DeclareFieldFormat{eprint:zenon}{%
- \textsc{zenon (opac)}%
- \addcolon\space%
- \ifhyperref%
- {\href{http://zenon.dainst.org/Record/#1}{\nolinkurl{#1}}}%
- {\nolinkurl{#1}}%
+ \textsc{zenon (opac)}%
+ \addcolon\space%
+ \ifhyperref%
+ {\href{http://zenon.dainst.org/Record/#1}{\nolinkurl{#1}}}%
+ {\nolinkurl{#1}}%
}
\DeclareFieldFormat{eprint:jstor}{%
- \textsc{jstor}%
- \addcolon\space%
- \ifhyperref%
- {\href{http://www.jstor.org/stable/#1}{\nolinkurl{#1}}}%
- {\nolinkurl{#1}}%
+ \textsc{jstor}%
+ \addcolon\space%
+ \ifhyperref%
+ {\href{http://www.jstor.org/stable/#1}{\nolinkurl{#1}}}%
+ {\nolinkurl{#1}}%
}
%-----------------------
\DeclareFieldAlias{zenon}{eprint:zenon}
\DeclareFieldAlias{jstor}{eprint:jstor}
\DeclareFieldAlias{urn}{eprint:urn}
-
%-----------------------
\DeclareRedundantLanguages{ngerman}{german,ngerman,austrian,naustrian}
\DeclareRedundantLanguages{english,american}{english,american,british,%
@@ -188,17 +229,17 @@
\renewcommand*{\newunitpunct}{\addcomma\addspace}
\newcommand*{\orttrennzeichen}{\addnbspace\textendash\addspace}
\renewcommand{\finentrypunct}{%http://tex.stackexchange.com/a/14159/98739
- \ifbool{bbx:counter}%
- {\addspace$\vert$ \addspace\scshape%
- \iflanguage{ngerman}%
- {wurde \ifnumequal{\value{citecounter}}{0}{{\color{red}{keinmal}}}%
- {\arabic{citecounter}-mal} zitiert.%
- }
- {cited \ifnumequal{\value{citecounter}}{0}{{\color{red}{not once}}}%
- {\arabic{citecounter}~time\ifnumequal{\value{citecounter}}{1}{}{s}}.%
- }%
- }%
- {}%
+ \ifbool{bbx:counter}%
+ {\addspace$\vert$ \addspace\scshape%
+ \iflanguage{ngerman}%
+ {wurde \ifnumequal{\value{citecounter}}{0}{{\color{red}{keinmal}}}%
+ {\arabic{citecounter}-mal} zitiert.%
+ }
+ {cited \ifnumequal{\value{citecounter}}{0}{{\color{red}{not once}}}%
+ {\arabic{citecounter}~time\ifnumequal{\value{citecounter}}{1}{}{s}}.%
+ }%
+ }%
+ {}%
}
\renewcommand{\multinamedelim}{\addnbspace\textendash\addspace}
\renewcommand{\finalnamedelim}{\multinamedelim}
@@ -214,29 +255,29 @@
\DeclareBibliographyAlias{manual}{book}
%-----------------------
\DeclareSortingScheme{nyt}{%
- \sort{\field{presort}}%
- \sort[final]{\field{sortkey}}%
+ \sort{\field{presort}}%
+ \sort[final]{\field{sortkey}}%
+ \sort{%
+ \field{shorthand}%
+ \name{sortname}%
+ \name{author}%
+ \name{editor}%
+ \name{translator}%
+ \field{sorttitle}%
+ \field{title}%
+ }%
+ \sort{%
+ \field{sortyear}%
+ \field{year}%
+ }%
+ \sort{%
+ \field{sorttitle}%
+ \field{title}%
+ }%
\sort{%
- \field{shorthand}%
- \name{sortname}%
- \name{author}%
- \name{editor}%
- \name{translator}%
- \field{sorttitle}%
- \field{title}%
- }%
- \sort{%
- \field{sortyear}%
- \field{year}%
- }%
- \sort{%
- \field{sorttitle}%
- \field{title}%
- }%
- \sort{%
- \field[padside=left,padwidth=4,padchar=0]{volume}%
- \literal{0000}%
- }%
+ \field[padside=left,padwidth=4,padchar=0]{volume}%
+ \literal{0000}%
+ }%
}
%-----------------------
\DeclareSortingScheme{shortseries}{\sort{\field{shortseries}}}
@@ -243,26 +284,26 @@
\DeclareSortingScheme{shortjournal}{\sort{\field{shortjournal}}}
%-----------------------
\defbibcheck{shortseries}{%
- \iffieldundef{shortseries}%
- {\skipentry}%
- {}%
+ \iffieldundef{shortseries}%
+ {\skipentry}%
+ {}%
\iffieldundef{series}%
- {\skipentry}%
- {\ifcsdef{\strfield{series}}%
- {\skipentry}%
- {\savefieldcs{series}{\strfield{series}}}%
- }%
+ {\skipentry}%
+ {\ifcsdef{\strfield{series}}%
+ {\skipentry}%
+ {\savefieldcs{series}{\strfield{series}}}%
+ }%
}
\defbibcheck{shortjournal}{%
- \iffieldundef{shortjournal}%
- {\skipentry}%
- {}%
- \iffieldundef{journaltitle}%
- {\skipentry}%
- {\ifcsdef{\strfield{journaltitle}}%
- {\skipentry}%
- {\savefieldcs{journaltitle}{\strfield{journaltitle}}}%
- }%
+ \iffieldundef{shortjournal}%
+ {\skipentry}%
+ {}%
+ \iffieldundef{journaltitle}%
+ {\skipentry}%
+ {\ifcsdef{\strfield{journaltitle}}%
+ {\skipentry}%
+ {\savefieldcs{journaltitle}{\strfield{journaltitle}}}%
+ }%
}
%-----------------------
\DeclareNameAlias{author}{name:initials}
@@ -270,28 +311,30 @@
\DeclareNameAlias{translator}{author}
%-----------------------
\DeclareListFormat{location}{%
- #1\ifthenelse{\value{listcount}<\value{liststop}}%
- {\orttrennzeichen}%
- {}%
+ #1\ifthenelse{\value{listcount}<\value{liststop}}%
+ {\orttrennzeichen}%
+ {}%
}
%-----------------------
\AtEveryBibitem{%
- \iffieldequalstr{relatedtype}{translationof}
- {\savename{translator}{\savedrelatedtranslator}%
- \clearname{translator}}
- {}
- \ifboolexpr{bool {bbx:translation}%
- or bool {cbx:ancient}%
- or bool {cbx:frgancient}}%
- {}%
- {\clearname{translator}%
- \clearfield{origtitle}}}
+ \iffieldequalstr{relatedtype}{translationof}
+ {\savename{translator}{\savedrelatedtranslator}%
+ \clearname{translator}}
+ {}
+ \ifboolexpr{bool {bbx:translation}%
+ 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{%
+ \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|[B-DF-HJ-NP-TV-XZ](l|r))(\S*,)}},%
@@ -406,29 +449,46 @@
}
%-----------------------
\newbibmacro{labelwidthbib}{%
- \begingroup%
- \DeclareFieldFormat{bibhyperref}{##1}%
- \csuse{blx at hook@cite}%
- \csuse{blx at hook@citekey}%
- \defcounter{maxnames}{\blx at maxcitenames}%
- \usebibmacro{cite}%
- \endgroup%
+ \begingroup%
+ \DeclareFieldFormat{bibhyperref}{##1}%
+ \csuse{blx at hook@cite}%
+ \csuse{blx at hook@citekey}%
+ \defcounter{maxnames}{\blx at maxcitenames}%
+ \usebibmacro{cite}%
+ \endgroup%
}
%-----------------------
\newbibmacro{kicklabel}{%
- \sbox\arch at labelbox{\usebibmacro{labelwidthbib}}%
- \global\togglefalse{blx at insert}%
- \ifdim.9\wd\arch at labelbox>%
- \labwidthsameline\leavevmode\newline\fi%
+ \sbox\arch at labelbox{\usebibmacro{labelwidthbib}}%
+ \global\togglefalse{blx at insert}%
+ \ifdim1.1\wd\arch at labelbox>%
+ \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}%
+ \endgroup
+}
+%-----------------------
+\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
+}
+%-----------------------
\renewbibmacro{in:}{%
- \ifthenelse{%
- \ifentrytype{article}%
- \OR%
- \ifentrytype{review}}%
- {}%
- {\printtext{\bibstring{in}\intitlepunct}}%
+ \ifthenelse{%
+ \ifentrytype{article}%
+ \OR%
+ \ifentrytype{review}}%
+ {}%
+ {\printtext{\bibstring{in}\intitlepunct}}%
}
%-----------------------
\newbibmacro*{bbx:parunit}{%
@@ -450,8 +510,8 @@
}
%-----------------------
\newbibmacro*{zenon}{%
- \iffieldundef{zenon}
- {}
+ \iffieldundef{zenon}%
+ {}%
{\usebibmacro{bbx:parunit}%
\printfield{zenon}%
}
@@ -458,8 +518,8 @@
}
%-----------------------
\newbibmacro*{jstor}{%
- \iffieldundef{jstor}
- {}
+ \iffieldundef{jstor}%
+ {}%
{\usebibmacro{bbx:parunit}%
\printfield{jstor}%
}
@@ -493,12 +553,11 @@
\iftoggle{bbx:url}{\usebibmacro{url+urldate}}{}%
}
%-----------------------
-\DeclareFieldFormat{editortype}{\mkbibparens{#1}}
- \renewbibmacro*{editor}{%
+\renewbibmacro*{editor}{%
\ifboolexpr{%
test \ifuseeditor %
and %
- not test {\ifnameundef{editor}}
+ not test {\ifnameundef{editor}}%
}%
{\printnames{editor}%
\setunit{\addspace}%
@@ -514,6 +573,15 @@
\savefield{booktitle}{\bbx at lastbooktitle}%
}
%-----------------------
+\DeclareLabeldate{%
+ \field{date}
+ \field{eventdate}
+ \field{origdate}
+ \field{urldate}
+ \field{pubstate}
+ \literal{nodate}
+}
+%-----------------------
\newbibmacro*{series}{%
\ifboolexpr{test {\iffieldundef{shortseries}} %
or bool {bbx:noabbrv}}%
@@ -549,8 +617,6 @@
\usebibmacro{journal}%
\setunit{\jourvoldelim}%
\printfield{volume}%
- %\iffieldundef{number}%
- % {}%
{\setunit{\volnumdelim}%
\printfield{number}%
}%
@@ -557,7 +623,7 @@
\newunit%
\iffieldundef{year}%
{\printfield{pubstate}}%
- {\printfield{year}}%
+{\printfield{year}}%
}
%-----------------------
\newbibmacro*{pages}{%
@@ -592,8 +658,8 @@
\bibstring{bytranslator}%keine Sprache ausgegeben?
\setunit{\addspace}%
\printnames{savedtranslator}%
- }
- }
+ }%
+ }%
}
%-----------------------
\newbibmacro*{inreference:title+author}{%
@@ -610,11 +676,11 @@
}
%-----------------------
\newbibmacro*{maintitle+title+volumes}{%
- \iffieldsequal{maintitle}{title}%
- {\clearfield{maintitle}%
- \clearfield{mainsubtitle}%
- \clearfield{maintitleaddon}%
- }%
+ \iffieldsequal{maintitle}{title}%
+ {\clearfield{maintitle}%
+ \clearfield{mainsubtitle}%
+ \clearfield{maintitleaddon}%
+ }%
{\iffieldundef{maintitle}%
{}%
{\usebibmacro{maintitle}%
@@ -660,7 +726,7 @@
\ifboolexpr{%
test {\iffieldundef{title}}%
and%
- test {\iffieldundef{subtitle}}}
+ test {\iffieldundef{subtitle}}}%
{}%
{\printtext[title]{%
\printfield[titlecase]{title}%
@@ -675,7 +741,7 @@
\ifboolexpr{%
test {\iffieldundef{booktitle}}%
and%
- test {\iffieldundef{booksubtitle}}}
+ test {\iffieldundef{booksubtitle}}}%
{}%
{\printtext[booktitle]{%
\printfield[titlecase]{booktitle}%
@@ -701,11 +767,6 @@
\printfield{maintitleaddon}%
}
%-----------------------
-\newbibmacro*{Erstauflage}{%
- \bibstring{firstprint}%
- \setunit{\addcolon\addspace}%
-}
-%-----------------------
\newbibmacro*{edition}{%
\iffieldint{edition}%
{\setunit*{\addspace}%
@@ -717,67 +778,69 @@
}
%-----------------------
\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}%
- \iffieldundef{year}%
- {\printfield{pubstate}}%
- {\printfield{year}}%
- \setunit*{\addspace}%
- \ifboolexpr{%
- test {\iflistundef{origlocation}}%
- and test {\iflistundef{origpublisher}}%
- and test {\iffieldundef{origyear}}}%
- {}%
- {\printtext[parens]{%\usebibmacro{Erstauflage}%
- \printlist{origlocation}%
- \iflistundef{origpublisher}%
- {}%
- {\setunit*{\addcolon\addspace}%
- \printlist{origpublisher}%
+ \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}%
+ \iffieldundef{year}%
+ {\printfield{pubstate}}%
+ {\printfield{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}%
+ \addspace%
+ }%
}%
- \setunit{\addspace}%
- \printfield{origyear}%
- }%
+ \printlist{location}%
+ \setunit*{\addspace}%
+ \iffieldundef{year}%
+ {\printfield{pubstate}}%
+ {\printfield{year}}%
+ }%
+ }%
}%
- }%
- }%
- {\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}%
-\addspace%
- }%
- }%
- \printlist{location}%
- \setunit*{\addspace}%
- \iffieldundef{year}%
- {\printfield{pubstate}}%
- {\printfield{year}}%
- }%
- }%
- }%
}
%-----------------------
\renewbibmacro*{institution+location+date}{%
@@ -789,26 +852,6 @@
{\printfield{year}}%
}
%-----------------------
-\DeclareLabeldate{%http://tex.stackexchange.com/a/154367/98739
- \field{date}%
- \field{eventdate}%
- \field{origdate}%
- \field{urldate}%
- \field{pubstate}%
- \literal{nodate}%
-}
-%-----------------------
-\newbibmacro*{addendum}{}%%notwendig?
-%-----------------------
-\renewbibmacro*{addendum+pubstate}{%
- \printfield{addendum}%
- \iffieldundef{\thefield{datelabesource}year}%
- {}%
- {\newunit\newblock%
- \printfield{pubstate}%
- }%
-}
-%-----------------------
\newbibmacro{signatur}{%
\printfield{note}%
}
@@ -824,7 +867,7 @@
\iffieldundef{maintitle}%
{}%
{\usebibmacro{maintitle}%
- \iffieldundef{volume}
+ \iffieldundef{volume}%
{\setunit{\maintitlepunct}}%
{\setunit{\addspace}%
\printfield{volume}%
@@ -833,7 +876,7 @@
}%
}%
\usebibmacro{booktitle}%
- \newunit
+ \newunit%
}
%-----------------------
\newbibmacro*{booktitle+volume+editor}{%
@@ -879,18 +922,16 @@
}
%-----------------------
\DeclareBibliographyDriver{shortjournal}{%
- \printtext[journaltitle]{%
- \printfield[titlecase]{journaltitle}%
- \setunit{\subtitlepunct}%
- \printfield[titlecase]{journalsubtitle}%
- }%
-}
+ \printtext[journaltitle]{%
+ \printfield[titlecase]{journaltitle}%
+ \setunit{\subtitlepunct}%
+ \printfield[titlecase]{journalsubtitle}}%
+ \blx at initunit}
%-----------------------
\DeclareBibliographyDriver{shortseries}{%
- \printtext[seriestitle]{%
- \printfield[titlecase]{series}%
- }%
-}
+ \printtext[seriestitle]{%
+ \printfield[titlecase]{series}}%
+ \blx at initunit}
%-----------------------
\DeclareDataInheritance{reference}{inreference}{%
\inherit{shorthand}{booktitle}%
@@ -917,9 +958,9 @@
\usebibmacro{pages}%
\setunit{\addspace}%
\usebibmacro{doi+eprint+url}%
- \newunit\newblock%
- \setunit{\bibpagerefpunct}%
\newblock%
+ \usebibmacro{signatur}%
+ \newblock%
\usebibmacro{pageref}%
\newunit\newblock%
\iftoggle{bbx:related}%
@@ -967,7 +1008,7 @@
\DeclareBibliographyDriver{thesis}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author/editor}
+ \usebibmacro{author/editor}%
\setunit*{\labelnamepunct}%
\newblock%
\usebibmacro{title}%
@@ -979,11 +1020,11 @@
\usebibmacro{doi+eprint+url}%
\setunit*{\addperiod\addspace}%
\usebibmacro{signatur}%
- \newunit\newblock
- \iftoggle{bbx:related}
+ \newunit\newblock%
+ \iftoggle{bbx:related}%
{\usebibmacro{related:init}%
\usebibmacro{related}%
- }
+ }%
{}%
\usebibmacro{savestuff}%
\usebibmacro{finentry}%
@@ -1027,7 +1068,7 @@
%-----------------------
\DeclareBibliographyDriver{inproceedings}{%
\usebibmacro{bibindex}%
- \usebibmacro{begentry}%%
+ \usebibmacro{begentry}%
\usebibmacro{author/editor}%
\setunit*{\labelnamepunct}%
\newblock%
@@ -1077,7 +1118,7 @@
\newunit\newblock%
\bibstring{talk}%
\setunit{\addspace}%
- \printdate
+ \printdate%
\newunit\newblock%
\printlist{institution}%
\newunit\newblock%
@@ -1150,13 +1191,12 @@
\printfield[parens]{year}%
\setunit{\addspace}%
\usebibmacro{pages}%
- \usebibmacro{inreference:title+author}
- \setunit*{\addspace}%
- \usebibmacro{addendum}%
+ \usebibmacro{inreference:title+author}%
+ \newunit\newblock%
\usebibmacro{doi+eprint+url}%
\setunit{\addperiod\addspace}%
\usebibmacro{signatur}%
- \newunit\newblock
+ \newunit\newblock%
\usebibmacro{savestuff}%
\usebibmacro{finentry}%
}
@@ -1186,19 +1226,32 @@
}
%-----------------------
\defbibenvironment{bibliography}%
- {\list%
- {\usebibmacro{labelwidthbib}}%
- {\setlength{\labelwidth}{\labwidthsameline}
- \setlength{\leftmargin}{\labelwidth}%
- \setlength{\labelsep}{\biblabelsep}%
- \addtolength{\leftmargin}{\labelsep}%
- \setlength{\itemsep}{\bibitemsep}%
- \setlength{\parsep}{\bibparsep}%
- \renewcommand*{\makelabel}[1]{##1\hss}%
- }%
- }%
- {\endlist}%
- {\item%
- \usebibmacro{kicklabel}%
- }
+ {\list%
+ {\usebibmacro{labelwidthbib}}%
+ {\setlength{\labelwidth}{\labwidthsameline}%
+ \setlength{\leftmargin}{\labelwidth}%
+ \setlength{\labelsep}{\biblabelsep}%
+ \addtolength{\leftmargin}{\labelsep}%
+ \setlength{\itemsep}{\bibitemsep}%
+ \setlength{\parsep}{\bibparsep}%
+ \renewcommand*{\makelabel}[1]{##1\hss}}}%
+ {\endlist}%
+ {\item\usebibmacro{kicklabel}}
+ %-----------------------
+\def\do#1{%
+ \defbibenvironment{#1}
+ {\list%
+ {\printfield{#1}}%
+ {\setlength{\labelwidth}{\labwidthsameline}%
+ \setlength{\leftmargin}{\labelwidth}%
+ \setlength{\labelsep}{\biblabelsep}%
+ \addtolength{\leftmargin}{\labelsep}%
+ \setlength{\itemsep}{\bibitemsep}%
+ \setlength{\parsep}{\bibparsep}%
+ \renewcommand*{\makelabel}[1]{####1\hss}}}
+ {\endlist}
+ {\item\usebibmacro{kicklabelfield}{#1}}%
+}
+\docsvlist{shortjournal,shortseries}
+
\endinput
\ No newline at end of file
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx 2016-07-30 23:09:29 UTC (rev 41770)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx 2016-07-30 23:09:45 UTC (rev 41771)
@@ -26,8 +26,8 @@
{\listcsxadd{cbx at fseen@names}{#1}}
{\listcsxadd{cbx at tseen@names}{#1}}}
\newrobustcmd*{\cbx at ifnameseen}[1]{%
- \iftoggle{blx at footnote}
- {\xifinlistcs{#1}{cbx at fseen@names}}
+ \iftoggle{blx at footnote}%
+ {\xifinlistcs{#1}{cbx at fseen@names}}%
{\xifinlistcs{#1}{cbx at tseen@names}}}
\renewcommand*{\multicitedelim}{\addsemicolon\addspace}
@@ -43,21 +43,22 @@
}
%-----------------------
\DeclareBibliographyOption{yearinparens}[true]{%
- \ifstrequal{#1}{true}
- {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}
- \csuse{bool#1}{cbx:yearinparens}}
- {\DeclareFieldFormat{citeyear}{##1}}}
+ \ifstrequal{#1}{true}%
+ {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}%
+ \csuse{bool#1}{cbx:yearinparens}}%
+ {\DeclareFieldFormat{citeyear}{##1}}}%
\DeclareBibliographyOption{seenote}[true]{\csuse{bool#1}%
{cbx:seenote}%
\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}
- {The option you have supplied is invalid.\MessageBreak
- Use one of the values 'initials', 'full', 'family' or 'firstfull'.}}}
+ \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}%
+}
%-----------------------
\DeclareFieldFormat{citeyear}{#1}
\DeclareFieldFormat{prenote}{#1\isdot}
@@ -153,34 +154,37 @@
\def\cbx at arch@citeauthorformat at initials{%
\DeclareNameAlias{citeauthor}{name:initials}}
+ \DeclareNameFormat{citeauthor:fancy}{%
+ \cbx at ifnameseen{\thefield{hash}}
+ {\ifnum\value{uniquename}=2
+ \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}}%
+ \fi}
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
+ \cbx at nameseen{\thefield{hash}}}%
+ \usebibmacro{name:andothers}}
+
\def\cbx at arch@citeauthorformat at firstfull{%
- \DeclareNameFormat{citeauthor}{%
- \cbx at ifnameseen{\thefield{hash}}
- {\ifnum\value{uniquename}=2%
- \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}}}
- {\usebibmacro{name:given-family}
- {\namepartfamily}
- {\namepartgiven}
- {\namepartprefix}
- {\namepartsuffix}%
- \cbx at nameseen{\thefield{hash}}}%
- \usebibmacro{name:andothers}}}
+ \DeclareNameAlias{citeauthor}{citeauthor:fancy}}
%-----------------------
\ExecuteBibliographyOptions{%
citetracker=true,%
@@ -294,7 +298,7 @@
{\usebibmacro{cite:labelyear+extrayear}}}%
{\usebibmacro{cite}}}
%-----------------------
-\newbibmacro*{textcite}{%aus authoryear
+\newbibmacro*{textcite}{%
\ifnameundef{labelname}%
{\iffieldundef{shorthand}%
{\usebibmacro{cite:label}%
@@ -355,7 +359,7 @@
test{\ifentrytype{inreference}}%
}{}{\usebibmacro{postnote}}}%
%-----------------------
-\DeclareCiteCommand{\textcite}%aus authoryear
+\DeclareCiteCommand{\textcite}%
{\boolfalse{cbx:yearinparens}%
\usebibmacro{prenote}%
}%
@@ -384,11 +388,11 @@
}{}{\usebibmacro{postnote}}}%
%-----------------------
\DeclareMultiCiteCommand{\cites}%
- {\cite}{\multicitedelim}
+ {\cite}{\multicitedelim}%
\DeclareMultiCiteCommand{\parencites}[\mkbibparens]%
- {\parencite}{\multicitedelim}
- \DeclareMultiCiteCommand{\textcites}%
- {\textcite}{\textcitedelim}
+ {\parencite}{\multicitedelim}%
+\DeclareMultiCiteCommand{\textcites}%
+ {\textcite}{\textcitedelim}%
%-----------------------
\DeclareCiteCommand{\citeauthor}
{\boolfalse{citetracker}%
@@ -398,8 +402,8 @@
\ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
\addspace\bibstring{and}\space}%
\usebibmacro{prenote}}%
- {\ifciteindex
- {\indexnames{labelname}}
+ {\ifciteindex%
+ {\indexnames{labelname}}%
{}%
\ifboolexpr{%
test {\ifbool{bbx:inreferences}}%
@@ -407,9 +411,9 @@
test {\ifentrytype{inreference}}%
}%
{\printtext}%
- {\printtext[bibhyperref]}
- {\printnames[citeauthor]{labelname}}}
- {\multicitedelim}
+ {\printtext[bibhyperref]}%
+ {\printnames[citeauthor]{labelname}}}%
+ {\multicitedelim}%
{\usebibmacro{postnote}}
%-----------------------
\DeclareCiteCommand{\citetitle} %
More information about the tex-live-commits
mailing list