diff options
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/postnotes/CHANGELOG.md | 11 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/postnotes/postnotes-code.pdf | bin | 815331 -> 838960 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/postnotes/postnotes-code.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/postnotes/postnotes.pdf | bin | 177361 -> 177382 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/postnotes/postnotes.tex | 67 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/postnotes/postnotes.dtx | 103 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/postnotes/postnotes.ins | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/postnotes/postnotes.sty | 64 |
8 files changed, 136 insertions, 115 deletions
diff --git a/Master/texmf-dist/doc/latex/postnotes/CHANGELOG.md b/Master/texmf-dist/doc/latex/postnotes/CHANGELOG.md index c6fa6634787..d9b24379f53 100644 --- a/Master/texmf-dist/doc/latex/postnotes/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/postnotes/CHANGELOG.md @@ -1,6 +1,15 @@ # Changelog -## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.2.0...HEAD) +## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.2.1...HEAD) + +## [v0.2.1](https://github.com/gusbrs/postnotes/compare/v0.2.0...v0.2.1) (2023-02-13) + +### Fixed +- User manual typos. + +### Changed +- To standardize hooks' names, the `postnotes/store/note` hook has been + renamed to `postnotes/note/store`. ## [v0.2.0](https://github.com/gusbrs/postnotes/compare/v0.1.7...v0.2.0) (2022-12-28) diff --git a/Master/texmf-dist/doc/latex/postnotes/postnotes-code.pdf b/Master/texmf-dist/doc/latex/postnotes/postnotes-code.pdf Binary files differindex b5a50db4248..644edf8e889 100644 --- a/Master/texmf-dist/doc/latex/postnotes/postnotes-code.pdf +++ b/Master/texmf-dist/doc/latex/postnotes/postnotes-code.pdf diff --git a/Master/texmf-dist/doc/latex/postnotes/postnotes-code.tex b/Master/texmf-dist/doc/latex/postnotes/postnotes-code.tex index cc23313f517..59ed76afd88 100644 --- a/Master/texmf-dist/doc/latex/postnotes/postnotes-code.tex +++ b/Master/texmf-dist/doc/latex/postnotes/postnotes-code.tex @@ -4,7 +4,7 @@ % % This file is part of the LaTeX package "postnotes". % -% Copyright (C) 2022 Gustavo Barros +% Copyright (C) 2022-2023 Gustavo Barros % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this diff --git a/Master/texmf-dist/doc/latex/postnotes/postnotes.pdf b/Master/texmf-dist/doc/latex/postnotes/postnotes.pdf Binary files differindex 58a7d4a3e74..52735b15623 100644 --- a/Master/texmf-dist/doc/latex/postnotes/postnotes.pdf +++ b/Master/texmf-dist/doc/latex/postnotes/postnotes.pdf diff --git a/Master/texmf-dist/doc/latex/postnotes/postnotes.tex b/Master/texmf-dist/doc/latex/postnotes/postnotes.tex index 79f77d22cbb..2496f321219 100644 --- a/Master/texmf-dist/doc/latex/postnotes/postnotes.tex +++ b/Master/texmf-dist/doc/latex/postnotes/postnotes.tex @@ -4,7 +4,7 @@ % % This file is part of the LaTeX package "postnotes". % -% Copyright (C) 2022 Gustavo Barros +% Copyright (C) 2022-2023 Gustavo Barros % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -313,7 +313,7 @@ is also provided. \begin{function}{\postnotesetup} \begin{syntax} - \cs{postnotesetup}\oarg{options} + \cs{postnotesetup}\marg{options} \end{syntax} \end{function} Package options can be configured by means of \cs{postnotesetup}, which @@ -540,34 +540,34 @@ expanded in place, but rather stored with ``no manipulation'' to be typeset later at \cs{printpostnotes}. For this reason, some contextual information is stored at the place \cs{postnotesection} is called, and made available at the point it's content gets expanded by means of some variables (you can use -\cs{postnotesectionx} instead, in which case these variables are of little -use). When the content of a notes section gets typeset, \cs{pnthechapter} -contains the value of \cs{thechapter} where \cs{postnotesection} was -originally called. Similarly, \cs{pnthesection} contains the value of -\cs{thesection}. \cs{pnthechapternextnote} and \cs{pnthesectionnextnote} are -meant to support the automation of the notes subdivision by using hooks to -sectioning commands, which is a quite natural way to do this. However, since -it may be problematic to hook \emph{after} sectioning commands -- -\cs{section}, for example, figures prominently in the documentation of -\pkg{ltcmdhooks} as a case of ``look ahead'' command for which the -\texttt{after} hook is not supported -- we will typically want to hook -\emph{before} them. But, at this point the values of the \texttt{chapter} or -\texttt{section} counters have not yet been stepped, therefore \cs{thechapter} -and \cs{thesection} do not correspond to what we would like to refer to. For -this reason, \cs{pnthechapternextnote} contains the value of \cs{thechapter} -at the point the ``next note'' is placed (a \cs{postnote}, that is), the first -in the chapter, and already inside it, thus with an expected value of the -\texttt{chapter} counter. Similarly, \cs{pnthesectionnextnote} contains the -value of \cs{thesection} for the ``next note''. Of course, the ``next note'' -variables are \emph{proxies}, but they are meant to support the automation of -the subdivision of the notes through the use of \texttt{before} hooks to the -document's sectioning commands, in which case the subdivision of the notes -will correspond to the document's structure and, given empty notes sections -are skipped, the values will be the ones we are interested in. But more -complex use cases may require something different. Either way, it is up to -the user to judge whether the \emph{proxy} is a good one for their use case, -the variables just do what they say, and contain the values of interest for -the ``next note''. +\cs{postnotesection}\texttt{[exp]} instead, in which case these variables are +of little use). When the content of a notes section gets typeset, +\cs{pnthechapter} contains the value of \cs{thechapter} where +\cs{postnotesection} was originally called. Similarly, \cs{pnthesection} +contains the value of \cs{thesection}. \cs{pnthechapternextnote} and +\cs{pnthesectionnextnote} are meant to support the automation of the notes +subdivision by using hooks to sectioning commands, which is a quite natural +way to do this. However, since it may be problematic to hook \emph{after} +sectioning commands -- \cs{section}, for example, figures prominently in the +documentation of \pkg{ltcmdhooks} as a case of ``look ahead'' command for +which the \texttt{after} hook is not supported -- we will typically want to +hook \emph{before} them. But, at this point the values of the +\texttt{chapter} or \texttt{section} counters have not yet been stepped, +therefore \cs{thechapter} and \cs{thesection} do not correspond to what we +would like to refer to. For this reason, \cs{pnthechapternextnote} contains +the value of \cs{thechapter} at the point the ``next note'' is placed (a +\cs{postnote}, that is), the first in the chapter, and already inside it, thus +with an expected value of the \texttt{chapter} counter. Similarly, +\cs{pnthesectionnextnote} contains the value of \cs{thesection} for the ``next +note''. Of course, the ``next note'' variables are \emph{proxies}, but they +are meant to support the automation of the subdivision of the notes through +the use of \texttt{before} hooks to the document's sectioning commands, in +which case the subdivision of the notes will correspond to the document's +structure and, given empty notes sections are skipped, the values will be the +ones we are interested in. But more complex use cases may require something +different. Either way, it is up to the user to judge whether the \emph{proxy} +is a good one for their use case, the variables just do what they say, and +contain the values of interest for the ``next note''. This is meant to be simple. Some examples might make things more concrete. At its most basic, \cs{postnotesection} can just be set manually: @@ -963,11 +963,16 @@ provided by (in chronological order): % 2022-03-28: https://chat.stackexchange.com/transcript/message/60754383#60754383 % 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) David Carlisle, % 2022-03-28: https://chat.stackexchange.com/transcript/message/60754383#60754383 % 2022-04-08: https://tex.stackexchange.com/a/640035 (comments) - and Moritz Wemheuer. + % 2023-02-10: https://chat.stackexchange.com/transcript/message/62955941#62955941 (and discussion) + % 2023-02-10: https://tex.stackexchange.com/a/674846 + Moritz Wemheuer, % 2022-04-05: https://tex.stackexchange.com/q/597359#comment1594585_597389 + and Joseph Wright. + % 2023-02-10: https://chat.stackexchange.com/transcript/message/62955941#62955941 (and discussion) The package's language support have been provided or improved thanks to: \username{Pika78} (French) diff --git a/Master/texmf-dist/source/latex/postnotes/postnotes.dtx b/Master/texmf-dist/source/latex/postnotes/postnotes.dtx index b6a9a15572c..fab2cb99144 100644 --- a/Master/texmf-dist/source/latex/postnotes/postnotes.dtx +++ b/Master/texmf-dist/source/latex/postnotes/postnotes.dtx @@ -4,7 +4,7 @@ % % This file is part of the LaTeX package "postnotes". % -% Copyright (C) 2022 Gustavo Barros +% Copyright (C) 2022-2023 Gustavo Barros % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -153,7 +153,7 @@ % % % \begin{macrocode} -\ProvidesExplPackage {postnotes} {2022-12-28} {0.2.0} +\ProvidesExplPackage {postnotes} {2023-02-13} {0.2.1} {Endnotes for LaTeX} % \end{macrocode} % @@ -175,16 +175,23 @@ % \end{macro} % % +% \pkg{postnotes} provides a number of hooks from the new hook system to grant +% some points of access in key places of the package. Note that hooks created +% with \cs{NewHook} are meant to be public interfaces (see +% \url{https://chat.stackexchange.com/transcript/message/62955941#62955941}, +% and following discussion). +% +% % \begin{macro}{\@@_store:nn} % Stores the metadata and \meta{note content} of \cs{postnote} with ID % \meta{note id}, from where it is called. The -% \texttt{postnotes/store/note} hook is intended to add further data to the +% \texttt{postnotes/note/store} hook is intended to add further data to the % note, when required to support packages with specific needs. % \begin{syntax} % \cs{@@_store:nn} \Arg{note id} \Arg{note content} % \end{syntax} % \begin{macrocode} -\NewHook { postnotes/store/note } +\NewHook { postnotes/note/store } \cs_new_protected:Npn \@@_store:nn #1#2 { \prop_new:c { \@@_data_name:e {#1} } @@ -213,7 +220,7 @@ \prop_gput:cnx { \@@_data_name:e {#1} } { multibool } { \bool_to_str:N \l_@@_maybe_multi_bool } \prop_gput:cnn { \@@_data_name:e {#1} } { content } {#2} - \UseHook { postnotes/store/note } + \UseHook { postnotes/note/store } } % \end{macrocode} % \end{macro} @@ -811,20 +818,20 @@ % \begin{macro} % { % \g_@@_note_id_int , -% \l_@@_note_id_tl , +% \l_postnotes_note_id_tl , % \g_@@_queue_seq , % } % \cs{g_@@_note_id_int} is the internal, unique counter which provides the % ID number of each note. It ties ``mark'' and ``text'' together, is also % the connection between each note and its data, including the content, % which is stored in a property list named according to \cs{@@_data_name:n} -% and the ID number. \cs{l_@@_note_id_tl} is a convenience variable storing -% the counter's value. \cs{g_@@_queue_seq} stores the sequence of notes' -% IDs that to be processed by the next call of \cs{printpostnotes}. +% and the ID number. \cs{l_postnotes_note_id_tl} is a convenience variable +% storing the counter's value. \cs{g_@@_queue_seq} stores the sequence of +% notes' IDs to be processed by the next call of \cs{printpostnotes}. % \begin{macrocode} \int_new:N \g_@@_note_id_int -\tl_new:N \l_@@_note_id_tl -\tl_set:Nn \l_@@_note_id_tl { \int_use:N \g_@@_note_id_int } +\tl_new:N \l_postnotes_note_id_tl +\tl_set:Nn \l_postnotes_note_id_tl { \int_use:N \g_@@_note_id_int } \seq_new:N \g_@@_queue_seq % \end{macrocode} % \end{macro} @@ -866,19 +873,19 @@ \tl_set:Nx \l_@@_mark_tl { \thepostnote } } \seq_gput_right:Nx \g_@@_queue_seq - { \l_@@_note_id_tl } + { \l_postnotes_note_id_tl } \UseHook { postnotes/note/begin } \cs_set:Npn \@currentcounter { postnote } \cs_set:Npx \@currentlabel { \p@postnote \l_@@_mark_tl } - \MakeLinkTarget* { postnote. \l_@@_note_id_tl .mark } - \@@_set_mark_page_label:x { \l_@@_note_id_tl } + \MakeLinkTarget* { postnote. \l_postnotes_note_id_tl .mark } + \@@_set_mark_page_label:x { \l_postnotes_note_id_tl } \@@_set_user_labels: \bool_if:NF \l_@@_nomark_bool { \@@_typeset_mark:xV - { \l_@@_note_id_tl } \l_@@_mark_tl + { \l_postnotes_note_id_tl } \l_@@_mark_tl } - \@@_store:nn { \l_@@_note_id_tl } {#2} + \@@_store:nn { \l_postnotes_note_id_tl } {#2} } \group_end: } @@ -1107,12 +1114,12 @@ \group_begin: \int_gincr:N \g_@@_sectid_int \int_gincr:N \g_@@_note_id_int - \seq_gput_right:Nx \g_@@_queue_seq { \l_@@_note_id_tl } + \seq_gput_right:Nx \g_@@_queue_seq { \l_postnotes_note_id_tl } \tl_gclear:N \g_@@_section_name_tl \keys_set:nn { postnotes/section } {#1} \bool_if:NTF \l_@@_section_exp_bool - { \@@_store_section:nx { \l_@@_note_id_tl } {#2} } - { \@@_store_section:nn { \l_@@_note_id_tl } {#2} } + { \@@_store_section:nx { \l_postnotes_note_id_tl } {#2} } + { \@@_store_section:nn { \l_postnotes_note_id_tl } {#2} } \group_end: } % \end{macrocode} @@ -1173,7 +1180,7 @@ % \begin{macro} % { % \g_@@_print_postnotes_int , -% \l_@@_print_note_id_tl , +% \l_postnotes_print_note_id_tl , % \l_@@_print_note_id_next_tl , % \l_@@_print_counter_tl , % \l_@@_print_mark_tl , @@ -1186,7 +1193,7 @@ % Auxiliary variables for \cs{@@_print_notes:}. % \begin{macrocode} \int_new:N \g_@@_print_postnotes_int -\tl_new:N \l_@@_print_note_id_tl +\tl_new:N \l_postnotes_print_note_id_tl \tl_new:N \l_@@_print_note_id_next_tl \tl_new:N \l_@@_print_counter_tl \tl_new:N \l_@@_print_mark_tl @@ -1285,8 +1292,8 @@ \bool_until_do:nn { \seq_if_empty_p:N \g_@@_queue_seq } { \seq_gpop_left:NN \g_@@_queue_seq - \l_@@_print_note_id_tl - \@@_prop_get:nnN { \l_@@_print_note_id_tl } + \l_postnotes_print_note_id_tl + \@@_prop_get:nnN { \l_postnotes_print_note_id_tl } { type } \l_@@_print_type_curr_tl \tl_if_eq:NnTF \l_@@_print_type_curr_tl { section } { % type_curr = `section' @@ -1311,10 +1318,10 @@ \stepcounter { postnotesection } \group_begin: \@@_prop_get:nnN - { \l_@@_print_note_id_tl } + { \l_postnotes_print_note_id_tl } { thechapter } \pnthechapter \@@_prop_get:nnN - { \l_@@_print_note_id_tl } + { \l_postnotes_print_note_id_tl } { thesection } \pnthesection \@@_prop_get:nnN { \l_@@_print_note_id_next_tl } @@ -1323,7 +1330,7 @@ { \l_@@_print_note_id_next_tl } { thesection } \pnthesectionnextnote \@@_prop_get:nnN - { \l_@@_print_note_id_tl } + { \l_postnotes_print_note_id_tl } { content } \l_@@_print_content_tl \l_@@_print_content_tl \group_end: @@ -1345,15 +1352,15 @@ \group_begin: \UseHook { postnotes/print/eachnote } \@@_get_pageref:Nx \pnthepage - { mark@ \l_@@_print_note_id_tl } + { mark@ \l_postnotes_print_note_id_tl } \@@_prop_get:nnN - { \l_@@_print_note_id_tl } + { \l_postnotes_print_note_id_tl } { mark } \l_@@_print_mark_tl \@@_prop_get:nnN - { \l_@@_print_note_id_tl } + { \l_postnotes_print_note_id_tl } { counter } \l_@@_print_counter_tl \@@_prop_get:nnN - { \l_@@_print_note_id_tl } + { \l_postnotes_print_note_id_tl } { content } \l_@@_print_content_tl \cs_set:Npn \@currentcounter { postnotetext } \int_set:Nn \c@postnotetext @@ -1363,11 +1370,11 @@ \@@_text_mark_wrapper:n { \MakeLinkTarget* - { postnote. \l_@@_print_note_id_tl .text } + { postnote. \l_postnotes_print_note_id_tl .text } \@@_set_text_page_label:x - { \l_@@_print_note_id_tl } + { \l_postnotes_print_note_id_tl } \@@_typeset_text_mark:eV - { \l_@@_print_note_id_tl } + { \l_postnotes_print_note_id_tl } \l_@@_print_mark_tl } \l_@@_print_content_tl @@ -2042,16 +2049,16 @@ % \end{macrocode} % Store \pkg{biblatex} variables for each note. % \begin{macrocode} - \AddToHook { postnotes/store/note } [ postnotes ] + \AddToHook { postnotes/note/store } [ postnotes ] { - \prop_gput:cnx { \@@_data_name:e { \l_@@_note_id_tl } } + \prop_gput:cnx { \@@_data_name:e { \l_postnotes_note_id_tl } } { biblatex@refsection } { \int_use:N \c@refsection } - \prop_gput:cnx { \@@_data_name:e { \l_@@_note_id_tl } } + \prop_gput:cnx { \@@_data_name:e { \l_postnotes_note_id_tl } } { biblatex@refsegment } { \int_use:N \c@refsegment } - \prop_gput:cnx { \@@_data_name:e { \l_@@_note_id_tl } } + \prop_gput:cnx { \@@_data_name:e { \l_postnotes_note_id_tl } } { biblatex@refcontextbool } { \iftoggle { blx@refcontext } { true } { false } } - \prop_gput:cnV { \@@_data_name:e { \l_@@_note_id_tl } } + \prop_gput:cnV { \@@_data_name:e { \l_postnotes_note_id_tl } } { biblatex@refcontext } \blx@refcontext@context } % \end{macrocode} @@ -2067,16 +2074,16 @@ % \begin{macrocode} \AddToHook { postnotes/print/eachnote } [ postnotes ] { - \@@_prop_get:nnN { \l_@@_print_note_id_tl } + \@@_prop_get:nnN { \l_postnotes_print_note_id_tl } { biblatex@refsection } \l_@@_restore_tmp_tl \int_set:Nn \c@refsection { \l_@@_restore_tmp_tl } - \@@_prop_get:nnN { \l_@@_print_note_id_tl } + \@@_prop_get:nnN { \l_postnotes_print_note_id_tl } { biblatex@refsegment } \l_@@_restore_tmp_tl \int_set:Nn \c@refsegment { \l_@@_restore_tmp_tl } - \@@_prop_get:nnN { \l_@@_print_note_id_tl } + \@@_prop_get:nnN { \l_postnotes_print_note_id_tl } { biblatex@refcontextbool } \l_@@_restore_tmp_tl \use:c { toggle \l_@@_restore_tmp_tl } { blx@refcontext } - \@@_prop_get:nnN { \l_@@_print_note_id_tl } + \@@_prop_get:nnN { \l_postnotes_print_note_id_tl } { biblatex@refcontext } \l_@@_restore_tmp_tl \blx@edef@refcontext { \l_@@_restore_tmp_tl } } @@ -2196,7 +2203,7 @@ } \AddToHook { postnotes/print/eachnote } [ postnotes ] { - \@@_prop_get:nnN { \l_@@_print_note_id_tl } + \@@_prop_get:nnN { \l_postnotes_print_note_id_tl } { biblatex@refsection } \l_@@_restore_tmp_tl \tl_if_eq:NNF \l_@@_restore_tmp_tl @@ -2311,19 +2318,19 @@ { \IfPackageAtLeastTF { zref-check } { 2022-07-05 } { - \AddToHook { postnotes/store/note } [ postnotes ] + \AddToHook { postnotes/note/store } [ postnotes ] { - \prop_gput:cnx { \@@_data_name:e { \l_@@_note_id_tl } } + \prop_gput:cnx { \@@_data_name:e { \l_postnotes_note_id_tl } } { zref-check@abschap } { \int_use:N \c@zc@abschap } - \prop_gput:cnx { \@@_data_name:e { \l_@@_note_id_tl } } + \prop_gput:cnx { \@@_data_name:e { \l_postnotes_note_id_tl } } { zref-check@abssec } { \int_use:N \c@zc@abssec } } \AddToHook { postnotes/print/eachnote } [ postnotes ] { - \@@_prop_get:nnN { \l_@@_print_note_id_tl } + \@@_prop_get:nnN { \l_postnotes_print_note_id_tl } { zref-check@abschap } \l_@@_restore_tmp_tl \int_set:Nn \c@zc@abschap { \l_@@_restore_tmp_tl } - \@@_prop_get:nnN { \l_@@_print_note_id_tl } + \@@_prop_get:nnN { \l_postnotes_print_note_id_tl } { zref-check@abssec } \l_@@_restore_tmp_tl \int_set:Nn \c@zc@abssec { \l_@@_restore_tmp_tl } } diff --git a/Master/texmf-dist/source/latex/postnotes/postnotes.ins b/Master/texmf-dist/source/latex/postnotes/postnotes.ins index e8c217a13b1..3897fb0534d 100644 --- a/Master/texmf-dist/source/latex/postnotes/postnotes.ins +++ b/Master/texmf-dist/source/latex/postnotes/postnotes.ins @@ -4,7 +4,7 @@ % % This file is part of the LaTeX package "postnotes". % -% Copyright (C) 2022 Gustavo Barros +% Copyright (C) 2022-2023 Gustavo Barros % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -50,7 +50,7 @@ This file was generated from file(s) of the LaTeX package "postnotes". -Copyright (C) 2022 Gustavo Barros +Copyright (C) 2022-2023 Gustavo Barros It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this diff --git a/Master/texmf-dist/tex/latex/postnotes/postnotes.sty b/Master/texmf-dist/tex/latex/postnotes/postnotes.sty index 1a55e28309a..b78ca391314 100644 --- a/Master/texmf-dist/tex/latex/postnotes/postnotes.sty +++ b/Master/texmf-dist/tex/latex/postnotes/postnotes.sty @@ -8,7 +8,7 @@ %% %% This file was generated from file(s) of the LaTeX package "postnotes". %% -%% Copyright (C) 2022 Gustavo Barros +%% Copyright (C) 2022-2023 Gustavo Barros %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -53,12 +53,12 @@ }% \endinput }% -\ProvidesExplPackage {postnotes} {2022-12-28} {0.2.0} +\ProvidesExplPackage {postnotes} {2023-02-13} {0.2.1} {Endnotes for LaTeX} \cs_new:Npn \__postnotes_data_name:n #1 { g__postnotes_ #1 _data_prop } \cs_generate_variant:Nn \__postnotes_data_name:n { e } -\NewHook { postnotes/store/note } +\NewHook { postnotes/note/store } \cs_new_protected:Npn \__postnotes_store:nn #1#2 { \prop_new:c { \__postnotes_data_name:e {#1} } @@ -87,7 +87,7 @@ \prop_gput:cnx { \__postnotes_data_name:e {#1} } { multibool } { \bool_to_str:N \l__postnotes_maybe_multi_bool } \prop_gput:cnn { \__postnotes_data_name:e {#1} } { content } {#2} - \UseHook { postnotes/store/note } + \UseHook { postnotes/note/store } } \cs_new_protected:Npn \__postnotes_store_section:nn #1#2 { @@ -347,8 +347,8 @@ { \keys_set:nn { postnotes/setup } {#1} } \newcounter { postnote } \int_new:N \g__postnotes_note_id_int -\tl_new:N \l__postnotes_note_id_tl -\tl_set:Nn \l__postnotes_note_id_tl { \int_use:N \g__postnotes_note_id_int } +\tl_new:N \l_postnotes_note_id_tl +\tl_set:Nn \l_postnotes_note_id_tl { \int_use:N \g__postnotes_note_id_int } \seq_new:N \g__postnotes_queue_seq \NewDocumentCommand \postnote { O { } +m } { \__postnotes_note:nn {#1} {#2} } @@ -366,19 +366,19 @@ \tl_set:Nx \l__postnotes_mark_tl { \thepostnote } } \seq_gput_right:Nx \g__postnotes_queue_seq - { \l__postnotes_note_id_tl } + { \l_postnotes_note_id_tl } \UseHook { postnotes/note/begin } \cs_set:Npn \@currentcounter { postnote } \cs_set:Npx \@currentlabel { \p@postnote \l__postnotes_mark_tl } - \MakeLinkTarget* { postnote. \l__postnotes_note_id_tl .mark } - \__postnotes_set_mark_page_label:x { \l__postnotes_note_id_tl } + \MakeLinkTarget* { postnote. \l_postnotes_note_id_tl .mark } + \__postnotes_set_mark_page_label:x { \l_postnotes_note_id_tl } \__postnotes_set_user_labels: \bool_if:NF \l__postnotes_nomark_bool { \__postnotes_typeset_mark:xV - { \l__postnotes_note_id_tl } \l__postnotes_mark_tl + { \l_postnotes_note_id_tl } \l__postnotes_mark_tl } - \__postnotes_store:nn { \l__postnotes_note_id_tl } {#2} + \__postnotes_store:nn { \l_postnotes_note_id_tl } {#2} } \group_end: } @@ -506,12 +506,12 @@ \group_begin: \int_gincr:N \g__postnotes_sectid_int \int_gincr:N \g__postnotes_note_id_int - \seq_gput_right:Nx \g__postnotes_queue_seq { \l__postnotes_note_id_tl } + \seq_gput_right:Nx \g__postnotes_queue_seq { \l_postnotes_note_id_tl } \tl_gclear:N \g__postnotes_section_name_tl \keys_set:nn { postnotes/section } {#1} \bool_if:NTF \l__postnotes_section_exp_bool - { \__postnotes_store_section:nx { \l__postnotes_note_id_tl } {#2} } - { \__postnotes_store_section:nn { \l__postnotes_note_id_tl } {#2} } + { \__postnotes_store_section:nx { \l_postnotes_note_id_tl } {#2} } + { \__postnotes_store_section:nn { \l_postnotes_note_id_tl } {#2} } \group_end: } \tl_new:N \g__postnotes_section_name_tl @@ -532,7 +532,7 @@ \tl_new:N \pnthesectionnextnote \tl_new:N \pnthepage \int_new:N \g__postnotes_print_postnotes_int -\tl_new:N \l__postnotes_print_note_id_tl +\tl_new:N \l_postnotes_print_note_id_tl \tl_new:N \l__postnotes_print_note_id_next_tl \tl_new:N \l__postnotes_print_counter_tl \tl_new:N \l__postnotes_print_mark_tl @@ -571,8 +571,8 @@ \bool_until_do:nn { \seq_if_empty_p:N \g__postnotes_queue_seq } { \seq_gpop_left:NN \g__postnotes_queue_seq - \l__postnotes_print_note_id_tl - \__postnotes_prop_get:nnN { \l__postnotes_print_note_id_tl } + \l_postnotes_print_note_id_tl + \__postnotes_prop_get:nnN { \l_postnotes_print_note_id_tl } { type } \l__postnotes_print_type_curr_tl \tl_if_eq:NnTF \l__postnotes_print_type_curr_tl { section } { % type_curr = `section' @@ -593,10 +593,10 @@ \stepcounter { postnotesection } \group_begin: \__postnotes_prop_get:nnN - { \l__postnotes_print_note_id_tl } + { \l_postnotes_print_note_id_tl } { thechapter } \pnthechapter \__postnotes_prop_get:nnN - { \l__postnotes_print_note_id_tl } + { \l_postnotes_print_note_id_tl } { thesection } \pnthesection \__postnotes_prop_get:nnN { \l__postnotes_print_note_id_next_tl } @@ -605,7 +605,7 @@ { \l__postnotes_print_note_id_next_tl } { thesection } \pnthesectionnextnote \__postnotes_prop_get:nnN - { \l__postnotes_print_note_id_tl } + { \l_postnotes_print_note_id_tl } { content } \l__postnotes_print_content_tl \l__postnotes_print_content_tl \group_end: @@ -624,15 +624,15 @@ \group_begin: \UseHook { postnotes/print/eachnote } \__postnotes_get_pageref:Nx \pnthepage - { mark@ \l__postnotes_print_note_id_tl } + { mark@ \l_postnotes_print_note_id_tl } \__postnotes_prop_get:nnN - { \l__postnotes_print_note_id_tl } + { \l_postnotes_print_note_id_tl } { mark } \l__postnotes_print_mark_tl \__postnotes_prop_get:nnN - { \l__postnotes_print_note_id_tl } + { \l_postnotes_print_note_id_tl } { counter } \l__postnotes_print_counter_tl \__postnotes_prop_get:nnN - { \l__postnotes_print_note_id_tl } + { \l_postnotes_print_note_id_tl } { content } \l__postnotes_print_content_tl \cs_set:Npn \@currentcounter { postnotetext } \int_set:Nn \c@postnotetext @@ -642,11 +642,11 @@ \__postnotes_text_mark_wrapper:n { \MakeLinkTarget* - { postnote. \l__postnotes_print_note_id_tl .text } + { postnote. \l_postnotes_print_note_id_tl .text } \__postnotes_set_text_page_label:x - { \l__postnotes_print_note_id_tl } + { \l_postnotes_print_note_id_tl } \__postnotes_typeset_text_mark:eV - { \l__postnotes_print_note_id_tl } + { \l_postnotes_print_note_id_tl } \l__postnotes_print_mark_tl } \l__postnotes_print_content_tl @@ -1017,19 +1017,19 @@ { \IfPackageAtLeastTF { zref-check } { 2022-07-05 } { - \AddToHook { postnotes/store/note } [ postnotes ] + \AddToHook { postnotes/note/store } [ postnotes ] { - \prop_gput:cnx { \__postnotes_data_name:e { \l__postnotes_note_id_tl } } + \prop_gput:cnx { \__postnotes_data_name:e { \l_postnotes_note_id_tl } } { zref-check@abschap } { \int_use:N \c@zc@abschap } - \prop_gput:cnx { \__postnotes_data_name:e { \l__postnotes_note_id_tl } } + \prop_gput:cnx { \__postnotes_data_name:e { \l_postnotes_note_id_tl } } { zref-check@abssec } { \int_use:N \c@zc@abssec } } \AddToHook { postnotes/print/eachnote } [ postnotes ] { - \__postnotes_prop_get:nnN { \l__postnotes_print_note_id_tl } + \__postnotes_prop_get:nnN { \l_postnotes_print_note_id_tl } { zref-check@abschap } \l__postnotes_restore_tmp_tl \int_set:Nn \c@zc@abschap { \l__postnotes_restore_tmp_tl } - \__postnotes_prop_get:nnN { \l__postnotes_print_note_id_tl } + \__postnotes_prop_get:nnN { \l_postnotes_print_note_id_tl } { zref-check@abssec } \l__postnotes_restore_tmp_tl \int_set:Nn \c@zc@abssec { \l__postnotes_restore_tmp_tl } } |