anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid extra ' ' in text-only export of consecutive macros in math mode, for Advanced F&R matching, with ignore-format off.

Browse Source 
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).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38888 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Tommaso Cucinotta 2011-05-29 14:08:29 +00:00
parent 9fc888fa65
commit 69ab1306a8
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
development/autotests/findadv-17-in.txt
View File

@ -3,7 +3,16 @@
Lang it_IT.utf8 Lang it_IT.utf8
TestBegin test.lyx -dbg find > lyx-log.txt 2>&1 TestBegin test.lyx -dbg find > lyx-log.txt 2>&1
KK: \Cm\\alpha\\beta\\alpha \C\[Home] KK: \Cm\\alpha\\beta\\alpha \C\[Home]
KK: \Cs
KK: \CF KK: \CF
KK: \Cm\\beta\\alpha \[Return] KK: \Cm\\beta\\alpha \[Return]
TestEnd 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 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

2
src/lyxfind.cpp
View File

@ -1029,7 +1029,7 @@ docstring latexifyFromCursor(DocIterator const & cur, int len)
MathData::const_iterator it_end = ( ( len == -1 || cs.pos() + len > int(md.size()) ) MathData::const_iterator it_end = ( ( len == -1 || cs.pos() + len > int(md.size()) )
? md.end() : md.begin() + cs.pos() + len ); ? md.end() : md.begin() + cs.pos() + len );
for (MathData::const_iterator it = md.begin() + cs.pos(); it != it_end; ++it) 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 '$]' // Retrieve the math environment type, and add '$' or '$]'
// or others (\end{equation}) accordingly // or others (\end{equation}) accordingly