summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib15
-rw-r--r--Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib4
-rw-r--r--Master/texmf-dist/doc/latex/archaeologie/README.md15
-rw-r--r--Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdfbin159169 -> 159463 bytes
-rw-r--r--Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex8
-rw-r--r--Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdfbin746539 -> 751735 bytes
-rw-r--r--Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex39
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx93
9 files changed, 112 insertions, 66 deletions
diff --git a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib
index 8da8e5fda4f..c05be86d30a 100644
--- a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib
+++ b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib
@@ -690,6 +690,21 @@
sortshorthand = {Vitr. Krohn},
}
+@Book{Artem,
+ author = {{Artemidor von Daldis}},
+ editor = {Brackertz, Karl},
+ title = {Das Traumbuch},
+ publisher = {Artemis},
+ location = {Zürich},
+ year = {1979},
+ series = {Die Bibliothek der Alten Welt. Griechische Reihe},
+ origtitle = {Ὀνειροκριτικόν},
+ origlanguage = {greek},
+ shorthand = {Artem.},
+ keywords = {ancient},
+ options = {ancient},
+}
+
@Comment{jabref-meta: databaseType:biblatex;}
@Comment{jabref-entrytype: Review: req[author;number;title;subtitle;pages;volume;journaltitle;shortjournal;related;relatedtype;year] opt[]}
diff --git a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib
index 5ff93ab779a..781b7b8baad 100644
--- a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib
+++ b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib
@@ -1,6 +1,6 @@
% archaeologie --%
% biblatex fuer Archaeologen, Historiker und Philologen
-% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
+% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -12,7 +12,7 @@
%%%%%%%%%%%%%%%%%%%%
%%
%% Liste der Abkürzungen für Zeitschriften, Reihen,
-%% Lexika und häufig zitierte Werke
+%% Lexika und häufig zitierte Werke
%%
%%%%%%%%%%%%%%%%%%%%
%%
diff --git a/Master/texmf-dist/doc/latex/archaeologie/README.md b/Master/texmf-dist/doc/latex/archaeologie/README.md
index baf8e524348..10fa1cb815a 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.
---
-_2017/05/29 v2.31_
+_2017/08/10 v2.3.3_
Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl
@@ -65,7 +65,18 @@ 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.2 (2017-07-19) --> [current release]
+## unreleased (beta status)
+
+
+## v2.3.3 (2017-08-10) --> [current release]
+
+#### *fixed*
+* typo in documentation
+
+#### *added*
+* if there is no `translator` `\citetranslator` will fall back to the `bibstring` "owntranslation" which can be modified; see [#112](https://github.com/LukasCBossert/biblatex-archaeologie/issues/112) and [tex.stackexchange.com/q/385719/98739](https://tex.stackexchange.com/q/385719/98739) thanks to [moewe](https://tex.stackexchange.com/users/35864/moewe)
+
+## v2.3.2 (2017-07-19)
#### *fixed*
* wrong code-example in documentation
diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf
index 57b39db4b1e..b24368e383f 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf
+++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex
index 50695af4986..27187b85569 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex
+++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex
@@ -56,7 +56,7 @@ Wie bei |bib|\LaTeX{} gewohnt werden Zitate über einen der \cs{cite}-Befehle ei
Einige Möglichkeiten zur Gestaltung der Bibliographie geben wir in \cref{bibliographie}.
Um die externen Bibliographien, die |archaeologie| optional bereitstellt, korrekt einzubinden, ist ein Input-Encoding von Nöten, das unter anderem auch griechische Schriftzeichen enthält.
-Für \LaTeX{} ist ein entsprechendes Encoding z.\,B. über \cs{usepackage[utf8]\{inputenc\}} zu erreichen. \XeLaTeX{} unterstützt Unicode von Hause aus.
+Für \LaTeX{} ist ein entsprechendes Encoding z.\,B. über \cs{usepackage[utf8]\{inputenc\}} zu erreichen. \XeLaTeX{} und \LuaLaTeX{} unterstützen Unicode von Hause aus.
\section{Übersicht}
Im Folgenden stellen wir etwas knapp die Optionen und Einstellungen vor, mit denen der Stil |archaeologie| aufgerufen werden kann. Wer mehr wissen will, sei auf die englische Hauptdokumentation verwiesen.
@@ -189,11 +189,11 @@ Der Unterschied zu \cs{cite} besteht darin, dass der Literaturverweis durch Klam
\DescribeMacro{\citeauthor} \DescribeMacro{\citetitle} Diese Befehle ermöglich, nur einzelne Elemente einer Publikation zu zitieren. Je nach Verwendung wird entweder nur der Titel oder der Autor eines Bibliographieeintrages ausgegeben. Ein Vorteil gegenüber des händischen Eintippens eines solchen Elementes ist, dass der Eintrag indiziert und referenziert wird. Dies kann z.\,B. für einen (Autoren-)Index, der auf die Textstelle verweisen soll, relevant sein.
-\DescribeMacro{\citetranslator} Zusätzlich gibt es noch die Möglichkeit den Übersetzer eines (insbesondere) antiken Werkes anzugeben.
+\DescribeMacro{\citetranslator}\rmarginpar{v.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*} Die Sternchen-Variante gibt zusätzlich noch die Sprache an,
+ \DescribeMacro{\citetranslator*} \rmarginpar{v.2.3.0} Die Sternchen-Variante gibt zusätzlich noch die Sprache an,
aus der übersetzt wurde.
\section{Publikationstypen}
@@ -249,7 +249,7 @@ Im folgenden werden die zur Verfügung stehenden Publikationstypen (\emph{Entry
\item[Optional:] |doi|, |url|, |urldate|, |eprint|, |eprinttype|, |note|, |addendum|
\end{description}
-\printbib[6em]{Bergmann2015}
+\printbib[7em]{Bergmann2015}
\DescribeMacro{@review} Für Rezensionen.
diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf
index 73dee2041dd..7be728c3259 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf
+++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex
index fdf7331eb55..654cd5bd6d4 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex
+++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex
@@ -366,24 +366,45 @@ Public space is part of a city says \citeauthor{Osland2016} in \citetitle{Osland
For further information cf. \cref{citeauthorformat}.
\DescribeMacro{\citetranslator}\label{citetranslator}%
-Addionally there is also a \cs{cite}-command which can be used to print the translator of an (ancient) work.
+\rmarginpar{v.2.3.0}
+Addionally there is also a \cs{cite}-command which can be used to print the translator of an (ancient) publication.
\begin{code}
\citetranslator*@\marg{bibtex-key}%@*
\end{code}
This will print the name(s) of the translator according to the chosen |citeauthorformat|.
-If there is no translator it will name you as translator (\enquote{own translation}).
+\begin{code}
+\blockcquote[12,25,1]{Cic:Att}{Aber dein Heim ist das Forum.} (\citetranslator{Cic:Att})
+\end{code}
+
+\begin{example}
+\blockcquote[12,25,1]{Cic:Att}{Aber dein Heim ist das Forum.} (\citetranslator{Cic:Att})
+\end{example}
+\rmarginpar{v.2.3.3}
+If there is no translator given it will name you as translator using a |bibstring| with \enquote{own translation}.
+\begin{example}
+\blockcquote[3,62,1]{Artem}{The Agora means confusion and uproar because of the people that are gathered there.} (\citetranslator{Artem})
+\end{example}
+You can change the |bibstring| \enquote{own translation} and replace it with anything you like,
+at least it is done in the preamble of your document.
+\begin{code}
+\DefineBibliographyStrings{english}{%
+ owntranslation = {by me},%
+}
+\end{code}
+
+
+
+\DescribeMacro{\citetranslator*}\rmarginpar{v.2.3.0}
\begin{code}
\citetranslator* *@\marg{bibtex-key}%@*
\end{code}
-\newcommand\latquote[5]{\cite[#1][#2]{#3}: \emph{#4} -- \enquote{#5} \parentext{\citetranslator*{#3}}.}
The starred version prints also the informtion from which language the text has been translated.
-For an efficient way of citing ancient texts we introduce a new command (only a suggestion):
\begin{code}
-\newcommand\latquote[5]{\cite[#1][#2]{#3}: \emph{#4} -- \enquote{#5} \parentext{\citetranslator*{#3}}.}
+\blockcquote[12,25,1]{Cic:Att}{Aber dein Heim ist das Forum.} (\citetranslator*{Cic:Att})
\end{code}
\begin{example}
-\latquote{cf.}{12,25,1}{Cic:Att}{sed domus est, ut ais, forum}{Aber dein Heim ist das Forum.}
+\blockcquote[12,25,1]{Cic:Att}{Aber dein Heim ist das Forum.} (\citetranslator*{Cic:Att})
\end{example}
@@ -2118,9 +2139,9 @@ Here is an example for a paper given in Berlin in 2015:
\end{bibexample}
The bibliography will show the entry as:
-\printbib[6em]{Bergmann2015}
+\printbib[7em]{Bergmann2015}
- \changes{v1.5}{2016/05/31}{Rückverweis}
+\changes{v1.5}{2016/05/31}{Rückverweis}
\section{Bibliography}\label{bibliographie}
@@ -2398,7 +2419,7 @@ or the date of this version with |\archaeologiedate|.
\archaeologiedate
\end{example}
-\subsection{Print the citet authors of secondary literature}
+\subsection{Print the cited authors of secondary literature}
In case you want to have an index about the authors you cited in your text,
you can do that quite easily.
We coded it that way so authors of ancient sources (e.\,g. Cicero) will be omitted in that index (when these entries have |options={ancient}| or |options={frgancient}|).
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
index 87f72c5f602..866a8ed01ab 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
@@ -10,8 +10,8 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-\def\arch@date{2017/07/19}
-\def\arch@version{2.3.2}
+\def\arch@date{2017/08/10}
+\def\arch@version{2.3.3}
\def\arch@bbxid{\arch@date\space v\arch@version\space biblatex-archaeologie bibliography style (LCB/JF)}
\def\arch@cbxid{\arch@date\space v\arch@version\space biblatex-archaeologie citation style (LCB/JF)}
\def\arch@lbxid{\arch@date\space v\arch@version\space biblatex-archaeologie localization (LCB/JF)}
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
index 253141e9368..1db43dfd623 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
@@ -220,9 +220,9 @@
}
%-----------------------
\renewbibmacro*{postnote}{%
- \ifboolexpr{%
- test{\ifbool{bbx:inreferences}}%
- and%
+ \ifboolexpr{
+ bool{bbx:inreferences}
+ and
test{\ifentrytype{inreference}}}
{}
{\iffieldundef{postnote}%
@@ -289,11 +289,10 @@
}}}
%-----------------------
\newbibmacro{cite}{%
- \ifboolexpr{%
- test {\ifbool{bbx:inreferences}}%
- and %
- test {\ifentrytype{inreference}}%
- }%
+ \ifboolexpr{
+ bool{bbx:inreferences}
+ and
+ test{\ifentrytype{inreference}}}
{\usebibmacro{cite:lexikon}}%
{\ifbool{cbx:seenote}%
{\usebibmacro{cite:seenote}}%
@@ -443,11 +442,12 @@
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
- {\ifboolexpr{%
- test{\ifbool{bbx:inreferences}}%
- and%
- test{\ifentrytype{inreference}}%
- }{}{\usebibmacro{postnote}}}%
+ {\ifboolexpr{
+ bool{bbx:inreferences}
+ and
+ test{\ifentrytype{inreference}}}
+ {}
+ {\usebibmacro{postnote}}}%
%-----------------------
\DeclareCiteCommand{\fullcite}
{\usebibmacro{prenote}}
@@ -483,11 +483,10 @@
\addspace\bibstring{and}\space}%
\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
-\ifboolexpr{%
- test {\ifbool{bbx:inreferences}}%
- and %
- test {\ifentrytype{inreference}}%
- }%
+ \ifboolexpr{
+ bool{bbx:inreferences}
+ and
+ test{\ifentrytype{inreference}}}
{\printtext}%
{\printtext[bibhyperref]}%
{\printnames[citeauthor]{labelname}}}%
@@ -499,25 +498,27 @@
\boolfalse{pagetracker}%
\renewcommand*{\multinamedelim}{\addcomma\space}%
\renewcommand*{\finalnamedelim}{%
- \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
- \addspace\bibstring{and}\space}%
+ \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
+ \addspace\bibstring{and}\space}%
\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
-\ifboolexpr{%
- test {\ifbool{bbx:inreferences}}%
- and %
- test {\ifentrytype{inreference}}%
+ \ifboolexpr{%
+ test {\ifentrytype{incollection}}
+ or
+ test {\ifentrytype{inbook}}
}%
- {\printtext}%
- {\printtext[bibhyperref]}%
- {\ifthenelse{%
- \ifentrytype{incollection}%
- \OR%
- \ifentrytype{inbook}%
- }%
- {\printnames[citeauthor]{intranslator}}%
- {\printnames[citeauthor]{translator}}}%
- }%
+ {\ifnameundef{intranslator}%
+ {\bibstring{owntranslation}}%
+ {\printtext[bibhyperref]{\printnames[citeauthor]{intranslator}}}}%
+ {\ifnameundef{translator}%
+ {\bibstring{owntranslation}}%
+ {\ifboolexpr{
+ bool {bbx:inreferences}
+ and
+ test {\ifentrytype{inreference}}
+ }%
+ {\printnames[citeauthor]{translator}}
+ {\printtext[bibhyperref]{\printnames[citeauthor]{translator}}}}}}
{\multicitedelim}%
{\usebibmacro{postnote}}
%-----------------------
@@ -531,13 +532,12 @@
\addspace\bibstring{and}\space}%
\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
- \ifboolexpr{%
- test {\ifbool{bbx:inreferences}}%
- and %
- test {\ifentrytype{inreference}}%
- }%
- {\printtext}%
- {\printtext[bibhyperref]}%
+ \ifboolexpr{
+ bool{bbx:inreferences}
+ and
+ test{\ifentrytype{inreference}}}
+ {\printtext}%
+ {\printtext[bibhyperref]}%
{\ifthenelse{%
\ifentrytype{incollection}%
\OR%
@@ -565,13 +565,12 @@
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
\usebibmacro{prenote}}%
- {\ifboolexpr{%
- test {\ifbool{bbx:inreferences}}%
- and %
- test {\ifentrytype{inreference}}%
- }%
+ {\ifboolexpr{
+ bool{bbx:inreferences}
+ and
+ test{\ifentrytype{inreference}}}
{\printtext}%
- {\printtext[bibhyperref]}{%
+ {\printtext[bibhyperref]}{%
\ifbool{cbx:ancient}{\printtext[emph]{\usebibmacro{cite:title}}}%
{\printtext[emph]{\usebibmacro{cite:title}}%
\iffieldundef{year}