diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/biblatex/RELEASE | 7 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/biblatex/biblatex.pdf | bin | 1156634 -> 1163303 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/biblatex/biblatex.tex | 119 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/biblatex.def | 3 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/biblatex.sty | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/biblatex1.sty | 25 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/biblatex2.sty | 113 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx | 100 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx | 6 |
10 files changed, 288 insertions, 96 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex/RELEASE b/Master/texmf-dist/doc/latex/biblatex/RELEASE index c9117079c0b..011ec39a266 100644 --- a/Master/texmf-dist/doc/latex/biblatex/RELEASE +++ b/Master/texmf-dist/doc/latex/biblatex/RELEASE @@ -1,3 +1,10 @@ +RELEASE NOTES FOR VERSION 3.1 + +* Biber version 2.2 is required for biblatex 3.1 +* Added new macros \DeclareNolabel and \DeclareNolabelwidthcount for fine-tuning label generation +* Improved Finnish and Russian localisation +* Many bug fixes + RELEASE NOTES FOR VERSION 3.0 * Biber version 2.0 is required for biblatex 3.0 diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf Binary files differindex d5227f7510d..4093e7bd936 100644 --- a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex index c8e393f40f6..e180357653f 100644 --- a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex +++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex @@ -49,8 +49,8 @@ url={\biblatexhome}, author={Philipp Lehman \\(with Philip Kime, Audrey Boruvka and Joseph Wright)}, email={}, - revision={3.0}, - date={20/04/2015}} + revision={3.1}, + date={21/10/2015}} \hypersetup{% pdftitle={The \biblatex Package}, @@ -346,6 +346,9 @@ compatibility matrix for the recent versions. \sffamily\bfseries\spotcolor Biber version & \sffamily\bfseries\spotcolor \biblatex\ version\\ \midrule +2.2 & 3.1\\ +2.1 & 3.0\\ +2.0 & 3.0\\ 1.9 & 2.9\\ 1.8 & 2.8\\ 1.7 & 2.7\\ @@ -3514,29 +3517,61 @@ See the author guide, in particular \secref{aut:aux:tst,aut:aux:ife}, for furthe \end{ltxsyntax} -\subsubsection{Bibliography Contexts} +\subsubsection{Bibliography Contexts}\BiberOnlyMark \label{use:bib:context} -References in a bibliography are cited and printed in a <context>. The context determines the data which is actually used for an entry. A context consists currently of the following information (the <context> concept is designed for future extensibility): +References in a bibliography are cited and printed in a <context>. The context determines the data which is actually used to cite or provide bibliographic data for an entry. A context consists currently of the following information (the <context> concept is designed for future extensibility): \begin{itemize} - \item A specific sorting scheme + \item A sorting scheme \end{itemize} % -The data for an entry can vary depending on the context. This is most obvious in the case of the \opt{extra*} fields like \opt{extrayear} which are generated by the backend according to the order of entries \emph{after} sorting so that they come out in the expected <a, b, c> order. This clearly shows that the \emph{data} in an entry can be different between sorting schemes. If a document contains more than one bibliography list with different sorting schemes, it can happen then that the \file{.bbl} contains sorting lists with the same entry but containing different data (a different value for \bibfield{extrayear}, for example). The purpose of bibliography contexts is to encapsulate things inside a context so that \biblatex can use the correct entry data. An example is printing a bibliography list with a different sorting order to the global sorting order: +The point of bibliography contexts is twofold. Firstly, they are used to set options which influence a printed bibliography and secondly to influence the data printed by citation commands. +The former use is the most common when one needs to print more than one bibliography list with different, for example, sorting. \begin{lstlisting}[style=latex]{} \usepackage[sorting=nyt]{biblatex} +\begin{document} +\cite{one} +\cite{two} +\printbibliography +\newrefcontext[sorting=ydnt] +\printbibliography +\end{lstlisting} +% +Here we print two bibliographies, one with the default <nyt> sorting scheme and one with the <ydnt> sorting scheme. + +To demonstrate the second type of use of bibliography contexts, we have to understand that the actual data for an entry can vary depending on the context. This is most obvious in the case of the \opt{extra*} fields like \opt{extrayear} which are generated by the backend according to the order of entries \emph{after} sorting so that they come out in the expected <a, b, c> order. This clearly shows that the \emph{data} in an entry can be different between sorting schemes. If a document contains more than one bibliography list with different sorting schemes, it can happen then that the \file{.bbl} contains sorting lists with the same entry but containing different data (a different value for \bibfield{extrayear}, for example). The purpose of bibliography contexts is to encapsulate things inside a context so that \biblatex can use the correct entry data. An example is printing a bibliography list with a different sorting order to the global sorting order where the \opt{extra*} fields are different for the same entry between sorting lists: + +\begin{lstlisting}[style=latex]{} +\usepackage[sorting=nyt,style=authoryear]{biblatex} +\DeclareSortingScheme{yntd}{ + \sort{ + \field[strside=left,strwidth=4]{sortyear} + \field[strside=left,strwidth=4]{year} + \literal{9999} + } + \sort{ + \field{sortname} + \field{author} + \field{editor} + } + \sort[direction=descending]{ + \field{sorttitle} + \field{title} + } +} +\begin{document} \cite{one} \cite{two} \printbibliography -\newrefcontext[sorting=yndt] +\newrefcontext[sorting=yntd] \cite{one} \cite{two} \printbibliography \end{lstlisting} % -Here, the second use of the citations, along with the \cmd{printbibliography} command will use data from the context of the <yndt> sorting scheme which may well be different from the data associated with the default <nyt> scheme. +Here, the second use of the citations, along with the \cmd{printbibliography} command will use data from the context of the custom <yntd> sorting scheme which may well be different from the data associated with the default <nyt> scheme. That is, the citation labels (in an authoryear style which uses \opt{extrayear}) may be different \emph{for the exact same entries} between different bibliography contexts and so the citations themselves may look different. \begin{ltxsyntax} @@ -5573,12 +5608,14 @@ Holds the prefix coming before <date> of the date field name chosen by \cmd{Decl \begin{lstlisting}[style=latex]{} \iffieldundef{datelabelsource} { - % labeldate package option is not set or \DeclareLabeldate resolved to a literal string + % labeldate package option is not set or + % \DeclareLabeldate resolved to a literal string } { - \iffieldundef{\thefield{datelabelsource}} + \iffieldundef{\thefield{datelabelsource}date} { - % datelabelsource contains a date field name prefix like "", "event", "url" or "orig" + % datelabelsource contains a date field name + % prefix like "", "event", "url" or "orig" } { % datelabelsource contains a non-date field @@ -6506,9 +6543,9 @@ If an entry has a \bibfield{lista} field which matches regular expression <regex \end{lstlisting} %$<- to stop emacs highlighting breaking For any entry with an \bibfield{author} field, try to set -\bibfield{sortname} to the same as \bibfield{author}. If this fails because -\bibfield{sortname} already exists, stop, otherwise truncate -\bibfield{sortname} to just the first name in the name list. +\bibfield{editor} to the same as \bibfield{author}. If this fails because +\bibfield{editor} already exists, stop, otherwise truncate +\bibfield{editor} to just the first name in the name list. % \begin{lstlisting}[style=latex]{} \DeclareSourcemap{ @@ -7160,6 +7197,47 @@ would resulting a label looking like this: [>%YY__&&T07] \end{verbatim} +Generating labels from fields may involve some difficulties when you have fields containing diacritics, hyphens, spaces etc. Often, you want to ignore things like separator characters or spaces when generating labels. An option is provided to customise the regular expression(s) to strip from a field before it is passed to the label generation system. + +\begin{ltxsyntax} + +\cmditem{DeclareNolabel}{specification}\BiberOnlyMark + +Defines regular expressions to strip from any field before generating a label part for the field. The \prm{specification} is an undelimited list of \cmd{nolabel} directives which specify the regular expressions to remove from fields. Spaces, tabs and line endings may be used freely to visually arrange the \prm{specification}. Blank lines are not permissible. This command may only be used in the preamble. + +\cmditem{nolabel}{regexp} + +Any number of \cmd{nolabel} commands can be given each of which specifies to remove the \prm{regexp} from the copy of the field which the label generation system sees. Since regular expressions usually contain special characters, it is best to enclose them in the provided \cmd{regexp} macro as shown---this will pass the expression through to \biber correctly. + +\end{ltxsyntax} + +If there is no \cmd{DeclareNolabel} specification, \biber will default to: + +\begin{lstlisting}[style=latex]{} +\DeclareNolabel{ + % strip punctuation, symbols, separator and control characters + \nolabel{\regexp{<<[\p{P}\p{S}\p{C}]+>>}} +} +\end{lstlisting} +% +This \biber default strips punctuation, symbol, separator and control characters from fields before passing the field string to the label generation system. + +\begin{ltxsyntax} + +\cmditem{DeclareNolabelwidthcount}{specification}\BiberOnlyMark + +Defines regular expressions to ignore from any field when counting characters in fixed-width substrings. The \prm{specification} is an undelimited list of \cmd{nolabelwidthcount} directives which specify the regular expressions to ignore when counting characters for fixed-width substrings. Spaces, tabs and line endings may be used freely to visually arrange the \prm{specification}. Blank lines are not permissible. This command may only be used in the preamble. + +\cmditem{nolabelwidthcount}{regexp} + +Any number of \cmd{nolabelwidthcount} commands can be given each of which specifies to ignore the \prm{regexp} when generating fixed-width substrings during label generation. Since regular expressions usually contain special characters, it is best to enclose them in the provided \cmd{regexp} macro as shown---this will pass the expression through to \biber correctly. + +\end{ltxsyntax} + +There is no default \cmd{DeclareNolabelwidthcount} specification. Note that +this setting is only taken into account when using fixed-width substrings +(non-varwidth) during label part generation. See \secref{aut:ctm:lab}. + \subsubsection{Sorting} \label{aut:ctm:srt} @@ -7363,9 +7441,9 @@ When using customisable bibliography lists (See \secref{use:bib:biblist}), usual Defines a bibliography list filter with \prm{name}. The \prm{specification} consists of one or more \cmd{filter} or \cmd{filteror} macros, all of which must be satisfied for the entry to pass the filter: -\cmditem{filter}{type}{filter} +\cmditem{filter}[filterspec]{filter} -Filter entries according to the \prm{type} and \prm{filter}. \prm{type} can be one of: +Filter entries according to the \prm{filterspec} and \prm{filter}. \prm{filterspec} can be one of: \end{ltxsyntax} @@ -11057,8 +11135,8 @@ Please refer to \secref{bib:cav:ref, aut:ctm:ref} for explanation. \begin{longtable}[l]{% @{}V{0.2\textwidth}% @{}V{0.4\textwidth}% - @{}V{0.2\textwidth}% - @{}V{0.2\textwidth}@{}} + @{}V{0.3\textwidth}% + @{}V{0.3\textwidth}@{}} \toprule \multicolumn{2}{@{}H}{Types} & \multicolumn{2}{@{}H}{Fields} \\ \cmidrule(r){1-2}\cmidrule{3-4} @@ -11378,6 +11456,11 @@ This revision history is a list of changes relevant to users of this package. Ch \begin{changelog} +\begin{release}{3.1}{2015-09} +\item Added \cmd{DeclareNolabel}\see{aut:ctm:lab}\BiberOnlyMark +\item Added \cmd{DeclareNolabelwidthcount}\see{aut:ctm:lab}\BiberOnlyMark +\end{release} + \begin{release}{3.0}{2015-04-20} \item Improved Danish (Jonas Nyrup) and Spanish (ludenticus) translations \item \bibfield{labelname} and \bibfield{labeltitle} are now resolved by \biblatex instead of \biber for more flexibility and future extensibility 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 @@ -997,6 +997,9 @@ \DeclareDriverSourcemap[datatype=bibtex]{ \map{ + \step[fieldset=day, null] + } + \map{ \step[typesource=conference, typetarget=inproceedings] \step[typesource=electronic, typetarget=online] \step[typesource=www, 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{% ~~~~<bcf:noinit value="#1"/>\blx@nl} +\xdef\blx@xml@nolabels#1{% + ~~<bcf:nolabels>\blx@nl + #1% + ~~</bcf:nolabels>\blx@nl} +\xdef\blx@xml@nolabel#1{% + ~~~~<bcf:nolabel value="#1"/>\blx@nl} + +\xdef\blx@xml@nolabelwidthcounts#1{% + ~~<bcf:nolabelwidthcounts>\blx@nl + #1% + ~~</bcf:nolabelwidthcounts>\blx@nl} +\xdef\blx@xml@nolabelwidthcount#1{% + ~~~~<bcf:nolabelwidthcount value="#1"/>\blx@nl} + \xdef\blx@xml@sorting#1#2{% ~~<bcf:sorting#1>\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 = {{Германия}{Германия}}, |