From c3a329c190ed6858780c5e5fc4ffeccb5841bea9 Mon Sep 17 00:00:00 2001 From: moewew Date: Fri, 7 Apr 2023 08:21:31 +0200 Subject: [PATCH 01/19] Add prenote and postnote to \printbibheading (#1278) --- doc/latex/biblatex/biblatex.tex | 2 +- tex/latex/biblatex/biblatex.sty | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/latex/biblatex/biblatex.tex b/doc/latex/biblatex/biblatex.tex index 16d84fbbb..eee8f1cf5 100644 --- a/doc/latex/biblatex/biblatex.tex +++ b/doc/latex/biblatex/biblatex.tex @@ -3886,7 +3886,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} diff --git a/tex/latex/biblatex/biblatex.sty b/tex/latex/biblatex/biblatex.sty index e186bd445..876f67ec9 100644 --- a/tex/latex/biblatex/biblatex.sty +++ b/tex/latex/biblatex/biblatex.sty @@ -9588,6 +9588,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}{% @@ -9602,7 +9604,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}} @@ -9655,12 +9658,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 From 03ac7b2440c00b2996501948648a905a8cc3501c Mon Sep 17 00:00:00 2001 From: moewew Date: Fri, 28 Apr 2023 09:33:12 +0200 Subject: [PATCH 02/19] Add Italian idem abbreviations (#1280) --- tex/latex/biblatex/lbx/italian.lbx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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}}, From 7273971b5f46311ac8cd8519e9067c3f13fd81fc Mon Sep 17 00:00:00 2001 From: plk Date: Sun, 14 May 2023 16:52:33 +0200 Subject: [PATCH 03/19] Better doc for filter comments --- tex/latex/biblatex/biblatex.sty | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tex/latex/biblatex/biblatex.sty b/tex/latex/biblatex/biblatex.sty index e186bd445..ac81bc93a 100644 --- a/tex/latex/biblatex/biblatex.sty +++ b/tex/latex/biblatex/biblatex.sty @@ -1169,7 +1169,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} @@ -1194,7 +1194,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} From 87e29698dd55876aad48e46e3b5f630a307e899e Mon Sep 17 00:00:00 2001 From: moewew Date: Sun, 30 Apr 2023 09:04:34 +0200 Subject: [PATCH 04/19] Call \@doendpe in end code for \printbibliography (#1279) and \printbiblist. Also add an explicit \par. Document \par change --- doc/latex/biblatex/CHANGES.md | 12 ++++++++++-- tex/latex/biblatex/biblatex.sty | 8 +++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/doc/latex/biblatex/CHANGES.md b/doc/latex/biblatex/CHANGES.md index a11eb118d..f55d9676f 100644 --- a/doc/latex/biblatex/CHANGES.md +++ b/doc/latex/biblatex/CHANGES.md @@ -1,8 +1,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/tex/latex/biblatex/biblatex.sty b/tex/latex/biblatex/biblatex.sty index 643612ded..3b9a5b9eb 100644 --- a/tex/latex/biblatex/biblatex.sty +++ b/tex/latex/biblatex/biblatex.sty @@ -9891,7 +9891,8 @@ \blx@locallabelwidth@finish \endgroup \blx@bibnote\blx@thepostnote - \endgroup} + \expandafter\endgroup\if@endpe\@doendpe\fi + \par} \def\blx@bibheading#1#2{% \begingroup @@ -10241,8 +10242,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}} From 1f7e3db1193badfae79800b6d9df203082cc87cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20Puk=C5=A1ta?= <54238857+yjhn@users.noreply.github.com> Date: Mon, 12 Jun 2023 11:13:25 +0300 Subject: [PATCH 05/19] Better lithuanian translation for 'in' --- tex/latex/biblatex/lbx/lithuanian.lbx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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}}, From c7ec93a46a0a93f29d8e963bf96f1fd5dde1be16 Mon Sep 17 00:00:00 2001 From: moewew Date: Tue, 13 Jun 2023 15:36:41 +0200 Subject: [PATCH 06/19] Simplify \addtocontents patch (#1205) --- tex/latex/biblatex/biblatex.sty | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/tex/latex/biblatex/biblatex.sty b/tex/latex/biblatex/biblatex.sty index 3b9a5b9eb..b3ad31c3f 100644 --- a/tex/latex/biblatex/biblatex.sty +++ b/tex/latex/biblatex/biblatex.sty @@ -340,21 +340,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{% From 2e28b00da5f069a2f2884b3f0918fbcc9ab6c35f Mon Sep 17 00:00:00 2001 From: moewew Date: Tue, 13 Jun 2023 16:11:15 +0200 Subject: [PATCH 07/19] Update testfiles for \newlabel change --- testfiles/pdftex/94-labelprefix.tlg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 858cdd976de9f237a498b1ee22d8e4ef96c017a2 Mon Sep 17 00:00:00 2001 From: plk Date: Wed, 14 Jun 2023 12:32:19 +0200 Subject: [PATCH 08/19] Fix for #1289 --- doc/latex/biblatex/biblatex.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/latex/biblatex/biblatex.tex b/doc/latex/biblatex/biblatex.tex index eee8f1cf5..525174d85 100644 --- a/doc/latex/biblatex/biblatex.tex +++ b/doc/latex/biblatex/biblatex.tex @@ -1437,7 +1437,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. From 60accecccf8dd8e22bfb3aa79c22cb061e0f66c8 Mon Sep 17 00:00:00 2001 From: sebasvila Date: Fri, 7 Jul 2023 17:53:32 +0200 Subject: [PATCH 09/19] Update catalan.lbx Localize new strings and catch some typos. --- tex/latex/biblatex/lbx/catalan.lbx | 36 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) 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}}, } From 9fb2d4bdab454daedec0cd96f0fa491b2437366a Mon Sep 17 00:00:00 2001 From: moewew Date: Thu, 20 Jul 2023 18:01:59 +0200 Subject: [PATCH 10/19] Add hint about MakeSentenceCase description to bibtexcaseprotection option --- doc/latex/biblatex/biblatex.tex | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/latex/biblatex/biblatex.tex b/doc/latex/biblatex/biblatex.tex index 525174d85..9b3c5503e 100644 --- a/doc/latex/biblatex/biblatex.tex +++ b/doc/latex/biblatex/biblatex.tex @@ -2601,7 +2601,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} From 201e680aedbd9a52f53bcf4c4cbca1818a8228e4 Mon Sep 17 00:00:00 2001 From: plk Date: Tue, 1 Aug 2023 16:24:42 +0200 Subject: [PATCH 11/19] Added full date sorting templates --- doc/latex/biblatex/biblatex.tex | 12 +- tex/latex/biblatex/biblatex.def | 308 ++++++++++++++++++++++++++++++++ 2 files changed, 319 insertions(+), 1 deletion(-) diff --git a/doc/latex/biblatex/biblatex.tex b/doc/latex/biblatex/biblatex.tex index 525174d85..b710edb8a 100644 --- a/doc/latex/biblatex/biblatex.tex +++ b/doc/latex/biblatex/biblatex.tex @@ -2112,18 +2112,25 @@ \subsubsection{Preamble Options} \begin{optionlist} -\optitem[nty]{sorting}{\opt{nty}, \opt{nyt}, \opt{nyvt}, \opt{anyt}, \opt{anyvt}, \opt{ynt}, \opt{ydnt}, \opt{none}, \opt{count}, \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. @@ -3487,6 +3494,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} @@ -14973,6 +14982,7 @@ \section{Revision History} \begin{changelog} \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/tex/latex/biblatex/biblatex.def b/tex/latex/biblatex/biblatex.def index 4a4a75d48..54ea7c23e 100644 --- a/tex/latex/biblatex/biblatex.def +++ b/tex/latex/biblatex/biblatex.def @@ -1530,6 +1530,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} @@ -1559,6 +1603,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} @@ -1588,6 +1676,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} @@ -1620,6 +1752,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} @@ -1652,6 +1831,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} @@ -1678,6 +1904,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} @@ -1704,6 +1971,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) % ------------------------------------------------------------------ From 47bbdd7a60f72a04b6d57340b37681628c6a4b62 Mon Sep 17 00:00:00 2001 From: plk Date: Sat, 26 Aug 2023 11:57:56 +0200 Subject: [PATCH 12/19] Minor doc clarification --- doc/latex/biblatex/biblatex.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/latex/biblatex/biblatex.tex b/doc/latex/biblatex/biblatex.tex index 03a9bc6c1..fae1e26e4 100644 --- a/doc/latex/biblatex/biblatex.tex +++ b/doc/latex/biblatex/biblatex.tex @@ -3932,7 +3932,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 From 2b78737ac0eb5a9eca9b8e8edfab58facc436c4a Mon Sep 17 00:00:00 2001 From: plk Date: Sat, 2 Sep 2023 15:52:04 +0200 Subject: [PATCH 13/19] Fix for plk/biblatex-apa#215 --- tex/latex/biblatex/lbx/dutch.lbx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tex/latex/biblatex/lbx/dutch.lbx b/tex/latex/biblatex/lbx/dutch.lbx index 89339eae7..1ca7b35c5 100644 --- a/tex/latex/biblatex/lbx/dutch.lbx +++ b/tex/latex/biblatex/lbx/dutch.lbx @@ -415,7 +415,7 @@ datacd = {{cd-rom}{cd-rom}}, audiocd = {{audio-cd}{audio-cd}}, and = {{en}{en}}, - andothers = {{en andere}{e\adddot a\adddot}}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, andmore = {{en andere}{e\adddot a\adddot}}, url = {{adres}{adres}}, urlfrom = {{beschikbaar op}{beschikbaar op}}, From 7edc74d4a9a72d03b67a9ecb0588fbcd3ba6e837 Mon Sep 17 00:00:00 2001 From: plk Date: Sat, 2 Sep 2023 15:53:53 +0200 Subject: [PATCH 14/19] Fix for plk/biblatex-apa#216 --- tex/latex/biblatex/lbx/dutch.lbx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tex/latex/biblatex/lbx/dutch.lbx b/tex/latex/biblatex/lbx/dutch.lbx index 1ca7b35c5..e8f92a412 100644 --- a/tex/latex/biblatex/lbx/dutch.lbx +++ b/tex/latex/biblatex/lbx/dutch.lbx @@ -379,7 +379,7 @@ 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}}, page = {{pagina}{p\adddot}}, From 18d4d742d567c7da9901815a27f742b81373b454 Mon Sep 17 00:00:00 2001 From: plk Date: Sat, 2 Sep 2023 15:55:21 +0200 Subject: [PATCH 15/19] Fix for plk/biblatex-apa#217 --- tex/latex/biblatex/lbx/dutch.lbx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tex/latex/biblatex/lbx/dutch.lbx b/tex/latex/biblatex/lbx/dutch.lbx index e8f92a412..260bc3278 100644 --- a/tex/latex/biblatex/lbx/dutch.lbx +++ b/tex/latex/biblatex/lbx/dutch.lbx @@ -381,7 +381,7 @@ % forthcoming = {{onderweg}{onderweg}},% FIXME: check 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}}, From 33e58a6c4715fa61882c239e82b955bde44905e9 Mon Sep 17 00:00:00 2001 From: plk Date: Sun, 3 Sep 2023 12:09:41 +0200 Subject: [PATCH 16/19] Fix for plk/biblatex-apa#224 --- tex/latex/biblatex/lbx/dutch.lbx | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/tex/latex/biblatex/lbx/dutch.lbx b/tex/latex/biblatex/lbx/dutch.lbx index 260bc3278..79ac7241c 100644 --- a/tex/latex/biblatex/lbx/dutch.lbx +++ b/tex/latex/biblatex/lbx/dutch.lbx @@ -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}}, } From ec47b8ad0a56d0148e03ec340434a007ee378aed Mon Sep 17 00:00:00 2001 From: plk Date: Sun, 3 Sep 2023 13:52:31 +0200 Subject: [PATCH 17/19] Reverting andother in Dutch --- tex/latex/biblatex/lbx/dutch.lbx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tex/latex/biblatex/lbx/dutch.lbx b/tex/latex/biblatex/lbx/dutch.lbx index 79ac7241c..6dd1cb633 100644 --- a/tex/latex/biblatex/lbx/dutch.lbx +++ b/tex/latex/biblatex/lbx/dutch.lbx @@ -415,7 +415,7 @@ datacd = {{cd-rom}{cd-rom}}, audiocd = {{audio-cd}{audio-cd}}, and = {{en}{en}}, - andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + andothers = {{en andere}{e\adddot a\adddot}}, andmore = {{en andere}{e\adddot a\adddot}}, url = {{adres}{adres}}, urlfrom = {{beschikbaar op}{beschikbaar op}}, From a602543ece9933a6e235b5c287d11534f5c82bfe Mon Sep 17 00:00:00 2001 From: plk Date: Sun, 3 Sep 2023 14:24:04 +0200 Subject: [PATCH 18/19] Fix for #1304 --- tex/latex/biblatex/blx-dm.def | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tex/latex/biblatex/blx-dm.def b/tex/latex/biblatex/blx-dm.def index 3c44827fb..ca101535f 100644 --- a/tex/latex/biblatex/blx-dm.def +++ b/tex/latex/biblatex/blx-dm.def @@ -182,7 +182,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}} + {}} {}% \ifboolexpr{% add to list of fields unless certain type/datatype etc. bool {dmskipout} From 255cbcfc76d30cdb74aea48a9409d2018177d225 Mon Sep 17 00:00:00 2001 From: plk Date: Sun, 3 Sep 2023 14:57:42 +0200 Subject: [PATCH 19/19] raw URI lists need data model support --- tex/latex/biblatex/blx-dm.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tex/latex/biblatex/blx-dm.def b/tex/latex/biblatex/blx-dm.def index ca101535f..9ab7319ba 100644 --- a/tex/latex/biblatex/blx-dm.def +++ b/tex/latex/biblatex/blx-dm.def @@ -184,7 +184,7 @@ not test {\ifinlistcs{##1}{blx@datamodel@lists}}} {\listcsgadd{blx@datamodel@lists}{##1}% \ifcsstring{blx@dm@datatype}{uri} - {\listcsgadd{blx@datamodel@lists}{##1raw}} + {\listcsgadd{blx@datamodel@lists}{##1raw}} % URL lists need a raw variant {}} {}% \ifboolexpr{% add to list of fields unless certain type/datatype etc.