Harmonize naming

[lyx.git] / src / lyxfind.cpp

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 308074c3a9ca06e3757ef8f879e28ee0b422f812..99e361ea47c6b7fb59d37441ddcd484fcd0a3f16 100644 (file)
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -45,6 +45,7 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
+#include "support/FileName.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
@@ -121,23 +122,6 @@ int findBackwards(DocIterator & cur, MatchString const & match,
 }
 
 
-bool findChange(DocIterator & cur, bool next)
-{
-       if (!next)
-               cur.backwardPos();
-       for (; cur; next ? cur.forwardPos() : cur.backwardPos())
-               if (cur.inTexted() && cur.paragraph().isChanged(cur.pos())) {
-                       if (!next)
-                               // if we search backwards, take a step forward
-                               // to correctly set the anchor
-                               cur.forwardPos();
-                       return true;
-               }
-
-       return false;
-}
-
-
 bool searchAllowed(docstring const & str)
 {
        if (str.empty()) {
@@ -404,15 +388,21 @@ bool lyxreplace(BufferView * bv,
 }
 
 
-bool findNextChange(BufferView * bv)
+namespace {
+bool findChange(DocIterator & cur, bool next)
 {
-       return findChange(bv, true);
-}
-
+       if (!next)
+               cur.backwardPos();
+       for (; cur; next ? cur.forwardPos() : cur.backwardPos())
+               if (cur.inTexted() && cur.paragraph().isChanged(cur.pos())) {
+                       if (!next)
+                               // if we search backwards, take a step forward
+                               // to correctly set the anchor
+                               cur.forwardPos();
+                       return true;
+               }
 
-bool findPreviousChange(BufferView * bv)
-{
-       return findChange(bv, false);
+       return false;
 }
 
 
@@ -456,13 +446,13 @@ bool findChange(BufferView * bv, bool next)
        Change orig_change = tip.paragraph().lookupChange(tip.pos());
 
        if (next) {
-               for (; !tip.at_end(); tip.forwardPos()) {
+               for (; tip.pit() < tip.lastpit() || tip.pos() < tip.lastpos(); tip.forwardPos()) {
                        Change change = tip.paragraph().lookupChange(tip.pos());
                        if (!change.isSimilarTo(orig_change))
                                break;
                }
        } else {
-               for (; !tip.at_begin();) {
+               for (; tip.pit() > 0 || tip.pos() > 0;) {
                        tip.backwardPos();
                        Change change = tip.paragraph().lookupChange(tip.pos());
                        if (!change.isSimilarTo(orig_change)) {
@@ -483,6 +473,20 @@ bool findChange(BufferView * bv, bool next)
 
        return true;
 }
+}
+
+
+bool findNextChange(BufferView * bv)
+{
+       return findChange(bv, true);
+}
+
+
+bool findPreviousChange(BufferView * bv)
+{
+       return findChange(bv, false);
+}
+
 
 namespace {
 
@@ -900,6 +904,9 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions const &
 
 int MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_begin) const
 {
+       if (at_begin &&
+               (opt.restr == FindAndReplaceOptions::R_ONLY_MATHS && !cur.inMathed()) )
+               return 0;
        docstring docstr = stringifyFromForSearch(opt, cur, len);
        LYXERR(Debug::FIND, "Matching against     '" << lyx::to_utf8(docstr) << "'");
        string str = normalize(docstr, true);
@@ -1292,10 +1299,10 @@ FindAndReplaceOptions::FindAndReplaceOptions(
        docstring const & find_buf_name, bool casesensitive,
        bool matchword, bool forward, bool expandmacros, bool ignoreformat,
        docstring const & repl_buf_name, bool keep_case,
-       SearchScope scope)
+       SearchScope scope, SearchRestriction restr)
        : find_buf_name(find_buf_name), casesensitive(casesensitive), matchword(matchword),
          forward(forward), expandmacros(expandmacros), ignoreformat(ignoreformat),
-         repl_buf_name(repl_buf_name), keep_case(keep_case), scope(scope)
+         repl_buf_name(repl_buf_name), keep_case(keep_case), scope(scope), restr(restr)
 {
 }
 
@@ -1304,10 +1311,15 @@ namespace {
 
 
 /** Check if 'len' letters following cursor are all non-lowercase */
-static bool allNonLowercase(DocIterator const & cur, int len)
+static bool allNonLowercase(Cursor const & cur, int len)
 {
-       pos_type end_pos = cur.pos() + len;
-       for (pos_type pos = cur.pos(); pos != end_pos; ++pos)
+       pos_type beg_pos = cur.selectionBegin().pos();
+       pos_type end_pos = cur.selectionBegin().pos() + len;
+       if (len > cur.lastpos() + 1 - beg_pos) {
+               LYXERR(Debug::FIND, "This should not happen, more debug needed");
+               len = cur.lastpos() + 1 - beg_pos;
+       }
+       for (pos_type pos = beg_pos; pos != end_pos; ++pos)
                if (isLowerCase(cur.paragraph().getChar(pos)))
                        return false;
        return true;
@@ -1315,15 +1327,16 @@ static bool allNonLowercase(DocIterator const & cur, int len)
 
 
 /** Check if first letter is upper case and second one is lower case */
-static bool firstUppercase(DocIterator const & cur)
+static bool firstUppercase(Cursor const & cur)
 {
        char_type ch1, ch2;
-       if (cur.pos() >= cur.lastpos() - 1) {
+       pos_type pos = cur.selectionBegin().pos();
+       if (pos >= cur.lastpos() - 1) {
                LYXERR(Debug::FIND, "No upper-case at cur: " << cur);
                return false;
        }
-       ch1 = cur.paragraph().getChar(cur.pos());
-       ch2 = cur.paragraph().getChar(cur.pos()+1);
+       ch1 = cur.paragraph().getChar(pos);
+       ch2 = cur.paragraph().getChar(pos + 1);
        bool result = isUpperCase(ch1) && isLowerCase(ch2);
        LYXERR(Debug::FIND, "firstUppercase(): "
               << "ch1=" << ch1 << "(" << char(ch1) << "), ch2=" 
@@ -1340,10 +1353,11 @@ static bool firstUppercase(DocIterator const & cur)
 static void changeFirstCase(Buffer & buffer, TextCase first_case, TextCase others_case)
 {
        ParagraphList::iterator pit = buffer.paragraphs().begin();
+       LASSERT(pit->size() >= 1, /**/);
        pos_type right = pos_type(1);
        pit->changeCase(buffer.params(), pos_type(0), right, first_case);
-       right = pit->size() + 1;
-       pit->changeCase(buffer.params(), right, right, others_case);
+       right = pit->size();
+       pit->changeCase(buffer.params(), pos_type(1), right, others_case);
 }
 
 } // anon namespace
@@ -1379,6 +1393,7 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M
        repl_buffer.setUnnamed(true);
        LASSERT(repl_buffer.readString(lyx), return);
        if (opt.keep_case && sel_len >= 2) {
+               LYXERR(Debug::FIND, "keep_case true: cur.pos()=" << cur.pos() << ", sel_len=" << sel_len);
                if (cur.inTexted()) {
                        if (firstUppercase(cur))
                                changeFirstCase(repl_buffer, text_uppercase, text_lowercase);
@@ -1480,7 +1495,8 @@ ostringstream & operator<<(ostringstream & os, FindAndReplaceOptions const & opt
           << opt.ignoreformat << ' '
           << to_utf8(opt.repl_buf_name) << "\nEOSS\n"
           << opt.keep_case << ' '
-          << int(opt.scope);
+          << int(opt.scope) << ' '
+          << int(opt.restr);
 
        LYXERR(Debug::FIND, "built: " << os.str());
 
@@ -1522,8 +1538,12 @@ istringstream & operator>>(istringstream & is, FindAndReplaceOptions & opt)
        int i;
        is >> i;
        opt.scope = FindAndReplaceOptions::SearchScope(i);
+       is >> i;
+       opt.restr = FindAndReplaceOptions::SearchRestriction(i);
+
        LYXERR(Debug::FIND, "parsed: " << opt.casesensitive << ' ' << opt.matchword << ' ' << opt.forward << ' '
-              << opt.expandmacros << ' ' << opt.ignoreformat << ' ' << opt.keep_case);
+              << opt.expandmacros << ' ' << opt.ignoreformat << ' ' << opt.keep_case << ' '
+              << opt.scope << ' ' << opt.restr);
        return is;
 }