Commit Graph

132 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
d4b960c5f4 Fix bug #8370: crash when searching for next change
Cursor::backwardPos() may enter in a nested inset, while CursorSlice::backwardPos() will not.
2013-04-08 09:44:16 +02:00
Jean-Marc Lasgouttes
46aa8f32ec Fix confusing behavior in search when changing directions (bug 8543) 2013-02-22 18:16:04 +01:00
Tommaso Cucinotta
927496ecd0 Fixed bug in escape sequence, showing up with ignore format off (addressing #8380). 2012-12-09 19:05:36 +00:00
Stephan Witt
7cc30cdf29 Fix bug #8238: correct the forward argument of replace2string() in on_replacePB_clicked().
(cherry picked from commit 44b3278006)
Fix the wrong cursor move when forward flag is false:
The forward flag is used to place the cursor behind the replaced text if it's true.
But it's not correct to move the cursor if it's false. The cursor is in front of the
replacement already after the replaceSelectionWithString() was done.
(cherry picked from commit 430cf3ee5e)
2012-08-22 18:07:58 +02:00
Jean-Marc Lasgouttes
dbcfbe5b76 In replaceSelectionWithString, do not select the new string
This is a patch from Scott Kostyshak. The problem it solves is as follows:

1. enable continuous spell check.
2. type a misspelled word and press space so that it has a wavy red underline.
3. right-click and choose a suggested replacement word.
4. press the backspace button.

Result: nothing happens. If you press the backspace button again, then it works as normal.

The selection code was added for the benefit of the spellchecker, but the code has been rewritten since then.
2012-05-11 17:37:41 +02:00
Tommaso Cucinotta
ee96d30955 Fixed longstanding bug in Advanced Find&Replace, when dealing with documents containing braces.
Corresponding test-case needed a fix as well and now it is passed.
Copying r39518 from trunk.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39521 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-25 19:31:48 +00:00
Tommaso Cucinotta
604b07c4d1 After replacing with multi-cell contents inside maths, now advanced find and replace leaves the cursor after the inserted material.
Addressing #7675.
Added accompanying regression test.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39282 a592a061-630c-0410-9148-cb99ea01b6c8
2011-07-12 15:58:53 +00:00
Tommaso Cucinotta
1141dc23c9 Backporting various fixes in Advanced Find and Replace:
- Now the cursor is visible while at the rightmost part of a regexp inset.
- Now a regexp inset with a \backslash or braces is previewed correctly.
- Disabled possibility to type macros in regexp-mode.
- Now backslash-prefixed regexps like "\s", "\d", etc., are all understood by Advanced F&R.
- Now Adv. F&R correctly interprets escape sequences within regexp insets, e.g., \\ or \(,
  for finding characters with a special meaning in regular expression context (\^()[]).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39136 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-19 19:46:59 +00:00
Tommaso Cucinotta
de79527b20 Backporting r38863.
Fixed bug in matching at borders within *-environments with ignore-format off.
(related to #7596)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38869 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-27 22:11:07 +00:00
Tommaso Cucinotta
63e5421f22 (replaying r38846 from trunk)
Bugfix in how the search buffer was exported for the Advanced Find & Replace.
For example, before this footnotes were not correctly found.
Added also accompanying regression test.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38850 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-27 06:15:50 +00:00
Tommaso Cucinotta
82ba1e2437 Now advanced find and replace doesn't ignore white spaces while matching with ignore format.
This fixes #7584.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38840 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-26 13:53:37 +00:00
Stephan Witt
4016d0b7a7 #7564 make the move forward to next match after text replacement optional and suppress it when replace a word by selected suggestion; move the text cursor to the end of the word after replace of the misspelled with suggested text
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38790 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-19 19:11:01 +00:00
Richard Heck
d7ed0882ea Backport r38743-4. This is cleanup, prior to serious work on Buffer::clone().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38745 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-13 22:39:21 +00:00
Tommaso Cucinotta
8fd08e4ece Nearly cosmetics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38410 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-16 10:48:55 +00:00
Tommaso Cucinotta
29948eec26 Now math previews are correctly updated when replacing math contents inside
through Advanced Find and Replace.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38355 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-12 20:16:57 +00:00
Tommaso Cucinotta
62411b7c0f Fixes a weird bug found while playing with #7363.
Indeed, unchecking ignore format in that scenario was not matching anyway while searching.
This patch fixes that behavior.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37943 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-18 00:47:42 +00:00
Enrico Forestieri
d866717ef7 Integrate texrow with otexstream in order to perform automatic line
counting when exporting to latex. This is done for the code comprised
between \begin{document} and \end{document}, while the preamble code
still needs manual calls to TexRow::newline() for registering new lines.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37584 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-10 20:02:48 +00:00
Tommaso Cucinotta
dc4abad361 Removing dependency on longOperationCancelled() patch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37562 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-08 09:11:58 +00:00
Tommaso Cucinotta
fcae022192 Search and replace buffers are now passed from the GUI to the Model
just by their file-name, and directly accessed there.
All string/latex exporting of those buffers is handled on the Model
side (lyxfind.cpp) according to the selected options.
Fixed bugs when searching with ignore-format disabled material
in the middle of a paragraph, and when using regular expressions.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37549 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-07 20:36:40 +00:00
Enrico Forestieri
1ef605f625 Introduce a wrapper class for odocstream to help ensuring that no
blank lines may be inadvertently output. This is achieved by using two
special iomanip-like variables (breakln and safebreakln) in the lyx::
namespace. When they are inserted in the stream, a newline is output
only if not already at the beginning of a line. The difference between
breakln and safebreakln is that, if needed, the former outputs '\n'
and the latter "%\n".
In future, the new class will also be used for counting the number of
newlines issued. Even if the infractrure for doing that is already in
place, the counting is essentially still done the old way.
There are still places in the code where the functionality of the
class could be used, most probably. ATM, it is used for InsetTabular,
InsetListings, InsetFloat, and InsetText.
The Comment and GreyedOut insets required a special treatment and a
new InsetLayout parameter (Display) has been introduced. The default
for Display is "true", meaning that the corresponding latex
environment is of "display" type, i.e., it stands on its own, whereas
"false" means that the contents appear inline with the text. The
latter is the case for both Comment and GreyedOut insets.
Mostly, the only visible effects on latex exports should be the
disappearing of some redundant % chars and the appearing/disappearing
of null {} latex groups after a comment or lyxgreyedout environments
(they are related to the presence or absence of a space immediately
after those environments), as well as the fact that math environments
are now started on their own lines.
As a last thing, only the latex code between \begin{document} and
\end{document} goes through the new class, the preamble being directly
output through odocstream, as usual.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37360 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-29 02:41:13 +00:00
Tommaso Cucinotta
e05d115be8 Fixing regression bug after last commit. Couldn't find anything better, however now it apparently works and doesn't crash
(when replacing text which is longer than the replaced contents in math mode and similar).



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37335 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-26 23:54:12 +00:00
Tommaso Cucinotta
c005af6749 Puts the selection at the correct position after replacing math contents with Advanced Search.
Fixes crashes reported as #7245 and also #7241.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37333 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-26 23:06:02 +00:00
Tommaso Cucinotta
22d245312a Addressing #6560.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37048 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-30 17:59:59 +00:00
Tommaso Cucinotta
fa0e638b95 Fix of #4388 also for non advanced find.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37047 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-30 15:34:09 +00:00
Tommaso Cucinotta
fab8c264aa Applying (variation of) fix by stwitt to solve #7172.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37043 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-29 19:59:41 +00:00
Abdelrazak Younes
1614a64e15 TeXOnePar() simplification: use pit_type instead of iterator
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36936 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 15:57:27 +00:00
Jean-Marc Lasgouttes
3370b1d2fa Fix the last part of #3733:
- In GuiApplication::dispatch, do not call markDirty() for lfuns that are not ReadOnly
- In Undo::Private::recordUndo, call markDirty(). The indicator of dirtyness is now the existence of an undo element.
- In lyxfind, remove several markDirty calls that are not needed anymore.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36772 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-08 10:30:45 +00:00
Tommaso Cucinotta
5e5122699d Ignore ligature breaks and hyphenations during simple search (fixes #1468).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36427 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-22 07:50:34 +00:00
Uwe Stöhr
ce2ca9bd7e lyxfind.cpp: squash compiler warnings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36414 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-20 18:28:28 +00:00
Tommaso Cucinotta
630953e613 Finds formatted matches in the middle of paragraphs, when no regular expressions are involved (fixes #6891).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36411 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-20 15:57:54 +00:00
Tommaso Cucinotta
df8e614237 Fix update of document buffer on last replace operation.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36405 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-20 11:04:40 +00:00
Tommaso Cucinotta
55641a1a74 Some more debugging stuff.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36404 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-20 11:03:24 +00:00
Pavel Sanda
058c815515 Fix order of return value
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36299 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-14 23:23:20 +00:00
Richard Heck
97b82d285d Fix up some of the find and replace code again. This solves a bug
involving the messages and will also help sort out some dispatch stuff.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35649 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-14 14:32:58 +00:00
Pavel Sanda
0978e91ecf This stuff is general enough for lstrings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35646 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-14 11:01:15 +00:00
Richard Heck
3fe55bccc4 const
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35642 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-13 18:59:24 +00:00
Richard Heck
e9cf7aabcb Const.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35640 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-13 18:57:57 +00:00
Richard Heck
d3e4bfb124 Change how some of the updating stuff is handled in lyxfind. I had no
idea what a mess this was.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35639 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-13 18:53:41 +00:00
Richard Heck
3b00f19cc2 Anonymize some things.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35638 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-13 18:30:37 +00:00
Richard Heck
9511e345c1 Why have an argument in an anonymous method if you aren't going to use
it?


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35637 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-13 18:27:40 +00:00
Richard Heck
77a9dfcdba More find cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35636 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-13 18:24:53 +00:00
Richard Heck
b261a6d247 Begin some cleanup of the find code. I'm trying to sort out some odd
dispatch behavior, but can't understand this code as it is. Why isn't
there any documenation here?


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35635 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-13 18:19:21 +00:00
Richard Heck
5577e877bb Try to move all updateBuffer() calls to a central location. We now use
DispatchResult to store a flag that tells us whether we need a buffer
update or not. 

So: If you find a missing one, go to an appropriate place in the
dispatch and call cur.forceBufferUpdate() or, if you don't have a cursor
but do have a DispatchResult, call dr.forceBufferUpdate().

There is one remaining call I could not move, in
TextMetrics::redoParagraph. But this looks like an emergency call when
the macro context has not been set. There are also a couple calls that
are connected with buffer creation that I commented out, since the same
call is done again almost immediately. But I'm not positive about those.

Now the nice thing would be to do the same for updateMacros().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34826 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-09 14:37:00 +00:00
Peter Kümmel
615d42d357 TR1: use std::tr1 regex with msvc10
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34725 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-29 17:09:40 +00:00
Vincent van Ravesteijn
d9fab1ecc6 * lyxfind: Remove unnecessary non-const reference as parameter.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34355 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-02 22:33:36 +00:00
Vincent van Ravesteijn
d8db0e8515 Rename anchor() to normalAnchor() as the anchor() function was already returning a normalized anchor in stead of the real one.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34145 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-15 17:49:15 +00:00
Richard Heck
b79d8e5e2d Make members of FuncRequest private, per the FIXME there. Again, this is
basically a massive renaming, with no real changes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34106 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-09 19:00:42 +00:00
Richard Heck
4c7a5d0024 This is just a giant renaming of member variables in FuncRequest,
preparatory to making them private.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34105 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-09 18:15:17 +00:00
Tommaso Cucinotta
4bac24026d Fixed #2674 (Find and replace should restore initial cursor position), occurring on replace all.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33818 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-21 10:36:59 +00:00
Tommaso Cucinotta
57aa866a1c Fixed issues in backward search in various corner cases (fixed #6482 and #6596).
Now, when scope includes multiple documents, the switch_buffer LFUN is only issues if buffer actually changes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33812 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-20 13:59:46 +00:00