From 7cd6a515482210cfdfe54c8510b2758fec431c0c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 Mar 2021 21:10:53 +0000 Subject: lua-ul (18mar21) git-svn-id: svn://tug.org/texlive/trunk@58514 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/lualatex/lua-ul/lua-ul.pdf | Bin 99609 -> 100003 bytes .../texmf-dist/source/lualatex/lua-ul/lua-ul.dtx | 24 +++++++++++---------- .../tex/lualatex/lua-ul/docstrip-luacode.sty | 2 +- Master/texmf-dist/tex/lualatex/lua-ul/lua-ul.sty | 8 +++---- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Master/texmf-dist/doc/lualatex/lua-ul/lua-ul.pdf b/Master/texmf-dist/doc/lualatex/lua-ul/lua-ul.pdf index a868e5e6ef8..f87859a29d0 100644 Binary files a/Master/texmf-dist/doc/lualatex/lua-ul/lua-ul.pdf and b/Master/texmf-dist/doc/lualatex/lua-ul/lua-ul.pdf differ diff --git a/Master/texmf-dist/source/lualatex/lua-ul/lua-ul.dtx b/Master/texmf-dist/source/lualatex/lua-ul/lua-ul.dtx index ad57f41b679..fc2b8b43af6 100644 --- a/Master/texmf-dist/source/lualatex/lua-ul/lua-ul.dtx +++ b/Master/texmf-dist/source/lualatex/lua-ul/lua-ul.dtx @@ -20,6 +20,7 @@ % \input docstrip.tex \keepsilent +\askforoverwritefalse \let\MetaPrefix\relax \preamble \endpreamble @@ -62,7 +63,7 @@ % \duck % \end{tikzpicture}§ % }} -% \NewDocumentCommand\underDuck{m}{{\beginUnderDuck#1}} +% \NewDocumentCommand\underDuck{+m}{{\beginUnderDuck#1}} % \newunderlinetype\beginUnderWavy[\number\dimexpr1ex]{\cleaders\hbox{§ % \setlength\unitlength{.3ex}§ % \begin{picture}(4,0)(0,1) @@ -72,11 +73,11 @@ % \qbezier(2,0)(3,-1)(4,0) % \end{picture}§ % }} -% \NewDocumentCommand\underWavy{m}{{\beginUnderWavy#1}} +% \NewDocumentCommand\underWavy{+m}{{\beginUnderWavy#1}} % \newunderlinetype\beginStrikeThough{\leaders\hbox{§ % \normalfont\bfseries/§ % }} -% \NewDocumentCommand\StrikeThough{m}{{\beginStrikeThough#1}} +% \NewDocumentCommand\StrikeThough{+m}{{\beginStrikeThough#1}} % % \newcommand\Luaul{Lua-UL} % \newcommand\luaul{Lua-UL} @@ -180,7 +181,7 @@ % \duck % \end{tikzpicture}% % }} -% \NewDocumentCommand\underDuck{m}{{\beginUnderDuck#1}} +% \NewDocumentCommand\underDuck{+m}{{\beginUnderDuck#1}} % \newunderlinetype\beginUnderWavy[\number\dimexpr1ex]{\cleaders\hbox{% % \setlength\unitlength{.3ex}% % \begin{picture}(4,0)(0,1) @@ -190,11 +191,11 @@ % \qbezier(2,0)(3,-1)(4,0) % \end{picture}% % }} -% \NewDocumentCommand\underWavy{m}{{\beginUnderWavy#1}} +% \NewDocumentCommand\underWavy{+m}{{\beginUnderWavy#1}} % \newunderlinetype\beginStrikeThough{\leaders\hbox{% % \normalfont\bfseries/% % }} -% \NewDocumentCommand\StrikeThough{m}{{\beginStrikeThough#1}} +% \NewDocumentCommand\StrikeThough{+m}{{\beginStrikeThough#1}} % \end{verbatim} % % Here \verb+\underWavy+ uses a custom context because it doesn't change depending on the current font color. @@ -816,7 +817,7 @@ luatexbase.add_to_callback('vpack_filter', \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {lua-ul} - [2021/02/02 v0.1.1 Underlining and related functionality for LuaTeX] + [2021/02/15 v0.1.2 Underlining and related functionality for LuaTeX] % \fi % Only \LuaLaTeX{} is supported. @@ -910,15 +911,16 @@ luatexbase.add_to_callback('vpack_filter', \edef\luaul@highlight@color{\IfValueTF{#1}{[#1]{#2}}{#2}}% } % \end{macrocode} -% \changes{0.1.1}{2020-03-15}{Use \texttt{xparse} for all user commands} +% \changes{0.1.1}{2021-02-02}{Use \texttt{xparse} for all user commands} % \changes{0.1.1}{2021-02-02}{Optionally color \texttt{\protect\string\protect\strikeThrough}} +% \changes{0.1.2}{2021-02-15}{Allow \texttt{long} arguments (again)} % The sizes for the predefined commands are stolen from the \enquote{soul} % default values. % \begin{macrocode} \newunderlinetype\@underLine{% \leaders\vrule height -.65ex depth .75ex } - \NewDocumentCommand\underLine{m}{{\@underLine#1}} + \NewDocumentCommand\underLine{+m}{{\@underLine#1}} \newunderlinetype\@strikeThrough{% \leaders\vrule height .55ex depth -.45ex @@ -928,7 +930,7 @@ luatexbase.add_to_callback('vpack_filter', \luaul@applycolor \leaders\vrule height .55ex depth -.45ex } - \NewDocumentCommand\strikeThrough{om}{{% + \NewDocumentCommand\strikeThrough{o+m}{{% \IfValueTF{#1}{% \luaul@setcolor{#1}% \colored@strikeThrough @@ -941,7 +943,7 @@ luatexbase.add_to_callback('vpack_filter', \luaul@applycolor \leaders\vrule height 1.75ex depth .75ex } - \NewDocumentCommand\highLight{O{\luaul@highlight@color}m}{{% + \NewDocumentCommand\highLight{O{\luaul@highlight@color}+m}{{% \luaul@setcolor{#1}% \@highLight#2% }} diff --git a/Master/texmf-dist/tex/lualatex/lua-ul/docstrip-luacode.sty b/Master/texmf-dist/tex/lualatex/lua-ul/docstrip-luacode.sty index 29f055258f4..f406b6a0d15 100644 --- a/Master/texmf-dist/tex/lualatex/lua-ul/docstrip-luacode.sty +++ b/Master/texmf-dist/tex/lualatex/lua-ul/docstrip-luacode.sty @@ -13,7 +13,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {docstrip-luacode} - [2021/02/02 v0.1.1 Directly execute Lua code from DocStrip files] + [2021/02/15 v0.1.2 Directly execute Lua code from DocStrip files] \expanded{% \def\noexpand\docstrip@luacode@argscanner#1\directlua{ tex.sprint(\the\catcodetable@string, "\string\\end{docstrip-luacode}") diff --git a/Master/texmf-dist/tex/lualatex/lua-ul/lua-ul.sty b/Master/texmf-dist/tex/lualatex/lua-ul/lua-ul.sty index f432fb068cb..a36cdec1b44 100644 --- a/Master/texmf-dist/tex/lualatex/lua-ul/lua-ul.sty +++ b/Master/texmf-dist/tex/lualatex/lua-ul/lua-ul.sty @@ -20,7 +20,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {lua-ul} - [2021/02/02 v0.1.1 Underlining and related functionality for LuaTeX] + [2021/02/15 v0.1.2 Underlining and related functionality for LuaTeX] \ifx\directlua\undefined \PackageError{lua-ul}{LuaLaTeX required}% @@ -84,7 +84,7 @@ \newunderlinetype\@underLine{% \leaders\vrule height -.65ex depth .75ex } - \NewDocumentCommand\underLine{m}{{\@underLine#1}} + \NewDocumentCommand\underLine{+m}{{\@underLine#1}} \newunderlinetype\@strikeThrough{% \leaders\vrule height .55ex depth -.45ex @@ -94,7 +94,7 @@ \luaul@applycolor \leaders\vrule height .55ex depth -.45ex } - \NewDocumentCommand\strikeThrough{om}{{% + \NewDocumentCommand\strikeThrough{o+m}{{% \IfValueTF{#1}{% \luaul@setcolor{#1}% \colored@strikeThrough @@ -107,7 +107,7 @@ \luaul@applycolor \leaders\vrule height 1.75ex depth .75ex } - \NewDocumentCommand\highLight{O{\luaul@highlight@color}m}{{% + \NewDocumentCommand\highLight{O{\luaul@highlight@color}+m}{{% \luaul@setcolor{#1}% \@highLight#2% }} -- cgit v1.2.3