diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/archaeologie')
3 files changed, 120 insertions, 42 deletions
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx index 0513f9c5ccf..57c484fd9aa 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx @@ -1,7 +1,7 @@ % archaeologie --% % biblatex for archaeologists, % historians and philologists -% Copyright (c) 2018 Lukas C. Bossert | Johannes Friedl +% Copyright (c) 2016-2018 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 @@ -10,14 +10,13 @@ % 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{2018/02/13} -\def\arch@version{2.3.5} +\def\arch@date{2018/02/20} +\def\arch@version{2.3.6} \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)} -\ProvidesFile{archaeologie.bbx}% - [\arch@bbxid] +\ProvidesFile{archaeologie.bbx}[\arch@bbxid] \RequireBibliographyStyle{standard} \AtBeginDocument{% \urlstyle{sf}% @@ -37,7 +36,9 @@ bibencoding=utf8,% dateabbrev=false, % sorting=nyt,% - labeldateparts=true, + alldates=comp,% + labeldateparts=true,% + labeldate=year,% maxnames=2,% minnames=1,% maxitems=1,% @@ -99,8 +100,10 @@ \DeclareBibliographyOption[boolean]{urn}[true]{% \settoggle{bbx:urn}{#1}} \ExecuteBibliographyOptions{% - jstor,% urn,% + lstabbrv,% + lstlocations,% + lstpublishers,% } %----------------------- \DeclareBibliographyOption{edby}[true]{\csuse{bool#1}{bbx:edby}} @@ -144,16 +147,19 @@ {Zusätzlich geladene oder \xout{deaktivierte} Optionen von \textsc{bib}\LaTeX-\textsf{archaeologie} (Version \archaeologieversion~| \archaeologiedate):}% {Additional options of \textsc{bib}\LaTeX-\textsf{archaeologie} (version \archaeologieversion~| \archaeologiedate) used or \xout{omitted}:}\addspace}% - {\ifthenelse{\equal{#1}{plain}}{}{{\PackageError{biblatex-archaeologie}% - {command 'archaeologieoptions[#1]' invalid.\MessageBreak% - Use 'archaeologieoptions[plain]' or omit the brackets.}{} + {\ifthenelse{\equal{#1}{plain}} + {} + {{\PackageError{biblatex-archaeologie}% + {command 'archaeologieoptions[#1]' invalid.\MessageBreak% + Use 'archaeologieoptions[plain]' + or omit the brackets.}{} }}}% \def\seperator{ | }% \ifbool{bib:bibancient}{bibancient\seperator}{}% \ifbool{bib:bibcorpora}{bibcorpora\seperator}{}% - \ifbool{bib:lstabbrv}{lstabbrv\seperator}{}% - \ifbool{bib:lstlocations}{lstlocations\seperator}{}% - \ifbool{bib:lstpublishers}{lstpublishers\seperator}{}% + \ifbool{bib:lstabbrv}{}{\xout{lstabbrv}\seperator}{}% + \ifbool{bib:lstlocations}{}{\xout{lstlocations}\seperator}{}% + \ifbool{bib:lstpublishers}{}{\xout{lstpublishers}\seperator}{}% \ifbool{bbx:bibfullname}{bibfullname\seperator}{}% \ifdefstring\citeauthorformatVALUE{initials}% {} @@ -166,16 +172,18 @@ \ifbool{bbx:publisher}{publisher\seperator}{}% \ifbool{cbx:seenote}{seenote\seperator}{}% \ifbool{bbx:translation}{translation\seperator}{}% - \ifbool{bbx:width}{width=\labwidthsamelineVALUE\seperator}{}% - \ifbool{cbx:yearinparens}{yearinparens\seperator}{}% + \ifbool{bbx:width}% + {width\,=\labwidthsamelineVALUE\seperator}{}% + \ifbool{cbx:yearinparensoption} + {yearinparens\seperator}{}% \ifbool{bbx:yearseries}{yearseries\seperator}{}% \iftoggle{bbx:zenon}{zenon\seperator}{}% - \iftoggle{bbx:jstor}{}{\xout{jstor}\seperator}% + \iftoggle{bbx:jstor}{jstor\seperator}{}% \iftoggle{bbx:urn}{}{\xout{urn}\seperator}% \iftoggle{bbx:doi}{}{\xout{doi}\seperator}% \iflanguage{ngerman}% - {weitere Informationen unter \url{http://biblatex-archaeologie.de}} - {for further information see \url{http://biblatex-archaeologie.de}} + {Weitere Informationen unter \url{http://biblatex-archaeologie.de}} + {For further information see \url{http://biblatex-archaeologie.de}} } %----------------------- \DeclareFieldFormat*{title}{#1\isdot} @@ -788,8 +796,8 @@ \newunit} %----------------------- \DeclareLabeldate{% - \field{year} \field{date} + \field{year} \field{origdate} \field{urldate} \field{pubstate} diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index 83e9eea64e4..437ba54f2b4 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx @@ -1,7 +1,7 @@ % archaeologie --% % biblatex for archaeologists, % historians and philologists -% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl +% Copyright (c) 2016-2018 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 @@ -10,12 +10,12 @@ % 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.cbx}% - [\arch@cbxid] +\ProvidesFile{archaeologie.cbx}[\arch@cbxid] %----------------------- \newbool{cbx:yearinparens} \newbool{cbx:seenote} \newbool{cbx:uniqueme} +\newbool{cbx:yearinparensoption} %----------------------- %\renewcommand*{\multicitedelim}{\addsemicolon\addspace} \newcommand*{\labelyeardelim}{\addspace} @@ -81,24 +81,12 @@ \global\cslet{cbx@bseen@names@\the\c@refsection}\@empty \global\cslet{cbx@fseen@names@\the\c@refsection}\@empty} -%\renewrobustcmd*{\citereset}{% -% \csuse{blx@hook@cbxinit}% -% \@ifstar -% {} -% {\global\cslet{blx@bsee@\the\c@refsection}\@empty -% \global\cslet{blx@fsee@\the\c@refsection}\@empty -% \global\cslet{cbx@bseen@names@\the\c@refsection}\@empty -% \global\cslet{cbx@fseen@names@\the\c@refsection}\@empty -% \blx@ibidreset@force -% \blx@idemreset@force -% \blx@opcitreset@force -% \blx@loccitreset@force}} - %----------------------- \DeclareBibliographyOption{yearinparens}[true]{% \ifstrequal{#1}{true}% {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}% - \csuse{bool#1}{cbx:yearinparens}}% + \csuse{bool#1}{cbx:yearinparens} + \booltrue{cbx:yearinparensoption}}% {\DeclareFieldFormat{citeyear}{##1}}}% \DeclareBibliographyOption{seenote}[true]{% \csuse{bool#1}{cbx:seenote}% @@ -108,7 +96,7 @@ {\csuse{cbx@arch@citeauthorformat@#1}}% {\PackageError{biblatex-archaeologie}% {Option 'citeauthorformat=#1' invalid.\MessageBreak - Use one of the values 'initials', 'full', 'family' or 'firstfull'.}{}}% + Use one of the values 'initials', 'full', 'family', 'firstfulltheninitials' or 'firstfullthenfamily'.}{}}% \def\citeauthorformatVALUE{#1}} \DeclareEntryOption{uniqueme}[true]{\csuse{bool#1}{cbx:uniqueme}} %----------------------- @@ -206,7 +194,7 @@ \def\cbx@arch@citeauthorformat@initials{% \DeclareNameAlias{citeauthor}{name:initials}} - \DeclareNameFormat{citeauthor:fancy}{% + \DeclareNameFormat{citeauthor:firstfulltheninitials}{% \cbx@ifnameseen{\thefield{hash}} {\ifnum\value{uniquename}=2 \usebibmacro{name:given-family} @@ -235,8 +223,91 @@ \cbx@nametracker{\thefield{hash}}}% \usebibmacro{name:andothers}} + +\DeclareNameFormat{citeauthor:firstinitialsthenfamily}{% + \cbx@ifnameseen{\thefield{hash}} + {} + {\ifnumequal{\value{uniquename}}{0} + {\stepcounter{uniquename}} + {}% + \cbx@nametracker{\thefield{hash}}}% + \ifcase\value{uniquename}% + \usebibmacro{name:family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \or + \ifuseprefix + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffixi}} + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefixi} + {\namepartsuffixi}}% + \or + \usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \fi + \usebibmacro{name:andothers}} + +\DeclareNameFormat{citeauthor:firstfullthenfamily}{% + \cbx@ifnameseen{\thefield{hash}} + {\ifcase\value{uniquename}% + \usebibmacro{name:family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \or + \ifuseprefix + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffixi}} + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefixi} + {\namepartsuffixi}}% + \or + \usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \fi} + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix} + \cbx@nametracker{\thefield{hash}}}% + \usebibmacro{name:andothers}} + +\def\cbx@arch@citeauthorformat@firstfulltheninitials{% + \DeclareNameAlias{citeauthor}{citeauthor:firstfulltheninitials}} + +\def\cbx@arch@citeauthorformat@firstfullthenfamily{% + \DeclareNameAlias{citeauthor}{citeauthor:firstfullthenfamily}} + +\def\cbx@arch@citeauthorformat@firstinitialsthenfamily{% + \DeclareNameAlias{citeauthor}{citeauthor:firstinitialsthenfamily}} + + \def\cbx@arch@citeauthorformat@firstfull{% - \DeclareNameAlias{citeauthor}{citeauthor:fancy}} + \PackageWarningNoLine{biblatex-archaeologie}{% + Value 'firstfull' for 'citeauthorformat' is deprecated,\MessageBreak + use 'firstfulltheninitials' instead.}% + \cbx@arch@citeauthorformat@firstfulltheninitials} %----------------------- \ExecuteBibliographyOptions{% citetracker=true, @@ -245,7 +316,6 @@ opcittracker=true, loccittracker=true, nametracker=context, - alldates=comp, dateuncertain=true, datecirca=true, citeauthorformat=initials, diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx index 93aedc4571c..662bf36bacd 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx @@ -1,7 +1,7 @@ % archaeologie --% % biblatex for archaeologists, % historians and philologists -% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl +% Copyright (c) 2016-2018 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 @@ -17,7 +17,7 @@ \DeclareDatamodelFields[type=list,datatype=name]{ineditor, intranslator, inannotator, incommentator, inintroduction, inforeword, inafterword} \DeclareDatamodelEntryfields[inbook,incollection,inproceedings,inreference]{ineditor, intranslator, inannotator, incommentator, inintroduction, inforeword, inafterword} \DeclareDatamodelEntrytypes{talk} -\DeclareDatamodelEntryfields[talk]{author,title,subtitle,titleaddon,date,venue,institution,eventtitle,eventdate,url,urldate,note,} +\DeclareDatamodelEntryfields[talk]{author,title,subtitle,titleaddon,date,labeldate,year,venue,institution,eventtitle,eventdate,url,urldate,note} \DeclareDatamodelFields[type=field,datatype=verbatim]{zenon} \DeclareDatamodelEntryfields{zenon} \DeclareDatamodelFields[type=field,datatype=verbatim]{urn} |