texlive[73936] branches/branch2024.final/Master/texmf-dist:

commits+karl at tug.org commits+karl at tug.org
Wed Feb 12 22:09:36 CET 2025


Revision: 73936
          https://tug.org/svn/texlive?view=revision&revision=73936
Author:   karl
Date:     2025-02-12 22:09:36 +0100 (Wed, 12 Feb 2025)
Log Message:
-----------
notebeamer (branch) (12feb25)

Modified Paths:
--------------
    branches/branch2024.final/Master/texmf-dist/doc/latex/notebeamer/README.md
    branches/branch2024.final/Master/texmf-dist/doc/latex/notebeamer/notebeamer.pdf
    branches/branch2024.final/Master/texmf-dist/source/latex/notebeamer/notebeamer.dtx
    branches/branch2024.final/Master/texmf-dist/source/latex/notebeamer/notebeamer.ins
    branches/branch2024.final/Master/texmf-dist/tex/latex/notebeamer/notebeamer.sty

Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/notebeamer/README.md
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/latex/notebeamer/README.md	2025-02-12 21:09:28 UTC (rev 73935)
+++ branches/branch2024.final/Master/texmf-dist/doc/latex/notebeamer/README.md	2025-02-12 21:09:36 UTC (rev 73936)
@@ -24,7 +24,7 @@
   license or (at your option) any later version. The latest version
   of this license is in the file
       http://www.latex-project.org/lppl.txt
-  This work has the LPPL maintenance status `maintained'.
+  This work has the LPPL maintenance status `maintained`.
 
   The Current Maintainer of this work is Mingyu Xia.
 

Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/notebeamer/notebeamer.pdf
===================================================================
(Binary files differ)

Modified: branches/branch2024.final/Master/texmf-dist/source/latex/notebeamer/notebeamer.dtx
===================================================================
--- branches/branch2024.final/Master/texmf-dist/source/latex/notebeamer/notebeamer.dtx	2025-02-12 21:09:28 UTC (rev 73935)
+++ branches/branch2024.final/Master/texmf-dist/source/latex/notebeamer/notebeamer.dtx	2025-02-12 21:09:36 UTC (rev 73936)
@@ -11,7 +11,7 @@
 %                                                                       *
 %       http://www.latex-project.org/lppl.txt                           *
 %                                                                       *
-%   This work has the LPPL maintenance status `maintained'.             *
+%   This work has the LPPL maintenance status `maintained`.             *
 %                                                                       *
 %   The Current Maintainer of this work is Mingyu Xia.                  *
 %                                                                       *
@@ -58,7 +58,7 @@
   license or (at your option) any later version. The latest version
   of this license is in the file
       http://www.latex-project.org/lppl.txt
