Revert the fix; it doesn't strip trailing whitespace correctly.

More thinking required.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6014 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/reLyX/Text/TeX.pm b/lib/reLyX/Text/TeX.pm
index 66e921cdd769f9a72d9c8adf99bb640f9423d457..a9d2021bb244d7164ab37fd0e8c57f51947c38ad 100644 (file)
--- a/lib/reLyX/Text/TeX.pm
+++ b/lib/reLyX/Text/TeX.pm
@@ -96,21 +96,13 @@ $notusualtoks = "\\\\" . '\${}^_~&@%'; # Why \\\\? double interpretation!
 $notusualtokenclass = "[$notusualtoks]";
 $usualtokenclass = "[^$notusualtoks]";
 
-# The $macro RE matches LaTeX macros. Here's exactly what it does:
-# $macro = \\\\(?:RE)
-# This matches either '\\' or \RE where RE = RE1 or RE2
-# RE1 = '\)', so $macro will match the end of a math environment, '\)'
-# RE2 = (RE3 or RE4) followed by an arbitrary amount of trailing
-# whitespace, '\s*'
-# RE3 = '([^a-zA-Z)]\*?)'
-# Ie, a single non-alphabetic char followed by zero or 1 asterisks.
-# We already test for the presence of macro \) so this is excluded from
-# RE3 because '\)*' is not a macro. It is '\)' followed by an asterisk.
-# RE4 = '([a-zA-Z]+\*?)'
-# Ie, one or more alphabetic chars followed by zero or 1 asterisks
-# Eg, \section or \section*
-# Putting all this together:
-$macro = '\\\\(?:\)|([^a-zA-Z)]\*?)|([a-zA-Z]+\*?)\s*)';
+# Original $macro wouldn't recognize, e.g., '\section*'. Added '\*?' - Ak
+# (Had to add it for \section and \\ separately.)
+#    \" or \frac, e.g. Note that it eats whitespace AFTER the token. This is
+# correct LaTeX behavior, but if text follows such a macro, and you just
+# print out the macro & then the text, they will run together.
+$macro = '\\\\(?:[^a-zA-Z]\*?|([a-zA-Z]+\*?)\s*)'; # Has one level of grouping
+#$macro = '\\\\(?:[^a-zA-Z]|([a-zA-Z]+)\s*)'; # Contains one level of grouping
 
 # active is a backslashed macro or $$ (same as \[) or ^^ followed by a char
 #    (^^A means ASCII(1), e.g. See the TeXbook) or a special character like ~