texlive[74371] Master: notebeamer (1mar25)
commits+karl at tug.org
commits+karl at tug.org
Sat Mar 1 22:31:58 CET 2025
Revision: 74371
https://tug.org/svn/texlive?view=revision&revision=74371
Author: karl
Date: 2025-03-01 22:31:58 +0100 (Sat, 01 Mar 2025)
Log Message:
-----------
notebeamer (1mar25)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/notebeamer/README.md
trunk/Master/texmf-dist/doc/latex/notebeamer/notebeamer.pdf
trunk/Master/texmf-dist/source/latex/notebeamer/notebeamer.dtx
trunk/Master/texmf-dist/source/latex/notebeamer/notebeamer.ins
trunk/Master/texmf-dist/tex/latex/notebeamer/notebeamer.sty
trunk/Master/tlpkg/bin/ctan2tl
trunk/Master/tlpkg/libexec/ctan2tds
Modified: trunk/Master/texmf-dist/doc/latex/notebeamer/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/notebeamer/README.md 2025-03-01 16:59:06 UTC (rev 74370)
+++ trunk/Master/texmf-dist/doc/latex/notebeamer/README.md 2025-03-01 21:31:58 UTC (rev 74371)
@@ -1,10 +1,11 @@
-# notebeamer
+The `notebeamer` Package
+========================
The `notebeamer` package provides a method for inputting slides on note
papers quickly.
-Basic Usage
------------
+Overview
+--------
The package provides the `\includebeamer` macro
@@ -14,6 +15,12 @@
See `notebeamer.pdf` for more. Happy TeXing!
+Issues
+------
+
+The issue tracker for `notebeamer` is currently located
+[on GitHub](https://github.com/myhsia/notebeamer/issues).
+
Copyright and License
---------------------
@@ -22,14 +29,8 @@
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
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
+ of this license is in the file <http://www.latex-project.org/lppl.txt>
+
This work has the LPPL maintenance status `maintained`.
The Current Maintainer of this work is Mingyu Xia.
-
- This work consists of the files notebeamer.dtx,
- and the derived files notebeamer.ins,
- notebeamer.sty,
- notebeamer.pdf,
- and README.md (this file).
Modified: trunk/Master/texmf-dist/doc/latex/notebeamer/notebeamer.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/notebeamer/notebeamer.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/notebeamer/notebeamer.dtx 2025-03-01 16:59:06 UTC (rev 74370)
+++ trunk/Master/texmf-dist/source/latex/notebeamer/notebeamer.dtx 2025-03-01 21:31:58 UTC (rev 74371)
@@ -11,13 +11,13 @@
% *
% 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. *
% *
% This work consists of the files notebeamer.dtx, *
-% and the derived files notebeamer.ins, *
-% notebeamer.sty, *
+% and notebeamer.ins, *
+% and the derived files notebeamer.sty, *
% notebeamer.pdf, *
% and README.md. *
% -----------------------------------------------------------------------
@@ -32,13 +32,14 @@
%</internal>
%
%<*readme>
-# notebeamer
+The `notebeamer` Package
+========================
The `notebeamer` package provides a method for inputting slides on note
papers quickly.
-Basic Usage
------------
+Overview
+--------
The package provides the `\includebeamer` macro
@@ -48,6 +49,12 @@
See `notebeamer.pdf` for more. Happy TeXing!
+Issues
+------
+
+The issue tracker for `notebeamer` is currently located
+[on GitHub](https://github.com/myhsia/notebeamer/issues).
+
Copyright and License
---------------------
@@ -56,17 +63,11 @@
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
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
+ of this license is in the file <http://www.latex-project.org/lppl.txt>
+
This work has the LPPL maintenance status `maintained`.
The Current Maintainer of this work is Mingyu Xia.
-
- This work consists of the files notebeamer.dtx,
- and the derived files notebeamer.ins,
- notebeamer.sty,
- notebeamer.pdf,
- and README.md (this file).
%</readme>
%
%<*internal>
@@ -77,12 +78,19 @@
\RequirePackage{expl3, xparse}
%</driver|package>
%<*driver>
-\documentclass[svgnames]{l3doc}
+\documentclass[svgnames, onlydoc]{l3doc}
\usepackage[pass]{geometry}
\usepackage{notebeamer}
-\AddToHook{env/function/before}{\vspace*{-.6\baselineskip}}
-\def \key #1{\textcolor{red}{\textbf{\texttt{#1}}}}
-\def \keyval #1#2{\key{#1} \normalfont \texttt{=} \meta{\textup{#2}}}
+\AddToHook{env/function/before}{\vspace*{-.65\baselineskip}}
+\AddToHook{env/syntax/after}{\vspace*{.15\baselineskip}}
+\makeatletter
+\def \@key #1{\textcolor{red}{\textbf{\texttt{#1}}} \normalfont \texttt{=}}
+\def \s at key #1{\textcolor{red}{\textbf{\texttt{#1}}}}
+\DeclareRobustCommand \key{\@ifstar\s at key\@key}
+\def \val #1{\meta{\textup{#1}}}
+\def \HoLogo at ApTeX #1{\HOLOGO at mbox {Ap\kern -.1667em\TeX}}
+\makeatother
+\makeindex
\begin{document}
\DocInput{\jobname.dtx}
\end{document}
@@ -90,8 +98,7 @@
% \fi
%
% \title{^^A
-% The \pkg{notebeamer} Package\thanks
-% {^^A
+% The \pkg{notebeamer} Package\thanks{^^A
% \url{https://github.com/myhsia/notebeamer},
% \url{https://ctan.org/pkg/notebeamer}^^A
% }
@@ -102,7 +109,7 @@
% \texttt{<\href{mailto:myhsia at outlook.com}{myhsia at outlook.com}>}^^A
% }
%
-% \date{Released 2025-02-12\quad \texttt{v4.0D}}
+% \date{Released 2025-03-01\quad \texttt{v4.1B}}
%
% \maketitle
%
@@ -111,10 +118,10 @@
% \section{Introduction}
%
% The \pkg{notebeamer} package provides an easy way to input slides on note
-% pages quickly for making annotations, developed by \pkg{expl3} based on
-% \pkg{tikz} and \pkg{l3graphics}. It is compatible with \hologo{TeX} Live 2019
-% or later distributions and supports compilation methods such as
-% \hologo{pdfLaTeX}, \hologo{XeLaTeX}, and \hologo{LuaLaTeX}, etc.
+% pages quickly, developed by \pkg{expl3} based on \pkg{tikz} and
+% \pkg{l3graphics}. It is compatible with \hologo{TeX} Live 2019 or later
+% distributions and supports various compilation methods, such as
+% \hologo{pdfLaTeX}, \hologo{XeLaTeX}, \hologo{ApTeX}, \hologo{LuaLaTeX}, etc.
%
% \section{Usage}
%
@@ -131,36 +138,35 @@
% the specific pages of the \file{.pdf} file on the left side of the note
% pages. The mandatory argument can set the \file{.pdf} file that will be
% inserted. The optional argument accepts the following keys
-% \begin{description}[leftmargin = 0pt]
-% \item [\keyval{color}{string}] can set the color of the note lines
-% (Default: \cmd{black}), key's name could be omitted.
-% \item [\keyval{ratio}{fp}] can set the ratio of imported slides' and empty
-% area's width (Default: \cmd{0.5}).
-% \item [\keyval{sep}{dim}] can set the vertical space between slides
-% (Default: \cmd{2ex}).
-% \item [\keyval{nup}{int}] can set the number of slides on every page
-% (Default: \cmd3).
-% \item [\keyval{pages}{comma separated list}] can select pages to insert.
-% The comma separated list contains combination of (ranges of) page numbers.
-% (Default: \cmd1).
-% \item [\keyval{lefthead}{string}, \keyval{righthead}{string}] can set the
-% left / right header of the pages.
-% \end{description}
+% \begin{itemize}[leftmargin = 0pt]
+% \item [\key{color}] \val{str} can set the note lines' color
+% (Default: black), this key's name could be omitted.
+% \item [\key{ratio}] \val{fp num} can set imported slides' ratio and empty
+% area's width (Default: |0.5|).
+% \item [\key{sep}] \val{dim} can set the vertical space between slides
+% (Default: |2ex|).
+% \item [\key{nup}] \val{int} can set the number of slides on every page
+% (Default: |3|).
+% \item [\key{pages}] \val{comma-separated list} can select pages to insert.
+% The list could contain ranges of page numbers.
+% (Default: |1|).
+% \item [\key{lhead, rhead}] \val{str} can set the left / right header of
+% the pages.
+% \end{itemize}
% \end{function}
%
-% Meanwhile, You can use \cs{newgeometry}. For instance
+% Additionally, \cs[no-index]{newgeometry} could be used for assistance. Such as
% \begin{verbatim}
% \newgeometry{margin = .75in}
% \includebeamer
-% [ nup = 4, pages = {2-4, 6}, lines = 32, ratio = .28,
-% Navy, lefthead = Chapter 1, righthead = Page~\thepage
+% [ nup = 4, pages = {2-4, 6}, lines = 32, ratio = .28,
+% Navy, lhead = Chapter 1, rhead = Page~\thepage
% ] { example-image-a4-numbered.pdf }
% \end{verbatim}
-%
% \newgeometry{margin = .75in}
% \includebeamer
-% [ nup = 4, pages = {2-4, 6}, lines = 32, ratio = .28,
-% Navy, lefthead = Chapter 1, righthead = Page~\thepage
+% [ nup = 4, pages = {2-4, 6}, lines = 32, ratio = .28,
+% Navy, lhead = Chapter 1, rhead = Page~\thepage
% ] { example-image-a4-numbered.pdf }
%
% \end{documentation}
@@ -169,152 +175,166 @@
%
% \section{The Source Code}
%
-% \linespread{1.15}
+% \linespread{1.1}
%
% \begin{macrocode}
%<*package>
-%<@@=notebm>
% \end{macrocode}
%
-% The package starts here.
+% \begin{macrocode}
+%<@@=ntbm>
+% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{notebeamer}{2025-02-12}{v4.0D}
+\ProvidesExplPackage {notebeamer} {2025-03-01} {v4.1B}
{Package provides macros for inputting slides on note papers quickly.}
+% \end{macrocode}
+%
+% \begin{macrocode}
\RequirePackage{l3graphics, tikz, tikzpagenodes}
% \end{macrocode}
%
% \subsection{User's Interface}
%
-% \DescribeMacro{\includebeamer}
-% Define the \cs{includebeamer} command.
+% \begin{macro}{\includebeamer}
+% Define the \cs{includebeamer} command.
% \begin{macrocode}
\NewDocumentCommand \includebeamer { O{} m O{} }
{
\group_begin:
\keys_set:nn { notebeamer / includebeamer } { #1, #3 }
- \__@@_include_aux:n {#2}
+ \@@_include_aux:n {#2}
\group_end:
}
% \end{macrocode}
-%
-% \subsection{Keys}
-%
-% Define the keys for the \cs{includebeamer} command.
-%
+% \begin{variable}
+% {
+% \l_@@_include_color_tl , \l_@@_include_pages_tl ,
+% \l_@@_include_nup_int , \l_@@_include_lines_int ,
+% \l_@@_include_ratio_fp , \l_@@_include_sep_dim ,
+% \l_@@_include_lhead_tl , \l_@@_include_rhead_tl
+% }
+% Key--value definitions for the \cs{includebeamer} command.
% \begin{macrocode}
\keys_define:nn { notebeamer / includebeamer }
{
- color .tl_set:N = \l__@@_include_color_tl,
- color .initial:n = black,
- pages .tl_set:N = \l__@@_include_pages_tl,
- pages .initial:n = 1,
- nup .int_set:N = \l__@@_include_nup_int,
- nup .initial:n = 3,
- 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__@@_include_sep_dim,
- sep .initial:n = 2ex,
- 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__@@_include_color_tl \l_keys_key_tl }
+ color .tl_set:N = \l_@@_include_color_tl,
+ color .initial:n = black,
+ pages .tl_set:N = \l_@@_include_pages_tl,
+ pages .initial:n = 1,
+ nup .int_set:N = \l_@@_include_nup_int,
+ nup .initial:n = 3,
+ 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_@@_include_sep_dim,
+ sep .initial:n = 2ex,
+ lhead .tl_set:N = \l_@@_include_lhead_tl,
+ rhead .tl_set:N = \l_@@_include_rhead_tl,
+ unknown .code:n = \tl_if_novalue:nF {#1}
+ { \tl_set_eq:NN \l_@@_include_color_tl \l_keys_key_tl }
}
% \end{macrocode}
+% \end{variable}
+% \end{macro}
%
% \subsection{Internal Auxiliary}
%
-% \begin{variable}{\l__@@_nup_dim,\l__@@_include_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__@@_nup_dim
-\dim_new:N \l__@@_include_ratio_dim
+\dim_new:N \l_@@_nup_dim
+\dim_new:N \l_@@_include_ratio_dim
% \end{macrocode}
% \end{variable}
% \newpage
-% \begin{variable}{\l__@@_pages_total_int,\l__@@_pages_residue_int}
+% \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__@@_pages_total_int
-\int_new:N \l__@@_pages_residue_int
+\int_new:N \l_@@_pages_total_int
+\int_new:N \l_@@_pages_residue_int
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l__@@_tmpa_clist}
+% \begin{variable}{\l_@@_tmpa_clist}
% Store the results of \cs{@@_range_to_list:nN}.
% \begin{macrocode}
-\clist_new:N \l__@@_tmpa_clist
+\clist_new:N \l_@@_tmpa_clist
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\__@@_include_aux:n}
-% Define the auxiliary command of \cs{includebeamer}.
+% \begin{macro}{\@@_include_aux:n}
+% Define the auxiliary command for \cs{includebeamer}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \__@@_include_aux:n #1
+\cs_new_protected_nopar:Npn \@@_include_aux:n #1
{
- \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 { - }
+ \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 { - }
{
\@@_range_to_list:nN
- { 1 - \l__@@_include_filepages_int } \l__@@_tmpa_clist
+ { 1 - \l_@@_include_filepages_int } \l_@@_tmpa_clist
}
{
\exp_args:NV \@@_range_to_list:nN
- { \l__@@_include_pages_tl } \l__@@_tmpa_clist
+ { \l_@@_include_pages_tl } \l_@@_tmpa_clist
}
- \int_set:Nn \l__@@_pages_total_int
+ \int_set:Nn \l_@@_pages_total_int
{
\fp_eval:n
- {
- ceil(\clist_count:N \l__@@_tmpa_clist/\l__@@_include_nup_int,0)
- } - 1
+ { ceil
+ ( \clist_count:N \l_@@_tmpa_clist/
+ \l_@@_include_nup_int,0
+ ) - 1
+ }
}
- \int_set:Nn \l__@@_pages_residue_int
+ \int_set:Nn \l_@@_pages_residue_int
{
\int_eval:n
{
- \clist_count:N \l__@@_tmpa_clist -
- \l__@@_include_nup_int * \l__@@_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__@@_pages_total_int }
+ \int_step_inline:nn { \int_use:N \l_@@_pages_total_int }
{
\clearpage
- \__@@_empty_note_aux:
- \int_step_inline:nn { \l__@@_include_nup_int }
+ \@@_empty_note_aux:
+ \int_step_inline:nn { \l_@@_include_nup_int }
{
\tikz [ remember~picture, overlay ]
- \node [ xshift = \l__@@_include_ratio_dim/2,
- yshift = \fp_eval:n { -####1 + .5 } \l__@@_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__@@_nup_dim - \l__@@_include_sep_dim },
- page = \clist_item:Nn \l__@@_tmpa_clist
- { ####1 + \l__@@_include_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
}
- \__@@_empty_note_aux:
- \int_step_inline:nn { \int_use:N \l__@@_pages_residue_int }
+ \@@_empty_note_aux:
+ \int_step_inline:nn { \int_use:N \l_@@_pages_residue_int }
{
\tikz [ remember~picture, overlay ]
- \node [ xshift = \l__@@_include_ratio_dim/2,
- yshift = \fp_eval:n {( -##1 + .5 )} \l__@@_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__@@_nup_dim - \l__@@_include_sep_dim },
- page = \clist_item:Nn \l__@@_tmpa_clist
- { \l__@@_include_nup_int * \l__@@_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}
};
}
@@ -323,29 +343,29 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\__@@_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 \__@@_empty_note_aux:
+\cs_new_protected_nopar:Nn \@@_empty_note_aux:
{
\tikzpicture [ remember~picture, overlay ]
- \draw [ very~thick, \l__@@_include_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__@@_include_lefthead_tl }
+ { \l_@@_include_lhead_tl }
node [ above~left, font = \Large \bfseries ]
- { \l__@@_include_righthead_tl };
- \draw [ very~thick, \l__@@_include_color_tl!80 ]
+ { \l_@@_include_rhead_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__@@_include_lines_int - 1 }
+ \int_step_inline:nn { \l_@@_include_lines_int - 1 }
{
- \draw [ thick, \l__@@_include_color_tl!60 ]
- ([xshift = \l__@@_include_ratio_dim,
- yshift = -\textheight/\l__@@_include_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__@@_include_ratio_dim },0);
+ (\dim_eval:n { \textwidth - \l_@@_include_ratio_dim },0);
}
\endtikzpicture
\pagestyle{empty}
@@ -353,11 +373,11 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{variable}{\l__@@_tmpa_seq,\l__@@_tmpb_seq}
+% \begin{variable}{\l_@@_tmpa_seq, \l_@@_tmpb_seq}
% Store the results of 2D array segmentation.
% \begin{macrocode}
-\seq_new:N \l__@@_tmpa_seq
-\seq_new:N \l__@@_tmpb_seq
+\seq_new:N \l_@@_tmpa_seq
+\seq_new:N \l_@@_tmpb_seq
% \end{macrocode}
% \end{variable}
%
@@ -367,17 +387,17 @@
\cs_new_protected_nopar:Npn \@@_range_to_list:nN #1#2
{
\clist_clear:N #2
- \seq_set_split:Nnn \l__@@_tmpa_seq { , } {#1}
- \seq_map_inline:Nn \l__@@_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__@@_tmpb_seq { - } {##1}
- \int_step_inline:nnn
- { \seq_item:Nn \l__@@_tmpb_seq { 1 } }
- { \seq_item:Nn \l__@@_tmpb_seq { 2 } }
+ \seq_set_split:Nnn \l_@@_tmpb_seq { - } {##1}
+ \int_step_inline:nnn
+ { \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} }
+ } { \clist_put_right:Nn #2 {##1} }
}
}
% \end{macrocode}
@@ -384,17 +404,9 @@
% \end{macro}
%
% \begin{macrocode}
-%<@@=>
-% \end{macrocode}
-%
-% The package ends here.
-%
-% \begin{macrocode}
%</package>
% \end{macrocode}
%
% \end{implementation}
%
-\endinput
-%%
-%% End of file `notebeamer.dtx'
+% \PrintIndex
\ No newline at end of file
Modified: trunk/Master/texmf-dist/source/latex/notebeamer/notebeamer.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/notebeamer/notebeamer.ins 2025-03-01 16:59:06 UTC (rev 74370)
+++ trunk/Master/texmf-dist/source/latex/notebeamer/notebeamer.ins 2025-03-01 21:31:58 UTC (rev 74371)
@@ -11,13 +11,13 @@
*
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. *
*
This work consists of the files notebeamer.dtx, *
- and the derived files notebeamer.ins, *
- notebeamer.sty, *
+ and notebeamer.ins, *
+ and the derived files notebeamer.sty, *
notebeamer.pdf, *
and README.md. *
-----------------------------------------------------------------------
@@ -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. *
-----------------------------------------------------------------------
@@ -52,8 +52,8 @@
\postamble
-----------------------------------------------------------------------
This work consists of the files notebeamer.dtx, *
- and the derived files notebeamer.ins, *
- notebeamer.sty, *
+ and notebeamer.ins, *
+ and the derived files notebeamer.sty, *
notebeamer.pdf, *
and README.md. *
-----------------------------------------------------------------------
Modified: trunk/Master/texmf-dist/tex/latex/notebeamer/notebeamer.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/notebeamer/notebeamer.sty 2025-03-01 16:59:06 UTC (rev 74370)
+++ trunk/Master/texmf-dist/tex/latex/notebeamer/notebeamer.sty 2025-03-01 21:31:58 UTC (rev 74371)
@@ -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-12}{v4.0D}
+\ProvidesExplPackage {notebeamer} {2025-03-01} {v4.1B}
{Package provides macros for inputting slides on note papers quickly.}
\RequirePackage{l3graphics, tikz, tikzpagenodes}
\NewDocumentCommand \includebeamer { O{} m O{} }
@@ -27,147 +27,152 @@
{
\group_begin:
\keys_set:nn { notebeamer / includebeamer } { #1, #3 }
- \__notebm_include_aux:n {#2}
+ \__ntbm_include_aux:n {#2}
\group_end:
}
\keys_define:nn { notebeamer / includebeamer }
{
- color .tl_set:N = \l__notebm_include_color_tl,
- color .initial:n = black,
- pages .tl_set:N = \l__notebm_include_pages_tl,
- pages .initial:n = 1,
- nup .int_set:N = \l__notebm_include_nup_int,
- nup .initial:n = 3,
- 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__notebm_include_sep_dim,
- sep .initial:n = 2ex,
- 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__notebm_include_color_tl \l_keys_key_tl }
+ color .tl_set:N = \l__ntbm_include_color_tl,
+ color .initial:n = black,
+ pages .tl_set:N = \l__ntbm_include_pages_tl,
+ pages .initial:n = 1,
+ nup .int_set:N = \l__ntbm_include_nup_int,
+ nup .initial:n = 3,
+ lines .int_set:N = \l__ntbm_include_lines_int,
+ ratio .fp_set:N = \l__ntbm_include_ratio_fp,
+ ratio .initial:n = .5,
+ sep .dim_set:N = \l__ntbm_include_sep_dim,
+ sep .initial:n = 2ex,
+ lhead .tl_set:N = \l__ntbm_include_lhead_tl,
+ rhead .tl_set:N = \l__ntbm_include_rhead_tl,
+ unknown .code:n = \tl_if_novalue:nF {#1}
+ { \tl_set_eq:NN \l__ntbm_include_color_tl \l_keys_key_tl }
}
-\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
+\dim_new:N \l__ntbm_nup_dim
+\dim_new:N \l__ntbm_include_ratio_dim
+\int_new:N \l__ntbm_pages_total_int
+\int_new:N \l__ntbm_pages_residue_int
+\clist_new:N \l__ntbm_tmpa_clist
+\cs_new_protected_nopar:Npn \__ntbm_include_aux:n #1
{
- \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 { - }
+ \graphics_get_pagecount:nN {#1} \l__ntbm_include_filepages_int
+ \dim_set:Nn \l__ntbm_nup_dim { \textheight/\l__ntbm_include_nup_int }
+ \dim_set:Nn \l__ntbm_include_ratio_dim
+ { \fp_use:N \l__ntbm_include_ratio_fp \textwidth }
+ \tl_if_eq:NnTF \l__ntbm_include_pages_tl { - }
{
- \__notebm_range_to_list:nN
- { 1 - \l__notebm_include_filepages_int } \l__notebm_tmpa_clist
+ \__ntbm_range_to_list:nN
+ { 1 - \l__ntbm_include_filepages_int } \l__ntbm_tmpa_clist
}
{
- \exp_args:NV \__notebm_range_to_list:nN
- { \l__notebm_include_pages_tl } \l__notebm_tmpa_clist
+ \exp_args:NV \__ntbm_range_to_list:nN
+ { \l__ntbm_include_pages_tl } \l__ntbm_tmpa_clist
}
- \int_set:Nn \l__notebm_pages_total_int
+ \int_set:Nn \l__ntbm_pages_total_int
{
\fp_eval:n
- {
- ceil(\clist_count:N \l__notebm_tmpa_clist/\l__notebm_include_nup_int,0)
- } - 1
+ { ceil
+ ( \clist_count:N \l__ntbm_tmpa_clist/
+ \l__ntbm_include_nup_int,0
+ ) - 1
+ }
}
- \int_set:Nn \l__notebm_pages_residue_int
+ \int_set:Nn \l__ntbm_pages_residue_int
{
\int_eval:n
{
- \clist_count:N \l__notebm_tmpa_clist -
- \l__notebm_include_nup_int * \l__notebm_pages_total_int
+ \clist_count:N \l__ntbm_tmpa_clist -
+ \l__ntbm_include_nup_int * \l__ntbm_pages_total_int
}
}
- \int_step_inline:nn { \int_use:N \l__notebm_pages_total_int }
+ \int_step_inline:nn { \int_use:N \l__ntbm_pages_total_int }
{
\clearpage
- \__notebm_empty_note_aux:
- \int_step_inline:nn { \l__notebm_include_nup_int }
+ \__ntbm_empty_note_aux:
+ \int_step_inline:nn { \l__ntbm_include_nup_int }
{
\tikz [ remember~picture, overlay ]
- \node [ xshift = \l__notebm_include_ratio_dim/2,
- yshift = \fp_eval:n { -####1 + .5 } \l__notebm_nup_dim
+ \node [ xshift = \l__ntbm_include_ratio_dim/2,
+ yshift = \fp_eval:n { -####1 + .5 } \l__ntbm_nup_dim
] at (current~page~text~area.north~west)
{
\includegraphics
[ height = \dim_eval:n
- { \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 ) }
+ { \l__ntbm_nup_dim - \l__ntbm_include_sep_dim },
+ page = \clist_item:Nn \l__ntbm_tmpa_clist
+ { ####1 + \l__ntbm_include_nup_int * ( ##1 - 1 ) }
] {#1}
};
}
\clearpage
}
- \__notebm_empty_note_aux:
- \int_step_inline:nn { \int_use:N \l__notebm_pages_residue_int }
+ \__ntbm_empty_note_aux:
+ \int_step_inline:nn { \int_use:N \l__ntbm_pages_residue_int }
{
\tikz [ remember~picture, overlay ]
- \node [ xshift = \l__notebm_include_ratio_dim/2,
- yshift = \fp_eval:n {( -##1 + .5 )} \l__notebm_nup_dim
+ \node [ xshift = \l__ntbm_include_ratio_dim/2,
+ yshift = \fp_eval:n {( -##1 + .5 )} \l__ntbm_nup_dim
] at (current~page~text~area.north~west)
{
\includegraphics
[ height = \dim_eval:n
- { \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 }
+ { \l__ntbm_nup_dim - \l__ntbm_include_sep_dim },
+ page = \clist_item:Nn \l__ntbm_tmpa_clist
+ {
+ \l__ntbm_include_nup_int *
+ \l__ntbm_pages_total_int + ##1
+ }
] {#1}
};
}
\clearpage
}
-\cs_new_protected_nopar:Nn \__notebm_empty_note_aux:
+\cs_new_protected_nopar:Nn \__ntbm_empty_note_aux:
{
\tikzpicture [ remember~picture, overlay ]
- \draw [ very~thick, \l__notebm_include_color_tl!80 ]
+ \draw [ very~thick, \l__ntbm_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__notebm_include_lefthead_tl }
+ { \l__ntbm_include_lhead_tl }
node [ above~left, font = \Large \bfseries ]
- { \l__notebm_include_righthead_tl };
- \draw [ very~thick, \l__notebm_include_color_tl!80 ]
+ { \l__ntbm_include_rhead_tl };
+ \draw [ very~thick, \l__ntbm_include_color_tl!80 ]
(current~page~text~area.south~west) --
(current~page~text~area.south~east);
- \int_step_inline:nn { \l__notebm_include_lines_int - 1 }
+ \int_step_inline:nn { \l__ntbm_include_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
+ \draw [ thick, \l__ntbm_include_color_tl!60 ]
+ ([xshift = \l__ntbm_include_ratio_dim,
+ yshift = -\textheight/\l__ntbm_include_lines_int * ##1
]current~page~text~area.north~west) --++
- (\dim_eval:n { \textwidth - \l__notebm_include_ratio_dim },0);
+ (\dim_eval:n { \textwidth - \l__ntbm_include_ratio_dim },0);
}
\endtikzpicture
\pagestyle{empty}
}
-\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
+\seq_new:N \l__ntbm_tmpa_seq
+\seq_new:N \l__ntbm_tmpb_seq
+\cs_new_protected_nopar:Npn \__ntbm_range_to_list:nN #1#2
{
\clist_clear:N #2
- \seq_set_split:Nnn \l__notebm_tmpa_seq { , } {#1}
- \seq_map_inline:Nn \l__notebm_tmpa_seq
+ \seq_set_split:Nnn \l__ntbm_tmpa_seq { , } {#1}
+ \seq_map_inline:Nn \l__ntbm_tmpa_seq
{
\tl_if_in:nnTF {##1} { - }
{
- \seq_set_split:Nnn \l__notebm_tmpb_seq { - } {##1}
+ \seq_set_split:Nnn \l__ntbm_tmpb_seq { - } {##1}
\int_step_inline:nnn
- { \seq_item:Nn \l__notebm_tmpb_seq { 1 } }
- { \seq_item:Nn \l__notebm_tmpb_seq { 2 } }
+ { \seq_item:Nn \l__ntbm_tmpb_seq { 1 } }
+ { \seq_item:Nn \l__ntbm_tmpb_seq { 2 } }
{ \clist_put_right:Nn #2 {####1} }
- } { \clist_put_right:Nn #2 {##1} }
+ } { \clist_put_right:Nn #2 {##1} }
}
}
%% -----------------------------------------------------------------------
%% This work consists of the files notebeamer.dtx, *
-%% and the derived files notebeamer.ins, *
-%% notebeamer.sty, *
+%% and notebeamer.ins, *
+%% and the derived files notebeamer.sty, *
%% notebeamer.pdf, *
%% and README.md. *
%% -----------------------------------------------------------------------
Modified: trunk/Master/tlpkg/bin/ctan2tl
===================================================================
--- trunk/Master/tlpkg/bin/ctan2tl 2025-03-01 16:59:06 UTC (rev 74370)
+++ trunk/Master/tlpkg/bin/ctan2tl 2025-03-01 21:31:58 UTC (rev 74371)
@@ -189,7 +189,7 @@
printf "\n$0: calling place $place_chicken $contrib_place_arg $pkg\n"
rm -rf $pkg.done
-place $place_chicken --mode $mode $contrib_place_arg $pkg
+place $place_chicken --no-final-svn-update --mode $mode $contrib_place_arg $pkg
status=$?
$copy_from_ctan && rm -rf $raw/$pkg
Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds 2025-03-01 16:59:06 UTC (rev 74370)
+++ trunk/Master/tlpkg/libexec/ctan2tds 2025-03-01 21:31:58 UTC (rev 74371)
@@ -6917,22 +6917,23 @@
# ConTeXt is complicated. Procedure for updating:
-# 0. ctxversion=whatever
+# 0. ctxversion=`sed -n 's/define *luametatex_version_string/p \
+# source/luametatex.h | sed 's/"//g'` # in unpacked tree
# 1. c2l context # change code here until good
# (all files match, no mkii, etc.), then:
-# 1b. c2l context p # place new files in svn; don't commit yet.
# 2. tl-update-lmtx-bin # download luametatex binaries (check this first);
# # possibly no_lmtx_platforms in
# # 00texlive.autopatterns.tlpsrc
-# # will need to be updated. Then commit:
-# 3. tlcom "context $ctxversion" $tlroot/Master/bin # commits runtime too
-# 4. tl-update-tlpdb -v --fix-reverse-revisions # must clean new context for:
-# 5. c2l context-legacy # until good, then:
-# 5b. c2l context-legacy p
-# 6. tlcom "context-legacy $ctxversion"
-# 7. If needed, update context-legacy by hand.
-# 8. Probably better to revert the interim texlive.tlpdb and let the
-# nightly build do the full update.
+# # will need to be updated.
+# 3. c2l context p # place new files in svn. Then we can commit:
+# 4. tlcom "context $ctxversion" $tlroot/Master/bin # commits runtime too
+# 5. tl-update-tlpdb -v --fix-reverse-revisions # must clean new context for:
+# 6. c2l context-legacy # until good, then:
+# 6b. c2l context-legacy p
+# 7. tlcom "context-legacy $ctxversion"
+# 8. If needed, other context-legacy updates by hand.
+# 9. svn revert tlpkg/texlive.tlpdb # revert interim texlive.tlpdb and let the
+# # nightly build do the full update.
#
sub POSTcontext {
print "POST$package - remove context-legacy etc. files, rearrange for TL\n";
@@ -6941,12 +6942,44 @@
&context_common_removals ();
- # remove the mkii files we put into context-legacy.
+ print "still POST$package - make README.TEXLIVE\n";
+ my $RTL = "doc/context/README.TEXLIVE";
+ open (RTL, ">$RTL") || die "open(>$RTL) failed: $!";
+ print RTL <<END_RTL;
+For TeX Live, some files are (re)moved from the ConTeXt distribution.
+
+Files relating to ConTeXt MkII are in the context-legacy package.
+Files relating to mptopdf are in the mptopdf package.
+LuaMetaTeX's compiled sources are in Master/source/luametatex-*.tar.xz.
+
+The list of removed files follows; most relate to nonfree fonts. Others
+relate to the standalone ConTeXt distribution and would cause trouble
+within TeX Live. For the code implementing all this and more details,
+see the POSTcontext routine in the Master/tlpkg/libexec/ctan2tds script.
+
+END_RTL
+ close (RTL) || die "close(>$RTL) failed: $!";
+ #
+ my $before_rm = "/tmp/$<.ctx.before.rm";
+ my $after_rm = "/tmp/$<.ctx.after.rm";
+ &SYSTEM ("cd $RAW_DIR/$packagedir && find . -type f | sort >$before_rm");
+ &SYSTEM ("find . -type f | sort >$after_rm");
+ &SYSTEM ("comm -23 $before_rm $after_rm >>$RTL");
+
+ # remove the mkii files we put into context-legacy; don't list these
+ # in README.TEXLIVE. Hopefully there will be no new mkii files.
&remove_files_of_pkg ("context-legacy");
+ #
+ # Ditto mptopdf. Although mptopdf is removed from both context and
+ # context-legacy, we don't do it in context_common_removals because we
+ # don't want to list its files in README.TEXLIVE, for consistency with
+ # how context-legacy is handled.
+ &remove_files_of_pkg ("mptopdf");
- # remove mkii stuff that we omit from context-legacy, or may be new, etc.
+ # Remove two more mptopdf doc formats there's no need to distribute.
&SYSTEM ("$RM -rf doc/context/scripts/mkii/");
- &SYSTEM ("$RM -rf tex/context/*/mkii/"); # base, fonts, etc.
+
+ # No more removals after this, just copying and moving around.
# move some files to context subdirs for tl.
&mv_with_mkdir ("colors/icc/context", "tex/context/colors/icc");
@@ -7004,6 +7037,9 @@
&context_common_removals ();
+ # mptopdf is its own package. (See more comments above.)
+ &remove_files_of_pkg ("mptopdf");
+
# remove the mkiv and newer files we have in context.
# The context package should be committed first, and tlpdb updated,
# before committing context-legacy, so new files get removed here.
@@ -7029,23 +7065,42 @@
# Some files we remove from both context and context-legacy.
sub context_common_removals {
print "\t context_common_removals\n";
- # mptopdf is its own package.
- &remove_files_of_pkg ("mptopdf");
# remove files Hans wants in his distribution but are confusing or
# problematic in TeX Live.
&SYSTEM ("$RM -rf colors/icc/profiles"); # nonfree
- &SYSTEM ("$RM -rf fonts/truetype/hoekwater/lm/");# lmtypewriter10-regular.ttf
- &SYSTEM ("$RM -rf fonts/data/tests/"); # texmfhome.otf
&SYSTEM ("$RM -rf scripts/context/stubs/"); # install/setup
&SYSTEM ("$RM -rf source"); # entire engine source
&SYSTEM ("$RM -rf web2c/"); # context*cnf*, texlive*cnf.lua
- # nonfree (first two) and unused (jmn) fonts.
- &SYSTEM ("find -name \*koeiel\* -o -name \*lucida\* -o -name jmn"
+ # Taco, 14sep2012: IIRC, we decided to remove that file altogether.
+ # Its only reason for existence is that (at the time it was created)
+ # editors like SciTE did not handle .OTF files properly, so I created
+ # a truetype version with fontforge. That was five years ago or so,
+ # and it should no longer be needed. It's never been removed from
+ # ConTeXt, but for TL, let's avoid the complication of having an lm
+ # directory outside the normal lm package.
+ &SYSTEM ("$RM -rf fonts/truetype/hoekwater/lm/");# lmtypewriter10-regular.ttf
+
+ # Mojca, 12sep2012: I'm not exactly sure how Hans uses this font
+ # [texmfhome.otf], but it has something to do with locating the tree
+ # where ConTeXt resides. It's not a real font Hans will be reluctant
+ # to move the font from "data" to "fonts" and unless/until someone
+ # needs the font in TL, I would just remove it and maybe put a comment
+ # to your script that if need arises, the font can be included into TL later.
+ &SYSTEM ("$RM -rf fonts/data/"); # texmfhome.otf
+
+ # unused per hans (jmn) and nonfree (all the rest) fonts.
+ &SYSTEM ("find -name jmn "
+ . "-o -name \*cambria\* "
+ . "-o -name \*cleartype\* "
+ . "-o -name \*koeiel\* "
+ . "-o -name \*lucida\* "
+ . "-o -name \*minion\* "
. "| xargs rm -rfv");
- }
+}
+
# Remove all files from PKG (as reported by the tlpfiles script).
# Used for ConTeXt.
#
More information about the tex-live-commits
mailing list.