-  This work has the LPPL maintenance status `maintained'.
+  This work has the LPPL maintenance status `maintained`.
 
   The Current Maintainer of this work is Mingyu Xia.
 
@@ -102,7 +102,7 @@
 %   \texttt{<\href{mailto:myhsia at outlook.com}{myhsia at outlook.com}>}^^A
 % }
 %
-% \date{Released 2025-02-11\quad \texttt{v4.0C}}
+% \date{Released 2025-02-12\quad \texttt{v4.0D}}
 %
 % \maketitle
 %
@@ -173,16 +173,14 @@
 %
 %    \begin{macrocode}
 %<*package>
+%<@@=notebm>
 %    \end{macrocode}
-% Provides the package name.
+%
+% The package starts here.
+%
 %    \begin{macrocode}
-\ProvidesExplPackage{notebeamer}{2025/02/11}{v4.0C}
+\ProvidesExplPackage{notebeamer}{2025-02-12}{v4.0D}
   {Package provides macros for inputting slides on note papers quickly.}
-%    \end{macrocode}
-% Load the \pkg{l3graphics} package to get the number of file pages, the
-% \pkg{tikz} package to draw graphics, and the \pkg{tikzpagenodes} package to
-% locate the text area of the physical pages.
-%    \begin{macrocode}
 \RequirePackage{l3graphics, tikz, tikzpagenodes}
 %    \end{macrocode}
 %
@@ -195,7 +193,7 @@
   {
     \group_begin:
     \keys_set:nn { notebeamer / includebeamer } { #1, #3 }
-    \__nb_includebm_aux:n {#2}
+    \__@@_include_aux:n {#2}
     \group_end:
   }
 %    \end{macrocode}
@@ -203,117 +201,120 @@
 % \subsection{Keys}
 %
 % Define the keys for the \cs{includebeamer} command.
+%
 %    \begin{macrocode}
 \keys_define:nn { notebeamer / includebeamer }
   {
-    color     .tl_set:N  = \l__includebm_color_tl,
+    color     .tl_set:N  = \l__@@_include_color_tl,
       color   .initial:n = black,
-    pages     .tl_set:N  = \l__includebm_pages_tl,
+    pages     .tl_set:N  = \l__@@_include_pages_tl,
       pages   .initial:n = 1,
-    nup       .int_set:N = \l__includebm_nup_int,
+    nup       .int_set:N = \l__@@_include_nup_int,
       nup     .initial:n = 3,
-    lines     .int_set:N = \l__includebm_lines_int,
-    ratio     .fp_set:N  = \l__includebm_ratio_fp,
+    lines     .int_set:N = \l__@@_include_lines_int,
+    ratio     .fp_set:N  = \l__@@_include_ratio_fp,
       ratio   .initial:n = .5,
-    sep       .dim_set:N = \l__includebm_sep_dim,
+    sep       .dim_set:N = \l__@@_include_sep_dim,
       sep     .initial:n = 2ex,
-    lefthead  .tl_set:N  = \l__includebm_lefthead_tl,
-    righthead .tl_set:N  = \l__includebm_righthead_tl,
+    lefthead  .tl_set:N  = \l__@@_include_lefthead_tl,
+    righthead .tl_set:N  = \l__@@_include_righthead_tl,
     unknown   .code:n    = \tl_if_novalue:nF {#1}
-      { \tl_set_eq:NN \l__includebm_color_tl \l_keys_key_tl }
+      { \tl_set_eq:NN \l__@@_include_color_tl \l_keys_key_tl }
   }
 %    \end{macrocode}
-% \newpage
+%
 % \subsection{Internal Auxiliary}
 %
-% \begin{variable}{\l__nb_nup_dim,\l__includebm_ratio_dim}
+% \begin{variable}{\l__@@_nup_dim,\l__@@_include_ratio_dim}
 %   Store the heights and widths of the logical pages in a specific nup.
 %    \begin{macrocode}
-\dim_new:N \l__nb_nup_dim
-\dim_new:N \l__includebm_ratio_dim
+\dim_new:N \l__@@_nup_dim
+\dim_new:N \l__@@_include_ratio_dim
 %    \end{macrocode}
 % \end{variable}
-%
-% \begin{variable}{\l__nb_pages_total_int,\l__nb_pages_residue_int}
+% \newpage
+% \begin{variable}{\l__@@_pages_total_int,\l__@@_pages_residue_int}
 %   Store the number of total physical pages and residue logical pages.
 %    \begin{macrocode}
-\int_new:N \l__nb_pages_total_int
-\int_new:N \l__nb_pages_residue_int
+\int_new:N \l__@@_pages_total_int
+\int_new:N \l__@@_pages_residue_int
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{variable}{\l__nb_tmpa_clist}
-%   Store the results of \cs{nb_range_to_list:nN}.
+% \begin{variable}{\l__@@_tmpa_clist}
+%   Store the results of \cs{@@_range_to_list:nN}.
 %    \begin{macrocode}
-\clist_new:N \l__nb_tmpa_clist
+\clist_new:N \l__@@_tmpa_clist
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{macro}{\__nb_includebm_aux:n}
+% \begin{macro}{\__@@_include_aux:n}
 %   Define the auxiliary command of \cs{includebeamer}.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \__nb_includebm_aux:n #1
+\cs_new_protected_nopar:Npn \__@@_include_aux:n #1
   {
-    \graphics_get_pagecount:nN {#1} \l__includebm_filepages_int
-    \dim_set:Nn \l__nb_nup_dim { \textheight/\l__includebm_nup_int }
-    \dim_set:Nn \l__includebm_ratio_dim
-      { \fp_use:N \l__includebm_ratio_fp \textwidth }
-    \tl_if_eq:NnTF \l__includebm_pages_tl { - }
+    \graphics_get_pagecount:nN {#1} \l__@@_include_filepages_int
+    \dim_set:Nn \l__@@_nup_dim { \textheight/\l__@@_include_nup_int }
+    \dim_set:Nn \l__@@_include_ratio_dim
+      { \fp_use:N \l__@@_include_ratio_fp \textwidth }
+    \tl_if_eq:NnTF \l__@@_include_pages_tl { - }
       {
-        \nb_range_to_list:nN
-          { 1 - \l__includebm_filepages_int } \l__nb_tmpa_clist
+        \@@_range_to_list:nN
+          { 1 - \l__@@_include_filepages_int } \l__@@_tmpa_clist
       }
       {
-        \exp_args:NV \nb_range_to_list:nN
-          { \l__includebm_pages_tl } \l__nb_tmpa_clist
+        \exp_args:NV \@@_range_to_list:nN
+          { \l__@@_include_pages_tl } \l__@@_tmpa_clist
       }
-    \int_set:Nn \l__nb_pages_total_int
+    \int_set:Nn \l__@@_pages_total_int
       {
         \fp_eval:n
-          { ceil(\clist_count:N \l__nb_tmpa_clist/\l__includebm_nup_int,0) } - 1
+          {
+            ceil(\clist_count:N \l__@@_tmpa_clist/\l__@@_include_nup_int,0)
+          } - 1
       }
-    \int_set:Nn \l__nb_pages_residue_int
+    \int_set:Nn \l__@@_pages_residue_int
       {
         \int_eval:n
           {
-            \clist_count:N \l__nb_tmpa_clist -
-            \l__includebm_nup_int * \l__nb_pages_total_int
+            \clist_count:N \l__@@_tmpa_clist -
+            \l__@@_include_nup_int * \l__@@_pages_total_int
           }
       }
-    \int_step_inline:nn { \int_use:N \l__nb_pages_total_int }
+    \int_step_inline:nn { \int_use:N \l__@@_pages_total_int }
       {
         \clearpage
-        \__nb_empty_note_aux:
-        \int_step_inline:nn { \l__includebm_nup_int }
+        \__@@_empty_note_aux:
+        \int_step_inline:nn { \l__@@_include_nup_int }
           {
             \tikz [ remember~picture, overlay ]
-              \node [ xshift = \l__includebm_ratio_dim/2,
-                      yshift = \fp_eval:n { -####1 + .5 } \l__nb_nup_dim
+              \node [ xshift = \l__@@_include_ratio_dim/2,
+                      yshift = \fp_eval:n { -####1 + .5 } \l__@@_nup_dim
                     ] at (current~page~text~area.north~west)
                 {
                   \includegraphics
                     [ height = \dim_eval:n
-                        { \l__nb_nup_dim - \l__includebm_sep_dim },
-                      page = \clist_item:Nn \l__nb_tmpa_clist
-                        { ####1 + \l__includebm_nup_int * ( ##1 - 1 ) }
+                        { \l__@@_nup_dim - \l__@@_include_sep_dim },
+                      page = \clist_item:Nn \l__@@_tmpa_clist
+                        { ####1 + \l__@@_include_nup_int * ( ##1 - 1 ) }
                     ] {#1}
                 };
           }
         \clearpage
       }
-    \__nb_empty_note_aux:
-    \int_step_inline:nn { \int_use:N \l__nb_pages_residue_int }
+    \__@@_empty_note_aux:
+    \int_step_inline:nn { \int_use:N \l__@@_pages_residue_int }
       {
         \tikz [ remember~picture, overlay ]
-          \node [ xshift = \l__includebm_ratio_dim/2,
-                  yshift = \fp_eval:n {( -##1 + .5 )} \l__nb_nup_dim
+          \node [ xshift = \l__@@_include_ratio_dim/2,
+                  yshift = \fp_eval:n {( -##1 + .5 )} \l__@@_nup_dim
                 ] at (current~page~text~area.north~west)
             {
               \includegraphics
                 [ height = \dim_eval:n
-                    { \l__nb_nup_dim - \l__includebm_sep_dim },
-                  page = \clist_item:Nn \l__nb_tmpa_clist
-                    { \l__includebm_nup_int * \l__nb_pages_total_int + ##1 }
+                    { \l__@@_nup_dim - \l__@@_include_sep_dim },
+                  page = \clist_item:Nn \l__@@_tmpa_clist
+                    { \l__@@_include_nup_int * \l__@@_pages_total_int + ##1 }
                 ] {#1}
             };
       }
@@ -322,29 +323,29 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\__nb_empty_note_aux:}
+% \begin{macro}{\__@@_empty_note_aux:}
 %   Define the auxiliary command for creating empty note line page.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Nn \__nb_empty_note_aux:
+\cs_new_protected_nopar:Nn \__@@_empty_note_aux:
   {
     \tikzpicture [ remember~picture, overlay ]
-      \draw [ very~thick, \l__includebm_color_tl!80 ]
+      \draw [ very~thick, \l__@@_include_color_tl!80 ]
         (current~page~text~area.north~west) --
         (current~page~text~area.north~east)
        node [ at~start, above~right, font = \Large \bfseries ]
-        { \l__includebm_lefthead_tl }
+        { \l__@@_include_lefthead_tl }
        node [ above~left, font = \Large \bfseries ]
-        { \l__includebm_righthead_tl };
-      \draw [ very~thick, \l__includebm_color_tl!80 ]
+        { \l__@@_include_righthead_tl };
+      \draw [ very~thick, \l__@@_include_color_tl!80 ]
         (current~page~text~area.south~west) --
         (current~page~text~area.south~east);
-      \int_step_inline:nn { \l__includebm_lines_int - 1 }
+      \int_step_inline:nn { \l__@@_include_lines_int - 1 }
         {
-          \draw [ thick, \l__includebm_color_tl!60 ]
-            ([xshift = \l__includebm_ratio_dim,
-              yshift = -\textheight/\l__includebm_lines_int * ##1
+          \draw [ thick, \l__@@_include_color_tl!60 ]
+            ([xshift = \l__@@_include_ratio_dim,
+              yshift = -\textheight/\l__@@_include_lines_int * ##1
              ]current~page~text~area.north~west) --++
-            (\dim_eval:n { \textwidth - \l__includebm_ratio_dim },0);
+            (\dim_eval:n { \textwidth - \l__@@_include_ratio_dim },0);
         }
     \endtikzpicture
     \pagestyle{empty}
@@ -352,29 +353,29 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{variable}{\l__nb_tmpa_seq,\l__nb_tmpb_seq}
+% \begin{variable}{\l__@@_tmpa_seq,\l__@@_tmpb_seq}
 %   Store the results of 2D array segmentation.
 %    \begin{macrocode}
-\seq_new:N \l__nb_tmpa_seq
-\seq_new:N \l__nb_tmpb_seq
+\seq_new:N \l__@@_tmpa_seq
+\seq_new:N \l__@@_tmpb_seq
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{macro}{\nb_range_to_list:nN}
+% \begin{macro}{\@@_range_to_list:nN}
 %   Convert the combination of number and number range to a list.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \nb_range_to_list:nN #1#2
+\cs_new_protected_nopar:Npn \@@_range_to_list:nN #1#2
   {
     \clist_clear:N #2
-    \seq_set_split:Nnn \l__nb_tmpa_seq { , } {#1}
-    \seq_map_inline:Nn \l__nb_tmpa_seq 
+    \seq_set_split:Nnn \l__@@_tmpa_seq { , } {#1}
+    \seq_map_inline:Nn \l__@@_tmpa_seq 
       {
         \tl_if_in:nnTF {##1} { - }
           {
-            \seq_set_split:Nnn \l__nb_tmpb_seq { - } {##1}
+            \seq_set_split:Nnn \l__@@_tmpb_seq { - } {##1}
             \int_step_inline:nnn 
-              { \seq_item:Nn \l__nb_tmpb_seq { 1 } } 
-              { \seq_item:Nn \l__nb_tmpb_seq { 2 } } 
+              { \seq_item:Nn \l__@@_tmpb_seq { 1 } } 
+              { \seq_item:Nn \l__@@_tmpb_seq { 2 } } 
               { \clist_put_right:Nn #2 {####1} }
           } { \clist_put_right:Nn #2 {##1} }
       }
@@ -383,6 +384,12 @@
 % \end{macro}
 %
 %    \begin{macrocode}
+%<@@=>
+%    \end{macrocode}
+%
+% The package ends here.
+%
+%    \begin{macrocode}
 %</package>
 %    \end{macrocode}
 %

Modified: branches/branch2024.final/Master/texmf-dist/source/latex/notebeamer/notebeamer.ins
===================================================================
--- branches/branch2024.final/Master/texmf-dist/source/latex/notebeamer/notebeamer.ins	2025-02-12 21:09:28 UTC (rev 73935)
+++ branches/branch2024.final/Master/texmf-dist/source/latex/notebeamer/notebeamer.ins	2025-02-12 21:09:36 UTC (rev 73936)
@@ -11,7 +11,7 @@
                                                                       *
       http://www.latex-project.org/lppl.txt                           *
                                                                       *
-  This work has the LPPL maintenance status `maintained'.             *
+  This work has the LPPL maintenance status `maintained`.             *
                                                                       *
   The Current Maintainer of this work is Mingyu Xia.                  *
                                                                       *
