From 0ae54512aa6f0dbabb5ae4b9f8ba4f08d9c4890a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 28 Feb 2017 21:23:38 +0000 Subject: archaeologie (28feb17) git-svn-id: svn://tug.org/texlive/trunk@43357 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/archaeologie/archaeologie-english.lbx | 19 +- .../tex/latex/archaeologie/archaeologie-french.lbx | 8 +- .../tex/latex/archaeologie/archaeologie-german.lbx | 43 ++++ .../latex/archaeologie/archaeologie-italian.lbx | 27 +- .../latex/archaeologie/archaeologie-ngerman.lbx | 41 --- .../latex/archaeologie/archaeologie-spanish.lbx | 12 +- .../tex/latex/archaeologie/archaeologie.bbx | 277 +++++++++------------ .../tex/latex/archaeologie/archaeologie.cbx | 240 ++++++++++++------ .../tex/latex/archaeologie/archaeologie.dbx | 6 +- 9 files changed, 355 insertions(+), 318 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/archaeologie/archaeologie-german.lbx delete mode 100644 Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx (limited to 'Master/texmf-dist/tex/latex/archaeologie') diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx index e1ea38a4caa..413971f3d06 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx @@ -1,7 +1,7 @@ % archaeologie --% % biblatex for archaeologists, % historians and philologists -% 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 @@ -20,23 +20,25 @@ \NewBibliographyString{talk} \NewBibliographyString{editor} \NewBibliographyString{subvoce} +\NewBibliographyString{owntranslation} + \DeclareBibliographyStrings{% inherit = {english}, subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, - reference = {{Article}{Art\adddot}}, - origtitle = {{original title}{orig\adddot title}}, - firstprint = {{first\addspace edition}{first\addspace edition}}, - talk = {{talk}{talk}}, - fromamerican ={{from\addspace American} {from\addspace American}}, + reference = {{Article}{Art\adddot}}, + origtitle = {{original title}{orig\adddot title}}, + firstprint = {{first\addspace edition}{first\addspace edition}}, + talk = {{talk}{talk}}, + fromamerican = {{from\addspace American} {from\addspace American}}, frombrazilian = {{from\addspace Brazilian}{from\addspace Brazilian}}, fromcroatian = {{from\addspace Croatian}{from\addspace Croatian}}, fromdanish = {{from\addspace Danish}{from\addspace Danish}}, fromdutch = {{from\addspace Dutch}{from\addspace Dutch}}, fromenglish = {{from\addspace English}{from\addspace English}}, fromfinnish = {{from\addspace Finnish}{from\addspace Finnish}}, - fromfrench = { {from\addspace French}{from\addspace French}}, - fromgerman ={{from\addspace German} {from\addspace German}}, + fromfrench = {{from\addspace French}{from\addspace French}}, + fromgerman = {{from\addspace German} {from\addspace German}}, fromgreek = {{from\addspace Greek}{from\addspace Greek}}, fromitalian = {{from\addspace Italian}{from\addspace Italian}}, fromlatin = {{from\addspace Latin}{from\addspace Latin}}, @@ -45,5 +47,6 @@ fromrussian = {{from\addspace Russian}{from\addspace Russian}}, fromspanish = {{from\addspace Spanish}{from\addspace Spanish}}, fromswedish = {{from\addspace Swedish}{from\addspace Swedish}}, + owntranslation = {{own\addspace trans\adddot}{own\addspace translation}}, } \endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx index ef09873e9b6..c1506bdef32 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx @@ -1,7 +1,7 @@ % archaeologie --% % biblatex for archaeologists, % historians and philologists -% 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 @@ -24,6 +24,7 @@ \NewBibliographyString{translationof} \NewBibliographyString{talk} \NewBibliographyString{subvoce} +\NewBibliographyString{owntranslation} \DeclareBibliographyStrings{% @@ -32,9 +33,9 @@ translationof = {{traduction\addspace de}{trad\adddot\addspace de}}, reference = {{article}{art\adddot}}, reviewof = {{recension\addspace de}{rec\adddot\addspace de}}, - origtitle = {{titre original}{titre orig.\adddot}}, + origtitle = {{titre original}{titre orig.\adddot}}, firstprint = {{première\addspace édition}{première\addspace éd\adddot}}, - talk = {{conférence}{conf.}}, + talk = {{conférence}{conf.}}, fromamerican = {{depuis\addspace l'anglais américain} {depuis\addspace l'anglais américain}}, frombrazilian = {{depuis\addspace le\addspace brésilien}{depuis\addspace le\addspace brésilien}}, fromcroatian = {{depuis\addspace le\addspace croatien}{depuis\addspace le\addspace croatien}}, @@ -52,4 +53,5 @@ fromrussian = {{depuis\addspace le\addspace russe}{depuis\addspace le\addspace russe}}, fromspanish = {{depuis\addspace l'espagnole}{depuis\addspace l'espagnol}}, fromswedish = {{depuis\addspace le\addspace suédois}{depuis\addspace le\addspace suédois}}, + owntranslation = {{}{}},% FIX ME! } \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-german.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-german.lbx new file mode 100644 index 00000000000..da9d1243e2c --- /dev/null +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-german.lbx @@ -0,0 +1,43 @@ +% archaeologie --% +% biblatex for archaeologists, +% historians and philologists +% 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 +% 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-german.lbx}% + [\arch@lbxid] +\InheritBibliographyExtras{ngerman} + +\NewBibliographyString{origtitle} +\NewBibliographyString{firstprint} +\NewBibliographyString{reviewof} +\NewBibliographyString{reference} +\NewBibliographyString{translationof} +\NewBibliographyString{talk} + +\NewBibliographyString{seenote} +\NewBibliographyString{loccit} +\NewBibliographyString{subvoce} +\NewBibliographyString{owntranslation} + + +\DeclareBibliographyStrings{% + inherit = {ngerman}, + subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, + reference = {{Artikel}{Art\adddot}}, + reviewof = {{Rezension\addspace zu}{Rez\adddot\addabthinspace zu}}, + origtitle = {{Originaltitel}{Orig\adddot titel}}, + firstprint = {{Erstauflage}{Erstaufl\adddot}}, + talk = {{Vortrag}{Vortrag}}, + seenote = {{Anmerkung}{Anm\adddot}}, + loccit = {{am\addabthinspace Ort}{a\adddot\addabthinspace O\adddot}}, + translationof = {{\"Ubersetzung\addspace von}{\"Ubers\adddot\addspace von}}, + owntranslation = {{eigene\addspace\"Ubersetzung}{eig\adddot\addspace\"Ubers\adddot}}, + } +\endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx index 968a5a0294d..4536a4404e7 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx @@ -1,7 +1,7 @@ % archaeologie --% % biblatex for archaeologists, % historians and philologists -% 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 @@ -28,21 +28,24 @@ \NewBibliographyString{inpress} \NewBibliographyString{prepublished} \NewBibliographyString{subvoce} +\NewBibliographyString{owntranslation} + \DeclareBibliographyStrings{% inherit = {italian}, subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, - translationof = {{traduzione\addspace di}{trad\adddot\addabthinspace di}}, - reference = {{articolo}{art\adddot}}, - reviewof = {{recensione\addspace di}{recens\adddot\addabthinspace di}}, - origtitle = {{titolo\addspace originale}{titolo\addspace orig\adddot}}, - firstprint = {{prima\addspace edizione}{prima\addspace edizione}}, - talk = {{presentazione}{presentazione}}, - inpreparation = {{in\addspace preparazione}{in prep\adddot}}, - submitted = {{}{}}, - inpress = {{in\addspace corso\addspace di\addspace stampa}{c\adddot\addabthinspace d\adddot\addabthinspace s\adddot}}, - prepublished = {{}{}}, - forthcoming = {{prossimo}{prossimo}}, + translationof = {{traduzione\addspace di}{trad\adddot\addabthinspace di}}, + reference = {{articolo}{art\adddot}}, + reviewof = {{recensione\addspace di}{recens\adddot\addabthinspace di}}, + origtitle = {{titolo\addspace originale}{titolo\addspace orig\adddot}}, + firstprint = {{prima\addspace edizione}{prima\addspace edizione}}, + talk = {{presentazione}{presentazione}}, + inpreparation = {{in\addspace preparazione}{in prep\adddot}}, + submitted = {{}{}},% FIX ME! + inpress = {{in\addspace corso\addspace di\addspace stampa}{c\adddot\addabthinspace d\adddot\addabthinspace s\adddot}}, + prepublished = {{}{}},% FIX ME! + forthcoming = {{prossimo}{prossimo}}, + owntranslation = {{}{}},% FIX ME! } \endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx deleted file mode 100644 index bd71988d1d9..00000000000 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx +++ /dev/null @@ -1,41 +0,0 @@ -% archaeologie --% -% biblatex for archaeologists, -% historians and philologists -% 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-ngerman.lbx}% - [\arch@lbxid] -\InheritBibliographyExtras{ngerman} - -\NewBibliographyString{origtitle} -\NewBibliographyString{firstprint} -\NewBibliographyString{reviewof} -\NewBibliographyString{reference} -\NewBibliographyString{translationof} -\NewBibliographyString{talk} - -\NewBibliographyString{seenote} -\NewBibliographyString{loccit} -\NewBibliographyString{subvoce} - - -\DeclareBibliographyStrings{% - inherit = {ngerman}, - subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, - reference = {{Artikel}{Art\adddot}}, - reviewof = {{Rezension\addspace zu}{Rez\adddot\addabthinspace zu}}, - origtitle = {{Originaltitel}{Orig\adddot titel}}, - firstprint = {{Erstauflage}{Erstaufl\adddot}}, - talk = {{Vortrag}{Vortrag}}, - seenote = {{Anmerkung}{Anm\adddot}}, - loccit = {{am\addabthinspace Ort}{a\adddot\addabthinspace O\adddot}}, - translationof = {{\"Ubersetzung\addspace von}{\"Ubers\adddot\addspace von}}, - } -\endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx index a47772249c2..5d2b9a6c0f0 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx @@ -1,7 +1,7 @@ % archaeologie --% % biblatex for archaeologists, % historians and philologists -% 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 @@ -21,13 +21,15 @@ \NewBibliographyString{reference} \NewBibliographyString{talk} \NewBibliographyString{subvoce} +\NewBibliographyString{owntranslation} \DeclareBibliographyStrings{% inherit = {spanish}, subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, - reference = {{Artículo}{Art\adddot}}, - origtitle = {{Título\addspace original}{Título\addspace original}}, - firstprint = {{Primera\addspace edición}{Primera\addspace edición}}, - talk = {{Conferencia}{Conferencia}}, + reference = {{Artículo}{Art\adddot}}, + origtitle = {{Título\addspace original}{Título\addspace original}}, + firstprint = {{Primera\addspace edición}{Primera\addspace edición}}, + talk = {{Conferencia}{Conferencia}}, + owntranslation = {{}{}},% FIX ME! } \endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx index d75557fb57f..cd9eadb3233 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) 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 @@ -10,25 +10,23 @@ % 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{2016-10-06} -\def\arch@version{2.2b} +\def\arch@date{2017-02-27} +\def\arch@version{2.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@dbxid{\arch@date\space v\arch@version\space biblatex-archaeologie data (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] \RequireBibliographyStyle{standard} \AtBeginDocument{% - \RequirePackage[normalem]{ulem} - %\RequirePackage{csquotes} \urlstyle{sf}% \typeout{* * * archaeologie * * * biblatex for archaeologists, historians and philologists} } - +\RequirePackage[normalem]{ulem} +%\RequirePackage{csquotes} \def\archaeologieversion{\arch@version} \def\archaeologiedate{\arch@date} \ExecuteBibliographyOptions{% @@ -45,6 +43,7 @@ minnames=1,% maxitems=1,% maxbibnames=999,% + useprefix=true,% } %----------------------- \newbool{bbx:edby} @@ -171,6 +170,9 @@ \iftoggle{bbx:jstor}{}{\xout{jstor}\seperator}% \iftoggle{bbx:urn}{}{\xout{urn}\seperator}% \iftoggle{bbx:doi}{}{\xout{doi}\seperator}% + \iflanguage{ngerman}% + {weitere Informationen unter \url{http://biblatex-archaeologie.de}} + {further information see \url{http://biblatex-archaeologie.de}} } %----------------------- \DeclareFieldFormat*{title}{#1} @@ -186,6 +188,7 @@ \DeclareFieldFormat{edition}{#1} \DeclareFieldFormat{volumes}{#1} \DeclareFieldFormat{volume}{#1} +\DeclareFieldFormat[article]{date}{\iffieldundef{number}{#1}{#1\setunit{\yearnumdelim}\printfield{number}}} \DeclareFieldFormat[inreference]{number}{\mkbibbrackets{#1}} \DeclareFieldFormat{parens}{\mkbibparens{#1}} \DeclareFieldFormat{brackets}{\mkbibbrackets{#1}} @@ -219,15 +222,16 @@ \DeclareFieldAlias{jstor}{eprint:jstor} \DeclareFieldAlias{urn}{eprint:urn} %----------------------- -\DeclareRedundantLanguages{ngerman}{german,ngerman,austrian,naustrian} +\DeclareRedundantLanguages{german}{german,ngerman,austrian,naustrian} \DeclareRedundantLanguages{english,american}{english,american,british,% canadian,australian,newzealand,USenglish,UKenglish} -\DeclareLanguageMapping{ngerman}{archaeologie-ngerman} +\DeclareLanguageMapping{german}{archaeologie-german} \DeclareLanguageMapping{english}{archaeologie-english} \DeclareLanguageMapping{french}{archaeologie-french} \DeclareLanguageMapping{italian}{archaeologie-italian} \DeclareLanguageMapping{spanish}{archaeologie-spanish} %----------------------- +\renewcommand*{\sqspace}{\addnbthinspace} \renewcommand*{\subtitlepunct}{\addperiod\addspace} \renewcommand*{\intitlepunct}{\addcolon\addspace} \renewcommand*{\newunitpunct}{\addcomma\addspace} @@ -252,7 +256,8 @@ \renewcommand{\multinamedelim}{\addnbspace\textendash\addspace} \renewcommand{\finalnamedelim}{\multinamedelim} \renewcommand*\relateddelim{\addnbspace\textendash\addspace} -\newcommand*{\volnumdelim}{\addslash} +\newcommand*{\volnumdelim}{\addcomma} +\newcommand*{\yearnumdelim}{\addslash} \newcommand*{\jourvoldelim}{\addnbspace} %----------------------- \DeclareBibliographyAlias{collection}{book} @@ -331,10 +336,10 @@ } %----------------------- \AtEveryBibitem{% - \iffieldequalstr{relatedtype}{translationof} + \iffieldequalstr{relatedtype}{translationof}% {\savename{translator}{\savedrelatedtranslator}% - \clearname{translator}} - {} + \clearname{translator}}% + {}% \ifboolexpr{bool {bbx:translation}% or bool {cbx:ancient}% or bool {cbx:frgancient}}% @@ -377,73 +382,59 @@ %% that is fields referring to the title work and not the booktitle work in inbook etc. works % these macros are essentially the same as the standard macros without the "in" \newbibmacro*{byineditor+others}{% - \ifnameundef{ineditor}% - {}% - {\usebibmacro{byeditor+othersstrg}% - \setunit{\addspace}% - \printnames[byeditor]{ineditor}% - \clearname{ineditor}% - \newunit% - }% - \usebibmacro{byintranslator+others}% -} + \ifnameundef{ineditor} + {} + {\usebibmacro{byeditor+othersstrg}% + \setunit{\addspace}% + \printnames[byeditor]{ineditor}% + \clearname{ineditor}% + \newunit}% + \usebibmacro{byintranslator+others}} %----------------------- \newbibmacro*{byintranslator+others}{% - \ifnameundef{intranslator}% - {}% - {\usebibmacro{bytranslator+othersstrg}% - \setunit{\addspace}% - \printnames[bytranslator]{intranslator}% - \clearname{intranslator}% - \newunit% - }% - \usebibmacro{withinothers}% -} + \ifnameundef{intranslator} + {} + {\usebibmacro{bytranslator+othersstrg}% + \setunit{\addspace}% + \printnames[bytranslator]{intranslator}% + \clearname{intranslator}% + \newunit}% + \usebibmacro{withinothers}} %----------------------- \newbibmacro*{withincommentator}{% - \ifnameundef{incommentator}% - {}% - {\bibstring{withcommentator}% - \setunit{\addspace}% - \printnames[withcommentator]{incommentator}% - }% -} + \ifnameundef{incommentator} + {} + {\bibstring{withcommentator}% + \setunit{\addspace}% + \printnames[withcommentator]{incommentator}}} %----------------------- \newbibmacro*{withinannotator}{% - \ifnameundef{inannotator}% - {}% - {\bibstring{withannotator}% - \setunit{\addspace}% - \printnames[withannotator]{inannotator}% - }% - } + \ifnameundef{inannotator} + {} + {\bibstring{withannotator}% + \setunit{\addspace}% + \printnames[withannotator]{inannotator}}} %----------------------- \newbibmacro*{withinintroduction}{% - \ifnameundef{inintroduction} - {}% - {\bibstring{withintroduction}% - \setunit{\addspace}% - \printnames[withintroduction]{inintroduction}% - }% -} + \ifnameundef{inintroduction} + {} + {\bibstring{withintroduction}% + \setunit{\addspace}% + \printnames[withintroduction]{inintroduction}}} %----------------------- \newbibmacro*{withinforeword}{% - \ifnameundef{inforeword}% - {}% - {\bibstring{withforeword}% - \setunit{\addspace}% - \printnames[withforeword]{inforeword}% - }% -} + \ifnameundef{inforeword} + {} + {\bibstring{withforeword}% + \setunit{\addspace}% + \printnames[withforeword]{inforeword}}} %----------------------- \newbibmacro*{withinafterword}{% - \ifnameundef{inafterword} - {} - {\bibstring{withafterword}% - \setunit{\addspace}% - \printnames[withafterword]{inafterword}% - }% -} + \ifnameundef{inafterword} + {} + {\bibstring{withafterword}% + \setunit{\addspace}% + \printnames[withafterword]{inafterword}}} %----------------------- \newbibmacro*{withinothers}{% \usebibmacro{withincommentator}% @@ -523,7 +514,7 @@ \clearlist{pageref}% \setunit{\addcomma\newline\nobreak}% }% - {}% + {\newunit}% } %----------------------- \renewbibmacro*{eprint}{% @@ -534,35 +525,30 @@ } %----------------------- \newbibmacro*{zenon}{% - \iffieldundef{zenon}% - {}% - {\usebibmacro{bbx:parunit}% - \printfield{zenon}% - } -} + \iffieldundef{zenon} + {}% + {\usebibmacro{bbx:parunit}% + \printfield{zenon}}} %----------------------- \newbibmacro*{jstor}{% - \iffieldundef{jstor}% - {}% - {\usebibmacro{bbx:parunit}% - \printfield{jstor}% - } -} + \iffieldundef{jstor} + {} + {\usebibmacro{bbx:parunit}% + \printfield{jstor}}} %----------------------- \newbibmacro*{urn}{% - \iffieldundef{urn} - {} - {\usebibmacro{bbx:parunit}% - \printfield{urn}% - } -} + \iffieldundef{urn} + {} + {\usebibmacro{bbx:parunit}% + \printfield{urn}}} %----------------------- \renewbibmacro*{url+urldate}{% - \usebibmacro{bbx:parunit}% - \iffieldundef{url}{}{\printfield{url}% - \setunit*{\addspace}% - \printtext{\printurldate}% -}} + \usebibmacro{bbx:parunit}% + \iffieldundef{url} + {} + {\printfield{url}% + \setunit*{\addspace}% + \printtext{\printurldate}}} %----------------------- \renewbibmacro*{doi+eprint+url}{% \usebibmacro{bbx:parunit}% @@ -575,24 +561,15 @@ } %----------------------- \renewbibmacro*{editor}{% - \ifboolexpr{% - test \ifuseeditor % - and % - not test {\ifnameundef{editor}}% - }% + \ifboolexpr{% + test \ifuseeditor % + and % + not test {\ifnameundef{editor}}}% {\printnames{editor}% - \setunit{\addspace}% - \printtext[parens]{\bibstring{editor}}% - \clearname{editor}% - }% - {}% -} -%----------------------- -\newbibmacro{savestuff}{% - \savename{editor}{\bbx@lasteditor}% - \savefield{namehash}{\bbx@lasthash}% - \savefield{booktitle}{\bbx@lastbooktitle}% -} + \setunit{\addspace}% + \printtext[parens]{\bibstring{editor}}% + \clearname{editor}}% + {}} %----------------------- \DeclareLabeldate{% \field{date} @@ -619,9 +596,7 @@ \printfield{number}% \ifbool{bbx:yearseries}% {\newunit}% - {\setunit{\addspace}}% - }% -} + {\setunit{\addspace}}}} %----------------------- \renewbibmacro*{journal}{% \ifboolexpr{test {\iffieldundef{shortjournal}}% @@ -632,19 +607,19 @@ \printfield[titlecase]{journalsubtitle}% }% }% - {\printfield{shortjournal}}% -} + {\printfield{shortjournal}}} %----------------------- \newbibmacro{journal+number+year}{% \usebibmacro{journal}% \setunit{\jourvoldelim}% \printfield{volume}% + \iffieldundef{number} + {} {\setunit{\volnumdelim}% \printfield{number}% }% \newunit% -\usebibmacro{pubstate+year}% -} +\usebibmacro{pubstate+year}} %----------------------- \newbibmacro{pubstate+year}{% \iffieldundef{pubstate}% @@ -658,18 +633,15 @@ \newbibmacro{translation}{% \printfield{origtitle}% \setunit{\addcomma\space}% - \usebibmacro{byeditor+others}% -} + \usebibmacro{byeditor+others}} %----------------------- \newbibmacro{intranslation}{% \printfield{origtitle}% \setunit{\addcomma\space}% - \usebibmacro{byineditor+others}% -} + \usebibmacro{byineditor+others}} %----------------------- \newbibmacro*{related:reviewof}[1]{% - \usebibmacro*{related:default}{#1}% -} + \usebibmacro*{related:default}{#1}} %----------------------- \newbibmacro*{related:translationof}[1]{% \entrydata*{#1}{% @@ -681,10 +653,7 @@ {\newunit \bibstring{bytranslator}%keine Sprache ausgegeben? \setunit{\addspace}% - \printnames{savedtranslator}% - }% - }% -} + \printnames{savedtranslator}}}} %----------------------- \newbibmacro*{inreference:title+author}{% \iffieldundef{title}% @@ -696,8 +665,7 @@ \setunit*{\addspace}% \printfield{number}}% \setunit{\addspace}% - \printtext[parens]{\printnames[name:initials]{labelname}}% -} + \printtext[parens]{\printnames[name:initials]{labelname}}} %----------------------- \newbibmacro*{maintitle+title+volumes}{% \iffieldsequal{maintitle}{title}% @@ -710,31 +678,23 @@ {\usebibmacro{maintitle}% \ifbool{cbx:ancient}% {\usebibmacro{title}% - \iffieldundef{volume}% - {\newunit\newblock}% - {}% - }% + \iffieldundef{volume}% + {\newunit\newblock}% + {}}% {\iffieldundef{volume}% {\iffieldundef{volumes}% - {}% - {\printfield{volumes}% - \setunit*{\addspace}% - \bibstring{volumes}% - \setunit{\addspace}% - }% - }% - {\setunit{\addspace}% - \printfield{volume}% - \setunit*{\adddot\addspace}% - }% - }% - }% - }% - \iffieldundef{volumes}% - {\usebibmacro{title}}% - {}% - \newunit% -} + {}% + {\printfield{volumes}% + \setunit*{\addspace}% + \bibstring{volumes}% + \setunit{\addspace}}}% + {\setunit{\addspace}% + \printfield{volume}% + \setunit*{\adddot\addspace}}}}}% + \iffieldundef{volumes}% + {\usebibmacro{title}}% + {}% + \newunit} %----------------------- \renewbibmacro{event+venue+date}{% \setunit{\adddot\addspace}% @@ -1017,9 +977,8 @@ \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}% - } + }% {}% - \usebibmacro{savestuff}% \usebibmacro{finentry}% } %----------------------- @@ -1044,7 +1003,6 @@ \usebibmacro{related}% }% {}% - \usebibmacro{savestuff}% \usebibmacro{finentry}% } %----------------------- @@ -1074,12 +1032,10 @@ \usebibmacro{doi+eprint+url}% \setunit{\addperiod\addspace}% \usebibmacro{signatur}% - \usebibmacro{savestuff}% \newunit\newblock% \iftoggle{bbx:related}% {\usebibmacro{related:init}% - \usebibmacro{related}% - }% + \usebibmacro{related}}% {}% \usebibmacro{finentry}% } @@ -1122,7 +1078,6 @@ \usebibmacro{related}% }% {}% - \usebibmacro{savestuff}% \usebibmacro{finentry}% } %----------------------- @@ -1152,7 +1107,6 @@ \usebibmacro{related}% }% {}% - \usebibmacro{savestuff}% \usebibmacro{finentry}% } %----------------------- @@ -1195,7 +1149,6 @@ \usebibmacro{related}% }% {}% - \usebibmacro{savestuff}% \usebibmacro{finentry}% } %----------------------- @@ -1215,7 +1168,6 @@ \setunit{\addperiod\addspace}% \usebibmacro{signatur}% \newunit\newblock% - \usebibmacro{savestuff}% \usebibmacro{finentry}% } %----------------------- @@ -1239,7 +1191,6 @@ \usebibmacro{doi+eprint+url}% \usebibmacro{signatur}% \newunit\newblock% - \usebibmacro{savestuff}% \usebibmacro{finentry}% } %----------------------- diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index 22f01596b5c..b6728f3d18c 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) 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 @@ -15,9 +15,19 @@ %----------------------- \newbool{cbx:yearinparens} \newbool{cbx:seenote} -\newbool{cbx:seen} \newbool{cbx:uniqueme} %----------------------- +%\renewcommand*{\multicitedelim}{\addsemicolon\addspace} +\newcommand*{\labelyeardelim}{\addspace} +%\renewcommand{\textcitedelim}{\addcomma\space} +\renewcommand{\postnotedelim}{% + \ifboolexpr{% + bool {cbx:ancient}% + or bool {cbx:frgancient}% + or bool {cbx:corpus}% + }% + {\addspace}% + {\newunitpunct}} \newcommand*{\cbx@fseen@names}{} \newcommand*{\cbx@tseen@names}{} \newrobustcmd*{\cbx@nameseen}[1]{% @@ -28,33 +38,21 @@ \iftoggle{blx@footnote}% {\xifinlistcs{#1}{cbx@fseen@names}}% {\xifinlistcs{#1}{cbx@tseen@names}}} - -\renewcommand*{\multicitedelim}{\addsemicolon\addspace} -\newcommand*{\labelyeardelim}{\addspace} -\renewcommand{\textcitedelim}{\multicitedelim} -\renewcommand{\postnotedelim}{% - \ifboolexpr{bool {cbx:ancient}% - or bool {cbx:frgancient}% - or bool {cbx:corpus}% - }% - {\addspace}% - {\newunitpunct}% -} %----------------------- \DeclareBibliographyOption{yearinparens}[true]{% \ifstrequal{#1}{true}% {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}% \csuse{bool#1}{cbx:yearinparens}}% {\DeclareFieldFormat{citeyear}{##1}}}% -\DeclareBibliographyOption{seenote}[true]{\csuse{bool#1}% - {cbx:seenote}% +\DeclareBibliographyOption{seenote}[true]{% + \csuse{bool#1}{cbx:seenote}% \ExecuteBibliographyOptions{maxnames=999}% }% \DeclareBibliographyOption[string]{citeauthorformat}{% \ifcsdef{cbx@arch@citeauthorformat@#1}% {\csuse{cbx@arch@citeauthorformat@#1}}% {\PackageError{biblatex-archaeologie}% - {Option 'citeauthorformat=#1' invalid.\MessageBreak% + {Option 'citeauthorformat=#1' invalid.\MessageBreak Use one of the values 'initials', 'full', 'family' or 'firstfull'.}{}}% \def\citeauthorformatVALUE{#1}% } @@ -197,6 +195,7 @@ datecirca=true, citeauthorformat=initials,% uniquename=minfull,% + autocite=footnote, } %----------------------- \newbibmacro*{uniqueshorthand}{% @@ -205,7 +204,7 @@ {\ifnameundef{intranslator}% {\iffieldundef{series}% {\printnames[name:family]{editor}}% - {\usebibmacro*{series}}% + {\usebibmacro{series}}% }% {\printnames[name:family]{intranslator}}}% {\printnames[name:family]{translator}}}} @@ -221,14 +220,19 @@ } %----------------------- \renewbibmacro*{postnote}{% -\iffieldundef{postnote}% - {}% - {\postnotedelim\printfield{postnote}% - \ifbool{cbx:frgancient}% - {\setunit{\addspace}% - \usebibmacro{cite:frgname}}% - }% -} + \ifboolexpr{% + test{\ifbool{bbx:inreferences}}% + and% + test{\ifentrytype{inreference}}} + {} + {\iffieldundef{postnote}% + {}% + {\setunit{\postnotedelim}% + \printfield{postnote}% + \ifbool{cbx:frgancient}% + {\setunit{\addspace}% + \usebibmacro{cite:frgname}}% + {}}}} %----------------------- \newbibmacro*{cite:frgname}{% \ifnameundef{shorteditor}% @@ -237,16 +241,16 @@ } %----------------------- \newbibmacro*{seenote}{% -\ifnameundef{labelname}% - {\usebibmacro{cite:label}% - \setunit{\labelyeardelim}}% - {\printnames{labelname}% - \setunit{\nameyeardelim}}% -\setunit{\addspace}% -\bibstring{loccit}\addspace% -\printtext[parens]{\bibstring{seenote}\addspace% -\ref{footref:\thefield{entrykey}}}% -\renewcommand{\postnotedelim}{\addspace}% + \ifnameundef{labelname}% + {\usebibmacro{cite:label}}% + {\printnames{labelname}}% + \setunit{\labelyeardelim}% + \bibstring{loccit}% + \setunit{\addspace}% + \printtext[parens]{\bibstring{seenote}% + \addspace% + \ref{footref:\thefield{entrykey}}}% + \renewcommand{\postnotedelim}{\addspace}% }% %----------------------- \newbibmacro*{cite:title}{\printfield{labeltitle}}% @@ -275,19 +279,14 @@ or bool{cbx:frgancient}% or bool{cbx:corpus}}% {\usebibmacro{cite:shorthand}}% - {\ifciteseen{\usebibmacro{seenote}}{% - \ifboolexpr{% - test {\ifentrytype{book}}% - or % - test {\ifentrytype{proceedings}}% - or % - test {\ifentrytype{inreference}}% - }{\renewcommand{\postnotedelim}{\addspace}}{}% - \bibhypertarget{ref:\thefield{entrykey}}{% - \usedriver{}{\thefield{entrytype}}% - \iffootnote{\label{footref:\thefield{entrykey}}}% - }}}% -} + {\ifciteseen% + {\usebibmacro{seenote}}% + {\bibhypertarget{ref:\thefield{entrykey}}% + {\usedriver% + {\DeclareNameAlias{sortname}{default}}% + {\thefield{entrytype}}% + \iffootnote{\label{footref:\thefield{entrykey}}}}% +}}} %----------------------- \newbibmacro{cite}{% \ifboolexpr{% @@ -295,10 +294,10 @@ and % test {\ifentrytype{inreference}}% }% - {\usebibmacro{cite:lexikon}} - {\ifbool{cbx:seenote} - {\usebibmacro{cite:seenote}} - {\printtext[bibhyperref]{% + {\usebibmacro{cite:lexikon}}% + {\ifbool{cbx:seenote}% + {\usebibmacro{cite:seenote}}% + {\printtext[bibhyperref]{% \iffieldundef{shorthand}% {\ifnameundef{labelname}% {\usebibmacro{cite:label}% @@ -307,11 +306,7 @@ \setunit{\nameyeardelim}}% \usebibmacro{cite:year}}% {\usebibmacro{cite:shorthand}}% - }}}% - \ifciteseen{\global\booltrue{cbx:seen}}% - {\global\boolfalse{cbx:seen}}% - \usebibmacro{savestuff}% -} + }}}} %----------------------- \newbibmacro*{citeyear}{% \iffieldundef{shorthand}% @@ -361,28 +356,28 @@ {} {\datecircaprint}% \dateeraprintpre{labelyear}% - \iffieldnums{labelyear} - {\mkyearzeros{\thefield{labelyear}}} + \iffieldnums{labelyear}% + {\mkyearzeros{\thefield{labelyear}}}% {\printfield{labelyear}}% \printfield{extrayear}% - \iffieldsequal{labeldateera}{labelenddateera}{} + \iffieldsequal{labeldateera}{labelenddateera}{}% {\dateeraprint{labelyear}}% \dateuncertainprint% - \ifdefstring\blx@dateformat@labeldate{edtf} - {\datecircaprintedtf} + \ifdefstring\blx@dateformat@labeldate{edtf}% + {\datecircaprintedtf}% {}% - \iffieldundef{labelendyear} + \iffieldundef{labelendyear}% {} - {\iffieldsequal{labelyear}{labelendyear}{} - {\ifdefstring\blx@dateformat@labeldate{edtf} + {\iffieldsequal{labelyear}{labelendyear}{}% + {\ifdefstring\blx@dateformat@labeldate{edtf}% {\slash}% strict EDTF - {\bibdaterangesep + {\bibdaterangesep% \enddatecircaprint}% \dateeraprintpre{labelendyear}% \mkyearzeros{\thefield{labelendyear}}% - \enddateuncertainprint - \ifdefstring\blx@dateformat@labeldate{edtf} - {\enddatecircaprintedtf} + \enddateuncertainprint% + \ifdefstring\blx@dateformat@labeldate{edtf}% + {\enddatecircaprintedtf}% {}% \dateeraprint{labelendyear}}}}}} %----------------------- @@ -406,25 +401,21 @@ {\usebibmacro{citeindex}% \usebibmacro{cite}}% {\multicitedelim}% - {\ifboolexpr{% - test{\ifbool{bbx:inreferences}}% - and% - test{\ifentrytype{inreference}}% - }{}{\usebibmacro{postnote}}}% + {\usebibmacro{postnote}} %----------------------- \DeclareCiteCommand{\footcite}[\mkbibfootnote] {\usebibmacro{prenote}}% {\usebibmacro{citeindex}% \usebibmacro{cite}}% {\multicitedelim}% - {\ifboolexpr{% - test{\ifbool{bbx:inreferences}}% - and% - test{\ifentrytype{inreference}}% - }{}{\usebibmacro{postnote}}}% + {\usebibmacro{postnote}} %----------------------- \DeclareCiteCommand{\textcite}% {\boolfalse{cbx:yearinparens}% + \renewcommand*{\multinamedelim}{\addcomma\space}% + \renewcommand*{\finalnamedelim}{% + \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}% + \addspace\bibstring{and}\space}% \usebibmacro{prenote}% }% {\usebibmacro{citeindex}% @@ -445,18 +436,43 @@ {\usebibmacro{citeindex}% \usebibmacro{cite}}% {\multicitedelim}% - {\ifboolexpr{% + {\usebibmacro{postnote}} +%----------------------- +\DeclareCiteCommand{\smartcite}[\iffootnote\textnormal\mkbibfootnote] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\ifboolexpr{% test{\ifbool{bbx:inreferences}}% and% test{\ifentrytype{inreference}}% }{}{\usebibmacro{postnote}}}% -%----------------------- +%----------------------- + \DeclareCiteCommand{\fullcite} + {\usebibmacro{prenote}} + {\usedriver + {\DeclareNameAlias{sortname}{default}} + {\thefield{entrytype}}} + {\multicitedelim} + {\usebibmacro{postnote}} +%----------------------- +\DeclareCiteCommand{\footfullcite}[\mkbibfootnote] + {\usebibmacro{prenote}} + {\usedriver + {\DeclareNameAlias{sortname}{default}} + {\thefield{entrytype}}} + {\multicitedelim} + {\usebibmacro{postnote}} +%----------------------- \DeclareMultiCiteCommand{\cites}% {\cite}{\multicitedelim}% \DeclareMultiCiteCommand{\parencites}[\mkbibparens]% {\parencite}{\multicitedelim}% \DeclareMultiCiteCommand{\textcites}% - {\textcite}{\textcitedelim}% + {\textcite}{\textcitedelim} +\DeclareMultiCiteCommand{\smartcites} + [\iffootnote\textnormal\mkbibfootnote]{\smartcite}{\multicitedelim} %----------------------- \DeclareCiteCommand{\citeauthor} {\boolfalse{citetracker}% @@ -478,6 +494,64 @@ {\multicitedelim}% {\usebibmacro{postnote}} %----------------------- +\DeclareCiteCommand{\citetranslator} + {\boolfalse{citetracker}% + \boolfalse{pagetracker}% + \renewcommand*{\multinamedelim}{\addcomma\space}% + \renewcommand*{\finalnamedelim}{% + \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}% + \addspace\bibstring{and}\space}% + \usebibmacro{prenote}}% + {\usebibmacro{citeindex}% +\ifboolexpr{% + test {\ifbool{bbx:inreferences}}% + and % + test {\ifentrytype{inreference}}% + }% + {\printtext}% + {\printtext[bibhyperref]}% + {\ifthenelse{% + \ifentrytype{incollection}% + \OR% + \ifentrytype{inbook}% + }% + {\printnames[citeauthor]{intranslator}}% + {\printnames[citeauthor]{translator}}}% + }% + {\multicitedelim}% + {\usebibmacro{postnote}} +%----------------------- +\DeclareCiteCommand*{\citetranslator} + {\boolfalse{citetracker}% + \boolfalse{pagetracker}% + \DeclareNameAlias{bytranslator}{citeauthor}% + \renewcommand*{\multinamedelim}{\addcomma\space}% + \renewcommand*{\finalnamedelim}{% + \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}% + \addspace\bibstring{and}\space}% + \usebibmacro{prenote}}% + {\usebibmacro{citeindex}% + \ifboolexpr{% + test {\ifbool{bbx:inreferences}}% + and % + test {\ifentrytype{inreference}}% + }% + {\printtext}% + {\printtext[bibhyperref]}% + {\ifthenelse{% + \ifentrytype{incollection}% + \OR% + \ifentrytype{inbook}% + }% + {\ifnameundef{intranslator}% + {\bibstring{owntranslation}}% + {\usebibmacro{byintranslator+others}}}% + {\ifnameundef{translator}% + {\bibstring{owntranslation}}% + {\usebibmacro{bytranslator+others}}}}}% + {\multicitedelim}% + {\usebibmacro{postnote}} +%----------------------- \DeclareCiteCommand*{\citeauthor} {\boolfalse{citetracker}% \boolfalse{pagetracker}% diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx index 42c379c16d8..93aedc4571c 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, +% biblatex for archaeologists, % historians and philologists -% 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 @@ -13,7 +13,7 @@ \ProvidesFile{archaeologie.dbx}% % [\arch@dbxid] - % new translator etc. fields for "inner" work, that is translator of title (not booktitle) in @in... +% new translator etc. fields for "inner" work, that is translator of title (not booktitle) in @in... \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} -- cgit v1.2.3