fix the | vs \| business...

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

diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C
index c2054507833f73e77f1313944e748b77b3310e15..eeb7dfb8c66111f3c354a9d13da27e2f39d66854 100644 (file)
--- a/src/mathed/math_cursor.C
+++ b/src/mathed/math_cursor.C
@@ -1284,14 +1284,14 @@ void MathCursor::interpret(string const & s)
                return;
        }
 
-       if (lastcode_ != LM_TC_TEX && strchr("#$%{|}", c)) {
+       if (lastcode_ != LM_TC_TEX && strchr("#$%{}", c)) {
                insert(new MathSpecialCharInset(c));    
                return;
        }
 
        if (lastcode_ == LM_TC_TEX) {
                if (macroName().empty()) {
-                       if (strchr("#$%{|}", c)) {
+                       if (strchr("#$%{}", c)) {
                                insert(new MathCharInset(c, LM_TC_TEX));        
                                lastcode_ = LM_TC_VAR;
                                return;

diff --git a/src/mathed/math_hash.C b/src/mathed/math_hash.C
index 9ce9aef14d64759370e5391262017ef99945350c..7e8b07f3ba924979b1094f7841b9e3241848c016 100644 (file)
--- a/src/mathed/math_hash.C
+++ b/src/mathed/math_hash.C
@@ -128,7 +128,6 @@ latexkeys_a wordlist_array[] =
        {"widehat",  LM_TK_DECORATION, 0},
        {"widetilde",  LM_TK_DECORATION, 0},
        {"{",  LM_TK_SPECIAL, '{'},
-       {"|",  LM_TK_UNDEF, '|'},
        {"}",  LM_TK_SPECIAL, '}'}
 };
 

diff --git a/src/mathed/math_macrotable.C b/src/mathed/math_macrotable.C
index effb936f81602f46e0af3d32e298e0af03912bea..ac067a97787dd8c32c0fdf5cf4ea9750be486551 100644 (file)
--- a/src/mathed/math_macrotable.C
+++ b/src/mathed/math_macrotable.C
@@ -100,6 +100,7 @@ void MathMacroTable::builtinMacros()
        createTemplate("owns",         0, "\\ni");
        createTemplate("gets",         0, "\\leftarrow");
        createTemplate("to",           0, "\\rightarrow");
+       createTemplate("|",            0, "\\parallel");
 
        createTemplate("longleftrightarrow", 0, "\\leftarrow\\kern-6mu\\rightarrow");
        createTemplate("Longleftrightarrow", 0, "\\Leftarrow\\kern-6mu\\Rightarrow");

diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index 42256d2fbc534ff557cb219a8e8c00f214f87ec1..d3915d02636b419d9d4785fbb76a545079519058 100644 (file)
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -785,17 +785,6 @@ void Parser::parse_into(MathArray & array, unsigned flags, MathTextCodes code)
                        break; 
                }
 
-               case LM_TK_UNDEF: 
-                       if (MathMacroTable::hasTemplate(sval_)) {
-                               MathMacro * m = MathMacroTable::cloneTemplate(sval_);
-                               for (int i = 0; i < m->nargs(); ++i) 
-                                       parse_into(m->cell(i), FLAG_ITEM);
-                               array.push_back(m);
-                               m->metrics(LM_ST_TEXT);
-                       } else
-                               array.push_back(new MathFuncInset(sval_));
-                       break;
-
                else  LM_TK_SPECIAL:
                        array.push_back(new MathCharInset(ival_, LM_TC_TEX));
                        break;

diff --git a/src/mathed/math_parser.h b/src/mathed/math_parser.h
index 68ef43cce915ff519575b7ddc74a2acf6bf37754..067d59b31368d856adc9fe1cf1d8dcc3c67a7115 100644 (file)
--- a/src/mathed/math_parser.h
+++ b/src/mathed/math_parser.h
@@ -55,8 +55,6 @@ enum MathTokenEnum
        LM_TK_END,
        ///
        LM_TK_NEWLINE,
-       ///
-       LM_TK_UNDEF,
        /// mathcal, mathrm...
        LM_TK_OLDFONT,
        /// cal,...