@@ -43,7 +43,7 @@
                                                                       *
       http://www.latex-project.org/lppl.txt                           *
                                                                       *
-  This work has the LPPL maintenance status `maintained'.             *
+  This work has the LPPL maintenance status `maintained`.             *
                                                                       *
   The Current Maintainer of this work is Mingyu Xia.                  *
 -----------------------------------------------------------------------

Modified: branches/branch2024.final/Master/texmf-dist/tex/latex/notebeamer/notebeamer.sty
===================================================================
--- branches/branch2024.final/Master/texmf-dist/tex/latex/notebeamer/notebeamer.sty	2025-02-12 21:09:28 UTC (rev 73935)
+++ branches/branch2024.final/Master/texmf-dist/tex/latex/notebeamer/notebeamer.sty	2025-02-12 21:09:36 UTC (rev 73936)
@@ -15,12 +15,12 @@
 %%                                                                       *
 %%       http://www.latex-project.org/lppl.txt                           *
 %%                                                                       *
-%%   This work has the LPPL maintenance status `maintained'.             *
+%%   This work has the LPPL maintenance status `maintained`.             *
 %%                                                                       *
 %%   The Current Maintainer of this work is Mingyu Xia.                  *
 %% -----------------------------------------------------------------------
 \RequirePackage{expl3, xparse}
