summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-10 23:20:55 +0000
committerKarl Berry <karl@freefriends.org>2016-03-10 23:20:55 +0000
commit50fde4c9a5b56177472e5d5538e84cb6333c6b6d (patch)
treefff2a6fe94fee2ab0b8ecc534dfc509a7ca92d16 /Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
parentbfeadd8a67ed0c642c8c55ae3539351962d0b382 (diff)
archaeologie (10mar16)
git-svn-id: svn://tug.org/texlive/trunk@39984 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx')
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx75
1 files changed, 27 insertions, 48 deletions
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
index ad6118d4238..f73ea141312 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
@@ -11,7 +11,7 @@
% version 2005/12/01 or later.
\ProvidesFile{archaeologie.cbx}%
- [2016/01/31 v1.3 archaeologie --%
+ [2016/03/10 v1.4 archaeologie --%
biblatex fuer Archaeologen, Historiker und Philologen, cbx-Datei]
\ExecuteBibliographyOptions{%
citetracker=true,%
@@ -23,12 +23,12 @@
}%
%%%%%%%% cbx %%%%%%%%%%
-\newbool{cbx:jahrinklammern}%
+\newbool{cbx:yearinparens}%jahrinklammern
%%%%%%%% \DeclareBibliographyOption %%%%%%%%%%
-\DeclareBibliographyOption{jahrinklammern}[true]{%
+\DeclareBibliographyOption{yearinparens}[true]{%
\ifstrequal{#1}{true}
{\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}
- \csuse{bool#1}{cbx:jahrinklammern}}
+ \csuse{bool#1}{cbx:yearinparens}}
{\DeclareFieldFormat{citeyear}{##1}}}
\DeclareFieldFormat{citeyear}{#1}
@@ -36,12 +36,26 @@
\DeclareFieldFormat{postnote}{#1}%
\DeclareFieldFormat{shorttitle}{#1}%
-\DeclareNameFormat{frg}{%
-#1%
- \ifthenelse{\value{listcount}<\value{liststop}}%
- {\addspace\textendash\addspace}{}%
-}%
+
+ \DeclareNameFormat{frg}{%
+ \nameparts{#1}%
+ \ifgiveninits
+ {\usebibmacro{name:family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefix}
+ {\namepartsuffix}}
+ {\usebibmacro{name:family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}}%
+ \usebibmacro{name:andothers}}
+
+
+
+
\renewcommand*{\multicitedelim}{\addsemicolon\addspace}%
\newcommand*{\labelyeardelim}{\addspace}
@@ -71,7 +85,7 @@
}
\newbibmacro*{cite:name}{% % 0: only last names, 1: last name + first name initials, 2: full name
- \ifbool{cbx:vollername}{\c@uniquename=2}{\ifbool{cbx:nurnachname}{\c@uniquename=0}{\c@uniquename=1}}
+ \ifbool{cbx:fullnames}{\c@uniquename=2}{\ifbool{cbx:lastnames}{\c@uniquename=0}{\c@uniquename=1}}
\ifciteindex{\indexnames{labelname}}{}%
\printtext[bibhyperref]{%
\iffootnote{\c@uniquename=0 \printnames{labelname}}{\printnames{labelname}}}}
@@ -109,7 +123,7 @@
\newbibmacro{cite}{%
\ifboolexpr{%
- test {\ifbool{bbx:lexika}}%
+ test {\ifbool{bbx:inreferences}}%
and %
test {\ifentrytype{inreference}}%
}%
@@ -134,7 +148,7 @@
\usebibmacro{cite}}%
{\multicitedelim}%
{\ifboolexpr{%
-test{\ifbool{bbx:lexika}}%
+test{\ifbool{bbx:inreferences}}%
and%
test{\ifentrytype{inreference}}%
}{}{\usebibmacro{postnote}}}%
@@ -150,7 +164,7 @@ test{\ifentrytype{inreference}}%
\usebibmacro{cite}}%
{\multicitedelim}%
{\ifboolexpr{%
- test{\ifbool{bbx:lexika}}%
+ test{\ifbool{bbx:inreferences}}%
and%
test{\ifentrytype{inreference}}%
}{}{\usebibmacro{postnote}}}%
@@ -182,40 +196,5 @@ test{\ifentrytype{inreference}}%
}}}%
{\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'.