Fixes due to new math-insert syntax.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 8bbdf52891b011abe730e9c2820e4b745b6e500f..56d0aa43dfc8cb2274add12c0ab29aa4055a9120 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-15  Dekel Tsur  <dekelts@tau.ac.il>
+
+       * lyxlex_pimpl.C (next): Treat \ as normal char if not followed by
+       " or \.
+
 2001-08-16  Juergen Vigna  <jug@sad.it>
 
        * lyxfunc.C (dispatch): implemented the new FINISHED states.

diff --git a/src/frontends/xforms/FormMathsPanel.C b/src/frontends/xforms/FormMathsPanel.C
index 2917964e26624b0c81a19fff03e4adc50a10b93a..31bbfae70bc2c101ac5936076c5d3e512d00fba4 100644 (file)
--- a/src/frontends/xforms/FormMathsPanel.C
+++ b/src/frontends/xforms/FormMathsPanel.C
@@ -264,7 +264,7 @@ bool FormMathsPanel::input(FL_OBJECT *, long data)
 
 void FormMathsPanel::insertSymbol(string const & sym) const
 {
-       lv_->getLyXFunc()->dispatch(LFUN_INSERT_MATH, sym);
+       lv_->getLyXFunc()->dispatch(LFUN_INSERT_MATH, '\\' + sym);
 }
 
 

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index 6351ec523ba8b933e36aead8a4aa5e780264ca38..cb574e9e7dd45542fc38d73aff4b0a3aeacd53b7 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -311,7 +311,10 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                                                // escape the next char
                                                is.get(cc);
                                                c = cc;
-                                               escaped = true;
+                                               if (c == '\"' || c == '\\')
+                                                       escaped = true;
+                                               else
+                                                       buff[++i] = '\\';
                                        }
                                        buff[++i] = c;