-\ProvidesExplPackage{notebeamer}{2025/02/11}{v4.0C}
+\ProvidesExplPackage{notebeamer}{2025-02-12}{v4.0D}
   {Package provides macros for inputting slides on note papers quickly.}
 \RequirePackage{l3graphics, tikz, tikzpagenodes}
 \NewDocumentCommand \includebeamer { O{} m O{} }
@@ -27,137 +27,139 @@
   {
     \group_begin:
     \keys_set:nn { notebeamer / includebeamer } { #1, #3 }
-    \__nb_includebm_aux:n {#2}
+    \__notebm_include_aux:n {#2}
     \group_end:
   }
 \keys_define:nn { notebeamer / includebeamer }
   {
-    color     .tl_set:N  = \l__includebm_color_tl,
+    color     .tl_set:N  = \l__notebm_include_color_tl,
       color   .initial:n = black,
-    pages     .tl_set:N  = \l__includebm_pages_tl,
+    pages     .tl_set:N  = \l__notebm_include_pages_tl,
       pages   .initial:n = 1,
-    nup       .int_set:N = \l__includebm_nup_int,
+    nup       .int_set:N = \l__notebm_include_nup_int,
       nup     .initial:n = 3,
-    lines     .int_set:N = \l__includebm_lines_int,
-    ratio     .fp_set:N  = \l__includebm_ratio_fp,
+    lines     .int_set:N = \l__notebm_include_lines_int,
+    ratio     .fp_set:N  = \l__notebm_include_ratio_fp,
       ratio   .initial:n = .5,
-    sep       .dim_set:N = \l__includebm_sep_dim,
+    sep       .dim_set:N = \l__notebm_include_sep_dim,
       sep     .initial:n = 2ex,
-    lefthead  .tl_set:N  = \l__includebm_lefthead_tl,
-    righthead .tl_set:N  = \l__includebm_righthead_tl,
+    lefthead  .tl_set:N  = \l__notebm_include_lefthead_tl,
+    righthead .tl_set:N  = \l__notebm_include_righthead_tl,
     unknown   .code:n    = \tl_if_novalue:nF {#1}
-      { \tl_set_eq:NN \l__includebm_color_tl \l_keys_key_tl }
+      { \tl_set_eq:NN \l__notebm_include_color_tl \l_keys_key_tl }
   }
-\dim_new:N \l__nb_nup_dim
-\dim_new:N \l__includebm_ratio_dim
-\int_new:N \l__nb_pages_total_int
-\int_new:N \l__nb_pages_residue_int
-\clist_new:N \l__nb_tmpa_clist
-\cs_new_protected_nopar:Npn \__nb_includebm_aux:n #1
+\dim_new:N \l__notebm_nup_dim
+\dim_new:N \l__notebm_include_ratio_dim
+\int_new:N \l__notebm_pages_total_int
+\int_new:N \l__notebm_pages_residue_int
+\clist_new:N \l__notebm_tmpa_clist
+\cs_new_protected_nopar:Npn \__notebm_include_aux:n #1
   {
-    \graphics_get_pagecount:nN {#1} \l__includebm_filepages_int
-    \dim_set:Nn \l__nb_nup_dim { \textheight/\l__includebm_nup_int }
-    \dim_set:Nn \l__includebm_ratio_dim
-      { \fp_use:N \l__includebm_ratio_fp \textwidth }
-    \tl_if_eq:NnTF \l__includebm_pages_tl { - }
+    \graphics_get_pagecount:nN {#1} \l__notebm_include_filepages_int
+    \dim_set:Nn \l__notebm_nup_dim { \textheight/\l__notebm_include_nup_int }
+    \dim_set:Nn \l__notebm_include_ratio_dim
+      { \fp_use:N \l__notebm_include_ratio_fp \textwidth }
+    \tl_if_eq:NnTF \l__notebm_include_pages_tl { - }
       {
-        \nb_range_to_list:nN
-          { 1 - \l__includebm_filepages_int } \l__nb_tmpa_clist
+        \__notebm_range_to_list:nN
+          { 1 - \l__notebm_include_filepages_int } \l__notebm_tmpa_clist
       }
       {
-        \exp_args:NV \nb_range_to_list:nN
-          { \l__includebm_pages_tl } \l__nb_tmpa_clist
+        \exp_args:NV \__notebm_range_to_list:nN
+          { \l__notebm_include_pages_tl } \l__notebm_tmpa_clist
       }
-    \int_set:Nn \l__nb_pages_total_int
+    \int_set:Nn \l__notebm_pages_total_int
       {
         \fp_eval:n
-          { ceil(\clist_count:N \l__nb_tmpa_clist/\l__includebm_nup_int,0) } - 1
+          {
+            ceil(\clist_count:N \l__notebm_tmpa_clist/\l__notebm_include_nup_int,0)
+          } - 1
       }
-    \int_set:Nn \l__nb_pages_residue_int
+    \int_set:Nn \l__notebm_pages_residue_int
       {
         \int_eval:n
           {
-            \clist_count:N \l__nb_tmpa_clist -
-            \l__includebm_nup_int * \l__nb_pages_total_int
+            \clist_count:N \l__notebm_tmpa_clist -
+            \l__notebm_include_nup_int * \l__notebm_pages_total_int
           }
       }
-    \int_step_inline:nn { \int_use:N \l__nb_pages_total_int }
+    \int_step_inline:nn { \int_use:N \l__notebm_pages_total_int }
       {
         \clearpage
-        \__nb_empty_note_aux:
-        \int_step_inline:nn { \l__includebm_nup_int }
+        \__notebm_empty_note_aux:
+        \int_step_inline:nn { \l__notebm_include_nup_int }
           {
             \tikz [ remember~picture, overlay ]
-              \node [ xshift = \l__includebm_ratio_dim/2,
-                      yshift = \fp_eval:n { -####1 + .5 } \l__nb_nup_dim
+              \node [ xshift = \l__notebm_include_ratio_dim/2,
+                      yshift = \fp_eval:n { -####1 + .5 } \l__notebm_nup_dim
                     ] at (current~page~text~area.north~west)
                 {
                   \includegraphics
                     [ height = \dim_eval:n
-                        { \l__nb_nup_dim - \l__includebm_sep_dim },
-                      page = \clist_item:Nn \l__nb_tmpa_clist
-                        { ####1 + \l__includebm_nup_int * ( ##1 - 1 ) }
+                        { \l__notebm_nup_dim - \l__notebm_include_sep_dim },
+                      page = \clist_item:Nn \l__notebm_tmpa_clist
+                        { ####1 + \l__notebm_include_nup_int * ( ##1 - 1 ) }
                     ] {#1}
                 };
           }
         \clearpage
       }
-    \__nb_empty_note_aux:
-    \int_step_inline:nn { \int_use:N \l__nb_pages_residue_int }
+    \__notebm_empty_note_aux:
+    \int_step_inline:nn { \int_use:N \l__notebm_pages_residue_int }
       {
         \tikz [ remember~picture, overlay ]
-          \node [ xshift = \l__includebm_ratio_dim/2,
-                  yshift = \fp_eval:n {( -##1 + .5 )} \l__nb_nup_dim
+          \node [ xshift = \l__notebm_include_ratio_dim/2,
+                  yshift = \fp_eval:n {( -##1 + .5 )} \l__notebm_nup_dim
                 ] at (current~page~text~area.north~west)
             {
               \includegraphics
                 [ height = \dim_eval:n
-                    { \l__nb_nup_dim - \l__includebm_sep_dim },
-                  page = \clist_item:Nn \l__nb_tmpa_clist
-                    { \l__includebm_nup_int * \l__nb_pages_total_int + ##1 }
+                    { \l__notebm_nup_dim - \l__notebm_include_sep_dim },
+                  page = \clist_item:Nn \l__notebm_tmpa_clist
+                    { \l__notebm_include_nup_int * \l__notebm_pages_total_int + ##1 }
                 ] {#1}
             };
       }
     \clearpage
   }
-\cs_new_protected_nopar:Nn \__nb_empty_note_aux:
+\cs_new_protected_nopar:Nn \__notebm_empty_note_aux:
   {
     \tikzpicture [ remember~picture, overlay ]
-      \draw [ very~thick, \l__includebm_color_tl!80 ]
+      \draw [ very~thick, \l__notebm_include_color_tl!80 ]
         (current~page~text~area.north~west) --
         (current~page~text~area.north~east)
        node [ at~start, above~right, font = \Large \bfseries ]
-        { \l__includebm_lefthead_tl }
+        { \l__notebm_include_lefthead_tl }
        node [ above~left, font = \Large \bfseries ]
-        { \l__includebm_righthead_tl };
-      \draw [ very~thick, \l__includebm_color_tl!80 ]
+        { \l__notebm_include_righthead_tl };
+      \draw [ very~thick, \l__notebm_include_color_tl!80 ]
         (current~page~text~area.south~west) --
         (current~page~text~area.south~east);
-      \int_step_inline:nn { \l__includebm_lines_int - 1 }
+      \int_step_inline:nn { \l__notebm_include_lines_int - 1 }
         {
-          \draw [ thick, \l__includebm_color_tl!60 ]
-            ([xshift = \l__includebm_ratio_dim,
-              yshift = -\textheight/\l__includebm_lines_int * ##1
+          \draw [ thick, \l__notebm_include_color_tl!60 ]
+            ([xshift = \l__notebm_include_ratio_dim,
+              yshift = -\textheight/\l__notebm_include_lines_int * ##1
              ]current~page~text~area.north~west) --++
-            (\dim_eval:n { \textwidth - \l__includebm_ratio_dim },0);
+            (\dim_eval:n { \textwidth - \l__notebm_include_ratio_dim },0);
         }
     \endtikzpicture
     \pagestyle{empty}
   }
-\seq_new:N \l__nb_tmpa_seq
-\seq_new:N \l__nb_tmpb_seq
-\cs_new_protected_nopar:Npn \nb_range_to_list:nN #1#2
+\seq_new:N \l__notebm_tmpa_seq
+\seq_new:N \l__notebm_tmpb_seq
+\cs_new_protected_nopar:Npn \__notebm_range_to_list:nN #1#2
   {
     \clist_clear:N #2
-    \seq_set_split:Nnn \l__nb_tmpa_seq { , } {#1}
-    \seq_map_inline:Nn \l__nb_tmpa_seq
+    \seq_set_split:Nnn \l__notebm_tmpa_seq { , } {#1}
+    \seq_map_inline:Nn \l__notebm_tmpa_seq
       {
         \tl_if_in:nnTF {##1} { - }
           {
-            \seq_set_split:Nnn \l__nb_tmpb_seq { - } {##1}
+            \seq_set_split:Nnn \l__notebm_tmpb_seq { - } {##1}
             \int_step_inline:nnn
-              { \seq_item:Nn \l__nb_tmpb_seq { 1 } }
-              { \seq_item:Nn \l__nb_tmpb_seq { 2 } }
+              { \seq_item:Nn \l__notebm_tmpb_seq { 1 } }
+              { \seq_item:Nn \l__notebm_tmpb_seq { 2 } }
               { \clist_put_right:Nn #2 {####1} }
           } { \clist_put_right:Nn #2 {##1} }
       }



More information about the tex-live-commits mailing list.