Skip to content

Handle hash symbols properly in \eappto #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wise0704 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Handle hash symbols properly in \eappto #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a602192
Handle hash symbols properly in eappto and epreto
wise0704 Jun 26, 2021
e831670
Add test files for eappto and epreto
wise0704 Jun 26, 2021
a72e4b8
Fix test etoolbox-eappto
wise0704 Jun 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions etoolbox.sty
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,16 +942,16 @@
{\edef#1{\expandonce#1\unexpanded{#2}}}}
\newrobustcmd{\eappto}[2]{%
\ifundef{#1}
{\edef#1{#2}}
{\edef#1{\expandonce#1#2}}}
{\edef#1{\expandonce{\expanded{#2}}}}
{\edef#1{\expandonce#1\expandonce{\expanded{#2}}}}}
\newrobustcmd{\gappto}[2]{%
\ifundef{#1}
{\xdef#1{\unexpanded{#2}}}
{\xdef#1{\expandonce#1\unexpanded{#2}}}}
\newrobustcmd{\xappto}[2]{%
\ifundef{#1}
{\xdef#1{#2}}
{\xdef#1{\expandonce#1#2}}}
{\xdef#1{\expandonce{\expanded{#2}}}}
{\xdef#1{\expandonce#1\expandonce{\expanded{#2}}}}}

\newrobustcmd*{\protected@eappto}{\etb@protected\eappto}
\newrobustcmd*{\protected@xappto}{\etb@protected\xappto}
Expand All @@ -964,16 +964,16 @@
{\edef#1{\unexpanded{#2}\expandonce#1}}}
\newrobustcmd{\epreto}[2]{%
\ifundef{#1}
{\edef#1{#2}}
{\edef#1{#2\expandonce#1}}}
{\edef#1{\expandonce{\expanded{#2}}}}
{\edef#1{\expandonce{\expanded{#2}}\expandonce#1}}}
\newrobustcmd{\gpreto}[2]{%
\ifundef{#1}
{\xdef#1{\unexpanded{#2}}}
{\xdef#1{\unexpanded{#2}\expandonce#1}}}
\newrobustcmd{\xpreto}[2]{%
\ifundef{#1}
{\xdef#1{#2}}
{\xdef#1{#2\expandonce#1}}}
{\xdef#1{\expandonce{\expanded{#2}}}}
{\xdef#1{\expandonce{\expanded{#2}}\expandonce#1}}}

\newrobustcmd*{\protected@epreto}{\etb@protected\epreto}
\newrobustcmd*{\protected@xpreto}{\etb@protected\xpreto}
Expand Down
64 changes: 64 additions & 0 deletions testfiles/etoolbox-eappto.lvt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
\input{regression-test}
\RequirePackage{etoolbox}

\START

\def\mmeaning#1{\string#1\space= {\meaning#1}}
\def\inputa{a}
\def\inputb{b}
\def\inputc{c}
\def\inputd{d}
\def\inpute{e}
\def\inputee{\inpute}
\toks0={\unexpandingmacro}

\TEST{\eappto regression test}{
\TYPE{\mmeaning\test}
\eappto\test{\inputa}
\TYPE{\mmeaning\test}
\eappto\test{\inputb\inputc}
\TYPE{\mmeaning\test}
\eappto\test{(\noexpand\inputd = \inputd)}
\TYPE{\mmeaning\test}
\eappto\test{(\expandonce\inputee = \inputee)}
\TYPE{\mmeaning\test}
\eappto\test{\the\toks0}
\TYPE{\mmeaning\test}
}

\TEST{\epreto regression test}{
\let\test\undefined
\TYPE{\mmeaning\test}
\epreto\test{\inputa}
\TYPE{\mmeaning\test}
\epreto\test{\inputb\inputc}
\TYPE{\mmeaning\test}
\epreto\test{(\noexpand\inputd = \inputd)}
\TYPE{\mmeaning\test}
\epreto\test{(\expandonce\inputee = \inputee)}
\TYPE{\mmeaning\test}
\epreto\test{\the\toks0}
\TYPE{\mmeaning\test}
}

\TEST{\eappto & \epreto with hash symbols}{
\def\two{four}
\def\four{eight}
\let\test\undefined
\eappto\test{
\unexpanded{\edef\lazyedef}{
only \unexpanded{\two} hash symbols (##) needed to escape
instead of \unexpanded{\four}}
}
\epreto\test{
\unexpanded{\def\lazydef#1#2}{do something with #1 and #2}
}
\def\two{two}
\def\four{four}
\test
\TYPE{\mmeaning\lazyedef}
\TYPE{\mmeaning\lazydef}
\TYPE{\string\lazydef{arg1}{arg2} = \lazydef{arg1}{arg2}}
}

\END
29 changes: 29 additions & 0 deletions testfiles/etoolbox-eappto.tlg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
============================================================
TEST 1: \eappto regression test
============================================================
\test = {undefined}
\test = {macro:->a}
\test = {macro:->abc}
\test = {macro:->abc(\inputd = d)}
\test = {macro:->abc(\inputd = d)(\inpute = e)}
\test = {macro:->abc(\inputd = d)(\inpute = e)\unexpandingmacro }
============================================================
============================================================
TEST 2: \epreto regression test
============================================================
\test = {undefined}
\test = {macro:->a}
\test = {macro:->bca}
\test = {macro:->(\inputd = d)bca}
\test = {macro:->(\inpute = e)(\inputd = d)bca}
\test = {macro:->\unexpandingmacro (\inpute = e)(\inputd = d)bca}
============================================================
============================================================
TEST 3: \eappto & \epreto with hash symbols
============================================================
\lazyedef = {macro:-> only two hash symbols (##) needed to escape instead of four}
\lazydef = {macro:#1#2->do something with #1 and #2}
\lazydef{arg1}{arg2} = do something with arg1 and arg2
============================================================