texlive[63706] Master/texmf-dist: biblatex (23jun22)
commits+karl at tug.org
commits+karl at tug.org
Thu Jun 23 22:56:49 CEST 2022
Revision: 63706
http://tug.org/svn/texlive?view=revision&revision=63706
Author: karl
Date: 2022-06-23 22:56:48 +0200 (Thu, 23 Jun 2022)
Log Message:
-----------
biblatex (23jun22)
Modified Paths:
--------------
trunk/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
trunk/Master/texmf-dist/doc/latex/biblatex/CHANGES.md
trunk/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
trunk/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
trunk/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-bibtex.pdf
trunk/Master/texmf-dist/tex/latex/biblatex/biblatex.def
trunk/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
trunk/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def
trunk/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
trunk/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx
trunk/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
trunk/Master/texmf-dist/tex/latex/biblatex/lbx/turkish.lbx
Modified: trunk/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst 2022-06-23 20:56:07 UTC (rev 63705)
+++ trunk/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst 2022-06-23 20:56:48 UTC (rev 63706)
@@ -184,7 +184,7 @@
last.name last.hash last.year last.extra }
FUNCTION {initialize} {
- "$Revision: 3.17 $"
+ "$Revision: 3.18 $"
#12 entry.max$ substring$
#-3 entry.max$ substring$
"Biblatex version: " swap$ * top$
@@ -1928,7 +1928,7 @@
% This version corresponds to the .bcf version, *not* the biblatex version!
FUNCTION {input:control:version} {
input:control:parse
- "$Revision: 3.8 $"
+ "$Revision: 3.9 $"
#12 entry.max$ substring$
#-3 entry.max$ substring$
'tempstrga :=
Modified: trunk/Master/texmf-dist/doc/latex/biblatex/CHANGES.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex/CHANGES.md 2022-06-23 20:56:07 UTC (rev 63705)
+++ trunk/Master/texmf-dist/doc/latex/biblatex/CHANGES.md 2022-06-23 20:56:48 UTC (rev 63706)
@@ -1,3 +1,15 @@
+# RELEASE NOTES FOR VERSION 3.18
+- New sorting name key generation macro `\visibility` which allows
+ application of sorting name key generation to apply only to sorting
+ within citations.
+- New sorting macro `\intciteorder` which allows sorting by order internal
+ to a cite command like \cite{a,b,c}.
+- New option `pluralothers` to force "et al" to be plural (i.e. only
+ replace two or more names). This is required for some styles (e.g. APA)
+- Added `\localrefcontext` as a local alternative
+ to the global `\newrefcontext`.
+ `\localrefcontext` can be nested and is only active in the current group.
+
# RELEASE NOTES FOR VERSION 3.17
- **INCOMPATIBLE CHANGE**
The behaviour of index-less granular xdata references to list fields has
Modified: trunk/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex/biblatex.tex 2022-06-23 20:56:07 UTC (rev 63705)
+++ trunk/Master/texmf-dist/doc/latex/biblatex/biblatex.tex 2022-06-23 20:56:48 UTC (rev 63706)
@@ -68,7 +68,7 @@
url={\biblatexhome},
author={Philip Kime, Moritz Wemheuer, Philipp Lehman},
email={},
- revision={3.17},
+ revision={3.18},
date={\today}}
\hypersetup{%
@@ -1757,7 +1757,7 @@
\acr{ISO8601-2} Extended Format dates are astronomical dates in which year <0> exists. When outputting dates in BCE or BC era (see the \opt{dateera} option below), note that they will typically be one year earlier since BCE/BC era do not have a year 0 (year 0 is 1 BCE/BC). This conversion is automatic. See examples in \tabref{bib:use:tab2}.
-Date field names \emph{must} end with the string <date>, as with the default date fields. Bear this in mind when adding new date fields to the datamodel (see \secref{aut:ctm:dm}). \biblatex will check all date fields after reading the date model and will exit with an error if it finds a date field which does not adhere to this naming convention.
+Date field names \emph{must} end with the string <date>, as with the default date fields. Bear this in mind when adding new date fields to the datamodel (see \secref{aut:ctm:dm}). \biblatex will check all date fields after reading the data model and will exit with an error if it finds a date field which does not adhere to this naming convention.
\acr{ISO8601-2} supports dates before common era (BCE/BC) by way of a negative date format and supports <approximate> (circa) and uncertain dates. Such date formats set internal markers which can be tested for so that appropriate localised markers (such as \opt{circa} or \opt{beforecommonera}) can be inserted. Also supported are <unspecified> dates (\acr{ISO8601-2} 4.3) which are automatically expanded into appropriate data ranges accompanied by a field \bibfield{$<$datetype$>$dateunspecified} which details the granularity of the unspecified data. Styles may use this information to format such dates appropriately but the standard styles do not do this. See \tabref{bib:use:tab3} on page~\pageref{bib:use:tab3} for the allowed \acr{ISO8601-2} <unspecified> formats, their range expansions and \bibfield{$<$datetype$>$dateunspecified} values (see \secref{aut:bbx:fld:gen}).
@@ -2146,6 +2146,13 @@
Whether or not to sort set members according to the active reference context sorting scheme. By default this is false and set members appear in the order given in the data source.
+\boolitem[false]{pluralothers}
+
+Controls whether the localised <and others> string (e.g. <et al>) is forced
+to be plural. If true, it will only be printed in place of two or more
+names and if there is only one name it would replace, the name itself is
+printed instead. Defaults to false.
+
\intitem[3]{maxnames}
A threshold affecting all lists of names (\bibfield{author}, \bibfield{editor}, etc.). If a list exceeds this threshold, \ie if it holds more than \prm{integer} names, it is automatically truncated according to the setting of the \opt{minnames} option. \opt{maxnames} is the master option which sets \opt{maxbibnames}, \opt{maxcitenames} and \opt{maxsortnames}. Note that the \opt{uniquelist} feature can locally override \opt{maxnames}, see the documentation of the \opt{uniquelist} option in \secref{use:opt:pre:int} and \secref{aut:cav:amb}.
@@ -4345,6 +4352,11 @@
\cmditem{newrefcontext}[key=value, \dots]{name}
This command is similar to the \env{refcontext} environment except that it is a stand"=alone command rather than an environment. It automatically ends any previous reference context section begun with \cmd{newrefcontext} (if any) and immediately starts a new one. Note that the context section started by the last \cmd{newrefcontext} command in the document will extend to the very end of the document. Use \cmd{endrefcontext} if you want to terminate it earlier.
+
+\cmditem{localrefcontext}[key=value, \dots]{name}
+
+This command is similar to the \env{newrefcontext} command except that it sets up the reference context only locally.
+This is useful if the reference context needs to be changed within a group. There is no need to end a local reference context, it will automatically be reset once the group ends.
\end{ltxsyntax}
%
At the beginning of the document, there is always a global context containing global settings for each of the reference context options. Here is an example summarising the reference contexts with various settings:
@@ -4454,6 +4466,12 @@
%
Here, the data for the citation of \bibfield{key2} will be drawn from refcontext with \opt{labelprefix=C} and not \opt{labelprefix=A} since the explicit options override the named refcontext (resulting in a label with prefix <C> and not <A> or <B>).
+\begin{ltxsyntax}
+\cmditem{GenRefcontextData}{key=value, \dots}
+
+This command takes the same key/value options as \cmd{DeclareRefcontext}. It forces the currently active refcontext, optionally modified by the key/value options, to be written to the \file{.bcf} so that \biber will create a sorted data list for the specified refcontext. Normally this is automatic when \cmd{printbibliography}/\cmd{prinbiblist} is used in a reference context but there are situations where the data for a refcontext will be needed but no reference list is generated in that context e.g. to sort citations with the \opt{sortcites} option when the sorting of citations requires a different refcontext to that used for the actual reference list.
+\end{ltxsyntax}
+
\subsubsection{Dynamic Entry Sets}
\label{use:bib:set}
@@ -5006,7 +5024,7 @@
\subsubsection{Generic Commands and Hooks}
\label{use:fmt:fmt}
-The commands in this section may be redefined with \cmd{renewcommand} in the document preamble. Those marked as <Context Sensitive> in the margin can also be customised with \cmd{DeclareDelimFormat} and are printed with \cmd{printdelim} (\secref{use:fmt:csd}). Note that all commands starting with \cmd{mk\dots} take one argument. All of these commands are defined in \path{biblatex.def}.
+The commands in this section may be redefined with \cmd{renewcommand} in the document preamble. Those marked as <Context Sensitive> in the margin can also (and generally should) be customised with \cmd{DeclareDelimFormat} and are printed with \cmd{printdelim} (\secref{use:fmt:csd}). Note that all commands starting with \cmd{mk\dots} take one argument. All of these commands are defined in \path{biblatex.def}.
\begin{ltxsyntax}
@@ -5092,7 +5110,7 @@
The dash to be used as a replacement for recurrent authors or editors in the bibliography. The default is an <em> or an <en> dash, depending on the indentation of the list of references.
\csitem{labelnamepunct}\DeprecatedMark
-A separator to be printed after the name used for alphabetizing in the bibliography (\bibfield{author} or \bibfield{editor}, if the \bibfield{author} field is undefined) instead of \cmd{newunitpunct}. The default is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation but permits convenient reconfiguration. This punctuation command is deprecated and has been superseded by the context-sensitive \cmd{nametitledelim} (see \secref{use:fmt:csd}). For backwards compatibility reasons, however, \cmd{nametitledelim} still defaults to \cmd{labelnamepunct} in the \texttt{bib} and \texttt{biblist} contexts. Style authors may want to consider replacing \cmd{labelnampunct} with \texttt{\textbackslash printdelim\{nametitledelim\}} and users may want to prefer modifying the context-sensitive \texttt{nametitledelim} in the \texttt{bib} context with \cmd{DeclareDelimFormat} over redefining \cmd{labelnamepunct}, e.g.
+A separator to be printed after the name used for alphabetizing in the bibliography (\bibfield{author} or \bibfield{editor}, if the \bibfield{author} field is undefined) instead of \cmd{newunitpunct}. The default is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation but permits convenient reconfiguration. This punctuation command is deprecated and has been superseded by the context-sensitive \cmd{nametitledelim} (see \secref{use:fmt:csd}). For backwards compatibility reasons, however, \cmd{nametitledelim} still defaults to \cmd{labelnamepunct} in the \texttt{bib} and \texttt{biblist} contexts. Style authors may want to consider replacing \cmd{labelnampunct} with \texttt{\textbackslash printdelim\{nametitledelim\}} and users may want to prefer modifying the context-sensitive \texttt{nametitledelim} in the \texttt{bib} context with \cmd{DeclareDelimFormat} over redefining \cmd{labelnamepunct}, \eg
\begin{ltxexample}
\DeclareDelimFormat[bib]{nametitledelim}{%
\addcolon\space}
@@ -5325,8 +5343,9 @@
\subsubsection{Context-sensitive Delimiters}
\label{use:fmt:csd}
-The delimiters described in \secref{use:fmt:fmt} are globally defined. That is, no matter where you use them, they print the same thing. This is not necessarily desirable for delimiters which you might want to print different things in different contexts. Here <context> means things like <inside a text citation> or <inside a bibliography item>. For this reason, \biblatex\ provides a more sophisticated delimiter specification and user interface alongside the standard one based on normal macros defined with \cmd{newcommand}.
+Many delimiters described in \secref{use:fmt:fmt} are globally defined. That is, no matter where you use them, they print the same thing. This is not necessarily desirable for delimiters which you might want to print different things in different contexts. Here <context> means things like <inside a text citation> or <inside a bibliography item>. For this reason, \biblatex\ provides a more sophisticated delimiter specification and user interface alongside the standard one based on normal macros defined with \cmd{newcommand}.
+ For backwards compatibility reasons all context-sensitive delimiters (\ie all delimiters marked as <context sensitive> in \secref{use:fmt:fmt}) can be redefined with \cmd{renewcommand} in the global context. It is, however, strongly recommended to use the interface documented below (primarily \cmd{DeclareDelimFormat}) to redefine these delimiters---even if \cmd{renewcommand} would suffice for the job at hand.
\begin{ltxsyntax}
\cmditem{DeclareDelimFormat}[context, \dots]{name}{code}
@@ -5420,7 +5439,7 @@
\printdelim[textcite]{nametitledelim}
\end{ltxexample}
%
-Would print \cmd{addspace} regardless of the surrounding context of the \cmd{printdelim}. Contexts are just arbitrary strings and so you can establish them at any time, using \cmd{delimcontext}. If \cmd{printdelim} finds no special value for the delimiter \prm{name} in the current context, it simply prints \cmd{name}. This means that style authors can use \cmd{printdelim} and users expecting to be able to use \cmd{renewcommand} to redefine delimiters can do so with one caveat---such a definition won't change any context-specific delimiters which are defined:
+would print \cmd{addspace} regardless of the surrounding context of the \cmd{printdelim}. Contexts are just arbitrary strings and so you can establish them at any time, using \cmd{delimcontext}. If \cmd{printdelim} finds no special value for the delimiter \prm{name} in the current context, it simply prints \cmd{name}. This means that style authors can use \cmd{printdelim} and users expecting to be able to use \cmd{renewcommand} to redefine delimiters can do so with one caveat---such a definition won't change any context-specific delimiters which are defined:
\begin{ltxexample}[style=latex]
\DeclareDelimFormat{delima}{X}
@@ -6482,7 +6501,7 @@
<<\endrefsection>>
\end{ltxexample}
%
-This will not from a group, but otherwise works as usual. As far as \biblatex is concerned, it does not matter which syntax you use. The alternative syntax is also supported by the \env{refsegment} environment. Note that the commands \cmd{newrefsection} and \cmd{newrefsegment} do not form a group. See \secref{use:bib:sec, use:bib:seg} for details.
+This will not form a group, but otherwise works as usual. As far as \biblatex is concerned, it does not matter which syntax you use. The alternative syntax is also supported by the \env{refsegment} environment. Note that the commands \cmd{newrefsection} and \cmd{newrefsegment} do not form a group. See \secref{use:bib:sec, use:bib:seg} for details.
\subsection{Using the fallback \bibtex\ backend}
\label{use:bibtex}
@@ -9344,7 +9363,7 @@
\cmditem{sort}{elements}
-Specifies the elements considered in the sorting process. The \prm{elements} are an undelimited list of \cmd{field}, \cmd{literal}, \cmd{citecount} and \cmd{citeorder} commands which are evaluated in the order in which they are given. If an element is defined, it is added to the sort key and the sorting routine skips to the next \cmd{sort} directive. If it is undefined, the next element is evaluated. Since literal strings are always defined, any \cmd{literal} commands should be the sole or the last element in a \cmd{sort} directive. All \prm{elements} should be the same datatype as described in \secref{bib:fld:dat} since they will be potentially compared to any of the other \prm{elements} in other entries.. The \cmd{sort} command supports the following optional arguments:
+Specifies the elements considered in the sorting process. The \prm{elements} are an undelimited list of \cmd{field}, \cmd{literal}, \cmd{citecount}, \cmd{intciteorder} and \cmd{citeorder} commands which are evaluated in the order in which they are given. If an element is defined, it is added to the sort key and the sorting routine skips to the next \cmd{sort} directive. If it is undefined, the next element is evaluated. Since literal strings are always defined, any \cmd{literal} commands should be the sole or the last element in a \cmd{sort} directive. All \prm{elements} should be the same datatype as described in \secref{bib:fld:dat} since they will be potentially compared to any of the other \prm{elements} in other entries.. The \cmd{sort} command supports the following optional arguments:
\begin{optionlist*}
@@ -9417,7 +9436,7 @@
there is a distinction between the lexical order and the semantic order. Here «one» and «two» have the same semantic order but a unique lexical order. The semantic order only matters if you specify further sorting to disambiguate entries with the same semantic order. For example, this is the definition of the \opt{none} sorting template:
\begin{ltxexample}
-\DeclareSortingTemplate{none}{
+\DeclareSortingTemplate{lexical}{
\sort{\citeorder}
}
\end{ltxexample}
@@ -9425,7 +9444,7 @@
This sorts the bibliography purely lexically by the order of the keys in the citation commands. In the example above, it sorts «one» before «two». However, suppose that you consider «one» and «two» to have the same order (semantic order) since they are cited at the same time and want to further sort these by year. Suppose «two» has an earlier \bibfield{year} than «one»:
\begin{ltxexample}
-\DeclareSortingTemplate{noneyear}{
+\DeclareSortingTemplate{lexicalyear}{
\sort{\citeorder}
\sort{<<year>>}
}
@@ -9433,6 +9452,25 @@
%
This sorts «two» before «one», even though lexically, «one» would sort before «two». This is possible because the semantic order can be disambiguated by the further sorting on year. With the standard \opt{none} sorting template, the lexical order and semantic order are identical because there is nothing further to disambiguate them. This means that you can use \cmd{citeorder} just like any other sorting specification element, choosing how to further sort entries cited at the same time (in the same citation command).
+See also \cmd{intciteorder} below.
+
+\csitem{intciteorder}
+
+The \cmd{intciteorder} element has a special meaning. It requests a sort based on the lexical order internal to the same citation command. For example:
+
+\begin{ltxexample}
+\cite{one,two}
+\end{ltxexample}
+%
+Here both citations have the same \cmd{citeorder} but different \cmd{intciteorder}. This sorting command is basically a more granular form of \cmd{citeorder} so that order can be distinguished for citations within the same citation command. So, for example, with the above example, this will guarantee sorting of <one> before <two>:
+
+\begin{ltxexample}
+\DeclareSortingTemplate{fulllexical}{
+ \sort{\citeorder}
+ \sort{\intciteorder}
+}
+\end{ltxexample}
+
\cmditem{DeclareSortingNamekeyTemplate}[name]{specification}
Defines how the sorting keys for names are constructed. This can change the sorting order of names arbitrarily because you can choose how to put together the name parts when constructing the string to compare when sorting. The sorting key construction template so defined is called \prm{name} which defaults to «global» if this optional parameter is absent. When constructing the sorting key for a name, a sorting key for each name part is constructed and the key for each name is formed into an ordered key list with a special internal separator. The point of this option is to accommodate languages or situations where sorting of names needs to be customised (for example, Icelandic names are sometimes sorted by given names rather than by family names). This macro may be used multiple times to define templates with different names which can then be referred to later. Sorting name key templates can be specified at the following scopes, in order of increasing precedence:
@@ -9465,8 +9503,50 @@
}
\end{ltxexample}
%
-This means that the key is constructed by concatenating, in order, the name prefix (only if the \opt{useprefix} option is true) with the family name(s), the given names(s), the name suffix and then the name prefix (only if the \opt{useprefix} option is false).
+This means that the key is constructed by concatenating, in order, the name prefix (only if the \opt{useprefix} option is true) with the family name(s), the given names(s), the name suffix and then the name prefix (only if the \opt{useprefix} option is false). The visible number of names in the name list used to construct the key is the default sorting visibility, see below.
+\cmditem{visibility}{visibilityscope}
+
+\prm{visibilityscope} determines which visibility settings to use for the name list. This determines how many names in the name list are visible to the sorting algorithm. This is by default set to <sort>, which is the standard visibility for sorting determined by the \opt{max*/min*names} and \opt{uniquelist} options. \cmd{visibility} can be omitted entirely if this default is desired. The only other scope is <cite> which forces the sorting algorithm to use the name list visibility of the citations rather than that of the reference list sorting. This is useful when using the \opt{sortcites} option in the situation when a style has different name list truncation rules for citations than it has for the reference list. Citations can then be forced to sort using a different reference context that uses a modified sorting name key template that enforces the correct name list truncation for citation sorting with:
+
+\begin{ltxexample}
+\DeclareSortingNamekeyTemplate[mycitesorttemplate]{
+ \visibilty{cite}
+ .
+ .
+ .
+\end{ltxexample}
+%
+and then force this to be used with e.g.:
+
+\begin{ltxexample}
+ \newrefcontext[sortingnamekeytemplate=mycitesorttemplate]
+ \cite{a,b,c}
+\end{ltxexample}
+%
+One thing to note is that a reference context will not be written to the \file{.bcf} if no \cmd{printbibliography} or \cmd{printbiblist} occurs within it which will mean that \biber will not generate any sorted data for the refcontext. Therefore if the requirement is to just correctly sort citations using this refcontext, you will need to force the writing of the refcontext using \cmd{GenRefcontextData} (see \secref{use:bib:context}):
+
+\begin{ltxexample}
+ % make sure sorting data using this template is
+ % generated since no \printbibliography/\printbiblist
+ % occurs in the refcontext with
+ % sortingnamekeytemplatename=mycitesorttemplate,
+ % this won't happen by default
+ \GenRefcontextData{sortingnamekeytemplatename=mycitesorttemplate}
+ % Switch to this refcontext to use the correct
+ % sorted data using the sorting name key template
+ % which uses "cite" visibility for the name lists
+ \newrefcontext[sortingnamekeytemplate=mycitesorttemplate]
+ % citations are correctly sorted
+ \cite{a,b,c}
+ % Switch to the default sorting name key template
+ % for the actual list of references which uses the
+ % default sorting visibility for the name lists
+ \newrefcontext[sortingnamekeytemplate=global]
+ % references are correctly sorted
+ \printbibliography
+\end{ltxexample}
+
\cmditem{keypart}{part}
\prm{part} is an ordered list of of \cmd{namepart} and \cmd{literal} specifications which are concatenated together when constructing a part of the name sorting key. The \cmd{keyparts} are then concatenated together with terminal padding to ensure correct sorting.
@@ -9497,7 +9577,7 @@
As an example, suppose you wanted to be able to sort names by given name rather than family name, you could define a sorting name key template like this:
\begin{ltxexample}
-\DeclareSortingNamekeyTemplate[givenfirst]{
+\DeclareNamekeyTemplate[givenfirst]{
\keypart{
\namepart{<<given>>}
}
@@ -12507,8 +12587,13 @@
The dash to be used as a replacement for recurrent authors or editors in the bibliography. The default is an <em> or an <en> dash, depending on the indentation of the list of references.
\csitem{labelnamepunct}\DeprecatedMark
-A separator to be printed after the name used for alphabetizing in the bibliography (\bibfield{author} or \bibfield{editor}, if the \bibfield{author} field is undefined) instead of \cmd{newunitpunct}. The default is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation but permits convenient reconfiguration. This punctuation command is deprecated and has been superseded by the context-sensitive \cmd{nametitledelim} (see \secref{use:fmt:csd}). For backwards compatibility reasons, however, \cmd{nametitledelim} still defaults to \cmd{labelnamepunct} in the \texttt{bib} and \texttt{biblist} contexts. Style authors may want to consider replacing \cmd{labelnampunct} with \texttt{\textbackslash printdelim\{nametitledelim\}} and users may want to prefer modifying the context-sensitive \texttt{nametitledelim} with \cmd{DeclareDelimFormat} over redefining \cmd{labelnamepunct}.
+A separator to be printed after the name used for alphabetizing in the bibliography (\bibfield{author} or \bibfield{editor}, if the \bibfield{author} field is undefined) instead of \cmd{newunitpunct}. The default is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation but permits convenient reconfiguration. This punctuation command is deprecated and has been superseded by the context-sensitive \cmd{nametitledelim} (see \secref{use:fmt:csd}). For backwards compatibility reasons, however, \cmd{nametitledelim} still defaults to \cmd{labelnamepunct} in the \texttt{bib} and \texttt{biblist} contexts. Style authors may want to consider replacing \cmd{labelnampunct} with \texttt{\textbackslash printdelim\{nametitledelim\}} and users may want to prefer modifying the context-sensitive \texttt{nametitledelim} with \cmd{DeclareDelimFormat} over redefining \cmd{labelnamepunct}, \eg
+\begin{ltxexample}
+\DeclareDelimFormat[bib]{nametitledelim}{%
+ \addcolon\space}
+\end{ltxexample}
+
\csitem{subtitlepunct}
The separator to be printed between the fields \bibfield{title} and \bibfield{subtitle}, \bibfield{booktitle} and \bibfield{booksubtitle}, as well as \bibfield{maintitle} and \bibfield{mainsubtitle}. Use this separator instead of \cmd{newunitpunct} at this location. The default is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation but permits convenient reconfiguration.
@@ -12576,16 +12661,16 @@
Similar to \cmd{multicitedelim}, but intended for \cmd{textcite} and related commands (\secref{use:cit:cbx}). The default is a comma plus an interword space. The standard styles modify this provisional definition to ensure that the delimiter before the final citation is the localised term <and>, separated by interword spaces.
\csitem{nametitledelim}\CSdelimMark
-The delimiter to be printed between the author\slash editor and the title. This command should be incorporated in the definition of all citation commands of author-title and some verbose citation styles and in the bibliography drivers---in author-year bibliographies \cs{nametitledelim} may be printed between the author\slash editor-year block and the title. The default definition inside bibliographies is the now deprecated \cmd{labelnamepunct} (for backwrds compatibility reasons) and is a comma plus an interword space otherwise.
+The delimiter to be printed between the author\slash editor and the title. This command should be incorporated in the definition of all citation commands of author-title and some verbose citation styles and in the bibliography drivers---in author-year bibliographies \cs{nametitledelim} may be printed between the author\slash editor-year block and the title. The default definition inside bibliographies (\ie in the \texttt{bib} and \texttt{biblist} contexts) is the now deprecated \cmd{labelnamepunct} (for backwards compatibility reasons), in \texttt{textcite} context it is a space and it is a comma plus an interword space otherwise.
\csitem{nameyeardelim}\CSdelimMark
-The delimiter to be printed between the author\slash editor and the year. This command should be incorporated in the definition of all citation commands of author-year citation styles and in the bibliography drivers. The default definition is an interword space.
+The delimiter to be printed between the author\slash editor and the year. This command should be incorporated in the definition of all citation commands of author-year citation styles and in the bibliography drivers. The default definition is an interword space. For backwards compatibility reasons there are separate definitions in the \texttt{bib}, \texttt{biblist}, \texttt{textcite} and global context.
\csitem{namelabeldelim}\CSdelimMark
The delimiter printed between the name\slash title and the label. This command should be incorporated in the definition of all citation commands of alphabetic and numeric citation styles. The default definition is an interword space.
\csitem{nonameyeardelim}\CSdelimMark
-The delimiter printed between the substitute for the labelname when it does not exist (usually the label or title in standard styles) and the year citation styles and the bibliography drivers. This command should be incorporated in the definition of all citation commands of author-year citation styles and in the bibliography drivers. The default definition is an interword space.
+The delimiter printed between the substitute for the labelname when it does not exist (usually the label or title in standard styles) and the year citation styles and the bibliography drivers. This command should be incorporated in the definition of all citation commands of author-year citation styles and in the bibliography drivers. The default definition is an interword space. For backwards compatibility reasons there are separate definitions in the \texttt{bib}, \texttt{biblist}, \texttt{textcite} and global context.
\csitem{authortypedelim}\CSdelimMark
The delimiter printed between the author and the \texttt{authortype}. The default is a comma followed by a space.
@@ -13178,6 +13263,10 @@
\begin{ltxsyntax}
+\cmditem{AtBeginRefsection}{code}
+
+Appends the \prm{code} to an internal hook executed at the beginning of every reference section. The \prm{code} is executed just after setting the reference section number. This command may only be used in the preamble.
+
\cmditem{AtBeginBibliography}{code}
Appends the \prm{code} to an internal hook executed at the beginning of the bibliography. The \prm{code} is executed at the beginning of the list of references, immediately after the \prm{begin code} of \cmd{defbibenvironment}. This command may only be used in the preamble.
@@ -14766,6 +14855,14 @@
This revision history is a list of changes relevant to users of this package. Changes of a more technical nature which do not affect the user interface or the behavior of the package are not included in the list. More technical details are to be found in the \file{CHANGES.md} file. The numbers on the right indicate the relevant section of this manual.
\begin{changelog}
+\begin{release}{3.18}{2022-06-22}
+\item Added sorting option \cmd{intciteorder}\see{aut:ctm:srt}
+\item Added global option \opt{pluralothers}\see{use:opt:pre:gen}
+\item Added \cmd{localrefcontext}\see{use:bib:context}
+\item Added \cmd{visibility} option to \cmd{DeclareSortingNamekeyTemplate}\see{aut:ctm:srt}
+\item Added \cmd{GenRefcontextData}\see{use:bib:context}
+\item Added \cmd{AtBeginRefsection}\see{aut:fmt:hok}
+\end{release}
\begin{release}{3.17}{2022-01-25}
\item Changed behaviour of index-less granular XDATA references\see{use:use:xdat}
\item Added \cmd{DeclareNonamestring} \see{aut:ctm:nonamestring}
Modified: trunk/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-bibtex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/biblatex/biblatex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex/biblatex.def 2022-06-23 20:56:07 UTC (rev 63705)
+++ trunk/Master/texmf-dist/tex/latex/biblatex/biblatex.def 2022-06-23 20:56:48 UTC (rev 63706)
@@ -1472,6 +1472,7 @@
\DeclareSortingTemplate{none}{
\sort{\citeorder}
+ \sort{\intciteorder}
}
\DeclareSortingTemplate{count}{
Modified: trunk/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex/biblatex.sty 2022-06-23 20:56:07 UTC (rev 63705)
+++ trunk/Master/texmf-dist/tex/latex/biblatex/biblatex.sty 2022-06-23 20:56:48 UTC (rev 63706)
@@ -12,8 +12,8 @@
% particular purpose.
% Set up the version strings here
-\def\abx at date{2022/02/02}
-\def\abx at version{3.17}
+\def\abx at date{2022/06/22}
+\def\abx at version{3.18}
\def\abx at bbxid{\abx at date\space v\abx at version\space biblatex bibliography style (PK/MW)}
\def\abx at cbxid{\abx at date\space v\abx at version\space biblatex citation style (PK/MW)}
\def\abx at lbxid{\abx at date\space v\abx at version\space biblatex localization (PK/MW)}
@@ -22,7 +22,7 @@
% This is not updated by build script as the control file version
% does not necessarily change with the package version.
% This is used when writing the .bcf
-\def\blx at bcfversion{3.8}
+\def\blx at bcfversion{3.9}
% This is not updated by build script as the bbl version
% does not necessarily change with the package version.
@@ -150,6 +150,14 @@
\PackageWarning{biblatex}{#1}%
\endgroup}}
+\def\blx at err@patch#1{%
+ \blx at error
+ {Patching #1 failed}
+ {This is an internal issue typically caused by a
+ conflict\MessageBreak between biblatex and some
+ other package. Modifying\MessageBreak the package
+ loading order may fix the problem}}
+
%% Compatibility
% this hook is executed once at the beginning of loading the package
% just a few lines down
@@ -328,7 +336,27 @@
{}}
{}%
\appto\TE at hook{\blx at TE@hook}%
+ % we need to patch \addtocontents
\toggletrue{blx at tempa}%
+ % kernel definition
+ \patchcmd\addtocontents
+ {\let\glossary\@gobble}
+ {\let\glossary\@gobble
+ \blx at contentssafe@citecommands}
+ {}
+ {\togglefalse{blx at tempa}}%
+ % try tag.sto's definition
+ \iftoggle{blx at tempa}
+ {}
+ {\patchcmd\addtocontents
+ {\let\glossary\Gobble}
+ {\let\glossary\Gobble
+ \blx at contentssafe@citecommands}
+ {}
+ {% give up
+ \blx at err@patch{\string\addtocontents}}}%
+ % patch footnote
+ \toggletrue{blx at tempa}%
\def\do#1{%
\patchcmd#1%
{\color at begingroup}
@@ -604,10 +632,10 @@
}
-\protected\def\blx at providecounter#1{%
- \ifltxcounter{#1}
+\protected\def\blx at providecount#1{%
+ \ifcscounter{#1}
{}
- {\newcounter{#1}}}
+ {\expandafter\newcount\csname #1\endcsname}}
\def\blx at citecmds{}
% \autocite and \autocites are not defined via \DeclareCiteCommand
@@ -629,13 +657,6 @@
\boolfalse{backtracker}%
\defcounter{refsection}{#1}}
-\patchcmd\addtocontents
- {\let\glossary\@gobble}
- {\let\glossary\@gobble
- \blx at contentssafe@citecommands}
- {}
- {\blx at err@patch{\addtocontents}}
-
% trick hyperref into believing we're natbib
\let\NAT at parse\@empty
% trick showkeys into believing we're havard
@@ -853,11 +874,12 @@
\newcount\blx at tempcntc
\newcounter{blx at maxsection}
\def\theblx at maxsection{\the\c at blx@maxsection}
-\newcounter{blx at maxsegment@0}
+\expandafter\newcount\csname blx at maxsegment@0\endcsname
\newcount\blx at notetype
\newcount\blx at parenlevel@text
\newcount\blx at parenlevel@foot
-\newcounter{blx at sectionciteorder@0}
+\expandafter\newcount\csname blx at sectionciteorder@0\endcsname
+\expandafter\newcount\csname blx at sectionciteorderinternal@0\endcsname
\newcount\blx at entrysetcounter
\newcount\blx at biblioinstance
@@ -919,6 +941,7 @@
\newtoggle{blx at labeltitle}
\newtoggle{blx at labeltitleyear}
\newtoggle{blx at labeldateparts}
+\newtoggle{blx at pluralothers}
\newtoggle{blx at natbib}
\newtoggle{blx at mcite}
\newtoggle{blx at loadfiles}
@@ -1345,13 +1368,6 @@
\protected\def\abx at missing#1{%
\mbox{\reset at font\bfseries#1}}
-\def\blx at err@patch#1{%
- \blx at error
- {Patching #1 failed}
- {This is an internal issue typically caused by a
- conflict\MessageBreak between biblatex and some
- other package. Modifying\MessageBreak the package
- loading order may fix the problem}}
\def\blx at err@nolang#1{%
\blx at error
@@ -2256,13 +2272,14 @@
{\csuse{blx at bbx@#1}}
{\ifcsdef{blx at bbx@*}
{\blx at warning{%
- No driver for entry type '#1'.\MessageBreak
+ No driver for '#1'.\MessageBreak
Using fallback driver}%
\csuse{blx at bbx@*}}
{\blx at error
- {No driver for '\abx at field@entrytype' found}
- {I can't find a driver for the entry type
- '\abx at field@entrytype'\MessageBreak
+ {No driver for '#1' found}
+ {I can't find a driver for
+ '#1'\MessageBreak
+ (entry type '\abx at field@entrytype')\MessageBreak
and there is no fallback driver either}}}}
% {<type>}{<true>}{<false>}
@@ -4580,6 +4597,11 @@
\c at liststop#2\relax
\fi
\fi}%
+ \ifboolexpr{test {\iftoggle{blx at pluralothers}}
+ and
+ test {\ifnumcomp{\value{listtotal}-\value{liststop}}{=}{1}}}
+ {\c at liststop\c at listtotal}
+ {}%
\blx at namecodes}
\def\blx at namesetup@i#1{%
@@ -8421,16 +8443,17 @@
\listcsxadd{blx at keyaliases@\the\c at refsection}{\detokenize{#1}}}
% blx at dlist@list@<section>@<refcontext> - a list of list items in a refcontext in a
-% section (for tracking bibliography lists,
-% obeys skipbiblist)
+% section (for tracking bibliography lists,
+% obeys skipbiblist)
% blx at dlist@entry@<section>@<list> - a list of normal entries in a list in a
-% section (for tracking bibliographies,
-% obeys skipbib)
+% section (for tracking bibliographies,
+% obeys skipbib)
% blx at dlist@centry@<section>@<list> - a list of normal entries in a list in a
-% section (for tracking citations,
-% obeys skipbib). Same as @entry@ but
-% with added set children
-
+% section (for tracking citations,
+% does not obey skipbib).
+% Same as @entry@, but includes skipbib'd entries
+% and set children
+%
% {<entrykey>}{<entrytype>}{<options>}
\protected\def\blx at bbl@entry#1#2#3{%
\begingroup
@@ -8463,9 +8486,11 @@
\ifdef\abx at field@entrysubtype
{\listcsxadd{blx at subt@\the\c at refsection @\abx at field@entrysubtype}{\abx at field@entrykey}}
{}%
+ \nottoggle{blx at setonly}
+ {\listcsxadd{blx at dlist@centry@\the\c at refsection @\blx at dlist@name}{\abx at field@entrykey}}
+ {}%
\nottoggle{blx at skipbib}
- {\listcsxadd{blx at dlist@entry@\the\c at refsection @\blx at dlist@name}{\abx at field@entrykey}%
- \listcsxadd{blx at dlist@centry@\the\c at refsection @\blx at dlist@name}{\abx at field@entrykey}}
+ {\listcsxadd{blx at dlist@entry@\the\c at refsection @\blx at dlist@name}{\abx at field@entrykey}}
{}}%
{}%
\nottoggle{blx at skipbiblist}
@@ -9600,7 +9625,7 @@
\xifinlist{\blx at refcontext@context @\blx at tempe @entry}\blx at dlistnames
{}
{\listxadd\blx at dlistnames{\blx at refcontext@context @\blx at tempe @entry}%
- \csxappto{blx at dlists}{%
+ \xappto\blx at dlists{%
\blx at xml@dlist{\blx at refcontext@context}{entry}{\blx at tempe}{\blx at xml@dlist at refcontext{\blx at refcontext@sortingtemplatename}{\blx at refcontext@sortingnamekeytemplatename}{\blx at refcontext@labelprefix at real}{\blx at refcontext@uniquenametemplatename}{\blx at refcontext@labelalphanametemplatename}}{}}}%
\ifdefvoid\blx at tempa
{\blx at warn@bibempty\endgroup}
@@ -9651,7 +9676,7 @@
\begingroup
\delimcontext{bib}%
\edef\on at line{\on at line}%
- \ifnum\csname c at blx@maxsegment@\the\c at refsection\endcsname=\z@
+ \ifnum\csname blx at maxsegment@\the\c at refsection\endcsname=\z@
\blx at warning{No reference segments found}%
\fi
\@ifnextchar[%]
@@ -9683,7 +9708,7 @@
{\letcs\blx at tempa{blx at dlist@entry@\the\c at refsection @\blx at refcontext@context}}%
\blx at filter\blx at tempa{blx at segm@\the\c at refsection @\the\c at refsegment}%
\blx at bibliography\blx at tempa}%
- \ifnum\c at refsegment<\csname c at blx@maxsegment@\the\c at refsection\endcsname
+ \ifnum\c at refsegment<\csname blx at maxsegment@\the\c at refsection\endcsname
\advance\c at refsegment\@ne
\expandafter\blx at refsegments
\else
@@ -10195,6 +10220,8 @@
\noexpand\blx at kv@setkeys{blx at refcontext}{\csuse{blx at refcontext@name@#2}}}%
\blx at tempa}%
% Override with explicit refcontext keyvals, if given
+ \def\blx at gdef@or at def{\gdef}%
+ \def\blx at xdef@or at edef{\xdef}%
\blx at kv@setkeys{blx at refcontext}{#1}%
% Add the sortingtemplate to the list of sortingtemplates so we can track
% special cases like sorting=none which need cite order change detection
@@ -10241,16 +10268,70 @@
\blx at refcontext@uniquenametemplatename/%
\blx at refcontext@labelalphanametemplatename}}
+% local version of \newrefcontext
+\def\localrefcontext{%
+ \@ifnextchar[%]
+ {\localrefcontext at i}
+ {\localrefcontext at i[]}}
+
+\def\localrefcontext at i[#1]{%
+ \@ifnextchar\bgroup
+ {\localrefcontext at ii[{#1}]}
+ {\localrefcontext at ii[{#1}]{}}}
+
+\newcommand*{\localrefcontext at ii}[2][]{%
+ \ifblank{#2}
+ {}
+ {\begingroup
+ \edef\blx at tempa{\endgroup%
+ \noexpand\blx at kv@setkeys{blx at refcontext}{\csuse{blx at refcontext@name@#2}}}%
+ \blx at tempa}%
+ % Override with explicit refcontext keyvals, if given
+ \def\blx at gdef@or at def{\def}%
+ \def\blx at xdef@or at edef{\edef}%
+ \blx at kv@setkeys{blx at refcontext}{#1}%
+ % Add the sortingtemplate to the list of sortingtemplates so we can track
+ % special cases like sorting=none which need cite order change detection
+ \xifinlist\blx at refcontext@sortingtemplatename\blx at sortingtemplatenames
+ {}
+ {\listxadd\blx at sortingtemplatenames\blx at refcontext@sortingtemplatename}%
+ \blx at edef@refcontext{%
+ \blx at refcontext@sortingtemplatename/%
+ \blx at refcontext@sortingnamekeytemplatename/%
+ \blx at refcontext@labelprefix/%
+ \blx at refcontext@uniquenametemplatename/%
+ \blx at refcontext@labelalphanametemplatename}%
+ % Add the refcontext to the list of refcontexts so we can compare on next run
+ \xifinlist\blx at refcontext@context\blx at refcontexts
+ {}
+ {\listxadd\blx at refcontexts\blx at refcontext@context}%
+ \blx at auxwrite\@mainaux{}{\string\abx at aux@refcontext{\blx at refcontext@context}}%
+ \ifcsundef{blx at sortingtemplate@\blx at refcontext@sortingtemplatename}
+ {\blx at err@invopt{sorting=\blx at refcontext@sortingtemplatename}{}}
+ {}%
+ \ifcsundef{blx at sortingnamekeytemplate@\blx at refcontext@sortingnamekeytemplatename}
+ {\blx at err@invopt{sortingnamekeytemplate=\blx at refcontext@sortingnamekeytemplatename}{}}
+ {}%
+ \ifcsundef{blx at uniquenametemplate@\blx at refcontext@uniquenametemplatename}
+ {\blx at err@invopt{uniquenametemplate=\blx at refcontext@uniquenametemplatename}{}}
+ {}%
+ \ifcsundef{blx at labelalphanametemplate@\blx at refcontext@labelalphanametemplatename}
+ {\blx at err@invopt{labelalphanametemplate=\blx at refcontext@labelalphanametemplatename}{}}
+ {}}
+
+\def\blx at gdef@or at def{\gdef}
+\def\blx at xdef@or at edef{\xdef}
+
% Meta option to set all name template options
\blx at kv@defkey{blx at refcontext}{nametemplates}{%
- \gdef\blx at refcontext@sortingnamekeytemplatename{#1}%
- \gdef\blx at refcontext@uniquenametemplatename{#1}%
- \gdef\blx at refcontext@labelalphanametemplatename{#1}}
+ \blx at gdef@or at def\blx at refcontext@sortingnamekeytemplatename{#1}%
+ \blx at gdef@or at def\blx at refcontext@uniquenametemplatename{#1}%
+ \blx at gdef@or at def\blx at refcontext@labelalphanametemplatename{#1}}
-\blx at kv@defkey{blx at refcontext}{sorting}{\gdef\blx at refcontext@sortingtemplatename{#1}}
-\blx at kv@defkey{blx at refcontext}{sortingnamekeytemplatename}{\gdef\blx at refcontext@sortingnamekeytemplatename{#1}}
-\blx at kv@defkey{blx at refcontext}{uniquenametemplatename}{\gdef\blx at refcontext@uniquenametemplatename{#1}}
-\blx at kv@defkey{blx at refcontext}{labelalphanametemplatename}{\gdef\blx at refcontext@labelalphanametemplatename{#1}}
+\blx at kv@defkey{blx at refcontext}{sorting}{\blx at gdef@or at def\blx at refcontext@sortingtemplatename{#1}}
+\blx at kv@defkey{blx at refcontext}{sortingnamekeytemplatename}{\blx at gdef@or at def\blx at refcontext@sortingnamekeytemplatename{#1}}
+\blx at kv@defkey{blx at refcontext}{uniquenametemplatename}{\blx at gdef@or at def\blx at refcontext@uniquenametemplatename{#1}}
+\blx at kv@defkey{blx at refcontext}{labelalphanametemplatename}{\blx at gdef@or at def\blx at refcontext@labelalphanametemplatename{#1}}
% labelprefix cannot be used as is because it is used to construct the internal
% refcontext name which is referenced/expanded a lot all over the place. So,
@@ -10259,8 +10340,8 @@
% the way and so unexpandable content like \dag breaks.
% Unexpandable content should be protected with \detokenize.
\blx at kv@defkey{blx at refcontext}{labelprefix}{%
- \xdef\blx at refcontext@labelprefix{\blx at mdfivesum{#1}}%
- \gdef\blx at refcontext@labelprefix at real{#1}%
+ \blx at xdef@or at edef\blx at refcontext@labelprefix{\blx at mdfivesum{#1}}%
+ \blx at gdef@or at def\blx at refcontext@labelprefix at real{#1}%
\iftoggle{blx at defernumbers}
{}%
{\iftoggle{blx at labelnumber}
@@ -10269,6 +10350,7 @@
'defernumbers=true'}}
{}}}
+
% [refcontext keys]{<keyword1>,<keyword2>,...}
\newcommand*{\assignrefcontextkeyws}{%
\@ifstar
@@ -10356,7 +10438,49 @@
\blx at kv@defkey{blx at assignrefcontext}{uniquenametemplatename}{\def\blx at tempd{#1}}
\blx at kv@defkey{blx at assignrefcontext}{labelalphanametemplatename}{\def\blx at tempe{#1}}
+% Manually force a refcontext datalist in the .bcf
+\newcommand*{\GenRefcontextData}[1]{%
+ \begingroup
+ \edef\blx at tempb{\the\c at refsection}%
+ \def\blx at tempc{global}%
+ \def\blx at tempd{global}%
+ \def\blx at tempe{global}%
+ \let\blx at tempf\blx at sorting%
+ \let\blx at tempg\@empty%
+ \ifblank{#1}
+ {}
+ {\blx at kv@setkeys{blx at refcontextmanual}{#1}}%
+ \def\blx at tempa{\blx at tempf/\blx at tempc/\blx at tempg/\blx at tempd/\blx at tempe}%
+ \xifinlist{\blx at tempa @\blx at tempb @entry}\blx at dlistnames
+ {}
+ {\listxadd\blx at dlistnames{\blx at tempa @\blx at tempb @entry}%
+ \xappto\blx at dlists{%
+ \blx at xml@dlist{\blx at tempa}{entry}{\blx at tempb}{\blx at xml@dlist at refcontext{\blx at tempf}{\blx at tempc}{\blx at tempg}{\blx at tempd}{\blx at tempe}}{}}}%
+ \endgroup}
+
+% Meta option to set all name template options
+\blx at kv@defkey{blx at refcontextmanual}{nametemplates}{%
+ \def\blx at tempc@sortingnamekeytemplatename{#1}%
+ \def\blx at tempd@uniquenametemplatename{#1}%
+ \def\blx at tempe@labelalphanametemplatename{#1}}
+\blx at kv@defkey{blx at refcontextmanual}{sorting}{\def\blx at tempf{#1}}
+\blx at kv@defkey{blx at refcontextmanual}{sortingnamekeytemplatename}{\def\blx at tempc{#1}}
+\blx at kv@defkey{blx at refcontextmanual}{uniquenametemplatename}{\def\blx at tempd{#1}}
+\blx at kv@defkey{blx at refcontextmanual}{labelalphanametemplatename}{\def\blx at tempe{#1}}
+\blx at kv@defkey{blx at refcontextmanual}{labelprefix}{%
+ \def\blx at tempg{#1}%
+ \iftoggle{blx at defernumbers}
+ {}%
+ {\iftoggle{blx at labelnumber}
+ {\blx at warning{%
+ Option 'labelprefix' requires global\MessageBreak
+ 'defernumbers=true'}}
+ {}}}
+
% Reference sections
+\newrobustcmd*{\AtBeginRefsection}{\gappto\blx at hook@refsectioninit}
+\@onlypreamble\AtBeginRefsection
+
\newrobustcmd*{\newrefsection}{%
\endrefcontext
\ifnum\c at refsection>\z@
@@ -10389,6 +10513,7 @@
\endgroup
\stepcounter{blx at maxsection}%
\setcounter{refsection}{\value{blx at maxsection}}%
+ \csuse{blx at hook@refsectioninit}%
\xifinlist{\the\c at refsection}\blx at allrefsections
{}
{\listxadd\blx at allrefsections{\the\c at refsection}}%
@@ -10395,8 +10520,8 @@
\ifcsdef{blx at defaultrefcontexts@\the\c at refsection}
{}
{\global\cslet{blx at defaultrefcontexts@\the\c at refsection}\@empty}%
- \blx at providecounter{blx at maxsegment@\the\c at refsection}%
- \blx at providecounter{blx at sectionciteorder@\the\c at refsection}%
+ \blx at providecount{blx at maxsegment@\the\c at refsection}%
+ \blx at providecount{blx at sectionciteorder@\the\c at refsection}%
\blx at inf@refsec
\blx at secinit
\if at filesw
@@ -10444,24 +10569,24 @@
\def\blx at endrefsection{%
\blx at endrefsegment
- \blx at providecounter{blx at sectionciteorder@\the\c at refsection}%
+ \blx at providecount{blx at sectionciteorder@\the\c at refsection}%
% make sure we always output aliases to the .bcf otherwise after their
% first resolution by biber, they will be invisible to subsequent biber
% runs since biblatex will resolve the \keyalias{} macro to the main
% entry key, biber won't put \keyalias{}in the .bbl on subsequent runs
% and biblatex will report a missing citekey
- \def\do##1{%
- \blx at xmlsanitizeafter{\def\blx at tempa}{##1}%
- % Make sure this counter exists. Sometimes it might not when using, e.g:
- % refsection=chapter and \includeonly to put in the chapters or when
- % inserting citations into table of contents
- \stepcounter{blx at sectionciteorder@\the\c at refsection}%
- \blx at auxwrite\blx at bcfout{}{%
- \blx at xml@citekey{\blx at tempa}{}
- {\expandafter\the\csname c at blx@sectionciteorder@\the\c at refsection\endcsname}}}%
- \ifcsundef{blx at keyaliases@\the\c at refsection}
+ \ifcsempty{blx at keyaliases@\the\c at refsection}
{}
- {\dolistcsloop{blx at keyaliases@\the\c at refsection}}%
+ {\def\do##1{%
+ \blx at xmlsanitizeafter{\def\blx at tempa}{##1}%
+ % Make sure this counter exists. Sometimes it might not when using, e.g:
+ % refsection=chapter and \includeonly to put in the chapters or when
+ % inserting citations into table of contents
+ \global\advance\csname blx at sectionciteorder@\the\c at refsection\endcsname\@ne
+ \blx at auxwrite\blx at bcfout{}{%
+ \blx at xml@citekey{\blx at tempa}{}
+ {\expandafter\the\csname blx at sectionciteorder@\the\c at refsection\endcsname}{1}}}%
+ \dolistcsloop{blx at keyaliases@\the\c at refsection}}%
% output key counts (for \citecount sorting) if citecounter option is not false
\ifcsundef{blx at cites@\the\c at refsection}
{}
@@ -10468,12 +10593,12 @@
{\ifundef\blx at citecounter
{}
{\def\do##1{%
- \ifcsundef{blx at currcount@\the\c at refsection @##1}
- {\csdef{blx at currcount@\the\c at refsection @##1}{0}}
- {}%
- \blx at auxwrite\blx at bcfout{}
- {\blx at xml@citekeycount{##1}{\csuse{blx at currcount@\the\c at refsection @##1}}}}}%
- \dolistcsloop{blx at cites@\the\c at refsection}}%
+ \ifcsundef{blx at currcount@\the\c at refsection @##1}
+ {\csdef{blx at currcount@\the\c at refsection @##1}{0}}
+ {}%
+ \blx at auxwrite\blx at bcfout{}
+ {\blx at xml@citekeycount{##1}{\csuse{blx at currcount@\the\c at refsection @##1}}}}%
+ \dolistcsloop{blx at cites@\the\c at refsection}}}%
\ifnum\c at refsection>\z@
\blx at auxwrite\blx at bcfout{}{%
\blx at xml@endsection\blx at nl
@@ -10512,8 +10637,8 @@
\blx at err@nestenv{refsegment}%
\blx at endrefsegment
\fi
- \stepcounter{blx at maxsegment@\the\c at refsection}%
- \setcounter{refsegment}{\value{blx at maxsegment@\the\c at refsection}}%
+ \global\advance\csname blx at maxsegment@\the\c at refsection\endcsname\@ne
+ \setcounter{refsegment}{\csuse{blx at maxsegment@\the\c at refsection}}%
\blx at inf@refseg
\blx at info{Setting label 'refsegment:\the\c at refsection\the\c at refsegment'}%
\label{refsegment:\the\c at refsection\the\c at refsegment}%
@@ -10993,7 +11118,6 @@
\apptocmd{\blx at hook@entrykey}}
\@onlypreamble\AtEveryEntrykey
-
\def\blx at imc@UseEveryCiteHook{\csuse{blx at hook@cite}}
\def\blx at imc@UseEveryCitekeyHook{\csuse{blx at hook@citekey}}
\def\blx at imc@UseEveryMultiCiteHook{\csuse{blx at hook@mcite}}
@@ -11109,7 +11233,8 @@
\def\blx at citation@all{%
\blx at auxwrite\@mainaux{}{\string\abx at aux@nociteall}%
\ifbool{citerequest}
- {\blx at bibreq{*}%
+ {\global\advance\csname blx at sectionciteorder@\the\c at refsection\endcsname\@ne
+ \blx at bibreq{*}%
\global\csletcs
{blx at segm@\the\c at refsection @\the\c at refsegment}
{blx at dlist@entry@\the\c at refsection @\blx at refcontext@context}%
@@ -11122,6 +11247,7 @@
\listgadd\blx at nocites{*}}
\protected\def\blx at bibreq#1{%
+ \advance\blx at tempcntc\@ne% holds internal \cite{} citation order
\begingroup
\blx at xmlsanitizeafter{\def\blx at tempa}{#1}%
\let\blx at tempb\@empty
@@ -11134,12 +11260,15 @@
not test {\ifinlist{#1}\blx at directcites}}
{\def\blx at tempb{ nocite="1"}}
{}%
+ \blx at auxwrite\blx at bcfout{}{\blx at xml@citekey{\blx at tempa}{\blx at tempb}%
+ {\expandafter\the\csname blx at sectionciteorder@\the\c at refsection\endcsname}%
+ {\expandafter\the\csname blx at tempcntc\endcsname}}%
% 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 at auxwrite\blx at bcfout{}{\blx at xml@citekey{\blx at tempa}{\blx at tempb}{0}}}
- {\blx at auxwrite\blx at bcfout{}{\blx at xml@citekey{\blx at tempa}{\blx at tempb}{%
- \expandafter\the\csname c at blx@sectionciteorder@\the\c at refsection\endcsname}}}%
+ % \ifstrequal{*}{#1}
+ % {\blx at auxwrite\blx at bcfout{}{\blx at xml@citekey{\blx at tempa}{\blx at tempb}{0}}}
+ % {\blx at auxwrite\blx at bcfout{}{\blx at xml@citekey{\blx at tempa}{\blx at tempb}{%
+ % \expandafter\the\csname blx at sectionciteorder@\the\c at refsection\endcsname}}}%
\endgroup}
% {<set>}{<key1,key2,key3>}
@@ -11182,8 +11311,16 @@
\endgroup}
% {<entrykey>,...}
+% a crude way to check for a do-nothing argument:
+% loop over it to see what happens
\protected\def\blx at citeloop#1{%
- \expandafter\blx at citeloop@i\expandafter{\detokenize{#1}}}
+ \togglefalse{blx at tempa}%
+ \def\do{\toggletrue{blx at tempa}\listbreak}%
+ \expandafter\docsvlist\expandafter{\detokenize{#1}}%
+ \iftoggle{blx at tempa}
+ {\expandafter\blx at citeloop@i\expandafter{\detokenize{#1}}}
+ {\abx at missing@entry{empty citation}%
+ \@latex at warning{\blx at msg@cundefon{}}}}
\protected\def\blx at citeloop@i#1{%
\begingroup
% This must be here and not after \blx at citeadd as this changes the refcontext
@@ -11194,10 +11331,11 @@
% Make sure this counter exists. Sometimes it might not when using, e.g:
% refsection=chapter and \includeonly to put in the chapters or when
% inserting citations into table of contents
- \blx at providecounter{blx at sectionciteorder@\the\c at refsection}%
- \stepcounter{blx at sectionciteorder@\the\c at refsection}%
+ \blx at providecount{blx at sectionciteorder@\the\c at refsection}%
+ \global\advance\csname blx at sectionciteorder@\the\c at refsection\endcsname\@ne
\blx at tempcnta\z@
\blx at tempcntb\z@
+ \blx at tempcntc\z@
\let\blx at tempa\@empty
\forcsvlist\blx at citeadd{#1}% adds to \blx at tempa
\blx at thenotecheck
@@ -11507,7 +11645,9 @@
\def\blx at ibidtracker@constrict{%
\blx at ifcitesingle
- {\blx at mpfnsave
+ {\iftoggle{blx at footnote}
+ {\blx at mpfnsave}
+ {}%
\blx at ibidtracker@context}
{\blx at ibidreset@context}}%
@@ -11553,7 +11693,9 @@
\let\blx at idemtracker@strict\blx at idemtracker@global
\def\blx at idemtracker@constrict{%
- \blx at mpfnsave
+ \iftoggle{blx at footnote}
+ {\blx at mpfnsave}
+ {}%
\blx at idemtracker@context}
\def\blx at idemreset@force{%
@@ -11602,7 +11744,9 @@
\def\blx at opcittracker@constrict{%
\blx at ifcitesingle
- {\blx at mpfnsave
+ {\iftoggle{blx at footnote}
+ {\blx at mpfnsave}
+ {}%
\blx at opcittracker@context}
{\blx at opcitreset@context}}%
@@ -11913,8 +12057,8 @@
% Make sure this counter exists. Sometimes it might not when using, e.g:
% refsection=chapter and \includeonly to put in the chapters or when
% inserting citations into table of contents
- \blx at providecounter{blx at sectionciteorder@\the\c at refsection}%
- \stepcounter{blx at sectionciteorder@\the\c at refsection}%
+ \blx at providecount{blx at sectionciteorder@\the\c at refsection}%
+ \global\advance\csname blx at sectionciteorder@\the\c at refsection\endcsname\@ne
\blx at nocitation{#1}\blx at msg@cundef}
% {<macro>}[<arg1>][<arg2>]{<arg3>}
@@ -13093,9 +13237,9 @@
\xdef\blx at xml@uniquenametemplatenamepart#1#2#3{%
~~~~<bcf:namepart #1#2>#3</bcf:namepart>\blx at nl}
-\xdef\blx at xml@sortingnamekeytemplate#1#2{%
- ~~<bcf:sortingnamekeytemplate name="#1">\blx at nl%
- #2%
+\xdef\blx at xml@sortingnamekeytemplate#1#2#3{%
+ ~~<bcf:sortingnamekeytemplate name="#1" visibility="#2">\blx at nl%
+ #3%
~~</bcf:sortingnamekeytemplate>\blx at nl}
\xdef\blx at xml@sortingnamekeykeypart#1#2{%
@@ -13166,8 +13310,8 @@
~~</bcf:bibdata>\blx at nl}
\xdef\blx at xml@datasource#1#2#3#4#5{%
~~~~<bcf:datasource type="#1" datatype="#2"#3#4>#5</bcf:datasource>\blx at nl}
-\xdef\blx at xml@citekey#1#2#3{%
- ~~~~<bcf:citekey order="#3"#2>#1</bcf:citekey>}
+\xdef\blx at xml@citekey#1#2#3#4{%
+ ~~~~<bcf:citekey order="#3" intorder="#4"#2>#1</bcf:citekey>}
\xdef\blx at xml@citeset#1#2{%
~~~~<bcf:citekey type="set" members="#2">#1</bcf:citekey>}
\xdef\blx at xml@citekeycount#1#2{%
@@ -13222,6 +13366,7 @@
\blx at xml@toggle{nohashothers}%
\blx at xml@toggle{noroman}%
\blx at xml@toggle{nosortothers}%
+ \blx at xml@toggle{pluralothers}%
\blx at xml@toggle{singletitle}%
\blx at xml@toggle{skipbib}%
\blx at xml@toggle{skipbiblist}%
@@ -13275,8 +13420,8 @@
\blx at xml@toggle{nosortothers}%
\blx at xml@toggle{singletitle}%
\blx at xml@toggle{skipbib}%
+ \blx at xml@toggle{skipbiblist}%
\blx at xml@toggle{skiplab}%
- \blx at xml@toggle{skipbiblist}%
\blx at xml@svalue{uniquelist}{\blx at uniquelist}%
\blx at xml@svalue{uniquename}{\blx at uniquename}%
\blx at xml@toggle{uniqueprimaryauthor}%
@@ -13476,7 +13621,7 @@
\eappto\blx at tempa{\blx at xml@comment{SORTING NAME KEY TEMPLATES}}%
\def\do##1{%
\eappto\blx at tempa{%
- \blx at xml@sortingnamekeytemplate{##1}{\csuse{blx at sortingnamekeytemplate@##1}}}}%
+ \blx at xml@sortingnamekeytemplate{##1}{\csuse{blx at sortingnamekeytemplatesvisibility@##1}}{\csuse{blx at sortingnamekeytemplate@##1}}}}%
\dolistloop\blx at sortingnamekeytemplates
% presort/sorting excludes/sorting includes
\def\do##1{%
@@ -14159,7 +14304,7 @@
Use '\string\DeclareBiblistFilter' to define it}}
{\def\blx at thebiblistfilter{#1}}}
-% [<langids>][<entrytype>]{translitsource}{translittarget}
+% [<entrytype>]{specification}
\newrobustcmd*{\DeclareSortTranslit}[2][]{%
\begingroup
\ifblank{#1}
@@ -14176,6 +14321,7 @@
\@onlypreamble\DeclareSortTranslit
\blx at DeclareBackendOption{global,type}[xml]{translit}
+% [<langids>]{<field or set>}{translitsource}{translittarget}
\newcommand*{\blx at translit@setup}[4][]{%
\eappto\blx at tempb{%
\ifblank{#1}
@@ -14234,6 +14380,8 @@
\let\namepart\blx at sortnk@namepart
\let\keypart\blx at sortnk@keypart
\let\literal\blx at sortnk@literal
+ \let\visibility\blx at sortnk@visibility
+ \csgdef{blx at sortingnamekeytemplatesvisibility@\blx at snkname}{sort}% default
\let\blx at tempa\@empty
\blx at tempcnta\z@
#2%
@@ -14271,6 +14419,9 @@
\eappto\blx at tempb{%
\blx at xml@sortingnamekeyliteral{\blx at tempe}{#1}}}
+\newcommand*{\blx at sortnk@visibility}[1]{%
+ \csgdef{blx at sortingnamekeytemplatesvisibility@\blx at snkname}{#1}}
+
\newcommand*{\blx at sortnk@namepart}[2][]{%
\advance\blx at tempcntb\@ne
\edef\blx at tempe{ order="\the\blx at tempcntb"}%
@@ -14313,6 +14464,8 @@
\def\citeorder{%
\global\cslet{blx at sortingtemplate@citeorder at relevant@#2}\@empty
\blx at sortdef@field{citeorder}}%
+ \def\intciteorder{%
+ \blx at sortdef@field{intciteorder}}%
\def\citecount{%
\blx at sortdef@field{citecount}}%
\blx at tempcnta\z@
@@ -15561,6 +15714,9 @@
\def\blx at opt@uniquelist at true{true}
\def\blx at opt@uniquelist at minyear{minyear}
+\DeclareBiblatexOption{global}[boolean]{pluralothers}[true]{%
+ \settoggle{blx at pluralothers}{#1}}
+
\blx at DeclareBackendOption{entry,namelist}[string]{uniquelist}
\DeclareBiblatexOption{global,type}[boolean]{nohashothers}[true]{%
@@ -15841,7 +15997,7 @@
% Set defaults
\blx at kv@setkeys{blx at opt@ldt}{style=numeric}
\blx at kv@setkeys{blx at opt@pre}{%
- sorting=nty,sortlocale=auto,sortcase,sortupper,sortcites=false,
+ sorting=nty,sortlocale=auto,sortcase,sortupper,sortcites=false,pluralothers=false,
maxnames=3,minnames=1,maxalphanames=3,minalphanames=1,
maxitems=3,minitems=1,mincrossrefs=2,minxrefs=2,
useauthor=true,useeditor=true,usetranslator=false,
@@ -16071,6 +16227,7 @@
\fi
\blx at bblinput
\setcounter{blx at maxsection}{0}%
+ \csuse{blx at hook@refsectioninit}%
\csuse{abx at preamble}%
\blx at inf@refsec
\blx at inf@refseg}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def 2022-06-23 20:56:07 UTC (rev 63705)
+++ trunk/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def 2022-06-23 20:56:48 UTC (rev 63706)
@@ -737,6 +737,11 @@
}
\def\blx at ctrlwrite{%
+ \ifcsundef{blx at sorting@\blx at sorting}
+ {\blx at warning@noline{Sorting template '\blx at sorting'\MessageBreak
+ not available with BibTeX backend.\MessageBreak
+ Switch to Biber or select one of the default templates}}
+ {}%
\begingroup
\blx at safe@actives
\let\protect\string
Modified: trunk/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx 2022-06-23 20:56:07 UTC (rev 63705)
+++ trunk/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx 2022-06-23 20:56:48 UTC (rev 63706)
@@ -75,45 +75,45 @@
\DeclareBibliographyStrings{%
bibliography = {{Bibliografi}{Bibliografi}},
- references = {{Litteraturhenvisninger}{Litteratur}},
+ references = {{Litteratur}{Litteratur}},
shorthands = {{Forkortelser}{Forkortelser}},
- editor = {{redakt\o r}{red\adddot}},
- editors = {{redakt\o rer}{red\adddot}},
+ editor = {{redakt{\o}r}{red\adddot}},
+ editors = {{redakt{\o}rer}{red\adddot}},
compiler = {{kompilator}{kompilator}},
compilers = {{kompilatorer}{kompilatorer}},
- redactor = {{medredakt\o r}{medred\adddot}},
- redactors = {{medredakt\o rer}{medred\adddot}},
- reviser = {{revision}{rev\adddot}},
- revisers = {{revision}{rev\adddot}},
+ redactor = {{medredakt{\o}r}{medred\adddot}},
+ redactors = {{medredakt{\o}rer}{medred\adddot}},
+ reviser = {{korrekturl{\ae}ser}{korrek\adddot}},
+ revisers = {{korrekturl{\ae}sere}{korrek\adddot}},
founder = {{stifter}{stifter}},
founders = {{stiftere}{stiftere}},
- continuator = {{videref\o rer}{videref\adddot}},
- continuators = {{videref\o rere}{videref\adddot}},
- collaborator = {{medarbejder}{medarb\adddot}},
- collaborators = {{medarbejdere}{medarb\adddot}},
- translator = {{overs\ae tter}{overs\adddot}},
- translators = {{overs\ae ttere}{overs\adddot}},
- commentator = {{kommentator}{komm\adddot}},
- commentators = {{kommentatorer}{komm\adddot}},
- annotator = {{kommentator}{komm\adddot}},
- annotators = {{kommentatorer}{komm\adddot}},
- commentary = {{kommentar}{komm\adddot}},
- annotations = {{annoteringer}{ann\adddot}},
+ continuator = {{videref{\o}rer}{videref\adddot}},
+ continuators = {{videref{\o}rere}{videref\adddot}},
+ collaborator = {{samarbejdspartner}{samarb\adddot}},
+ collaborators = {{samarbejdspartnere}{samarb\adddot}},
+ translator = {{overs{\ae}tter}{overs\adddot}},
+ translators = {{overs{\ae}ttere}{overs\adddot}},
+ commentator = {{kommentator}{komment\adddot}},
+ commentators = {{kommentatorer}{komment\adddot}},
+ annotator = {{kommentator}{komment\adddot}},
+ annotators = {{kommentatorer}{komment\adddot}},
+ commentary = {{kommentering}{komment\adddot}},
+ annotations = {{annotering}{annot\adddot}},
introduction = {{indledning}{indl\adddot}},
- foreword = {{forord}{forord}},
- afterword = {{efterord}{efterord}},
- editortr = {{redakt\o r og overs\ae tter}%
+ foreword = {{forord}{forord}},%or prolog
+ afterword = {{epilog}{epilog}},%or efterskrift
+ editortr = {{redakt{\o}r og overs{\ae}tter}%
{red\adddotspace og overs\adddot}},
- editorstr = {{redakt\o rer og overs\ae ttere}%
+ editorstr = {{redakt{\o}rer og overs{\ae}ttere}%
{red\adddotspace og overs\adddot}},
- editorco = {{redakt\o r og kommentator}
- {red\adddotspace og komm\adddot}},
- editorsco = {{redakt\o rer og kommentatorer}
- {red\adddotspace og komm\adddot}},
- editoran = {{redakt\o r og kommentator}%
- {red\adddotspace og komm\adddot}},
- editorsan = {{redakt\o rer og kommentatorer}%
- {red\adddotspace og komm\adddot}},
+ editorco = {{redakt{\o}r og kommentator}
+ {red\adddotspace og komment\adddot}},
+ editorsco = {{redakt{\o}rer og kommentatorer}
+ {red\adddotspace og komment\adddot}},
+ editoran = {{redakt{\o}r og kommentator}%
+ {red\adddotspace og komment\adddot}},
+ editorsan = {{redakt{\o}rer og kommentatorer}%
+ {red\adddotspace og komment\adddot}},
editorin = {{redaktion og indledning}%
{red\adddotspace og indl\adddot}},
editorsin = {{redaktion og indledning}%
@@ -122,122 +122,122 @@
{red\adddotspace og forord}},
editorsfo = {{redaktion og forord}%
{red\adddotspace og forord}},
- editoraf = {{redaktion og efterord}%
- {red\adddotspace og efterord}},
- editorsaf = {{redaktion og efterord}%
- {red\adddotspace og efterord}},
- editortrco = {{redakt\o r, overs\ae tter og kommentator}%
- {red.,\addabbrvspace overs\adddotspace og komm\adddot}},
- editorstrco = {{redakt\o rer, overs\ae ttere og kommentatorer}%
- {red.,\addabbrvspace overs\adddotspace og komm\adddot}},
- editortran = {{redakt\o r, overs\ae tter og kommentator}%
- {red.,\addabbrvspace overs\adddotspace og komm\adddot}},
- editorstran = {{redakt\o rer, overs\ae ttere og kommentatorer}%
- {red.,\addabbrvspace overs\adddotspace og komm\adddot}},
- editortrin = {{redaktion, overs\ae ttelse og indledning}%
- {red.,\addabbrvspace overs\adddotspace og indl\adddot}},
- editorstrin = {{redaktion, overs\ae ttelse og indledning}%
- {red.,\addabbrvspace overs\adddotspace og indl\adddot}},
- editortrfo = {{redaktion, overs\ae ttelse og forord}%
- {red.,\addabbrvspace overs\adddotspace og forord}},
- editorstrfo = {{redaktion, overs\ae ttelse og forord}%
- {red.,\addabbrvspace overs\adddotspace og forord}},
- editortraf = {{redaktion, overs\ae ttelse og efterord}%
- {red.,\addabbrvspace overs\adddotspace og efterord}},
- editorstraf = {{redaktion, overs\ae ttelse og efterord}%
- {red.,\addabbrvspace overs\adddotspace og efterord}},
+ editoraf = {{redaktion og epilog}%
+ {red\adddotspace og epilog}},
+ editorsaf = {{redaktion og epilog}%
+ {red\adddotspace og epilog}},
+ editortrco = {{redakt{\o}r, overs{\ae}tter og kommentator}%
+ {red\adddot,\addabbrvspace overs\adddotspace og komment\adddot}},
+ editorstrco = {{redakt{\o}rer, overs{\ae}ttere og kommentatorer}%
+ {red\adddot,\addabbrvspace overs\adddotspace og komment\adddot}},
+ editortran = {{redakt{\o}r, overs{\ae}tter og kommentator}%
+ {red\adddot,\addabbrvspace overs\adddotspace og komment\adddot}},
+ editorstran = {{redakt{\o}rer, overs{\ae}ttere og kommentatorer}%
+ {red\adddot,\addabbrvspace overs\adddotspace og komment\adddot}},
+ editortrin = {{redaktion, overs{\ae}ttelse og indledning}%
+ {red\adddot,\addabbrvspace overs\adddotspace og indl\adddot}},
+ editorstrin = {{redaktion, overs{\ae}ttelse og indledning}%
+ {red\addot,\addabbrvspace overs\adddotspace og indl\adddot}},
+ editortrfo = {{redaktion, overs{\ae}ttelse og forord}%
+ {red\adddot,\addabbrvspace overs\adddotspace og forord}},
+ editorstrfo = {{redaktion, overs{\ae}ttelse og forord}%
+ {red\adddot,\addabbrvspace overs\adddotspace og forord}},
+ editortraf = {{redaktion, overs{\ae}ttelse og epilog}%
+ {red\adddot,\addabbrvspace overs\adddotspace og epilog}},
+ editorstraf = {{redaktion, overs{\ae}ttelse og epilog}%
+ {red\adddot,\addabbrvspace overs\adddotspace og epilog}},
editorcoin = {{redaktion, kommentarer og indledning}%
- {red.,\addabbrvspace komm\adddotspace og indl\adddot}},
+ {red\adddot,\addabbrvspace komment\adddotspace og indl\adddot}},
editorscoin = {{redaktion, kommentarer og indledning}%
- {red.,\addabbrvspace komm\adddotspace og indl\adddot}},
+ {red\adddot,\addabbrvspace komment\adddotspace og indl\adddot}},
editorcofo = {{redaktion, kommentarer og forord}%
- {red.,\addabbrvspace komm\adddotspace og forord}},
+ {red\adddot,\addabbrvspace komment\adddotspace og forord}},
editorscofo = {{redaktion, kommentarer og forord}%
- {red.,\addabbrvspace komm\adddotspace og forord}},
- editorcoaf = {{redaktion, kommentarer og efterord}%
- {red.,\addabbrvspace komm\adddotspace og efterord}},
- editorscoaf = {{redaktion, kommentarer og efterord}%
- {red.,\addabbrvspace komm\adddotspace og efterord}},
- editoranin = {{redaktion, annoteringer og indledning}%
- {red.,\addabbrvspace ann\adddotspace og indl\adddot}},
- editorsanin = {{redaktion, \adddotspace og indledning}%
- {red.,\addabbrvspace ann\adddotspace og indl\adddot}},
- editoranfo = {{redaktion, \adddotspace og forord}%
- {red.,\addabbrvspace ann\adddotspace og forord}},
- editorsanfo = {{redaktion, annoteringer og forord}%
- {red.,\addabbrvspace ann\adddotspace og forord}},
- editoranaf = {{redaktion, annoteringer og efterord}%
- {red.,\addabbrvspace ann\adddotspace og efterord}},
- editorsanaf = {{redaktion, annoteringer og efterord}%
- {red.,\addabbrvspace ann\adddotspace og efterord}},
- editortrcoin = {{redaktion, overs\ae ttelse, kommentarer og indledning}%
- {red.,\addabbrvspace overs., komm\adddotspace og indl\adddot}},
- editorstrcoin = {{redaktion, overs\ae ttelse, kommentarer og indledning}%
- {red.,\addabbrvspace overs., komm\adddotspace og indl\adddot}},
- editortrcofo = {{redaktion, overs\ae ttelse, kommentarer og forord}%
- {red.,\addabbrvspace overs., komm\adddotspace og forord}},
- editorstrcofo = {{redaktion, overs\ae ttelse, kommentarer og forord}%
- {red.,\addabbrvspace overs., komm\adddotspace og forord}},
- editortrcoaf = {{redaktion, overs\ae ttelse, kommentarer og efterord}%
- {red.,\addabbrvspace overs., komm\adddotspace og efterord}},
- editorstrcoaf = {{redaktion, overs\ae ttelse, kommentarer og efterord}%
- {red.,\addabbrvspace overs., komm\adddotspace og efterord}},
- editortranin = {{redaktion, overs\ae ttelse, annoteringer og indledning}%
- {red.,\addabbrvspace overs., ann\adddotspace og indl\adddot}},
- editorstranin = {{redaktion, overs\ae ttelse, annoteringer og indledning}%
- {red.,\addabbrvspace overs., ann\adddotspace og indl\adddot}},
- editortranfo = {{redaktion, overs\ae ttelse, annoteringer og forord}%
- {red.,\addabbrvspace overs., ann\adddotspace og forord}},
- editorstranfo = {{redaktion, overs\ae ttelse, annoteringer og forord}%
- {red.,\addabbrvspace overs., ann\adddotspace og forord}},
- editortranaf = {{redaktion, overs\ae ttelse, annoteringer og efterord}%
- {red.,\addabbrvspace overs., ann\adddotspace og efterord}},
- editorstranaf = {{redaktion, overs\ae ttelse, annoteringer og efterord}%
- {red.,\addabbrvspace overs., ann\adddotspace og efterord}},
- translatorco = {{overs\ae ttelse og kommentarer}%
- {overs\adddotspace og komm\adddot}},
- translatorsco = {{overs\ae ttelse og kommentarer}%
- {overs\adddotspace og komm\adddot}},
- translatoran = {{overs\ae ttelse og annoteringer}%
- {overs\adddotspace og ann\adddot}},
- translatorsan = {{overs\ae ttelse og annoteringer}%
- {overs\adddotspace og ann\adddot}},
- translatorin = {{overs\ae ttelse og indledning}%
+ {red\adddot,\addabbrvspace komment\adddotspace og forord}},
+ editorcoaf = {{redaktion, kommentarer og epilog}%
+ {red\adddot,\addabbrvspace komment\adddotspace og epilog}},
+ editorscoaf = {{redaktion, kommentarer og epilog}%
+ {red\adddot,\addabbrvspace komment\adddotspace og epilog}},
+ editoranin = {{redaktion, annotering og indledning}%
+ {red\adddot,\addabbrvspace annot\adddotspace og indl\adddot}},
+ editorsanin = {{redaktion, annotering og indledning}%
+ {red\adddot,\addabbrvspace annot\adddotspace og indl\adddot}},
+ editoranfo = {{redaktion, annotering og forord}%
+ {red\adddot,\addabbrvspace annot\adddotspace og forord}},
+ editorsanfo = {{redaktion, annotering og forord}%
+ {red\adddot,\addabbrvspace annot\adddotspace og forord}},
+ editoranaf = {{redaktion, annotering og epilog}%
+ {red\adddot,\addabbrvspace annot\adddotspace og epilog}},
+ editorsanaf = {{redaktion, annotering og epilog}%
+ {red\adddot,\addabbrvspace annot\adddotspace og epilog}},
+ editortrcoin = {{redaktion, overs{\ae}ttelse, kommentarer og indledning}%
+ {red\adddot,\addabbrvspace overs\adddot, komment\adddotspace og indl\adddot}},
+ editorstrcoin = {{redaktion, overs{\ae}ttelse, kommentarer og indledning}%
+ {red\adddot,\addabbrvspace overs\adddot, komment\adddotspace og indl\adddot}},
+ editortrcofo = {{redaktion, overs{\ae}ttelse, kommentarer og forord}%
+ {red\adddot,\addabbrvspace overs\adddot, komment\adddotspace og forord}},
+ editorstrcofo = {{redaktion, overs{\ae}ttelse, kommentarer og forord}%
+ {red\adddot,\addabbrvspace overs\adddot, komment\adddotspace og forord}},
+ editortrcoaf = {{redaktion, overs{\ae}ttelse, kommentarer og epilog}%
+ {red\adddot,\addabbrvspace overs\adddot, komment\adddotspace og epilog}},
+ editorstrcoaf = {{redaktion, overs{\ae}ttelse, kommentarer og epilog}%
+ {red\adddot,\addabbrvspace overs\adddot, komment\adddotspace og epilog}},
+ editortranin = {{redaktion, overs{\ae}ttelse, annotering og indledning}%
+ {red\adddot,\addabbrvspace overs\adddot, annot\adddotspace og indl\adddot}},
+ editorstranin = {{redaktion, overs{\ae}ttelse, annotering og indledning}%
+ {red\adddot,\addabbrvspace overs\adddot, annot\adddotspace og indl\adddot}},
+ editortranfo = {{redaktion, overs{\ae}ttelse, annotering og forord}%
+ {red\adddot,\addabbrvspace overs\adddot, annot\adddotspace og forord}},
+ editorstranfo = {{redaktion, overs{\ae}ttelse, annotering og forord}%
+ {red\adddot,\addabbrvspace overs\adddot, annot\adddotspace og forord}},
+ editortranaf = {{redaktion, overs{\ae}ttelse, annotering og epilog}%
+ {red\adddot,\addabbrvspace overs\adddot, annot\adddotspace og epilog}},
+ editorstranaf = {{redaktion, overs{\ae}ttelse, annotering og epilog}%
+ {red\adddot,\addabbrvspace overs\adddot, annot\adddotspace og epilog}},
+ translatorco = {{overs{\ae}ttelse og kommentarer}%
+ {overs\adddotspace og komment\adddot}},
+ translatorsco = {{overs{\ae}ttelse og kommentarer}%
+ {overs\adddotspace og komment\adddot}},
+ translatoran = {{overs{\ae}ttelse og annotering}%
+ {overs\adddotspace og annot\adddot}},
+ translatorsan = {{overs{\ae}ttelse og annotering}%
+ {overs\adddotspace og annot\adddot}},
+ translatorin = {{overs{\ae}ttelse og indledning}%
{overs\adddotspace og indl\adddot}},
- translatorsin = {{overs\ae ttelse og indledning}%
+ translatorsin = {{overs{\ae}ttelse og indledning}%
{overs\adddotspace og indl\adddot}},
- translatorfo = {{overs\ae ttelse og forord}%
+ translatorfo = {{overs{\ae}ttelse og forord}%
{overs\adddotspace og forord}},
- translatorsfo = {{overs\ae ttelse og forord}%
+ translatorsfo = {{overs{\ae}ttelse og forord}%
{overs\adddotspace og forord}},
- translatoraf = {{overs\ae ttelse og efterord}%
- {overs\adddotspace og efterord}},
- translatorsaf = {{overs\ae ttelse og efterord}%
- {overs\adddotspace og efterord}},
- translatorcoin = {{overs\ae ttelse, kommentarer og indledning}%
- {overs., komm\adddotspace og indl\adddot}},
- translatorscoin = {{overs\ae ttelse, kommentarer og indledning}%
- {overs., komm\adddotspace og indl\adddot}},
- translatorcofo = {{overs\ae ttelse, kommentarer og forord}%
- {overs., komm\adddotspace og forord}},
- translatorscofo = {{overs\ae ttelse, kommentarer og forord}%
- {overs., komm\adddotspace og forord}},
- translatorcoaf = {{overs\ae ttelse, kommentarer og efterord}%
- {overs., komm\adddotspace og efterord}},
- translatorscoaf = {{overs\ae ttelse, kommentarer og efterord}%
- {overs., komm\adddotspace og efterord}},
- translatoranin = {{overs\ae ttelse, annoteringer og indledning}%
- {overs., ann\adddotspace og indl\adddot}},
- translatorsanin = {{overs\ae ttelse, annoteringer og indledning}%
- {overs., ann\adddotspace og indl\adddot}},
- translatoranfo = {{overs\ae ttelse, annoteringer og forord}%
- {overs., ann\adddotspace og forord}},
- translatorsanfo = {{overs\ae ttelse, annoteringer og forord}%
- {overs., ann\adddotspace og forord}},
- translatoranaf = {{overs\ae ttelse, annoteringer og efterord}%
- {overs., ann\adddotspace og efterord}},
- translatorsanaf = {{overs\ae ttelse, annoteringer og efterord}%
- {overs., ann\adddotspace og efterord}},
+ translatoraf = {{overs{\ae}ttelse og epilog}%
+ {overs\adddotspace og epilog}},
+ translatorsaf = {{overs{\ae}ttelse og epilog}%
+ {overs\adddotspace og epilog}},
+ translatorcoin = {{overs{\ae}ttelse, kommentarer og indledning}%
+ {overs\adddot, komment\adddotspace og indl\adddot}},
+ translatorscoin = {{overs{\ae}ttelse, kommentarer og indledning}%
+ {overs\adddot, komment\adddotspace og indl\adddot}},
+ translatorcofo = {{overs{\ae}ttelse, kommentarer og forord}%
+ {overs\adddot, komment\adddotspace og forord}},
+ translatorscofo = {{overs{\ae}ttelse, kommentarer og forord}%
+ {overs\adddot, komment\adddotspace og forord}},
+ translatorcoaf = {{overs{\ae}ttelse, kommentarer og epilog}%
+ {overs\adddot, komment\adddotspace og epilog}},
+ translatorscoaf = {{overs{\ae}ttelse, kommentarer og epilog}%
+ {overs\adddot, komment\adddotspace og epilog}},
+ translatoranin = {{overs{\ae}ttelse, annotering og indledning}%
+ {overs\adddot, annot\adddotspace og indl\adddot}},
+ translatorsanin = {{overs{\ae}ttelse, annotering og indledning}%
+ {overs\adddot, annot\adddotspace og indl\adddot}},
+ translatoranfo = {{overs{\ae}ttelse, annotering og forord}%
+ {overs\adddot, annot\adddotspace og forord}},
+ translatorsanfo = {{overs{\ae}ttelse, annotering og forord}%
+ {overs\adddot, annot\adddotspace og forord}},
+ translatoranaf = {{overs{\ae}ttelse, annotering og epilog}%
+ {overs\adddot, annot\adddotspace og epilog}},
+ translatorsanaf = {{overs{\ae}ttelse, annotering og epilog}%
+ {overs\adddot, annot\adddotspace og epilog}},
organizer = {{organisator}{org\adddot}},
organizers = {{organisatorer}{org\adddot}},
byorganizer = {{organiseret af}{org\adddotspace av}},
@@ -252,118 +252,118 @@
bycollaborator = {{i samarbejde med}{i samarb\adddotspace m\adddot}},
bytranslator = {{oversat \lbx at lfromlang\ af}%
{overs\adddot\ \lbx at sfromlang\ af}},
- bycommentator = {{kommenteret af}{komm\adddot\ af}},
- byannotator = {{annoteret af}{ann\adddot\ af}},
- withcommentator = {{med kommentarer af}{m\adddotspace komm\adddot\ af}},
- withannotator = {{med annoteringer af}{m\adddotspace ann\adddot\ af}},
+ bycommentator = {{kommenteret af}{komment\adddot\ af}},
+ byannotator = {{annoteret af}{annot\adddot\ af}},
+ withcommentator = {{med kommentarer af}{m\adddotspace komment\adddot\ af}},
+ withannotator = {{med annotering af}{m\adddotspace annot\adddot\ af}},
withintroduction = {{med indledning af}{m\adddotspace indl\adddot\ af}},
withforeword = {{med forord af}{m\adddotspace forord af}},
- withafterword = {{med efterord af}{m\adddotspace efterord af}},
+ withafterword = {{med epilog af}{m\adddotspace epilog af}},
byeditortr = {{redigeret og oversat \lbx at lfromlang\ af}%
{red\adddotspace og overs\adddot\ \lbx at sfromlang\ af}},
byeditorco = {{redigeret og kommenteret af}%
- {red\adddotspace og komm\adddot\ af}},
- byeditoran = {{redigeret med annoteringer af}%
- {red\adddotspace m\adddotspace ann\adddotspace af}},
+ {red\adddotspace og komment\adddot\ af}},
+ byeditoran = {{redigeret med annotering af}%
+ {red\adddotspace m\adddotspace annot\adddotspace af}},
byeditorin = {{redigeret med indledning af}%
{red\adddotspace med indl\adddot\ af}},
byeditorfo = {{redigeret med forord af}%
{red\adddotspace med forord af}},
- byeditoraf = {{redigeret med efterord af}%
- {red\adddotspace med efterord af}},
+ byeditoraf = {{redigeret med epilog af}%
+ {red\adddotspace med epilog af}},
byeditortrco = {{redigeret, oversat \lbx at lfromlang\ og kommenteret af}%
- {red.,\addabbrvspace overs\adddot\ \lbx at sfromlang\ og komm\adddot\ af}},
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx at sfromlang\ og komment\adddot\ af}},
byeditortran = {{redigeret, oversat \lbx at lfromlang\ og annoteret af}%
- {red.,\addabbrvspace overs\adddot\ \lbx at sfromlang\ og ann\adddot\ af}},
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx at sfromlang\ og annot\adddot\ af}},
byeditortrin = {{redigeret, oversat \lbx at lfromlang\ og med indledning af}%
- {red.,\addabbrvspace overs\adddot\ \lbx at sfromlang\ og indl\adddot\ af}},
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx at sfromlang\ og indl\adddot\ af}},
byeditortrfo = {{redigeret, oversat \lbx at lfromlang\ og med forord af}%
- {red.,\addabbrvspace overs\adddot\ \lbx at sfromlang\ og forord af}},
- byeditortraf = {{redigeret, oversat \lbx at lfromlang\ og med efterord af}%
- {red.,\addabbrvspace overs\adddot\ \lbx at sfromlang\ og efterord af}},
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx at sfromlang\ og forord af}},
+ byeditortraf = {{redigeret, oversat \lbx at lfromlang\ og med epilog af}%
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx at sfromlang\ og epilog af}},
byeditorcoin = {{redigeret, kommenteret og med indledning af}%
- {red.,\addabbrvspace komm\adddot\ og indl\adddotspace af}},
+ {red\adddot,\addabbrvspace komment\adddot\ og indl\adddotspace af}},
byeditorcofo = {{redigeret, kommenteret og med forord af}%
- {red.,\addabbrvspace komm\adddot\ og forord af}},
- byeditorcoaf = {{redigeret, kommenteret og med efterord af}%
- {red.,\addabbrvspace komm\adddot\ og efterord af}},
+ {red\adddot,\addabbrvspace komment\adddot\ og forord af}},
+ byeditorcoaf = {{redigeret, kommenteret og med epilog af}%
+ {red\adddot,\addabbrvspace komment\adddot\ og epilog af}},
byeditoranin = {{redigeret, annoteret og med indledning af}%
- {red.,\addabbrvspace ann\adddot\ og indl\adddot\ af}},
+ {red\adddot,\addabbrvspace annot\adddot\ og indl\adddot\ af}},
byeditoranfo = {{redigeret, annoteret og med forord af}%
- {red.,\addabbrvspace ann\adddot\ og forord af}},
- byeditoranaf = {{redigeret, annoteret og med efterord af}%
- {red.,\addabbrvspace ann\adddot\ og efterord af}},
+ {red\adddot,\addabbrvspace annot\adddot\ og forord af}},
+ byeditoranaf = {{redigeret, annoteret og med epilog af}%
+ {red\adddot,\addabbrvspace annot\adddot\ og epilog af}},
byeditortrcoin = {{redigeret, oversat \lbx at lfromlang, kommenteret og med indledning af}%
- {red.,\addabbrvspace overs\adddot\ \lbx at sfromlang, komm\adddot\ og indl\adddot\ af}},
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx at sfromlang, komment\adddot\ og indl\adddot\ af}},
byeditortrcofo = {{redigeret, oversat \lbx at lfromlang, kommenteret og med forord af}%
- {red.,\addabbrvspace overs\adddot\ \lbx at sfromlang, komm\adddot\ og forord af}},
- byeditortrcoaf = {{redigeret, oversat \lbx at lfromlang, kommenteret og med efterord af}%
- {red.,\addabbrvspace overs\adddot\ \lbx at sfromlang, komm\adddot\ og efterord af}},
- byeditortranin = {{redigeret, oversat \lbx at lfromlang, med annoteringer og indledning af}%
- {red.,\addabbrvspace overs\adddot\ \lbx at sfromlang, ann\adddot\ og indl\adddot\ af}},
- byeditortranfo = {{redigeret, oversat \lbx at lfromlang, med annoteringer og forord af}%
- {red.,\addabbrvspace overs\adddot\ \lbx at sfromlang, ann\adddot\ og forord af}},
- byeditortranaf = {{redigeret, oversat \lbx at lfromlang, med annoteringer og efterord af}%
- {red.,\addabbrvspace overs\adddot\ \lbx at sfromlang, ann\adddot\ og efterord af}},
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx at sfromlang, komment\adddot\ og forord af}},
+ byeditortrcoaf = {{redigeret, oversat \lbx at lfromlang, kommenteret og med epilog af}%
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx at sfromlang, komment\adddot\ og epilog af}},
+ byeditortranin = {{redigeret, oversat \lbx at lfromlang, med annotering og indledning af}%
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx at sfromlang, annot\adddot\ og indl\adddot\ af}},
+ byeditortranfo = {{redigeret, oversat \lbx at lfromlang, med annotering og forord af}%
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx at sfromlang, annot\adddot\ og forord af}},
+ byeditortranaf = {{redigeret, oversat \lbx at lfromlang, med annotering og epilog af}%
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx at sfromlang, annot\adddot\ og epilog af}},
bytranslatorco = {{oversat \lbx at lfromlang\ med kommentarer af}%
- {overs\adddot\ \lbx at sfromlang\ m\adddotspace komm\adddot\ af}},
+ {overs\adddot\ \lbx at sfromlang\ m\adddotspace komment\adddot\ af}},
bytranslatoran = {{oversat \lbx at lfromlang\ og annoteret af}%
- {overs\adddot\ \lbx at sfromlang\ og ann\adddot\ af}},
+ {overs\adddot\ \lbx at sfromlang\ og annot\adddot\ af}},
bytranslatorin = {{oversat \lbx at lfromlang\ med indledning af}%
{overs\adddot\ \lbx at sfromlang\ m\adddotspace indl\adddot\ af}},
bytranslatorfo = {{oversat \lbx at lfromlang\ med forord af}%
{overs\adddot\ \lbx at sfromlang\ m\adddotspace forord af}},
- bytranslatoraf = {{oversat \lbx at lfromlang\ med efterord af}%
- {overs\adddot\ \lbx at sfromlang\ m\adddotspace efterord af}},
+ bytranslatoraf = {{oversat \lbx at lfromlang\ med epilog af}%
+ {overs\adddot\ \lbx at sfromlang\ m\adddotspace epilog af}},
bytranslatorcoin = {{oversat \lbx at lfromlang\addspace med kommentarer og indledning af}%
- {overs\adddot\ \lbx at sfromlang\addspace m\adddotspace komm\adddotspace og indl\adddotspace af}},
+ {overs\adddot\ \lbx at sfromlang\addspace m\adddotspace komment\adddotspace og indl\adddotspace af}},
bytranslatorcofo = {{oversat \lbx at lfromlang\addspace med kommentarer og forord af}%
- {overs\adddot\ \lbx at sfromlang\addspace m\adddotspace komm\adddot\ og forord af}},
- bytranslatorcoaf = {{oversat \lbx at lfromlang\addspace med kommentarer og efterord af}%
- {overs\adddot\ \lbx at sfromlang\addspace m\adddotspace komm\adddot\ og efterord af}},
- bytranslatoranin = {{oversat \lbx at lfromlang\addspace med annoteringer og indledning af}%
- {overs\adddot\ \lbx at sfromlang\addspace m\adddotspace ann\adddot\ og indl\adddot\ af}},
- bytranslatoranfo = {{oversat \lbx at lfromlang\addspace med annoteringer og forord af}%
- {overs\adddot\ \lbx at sfromlang\addspace m\adddotspace ann\adddot\ og forord af}},
- bytranslatoranaf = {{oversat \lbx at lfromlang\addspace med annoteringer og efterord af}%
- {overs\adddot\ \lbx at sfromlang\addspace m\adddotspace ann\adddot\ og efterord af}},
+ {overs\adddot\ \lbx at sfromlang\addspace m\adddotspace komment\adddot\ og forord af}},
+ bytranslatorcoaf = {{oversat \lbx at lfromlang\addspace med kommentarer og epilog af}%
+ {overs\adddot\ \lbx at sfromlang\addspace m\adddotspace komment\adddot\ og epilog af}},
+ bytranslatoranin = {{oversat \lbx at lfromlang\addspace med annotering og indledning af}%
+ {overs\adddot\ \lbx at sfromlang\addspace m\adddotspace annot\adddot\ og indl\adddot\ af}},
+ bytranslatoranfo = {{oversat \lbx at lfromlang\addspace med annotering og forord af}%
+ {overs\adddot\ \lbx at sfromlang\addspace m\adddotspace annot\adddot\ og forord af}},
+ bytranslatoranaf = {{oversat \lbx at lfromlang\addspace med annotering og epilog af}%
+ {overs\adddot\ \lbx at sfromlang\addspace m\adddotspace annot\adddot\ og epilog af}},
and = {{og}{og}},
- andothers = {{med flere}{m.fl\adddot}},
- andmore = {{med mere}{m.m\adddot}},
+ andothers = {{med flere}{m\adddot fl\adddot}},
+ andmore = {{med mere}{m\adddot m\adddot}},
volume = {{bind}{bd\adddot}},
volumes = {{bind}{bd\adddot}},
involumes = {{i}{i}},
- jourvol = {{\aa rgang}{\aa rg\adddot}},
- jourser = {{r\ae kke}{rk\adddot}},
+ jourvol = {{{\aa}rgang}{{\aa}rg\adddot}},
+ jourser = {{r{\ae}kke}{rk\adddot}},
book = {{bog}{bog}},
part = {{del}{del}},
issue = {{nummer}{nr\adddot}},
- newseries = {{ny r\ae kke}{ny rk\adddot}},
- oldseries = {{gammel r\ae kke}{gl. rk\adddot}},
+ newseries = {{ny r{\ae}kke}{ny rk\adddot}},
+ oldseries = {{gammel r{\ae}kke}{gl. rk\adddot}},
edition = {{udgave}{udg\adddot}},
reprint = {{genoptryk}{genoptr\adddot}},
reprintof = {{genoptryk af}{genoptr\adddot\ af}},
- reprintas = {{genoptryk under titlen}{genoptr\adddot\ under titlen}},
- reprintfrom = {{genoptryk fra}{genoptr\adddot\ fra}},
- translationof = {{overs\ae ttelse af}{overs\adddot\ af}},
- translationas = {{oversat under titlen}{overs\adddotspace\ under titlen}},
- translationfrom = {{oversat fra}{overs\adddotspace\ fra}},
+ reprintas = {{genoptryk under titlen}{genoptr\adddotspace under titlen}},
+ reprintfrom = {{genoptryk fra}{genoptr\adddotspace fra}},
+ translationof = {{overs{\ae}ttelse af}{overs\adddot\ af}},
+ translationas = {{oversat under titlen}{overs\adddotspace under titlen}},
+ translationfrom = {{oversat fra}{overs\adddotspace fra}},
reviewof = {{bed\o mmelse af}{bed\adddotspace af}},
origpubas = {{oprindeligt udgivet som}{opr\adddot\ udg\adddot\ som}},
origpubin = {{oprindeligt udgivet i}{opr\adddot\ udg\adddot\ i}},
astitle = {{under titlen}{under titlen}},
bypublisher = {{af}{af}},
- nodate = {{uden \aa rstal}{u.\aa\adddot}},
+ nodate = {{uden dato}{u\adddot d\adddot}},%CORRECT: uden dato, NOT: uden år.
page = {{side}{s\adddot}},
- pages = {{sider}{s\adddot}},
+ pages = {{side}{s\adddot}},%not pluralized in Danish. In the context: side 1–16. NOT: sider 1–16.
column = {{spalte}{sp\adddot}},
- columns = {{spalter}{sp\adddot}},
+ columns = {{spalte}{sp\adddot}},
line = {{linje}{l\adddot}},
- lines = {{linjer}{l\adddot}},
+ lines = {{linje}{l\adddot}},
verse = {{vers}{v\adddot}},
verses = {{vers}{v\adddot}},
section = {{paragraf}{par\adddot}},
- sections = {{paragraffer}{par\adddot}},
+ sections = {{paragraf}{par\adddot}},
paragraph = {{afsnit}{afsn\adddot}},
paragraphs = {{afsnit}{afsn\adddot}},
pagetotal = {{side}{s\adddot}},
@@ -371,44 +371,44 @@
columntotal = {{spalte}{sp\adddot}},
columntotals = {{spalter}{sp\adddot}},
line = {{linje}{l\adddot}},
- lines = {{linjer}{l\adddot}},
+ lines = {{linje}{l\adddot}},
verse = {{vers}{v\adddot}},
verses = {{vers}{v\adddot}},
linetotal = {{linje}{l\adddot}},
- linetotals = {{linje}{l\adddot}},
+ linetotals = {{linjer}{l\adddot}},
versetotal = {{vers}{v\adddot}},
versetotals = {{vers}{v\adddot}},
- sectiontotal = {{paragraf}{par\adddot}},
- sectiontotals = {{paragraffer}{par\adddot}},
+ sectiontotal = {{sektion}{sekt\adddot}},
+ sectiontotals = {{sektioner}{sekt\adddot}},
paragraphtotal = {{afsnit}{afsn\adddot}},
paragraphtotals = {{afsnit}{afsn\adddot}},%
in = {{i}{i}},
- inseries = {{i r\ae kken}{i rk\adddot}},
- ofseries = {{fra r\ae kken}{fra rk\adddot}},
+ inseries = {{i r{\ae}kken}{i rk\adddot}},
+ ofseries = {{fra r{\ae}kken}{fra rk\adddot}},
number = {{nummer}{nr\adddot}},
-% numbers = {{numre}{nr\adddot}},
+ % numbers = {{numre}{nr\adddot}},%It is unclear where it comes from and what it is for. undefined variable and thus gives an xkeyval error.
chapter = {{kapitel}{kap\adddot}},
- bathesis = {{bachelorafhandling}{bachelorafh\adddot}},
- mathesis = {{masterafhandling}{masterafh\adddot}},
- phdthesis = {{PhD afhandling}{PhD afh\adddot}},
- candthesis = {{specialeafhandling}{specialeafh\adddot}},
+ bathesis = {{Bachelorafhandling}{Bachelorafh\adddot}},
+ mathesis = {{Masterafhandling}{Masterafh\adddot}},
+ phdthesis = {{PhD-afhandling}{PhD-afh\adddot}},
+ candthesis = {{Kandidatspeciale}{Kand\adddotspace spec\adddot}},
resreport = {{forskningsrapport}{forskningsrap\adddot}},
- techreport = {{teknisk rapport}{tekn\adddot\ rap\adddot}},
+ techreport = {{teknisk rapport}{tekn.\adddot\ rapp\adddot}},
software = {{software}{software}},
datacd = {{data-cd}{data-cd}},
audiocd = {{lyd-cd}{lyd-cd}},
version = {{version}{vers\adddot}},
url = {{webadresse}{webadr\adddot}},
- urlfrom = {{tilg\ae ngelig fra}{tilg\adddotspace fra}},
- urlseen = {{bes\o gt}{bes\adddot}},
+ urlfrom = {{tilg{\ae}ngelig fra}{tilg\adddotspace fra}},
+ urlseen = {{hentet}{hentet}},%retrieved date
inpreparation = {{under udarbejdelse}{under udarb\adddot}},
submitted = {{indleveret}{indlev\adddot}},
forthcoming = {{under udgivelse}{under udgiv\adddot}},
inpress = {{i trykken}{i trykken}},
- prepublished = {{pr\ae publiceret}{pr\ae publ\adddot}},
+ prepublished = {{pr{\ae}publiceret}{pr{\ae}publ\adddot}},
citedas = {{herefter citeret som}{herefter cit\adddot\ som}},
thiscite = {{her}{her}},
- seenote = {{se note}{se nt\adddot}},
+ seenote = {{se note}{se note}},
quotedin = {{citeret efter}{cit\adddot\ efter}},
idem = {{den samme}{d\adddot s\adddot}},
idemsf = {{den samme}{d\adddot s\adddot}},
@@ -419,14 +419,14 @@
idempn = {{de samme}{d\adddot s\adddot}},
idempp = {{de samme}{d\adddot s\adddot}},
ibidem = {{ibidem}{ibid\adddot}},
- opcit = {{op.\adddotspace cit\adddot}{op.\adddotspace cit\adddot}},
- loccit = {{loc.\adddotspace cit\adddot}{loc.\adddotspace cit\adddot}},
- confer = {{j\ae vnf\o r}{jvf\adddot}},
+ opcit = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+ loccit = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},
+ confer = {{j{\ae}vnf{\o}r}{jf\adddot}},
sequens = {{f\adddot}{f\adddot}},
sequentes = {{ff\adddot}{ff\adddot}},
passim = {{passim}{pass\adddot}},
see = {{se}{s\adddot}},
- seealso = {{se ogs\aa}{se ogs\aa}},
+ seealso = {{se ogs{\aa}}{se ogs{\aa}}},
backrefpage = {{se side}{se s\adddot}},
backrefpages = {{se siderne}{se s\adddot}},
january = {{januar}{jan\adddot}},
@@ -455,7 +455,7 @@
langfrench = {{fransk}{fransk}},
langgalician = {{galicisk}{galicisk}},
langgerman = {{tysk}{tysk}},
- langgreek = {{gr\ae sk}{gr\ae sk}},
+ langgreek = {{gr{\ae}sk}{gr{\ae}sk}},
langhungarian = {{ungarsk}{ungarsk}},
langitalian = {{italiensk}{italiensk}},
langjapanese = {{japansk}{japansk}},
@@ -484,7 +484,7 @@
fromfrench = {{fra fransk}{fra fransk}},
fromgalician = {{fra galicisk}{fra galicisk}},
fromgerman = {{fra tysk}{fra tysk}},
- fromgreek = {{fra gr\ae sk}{fra gr\ae sk}},
+ fromgreek = {{fra gr{\ae}sk}{fra gr{\ae}sk}},
fromhungarian = {{fra ungarsk}{fra ungarsk}},
fromitalian = {{fra italiensk}{fra italiensk}},
fromjapanese = {{fra japansk}{fra japansk}},
@@ -500,55 +500,55 @@
fromswedish = {{fra svensk}{fra svensk}},
fromukrainian = {{fra ukrainsk}{fra ukrainsk}},
countryde = {{Tyskland}{DE}},
- countryeu = {{Europ\ae iske Union}{EU}},
- countryep = {{Europ\ae iske Union}{EP}},
+ countryeu = {{Europ{\ae}iske Union}{EU}},
+ countryep = {{Europ{\ae}iske Union}{EP}},%must be wrong. Does this refer to European Parliament or European Patent?
countryfr = {{Frankrig}{FR}},
countryuk = {{Storbritannien}{GB}},
countryus = {{USA}{US}},
patent = {{patent}{pat\adddot}},
- patentde = {{tysk patent}{tysk pat\adddot}},
- patenteu = {{europ\ae isk patent}{eur\adddot\ pat\adddot}},
- patentfr = {{fransk patent}{fransk pat\adddot}},
- patentuk = {{britisk patent}{brit\adddot\ pat\adddot}},
- patentus = {{amerikansk patent}{am\adddot\ pat\adddot}},
- patreq = {{patentans\o gning}{pat\adddot\ ans\o gn\adddot}},
- patreqde = {{tysk patentans\o gning}{tysk pat\adddot\ ans\o gn\adddot}},
- patreqeu = {{europ\ae isk patentans\o gning}{eur\adddot\ pat\adddot\ ans\o gn\adddot}},
- patreqfr = {{fransk patentans\o gning}{fransk pat\adddot\ ans\o gn\adddot}},
- patrequk = {{britisk patentans\o gning}{brit\adddot\ pat\adddot\ ans\o gn\adddot}},
- patrequs = {{amerikansk patentans\o gning}{am\adddot\ pat\adddot\ ans\o gn\adddot}},
+ patentde = {{DE-patent}{DE-pat\adddot}},
+ patenteu = {{EU-patent}{EU-pat\adddot}},
+ patentfr = {{FR-patent}{FR-pat\adddot}},
+ patentuk = {{UK-patent}{UK-pat\adddot}},
+ patentus = {{US-patent}{US-pat\adddot}},
+ patreq = {{patentans{\o}gning}{pat\adddot\ ans{\o}gn\adddot}},
+ patreqde = {{tysk patentans{\o}gning}{tysk pat\adddot\ ans{\o}gn\adddot}},
+ patreqeu = {{europ{\ae}isk patentans{\o}gning}{EU-pat\adddot\ ans{\o}gn\adddot}},
+ patreqfr = {{fransk patentans{\o}gning}{fransk pat\adddot\ ans{\o}gn\adddot}},
+ patrequk = {{britisk patentans{\o}gning}{brit\adddot\ pat\adddot\ ans{\o}gn\adddot}},
+ patrequs = {{amerikansk patentans{\o}gning}{am\adddot\ pat\adddot\ ans{\o}gn\adddot}},
file = {{fil}{fil}},
library = {{bibliotek}{bibl\adddot}},
- abstract = {{resum\'{e}}{resum\'{e}}},
- annotation = {{kommentarer}{komm\adddot}},
+ abstract = {{Abstract}{Abstract}},%akademically it is an abstract and not a "resumé". They are not the same thing.
+ annotation = {{kommentarer}{komment\adddot}},
commonera = {{efter vor tidsregning}{e\adddot v\adddot t\adddot}},
- beforecommonera = {{f\o r vor tidsregning}{f\adddot v\adddot t\adddot}},
- annodomini = {{efter Kristi f\o dsel}{e\adddot Kr\adddot}},
- beforechrist = {{f\o r Kristi f\o dsel}{f\adddot Kr\adddot}},
+ beforecommonera = {{f{\o}r vor tidsregning}{f\adddot v\adddot t\adddot}},
+ annodomini = {{efter Kristi f{\o}dsel}{e\adddot Kr\adddot}},
+ beforechrist = {{f{\o}r Kristi f{\o}dsel}{f\adddot Kr\adddot}},
circa = {{cirka}{ca\adddot}},
- spring = {{for\aa r}{for\aa r}},
+ spring = {{for{\aa}r}{for{\aa}r}},
summer = {{sommer}{sommer}},
- autumn = {{efter\aa r}{efter\aa r}},
+ autumn = {{efter{\aa}r}{efter{\aa}r}},
winter = {{vinter}{vinter}},
-% springN = {{}{}},% FIXME: missing
-% summerN = {{}{}},% FIXME: missing
-% autumnN = {{}{}},% FIXME: missing
-% winterN = {{}{}},% FIXME: missing
-% springS = {{}{}},% FIXME: missing
-% summerS = {{}{}},% FIXME: missing
-% autumnS = {{}{}},% FIXME: missing
-% winterS = {{}{}},% FIXME: missing
-% Q1 = {{}{}},% FIXME: missing
-% Q2 = {{}{}},% FIXME: missing
-% Q3 = {{}{}},% FIXME: missing
-% Q4 = {{}{}},% FIXME: missing
-% QD1 = {{}{}},% FIXME: missing
-% QD2 = {{}{}},% FIXME: missing
-% QD3 = {{}{}},% FIXME: missing
-% S1 = {{}{}},% FIXME: missing
-% S2 = {{}{}},% FIXME: missing
- am = {{formiddag}{form\adddot}},
- pm = {{eftermiddag}{efterm\adddot}},
+ springN = {{for{\aa}r, nordlige halvkugle}{for{\aa}r, nordlige halvkugle}},
+ summerN = {{sommer, nordlige halvkugle}{sommer, nordlige halvkugle}},
+ autumnN = {{efter{\aa}r, nordlige halvkugle}{efter{\aa}r, nordlige halvkugle}},
+ winterN = {{vinter, nordlige halvkugle}{vinter, nordlige halvkugle}},
+ springS = {{for{\aa}r, sydlige halvkugle}{for{\aa}r, sydlige halvkugle}},
+ summerS = {{sommer, sydlige halvkugle}{sommer, sydlige halvkugle}},
+ autumnS = {{efter{\aa}r, sydlige halvkugle}{efter{\aa}r, sydlige halvkugle}},
+ winterS = {{vinter, sydlige halvkugle}{vinter, sydlige halvkugle}},
+ Q1 = {{1\adddot~kvartal}{Q1}},
+ Q2 = {{2\adddot~kvartal}{Q2}},
+ Q3 = {{3\adddot~kvartal}{Q3}},
+ Q4 = {{4\adddot~kvartal}{Q4}},
+ QD1 = {{1\adddot~kvarter}{Q1}},%reference to academic quadrimesters, in Danish: kvarter, akademisk kvarter.
+ QD2 = {{2\adddot~kvarter}{Q2}},
+ QD3 = {{3\adddot~kvarter}{Q3}},
+ S1 = {{1\adddot~halv{\aa}r}{H1}},%or 1.~semester
+ S2 = {{2\adddot~halv{\aa}r}{H2}},%or 2.~semester
+ am = {{formiddag}{formiddag}},
+ pm = {{eftermiddag}{eftermiddag}},
}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx 2022-06-23 20:56:07 UTC (rev 63705)
+++ trunk/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx 2022-06-23 20:56:48 UTC (rev 63706)
@@ -548,7 +548,6 @@
% QD3 = {{}{}},% FIXME: missing
% S1 = {{}{}},% FIXME: missing
% S2 = {{}{}},% FIXME: missing
-
am = {{AM}{AM}},
pm = {{PM}{PM}},
}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx 2022-06-23 20:56:07 UTC (rev 63705)
+++ trunk/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx 2022-06-23 20:56:48 UTC (rev 63706)
@@ -284,7 +284,7 @@
bytranslatoranaf = {{traducido \lbx at lfromlang, anotado y epilogado por}%
{trad\adddotspace \lbx at sfromlang, anot\adddotspace y ep\'{\i}l\adddotspace por}},
and = {{y}{y}},
- andothers = {{y~col\adddot}{y~col\adddot}},
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
andmore = {{et\adddotspace al\adddot}{et\adddotspace al\adddot}},
volume = {{volumen}{vol\adddot}},
volumes = {{vol\'umenes}{vols\adddot}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex/lbx/turkish.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex/lbx/turkish.lbx 2022-06-23 20:56:07 UTC (rev 63705)
+++ trunk/Master/texmf-dist/tex/latex/biblatex/lbx/turkish.lbx 2022-06-23 20:56:48 UTC (rev 63706)
@@ -453,6 +453,7 @@
november = {{Kas\i m}{Kas\adddot}},
december = {{Aral\i k}{Ara\adddot}},
langamerican = {{Amerikanca}{Amerikanca}},
+ langbasque = {{Bask\c{c}a}{Bask\c{c}a}},
langbrazilian = {{Brezilyanca}{Brezilyanca}},
langbulgarian = {{Bulgarca}{Bulgarca}},
langcatalan = {{Katalanca}{Katalanca}},
@@ -473,9 +474,11 @@
langlatin = {{Latince}{Latince}},
langlatvian = {{Letonca}{Letonca}},
langlithuanian = {{Litvanca}{Litvanca}},
+ langmarathi = {{Marathice}{Marathice}},
langnorwegian = {{Norve\c{c}\c{c}e}{Norve\c{c}\c{c}e}},
langpolish = {{Polonyaca}{Polonyaca}},
langportuguese = {{Portekizce}{Portekizce}},
+ langromanian = {{Rumence}{Rumence}},
langrussian = {{Rus\c{c}a}{Rus\c{c}a}},
langserbian = {{S\i rp\c{c}a}{S\i rp\c{c}a}},
langslovak = {{Slovak\c{c}a}{Slovak\c{c}a}},
@@ -482,8 +485,10 @@
langslovene = {{Slovence}{Slovence}},
langspanish = {{\.{I}spanyolca}{\.{I}spanyolca}},
langswedish = {{\.{I}sve\c{c}\c{c}e}{\.{I}sve\c{c}\c{c}e}},
+ langturkish = {{T\"{u}rk\c{c}e}{T\"{u}rk\c{c}e}},
langukrainian = {{Ukraynaca}{Ukraynaca}},
fromamerican = {{Amerikanca'dan}{Amerikanca'dan}},
+ frombasque = {{Bask\c{c}a'dan}{Bask\c{c}a'dan}},
frombrazilian = {{Brezilyanca'dan}{Brezilyanca'dan}},
frombulgarian = {{Bulgarca'dan}{Bulgarca'dan}},
fromcatalan = {{Katalanca'dan}{Katalanca'dan}},
@@ -504,9 +509,11 @@
fromlatin = {{Latince'den}{Latince'den}},
fromlatvian = {{Latvianca'dan}{Latvianca'dan}},
fromlithuanian = {{Litvanca'dan}{Litvanca'dan}},
+ frommarathi = {{Marathice'den}{Marathice'den}},
fromnorwegian = {{Norve\c{c}\c{c}e'den}{Norve\c{c}\c{c}e'den}},
frompolish = {{Polonyaca'dan}{Polonyaca'dan}},
fromportuguese = {{Portekizce'den}{Portekizce'den}},
+ fromromanian = {{Rumence'den}{Rumence'den}},
fromrussian = {{Rus\c{c}a'dan}{Rus\c{c}a'dan}},
fromserbian = {{S\i rp\c{c}a'dan}{S\i rp\c{c}a'dan}},
fromslovak = {{Slovak\c{c}a'dan}{Slovak\c{c}a'dan}},
@@ -513,6 +520,7 @@
fromslovene = {{Slovence'den}{Slovence'den}},
fromspanish = {{\.{I}spanyolca'dan}{\.{I}spanyolca'dan}},
fromswedish = {{\.{I}sve\c{c}\c{c}e'den}{\.{I}sve\c{c}\c{c}e'den}},
+ fromturkish = {{T\"{u}rk\c{c}e'den}{T\"{u}rk\c{c}e'den}},
fromukrainian = {{Ukraynaca'dan}{Ukraynaca'dan}},
countryde = {{Almanya}{DE}},
countryeu = {{Avrupa Birli\u{g}i}{AB}},
@@ -545,23 +553,23 @@
summer = {{Yaz}{Yaz}},
autumn = {{Sonbahar}{Sonbahar}},
winter = {{K\i \c{s}}{K\i \c{s}}},
-% springN = {{}{}},% FIXME: missing
-% summerN = {{}{}},% FIXME: missing
-% autumnN = {{}{}},% FIXME: missing
-% winterN = {{}{}},% FIXME: missing
-% springS = {{}{}},% FIXME: missing
-% summerS = {{}{}},% FIXME: missing
-% autumnS = {{}{}},% FIXME: missing
-% winterS = {{}{}},% FIXME: missing
-% Q1 = {{}{}},% FIXME: missing
-% Q2 = {{}{}},% FIXME: missing
-% Q3 = {{}{}},% FIXME: missing
-% Q4 = {{}{}},% FIXME: missing
-% QD1 = {{}{}},% FIXME: missing
-% QD2 = {{}{}},% FIXME: missing
-% QD3 = {{}{}},% FIXME: missing
-% S1 = {{}{}},% FIXME: missing
-% S2 = {{}{}},% FIXME: missing
+ springN = {{\.{I}lkbahar (Kuzey Yar\i mk\"{u}re)}{\.{I}lkbahar KY}},
+ summerN = {{Yaz (Kuzey Yar\i mk\"{u}re)}{Yaz KY}},
+ autumnN = {{Sonbahar (Kuzey Yar\i mk\"{u}re)}{Sonbahar KY}},
+ winterN = {{K\i \c{s} (Kuzey Yar\i mk\"{u}re)}{K\i \c{s} KY}},
+ springS = {{\.{I}lkbahar (G\"{u}ney Yar\i mk\"{u}re)}{\.{I}lkbahar GY}},
+ summerS = {{Yaz (G\"{u}ney Yar\i mk\"{u}re)}{Yaz GY}},
+ autumnS = {{Sonbahar (G\"{u}ney Yar\i mk\"{u}re)}{Sonbahar GY}},
+ winterS = {{K\i \c{s} (G\"{u}ney Yar\i mk\"{u}re)}{K\i \c{s} GY}},
+ Q1 = {{birinci \c{c}eyrek}{1\adddot \c{C}}},
+ Q2 = {{ikinci \c{c}eyrek}{2\adddot \c{C}}},
+ Q3 = {{\"{u}\c{c}\"{u}nc\"{u} \c{c}eyrek}{3\adddot \c{C}}},
+ Q4 = {{d\"{o}rd\"{u}nc\"{u} \c{c}eyrek}{4\adddot \c{C}}},
+ QD1 = {{birinci d\"{o}rt\"{u}k}{1\adddot D}},
+ QD2 = {{ikinci d\"{o}rt\"{u}k}{2\adddot D}},
+ QD3 = {{\"{u}\c{c}\"{u}nc\"{u} d\"{o}rt\"{u}k}{3\adddot D}},
+ S1 = {{birinci yar\i y\i l}{1\adddot YY}},
+ S2 = {{ikinci yar\i y\i l}{1\adddot YY}},
am = {{\"{o}\u{g}leden \"{o}nce}{\"{O}\"{O}}},
pm = {{\"{o}\u{g}leden sonra}{\"{O}S}},
}
More information about the tex-live-commits
mailing list.