From d05355c93719416944eb10461e2be1649ae4bc2d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 29 Oct 2015 21:09:13 +0000 Subject: biblatex (29oct15) git-svn-id: svn://tug.org/texlive/trunk@38737 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/biblatex/biblatex.def | 3 + Master/texmf-dist/tex/latex/biblatex/biblatex.sty | 6 +- Master/texmf-dist/tex/latex/biblatex/biblatex1.sty | 25 ++++- Master/texmf-dist/tex/latex/biblatex/biblatex2.sty | 113 ++++++++++++++++++--- .../texmf-dist/tex/latex/biblatex/lbx/finnish.lbx | 100 +++++++++--------- Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx | 5 +- .../texmf-dist/tex/latex/biblatex/lbx/russian.lbx | 6 +- 7 files changed, 180 insertions(+), 78 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def index 8537dd72d8a..7021402bb80 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def @@ -996,6 +996,9 @@ % ------------------------------------------------------------------ \DeclareDriverSourcemap[datatype=bibtex]{ + \map{ + \step[fieldset=day, null] + } \map{ \step[typesource=conference, typetarget=inproceedings] \step[typesource=electronic, typetarget=online] diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty index 716340a6fab..5594129e4e3 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty @@ -3,8 +3,8 @@ %% % Set up the version strings here, so they are the same for both branches -\def\abx@date{2015/04/19} -\def\abx@version{3.0} +\def\abx@date{2015/10/21} +\def\abx@version{3.1} \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)} @@ -12,7 +12,7 @@ % This is not updated by build script as the controlfile version % does not necessarily change with the package version. % This is used when writing the .bcf -\def\blx@bcfversion{2.7} +\def\blx@bcfversion{2.8} % This is not updated by build script as the bbl version % does not necessarily change with the package version. % This is used when checking the .bbl diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty index bb303cdfd37..6a51f2872c3 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty @@ -8887,7 +8887,7 @@ {\textciquote\endgroup} {\blx@setpostpunct\textciquote\endgroup}} -\def\blx@usqcheck#1#2{% +\long\def\blx@usqcheck#1#2{% \def\blx@tempa{#1}% \def\blx@tempb{#2}% \ifx\@let@token\space @@ -8897,20 +8897,35 @@ \blx@usqcheck@i\blx@tempa \fi \if\noexpand\@let@token\relax - \blx@usqcheck@i\blx@tempb + \expandafter\blx@usqcheck@iv \fi \expandafter\blx@usqcheck@ii\blx@quotepunct\relax&} -\def\blx@usqcheck@i#1#2&{\fi#1} +\long\def\blx@usqcheck@i#1#2&{\fi#1} -\def\blx@usqcheck@ii#1{% +\long\def\blx@usqcheck@ii#1{% \if\noexpand#1\relax \blx@usqcheck@i\blx@tempa \fi \if\noexpand#1\noexpand\@let@token \blx@usqcheck@i{\blx@usqcheck@iii\blx@tempa}% \fi - \blx@usqcheck@ii} + \blx@usqcheck@ii +} + +\long\def\blx@usqcheck@iii#1#2{#2#1} + +\long\def\blx@usqcheck@iv#1{% + \begingroup + \escapechar=-1 % + \edef\blx@tempa{\expandafter\@gobble\string#2}% + \expandafter\endgroup + \ifx\blx@tempa\@empty + \else + \blx@usqcheck@i\blx@tempb + \fi + #1% +} \def\blx@usqcheck@iii#1#2{#2#1} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty index 61b50df3587..19f1cf302e6 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty @@ -483,7 +483,7 @@ \def\abx@dorfields{% \dolistcsloop{abx@rfields}% } -% Just in case we ever have lists to instantiate like labelname etc. +% Just in case we ever have non-name lists to instantiate %\listadd\abx@rlists{} % \def\abx@dorlists{% % \dolistcsloop{abx@rlists}% @@ -545,7 +545,10 @@ \blx@loccitreset@force % List to track all aliases in a section. We need to output all aliases % to the .bcf every time so that they are visible to biber - \global\cslet{blx@keyaliases@\the\c@refsection}\@empty + % Reset only if undefined + \ifcsundef{blx@keyaliases@\the\c@refsection} + {\global\cslet{blx@keyaliases@\the\c@refsection}\@empty} + {}% \ifcsundef{blx@segm@\the\c@refsection @\the\c@refsegment} {\global\cslet{blx@segm@\the\c@refsection @\the\c@refsegment}\@empty} {}} @@ -5398,10 +5401,11 @@ {\expandafter\def\csname abx@field@##1\endcsname{\csuse{abx@field@\csuse{abx@field@##1source}}}}% {}}% \dolistloop{\abx@rfields}% - % Just in case we ever have lists to instantiate like labelname etc. + % Just in case we ever have non-name lists to instantiate % \def\do##1{% % \ifcsdef{abx@field@##1source} - % {\csletcs{abx@list@##1}{abx@list@\csuse{abx@field@##1source}}} + % {\csletcs{c@##1}{c@\csuse{abx@field@##1source}}% + % \csletcs{abx@list@##1}{abx@list@\csuse{abx@field@##1source}}} % {}}% % \dolistloop{\abx@rlists}% \def\do##1{% @@ -5591,7 +5595,16 @@ % the labelnumbers for each sortlist \ifdefempty\abx@field@localnumber {}% only if omitnumbers=true - {\ifundef\abx@field@shorthand + {\ifcsundef{abx@ffd@\blx@imc@thefield{entrytype}@labelnumberwidth} + {\letcs{\@lnw@labelnumberwidth}{abx@ffd@*@labelnumberwidth}} + {\letcs{\@lnw@labelnumberwidth}{abx@ffd@\blx@imc@thefield{entrytype}@labelnumberwidth}}% + \ifcsundef{abx@ffd@\blx@imc@thefield{entrytype}@prefixnumber} + {\letcs{\@lnw@prefixnumber}{abx@ffd@*@prefixnumber}} + {\letcs{\@lnw@prefixnumber}{abx@ffd@\blx@imc@thefield{entrytype}@prefixnumber}}% + \ifcsundef{abx@ffd@\blx@imc@thefield{entrytype}@labelnumber} + {\letcs{\@lnw@labelnumber}{abx@ffd@*@labelnumber}} + {\letcs{\@lnw@labelnumber}{abx@ffd@\blx@imc@thefield{entrytype}@labelnumber}}% + \ifundef\abx@field@shorthand {\iftoggle{blx@defernumbers} % only if defernumbers=true, we have to define localnumber to % something to stop labelnumberwidth def complaining on first @@ -5613,16 +5626,16 @@ \iftoggle{blx@skipbib} {} {\blx@setlabwidth{\labelnumberwidth}{% - \csuse{abx@ffd@*@labelnumberwidth}{% + \csuse{@lnw@labelnumberwidth}{% \ifdef\abx@field@prefixnumber - {\csuse{abx@ffd@*@prefixnumber}{\abx@field@prefixnumber}} + {\csuse{@lnw@prefixnumber}{\abx@field@prefixnumber}} {}% - \abx@field@localnumber}}}} + \csuse{@lnw@labelnumber}{\abx@field@localnumber}}}}} {\csgappto\blx@bbl@data{\let\abx@field@labelnumber\abx@field@shorthand}% \iftoggle{blx@skipbib} {} {\blx@setlabwidth{\labelnumberwidth}{% - \csuse{abx@ffd@*@labelnumberwidth}{\abx@field@shorthand}}}}}} + \csuse{@lnw@labelnumberwidth}{\abx@field@shorthand}}}}}} \def\blx@bbl@prefixnumber{% \ifdef\abx@field@prefixnumber @@ -8645,8 +8658,7 @@ {\textciquote\endgroup} {\blx@setpostpunct\textciquote\endgroup}} - -\def\blx@usqcheck#1#2{% +\long\def\blx@usqcheck#1#2{% \def\blx@tempa{#1}% \def\blx@tempb{#2}% \ifx\@let@token\space @@ -8660,8 +8672,21 @@ \fi \expandafter\blx@usqcheck@ii\blx@quotepunct\relax&} -\def\blx@usqcheck@i#1#2&{\fi#1} -\def\blx@usqcheck@iv#1{% +\long\def\blx@usqcheck@i#1#2&{\fi#1} + +\long\def\blx@usqcheck@ii#1{% + \if\noexpand#1\relax + \blx@usqcheck@i\blx@tempa + \fi + \if\noexpand#1\noexpand\@let@token + \blx@usqcheck@i{\blx@usqcheck@iii\blx@tempa}% + \fi + \blx@usqcheck@ii +} + +\long\def\blx@usqcheck@iii#1#2{#2#1} + +\long\def\blx@usqcheck@iv#1{% \begingroup \escapechar=-1 % \edef\blx@tempa{\expandafter\@gobble\string#2}% @@ -9026,6 +9051,20 @@ \xdef\blx@xml@noinit#1{% ~~~~\blx@nl} +\xdef\blx@xml@nolabels#1{% + ~~\blx@nl + #1% + ~~\blx@nl} +\xdef\blx@xml@nolabel#1{% + ~~~~\blx@nl} + +\xdef\blx@xml@nolabelwidthcounts#1{% + ~~\blx@nl + #1% + ~~\blx@nl} +\xdef\blx@xml@nolabelwidthcount#1{% + ~~~~\blx@nl} + \xdef\blx@xml@sorting#1#2{% ~~\blx@nl% #2% @@ -9269,6 +9308,24 @@ }% }} {}% + % nolabel + \ifcsdef{blx@biber@nolabel} + {\eappto\blx@tempa{% + \blx@xml@comment{NOLABEL}% + \blx@xml@nolabels{% + \csuse{blx@biber@nolabel}% + }% + }} + {}% + % nolabel + \ifcsdef{blx@biber@nolabelwidthcount} + {\eappto\blx@tempa{% + \blx@xml@comment{NOLABELWIDTHCOUNT}% + \blx@xml@nolabelwidthcounts{% + \csuse{blx@biber@nolabelwidthcount}% + }% + }} + {}% % nosort \ifcsdef{blx@biber@nosort} {\eappto\blx@tempa{% @@ -9327,6 +9384,34 @@ %% Customisation +% nolabel +\newrobustcmd*{\DeclareNolabel}[1]{% + \begingroup + \let\nolabel\blx@nolabel + \let\blx@tempa\@empty + #1% + \global\cslet{blx@biber@nolabel}\blx@tempa + \endgroup} +\@onlypreamble\DeclareNolabel + +\newcommand*{\blx@nolabel}[1]{% + \eappto\blx@tempa{% + \blx@xml@nolabel{#1}}} + +% nolabelwidthcount +\newrobustcmd*{\DeclareNolabelwidthcount}[1]{% + \begingroup + \let\nolabel\blx@nolabelwidthcount + \let\blx@tempa\@empty + #1% + \global\cslet{blx@biber@nolabelwidthcount}\blx@tempa + \endgroup} +\@onlypreamble\DeclareNolabelwidthcount + +\newcommand*{\blx@nolabelwidthcount}[1]{% + \eappto\blx@tempa{% + \blx@xml@nolabelwidthcount{#1}}} + % nosort \newrobustcmd*{\DeclareNosort}[1]{% \begingroup @@ -9979,7 +10064,7 @@ \def\blx@typeoptions#1#2{% \blx@addtypeopt{#2}% - \csappto{blx@opts@type@#2}{#1}} + \csappto{blx@opts@type@#2}{#1,}} \def\blx@addtypeopt#1{% \notblank{#1} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx index ec257270325..9d35ba43d07 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx @@ -74,7 +74,7 @@ \renewbibmacro{in:}{% \iffieldequalstr{entrytype}{article} {} - {\bibstring{in}\setunit{\intitlepunct}}}% + {\printtext{\bibstring{in}\intitlepunct}}}% } \UndeclareBibliographyExtras{% @@ -93,14 +93,14 @@ compilers = {{koontaneet}{koontaneet}},% FIXME: unsure redactor = {{toimittanut}{toim\adddot}},% FIXME: unsure redactors = {{toimittaneet}{toim\adddot}},% FIXME: unsure -% reviser = {{}{}},% FIXME: missing -% revisers = {{}{}},% FIXME: missing -% founder = {{}{}},% FIXME: missing -% founders = {{}{}},% FIXME: missing -% continuator = {{}{}},% FIXME: missing -% continuators = {{}{}},% FIXME: missing -% collaborator = {{}{}},% FIXME: missing -% collaborators = {{}{}},% FIXME: missing + reviser = {{toimittanut}{toim\adddot}},% FIXME: unsure + revisers = {{toimittaneet}{toim\adddot}},% FIXME: unsure + founder = {{perustaja}{perustaja}}, + founders = {{perustajat}{perustajat}}, + continuator = {{jatkaja}{jatkaja}},% FIXME: unsure + continuators = {{jatkajat}{jatkajat}},% FIXME: unsure + collaborator = {{avustaja}{avustaja}},% FIXME: unsure + collaborators = {{avustajat}{avustajat}},% FIXME: unsure translator = {{k\"a\"ant\"anyt}{k\"a\"ant\adddot}}, translators = {{k\"a\"ant\"anyt}{k\"a\"ant\adddot}}, commentator = {{kommentaarin kirjoittanut}{kommentaarin kirjoittanut}}, @@ -252,11 +252,11 @@ byeditor = {{toimittanut}{toim\adddot}}, bycompiler = {{koontanut}{koontanut}}, byredactor = {{toimittanut}{toim\adddot}},% FIXME: unsure -% byreviser = {{}{}},% FIXME: missing -% byreviewer = {{}{}},% FIXME: missing -% byfounder = {{}{}},% FIXME: missing -% bycontinuator = {{}{}},% FIXME: missing -% bycollaborator = {{}{}},% FIXME: missing + byreviser = {{toimittanut}{toim\adddot}},% FIXME: unsure + byreviewer = {{toimittanut}{toim\adddot}},% FIXME: unsure + byfounder = {{perustanut}{perustanut}},% FIXME: unsure + bycontinuator = {{jatkanut}{jatkanut}},% FIXME: unsure + bycollaborator = {{yhteisty\"oss\"a}{yhteisty\"oss\"a}},% FIXME: Bad translation. Impossible to translate with one word. bytranslator = {{\lbx@lfromlang k\"a\"ant\"anyt}{\lbx@sfromlang k\"a\"ant\adddot}}, bycommentator = {{kommentaarin kirjoittanut}{kommentaarin kirjoittanut}},% FIXME: unsure byannotator = {{selityksin varustanut}{selityksin varustanut}},% FIXME: unsure @@ -336,36 +336,36 @@ and = {{ja}{ja}}, andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, andmore = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, - volume = {{volyymi}{vol\adddot}}, - volumes = {{volyymit}{vol\adddot}}, - involumes = {{tilavuusosaan}{tilavuusosaan}},% FIXME: unsure + volume = {{volyymi}{vol\adddot}},% FIXME: Is {{osa}{osa}} a better translation? + volumes = {{volyymit}{vol\adddot}},% Incorrect. Correct translation of "volumes" depends on context. +% involumes = {{}{}},% FIXME: missing. Finnish translation of "in 5 volumes" is "5 osassa". jourvol = {{volyymi}{vol\adddot}}, jourser = {{sarja}{sarja}}, -% book = {{}{}},% FIXME: missing -% part = {{}{}},% FIXME: missing -% issue = {{}{}},% FIXME: missing + book = {{kirja}{kirja}},% FIXME: Literal translation of "book". Correct translation depends on context. + part = {{osa}{osa}},% FIXME: unsure + issue = {{numero}{numero}},% FIXME: unsure newseries = {{uusi sarja}{uusi sarja}}, oldseries = {{vanha sarja}{vanha sarja}}, edition = {{painos}{painos}}, reprint = {{j\"alkipainos}{j\"alkipainos}}, reprintof = {{julkaistu aiemmin nimell\"a}{julkaistu aiemmin nimell\"a}}, reprintas = {{julkaistu uudelleen nimell\"a}{julkaistu uudelleen nimell\"a}}, -% reprintfrom = {{}{}},% FIXME: missing -% translationof = {{}{}},% FIXME: missing -% translationas = {{}{}},% FIXME: missing -% translationfrom = {{}{}},% FIXME: missing -% reviewof = {{}{}},% FIXME: missing -% origpubas = {{}{}},% FIXME: missing -% origpubin = {{}{}},% FIXME: missing -% astitle = {{}{}},% FIXME: missing -% bypublisher = {{}{}},% FIXME: missing + reprintfrom = {{julkaistu aiemmin nimell\"a}{julkaistu aiemmin nimell\"a}},% FIXME: unsure + translationof = {{k\"a\"ann\"os teoksesta}{k\"a\"ann\"os teoksesta}},% FIXME: unsure + translationas = {{k\"a\"annetty nimell\"a}{k\"a\"annetty nimell\"a}},% FIXME: unsure + translationfrom = {{k\"a\"annetty kielest\"a}{k\"a\"annetty kielest\"a}},% Result is very bad Finnish. + reviewof = {{arvostelu teoksesta}{arvostelu teoksesta}},% FIXME: unsure. Bad Finnish. + origpubas = {{julkaistu ensi kerran nimell\"a}{julkaistu ensi kerran nimell\"a}}, + origpubin = {{julkaistu ensi kerran vuonna}{julkaistu ensi kerran vuonna}}, + astitle = {{nimell\"a}{nimell\"a}},% FIXME: unsure + bypublisher = {{julkaissut}{julkaissut}},% FIXME: unsure page = {{sivu}{s\adddot}}, pages = {{sivut}{s\adddot}}, column = {{palsta}{palsta}},% Here "sarake" is wrong! columns = {{palstat}{palstat}},% Here "sarakkeet" is wrong! line = {{rivi}{rivi}}, lines = {{rivit}{rivit}}, - nodate = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME + nodate = {{ei julkaisup\"aiv\"a\"a}{ei julkaisup\"aiv\"a\"a}},% FIXME: unsure verse = {{s\"ae}{s\"ae}}, verses = {{s\"akeet}{s\"akeet}}, section = {{kohta}{kohta}},% Bad translation, but "pyk\"al\"a" is no better. @@ -379,7 +379,7 @@ chapter = {{luku}{luku}}, mathesis = {{tutkielma}{tutkielma}},% FIXME: unsure phdthesis = {{tohtorinv\"ait\"oskirja}{tohtorinv\"ait\"oskirja}}, - candthesis = {{kandidat}{kandidat}},% FIXME: unsure + candthesis = {{kanditaatintutkielma}{kanditaatintutkielma}},% Literal translation of "Candidate thesis". resreport = {{tutkimusraportti}{tutkimusraportti}}, techreport = {{tekninen raportti}{tekninen raportti}}, software = {{ohjelmisto}{ohjelmisto}}, @@ -387,15 +387,15 @@ audiocd = {{\"a\"ani-CD}{\"a\"ani-CD}}, version = {{versio}{versio}}, url = {{url}{url}}, -% urlfrom = {{}{}},% FIXME: missing + urlfrom = {{saatavilla osoitteesta}{saatavilla osoitteesta}},% FIXME: unsure urlseen = {{viitattu}{viitattu}}, -% inpreparation = {{}{}},% FIXME: missing -% submitted = {{}{}},% FIXME: missing -% forthcoming = {{}{}},% FIXME: missing -% inpress = {{}{}},% FIXME: missing -% prepublished = {{}{}},% FIXME: missing + inpreparation = {{valmisteilla}{valmisteilla}},% FIXME: unsure + submitted = {{l\"ahetetty}{l\"ahetetty}},% FIXME: unsure + forthcoming = {{hyv\"aksytty julkaistavaksi}{hyv\"aksytty julkaistavaksi}},% FIXME: unsure + inpress = {{painossa}{painossa}},% FIXME: unsure + prepublished = {{esijulkaistu}{esijulkaistu}},% FIXME: unsure citedas = {{jatkossa}{jatkossa}}, -% thiscite = {{}{}},% FIXME: missing + thiscite = {{t\"am\"a lainaus}{t\"am\"a lainaus}},% FIXME: unsure seenote = {{katso viite}{katso viite}}, quotedin = {{lainattu teoksessa}{lainattu teoksessa}}, idem = {{idem}{id\adddot}},% It its not necessary to translate Latin phrases. @@ -443,43 +443,43 @@ basicdecember = {{joulukuu}{joulukuu}}, langamerican = {{amerikanenglanti}{amerikanenglanti}}, langbrazilian = {{brasilianportugali}{brasilianportugali}}, -% langcatalan = {{}{}},% FIXME: missing -% langcroatian = {{}{}},% FIXME: missing -% langczech = {{}{}},% FIXME: missing + langcatalan = {{katalonia}{katalonia}}, + langcroatian = {{kroataia}{kroatia}}, + langczech = {{t\v{s}ekki}{t\v{s}ekki}}, langdanish = {{tanska}{tanska}}, langdutch = {{hollanti}{hollanti}}, langenglish = {{englanti}{englanti}}, -% langfinnish = {{}{}},% FIXME: missing + langfinnish = {{suomi}{suomi}}, langfrench = {{ranska}{ranska}}, langgerman = {{saksa}{saksa}}, langgreek = {{kreikka}{kreikka}}, langitalian = {{italia}{italia}}, langlatin = {{latina}{latina}}, langnorwegian = {{norja}{norja}}, -% langpolish = {{}{}},% FIXME: missing + langpolish = {{puola}{puola}}, langportuguese = {{portugali}{portugali}}, -% langrussian = {{}{}},% FIXME: missing + langrussian = {{ven\"aj\"a}{ven\"aj\"a}}, % langslovene = {{}{}},% FIXME: missing langspanish = {{espanja}{espanja}}, langswedish = {{ruotsi}{ruotsi}}, fromamerican = {{englannin kielest\"a}{englannin kielest\"a}}, frombrazilian = {{portugalin kielest\"a}{portugalin kielest\"a}}, -% fromcatalan = {{}{}},% FIXME: missing -% fromcroatian = {{}{}},% FIXME: missing -% fromczech = {{}{}},% FIXME: missing + fromcatalan = {{katalonian kielest\"a}{katalonian kielest\"a}}, + fromcroatian = {{kroatian kielest\"a}{kroatian kielest\"a}}, + fromczech = {{t\v{s}ekin kielest\"a}{t\v{s}ekin kielest\"a}}, fromdanish = {{tanskan kielest\"a}{tanskan kielest\"a}}, fromdutch = {{hollannin kielest\"a}{hollannin kielest\"a}}, fromenglish = {{englannin kielest\"a}{englannin kielest\"a}}, -% fromfinnish = {{}{}},% FIXME: missing + fromfinnish = {{suomen kielest\"a}{suomen kielest\"a}}, fromfrench = {{ranskan kielest\"a}{ranskan kielest\"a}}, fromgerman = {{saksan kielest\"a}{saksan kielest\"a}}, fromgreek = {{kreikan kielest\"a}{kreikan kielest\"a}}, fromitalian = {{italian kielest\"a}{italian kielest\"a}}, fromlatin = {{latinan kielest\"a}{latinan kielest\"a}}, fromnorwegian = {{norjan kielest\"a}{norjan kielest\"a}}, -% frompolish = {{}{}},% FIXME: missing + frompolish = {{puolan kielest\"a}{puolan kielest\"a}}, fromportuguese = {{portugalin kielest\"a}{portugalin kielest\"a}}, -% fromrussian = {{}{}},% FIXME: missing + fromrussian = {{ven\"aj\"an kielest\"a}{ven\"aj\"an kielest\"a}}, % fromslovene = {{}{}},% FIXME: missing fromspanish = {{espanjan kielest\"a}{espanjan kielest\"a}}, fromswedish = {{ruotsin kielest\"a}{ruotsin kielest\"a}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx index bb47c740d58..2faa6b00ad2 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx @@ -50,8 +50,6 @@ \protected\def\mkbibmascord#1{\stripzeros{#1}ος}% \protected\def\mkbibfemord#1{\stripzeros{#1}η}% \protected\def\mkbibneutord{\mkbibmascord}% - \savecommand\mkbibmonth - \let\mkbibmonth\lbx@gr@mkbibmonth \protected\def\mkbibdatelong#1#2#3{% \iffieldundef{#3} {} @@ -59,7 +57,7 @@ \iffieldundef{#2}{}{\nobreakspace}}% \iffieldundef{#2} {} - {\mkbibmonth{\thefield{#2}}% + {\lbx@gr@mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} @@ -83,7 +81,6 @@ } \UndeclareBibliographyExtras{% - \restorecommand\mkbibmonth \restorecommand\mkbibordedition \restorecommand\mkbibordseries } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx index 67b78f17e31..9eb8472181a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx @@ -450,12 +450,13 @@ langgerman = {{немецкий}{нем\adddot}}, langgreek = {{греческий}{греч\adddot}}, langitalian = {{итальянский}{итал\adddot}}, + langjapanese = {{японский}{яп\adddot}}, langlatin = {{латинский}{лат\adddot}}, langnorwegian = {{норвежский}{норв\adddot}}, langpolish = {{польский}{пол\adddot}}, langportuguese = {{португальский}{порт\adddot}}, langrussian = {{русский}{рус\adddot}}, -% langslovene = {{}{}},% FIXME: missing + langslovene = {{словенский}{слов\adddot}}, langspanish = {{испанский}{исп\adddot}}, langswedish = {{шведский}{швед\adddot}}, fromamerican = {{с американского}{с\addabbrvspace амер\adddot}}, @@ -471,12 +472,13 @@ fromgerman = {{с немецкого}{с\addabbrvspace нем\adddot}}, fromgreek = {{с греческого}{с\addabbrvspace греч\adddot}}, fromitalian = {{с итальянского}{с\addabbrvspace итал\adddot}}, + fromjapanese = {{с японского}{с\addabbrvspace яп\adddot}}, fromlatin = {{с латинского}{с\addabbrvspace лат\adddot}}, fromnorwegian = {{с норвежского}{с\addabbrvspace норв\adddot}}, frompolish = {{с польского}{с пол\adddot}}, fromportuguese = {{с португальского}{с\addabbrvspace порт\adddot}}, fromrussian = {{с русского}{с\addabbrvspace рус\adddot}}, -% fromslovene = {{}{}},% FIXME: missing + fromslovene = {{со словенского}{со\addabbrvspace слов\adddot}}, fromspanish = {{с испанского}{с\addabbrvspace исп\adddot}}, fromswedish = {{со шведского}{со\addabbrvspace швед\adddot}}, countryde = {{Германия}{Германия}}, -- cgit v1.2.3