From 295b453abefbb11e8491968ce857079ce2b76087 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 2 Nov 2012 23:54:18 +0000 Subject: biblatex 2.3 (1nov12) git-svn-id: svn://tug.org/texlive/trunk@28161 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx | 1 + .../texmf-dist/tex/latex/biblatex/bbx/standard.bbx | 30 +- Master/texmf-dist/tex/latex/biblatex/biblatex.def | 76 ++-- Master/texmf-dist/tex/latex/biblatex/biblatex.sty | 9 +- Master/texmf-dist/tex/latex/biblatex/biblatex1.sty | 47 ++- Master/texmf-dist/tex/latex/biblatex/biblatex2.sty | 327 +++++++++++------ Master/texmf-dist/tex/latex/biblatex/blx-dm.def | 29 +- .../tex/latex/biblatex/lbx/brazilian.lbx | 1 + .../texmf-dist/tex/latex/biblatex/lbx/catalan.lbx | 400 +++++++++++++++++++++ .../texmf-dist/tex/latex/biblatex/lbx/danish.lbx | 1 + Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx | 1 + .../texmf-dist/tex/latex/biblatex/lbx/english.lbx | 1 + .../texmf-dist/tex/latex/biblatex/lbx/finnish.lbx | 1 + .../texmf-dist/tex/latex/biblatex/lbx/french.lbx | 1 + .../texmf-dist/tex/latex/biblatex/lbx/german.lbx | 1 + Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx | 1 + .../tex/latex/biblatex/lbx/icelandic.lbx | 1 + .../texmf-dist/tex/latex/biblatex/lbx/italian.lbx | 1 + .../tex/latex/biblatex/lbx/norwegian.lbx | 3 +- .../texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx | 2 +- .../tex/latex/biblatex/lbx/portuguese.lbx | 1 + .../texmf-dist/tex/latex/biblatex/lbx/russian.lbx | 1 + .../texmf-dist/tex/latex/biblatex/lbx/spanish.lbx | 1 + .../texmf-dist/tex/latex/biblatex/lbx/swedish.lbx | 1 + 24 files changed, 770 insertions(+), 168 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx (limited to 'Master/texmf-dist/tex/latex/biblatex') diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx index 60585d04d8f..ba0d4422610 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx @@ -79,6 +79,7 @@ \def\do{\printlist[debug][-\thelisttotal]}% \abx@dolists \def\do{\printfield[debug]}% + \abx@dointernalfields \abx@dofields\do{options}\do{execute}% \item\begingroup\ttfamily\leavevmode \xleaders\hbox to 0.75em{\hss-\hss}\hfill\kern\z@ diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx index d237fba1534..06d73b16a75 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx @@ -831,6 +831,7 @@ \printfield{pubstate}} \newcounter{bbx:relatedcount} +\newcounter{bbx:relatedtotal} \newbibmacro*{related}{% \ifboolexpr{ @@ -840,22 +841,31 @@ } {} {\setcounter{bbx:relatedcount}{0}% + \setcounter{bbx:relatedtotal}{0}% + \def\do##1{\stepcounter{bbx:relatedtotal}}% + \docsvfield{related}% \def\do{% \stepcounter{bbx:relatedcount}% \ifnumgreater{\value{bbx:relatedcount}}{1} {\printtext{\relateddelim}} {}}% - \ifcsundef{abx@macro@related:\strfield{relatedtype}} - {\appto{\do}{\csuse{abx@macro@related:default}}} - {\appto{\do}{\csuse{abx@macro@related:\strfield{relatedtype}}}}% - \ifcsundef{abx@ffd@*@related:\strfield{relatedtype}} - {\def\abx@tempa{related}} - {\def\abx@tempa{related:\strfield{relatedtype}}}% - \printtext[\abx@tempa]{% + \ifbibmacroundef{related:\strfield{relatedtype}} + {\appto{\do}{\usebibmacro{related:default}}} + {\appto{\do}{\usebibmacro*{related:\strfield{relatedtype}}}}% + \iffieldformatundef{related:\strfield{relatedtype}} + {\def\bbx@tempa{related}} + {\def\bbx@tempa{related:\strfield{relatedtype}}}% + \printtext[\bbx@tempa]{% \iffieldundef{relatedstring} - {\iffieldbibstring{relatedtype} - {\printtext{\bibstring{\thefield{relatedtype}}\relatedpunct}} - {}} + {\ifboolexpr{ + test {\ifnumgreater{\value{bbx:relatedtotal}}{1}} + and + test {\ifbibxstring{\thefield{relatedtype}s}} + } + {\printtext{\bibstring{\thefield{relatedtype}s}\relatedpunct}} + {\iffieldbibstring{relatedtype} + {\printtext{\bibstring{\thefield{relatedtype}}\relatedpunct}} + {}}} {\iffieldbibstring{relatedstring} {\printtext{\bibstring{\thefield{relatedstring}}\relatedpunct}} {\printtext{\printfield{relatedstring}\relatedpunct}}}% diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def index 840af8ea3c5..055f73791cd 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def @@ -822,12 +822,20 @@ \usebibmacro{index:field}{#1}{\thefield{indexsorttitle}}{\emph{#2}}} \newbibmacro*{index:field}[3]{% + \usebibmacro{index:entry}{#1}{\mkbibindexfield{#2}{#3}}} + +% Auxiliary macros for field indexing directives +% ------------------------------------------------------------------ + +\newbibmacro*{index:entry}[2]{% \begingroup - \protected@edef\theindexentry{% - \unexpanded{#1}{#2\actualoperator\unexpanded{#3}}}% + \protected@edef\theindexentry{\unexpanded{#1}{#2}}% \theindexentry \endgroup} +\newcommand*{\mkbibindexfield}[2]{\mkbibindexentry{#1}{\unexpanded{#2}}} +\newcommand*{\mkbibindexentry}[2]{#1\actualoperator#2} + % ------------------------------------------------------------------ % INDEX FORMATS FOR LITERAL LISTS (#1 is the current item) % ------------------------------------------------------------------ @@ -891,36 +899,54 @@ % We also use \ifuseprefix to ensure that the name prefix is handled % properly. \actualoperator is the so-called actual operator, as % defined by the 'actual' specifier in the .ist file. The makeindex -% programm will use the part preceeding the \actualoperator +% program will use the part preceeding the \actualoperator % delimiter for sorting. The part after the delimiter is used as the % index is printed. Note that this is not specific to biblatex, see % the makeindex documentation for details. \newcommand*{\actualoperator}{@} +\newcommand*{\subentryoperator}{!} \newbibmacro*{index:name}[5]{% - \begingroup + \usebibmacro{index:entry}{#1}{\mkbibindexname{#2}{#3}{#4}{#5}}} + +% {}{}{}{} + +\newcommand*{\mkbibindexname}[4]{% \ifuseprefix - {\protected@edef\theindexentry{% - \unexpanded{#1}{% - \ifblank{#4}{}{#4 }% - \@firstofone #2% remove spurious braces - \ifblank{#5}{}{ #5}% - \ifblank{#3}{}{, #3}% - \actualoperator - \ifblank{#4}{}{\MakeCapital{#4} }% - #2% - \ifblank{#5}{}{ #5}% - \ifblank{#3}{}{, #3}}}} - {\protected@edef\theindexentry{% - \unexpanded{#1}{% - \@firstofone #2% remove spurious braces - \ifblank{#5}{}{ #5}% - \ifblank{#3#4}{}{,}% - \ifblank{#3}{}{ #3}% - \ifblank{#4}{}{ #4}}}}% - \theindexentry - \endgroup} + {\ifblank{#3}{}{#3 }% + \@firstofone #1% remove spurious braces + \ifblank{#4}{}{ #4}% + \ifblank{#2}{}{, #2}% + \actualoperator + \ifblank{#3}{}{\MakeCapital{#3} }% + #1% + \ifblank{#4}{}{ #4}% + \ifblank{#2}{}{, #2}} + {\@firstofone #1% remove spurious braces + \ifblank{#4}{}{ #4}% + \ifblank{#2#3}{}{,}% + \ifblank{#2}{}{ #2}% + \ifblank{#3}{}{ #3}}} + +% {}{} + +\newcommand*{\mkbibindexsubentry}[2]{% + \ifblank{#1}{}{\subentryoperator#1\actualoperator#2}} + +% Additional macros with subentries + +\newbibmacro*{index:name:field}[6]{% + \usebibmacro{index:name:subentry}{#1}{#2}{#3}{#4}{#5} + {\thefield{#6}}{\csfield{#6}}} + +\newbibmacro*{index:name:title}[5]{% + \usebibmacro{index:name:subentry}{#1}{#2}{#3}{#4}{#5} + {\thefield{indexsorttitle}}{\emph{\csfield{indextitle}}}} + +\newbibmacro*{index:name:subentry}[7]{% + \usebibmacro{index:entry}{#1}{% + \mkbibindexname{#2}{#3}{#4}{#5}\mkbibindexsubentry{#6}{#7}}} % ------------------------------------------------------------------ % Driver sourcemaps @@ -1816,7 +1842,7 @@ \markboth{\chaptermarkformat#1}{\chaptermarkformat#1}} \defbibheading{subbibliography}[\refname]{% \section*{#1}% - \if@twoside\markright{\sectionmarkformat#1}\fi} + \if@twoside\markright{#1}\fi} \defbibheading{subbibintoc}[\refname]{% \addsec{#1}% \markboth{#1}{#1}} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty index 450f3621f32..fe3d920786c 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{2012/08/17} -\def\abx@version{2.2} +\def\abx@date{2012/10/29} +\def\abx@version{2.3} \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.0} +\def\blx@bcfversion{2.1} % 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 @@ -76,10 +76,11 @@ \expandafter\@secondoftwo \fi {% - % A few things not defined by v1, but defined in biblatex.def so has to be handled + % A few things not defined by v1 so has to be handled if using v1 \protected\long\def\DeclareDefaultSourcemap[#1]#2{}% \protected\long\def\DeclareLabelalphaTemplate#1{}% \protected\long\def\DeclareLabeltitle#1{}% + \protected\long\def\abx@dointernalfields{}% \RequirePackage{biblatex1}% } {\RequirePackage{biblatex2}} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty index 6a9aeac7dd9..ef59ba0505b 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty @@ -155,6 +155,7 @@ {}}% \docsvlist{% \@footnotetext,% patch twice + \H@@footnotetext,% patch twice \@plainfootnotetext}} {}% \iftoggle{blx@tempa} @@ -1935,12 +1936,25 @@ % {} -\newrobustcmd*{\usebibmacro}[1]{% - \ifcsundef{abx@macro@\detokenize{#1}} +\newrobustcmd*{\usebibmacro}{% + \@ifstar + {\blx@usebibmacro@i} + {\blx@usebibmacro}} + +\def\blx@usebibmacro#1{% + \blx@usebibmacro@i{\detokenize{#1}}} + +\def\blx@usebibmacro@i#1{% + \ifcsundef{abx@macro@#1} {\blx@error - {Bibliography macro '\detokenize{#1}' undefined} + {Bibliography macro '#1' undefined} {Use '\string\newbibmacro' to define this macro}} - {\csuse{abx@macro@\detokenize{#1}}}} + {\csuse{abx@macro@#1}}} + +% {}{}{} + +\def\blx@imc@ifbibmacroundef#1{% + \ifcsundef{abx@macro@#1}} % {} @@ -1952,6 +1966,14 @@ {\csname abx@field@#1\endcsname}} {}} +\def\blx@imc@csfield#1{\usefield{\unexpanded}{#1}} + +% {}{} + +\def\blx@imc@usefield#1#2{% + \expandafter\expandafter\expandafter#1% + \expandafter\expandafter\expandafter{\csname abx@field@#2\endcsname}} + % {} \def\blx@imc@thelist#1{\csuse{abx@list@#1}} @@ -3132,13 +3154,13 @@ \global\toggletrue{blx@block}} \blx@regimcs{% - \ifdriver \thefield \strfield \thelist \thename \clearfield \clearlist - \clearname \restorefield \restorelist \restorename + \ifdriver \thefield \strfield \csfield \usefield \thelist \thename + \clearfield \clearlist \clearname \restorefield \restorelist \restorename \ifcategory \ifentrycategory \ifkeyword \ifentrykeyword \ifciteseen \ifentryseen \ifciteibid \ifciteidem \ifopcit \ifloccit \ifcurrentfield \ifcurrentlist \ifcurrentname \ifentrytype \iffieldequalcs \iffieldequals \iffieldequalstr \iffieldsequal - \iffieldundef \iffieldxref \iflistequalcs \iflistequals + \ifbibmacroundef \iffieldundef \iffieldxref \iflistequalcs \iflistequals \iflistsequal \iflistundef \iflistxref \ifmorenames \ifmoreitems \ifnameequalcs \ifnameequals \ifnamesequal \ifnameundef \ifnamexref \iffirstonpage \ifsamepage \savefield \savefieldcs \savelist @@ -3558,6 +3580,12 @@ \newrobustcmd*{\restorelistformat}[2][*]{\blx@restore{abx@lfd@#1@#2}} \newrobustcmd*{\restorenameformat}[2][*]{\blx@restore{abx@nfd@#1@#2}} +% []{}{}{} + +\newrobustcmd*{\iffieldformatundef}[2][*]{\ifcsundef{abx@ffd@#1@#2}} +\newrobustcmd*{\iflistformatundef}[2][*]{\ifcsundef{abx@lfd@#1@#2}} +\newrobustcmd*{\ifnameformatundef}[2][*]{\ifcsundef{abx@nfd@#1@#2}} + % []{}[]{} \newrobustcmd*{\DeclareNameAlias}{\blx@defalias{nfd}} @@ -4326,6 +4354,7 @@ \do{inpreparation}% \do{submitted}% \do{inpress}% + \do{prepublished}% \do{forthcoming}% \do{library}% \do{abstract}% @@ -9554,14 +9583,14 @@ \DeclareBibliographyOption{maxcitenames}{% \numdef\blx@maxcitenames{#1}} \DeclareBibliographyOption{mincitenames}{% - \numdef\blx@minbibnames{#1}} + \numdef\blx@mincitenames{#1}} \DeclareTypeOption{maxcitenames}{% \numdef\blx@maxcitenames@type{#1}% \iftoggle{blx@bibliography} {} {\c@maxnames#1\relax}} \DeclareTypeOption{mincitenames}{% - \numdef\blx@minbibnames@type{#1}% + \numdef\blx@mincitenames@type{#1}% \iftoggle{blx@bibliography} {} {\c@minnames#1\relax}} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty index cb3b9ccd304..841261f358a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty @@ -150,6 +150,7 @@ {}}% \docsvlist{% \@footnotetext,% patch twice + \H@@footnotetext,% patch twice \@plainfootnotetext}} {}% \iftoggle{blx@tempa} @@ -448,6 +449,17 @@ \newtoggle{blx@reencode} \newtoggle{blx@citeindex} \newtoggle{blx@bibindex} +\newtoggle{blx@localnumber} + +% Initialise some lists which track changing citations/sortschemes +% etc. between runs +\global\let\blx@cites\@empty +\global\let\blx@sortschemes\@empty +\global\let\blx@lastsortschemes\@empty +\global\let\blx@sortschemeslos\@empty +\global\let\blx@lastsortschemeslos\@empty +\global\let\blx@lastcites\@empty +\global\let\blx@localnumaux\@empty \newread\blx@bcfin \newwrite\blx@bcfout @@ -1754,12 +1766,25 @@ % {} -\newrobustcmd*{\usebibmacro}[1]{% - \ifcsundef{abx@macro@\detokenize{#1}} +\newrobustcmd*{\usebibmacro}{% + \@ifstar + {\blx@usebibmacro@i} + {\blx@usebibmacro}} + +\def\blx@usebibmacro#1{% + \blx@usebibmacro@i{\detokenize{#1}}} + +\def\blx@usebibmacro@i#1{% + \ifcsundef{abx@macro@#1} {\blx@error - {Bibliography macro '\detokenize{#1}' undefined} + {Bibliography macro '#1' undefined} {Use '\string\newbibmacro' to define this macro}} - {\csuse{abx@macro@\detokenize{#1}}}} + {\csuse{abx@macro@#1}}} + +% {}{}{} + +\def\blx@imc@ifbibmacroundef#1{% + \ifcsundef{abx@macro@#1}} % {} @@ -1771,6 +1796,14 @@ {\csname abx@field@#1\endcsname}} {}} +\def\blx@imc@csfield#1{\usefield{\unexpanded}{#1}} + +% {}{} + +\def\blx@imc@usefield#1#2{% + \expandafter\expandafter\expandafter#1% + \expandafter\expandafter\expandafter{\csname abx@field@#2\endcsname}} + % {} \def\blx@imc@thelist#1{\csuse{abx@list@#1}} @@ -2942,13 +2975,13 @@ \global\toggletrue{blx@block}} \blx@regimcs{% - \ifdriver \thefield \strfield \thelist \thename \clearfield \clearlist - \clearname \restorefield \restorelist \restorename + \ifdriver \thefield \strfield \csfield \usefield \thelist \thename + \clearfield \clearlist \clearname \restorefield \restorelist \restorename \ifcategory \ifentrycategory \ifkeyword \ifentrykeyword \ifciteseen \ifentryseen \ifciteibid \ifciteidem \ifopcit \ifloccit \ifcurrentfield \ifcurrentlist \ifcurrentname \ifentrytype \iffieldequalcs \iffieldequals \iffieldequalstr \iffieldsequal - \iffieldundef \iffieldxref \iflistequalcs \iflistequals + \ifbibmacroundef \iffieldundef \iffieldxref \iflistequalcs \iflistequals \iflistsequal \iflistundef \iflistxref \ifmorenames \ifmoreitems \ifnameequalcs \ifnameequals \ifnamesequal \ifnameundef \ifnamexref \iffirstonpage \ifsamepage \savefield \savefieldcs \savelist @@ -2978,7 +3011,7 @@ \let\nopp\relax \protected\def\psq{\sqspace\bibstring{sequens}}% \protected\def\psqq{\sqspace\bibstring{sequentes}}} - + % Make sure that commands which might pop up inside an \edef will be defined % as something. If they are taken \AtBeginDocument then we assume that all will % be well. If not, then provide a definition which will give an error outside @@ -3368,6 +3401,12 @@ \newrobustcmd*{\restorelistformat}[2][*]{\blx@restore{abx@lfd@#1@#2}} \newrobustcmd*{\restorenameformat}[2][*]{\blx@restore{abx@nfd@#1@#2}} +% []{}{}{} + +\newrobustcmd*{\iffieldformatundef}[2][*]{\ifcsundef{abx@ffd@#1@#2}} +\newrobustcmd*{\iflistformatundef}[2][*]{\ifcsundef{abx@lfd@#1@#2}} +\newrobustcmd*{\ifnameformatundef}[2][*]{\ifcsundef{abx@nfd@#1@#2}} + % []{}[]{} \newrobustcmd*{\DeclareNameAlias}{\blx@defalias{nfd}} @@ -3854,7 +3893,7 @@ {\@firstoftwo}}} \blx@regimcs{% - \bibstring \biblstring \bibsstring + \bibstring \biblstring \bibsstring \bibxstring \bibxlstring \bibxsstring \bibcpstring \bibcplstring \bibcpsstring \biblcstring \biblclstring \biblcsstring @@ -4133,6 +4172,7 @@ \do{inpreparation}% \do{submitted}% \do{inpress}% + \do{prepublished}% \do{forthcoming}% \do{library}% \do{abstract}% @@ -4790,12 +4830,11 @@ \do{localnumber}% \do{namehash}% \do{prefixnumber}% - \do{sortinit}% -} + \do{sortinit}} \def\abx@dobooleans{% - \do{singletitle}% -} + \do{singletitle}} + \def\do#1{% \newcounter{#1}% \newcounter{saved#1}% @@ -5226,7 +5265,6 @@ \blx@setoptions@entry \edef\blx@bbl@data{blx@data@\the\c@refsection @\abx@field@entrykey}% \csuse\blx@bbl@data - \cslet\blx@bbl@data\@empty \blx@bbl@addfield{entrykey}{\abx@field@entrykey}% \blx@bbl@addfield{entrytype}{#2}% \blx@imc@iffieldundef{options} @@ -5256,21 +5294,21 @@ {}% \nottoggle{blx@skiplab} {\iftoggle{blx@labelnumber} - {\blx@bbl@labelnumber} - {}% - \iftoggle{blx@labelalpha} - {\blx@bbl@labelalpha} - {}% - \iftoggle{blx@labeltitle} - {\blx@bbl@labeltitle} - {}% - \iftoggle{blx@labeltitleyear} - {\blx@bbl@labeltitleyear} - {}% - \iftoggle{blx@labelyear} - {\blx@bbl@labelyear} - {}% - \blx@bbl@prefixnumber} + {\blx@bbl@labelnumber} + {}% + \iftoggle{blx@labelalpha} + {\blx@bbl@labelalpha} + {}% + \iftoggle{blx@labeltitle} + {\blx@bbl@labeltitle} + {}% + \iftoggle{blx@labeltitleyear} + {\blx@bbl@labeltitleyear} + {}% + \iftoggle{blx@labelyear} + {\blx@bbl@labelyear} + {}% + \blx@bbl@prefixnumber} {}% \blx@bbl@titles \blx@bbl@hooks @@ -5307,30 +5345,35 @@ \csuse{abx@ffd@*@shorthandwidth}{\abx@field@shorthand}}}} \def\blx@bbl@labelnumber{% - \ifdefempty\abx@field@localnumber - {} - {\ifundef\abx@field@shorthand - {\ifdef\abx@field@localnumber - {} + % Used at endentry + % only do this for the global sorting list otherwise we increment + % the labelnumbers for each sortlist + \ifdefstrequal{\blx@slist@name}{\blx@sorting} + {\ifdefempty\abx@field@localnumber + {}% only if omitnumbers=true + {\ifundef\abx@field@shorthand + {\ifdef\abx@field@localnumber + {}% only if defernumbers=true {\csnumgdef{blx@labelnumber@\the\c@refsection}{% - \csuse{blx@labelnumber@\the\c@refsection}+1}% - \edef\abx@field@localnumber{% - \csuse{blx@labelnumber@\the\c@refsection}}}% - \blx@bbl@fieldedef{labelnumber}{\abx@field@localnumber}% - \iftoggle{blx@skipbib} + \csuse{blx@labelnumber@\the\c@refsection}+1}% + \edef\abx@field@localnumber{% + \csuse{blx@labelnumber@\the\c@refsection}}}% + \blx@bbl@fieldedef{labelnumber}{\abx@field@localnumber}% + \iftoggle{blx@skipbib} {} {\blx@setlabwidth{\labelnumberwidth}{% - \csuse{abx@ffd@*@labelnumberwidth}{% - \ifdef\abx@field@prefixnumber - {\csuse{abx@ffd@*@prefixnumber}{\abx@field@prefixnumber}} - {}% - \abx@field@localnumber}}}} - {\csgappto\blx@bbl@data{% - \let\abx@field@labelnumber\abx@field@shorthand}% - \iftoggle{blx@skipbib} + \csuse{abx@ffd@*@labelnumberwidth}{% + \ifdef\abx@field@prefixnumber + {\csuse{abx@ffd@*@prefixnumber}{\abx@field@prefixnumber}} + {}% + \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{abx@ffd@*@labelnumberwidth}{\abx@field@shorthand}}}}}} + {}} \def\blx@bbl@prefixnumber{% \ifdef\abx@field@prefixnumber @@ -5436,14 +5479,29 @@ \def\blx@bblend{% } +% {} +% Get the saved information on which citations were mentioned last run +\protected\def\abx@aux@cite#1{% + \listxadd{\blx@lastcites}{\detokenize{#1}}} + +% {} +% Get the saved information on which sorting schemes were mentioned last run +\protected\def\abx@aux@sortscheme#1{% + \listgadd{\blx@lastsortschemes}{#1}} + +% {} +% Get the saved information on which shorthand sorting schemes were mentioned last run +\protected\def\abx@aux@sortschemelos#1{% + \listgadd{\blx@lastsortschemeslos}{#1}} + % {}{}{}{} \protected\def\blx@aux@number#1#2#3#4{% \blx@bbl@addentryfield{\detokenize{#2}}{#3}{localnumber}{#4}% + \global\toggletrue{blx@localnumber}% \ifblank{#4} {} - {\csgdef{blx@labelnumber@#3}{#4}% - \blx@addchecksum{#1}{#4}}} + {\csgdef{blx@labelnumber@#3}{#4}}} \AtEndDocument{% \def\abx@aux@number#1#2#3#4{% @@ -5451,22 +5509,79 @@ {} {\blx@addchecksum{#1}{#4}}}} +\AtEndDocument{% + % Here we run some tests to decide if we need to issue re-run + % messages in certain circumstances. In general, if we add/remove + % any citations or add/remove any sorting schemes, we need to re-run + % biber. Also, if we have to re-run biber, we need to defer writing + % the defernumbers .aux information because it will not yet be correct. + + % Test to see if we *removed* any citations since last run + % (adding citations is dealt with naturally in \blx@citation@entry) + % If so, give a rerun biber message. This also sets the + % rerun biber toggle so defernums doesn't consume the localnumbers + % in the .aux but instead, re-writes them, which is what we need. + \begingroup + \def\do#1{\ifinlist{#1}{\blx@cites}{}{\blx@logreq@active{}}\relax}% + \dolistloop\blx@lastcites + % Special case - if we are using sortscheme "none" anywhere, then changes + % in citation order matter and we need to re-run biber. So a special test + % to see if the cites from last run are identical in order. We have + % already tested for more or less cites between runs by now, we are + % testing here for exactly the same cites by treating the cite and + % lastcite lists as strings and comparing them. This doesn't apply + % to shorthand sortschemes as nobody wants to sort shorthands with + % "none" anyway, it makes no sense + \ifinlist{none}{\blx@sortschemes} + {\ifdefstrequal{\blx@cites}{\blx@lastcites} + {} + {\blx@logreq@active{}}} + {}% + % Test to see if we removed any mention of a sorting scheme since last run. + % If we did, we need to re-run biber + \def\do#1{\ifinlist{#1}{\blx@sortschemes}{}{\blx@logreq@active{}}\relax}% + \dolistloop\blx@lastsortschemes + % Test to see if we added any mention of a sorting scheme since last run + % If we did, we need to re-run biber + \def\do#1{\ifinlist{#1}{\blx@lastsortschemes}{}{\blx@logreq@active{}}\relax}% + \dolistloop\blx@sortschemes + % Test to see if we removed any mention of a shorthand sorting scheme since last run. + % If we did, we need to re-run biber + \def\do#1{\ifinlist{#1}{\blx@sortschemeslos}{}{\blx@logreq@active{}}\relax}% + \dolistloop\blx@lastsortschemeslos + % Test to see if we added any mention of a shorthand sorting scheme since last run + % If we did, we need to re-run biber + \def\do#1{\ifinlist{#1}{\blx@lastsortschemeslos}{}{\blx@logreq@active{}}\relax}% + \dolistloop\blx@sortschemeslos + % If we have to run biber or latex again and we are using defernumbers, + % don't write the localnumber information to the .aux file yet as we will + % potentially have to regenerate sorting order first in biber + \iftoggle{blx@defernumbers} + {\iftoggle{blx@runbiber} + {} + {\def\do#1{\blx@auxwrite\@mainaux{}{#1}} + \dolistloop\blx@localnumaux}} + {}% + \endgroup} + +% Only used when defernumbers=true \def\blx@addlabelnumber{% \begingroup \nottoggle{blx@skiplab} {\iftoggle{blx@labelnumber} {\ifundef\abx@field@shorthand - {\ifundef\abx@field@localnumber - {\iftoggle{blx@omitnumbers} - {\let\abx@field@localnumber\@empty} - {\csnumgdef{blx@labelnumber@\the\c@refsection}{% - \csuse{blx@labelnumber@\the\c@refsection}+1}% + % Need to know if we set any localnumber from .aux file, not + % just current item. Otherwise, we may just write new + % localnumbers but not existing ones + {\nottoggle{blx@localnumber} + {\iftoggle{blx@omitnumbers} + {\let\abx@field@localnumber\@empty} + {\csnumgdef{blx@labelnumber@\the\c@refsection}{% + \csuse{blx@labelnumber@\the\c@refsection}+1}% \edef\abx@field@localnumber{\csuse{blx@labelnumber@\the\c@refsection}}% \blx@bbl@addentryfield{\abx@field@entrykey}{\the\c@refsection}% {localnumber}{\abx@field@localnumber}}% - \blx@auxwrite\@mainaux{}{% - \string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}% - {\the\c@refsection}{\abx@field@localnumber}}} + \listxadd\blx@localnumaux{\string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}{\the\c@refsection}{\abx@field@localnumber}}} {}} {}}% {}} @@ -5495,7 +5610,6 @@ \blx@bbl@addentryfield{\detokenize{#1}}{#2}{prefixnumber}{#3}} \def\blx@bbl@slist#1#2{% - \csnumgdef{blx@labelnumber@\the\c@refsection}{0}% \begingroup \def\blx@slist@name{#2}% % This macro (\key) will only be called in shorthand lists @@ -5740,15 +5854,27 @@ {\blx@err@invopt{sorting=#1}{}}% {\blx@printbibchecks \def\blx@tempc{#1}% + % Add the sortscheme to the list of sortschemes + % so we can compare on next run + \ifinlist{#1}{\blx@sortschemes} + {} + {\listgadd\blx@sortschemes{#1}% + \blx@auxwrite\@mainaux{}{\string\abx@aux@sortscheme{#1}}}% \edef\blx@tempd{% \blx@xml@sorting{% \csuse{blx@biber@sorting@#1}}}}} - + \define@key{blx@los1}{sorting}{% \ifcsundef{blx@biber@sorting@#1} {\blx@err@invopt{sorting=#1}{}}% {\blx@printbibchecks \def\blx@tempc{#1}% + % Add the sortscheme to the list of shorthand sortschemes + % so we can compare on next run + \ifinlist{#1}{\blx@sortschemeslos} + {} + {\listgadd\blx@sortschemeslos{#1}% + \blx@auxwrite\@mainaux{}{\string\abx@aux@sortschemelos{#1}}}% \edef\blx@tempd{% \blx@xml@sorting{% \csuse{blx@biber@sorting@#1}}}}} @@ -6243,7 +6369,8 @@ \csuse{blx@bibsetup}} % {} - +% output a bib item, this is why \blx@thelabelnumber is here so that +% labelnumber is deferred if defernumbers=true \def\blx@bibitem#1{% \blx@ifdata{#1} {\begingroup @@ -6377,10 +6504,10 @@ \let\blx@thetitle\@empty % defaults \let\blx@tempa\@empty% before there is a .bbl, this must not be undef - \def\blx@tempc{shorthand}% sorting scheme name from "sorting" option + \def\blx@tempc{shorthand}% default sorting scheme for shorthands \edef\blx@tempd{% \blx@xml@sorting{% - \csuse{blx@biber@sorting@shorthand}}}% sorting scheme from "sorting" option + \csuse{blx@biber@sorting@shorthand}}}% default sorting scheme for shorthands \let\blx@printbibchecks\relax \edef\blx@tempe{\the\c@refsection}% default refsection is current \blx@safe@actives @@ -6854,7 +6981,7 @@ \blx@loccitreset} % {}{} - +% Just a wrapper to suppress citation tracking in toc/lof etc. \def\blx@citation#1#2{% \ifbool{citerequest} {\blx@citation@entry{#1}{#2}} @@ -6862,6 +6989,10 @@ \def\blx@citation@entry#1#2{% \blx@bibreq{#1}% + \ifinlist{#1}{\blx@cites} + {} + {\listgadd{\blx@cites}{#1}% + \blx@auxwrite\@mainaux{}{\string\abx@aux@cite{#1}}}% \ifinlistcs{#1}{blx@segm@\the\c@refsection @\the\c@refsegment} {} {\listcsgadd{blx@segm@\the\c@refsection @\the\c@refsegment}{#1}}% @@ -6907,7 +7038,7 @@ \protected\def\blx@bibreq#1{% \begingroup \blx@xmlsanitizeafter{\def\blx@tempa}{#1}% - % citeall is always order "0" - this make no real difference as biber + % citeall is always order "0" - this makes no real difference as biber % ignores all other citekeys in the section if citeall is present \ifstrequal{*}{#1} {\blx@auxwrite\blx@bcfout{}{\blx@xml@citekey{\blx@tempa}{0}}} @@ -6930,7 +7061,7 @@ {} {\blx@error {Conflicting definitions of '\blx@tempa'} - {The entry set '\blx@tempa' been defined before.\MessageBreak + {The entry set '\blx@tempa' been defined before.\MessageBreak old: \blx@tempa\space = % \csuse{blx@set@\the\c@refsection @\blx@tempa}\MessageBreak new: \blx@tempa\space = \blx@tempb\MessageBreak @@ -8504,19 +8635,6 @@ \xdef\blx@xml@sourcemap@step#1{% ~~~~~~~~\blx@nl} -\xdef\blx@xml@displaymodes#1#2{% - ~~\blx@nl - #2% - ~~\blx@nl} -\xdef\blx@xml@displaymode#1{% - ~~~~\blx@nl - #1% - ~~~~\blx@nl} -\xdef\blx@xml@dtarget#1{% - ~~~~~~#1\blx@nl} -\xdef\blx@xml@dmode#1#2{% - ~~~~~~#2\blx@nl} - \xdef\blx@xml@labelalphatemplate#1#2{% ~~\blx@nl #2% @@ -8728,13 +8846,6 @@ \endgroup}% \dolistloop\blx@opts@type} {}% - % displaymode - \eappto\blx@tempa{% - \blx@xml@comment{DISPLAYMODES}% - \blx@xml@displaymodes{global}{% - \csuse{blx@biber@displaymodes@global}% - }% - }% % sourcemap \ifbool{sourcemap} {\eappto\blx@tempa{% @@ -8960,8 +9071,15 @@ \eappto\blx@tempf{ map\string_field\string_target="#1"}} \define@key{blx@sourcemap@step}{fieldset}{% characters \eappto\blx@tempf{ map\string_field\string_set="#1"}} +% We are sanitising the XML here as it's the value of an attribute which +% might contain quotes or ampersands (URLs, for example) \define@key{blx@sourcemap@step}{fieldvalue}{% characters - \eappto\blx@tempf{ map\string_field\string_value="#1"}} + \blx@xmlsanitizeafter{\def\blx@temps}{#1}% + \eappto\blx@tempf{ map\string_field\string_value="\blx@temps"}} +\define@key{blx@sourcemap@step}{append}[true]{% true|false + \ifstrequal{#1}{true} + {\appto\blx@tempf{ map\string_append="1"}} + {}} \define@key{blx@sourcemap@step}{null}[true]{% true|false \ifstrequal{#1}{true} {\appto\blx@tempf{ map\string_null="1"}} @@ -9027,6 +9145,9 @@ \eappto\blx@tempb{% \blx@xml@labelalpha@part{\blx@tempc}{#2}}} +% script form - original | translated | romanised | uniform +\define@key{blx@latem@field}{form}{% + \appto\blx@tempc{ form="#1"}} \define@key{blx@latem@field}{uppercase}[true]{% true|false \ifstrequal{#1}{true} {\appto\blx@tempc{ uppercase="1"}} @@ -9212,6 +9333,9 @@ \eappto\blx@tempb{% \blx@xml@sortitem{\blx@tempd}{#2}}} +% script form - original | translated | romanised | uniform +\define@key{blx@sortdef@field}{form}{% + \appto\blx@tempd{ form="#1"}} \define@key{blx@sortdef@field}{padside}{% left|right \ifstrequal{#1}{right} {\eappto\blx@tempd{ pad\string_side="right"}} @@ -9301,25 +9425,6 @@ \docsvlist{#2}% \endgroup} -% experimental - -\newrobustcmd*{\DeclareDisplaymode}[2][global]{% - \begingroup - \blx@tempcnta\z@ - \def\blx@tempa{\blx@xml@dtarget{*}}% - \forcsvlist\blx@defdisplaymode{#2}% - \csxdef{blx@biber@displaymodes@#1}{% - \blx@xml@displaymode{\blx@tempa}}% - \endgroup} - -\def\blx@defdisplaymode#1{% - \advance\blx@tempcnta\@ne - \edef\blx@tempa{% - \blx@tempa - \blx@xml@dmode{\the\blx@tempcnta}{#1}}} - -\DeclareDisplaymode{original,romanised,uniform,translated} - %% Package options % []{} @@ -9419,7 +9524,8 @@ \ifcsdef{blx@biber@sorting@\blx@sorting} {} {\blx@err@invopt{sorting=\blx@sorting}{}% - \def\blx@sorting{nty}}} + \def\blx@sorting{nty}}% + \listxadd\blx@sortschemes{\blx@sorting}} \DeclareBibliographyOption{sortcase}[true]{% \settoggle{blx@sortcase}{#1}} @@ -9481,14 +9587,14 @@ \DeclareBibliographyOption{maxcitenames}{% \numdef\blx@maxcitenames{#1}} \DeclareBibliographyOption{mincitenames}{% - \numdef\blx@minbibnames{#1}} + \numdef\blx@mincitenames{#1}} \DeclareTypeOption{maxcitenames}{% \numdef\blx@maxcitenames@type{#1}% \iftoggle{blx@bibliography} {} {\c@maxnames#1\relax}} \DeclareTypeOption{mincitenames}{% - \numdef\blx@minbibnames@type{#1}% + \numdef\blx@mincitenames@type{#1}% \iftoggle{blx@bibliography} {} {\c@minnames#1\relax}} @@ -9584,7 +9690,7 @@ \renewrobustcmd*{\bibinitperiod}{\adddot} \renewrobustcmd*{\bibinitdelim}{\addnbspace} \renewrobustcmd*{\bibinithyphendelim}{\adddot\mbox{-}}}} - + \DeclareBibliographyOption{firstinits}[true]{% \settoggle{blx@firstinits}{#1}} @@ -10389,6 +10495,7 @@ % Deferred last minute setup \AtBeginDocument{% + \blx@auxwrite\@mainaux{}{\string\abx@aux@sortscheme{\blx@sorting}}% \blx@checkencoding \if@filesw \blx@ctrlwrite@biber diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def index 0da6bc8e7cd..dcee0112012 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def @@ -11,8 +11,8 @@ ~~~~\blx@nl #1% ~~~~\blx@nl} -\xdef\blx@xml@datamodel@entrytype#1{% - ~~~~~~#1\blx@nl} +\xdef\blx@xml@datamodel@entrytype#1#2{% + ~~~~~~#2\blx@nl} \xdef\blx@xml@datamodel@fields#1{% ~~~~\blx@nl #1% @@ -75,14 +75,25 @@ \newrobustcmd*{\ResetDatamodelConstraints}{% \global\cslet{blx@bcf@datamodel@constraints}\@empty} -\newrobustcmd*{\DeclareDatamodelEntrytypes}[1]{% +\newrobustcmd*{\DeclareDatamodelEntrytypes}[2][]{% + \begingroup + \let\blx@tempa\@empty \def\do##1{% \ifinlistcs{##1}{blx@biber@datamodel@entrytypes} {} {\listcsgadd{blx@biber@datamodel@entrytypes}{##1}}% \xappto\blx@bcf@datamodel@entrytypes{% - \blx@xml@datamodel@entrytype{##1}}}% - \docsvlist{#1}} + \blx@xml@datamodel@entrytype{\blx@tempa}{##1}}}% + \ifblank{#1} + {\docsvlist{#2}} + {\setkeys{blx@datamodel@entrytypes}{#1} + \docsvlist{#2}}% + \endgroup} + +\define@key{blx@datamodel@entrytypes}{skipout}[true]{% true|false + \ifstrequal{#1}{true} + {\appto\blx@tempa{ skip\string_output="true"}} + {}} \newrobustcmd*{\DeclareDatamodelFields}[2][]{% \begingroup @@ -300,8 +311,9 @@ suppcollection, thesis, unpublished, - video, - xdata} + video} + +\DeclareDatamodelEntrytypes[skipout]{xdata} \DeclareDatamodelFields[type=field, datatype=integer]{ day, @@ -473,11 +485,12 @@ doi, eprint, file, - url, verba, verbb, verbc} +\DeclareDatamodelFields[type=field, datatype=uri]{url} + \DeclareDatamodelFields[type=field, datatype=csv]{keywords} \DeclareDatamodelFields[type=field, datatype=csv, skipout]{options} \DeclareDatamodelFields[type=field, datatype=range]{pages} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx index dc08a17d6f9..f557a38826a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx @@ -353,6 +353,7 @@ submitted = {{submetido}{subm\adddot}}, % forthcoming = {{}{}}, % FIXME: missing inpress = {{na prensa}{na prensa}}, +% prepublished = {{}{}}, % FIXME: missing citedas = {{doravante citado como}{doravante citado como}}, seenote = {{ver nota}{ver nota}}, quotedin = {{apud}{apud}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx new file mode 100644 index 00000000000..4a4d425a8aa --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx @@ -0,0 +1,400 @@ +% -*- latex -*- +\ProvidesFile{catalan.lbx} + +% Changes: +% 2012-4-23 Translation by Sebastià Vila-Marta + +\DeclareRedundantLanguages{catalan}{catalan} + +\DeclareBibliographyExtras{% + \protected\def\bibrangedash{\bibendash{}}% + \protected\def\bibdatedash{\bibrangedash}% + \let\finalandcomma=\empty% + \protected\def\deap#1{\@ifnextchar{ yes }{ no }}% + \protected\def\mkbibordinalm#1{% + \begingroup + \@tempcnta0#1\relax\number\@tempcnta + \ifcase\@tempcnta x\or er\or n\or er\or rt\else \`e\fi + \endgroup}% + \protected\def\mkbibordinalf#1{% + \begingroup + \@tempcnta0#1\relax\number\@tempcnta + \ifcase\@tempcnta x\or era\or na\or era\else a\fi + \endgroup}% + \protected\def\mkbibmascord#1{\mkbibordinalm{#1}}% + \protected\def\mkbibfemord#1{\mkbibordinalf{#1}}% + \protected\def\mkbibdatelong#1#2#3{% + \iffieldundef{#3}{}{% + \stripzeros{\thefield{#3}}% + \iffieldundef{#2}{}{% + \nobreakspace% + \ifthenelse{\thefield{#2}=4}{d'}{% + \ifthenelse{\thefield{#2}=8}{d'}{% + \ifthenelse{\thefield{#2}=10}{d'}{% + de\space}}}% + }% + }% + \iffieldundef{#2}{}{% + \mkbibmonth{\thefield{#2}}% + \iffieldundef{#1}{}{% + \space de\nobreakspace% + }% + }% + \iffieldundef{#1}{}{\thefield{#1}}% + }% + \protected\def\mkbibdateshort#1#2#3{% + \iffieldundef{#3} + {} + {\mkdatezeros{\thefield{#3}}% + \iffieldundef{#2}{}{\mbox{-}}}% + \iffieldundef{#2} + {} + {\mkdatezeros{\thefield{#2}}% + \iffieldundef{#1}{}{\mbox{-}}}% + \thefield{#1}}% + \savecommand\mkbibrangeterse + \protected\def\mkbibrangeterse{% + \BibliographyWarning{% + Date format 'terse' not applicable to\MessageBreak + Catalan dates. Using format 'short' instead}% + \mkbibrangefull{short}}% + \savecommand\mkbibordedition + \savecommand\mkbibordseries + \def\mkbibordedition{\mkbibfemord}% + \def\mkbibordseries{\mkbibfemord}% + % + \DeclareFieldFormat{urldate}{\mkbibparens{\bibstring{urlseen}#1}} +} + +\UndeclareBibliographyExtras{% + \restorecommand\mkbibrangeterse + \restorecommand\lbx@finalnamedelim + \restorecommand\lbx@finallistdelim + \restorecommand\mkbibordedition + \restorecommand\mkbibordseries +} + +\DeclareBibliographyStrings{% + bibliography = {{Bibliografia}{Bibliografia}}, + references = {{Refer\`encies}{Refer\`encies}}, + shorthands = {{Llista de abreviatures}{Abreviatures}}, + editor = {{editor}{ed\adddot}}, + editors = {{editors}{eds\adddot}}, + compiler = {{compilador}{comp\adddot}}, + compilers = {{compiladors}{comps\adddot}}, + redactor = {{redactor}{red\adddot}}, + redactors = {{redactors}{reds\adddot}}, + reviser = {{revisor}{rev\adddot}}, + revisers = {{revisors}{revs\adddot}}, + founder = {{fundador}{fund\adddot}}, + founders = {{fundadors}{funds\adddot}}, + continuator = {{continuador}{cont\adddot}}, + continuators = {{continuadors}{conts\adddot}}, + collaborator = {{co\l.laborador}{co\l.l\adddot}}, %require babel + collaborators = {{co\l.laboradors}{co\l.ls\adddot}}, + translator = {{traductor}{trad\adddot}}, + translators = {{traductors}{trads\adddot}}, + commentator = {{comentarista}{com\adddot}}, + commentators = {{comentaristes}{coms\adddot}}, + annotator = {{autor de les notes}{autor de les notes}}, + annotators = {{autors de les notes}{autors de les notes}}, + commentary = {{comentari}{com\adddot}}, + annotations = {{notes}{notes}}, + introduction = {{introducci\'o}{intr\adddot}}, + foreword = {{pr\`oleg}{pr\`ol\adddot}}, + afterword = {{ep\'{\i}leg}{ep\'{\i}l\adddot}}, + editortr = {{editor i traductor}{ed\adddotspace i trad\adddot}}, + editorstr = {{editors i traductors}{eds\adddotspace i trads\adddot}}, + editorco = {{editor i comentarista}{ed\adddotspace i com\adddot}}, + editorsco = {{editors i comentaristes}{eds\adddotspac i coms\adddot}}, + editoran = {{editor i autor de les notes}{ed\adddotspace i autor de les notes}}, + editorsan = {{editors i autors de les notes}{eds\adddotspace i autors de les notes}}, + editorin = {{editor i autor de la introducci\'o}{ed\adddotspace i autor de la intr\addot}}, + editorsin = {{editors i autors de la introducci\'o}{eds\adddotspace i autors de la intr\adddot}}, + editorfo = {{editor i autor del pròleg}{ed\adddotspace i autor del pr\`ol\addot}}, + editorsfo = {{editors i autors del pròleg}{eds\adddotspace i autors del pr\`ol\addot}}, +% editoraf = {{}{}}, % FIXME: missing +% editorsaf = {{}{}}, % FIXME: missing +% editortrco = {{}{}}, % FIXME: missing +% editorstrco = {{}{}}, % FIXME: missing +% editortran = {{}{}}, % FIXME: missing +% editorstran = {{}{}}, % FIXME: missing +% editortrin = {{}{}}, % FIXME: missing +% editorstrin = {{}{}}, % FIXME: missing +% editortrfo = {{}{}}, % FIXME: missing +% editorstrfo = {{}{}}, % FIXME: missing +% editortraf = {{}{}}, % FIXME: missing +% editorstraf = {{}{}}, % FIXME: missing +% editorcoin = {{}{}}, % FIXME: missing +% editorscoin = {{}{}}, % FIXME: missing +% editorcofo = {{}{}}, % FIXME: missing +% editorscofo = {{}{}}, % FIXME: missing +% editorcoaf = {{}{}}, % FIXME: missing +% editorscoaf = {{}{}}, % FIXME: missing +% editoranin = {{}{}}, % FIXME: missing +% editorsanin = {{}{}}, % FIXME: missing +% editoranfo = {{}{}}, % FIXME: missing +% editorsanfo = {{}{}}, % FIXME: missing +% editoranaf = {{}{}}, % FIXME: missing +% editorsanaf = {{}{}}, % FIXME: missing +% editortrcoin = {{}{}}, % FIXME: missing +% editorstrcoin = {{}{}}, % FIXME: missing +% editortrcofo = {{}{}}, % FIXME: missing +% editorstrcofo = {{}{}}, % FIXME: missing +% editortrcoaf = {{}{}}, % FIXME: missing +% editorstrcoaf = {{}{}}, % FIXME: missing +% editortranin = {{}{}}, % FIXME: missing +% editorstranin = {{}{}}, % FIXME: missing +% editortranfo = {{}{}}, % FIXME: missing +% editorstranfo = {{}{}}, % FIXME: missing +% editortranaf = {{}{}}, % FIXME: missing +% editorstranaf = {{}{}}, % FIXME: missing +% translatorco = {{}{}}, % FIXME: missing +% translatorsco = {{}{}}, % FIXME: missing +% translatoran = {{}{}}, % FIXME: missing +% translatorsan = {{}{}}, % FIXME: missing +% translatorin = {{}{}}, % FIXME: missing +% translatorsin = {{}{}}, % FIXME: missing +% translatorfo = {{}{}}, % FIXME: missing +% translatorsfo = {{}{}}, % FIXME: missing +% translatoraf = {{}{}}, % FIXME: missing +% translatorsaf = {{}{}}, % FIXME: missing +% translatorcoin = {{}{}}, % FIXME: missing +% translatorscoin = {{}{}}, % FIXME: missing +% translatorcofo = {{}{}}, % FIXME: missing +% translatorscofo = {{}{}}, % FIXME: missing +% translatorcoaf = {{}{}}, % FIXME: missing +% translatorscoaf = {{}{}}, % FIXME: missing +% translatoranin = {{}{}}, % FIXME: missing +% translatorsanin = {{}{}}, % FIXME: missing +% translatoranfo = {{}{}}, % FIXME: missing +% translatorsanfo = {{}{}}, % FIXME: missing +% translatoranaf = {{}{}}, % FIXME: missing +% translatorsanaf = {{}{}}, % FIXME: missing + byauthor = {{per}{per}}, + byeditor = {{edici\´o a cura de}{ed\adddotspace de}}, + bycompiler = {{compilaci\'o a cura de}{comp\adddotspace de}}, + byredactor = {{redacci\'o a cura de}{red\adddotspace de}}, + byreviser = {{revisió a cura de}{rev\adddotspace de}}, + byfounder = {{fundat per}{\fund\adddotspace per}}, + bycontinuator = {{continuat per}{cont\adddotspace per}}, + bycollaborator = {{amb la co\l.laboraci\'o de}{amb la co\l.l\adddotspace de}}, + bytranslator = {{traducció \lbx@fromlang\ a cura de}{trad\adddotspace\lbx@fromlang\ de}}, + bycommentator = {{comentaris a cura de}{com\adddotspace de}}, + byannotator = {{notes a cura de}{notes de}}, + withcommentator = {{amb comentaris a cura de}{amb com\adddotspace a cura de}}, + withannotator = {{amb notes a cura de}{amb notes de}}, + withintroduction = {{amb l'introducci\'o a cura de}{amb l'intr\adddotspace de}}, + withforeword = {{amb el pr\`oleg a cura de}{amb el pr\`ol\adddotspace de}}, + withafterword = {{amb l'ep\'{\i}leg a cura de}{amb l'ep\'{\i}l\adddotspace de}}, + byeditortr = {{edici\'o i traducci\'o \lbx@fromlang\ a cura de}% + {ed\adddotspace i trad\adddotspace\lbx@fromlang\ de}}, + byeditorco = {{edició i comentaris a cura de}% + {ed\adddotspace i com\adddotspace de}}, + byeditoran = {{edició i notes a cura de}% + {ed\adddotspace i not\adddotspace de}}, + byeditorin = {{edició i introduccio a cura de}% + {ed\adddotspace i intr\adddotspace de}}, + byeditorfo = {{edició i pr\`oleg a cura de}% + {ed\adddotspace i pr\`ol\adddotspace de}}, + byeditoraf = {{edició i ep\'{\i}leg a cura de}% + {ed\adddotspace i ep\'{\i}l\adddotspace de}}, + byeditortrco = {{edici\'o, traducci\'o \lbx@fromlang\ i comentaris a cura de}% + {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i com\adddotspace de}}, + byeditortran = {{edici\'o, traducci\'o \lbx@fromlang\ i notes a cura de}% + {ed\adddot,\addabbrvspace trad\adddotspace\lbx@fromlang\ i not\adddotspace de}}, + byeditortrin = {{edici\'o, traducci\'o \lbx@fromlang\ i introducci\'o a cura de}% + {ed\adddot,\addabbrvspace trad\adddotspace\lbx@fromlang\ i intr\adddotspace de}}, + byeditortrfo = {{edici\'o, traducci\'o \lbx@fromlang\ i pr\`oleg a cura de}% + {ed\adddot,\addabbrvspace trad\adddotspace\lbx@fromlang\ i pr\`ol\adddotspace de}}, + byeditortraf = {{edici\'o, traducci\'o \lbx@fromlang\ i ep\'{\i}leg a cura de}% + {ed\adddot,\addabbrvspace trad\adddotspace\lbx@fromlang\ i ep\'{\i}l\adddotspace de}}, + byeditorcoin = {{edici\'o, comentaris i introducci\'o a cura de} + {ed\adddot,\addabbrvspace com\adddotspace i intr\adddotspace de}}, + byeditorcofo = {{edici\'o, comentaris i pr\`oleg a cura de} + {ed\adddot com\adddotspace i pr\`ol\adddotspace de}}, + byeditorcoaf = {{edici\'o, comentaris i ep\'{\i}leg a cura de}% + {ed\adddot, com\adddotspace y epil\adddotspace de}}, + byeditoranin = {{edici\'o, notes i introducci\'o a cura de}% + {ed\adddot, not\adddotspace i introd\adddotspace de}}, + byeditoranfo = {{edici\'o, notes y pr\`oleg a cura de}% + {ed.,\addabbrvspace not\adddotspace ì pr\'ol\adddotspace de}}, + byeditoranaf = {{edici\'o, notes i ep\'{\i}leg a cura de}% + {ed.,\addabbrvspace not\adddotspace y ep\'{\i}l\adddotspace de}}, + byeditortrcoin = {{edici\'o, traducció \lbx@fromlang, comentaris i introducci\'o a cura de}% + {ed.,\addabbrvspace trad\adddotspace \lbx@fromlang, com\adddotspace i intr\adddotspace de}}, + byeditortrcofo = {{edici\'o, traducció \lbx@fromlang, comentaris i pr\`oleg a cura de}% + {ed.,\addabbrvspace trad\adddotspace \lbx@fromlang, com\adddotspace i pr\`ol\adddotspace de}}, + byeditortrcoaf = {{edici\´o, traducci\´o \lbx@fromlang, comentaris i ep\´{\i}leg a cura de}% + {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, com\adddot\ y ep\´{i}l\adddot\ de}}, + byeditortranin = {{edici\´o, traducci\´o \lbx@fromlang, notes i introducci\´o a cura de}% + {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, not\adddot\ i intr\adddot\ de}}, + byeditortranfo = {{edici\´o, traducci\´o \lbx@fromlang, notes i pr\`oleg a cura de}% + {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, not\adddot\ i pr\`ol\adddot\ de}}, + byeditortranaf = {{edici\´o, traducci\´o \lbx@fromlang, notes i ep\´{\i}leg a cura de}% + {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, not\adddot\ i ep\´{\i}l\adddot\ de}}, + bytranslatorco = {{traducci\´o \lbx@fromlang\ i comentaris a cura de}% + {trad\adddot\ \lbx@fromlang\ i com\adddot\ de}}, + bytranslatoran = {{traducci\´o \lbx@fromlang\ i notes a cura de}% + {trad\adddot\ \lbx@fromlang\ i not\adddot\ de}}, + bytranslatorin = {{traducci\´o \lbx@fromlang\ i introducci\`o a cura de}% + {trad\adddot\ \lbx@fromlang\ i introd\adddot\ de}}, + bytranslatorfo = {{traducci\´o \lbx@fromlang\ i pr\`oleg a cura de}% + {trad\adddot\ \lbx@fromlang\ i pr\`ol\adddot\ de}}, + bytranslatoraf = {{traducci\´o \lbx@fromlang\ i ep\´{\i}leg a cura de}% + {trad\adddot\ \lbx@fromlang\ i ep\´{\i}l\adddot\ de}}, + bytranslatorcoin = {{traducci\´o \lbx@fromlang, comentaris i introducci\´o a cura de}% + {trad\adddot\ \lbx@fromlang, com\adddot\ i introd\adddot\ de}}, + bytranslatorcofo = {{traducci\´o \lbx@fromlang, comentaris y pr\`oleg a cura de}% + {trad\adddot\ \lbx@fromlang, com\adddot\ y pr\`ol\adddot\ de}}, + bytranslatorcoaf = {{traducci\´o \lbx@fromlang, comentaris i ep\´{\i}leg a cura de}% + {trad\adddot\ \lbx@fromlang, com\adddot\ y ep\´{\i}l\adddot\ de}}, + bytranslatoranin = {{traducci\´o \lbx@fromlang, notes i introducci\´o a cura de}% + {trad\adddot\ \lbx@fromlang, anot\adddot\ i introd\adddot\ de}}, + bytranslatoranfo = {{traducci\´o \lbx@fromlang, notes i pr\`oleg a cura de}% + {trad\adddot\ \lbx@fromlang, not\adddot\ i pr\'ol\adddot\ de}}, + bytranslatoranaf = {{traducci\´o \lbx@fromlang, notes i ep\´{\i}leg a cura de}% + {trad\adddot\ \lbx@fromlang, not\adddot\ y ep\´{\i}l\adddot\ de}}, + and = {{i}{i}}, + andothers = {{i d'altres\adddot}{i d'altres\adddot}}, + andmore = {{\textit{et al.}}{\textit{et al.}}}, + volume = {{volum}{vol\adddot}}, + volumes = {{volums}{vols\adddot}}, + jourvol = {{volum}{vol\adddot}}, + jourser = {{\`epoca}{\`ep\adddot}}, + book = {{llibre}{llib\addot}}, + part = {{part}{part}}, + issue = {{n\´umero}{n\´um\adddot}}, + newseries = {{nova \`epoca}{n\adddotspace\`ep\adddot}}, + oldseries = {{antiga \`epoca}{ant\adddotspace\`ep\adddot}}, + edition = {{edici\'o}{ed\adddot}}, + reprint = {{reimpressi\'o}{reimpr\adddot}}, + reprintof = {{reimpressi\'o de}{reimpr\adddotspace de}}, + reprintas = {{reimpr\`es com}{reimpr\adddotspace com}}, + page = {{p\`agina}{p\adddot}}, + pages = {{p\`agines}{pp\adddot}}, + column = {{columna}{col\adddot}}, + columns = {{columnes}{cols\adddot}}, + line = {{l\'{\i}nia}{l\´{\i}n\adddot}}, + lines = {{l\'{\i}nies}{l\´{\i}ns\adddot}}, + verse = {{vers}{ver\adddot}}, + verses = {{versos}{vers\adddot}}, + section = {{apartat}{\S}}, + sections = {{apartats}{\S\S}}, + paragraph = {{par\`agraf}{par\adddot}}, + paragraphs = {{par\`agrafs}{pars\adddot}}, + in = {{a}{a}}, + inseries = {{a}{a}}, + ofseries = {{de}{de}}, + number = {{n\'umero}{n\'um\adddot}}, + chapter = {{cap\'{\i}tol}{cap\adddot}}, + mathesis = {{tesi de m\`aster}{tesi de m\`aster}}, + phdthesis = {{tesi doctoral}{tesi doct\adddot}}, + resreport = {{informe de recerca}{inf\adddotspace de rec\adddot}}, + techreport = {{informe t\`ecnic}{inf\adddotspace t\`ec\adddot}}, + software = {{programari}{prog\adddot}}, + datacd = {{CD de dades}{CD de dades}}, + audiocd = {{CD d'audio}{CD d'audio}}, + version = {{versi\'o}{ver\adddot}}, + url = {{adreça}{adr\adddot}}, + urlseen = {{visitat \ifthenelse{\thefield{urlday}=1}{l'}{el\space}}{vis\adddotspace}}, + inpreparation = {{en preparaci\´o}{en prep\adddot}}, + inpress = {{a impremta}{a impr\adddot}}, % Per revisar + submitted = {{enviat}{env\adddot}}, % Per revisar + forthcoming = {{disponible en breu}{disp\adddotspace en breu}}, + citedas = {{citat en endavant com}{cit\adddotspace en endavant com}}, + thiscite = {{aquesta citaci\´o}{cit\adddot}}, + seenote = {{vegeu la nota}{veg\adddotspace la not\adddot}}, + quotedin = {{citat a}{cit\adddot a}}, + idem = {{\'{\i}dem}{\'{\i}d\adddot}}, + idemsf = {{\'{\i}dem}{\'{\i}d\adddot}}, + idemsm = {{\'{\i}dem}{\'{\i}d\adddot}}, + idemsn = {{\'{\i}dem}{\'{\i}d\adddot}}, + idempf = {{\'{\i}dem}{\'{\i}d\adddot}}, + idempm = {{\'{\i}dem}{\'{\i}d\adddot}}, + idempn = {{\'{\i}dem}{\'{\i}d\adddot}}, + idempp = {{\'{\i}dem}{\'{\i}d\adddot}}, + ibidem = {{ib\'{\i}dem}{ib\'{\i}d\adddot}}, + opcit = {{\`op\adddotspace cit\adddot}{\`op\adddotspace cit\adddot}}, + loccit = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}}, + confer = {{cf\adddot}{cf\adddot}}, + sequens = {{s\adddot}{s\adddot}}, + sequentes = {{ss\adddot}{ss\adddot}}, + passim = {{p\`assim}{p\`assim}}, + see = {{vegeu}{vegeu}}, + seealso = {{vegeu tamb\'e}{veg\adddotspace tamb\'e}}, + backrefpage = {{vegeu la p\`agina}{veg\adddotspace la p\`ag\adddot}}, + backrefpages = {{vegeu les p\`agines}{veg\adddotspace les p\`ag\adddot}}, + january = {{gener}{gen\adddot}}, + february = {{febrer}{feb\adddot}}, + march = {{març}{març}}, + april = {{abril}{abr\adddot}}, + may = {{maig}{maig}}, + june = {{juny}{juny}}, + july = {{juliol}{jul\adddot}}, + august = {{agost}{ago\adddot}}, + september = {{setembre}{set\adddot}}, + october = {{octubre}{oct\adddot}}, + november = {{novembre}{nov\adddot}}, + december = {{desembre}{des\adddot}}, + langamerican = {{angl\`es americ\`a}{ang\adddotspace amer\adddot}}, + langbrazilian = {{portugu\`es brasiler}{port\adddotspace bras\adddot}}, + langcroatian = {{croat}{croat}}, +% langcatalan = {{catal\`a}{catal\`a}}, + langdanish = {{dan\`es}{dan\adddot}}, + langdutch = {{neerland\`es}{neerland\`es}}, + langenglish = {{angl\`es}{ang\adddot}}, + langfinish = {{fin\`es}{fin\`es}}, + langfrench = {{franc\`es}{fran\adddot}}, + langgerman = {{alemany}{alem\adddot}}, + langgreek = {{grec}{grec}}, + langitalian = {{italià}{ital\adddot}}, + langlatin = {{llat\'{\i}}{llat\'{\i}}}, + langnorwegian = {{noruec}{noruec}}, + langportuguese = {{portugu\`es}{port\adddot}}, + langrussian = {{rus}{rus}}, + langspanish = {{castell\`a}{cast\adddot}}, + langswedish = {{suec}{suec}}, + fromamerican = {{de l'anglès americ\`a}{de l'ang\adddotspace amer\adddot}}, + frombrazilian = {{del portugu\`es brasiler}{del port\adddot bras\adddot}}, + fromcroatian = {{del croat}{del croat}}, +% fromcatalan = {{del catal\`a}{del catal\`a}}, + fromdanish = {{del dan\`es}{del dan\ès}}, + fromdutch = {{del neerland\`es}{del neerl\adddot}}, + fromenglish = {{de l'angl\`es}{de l'ang\adddot}}, + fromfinish = {{del fin\`es}{del fin\`es}}, + fromfrench = {{del franc\`es}{del fran\adddot}}, + fromgerman = {{de l'alemany}{de l'alem\adddot}}, + fromgreek = {{del grec}{del grec}}, + fromitalian = {{de l'itali\`a}{de l'ital\adddot}}, + fromlatin = {{del llat\'{\i}}{del llat\'{\i}}}, + fromnorwegian = {{del noruec}{del noruec}}, + fromportuguese = {{del portugu\`es}{del port\adddot}}, + fromrussian = {{del rus}{del rus}}, + fromspanish = {{del castell\`a}{del cast\adddot}}, + fromswedish = {{del suec}{del suec}}, +% countryca = {{Catalunya}{CAT}}, + countryde = {{Alemanya}{DE}}, + countryeu = {{Uni\'o Europea}{UE}}, + countryep = {{Uni\'o Europea}{UE}}, + countryfr = {{França}{FR}}, + countryuk = {{Regne Unit}{GB}}, + countryus = {{Estats Units d'Am\`erica}{US}}, + patent = {{patent}{pat\adddot}}, + patentde = {{patent alemana}{pat\adddot\ alem\adddot}}, + patenteu = {{patent europea}{pat\adddot\ eur\adddot}}, + patentfr = {{patent francesa}{pat\adddot\ fran\adddot}}, + patentuk = {{patent brit\`anica}{pat\adddot\ brit\adddot\adddot}}, + patentus = {{patent americana}{pat\adddot\ amer\adddot}}, + patreq = {{so\l.licitud de patent}{so\l.l\adddotspace de pat\adddot}}, + patreqde = {{so\l.licitud de patent alemana}{so\l.l\adddotspace de pat\adddot\ alem\adddot}}, + patreqeu = {{so\l.licitud de patent europea}{so\l.l\adddotspace de pat\adddot\ eur\adddot}}, + patreqfr = {{so\l.licitud de patent francesa}{so\l.l\adddotspace de pat\adddot\ fran\adddot}}, + patrequk = {{so\l.licitud de patent brit\`anica}{so\l.l\adddotspace de pat\adddot\ brit\adddot}}, + patrequs = {{so\l.licitud de patent americana}{so\l. l\adddotspace de pat\adddot\ amer\adddot}}, + file = {{fitxer}{fitx\adddot}}, + library = {{biblioteca}{bibl\adddot}}, + abstract = {{resum}{resum}}, + annotation = {{anotaci\´o}{anot\adddot}}, +} +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx index 9fd7c10b7bb..021b6da470b 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx @@ -298,6 +298,7 @@ % submitted = {{}{}}, % FIXME: missing % forthcoming = {{}{}}, % FIXME: missing % inpress = {{}{}}, % FIXME: missing +% prepublished = {{}{}}, % FIXME: missing citedas = {{herefter citeret som}{herefter cit\adddot\ som}}, % thiscite = {{}{}}, % FIXME: missing seenote = {{se note}{se note}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx index 66d8e787507..a14fce51fe5 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx @@ -336,6 +336,7 @@ submitted = {{ingediend}{ingedied}}, % forthcoming = {{}{}}, % FIXME: missing inpress = {{in druk}{in druk}}, +% prepublished = {{}{}}, % FIXME: missing page = {{pagina}{p\adddot}}, pages = {{pagina's}{p\adddot}}, column = {{kolom}{kol\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx index e4e1ec50117..0d8622e5635 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx @@ -374,6 +374,7 @@ canadian,australian,newzealand,USenglish,UKenglish} submitted = {{submitted}{submitted}}, forthcoming = {{forthcoming}{forthcoming}}, inpress = {{in press}{in press}}, + prepublished = {{pre-published}{pre-published}}, citedas = {{henceforth cited as}{henceforth cited as}}, thiscite = {{especially}{esp\adddot}}, seenote = {{see note}{see n\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx index 499bbaf4afc..930334fea5e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx @@ -373,6 +373,7 @@ % submitted = {{}{}}, % FIXME: missing % forthcoming = {{}{}}, % FIXME: missing % inpress = {{}{}}, % FIXME: missing +% prepublished = {{}{}}, % FIXME: missing citedas = {{jatkossa}{jatkossa}}, % thiscite = {{}{}}, % FIXME: missing seenote = {{katso viite}{katso viite}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx index 903bd0e636d..1a2b9dd0f19 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx @@ -309,6 +309,7 @@ % submitted = {{}{}}, % FIXME: missing % forthcoming = {{}{}}, % FIXME: missing % inpress = {{}{}}, % FIXME: missing +% prepublished = {{}{}}, % FIXME: missing citedas = {{d\'esign\'e ci-apr\`es par}{ci-apr\`es}}, % thiscite = {{}{}}, % FIXME: missing seenote = {{voir note}{cf\adddotspace note}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx index a6785385041..4f2355d129d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx @@ -360,6 +360,7 @@ submitted = {{eingereicht}{eingereicht}}, 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}}, thiscite = {{hier}{hier}}, seenote = {{siehe Anmerkung}{s\adddotspace Anm\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx index 6d3164c5fa0..beae0ffc979 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx @@ -361,6 +361,7 @@ submitted = {{υποβληθέν}{υποβληθέν}}, % FIXME: gender? % forthcoming = {{}{}}, % FIXME: missing inpress = {{υπό έκδοση}{υπό έκδ.}}, +% prepublished = {{}{}}, % FIXME: missing citedas = {{εφεξής θα αναφέρεται ως}{εφεξής θα αναφέρεται ως}}, thiscite = {{αυτή η αναφορά}{αυτή η αναφορά}}, seenote = {{βλέπε σημείωση}{βλ\adddot\ σημ\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx index 8209165695e..4d11804fd68 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx @@ -308,6 +308,7 @@ submitted = {{afhent til birtingar}{afhent til birtingar}}, forthcoming = {{mun birtast}{mun birtast}}, inpress = {{\'{\i} prentun}{\'{\i} prentun}}, +% prepublished = {{}{}}, % FIXME: missing citedas = {{h\'er eftir skammstafa}{h\'er eftir skst\adddot}}, seenote = {{sj\'a athugasemd}{sj\'a aths\adddot}}, quotedin = {{tilvitnun samkv\ae{}mt}{tilvitnun skv\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx index 048c1fcf099..c679d36a711 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx @@ -288,6 +288,7 @@ % submitted = {{}{}}, % FIXME: missing % forthcoming = {{}{}}, % FIXME: missing inpress = {{in stampa}{in stampa}}, +% prepublished = {{}{}}, % FIXME: missing citedas = {{citato come}{cit\adddotspace come}}, % thiscite = {{}{}}, % FIXME: missing seenote = {{vedi nota}{v\adddotspace nota}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx index eca364cc13d..263bbef6961 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx @@ -295,7 +295,7 @@ part = {{del}{del}}, issue = {{nummer}{nr\adddot}}, newseries = {{ny serie}{ny ser\adddot}}, - oldseries = {{gammel serie}{gml\adddotspace ser\adddot}}, + oldseries = {{gammel serie}{gl\adddotspace ser\adddot}}, edition = {{utgave}{utg\adddot}}, reprint = {{opptrykk}{opptr\adddot}}, reprintof = {{opptrykk av}{opptr\adddotspace av}}, @@ -341,6 +341,7 @@ submitted = {{innsendt}{innsendt}}, forthcoming = {{under utgivelse}{under utgiv\adddot}}, inpress = {{i trykken}{i trykken}}, + prepublished = {{prepublisert}{prepubl\adddot}}, citedas = {{fremover sitert som}{fremover sit\adddotspace som}}, thiscite = {{her}{her}}, seenote = {{se note}{se n\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx index 6919932e93b..cefa9aa80a6 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx @@ -231,7 +231,7 @@ {oms\adddot\ \lbx@sfromlang\ og forkl., med etterord, av}}, andothers = {{med fleire}{mfl\adddot}}, andmore = {{med meir}{m.m\adddot}}, - oldseries = {{gamal serie}{gml\adddotspace ser\adddot}}, + oldseries = {{gamal serie}{gl\adddotspace ser\adddot}}, edition = {{utg{\aa}ve}{utg\adddot}}, reprintfrom = {{opptrykk fr{\aa}}{opptr\adddotspace fr{\aa}}}, translationof = {{omsetjing av}{oms\adddotspace av}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx index b67cd53037f..ff53eb131fd 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx @@ -363,6 +363,7 @@ submitted = {{submetido}{subm\adddot}}, % forthcoming = {{}{}}, % FIXME: missing inpress = {{na imprensa}{na imp\addot}}, +% prepublished = {{}{}}, % FIXME: missing citedas = {{doravante citado como}{doravante citado como}}, seenote = {{ver nota}{ver nota}}, quotedin = {{apud}{apud}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx index 6125e498ed5..1dbac38c81e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx @@ -383,6 +383,7 @@ submitted = {{представлено}{предст\adddot}}, forthcoming = {{в печати}{в печ\adddot}}, inpress = {{в\addabbrvspace печати}{в печ\adddot}}, +% prepublished = {{}{}}, % FIXME: missing citedas = {{далее цитируется как}{далее цит\addabbrvspace как}}, thiscite = {{здесь}{здесь}}, seenote = {{смотри сноску}{см\adddotspace сн\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx index bab99bc453c..922a67069d0 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx @@ -298,6 +298,7 @@ % submitted = {{}{}}, % FIXME: missing % forthcoming = {{}{}}, % FIXME: missing % inpress = {{}{}}, % FIXME: missing +% prepublished = {{}{}}, % FIXME: missing citedas = {{citado en adelante como}{cit\adddotspace en adelante como}}, % thiscite = {{}{}}, % FIXME: missing % seenote = {{}{}}, % FIXME: missing diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx index 0015404cca8..785a9a42287 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx @@ -332,6 +332,7 @@ % submitted = {{}{}}, % FIXME: missing % forthcoming = {{}{}}, % FIXME: missing % inpress = {{}{}}, % FIXME: missing +% prepublished = {{}{}}, % FIXME: missing citedas = {{h\"adanefter citerad som}{h\"adanefter cit\adddotspace som}}, % thiscite = {{}{}}, % FIXME: missing seenote = {{se not}{se not}}, -- cgit v1.2.3