summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-02-01 23:05:43 +0000
committerKarl Berry <karl@freefriends.org>2016-02-01 23:05:43 +0000
commit80c57756d83521ede74c522252d2665987849dca (patch)
treee9df0597004b8e661c445531438ffcc0aba23ee9
parent86ce10d3a5965218b1ca952e8ad39ba2421ebaed (diff)
archaeologie (2feb16)
git-svn-id: svn://tug.org/texlive/trunk@39539 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/archaeologie/README.md6
-rw-r--r--Master/texmf-dist/doc/latex/archaeologie/antike-corpora.bib2
-rw-r--r--Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdfbin299120 -> 303603 bytes
-rw-r--r--Master/texmf-dist/doc/latex/archaeologie/dai-abkuerzungen.bib2
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx38
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx50
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx93
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx98
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx4
11 files changed, 212 insertions, 89 deletions
diff --git a/Master/texmf-dist/doc/latex/archaeologie/README.md b/Master/texmf-dist/doc/latex/archaeologie/README.md
index 221641a8b21..4ae54377dfa 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/README.md
+++ b/Master/texmf-dist/doc/latex/archaeologie/README.md
@@ -1,12 +1,12 @@
#####################################
## bibLaTeX-archaeologie ##
#####################################
-Version: 1.22 [2015/12/06]
+Version: 1.3 [2016-01-31]
archaeologie: biblatex fuer Archaeologen,
Historiker und Philologen (Deutsch und Englisch)
-Copyright (c) 2015 Lukas C. Bossert | Johannes Friedl
+Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
Email: lukas@digitales-altertum.de
@@ -29,6 +29,8 @@ Zum Stil gehören:
- archaeologie.dbx
- archaeologie-ngerman.lbx
- archaeologie-english.lbx
+- archaeologie-french.lbx
+- archaeologie-italian.lbx
- dai-abkuerzungen.bib
- antike-corpora.bib
diff --git a/Master/texmf-dist/doc/latex/archaeologie/antike-corpora.bib b/Master/texmf-dist/doc/latex/archaeologie/antike-corpora.bib
index 944bdc57821..bb3d68d04a1 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/antike-corpora.bib
+++ b/Master/texmf-dist/doc/latex/archaeologie/antike-corpora.bib
@@ -1,6 +1,6 @@
% archaeologie --%
% biblatex fuer Archaeologen, Historiker und Philologen
-% Copyright (c) 2015 Lukas C. Bossert | Johannes Friedl
+% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf
index 2335da75a74..db8bfbd377e 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/dai-abkuerzungen.bib b/Master/texmf-dist/doc/latex/archaeologie/dai-abkuerzungen.bib
index eb514b9ee2f..6e752106999 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/dai-abkuerzungen.bib
+++ b/Master/texmf-dist/doc/latex/archaeologie/dai-abkuerzungen.bib
@@ -1,6 +1,6 @@
% archaeologie --%
% biblatex fuer Archaeologen, Historiker und Philologen
-% Copyright (c) 2015 Lukas C. Bossert | Johannes Friedl
+% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
index 2dea0eea013..fea65e4bcbd 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
@@ -1,6 +1,6 @@
% archaeologie --%
% biblatex fuer Archaeologen, Historiker und Philologen
-% Copyright (c) 2015 Lukas C. Bossert | Johannes Friedl
+% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -12,7 +12,7 @@
\ProvidesFile{archaeologie-english.lbx}%
- [2015/12/06 v1.22 archaeologie --%
+ [2016/01/31 v1.3 archaeologie --%
biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei]
\InheritBibliographyExtras{english}
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
new file mode 100644
index 00000000000..e5513c3e1c2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
@@ -0,0 +1,38 @@
+% archaeologie --%
+% biblatex fuer Archaeologen, Historiker und Philologen
+% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+
+
+\ProvidesFile{archaeologie-french.lbx}%
+ [2016/01/31 v1.3 archaeologie --%
+ biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei]
+\InheritBibliographyExtras{french}
+\DefineBibliographyExtras{french}{\restorecommand\mkbibnamelast}
+
+\NewBibliographyString{origtitle}
+\NewBibliographyString{firstprint}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{reference}
+\NewBibliographyString{translationof}
+
+
+%\DeclareBibliographyStrings{%
+% inherit = {english},
+% translationof = {{Translation\addspace of}{Transl\adddot\addspace of}},
+% reference = {{Article}{Art\adddot}},
+% reviewof = {{critique\addspace du}{critique\addspace du}},
+% origtitle = {{original title}{orig\adddot title}},
+% firstprint = {{first\addspace edition}{first\addspace edition}},
+%}
+
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
new file mode 100644
index 00000000000..5ba1edfbb40
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
@@ -0,0 +1,50 @@
+% archaeologie --%
+% biblatex fuer Archaeologen, Historiker und Philologen
+% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+
+
+\ProvidesFile{archaeologie-italian.lbx}%
+ [2016/01/31 v1.3 archaeologie --%
+ biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei]
+\InheritBibliographyExtras{italian}
+
+\NewBibliographyString{origtitle}
+\NewBibliographyString{firstprint}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{reference}
+\NewBibliographyString{translationof}
+
+\NewBibliographyString{inpreparation}
+\NewBibliographyString{submitted}
+\NewBibliographyString{forthcoming}
+\NewBibliographyString{inpress}
+\NewBibliographyString{prepublished}
+
+
+\DeclareBibliographyStrings{%
+ inherit = {italian},
+ translationof = {{traduzione\addspace di}{trad\adddot\addspace di}},
+ reference = {{articolo}{art\adddot}},
+ reviewof = {{recensione\addspace di}{recens\adddot\addspace di}},
+ origtitle = {{titolo\addspace originale}{titolo\addspace orig\adddot}},
+ firstprint = {{primo\addspace edizione}{primo\addspace edizione}},
+ %
+ editor = {{Ed\adddot}{Ed\adddot}},
+ inpreparation = {{}{}},
+ submitted = {{}{}},
+ inpress = {{}{}},
+ prepublished = {{}{}},
+ forthcoming = {{prossimo}{prossimo}},
+}
+
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
index f7ac1a4f6d1..389fec4e4fb 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
@@ -1,6 +1,6 @@
% archaeologie --%
% biblatex fuer Archaeologen, Historiker und Philologen
-% Copyright (c) 2015 Lukas C. Bossert | Johannes Friedl
+% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -12,7 +12,7 @@
\ProvidesFile{archaeologie-ngerman.lbx}%
- [2015/12/06 v1.22 archaeologie --%
+ [2016/01/31 v1.3 archaeologie --%
biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei]
\InheritBibliographyExtras{ngerman}
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
index ef5dbca9baa..7baba064684 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
@@ -1,6 +1,6 @@
% archaeologie --%
% biblatex fuer Archaeologen, Historiker und Philologen
-% Copyright (c) 2015 Lukas C. Bossert | Johannes Friedl
+% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -11,16 +11,19 @@
% version 2005/12/01 or later.
\ProvidesFile{archaeologie.bbx}%
- [2015/12/06 v1.22 archaeologie --%
+ [2016/01/31 v1.3 archaeologie --%
biblatex fuer Archaeologen, Historiker und Philologen, bbx-Datei]
\RequireBibliographyStyle{standard}
\AtBeginDocument{%
\urlstyle{sf}%
-\typeout{* * * archaeologie * * * biblatex fuer Archaeologen, Historiker und Philologen}
+\typeout{* * * archaeologie * * * biblatex fuer Archaeologen,
+Historiker und Philologen}
}
\ExecuteBibliographyOptions{%
pagetracker=true,%
firstinits=true,
+sortlocale=de_DE,
+language=auto,autolang=other,
bibencoding=utf8,%
sortlocale=de,%
dateabbrev=false,%
@@ -35,6 +38,7 @@ maxbibnames=999,%
%\addbibresource{antike-corpora.bib} % Version 2.0
\newbool{bbx:hrsgv}
+\newbool{bbx:abstand}
\newbool{bbx:jahrreihe}
\newbool{bbx:bibvollername}
\newbool{bbx:lexika}
@@ -44,22 +48,27 @@ maxbibnames=999,%
\newbool{cbx:antik}%
\newbool{cbx:frgantik}%
\newbool{cbx:corpus}%
-\newbool{cbx:lexikon}%
\newbool{cbx:nurnachname}
\newbool{cbx:vollername}
+
%% \DeclareBibliographyOption %%
\DeclareBibliographyOption{hrsgv}[true]{\csuse{bool#1}{bbx:hrsgv}}
+\DeclareBibliographyOption{abstand}[]{%
+ \csuse{booltrue}{bbx:abstand}
+ \newcommand{\abstand}{#1}%
+ }
\DeclareBibliographyOption{jahrreihe}[true]{\csuse{bool#1}{bbx:jahrreihe}}
\DeclareBibliographyOption{bibvollername}[true]{\ExecuteBibliographyOptions{firstinits=false}}
-\DeclareBibliographyOption{lexika}[true]{\csuse{bool#1}{bbx:lexika}}
+\DeclareBibliographyOption{lexika}[true]{\csuse{bool#1}{bbx:lexika}
+ \ExecuteBibliographyOptions[inreference]{skipbib=true}}
\DeclareBibliographyOption{keineabkuerzung}[true]{\csuse{bool#1}{bbx:keineabkuerzung}}
\DeclareBibliographyOption{uebersetzung}[true]{\csuse{bool#1}{bbx:uebersetzung}}
\DeclareBibliographyOption{verlag}[true]{\csuse{bool#1}{bbx:verlag}
-\ExecuteBibliographyOptions{%
-maxitems=2,
-}%
+ \ExecuteBibliographyOptions{%
+ maxitems=2,
+ }%
}
\DeclareBibliographyOption{nurnachname}[true]{%
\csuse{booltrue}{cbx:nurnachname}%
@@ -81,10 +90,7 @@ maxitems=2,
\csuse{bool#1}{cbx:frgantik}%
}
\DeclareEntryOption{corpus}[true]{\csuse{bool#1}{cbx:corpus}}
-\DeclareEntryOption{lexikon}[true]{%
- \csuse{bool#1}{cbx:lexikon}%
- \ifbool{bbx:lexika}{\settoggle{blx@skipbib}{#1}}}
-
+
\DeclareFieldFormat*{title}{#1}
\DeclareFieldFormat{subtitle}{#1}
\DeclareFieldFormat{booktitle}{#1}
@@ -106,13 +112,22 @@ maxitems=2,
\DeclareFieldFormat{note}{\mkbibparens{#1}\nopunct}
\DeclareFieldFormat{shorthandwidth}{#1}
\DeclareFieldFormat{origtitle}{\mkbibemph{#1}}
+\DeclareFieldFormat{eprint:urn}{%
+ \textsc{urn}\addcolon\space
+ \ifhyperref
+ {\href{http://www.nbn-resolving.org/#1}{\nolinkurl{#1}}}
+ {\nolinkurl{#1}}}
+
\DeclareRedundantLanguages{ngerman}{german,ngerman,austrian,naustrian}
\DeclareRedundantLanguages{english,american}{english,american,british,%
canadian,australian,newzealand,USenglish,UKenglish}
\DeclareLanguageMapping{ngerman}{archaeologie-ngerman}
\DeclareLanguageMapping{english}{archaeologie-english}
+\DeclareLanguageMapping{french}{archaeologie-french}
+\DeclareLanguageMapping{italian}{archaeologie-italian}
+
@@ -156,12 +171,10 @@ maxitems=2,
\sort{%
\field[padside=left,padwidth=4,padchar=0]{volume}%
\literal{0000}}}
+
\DeclareSortingScheme{shortseries}{\sort{\field{shortseries}}}
\DeclareSortingScheme{shortjournal}{\sort{\field{shortjournal}}}
-
-
-
\defbibcheck{shortseries}{%
\iffieldundef{shortseries}{\skipentry}{}%
\iffieldundef{series}{\skipentry}{%
@@ -548,13 +561,14 @@ maxitems=2,
\printfield{origyear}}}}}%
{\usebibmacro{edition}%
\printtext[parens]{%
- \ifthenelse{\iffieldundef{origlocation}%
- \AND \NOT \iffieldundef{origyear}}%
- {\printlist{origlocation}\setunit*{\addspace}}{}%
- \printfield{origyear}%
+ \ifboolexpr{test {\iflistundef{origlocation}}%
+ and test {\iffieldundef{origyear}}}%
+ {}{\iflistundef{origlocation}%
+ {\printlist{location}}%
+ {\printlist{origlocation}}%
+ \setunit{\addspace}\printfield{origyear}%
\setunit*{\addsemicolon\addspace}%
- \iffieldundef{origyear}{}{\bibstring{reprint}}%
- \setunit*{\adddot\addspace}%
+ \iffieldundef{origyear}{}{\bibstring{reprint}\addspace}}%
\printlist{location}%
\setunit*{\addspace}%
\printfield{year}%
@@ -843,41 +857,21 @@ maxitems=2,
\DeclareBibliographyDriver{inreference}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
-\ifbool{cbx:lexikon}%
- {\printfield{booktitle}%
+\printfield{booktitle}%
\setunit{\addspace}\printfield{volume}%
\setunit{\addspace}\printfield[parens]{year}%
\setunit{\addspace}\usebibmacro{pages}%
- \setunit{\addspace}\printtext{s\adddot\addnbthinspace v\adddot}%
+ \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@uniquename=1%
\printnames{labelname}}%
- }{%
- \usebibmacro{author}%
- \setunit*{\labelnamepunct}\newblock%
- \usebibmacro{reftitle}%
- \newunit\newblock%
- \usebibmacro{in:}%
- \newunit\newblock%
- \usebibmacro{booktitle+volume+editor}%
- \setunit{\addspace}%
- \usebibmacro{series+number}%
- \setunit*{\addspace}\newblock%
- \usebibmacro{location+edition+year}%
- \setunit{\addspace}%
- \ifbool{bbx:jahrreihe}{%
- \newunit\usebibmacro{series+number}%
- \setunit*{\addcomma\addspace}}{}%
- \setunit*{\addspace}\newblock%
- \usebibmacro{pages}%
- \setunit{\addspace}%
+ \setunit*{\addspace}%
\usebibmacro{addendum}%
\usebibmacro{doi+eprint+url}%
\setunit{\addperiod\addspace}%
\usebibmacro{signatur}%
- }%
\newunit\newblock
\usebibmacro{savestuff}%
\usebibmacro{finentry}%
@@ -925,17 +919,16 @@ maxitems=2,
\defbibenvironment{bibliography}%
{\list%
- {\usebibmacro{labelwidthbib}}
- {\setlength{\labelwidth}{\shorthandwidth}%
+ {\usebibmacro{labelwidthbib}}%
+ {\setlength{\labelwidth}{%
+ \ifbool{bbx:abstand}{\abstand}{\shorthandwidth}}%
\setlength{\leftmargin}{\labelwidth}%
\setlength{\labelsep}{\biblabelsep}%
\addtolength{\leftmargin}{\labelsep}%
\setlength{\itemsep}{\bibitemsep}%
\setlength{\parsep}{\bibparsep}%
- \renewcommand*{\makelabel}[1]{##1\hss}}}
+ \renewcommand*{\makelabel}[1]{##1\hss}}}%
{\endlist}
- {\item%
- \usebibmacro{kicklabel}%
- }
+ {\item\usebibmacro{kicklabel}}
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
index 6998b86506e..ad6118d4238 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
@@ -1,6 +1,6 @@
% archaeologie --%
% biblatex fuer Archaeologen, Historiker und Philologen
-% Copyright (c) 2015 Lukas C. Bossert | Johannes Friedl
+% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -11,7 +11,7 @@
% version 2005/12/01 or later.
\ProvidesFile{archaeologie.cbx}%
- [2015/12/06 v1.22 archaeologie --%
+ [2016/01/31 v1.3 archaeologie --%
biblatex fuer Archaeologen, Historiker und Philologen, cbx-Datei]
\ExecuteBibliographyOptions{%
citetracker=true,%
@@ -20,7 +20,6 @@
opcittracker=true,%
loccittracker=true,%
labeldate=true,%
- sortcites=false%
}%
%%%%%%%% cbx %%%%%%%%%%
@@ -43,7 +42,7 @@
{\addspace\textendash\addspace}{}%
}%
-\renewcommand*{\multicitedelim}{\setunit{\addsemicolon\addspace}}%
+\renewcommand*{\multicitedelim}{\addsemicolon\addspace}%
\newcommand*{\labelyeardelim}{\addspace}
@@ -101,7 +100,7 @@
\printfield[parens]{year}%
\setunit{\addspace}%
\iffieldundef{postnote}{\printfield{pages}}{\printfield{postnote}}%
- \setunit{\addspace}\printtext{s\adddot\addnbthinspace v\adddot}%
+ \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@uniquename=1 \printnames{labelname}}%
@@ -109,9 +108,13 @@
\newbibmacro{cite}{%
- \ifboolexpr{bool{cbx:lexikon} and bool {bbx:lexika}}%
- {\usebibmacro{cite:lexikon}}%
- {\printtext[bibhyperref]{\iffieldundef{shorthand}
+ \ifboolexpr{%
+ test {\ifbool{bbx:lexika}}%
+ and %
+ test {\ifentrytype{inreference}}%
+ }%
+{\usebibmacro{cite:lexikon}}%
+ {\printtext[bibhyperref]{\iffieldundef{shorthand}%
{\ifnameundef{labelname}%
{\usebibmacro{cite:label}%
\setunit{\labelyeardelim}}%
@@ -120,33 +123,37 @@
\usebibmacro{cite:year}}%
{\printfield{shorthand}}}}%
}
-%%\newbibmacro{cite:bib}{%
-%% {\iffieldundef{shorthand}
-%% {\ifnameundef{labelname}%
-%% {\usebibmacro{cite:label}%
-%% \setunit{\labelyeardelim}}%
-%% {\printnames{labelname}%
-%% \setunit{\nameyeardelim}}%
-%% \usebibmacro{cite:year}}%
-%% {\printfield{shorthand}}}%
-%%}
+
-%%% Cite Commands %%%
+%% Cite Commands %%%
\DeclareCiteCommand{\cite}%
{\usebibmacro{prenote}}%
- {\usebibmacro{citeindex}%
- \usebibmacro{cite}}%
- {\multicitedelim}%
- {\ifboolexpr{bool{cbx:lexikon} and bool {bbx:lexika}}{}{\usebibmacro{postnote}}}%
-
+{\usebibmacro{citeindex}%
+\usebibmacro{cite}}%
+{\multicitedelim}%
+{\ifboolexpr{%
+test{\ifbool{bbx:lexika}}%
+and%
+test{\ifentrytype{inreference}}%
+}{}{\usebibmacro{postnote}}}%
+
+
+
+
+
+
\DeclareCiteCommand{\parencite}[\mkbibparens]%
{\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
\usebibmacro{cite}}%
{\multicitedelim}%
- {\ifboolexpr{bool{cbx:lexikon} and bool {bbx:lexika}}{}{\usebibmacro{postnote}}}%
+ {\ifboolexpr{%
+ test{\ifbool{bbx:lexika}}%
+ and%
+ test{\ifentrytype{inreference}}%
+ }{}{\usebibmacro{postnote}}}%
\DeclareCiteCommand{\citeauthor}%
@@ -156,8 +163,8 @@
\renewcommand*{\finalnamedelim}{%
\ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
\addspace\bibstring{and}\space}%
- \usebibmacro{prenote}}
- {\usebibmacro{cite:name}}
+ \usebibmacro{prenote}}%
+ {\usebibmacro{cite:name}}%
{\multicitedelim}%
{\usebibmacro{postnote}}%
@@ -175,7 +182,40 @@
}}}%
{\multicitedelim}%
{\usebibmacro{postnote}}%
-%
+
+
+\DeclareMultiCiteCommand{\cbx@cites}{\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\cites}[\cbx@cite@wrapper\cbx@cites]{\cbx@cite}{}
+\DeclareMultiCiteCommand{\cbx@parencites}[\mkbibparens]{\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\cbx@cite@wrapper\cbx@parencites]{\cbx@cite}{}
+
+
+\DeclareCiteCommand{\cbx@cite}
+{\csxdef{prenote:\thefield{entrykey}}{\thefield{prenote}}}
+{\listxadd\cbx@savekeys{\thefield{entrykey}}}
+{}
+{\csxdef{postnote:\thefield{entrykey}}{\thefield{postnote}}}
+
+\newrobustcmd{\cbx@cite@wrapper}[2]{%
+ \def\cbx@savekeys{}%
+ \def\cbx@citecall{#1}%
+ #2\cbx@sortkeysinit\cbx@citesort\cbx@citecall}
+
+\def\cbx@citesort{%
+ \def\do##1{%
+ \ifinlist{##1}{\cbx@savekeys}
+ {\protected@xappto\cbx@citecall{%
+ [\csuse{prenote:##1}][\csuse{postnote:##1}]{##1}}}
+ {}}%
+ \dolistloop{\cbx@sortkeys}}
+\def\cbx@sortkeysinit{%
+ \ifcsundef{blx@sort@\the\c@refsection}
+ {\global\letcs{\cbx@sortkeys}
+ {blx@slists@\the\c@refsection @entry@\blx@sorting}}% Biber
+ {\global\letcs{\cbx@sortkeys}{blx@sort@\the\c@refsection}}}% BibTeX
+\def\cbx@sortkeys{}
+
+
+
\endinput
-%%
%% End of file `archaeologie.cbx'.
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
index 5495bfd4ffb..eb02d7d90f1 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
@@ -1,6 +1,6 @@
% archaeologie --%
% biblatex fuer Archaeologen, Historiker und Philologen
-% Copyright (c) 2015 Lukas C. Bossert | Johannes Friedl
+% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -12,7 +12,7 @@
\ProvidesFile{archaeologie.dbx}%
- [2015/11/11 v1.2 archaeologie --%
+ [2016/01/31 v1.3 archaeologie --%
biblatex fuer Archaeologen, Historiker und Philologen, dbx-Datei]
% new translator etc. fields for "inner" work, that is translator of title (not booktitle) in @in...