5 files changed, 83 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/latex/archaeologie/README.md b/Master/texmf-dist/doc/latex/archaeologie/README.md
index b9127c941dc..ebf812d0edf 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/README.md
+++ b/Master/texmf-dist/doc/latex/archaeologie/README.md
@@ -5,7 +5,7 @@ bibLaTeX-__archaeologie__
 
 bibLaTeX-style for archaeologists, historians and philologists.
 ---
-_2018/02/13 v2.3.5_
+_2018/02/20 v2.3.6_
 
 
 Copyright (c) 2016-2018 Lukas C. Bossert | Johannes Friedl
@@ -65,10 +65,28 @@ additional lists and bibliographies:
 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/).
+## v2.3.6 (2018-02-20) 
+
+### *Added*
+* `citeauthorformat=firstinitialsthenfamily` as requested in
+[#138](https://github.com/LukasCBossert/biblatex-archaeologie/issues/138), 
+* `citeauthorformat=firstfullthenfamily` 
+
+### *Changed*
+* `jstor=false` by default, since it is no part of the guidelines
+* `lstabbrv=true` by default
+* `lstlocations=true` by default
+* `lstpublishers=true` by default
+* `citeauthorformat=firstfull` is now called `citeauthorformat=firstfulltheninitials`
+
+### *Fixed*
+* wrong entry with `\archaeologieoptions` deleted
+* labeldates now work correctly
+
 
 ## v2.3.5 (2018-02-13) --> [current release]
 
-#### *fixed*
+### *Fixed*
 * `\citereset` for author names (https://github.com/LukasCBossert/biblatex-archaeologie/issues/122)
 * `\citetitle` will give the original title of a work which has the option `ancient`; 
 `\citetitle*` instead will always give title without year.
@@ -76,13 +94,13 @@ The markdown syntax is inspired by the conventions proposed by [keepachangelog.c
 * `volume`/`volumes` are now shown for `book` etc.
 * `daterange` for a sequence of two years (now delimited by `\`)
 * Short-journal for `Archaeologia` 
-#### *changed*
+### *Changed*
 * `volume` is now automatically a Roman numeral for `book`, `inbook`, `collection`, `incollection`, `proceedings`, `inproceedings`, you only insert the Arabic number.
 
 ## v2.3.4 (2017-11-19)
 This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`.
 
-#### *fixed*
+### *Fixed*
 * Arrangement of multiple authors with `\textcites`; see
 [#115](https://github.com/LukasCBossert/biblatex-archaeologie/issues/115), solved with [https://tex.stackexchange.com/a/387162/98739](https://tex.stackexchange.com/a/387162/98739)
 * Delimiter of `subtitle` and `titleaddon`, it is now a comma instead of fullstop.
diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf
index ee9312a75e5..4c63541dd87 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf
+++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf
diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex
index 2e7f7dfdd9a..80f76c355d1 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex
+++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex
@@ -106,9 +106,14 @@ Vornameinitial und Nachname, (bspw. L. F. Ball)\\
 voller Vor- und Nachname (bspw. Larry F. Ball),\\
 \DescribeMacro{=family}% \meta{family} 
 nur Nachname (bspw. Ball), \\
-\DescribeMacro{=firstfull}%\meta{firstfull} 
-voller Vor- und Zuname bei Erstnennung (bspw. Larry F. Ball), 
-weitere Erwähnungen werden mit Vornameinitial und Nachname ausgegeben (bspw. L. F. Ball).
+\DescribeMacro{=firstfulltheninitials}%\meta{firstfull} 
+voller Vor- und Zuname bei Erstnennung (bspw. Larry F. Ball) dann abgekürzt,\\
+\DescribeMacro{=firstfullthenfamily}\archversion{2.3.6}%\meta{firstfull} 
+voller Vor- und Zuname bei Erstnennung (bspw. Larry F. Ball) dann nur Nachname,\\
+\DescribeMacro{=firstinitialsthenfamily}\archversion{2.3.6}%\meta{firstfull} 
+abgekürzter Vorname bei Erstnennung (bspw. L. F. Ball),
+dann nur noch Nachname.
+
 
 \DescribeMacro{scshape}  Die Namen im Fließtext und in den Fußnoten werden in Kapitälchen gesetzt, ausgenommen sind Werke unbekannter Herkunft und Werke antiker Autoren.
 
@@ -192,14 +197,14 @@ Je nach Verwendung wird entweder nur der Titel oder der Autor eines Bibliographi
 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{\citetitle*}
-  \rmarginpar{2.3.4} 
+  \archversion{2.3.4} 
   Damit wird nur der Titel ohne das Erscheinungsjahr ausgegeben.
   
-\DescribeMacro{\citetranslator}\rmarginpar{2.3.0}  Zusätzlich gibt es noch die Möglichkeit den Übersetzer eines (insbesondere) antiken Werkes anzugeben. 
+\DescribeMacro{\citetranslator}\archversion{2.3.0}  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*} \rmarginpar{2.3.0} Die Sternchen-Variante gibt zusätzlich noch die Sprache an, 
+ \DescribeMacro{\citetranslator*} \archversion{2.3.0} Die Sternchen-Variante gibt zusätzlich noch die Sprache an, 
  aus der übersetzt wurde.
  
 \section{Publikationstypen}
diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf
index af8f0c9d538..abcc4956b6d 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf
+++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf
diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex
index 8cb9256ce6a..38f1ea18240 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex
+++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex
@@ -135,9 +135,15 @@ of several publishers which can be used to easily print out their names; cf. \cr
 \DescribeMacro{bibfullname}
 In the bibliography full names of authors and/or editors are shown; cf. \cref{bibfullname}.
 
-\DescribeMacro{citeauthorformat}
+\DescribeMacro{citeauthorformat}\archversion{2.3.6}
 You can chose how the name of authors or editors are displayed within your text when they are cited with \cs{citeauthor}\marg{bibtex-key}.
-You can chose between the options \meta{initials}, \meta{full}, \meta{family}, \meta{firstfull}; 
+You can chose between the options 
+\meta{initials}, 
+\meta{full}, 
+\meta{family}, 
+\meta{firstfulltheninitials},
+\meta{firstinitialsthenfamily},
+\meta{firstfullthenfamily}; 
 cf. \cref{citeauthorformat}.
 
 
@@ -807,12 +813,14 @@ By activating |yearseries| it will change to:
 \parbox[t]{1.7cm}{Mundt 2015} \parbox[t]{9cm}{F. Mundt, Der Mensch, das Licht und die Stadt. Rhetorische Theorie und Praxis antiker und humanistischer Städtebeschreibung, in: T. Fuhrer -- F. Mundt -- J. Stenger (ed.), Cityscaping. Constructing and Modelling Images of the City (Berlin 2015) {\color{red}Philologus Suppl. 3,} 179–206}
 \end{bibbox}
 
-\subsubsection{citeauthorformat}\label{citeauthorformat}
+\subsubsection{citeauthorformat}\label{citeauthorformat}\archversion{2.3.6}
 \DescribeMacro{citeauthorformat}
 \DescribeMacro{=initials}
 \DescribeMacro{=full}
 \DescribeMacro{=family}
-\DescribeMacro{=fistfull}
+\DescribeMacro{=firstfulltheninitials}
+\DescribeMacro{=firstinitialsthenfamily}
+\DescribeMacro{=firstfullthenfamily}
 Every time you mention authors in the running text it is possible to cite them 
 directly with their names (\cs{citeauthor}\marg{bibtex-key}) or their works  (\cs{citetitle}\marg{bibtex-key});
 this has the benefit that they will be linked to your bibliography (cf. \cref{citeauthor}).
@@ -854,35 +862,55 @@ Or you can change it using the settings in the preamble:
 \begin{tcolorbox}[examplebox]
  |citeauthorformat=full| 
  \tcblower
-\ldots , this is also shown by {\color{red}Rainer Michael Boehmer  und Nadja Wrede} in their latest article \emph{Astragalspiele in und um Warka} (1985).
+\ldots , this is also shown by {\color{red}Rainer Michael Boehmer and Nadja Wrede} in their latest article \emph{Astragalspiele in und um Warka} (1985).
 \end{tcolorbox}
 \item\label{name:family}
 \begin{tcolorbox}[examplebox]
  |citeauthorformat=family| 
  \tcblower
-\ldots , this is also shown by {\color{red}Boehmer und  Wrede} in their latest article \emph{Astragalspiele in und um Warka} (1985).
+\ldots , this is also shown by {\color{red}Boehmer and  Wrede} in their latest article \emph{Astragalspiele in und um Warka} (1985).
 \end{tcolorbox}
-\item\label{name:firstfull}
+\item\label{name:firstfulltheninitials}
 \begin{tcolorbox}[examplebox]
- |citeauthorformat=firstfull| 
+ |citeauthorformat=firstfulltheninitials|
  \tcblower
-\ldots , this is also shown by {\color{red}Rainer Michael Boehmer  und Nadja Wrede} in their latest article \emph{Astragalspiele in und um Warka} (1985).
+\ldots , this is also shown by \textcolor{red}{Rainer Michael Boehmer  and Nadja Wrede} in their latest article \emph{Astragalspiele in und um Warka} (1985). 
+\textcolor{red}{R. M. Boehmer  and N. Wrede} argue that \ldots
 \end{tcolorbox}
-\end{enumerate}
+  If you use |citeauthorformat=firstfulltheninitials| the first citation will look like \ref{name:firstfull}, but after that that all following citations of |\citeauthor{Boehmer1985}| will change to the default behaviour and show the initials.
+  
+\item\label{name:firstfulltheninitials}
+\begin{tcolorbox}[examplebox]
+ |citeauthorformat=firstfullthenfamily|
+ \tcblower
+\ldots , this is also shown by \textcolor{red}{Rainer Michael Boehmer  and Nadja Wrede} in their latest article \emph{Astragalspiele in und um Warka} (1985). 
+\textcolor{red}{Boehmer  and Wrede} argue that \ldots
+\end{tcolorbox}
+ If you use |citeauthorformat=firstfullthenfamily| the first citation will look like \ref{name:firstfull}, but after that that all following citations of |\citeauthor{Boehmer1985}| will change and only show the family name(s), \ref{name:family}.
+
 
+\item\label{name:firstinitialsthenfamily}
+\begin{tcolorbox}[examplebox]
+ |citeauthorformat=firstinitialsthenfamily|
+ \tcblower
+\ldots , this is also shown by \textcolor{red}{R. M. Boehmer  and N. Wrede} in their latest article \emph{Astragalspiele in und um Warka} (1985). 
+\textcolor{red}{Boehmer  and Wrede} argue that \ldots
+\end{tcolorbox}
 
-If you use |citeauthorformat=firstfull| the first citation will look like \ref{name:firstfull}, but after that that all following citations of |\citeauthor{Boehmer1985}| will change to the default behaviour and show the initials.
+ If you use |citeauthorformat=firstinitialsthenfamily| the first citation will look like |citeauthorformat=initials|, but after that that all following citations of |\citeauthor{Boehmer1985}| will change and only show the family name(s), \ref{name:family}.
+\end{enumerate}
 \end{refsection}
 
 To complete this example,
 here is the appearence of the entry in a bibliography:
-\printbib[9em]{Boehmer1985}
+\printbib[9.5em]{Boehmer1985}
 
 
 Two things are left to mention: 
 \begin{enumerate}
-\item Citing an author in a footnote always prints  last names, no matter which citing option is chosen. 
-\item There is a slightly different behaviour if you use  \cs{citeauthor} or \cs{citetitle}  with ancient authors and work titles (|options={ancient}|).
+\item Citing an author in a footnote will start again with a first mention and then continue writing the name depending on your chosen option.
+
+\item There is a slightly different behavior if you use  \cs{citeauthor} or \cs{citetitle}  with ancient authors and work titles (|options={ancient}|).
 Instead of printing the field |author| which contains usually the full ancient name the field |shortauthor| is considered in which you can record the more common name of the ancient author.
 Ancient work titles will be printed without the year in parentheses. 
 Both are demonstrated in the following example: Based on the bibliography entry
@@ -2522,10 +2550,18 @@ It will list all options used:
 \archaeologieoptions
 \end{example}
 \end{otherlanguage}
+\begin{example}
+\archaeologieoptions
+\end{example}
 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{example}
 \archaeologieoptions[plain]
 \end{example}
+\begin{otherlanguage}{ngerman}
+\begin{example}
+\archaeologieoptions[plain]
+\end{example}
+\end{otherlanguage}
 
 You can print the version of this style with |\archaeologieversion| 
 \begin{example}