From 39010d345f62fd98626853160fbacf66fc329f0d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 19 Nov 2017 22:17:06 +0000 Subject: archaeologie (19nov17) git-svn-id: svn://tug.org/texlive/trunk@45852 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/archaeologie/archaeologie-english.lbx | 52 ------- .../tex/latex/archaeologie/archaeologie-french.lbx | 57 -------- .../tex/latex/archaeologie/archaeologie-german.lbx | 43 ------ .../latex/archaeologie/archaeologie-italian.lbx | 51 ------- .../latex/archaeologie/archaeologie-spanish.lbx | 35 ----- .../tex/latex/archaeologie/archaeologie.bbx | 154 +++++++++++---------- .../tex/latex/archaeologie/archaeologie.cbx | 44 +++--- .../latex/archaeologie/english-archaeologie.lbx | 52 +++++++ .../tex/latex/archaeologie/french-archaeologie.lbx | 57 ++++++++ .../tex/latex/archaeologie/german-archaeologie.lbx | 43 ++++++ .../latex/archaeologie/italian-archaeologie.lbx | 51 +++++++ .../latex/archaeologie/spanish-archaeologie.lbx | 35 +++++ 12 files changed, 348 insertions(+), 326 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx delete mode 100644 Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx delete mode 100644 Master/texmf-dist/tex/latex/archaeologie/archaeologie-german.lbx delete mode 100644 Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx delete mode 100644 Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx create mode 100644 Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx create mode 100644 Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx create mode 100644 Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx create mode 100644 Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx create mode 100644 Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.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 deleted file mode 100644 index 413971f3d06..00000000000 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx +++ /dev/null @@ -1,52 +0,0 @@ -% 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-english.lbx}% - [\arch@lbxid] -\InheritBibliographyExtras{english} - -\NewBibliographyString{origtitle} -\NewBibliographyString{firstprint} -\NewBibliographyString{reference} -\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}}, - 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}}, - fromgreek = {{from\addspace Greek}{from\addspace Greek}}, - fromitalian = {{from\addspace Italian}{from\addspace Italian}}, - fromlatin = {{from\addspace Latin}{from\addspace Latin}}, - fromnorwegian = {{from\addspace Norwegian}{from\addspace Norwegian}}, - fromportuguese = {{from\addspace Portuguese}{from\addspace Portuguese}}, - 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 deleted file mode 100644 index c1506bdef32..00000000000 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx +++ /dev/null @@ -1,57 +0,0 @@ -% 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-french.lbx}% - [\arch@lbxid] -\InheritBibliographyExtras{french} -\DefineBibliographyExtras{french}{\restorecommand\mkbibnamefamily} - -\NewBibliographyString{origtitle} -\NewBibliographyString{firstprint} -\NewBibliographyString{reviewof} -\NewBibliographyString{reference} -\NewBibliographyString{translationof} -\NewBibliographyString{talk} -\NewBibliographyString{subvoce} -\NewBibliographyString{owntranslation} - - -\DeclareBibliographyStrings{% - inherit = {french}, - subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, - 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}}, - firstprint = {{première\addspace édition}{première\addspace éd\adddot}}, - 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}}, - fromdanish = {{depuis\addspace le\addspace danois}{depuis\addspace le\addspace danois}}, - fromdutch = {{depuis\addspace le\addspace néerlandais}{depuis\addspace le\addspace néerlandais}}, - fromenglish = {{depuis\addspace l'anglais}{depuis l'anglais}}, - fromfinnish = {{depuis\addspace Finnish}{depuis\addspace le\addspace Finnish}}, - fromfrench = {{depuis\addspace le\addspace français}{depuis\addspace le\addspace français}}, - fromgerman = {{depuis\addspace l'allemand} {depuis\addspace l'allemand}}, - fromgreek = {{depuis\addspace le\addspace grec}{depuis\addspace le\addspace grec}}, - fromitalian = {{depuis\addspace l'italien}{depuis l'italien}}, - fromlatin = {{depuis\addspace le\addspace latin}{depuis\addspace le\addspace latin}}, - fromnorwegian = {{depuis\addspace le\addspace norvégien}{depuis\addspace le\addspace norvégien}}, - fromportuguese = {{depuis\addspace le\addspace portugais}{depuis\addspace le\addspace portugais}}, - 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 deleted file mode 100644 index da9d1243e2c..00000000000 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-german.lbx +++ /dev/null @@ -1,43 +0,0 @@ -% 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 deleted file mode 100644 index 4536a4404e7..00000000000 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx +++ /dev/null @@ -1,51 +0,0 @@ -% 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-italian.lbx}% - [\arch@lbxid] -\InheritBibliographyExtras{italian} - -\NewBibliographyString{origtitle} -\NewBibliographyString{firstprint} -\NewBibliographyString{reviewof} -\NewBibliographyString{reference} -\NewBibliographyString{translationof} -\NewBibliographyString{talk} -\NewBibliographyString{inpreparation} -\NewBibliographyString{submitted} -\NewBibliographyString{forthcoming} -\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 = {{}{}},% 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-spanish.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx deleted file mode 100644 index 5d2b9a6c0f0..00000000000 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx +++ /dev/null @@ -1,35 +0,0 @@ -% 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-spanish.lbx}% - [\arch@lbxid] - -\InheritBibliographyExtras{spanish} - -\NewBibliographyString{origtitle} -\NewBibliographyString{firstprint} -\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}}, - 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 866a8ed01ab..fcc5c83961e 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx @@ -10,8 +10,8 @@ % 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{2017/08/10} -\def\arch@version{2.3.3} +\def\arch@date{2017/11/19} +\def\arch@version{2.3.4} \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)} @@ -26,7 +26,7 @@ historians and philologists} } \RequirePackage[normalem]{ulem} -%\RequirePackage{csquotes} +%\RequirePackage{csquotes} % optionclash \def\archaeologieversion{\arch@version} \def\archaeologiedate{\arch@date} \ExecuteBibliographyOptions{% @@ -44,6 +44,7 @@ maxitems=1,% maxbibnames=999,% useprefix=true,% + mincrossrefs=1,% } %----------------------- \newbool{bbx:edby} @@ -173,7 +174,7 @@ \iftoggle{bbx:doi}{}{\xout{doi}\seperator}% \iflanguage{ngerman}% {weitere Informationen unter \url{http://biblatex-archaeologie.de}} - {further information see \url{http://biblatex-archaeologie.de}} + {for further information see \url{http://biblatex-archaeologie.de}} } %----------------------- \DeclareFieldFormat*{title}{#1} @@ -189,6 +190,7 @@ \DeclareFieldFormat{edition}{#1} \DeclareFieldFormat{volumes}{#1} \DeclareFieldFormat{volume}{#1} +\DeclareFieldFormat{part}{#1} \DeclareFieldFormat[article]{date}{\iffieldundef{number}{#1}{\iffieldundef{volume}{#1\yearnumdelim\printfield{number}}{#1}}} \DeclareFieldFormat[inreference]{number}{\mkbibbrackets{#1}} \DeclareFieldFormat{parens}{\mkbibparens{#1}} @@ -199,7 +201,8 @@ \DeclareFieldFormat{urldate}{\mkbibparens{#1}} \DeclareFieldFormat{note}{\mkbibparens{#1}\nopunct} \DeclareFieldFormat{shorthandwidth}{#1} -\DeclareFieldFormat{origtitle}{\iffieldequalstr{origlanguage}{greek}{#1}{\mkbibemph{#1}}} +\DeclareFieldFormat{origtitle}{#1} +%\DeclareFieldFormat{origtitle}{\iffieldequalstr{origlanguage}{greek}{#1}{\mkbibemph{#1}}} \DeclareFieldFormat{eprint:urn}{% \textsc{urn}% \addcolon\space% @@ -226,17 +229,26 @@ \DeclareRedundantLanguages{german}{german,ngerman,austrian,naustrian} \DeclareRedundantLanguages{english,american}{english,american,british,% canadian,australian,newzealand,USenglish,UKenglish} -\DeclareLanguageMapping{german}{archaeologie-german} -\DeclareLanguageMapping{english}{archaeologie-english} -\DeclareLanguageMapping{french}{archaeologie-french} -\DeclareLanguageMapping{italian}{archaeologie-italian} -\DeclareLanguageMapping{spanish}{archaeologie-spanish} +\DeclareLanguageMapping{german}{german-archaeologie} +\DeclareLanguageMapping{english}{english-archaeologie} +\DeclareLanguageMapping{french}{french-archaeologie} +\DeclareLanguageMapping{italian}{italian-archaeologie} +\DeclareLanguageMapping{spanish}{spanish-archaeologie} +%\DeclareLanguageMappingSuffix{-archaeologie} %----------------------- \renewcommand*{\sqspace}{\addnbthinspace} \renewcommand*{\subtitlepunct}{\addperiod\addspace} \renewcommand*{\intitlepunct}{\addcolon\addspace} \renewcommand*{\newunitpunct}{\addcomma\addspace} -\newcommand*{\orttrennzeichen}{\addnbspace\textendash\addspace} +\newcommand*{\maintitlepunct}{\addperiod\addspace} +\newcommand*{\locationdelim}{\addnbspace\textendash\addspace} +\renewcommand{\multinamedelim}{\addnbspace\textendash\addspace} +\renewcommand{\finalnamedelim}{\multinamedelim} +\renewcommand*\relateddelim{\addnbspace\textendash\addspace}% +\newcommand*{\relateddelimmultivolume}{\addcomma\par\nobreak} +\newcommand*{\volnumdelim}{\addcomma} +\newcommand*{\yearnumdelim}{\addslash} +\newcommand*{\jourvoldelim}{\addnbspace} \renewcommand{\finentrypunct}{%http://tex.stackexchange.com/a/14159/98739 \ifbool{bbx:counter}% {\addspace$\vert$ \addspace\scshape% @@ -254,12 +266,6 @@ {s}}.% }}% {}} -\renewcommand{\multinamedelim}{\addnbspace\textendash\addspace} -\renewcommand{\finalnamedelim}{\multinamedelim} -\renewcommand*\relateddelim{\addnbspace\textendash\addspace} -\newcommand*{\volnumdelim}{\addcomma} -\newcommand*{\yearnumdelim}{\addslash} -\newcommand*{\jourvoldelim}{\addnbspace} %----------------------- \DeclareBibliographyAlias{collection}{book} \DeclareBibliographyAlias{reference}{book} @@ -269,7 +275,7 @@ \DeclareBibliographyAlias{manual}{book} %----------------------- -\DeclareSortingScheme{nyt}{ +\DeclareSortingTemplate{nyt}{ \sort{ \field{presort} } @@ -300,8 +306,8 @@ } } %----------------------- -\DeclareSortingScheme{shortseries}{\sort{\field{shortseries}}} -\DeclareSortingScheme{shortjournal}{\sort{\field{shortjournal}}} +\DeclareSortingTemplate{shortseries}{\sort{\field{shortseries}}} +\DeclareSortingTemplate{shortjournal}{\sort{\field{shortjournal}}} %----------------------- \defbibcheck{shortseries}{% \iffieldundef{shortseries}% @@ -333,10 +339,12 @@ \DeclareNameAlias{translator}{author} \DeclareNameAlias{bytranslator}{default} \DeclareNameAlias{bycommentator}{author} +\DeclareNameAlias{bookauthor}{author} + %----------------------- \DeclareListFormat{location}{% #1\ifthenelse{\value{listcount}<\value{liststop}}% - {\orttrennzeichen}% + {\locationdelim}% {}% } %----------------------- @@ -499,7 +507,8 @@ \ifentrytype{review}% }% {}% - {\printtext{\bibstring{in}\intitlepunct}}} + {\setunit{\isdot\addcomma\addspace}% + \printtext{\bibstring{in}\intitlepunct}}} %----------------------- \renewbibmacro*{pageref}{% \iflistundef{pageref} @@ -576,6 +585,10 @@ \clearname{editor}}% {}} %----------------------- +\newbibmacro*{bookauthor}{% + \printnames{bookauthor}% + \newunit} +%----------------------- \DeclareLabeldate{% \field{date} \field{year} @@ -682,25 +695,20 @@ \clearfield{maintitleaddon}% }% {\iffieldundef{maintitle}% - {}% - {\usebibmacro{maintitle}}% - \iffieldundef{title}% + {}% + {\usebibmacro{maintitle}% + \usebibmacro{volume}% + \clearfield{volume}% + }% + \iffieldundef{title}% {}% {\usebibmacro{title}}% - \iffieldundef{volume}% - {\iffieldundef{volumes}% - {}% - {\printfield{volumes}% - \setunit*{\addspace}% - \bibstring{volumes}% - \setunit{\addspace}}}% - {\setunit{\addspace}% - \printfield{volume}% - \setunit*{\adddot\addspace}}% \ifbool{cbx:ancient}% - {\usebibmacro{translation}}% - {}% - }% + {\usebibmacro{translation}% + \usebibmacro{volume}% + }% + {}% + }% \newunit} %----------------------- \renewbibmacro{event+venue+date}{% @@ -723,9 +731,11 @@ \printfield[titlecase]{title}% \setunit{\subtitlepunct}% \printfield[titlecase]{subtitle}}% - \setunit{\subtitlepunct} }% - \printfield{titleaddon}% + \iffieldundef{titleaddon} + {\newunit} + {\setunit*{\subtitlepunct}% + \printfield{titleaddon}}% } %----------------------- \renewbibmacro*{booktitle}{% @@ -761,12 +771,10 @@ \newbibmacro*{edition}{% \iffieldint{edition}% {\setunit*{\addspace}% - \mkbibsuperscript{\printfield{edition}}}% + \mkbibsuperscript{\printfield{edition}}\kern -1pt}% {\newunit% - \printfield{edition}% - \setunit{\addspace}% - }% -} + \printfield{edition}% + \setunit{\addspace}}} %----------------------- \newbibmacro*{location+edition+year}{% \ifboolexpr{% @@ -782,7 +790,7 @@ \iffieldint{edition}% {\setunit{\addspace}}% {\newunit}% - \usebibmacro{edition}% + \usebibmacro{edition}% \usebibmacro{pubstate+year}% \setunit*{\addspace}% \ifboolexpr{% @@ -819,7 +827,7 @@ \iffieldundef{origyear}% {}% {\bibstring{reprint}% - \addspace% + \setunit*{\addspace}% }% }% \printlist{location}% @@ -833,7 +841,7 @@ \renewbibmacro*{institution+location+date}{% \printlist{location}% \printlist{institution}% - \setunit*{\space}% + \setunit*{\addspace}% \usebibmacro{pubstate+year}% } %----------------------- @@ -842,50 +850,52 @@ } %----------------------- \newbibmacro*{volume}{% - \iffieldundef{maintitle}% - {\printfield{volume}% - \newunit}% - {}% + \iffieldundef{volume}% + {\iffieldundef{volumes}% + {}% + {\printfield{volumes}% + \setunit*{\addspace}% + \bibstring{volumes}% + \setunit{\addspace}}}% + {\setunit{\addspace}% + \printfield{volume}% + \clearfield{volume}% + \iffieldundef{part} + {} + {\setunit{\addspace}% + \printfield{part}}% + }% + \newunit% } %----------------------- \renewbibmacro*{maintitle+booktitle}{% \iffieldundef{maintitle}% {}% {\usebibmacro{maintitle}% - \iffieldundef{volume}% - {\setunit{\maintitlepunct}}% - {\setunit{\addspace}% - \printfield{volume}% - \printfield{part}% - \setunit{\adddot\space}% - }% + \usebibmacro{volume}% + \setunit{\maintitlepunct} }% \usebibmacro{booktitle}% + \usebibmacro{volume}% \newunit% } %----------------------- \newbibmacro*{booktitle+volume+editor}{% - \ifnameundef{editor}% - {\usebibmacro{maintitle+booktitle}% - \setunit{\addspace}% - \usebibmacro{volume}% + \ifnameundef{editor}% + {\usebibmacro{bookauthor}% + \usebibmacro{maintitle+booktitle}% + \newunit% }% {\ifbool{bbx:edby}% - {\usebibmacro{booktitle}% - \setunit{\addspace}% - \usebibmacro{volume}% + {\usebibmacro{maintitle+booktitle}% \newunit% \bibstring{byeditor}% \setunit{\addspace}% \printnames{editor}% - }% - {\printnames{editor}% - \setunit*{\addspace}% - \printtext[parens]{\bibstring{editor}}% + }% + {\usebibmacro{editor}% \newunit\newblock% \usebibmacro{maintitle+booktitle}% - \setunit{\addspace}% - \usebibmacro{volume}% \newunit% }% }% diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index 1db43dfd623..6bf89ec1b7a 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx @@ -20,6 +20,7 @@ %\renewcommand*{\multicitedelim}{\addsemicolon\addspace} \newcommand*{\labelyeardelim}{\addspace} %\renewcommand{\textcitedelim}{\addcomma\space} +\renewcommand*{\iffinalcitedelim}{\iflastcitekey} \renewcommand{\postnotedelim}{% \ifboolexpr{% bool {cbx:ancient}% @@ -258,7 +259,7 @@ \newbibmacro*{cite:year}{% \iffieldundef{labelyear}% {}% - {\printtext[citeyear]{\usebibmacro{cite:labelyear+extrayear}}}% + {\printtext[citeyear]{\usebibmacro{cite:labelyear+extradate}}}% } %----------------------- \newbibmacro*{cite:lexikon}{% @@ -311,7 +312,7 @@ \iffieldundef{shorthand}% {\iffieldundef{labelyear}% {\usebibmacro{cite:label}}% - {\usebibmacro{cite:labelyear+extrayear}}}% + {\usebibmacro{cite:labelyear+extradate}}}% {\usebibmacro{cite}}} %----------------------- \newbibmacro*{textcite}{% @@ -324,7 +325,7 @@ \ifnumequal{\value{citecount}}{1}% {\usebibmacro{prenote}}% {}% - \usebibmacro{cite:labelyear+extrayear}}% + \usebibmacro{cite:labelyear+extradate}}% {\usebibmacro{cite}}}% {\printnames{labelname}% \setunit{% @@ -347,7 +348,7 @@ {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}% {\printtext[bibhyperref]{\printfield{label}}}} %----------------------- -\newbibmacro*{cite:labelyear+extrayear}{% +\newbibmacro*{cite:labelyear+extradate}{% \iffieldundef{labelyear} {} {\printtext[bibhyperref]{% @@ -358,7 +359,7 @@ \iffieldnums{labelyear}% {\mkyearzeros{\thefield{labelyear}}}% {\printfield{labelyear}}% - \printfield{extrayear}% + \printfield{extradate}% \iffieldsequal{labeldateera}{labelenddateera}{}% {\dateeraprint{labelyear}}% \dateuncertainprint% @@ -415,16 +416,16 @@ \renewcommand*{\finalnamedelim}{% \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}% \addspace\bibstring{and}\space}% - \usebibmacro{prenote}% }% {\usebibmacro{citeindex}% \iffirstcitekey% {\setcounter{textcitetotal}{1}}% {\stepcounter{textcitetotal}% - \textcitedelim}% + \textcitedelim% + \usebibmacro{prenote}}% \ifbool{cbx:seenote}{\usebibmacro{cite:seenote}}% {\usebibmacro{textcite}}}% - {\ifbool{cbx:parens}% + {\ifbool{cbx:yearinparens}% {\bibcloseparen\global\boolfalse{cbx:yearinparens}}% {}}% {\ifbool{cbx:seenote}{\usebibmacro{postnote}}% @@ -465,14 +466,10 @@ {\multicitedelim} {\usebibmacro{postnote}} %----------------------- -\DeclareMultiCiteCommand{\cites}% - {\cite}{\multicitedelim}% -\DeclareMultiCiteCommand{\parencites}[\mkbibparens]% - {\parencite}{\multicitedelim}% -\DeclareMultiCiteCommand{\textcites}% - {\textcite}{\textcitedelim} -\DeclareMultiCiteCommand{\smartcites} - [\iffootnote\textnormal\mkbibfootnote]{\smartcite}{\multicitedelim} +\DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim} +\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\textcites}{\textcite}{} +\DeclareMultiCiteCommand{\smartcites}[\iffootnote\textnormal\mkbibfootnote]{\smartcite}{\multicitedelim} %----------------------- \DeclareCiteCommand{\citeauthor} {\boolfalse{citetracker}% @@ -585,5 +582,20 @@ {\multicitedelim}% {\usebibmacro{postnote}}% +\DeclareCiteCommand{\citetitle*} % + {\boolfalse{citetracker}% + \boolfalse{pagetracker}% + \usebibmacro{prenote}}% + {\ifboolexpr{ + bool{bbx:inreferences} + and + test{\ifentrytype{inreference}}} + {\printtext}% + {\printtext[bibhyperref]}{% + \ifbool{cbx:ancient}{\printtext[emph]{\usebibmacro{cite:title}}}% + {\printtext[emph]{\usebibmacro{cite:title}}}}}% + {\multicitedelim}% + {\usebibmacro{postnote}}% + \endinput %% End of file `archaeologie.cbx'. \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx new file mode 100644 index 00000000000..413971f3d06 --- /dev/null +++ b/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx @@ -0,0 +1,52 @@ +% 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-english.lbx}% + [\arch@lbxid] +\InheritBibliographyExtras{english} + +\NewBibliographyString{origtitle} +\NewBibliographyString{firstprint} +\NewBibliographyString{reference} +\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}}, + 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}}, + fromgreek = {{from\addspace Greek}{from\addspace Greek}}, + fromitalian = {{from\addspace Italian}{from\addspace Italian}}, + fromlatin = {{from\addspace Latin}{from\addspace Latin}}, + fromnorwegian = {{from\addspace Norwegian}{from\addspace Norwegian}}, + fromportuguese = {{from\addspace Portuguese}{from\addspace Portuguese}}, + 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/french-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx new file mode 100644 index 00000000000..f66b1a9096f --- /dev/null +++ b/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx @@ -0,0 +1,57 @@ +% 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-french.lbx}% + [\arch@lbxid] +\InheritBibliographyExtras{french} +\DefineBibliographyExtras{french}{\restorecommand\mkbibnamefamily} + +\NewBibliographyString{origtitle} +\NewBibliographyString{firstprint} +\NewBibliographyString{reviewof} +\NewBibliographyString{reference} +\NewBibliographyString{translationof} +\NewBibliographyString{talk} +\NewBibliographyString{subvoce} +\NewBibliographyString{owntranslation} + + +\DeclareBibliographyStrings{% + inherit = {french}, + subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, + 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}}, + firstprint = {{première\addspace édition}{première\addspace éd\adddot}}, + 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}}, + fromdanish = {{depuis\addspace le\addspace danois}{depuis\addspace le\addspace danois}}, + fromdutch = {{depuis\addspace le\addspace néerlandais}{depuis\addspace le\addspace néerlandais}}, + fromenglish = {{depuis\addspace l'anglais}{depuis l'anglais}}, + fromfinnish = {{depuis\addspace Finnish}{depuis\addspace le\addspace Finnish}}, + fromfrench = {{depuis\addspace le\addspace français}{depuis\addspace le\addspace français}}, + fromgerman = {{depuis\addspace l'allemand} {depuis\addspace l'allemand}}, + fromgreek = {{depuis\addspace le\addspace grec}{depuis\addspace le\addspace grec}}, + fromitalian = {{depuis\addspace l'italien}{depuis l'italien}}, + fromlatin = {{depuis\addspace le\addspace latin}{depuis\addspace le\addspace latin}}, + fromnorwegian = {{depuis\addspace le\addspace norvégien}{depuis\addspace le\addspace norvégien}}, + fromportuguese = {{depuis\addspace le\addspace portugais}{depuis\addspace le\addspace portugais}}, + 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/german-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx new file mode 100644 index 00000000000..da9d1243e2c --- /dev/null +++ b/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.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/italian-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx new file mode 100644 index 00000000000..aca0683694b --- /dev/null +++ b/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx @@ -0,0 +1,51 @@ +% 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-italian.lbx}% + [\arch@lbxid] +\InheritBibliographyExtras{italian} + +\NewBibliographyString{origtitle} +\NewBibliographyString{firstprint} +\NewBibliographyString{reviewof} +\NewBibliographyString{reference} +\NewBibliographyString{translationof} +\NewBibliographyString{talk} +\NewBibliographyString{inpreparation} +\NewBibliographyString{submitted} +\NewBibliographyString{forthcoming} +\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 = {{}{}},% 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/spanish-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx new file mode 100644 index 00000000000..89daf2c73c1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx @@ -0,0 +1,35 @@ +% 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-spanish.lbx}% + [\arch@lbxid] + +\InheritBibliographyExtras{spanish} + +\NewBibliographyString{origtitle} +\NewBibliographyString{firstprint} +\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}}, + owntranslation = {{??}{??}},% FIX ME! +} +\endinput \ No newline at end of file -- cgit v1.2.3