Like so.
Objections?
? Config
? advdist.diff
Index: boost/libs/regex/src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/libs/regex/src/Makefile.am,v
retrieving revision 1.5
diff -u -p -b -r1.5 Makefile.am
--- boost/libs/regex/src/Makefile.am 7 Nov 2002 15:24:06 -0000 1.5
+++ boost/libs/regex/src/Makefile.am 26 Jan 2004 14:38:19 -0000
@@ -19,4 +19,4 @@ libboostregex_la_SOURCES = \
# posix_api.cpp \
# wide_posix_api.cpp \
# regex_debug.cpp
-# winstances.cpp \
+# winstances.cpp
Index: po/POTFILES.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/POTFILES.in,v
retrieving revision 1.374
diff -u -p -b -r1.374 POTFILES.in
--- po/POTFILES.in 8 Jan 2004 10:59:46 -0000 1.374
+++ po/POTFILES.in 26 Jan 2004 14:38:19 -0000
@@ -27,9 +27,7 @@ src/frontends/controllers/ControlLog.C
src/frontends/controllers/ControlPreamble.C
src/frontends/controllers/ControlPrefs.C
src/frontends/controllers/ControlPrint.C
-src/frontends/controllers/ControlSearch.C
src/frontends/controllers/ControlSpellchecker.C
-src/frontends/controllers/ControlThesaurus.C
src/frontends/controllers/biblio.C
src/frontends/controllers/character.C
src/frontends/controllers/frnt_lang.C
@@ -141,7 +139,7 @@ src/frontends/xforms/xformsBC.h
src/frontends/xforms/xforms_helpers.C
src/gettext.h
src/importer.C
-src/insets/inset.C
+src/insets/insetbase.C
src/insets/insetbibtex.C
src/insets/insetbox.C
src/insets/insetbranch.C
@@ -185,6 +183,7 @@ src/mathed/formulabase.C
src/mathed/formulamacro.C
src/mathed/math_hullinset.C
src/mathed/math_macrotemplate.C
+src/mathed/math_nestinset.C
src/mathed/math_parboxinset.C
src/mathed/ref_inset.C
src/output.C
@@ -194,6 +193,9 @@ src/output_plaintext.C
src/paragraph.C
src/paragraph_funcs.C
src/rowpainter.C
+src/support/globbing.C
+src/support/path_defines.C
+src/tex2lyx/lengthcommon.C
src/text.C
src/text2.C
src/text3.C
Index: src/PosIterator.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/PosIterator.C,v
retrieving revision 1.9
diff -u -p -b -r1.9 PosIterator.C
--- src/PosIterator.C 26 Jan 2004 10:13:08 -0000 1.9
+++ src/PosIterator.C 26 Jan 2004 14:38:19 -0000
@@ -150,22 +150,4 @@ InsetBase * PosIterator::inset() const
return 0;
PosIteratorItem const & pi = stack_[stack_.size() - 2];
return pi.pit->getInset(pi.pos);
-}
-
-
-int distance(PosIterator const & cur, PosIterator const & end)
-{
- int count = 0;
- for (PosIterator p = cur; p != end; ++p, ++count)
- ;
- return count;
-}
-
-
-void advance(PosIterator & cur, int howmuch)
-{
- for (int i = 0; i < howmuch; ++i)
- ++cur;
- for (int i = 0; i > howmuch; --i)
- --cur;
}
Index: src/PosIterator.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/PosIterator.h,v
retrieving revision 1.6
diff -u -p -b -r1.6 PosIterator.h
--- src/PosIterator.h 26 Jan 2004 10:13:08 -0000 1.6
+++ src/PosIterator.h 26 Jan 2004 14:38:19 -0000
@@ -35,7 +35,9 @@ struct PosIteratorItem {
};
-class PosIterator {
+class PosIterator : public std::iterator<
+ std::bidirectional_iterator_tag,
+ ParagraphList::value_type> {
public:
PosIterator(BufferView & bv);
PosIterator(ParIterator & par, lyx::pos_type pos);
@@ -63,8 +65,4 @@ private:
bool operator!=(PosIterator const &, PosIterator const &);
bool operator==(PosIterator const &, PosIterator const &);
-int distance(PosIterator const &, PosIterator const &);
-void advance(PosIterator &, int);
-
#endif
-
Index: src/iterators.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/iterators.h,v
retrieving revision 1.26
diff -u -p -b -r1.26 iterators.h
--- src/iterators.h 26 Jan 2004 10:13:08 -0000 1.26
+++ src/iterators.h 26 Jan 2004 14:38:19 -0000
@@ -25,7 +25,9 @@ class BufferView;
class PosIterator;
-class ParIterator {
+class ParIterator : public std::iterator<
+ std::forward_iterator_tag,
+ ParagraphList::value_type> {
public:
///
ParIterator(ParagraphList::iterator pit, ParagraphList const & pl);
@@ -77,7 +79,9 @@ bool operator==(ParIterator const & iter
bool operator!=(ParIterator const & iter1, ParIterator const & iter2);
-class ParConstIterator {
+class ParConstIterator : public std::iterator<
+ std::forward_iterator_tag,
+ ParagraphList::value_type> {
public:
///
ParConstIterator(ParagraphList::iterator pit, ParagraphList const & pl);
Index: src/lyxfind.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfind.C,v
retrieving revision 1.69
diff -u -p -b -r1.69 lyxfind.C
--- src/lyxfind.C 26 Jan 2004 10:13:08 -0000 1.69
+++ src/lyxfind.C 26 Jan 2004 14:38:20 -0000
@@ -345,7 +345,7 @@ int replaceAll(BufferView * bv,
= cur.pit()->getFontSettings(buf.params(), pos);
int striked = ssize - cur.pit()->erase(pos, pos + ssize);
cur.pit()->insert(pos, replacestr, font);
- advance(cur, rsize + striked);
+ std::advance(cur, rsize + striked);
++num;
}
Index: src/frontends/controllers/ControlSpellchecker.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlSpellchecker.C,v
retrieving revision 1.60
diff -u -p -b -r1.60 ControlSpellchecker.C
--- src/frontends/controllers/ControlSpellchecker.C 14 Jan 2004 17:21:38 -0000 1.60
+++ src/frontends/controllers/ControlSpellchecker.C 26 Jan 2004 14:38:20 -0000
@@ -195,8 +195,8 @@ void ControlSpellchecker::check()
PosIterator const beg = buffer()->pos_iterator_begin();
PosIterator const end = buffer()->pos_iterator_end();
- int start = distance(beg, cur);
- int const total = start + distance(cur, end);
+ int start = std::distance(beg, cur);
+ int const total = start + std::distance(cur, end);
if (cur != buffer()->pos_iterator_begin())
for (; cur != end && isLetter(cur); ++cur, ++start);
@@ -235,9 +235,9 @@ void ControlSpellchecker::check()
if (!word_.word().empty()) {
int const size = word_.word().size();
- advance(cur, -size);
+ std::advance(cur, -size);
bufferview()->putSelectionAt(cur, size, false);
- advance(cur, size);
+ std::advance(cur, size);
} else {
showSummary();
endSession();
--
Lgb
