texlive[41595] Master/texmf-dist: archaeologie (1jul16)
commits+karl at tug.org
commits+karl at tug.org
Sat Jul 2 00:03:13 CEST 2016
Revision: 41595
http://tug.org/svn/texlive?view=revision&revision=41595
Author: karl
Date: 2016-07-02 00:03:12 +0200 (Sat, 02 Jul 2016)
Log Message:
-----------
archaeologie (1jul16)
Modified Paths:
--------------
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-ngerman.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
Modified: trunk/Master/texmf-dist/doc/latex/archaeologie/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/archaeologie/README.md 2016-07-01 22:02:58 UTC (rev 41594)
+++ trunk/Master/texmf-dist/doc/latex/archaeologie/README.md 2016-07-01 22:03:12 UTC (rev 41595)
@@ -5,7 +5,7 @@
bibLaTeX-style for archaeologists, historians and philologists.
---
-_2016/06/06 v2.0_
+_2016/07/04 v2.01_
Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
@@ -12,7 +12,7 @@
Email: [lukas at digitales-altertum.de](mailto:lukas at digitales-altertum.de)
This citation-style covers the citation and bibliography rules of
-the __German Archaeological Institute__.
+the [__German Archaeological Institute__ (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)
@@ -19,7 +19,7 @@
---
*Der Stil setzt die Zitations- und Bibliographievorgaben
-des __Deutschen Archäologischen Instituts (DAI)__ (Stand 2014) um.
+des [__Deutschen Archäologischen Instituts (DAI)__ ](http://www.dainst.org/dai/meldungen) (Stand 2014) um.
Verschiedene zusätzliche Optionen erlauben das Erscheinungsbild
jedoch auch zu verändern, um eigenen Vorlieben anzupassen.*
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-01 22:02:58 UTC (rev 41594)
+++ trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex 2016-07-01 22:03:12 UTC (rev 41595)
@@ -52,8 +52,8 @@
\begin{lstlisting}
\usepackage[style=archaeologie,%
- <@\meta{weitere Optionen}@>]{biblatex}
-\bibliography<@\marg{|bib|-Datei}@>
+ *@\meta{weitere Optionen}@*]{biblatex}
+\bibliography*@\marg{|bib|-Datei}@*
\end{lstlisting}
|archaeologie| funktioniert out-of-the-box und lädt hierfür standardmäßig den DAI-Stil im Autor-Jahr-System.
@@ -101,10 +101,21 @@
\DescribeMacro{bibfullname} Schreibt die Autoren/Herausgeber mit vollem Namen in die Bibliographie. Standard ist sonst die Abkürzung der Vornamen.
-\DescribeMacro{fullnames} Schreibt die Autoren/Herausgeber, die über \cs{citeauthor}\-\marg{bibtex-key} im Fließtext aufgerufen werden, mit vollem Vor- und Nachnamen -- sofern diese im Bibliographieeintrag vorhanden sind.
-
-\DescribeMacro{lastnames} Schreibt die Autoren/Herausgeber, die über \cs{citeauthor}\-\marg{bibtex-key} im Fließtext aufgerufen werden, nur mit Nachnamen (dies entspricht der Autoren-Darstellungweise in Fußnoten).
-
+\DescribeMacro{citeauthorformat}
+Mit dieser Textoption kann man entscheiden,
+wie Autoren/Herausgeber, die über \cs{citeauthor}\-\marg{bibtex-key} im Fließtext aufgerufen werden,
+ausgegeben werden sollen.
+Vier Optionen stehen dafür zur Verfügung:\\
+\DescribeMacro{=initials}%\meta{initials}
+Vornameinitial und Nachname, (bspw. L. F. Ball)\\
+\DescribeMacro{=full}% \meta{full}
+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).
+%%(dies entspricht der Autoren-Darstellungweise in Fußnoten).
\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.
\subsubsection{Zitierweise}
@@ -150,13 +161,13 @@
\subsection{Zitierbefehle}\label{cite_commands}
\DescribeMacro{\cite} Die einfachste Art zu zitieren ist der Befehl \cs{cite}:
\begin{lstlisting}
-\cite<@\oarg{prenote}\oarg{postnote}\marg{bibtex-key}%@>
+\cite*@\oarg{prenote}\oarg{postnote}\marg{bibtex-key}%@*
\end{lstlisting}
Dabei ist \meta{prenote} eine einleitende Bemerkung (z.\,B. \enquote{Vgl.}), \meta{postnote} enthält für gewöhnlich die Seitenzahl.
Wird nur ein optionales Argument gegeben, so ist das die Seitenzahl:
\begin{lstlisting}
-\cite<@\oarg{postnote}\marg{bibtex-key}%@>
+\cite*@\oarg{postnote}\marg{bibtex-key}%@*
\end{lstlisting}
\meta{bibtex-key} ist der Schlüssel des Bibliographieeintrags aus der |bib|-Datei (\emph{entrykey}).
@@ -163,9 +174,9 @@
\DescribeMacro{\cites} Möchte man mehrere Autoren/Werke zugleich zitieren, eignet sich am besten der \cs{cites}-Befehl:
\begin{lstlisting}
-\cites(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@>
+\cites(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{lstlisting}
\DescribeMacro{\parencite} \DescribeMacro{\parencites} Soll die Literaturangabe (bspw. in den Fußnoten) in Klammern erscheinen, dann empfiehlt sich dies mittels \cs{parencite} zu tun.
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-01 22:02:58 UTC (rev 41594)
+++ trunk/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex 2016-07-01 22:03:12 UTC (rev 41595)
@@ -42,7 +42,7 @@
\begin{document}
\title{\texttt{archaeologie} -- \\\texttt{bib\LaTeX} for archaeologists\footnote{Also very handy as well for (ancient) History or Classics.
The development of the code is done at \url{https://github.com/LukasCBossert/biblatex-archaeologie}:
-Comments and critics are welcome.
+Comments and criticisms are welcome.
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}
@@ -88,7 +88,7 @@
%%introduction from biblatex-dw copied and applied. might to be rewritten.
\section{Usage}
- \DescribeMacro{archaeologie} The name of the bib\LaTeX-style is |archaeologie| has to be activated in the preamble.
+ \DescribeMacro{archaeologie} The name of the bib\LaTeX-style is |archaeologie| which has to be activated in the preamble.
\begin{lstlisting}
\usepackage[style=archaeologie,%
@@ -96,24 +96,25 @@
\bibliography*@\marg{|bib|-file}@*
\end{lstlisting}
-Without any further options the style covers now the rules of the German Archaeological Institute. 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}.}
+Without any further options the style follows the rules of the German Archaeological Institute.
+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}.}
At the end of your document you can write the command |\printbibliography| to print
the bibliography.
-Since |archaeologie| supports different citations of various texts like from ancient authors and from modern scholars we suggest to have them listed in separated bibliographies.
-Further information are found below (\cref{bibliographie}).
+Since |archaeologie| supports different citations of various texts such as those of ancient authors and modern scholars we suggest having them listed in separate bibliographies.
+Further information can be found below (\cref{bibliographie}).
\section{Overview}\label{overview}
-Following there is a quick overview of possible options of the style |archaeologie|.
+There follows a quick overview of possible options of the style |archaeologie|.
Contrary to the alphabetically ordered description later (\cref{options-description}) they here are listed by topic.
-Furthermore you can -- at your own risk -- also use the conventional |bib|\LaTeX-options which are related of indent, etc.
+Furthermore you can -- at your own risk -- also use the conventional |bib|\LaTeX-options relating to indent, etc.
For that please see the excellent documentation of |bib|\LaTeX.
\subsection{Preamble options}\label{preamble_options}
\subsubsection{Additional bibliographies and macro lists}
\DescribeMacro{bibancient}A separate bibliography-file is loaded, in which round about
-600 ancient authors and works are listed and can be cited right away cf. \cref{bibancient}.
+600 ancient authors and works are listed and can be cited right away; cf. \cref{bibancient}.
\DescribeMacro{bibcorpora}
A separate bibliography-file is loaded, in which the common corpora for ancient studies are stored cf. \cref{bibcorpora}.
@@ -122,89 +123,89 @@
\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}.
+German Archaeological Institute which can be used as |@String| macros in bibliography entries; cf. \cref{abbrv}.
\DescribeMacro{lstlocations}
Activates the additional bibliography file |archaeologie-lstlocations.bib|
-with |@String| macros of locations which can be used to automatically print out their correct exonym in the selected language cf. \cref{lstlocations}.
+with |@String| macros of locations which can be used to automatically print out their correct exonym in the selected language; cf. \cref{lstlocations}.
\DescribeMacro{lstpublishers}
Activates the additional bibliography file |archaeologie-lstpublishers.bib| with |@String| macros
-of several publishers which can be used to easily print out their names cf. \cref{lstpublishers}.
+of several publishers which can be used to easily print out their names; cf. \cref{lstpublishers}.
\subsubsection{Notation of names}
\DescribeMacro{bibfullname}
-In the bibliography full names of authors and/or editors are shown cf. \cref{bibfullname}.
+In the bibliography full names of authors and/or editors are shown; cf. \cref{bibfullname}.
-\DescribeMacro{fullnames}
-Writes only first and family names of authors or editors when they are cited with \cs{citeauthor}\marg{bibtex-key} cf. \cref{fullnames}.
+\DescribeMacro{citeauthorformat}
+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};
+cf. \cref{citeauthorformat}.
+
+
\DescribeMacro{initials}
-First names are abbreviated keeping digraphs and trigraphs cf. \cref{initials}.
+First names are abbreviated keeping digraphs and trigraphs; cf. \cref{initials}.
-\DescribeMacro{lastnames}
-Writes only family names of authors or editors when they are cited with \cs{citeauthor}\marg{bibtex-key}.
-In footnotes this is default cf. \cref{lastnames}.
-
\DescribeMacro{scshape}
Cited names are shown with small capital letters cf. \cref{scshape}.
-Bibliography entries with |option={ancient}| or |option={frgancient}| (\cref{ancient,frgancient}) are not touched by this option.
+Bibliography entries with |option={ancient}| or |option={frgancient}| (\cref{ancient,frgancient}) are not affected by this option.
\subsubsection{Manner of citing}
\DescribeMacro{edby}
-Switches \enquote{ed.}/\enquote{Hrsg.} to \enquote{ed. by}/\enquote{hrsg. v.} cf. \cref{edby}.
+Switches \enquote{ed.}/\enquote{Hrsg.} to \enquote{ed. by}/\enquote{hrsg. v.}; cf. \cref{edby}.
\DescribeMacro{inreferences}
-Each bibliography entry which is a |@Inreference| is fully referenced according to the special rules of the
-German Archaeological Institute for manuals and encyclopaedias cf. \cref{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}.
\DescribeMacro{noabbrv}
By default the short titles of journals and series (|shortjournal| and |shortseries|) are shown in the bibliography.
-With this option full titles are printed instead (|journaltitle| and |series|) cf. \cref{noabbrevs}.
+With this option full titles are printed instead (|journaltitle| and |series|); cf. \cref{noabbrevs}.
\DescribeMacro{publisher}
All locations and the publisher is shown.
-It also changes the format of the edition and the first print cf. \cref{publisher}.
+It also changes the format of the edition and the first print; cf. \cref{publisher}.
\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).
-So the first citation will be a full citation and all the following citations will refer to the first full citation cf. \cref{seenote}
+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}
Original title, translator and original language are shown in the bibliography.
-Setting a bibliography entry to |option={ancient}| this behaviour is default cf. \cref{translation}.
+Setting a bibliography entry to |option={ancient}| this behaviour is default; cf. \cref{translation}.
\DescribeMacro{yearinparens}
-The year is shown in parens cf. \cref{yearinparens}.
+The year is shown in parentheses; cf. \cref{yearinparens}.
\DescribeMacro{yearseries}
-Switches the order of series and year cf. \cref{yearseries}.
+Switches the order of series and year; cf. \cref{yearseries}.
\subsubsection{Global bibliography settings}
\DescribeMacro{width}
-|width={value}| defines the bibliography width between label and reference cf. \cref{width}.
+|width={value}| defines the bibliography width between label and reference; cf. \cref{width}.
\DescribeMacro{counter}
-Reveals at the end of each reference a summary of citations in the text cf. \cref{counter}.
+Reveals at the end of each reference a summary of citations in the text; cf. \cref{counter}.
\subsection{Entry Options}
A single bibliography entry can contain a value in its |options|-field.
-Depending on the option it changes the behaviour how that entry is cited cf. \cref{options-bibentry,beispiele}.
+Depending on the option it changes the behaviour of how that entry is cited; cf. \cref{options-bibentry,beispiele}.
Beside their distinct properties all of these options have in common that the separating comma between citation and page record is missing.
Actually this concerns citation of ancient texts and corpora where usually the |shorthand|-field is printed in citations.
\DescribeMacro{ancient}
-The entry is an ancient source (e.\,g. Cicero, Plutarch, etc) cf. \cref{ancient}.
+The entry is an ancient source (e.\,g. Cicero, Plutarch, etc); cf. \cref{ancient}.
\DescribeMacro{frgancient}
-The entry is a fragmented ancient source (e.\,g. Festus) cf. \cref{frgancient}.
+The entry is a fragmentary ancient source (e.\,g. Festus); cf. \cref{frgancient}.
\DescribeMacro{corpus}
Only the |shorthand|-field is printed.
-This is needed especially for corpora of inscriptions or coins (CIL, AE, RIC, etc.) cf. \cref{corpus}.
+This is needed especially for corpora of inscriptions or coins (CIL, AE, RIC, etc.); cf. \cref{corpus}.
\changes{v1.1}{2015/06/04}{New options added in summary.}
@@ -237,7 +238,7 @@
\parencite*@\oarg{postnote}\marg{bibtex-key}%@*
\end{lstlisting}
This cite command takes care of the correct corresponding parentheses and brackets.
-Especially in |@Inreference| citations the parentheses are changing to (square) brackets.
+Especially in |@Inreference| citations the parentheses change to (square) brackets.
The example shown in \cref{faq:inreference} makes it clear.
\DescribeMacro{\parencites}
@@ -252,7 +253,7 @@
\DescribeMacro{\textcite}
Beside the listed \cs{cite} commands above there is a third way of citing:
\cs{textcite} is useful if the author should be mentioned in the text and
-the remaining components like year and page will immediately follow in parentheses.
+the remaining components such as year and page will immediately follow in parentheses.
\begin{lstlisting}
\textcite*@\oarg{postnote}\marg{bibtex-key}%@*
\end{lstlisting}
@@ -266,7 +267,7 @@
\end{lstlisting}
\DescribeMacro{\citeauthor}\DescribeMacro{\citetitle}\label{citeauthor}%
-Furthermore and additionally to the ›normal‹ \cs{cite}-commands one can also cite only the author or the work title in the text and in the footnotes.
+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{lstlisting}
\citeauthor*@\oarg{prenote}\oarg{postnote}\marg{bibtex-key}%@*
\end{lstlisting}
@@ -274,7 +275,7 @@
\begin{lstlisting}
\citetitle*@\oarg{prenote}\oarg{postnote}\marg{bibtex-key}%@*
\end{lstlisting}
-For further information cf. \cref{fullnames}.
+For further information cf. \cref{citeauthorformat}.
\subsection{Entries with @String}\label{string}
@@ -289,11 +290,11 @@
The advantage of these |@Strings| is that several bibliography entries can be defined by one globally given value.
The |@String| is loaded at begin of the |bib|-file, therefore all |@Strings| have to be previous to all other bibliography entries.
-To use this offer of simplification the bibliography fields for the title of the journal (|journaltitle|) and its short form (|shortjournal|),
-as well as the name of the series (|series|) and its shortform (|shortseries|) have to be written with a |@String|.
+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 which the |@String| (with endings |-short| for |shortjournal| or |shortseries|) are listed in the left column.
-A |@String| has to be written \emph{without} any curly brackets.\footnote{If you use \emph{JabRef} in its non-coding window,
+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|\#. JabRef converts this internally to a |@String| and omits the \# in the coding window.
\emph{BibDesk} provides such conversion as well by pressing |cmd-R| which enables direct BibTeX typing without enclosing curly brackets.}
@@ -313,7 +314,7 @@
That article appeared within a rather unusual journal,
which should be abbreviated with ›AyasofyaMüzYıl‹.
-To save the time to look for the special character and insert ›ı‹ manually
+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}
@@ -326,7 +327,7 @@
\parbox[t]{2cm}{Koyunlu 1990} \parbox[t]{9cm}{A. Koyunlu,
Die Bodenbelage und der Errichtungsort der Hagia Sophia, {\color{red}Ayasofia Müzesi yıllığı. Annual of Ayasofya Museum} 11, 1990, 147–156}
\end{bibbsp}
-Nevertheless the advantage of our abbreviation list lies in the possibility to create a separate bibliography
+Nevertheless the advantage of our abbreviation list lies in the possibility of creating a separate bibliography
with all the abbreviations of used journal titles and series (see \cref{bibliographie}) without being prone to citation differences and typing errors.
However, if a journal or a series is \emph{not} included in the list (\cref{abbrv-lists})
@@ -333,7 +334,7 @@
then this journal/series will \emph{not} be abbreviated and converted to full title in curly brackets in the respective field e.\,g. |journaltitle=|\marg{title of the journal} or |series=|\marg{name of the series}.
Therefore the field content will not be printed.
At least Bib\TeX{} gives a warning in its log which can be checked.\footnote{For example something like \enquote{\enquote{journaltitle} in entry \meta{entrykey} cannot be null, deleting it}.}
-For the following examples we use |@String| whenever it is clever and possible.
+For the following examples we use |@String| whenever it is appropriate and possible.
Lastly we want to point out that |@Strings| can also be used partly as following shows:
@@ -348,7 +349,7 @@
Each time you want to leave the |@String| environment and enter the curly bracket environment (and reverse) make use of a hash \# to concatenate elements.
\section{Details of optional preferences}\label{options-description}
-Following we give a more detailed insight into the various options of |archaeologie|
+In the following we give a more detailed insight into the various options of |archaeologie|
and show their results on the bases of concrete examples.
Changes made by these options are {\color{red}coloured in red}.
@@ -367,7 +368,7 @@
Now, manual entries don't appear in author-year-style anymore and journal/series |@string|-macros are enabled.
By the way, it doesn't matter if you write |inreferences| or |inreferences=true|.
-Each of the listed options is disabled by default even if we strongly recommend to use in particular the additional bibliographies and |@string| lists.
+Each of the listed options is disabled by default even if we strongly recommend their use in particular the additional bibliographies and |@String| lists.
All remaining options are rather a matter of taste.
Despite to the overview section (\cref{overview}) the following list is arranged in alphabetic order.
@@ -442,8 +443,8 @@
\DescribeMacro{inreferences}
One peculiarity of citation rules of the German Archaeological Institute
is the way manuals and encyclopaedias should be cited when not represented in author-year-style.
-|archaeologie| allows to cite these manuals in footnotes or text as full citation in this special manner.
-Single requirement is that the bibliography entry is an |@Inreference| (cf. \cref{inreference}).
+|archaeologie| allows you to cite these manuals in footnotes or text as full citation in this special manner.
+The single requirement is that the bibliography entry is an |@Inreference| (cf. \cref{inreference}).
An example makes it clear:
\begin{lstlisting}[style=bibentry,label=Nieddu1995,caption={{@}Inreference\{Nieddu1995,…\} }]
@@ -494,7 +495,8 @@
If you want to benefit from the above mentioned method with |@String| (cf. \cref{string})
you have to activate the option called |lstabbrv| (list of abbreviations) in the preamble.
Once activated the additional bibliography |archaeologie-lstabbrv.bib| is loaded.
-In this bibliography all abbreviations listed in \cref{abbrv-lists} are stored, for further details of usage see \cref{string}.
+In this bibliography all abbreviations listed in \cref{abbrv-lists} are stored;
+for further details of usage see \cref{string}.
\subsubsection{lstlocations}\label{lstlocations}
\DescribeMacro{lstlocations}
@@ -502,7 +504,7 @@
In that case you are not forced to change location spelling when switching the language.
(Otherwise it is necessary to adjust location names like \emph{Rome} to \emph{Rom} or \emph{Roma}
in your potentially multiple-used bibliography each time you change the language of your scientific text).
-For details on the locations list cf. \cref{list-locations}.
+For details on the locations list, cf. \cref{list-locations}.
\subsubsection{lstpublishers}\label{lstpublishers}
\DescribeMacro{lstpublishers}
@@ -509,7 +511,7 @@
Activates the additional bibliography file |archaeologie-lstpublishers.bib| with |@Strings|
of publishers which can be used to print out their correct name.
Benefits are similar to the other lists mentioned above and in \cref{string}.
-For the list cf. \cref{list-publishers}
+For the list, cf. \cref{list-publishers}
@@ -521,7 +523,7 @@
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.
-Bibliography entries with |options={ancient}| are excluded form this speciality and are cited as always.
+Bibliography entries with |options={ancient}| are excluded from this speciality and are cited as always.
You can use the cite-commands \cs{cite(s)} and \cs{parencite(s)} but \cs{textcite(s)}
will behave like \cs{cite(s)} because |seenote| actually just checks for occurrences in footnotes and does not refer to cites in running text.
@@ -555,7 +557,7 @@
For ancient texts and fragments (|options={ancient}| or |options={frgancient}|) this is default,
so they will always be printed with original title, language and translator.
-An example will be clarifying.
+An example will clarify matters:
The bibliographical entry |Lefebvre2011| contains following fields:
\begin{lstlisting}[style=bibentry,label=Lefebvre2011,caption={{@}Book\{Lefebvre2011,…\}}]
@Book{Lefebvre2011,
@@ -610,7 +612,7 @@
\subsubsection{inreferences}\label{inreferences}
\DescribeMacro{inreferences}
-There is the possibility to cite inreferences in the footnote as a full citation.
+There is the possibility to cite inreferences in the footnote as a full citations.
It is only required that the bibliography-entry is an |@Inreference| (cf. \cref{inreference}).
Another example makes it clear:
@@ -625,7 +627,7 @@
}
\end{lstlisting}
\begin{refsection}
-There are two ways of the display of |\cite{Nieddu1995}|:
+There are two ways to display |\cite{Nieddu1995}|:
\begin{enumerate}
\item by default it will give: %Nieddu 1995
\cite{Nieddu1995}
@@ -684,16 +686,19 @@
\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 Stä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{bibbsp}
-\subsubsection{fullnames / lastnames}\label{fullnames}\label{lastnames}
-\DescribeMacro{fullnames}
-\DescribeMacro{lastnames}
+\subsubsection{citeauthorformat}\label{citeauthorformat}
+\DescribeMacro{citeauthorformat}
+\DescribeMacro{=initials}
+\DescribeMacro{=full}
+\DescribeMacro{=family}
+\DescribeMacro{=fistfull}
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})
-having the benefit that they will be linked to your bibliography (cf. \cref{citeauthor}).
+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}).
By default the author's name is printed with abbreviated first name\footnote{Usually only the first letter, but setting the option |initials| to true it might change (cf. \cref{initials}).} and last name.
-If you prefer to have full names printed (in running text, not in the bibliography!) switch on the option |fullnames|.
-If you want in contrast the authors to be shorten to their last names use |lastnames|.
+If you prefer to have full names printed (in running text, not in the bibliography!) switch on the option |citeauthorformat=full|.
+If you want in contrast the authors to be shorten to their last names use |citeauthorformat=family|.
The following example illustrates it:
@@ -716,27 +721,51 @@
*@\ldots , this is also shown by @*\citeauthor{Boehmer1985}
*@ in their latest article @*\citetitle{Boehmer1985}*@.@* \end{lstlisting}
-After compiling it will look by default like this using the
-etting |fullnames| \ref{name:a} or |lastnames| \ref{name:b}:
+After compiling it will look like this,
+because the default is set |citeauthorformat=initials|
\begin{bsp}
+\ldots , this is also shown by \citeauthor{Boehmer1985}
+in their latest article \citetitle{Boehmer1985}
+\end{bsp}
+
+Or you can change it using the settings
\begin{enumerate}
-\item\label{name:a}
+\item |citeauthorformat=full| \ref{name:full}
+\item |citeauthorformat=family| \ref{name:family}
+\item |citeauthorformat=firstfull| \ref{name:firstfull}
+\end{enumerate}
+
+
+
+\begin{bsp}
+\begin{enumerate}
+\item\label{name:full}
\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).
-\item\label{name:b}
+\item\label{name:family}
\ldots , this is also shown by {\color{red}Boehmer und Wrede} in their latest article \emph{Astragalspiele in und um Warka} (1985).
+\item\label{name:firstfull}
+\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).
\end{enumerate}
\end{bsp}
+
+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:
+
+\begin{bsp}
+\ldots , this is also shown by R. M. Boehmer und N. Wrede in their latest article \emph{Astragalspiele in und um Warka} (1985).
+\end{bsp}
+
\end{refsection}
\printbib[9.5em]{Boehmer1985}
-Two things are left to be noticed:
+Two things are left to mention:
\begin{enumerate}
-\item Citing an author in a footnote prints always last names, no matter which citing option is chosen.
+\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}|).
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 is demonstrated in the following example: Based on the bibliography entry
+Ancient work titles will be printed without the year in parentheses.
+Both are demonstrated in the following example: Based on the bibliography entry
\end{enumerate}
\begin{lstlisting}[style=bibentry,label=Quint:inst,caption={{@}Book\{Quint:inst,…\} }]
@Book{Quint:inst,
@@ -1018,7 +1047,7 @@
S. Böhm – K.-V. v. Eickstedt (ed.), Ithake. Festschrift Jörg Schäfer (Würzburg 2001) $\vert$ {\scshape cited 1 time.}}
\end{bibbsp}
-If there has been more than one citations:
+If there has been more than one citation:
\begin{bibbsp}{Boehm2001}
\parbox[t]{3cm}{Böhm – Eickstedt 2001} \parbox[t]{8cm}{%
S. Böhm – K.-V. v. Eickstedt (ed.), Ithake. Festschrift Jörg Schäfer (Würzburg 2001) $\vert$ {\scshape cited 3 times.}}
@@ -1039,7 +1068,7 @@
If you intend to cite ancient authors we strongly recommend this option to you
because it enables you to cite ancient texts in the style archaeologists and
-historians are used to \emph{plus} to get entirely supported bibliography referencing.
+historians are used to \emph{plus} you get entirely supported bibliography referencing.
Let us have a look at an example:
\begin{lstlisting}[style=bibentry,label=Cic:Att,caption={{@}Book\{Cic:Att,…\} }]
@@ -1063,7 +1092,7 @@
}
\end{lstlisting}
-Instead of applying |author| and |year| as label the option |ancient| takes the field |shorthand| into account.
+Instead of applying |author| and |year| as labels the option |ancient| takes the field |shorthand| into account.
So you write in your text
\begin{lstlisting}
@@ -1076,7 +1105,7 @@
\cite[1, 3,3]{Cic:Att}
\end{bsp}\end{refsection}
-Equally the field |shorthand| is used as label in the bibliography instead of an author-year label:
+Equally the field |shorthand| is used as a label in the bibliography instead of an author-year label:
\printbib{Cic:Att}
Take notice how |options={ancient}| treats editor and translator in this example.
@@ -1113,7 +1142,7 @@
\subsubsection{frgancient}\label{frgancient}
\DescribeMacro{frgancient}
-When dealing with fragments of ancient texts often the edition respective the editor is important to cite.
+When dealing with fragments of ancient texts often it is important to cite the edition respective to the editor.
If you want to cite such a collection of fragments use |options={frgancient}|.
In this case the editor (|shorteditor| or |editor|) will be put in after the \marg{postnote}.
@@ -1149,7 +1178,7 @@
There are some corpora (e.\,g. inscriptions, minted coins, vases, etc.) which are usually cited with a common abbreviation.
Those abbreviations are typed in in the field |shorthand|.
To cite such a corpus with its abbreviation you have to write an additional |options={corpus}| in the bibliographical entry.
-Now you can cite it as usual with \oarg{prenote} or \oarg{postnote} you like to have.
+Now you can cite it as usual with the \oarg{prenote} or \oarg{postnote} you like to have.
This example shows the behaviour with a corpus that is common for Latin epigraphy:
\begin{lstlisting}[style=bibentry,label=CIL,caption={{@}Book\{CIL,…\} }]
@@ -1177,7 +1206,7 @@
where it is listed as label.
\printbib{CIL}
-If you also set something like |keywords={corpus}| then you can make a separate bibliography with all the copora cf. \cref{bibliographie}.
+If you also set something like |keywords={corpus}| then you can make a separate bibliography with all the corpora cf. \cref{bibliographie}.
\changes{v1.1}{2015/06/15}{Modifikation der Option |corpus|.}
@@ -1184,7 +1213,7 @@
\section{Examples of entry types}\label{beispiele}
The style |archaeologie| defines several so-called bibliographical drivers,
-which allow to cite different kind of works.
+which allow you to cite different kind of works.
Below we describe how they are working and which fields you should fill out.
For the examples we don't use any further options which are described above.
@@ -1235,7 +1264,7 @@
\subsubsection{›Festschrift‹, commemorative volume, catalogue, etc.}
To mark that the book or collection is a so-called ›Festschrift‹/ commemorative volume,
or an exhibition or auction catalogue you need an additional note to make it clear.
-We suggest to use the field |titleaddon| or if it is a |@Incollection| or |@Inproceedings| you can use the field |booktitleaddon| (for papers in collections see \cref{inbook}).
+We suggest using the field |titleaddon| or if it is a |@Incollection| or |@Inproceedings| you can use the field |booktitleaddon| (for papers in collections see \cref{inbook}).
\begin{lstlisting}[style=bibentry,label=Boehm2001,caption={{@}Book\{Boehm2001,…\} }]
@Book{Boehm2001,
editor = {Böhm, Stephanie and Eickstedt, Klaus-Valtin von},
@@ -1251,9 +1280,9 @@
\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.
-To obtain this fill the fields |related| and |relatedtype| (for further information see the informations about reviews in \cref{review}).
+To obtain this fill the fields |related| and |relatedtype| (for further guidance see the information about reviews in \cref{review}).
-It will be more clear with this example:
+This example will clarify matters:
The first edition of \citetitle*{Zanker2009} by \citeauthor*{Zanker2009} has been published in 1987 (|origyear|), but by now it has been released in its 5th edition.
\begin{lstlisting}[style=bibentry,label=Zanker2009,caption={{@}Book\{Zanker2009,…\} }]
@@ -1273,7 +1302,7 @@
}
\end{lstlisting}
-In \citeyear{Zanker1988}, one year later after the first edition (|origyear|) the book has been translated by A. H. Shapiro:
+In \citeyear{Zanker1988}, one year later after the first edition (|origyear|) the book was translated by A. H. Shapiro:
\begin{lstlisting}[style=bibentry,label=Zanker1988,caption={{@}Book\{Zanker1988,…\} }]
@Book{Zanker1988,
author = {Zanker, Paul},
@@ -1300,9 +1329,9 @@
\subsubsection{Multiple volumes of a monograph}
-There is the case that you have to cite a book which consists of several volumes,
+It may be the case that you have to cite a book which consists of several volumes:
usually there is a volume with text and one volume with plates.
-To cite particularly e.\,g. the second volume you can do the following.
+To cite e.\,g. the second volume in particular you can do the following.
Let’s assume this is the bibliography entry:
\begin{lstlisting}[style=bibentry,label=MacDonald1986,caption={{@}Book\{MacDonald1986,…\} }]
@Book{MacDonald1986,
@@ -1343,7 +1372,7 @@
-This following example should make it clear:
+This following example clarify matters:
\begin{lstlisting}[style=bibentry,label=Carter2014,caption={{@}Incollection\{Carter2014,…\} }]
@Incollection{Carter2014,
author = {Carter, Michael J. and Edmondson, Jonathan},
@@ -1409,7 +1438,7 @@
\subsubsection{Inventory catalogue}
-The output of an inventory catalogue changes slightly compared to collections or sth. similar.
+The output of an inventory catalogue changes slightly compared to collections or something similar.
The title is omitted and therefore there is no comma after the author’s name.
We provide two examples so you see the difference.
\begin{lstlisting}[style=bibentry,label=Kohlmeyer1983,caption={{@}Inbook\{Kohlmeyer1983,…\} }]
@@ -1478,8 +1507,8 @@
\subsection{Type \texttt{@Proceedings}}\label{proceedings}
\DescribeMacro{@Proceedings}
-Similar to a collection but still different in the bibliographical output is proceedings.
-Therefore we recommend to use the type |@Proceedings|.
+Similar to a collection but still different in the bibliographical output are proceedings.
+Therefore we recommend using the type |@Proceedings|.
The difference lies in the additional mandatory fields |venue|, |eventdate| and |eventtitle|.
Everything else is like the type |@Book|.
@@ -1574,7 +1603,7 @@
\subsection{Type \texttt{@Reference}}\label{reference}
\DescribeMacro{@Reference}
- This entry type can be used especially for references if you want to cite it as whole or if you need to relate to it.
+ This entry type can be used especially for references if you want to cite it as whole or if you need to relate to a reference.
We provide an example below---cf. \cref{inreference}
You don’t need to fill out many fields to have a working entry:
@@ -1616,8 +1645,8 @@
\DescribeMacro{@Inreference}
Besides a whole reference you can also -- and which is more likely -- cite only an entry of it via the type |@Inreference|.
-It will be more clear with an example:
- \begin{lstlisting}[style=bibentry,label=Neils1994,caption={{@}Inreference\{Neils1994,…\} }]
+Let’s clarify matters with an example:
+\begin{lstlisting}[style=bibentry,label=Neils1994,caption={{@}Inreference\{Neils1994,…\} }]
@Inreference{Neils1994,
author = {Neils, Jenifer},
title = {Theseus},
@@ -1634,7 +1663,7 @@
\begin{enumerate}
\item\label{inreference:a}
-Either you want it in the default style ›author-year‹, so it will have a label and is referenced
+If you want it in the default style ›author-year‹, so it will have a label and is referenced
to your final bibliography, then you don’t have to do anything.
In the bibliography it will look like
\printbib{Neils1994}
@@ -1660,7 +1689,7 @@
\end{enumerate}
-As mentioned above it is of advantage when you relate entries like an |@Inreference| with its |@Reference|.
+As mentioned above it is advantageous to relate entries such as an |@Inreference| with its |@Reference|.
And since not all references have a ›canonical‹ abbreviation (e.\,g. RE, LIMC, DNP, LTUR, LÄ, etc.) it might be necessary to define a |shorthand|.
This is shown in the example below.
@@ -1741,7 +1770,7 @@
publisher = {Archaeological Institute of America},
}
\end{lstlisting}
-You maybe noticed that the reveiw (|Bell2011|) is with the field |related| in line 8 connected to the entry |Welch2007|.
+You maybe noticed that the review (|Bell2011|) is connected to the entry |Welch2007| with the field |related| in line 8.
In addition we not only need a connected work but also to qualify the relation:
This is done in line 9 with |relatedtype = {reviewof}|.
This so-called |bibstring| is especially for reviews and contains the language based correct abbreviation for \emph{Review of} or e.\,g. \emph{Rez. zu}.
@@ -1756,7 +1785,7 @@
Some reviews are more detailed then others and have their own title which should be displayed in the bibliography.
In these cases you can use the field |title| the other things stay the same.
-The following entry is an example reviews the book by \citeauthor*{Welch2007}, too but with an individual title:
+The following entry is an example which also reviews the book by \citeauthor*{Welch2007}, but with an individual title:
\begin{lstlisting}[style=bibentry,label=Hufschmid2010,caption={{@}Review\{Hufschmid2010,…\} }]
@Review{Hufschmid2010,
author = {Hufschmid, Thomas},
@@ -1811,18 +1840,18 @@
year = {2008},
}
\end{lstlisting}
-In the field |related| you can have several \meta{bibtex-keys} which has to be separated by a comma (see line 7).
+In the field |related| you can have several \meta{bibtex-keys} which have to be separated by a comma (see line 7).
-And in the bibliography all information is gathered:
-
+Subsequently, all information is gathered in the bibliography:
\printbib[5em]{Taylor2008}
\subsection{Type \texttt{@Thesis}}\label{thesis}
-For MA and PhD thesis, which are not published a monograph or such, can be cited when they are edited as |@Thesis|.
-It is important to differentiate whether it is a MA or a PhD thesis,
+MA and PhD theses, which are not published as a monograph or such, can be cited when they are edited as |@Thesis|.
+It is important to differentiate between an entry referring to an MA or a PhD thesis;
this can be done by |type=|\marg{|phdthesis|} or
- \marg{|mathesis|}; you also have to define the |institution=|\marg{university}.
+ \marg{|mathesis|}.
+You also have to define the |institution=|\marg{university}.
\begin{description}
\item[mandatory:]
@@ -1897,7 +1926,7 @@
\section{Bibliography}\label{bibliographie}
\DescribeMacro{\printbibliography}
As long as you don’t use the option\DescribeMacro{seenote} |seenote|---for
-which a final bibliography is not needed---you will need to print you cited entries in a bibliography
+which a final bibliography is not needed---you will need to print your cited entries in a bibliography
at a certain place in your document.
It can be useful to differentiate your bibliography and divide it e.\,g. into a bibliography
with ancient authors and one with modern scholars.
@@ -1905,7 +1934,7 @@
How the different bibliographies can be set up is explained now:
Let’s assume you want to have a bibliography with the ancient authors and one with modern scholars.
-Since the entries of the ancient authors have the field |keyword={ancient}| (or should have it) this is done quite easy.
+Since the entries of the ancient authors have the field |keyword={ancient}| (or should have) this is done quite easy.
But first we define the heading of the whole bibliography:
\begin{lstlisting}
@@ -1925,7 +1954,7 @@
%heading=subbibnumbered,% if you want it numbered
title={Ancient authors and works}]
\end{lstlisting}
-We tell the bibliography just to contain the entries which have have |ancient| in the field |keywords| (line 2).
+We tell the bibliography just to contain the entries which have |ancient| in the field |keywords| (line 2).
Finally the bibliography for modern scholars:
@@ -1963,7 +1992,7 @@
title={Secondary literature}]
\end{bsp}
-You can create as many bibliographies as you wish each with an other keyword if you like.
+You can create as many bibliographies as you wish each with another keyword if you like.
Or you can make a bibliography with all the |shorthands| used in your text---for that we use |keyword= {corpus}| (line 2):
\begin{lstlisting}
\printbibliography[%
@@ -1979,12 +2008,11 @@
title={Abbreviation of corpora}]\label{bib:corpus}
\end{bsp}
-Note: If you want to separate in your bibliography author-year labels from |shorthand| labels
- you should insure yourself that bibliography entries which contain a |shorthand| denomination
+Note: If you want to separate author-year labels from |shorthand| labels in your bibliography
+ you should ensure that bibliography entries which contain a |shorthand| denomination
are set with a keyword either |ancient|, |corpus| or something else, to guarantee that there is
no bibliographical shortcut wrongly sorted in the bibliography.
-
Furthermore you can have a bibliography for all the abbreviated journal titles and series to have the abbreviation and its long form.
For journals it works like this:
\begin{lstlisting}
@@ -2020,12 +2048,12 @@
\subsection{Online referencing}
\DescribeMacro{eprint}\DescribeMacro{eprinttype} If you have a paper or book which is available
-in the internet via a permanent link there a different possibilities referring to it---see also the
+in the internet via a permanent link there are different possibilities for referring to it---see also the
\href{http://tug.ctan.org/macros/latex/exptl/biblatex/doc/biblatex.pdf}{|bib|\LaTeX-documentation chapter 3.11.7}.\footnote{You can also use as an |eprinttype|: |arXiv|, |pubmed|, |hdl|, |googlebooks|.
}
\DescribeMacro{jstor}
- If you can refer to the on-line plattform \href{www.jstor.org}{jstor} then you need the individual number for the article---cf. \cref{Ball2013}:
+ If you can refer to the on-line platform \href{www.jstor.org}{jstor} then you need the individual number for the article---cf. \cref{Ball2013}:
\begin{lstlisting}
eprint = *@\marg{jstor-number}@*
eprinttype = {jstor}
@@ -2067,7 +2095,7 @@
\end{lstlisting}
\subsection{Brackets (with @Inreference)}\label{faq:inreference}
-Be aware to stick to the correct order of parentheses and brackets.
+Ensure you stick to the correct order of parentheses and brackets.
The rule says that within a pair of parentheses you have to use square brackets.
Citing |@Inreferences| can lead easily to a false behaviour when you put it in parentheses.
This is an example how it should not be done:
@@ -2090,7 +2118,7 @@
\end{bsp}
\subsection{Unknown work}\label{unknown}
-Sometimes it is impossible to get hold of the author or editor but you still want to cite them.
+Sometimes it is impossible to ascertain the author or editor but you still want to cite them.
If you come along such a paper you can define a |label| which will be used for citing and sorting.
This is not connected to an entry type -- it can be used with any work.
In the following example we use an entry type |@Article|:
@@ -2107,7 +2135,7 @@
number = {1},
}
\end{lstlisting}
- The |label| (line 9) can be defined as one wishes in this case we chose it analogous to the title: |label = {Cosa}|.
+ The |label| (line 9) can be defined as one wishes; in this case we chose it analogous to the title: |label = {Cosa}|.
When you cite such an anonymous work it will be done like all the others:
\begin{lstlisting}
\cite[vgl.][145--146]{Cosa1949}
@@ -2123,7 +2151,7 @@
Sometimes you know the author of an article or a book, proceedings etc. and you get a proof of the work beforehand.
You can also cite this version of the work and provide information about the publication status in the field |pubstate|.
This field is usable with all entry types provided (except |@Talk|).
-There are some predefined publication status which are recommended to use since they are translated into the used language:
+There are some predefined publication statuses which you are recommended to use since they are translated into the used language:
\begin{description}
\item[inpreparation] Typoscript is prepared for your publication.
\begin{lstlisting}
@@ -2141,7 +2169,7 @@
pubstate = {forthcoming}
\end{lstlisting}
-\item[inpress] Typoscript has been edited and you have a proof version of it.
+\item[inpress] Typescript has been edited and you have a proof version of it.
\begin{lstlisting}
pubstate = {inpress}
@@ -2282,7 +2310,7 @@
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}).
-We recommend to look up the journal names in the list and insert the |@String| in the fields |journaltitle| and |shortjournal|, or |series| and |shortseries|.
+We recommend looking up the journal names in the list and inserting the |@String| in the fields |journaltitle| and |shortjournal|, or |series| and |shortseries|.
\subsection{Short form} \label{liste-kurz}
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx 2016-07-01 22:02:58 UTC (rev 41594)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx 2016-07-01 22:03:12 UTC (rev 41595)
@@ -21,9 +21,11 @@
\NewBibliographyString{reference}
\NewBibliographyString{talk}
\NewBibliographyString{editor}
+\NewBibliographyString{subvoce}
\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}},
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx 2016-07-01 22:02:58 UTC (rev 41594)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx 2016-07-01 22:03:12 UTC (rev 41595)
@@ -25,10 +25,12 @@
\NewBibliographyString{reference}
\NewBibliographyString{translationof}
\NewBibliographyString{talk}
+\NewBibliographyString{subvoce}
\DeclareBibliographyStrings{%
inherit = {french},
+ subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
translationof = {{traduction\addspace de}{trad\adddot\addspace de}},
reference = {{article}{art\adddot}},
reviewof = {{recension\addspace de}{rec\adddot\addspace de}},
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx 2016-07-01 22:02:58 UTC (rev 41594)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx 2016-07-01 22:03:12 UTC (rev 41595)
@@ -29,10 +29,12 @@
\NewBibliographyString{forthcoming}
\NewBibliographyString{inpress}
\NewBibliographyString{prepublished}
+\NewBibliographyString{subvoce}
\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}},
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx 2016-07-01 22:02:58 UTC (rev 41594)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx 2016-07-01 22:03:12 UTC (rev 41595)
@@ -27,10 +27,12 @@
\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}},
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx 2016-07-01 22:02:58 UTC (rev 41594)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx 2016-07-01 22:03:12 UTC (rev 41595)
@@ -21,12 +21,14 @@
\NewBibliographyString{firstprint}
\NewBibliographyString{reference}
\NewBibliographyString{talk}
+\NewBibliographyString{subvoce}
\DeclareBibliographyStrings{%
inherit = {spanish},
- reference = {{}{}},
- origtitle = {{título\addspace original}{título\addspace original}},
- firstprint = {{edición}{edición}},
- talk = {{charla}{charla}},
+ subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
+ reference = {{Artículo}{Art\adddot}},
+ origtitle = {{Título original}{Título original}},
+ firstprint = {{Primera edición}{Primera edición}},
+ talk = {{Conferencia}{Conferencia}},
}
\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 2016-07-01 22:02:58 UTC (rev 41594)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx 2016-07-01 22:03:12 UTC (rev 41595)
@@ -24,7 +24,7 @@
\ExecuteBibliographyOptions{%
pagetracker=true,%
citecounter=true,%
- giveninits=true,%
+ %%giveninits=true,%
sortlocale=auto,%
language=auto,%
autolang=other,%
@@ -129,6 +129,7 @@
\DeclareFieldFormat{edition}{#1}
\DeclareFieldFormat{volumes}{#1}
\DeclareFieldFormat{volume}{#1}
+\DeclareFieldFormat[inreference]{number}{\mkbibbrackets{#1}}
\DeclareFieldFormat{parens}{\mkbibparens{#1}}
\DeclareFieldFormat{brackets}{\mkbibbrackets{#1}}
\DeclareFieldFormat{quotes}{\mkbibquote{#1}}
@@ -196,6 +197,7 @@
\renewcommand*\relateddelim{\addnbspace\textendash\addspace}
\newcommand*{\volnumdelim}{\addslash}
\newcommand*{\jourvoldelim}{\addnbspace}
+%%\newcommand*{\subvoce}{\addspace s\adddot\addnbthinspace v\adddot}
%-----------------------
\DeclareBibliographyAlias{collection}{book}
\DeclareBibliographyAlias{reference}{book}
@@ -442,22 +444,16 @@
%-----------------------
\newbibmacro*{zenon}{%
\usebibmacro{bbx:parunit}%
- \iffieldundef{zenon}%
- {}%
{\printfield{zenon}}%
}
%-----------------------
\newbibmacro*{jstor}{%
\usebibmacro{bbx:parunit}%
- \iffieldundef{jstor}%
- {}%
{\printfield{jstor}}%
}
%-----------------------
\newbibmacro*{urn}{%
\usebibmacro{bbx:parunit}%
- \iffieldundef{urn}%
- {}%
{\printfield{urn}}%
}
%-----------------------
@@ -464,8 +460,6 @@
\renewbibmacro*{url+urldate}{%
\usebibmacro{bbx:parunit}%
\printfield{url}%
- \iffieldundef{urlyear}%
- {}%
{\setunit*{\addspace}%
\printtext{\printurldate}%
}%
@@ -543,8 +537,8 @@
\usebibmacro{journal}%
\setunit{\jourvoldelim}%
\printfield{volume}%
- \iffieldundef{number}%
- {}%
+ %\iffieldundef{number}%
+ % {}%
{\setunit{\volnumdelim}%
\printfield{number}%
}%
@@ -590,6 +584,19 @@
}
}
%-----------------------
+\newbibmacro*{inreference:title+author}{%
+\iffieldundef{title}%
+ {}%
+ {\setunit{\addspace}
+ \bibstring{subvoce}%
+ \setunit{\addspace}%
+ \printfield{title}%
+ \setunit*{\addspace}%
+ \printfield{number}}
+ \setunit{\addspace}%
+ \printtext[parens]{\printnames[name:inreference]{labelname}}
+}
+%-----------------------
\newbibmacro*{maintitle+title+volumes}{%
\iffieldsequal{maintitle}{title}%
{\clearfield{maintitle}%
@@ -1131,21 +1138,7 @@
\printfield[parens]{year}%
\setunit{\addspace}%
\usebibmacro{pages}%
- \iffieldundef{title}%
- {}%
- {\setunit{\addspace}%
- \printtext{s\adddot\addnbthinspace v\adddot}%
- }%
- \setunit{\addspace}%
- \printfield{title}%
- \iffieldundef{number}%
- {}%
- {\setunit{\addspace}%
- \printtext[brackets]{\printfield{number}}%
- }%
- \setunit{\addspace}%
- \printtext[parens]{\c at uniquename=1%
- \printnames{labelname}}%
+ \usebibmacro{inreference:title+author}
\setunit*{\addspace}%
\usebibmacro{addendum}%
\usebibmacro{doi+eprint+url}%
Modified: trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx 2016-07-01 22:02:58 UTC (rev 41594)
+++ trunk/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx 2016-07-01 22:03:12 UTC (rev 41595)
@@ -14,19 +14,34 @@
[2016/06/06 v2.0 archaeologie --
biblatex for archaeologists,
historians and philologists, cbx-Datei]
-\ExecuteBibliographyOptions{%
- citetracker=true,%
- idemtracker=false,%
- ibidtracker=true,%
- opcittracker=true,%
- loccittracker=true,%
- labeldate=true,%
-}
%-----------------------
\newbool{cbx:yearinparens}
\newbool{cbx:seenote}
\newbool{cbx:seen}
%-----------------------
+\newcommand*{\cbx at fseen@names}{}
+\newcommand*{\cbx at tseen@names}{}
+\newrobustcmd*{\cbx at nameseen}[1]{%
+ \iftoggle{blx at footnote}
+ {\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}}
+ {\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}
{\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}
@@ -36,11 +51,50 @@
{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'.}}}
%-----------------------
\DeclareFieldFormat{citeyear}{#1}
\DeclareFieldFormat{prenote}{#1\isdot}%
\DeclareFieldFormat{postnote}{#1}%
\DeclareFieldFormat{shorttitle}{#1}%
+\DeclareFieldFormat{pages}{#1}
+
+\DeclareNameFormat{labelname}{%
+ \ifcase\value{uniquename}%
+ \usebibmacro{name:family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
+ \or
+ \ifuseprefix
+ {\usebibmacro{name:family-given}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefix}
+ {\namepartsuffixi}}
+ {\usebibmacro{name:family-given}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefixi}
+ {\namepartsuffixi}}%
+ \or
+ \usebibmacro{name:family-given}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
+ \fi
+ \usebibmacro{name:andothers}}
+
+
+
\DeclareNameFormat{frg}{%
\nameparts{#1}%
\ifgiveninits%
@@ -55,17 +109,85 @@
{\namepartprefix}
{\namepartsuffix}}%
\usebibmacro{name:andothers}}
-%-----------------------
-\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}%
+
+\def\cbx at arch@citeauthorformat at family{%
+ \DeclareNameFormat{citeauthor}{%
+ \usebibmacro{name:family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
+ \usebibmacro{name:andothers}}}
+
+\def\cbx at arch@citeauthorformat at full{%
+ \DeclareNameFormat{citeauthor}{%
+ \usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
+ \usebibmacro{name:andothers}}}
+
+\def\cbx at arch@citeauthorformat at initials{%
+ \DeclareNameFormat{citeauthor}{%
+ \ifuseprefix
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefix}
+ {\namepartsuffixi}}
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefixi}
+ {\namepartsuffixi}}%
+ \usebibmacro{name:andothers}}}
+
+\def\cbx at arch@citeauthorformat at firstfull{%
+ \DeclareNameFormat{citeauthor}{%
+ \cbx at ifnameseen{\thefield{hash}}
+ {\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}}}
+
+\DeclareNameFormat{name:inreference}{%
+ \ifuseprefix
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefix}
+ {\namepartsuffixi}}
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefixi}
+ {\namepartsuffixi}}%
+ \usebibmacro{name:andothers}}
+%-----------------------
+\ExecuteBibliographyOptions{%
+ citetracker=true,%
+ idemtracker=false,%
+ ibidtracker=true,%
+ opcittracker=true,%
+ loccittracker=true,%
+ labeldate=true,%
+ citeauthorformat=initials,%
+ uniquename=minfull,%
}
%-----------------------
\renewbibmacro*{postnote}{%
@@ -97,13 +219,6 @@
\renewcommand{\postnotedelim}{\addspace}%
}%
%-----------------------
-\newbibmacro*{cite:name}{%
-% 0: only last names, 1: last name + first name initials, 2: full name
- \ifbool{cbx:fullnames}{\c at uniquename=2}{\ifbool{cbx:lastnames}{\c at uniquename=0}{\c at uniquename=1}}%
- \ifciteindex{\indexnames{labelname}}{}%
- \printtext[bibhyperref]{%
- \iffootnote{\c at uniquename=0 \printnames{labelname}}{\printnames{labelname}}}}
-%-----------------------
\newbibmacro*{cite:title}{\printfield{labeltitle}}%
%-----------------------
\newbibmacro*{cite:year}{%
@@ -112,22 +227,17 @@
{{\printtext[citeyear]{\printfield{labelyear}\printfield{extrayear}}}}}
%-----------------------
\newbibmacro*{cite:lexikon}{%
- \printfield{booktitle}%
- \setunit{\addspace}%
- \printfield{volume}%
- \setunit{\addspace}%
- \printfield[parens]{year}%
- \setunit{\addspace}%
- \iffieldundef{postnote}{\printfield{pages}}%
- {\printfield{postnote}}%
- \iffieldundef{title}{}{\setunit{\addspace}%
- \printtext{s\adddot\addnbthinspace v\adddot}}%
- \setunit{\addspace}\printfield{title}%
- \iffieldundef{number}{}{\setunit{\addspace}%
- \printtext[brackets]{\printfield{number}}}%
- \setunit{\addspace}%
- \printtext[parens]{\c at uniquename=1 \printnames{labelname}}%
- }
+ \printfield{booktitle}%
+ \setunit{\addspace}%
+ \printfield{volume}%
+ \setunit{\addspace}%
+ \printfield[parens]{year}%
+ \setunit{\addspace}%
+ \iffieldundef{postnote}%
+ {\printfield{pages}}%
+ {\printfield{postnote}}%
+ \usebibmacro{inreference:title+author}
+}
%-----------------------
\newbibmacro{cite:seenote}{%
\ifboolexpr{bool{cbx:ancient}%
@@ -274,7 +384,7 @@
\DeclareMultiCiteCommand{\textcites}%
{\textcite}{\textcitedelim}
%-----------------------
-\DeclareCiteCommand{\citeauthor}%
+\DeclareCiteCommand{\citeauthor}
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
\renewcommand*{\multinamedelim}{\addcomma\space}%
@@ -282,9 +392,13 @@
\ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
\addspace\bibstring{and}\space}%
\usebibmacro{prenote}}%
- {\usebibmacro{cite:name}}%
- {\multicitedelim}%
- {\usebibmacro{postnote}}%
+ {\ifciteindex
+ {\indexnames{labelname}}
+ {}%
+ \printtext[bibhyperref]{%
+ \printnames[citeauthor]{labelname}}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
%-----------------------
\DeclareCiteCommand{\citetitle} %
{\boolfalse{citetracker}%
@@ -300,5 +414,6 @@
}}}%
{\multicitedelim}%
{\usebibmacro{postnote}}%
+
\endinput
%% End of file `archaeologie.cbx'.
\ No newline at end of file
More information about the tex-live-commits
mailing list