From d4a75ab9db4e8f02b22024ac4e7eb53f983512eb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 29 Oct 2019 21:24:55 +0000 Subject: scontents (29oct19) git-svn-id: svn://tug.org/texlive/trunk@52575 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/context/third/scontents/t-scontents.mkiv | 14 ++++--------- .../tex/generic/scontents/scontents-code.tex | 2 +- .../texmf-dist/tex/generic/scontents/scontents.tex | 23 ++++++++++------------ .../texmf-dist/tex/latex/scontents/scontents.sty | 7 +++---- 4 files changed, 18 insertions(+), 28 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/context/third/scontents/t-scontents.mkiv b/Master/texmf-dist/tex/context/third/scontents/t-scontents.mkiv index 71c505801c9..8f336482dad 100644 --- a/Master/texmf-dist/tex/context/third/scontents/t-scontents.mkiv +++ b/Master/texmf-dist/tex/context/third/scontents/t-scontents.mkiv @@ -33,16 +33,16 @@ %% scontents.dtx (with options: `loader,context') %D \module %D [ file=t-scontents, -%D version=1.6, +%D version=1.7, %D title=\CONTEXT\ User Module, %D subtitle=Storing Contents, %D author=Pablo González, -%D date=2019-10-26, +%D date=2019-10-29, %D copyright=Pablo González, %D email=pablgonz@educarchile.cl, %D license=LPPL] -\def\ScontentsFileDate{2019-10-26}% -\def\ScontentsFileVersion{1.6}% +\def\ScontentsFileDate{2019-10-29}% +\def\ScontentsFileVersion{1.7}% \def\ScontentsFileDescription{Stores LaTeX contents in memory or files}% \writestatus{loading}{User Module scontents v\ScontentsFileVersion} \unprotect @@ -169,12 +169,6 @@ { \__scontents_foreachsc_internal:nn {#1} {#2} } \NewDocumentCommand { \typestored } { o m } { \__scontents_typestored_internal:nn {#1} {#2} } -\use:x - { - \cs_new_protected:Npn \exp_not:N \__scontents_xverb:w - ##1 \g__scontents_end_verbatimsc_tl - { ##1 \exp_not:N \stopverbatimsc } - } \definetyping[verbatimsc] \group_begin: \cs_new_protected:Npn \__scontents_plain_disable_outer_par: diff --git a/Master/texmf-dist/tex/generic/scontents/scontents-code.tex b/Master/texmf-dist/tex/generic/scontents/scontents-code.tex index 378e48aeff1..49e87eba3e0 100644 --- a/Master/texmf-dist/tex/generic/scontents/scontents-code.tex +++ b/Master/texmf-dist/tex/generic/scontents/scontents-code.tex @@ -27,7 +27,7 @@ %% t-scontents.mkiv and %% scontents-code.tex. %% -\def\ScontentsCoreFileDate{2019-10-26}% +\def\ScontentsCoreFileDate{2019-10-29}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax diff --git a/Master/texmf-dist/tex/generic/scontents/scontents.tex b/Master/texmf-dist/tex/generic/scontents/scontents.tex index 9f295044168..24d0ee99dcf 100644 --- a/Master/texmf-dist/tex/generic/scontents/scontents.tex +++ b/Master/texmf-dist/tex/generic/scontents/scontents.tex @@ -27,8 +27,8 @@ %% t-scontents.mkiv and %% scontents-code.tex. %% -\def\ScontentsFileDate{2019-10-26}% -\def\ScontentsFileVersion{1.6}% +\def\ScontentsFileDate{2019-10-29}% +\def\ScontentsFileVersion{1.7}% \def\ScontentsFileDescription{Stores LaTeX contents in memory or files}% \input expl3-generic.tex \ExplSyntaxOn @@ -146,9 +146,14 @@ \NewDocumentCommand \__scontents_grab_optional:w { r[] } { \__scontents_grab_optional:n {#1} } \bool_new:N \l__scontents_temp_bool -\cs_new_protected:Npn \verbatim - { \__scontents_verbatim_aux: \frenchspacing \__scontents_vobeyspaces: \__scontents_xverb: } -\cs_new_protected:Npn \__scontents_verbatim_aux: +\cs_new_protected:Npn \verbatimsc + { + \group_begin: + \__scontents_verbatimsc_aux: \frenchspacing \__scontents_vobeyspaces: \__scontents_xverb: + } +\cs_new_protected:Npn \endverbatimsc + { \group_end: } +\cs_new_protected:Npn \__scontents_verbatimsc_aux: { \skip_vertical:N \parskip \int_set:Nn \parindent { 0pt } @@ -206,14 +211,6 @@ ##1 \g__scontents_end_verbatimsc_tl { ##1 \exp_not:N \endverbatimsc } } -\NewDocumentEnvironment { verbatimsc } { } - { - \group_begin: - \verbatim - } - { - \group_end: - } \group_begin: \char_set_catcode_active:n { `\* } \cs_new_protected:Npn \__scontents_plain_disable_outer_par: diff --git a/Master/texmf-dist/tex/latex/scontents/scontents.sty b/Master/texmf-dist/tex/latex/scontents/scontents.sty index 91b3d854865..ceb700d4348 100644 --- a/Master/texmf-dist/tex/latex/scontents/scontents.sty +++ b/Master/texmf-dist/tex/latex/scontents/scontents.sty @@ -27,8 +27,8 @@ %% t-scontents.mkiv and %% scontents-code.tex. %% -\def\ScontentsFileDate{2019-10-26}% -\def\ScontentsFileVersion{1.6}% +\def\ScontentsFileDate{2019-10-29}% +\def\ScontentsFileVersion{1.7}% \def\ScontentsFileDescription{Stores LaTeX contents in memory or files}% \RequirePackage{expl3,xparse,l3keys2e}[2019/05/28] \ProvidesExplPackage @@ -96,8 +96,7 @@ \cs_set_eq:cN { @xverbatim } \__scontents_xverb: \verbatim } - { - } + { } \group_begin: \cs_new_protected:Npn \__scontents_plain_disable_outer_par: { } -- cgit v1.2.3