diff --git a/doc/manual/manual.tex b/doc/manual/manual.tex index 3f39cac0a..dd335db91 100644 --- a/doc/manual/manual.tex +++ b/doc/manual/manual.tex @@ -1205,8 +1205,7 @@ \section{LaTeXML Customization}\label{customization.latexml} DefConstructor('\item[]', "?#1(#1)"); DefEnvironment('{quote}', - '#body', - beforeDigest=>sub{ Let('\\\\','\@block@cr');}); + '#body'); DefConstructor('\footnote[]{}', "#2", mode=>'text', diff --git a/lib/LaTeXML/Package/LaTeX.pool.ltxml b/lib/LaTeXML/Package/LaTeX.pool.ltxml index 4e550d107..0e3f7bc1b 100644 --- a/lib/LaTeXML/Package/LaTeX.pool.ltxml +++ b/lib/LaTeXML/Package/LaTeX.pool.ltxml @@ -1407,21 +1407,16 @@ DefConstructorI('\@add@flushleft', undef, #======================================================================- # C.6.1 Quotations and Verse #======================================================================- -DefConstructor('\@block@cr[Dimension]', "\n", - reversion => Tokens(T_CS("\\\\"), T_CR)); +Let('\@block@cr', '\lx@newline'); # Obsolete, but in case still used DefEnvironment('{quote}', '#body', - beforeDigest => sub { Let('\\\\', '\@block@cr'); Let('\par', '\@block@cr') }, - mode => 'text'); + mode => 'text'); DefEnvironment('{quotation}', '#body', - beforeDigest => sub { Let('\\\\', '\@block@cr'); Let('\par', '\@block@cr') }, - mode => 'text'); -# NOTE: Handling of \\ within these environments? + mode => 'text'); DefEnvironment('{verse}', '#body', - beforeDigest => sub { Let('\\\\', '\@block@cr'); Let('\par', '\@block@cr') }, - mode => 'text'); + mode => 'text'); #====================================================================== # C.6.2 List-Making environments diff --git a/lib/LaTeXML/Package/amsmath.sty.ltxml b/lib/LaTeXML/Package/amsmath.sty.ltxml index 1136d41da..da2518ab3 100644 --- a/lib/LaTeXML/Package/amsmath.sty.ltxml +++ b/lib/LaTeXML/Package/amsmath.sty.ltxml @@ -929,7 +929,7 @@ DefConstructor('\boxed@text{}', . "", mode => 'math', bounded => 1, beforeDigest => sub { - Let("\\\\", '\@block@cr'); }, + Let("\\\\", '\lx@newline'); }, alias => '\boxed'); DefMath('\implies', "\x{27F9}", role => 'ARROW', meaning => 'implies'); diff --git a/lib/LaTeXML/Package/csquotes.sty.ltxml b/lib/LaTeXML/Package/csquotes.sty.ltxml index 981dc2164..5457c7373 100644 --- a/lib/LaTeXML/Package/csquotes.sty.ltxml +++ b/lib/LaTeXML/Package/csquotes.sty.ltxml @@ -235,8 +235,7 @@ Let('\csq@bquote@ii', '\csq@bquote@iii'); DefMacro('\ltxml@mkblockquote@open', '\begingroup\ltxml@mkblockquote@open@i'); DefPrimitive('\ltxml@mkblockquote@open@i', sub { DefEnvironment('{quote}', '#body', - beforeDigest => sub { Let('\\\\', '\@block@cr'); Let('\par', '\@block@cr') }, - mode => 'text'); }); + mode => 'text'); }); DefMacro('\ltxml@mkblockquote@close', '\endgroup'); DefConstructor('\ltxml@mkblockquote@aopen', ''); @@ -266,8 +265,7 @@ EoTeX DefMacro('\ltxml@blockenvironment@open', '\begingroup\ltxml@blockenvironment@open@i'); DefPrimitive('\ltxml@blockenvironment@open@i', sub { DefEnvironment('{quote}', '#body', - beforeDigest => sub { Let('\\\\', '\@block@cr'); Let('\par', '\@block@cr') }, - mode => 'text'); }); + mode => 'text'); }); DefMacro('\ltxml@blockenvironment@close', '\endgroup'); DefMacro('\ltxml@mkbegdispquote{}{}', '\ltxml@mkbegdispquote@aopen\mkbegdispquote{#1}{#2}'); diff --git a/t/expansion/environments.xml b/t/expansion/environments.xml index aa721b044..57450b287 100644 --- a/t/expansion/environments.xml +++ b/t/expansion/environments.xml @@ -11,25 +11,22 @@ -

MY -A Quote!

+

MYA Quote!

-

1 -A Quote!

+

1A Quote!

-

ONE -A Quote!

+

ONEA Quote!

-

a + b

+

a + b