From 72b09a95e33b49273735d86bd57a872cb6b77c92 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 11 Dec 2016 22:31:44 +0000 Subject: biblatex (11dec16) git-svn-id: svn://tug.org/texlive/trunk@42680 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/biblatex/bbx/standard.bbx | 4 +- Master/texmf-dist/tex/latex/biblatex/biblatex.def | 8 +- Master/texmf-dist/tex/latex/biblatex/biblatex.sty | 114 +++++++++++++++------ Master/texmf-dist/tex/latex/biblatex/blx-dm.def | 4 +- .../tex/latex/biblatex/cbx/authoryear-comp.cbx | 4 +- .../tex/latex/biblatex/cbx/authoryear-ibid.cbx | 4 +- .../tex/latex/biblatex/cbx/authoryear-icomp.cbx | 4 +- .../tex/latex/biblatex/cbx/authoryear.cbx | 6 +- .../texmf-dist/tex/latex/biblatex/lbx/german.lbx | 4 +- .../tex/latex/biblatex/lbx/nswissgerman.lbx | 28 +++++ .../texmf-dist/tex/latex/biblatex/lbx/spanish.lbx | 4 +- .../tex/latex/biblatex/lbx/swissgerman.lbx | 24 +++++ 12 files changed, 156 insertions(+), 52 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/biblatex/lbx/nswissgerman.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex/lbx/swissgerman.lbx (limited to 'Master/texmf-dist/tex/latex/biblatex') diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx index e8a1606383f..d5bf3f198d1 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx @@ -918,7 +918,9 @@ \def\do{% \stepcounter{bbx:relatedcount}% \ifnumgreater{\value{bbx:relatedcount}}{1} - {\printtext{\relateddelim}} + {\ifcsundef{relateddelim\strfield{relatedtype}} + {\printtext{\relateddelim}} + {\printtext{\csuse{relateddelim\strfield{relatedtype}}}}} {}}% \ifbibmacroundef{related:\strfield{relatedtype}} {\appto{\do}{\usebibmacro{related:default}}} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def index b9b58f756de..653677f34e4 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def @@ -394,9 +394,11 @@ \DeclareFieldFormat [suppbook,suppcollection,suppperiodical] {citetitle}{#1} -% labelyear can be a localisation string to allow for "no date" etc. +% label{end}year can be a localisation string to allow for "no date" etc. \DeclareFieldFormat{labelyear}{% = the '1995' part in 'Jones 1995a' - \ifbibstring{#1}{\bibstring{#1}}{#1}} + \ifbibstring{#1}{\bibstring{#1}}{\mkyearzeros{#1}}} +\DeclareFieldFormat{labelendyear}{% = the '1995' part in 'Jones 1995a' + \ifbibstring{#1}{\bibstring{#1}}{\mkyearzeros{#1}}} % If labeldatesource is a defined field, they % Don't check labelyear directly as it is already processed into a range with markers % and so is never nums due to unexpandable parts of labelyear determination @@ -436,7 +438,7 @@ \DeclareFieldFormat{doi}{% \mkbibacro{DOI}\addcolon\space \ifhyperref - {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}} + {\href{https://doi.org/#1}{\nolinkurl{#1}}} {\nolinkurl{#1}}} \DeclareFieldFormat{edition}{% \ifinteger{#1} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty index c1afccda49b..8cac4f17a05 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty @@ -11,8 +11,8 @@ % particular purpose. % Set up the version strings here -\def\abx@date{2016/09/17} -\def\abx@version{3.6} +\def\abx@date{2016/12/05} +\def\abx@version{3.7} \def\abx@bbxid{\abx@date\space v\abx@version\space biblatex bibliography style (PK/JW/AB)} \def\abx@cbxid{\abx@date\space v\abx@version\space biblatex citation style (PK/JW/AB)} \def\abx@lbxid{\abx@date\space v\abx@version\space biblatex localization (PK/JW/AB)} @@ -21,7 +21,7 @@ % This is not updated by build script as the control file version % does not necessarily change with the package version. % This is used when writing the .bcf -\def\blx@bcfversion{3.2} +\def\blx@bcfversion{3.3} % This is not updated by build script as the bbl version % does not necessarily change with the package version. @@ -5007,8 +5007,10 @@ \newrobustcmd*{\mkdaterangeyear}[1]{% \blx@imc@clearfield{#1month}% \blx@imc@clearfield{#1day}% + \blx@imc@clearfield{#1season}% \blx@imc@clearfield{#1endmonth}% \blx@imc@clearfield{#1endday}% + \blx@imc@clearfield{#1endseason}% \iffieldsequal{#1year}{#1endyear} {\blx@imc@clearfield{#1endyear}} {}% @@ -5085,8 +5087,10 @@ \newrobustcmd*{\mkdaterangeyearextra}[1]{% \blx@imc@clearfield{#1month}% \blx@imc@clearfield{#1day}% + \blx@imc@clearfield{#1season}% \blx@imc@clearfield{#1endmonth}% \blx@imc@clearfield{#1endday}% + \blx@imc@clearfield{#1endseason}% \iffieldsequal{#1year}{#1endyear} {\blx@imc@clearfield{#1endyear}} {}% @@ -5198,7 +5202,8 @@ \newrobustcmd*{\bibtzminsep}{\bibtimesep} % dates \newrobustcmd*{\bibdateuncertain}{?} -\newrobustcmd*{\bibdateeraprefix}{\textminus} +% \textminus is only guaranteed for non-PDFTeX +\newrobustcmd*{\bibdateeraprefix}{\ifdef\textminus\textminus\textendash} \newrobustcmd*{\bibdateeraendprefix}{\,\bibdateeraprefix} \newrobustcmd*{\bibdatesep}{\hyphen} \newrobustcmd*{\bibdaterangesep}{\bibrangedash} @@ -5868,10 +5873,11 @@ {\StrCut{#1}{year}\blx@datetype\blx@tempnull}% \csuse{if\blx@datetype\blx@tempa dateera}{bce} {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto - \printtext{\printdelim{dateeradelim}\bibstring{\blx@dateera@bce}}\relax + % \midsentence is to suppress automatic capitalisation + \printtext{\printdelim{dateeradelim}\midsentence\bibstring{\blx@dateera@bce}}\relax \fi} {\ifnumless{\thefield{#1}}\blx@dateeraauto - {\printtext{\printdelim{dateeradelim}\bibstring{\blx@dateera@ce}}} + {\printtext{\printdelim{dateeradelim}\midsentence\bibstring{\blx@dateera@ce}}} {}}% \endgroup} {}}}% @@ -5965,8 +5971,7 @@ \appto\blx@TE@hook{% \csdef{if#1inits}{\blx@TE{\iftoggle{abx@bool@#1inits}}}}}% \DeclareBibliographyOption[boolean]{#1inits}[true]{% - \toggletrue{abx@bool@#1inits}% - \toggletrue{abx@bool@xinits}}} + \settoggle{abx@bool@#1inits}{##1}}} \abx@donameparts %LEGACY(<3.3) legacy name for \ifgiveninits which is autogenerated now @@ -6129,7 +6134,7 @@ {\csdef{blx@nih@#1}##1{#2}}} \@onlypreamble\DeclareNameInputHandler -% {}{}{}{}{} +% {}{}{}{}{} \long\def\blx@bbl@addentryfield#1#2#3#4#5{% \csxappto{blx@data@#2@#4@#1}{% \def\expandafter\noexpand\csname abx@field@#3\endcsname{#5}}} @@ -7770,7 +7775,7 @@ % This sets and saves to the .aux the default refcontext for an entry. The % default refcontext for an entry is the refcontext of the last -% bibliography in the refsection in which it is actually printed . This +% bibliography in the refsection in which it is actually printed. This % allows citations to default to selecting data from the correct % bibliography list in standard cases where entries are not listed in % multiple bibliographies @@ -7975,7 +7980,7 @@ \iftoggle{blx@defernumbers} {\global\let\blx@printbibchecks\relax} {\iftoggle{blx@labelnumber} - {\blx@warning@noline{Setting 'defernumbers=true' recommended}} + {} {\global\let\blx@printbibchecks\relax}}} % {,...} @@ -8351,7 +8356,10 @@ {\blx@err@nodocdiv{chapter}} {\pretocmd\@makechapterhead{#1} {} - {\blx@err@patch{\string\@makechapterhead}}}} + {\blx@err@patch{\string\@makechapterhead}} + \pretocmd\@makeschapterhead{#1} + {} + {\blx@err@patch{\string\@makeschapterhead}}}} \def\blx@refpatch@sect#1{% \ifcsundef{#1} @@ -8377,7 +8385,7 @@ \H@old@sect,% hyperref \NR@sect,% nameref \scr@sect,% koma-script 3.x - \@sect}% latex + \@startsection}% latex \iftoggle{blx@tempa} {\blx@err@patch{\string\@sect}} {}% @@ -8719,12 +8727,12 @@ % {,...} \protected\def\blx@citeloop#1{% \begingroup - % Make sure this counter exists. Sometimes it might not when using, e.g: - % refsection=chapter and \includeonly to put in the chapters or when - % inserting citations into table of contents - \ifcsname blx@sectionciteorder@\the\c@refsection\endcsname\else - \expandafter\newcount\csname blx@sectionciteorder@\the\c@refsection\endcsname - \fi + % Make sure this counter exists. Sometimes it might not when using, e.g: + % refsection=chapter and \includeonly to put in the chapters or when + % inserting citations into table of contents + \ifcsname blx@sectionciteorder@\the\c@refsection\endcsname\else + \expandafter\newcount\csname blx@sectionciteorder@\the\c@refsection\endcsname + \fi \global\advance\csname blx@sectionciteorder@\the\c@refsection\endcsname\@ne \blx@tempcnta\z@ \blx@tempcntb\z@ @@ -8828,15 +8836,19 @@ {}% % assignment via entrykeys % weak version - \ifboolexpr{test {\ifcsdef{blx@assignedrefcontextkeys*@\the\c@refsection @#1}} - and - not togl {blx@refcontext}}% inside explicit non-global refcontext - {\letcs\blx@refcontext@context{blx@assignedrefcontextkeys*@\the\c@refsection @#1}} + \nottoggle{blx@refcontext} + {\ifcsdef{blx@assignedrefcontextkeys*@\the\c@refsection @*} + {\letcs\blx@refcontext@context{blx@assignedrefcontextkeys*@\the\c@refsection @*}} + {\ifcsdef{blx@assignedrefcontextkeys*@\the\c@refsection @#1} + {\letcs\blx@refcontext@context{blx@assignedrefcontextkeys*@\the\c@refsection @#1}} + {}}} {}% % strong version - \ifcsdef{blx@assignedrefcontextkeys@\the\c@refsection @#1} - {\letcs\blx@refcontext@context{blx@assignedrefcontextkeys@\the\c@refsection @#1}} - {}} + \ifcsdef{blx@assignedrefcontextkeys@\the\c@refsection @*} + {\letcs\blx@refcontext@context{blx@assignedrefcontextkeys@\the\c@refsection @*}} + {\ifcsdef{blx@assignedrefcontextkeys@\the\c@refsection @#1} + {\letcs\blx@refcontext@context{blx@assignedrefcontextkeys@\the\c@refsection @#1}} + {}}} % {} \protected\def\blx@citeprint#1{% @@ -10466,6 +10478,12 @@ ~~~~\blx@nl} \xdef\blx@xml@exclude#1{% ~~~~~~#1\blx@nl} +\xdef\blx@xml@sortinclude#1#2{% + ~~~~\blx@nl + #2% + ~~~~\blx@nl} +\xdef\blx@xml@include#1{% + ~~~~~~#1\blx@nl} \xdef\blx@xml@sort#1#2{% ~~~~\blx@nl #2% @@ -10794,13 +10812,16 @@ % sorting \def\do##1{% \eappto\blx@bcf@presort{\csuse{blx@bcf@presort@##1}}% - \eappto\blx@bcf@exclude{\csuse{blx@bcf@exclude@##1}}}% + \eappto\blx@bcf@exclude{\csuse{blx@bcf@exclude@##1}}% + \eappto\blx@bcf@include{\csuse{blx@bcf@include@##1}}}% \abx@doentrytypes + \do{*}% entrytype wildcard \eappto\blx@tempa{% \blx@xml@comment{SORTING}% \blx@xml@sorting{}{% \blx@bcf@presort \blx@bcf@exclude + \blx@bcf@include \csuse{blx@sorting@\blx@sorting}% }% }% @@ -11129,8 +11150,8 @@ % []{} \newrobustcmd*{\DeclareLabelalphaNameTemplate}[2][]{% \ifblank{#1} - {\blx@lantem{#2}{global}} - {\forcsvlist{\blx@lantem{#2}}{#1}}} + {\blx@lantem{#2}{global}} + {\forcsvlist{\blx@lantem{#2}}{#1}}} \@onlypreamble\DeclareLabelalphaNameTemplate \blx@collectopts{xml}{blx@globalopts}{labelalphanametemplate}% for passing to the .bcf \blx@collectopts{xml}{blx@typeopts}{labelalphanametemplate}% for passing to the .bcf @@ -11655,23 +11676,44 @@ \def\blx@undefpresort#1{% \global\csundef{blx@bcf@presort@#1}} +% {}{} \newrobustcmd*{\DeclareSortExclusion}[2]{% - \forcsvlist{\blx@sortexlude{#2}}{#1}} + \forcsvlist{\blx@sortexclude{#2}}{#1}} \blx@collectopts{xml}{blx@typeopts}{sortexclusion}% for passing to the .bcf -\def\blx@sortexlude#1#2{% +% {}{} +\def\blx@sortexclude#1#2{% \begingroup \ifblank{#1} {\global\csundef{blx@bcf@exclude@#2}} {\let\blx@tempa\@empty - \forcsvlist\blx@sortexlude@i{#1}% + \forcsvlist\blx@sortexclude@i{#1}% \csxdef{blx@bcf@exclude@#2}{% \blx@xml@sortexclude{#2}{\blx@tempa}}} \endgroup} -\def\blx@sortexlude@i#1{% +\def\blx@sortexclude@i#1{% \appto\blx@tempa{\blx@xml@exclude{#1}}} +% {}{} +\newrobustcmd*{\DeclareSortInclusion}[2]{% + \forcsvlist{\blx@sortinclude{#2}}{#1}} +\blx@collectopts{xml}{blx@typeopts}{sortinclusion}% for passing to the .bcf + +% {}{} +\def\blx@sortinclude#1#2{% + \begingroup + \ifblank{#1} + {\global\csundef{blx@bcf@include@#2}} + {\let\blx@tempa\@empty + \forcsvlist\blx@sortinclude@i{#1}% + \csxdef{blx@bcf@include@#2}{% + \blx@xml@sortinclude{#2}{\blx@tempa}}} + \endgroup} + +\def\blx@sortinclude@i#1{% + \appto\blx@tempa{\blx@xml@include{#1}}} + % []{} \newrobustcmd*{\DeclareLabelname}[2][]{% \begingroup @@ -12605,6 +12647,9 @@ {\blx@err@invopt{#1time=##1}{}}}% % Default for new time fields is "24h" \setkeys{blx@opt@pre}{#1time=24h}% + % Boolean for unknown dates + \newtoggle{abx@bool@#1dateunknown}% + \newtoggle{abx@bool@end#1dateunknown}% % Boolean to determine if times are printed with dates \newtoggle{blx@#1dateusetime}% \DeclareBibliographyOption[boolean]{#1dateusetime}{% @@ -13014,6 +13059,9 @@ \c@minnames\blx@mincitenames\relax \c@maxitems\blx@maxitems\relax \c@minitems\blx@minitems\relax + \togglefalse{abx@bool@xinits} + \def\do#1{\iftoggle{abx@bool@#1inits}{\toggletrue{abx@bool@xinits}}{}} + \abx@donameparts \iftoggle{abx@bool@xinits} {\ifnumequal\blx@uniquename\blx@opt@uniquename@full {\blx@warn@conflopt{% diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def index 829a5a811bd..7677cb148d6 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def @@ -105,8 +105,8 @@ {}} % Valid dateparts -\def\blx@notnulldateparts{year,month,day,hour,minute,second,timezone,season,endmonth,endday,endhour,endminute,endsecond,endtimezone,endseason} -\def\blx@nullokdateparts{endyear} +\def\blx@notnulldateparts{month,day,hour,minute,second,timezone,season,endmonth,endday,endhour,endminute,endsecond,endtimezone,endseason} +\def\blx@nullokdateparts{endyear,year} \edef\blx@dateparts{\blx@notnulldateparts,\blx@nullokdateparts} \newrobustcmd*{\DeclareDatamodelFields}[2][]{% diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx index 31ea488f673..73f975bb976 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx @@ -131,7 +131,7 @@ {} {\datecircaprint}% \dateeraprintpre{labelyear}% - \mkyearzeros{\thefield{labelyear}}% + \printfield{labelyear}% \printfield{extrayear}% \iffieldsequal{labeldateera}{labelenddateera}{} {\dateeraprint{labelyear}}% @@ -147,7 +147,7 @@ {\bibdaterangesep \enddatecircaprint}% \dateeraprintpre{labelendyear}% - \mkyearzeros{\thefield{labelendyear}}% + \printfield{labelendyear}% \enddateuncertainprint \ifdefstring\blx@dateformat@labeldate{edtf} {\enddatecircaprintedtf} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx index f7e24c5f909..7148258f0fd 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx @@ -90,7 +90,7 @@ {} {\datecircaprint}% \dateeraprintpre{labelyear}% - \mkyearzeros{\thefield{labelyear}}% + \printfield{labelyear}% \printfield{extrayear}% \iffieldsequal{labeldateera}{labelenddateera}{} {\dateeraprint{labelyear}}% @@ -106,7 +106,7 @@ {\bibdaterangesep \enddatecircaprint}% \dateeraprintpre{labelendyear}% - \mkyearzeros{\thefield{labelendyear}}% + \printfield{labelendyear}% \enddateuncertainprint \ifdefstring\blx@dateformat@labeldate{edtf} {\enddatecircaprintedtf} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx index 1fb8d93a84f..4bb47ceeea1 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx @@ -147,7 +147,7 @@ {} {\datecircaprint}% \dateeraprintpre{labelyear}% - \mkyearzeros{\thefield{labelyear}}% + \printfield{labelyear}% \printfield{extrayear}% \iffieldsequal{labeldateera}{labelenddateera}{} {\dateeraprint{labelyear}}% @@ -163,7 +163,7 @@ {\bibdaterangesep \enddatecircaprint}% \dateeraprintpre{labelendyear}% - \mkyearzeros{\thefield{labelendyear}}% + \printfield{labelendyear}% \enddateuncertainprint \ifdefstring\blx@dateformat@labeldate{edtf} {\enddatecircaprintedtf} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx index ed9c7a0591b..fd411c90b55 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx @@ -63,11 +63,11 @@ {} {\datecircaprint}% \dateeraprintpre{labelyear}% - \mkyearzeros{\thefield{labelyear}}% + \printfield{labelyear}% \printfield{extrayear}% + \dateuncertainprint% \iffieldsequal{labeldateera}{labelenddateera}{} {\dateeraprint{labelyear}}% - \dateuncertainprint% \ifdefstring\blx@dateformat@labeldate{edtf} {\datecircaprintedtf} {}% @@ -79,7 +79,7 @@ {\bibdaterangesep \enddatecircaprint}% \dateeraprintpre{labelendyear}% - \mkyearzeros{\thefield{labelendyear}}% + \printfield{labelendyear}% \enddateuncertainprint \ifdefstring\blx@dateformat@labeldate{edtf} {\enddatecircaprintedtf} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx index 8d485fde33d..29dc2a10f1b 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx @@ -1,7 +1,7 @@ \ProvidesFile{german.lbx} [\abx@lbxid] -\DeclareRedundantLanguages{german}{german,ngerman,austrian,naustrian} +\DeclareRedundantLanguages{german}{german,ngerman,austrian,naustrian,nswissgerman,swissgerman} \DeclareBibliographyExtras{% \DeclareCapitalPunctuation{.:!?}% @@ -399,7 +399,7 @@ forthcoming = {{im Erscheinen}{im Erscheinen}}, inpress = {{im Druck}{im Druck}}, prepublished = {{Vorver\"offentlichung}{Vorver\"offentlichung}}, - citedas = {{im Folgenden zitiert als}{im Folgenden zit\adddotspace als}}, + citedas = {{im folgenden zitiert als}{im folgenden zit\adddotspace als}}, thiscite = {{hier}{hier}}, seenote = {{siehe Anmerkung}{s\adddotspace Anm\adddot}}, quotedin = {{zitiert nach}{zit\adddotspace nach}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nswissgerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nswissgerman.lbx new file mode 100644 index 00000000000..65b02b83d16 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nswissgerman.lbx @@ -0,0 +1,28 @@ +\ProvidesFile{nswissgerman.lbx} +[\abx@lbxid] + +\InheritBibliographyExtras{german} + +% Swiss time sep is a dot +\DeclareBibliographyExtras{% + \protected\def\bibtimesep{.} +} + +% One point where Swiss German spelling +% differs from Austrian and German German +% is the (non-)use of \ss +\DeclareBibliographyStrings{% + inherit = {german}, + citedas = {{im Folgenden zitiert als}{im Folgenden zit\adddotspace als}}, + countryuk = {{Grossbritannien}{GB}}, +% alternative spelling, uncomment to enable: +% section = {{Paragraf}{\S}}, +% sections = {{Paragrafen}{\S\S}}, +} + +\DeclareHyphenationExceptions{% + Pa-tent-an-mel-dung + Pa-tent-an-meld +} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx index cd741dc846d..e6fbf676755 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx @@ -112,8 +112,8 @@ continuators = {{continuaci\'{o}n}{conts\adddot}}, %% {continuaci\'{o}n} instead of {continuadores} or {continuadoras} collaborator = {{colaboraci\'{o}n}{colab\adddot}}, %% {colaboraci\'{o}n} instead of {colaborador} or {colaboradora} collaborators = {{colaboraci\'{o}n}{colabs\adddot}}, %% {colaboraci\'{o}n} instead of {colaboradores} or {colaboradoras} - translator = {{traducci\'{o}n \lbx@sfromlang}{trad\adddot \lbx@sfromlang}}, %% {traducci\'{o}n} instead of {traductor} or {traductora} - translators = {{traducci\'{o}n \lbx@sfromlang}{trads\adddot \lbx@sfromlang}}, %% {traducci\'{o}n} instead of {traductores} or {traductoras} + translator = {{traducci\'{o}n \lbx@sfromlang}{trad\adddotspace \lbx@sfromlang}}, %% {traducci\'{o}n} instead of {traductor} or {traductora} + translators = {{traducci\'{o}n \lbx@sfromlang}{trads\adddotspace \lbx@sfromlang}}, %% {traducci\'{o}n} instead of {traductores} or {traductoras} commentator = {{comentario}{com\adddot}}, %% {comentario} instead of {comentador} or {comentadora} commentators = {{comentarios}{coms\adddot}}, %% {comentarios} instead of {comentadores} or {comentadoras} annotator = {{anotaciones}{anot\adddot}}, %% {anotaciones instead of {anotador} or {anotadora} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swissgerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swissgerman.lbx new file mode 100644 index 00000000000..3ed0714388d --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swissgerman.lbx @@ -0,0 +1,24 @@ +\ProvidesFile{swissgerman.lbx} +[\abx@lbxid] + +\InheritBibliographyExtras{german} + +% Swiss time sep is a dot +\DeclareBibliographyExtras{% + \protected\def\bibtimesep{.} +} + +% One point where Swiss German spelling +% differs from Austrian and German German +% is the (non-)use of \ss +\DeclareBibliographyStrings{% + inherit = {german}, + countryuk = {{Grossbritannien}{GB}}, +} + +\DeclareHyphenationExceptions{% + Pa-tent-an-mel-dung + Pa-tent-an-meld +} + +\endinput -- cgit v1.2.3