Skip to content

Commit

Permalink
Fix \cleansc
Browse files Browse the repository at this point in the history
  • Loading branch information
pablgonz committed Jun 7, 2024
1 parent 5761172 commit 84d1628
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 25 deletions.
4 changes: 2 additions & 2 deletions build.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
-- General package identification
module = "scontents"
pkgversion = "2.1"
pkgdate = "2024-04-15"
pkgdate = "2024-06-07"

-- Configuration of files for build and installation
maindir = "."
Expand Down Expand Up @@ -55,7 +55,7 @@ tagfiles = {"sources/scontents.ins", "sources/scontents.dtx", "sources/CTANREADM
local mydate = os.date("!%Y-%m-%d")

function update_tag(file,content,tagname,tagdate)
if not tagname and tagdate == mydate then
if not tagname and tagdate == mydate or "" then
tagname = pkgversion
tagdate = pkgdate
print("** "..file.." have been tagged with the version and date of build.lua")
Expand Down
2 changes: 1 addition & 1 deletion ctan.ann
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Changes in v2.1 2024-04-15:
Changes in v2.1 2024-06-07:
- Fix internal code for `\typestored`.
- Adapt detection of `l3keys2e` package (obsolete in june 2022 `LaTeX` release).
2 changes: 1 addition & 1 deletion sources/CTANREADME.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## scontents — Stores LaTeX contents in memory or files

Release v2.1 \[2024-04-15\]
Release v2.1 \[2024-06-07\]

## Description

Expand Down
3 changes: 1 addition & 2 deletions sources/scontents-code.tex
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
%% t-scontents.mkiv and
%% scontents-code.tex.
%%

\def\ScontentsCoreFileDate{2023-09-22}%
\def\ScontentsCoreFileDate{2024-04-15}%
\begingroup
\catcode32=10
\endlinechar=32
Expand Down
13 changes: 6 additions & 7 deletions sources/scontents.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
% so that entries written to both streams end up in the same file.
\usepackage[english]{babel}
\usepackage[top=0.5in,bottom=0.3in,left=2in,right=0.7in,footskip=0.2in,headheight=1cm,headsep=0.27cm]{geometry}
\usepackage{libertine} % need by setup-texlive-action@v3
\usepackage[llscaled=0.95]{libertine} % need by setup-texlive-action@v3
\usepackage[osf,nomath,mono=false,ScaleSF=0.95,ScaleRM=0.95]{libertinus-otf}
% Set Monospace font, fix 'quotes' in verbatim
\usepackage{sourcecodepro}
Expand Down Expand Up @@ -1252,13 +1252,11 @@ This text is in the outer environment (after nested).
% stored in the \mymarg[type=tt]{seq name}. The key \mykey{width-tab} is available for
% this command.
%
%
% \subsection{The command \cs{mergesc}}
% \label{sec:mergesc}
%
% \vspace*{-10pt}
%
%
% \newsavebox{\argmergesc}
% \begin{lrbox}{\argmergesc}
% \small\mymarg[type=tt]{seq A}\myoarg[type=tt]{index}\textcolor{gray}{, }\mymarg[type=tt]{seq B}\myoarg[type=tt]{start \textcolor{gray}{-} stop}\textcolor{gray}{, }\mymarg[type=tt]{seq C}\myoarg[type=tt]{1-end}
Expand Down Expand Up @@ -1953,7 +1951,8 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
% \begin{description}[font=\small\sffamily,wide=0pt,style=multiline,leftmargin=\descrwidth,nosep,noitemsep]
% \item [\fileversion{} (ctan), \filedate]
% \begin{itemize}
% \item Add |mergesc| command.
% \item Fix |\cleansc| command.
% \item Add |\mergesc| command.
% \item Fix internal code for |\typestored|.
% \item Replace |\cs_argument_spec:N| by |\cs_parameter_spec:N|.
% \item Detect |l3keys2e| package (obsolete in june 2022 \LaTeX{} release).
Expand Down Expand Up @@ -2104,8 +2103,8 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
%
% Now we define some common macros to hold the package date and version:
% \begin{macrocode}
%<loader>\def\ScontentsFileDate{2024-04-15}%
%<core>\def\ScontentsCoreFileDate{2024-04-15}%
%<loader>\def\ScontentsFileDate{2024-06-07}%
%<core>\def\ScontentsCoreFileDate{2024-06-07}%
%<*loader>
\def\ScontentsFileVersion{2.1}%
\def\ScontentsFileDescription{Stores LaTeX contents in memory or files}%
Expand Down Expand Up @@ -4111,7 +4110,7 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
%</core>
%<*loader>
\NewDocumentCommand \cleanseqsc { m }
{ \seq_clear_new:c { g_@@_name_#1_seq } }
{ \seq_gclear_new:c { g_@@_name_#1_seq } }
%</loader>
%<*core>
% \end{macrocode}
Expand Down
2 changes: 1 addition & 1 deletion sources/scontents.ins
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ and the derived files scontents.sty,
title=\string\CONTEXT\ User Module,
subtitle=Storing Contents,
author=Pablo González,
date=2024-04-15,
date=2024-06-07,
copyright=Pablo González,
email=pablgonz@educarchile.cl,
license=LPPL]
Expand Down
5 changes: 2 additions & 3 deletions sources/scontents.sty
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@
%% t-scontents.mkiv and
%% scontents-code.tex.
%%

\def\ScontentsFileDate{2023-09-22}%
\def\ScontentsFileVersion{2.2}%
\def\ScontentsFileDate{2024-04-15}%
\def\ScontentsFileVersion{2.1}%
\def\ScontentsFileDescription{Stores LaTeX contents in memory or files}%
\IfFormatAtLeastTF { 2022-06-01 }
{ }
Expand Down
5 changes: 2 additions & 3 deletions sources/scontents.tex
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@
%% t-scontents.mkiv and
%% scontents-code.tex.
%%

\def\ScontentsFileDate{2023-09-22}%
\def\ScontentsFileVersion{2.2}%
\def\ScontentsFileDate{2024-04-15}%
\def\ScontentsFileVersion{2.1}%
\def\ScontentsFileDescription{Stores LaTeX contents in memory or files}%
\input expl3-generic.tex
\ExplSyntaxOn
Expand Down
9 changes: 4 additions & 5 deletions sources/t-scontents.mkiv
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,16 @@
%% scontents.dtx (with options: `loader,context')
%D \module
%D [ file=t-scontents,
%D version=2.2,
%D version=2.1,
%D title=\CONTEXT\ User Module,
%D subtitle=Storing Contents,
%D author=Pablo González,
%D date=2023-09-22,
%D date=2024-04-15,
%D copyright=Pablo González,
%D email=pablgonz@educarchile.cl,
%D license=LPPL]

\def\ScontentsFileDate{2023-09-22}%
\def\ScontentsFileVersion{2.2}%
\def\ScontentsFileDate{2024-04-15}%
\def\ScontentsFileVersion{2.1}%
\def\ScontentsFileDescription{Stores LaTeX contents in memory or files}%
\writestatus{loading}{User Module scontents v\ScontentsFileVersion}
\unprotect
Expand Down

0 comments on commit 84d1628

Please sign in to comment.