diff options
author | Karl Berry <karl@freefriends.org> | 2016-03-10 23:20:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-03-10 23:20:55 +0000 |
commit | 50fde4c9a5b56177472e5d5538e84cb6333c6b6d (patch) | |
tree | fff2a6fe94fee2ab0b8ecc534dfc509a7ca92d16 /Master/texmf-dist/tex/latex | |
parent | bfeadd8a67ed0c642c8c55ae3539351962d0b382 (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')
7 files changed, 88 insertions, 109 deletions
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx index fea65e4bcbd..abea3686465 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx @@ -12,7 +12,7 @@ \ProvidesFile{archaeologie-english.lbx}% - [2016/01/31 v1.3 archaeologie --% + [2016/03/10 v1.4 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 index e5513c3e1c2..4ddf6c54aa7 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx @@ -12,7 +12,7 @@ \ProvidesFile{archaeologie-french.lbx}% - [2016/01/31 v1.3 archaeologie --% + [2016/03/10 v1.4 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei] \InheritBibliographyExtras{french} \DefineBibliographyExtras{french}{\restorecommand\mkbibnamelast} diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx index 5ba1edfbb40..6d0e300fc54 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx @@ -12,7 +12,7 @@ \ProvidesFile{archaeologie-italian.lbx}% - [2016/01/31 v1.3 archaeologie --% + [2016/03/10 v1.4 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei] \InheritBibliographyExtras{italian} diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx index 389fec4e4fb..b667fc6a80c 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx @@ -12,7 +12,7 @@ \ProvidesFile{archaeologie-ngerman.lbx}% - [2016/01/31 v1.3 archaeologie --% + [2016/03/10 v1.4 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 7baba064684..e9af9ddcbff 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx @@ -11,7 +11,7 @@ % version 2005/12/01 or later. \ProvidesFile{archaeologie.bbx}% - [2016/01/31 v1.3 archaeologie --% + [2016/03/10 v1.4 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, bbx-Datei] \RequireBibliographyStyle{standard} \AtBeginDocument{% @@ -21,11 +21,11 @@ Historiker und Philologen} } \ExecuteBibliographyOptions{% pagetracker=true,% -firstinits=true, -sortlocale=de_DE, -language=auto,autolang=other, +giveninits=true, +sortlocale=auto, +language=auto, +autolang=other, bibencoding=utf8,% -sortlocale=de,% dateabbrev=false,% sorting=nyt,% maxnames=2,% @@ -37,48 +37,48 @@ maxbibnames=999,% \addbibresource{dai-abkuerzungen.bib} %\addbibresource{antike-corpora.bib} % Version 2.0 -\newbool{bbx:hrsgv} -\newbool{bbx:abstand} -\newbool{bbx:jahrreihe} -\newbool{bbx:bibvollername} -\newbool{bbx:lexika} -\newbool{bbx:keineabkuerzung}% -\newbool{bbx:uebersetzung}% -\newbool{bbx:verlag} +\newbool{bbx:edby}%hrsgv +\newbool{bbx:width}%abstand +\newbool{bbx:yearseries}%jahrserie +\newbool{bbx:bibfullname}%bibfullnames +\newbool{bbx:inreferences} %lexika +\newbool{bbx:noabbrevs}% keineabkuerzung +\newbool{bbx:translation}% uebersetzung +\newbool{bbx:publisher}% verlag \newbool{cbx:antik}% \newbool{cbx:frgantik}% \newbool{cbx:corpus}% -\newbool{cbx:nurnachname} -\newbool{cbx:vollername} +\newbool{cbx:lastnames}% nurnachname +\newbool{cbx:fullnames}% vollername %% \DeclareBibliographyOption %% -\DeclareBibliographyOption{hrsgv}[true]{\csuse{bool#1}{bbx:hrsgv}} -\DeclareBibliographyOption{abstand}[]{% - \csuse{booltrue}{bbx:abstand} - \newcommand{\abstand}{#1}% +\DeclareBibliographyOption{edby}[true]{\csuse{bool#1}{bbx:edby}} +\DeclareBibliographyOption{width}[]{% + \csuse{booltrue}{bbx:width} + \newcommand{\width}{#1}% } -\DeclareBibliographyOption{jahrreihe}[true]{\csuse{bool#1}{bbx:jahrreihe}} -\DeclareBibliographyOption{bibvollername}[true]{\ExecuteBibliographyOptions{firstinits=false}} -\DeclareBibliographyOption{lexika}[true]{\csuse{bool#1}{bbx:lexika} +\DeclareBibliographyOption{yearseries}[true]{\csuse{bool#1}{bbx:yearseries}} +\DeclareBibliographyOption{bibfullname}[true]{\ExecuteBibliographyOptions{firstinits=false}} +\DeclareBibliographyOption{reference}[true]{\csuse{bool#1}{bbx:inreferences} \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} +\DeclareBibliographyOption{noabbrevs}[true]{\csuse{bool#1}{bbx:noabbrevs}} +\DeclareBibliographyOption{translation}[true]{\csuse{bool#1}{bbx:translation}} +\DeclareBibliographyOption{publisher}[true]{\csuse{bool#1}{bbx:publisher} \ExecuteBibliographyOptions{% maxitems=2, }% } -\DeclareBibliographyOption{nurnachname}[true]{% - \csuse{booltrue}{cbx:nurnachname}% - \csuse{boolfalse}{cbx:vollername}% +\DeclareBibliographyOption{lastnames}[true]{% + \csuse{booltrue}{cbx:lastnames}% + \csuse{boolfalse}{cbx:fullnames}% } -\DeclareBibliographyOption{vollername}[true]{% - \csuse{boolfalse}{cbx:nurnachname}% - \csuse{booltrue}{cbx:vollername}% +\DeclareBibliographyOption{fullnames}[true]{% + \csuse{boolfalse}{cbx:lastnames}% + \csuse{booltrue}{cbx:fullnames}% } -\DeclareBibliographyOption{kapitaelchen}[true]{% +\DeclareBibliographyOption{scshape}[true]{% \ifstrequal{#1}{true}% {\AtEveryCite{\renewcommand*{\mkbibnamelast}[1]{\textsc{##1}}}}% {}} @@ -187,7 +187,7 @@ maxbibnames=999,% }} -\DeclareNameAlias{author}{first-last} +\DeclareNameAlias{author}{given-family} \DeclareNameAlias{editor}{author} \DeclareNameAlias{translator}{author} @@ -197,7 +197,7 @@ maxbibnames=999,% } \AtEveryBibitem{% - \ifboolexpr{bool {bbx:uebersetzung} or bool {cbx:antik} or bool {cbx:frgantik}}% + \ifboolexpr{bool {bbx:translation} or bool {cbx:antik} or bool {cbx:frgantik}}% {}% {% \clearname{translator}% @@ -366,7 +366,7 @@ maxbibnames=999,% \newbibmacro*{series}{% \ifboolexpr{test {\iffieldundef{shortseries}} % - or bool {bbx:keineabkuerzung}}% + or bool {bbx:noabbrevs}}% {\printtext[seriestitle]{\printfield[titlecase]{series}}}% {\printfield{shortseries}}% } @@ -377,7 +377,7 @@ maxbibnames=999,% \usebibmacro{series}% \setunit*{\addspace}% \printfield{number}% - \ifbool{bbx:jahrreihe}% + \ifbool{bbx:yearseries}% {\newunit}% {\setunit{\addspace}}% }% @@ -386,7 +386,7 @@ maxbibnames=999,% \renewbibmacro*{journal}{% \ifboolexpr{test {\iffieldundef{shortjournal}} % - or bool {bbx:keineabkuerzung}}% + or bool {bbx:noabbrevs}}% {\printtext[journaltitle]{% \printfield[titlecase]{journaltitle}% \setunit{\subtitlepunct}% @@ -544,7 +544,7 @@ maxbibnames=999,% and test {\iffieldundef{publisher}}% and test {\iffieldundef{year}}}% {}% - {\ifbool{bbx:verlag}% + {\ifbool{bbx:publisher}% {\printtext[parens]{% \printlist{location}% \setunit*{\addcolon\addspace}% @@ -620,7 +620,7 @@ maxbibnames=999,% \setunit{\addspace}% \usebibmacro{volume}% }{% - \ifbool{bbx:hrsgv}{% + \ifbool{bbx:edby}{% \usebibmacro{booktitle}% \setunit{\addspace}% \usebibmacro{volume}% @@ -713,12 +713,12 @@ maxbibnames=999,% \usebibmacro{maintitle+title+volumes}% \newunit\newblock% \usebibmacro{translation}% - \ifbool{bbx:jahrreihe}{}% + \ifbool{bbx:yearseries}{}% {\newunit\usebibmacro{series+number}}% \setunit{\addspace}\newblock% \usebibmacro{location+edition+year}% \setunit*{\addspace}\newblock% - \ifbool{bbx:jahrreihe}% + \ifbool{bbx:yearseries}% {\usebibmacro{series+number}}{}% \usebibmacro{addendum}% \usebibmacro{doi+eprint+url}% @@ -764,12 +764,12 @@ maxbibnames=999,% \usebibmacro{maintitle+title+volumes}% \usebibmacro{event+venue+date}% \setunit*{\addspace}% - \ifbool{bbx:jahrreihe}{}% + \ifbool{bbx:yearseries}{}% {\newunit\usebibmacro{series+number}}% \setunit{\addspace}\newblock% \usebibmacro{location+edition+year}% \setunit*{\addspace}\newblock% - \ifbool{bbx:jahrreihe}{% + \ifbool{bbx:yearseries}{% \usebibmacro{series+number}}{}% \usebibmacro{addendum}% \usebibmacro{doi+eprint+url}% @@ -796,12 +796,12 @@ maxbibnames=999,% \usebibmacro{booktitle+volume+editor}% \usebibmacro{event+venue+date}% \setunit{\addspace}% - \ifbool{bbx:jahrreihe}{}% + \ifbool{bbx:yearseries}{}% {\newunit\usebibmacro{series+number}}% \setunit{\addspace}\newblock% \usebibmacro{location+edition+year}% \setunit*{\addspace}\newblock% - \ifbool{bbx:jahrreihe}{% + \ifbool{bbx:yearseries}{% \usebibmacro{series+number}}{}% \usebibmacro{pages}% \setunit{\addspace}% @@ -831,12 +831,12 @@ maxbibnames=999,% \usebibmacro{in:}% \usebibmacro{booktitle+volume+editor}% \setunit{\addspace}% - \ifbool{bbx:jahrreihe}{}% + \ifbool{bbx:yearseries}{}% {\newunit\usebibmacro{series+number}}% \setunit{\addspace}\newblock% \usebibmacro{location+edition+year}% \setunit*{\addspace}\newblock% - \ifbool{bbx:jahrreihe}% + \ifbool{bbx:yearseries}% {\usebibmacro{series+number}}{}% \usebibmacro{pages}% \setunit{\addspace}% @@ -880,20 +880,20 @@ maxbibnames=999,% \DeclareBibliographyDriver{review}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% - \usebibmacro{author/editor} + \usebibmacro{author/editor}% \setunit*{\labelnamepunct}\newblock% \iffieldundef{title}{}% {\usebibmacro{title}}% - \newunit\newblock - \usebibmacro{related:init} - \usebibmacro{related}% % - \newunit\newblock + \newunit\newblock% + \usebibmacro{related:init}% + \usebibmacro{related}% + \newunit\newblock% \usebibmacro{journal+number+year}% \newunit\newblock% \usebibmacro{pages}% \usebibmacro{doi+eprint+url}% \usebibmacro{signatur}% - \newunit\newblock + \newunit\newblock% \usebibmacro{savestuff}% \usebibmacro{finentry}% } @@ -903,12 +903,12 @@ maxbibnames=999,% \newbibmacro{labelwidthbib}{% \begingroup% \DeclareFieldFormat{bibhyperref}{##1}% - \csuse{blx@hook@cite}% + \csuse{blx@hook@cite}% \csuse{blx@hook@citekey}% \defcounter{maxnames}{\blx@maxcitenames}% \usebibmacro{cite}% \endgroup% - } +} \newbibmacro{kicklabel}{% @@ -921,7 +921,7 @@ maxbibnames=999,% {\list% {\usebibmacro{labelwidthbib}}% {\setlength{\labelwidth}{% - \ifbool{bbx:abstand}{\abstand}{\shorthandwidth}}% + \ifbool{bbx:width}{\width}{\shorthandwidth}}% \setlength{\leftmargin}{\labelwidth}% \setlength{\labelsep}{\biblabelsep}% \addtolength{\leftmargin}{\labelsep}% 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'. diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx index eb02d7d90f1..1336f491ec8 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx @@ -12,7 +12,7 @@ \ProvidesFile{archaeologie.dbx}% - [2016/01/31 v1.3 archaeologie --% + [2016/03/10 v1.4 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... |