Author: tommaso
Date: Sun May 29 16:08:29 2011
New Revision: 38888
URL: http://www.lyx.org/trac/changeset/38888
Log:
Avoid extra ' ' in text-only export of consecutive macros in math mode, for
Advanced F&R matching, with ignore-format off.
For example, this wasn't allowing to match '\beta\alpha' in the sequence
'\alpha\beta\alpha', as
in the accompanying regression test-case (added case for ignore-format off).
Modified:
lyx-devel/trunk/development/autotests/findadv-17-in.txt
lyx-devel/trunk/src/lyxfind.cpp
Modified: lyx-devel/trunk/development/autotests/findadv-17-in.txt
==============================================================================
--- lyx-devel/trunk/development/autotests/findadv-17-in.txt Sun May 29
15:49:28 2011 (r38887)
+++ lyx-devel/trunk/development/autotests/findadv-17-in.txt Sun May 29
16:08:29 2011 (r38888)
@@ -3,7 +3,16 @@
Lang it_IT.utf8
TestBegin test.lyx -dbg find > lyx-log.txt 2>&1
KK: \Cm\\alpha\\beta\\alpha \C\[Home]
+KK: \Cs
KK: \CF
KK: \Cm\\beta\\alpha \[Return]
TestEnd
Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par:
0 pos: 1\n with len: 2' lyx-log.txt
+
+TestBegin test.lyx -dbg find > lyx-log.txt 2>&1
+KK: \CF
+# Uncheck ignore format
+KK: \Az\Ag\Ae
+KK: \Cm\\beta\\alpha \[Return]
+TestEnd
+Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par:
0 pos: 1\n with len: 2' lyx-log.txt
Modified: lyx-devel/trunk/src/lyxfind.cpp
==============================================================================
--- lyx-devel/trunk/src/lyxfind.cpp Sun May 29 15:49:28 2011 (r38887)
+++ lyx-devel/trunk/src/lyxfind.cpp Sun May 29 16:08:29 2011 (r38888)
@@ -1029,7 +1029,7 @@
MathData::const_iterator it_end = ( ( len == -1 || cs.pos() +
len > int(md.size()) )
? md.end() : md.begin() + cs.pos() + len );
for (MathData::const_iterator it = md.begin() + cs.pos(); it !=
it_end; ++it)
- ods << *it;
+ ods << asString(*it);
// Retrieve the math environment type, and add '$' or '$]'
// or others (\end{equation}) accordingly
