diff --git a/doc/latex/biblatex/CHANGES.md b/doc/latex/biblatex/CHANGES.md index f7478cd19..854588a06 100644 --- a/doc/latex/biblatex/CHANGES.md +++ b/doc/latex/biblatex/CHANGES.md @@ -34,8 +34,16 @@ # RELEASE NOTES FOR VERSION 3.20 - Added `\DeclareNamehashTemplate` and supporting macros to allow customisation of the nameparts used in name hash construction. -- Added facility for custom namehash ids in extended name format -- Added new field 'fullhashraw' +- Added facility for custom namehash ids in extended name format. +- Added new field 'fullhashraw'. +- Added `\@doendpe` and `\par` call to `\printbibliography` and + `\printbiblist`. + This means that `\printbibliography` and `\printbiblist` + now force text after them to start a new paragraph. + This is probably usually desired. Since most people will use + bibliography environments that come with an implicit `\par` + or at least a new line, this should hopefully not change the output + in too many cases. # RELEASE NOTES FOR VERSION 3.19 - Added `\AtNextRefsection`. diff --git a/doc/latex/biblatex/biblatex.tex b/doc/latex/biblatex/biblatex.tex index 6e21b3dc2..0fca1f49e 100644 --- a/doc/latex/biblatex/biblatex.tex +++ b/doc/latex/biblatex/biblatex.tex @@ -1451,7 +1451,7 @@ \subsubsection{Custom Fields} Custom fields for special bibliography styles. Not used by the standard bibliography styles. -\fielditem{verb{[a--c]}}{literal} +\fielditem{verb{[a--c]}}{verbatim} Similar to the custom fields above except that these are verbatim fields. Not used by the standard bibliography styles. @@ -2138,18 +2138,25 @@ \subsubsection{Preamble Options} Normally the multiscript entryfield alternates pointed to by \bibfield{labelname} and \bibfield{labeltitle} are determined for the document via the \cmd{DeclareLabelname} and \cmd{DeclareLabeltitle} commands and this determination is static. If this option is , then the multiscript alternate entryfield pointed by \bibfield{labelname} and \bibfield{labeltitle} are determined dynamically by the setting of the \opt{msform} and \opt{mslang} options at the point where the \bibfield{labelname} or \bibfield{labeltitle} are printed. See \secref{use:multiscript}. -\optitem[nty]{sorting}{\opt{nty}, \opt{nyt}, \opt{nyvt}, \opt{anyt}, \opt{anyvt}, \opt{ynt}, \opt{ydnt}, \opt{count}, \opt{none}, \opt{debug}, \prm{name}} +\optitem[nty]{sorting}{\opt{nty}, \opt{ntd}, \opt{nyt}, \opt{ndt}, \opt{nyvt}, \opt{ndvt}, \opt{anyt}, \opt{andt}, \opt{anyvt}, opt{andvt}, \opt{ynt}, \opt{dnt}, \opt{ydnt}, \opt{ddnt}, \opt{none}, \opt{count}, \opt{debug}, \prm{name}} The sorting order of the bibliography. Unless stated otherwise, the entries are sorted in ascending order. The following choices are available by default: \begin{valuelist} \item[nty] Sort by name, title, year. +\item[ntd] Sort by name, title, full date. \item[nyt] Sort by name, year, title. +\item[ndt] Sort by name, full date, title. \item[nyvt] Sort by name, year, volume, title. +\item[ndvt] Sort by name, full date, volume, title. \item[anyt] Sort by alphabetic label, name, year, title. +\item[andt] Sort by alphabetic label, name, full date, title. \item[anyvt] Sort by alphabetic label, name, year, volume, title. +\item[andvt] Sort by alphabetic label, name, full date, volume, title. \item[ynt] Sort by year, name, title. +\item[dnt] Sort by full date, name, title. \item[ydnt] Sort by year (descending), name, title. +\item[ddnt] Sort by full date (descending), name, title. \item[none] Do not sort at all. All entries are processed in citation order. \item[count] Sort in descending order of number of times cited \item[debug] Sort by entry key. This is intended for debugging only. @@ -2635,7 +2642,8 @@ \subsubsection{Preamble Options} \boolitem[true]{bibtexcaseprotection} -This option only has an effect when the \sty{expl3} implementation of the case changing functions is selected. If the option is set to \opt{true}, \cmd{MakeSentenceCase*} supports brace protection of words from case change as in classical \bibtex. If the option is set to \opt{false}, pairs of braces no longer imply case protection, which can now be enforced by wrapping the relevant word in \cmd{NoCaseChange}---this makes for a less confusing, if more verbose, markup of case protection. +This option only has an effect when the \sty{expl3} implementation of the case changing functions is selected. If the option is set to \opt{true}, \cmd{MakeSentenceCase*} supports brace protection of words from case change as in classical \bibtex. If the option is set to \opt{false}, pairs of braces no longer imply case protection, which can now be achieved by wrapping the relevant word in \cmd{NoCaseChange}---this makes for a less confusing, if more verbose, markup of case protection. +For examples of the effect of this option refer to the documentation of \cmd{MakeSentenceCase*} in \secref{aut:aux:msc}. \end{optionlist} @@ -3521,6 +3529,8 @@ \subsection{Sorting Options} The chronological sorting templates presented in \apxref{apx:srt:chr} also make use of the \bibfield{presort} and \bibfield{sortkey} fields, if defined. The next item considered is the \bibfield{sortyear} or the \bibfield{year} field, depending on availability. The \opt{ynt} template extracts the first four Arabic figures from the field. If both fields are undefined, the string \texttt{9999} is used as a fallback value. This means that all entries without a year will be moved to the end of the list. The \opt{ydnt} template is similar in concept but sorts the year in descending order. As with the \opt{ynt} template, the string \texttt{9999} is used as a fallback value. The remaining items are similar to the alphabetic sorting templates discussed above. Note that the \opt{ydnt} sorting template will only sort the date in descending order. All other items are sorted in ascending order as usual. +Most built-in sorting templates have a variant which sorts on all of the available parts of a full ISO8601 date right down to \bibfield{seconds} instead of only the year, see \secref{use:opt:pre}. + Using special fields such as \bibfield{sortkey}, \bibfield{sortname}, or \bibfield{sorttitle} is usually not required. The \biblatex package is quite capable of working out the desired sorting order by using the data found in the regular fields of an entry. You will only need them if you want to manually modify the sorting order of the bibliography or if any data required for sorting is missing. Please refer to the field descriptions in \secref{bib:fld:spc} for details on possible uses of the special fields. \subsection{Data Annotations} @@ -3919,7 +3929,7 @@ \subsubsection{The Bibliography} \cmditem{printbibheading}[key=value, \dots] -This command prints a bibliography heading defined with \cmd{defbibheading}. It takes one optional argument, which is a list of options given in \keyval notation. The options are a small subset of those supported by \cmd{printbibliography}. Valid options are \opt{heading}, \opt{title} and \opt{label}. By default, this command uses the heading \texttt{bibliography}. See \secref{use:bib:hdg} for details. Also see \secref{use:use:mlt,use:use:div} for usage examples. +This command prints a bibliography heading defined with \cmd{defbibheading}. It takes one optional argument, which is a list of options given in \keyval notation. The options are a small subset of those supported by \cmd{printbibliography}. Valid options are \opt{heading}, \opt{title}, \opt{label}, \opt{prenote} and \opt{postnote}. Note that both the \opt{prenote} and \opt{postnote} argument are printed after the heading. Their behaviour exactly mirrors that of \cmd{printbibliography}, except that no bibliography is created in between the two notes. By default, this command uses the heading \texttt{bibliography}. See \secref{use:bib:hdg} for details. Also see \secref{use:use:mlt,use:use:div} for usage examples. \cmditem{DeclarePrintbibliographyDefaults}{key=value, \dots} @@ -3955,7 +3965,7 @@ \subsubsection{Bibliography Lists} The \prm{biblistname} is a mandatory argument which names the bibliography list. This name is used to identify: \begin{itemize} \item The default bibliography driver used to print the list entries -\item A default bibliography list filter declared with \cmd{DeclareBiblistFilter} (see \secref{aut:ctm:bibfilt}) used to filter the entries returned from \biber +\item A default bibliography list filter declared with \cmd{DeclareBiblistFilter} (see \secref{aut:ctm:bibfilt}) used to filter the entries returned by \biber in the \file{.bbl} \item A default check declared with \cmd{defbibcheck} (see \secref{use:bib:flt}) used to post-process the list entries \item The default bib environment to use \item The default sorting template to use @@ -15591,8 +15601,8 @@ \section{Revision History} \begin{release}{4.0}{2022-} \item Multiscript support\see{use:multiscript} \end{release} -\begin{release}{3.19}{2022} \begin{release}{3.20}{2023-} +\item Added default full date sorting templates\see{use:opt:pre} \item Added \opt{bibdatendsep}\see{use:fmt:lng} \item Added \cmd{AtFollowingRefsections}\see{aut:fmt:hok} \item Added \cmd{DeclareNamehashTemplate}\see{aut:cav:ni} diff --git a/testfiles/pdftex/94-labelprefix.tlg b/testfiles/pdftex/94-labelprefix.tlg index b353b21ed..474d300f0 100644 --- a/testfiles/pdftex/94-labelprefix.tlg +++ b/testfiles/pdftex/94-labelprefix.tlg @@ -3132,7 +3132,7 @@ Completed box being shipped out [2] ....\glue(\rightskip) 0.0 ...\penalty 10000 ...\glue 9.90036 plus 0.86089 -...\write1{\newlabel{refsection:1}{{}{\thepage }}} +...\write1{\newlabel{refsection:1}{{}{\thepage }{}{}{}}} ...\penalty 10000 ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 diff --git a/tex/latex/biblatex/biblatex.def b/tex/latex/biblatex/biblatex.def index fb3010dcb..3af88ce48 100644 --- a/tex/latex/biblatex/biblatex.def +++ b/tex/latex/biblatex/biblatex.def @@ -1608,6 +1608,50 @@ } } +\DeclareSortingTemplate{ntd}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \sort{ + \field{sortname} + \field{author} + \field{editor} + \field{translator} + \field{sorttitle} + \field{title} + } + \sort{ + \field{sorttitle} + \field{title} + } + \sort{ + \field{sortyear} + \field{year} + } + \sort{ + \field{month} + } + \sort{ + \field{day} + } + \sort{ + \field{hour} + } + \sort{ + \field{minute} + } + \sort{ + \field{second} + } + \sort{ + \field{volume} + \literal{0} + } +} + \DeclareSortingTemplate{nyt}{ \sort{ \field{presort} @@ -1637,6 +1681,50 @@ } } +\DeclareSortingTemplate{ndt}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \sort{ + \field{sortname} + \field{author} + \field{editor} + \field{translator} + \field{sorttitle} + \field{title} + } + \sort{ + \field{sortyear} + \field{year} + } + \sort{ + \field{month} + } + \sort{ + \field{day} + } + \sort{ + \field{hour} + } + \sort{ + \field{minute} + } + \sort{ + \field{second} + } + \sort{ + \field{sorttitle} + \field{title} + } + \sort{ + \field{volume} + \literal{0} + } +} + \DeclareSortingTemplate{nyvt}{ \sort{ \field{presort} @@ -1666,6 +1754,50 @@ } } +\DeclareSortingTemplate{ndvt}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \sort{ + \field{sortname} + \field{author} + \field{editor} + \field{translator} + \field{sorttitle} + \field{title} + } + \sort{ + \field{sortyear} + \field{year} + } + \sort{ + \field{month} + } + \sort{ + \field{day} + } + \sort{ + \field{hour} + } + \sort{ + \field{minute} + } + \sort{ + \field{second} + } + \sort{ + \field{volume} + \literal{0} + } + \sort{ + \field{sorttitle} + \field{title} + } +} + \DeclareSortingTemplate{anyt}{ \sort{ \field{presort} @@ -1698,6 +1830,53 @@ } } +\DeclareSortingTemplate{andt}{ + \sort{ + \field{presort} + } + \sort{ + \field{labelalpha} + } + \sort[final]{ + \field{sortkey} + } + \sort{ + \field{sortname} + \field{author} + \field{editor} + \field{translator} + \field{sorttitle} + \field{title} + } + \sort{ + \field{sortyear} + \field{year} + } + \sort{ + \field{month} + } + \sort{ + \field{day} + } + \sort{ + \field{hour} + } + \sort{ + \field{minute} + } + \sort{ + \field{second} + } + \sort{ + \field{sorttitle} + \field{title} + } + \sort{ + \field{volume} + \literal{0} + } +} + \DeclareSortingTemplate{anyvt}{ \sort{ \field{presort} @@ -1730,6 +1909,53 @@ } } +\DeclareSortingTemplate{andvt}{ + \sort{ + \field{presort} + } + \sort{ + \field{labelalpha} + } + \sort[final]{ + \field{sortkey} + } + \sort{ + \field{sortname} + \field{author} + \field{editor} + \field{translator} + \field{sorttitle} + \field{title} + } + \sort{ + \field{sortyear} + \field{year} + } + \sort{ + \field{month} + } + \sort{ + \field{day} + } + \sort{ + \field{hour} + } + \sort{ + \field{minute} + } + \sort{ + \field{second} + } + \sort{ + \field{volume} + \literal{0} + } + \sort{ + \field{sorttitle} + \field{title} + } +} + \DeclareSortingTemplate{ynt}{ \sort{ \field{presort} @@ -1756,6 +1982,47 @@ } } +\DeclareSortingTemplate{dnt}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \sort{ + \field{sortyear} + \field{year} + \literal{9999} + } + \sort{ + \field{month} + } + \sort{ + \field{day} + } + \sort{ + \field{hour} + } + \sort{ + \field{minute} + } + \sort{ + \field{second} + } + \sort{ + \field{sortname} + \field{author} + \field{editor} + \field{translator} + \field{sorttitle} + \field{title} + } + \sort{ + \field{sorttitle} + \field{title} + } +} + \DeclareSortingTemplate{ydnt}{ \sort{ \field{presort} @@ -1782,6 +2049,47 @@ } } +\DeclareSortingTemplate{ddnt}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \sort[direction=descending]{ + \field{sortyear} + \field{year} + \literal{9999} + } + \sort[direction=descending]{ + \field{month} + } + \sort[direction=descending]{ + \field{day} + } + \sort[direction=descending]{ + \field{hour} + } + \sort[direction=descending]{ + \field{minute} + } + \sort[direction=descending]{ + \field{second} + } + \sort{ + \field{sortname} + \field{author} + \field{editor} + \field{translator} + \field{sorttitle} + \field{title} + } + \sort{ + \field{sorttitle} + \field{title} + } +} + % ------------------------------------------------------------------ % DATA INHERITANCE (CROSSREF) % ------------------------------------------------------------------ diff --git a/tex/latex/biblatex/biblatex.sty b/tex/latex/biblatex/biblatex.sty index d818b2d74..5e4345a19 100644 --- a/tex/latex/biblatex/biblatex.sty +++ b/tex/latex/biblatex/biblatex.sty @@ -370,21 +370,11 @@ \toggletrue{blx@tempa}% % kernel definition \patchcmd\addtocontents - {\let\glossary\@gobble} - {\let\glossary\@gobble - \blx@contentssafe@citecommands} + {\let} + {\blx@contentssafe@citecommands + \let} {} - {\togglefalse{blx@tempa}}% - % try tag.sto's definition - \iftoggle{blx@tempa} - {} - {\patchcmd\addtocontents - {\let\glossary\Gobble} - {\let\glossary\Gobble - \blx@contentssafe@citecommands} - {} - {% give up - \blx@err@patch{\string\addtocontents}}}% + {\blx@err@patch{\string\addtocontents}}% % patch footnote \toggletrue{blx@tempa}% \def\do#1{% @@ -1295,7 +1285,7 @@ \undef\blx@do \undef\blx@done} -% {}{} => matches in +% {}{} => elements of that are in \protected\def\blx@filter#1#2{% \def\do##1{% \ifinlistcs{##1}{#2} @@ -1320,7 +1310,7 @@ {}}% \blx@runfilter#1} -% {}{} => neg. matches in +% {}{} => elements of that are not in \protected\def\blx@notfilter#1#2{% \def\do##1{% \ifinlistcs{##1}{#2} @@ -10944,6 +10934,8 @@ \blx@key@bibnote{\blx@theprenote}{#1}} \blx@kv@defkey{blx@bbc}{prenote}{% \blx@key@bibnote{\blx@theprenote}{#1}} +\blx@kv@defkey{blx@bhd}{prenote}{% + \blx@key@bibnote{\blx@theprenote}{#1}} \let\blx@default@thepostnote\@empty \blx@kv@defkey{blx@bibdefaults}{postnote}{% @@ -10958,7 +10950,8 @@ \blx@key@bibnote{\blx@thepostnote}{#1}} \blx@kv@defkey{blx@bbc}{postnote}{% \blx@key@bibnote{\blx@thepostnote}{#1}} - +\blx@kv@defkey{blx@bhd}{postnote}{% + \blx@key@bibnote{\blx@thepostnote}{#1}} \blx@kv@defkey{blx@bibdefaults}{locallabelwidth}{% \blx@key@locallabelwidth{#1}} @@ -11011,12 +11004,16 @@ \def\blx@printbibheading[#1]{% \let\blx@theheading\blx@default@theheading \let\blx@thetitle\blx@default@thetitle + \let\blx@theprenote\blx@default@theprenote + \let\blx@thepostnote\blx@default@thepostnote \undef\blx@thelabel \blx@safe@actives \blx@kv@setkeys{blx@bhd}{#1}% \blx@rest@actives \blx@bibheading\blx@theheading\blx@thetitle \blx@biblabel\blx@thelabel + \blx@bibnote\blx@theprenote + \blx@bibnote\blx@thepostnote \endgroup} % We use this to determine whether an explicit value for resetnumbers is passed to @@ -11240,7 +11237,8 @@ \blx@locallabelwidth@finish \endgroup \blx@bibnote\blx@thepostnote - \endgroup} + \expandafter\endgroup\if@endpe\@doendpe\fi + \par} \def\blx@bibheading#1#2{% \begingroup @@ -11590,8 +11588,9 @@ \blx@locallabelwidth@finish \endgroup \blx@bibnote\blx@thepostnote - \endgroup - \if@restonecol\twocolumn\fi} + \expandafter\endgroup\if@endpe\@doendpe\fi + \if@restonecol\twocolumn\fi + \par} % {} \newrobustcmd*{\AtBeginBiblist}[1]{\csgappto{blx@hook@biblistinit@#1}} diff --git a/tex/latex/biblatex/blx-dm.def b/tex/latex/biblatex/blx-dm.def index efd252ec2..45bcf5ed7 100644 --- a/tex/latex/biblatex/blx-dm.def +++ b/tex/latex/biblatex/blx-dm.def @@ -187,7 +187,10 @@ ) and not test {\ifinlistcs{##1}{blx@datamodel@lists}}} - {\listcsgadd{blx@datamodel@lists}{##1}} + {\listcsgadd{blx@datamodel@lists}{##1}% + \ifcsstring{blx@dm@datatype}{uri} + {\listcsgadd{blx@datamodel@lists}{##1raw}} % URL lists need a raw variant + {}} {}% \ifboolexpr{% add to list of fields unless certain type/datatype etc. bool {dmskipout} diff --git a/tex/latex/biblatex/lbx/catalan.lbx b/tex/latex/biblatex/lbx/catalan.lbx index 82cf0edd0..cd968410c 100644 --- a/tex/latex/biblatex/lbx/catalan.lbx +++ b/tex/latex/biblatex/lbx/catalan.lbx @@ -548,7 +548,7 @@ patentde = {{patent alemana}{pat\adddot\ al\adddot}}, patenteu = {{patent europea}{pat\adddot\ eur\adddot}}, patentfr = {{patent francesa}{pat\adddot\ fr\adddot}}, - patentuk = {{patent brit\`anica}{pat\adddot\ brit\adddot\adddot}}, + patentuk = {{patent brit\`anica}{pat\adddot\ brit\adddot}}, patentus = {{patent estatunidenca}{pat\adddot\ EUA}}, patreq = {{so\l.licitud de patent}{so\l.l\adddotspace de pat\adddot}}, patreqde = {{so\l.licitud de patent alemana}{so\l.l\adddotspace de pat\adddot\ al\adddot}}, @@ -569,23 +569,23 @@ summer = {{estiu}{est\adddot}}, autumn = {{tardor}{tard\adddot}}, winter = {{hivern}{hiv\adddot}}, -% 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 = {{primavera boreal}{prim\adddotspace bor\adddot}}, + summerN = {{estiu boreal}{est\adddotspace bor\adddot}}, + autumnN = {{tardor boreal}{tard\adddotspace bor\adddot}}, + winterN = {{hivern boreal}{hivern\adddotspace bor\adddot}}, + springS = {{primavera austral}{prim\adddotspace aus\adddot}}, + summerS = {{estiu austral}{est\adddotspace aus\adddot}}, + autumnS = {{tardor austral}{tard\adddotspace aus\adddot}}, + winterS = {{hivern austral}{hiv\adddotspace aus\adddot}}, + Q1 = {{primer trimestre}{1r\adddotspace trim\adddot}}, + Q2 = {{segon trimestre}{2n\adddotspace trim\adddot}}, + Q3 = {{tercer trimestre}{3r\adddotspace trim\adddot}}, + Q4 = {{quart trimestre}{4t\adddotspace trim\adddot}}, + QD1 = {{primer quadrimestre}{1r\adddotspace quad\adddot}}, + QD2 = {{segon quadrimestre}{2n\adddotspace quad\adddot}}, + QD3 = {{tercer quadrimestre}{3r\adddotspace quad\adddot}}, + S1 = {{primer semestre}{1r\adddotspace sem\adddot}}, + S2 = {{segon semestre}{2n\adddotspace sem\adddot}}, am = {{a\adddotspace m\adddot}{a\adddotspace m\adddot}}, pm = {{p\adddotspace m\adddot}{p\adddotspace m\adddot}}, } diff --git a/tex/latex/biblatex/lbx/dutch.lbx b/tex/latex/biblatex/lbx/dutch.lbx index 89339eae7..6dd1cb633 100644 --- a/tex/latex/biblatex/lbx/dutch.lbx +++ b/tex/latex/biblatex/lbx/dutch.lbx @@ -379,9 +379,9 @@ inpreparation = {{in voorbereiding}{in voorbereiding}}, submitted = {{ingediend}{ingedied}}, % forthcoming = {{onderweg}{onderweg}},% FIXME: check - inpress = {{in druk}{in druk}}, + inpress = {{ter\space perse}{ter\space perse}}, prepublished = {{voorpublicatie}{voorpublicatie}}, - nodate = {{geen\space datum}{{}g\adddot d\adddot}}, + nodate = {{zonder\space datum}{{}z\adddot d\adddot}}, page = {{pagina}{p\adddot}}, pages = {{pagina's}{p\adddot}}, column = {{kolom}{kol\adddot}}, @@ -545,28 +545,28 @@ beforecommonera = {{v\'o\'or gewone jaartelling}{v\adddot g\adddot j\adddot}}, annodomini = {{na Christus}{n\adddot Chr\adddot}}, beforechrist = {{voor Christus}{v\adddot Chr\adddot}}, -% circa = {{}{}},% FIXME: missing -% spring = {{}{}},% FIXME: missing -% summer = {{}{}},% FIXME: missing -% autumn = {{}{}},% FIXME: missing -% winter = {{}{}},% FIXME: missing -% 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 + % circa = {{}{}},% FIXME: missing + spring = {{voorjaar}{voorjaar}}, + summer = {{zomer}{zomer}}, + autumn = {{herfst}{herfst}}, + winter = {{winter}{winter}}, + springN = {{voorjaar (noordelijk halfrond)}{voorjaar (noordelijk halfrond)}}, + summerN = {{zomer (noordelijk halfrond)}{zomer (noordelijk halfrond)}}, + autumnN = {{herfst (noordelijk halfrond)}{herfst (noordelijk halfrond)}}, + winterN = {{winter (noordelijk halfrond)}{winter (noordelijk halfrond)}}, + springS = {{voorjaar (zuidelijk halfrond)}{voorjaar (zuidelijk halfrond)}}, + summerS = {{zomer (zuidelijk halfrond)}{zomer (zuidelijk halfrond)}}, + autumnS = {{herfst (zuidelijk halfrond)}{herfst (zuidelijk halfrond)}}, + winterS = {{winter (zuidelijk halfrond)}{winter (zuidelijk halfrond)}}, + Q1 = {{eerste kwartaal}{eerste kwartaal}}, + Q2 = {{tweede kwartaal}{tweede kwartaal}}, + Q3 = {{derde kwartaal}{derde kwartaal}}, + Q4 = {{vierde kwartaal}{vierde kwartaal}}, + QD1 = {{eerste tertaal}{eerste tertaal}}, + QD2 = {{tweede tertaal}{tweede tertaal}}, + QD3 = {{derde tertaal}{derde tertaal}}, + S1 = {{eerste semester}{eerste semester}}, + S2 = {{tweede semester}{tweede semester}}, am = {{a\adddot m\adddot}{a\adddot m\adddot}}, pm = {{p\adddot m\adddot}{p\adddot m\adddot}}, } diff --git a/tex/latex/biblatex/lbx/italian.lbx b/tex/latex/biblatex/lbx/italian.lbx index bb9ae4add..2cdd14baa 100644 --- a/tex/latex/biblatex/lbx/italian.lbx +++ b/tex/latex/biblatex/lbx/italian.lbx @@ -349,14 +349,14 @@ % thiscite = {{}{}},% FIXME: missing seenote = {{vedi nota}{v\adddotspace nota}}, quotedin = {{citato da}{cit\adddotspace da}}, - idem = {{idem}{idem}}, - idemsm = {{idem}{idem}}, - idemsf = {{eadem}{eadem}}, - idemsn = {{idem}{idem}}, - idempm = {{eidem}{eidem}}, - idempf = {{eaedem}{eaedem}}, - idempn = {{eadem}{eadem}}, - idempp = {{eidem}{eidem}}, + idem = {{idem}{id\adddot}}, + idemsm = {{idem}{id\adddot}}, + idemsf = {{eadem}{ead\adddot}}, + idemsn = {{idem}{id\adddot}}, + idempm = {{eidem}{eid\adddot}}, + idempf = {{eaedem}{eaed\adddot}}, + idempn = {{eadem}{ead\adddot}}, + idempp = {{eidem}{eid\adddot}}, ibidem = {{ibidem}{ibid\adddot}}, opcit = {{cit\adddot}{cit\adddot}}, loccit = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}}, diff --git a/tex/latex/biblatex/lbx/lithuanian.lbx b/tex/latex/biblatex/lbx/lithuanian.lbx index 07482617f..0c38bfe80 100644 --- a/tex/latex/biblatex/lbx/lithuanian.lbx +++ b/tex/latex/biblatex/lbx/lithuanian.lbx @@ -465,8 +465,8 @@ sectiontotals = {{paragrafai}{paragr\adddot}}, paragraphtotal = {{pastraipa}{pastr\adddot}}, paragraphtotals = {{pastraipos}{pastr\adddot}}, - in = {{in}{in}}, -% inseries = {{}{}},%or in + in = {{iš}{iš}}, +% inseries = {{}{}},%or iš ofseries = {{iš}{iš}}, number = {{numeris}{Nr\adddot}}, chapter = {{skyrius}{sk\adddot}},