From 524f2309e929b0f910f45186e5d294e19372c940 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 25 Sep 2018 20:43:45 +0000 Subject: archaeologie (25sep18) git-svn-id: svn://tug.org/texlive/trunk@48763 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/archaeologie/archaeologie.bbx | 197 +++++++-------------- .../tex/latex/archaeologie/archaeologie.cbx | 93 ++++------ .../tex/latex/archaeologie/archaeologie.dbx | 41 +++-- .../latex/archaeologie/english-archaeologie.lbx | 116 ++++++------ .../tex/latex/archaeologie/french-archaeologie.lbx | 54 +++--- .../tex/latex/archaeologie/german-archaeologie.lbx | 41 +++-- .../latex/archaeologie/italian-archaeologie.lbx | 50 +++--- .../latex/archaeologie/spanish-archaeologie.lbx | 46 +++-- 8 files changed, 298 insertions(+), 340 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx index 9e86e96b98c..70055c3ca78 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx @@ -1,33 +1,30 @@ -% archaeologie --% -% biblatex for archaeologists, -% historians and philologists -% 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 -% 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. -\def\arch@date{2018/04/08} -\def\arch@version{2.3.7} -\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] +%% +%% This is file `archaeologie.bbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% archaeologie.dtx (with options: `bbx') +%% ---------------------------------------------------------------- +%% biblatex-archaeologie --- +%% Author: Lukas C. Bossert +%% E-mail: info@biblatex-archaeologie.de +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\archDate{2018/09/25} +\def\archVersion{2.4.0} +\NeedsTeXFormat{LaTeX2e}[2005/12/01] +\ProvidesFile{archaeologie.bbx} + [\archVersion\space\archDate Base settings for bibliography style of biblatex-archaeologie] + \typeout{ * * * archaeologie * * *^^J + biblatex for archaeologists,^^J + historians and philologists} +\def\archaeologieversion{\archVersion} +\def\archaeologiedate{\archDate} \RequireBibliographyStyle{standard} -\AtBeginDocument{% - \urlstyle{sf}% - \typeout{* * * archaeologie * * * - biblatex for archaeologists, - historians and philologists} -} \RequirePackage[normalem]{ulem} -%\RequirePackage{csquotes} % optionclash -\def\archaeologieversion{\arch@version} -\def\archaeologiedate{\arch@date} \ExecuteBibliographyOptions{% pagetracker=true,% citecounter=true,% @@ -46,7 +43,6 @@ useprefix=true,% mincrossrefs=1,% } -%----------------------- \newbool{bbx:edby} \newbool{bbx:width} \newbool{bbx:yearseries} @@ -75,7 +71,6 @@ \newtoggle{bbx:arachne} \setlength{\biblabelsep}{0em} -%----------------------- \DeclareBibliographyOption{lstabbrv}[true]{% \csuse{bool#1}{bib:lstabbrv}% \addbibresource{archaeologie-lstabbrv.bib}} @@ -108,7 +103,6 @@ lstlocations,% lstpublishers,% } -%----------------------- \DeclareBibliographyOption[string]{biblabel}{% \ifcsundef{archblx@biblabel@#1} {\PackageError{biblatex-archaeologie} @@ -116,7 +110,7 @@ {Unknown value '#1' for option 'biblabel'.\MessageBreak Possible values are 'plain', 'bold', 'brackets', 'parens'.}% \csdef{archblx@biblabel}{\csuse{archblx@biblabel@plain}}} - {\csdef{archblx@biblabel}{\csuse{archblx@biblabel@#1}}}} + {\csdef{archblx@biblabel}{\csuse{archblx@biblabel@#1}}}} \let\archblx@biblabel@plain\@firstofone \def\archblx@biblabel@bold{\mkbibbold} \def\archblx@biblabel@brackets{\mkbibbrackets} @@ -124,7 +118,7 @@ \DeclareBibliographyOption{edby}[true]{\csuse{bool#1}{bbx:edby}} \DeclareBibliographyOption{initials}[false]{\PackageWarningNoLine{biblatex-archaeologie}{% - The option 'initials' has been deleted in version 2.3.7,\MessageBreak + The option 'initials' has been deleted in version 2.3.7,\MessageBreak due to incompatibility reasons with 'biber'.}} \DeclareBibliographyOption{width}[]{% \csuse{booltrue}{bbx:width}% @@ -136,9 +130,9 @@ \DeclareNameAlias{author}{given-family}} \DeclareBibliographyOption{inreferences}[true]{% \PackageWarningNoLine{biblatex-archaeologie}{% - The option 'inreferences' for is deprecated,\MessageBreak + The option 'inreferences' for is deprecated,\MessageBreak use 'inreferencesasfullcite' instead.}% - \booltrue{bbx:inreferencesasfullcite}} + \booltrue{bbx:inreferencesasfullcite}} \DeclareBibliographyOption{inreferencesasfullcite}[true]{\csuse{bool#1}{bbx:inreferencesasfullcite} \ExecuteBibliographyOptions[inreference]{skipbib=true}% \ExecuteBibliographyOptions[inreference]{skiplab=true}} @@ -151,12 +145,9 @@ \ifstrequal{#1}{true}% {\AtEveryCite{\renewcommand*{\mkbibnamefamily}[1]{\textsc{##1}}}}% {}} -%----------------------- \ExecuteBibliographyOptions{% - initials=true, autolang=hyphen,% } -%----------------------- \DeclareEntryOption{ancient}[true]{\csuse{bool#1}{cbx:ancient}} \DeclareEntryOption{frgancient}[true]{% \ifstrequal{#1}{true}% @@ -164,7 +155,6 @@ {}% \csuse{bool#1}{cbx:frgancient}} \DeclareEntryOption{corpus}[true]{\csuse{bool#1}{cbx:corpus}} -%---------- \newcommand{\archaeologieoptions}[1][]{% \ifstrempty{#1}{% \iflanguage{ngerman}% @@ -175,10 +165,10 @@ {} {{\PackageError{biblatex-archaeologie}% {command 'archaeologieoptions[#1]' invalid.\MessageBreak% - Use 'archaeologieoptions[plain]' + Use 'archaeologieoptions[plain]' or omit the brackets.}{} }}}% - \def\seperator{ | }% + \def\seperator{\space|\space}% \ifbool{bib:bibancient}{bibancient\seperator}{}% \ifbool{bib:bibcorpora}{bibcorpora\seperator}{}% \ifbool{bib:lstabbrv}{}{\xout{lstabbrv}\seperator}{}% @@ -191,7 +181,6 @@ \ifbool{bbx:counter}{counter\seperator}{}% \ifbool{bbx:edby}{edby\seperator}{}% \ifbool{bbx:inreferencesasfullcite}{inreferencesasfullcite\seperator}{}% - \ifbool{bbx:initials}{}{\xout{initials}\seperator}% \ifbool{bbx:noabbrv}{noabbrv\seperator}{}% \ifbool{bbx:publisher}{publisher\seperator}{}% \ifbool{cbx:seenote}{seenote\seperator}{}% @@ -210,7 +199,6 @@ {Weitere Informationen unter \url{http://biblatex-archaeologie.de}} {For further information see \url{http://biblatex-archaeologie.de}} } -%----------------------- \DeclareFieldFormat*{title}{#1\isdot} \DeclareFieldFormat{subtitle}{#1} \DeclareFieldFormat{booktitle}{#1} @@ -224,7 +212,15 @@ \DeclareFieldFormat{edition}{#1} \DeclareFieldFormat{volumes}{#1} \DeclareFieldFormat{volume}{#1} -\DeclareFieldFormat[book,collection,proceedings,inproceedings,inbook,incollection]{volume}{\RN{#1}} +\DeclareFieldFormat[% + book,% + collection,% + proceedings,% + inproceedings,% + inbook,% + incollection] + {volume} + {\ifinteger{#1}{\RN{#1}}{#1}} \DeclareFieldFormat{part}{#1} \DeclareFieldFormat[article]{date}{\iffieldundef{number}{#1}{\iffieldundef{volume}{#1\yearnumdelim\printfield{number}}{#1}}} \DeclareFieldFormat[inreference]{number}{\mkbibbrackets{#1}} @@ -262,12 +258,10 @@ \ifhyperref% {\href{https://arachne.dainst.org/entity/#1}{\nolinkurl{#1}}}% {\nolinkurl{#1}}} -%----------------------- \DeclareFieldAlias{zenon}{eprint:zenon} \DeclareFieldAlias{jstor}{eprint:jstor} \DeclareFieldAlias{urn}{eprint:urn} \DeclareFieldAlias{arachne}{eprint:arachne} -%----------------------- \DeclareRedundantLanguages{german}{german,ngerman,austrian,naustrian} \DeclareRedundantLanguages{english,american}{english,american,british,% canadian,australian,newzealand,USenglish,UKenglish} @@ -276,8 +270,6 @@ \DeclareLanguageMapping{french}{french-archaeologie} \DeclareLanguageMapping{italian}{italian-archaeologie} \DeclareLanguageMapping{spanish}{spanish-archaeologie} -%\DeclareLanguageMappingSuffix{-archaeologie} -%----------------------- \NewBibliographyString{origtitle} \NewBibliographyString{firstprint} \NewBibliographyString{reviewof} @@ -294,7 +286,6 @@ \NewBibliographyString{subvoce} \NewBibliographyString{owntranslation} \NewBibliographyString{magthesis} -%----------------------- \renewcommand*{\sqspace}{\addnbthinspace} \renewcommand*{\subtitlepunct}{\addperiod\addspace} \renewcommand*{\intitlepunct}{\addcolon\addspace} @@ -328,7 +319,7 @@ \newrobustcmd*{\bibdatesubseqesep}{\slash} \newrobustcmd*{\bibdaterangesepx}[1]{% - \ifboolexpr{test {\iffieldint{#1year}} and test {\iffieldint{#1endyear}}} + \ifboolexpr{test {\iffieldint{#1year}} and test {\iffieldint{#1endyear}}} {\ifnumequal{\thefield{#1endyear}-\thefield{#1year}}{1} {\bibdatesubseqesep} {\bibdaterangesep}} @@ -538,7 +529,6 @@ \enddateuncertainprint \dateeraprint{#1endyear}}}}}% \endgroup} -%----------------------- \DeclareBibliographyAlias{collection}{book} \DeclareBibliographyAlias{reference}{book} \DeclareBibliographyAlias{institution}{school} @@ -546,7 +536,6 @@ \DeclareBibliographyAlias{incollection}{inbook} \DeclareBibliographyAlias{manual}{book} \DeclareBibliographyAlias{mathesis}{thesis} -%----------------------- \DeclareSortingTemplate{nyt}{ \sort{ @@ -578,10 +567,8 @@ \literal{0} } } -%----------------------- \DeclareSortingTemplate{shortseries}{\sort{\field{shortseries}}} \DeclareSortingTemplate{shortjournal}{\sort{\field{shortjournal}}} -%----------------------- \defbibcheck{shortseries}{% \iffieldundef{shortseries}% {\skipentry}% @@ -602,7 +589,6 @@ {\skipentry}% {\savefieldcs{journaltitle}{\strfield{journaltitle}}}}% } -%----------------------- \DeclareNameAlias{name:initials}{default} \DeclareNameAlias{author}{name:initials} \DeclareNameAlias{editor}{author} @@ -612,13 +598,11 @@ \DeclareNameAlias{bycommentator}{author} \DeclareNameAlias{bookauthor}{author} -%----------------------- \DeclareListFormat{location}{% #1\ifthenelse{\value{listcount}<\value{liststop}}% {\locationdelim}% {}% } -%----------------------- \AtEveryBibitem{% \iffieldequalstr{relatedtype}{translationof}% {\savename{translator}{\savedrelatedtranslator}% @@ -630,10 +614,8 @@ {}% {\clearname{translator}% \clearfield{origtitle}}} -%----------------------- %% provide macros to deal with intranslator, withincommentator, withinannotator, withinintroduction, withinforeword, withinafterword %% 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} {} @@ -643,7 +625,6 @@ \clearname{ineditor}% \newunit}% \usebibmacro{byintranslator+others}} -%----------------------- \newbibmacro*{byintranslator+others}{% \ifnameundef{intranslator} {} @@ -653,42 +634,36 @@ \clearname{intranslator}% \newunit}% \usebibmacro{withinothers}} -%----------------------- \newbibmacro*{withincommentator}{% \ifnameundef{incommentator} {} {\bibstring{withcommentator}% \setunit{\addspace}% \printnames[author]{incommentator}}} -%----------------------- \newbibmacro*{withinannotator}{% \ifnameundef{inannotator} {} {\bibstring{withannotator}% \setunit{\addspace}% \printnames[author]{inannotator}}} -%----------------------- \newbibmacro*{withinintroduction}{% \ifnameundef{inintroduction} {} {\bibstring{withintroduction}% \setunit{\addspace}% \printnames[author]{inintroduction}}} -%----------------------- \newbibmacro*{withinforeword}{% \ifnameundef{inforeword} {} {\bibstring{withforeword}% \setunit{\addspace}% \printnames[author]{inforeword}}} -%----------------------- \newbibmacro*{withinafterword}{% \ifnameundef{inafterword} {} {\bibstring{withafterword}% \setunit{\addspace}% \printnames[author]{inafterword}}} -%----------------------- \newbibmacro*{withinothers}{% \usebibmacro{withincommentator}% \clearname{incommentator}% @@ -704,7 +679,6 @@ \newunit \usebibmacro{withinafterword}% \clearname{inafterword}} -%----------------------- \newbibmacro{labelwidthbib}{% \begingroup \DeclareFieldFormat{bibhyperref}{##1}% @@ -714,14 +688,12 @@ \printtext[bibcitelabel]{\usebibmacro{cite}}% \endgroup } -%----------------------- \newbibmacro{kicklabel}{% \sbox\arch@labelbox{\usebibmacro{labelwidthbib}}% \global\togglefalse{blx@insert}% \ifdim1.1\wd\arch@labelbox>% \labwidthsameline\leavevmode\newline \fi} -%----------------------- \newbibmacro{labelwidthfield}[1]{% \begingroup \DeclareFieldFormat{bibhyperref}{##1}% @@ -730,14 +702,12 @@ \defcounter{maxnames}{\blx@maxcitenames}% \printfield{#1}% \endgroup} -%----------------------- \newbibmacro{kicklabelfield}[1]{% \sbox\arch@labelbox{\usebibmacro{labelwidthfield}{#1}}% \global\togglefalse{blx@insert}% \ifdim.9\wd\arch@labelbox>% \labwidthsameline\leavevmode\newline \fi} -%----------------------- \renewbibmacro*{pageref}{% \iflistundef{pageref} {} @@ -747,7 +717,6 @@ {\bibstring{backrefpages}\ppspace} {\bibstring{backrefpage}\ppspace}% \printlist[pageref][-\value{listtotal}]{pageref}}}} -%----------------------- \newbibmacro*{bbx:parunit}{% \ifbibliography{% \setunit{\bibpagerefpunct}\newblock @@ -763,31 +732,26 @@ {\printfield{eprint}}% {\printfield[eprint:\strfield{eprinttype}]{eprint}}% } -%----------------------- \newbibmacro*{zenon}{% \iffieldundef{zenon} {}% {\usebibmacro{bbx:parunit}% \printfield{zenon}}} -%----------------------- \newbibmacro*{jstor}{% \iffieldundef{jstor} {} {\usebibmacro{bbx:parunit}% \printfield{jstor}}} -%----------------------- \newbibmacro*{arachne}{% \iffieldundef{arachne} {} {\usebibmacro{bbx:parunit}% - \printfield{arachne}}} -%----------------------- + \printfield{arachne}}} \newbibmacro*{urn}{% \iffieldundef{urn} {} {\usebibmacro{bbx:parunit}% \printfield{urn}}} -%----------------------- \renewbibmacro*{url+urldate}{% \usebibmacro{bbx:parunit}% \iffieldundef{url} @@ -795,7 +759,6 @@ {\printfield{url}% \setunit*{\addspace}% \printtext{\printurldate}}} -%----------------------- \renewbibmacro*{doi+eprint+url}{% \usebibmacro{bbx:parunit}% \iftoggle{bbx:doi}{\printfield{doi}}{}% @@ -806,7 +769,6 @@ \iftoggle{bbx:zenon}{\usebibmacro{zenon}}{}% \iftoggle{bbx:url}{\usebibmacro{url+urldate}}{}% } -%----------------------- \renewbibmacro*{editor}{% \ifboolexpr{% test \ifuseeditor % @@ -817,11 +779,9 @@ \printtext[editortype]{\bibstring{editor}}% \clearname{editor}}% {}} -%----------------------- \newbibmacro*{bookauthor}{% \printnames{bookauthor}% \newunit} -%----------------------- \DeclareLabeldate{% \field{date} \field{year} @@ -831,14 +791,12 @@ \field{eventdate} \literal{nodate} } -%----------------------- \newbibmacro*{series}{% \ifboolexpr{test {\iffieldundef{shortseries}} % or bool {bbx:noabbrv}}% {\printtext[seriestitle]{\printfield[titlecase]{series}}}% {\printfield{shortseries}}% } -%----------------------- \renewbibmacro*{series+number}{% \iffieldundef{series}% {}% @@ -848,7 +806,6 @@ \ifbool{bbx:yearseries}% {\newunit}% {\setunit{\addspace}}}} -%----------------------- \renewbibmacro*{journal}{% \ifboolexpr{test {\iffieldundef{shortjournal}}% or bool {bbx:noabbrv}}% @@ -857,7 +814,6 @@ \setunit{\subtitlepunct}% \printfield[titlecase]{journalsubtitle}}}% {\printfield{shortjournal}}} -%----------------------- \newbibmacro{journal+number+year}{% \usebibmacro{journal}% \setunit{\jourvoldelim}% @@ -870,7 +826,6 @@ \printfield{number}}% \newunit}% \usebibmacro{pubstate+year}} -%----------------------- \newbibmacro{pubstate+year}{% \iffieldundef{pubstate}% {\usebibmacro{date}}% @@ -879,20 +834,16 @@ \newbibmacro*{pages}{% \printfield{pages}% \isdot} -%----------------------- \newbibmacro{translation}{% \printfield{origtitle}% \setunit{\addcomma\space}% \usebibmacro{byeditor+others}} -%----------------------- \newbibmacro{intranslation}{% \printfield{origtitle}% \setunit{\addcomma\space}% \usebibmacro{byineditor+others}} -%----------------------- \newbibmacro*{related:reviewof}[1]{% \usebibmacro*{related:default}{#1}} -%----------------------- \newbibmacro*{related:translationof}[1]{% \entrydata*{#1}{% \restorename{savedtranslator}{\savedrelatedtranslator}% @@ -904,7 +855,6 @@ \bibstring{bytranslator}%keine Sprache ausgegeben? \setunit{\addspace}% \printnames{savedtranslator}}}} -%----------------------- \newbibmacro*{inreference:title+author}{% \iffieldundef{title}% {}% @@ -918,7 +868,6 @@ \ifnameundef{author}% {} {\printtext[parens]{\printnames[name:initials]{labelname}}}} -%----------------------- \newbibmacro*{maintitle+title+volumes}{% \iffieldsequal{maintitle}{title}% {\clearfield{maintitle}% @@ -936,30 +885,28 @@ {\usebibmacro{translation}}% {\usebibmacro{volume}}}% \newunit} -%----------------------- -%https://tex.stackexchange.com/a/15014/35864 \newenvironment{fullexpotherlanguage}[1]{% \begingroup \edef\temp{\endgroup\noexpand\otherlanguage{#1}}% \temp }{\endotherlanguage} -%----------------------- \renewbibmacro{event+venue+date}{% \setunit{\adddot\addspace}% \printfield{eventtitle}% \setunit*{\addspace}% \printfield{venue}% \setunit*{\addspace}% -\ifbool{bbx:eventdatelanguage} - {\begingroup - \begin{fullexpotherlanguage}{\thefield{eventdatelanguage}}% + \ifboolexpr{ + bool{bbx:eventdatelanguage} + and + not test{\iffieldundef{eventdatelanguage}} + } + {\begin{fullexpotherlanguage}{\thefield{eventdatelanguage}}% \printeventdate - \end{fullexpotherlanguage}% - \endgroup} + \end{fullexpotherlanguage}} {\printeventdate} - \newunit + \newunit% } -%----------------------- \renewbibmacro*{title}{% \ifboolexpr{% test {\iffieldundef{title}}% @@ -973,9 +920,8 @@ \iffieldundef{titleaddon} {\newunit} {\setunit*{\subtitlepunct}% - \printfield{titleaddon}} + \printfield{titleaddon}}% } -%----------------------- \renewbibmacro*{booktitle}{% \ifboolexpr{% test {\iffieldundef{booktitle}}% @@ -989,7 +935,6 @@ \setunit{\subtitlepunct}}% \printfield{booktitleaddon}% } -%----------------------- \renewbibmacro*{maintitle}{% \ifboolexpr{% test {\iffieldundef{maintitle}}% @@ -1003,7 +948,6 @@ \setunit{\subtitlepunct}}% \printfield{maintitleaddon}% } -%----------------------- \newbibmacro*{edition}{% \iffieldint{edition}% {\setunit*{\addspace}% @@ -1011,7 +955,6 @@ {\newunit \printfield{edition}% \setunit{\addspace}}} -%----------------------- \newbibmacro*{location+edition+year}{% \ifboolexpr{% test {\iflistundef{location}}% @@ -1023,9 +966,9 @@ \printlist{location}% \setunit*{\addcolon\addspace}% \printlist{publisher}% - \iffieldint{edition}% - {\setunit{\addspace}}% - {\newunit}% + % \iffieldint{edition}% + % {\setunit{\addspace}}% + % {\newunit}% \usebibmacro{edition}% \usebibmacro{pubstate+year}% \setunit*{\addspace}% @@ -1061,22 +1004,20 @@ \printlist{location}% \setunit*{\addspace}% \usebibmacro{pubstate+year}}}}} -%----------------------- \renewbibmacro*{institution+location+date}{% \printlist{location}% \setunit*{\addspace}% \printlist{institution}% \setunit*{\addspace}% \usebibmacro{pubstate+year}} -%----------------------- \newbibmacro{signatur}{% \printfield{note}} -%----------------------- \newbibmacro*{volume}{% \iffieldundef{volume}% {\iffieldundef{volumes}% {}% - {\printfield{volumes}% + {\setunit{\addspace}% + \printfield{volumes}% \setunit*{\addspace}% \bibstring{volumes}% \setunit{\addspace}}}% @@ -1088,7 +1029,6 @@ {\setunit{\addspace}% \printfield{part}}}% \newunit} -%----------------------- \renewbibmacro*{maintitle+booktitle}{% \iffieldundef{maintitle}% {}% @@ -1099,7 +1039,6 @@ \usebibmacro{volume}% \newunit } -%----------------------- \newbibmacro*{booktitle+volume+editor}{% \ifnameundef{editor}% {\usebibmacro{bookauthor}% @@ -1116,7 +1055,6 @@ \usebibmacro{maintitle+booktitle}% \newunit}}% } -%----------------------- \newbibmacro*{reftitle}{% \iffieldundef{title}% {}% @@ -1129,30 +1067,25 @@ {}% {\printfield[brackets]{number}}}}% } -%----------------------- \DeclareBibliographyDriver{shortjournal}{% \printtext[journaltitle]{% \printfield[titlecase]{journaltitle}% \setunit{\subtitlepunct}% \printfield[titlecase]{journalsubtitle}}% \blx@initunit} -%----------------------- \DeclareBibliographyDriver{shortseries}{% \printtext[seriestitle]{% \printfield[titlecase]{series}}% \blx@initunit} -%----------------------- \DeclareDataInheritance{reference}{inreference}{% \inherit{shorthand}{booktitle}% \noinherit{volumes}% } -%----------------------- \DeclareBibliographyDriver{shorthand}{% \iffieldundef{title}% {\printfield{booktitle}}% {\printfield{title}}% } -%----------------------- \DeclareBibliographyDriver{article}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -1177,7 +1110,6 @@ {}% \usebibmacro{finentry}% } -%----------------------- \DeclareBibliographyDriver{book}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -1208,7 +1140,6 @@ {}% \usebibmacro{finentry}% } -%----------------------- \DeclareBibliographyDriver{thesis}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -1230,7 +1161,6 @@ {}% \usebibmacro{finentry}% } -%----------------------- \DeclareBibliographyDriver{proceedings}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -1260,7 +1190,6 @@ {}% \usebibmacro{finentry}% } -%----------------------- \DeclareBibliographyDriver{inproceedings}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -1296,7 +1225,6 @@ {}% \usebibmacro{finentry}% } -%----------------------- \DeclareBibliographyDriver{talk}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -1323,7 +1251,6 @@ {}% \usebibmacro{finentry}% } -%----------------------- \DeclareBibliographyDriver{inbook}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -1360,7 +1287,6 @@ {}% \usebibmacro{finentry}% } -%----------------------- \DeclareBibliographyDriver{inreference}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -1379,7 +1305,6 @@ \newunit\newblock \usebibmacro{finentry}% } -%----------------------- \DeclareBibliographyDriver{review}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -1401,7 +1326,6 @@ \newunit\newblock \usebibmacro{finentry}% } -%----------------------- \defbibenvironment{bibliography}% {\list% {\usebibmacro{labelwidthbib}}% @@ -1431,4 +1355,11 @@ } \docsvlist{shortjournal,shortseries} -\endinput \ No newline at end of file +\providecommand*{\ifdateyearsequal}[2]{% + \ifboolexpr{ test {\iffieldsequal{#1year}{#2year}} + and test {\iffieldsequal{#1dateera}{#2dateera}}}} + +%% +%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% +%% End of file `archaeologie.bbx'. diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index 2798d7d09ec..a483ecf3372 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx @@ -1,25 +1,29 @@ -% archaeologie --% -% biblatex for archaeologists, -% historians and philologists -% 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 -% 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.cbx}[\arch@cbxid] -%----------------------- +%% +%% This is file `archaeologie.cbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% archaeologie.dtx (with options: `cbx') +%% ---------------------------------------------------------------- +%% biblatex-archaeologie --- +%% Author: Lukas C. Bossert +%% E-mail: info@biblatex-archaeologie.de +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\archDate{2018/09/25} +\def\archVersion{2.4.0} +\NeedsTeXFormat{LaTeX2e}[2005/12/01] +\ProvidesFile{archaeologie.cbx} + [\archVersion\space\archDate Base settings for citation style of biblatex-archaeologie] + \newbool{cbx:yearinparens} \newbool{cbx:seenote} \newbool{cbx:uniqueme} \newbool{cbx:yearinparensoption} -%----------------------- -%\renewcommand*{\multicitedelim}{\addsemicolon\addspace} \newcommand*{\labelyeardelim}{\addspace} -%\renewcommand{\textcitedelim}{\addcomma\space} \renewcommand*{\iffinalcitedelim}{\iflastcitekey} \renewcommand{\postnotedelim}{% \ifboolexpr{% @@ -81,7 +85,6 @@ \global\cslet{cbx@bseen@names@\the\c@refsection}\@empty \global\cslet{cbx@fseen@names@\the\c@refsection}\@empty} -%----------------------- \DeclareBibliographyOption{yearinparens}[true]{% \ifstrequal{#1}{true}% {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}% @@ -99,10 +102,10 @@ Use one of the values 'initials', 'full', 'family', 'firstfulltheninitials' or 'firstfullthenfamily'.}{}}% \def\citeauthorformatVALUE{#1}} \DeclareEntryOption{uniqueme}[true]{\csuse{bool#1}{cbx:uniqueme}} -%----------------------- \DeclareFieldFormat{citeyear}{#1} \DeclareFieldFormat{prenote}{#1\isdot} -\DeclareFieldFormat{postnote}{#1} +\DeclareFieldFormat{postnote}{\mknormrange{#1}} +\DeclareFieldFormat{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat{shorttitle}{#1} \DeclareFieldFormat{pages}{#1} @@ -184,7 +187,6 @@ \fi \usebibmacro{name:andothers}} - \def\cbx@arch@citeauthorformat@family{% \DeclareNameAlias{citeauthor}{name:family}} @@ -223,7 +225,6 @@ \cbx@nametracker{\thefield{hash}}}% \usebibmacro{name:andothers}} - \DeclareNameFormat{citeauthor:firstinitialsthenfamily}{% \cbx@ifnameseen{\thefield{hash}} {} @@ -268,7 +269,7 @@ {\namepartsuffix}% \or \ifuseprefix - {\usebibmacro{name:given-family} + {\usebibmacro{name:given-family} {\namepartfamily} {\namepartgiveni} {\namepartprefix} @@ -289,10 +290,10 @@ {\namepartfamily} {\namepartgiven} {\namepartprefix} - {\namepartsuffix} + {\namepartsuffix}% \cbx@nametracker{\thefield{hash}}}% \usebibmacro{name:andothers}} - + \def\cbx@arch@citeauthorformat@firstfulltheninitials{% \DeclareNameAlias{citeauthor}{citeauthor:firstfulltheninitials}} @@ -302,15 +303,12 @@ \def\cbx@arch@citeauthorformat@firstinitialsthenfamily{% \DeclareNameAlias{citeauthor}{citeauthor:firstinitialsthenfamily}} - \def\cbx@arch@citeauthorformat@firstfull{% \PackageWarningNoLine{biblatex-archaeologie}{% - Value 'firstfull' for 'citeauthorformat' is deprecated,\MessageBreak + Value 'firstfull' for 'citeauthorformat' is deprecated,\MessageBreak use 'firstfulltheninitials' instead.}% \cbx@arch@citeauthorformat@firstfulltheninitials} - -%----------------------- \ExecuteBibliographyOptions{% citetracker=true, idemtracker=true, @@ -324,7 +322,6 @@ uniquename=minfull, autocite=footnote, } -%----------------------- \newbibmacro*{uniqueshorthand}{% \printtext[brackets]{% \ifnameundef{translator} @@ -334,7 +331,6 @@ {\usebibmacro{series}}}% {\printnames[name:family]{intranslator}}}% {\printnames[name:family]{translator}}}} -%----------------------- \renewbibmacro*{citeindex}{% \ifciteindex% {\ifboolexpr{% @@ -345,7 +341,6 @@ {\indexnames{labelname}}}% {}% } -%----------------------- \renewbibmacro*{postnote}{% \ifboolexpr{ bool{bbx:inreferencesasfullcite} @@ -361,13 +356,11 @@ {\setunit{\addspace}% \usebibmacro{cite:frgname}}% {}}}} -%----------------------- \newbibmacro*{cite:frgname}{% \ifnameundef{shorteditor}% {\printnames[name:family]{editor}}% {\printnames{shorteditor}}% } -%----------------------- \newbibmacro*{seenote}{% \ifnameundef{labelname}% {\usebibmacro{cite:label}}% @@ -379,24 +372,20 @@ \addspace% \ref{footref:\thefield{entrykey}}}% \renewcommand{\postnotedelim}{\addspace}} -%----------------------- \newbibmacro*{cite:title}{\printfield{labeltitle}} -%----------------------- \newbibmacro*{cite:origtitle}{% \iffieldundef{origtitle} {\usebibmacro{cite:title}} {\printfield{origtitle}}} -%----------------------- \newbibmacro*{cite:year}{% \iffieldundef{labelyear} {} {\printtext[citeyear]{\usebibmacro{cite:labeldate+extradate}}}} -%----------------------- \newbibmacro*{cite:lexikon}{% \printfield{booktitle}% \setunit{\addspace}% \printfield{volume}% - \setunit{\addspace}% + \usebibmacro{edition}% \printfield[parens]{year}% \setunit{\addspace}% \iffieldundef{postnote}% @@ -404,7 +393,6 @@ {\printfield{postnote}}% \usebibmacro{inreference:title+author}% } -%----------------------- \newbibmacro{cite:seenote}{% \ifboolexpr{bool{cbx:ancient}% or bool{cbx:frgancient}% @@ -418,7 +406,6 @@ {\DeclareNameAlias{sortname}{default}}% {\thefield{entrytype}}% \iffootnote{\label{footref:\thefield{entrykey}}}}}}} -%----------------------- \newbibmacro{cite}{% \ifboolexpr{ bool{bbx:inreferencesasfullcite} @@ -437,14 +424,12 @@ \setunit{\nameyeardelim}}% \usebibmacro{cite:year}}% {\usebibmacro{cite:shorthand}}}}}} -%----------------------- \newbibmacro*{citeyear}{% \iffieldundef{shorthand}% {\iffieldundef{labelyear}% {\usebibmacro{cite:label}}% {\usebibmacro{cite:labeldate+extradate}}}% {\usebibmacro{cite}}} -%----------------------- \newbibmacro*{textcite}{% \ifnameundef{labelname}% {\iffieldundef{shorthand}% @@ -462,7 +447,6 @@ \global\booltrue{cbx:yearinparens}% \nameyeardelim\bibopenparen}% \usebibmacro{citeyear}}} -%----------------------- \newbibmacro*{cite:shorthand}{% \ifbool{cbx:seenote}% {\printtext{\printfield{shorthand}}}% @@ -472,17 +456,14 @@ {\setunit*{\addspace}% \usebibmacro*{uniqueshorthand}}% {}}}} -%----------------------- \newbibmacro*{cite:label}{% \iffieldundef{label}% {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}% {\printtext[bibhyperref]{\printfield{label}}}} -%----------------------- \newbibmacro*{cite:labeldate+extradate}{% \iffieldundef{labelyear} {} {\printtext[bibhyperref]{\printlabeldateextra}}} -%----------------------- \newbibmacro*{textcite:postnote}{% \iffieldundef{postnote}% {\ifbool{cbx:yearinparens}% @@ -497,7 +478,6 @@ \usebibmacro{cite:frgname}% \bibcloseparen}% \bibcloseparen}} -%----------------------- \DeclareCiteCommand{\cite}% {\usebibmacro{prenote}}% {\usebibmacro{citeindex}% @@ -511,7 +491,6 @@ \usebibmacro{cite}}% {\multicitedelim}% {\usebibmacro{postnote}} -%----------------------- \DeclareCiteCommand{\textcite}% {\boolfalse{cbx:yearinparens}% \renewcommand*{\multinamedelim}{\addcomma\space}% @@ -533,14 +512,12 @@ {\ifbool{cbx:seenote} {\usebibmacro{postnote}}% {\usebibmacro{textcite:postnote}}} -%----------------------- \DeclareCiteCommand{\parencite}[\mkbibparens]% {\usebibmacro{prenote}}% {\usebibmacro{citeindex}% \usebibmacro{cite}}% {\multicitedelim}% {\usebibmacro{postnote}} -%----------------------- \DeclareCiteCommand{\smartcite}[\iffootnote\textnormal\mkbibfootnote] {\usebibmacro{prenote}} {\usebibmacro{citeindex}% @@ -552,7 +529,6 @@ test{\ifentrytype{inreference}}} {} {\usebibmacro{postnote}}}% -%----------------------- \DeclareCiteCommand{\fullcite} {\usebibmacro{prenote}} {\usedriver @@ -560,7 +536,6 @@ {\thefield{entrytype}}} {\multicitedelim} {\usebibmacro{postnote}} -%----------------------- \DeclareCiteCommand{\footfullcite}[\mkbibfootnote] {\usebibmacro{prenote}} {\usedriver @@ -568,12 +543,10 @@ {\thefield{entrytype}}} {\multicitedelim} {\usebibmacro{postnote}} -%----------------------- \DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\multicitedelim} \DeclareMultiCiteCommand{\textcites}{\textcite}{} \DeclareMultiCiteCommand{\smartcites}[\iffootnote\textnormal\mkbibfootnote]{\smartcite}{\multicitedelim} -%----------------------- \DeclareCiteCommand{\citeauthor} {\boolfalse{citetracker}% \boolfalse{pagetracker}% @@ -592,7 +565,6 @@ {\printnames[citeauthor]{labelname}}}% {\multicitedelim}% {\usebibmacro{postnote}} -%----------------------- \DeclareCiteCommand{\citetranslator} {\boolfalse{citetracker}% \boolfalse{pagetracker}% @@ -621,7 +593,6 @@ {\printtext[bibhyperref]{\printnames[citeauthor]{translator}}}}}} {\multicitedelim}% {\usebibmacro{postnote}} -%----------------------- \DeclareCiteCommand*{\citetranslator} {\boolfalse{citetracker}% \boolfalse{pagetracker}% @@ -651,7 +622,6 @@ {\usebibmacro{bytranslator+others}}}}}% {\multicitedelim}% {\usebibmacro{postnote}} -%----------------------- \DeclareCiteCommand*{\citeauthor} {\boolfalse{citetracker}% \boolfalse{pagetracker}% @@ -660,7 +630,6 @@ \printnames[][1-1]{labelname}} {\multicitedelim} {\usebibmacro{postnote}} -%----------------------- \DeclareCiteCommand{\citetitle} {\boolfalse{citetracker}% \boolfalse{pagetracker}% @@ -699,5 +668,7 @@ {\multicitedelim}% {\usebibmacro{postnote}}% -\endinput -%% End of file `archaeologie.cbx'. \ No newline at end of file +%% +%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% +%% 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 218fd48b753..e42cb4393cb 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx @@ -1,19 +1,23 @@ -% archaeologie --% -% biblatex for archaeologists, -% historians and philologists -% 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 -% 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.dbx}% -% [\arch@dbxid] - -% new translator etc. fields for "inner" work, that is translator of title (not booktitle) in @in... +%% +%% This is file `archaeologie.dbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% archaeologie.dtx (with options: `dbx') +%% ---------------------------------------------------------------- +%% biblatex-archaeologie --- +%% Author: Lukas C. Bossert +%% E-mail: info@biblatex-archaeologie.de +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\archDate{2018/09/25} +\def\archVersion{2.4.0} +\NeedsTeXFormat{LaTeX2e}[2005/12/01] +\ProvidesFile{archaeologie.dbx} + [\archVersion\space\archDate Bibliographical data model of biblatex-archaeologie] \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} @@ -28,4 +32,7 @@ \DeclareDatamodelEntryfields{jstor} \DeclareDatamodelFields[type=field,datatype=verbatim]{eventdatelanguage} \DeclareDatamodelEntryfields[proceedings,inproceedings]{eventdatelanguage} -\endinput \ No newline at end of file +%% +%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% +%% End of file `archaeologie.dbx'. diff --git a/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx index eaba25e327a..f410f1332a2 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx @@ -1,23 +1,30 @@ -% archaeologie --% -% biblatex for archaeologists, -% historians and philologists -% 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 -% 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{english-archaeologie.lbx}% - [\arch@lbxid] +%% +%% This is file `english-archaeologie.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% archaeologie.dtx (with options: `lbx,en') +%% ---------------------------------------------------------------- +%% biblatex-archaeologie --- +%% Author: Lukas C. Bossert +%% E-mail: info@biblatex-archaeologie.de +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\archDate{2018/09/25} +\def\archVersion{2.4.0} +\NeedsTeXFormat{LaTeX2e}[2005/12/01] +\ProvidesFile{english-archaeologie.lbx} + [\archVersion\space\archDate Generic English conventions required by the biblatex-archaeologie style] + \InheritBibliographyExtras{english} \DeclareBibliographyStrings{% inherit = {english}, - magthesis = {{}{}},% FIX ME! - mathesis = {{Masters-thesis}{MA thesis}},% FIX ME! + magthesis = {{}{}},% FIXME! + mathesis = {{Masters-thesis}{MA thesis}},% FIXME! subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, reference = {{Article}{Art\adddot}}, origtitle = {{original title}{orig\adddot title}}, @@ -48,17 +55,17 @@ \blx@metadateinfo{#2}% \iffieldundef{#2year} {} - {\datecircaprint - \printtext[#2date]{% + {\printtext[#2date]{% + \datecircaprint \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2month}{#2day}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% - \dateeraprint{#2}}} - {\iffieldsequal{#2year}{#2endyear} + \dateeraprint{#2year}}} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% - \dateeraprint{#2}}% + {\csuse{mkbibseasondate#1}{#2year}{#2season}% + \dateeraprint{#2year}}}% \dateuncertainprint \iffieldundef{#2endyear} {} @@ -67,14 +74,14 @@ {\bibdaterangesepx{#2}% \enddatecircaprint \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% \enddateuncertainprint - \dateeraprint{#2}}}}}% + \dateeraprint{#2endyear}}}}}% \endgroup} \protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{% @@ -82,17 +89,17 @@ \blx@metadateinfo{#2}% \iffieldundef{#2year} {} - {\datecircaprint - \printtext[#2date]{% + {\printtext[#2date]{% + \datecircaprint \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day} - \dateeraprint{#2}}} - {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \dateeraprint{#2year}}} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% - \dateeraprint{#2}}% + {\csuse{mkbibseasondate#1}{#2year}{#2season}% + \dateeraprint{#2year}}}% \dateuncertainprint \iffieldundef{#2endyear} {} @@ -104,7 +111,7 @@ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% \enddateuncertainprint - \dateeraprint{#2}}}}}% + \dateeraprint{#2endyear}}}}}% \endgroup} \protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{% @@ -112,16 +119,17 @@ \blx@metadateinfo{#2}% \iffieldundef{#2year} {} - {\datecircaprint - \printtext[#2date]{% + {\printtext[#2date]{% + \datecircaprint \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} - {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \dateeraprint{#2year}}}% + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% - \dateeraprint{#2}}% + {\csuse{mkbibseasondate#1}{#2year}{#2season}% + \dateeraprint{#2year}}}% \dateuncertainprint \iffieldundef{#2endyear} {\printfield{extradate}} @@ -131,7 +139,7 @@ {\bibdaterangesepx{#2}% \enddatecircaprint \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} @@ -139,7 +147,7 @@ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% \printfield{extradate}% \enddateuncertainprint - \dateeraprint{#2}}}}}% + \dateeraprint{#2endyear}}}}}% \endgroup} \protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{% @@ -147,16 +155,17 @@ \blx@metadateinfo{#2}% \iffieldundef{#2year} {} - {\datecircaprint - \printtext[#2date]{% + {\printtext[#2date]{% + \datecircaprint \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} - {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \dateeraprint{#2year}}}% + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% - \dateeraprint{#2}}% + {\csuse{mkbibseasondate#1}{#2year}{#2season}% + \dateeraprint{#2year}}}% \dateuncertainprint \iffieldundef{#2endyear} {\printfield{extradate}} @@ -170,7 +179,10 @@ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% \printfield{extradate}% \enddateuncertainprint - \dateeraprint{#2}}}}}% + \dateeraprint{#2endyear}}}}}% \endgroup} -\endinput \ No newline at end of file +%% +%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% +%% End of file `english-archaeologie.lbx'. diff --git a/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx index b1ba2e8211b..93f28935784 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx @@ -1,33 +1,40 @@ -% 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. +%% +%% This is file `french-archaeologie.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% archaeologie.dtx (with options: `lbx,fr') +%% ---------------------------------------------------------------- +%% biblatex-archaeologie --- +%% Author: Lukas C. Bossert +%% E-mail: info@biblatex-archaeologie.de +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\archDate{2018/09/25} +\def\archVersion{2.4.0} +\NeedsTeXFormat{LaTeX2e}[2005/12/01] +\ProvidesFile{french-archaeologie.lbx} + [\archVersion\space\archDate French conventions required by the biblatex-archaeologie style] +\ProvidesFile{italien-archaeologie.lbx} + [\archVersion\space\archDate Italian conventions required by the biblatex-archaeologie style] - -\ProvidesFile{archaeologie-french.lbx}% - [\arch@lbxid] \InheritBibliographyExtras{french} \DefineBibliographyExtras{french}{\restorecommand\mkbibnamefamily} \DeclareBibliographyStrings{% inherit = {french}, - magthesis = {{}{}},% FIX ME! - mathesis = {{}{}},% FIX ME! + magthesis = {{}{}},% FIXME! + mathesis = {{}{}},% FIXME! 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}}, + 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}}, @@ -45,5 +52,10 @@ 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 +owntranslation = {{??}{??}},% FIXME! +} + +%% +%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% +%% End of file `french-archaeologie.lbx'. diff --git a/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx index 62581365863..79fb6231453 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx @@ -1,17 +1,24 @@ -% archaeologie --% -% biblatex for archaeologists, -% historians and philologists -% 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 -% 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{german-archaeolgie.lbx}% - [\arch@lbxid] +%% +%% This is file `german-archaeologie.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% archaeologie.dtx (with options: `lbx,de') +%% ---------------------------------------------------------------- +%% biblatex-archaeologie --- +%% Author: Lukas C. Bossert +%% E-mail: info@biblatex-archaeologie.de +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\archDate{2018/09/25} +\def\archVersion{2.4.0} +\NeedsTeXFormat{LaTeX2e}[2005/12/01] +\ProvidesFile{german-archaeologie.lbx} + [\archVersion\space\archDate German conventions required by the biblatex-archaeologie style] + \InheritBibliographyExtras{ngerman} \DeclareBibliographyStrings{% @@ -29,4 +36,8 @@ translationof = {{\"Ubersetzung\addspace von}{\"Ubers\adddot\addspace von}}, owntranslation = {{eigene\addspace\"Ubersetzung}{eig\adddot\addspace\"Ubers\adddot}}, } -\endinput \ No newline at end of file + +%% +%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% +%% End of file `german-archaeologie.lbx'. diff --git a/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx index 3e097c05c2b..2eb18a891f1 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx @@ -1,25 +1,27 @@ -% archaeologie --% -% biblatex for archaeologists, -% historians and philologists -% 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 -% 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{italian-archaeologie.lbx}% - [\arch@lbxid] +%% +%% This is file `italian-archaeologie.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% archaeologie.dtx (with options: `lbx,it') +%% ---------------------------------------------------------------- +%% biblatex-archaeologie --- +%% Author: Lukas C. Bossert +%% E-mail: info@biblatex-archaeologie.de +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\archDate{2018/09/25} +\def\archVersion{2.4.0} +\NeedsTeXFormat{LaTeX2e}[2005/12/01] \InheritBibliographyExtras{italian} \DeclareBibliographyStrings{% inherit = {italian}, - magthesis = {{}{}},% FIX ME! - mathesis = {{}{}},% FIX ME! + magthesis = {{}{}},% FIXME! + mathesis = {{}{}},% FIXME! subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, translationof = {{traduzione\addspace di}{trad\adddot\addabthinspace di}}, reference = {{articolo}{art\adddot}}, @@ -28,10 +30,14 @@ firstprint = {{prima\addspace edizione}{prima\addspace edizione}}, talk = {{presentazione}{presentazione}}, inpreparation = {{in\addspace preparazione}{in prep\adddot}}, - submitted = {{}{}},% FIX ME! + submitted = {{}{}},% FIXME! inpress = {{in\addspace corso\addspace di\addspace stampa}{c\adddot\addabthinspace d\adddot\addabthinspace s\adddot}}, - prepublished = {{}{}},% FIX ME! + prepublished = {{}{}},% FIXME! forthcoming = {{prossimo}{prossimo}}, - owntranslation = {{??}{??}},% FIX ME! + owntranslation = {{??}{??}},% FIXME! } -\endinput \ No newline at end of file + +%% +%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% +%% End of file `italian-archaeologie.lbx'. diff --git a/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx index 34b727b4b8b..b9d17af4b97 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx @@ -1,30 +1,38 @@ -% archaeologie --% -% biblatex for archaeologists, -% historians and philologists -% 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 -% 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. +%% +%% This is file `spanish-archaeologie.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% archaeologie.dtx (with options: `lbx,es') +%% ---------------------------------------------------------------- +%% biblatex-archaeologie --- +%% Author: Lukas C. Bossert +%% E-mail: info@biblatex-archaeologie.de +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\archDate{2018/09/25} +\def\archVersion{2.4.0} +\NeedsTeXFormat{LaTeX2e}[2005/12/01] +\ProvidesFile{spanish-archaeologie.lbx} + [\archVersion\space\archDate Spanish conventions required by the biblatex-archaeologie style] -\ProvidesFile{spanish-archaeologie.lbx}% - [\arch@lbxid] - \InheritBibliographyExtras{spanish} \DeclareBibliographyStrings{% inherit = {spanish}, - magthesis = {{}{}},% FIX ME! - mathesis = {{}{}},% FIX ME! + magthesis = {{}{}},% FIXME! + mathesis = {{}{}},% FIXME! 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! + owntranslation = {{??}{??}},% FIXME! } -\endinput \ No newline at end of file +%% +%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% +%% End of file `spanish-archaeologie.lbx'. -- cgit v1.2.3