summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-10-26 20:38:48 +0000
committerKarl Berry <karl@freefriends.org>2019-10-26 20:38:48 +0000
commit58fc9c2dd30d4246b9cb2a6708d45b0eb7030ef9 (patch)
tree265f9b4954aed37cfd246fd505ce4873291a28db
parent7026eb5fea352c3036b5188e7a16fed00b0365d3 (diff)
scontents (26oct19)
git-svn-id: svn://tug.org/texlive/trunk@52539 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/scontents/README.md6
-rw-r--r--Master/texmf-dist/doc/latex/scontents/scontents.pdfbin340870 -> 338561 bytes
-rw-r--r--Master/texmf-dist/source/latex/scontents/scontents.dtx81
-rw-r--r--Master/texmf-dist/source/latex/scontents/scontents.ins8
-rw-r--r--Master/texmf-dist/tex/context/third/scontents/t-scontents.mkiv (renamed from Master/texmf-dist/tex/context/third/scontents/t-scontents.mkvi)14
-rw-r--r--Master/texmf-dist/tex/generic/scontents/scontents-code.tex19
-rw-r--r--Master/texmf-dist/tex/generic/scontents/scontents.tex6
-rw-r--r--Master/texmf-dist/tex/latex/scontents/scontents.sty6
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds10
9 files changed, 98 insertions, 52 deletions
diff --git a/Master/texmf-dist/doc/latex/scontents/README.md b/Master/texmf-dist/doc/latex/scontents/README.md
index 73e9648df8d..5e2fcf02fd3 100644
--- a/Master/texmf-dist/doc/latex/scontents/README.md
+++ b/Master/texmf-dist/doc/latex/scontents/README.md
@@ -1,6 +1,6 @@
## scontents — Stores LaTeX contents in memory or files
-- Version: 1.5
-- Date: 2019-10-24
+- Version: 1.6
+- Date: 2019-10-26
- Author: Pablo González
## Description
@@ -26,7 +26,7 @@ the files to appropriate locations:
scontents.tex -> TDS:tex/generic/scontents/
scontents-code.tex -> TDS:tex/generic/scontents/
scontents.sty -> TDS:tex/latex/scontents/
- t-scontents.mkvi -> TDS:tex/context/third/scontents/
+ t-scontents.mkiv -> TDS:tex/context/third/scontents/
scontents.pdf -> TDS:doc/latex/scontents/
README.md -> TDS:doc/latex/scontents/
scontents.dtx -> TDS:source/latex/scontents/
diff --git a/Master/texmf-dist/doc/latex/scontents/scontents.pdf b/Master/texmf-dist/doc/latex/scontents/scontents.pdf
index ee0ed05e8d9..55eb50773f1 100644
--- a/Master/texmf-dist/doc/latex/scontents/scontents.pdf
+++ b/Master/texmf-dist/doc/latex/scontents/scontents.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/scontents/scontents.dtx b/Master/texmf-dist/source/latex/scontents/scontents.dtx
index 4b77c043eef..70c7ea4b14f 100644
--- a/Master/texmf-dist/source/latex/scontents/scontents.dtx
+++ b/Master/texmf-dist/source/latex/scontents/scontents.dtx
@@ -18,7 +18,7 @@
% scontents.ins,
% and the derived files scontents.sty,
% scontents.tex,
-% t-scontents.mkvi and
+% t-scontents.mkiv and
% scontents-code.tex.
%
%<*driver>
@@ -32,16 +32,37 @@
% so that entries written to both streams end up in the same file.
\usepackage[top=0.5in,bottom=0.5in,left=2in,right=0.7in,footskip=0.2in,headsep=10pt]{geometry}
\usepackage[osf,mono=false,scale=0.95,llscaled=0.95]{libertine}
+\setmonofont[
+ Ligatures = TeX,
+ Numbers = OldStyle,
+ Scale = 0.80,
+ UprightFont = *-Regular,
+ ItalicFont = *-RegularIt,
+ BoldFont = *-Semibold,
+ BoldItalicFont = *-SemiboldIt,
+ RawFeature = {+zero,+ss06},
+ FontFace = {m}{sc}{*-ExtraLight},
+ Extension = .otf]{SourceCodePro}
+\newfontfamily\sourcecodeprolight{SourceCodePro-Regular.otf}[Scale = 0.80,FakeStretch =0.75]
+\RenewDocumentCommand{\MacroLongFont}{}
+ { \sourcecodeprolight\small }
\usepackage{unicode-math}
+
+% Unicode-math changes the position of the glyphs, so the position 26A is now
+% a letter `j'. The doc package ensures that mathcode and the | actually prints
+% a j inside docstrip guards. This changes the mathcode of | to 07C:
+\makeatletter
+\def\mod@math@codes{\mathcode`\|="207C \mathcode`\&="2026
+ \mathcode`\-="702D \mathcode`\+="702B
+ \mathcode`\:="703A \mathcode`\=="703D }
+\makeatother
+
\setmathfont[Scale = 0.95]{latinmodern-math.otf}
-\usepackage[osf,scale=0.80,semibold]{sourcecodepro}
\usepackage{fontawesome5}
\newfontfamily\lmmitalic{lmmono10-italic.otf}[
Scale = 0.95,%
Extension = .otf,%
ItalicFont = lmmono10-italic,%
- SmallCapsFont = lmmonocaps10-oblique,%
- SlantedFont = lmmonoslant10-regular,
]
\newfontfamily\fetamontotf{ffmw10.otf}[
Scale = 0.95,%
@@ -52,7 +73,6 @@
\usepackage{hyperxmp,lastpage,imakeidx,microtype,attachfile2}
\usepackage{adjustbox,multicol,listings,accsupp,titletoc}
\usepackage{scontents} % main
-\usepackage[osf,scale=0.80,semibold]{sourcecodepro}
\usepackage[contents]{colordoc}
% Patching colordoc.sty to work with l3doc.cls
@@ -92,7 +112,7 @@
% Now, after imakeidx opens the write stream for the index file, we copy
% the reference to \@indexfile:
\makeatletter
-\let\@indexfile\scontents@idxfile
+\expandafter\let\expandafter\@indexfile\csname \jobname @idxfile\endcsname
\makeatother
\setlength{\parindent}{0pt}
@@ -1579,11 +1599,17 @@ No tab
%
% \setlist[itemize,1]{label=\textendash,wide=0.5em,nosep,noitemsep,leftmargin=10pt}
% \newlength\descrwidth
-% \settowidth{\descrwidth}{\textsf{v1.0, (ctan), 2019/07/30} }
+% \settowidth{\descrwidth}{\textsf{v1.0, (ctan), 2019-07-30} }
%
% \begin{description}[font=\small\sffamily,wide=0pt,style=multiline,leftmargin=\descrwidth,nosep,noitemsep]
% \item [\fileversion{} (ctan), \filedate]
% \begin{itemize}
+% \item The internal behavior of |\getstored| has been modified.
+% \item The internal behavior of |\foreachsc| has been modified.
+% \item Corrected file extension for \hologo{ConTeXt}.
+% \end{itemize}
+% \item [v1.5 (ctan), 2019-10-24]
+% \begin{itemize}
% \item Add support for \hologo{plainTeX} and \hologo{ConTeXt}.
% \item Split internal code for optimization.
% \item Add support for vertical spaces in |key=val|.
@@ -1596,27 +1622,27 @@ No tab
% \item Messages and keys were separated.
% \item Restructuring of documentation.
% \item Now the version of |expl3| is checked instead of |xparse|.
-% \item The internal behavior of \verb+force-eol+ has been modified.
+% \item The internal behavior of |force-eol| has been modified.
% \end{itemize}
% \item [v1.3 (ctan), 2019-09-24]
% \begin{itemize}
% \item The environment can now nest.
-% \item Added \verb+force-eol+, \verb+verb-font+ and \verb+width-tab+ keys.
-% \item The extra space has been removed when you run \verb+\getstored+.
+% \item Added |force-eol|, |verb-font| and |width-tab| keys.
+% \item The extra space has been removed when you run |\getstored|.
% \item Internal code has been rewritten more efficiently.
-% \item Remove \verb+\typestored*+.
-% \item Remove \verb+filecontentsdef+ dependency.
-% \item Changing \verb+\regex_replace_all:+ for \verb+\tl_replace_all:+.
+% \item Remove |\typestored|.
+% \item Remove |filecontentsdef| dependency.
+% \item Changing |\regex_replace_all:| for |\tl_replace_all:|.
% \end{itemize}
% \item [v1.2 (ctan), 2019-08-28]
% \begin{itemize}
% \item Restructuring of documentation.
-% \item Added copy of \verb+\tex_scantokens:D+.
+% \item Added copy of |\tex_scantokens:|.
% \end{itemize}
% \item [v1.1 (ctan), 2019-08-12]
% \begin{itemize}
% \item Extension of documentation.
-% \item Replace \verb+\tex_endinput:D+ by \verb+\file_input_stop:+.
+% \item Replace |\tex_endinput:D| by |\file_input_stop:|.
% \end{itemize}
% \item [v1.0 (ctan), 2019-07-30]
% \begin{itemize}
@@ -1651,10 +1677,10 @@ No tab
%
% Now we define some common macros to hold the package date and version:
% \begin{macrocode}
-%<loader>\def\ScontentsFileDate{2019-10-24}%
-%<core>\def\ScontentsCoreFileDate{2019-10-24}%
+%<loader>\def\ScontentsFileDate{2019-10-26}%
+%<core>\def\ScontentsCoreFileDate{2019-10-26}%
%<*loader>
-\def\ScontentsFileVersion{1.5}%
+\def\ScontentsFileVersion{1.6}%
\def\ScontentsFileDescription{Stores LaTeX contents in memory or files}%
% \end{macrocode}
%
@@ -2394,8 +2420,7 @@ No tab
%
% We define the environment \env{scontents}, next to the system
% \myoarg{key \textnormal{\textcolor{gray}{=}} val}. The environment
-% is divided into three parts. This implementation is taken from answer
-% by Enrico Gregorio in \url{https://tex.stackexchange.com/a/487746/7832}.
+% is divided into two parts.
%
% \begin{macro}{
% scontents,
@@ -2622,7 +2647,8 @@ No tab
{ \tl_if_blank_p:n {#2} }
{ \str_if_eq_p:ee {#2} { \c_percent_str } }
{
- \msg_warning:nnn { scontents } { rescanning-text } {#2}
+ \str_if_eq:VnF \c_@@_hidden_space_str {#2}
+ { \msg_warning:nnn { scontents } { rescanning-text } {#2} }
\@@_rescan_tokens:n {#2}
}
}
@@ -2834,7 +2860,6 @@ No tab
% \Scontents,
% \@@_norm_arg:n,
% \@@_Scontents_auxi:N,
-% \Scontents code,
% \@@_Scontents_internal:nn,
% \@@_verb_arg:w,
% \@@_verb_arg_internal:n,
@@ -2912,8 +2937,10 @@ No tab
\group_begin:
\int_set:Nn \tex_newlinechar:D { `\^^J }
\@@_rescan_tokens:x
- { \@@_getfrom_seq:nn {#1} {#2} }
- \group_end:
+ {
+ \endgroup % This assumes \catcode`\\=0... Things might go off otherwise.
+ \@@_getfrom_seq:nn {#1} {#2}
+ }
}
% \end{macrocode}
% \end{macro}
@@ -2946,8 +2973,12 @@ No tab
{ \l_@@_foreach_step_int }
{ \l_@@_foreach_stop_int }
\@@_foreach_add_body:n
- \seq_use:Nn \l_@@_foreach_print_seq { \tl_use:N \l_@@_foreach_sep_tl }
+ \tl_gset:Nx \g_@@_temp_tl
+ { \seq_use:Nn \l_@@_foreach_print_seq { \tl_use:N \l_@@_foreach_sep_tl } }
\group_end:
+ \exp_after:wN \tl_gclear:N
+ \exp_after:wN \g_@@_temp_tl
+ \g_@@_temp_tl
}
\cs_new_protected:Npn \@@_foreach_add_body:n #1
{
diff --git a/Master/texmf-dist/source/latex/scontents/scontents.ins b/Master/texmf-dist/source/latex/scontents/scontents.ins
index 70db162f19a..760aea29511 100644
--- a/Master/texmf-dist/source/latex/scontents/scontents.ins
+++ b/Master/texmf-dist/source/latex/scontents/scontents.ins
@@ -21,7 +21,7 @@ This work consists of the files scontents.dtx and
scontents.ins,
and the derived files scontents.sty,
scontents.tex,
- t-scontents.mkvi and
+ t-scontents.mkiv and
scontents-code.tex.
\endpreamble
@@ -33,11 +33,11 @@ and the derived files scontents.sty,
\declarepreamble\context
\string\module
[ file=t-scontents,
- version=1.5,
+ version=1.6,
title=\string\CONTEXT\ User Module,
subtitle=Storing Contents,
author=Pablo González,
- date=2019-10-24,
+ date=2019-10-26,
copyright=Pablo González,
email=pablgonz@educarchile.cl,
license=LPPL]
@@ -52,7 +52,7 @@ and the derived files scontents.sty,
\file{scontents.tex} {\from{scontents.dtx}{loader,plain}}%
\file{scontents-code.tex}{\from{scontents.dtx}{core}}%
\edef\tmpa{\standard^^J\context}\usepreamble\tmpa
- \file{t-scontents.mkvi} {\from{scontents.dtx}{loader,context}}%
+ \file{t-scontents.mkiv} {\from{scontents.dtx}{loader,context}}%
}%
\Msg{*****************************************************************}%
diff --git a/Master/texmf-dist/tex/context/third/scontents/t-scontents.mkvi b/Master/texmf-dist/tex/context/third/scontents/t-scontents.mkiv
index 4365af18f1c..71c505801c9 100644
--- a/Master/texmf-dist/tex/context/third/scontents/t-scontents.mkvi
+++ b/Master/texmf-dist/tex/context/third/scontents/t-scontents.mkiv
@@ -1,5 +1,5 @@
%%
-%% This is file `t-scontents.mkvi',
+%% This is file `t-scontents.mkiv',
%% generated with the docstrip utility.
%%
%% The original source files were:
@@ -24,7 +24,7 @@
%% scontents.ins,
%% and the derived files scontents.sty,
%% scontents.tex,
-%% t-scontents.mkvi and
+%% t-scontents.mkiv and
%% scontents-code.tex.
%%
%%
@@ -33,16 +33,16 @@
%% scontents.dtx (with options: `loader,context')
%D \module
%D [ file=t-scontents,
-%D version=1.5,
+%D version=1.6,
%D title=\CONTEXT\ User Module,
%D subtitle=Storing Contents,
%D author=Pablo González,
-%D date=2019-10-24,
+%D date=2019-10-26,
%D copyright=Pablo González,
%D email=pablgonz@educarchile.cl,
%D license=LPPL]
-\def\ScontentsFileDate{2019-10-24}%
-\def\ScontentsFileVersion{1.5}%
+\def\ScontentsFileDate{2019-10-26}%
+\def\ScontentsFileVersion{1.6}%
\def\ScontentsFileDescription{Stores LaTeX contents in memory or files}%
\writestatus{loading}{User Module scontents v\ScontentsFileVersion}
\unprotect
@@ -191,4 +191,4 @@
\ExplSyntaxOff
\endinput
%%
-%% End of file `t-scontents.mkvi'.
+%% End of file `t-scontents.mkiv'.
diff --git a/Master/texmf-dist/tex/generic/scontents/scontents-code.tex b/Master/texmf-dist/tex/generic/scontents/scontents-code.tex
index ab8bbdb8a99..378e48aeff1 100644
--- a/Master/texmf-dist/tex/generic/scontents/scontents-code.tex
+++ b/Master/texmf-dist/tex/generic/scontents/scontents-code.tex
@@ -24,10 +24,10 @@
%% scontents.ins,
%% and the derived files scontents.sty,
%% scontents.tex,
-%% t-scontents.mkvi and
+%% t-scontents.mkiv and
%% scontents-code.tex.
%%
-\def\ScontentsCoreFileDate{2019-10-24}%
+\def\ScontentsCoreFileDate{2019-10-26}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -393,7 +393,8 @@
{ \tl_if_blank_p:n {#2} }
{ \str_if_eq_p:ee {#2} { \c_percent_str } }
{
- \msg_warning:nnn { scontents } { rescanning-text } {#2}
+ \str_if_eq:VnF \c__scontents_hidden_space_str {#2}
+ { \msg_warning:nnn { scontents } { rescanning-text } {#2} }
\__scontents_rescan_tokens:n {#2}
}
}
@@ -534,8 +535,10 @@
\group_begin:
\int_set:Nn \tex_newlinechar:D { `\^^J }
\__scontents_rescan_tokens:x
- { \__scontents_getfrom_seq:nn {#1} {#2} }
- \group_end:
+ {
+ \endgroup % This assumes \catcode`\\=0... Things might go off otherwise.
+ \__scontents_getfrom_seq:nn {#1} {#2}
+ }
}
\cs_new_protected:Npn \__scontents_foreachsc_internal:nn #1 #2
{
@@ -553,8 +556,12 @@
{ \l__scontents_foreach_step_int }
{ \l__scontents_foreach_stop_int }
\__scontents_foreach_add_body:n
- \seq_use:Nn \l__scontents_foreach_print_seq { \tl_use:N \l__scontents_foreach_sep_tl }
+ \tl_gset:Nx \g__scontents_temp_tl
+ { \seq_use:Nn \l__scontents_foreach_print_seq { \tl_use:N \l__scontents_foreach_sep_tl } }
\group_end:
+ \exp_after:wN \tl_gclear:N
+ \exp_after:wN \g__scontents_temp_tl
+ \g__scontents_temp_tl
}
\cs_new_protected:Npn \__scontents_foreach_add_body:n #1
{
diff --git a/Master/texmf-dist/tex/generic/scontents/scontents.tex b/Master/texmf-dist/tex/generic/scontents/scontents.tex
index 35fc8e406ec..9f295044168 100644
--- a/Master/texmf-dist/tex/generic/scontents/scontents.tex
+++ b/Master/texmf-dist/tex/generic/scontents/scontents.tex
@@ -24,11 +24,11 @@
%% scontents.ins,
%% and the derived files scontents.sty,
%% scontents.tex,
-%% t-scontents.mkvi and
+%% t-scontents.mkiv and
%% scontents-code.tex.
%%
-\def\ScontentsFileDate{2019-10-24}%
-\def\ScontentsFileVersion{1.5}%
+\def\ScontentsFileDate{2019-10-26}%
+\def\ScontentsFileVersion{1.6}%
\def\ScontentsFileDescription{Stores LaTeX contents in memory or files}%
\input expl3-generic.tex
\ExplSyntaxOn
diff --git a/Master/texmf-dist/tex/latex/scontents/scontents.sty b/Master/texmf-dist/tex/latex/scontents/scontents.sty
index 1639f07f615..91b3d854865 100644
--- a/Master/texmf-dist/tex/latex/scontents/scontents.sty
+++ b/Master/texmf-dist/tex/latex/scontents/scontents.sty
@@ -24,11 +24,11 @@
%% scontents.ins,
%% and the derived files scontents.sty,
%% scontents.tex,
-%% t-scontents.mkvi and
+%% t-scontents.mkiv and
%% scontents-code.tex.
%%
-\def\ScontentsFileDate{2019-10-24}%
-\def\ScontentsFileVersion{1.5}%
+\def\ScontentsFileDate{2019-10-26}%
+\def\ScontentsFileVersion{1.6}%
\def\ScontentsFileDescription{Stores LaTeX contents in memory or files}%
\RequirePackage{expl3,xparse,l3keys2e}[2019/05/28]
\ProvidesExplPackage
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 1ca05159943..a4c54637aa5 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1518,6 +1518,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'pxchfon' => '&POSTpxchfon',
'recipebook' => '&POST_rmsymlink',
'schule' => '&POSTschule',
+ 'scontents' => '&POSTscontents',
'shipunov' => '&POSTshipunov',
'simple-resume-cv' => '&POST_simple_rmFonts',
'simple-thesis-dissertation' => '&POST_simple_rmFonts',
@@ -6605,11 +6606,18 @@ sub POSTpxchfon {
}
sub POSTschule {
- print "POST$package - move additional packages\n";
+ print "POST$package - move additional files\n";
&mv_with_mkdir ("latex/* data/*", "$DEST/tex/latex/$package");
&SYSTEM ("$MV doc/* . && rmdir doc");
}
+sub POSTscontents {
+ print "POST$package - move files to assorted runtime directories\n";
+ &mv_with_mkdir ("t-scontents.mk*", "$DEST/tex/context/third/$package");
+ &mv_with_mkdir ("scontents.tex", "scontents-code.tex",
+ "$DEST/tex/generic/$package");
+}
+
sub POSTshipunov {
print "POST$package - rename new style files per agreement with author\n";
#