texlive[74765] Master/texmf-dist: scontents (27mar25)
commits+karl at tug.org
commits+karl at tug.org
Thu Mar 27 20:06:59 CET 2025
Revision: 74765
https://tug.org/svn/texlive?view=revision&revision=74765
Author: karl
Date: 2025-03-27 20:06:59 +0100 (Thu, 27 Mar 2025)
Log Message:
-----------
scontents (27mar25)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/scontents/README.md
trunk/Master/texmf-dist/doc/latex/scontents/scontents.pdf
trunk/Master/texmf-dist/source/latex/scontents/scontents.dtx
trunk/Master/texmf-dist/source/latex/scontents/scontents.ins
trunk/Master/texmf-dist/tex/context/third/scontents/t-scontents.mkiv
trunk/Master/texmf-dist/tex/generic/scontents/scontents-code.tex
trunk/Master/texmf-dist/tex/generic/scontents/scontents.tex
trunk/Master/texmf-dist/tex/latex/scontents/scontents.sty
Modified: trunk/Master/texmf-dist/doc/latex/scontents/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/scontents/README.md 2025-03-27 19:06:45 UTC (rev 74764)
+++ trunk/Master/texmf-dist/doc/latex/scontents/README.md 2025-03-27 19:06:59 UTC (rev 74765)
@@ -1,6 +1,6 @@
## scontents — Stores LaTeX contents in memory or files
-Release v2.1 \[2024-06-14\]
+Release v2.2 \[2025-03-26\]
## Description
@@ -68,4 +68,4 @@
## Author and copyright
-Copyright 2019-2023 by Pablo González L.
+Copyright 2019-2025 by Pablo González L.
Modified: trunk/Master/texmf-dist/doc/latex/scontents/scontents.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/scontents/scontents.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/scontents/scontents.dtx 2025-03-27 19:06:45 UTC (rev 74764)
+++ trunk/Master/texmf-dist/source/latex/scontents/scontents.dtx 2025-03-27 19:06:59 UTC (rev 74765)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019-2024 by Pablo González L <pablgonz at educarchile.cl>
+% Copyright (C) 2019-2025 by Pablo González L <pablgonz at educarchile.cl>
%
% This work may be distributed and/or modified under the conditions of the
% LaTeX Project Public License, either version 1.3c of this license or (at
@@ -450,7 +450,7 @@
keywordstyle = [2]{\color{blue!75}},%
keywords = [2]{usepackage,section,documentclass,input,usemodule,
subsection,ExplSyntaxOff,ExplSyntaxOn,RequirePackage,
- ProvidesExplPackage},%
+ ProvidesExplPackage,obeyedline},%
% Other words 3
keywordstyle = [3]{\color{optcolor!85}},%
keywords = [3]{document,article,setlength,pagestyle,definecolor},%
@@ -577,7 +577,7 @@
}
\setfoot{\rlap{\hskip\dimexpr-\oddsidemargin-1in\relax%
\parbox{1.93\paperwidth}{\hfil\thepage\,/\,\pageref{LastPage}}}}%
- {\parbox{\textwidth}{\raggedright \textcolor{gray}{\raisebox{-1pt}{\textcopyright}{}2019--2024 by Pablo González}}}%
+ {\parbox{\textwidth}{\raggedright \textcolor{gray}{\raisebox{-1pt}{\textcopyright}{}2019--2025 by Pablo González}}}%
{}%
\sethead{\llap{\raisebox{0.55cm}{\parbox{\dimexpr\oddsidemargin+1in\relax}{\makebox[0pt][l]{\hspace{15pt}\pkglogo\space\fileversion}}}}}
{\raisebox{0.55cm}{\parbox{\textwidth}{\hspace*{-\oddsidemargin}\centering\small\S.\thesection\space\sectiontitle}}}%
@@ -632,7 +632,7 @@
% \filedate.}\\[25pt]
% \author{
% \large
-% \raisebox{-1pt}{\textcopyright}{}2019--2024 by Pablo González\thanks{
+% \raisebox{-1pt}{\textcopyright}{}2019--2025 by Pablo González\thanks{
% E-mail: \textcolor{OrangeRed}{\textsf{\guillemotleft}}\email{pablgonz at educarchile.cl}\textcolor{OrangeRed}{\textsf{\guillemotright}}.
% }%
% }
@@ -1300,7 +1300,7 @@
% \mymeta[type=tt]{seq temp}.
% \end{function}
%
-% The use of the keys \mykey{typestored} or \mykey{menaingsc} are
+% The use of the keys \mykey{typestored} or \mykey{meaningsc} are
% \emph{\enquote{mandatory}} and disjoint from each other, the rest of the
% accepted \mymeta{keys} are \mykey{print-cmd}, \mykey{write-out},
% \mykey{width-tab} and \mykey{overwrite}.
@@ -2064,6 +2064,12 @@
% \begin{description}[font=\small\sffamily,wide=0pt,style=multiline,leftmargin=\descrwidth,nosep,noitemsep]
% \item [\fileversion{} (ctan), \filedate]
% \begin{itemize}
+% \item Fix internal definition for some functions.
+% \item Replace |\peek_charcode_ignore_spaces:NTF| by |\peek_charcode:NTF|.
+% \item Set correct code for |\obeyedline| implement in \LaTeX{} release 2024-06-01.
+% \end{itemize}
+% \item [v2.1 (ctan), 2024-06-14]
+% \begin{itemize}
% \item Fix |\cleansc| command.
% \item Add |\mergesc| command.
% \item Fix internal definition for seq var.
@@ -2217,10 +2223,10 @@
%
% Now we define some common macros to hold the package date and version:
% \begin{macrocode}
-%<loader>\def\ScontentsFileDate{2024-06-14}%
-%<core>\def\ScontentsCoreFileDate{2024-06-14}%
+%<loader>\def\ScontentsFileDate{2025-03-26}%
+%<core>\def\ScontentsCoreFileDate{2025-03-26}%
%<*loader>
-\def\ScontentsFileVersion{2.1}%
+\def\ScontentsFileVersion{2.2}%
\def\ScontentsFileDescription{Stores LaTeX contents in memory or files}%
% \end{macrocode}
%
@@ -2265,7 +2271,7 @@
% (\LaTeX{} and \hologo{ConTeXt} already defend against that):
% \begin{macrocode}
%<*plain>
-\msg_gset:nnn { scontents } { already-loaded }
+\msg_set:nnn { scontents } { already-loaded }
{ The~'scontents'~package~is~already~loaded.~Aborting~input~\msg_line_context:. }
\cs_if_exist:NT \@@_rescan_tokens:n
{
@@ -2402,7 +2408,7 @@
% \end{macro}
%
% \begin{macro}{\l_@@_keys_tl}
-% Stores unused keys to be frwarded to other commands.
+% Stores unused \mymeta{keys} to be forwarded to other commands.
% \begin{macrocode}
\tl_new:N \l_@@_keys_tl
% \end{macrocode}
@@ -2891,13 +2897,14 @@
{ \seq_count:c { g_@@_name_\l_@@_cur_seq_name_str _seq } }
{ \msg_error:nnn { scontents } { type-key-unknown } }
}
-\cs_generate_variant:Nn \@@_range_parser:nnnn { nnx }
-\cs_new_protected:Npn \@@_range_parser:nnnn #1 #2 #3
+\cs_new_protected:Npn \@@_range_parser:nnnn #1 #2 #3 #4
{
\exp_args:Nxx \@@_range_parser_aux:nnn
{ \str_if_eq:nnTF {#1} { end } {#3} { \exp_not:n {#1} } }
{ \str_if_eq:nnTF {#2} { end } {#3} { \exp_not:n {#2} } }
+ { #4 }
}
+\cs_generate_variant:Nn \@@_range_parser:nnnn { nnxn }
\cs_new_protected:Npn \@@_range_parser_aux:nnn #1 #2 #3
{
\@@_tl_if_head_is_q_mark:nTF {#2}
@@ -3691,7 +3698,8 @@
% \@@_file_write_cmd:VV,
% }
%
-% The function \cs{@@_verb_arg_internal:n} replace all §\^^M§ by
+% The function \cs{@@_verb_arg_internal:n} replace all §\^^M§ and
+% §\obeyedline§ added by §+v§ argument added in \hologo{LaTeX} release 2024-06-01 by
% §\^^J§ then adds it to the |seq| variable.
%
% \begin{macrocode}
@@ -3698,6 +3706,10 @@
\cs_new_protected:Npn \@@_verb_arg_internal:n #1
{
\tl_set:Nn \l_@@_temp_tl {#1}
+ \cs_if_exist:NT \obeyedline
+ {
+ \tl_replace_all:Nxx \l_@@_temp_tl { \obeyedline } { \iow_char:N \^^M }
+ }
\tl_replace_all:Nxx \l_@@_temp_tl { \iow_char:N \^^M } { \iow_char:N \^^J }
\@@_Scontents_finish:
}
@@ -3916,7 +3928,9 @@
%
% \subsection{The command \cs{mergesc}}
%
-% \begin{macro}{\mergesc}
+% \begin{macro}{\mergesc,\@@_mergesc_output_cmd:nn,\@@_mergesc_internal:nn,
+% \@@_mergesc_parse_list:n, \@@_remove_trailing_eol:N, \@@_remove_trailing_eol:w,
+% \@@_parse_mergesc:nw, \@@_parse_mergesc_aux:nw, \@@_parse_mergesc_range:nw,}
% The §\mergesc§ command parses a list given as argument, and just assembles
% it as a temporary internal sequence, then passes it to the requested command.
% \begin{macrocode}
@@ -3986,9 +4000,12 @@
}
\cs_new_protected:Npn \@@_parse_mergesc:nw #1
{
- \peek_charcode_ignore_spaces:NTF [ % ]
- { \@@_parse_mergesc_aux:nw {#1} }
- { \@@_parse_mergesc_aux:nw {#1} [ 1-\seq_count:c { g_@@_name_#1_seq } ] }
+ \peek_remove_spaces:n
+ {
+ \peek_charcode:NTF [ % ]
+ { \@@_parse_mergesc_aux:nw {#1} }
+ { \@@_parse_mergesc_aux:nw {#1} [ 1-\seq_count:c { g_@@_name_#1_seq } ] }
+ }
}
\cs_new_protected:Npn \@@_parse_mergesc_aux:nw #1 [#2]
{
Modified: trunk/Master/texmf-dist/source/latex/scontents/scontents.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/scontents/scontents.ins 2025-03-27 19:06:45 UTC (rev 74764)
+++ trunk/Master/texmf-dist/source/latex/scontents/scontents.ins 2025-03-27 19:06:59 UTC (rev 74765)
@@ -3,7 +3,7 @@
\askforoverwritefalse
\declarepreamble\standard
-Copyright (C) 2019-2024 by Pablo González L <pablgonz at educarchile.cl>
+Copyright (C) 2019-2025 by Pablo González L <pablgonz at educarchile.cl>
This work may be distributed and/or modified under the conditions of the
LaTeX Project Public License, either version 1.3c of this license or (at
@@ -33,11 +33,11 @@
\declarepreamble\context
\string\module
[ file=t-scontents,
- version=2.1,
+ version=2.2,
title=\string\CONTEXT\ User Module,
subtitle=Storing Contents,
author=Pablo González,
- date=2024-06-14,
+ date=2025-03-26,
copyright=Pablo González,
email=pablgonz at educarchile.cl,
license=LPPL]
Modified: trunk/Master/texmf-dist/tex/context/third/scontents/t-scontents.mkiv
===================================================================
--- trunk/Master/texmf-dist/tex/context/third/scontents/t-scontents.mkiv 2025-03-27 19:06:45 UTC (rev 74764)
+++ trunk/Master/texmf-dist/tex/context/third/scontents/t-scontents.mkiv 2025-03-27 19:06:59 UTC (rev 74765)
@@ -6,7 +6,7 @@
%%
%% scontents.dtx (with options: `loader,context')
%%
-%% Copyright (C) 2019-2024 by Pablo González L <pablgonz at educarchile.cl>
+%% Copyright (C) 2019-2025 by Pablo González L <pablgonz at educarchile.cl>
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
@@ -33,16 +33,16 @@
%% scontents.dtx (with options: `loader,context')
%D \module
%D [ file=t-scontents,
-%D version=2.1,
+%D version=2.2,
%D title=\CONTEXT\ User Module,
%D subtitle=Storing Contents,
%D author=Pablo González,
-%D date=2024-06-14,
+%D date=2025-03-26,
%D copyright=Pablo González,
%D email=pablgonz at educarchile.cl,
%D license=LPPL]
-\def\ScontentsFileDate{2024-06-14}%
-\def\ScontentsFileVersion{2.1}%
+\def\ScontentsFileDate{2025-03-26}%
+\def\ScontentsFileVersion{2.2}%
\def\ScontentsFileDescription{Stores LaTeX contents in memory or files}%
\writestatus{loading}{User Module scontents v\ScontentsFileVersion}
\unprotect
Modified: trunk/Master/texmf-dist/tex/generic/scontents/scontents-code.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/scontents/scontents-code.tex 2025-03-27 19:06:45 UTC (rev 74764)
+++ trunk/Master/texmf-dist/tex/generic/scontents/scontents-code.tex 2025-03-27 19:06:59 UTC (rev 74765)
@@ -6,7 +6,7 @@
%%
%% scontents.dtx (with options: `core')
%%
-%% Copyright (C) 2019-2024 by Pablo González L <pablgonz at educarchile.cl>
+%% Copyright (C) 2019-2025 by Pablo González L <pablgonz at educarchile.cl>
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
@@ -27,7 +27,7 @@
%% t-scontents.mkiv and
%% scontents-code.tex.
%%
-\def\ScontentsCoreFileDate{2024-06-14}%
+\def\ScontentsCoreFileDate{2025-03-26}%
\begingroup
\catcode32=10
\endlinechar=32
@@ -280,13 +280,14 @@
{ \seq_count:c { g__scontents_name_\l__scontents_cur_seq_name_str _seq } }
{ \msg_error:nnn { scontents } { type-key-unknown } }
}
-\cs_generate_variant:Nn \__scontents_range_parser:nnnn { nnx }
-\cs_new_protected:Npn \__scontents_range_parser:nnnn #1 #2 #3
+\cs_new_protected:Npn \__scontents_range_parser:nnnn #1 #2 #3 #4
{
\exp_args:Nxx \__scontents_range_parser_aux:nnn
{ \str_if_eq:nnTF {#1} { end } {#3} { \exp_not:n {#1} } }
{ \str_if_eq:nnTF {#2} { end } {#3} { \exp_not:n {#2} } }
+ { #4 }
}
+\cs_generate_variant:Nn \__scontents_range_parser:nnnn { nnxn }
\cs_new_protected:Npn \__scontents_range_parser_aux:nnn #1 #2 #3
{
\__scontents_tl_if_head_is_q_mark:nTF {#2}
@@ -691,6 +692,10 @@
\cs_new_protected:Npn \__scontents_verb_arg_internal:n #1
{
\tl_set:Nn \l__scontents_temp_tl {#1}
+ \cs_if_exist:NT \obeyedline
+ {
+ \tl_replace_all:Nxx \l__scontents_temp_tl { \obeyedline } { \iow_char:N \^^M }
+ }
\tl_replace_all:Nxx \l__scontents_temp_tl { \iow_char:N \^^M } { \iow_char:N \^^J }
\__scontents_Scontents_finish:
}
@@ -905,9 +910,12 @@
}
\cs_new_protected:Npn \__scontents_parse_mergesc:nw #1
{
- \peek_charcode_ignore_spaces:NTF [ % ]
- { \__scontents_parse_mergesc_aux:nw {#1} }
- { \__scontents_parse_mergesc_aux:nw {#1} [ 1-\seq_count:c { g__scontents_name_#1_seq } ] }
+ \peek_remove_spaces:n
+ {
+ \peek_charcode:NTF [ % ]
+ { \__scontents_parse_mergesc_aux:nw {#1} }
+ { \__scontents_parse_mergesc_aux:nw {#1} [ 1-\seq_count:c { g__scontents_name_#1_seq } ] }
+ }
}
\cs_new_protected:Npn \__scontents_parse_mergesc_aux:nw #1 [#2]
{
Modified: trunk/Master/texmf-dist/tex/generic/scontents/scontents.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/scontents/scontents.tex 2025-03-27 19:06:45 UTC (rev 74764)
+++ trunk/Master/texmf-dist/tex/generic/scontents/scontents.tex 2025-03-27 19:06:59 UTC (rev 74765)
@@ -6,7 +6,7 @@
%%
%% scontents.dtx (with options: `loader,plain')
%%
-%% Copyright (C) 2019-2024 by Pablo González L <pablgonz at educarchile.cl>
+%% Copyright (C) 2019-2025 by Pablo González L <pablgonz at educarchile.cl>
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
@@ -27,8 +27,8 @@
%% t-scontents.mkiv and
%% scontents-code.tex.
%%
-\def\ScontentsFileDate{2024-06-14}%
-\def\ScontentsFileVersion{2.1}%
+\def\ScontentsFileDate{2025-03-26}%
+\def\ScontentsFileVersion{2.2}%
\def\ScontentsFileDescription{Stores LaTeX contents in memory or files}%
\input expl3-generic.tex
\ExplSyntaxOn
@@ -35,7 +35,7 @@
\tl_gset:cx { ver @ scontents . sty } { \ScontentsFileDate\space
v\ScontentsFileVersion\space \ScontentsFileDescription }
\iow_log:x { Package: ~ scontents ~ \use:c { ver @ scontents . sty } }
-\msg_gset:nnn { scontents } { already-loaded }
+\msg_set:nnn { scontents } { already-loaded }
{ The~'scontents'~package~is~already~loaded.~Aborting~input~\msg_line_context:. }
\cs_if_exist:NT \__scontents_rescan_tokens:n
{
Modified: trunk/Master/texmf-dist/tex/latex/scontents/scontents.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/scontents/scontents.sty 2025-03-27 19:06:45 UTC (rev 74764)
+++ trunk/Master/texmf-dist/tex/latex/scontents/scontents.sty 2025-03-27 19:06:59 UTC (rev 74765)
@@ -6,7 +6,7 @@
%%
%% scontents.dtx (with options: `loader,latex')
%%
-%% Copyright (C) 2019-2024 by Pablo González L <pablgonz at educarchile.cl>
+%% Copyright (C) 2019-2025 by Pablo González L <pablgonz at educarchile.cl>
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
@@ -27,8 +27,8 @@
%% t-scontents.mkiv and
%% scontents-code.tex.
%%
-\def\ScontentsFileDate{2024-06-14}%
-\def\ScontentsFileVersion{2.1}%
+\def\ScontentsFileDate{2025-03-26}%
+\def\ScontentsFileVersion{2.2}%
\def\ScontentsFileDescription{Stores LaTeX contents in memory or files}%
\IfFormatAtLeastTF { 2022-06-01 }
{ }
More information about the tex-live-commits
mailing list.