From 37226b532beb16459f83818251d6d28c16ae3b10 Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Sun, 19 Feb 2023 17:33:36 -0300 Subject: [PATCH 01/21] Add comment about new measuring bool for tabularray --- postnotes.dtx | 6 ++++++ postnotes.tex | 1 + 2 files changed, 7 insertions(+) diff --git a/postnotes.dtx b/postnotes.dtx index f2b5fbb..8b3e407 100644 --- a/postnotes.dtx +++ b/postnotes.dtx @@ -2457,6 +2457,12 @@ % \pkg{tabularray} a trial/measure pass from the final one. So we use % \cs{@@_verify_multipass:N} for it. % +% See, however, \url{https://tex.stackexchange.com/q/675818} and +% \url{https://github.com/lvjr/tabularray/issues/179} (thanks +% \contributor{Ulrike Fischer}). In sum, there's a not yet released new +% boolean \cs{lTblrMeasuringBool} provided by \pkg{tabularray}, use it when it +% comes. +% % \begin{macrocode} \AddToHook { package/tabularray/after } { diff --git a/postnotes.tex b/postnotes.tex index 72e9c6b..0be7d50 100644 --- a/postnotes.tex +++ b/postnotes.tex @@ -965,6 +965,7 @@ \section{Acknowledgments} % 2022-03-31: https://github.com/latex3/hyperref/issues/230 % 2022-04-09: https://github.com/latex3/hyperref/issues/229 % 2023-02-10: https://chat.stackexchange.com/transcript/message/62955941#62955941 (and discussion) + % 2023-02-19: https://tex.stackexchange.com/q/675818#comment1678904_675818 David Carlisle, % 2022-03-28: https://chat.stackexchange.com/transcript/message/60754383#60754383 % 2022-04-08: https://tex.stackexchange.com/a/640035 (comments) From a2fc13c89ce763f7792b3d1f290b18e4c7e35d0a Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Tue, 21 Feb 2023 10:17:46 -0300 Subject: [PATCH 02/21] Update change log --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b626145..4390771 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.2.2...HEAD) +### Fixed +- Don't apply fix for "perhaps a missing \item" error for option + `listenv=none`. + ## [v0.2.2](https://github.com/gusbrs/postnotes/compare/v0.2.1...v0.2.2) (2023-02-15) ### Fixed From e3fe68c8ddd1ea1896ccb4fe12fde7d0f5249e0e Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Tue, 21 Feb 2023 10:18:52 -0300 Subject: [PATCH 03/21] Step release tag --- CHANGELOG.md | 4 +++- build.lua | 2 +- ctan-announcement.text | 9 +++------ postnotes.dtx | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4390771..54cc0ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog -## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.2.2...HEAD) +## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.2.3...HEAD) + +## [v0.2.3](https://github.com/gusbrs/postnotes/compare/v0.2.2...v0.2.3) (2023-02-21) ### Fixed - Don't apply fix for "perhaps a missing \item" error for option diff --git a/build.lua b/build.lua index 032753c..9aae4c1 100644 --- a/build.lua +++ b/build.lua @@ -56,7 +56,7 @@ asciiengines = {} -- CTAN upload settings uploadconfig = { - version = "0.2.2", -- first line for tagging + version = "0.2.3", -- first line for tagging pkg = "postnotes", author = "Gustavo Barros", uploader = "Gustavo Barros", diff --git a/ctan-announcement.text b/ctan-announcement.text index be85495..b2a52d8 100644 --- a/ctan-announcement.text +++ b/ctan-announcement.text @@ -1,9 +1,6 @@ -## v0.2.2 (2023-02-15) +## v0.2.3 (2023-02-21) ### Fixed -- Don't try to hyperlink `\postnotezref` when `zref-hyperref` is not loaded. -- "perhaps a missing \item" error for empty `\postnote`. - -### Changed -- Renamed `postnotes/print/eachnote` hook to `postnotes/print/note/begin`. +- Don't apply fix for "perhaps a missing \item" error for option + `listenv=none`. diff --git a/postnotes.dtx b/postnotes.dtx index 8b3e407..edf129e 100644 --- a/postnotes.dtx +++ b/postnotes.dtx @@ -153,7 +153,7 @@ % % % \begin{macrocode} -\ProvidesExplPackage {postnotes} {2023-02-15} {0.2.2} +\ProvidesExplPackage {postnotes} {2023-02-21} {0.2.3} {Endnotes for LaTeX} % \end{macrocode} % From 030f837e18b844c8655bb0c0a5d77cebeaa95443 Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Thu, 2 Mar 2023 09:27:43 -0300 Subject: [PATCH 04/21] Typo --- postnotes.dtx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postnotes.dtx b/postnotes.dtx index edf129e..fca28ce 100644 --- a/postnotes.dtx +++ b/postnotes.dtx @@ -700,7 +700,7 @@ % offers a boolean to indicate when it is a measuring pass; \pkg{csquotes} % offers further handles. But the standard \cs{caption} offers none, and % neither does \pkg{amsmath}'s \cs{text} macro. Well, the pkg{caption} -% package has can disable the multiple passes for \cs{caption} with the option +% package can disable the multiple passes for \cs{caption} with the option % \opt{singlelinecheck}, but it is not reasonable to require it for our % purposes, so we must assume the worst case. % From 4af19a70ad4d89ac8d51fa528cc88246ac178c74 Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Thu, 2 Mar 2023 09:34:16 -0300 Subject: [PATCH 05/21] Use new tabularray measuring bool --- postnotes.dtx | 53 +++++++++---- .../pn-compat-tabularray01.lvt | 0 .../pn-compat-tabularray01.tlg | 78 ++++--------------- .../pn-compat-tabularray01.xetex.tlg | 78 ++++--------------- 4 files changed, 69 insertions(+), 140 deletions(-) rename {testfiles-3runs => testfiles}/pn-compat-tabularray01.lvt (100%) rename {testfiles-3runs => testfiles}/pn-compat-tabularray01.tlg (76%) rename {testfiles-3runs => testfiles}/pn-compat-tabularray01.xetex.tlg (73%) diff --git a/postnotes.dtx b/postnotes.dtx index fca28ce..03cd5f2 100644 --- a/postnotes.dtx +++ b/postnotes.dtx @@ -2453,24 +2453,49 @@ % % \subsection*{\pkg{tabularray}} % -% I've tried, but I could not find any ``handle'' to distinguish in -% \pkg{tabularray} a trial/measure pass from the final one. So we use -% \cs{@@_verify_multipass:N} for it. -% -% See, however, \url{https://tex.stackexchange.com/q/675818} and -% \url{https://github.com/lvjr/tabularray/issues/179} (thanks -% \contributor{Ulrike Fischer}). In sum, there's a not yet released new -% boolean \cs{lTblrMeasuringBool} provided by \pkg{tabularray}, use it when it -% comes. -% % \begin{macrocode} \AddToHook { package/tabularray/after } { - \clist_map_inline:nn - { tblr , longtblr , talltblr , booktabs , longtabs , talltabs , +array } +% \end{macrocode} +% Since version \texttt{2023A}, from 2023-03-01, \pkg{tabularray} offers the +% \cs{lTblrMeasuringBool} which is true when measuring and false otherwise. +% See \url{https://tex.stackexchange.com/q/675818} +% and \url{https://github.com/lvjr/tabularray/issues/179} (thanks +% \contributor{Ulrike Fischer}). +% \begin{macrocode} + \bool_if_exist:NTF \lTblrMeasuringBool { - \AddToHook { env/#1/begin } [ postnotes ] - { \bool_set_true:N \l_@@_maybe_multi_bool } +% \end{macrocode} +% I'd be inclined to restrict the inhibition effect to known \pkg{tabularray} +% environments to ``keep things under control''. However this is a dedicated +% and public boolean, and users can create arbitrary new \pkg{tabularray} +% environments with \cs{NewTblrEnviron}, which we either wouldn't catch or +% have to provide an user interface for. So, for the time being, let's trust +% this boolean won't be misused by third-parties or users. +% \begin{macrocode} + \AddToHook { postnotes/note/inhibit } [ postnotes ] + { + \bool_if:NT \lTblrMeasuringBool + { + \bool_set_true:N \l_@@_inhibit_note_bool + \bool_set_true:N \l_@@_print_plain_mark_bool + } + } + } + { +% \end{macrocode} +% If the new boolean is not yet available, we use \cs{@@_verify_multipass:N} +% to distinguish a trial/measure pass from the final one. +% \begin{macrocode} + \clist_map_inline:nn + { + tblr , longtblr , talltblr , booktabs , + longtabs , talltabs , +array + } + { + \AddToHook { env/#1/begin } [ postnotes ] + { \bool_set_true:N \l_@@_maybe_multi_bool } + } } } % \end{macrocode} diff --git a/testfiles-3runs/pn-compat-tabularray01.lvt b/testfiles/pn-compat-tabularray01.lvt similarity index 100% rename from testfiles-3runs/pn-compat-tabularray01.lvt rename to testfiles/pn-compat-tabularray01.lvt diff --git a/testfiles-3runs/pn-compat-tabularray01.tlg b/testfiles/pn-compat-tabularray01.tlg similarity index 76% rename from testfiles-3runs/pn-compat-tabularray01.tlg rename to testfiles/pn-compat-tabularray01.tlg index ccf60c7..a29be76 100644 --- a/testfiles-3runs/pn-compat-tabularray01.tlg +++ b/testfiles/pn-compat-tabularray01.tlg @@ -17,19 +17,11 @@ LaTeX Font Info: External font `cmex10' loaded for size > \box...= \hbox(8.14003+0.0)x4.48613 .\penalty 10000 -.\hbox(0.0+0.0)x0.0 -..\hbox(0.0+0.0)x0.0, shifted -12.0 -...\pdfdest name{postnote.1.mark} xyz -...\penalty 10000 -.\write1{\token_to_str:N \post@note {mark@1}{\thepage }} -.\penalty 10000 -.\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[1 0 0]} action goto name{postnote.1.text} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 ...\OT1/cmr/m/n/7 1 ..\mathoff -.\pdfendlink ! OK. \box @@ -38,19 +30,11 @@ l. ...\end > \box...= \hbox(8.14003+0.0)x4.48613 .\penalty 10000 -.\hbox(0.0+0.0)x0.0 -..\hbox(0.0+0.0)x0.0, shifted -12.0 -...\pdfdest name{postnote.2.mark} xyz -...\penalty 10000 -.\write1{\token_to_str:N \post@note {mark@2}{\thepage }} -.\penalty 10000 -.\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[1 0 0]} action goto name{postnote.2.text} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 ...\OT1/cmr/m/n/7 1 ..\mathoff -.\pdfendlink ! OK. \box @@ -59,19 +43,11 @@ l. ...\end > \box...= \hbox(8.14003+0.0)x4.48613 .\penalty 10000 -.\hbox(0.0+0.0)x0.0 -..\hbox(0.0+0.0)x0.0, shifted -12.0 -...\pdfdest name{postnote.3.mark} xyz -...\penalty 10000 -.\write1{\token_to_str:N \post@note {mark@3}{\thepage }} -.\penalty 10000 -.\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[1 0 0]} action goto name{postnote.3.text} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 2 +...\OT1/cmr/m/n/7 1 ..\mathoff -.\pdfendlink ! OK. \box @@ -80,19 +56,11 @@ l. ...\end > \box...= \hbox(8.14003+0.0)x4.48613 .\penalty 10000 -.\hbox(0.0+0.0)x0.0 -..\hbox(0.0+0.0)x0.0, shifted -12.0 -...\pdfdest name{postnote.4.mark} xyz -...\penalty 10000 -.\write1{\token_to_str:N \post@note {mark@4}{\thepage }} -.\penalty 10000 -.\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[1 0 0]} action goto name{postnote.4.text} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 2 +...\OT1/cmr/m/n/7 1 ..\mathoff -.\pdfendlink ! OK. \box @@ -101,19 +69,11 @@ l. ...\end > \box...= \hbox(8.14003+0.0)x4.48613 .\penalty 10000 -.\hbox(0.0+0.0)x0.0 -..\hbox(0.0+0.0)x0.0, shifted -12.0 -...\pdfdest name{postnote.5.mark} xyz -...\penalty 10000 -.\write1{\token_to_str:N \post@note {mark@5}{\thepage }} -.\penalty 10000 -.\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[1 0 0]} action goto name{postnote.5.text} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 ...\OT1/cmr/m/n/7 1 ..\mathoff -.\pdfendlink ! OK. \box @@ -122,19 +82,11 @@ l. ...\end > \box...= \hbox(8.14003+0.0)x4.48613 .\penalty 10000 -.\hbox(0.0+0.0)x0.0 -..\hbox(0.0+0.0)x0.0, shifted -12.0 -...\pdfdest name{postnote.6.mark} xyz -...\penalty 10000 -.\write1{\token_to_str:N \post@note {mark@6}{\thepage }} -.\penalty 10000 -.\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[1 0 0]} action goto name{postnote.6.text} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 2 +...\OT1/cmr/m/n/7 1 ..\mathoff -.\pdfendlink ! OK. \box @@ -146,11 +98,11 @@ l. ...\end .\penalty 10000 .\hbox(0.0+0.0)x0.0 ..\hbox(0.0+0.0)x0.0, shifted -12.0 -...\pdfdest name{postnote.7.mark} xyz +...\pdfdest name{postnote.1.mark} xyz ...\penalty 10000 -.\write1{\token_to_str:N \post@note {mark@7}{\thepage }} +.\write1{\token_to_str:N \post@note {mark@1}{\thepage }} .\penalty 10000 -.\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[1 0 0]} action goto name{postnote.7.text} +.\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[1 0 0]} action goto name{postnote.1.text} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 @@ -167,11 +119,11 @@ l. ...\end .\penalty 10000 .\hbox(0.0+0.0)x0.0 ..\hbox(0.0+0.0)x0.0, shifted -12.0 -...\pdfdest name{postnote.8.mark} xyz +...\pdfdest name{postnote.2.mark} xyz ...\penalty 10000 -.\write1{\token_to_str:N \post@note {mark@8}{\thepage }} +.\write1{\token_to_str:N \post@note {mark@2}{\thepage }} .\penalty 10000 -.\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[1 0 0]} action goto name{postnote.8.text} +.\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[1 0 0]} action goto name{postnote.2.text} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 @@ -250,10 +202,10 @@ Completed box being shipped out [2] .......\penalty 10000 .......\hbox(0.0+0.0)x0.0 ........\hbox(0.0+0.0)x0.0, shifted -11.0 -.........\pdfdest name{postnote.7.text} xyz +.........\pdfdest name{postnote.1.text} xyz .........\penalty 10000 -.......\write1{\token_to_str:N \post@note {text@7}{\int_use:N \c@page }} -.......\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[1 0 0]} action goto name{postnote.7.mark} +.......\write1{\token_to_str:N \post@note {text@1}{\int_use:N \c@page }} +.......\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[1 0 0]} action goto name{postnote.1.mark} .......\OT1/cmr/m/n/9 1 .......\OT1/cmr/m/n/9 . .......\pdfendlink @@ -281,10 +233,10 @@ Completed box being shipped out [2] .......\penalty 10000 .......\hbox(0.0+0.0)x0.0 ........\hbox(0.0+0.0)x0.0, shifted -11.0 -.........\pdfdest name{postnote.8.text} xyz +.........\pdfdest name{postnote.2.text} xyz .........\penalty 10000 -.......\write1{\token_to_str:N \post@note {text@8}{\int_use:N \c@page }} -.......\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[1 0 0]} action goto name{postnote.8.mark} +.......\write1{\token_to_str:N \post@note {text@2}{\int_use:N \c@page }} +.......\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[1 0 0]} action goto name{postnote.2.mark} .......\OT1/cmr/m/n/9 2 .......\OT1/cmr/m/n/9 . .......\pdfendlink diff --git a/testfiles-3runs/pn-compat-tabularray01.xetex.tlg b/testfiles/pn-compat-tabularray01.xetex.tlg similarity index 73% rename from testfiles-3runs/pn-compat-tabularray01.xetex.tlg rename to testfiles/pn-compat-tabularray01.xetex.tlg index 697d0c0..d769461 100644 --- a/testfiles-3runs/pn-compat-tabularray01.xetex.tlg +++ b/testfiles/pn-compat-tabularray01.xetex.tlg @@ -17,19 +17,11 @@ LaTeX Font Info: External font `cmex10' loaded for size > \box...= \hbox(8.14003+0.0)x4.48613 .\penalty 10000 -.\hbox(0.0+0.0)x0.0 -..\hbox(0.0+0.0)x0.0, shifted -12.0 -...\special{pdf:dest (postnote.1.mark) [@thispage /XYZ @xpos @ypos null]} -...\penalty 10000 -.\write1{\token_to_str:N \post@note {mark@1}{\thepage }} -.\penalty 10000 -.\special{pdf:bann<>>>} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 ...\OT1/cmr/m/n/7 1 ..\mathoff -.\special{pdf:eann} ! OK. \box @@ -38,19 +30,11 @@ l. ...\end > \box...= \hbox(8.14003+0.0)x4.48613 .\penalty 10000 -.\hbox(0.0+0.0)x0.0 -..\hbox(0.0+0.0)x0.0, shifted -12.0 -...\special{pdf:dest (postnote.2.mark) [@thispage /XYZ @xpos @ypos null]} -...\penalty 10000 -.\write1{\token_to_str:N \post@note {mark@2}{\thepage }} -.\penalty 10000 -.\special{pdf:bann<>>>} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 ...\OT1/cmr/m/n/7 1 ..\mathoff -.\special{pdf:eann} ! OK. \box @@ -59,19 +43,11 @@ l. ...\end > \box...= \hbox(8.14003+0.0)x4.48613 .\penalty 10000 -.\hbox(0.0+0.0)x0.0 -..\hbox(0.0+0.0)x0.0, shifted -12.0 -...\special{pdf:dest (postnote.3.mark) [@thispage /XYZ @xpos @ypos null]} -...\penalty 10000 -.\write1{\token_to_str:N \post@note {mark@3}{\thepage }} -.\penalty 10000 -.\special{pdf:bann<>>>} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 2 +...\OT1/cmr/m/n/7 1 ..\mathoff -.\special{pdf:eann} ! OK. \box @@ -80,19 +56,11 @@ l. ...\end > \box...= \hbox(8.14003+0.0)x4.48613 .\penalty 10000 -.\hbox(0.0+0.0)x0.0 -..\hbox(0.0+0.0)x0.0, shifted -12.0 -...\special{pdf:dest (postnote.4.mark) [@thispage /XYZ @xpos @ypos null]} -...\penalty 10000 -.\write1{\token_to_str:N \post@note {mark@4}{\thepage }} -.\penalty 10000 -.\special{pdf:bann<>>>} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 2 +...\OT1/cmr/m/n/7 1 ..\mathoff -.\special{pdf:eann} ! OK. \box @@ -101,19 +69,11 @@ l. ...\end > \box...= \hbox(8.14003+0.0)x4.48613 .\penalty 10000 -.\hbox(0.0+0.0)x0.0 -..\hbox(0.0+0.0)x0.0, shifted -12.0 -...\special{pdf:dest (postnote.5.mark) [@thispage /XYZ @xpos @ypos null]} -...\penalty 10000 -.\write1{\token_to_str:N \post@note {mark@5}{\thepage }} -.\penalty 10000 -.\special{pdf:bann<>>>} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 ...\OT1/cmr/m/n/7 1 ..\mathoff -.\special{pdf:eann} ! OK. \box @@ -122,19 +82,11 @@ l. ...\end > \box...= \hbox(8.14003+0.0)x4.48613 .\penalty 10000 -.\hbox(0.0+0.0)x0.0 -..\hbox(0.0+0.0)x0.0, shifted -12.0 -...\special{pdf:dest (postnote.6.mark) [@thispage /XYZ @xpos @ypos null]} -...\penalty 10000 -.\write1{\token_to_str:N \post@note {mark@6}{\thepage }} -.\penalty 10000 -.\special{pdf:bann<>>>} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 2 +...\OT1/cmr/m/n/7 1 ..\mathoff -.\special{pdf:eann} ! OK. \box @@ -146,11 +98,11 @@ l. ...\end .\penalty 10000 .\hbox(0.0+0.0)x0.0 ..\hbox(0.0+0.0)x0.0, shifted -12.0 -...\special{pdf:dest (postnote.7.mark) [@thispage /XYZ @xpos @ypos null]} +...\special{pdf:dest (postnote.1.mark) [@thispage /XYZ @xpos @ypos null]} ...\penalty 10000 -.\write1{\token_to_str:N \post@note {mark@7}{\thepage }} +.\write1{\token_to_str:N \post@note {mark@1}{\thepage }} .\penalty 10000 -.\special{pdf:bann<>>>} +.\special{pdf:bann<>>>} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 @@ -167,11 +119,11 @@ l. ...\end .\penalty 10000 .\hbox(0.0+0.0)x0.0 ..\hbox(0.0+0.0)x0.0, shifted -12.0 -...\special{pdf:dest (postnote.8.mark) [@thispage /XYZ @xpos @ypos null]} +...\special{pdf:dest (postnote.2.mark) [@thispage /XYZ @xpos @ypos null]} ...\penalty 10000 -.\write1{\token_to_str:N \post@note {mark@8}{\thepage }} +.\write1{\token_to_str:N \post@note {mark@2}{\thepage }} .\penalty 10000 -.\special{pdf:bann<>>>} +.\special{pdf:bann<>>>} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 @@ -250,10 +202,10 @@ Completed box being shipped out [2] .......\penalty 10000 .......\hbox(0.0+0.0)x0.0 ........\hbox(0.0+0.0)x0.0, shifted -11.0 -.........\special{pdf:dest (postnote.7.text) [@thispage /XYZ @xpos @ypos null]} +.........\special{pdf:dest (postnote.1.text) [@thispage /XYZ @xpos @ypos null]} .........\penalty 10000 -.......\write1{\token_to_str:N \post@note {text@7}{\int_use:N \c@page }} -.......\special{pdf:bann<>>>} +.......\write1{\token_to_str:N \post@note {text@1}{\int_use:N \c@page }} +.......\special{pdf:bann<>>>} .......\OT1/cmr/m/n/9 1 .......\OT1/cmr/m/n/9 . .......\special{pdf:eann} @@ -281,10 +233,10 @@ Completed box being shipped out [2] .......\penalty 10000 .......\hbox(0.0+0.0)x0.0 ........\hbox(0.0+0.0)x0.0, shifted -11.0 -.........\special{pdf:dest (postnote.8.text) [@thispage /XYZ @xpos @ypos null]} +.........\special{pdf:dest (postnote.2.text) [@thispage /XYZ @xpos @ypos null]} .........\penalty 10000 -.......\write1{\token_to_str:N \post@note {text@8}{\int_use:N \c@page }} -.......\special{pdf:bann<>>>} +.......\write1{\token_to_str:N \post@note {text@2}{\int_use:N \c@page }} +.......\special{pdf:bann<>>>} .......\OT1/cmr/m/n/9 2 .......\OT1/cmr/m/n/9 . .......\special{pdf:eann} From e632eeb0f7d6e8f68872d4e84224f6c99604dfe4 Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Thu, 2 Mar 2023 11:49:19 -0300 Subject: [PATCH 06/21] Ensure proper measuring in contexts which restore counter values --- postnotes.dtx | 49 ++++++++++++++----- testfiles-3runs/pn-compat-amsmath01.tlg | 18 +++---- testfiles-3runs/pn-compat-amsmath01.xetex.tlg | 18 +++---- testfiles/pn-compat-csquotes01.lvt | 7 ++- testfiles/pn-compat-csquotes01.tlg | 49 ++++++++++++------- testfiles/pn-compat-csquotes01.xetex.tlg | 49 ++++++++++++------- testfiles/pn-compat-tabularray01.tlg | 6 +-- testfiles/pn-compat-tabularray01.xetex.tlg | 6 +-- testfiles/pn-compat-tabularx01.tlg | 8 +-- testfiles/pn-compat-tabularx01.xetex.tlg | 8 +-- 10 files changed, 135 insertions(+), 83 deletions(-) diff --git a/postnotes.dtx b/postnotes.dtx index 03cd5f2..6ab2e47 100644 --- a/postnotes.dtx +++ b/postnotes.dtx @@ -932,36 +932,50 @@ % conditional, obviously, will always return the true branch unless % something is done in the \texttt{postnotes/note/inhibit} hook. This hook % is meant to handle support for packages or features which may justify note -% inhibition, and the code there should set \cs{l_@@_inhibit_note_bool} and -% \cs{l_@@_print_plain_mark_bool} as appropriate to the case. +% inhibition, and the code there should set \cs{l_@@_inhibit_note_bool}, +% \cs{l_@@_print_plain_mark_bool} and +% \cs{l_@@_print_plain_mark_stepcounter_bool} as appropriate to the case. % \begin{macrocode} \bool_new:N \l_@@_inhibit_note_bool \bool_new:N \l_@@_print_plain_mark_bool +\bool_new:N \l_@@_print_plain_mark_stepcounter_bool \NewHook { postnotes/note/inhibit } \prg_new_protected_conditional:Npnn \@@_inhibit_note: { F } { \bool_set_false:N \l_@@_inhibit_note_bool \bool_set_false:N \l_@@_print_plain_mark_bool + \bool_set_false:N \l_@@_print_plain_mark_stepcounter_bool \UseHook { postnotes/note/inhibit } % \end{macrocode} % Printing a plain mark here may be needed because, if we are inhibiting the % note in a ``measuring context'' and omit it completely, the measuring being % performed will be off by the size of the mark. So, to ensure the measuring -% can be done correctly, we place the mark. Since we'd only print this mark -% in case of inhibition, when we don't actually step the counter, to typeset -% correctly the mark that would be printed if the counter had been stepped, we -% increment \cs{c@postnote} locally and grouped, and smuggle \cs{thepostnote} -% out of the group. +% can be done correctly, we place the mark. What to do with the counter +% itself, depends on the situation. In places that are known to restore the +% counter values after the measuring pass, we can let the counter be stepped. +% And, actually we should do so, for example, in a \env{tabularx} with +% multiple postnotes, if we don't step the counter, all the measuring will be +% done with the number of the first note. Otherwise, we don't actually step +% the counter but, to typeset correctly the mark that would be printed if the +% counter had been stepped, we increment \cs{c@postnote} locally and grouped, +% and smuggle \cs{thepostnote} out of the group. % \begin{macrocode} \bool_if:NT \l_@@_print_plain_mark_bool { \tl_if_empty:NT \l_@@_mark_tl { - \group_begin: - \int_incr:N \c@postnote - \exp_args:NNNx - \group_end: - \tl_set:Nn \l_@@_mark_tl { \thepostnote } + \bool_if:NTF \l_@@_print_plain_mark_stepcounter_bool + { + \stepcounter { postnote } + \tl_set:Nx \l_@@_mark_tl { \thepostnote } + } + { + \group_begin: + \int_incr:N \c@postnote + \exp_args:NNNx + \group_end: + \tl_set:Nn \l_@@_mark_tl { \thepostnote } + } } \@@_typeset_mark_wrapper:n { \@@_make_mark:nnn { \l_@@_mark_tl } { } { } } @@ -2371,6 +2385,7 @@ { \bool_set_true:N \l_@@_inhibit_note_bool \bool_set_true:N \l_@@_print_plain_mark_bool + \bool_set_true:N \l_@@_print_plain_mark_stepcounter_bool } } % \end{macrocode} @@ -2414,6 +2429,7 @@ { \bool_set_true:N \l_@@_inhibit_note_bool \bool_set_true:N \l_@@_print_plain_mark_bool + \bool_set_true:N \l_@@_print_plain_mark_stepcounter_bool } } } @@ -2445,6 +2461,7 @@ { \bool_set_true:N \l_@@_inhibit_note_bool \bool_set_true:N \l_@@_print_plain_mark_bool + \bool_set_true:N \l_@@_print_plain_mark_stepcounter_bool } } } @@ -2471,7 +2488,12 @@ % and public boolean, and users can create arbitrary new \pkg{tabularray} % environments with \cs{NewTblrEnviron}, which we either wouldn't catch or % have to provide an user interface for. So, for the time being, let's trust -% this boolean won't be misused by third-parties or users. +% this boolean won't be misused by third-parties or users. Note that setting +% \cs{l_@@_print_plain_mark_stepcounter_bool} to true presumes +% \pkg{tabularray}'s \texttt{counter} module is enabled. But, since this is +% the only way to get the measuring right in this context if there is more +% than one \cs{postnote} inside a given table, pkg{postnotes} expects and +% requires the \texttt{counter} module. % \begin{macrocode} \AddToHook { postnotes/note/inhibit } [ postnotes ] { @@ -2479,6 +2501,7 @@ { \bool_set_true:N \l_@@_inhibit_note_bool \bool_set_true:N \l_@@_print_plain_mark_bool + \bool_set_true:N \l_@@_print_plain_mark_stepcounter_bool } } } diff --git a/testfiles-3runs/pn-compat-amsmath01.tlg b/testfiles-3runs/pn-compat-amsmath01.tlg index 4d4b7b7..2a796f4 100644 --- a/testfiles-3runs/pn-compat-amsmath01.tlg +++ b/testfiles-3runs/pn-compat-amsmath01.tlg @@ -68,7 +68,7 @@ l. ...\setbox0=\hbox{\testtmp}\showbox0\box .\hbox(8.64003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -4.12892 -...\OT1/cmr/m/n/7 3 +...\OT1/cmr/m/n/7 4 ..\mathoff ! OK. @@ -80,13 +80,13 @@ l. ...\end{align} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 3 +...\OT1/cmr/m/n/7 4 ..\mathoff .\penalty 10000 .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 3 +...\OT1/cmr/m/n/7 4 ..\mathoff ! OK. @@ -98,13 +98,13 @@ l. ...\end{align} .\hbox(6.24+0.0)x3.90283 ..\mathon ..\hbox(3.22221+0.0)x3.90283, shifted -3.01779 -...\OT1/cmr/m/n/5 3 +...\OT1/cmr/m/n/5 4 ..\mathoff .\penalty 10000 .\hbox(6.24+0.0)x3.90283 ..\mathon ..\hbox(3.22221+0.0)x3.90283, shifted -3.01779 -...\OT1/cmr/m/n/5 3 +...\OT1/cmr/m/n/5 4 ..\mathoff ! OK. @@ -116,13 +116,13 @@ l. ...\end{align} .\hbox(5.23997+0.0)x3.90283 ..\mathon ..\hbox(3.22221+0.0)x3.90283, shifted -2.01776 -...\OT1/cmr/m/n/5 3 +...\OT1/cmr/m/n/5 4 ..\mathoff .\penalty 10000 .\hbox(5.23997+0.0)x3.90283 ..\mathon ..\hbox(3.22221+0.0)x3.90283, shifted -2.01776 -...\OT1/cmr/m/n/5 3 +...\OT1/cmr/m/n/5 4 ..\mathoff ! OK. @@ -282,7 +282,7 @@ l. ...\end{gather} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 5 +...\OT1/cmr/m/n/7 6 ..\mathoff ! OK. @@ -294,7 +294,7 @@ l. ...\end{gather} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 5 +...\OT1/cmr/m/n/7 7 ..\mathoff ! OK. diff --git a/testfiles-3runs/pn-compat-amsmath01.xetex.tlg b/testfiles-3runs/pn-compat-amsmath01.xetex.tlg index 75fc4cd..6ea34f4 100644 --- a/testfiles-3runs/pn-compat-amsmath01.xetex.tlg +++ b/testfiles-3runs/pn-compat-amsmath01.xetex.tlg @@ -68,7 +68,7 @@ l. ...\setbox0=\hbox{\testtmp}\showbox0\box .\hbox(8.64003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -4.12892 -...\OT1/cmr/m/n/7 3 +...\OT1/cmr/m/n/7 4 ..\mathoff ! OK. @@ -80,13 +80,13 @@ l. ...\end{align} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 3 +...\OT1/cmr/m/n/7 4 ..\mathoff .\penalty 10000 .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 3 +...\OT1/cmr/m/n/7 4 ..\mathoff ! OK. @@ -98,13 +98,13 @@ l. ...\end{align} .\hbox(6.24+0.0)x3.90283 ..\mathon ..\hbox(3.22221+0.0)x3.90283, shifted -3.01779 -...\OT1/cmr/m/n/5 3 +...\OT1/cmr/m/n/5 4 ..\mathoff .\penalty 10000 .\hbox(6.24+0.0)x3.90283 ..\mathon ..\hbox(3.22221+0.0)x3.90283, shifted -3.01779 -...\OT1/cmr/m/n/5 3 +...\OT1/cmr/m/n/5 4 ..\mathoff ! OK. @@ -116,13 +116,13 @@ l. ...\end{align} .\hbox(5.23997+0.0)x3.90283 ..\mathon ..\hbox(3.22221+0.0)x3.90283, shifted -2.01776 -...\OT1/cmr/m/n/5 3 +...\OT1/cmr/m/n/5 4 ..\mathoff .\penalty 10000 .\hbox(5.23997+0.0)x3.90283 ..\mathon ..\hbox(3.22221+0.0)x3.90283, shifted -2.01776 -...\OT1/cmr/m/n/5 3 +...\OT1/cmr/m/n/5 4 ..\mathoff ! OK. @@ -282,7 +282,7 @@ l. ...\end{gather} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 5 +...\OT1/cmr/m/n/7 6 ..\mathoff ! OK. @@ -294,7 +294,7 @@ l. ...\end{gather} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 5 +...\OT1/cmr/m/n/7 7 ..\mathoff ! OK. diff --git a/testfiles/pn-compat-csquotes01.lvt b/testfiles/pn-compat-csquotes01.lvt index 14883d7..eea31bd 100644 --- a/testfiles/pn-compat-csquotes01.lvt +++ b/testfiles/pn-compat-csquotes01.lvt @@ -26,10 +26,9 @@ \START \BEGINTEST{csquotes} -\setbox0=\hbox{\blockquote{\enquote{Foo.\postnote{\enquote{Foo - note.}}\postnote{Bar note.}}}} -\showbox0 -\box0 +\blockquote{\enquote{Foo.\setbox0=\hbox{\postnote{\enquote{Foo + note.}}}\showbox0\box0\setbox0=\hbox{\postnote{Bar + note.}}\showbox0\box0}} \ENDTEST \OMIT diff --git a/testfiles/pn-compat-csquotes01.tlg b/testfiles/pn-compat-csquotes01.tlg index 3a0c2ce..95088b2 100644 --- a/testfiles/pn-compat-csquotes01.tlg +++ b/testfiles/pn-compat-csquotes01.tlg @@ -8,20 +8,31 @@ LaTeX Font Info: External font `cmex10' loaded for size LaTeX Font Info: External font `cmex10' loaded for size (Font) <5> on input line .... > \box...= -\hbox(8.14003+0.0)x44.27798 -.\OT1/cmr/m/n/10 \ +\hbox(8.14003+0.0)x4.48613 .\penalty 10000 -.\glue 0.50003 -.\OT1/cmr/m/n/10 ` +.\hbox(8.14003+0.0)x4.48613 +..\mathon +..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 +...\OT1/cmr/m/n/7 1 +..\mathoff +! OK. + + \box +l. ... note.}}\showbox0\box0}} +> \box...= +\hbox(8.14003+0.0)x4.48613 .\penalty 10000 -.\glue -0.0002 -.\glue 0.0002 -.\OT1/cmr/m/n/10 F -.\kern-0.83334 -.\OT1/cmr/m/n/10 o -.\kern0.27779 -.\OT1/cmr/m/n/10 o -.\OT1/cmr/m/n/10 . +.\hbox(8.14003+0.0)x4.48613 +..\mathon +..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 +...\OT1/cmr/m/n/7 2 +..\mathoff +! OK. + + \box +l. ... note.}}\showbox0\box0}} +> \box...= +\hbox(8.14003+0.0)x4.48613 .\penalty 10000 .\hbox(0.0+0.0)x0.0 ..\hbox(0.0+0.0)x0.0, shifted -12.0 @@ -36,6 +47,12 @@ LaTeX Font Info: External font `cmex10' loaded for size ...\OT1/cmr/m/n/7 1 ..\mathoff .\pdfendlink +! OK. + + \box +l. ... note.}}\showbox0\box0}} +> \box...= +\hbox(8.14003+0.0)x4.48613 .\penalty 10000 .\hbox(0.0+0.0)x0.0 ..\hbox(0.0+0.0)x0.0, shifted -12.0 @@ -50,12 +67,10 @@ LaTeX Font Info: External font `cmex10' loaded for size ...\OT1/cmr/m/n/7 2 ..\mathoff .\pdfendlink -.\OT1/cmr/m/n/10 ' -.\penalty 10000 -.\glue 0.50003 -.\OT1/cmr/m/n/10 " ! OK. -l. ...\showbox0 + + \box +l. ... note.}}\showbox0\box0}} ============================================================ ============================================================ TEST 2: Print csquotes diff --git a/testfiles/pn-compat-csquotes01.xetex.tlg b/testfiles/pn-compat-csquotes01.xetex.tlg index fda0c4e..42e7260 100644 --- a/testfiles/pn-compat-csquotes01.xetex.tlg +++ b/testfiles/pn-compat-csquotes01.xetex.tlg @@ -8,20 +8,31 @@ LaTeX Font Info: External font `cmex10' loaded for size LaTeX Font Info: External font `cmex10' loaded for size (Font) <5> on input line .... > \box...= -\hbox(8.14003+0.0)x44.27798 -.\OT1/cmr/m/n/10 \ +\hbox(8.14003+0.0)x4.48613 .\penalty 10000 -.\glue 0.50003 -.\OT1/cmr/m/n/10 ` +.\hbox(8.14003+0.0)x4.48613 +..\mathon +..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 +...\OT1/cmr/m/n/7 1 +..\mathoff +! OK. + + \box +l. ... note.}}\showbox0\box0}} +> \box...= +\hbox(8.14003+0.0)x4.48613 .\penalty 10000 -.\glue -0.0002 -.\glue 0.0002 -.\OT1/cmr/m/n/10 F -.\kern-0.83334 -.\OT1/cmr/m/n/10 o -.\kern0.27779 -.\OT1/cmr/m/n/10 o -.\OT1/cmr/m/n/10 . +.\hbox(8.14003+0.0)x4.48613 +..\mathon +..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 +...\OT1/cmr/m/n/7 2 +..\mathoff +! OK. + + \box +l. ... note.}}\showbox0\box0}} +> \box...= +\hbox(8.14003+0.0)x4.48613 .\penalty 10000 .\hbox(0.0+0.0)x0.0 ..\hbox(0.0+0.0)x0.0, shifted -12.0 @@ -36,6 +47,12 @@ LaTeX Font Info: External font `cmex10' loaded for size ...\OT1/cmr/m/n/7 1 ..\mathoff .\special{pdf:eann} +! OK. + + \box +l. ... note.}}\showbox0\box0}} +> \box...= +\hbox(8.14003+0.0)x4.48613 .\penalty 10000 .\hbox(0.0+0.0)x0.0 ..\hbox(0.0+0.0)x0.0, shifted -12.0 @@ -50,12 +67,10 @@ LaTeX Font Info: External font `cmex10' loaded for size ...\OT1/cmr/m/n/7 2 ..\mathoff .\special{pdf:eann} -.\OT1/cmr/m/n/10 ' -.\penalty 10000 -.\glue 0.50003 -.\OT1/cmr/m/n/10 " ! OK. -l. ...\showbox0 + + \box +l. ... note.}}\showbox0\box0}} ============================================================ ============================================================ TEST 2: Print csquotes diff --git a/testfiles/pn-compat-tabularray01.tlg b/testfiles/pn-compat-tabularray01.tlg index a29be76..2e60cec 100644 --- a/testfiles/pn-compat-tabularray01.tlg +++ b/testfiles/pn-compat-tabularray01.tlg @@ -46,7 +46,7 @@ l. ...\end .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 1 +...\OT1/cmr/m/n/7 2 ..\mathoff ! OK. @@ -59,7 +59,7 @@ l. ...\end .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 1 +...\OT1/cmr/m/n/7 2 ..\mathoff ! OK. @@ -85,7 +85,7 @@ l. ...\end .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 1 +...\OT1/cmr/m/n/7 2 ..\mathoff ! OK. diff --git a/testfiles/pn-compat-tabularray01.xetex.tlg b/testfiles/pn-compat-tabularray01.xetex.tlg index d769461..4ab9748 100644 --- a/testfiles/pn-compat-tabularray01.xetex.tlg +++ b/testfiles/pn-compat-tabularray01.xetex.tlg @@ -46,7 +46,7 @@ l. ...\end .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 1 +...\OT1/cmr/m/n/7 2 ..\mathoff ! OK. @@ -59,7 +59,7 @@ l. ...\end .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 1 +...\OT1/cmr/m/n/7 2 ..\mathoff ! OK. @@ -85,7 +85,7 @@ l. ...\end .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 1 +...\OT1/cmr/m/n/7 2 ..\mathoff ! OK. diff --git a/testfiles/pn-compat-tabularx01.tlg b/testfiles/pn-compat-tabularx01.tlg index 1d17059..6aa2dd0 100644 --- a/testfiles/pn-compat-tabularx01.tlg +++ b/testfiles/pn-compat-tabularx01.tlg @@ -21,7 +21,7 @@ l. ...\end{tabularx} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 1 +...\OT1/cmr/m/n/7 2 ..\mathoff ! OK. @@ -33,7 +33,7 @@ l. ...\end{tabularx} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 1 +...\OT1/cmr/m/n/7 3 ..\mathoff ! OK. @@ -57,7 +57,7 @@ l. ...\end{tabularx} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 1 +...\OT1/cmr/m/n/7 2 ..\mathoff ! OK. @@ -69,7 +69,7 @@ l. ...\end{tabularx} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 1 +...\OT1/cmr/m/n/7 3 ..\mathoff ! OK. diff --git a/testfiles/pn-compat-tabularx01.xetex.tlg b/testfiles/pn-compat-tabularx01.xetex.tlg index 816b707..56e1c41 100644 --- a/testfiles/pn-compat-tabularx01.xetex.tlg +++ b/testfiles/pn-compat-tabularx01.xetex.tlg @@ -21,7 +21,7 @@ l. ...\end{tabularx} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 1 +...\OT1/cmr/m/n/7 2 ..\mathoff ! OK. @@ -33,7 +33,7 @@ l. ...\end{tabularx} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 1 +...\OT1/cmr/m/n/7 3 ..\mathoff ! OK. @@ -57,7 +57,7 @@ l. ...\end{tabularx} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 1 +...\OT1/cmr/m/n/7 2 ..\mathoff ! OK. @@ -69,7 +69,7 @@ l. ...\end{tabularx} .\hbox(8.14003+0.0)x4.48613 ..\mathon ..\hbox(4.51111+0.0)x4.48613, shifted -3.62892 -...\OT1/cmr/m/n/7 1 +...\OT1/cmr/m/n/7 3 ..\mathoff ! OK. From c3ea82517528d03f606f654101c98d792e5ca981 Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Mon, 6 Mar 2023 07:24:26 -0300 Subject: [PATCH 07/21] Update change log --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54cc0ec..f100a8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ ## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.2.3...HEAD) +### Changed +- Use new `\lTblrMeasuringBool` for identifying measuring passes in + `tabularray` tables. + +### Fixed +- Don't inhibit `postnote` counter stepping in contexts which restore counter + values in measuring passes to ensure proper measuring. + ## [v0.2.3](https://github.com/gusbrs/postnotes/compare/v0.2.2...v0.2.3) (2023-02-21) ### Fixed From 55b5258cad227ec146a156222058e7cd3b06d19f Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Sun, 23 Apr 2023 15:57:23 -0300 Subject: [PATCH 08/21] Rename User manual to postnotes-doc.tex So that AUCTeX style files work for it and the .dtx. --- postnotes-code.tex | 2 +- postnotes.tex => postnotes-doc.tex | 2 +- postnotes.dtx | 2 +- postnotes.ins | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename postnotes.tex => postnotes-doc.tex (99%) diff --git a/postnotes-code.tex b/postnotes-code.tex index 59ed76a..67aff57 100644 --- a/postnotes-code.tex +++ b/postnotes-code.tex @@ -22,7 +22,7 @@ % % This work consists of the files postnotes.dtx, % postnotes.ins, -% postnotes.tex, +% postnotes-doc.tex, % postnotes-code.tex, % and the files generated from them. % diff --git a/postnotes.tex b/postnotes-doc.tex similarity index 99% rename from postnotes.tex rename to postnotes-doc.tex index 0be7d50..3f2111c 100644 --- a/postnotes.tex +++ b/postnotes-doc.tex @@ -22,7 +22,7 @@ % % This work consists of the files postnotes.dtx, % postnotes.ins, -% postnotes.tex, +% postnotes-doc.tex, % postnotes-code.tex, % and the files generated from them. % diff --git a/postnotes.dtx b/postnotes.dtx index 6ab2e47..d06b169 100644 --- a/postnotes.dtx +++ b/postnotes.dtx @@ -22,7 +22,7 @@ % % This work consists of the files postnotes.dtx, % postnotes.ins, -% postnotes.tex, +% postnotes-doc.tex, % postnotes-code.tex, % and the files generated from them. % diff --git a/postnotes.ins b/postnotes.ins index 3897fb0..08c592a 100644 --- a/postnotes.ins +++ b/postnotes.ins @@ -22,7 +22,7 @@ % % This work consists of the files postnotes.dtx, % postnotes.ins, -% postnotes.tex, +% postnotes-doc.tex, % postnotes-code.tex, % and the files generated from them. % @@ -68,7 +68,7 @@ This work is "maintained" (as per LPPL maintenance status) by This work consists of the files postnotes.dtx, postnotes.ins, - postnotes.tex, + postnotes-doc.tex, postnotes-code.tex, and the files generated from them. From d3e4c39611992b7a7f2dfa7324ee69c55b4f45ff Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Mon, 12 Jun 2023 08:55:58 -0300 Subject: [PATCH 09/21] Update pn-languages-polyglossia01 test results for upstream change --- testfiles/pn-languages-polyglossia01.luatex.tlg | 15 --------------- .../pn-languages-polyglossia01.luatexdev.tlg | 15 --------------- testfiles/pn-languages-polyglossia01.xetex.tlg | 15 --------------- 3 files changed, 45 deletions(-) diff --git a/testfiles/pn-languages-polyglossia01.luatex.tlg b/testfiles/pn-languages-polyglossia01.luatex.tlg index b12200d..0f739d5 100644 --- a/testfiles/pn-languages-polyglossia01.luatex.tlg +++ b/testfiles/pn-languages-polyglossia01.luatex.tlg @@ -45,10 +45,7 @@ Completed box being shipped out [3] ...\glue 18.06749 ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 404.0fil, direction TLT -....\write1{\protect \xpglanginauxtrue } -....\write1{\protect \selectlanguage *{english}} ....\write1{\@writefile{toc}{\protect \selectlanguage *{english}}} -....\write1{\protect \xpglanginauxfalse } ....\write-{} ....\pdfdest name{chapter*.1} xyz ....\glue(\topskip) 10.0 @@ -209,10 +206,7 @@ Completed box being shipped out [5] ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 402.90399fil, direction TLT ....\write-{} -....\write1{\protect \xpglanginauxtrue } -....\write1{\protect \selectlanguage *{english}} ....\write1{\@writefile{toc}{\protect \selectlanguage *{english}}} -....\write1{\protect \xpglanginauxfalse } ....\write-{} ....\pdfdest name{chapter*.2} xyz ....\glue(\topskip) 10.0 @@ -365,10 +359,7 @@ Completed box being shipped out [9] ...\glue 18.06749 ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 404.0fil, direction TLT -....\write1{\protect \xpglanginauxtrue } -....\write1{\protect \selectlanguage *{portuguese}} ....\write1{\@writefile{toc}{\protect \selectlanguage *{portuguese}}} -....\write1{\protect \xpglanginauxfalse } ....\write-{} ....\pdfdest name{chapter*.3} xyz ....\glue(\topskip) 10.0 @@ -521,10 +512,7 @@ Completed box being shipped out [13] ...\glue 18.06749 ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 404.0fil, direction TLT -....\write1{\protect \xpglanginauxtrue } -....\write1{\protect \selectlanguage *{french}} ....\write1{\@writefile{toc}{\protect \selectlanguage *{french}}} -....\write1{\protect \xpglanginauxfalse } ....\write-{} ....\pdfdest name{chapter*.4} xyz ....\glue(\topskip) 10.0 @@ -678,10 +666,7 @@ Completed box being shipped out [17] ...\glue 18.06749 ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 404.0fil, direction TLT -....\write1{\protect \xpglanginauxtrue } -....\write1{\protect \selectlanguage *{german}} ....\write1{\@writefile{toc}{\protect \selectlanguage *{german}}} -....\write1{\protect \xpglanginauxfalse } ....\write-{} ....\pdfdest name{chapter*.5} xyz ....\glue(\topskip) 10.0 diff --git a/testfiles/pn-languages-polyglossia01.luatexdev.tlg b/testfiles/pn-languages-polyglossia01.luatexdev.tlg index b12200d..0f739d5 100644 --- a/testfiles/pn-languages-polyglossia01.luatexdev.tlg +++ b/testfiles/pn-languages-polyglossia01.luatexdev.tlg @@ -45,10 +45,7 @@ Completed box being shipped out [3] ...\glue 18.06749 ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 404.0fil, direction TLT -....\write1{\protect \xpglanginauxtrue } -....\write1{\protect \selectlanguage *{english}} ....\write1{\@writefile{toc}{\protect \selectlanguage *{english}}} -....\write1{\protect \xpglanginauxfalse } ....\write-{} ....\pdfdest name{chapter*.1} xyz ....\glue(\topskip) 10.0 @@ -209,10 +206,7 @@ Completed box being shipped out [5] ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 402.90399fil, direction TLT ....\write-{} -....\write1{\protect \xpglanginauxtrue } -....\write1{\protect \selectlanguage *{english}} ....\write1{\@writefile{toc}{\protect \selectlanguage *{english}}} -....\write1{\protect \xpglanginauxfalse } ....\write-{} ....\pdfdest name{chapter*.2} xyz ....\glue(\topskip) 10.0 @@ -365,10 +359,7 @@ Completed box being shipped out [9] ...\glue 18.06749 ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 404.0fil, direction TLT -....\write1{\protect \xpglanginauxtrue } -....\write1{\protect \selectlanguage *{portuguese}} ....\write1{\@writefile{toc}{\protect \selectlanguage *{portuguese}}} -....\write1{\protect \xpglanginauxfalse } ....\write-{} ....\pdfdest name{chapter*.3} xyz ....\glue(\topskip) 10.0 @@ -521,10 +512,7 @@ Completed box being shipped out [13] ...\glue 18.06749 ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 404.0fil, direction TLT -....\write1{\protect \xpglanginauxtrue } -....\write1{\protect \selectlanguage *{french}} ....\write1{\@writefile{toc}{\protect \selectlanguage *{french}}} -....\write1{\protect \xpglanginauxfalse } ....\write-{} ....\pdfdest name{chapter*.4} xyz ....\glue(\topskip) 10.0 @@ -678,10 +666,7 @@ Completed box being shipped out [17] ...\glue 18.06749 ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 404.0fil, direction TLT -....\write1{\protect \xpglanginauxtrue } -....\write1{\protect \selectlanguage *{german}} ....\write1{\@writefile{toc}{\protect \selectlanguage *{german}}} -....\write1{\protect \xpglanginauxfalse } ....\write-{} ....\pdfdest name{chapter*.5} xyz ....\glue(\topskip) 10.0 diff --git a/testfiles/pn-languages-polyglossia01.xetex.tlg b/testfiles/pn-languages-polyglossia01.xetex.tlg index e3677d6..190e93b 100644 --- a/testfiles/pn-languages-polyglossia01.xetex.tlg +++ b/testfiles/pn-languages-polyglossia01.xetex.tlg @@ -37,10 +37,7 @@ Completed box being shipped out [3] ...\glue 18.06749 ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 404.0fil -....\write1{\protect \xpglanginauxtrue } -....\write1{\protect \selectlanguage *{english}} ....\write1{\@writefile{toc}{\protect \selectlanguage *{english}}} -....\write1{\protect \xpglanginauxfalse } ....\write-{} ....\special{pdf:dest (chapter*.1) [@thispage /XYZ @xpos @ypos null]} ....\glue(\topskip) 10.0 @@ -162,10 +159,7 @@ Completed box being shipped out [5] ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 402.90402fil ....\write-{} -....\write1{\protect \xpglanginauxtrue } -....\write1{\protect \selectlanguage *{english}} ....\write1{\@writefile{toc}{\protect \selectlanguage *{english}}} -....\write1{\protect \xpglanginauxfalse } ....\write-{} ....\special{pdf:dest (chapter*.2) [@thispage /XYZ @xpos @ypos null]} ....\glue(\topskip) 10.0 @@ -282,10 +276,7 @@ Completed box being shipped out [9] ...\glue 18.06749 ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 404.0fil -....\write1{\protect \xpglanginauxtrue } -....\write1{\protect \selectlanguage *{portuguese}} ....\write1{\@writefile{toc}{\protect \selectlanguage *{portuguese}}} -....\write1{\protect \xpglanginauxfalse } ....\write-{} ....\special{pdf:dest (chapter*.3) [@thispage /XYZ @xpos @ypos null]} ....\glue(\topskip) 10.0 @@ -402,10 +393,7 @@ Completed box being shipped out [13] ...\glue 18.06749 ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 404.0fil -....\write1{\protect \xpglanginauxtrue } -....\write1{\protect \selectlanguage *{french}} ....\write1{\@writefile{toc}{\protect \selectlanguage *{french}}} -....\write1{\protect \xpglanginauxfalse } ....\write-{} ....\special{pdf:dest (chapter*.4) [@thispage /XYZ @xpos @ypos null]} ....\glue(\topskip) 10.0 @@ -520,10 +508,7 @@ Completed box being shipped out [17] ...\glue 18.06749 ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 404.0fil -....\write1{\protect \xpglanginauxtrue } -....\write1{\protect \selectlanguage *{german}} ....\write1{\@writefile{toc}{\protect \selectlanguage *{german}}} -....\write1{\protect \xpglanginauxfalse } ....\write-{} ....\special{pdf:dest (chapter*.5) [@thispage /XYZ @xpos @ypos null]} ....\glue(\topskip) 10.0 From 5f66a42091cf753466264ed370c11bd18bdb0e53 Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Mon, 12 Jun 2023 09:02:54 -0300 Subject: [PATCH 10/21] Update manual and tests for renaming of \bool_case:n(TF) --- CHANGELOG.md | 2 ++ postnotes-doc.tex | 4 ++-- testfiles/pn-headers-fancy03.lvt | 2 +- testfiles/pn-headers-fancy04.lvt | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f100a8b..41980ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ ### Fixed - Don't inhibit `postnote` counter stepping in contexts which restore counter values in measuring passes to ensure proper measuring. +- Update User manual and regression tests for `l3kernel`'s renaming of + `\bool_case_true:n(TF)` to `\bool_case:n(TF)`. ## [v0.2.3](https://github.com/gusbrs/postnotes/compare/v0.2.2...v0.2.3) (2023-02-21) diff --git a/postnotes-doc.tex b/postnotes-doc.tex index 3f2111c..3d29f76 100644 --- a/postnotes-doc.tex +++ b/postnotes-doc.tex @@ -86,7 +86,7 @@ \ExplSyntaxOff , \NewDocumentCommand , \tl_if_eq:NNTF , - \bool_case_true:nF , + \bool_case:nF , \str_if_eq_p:ee , \prg_replicate:nn , \lipsum , @@ -754,7 +754,7 @@ \section{Headers} \ExplSyntaxOn \NewDocumentCommand \mypnheader {} { - \bool_case_true:nF + \bool_case:nF { { \str_if_eq_p:ee { \pnhdnamefirst } { intro } && diff --git a/testfiles/pn-headers-fancy03.lvt b/testfiles/pn-headers-fancy03.lvt index ebd0dc7..220b755 100644 --- a/testfiles/pn-headers-fancy03.lvt +++ b/testfiles/pn-headers-fancy03.lvt @@ -30,7 +30,7 @@ \ExplSyntaxOn \NewDocumentCommand \mypnheader {} { - \bool_case_true:nF + \bool_case:nF { { \str_if_eq_p:ee { \pnhdnamefirst } { intro } && diff --git a/testfiles/pn-headers-fancy04.lvt b/testfiles/pn-headers-fancy04.lvt index 84e7d6b..18cc617 100644 --- a/testfiles/pn-headers-fancy04.lvt +++ b/testfiles/pn-headers-fancy04.lvt @@ -30,7 +30,7 @@ \ExplSyntaxOn \NewDocumentCommand \mypnheader {} { - \bool_case_true:nF + \bool_case:nF { { \str_if_eq_p:ee { \pnhdnamefirst } { intro } && From 79df62eb998722e39e4bd6d23ceb1eab4d1f3f4b Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Mon, 12 Jun 2023 09:10:40 -0300 Subject: [PATCH 11/21] Step release tag --- CHANGELOG.md | 4 +++- build.lua | 2 +- ctan-announcement.text | 12 +++++++++--- postnotes.dtx | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41980ae..7cc16f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog -## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.2.3...HEAD) +## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.2.4...HEAD) + +## [v0.2.4](https://github.com/gusbrs/postnotes/compare/v0.2.3...v0.2.4) (2023-06-12) ### Changed - Use new `\lTblrMeasuringBool` for identifying measuring passes in diff --git a/build.lua b/build.lua index 9aae4c1..20e906a 100644 --- a/build.lua +++ b/build.lua @@ -56,7 +56,7 @@ asciiengines = {} -- CTAN upload settings uploadconfig = { - version = "0.2.3", -- first line for tagging + version = "0.2.4", -- first line for tagging pkg = "postnotes", author = "Gustavo Barros", uploader = "Gustavo Barros", diff --git a/ctan-announcement.text b/ctan-announcement.text index b2a52d8..c922c10 100644 --- a/ctan-announcement.text +++ b/ctan-announcement.text @@ -1,6 +1,12 @@ -## v0.2.3 (2023-02-21) +## v0.2.4 (2023-06-12) + +### Changed +- Use new `\lTblrMeasuringBool` for identifying measuring passes in + `tabularray` tables. ### Fixed -- Don't apply fix for "perhaps a missing \item" error for option - `listenv=none`. +- Don't inhibit `postnote` counter stepping in contexts which restore counter + values in measuring passes to ensure proper measuring. +- Update User manual and regression tests for `l3kernel`'s renaming of + `\bool_case_true:n(TF)` to `\bool_case:n(TF)`. diff --git a/postnotes.dtx b/postnotes.dtx index d06b169..03a4391 100644 --- a/postnotes.dtx +++ b/postnotes.dtx @@ -153,7 +153,7 @@ % % % \begin{macrocode} -\ProvidesExplPackage {postnotes} {2023-02-21} {0.2.3} +\ProvidesExplPackage {postnotes} {2023-06-12} {0.2.4} {Endnotes for LaTeX} % \end{macrocode} % From e0f209d3a8403c3332c7fe0dce23f5cbb1a92a05 Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Wed, 14 Jun 2023 11:19:14 -0300 Subject: [PATCH 12/21] Explicitly require LaTeX2e TeX format --- postnotes.dtx | 1 + 1 file changed, 1 insertion(+) diff --git a/postnotes.dtx b/postnotes.dtx index 03a4391..51c6e49 100644 --- a/postnotes.dtx +++ b/postnotes.dtx @@ -138,6 +138,7 @@ % kernel or newer. % % \begin{macrocode} +\NeedsTeXFormat{LaTeX2e} \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \IfFormatAtLeastTF{2022-06-01} {} From 21c6d7e4c0ecb38a016759e24d2ae919148302f9 Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Wed, 14 Jun 2023 11:32:21 -0300 Subject: [PATCH 13/21] Ensure \par at the end of \printpostnotes See https://github.com/u-fischer/tagpdf/issues/68#issuecomment-1587343876 --- CHANGELOG.md | 4 ++++ postnotes.dtx | 6 ++++++ testfiles-3runs/pn-biblatex-70-style-verbose.luatex.tlg | 8 ++++---- .../pn-biblatex-70-style-verbose.luatexdev.tlg | 8 ++++---- testfiles-3runs/pn-biblatex-70-style-verbose.tlg | 8 ++++---- testfiles-3runs/pn-biblatex-70-style-verbose.xetex.tlg | 8 ++++---- .../pn-biblatex-71-style-verbose-ibid.luatex.tlg | 8 ++++---- .../pn-biblatex-71-style-verbose-ibid.luatexdev.tlg | 8 ++++---- testfiles-3runs/pn-biblatex-71-style-verbose-ibid.tlg | 8 ++++---- .../pn-biblatex-71-style-verbose-ibid.xetex.tlg | 8 ++++---- .../pn-biblatex-72-style-verbose-note.luatex.tlg | 6 +++--- .../pn-biblatex-72-style-verbose-note.luatexdev.tlg | 6 +++--- testfiles-3runs/pn-biblatex-72-style-verbose-note.tlg | 6 +++--- .../pn-biblatex-72-style-verbose-note.xetex.tlg | 6 +++--- .../pn-biblatex-73-style-verbose-inote.luatex.tlg | 6 +++--- .../pn-biblatex-73-style-verbose-inote.luatexdev.tlg | 6 +++--- testfiles-3runs/pn-biblatex-73-style-verbose-inote.tlg | 6 +++--- .../pn-biblatex-73-style-verbose-inote.xetex.tlg | 6 +++--- .../pn-biblatex-74-style-verbose-trad1.luatex.tlg | 6 +++--- .../pn-biblatex-74-style-verbose-trad1.luatexdev.tlg | 6 +++--- testfiles-3runs/pn-biblatex-74-style-verbose-trad1.tlg | 6 +++--- .../pn-biblatex-74-style-verbose-trad1.xetex.tlg | 6 +++--- .../pn-biblatex-75-style-verbose-trad2.luatex.tlg | 6 +++--- .../pn-biblatex-75-style-verbose-trad2.luatexdev.tlg | 6 +++--- testfiles-3runs/pn-biblatex-75-style-verbose-trad2.tlg | 6 +++--- .../pn-biblatex-75-style-verbose-trad2.xetex.tlg | 6 +++--- .../pn-biblatex-76-style-verbose-trad3.luatex.tlg | 6 +++--- .../pn-biblatex-76-style-verbose-trad3.luatexdev.tlg | 6 +++--- testfiles-3runs/pn-biblatex-76-style-verbose-trad3.tlg | 6 +++--- .../pn-biblatex-76-style-verbose-trad3.xetex.tlg | 6 +++--- 30 files changed, 102 insertions(+), 92 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cc16f8..203fb44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.2.4...HEAD) +### Fixed +- Ensure `\par` at the end of `\printpostnotes`, see + https://github.com/u-fischer/tagpdf/issues/68#issuecomment-1587343876 . + ## [v0.2.4](https://github.com/gusbrs/postnotes/compare/v0.2.3...v0.2.4) (2023-06-12) ### Changed diff --git a/postnotes.dtx b/postnotes.dtx index 51c6e49..c429b8c 100644 --- a/postnotes.dtx +++ b/postnotes.dtx @@ -1418,6 +1418,12 @@ \bool_if:NTF \l_@@_print_as_list_bool { \exp_args:Nx \end { \l_@@_print_env_tl } } { \group_end: } +% \end{macrocode} +% Ensure \cs{par} at the end of \cs{printopostnotes} (see +% \url{https://github.com/u-fischer/tagpdf/issues/68#issuecomment-1587343876}, +% thanks \contributor{Ulrike Fischer}). +% \begin{macrocode} + \par } % \end{macrocode} % Set \texttt{type_prev} for the next iteration. diff --git a/testfiles-3runs/pn-biblatex-70-style-verbose.luatex.tlg b/testfiles-3runs/pn-biblatex-70-style-verbose.luatex.tlg index 710a82e..418eb6b 100644 --- a/testfiles-3runs/pn-biblatex-70-style-verbose.luatex.tlg +++ b/testfiles-3runs/pn-biblatex-70-style-verbose.luatex.tlg @@ -679,7 +679,7 @@ Completed box being shipped out [8] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642, direction TLT .....\OT1/cmr/m/it/9 T @@ -997,7 +997,7 @@ Completed box being shipped out [8] .....\OT1/cmr/m/it/9 - .....\discretionary (penalty 50) .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577, direction TLT .....\OT1/cmr/m/it/9 t @@ -1464,7 +1464,7 @@ Completed box being shipped out [9] .....\OT1/cmr/m/it/9 - .....\discretionary (penalty 50) .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.31946, direction TLT .....\OT1/cmr/m/it/9 i @@ -1728,7 +1728,7 @@ Completed box being shipped out [9] .....\OT1/cmr/m/it/9 c .....\OT1/cmr/m/it/9 t .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.12524, direction TLT .....\OT1/cmr/m/it/9 b diff --git a/testfiles-3runs/pn-biblatex-70-style-verbose.luatexdev.tlg b/testfiles-3runs/pn-biblatex-70-style-verbose.luatexdev.tlg index 710a82e..418eb6b 100644 --- a/testfiles-3runs/pn-biblatex-70-style-verbose.luatexdev.tlg +++ b/testfiles-3runs/pn-biblatex-70-style-verbose.luatexdev.tlg @@ -679,7 +679,7 @@ Completed box being shipped out [8] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642, direction TLT .....\OT1/cmr/m/it/9 T @@ -997,7 +997,7 @@ Completed box being shipped out [8] .....\OT1/cmr/m/it/9 - .....\discretionary (penalty 50) .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577, direction TLT .....\OT1/cmr/m/it/9 t @@ -1464,7 +1464,7 @@ Completed box being shipped out [9] .....\OT1/cmr/m/it/9 - .....\discretionary (penalty 50) .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.31946, direction TLT .....\OT1/cmr/m/it/9 i @@ -1728,7 +1728,7 @@ Completed box being shipped out [9] .....\OT1/cmr/m/it/9 c .....\OT1/cmr/m/it/9 t .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.12524, direction TLT .....\OT1/cmr/m/it/9 b diff --git a/testfiles-3runs/pn-biblatex-70-style-verbose.tlg b/testfiles-3runs/pn-biblatex-70-style-verbose.tlg index ba48cf9..d5c6686 100644 --- a/testfiles-3runs/pn-biblatex-70-style-verbose.tlg +++ b/testfiles-3runs/pn-biblatex-70-style-verbose.tlg @@ -617,7 +617,7 @@ Completed box being shipped out [8] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642 .....\OT1/cmr/m/it/9 T @@ -906,7 +906,7 @@ Completed box being shipped out [8] .....\discretionary .....\OT1/cmr/m/it/9 - .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577 .....\OT1/cmr/m/it/9 t @@ -1354,7 +1354,7 @@ Completed box being shipped out [9] .....\discretionary .....\OT1/cmr/m/it/9 - .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.31946 .....\OT1/cmr/m/it/9 i @@ -1594,7 +1594,7 @@ Completed box being shipped out [9] .....\OT1/cmr/m/it/9 c .....\OT1/cmr/m/it/9 t .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.12524 .....\OT1/cmr/m/it/9 b diff --git a/testfiles-3runs/pn-biblatex-70-style-verbose.xetex.tlg b/testfiles-3runs/pn-biblatex-70-style-verbose.xetex.tlg index 347c23a..03de998 100644 --- a/testfiles-3runs/pn-biblatex-70-style-verbose.xetex.tlg +++ b/testfiles-3runs/pn-biblatex-70-style-verbose.xetex.tlg @@ -617,7 +617,7 @@ Completed box being shipped out [8] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642 .....\OT1/cmr/m/it/9 T @@ -906,7 +906,7 @@ Completed box being shipped out [8] .....\discretionary .....\OT1/cmr/m/it/9 - .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577 .....\OT1/cmr/m/it/9 t @@ -1354,7 +1354,7 @@ Completed box being shipped out [9] .....\discretionary .....\OT1/cmr/m/it/9 - .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.31946 .....\OT1/cmr/m/it/9 i @@ -1594,7 +1594,7 @@ Completed box being shipped out [9] .....\OT1/cmr/m/it/9 c .....\OT1/cmr/m/it/9 t .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.12524 .....\OT1/cmr/m/it/9 b diff --git a/testfiles-3runs/pn-biblatex-71-style-verbose-ibid.luatex.tlg b/testfiles-3runs/pn-biblatex-71-style-verbose-ibid.luatex.tlg index 78816fc..975f1c1 100644 --- a/testfiles-3runs/pn-biblatex-71-style-verbose-ibid.luatex.tlg +++ b/testfiles-3runs/pn-biblatex-71-style-verbose-ibid.luatex.tlg @@ -863,7 +863,7 @@ Completed box being shipped out [9] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642, direction TLT .....\OT1/cmr/m/it/9 T @@ -1181,7 +1181,7 @@ Completed box being shipped out [9] .....\OT1/cmr/m/it/9 - .....\discretionary (penalty 50) .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577, direction TLT .....\OT1/cmr/m/it/9 t @@ -1642,7 +1642,7 @@ Completed box being shipped out [10] .....\kern-0.47224 (font) .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922, direction TLT .....\OT1/cmr/m/it/9 M @@ -1916,7 +1916,7 @@ Completed box being shipped out [10] .....\OT1/cmr/m/it/9 c .....\OT1/cmr/m/it/9 t .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.12524, direction TLT .....\OT1/cmr/m/it/9 b diff --git a/testfiles-3runs/pn-biblatex-71-style-verbose-ibid.luatexdev.tlg b/testfiles-3runs/pn-biblatex-71-style-verbose-ibid.luatexdev.tlg index 78816fc..975f1c1 100644 --- a/testfiles-3runs/pn-biblatex-71-style-verbose-ibid.luatexdev.tlg +++ b/testfiles-3runs/pn-biblatex-71-style-verbose-ibid.luatexdev.tlg @@ -863,7 +863,7 @@ Completed box being shipped out [9] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642, direction TLT .....\OT1/cmr/m/it/9 T @@ -1181,7 +1181,7 @@ Completed box being shipped out [9] .....\OT1/cmr/m/it/9 - .....\discretionary (penalty 50) .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577, direction TLT .....\OT1/cmr/m/it/9 t @@ -1642,7 +1642,7 @@ Completed box being shipped out [10] .....\kern-0.47224 (font) .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922, direction TLT .....\OT1/cmr/m/it/9 M @@ -1916,7 +1916,7 @@ Completed box being shipped out [10] .....\OT1/cmr/m/it/9 c .....\OT1/cmr/m/it/9 t .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.12524, direction TLT .....\OT1/cmr/m/it/9 b diff --git a/testfiles-3runs/pn-biblatex-71-style-verbose-ibid.tlg b/testfiles-3runs/pn-biblatex-71-style-verbose-ibid.tlg index 2873953..ce8fd1c 100644 --- a/testfiles-3runs/pn-biblatex-71-style-verbose-ibid.tlg +++ b/testfiles-3runs/pn-biblatex-71-style-verbose-ibid.tlg @@ -782,7 +782,7 @@ Completed box being shipped out [9] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642 .....\OT1/cmr/m/it/9 T @@ -1071,7 +1071,7 @@ Completed box being shipped out [9] .....\discretionary .....\OT1/cmr/m/it/9 - .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577 .....\OT1/cmr/m/it/9 t @@ -1513,7 +1513,7 @@ Completed box being shipped out [10] .....\kern-0.47224 .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922 .....\OT1/cmr/m/it/9 M @@ -1763,7 +1763,7 @@ Completed box being shipped out [10] .....\OT1/cmr/m/it/9 c .....\OT1/cmr/m/it/9 t .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.12524 .....\OT1/cmr/m/it/9 b diff --git a/testfiles-3runs/pn-biblatex-71-style-verbose-ibid.xetex.tlg b/testfiles-3runs/pn-biblatex-71-style-verbose-ibid.xetex.tlg index dbcef3d..98fddcc 100644 --- a/testfiles-3runs/pn-biblatex-71-style-verbose-ibid.xetex.tlg +++ b/testfiles-3runs/pn-biblatex-71-style-verbose-ibid.xetex.tlg @@ -782,7 +782,7 @@ Completed box being shipped out [9] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642 .....\OT1/cmr/m/it/9 T @@ -1071,7 +1071,7 @@ Completed box being shipped out [9] .....\discretionary .....\OT1/cmr/m/it/9 - .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577 .....\OT1/cmr/m/it/9 t @@ -1513,7 +1513,7 @@ Completed box being shipped out [10] .....\kern-0.47224 .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922 .....\OT1/cmr/m/it/9 M @@ -1763,7 +1763,7 @@ Completed box being shipped out [10] .....\OT1/cmr/m/it/9 c .....\OT1/cmr/m/it/9 t .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.12524 .....\OT1/cmr/m/it/9 b diff --git a/testfiles-3runs/pn-biblatex-72-style-verbose-note.luatex.tlg b/testfiles-3runs/pn-biblatex-72-style-verbose-note.luatex.tlg index 9271733..7e72993 100644 --- a/testfiles-3runs/pn-biblatex-72-style-verbose-note.luatex.tlg +++ b/testfiles-3runs/pn-biblatex-72-style-verbose-note.luatex.tlg @@ -1164,7 +1164,7 @@ Completed box being shipped out [8] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642, direction TLT .....\OT1/cmr/m/it/9 T @@ -1483,7 +1483,7 @@ Completed box being shipped out [8] .....\OT1/cmr/m/it/9 - .....\discretionary (penalty 50) .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577, direction TLT .....\OT1/cmr/m/it/9 t @@ -1943,7 +1943,7 @@ Completed box being shipped out [9] .....\kern-0.47224 (font) .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922, direction TLT .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-72-style-verbose-note.luatexdev.tlg b/testfiles-3runs/pn-biblatex-72-style-verbose-note.luatexdev.tlg index 9271733..7e72993 100644 --- a/testfiles-3runs/pn-biblatex-72-style-verbose-note.luatexdev.tlg +++ b/testfiles-3runs/pn-biblatex-72-style-verbose-note.luatexdev.tlg @@ -1164,7 +1164,7 @@ Completed box being shipped out [8] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642, direction TLT .....\OT1/cmr/m/it/9 T @@ -1483,7 +1483,7 @@ Completed box being shipped out [8] .....\OT1/cmr/m/it/9 - .....\discretionary (penalty 50) .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577, direction TLT .....\OT1/cmr/m/it/9 t @@ -1943,7 +1943,7 @@ Completed box being shipped out [9] .....\kern-0.47224 (font) .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922, direction TLT .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-72-style-verbose-note.tlg b/testfiles-3runs/pn-biblatex-72-style-verbose-note.tlg index fdf0116..b2ffa47 100644 --- a/testfiles-3runs/pn-biblatex-72-style-verbose-note.tlg +++ b/testfiles-3runs/pn-biblatex-72-style-verbose-note.tlg @@ -1034,7 +1034,7 @@ Completed box being shipped out [8] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642 .....\OT1/cmr/m/it/9 T @@ -1324,7 +1324,7 @@ Completed box being shipped out [8] .....\discretionary .....\OT1/cmr/m/it/9 - .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577 .....\OT1/cmr/m/it/9 t @@ -1765,7 +1765,7 @@ Completed box being shipped out [9] .....\kern-0.47224 .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922 .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-72-style-verbose-note.xetex.tlg b/testfiles-3runs/pn-biblatex-72-style-verbose-note.xetex.tlg index a436c18..08d0e75 100644 --- a/testfiles-3runs/pn-biblatex-72-style-verbose-note.xetex.tlg +++ b/testfiles-3runs/pn-biblatex-72-style-verbose-note.xetex.tlg @@ -1034,7 +1034,7 @@ Completed box being shipped out [8] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642 .....\OT1/cmr/m/it/9 T @@ -1324,7 +1324,7 @@ Completed box being shipped out [8] .....\discretionary .....\OT1/cmr/m/it/9 - .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577 .....\OT1/cmr/m/it/9 t @@ -1765,7 +1765,7 @@ Completed box being shipped out [9] .....\kern-0.47224 .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922 .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-73-style-verbose-inote.luatex.tlg b/testfiles-3runs/pn-biblatex-73-style-verbose-inote.luatex.tlg index a4db7e9..2d20810 100644 --- a/testfiles-3runs/pn-biblatex-73-style-verbose-inote.luatex.tlg +++ b/testfiles-3runs/pn-biblatex-73-style-verbose-inote.luatex.tlg @@ -1676,7 +1676,7 @@ Completed box being shipped out [6] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642, direction TLT .....\OT1/cmr/m/it/9 T @@ -1996,7 +1996,7 @@ Completed box being shipped out [6] .....\OT1/cmr/m/it/9 - .....\discretionary (penalty 50) .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577, direction TLT .....\OT1/cmr/m/it/9 t @@ -2444,7 +2444,7 @@ Completed box being shipped out [7] .....\kern-0.47224 (font) .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922, direction TLT .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-73-style-verbose-inote.luatexdev.tlg b/testfiles-3runs/pn-biblatex-73-style-verbose-inote.luatexdev.tlg index a4db7e9..2d20810 100644 --- a/testfiles-3runs/pn-biblatex-73-style-verbose-inote.luatexdev.tlg +++ b/testfiles-3runs/pn-biblatex-73-style-verbose-inote.luatexdev.tlg @@ -1676,7 +1676,7 @@ Completed box being shipped out [6] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642, direction TLT .....\OT1/cmr/m/it/9 T @@ -1996,7 +1996,7 @@ Completed box being shipped out [6] .....\OT1/cmr/m/it/9 - .....\discretionary (penalty 50) .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577, direction TLT .....\OT1/cmr/m/it/9 t @@ -2444,7 +2444,7 @@ Completed box being shipped out [7] .....\kern-0.47224 (font) .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922, direction TLT .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-73-style-verbose-inote.tlg b/testfiles-3runs/pn-biblatex-73-style-verbose-inote.tlg index 29f232a..3f8f44b 100644 --- a/testfiles-3runs/pn-biblatex-73-style-verbose-inote.tlg +++ b/testfiles-3runs/pn-biblatex-73-style-verbose-inote.tlg @@ -1503,7 +1503,7 @@ Completed box being shipped out [6] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642 .....\OT1/cmr/m/it/9 T @@ -1816,7 +1816,7 @@ Completed box being shipped out [6] .....\discretionary .....\OT1/cmr/m/it/9 - .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577 .....\OT1/cmr/m/it/9 t @@ -2245,7 +2245,7 @@ Completed box being shipped out [7] .....\kern-0.47224 .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922 .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-73-style-verbose-inote.xetex.tlg b/testfiles-3runs/pn-biblatex-73-style-verbose-inote.xetex.tlg index 18ab116..7809900 100644 --- a/testfiles-3runs/pn-biblatex-73-style-verbose-inote.xetex.tlg +++ b/testfiles-3runs/pn-biblatex-73-style-verbose-inote.xetex.tlg @@ -1503,7 +1503,7 @@ Completed box being shipped out [6] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642 .....\OT1/cmr/m/it/9 T @@ -1816,7 +1816,7 @@ Completed box being shipped out [6] .....\discretionary .....\OT1/cmr/m/it/9 - .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577 .....\OT1/cmr/m/it/9 t @@ -2245,7 +2245,7 @@ Completed box being shipped out [7] .....\kern-0.47224 .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922 .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-74-style-verbose-trad1.luatex.tlg b/testfiles-3runs/pn-biblatex-74-style-verbose-trad1.luatex.tlg index 2721e6b..1c67d08 100644 --- a/testfiles-3runs/pn-biblatex-74-style-verbose-trad1.luatex.tlg +++ b/testfiles-3runs/pn-biblatex-74-style-verbose-trad1.luatex.tlg @@ -1683,7 +1683,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642, direction TLT .....\OT1/cmr/m/it/9 T @@ -2007,7 +2007,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 - .....\discretionary (penalty 50) .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577, direction TLT .....\OT1/cmr/m/it/9 t @@ -2469,7 +2469,7 @@ Completed box being shipped out [5] .....\kern-0.47224 (font) .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922, direction TLT .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-74-style-verbose-trad1.luatexdev.tlg b/testfiles-3runs/pn-biblatex-74-style-verbose-trad1.luatexdev.tlg index 2721e6b..1c67d08 100644 --- a/testfiles-3runs/pn-biblatex-74-style-verbose-trad1.luatexdev.tlg +++ b/testfiles-3runs/pn-biblatex-74-style-verbose-trad1.luatexdev.tlg @@ -1683,7 +1683,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642, direction TLT .....\OT1/cmr/m/it/9 T @@ -2007,7 +2007,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 - .....\discretionary (penalty 50) .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577, direction TLT .....\OT1/cmr/m/it/9 t @@ -2469,7 +2469,7 @@ Completed box being shipped out [5] .....\kern-0.47224 (font) .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922, direction TLT .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-74-style-verbose-trad1.tlg b/testfiles-3runs/pn-biblatex-74-style-verbose-trad1.tlg index 2d7c765..e993290 100644 --- a/testfiles-3runs/pn-biblatex-74-style-verbose-trad1.tlg +++ b/testfiles-3runs/pn-biblatex-74-style-verbose-trad1.tlg @@ -1516,7 +1516,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642 .....\OT1/cmr/m/it/9 T @@ -1833,7 +1833,7 @@ Completed box being shipped out [4] .....\discretionary .....\OT1/cmr/m/it/9 - .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577 .....\OT1/cmr/m/it/9 t @@ -2276,7 +2276,7 @@ Completed box being shipped out [5] .....\kern-0.47224 .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922 .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-74-style-verbose-trad1.xetex.tlg b/testfiles-3runs/pn-biblatex-74-style-verbose-trad1.xetex.tlg index 7420b3d..2b71f5f 100644 --- a/testfiles-3runs/pn-biblatex-74-style-verbose-trad1.xetex.tlg +++ b/testfiles-3runs/pn-biblatex-74-style-verbose-trad1.xetex.tlg @@ -1516,7 +1516,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642 .....\OT1/cmr/m/it/9 T @@ -1833,7 +1833,7 @@ Completed box being shipped out [4] .....\discretionary .....\OT1/cmr/m/it/9 - .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577 .....\OT1/cmr/m/it/9 t @@ -2276,7 +2276,7 @@ Completed box being shipped out [5] .....\kern-0.47224 .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922 .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-75-style-verbose-trad2.luatex.tlg b/testfiles-3runs/pn-biblatex-75-style-verbose-trad2.luatex.tlg index 02ad30d..adc0119 100644 --- a/testfiles-3runs/pn-biblatex-75-style-verbose-trad2.luatex.tlg +++ b/testfiles-3runs/pn-biblatex-75-style-verbose-trad2.luatex.tlg @@ -1547,7 +1547,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642, direction TLT .....\OT1/cmr/m/it/9 T @@ -1871,7 +1871,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 - .....\discretionary (penalty 50) .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577, direction TLT .....\OT1/cmr/m/it/9 t @@ -2333,7 +2333,7 @@ Completed box being shipped out [5] .....\kern-0.47224 (font) .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922, direction TLT .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-75-style-verbose-trad2.luatexdev.tlg b/testfiles-3runs/pn-biblatex-75-style-verbose-trad2.luatexdev.tlg index 02ad30d..adc0119 100644 --- a/testfiles-3runs/pn-biblatex-75-style-verbose-trad2.luatexdev.tlg +++ b/testfiles-3runs/pn-biblatex-75-style-verbose-trad2.luatexdev.tlg @@ -1547,7 +1547,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642, direction TLT .....\OT1/cmr/m/it/9 T @@ -1871,7 +1871,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 - .....\discretionary (penalty 50) .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577, direction TLT .....\OT1/cmr/m/it/9 t @@ -2333,7 +2333,7 @@ Completed box being shipped out [5] .....\kern-0.47224 (font) .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922, direction TLT .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-75-style-verbose-trad2.tlg b/testfiles-3runs/pn-biblatex-75-style-verbose-trad2.tlg index e087e25..bef7d7d 100644 --- a/testfiles-3runs/pn-biblatex-75-style-verbose-trad2.tlg +++ b/testfiles-3runs/pn-biblatex-75-style-verbose-trad2.tlg @@ -1395,7 +1395,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642 .....\OT1/cmr/m/it/9 T @@ -1712,7 +1712,7 @@ Completed box being shipped out [4] .....\discretionary .....\OT1/cmr/m/it/9 - .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577 .....\OT1/cmr/m/it/9 t @@ -2155,7 +2155,7 @@ Completed box being shipped out [5] .....\kern-0.47224 .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922 .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-75-style-verbose-trad2.xetex.tlg b/testfiles-3runs/pn-biblatex-75-style-verbose-trad2.xetex.tlg index 515c0c8..a523546 100644 --- a/testfiles-3runs/pn-biblatex-75-style-verbose-trad2.xetex.tlg +++ b/testfiles-3runs/pn-biblatex-75-style-verbose-trad2.xetex.tlg @@ -1395,7 +1395,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642 .....\OT1/cmr/m/it/9 T @@ -1712,7 +1712,7 @@ Completed box being shipped out [4] .....\discretionary .....\OT1/cmr/m/it/9 - .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577 .....\OT1/cmr/m/it/9 t @@ -2155,7 +2155,7 @@ Completed box being shipped out [5] .....\kern-0.47224 .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922 .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-76-style-verbose-trad3.luatex.tlg b/testfiles-3runs/pn-biblatex-76-style-verbose-trad3.luatex.tlg index f6b0842..b16c42f 100644 --- a/testfiles-3runs/pn-biblatex-76-style-verbose-trad3.luatex.tlg +++ b/testfiles-3runs/pn-biblatex-76-style-verbose-trad3.luatex.tlg @@ -1184,7 +1184,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642, direction TLT .....\OT1/cmr/m/it/9 T @@ -1503,7 +1503,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 - .....\discretionary (penalty 50) .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577, direction TLT .....\OT1/cmr/m/it/9 t @@ -1950,7 +1950,7 @@ Completed box being shipped out [5] .....\kern-0.47224 (font) .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922, direction TLT .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-76-style-verbose-trad3.luatexdev.tlg b/testfiles-3runs/pn-biblatex-76-style-verbose-trad3.luatexdev.tlg index f6b0842..b16c42f 100644 --- a/testfiles-3runs/pn-biblatex-76-style-verbose-trad3.luatexdev.tlg +++ b/testfiles-3runs/pn-biblatex-76-style-verbose-trad3.luatexdev.tlg @@ -1184,7 +1184,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642, direction TLT .....\OT1/cmr/m/it/9 T @@ -1503,7 +1503,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 - .....\discretionary (penalty 50) .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577, direction TLT .....\OT1/cmr/m/it/9 t @@ -1950,7 +1950,7 @@ Completed box being shipped out [5] .....\kern-0.47224 (font) .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922, direction TLT .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-76-style-verbose-trad3.tlg b/testfiles-3runs/pn-biblatex-76-style-verbose-trad3.tlg index cdec80d..46db531 100644 --- a/testfiles-3runs/pn-biblatex-76-style-verbose-trad3.tlg +++ b/testfiles-3runs/pn-biblatex-76-style-verbose-trad3.tlg @@ -1034,7 +1034,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642 .....\OT1/cmr/m/it/9 T @@ -1324,7 +1324,7 @@ Completed box being shipped out [4] .....\discretionary .....\OT1/cmr/m/it/9 - .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577 .....\OT1/cmr/m/it/9 t @@ -1752,7 +1752,7 @@ Completed box being shipped out [5] .....\kern-0.47224 .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922 .....\OT1/cmr/m/it/9 M diff --git a/testfiles-3runs/pn-biblatex-76-style-verbose-trad3.xetex.tlg b/testfiles-3runs/pn-biblatex-76-style-verbose-trad3.xetex.tlg index b58cfe1..444431c 100644 --- a/testfiles-3runs/pn-biblatex-76-style-verbose-trad3.xetex.tlg +++ b/testfiles-3runs/pn-biblatex-76-style-verbose-trad3.xetex.tlg @@ -1034,7 +1034,7 @@ Completed box being shipped out [4] .....\OT1/cmr/m/it/9 i .....\OT1/cmr/m/it/9 e .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set - 0.2642 .....\OT1/cmr/m/it/9 T @@ -1324,7 +1324,7 @@ Completed box being shipped out [4] .....\discretionary .....\OT1/cmr/m/it/9 - .....\glue(\rightskip) 0.0 -....\penalty 10100 +....\penalty 250 ....\glue(\baselineskip) 4.75 ....\hbox(6.25+1.75)x345.0, glue set 0.49577 .....\OT1/cmr/m/it/9 t @@ -1752,7 +1752,7 @@ Completed box being shipped out [5] .....\kern-0.47224 .....\OT1/cmr/m/it/9 d .....\glue(\rightskip) 0.0 -....\penalty 10000 +....\penalty 150 ....\glue(\baselineskip) 3.0 ....\hbox(6.25+1.75)x345.0, glue set 0.28922 .....\OT1/cmr/m/it/9 M From 2009630a5c4203ca918fa62bdfa74b86ffec3c6c Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Wed, 14 Jun 2023 12:00:25 -0300 Subject: [PATCH 14/21] Update pn-crossref01 for upstream changes in zref-clever --- testfiles/pn-crossref01.lvt | 2 +- testfiles/pn-crossref01.tlg | 4 ++-- testfiles/pn-crossref01.xetex.tlg | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testfiles/pn-crossref01.lvt b/testfiles/pn-crossref01.lvt index 2e2214a..7262177 100644 --- a/testfiles/pn-crossref01.lvt +++ b/testfiles/pn-crossref01.lvt @@ -28,7 +28,7 @@ \BEGINTEST{cross-ref} Foo.% -\setbox0=\hbox{\postnote[label={en:1},zlabel={en:1}]{\label{en:2}\zlabel{en:2}Foo note.}}% +\setbox0=\hbox{\postnote[label={en:1}]{\label{en:2}Foo note.}}% \showbox0 \box0 diff --git a/testfiles/pn-crossref01.tlg b/testfiles/pn-crossref01.tlg index 76ae5e5..41d9ddd 100644 --- a/testfiles/pn-crossref01.tlg +++ b/testfiles/pn-crossref01.tlg @@ -11,8 +11,8 @@ TEST 1: cross-ref ...\pdfdest name{postnote.1.mark} xyz ...\penalty 10000 .\write1{\token_to_str:N \post@note {mark@1}{\thepage }} -.\write1{\newlabel{en:1}{{1}{\thepage }{First chapter}{postnote.1.mark}{}}} .\write1{\zref@newlabel{en:1}{\default{1}\page{\Z@C@page }\abspage{\Z@C@abspage }\zc@counter{postnote}\thecounter{1}\zc@type{endnote}\zc@cntval{1}\zc@pgval{\Z@C@zc@pgval }\zc@enclval{}\zc@pgfmt{\Z@C@zc@pgfmt }\anchor{postnote.1.mark}}} +.\write1{\newlabel{en:1}{{1}{\thepage }{First chapter}{postnote.1.mark}{}}} .\penalty 10000 .\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[1 0 0]} action goto name{postnote.1.text} .\hbox(8.14003+0.0)x4.48613 @@ -156,8 +156,8 @@ Completed box being shipped out [3] .......\pdfendlink ......\glue 5.0 .....\penalty 0 -.....\write1{\newlabel{en:2}{{1}{\thepage }{\pntitle }{postnote.1.text}{}}} .....\write1{\zref@newlabel{en:2}{\default{1}\page{\Z@C@page }\abspage{\Z@C@abspage }\zc@counter{postnotetext}\thecounter{1}\zc@type{endnote}\zc@cntval{1}\zc@pgval{\Z@C@zc@pgval }\zc@enclval{{10000}}\zc@pgfmt{\Z@C@zc@pgfmt }\anchor{postnote.1.text}}} +.....\write1{\newlabel{en:2}{{1}{\thepage }{\pntitle }{postnote.1.text}{}}} .....\OT1/cmr/m/n/9 F .....\kern-0.77083 .....\OT1/cmr/m/n/9 o diff --git a/testfiles/pn-crossref01.xetex.tlg b/testfiles/pn-crossref01.xetex.tlg index b3e2b65..1276941 100644 --- a/testfiles/pn-crossref01.xetex.tlg +++ b/testfiles/pn-crossref01.xetex.tlg @@ -11,8 +11,8 @@ TEST 1: cross-ref ...\special{pdf:dest (postnote.1.mark) [@thispage /XYZ @xpos @ypos null]} ...\penalty 10000 .\write1{\token_to_str:N \post@note {mark@1}{\thepage }} -.\write1{\newlabel{en:1}{{1}{\thepage }{First chapter}{postnote.1.mark}{}}} .\write1{\zref@newlabel{en:1}{\default{1}\page{\Z@C@page }\abspage{\Z@C@abspage }\zc@counter{postnote}\thecounter{1}\zc@type{endnote}\zc@cntval{1}\zc@pgval{\Z@C@zc@pgval }\zc@enclval{}\zc@pgfmt{\Z@C@zc@pgfmt }\anchor{postnote.1.mark}}} +.\write1{\newlabel{en:1}{{1}{\thepage }{First chapter}{postnote.1.mark}{}}} .\penalty 10000 .\special{pdf:bann<>>>} .\hbox(8.14003+0.0)x4.48613 @@ -156,8 +156,8 @@ Completed box being shipped out [3] .......\special{pdf:eann} ......\glue 5.0 .....\penalty 0 -.....\write1{\newlabel{en:2}{{1}{\thepage }{\pntitle }{postnote.1.text}{}}} .....\write1{\zref@newlabel{en:2}{\default{1}\page{\Z@C@page }\abspage{\Z@C@abspage }\zc@counter{postnotetext}\thecounter{1}\zc@type{endnote}\zc@cntval{1}\zc@pgval{\Z@C@zc@pgval }\zc@enclval{{10000}}\zc@pgfmt{\Z@C@zc@pgfmt }\anchor{postnote.1.text}}} +.....\write1{\newlabel{en:2}{{1}{\thepage }{\pntitle }{postnote.1.text}{}}} .....\OT1/cmr/m/n/9 F .....\kern-0.77083 .....\OT1/cmr/m/n/9 o From c7292da331403fd9bcd23676d23465692ba3c86c Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Fri, 16 Jun 2023 10:04:07 -0300 Subject: [PATCH 15/21] Step release tag --- CHANGELOG.md | 4 +++- build.lua | 2 +- ctan-announcement.text | 12 +++--------- postnotes.dtx | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 203fb44..dc6811e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog -## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.2.4...HEAD) +## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.2.5...HEAD) + +## [v0.2.5](https://github.com/gusbrs/postnotes/compare/v0.2.4...v0.2.5) (2023-06-16) ### Fixed - Ensure `\par` at the end of `\printpostnotes`, see diff --git a/build.lua b/build.lua index 20e906a..4d994af 100644 --- a/build.lua +++ b/build.lua @@ -56,7 +56,7 @@ asciiengines = {} -- CTAN upload settings uploadconfig = { - version = "0.2.4", -- first line for tagging + version = "0.2.5", -- first line for tagging pkg = "postnotes", author = "Gustavo Barros", uploader = "Gustavo Barros", diff --git a/ctan-announcement.text b/ctan-announcement.text index c922c10..6a08c43 100644 --- a/ctan-announcement.text +++ b/ctan-announcement.text @@ -1,12 +1,6 @@ -## v0.2.4 (2023-06-12) - -### Changed -- Use new `\lTblrMeasuringBool` for identifying measuring passes in - `tabularray` tables. +## v0.2.5 (2023-06-16) ### Fixed -- Don't inhibit `postnote` counter stepping in contexts which restore counter - values in measuring passes to ensure proper measuring. -- Update User manual and regression tests for `l3kernel`'s renaming of - `\bool_case_true:n(TF)` to `\bool_case:n(TF)`. +- Ensure `\par` at the end of `\printpostnotes`, see + https://github.com/u-fischer/tagpdf/issues/68#issuecomment-1587343876 . diff --git a/postnotes.dtx b/postnotes.dtx index c429b8c..cb7998f 100644 --- a/postnotes.dtx +++ b/postnotes.dtx @@ -154,7 +154,7 @@ % % % \begin{macrocode} -\ProvidesExplPackage {postnotes} {2023-06-12} {0.2.4} +\ProvidesExplPackage {postnotes} {2023-06-16} {0.2.5} {Endnotes for LaTeX} % \end{macrocode} % From 42be7e6df8c244d737ead33f407abff1390810c6 Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Wed, 2 Aug 2023 11:41:07 -0300 Subject: [PATCH 16/21] Add required kernel version to \NeedsTeXFormat --- postnotes.dtx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postnotes.dtx b/postnotes.dtx index cb7998f..dd0d401 100644 --- a/postnotes.dtx +++ b/postnotes.dtx @@ -138,7 +138,7 @@ % kernel or newer. % % \begin{macrocode} -\NeedsTeXFormat{LaTeX2e} +\NeedsTeXFormat{LaTeX2e}[2022-06-01] \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \IfFormatAtLeastTF{2022-06-01} {} From 2f44e0ecaef3ace7f00e628df58fc25bee507f3f Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Wed, 2 Aug 2023 11:41:28 -0300 Subject: [PATCH 17/21] Don't \endinput if kernel too old --- postnotes.dtx | 2 -- 1 file changed, 2 deletions(-) diff --git a/postnotes.dtx b/postnotes.dtx index dd0d401..06aeb9b 100644 --- a/postnotes.dtx +++ b/postnotes.dtx @@ -146,9 +146,7 @@ \PackageError{postnotes}{LaTeX kernel too old} {% 'postnotes' requires a LaTeX kernel 2022-06-01 or newer.% - \MessageBreak Loading will abort!% }% - \endinput }% % \end{macrocode} % From 626a5749cf12c389b89a7d0bbeb0f69b551ea312 Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Wed, 2 Aug 2023 14:27:47 -0300 Subject: [PATCH 18/21] Store required kernel version in macro --- postnotes.dtx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/postnotes.dtx b/postnotes.dtx index 06aeb9b..8d1d769 100644 --- a/postnotes.dtx +++ b/postnotes.dtx @@ -138,14 +138,15 @@ % kernel or newer. % % \begin{macrocode} -\NeedsTeXFormat{LaTeX2e}[2022-06-01] +\def\postnotes@required@kernel{2022-06-01} +\NeedsTeXFormat{LaTeX2e}[\postnotes@required@kernel] \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} -\IfFormatAtLeastTF{2022-06-01} +\IfFormatAtLeastTF{\postnotes@required@kernel} {} {% \PackageError{postnotes}{LaTeX kernel too old} {% - 'postnotes' requires a LaTeX kernel 2022-06-01 or newer.% + 'postnotes' requires a LaTeX kernel \postnotes@required@kernel\space or newer.% }% }% % \end{macrocode} From 6c50cb56307400877c734b079c1743baa443e367 Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Mon, 14 Aug 2023 08:15:32 -0300 Subject: [PATCH 19/21] Update documentation link in Readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 559a643..1bff2ae 100644 --- a/README.md +++ b/README.md @@ -15,4 +15,4 @@ notes, including back links. The released version of this package is available [from CTAN](https://ctan.org/pkg/postnotes). For more details, check the -[Documentation](https://mirrors.ctan.org/macros/latex/contrib/postnotes/postnotes.pdf). +[Documentation](https://mirrors.ctan.org/macros/latex/contrib/postnotes/postnotes-doc.pdf). From 9853c56c583f20ffa17e0f82bdceefe835668056 Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Mon, 14 Aug 2023 15:48:54 -0300 Subject: [PATCH 20/21] Check if@filesw before writing labels to the .aux file And abstract \__postnotes_set_label:nn. --- CHANGELOG.md | 3 +++ postnotes.dtx | 29 +++++++++++++++-------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc6811e..ad77970 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.2.5...HEAD) +### Fixed +- Check `if@filesw` before writing labels to the .aux file. + ## [v0.2.5](https://github.com/gusbrs/postnotes/compare/v0.2.4...v0.2.5) (2023-06-16) ### Fixed diff --git a/postnotes.dtx b/postnotes.dtx index 8d1d769..9d5c18a 100644 --- a/postnotes.dtx +++ b/postnotes.dtx @@ -298,6 +298,7 @@ % % \begin{macro} % { +% \@@_set_label:nn , % \@@_set_mark_page_label:n , % \@@_set_text_page_label:n , % \@@_set_print_page_label:n , @@ -306,28 +307,28 @@ % \cs{iow_shipout_x:Nn}, since the main information we are interested in is % the \texttt{page}. % \begin{syntax} -% \cs{@@_set_mark_page_label:n} \Arg{label name} -% \cs{@@_set_text_page_label:n} \Arg{label name} -% \cs{@@_set_print_page_label:n} \Arg{label name} +% \cs{@@_set_label:nn} \Arg{label name} \Arg{value} +% \cs{@@_set_mark_page_label:n} \Arg{note id} +% \cs{@@_set_text_page_label:n} \Arg{note id} +% \cs{@@_set_print_page_label:n} \Arg{note id} % \end{syntax} % \begin{macrocode} -\cs_new_protected:Npn \@@_set_mark_page_label:n #1 +\cs_new_protected:Npn \@@_set_label:nn #1#2 { - \iow_shipout_x:Nn \@auxout - { \token_to_str:N \post@note { mark@ #1 } { \thepage } } + \legacy_if:nT { @filesw } + { + \iow_shipout_x:Nn \@auxout + { \token_to_str:N \post@note { #1 } { #2 } } + } } +\cs_new_protected:Npn \@@_set_mark_page_label:n #1 + { \@@_set_label:nn { mark@ #1 } { \thepage } } \cs_generate_variant:Nn \@@_set_mark_page_label:n { x } \cs_new_protected:Npn \@@_set_text_page_label:n #1 - { - \iow_shipout_x:Nn \@auxout - { \token_to_str:N \post@note { text@ #1 } { \int_use:N \c@page } } - } + { \@@_set_label:nn { text@ #1 } { \int_use:N \c@page } } \cs_generate_variant:Nn \@@_set_text_page_label:n { x } \cs_new_protected:Npn \@@_set_print_page_label:n #1 - { - \iow_shipout_x:Nn \@auxout - { \token_to_str:N \post@note { print@ #1 } { \int_use:N \c@page } } - } + { \@@_set_label:nn { print@ #1 } { \int_use:N \c@page } } \cs_generate_variant:Nn \@@_set_print_page_label:n { x } % \end{macrocode} % \end{macro} From 2a62ac56848b9413afc24c0a64c14a2cbbc96b54 Mon Sep 17 00:00:00 2001 From: gusbrs <19410606+gusbrs@users.noreply.github.com> Date: Mon, 14 Aug 2023 17:26:50 -0300 Subject: [PATCH 21/21] Ensure \post@note is defined in the .aux file --- CHANGELOG.md | 1 + postnotes.dtx | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad77970..3e757a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Fixed - Check `if@filesw` before writing labels to the .aux file. +- Ensure `\post@note` is defined in the .aux file. ## [v0.2.5](https://github.com/gusbrs/postnotes/compare/v0.2.4...v0.2.5) (2023-06-16) diff --git a/postnotes.dtx b/postnotes.dtx index 9d5c18a..7ef37da 100644 --- a/postnotes.dtx +++ b/postnotes.dtx @@ -295,6 +295,28 @@ % \end{macrocode} % \end{macro} % +% And ensure \cs{post@note} is defined in the \file{.aux} file. The hooks are +% the same used by \pkg{hyperref} for similar purpose. +% +% \begin{macrocode} +\AddToHook { begindocument } + { + \legacy_if:nT { @filesw } + { + \iow_now:Nx \@mainaux + { \token_to_str:N \providecommand \token_to_str:N \post@note [2]{} } + } + } +\AddToHook { include/before } + { + \legacy_if:nT { @filesw } + { + \iow_now:Nx \@partaux + { \token_to_str:N \providecommand \token_to_str:N \post@note [2]{} } + } + } +% \end{macrocode} +% % % \begin{macro} % {