Implement os::current_root for native Win32 builds.

[lyx.git] / src / buffer_funcs.C

diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C
index b1d50680814fc57d79da8710fdc1a925f240c7bf..5d28338ac9a81ba7a1a02630c6a3bdd25c3efc92 100644 (file)
--- a/src/buffer_funcs.C
+++ b/src/buffer_funcs.C
@@ -17,6 +17,7 @@
 #include "buffer.h"
 #include "bufferlist.h"
 #include "bufferparams.h"
+#include "dociterator.h"
 #include "errorlist.h"
 #include "gettext.h"
 #include "LaTeX.h"
@@ -31,6 +32,8 @@
 #include "support/filetools.h"
 #include "support/lyxlib.h"
 
+#include <boost/bind.hpp>
+
 using lyx::support::bformat;
 using lyx::support::FileInfo;
 using lyx::support::IsFileWriteable;
@@ -211,11 +214,7 @@ void bufferErrors(Buffer const & buf, TeXErrors const & terr)
 
 void bufferErrors(Buffer const & buf, ErrorList const & el)
 {
-       ErrorList::const_iterator it = el.begin();
-       ErrorList::const_iterator end = el.end();
-
-       for (; it != end; ++it)
-               buf.error(*it);
+       for_each(el.begin(), el.end(), bind(ref(buf.error), _1));
 }
 
 
@@ -230,3 +229,26 @@ string const BufferFormat(Buffer const & buffer)
        else
                return "latex";
 }
+
+
+int countWords(DocIterator const & from, DocIterator const & to)
+{
+       int count = 0;
+       bool inword = false;
+       for (DocIterator dit = from ; dit != to ; dit.forwardPos()) {
+               // Copied and adapted from isLetter() in ControlSpellChecker
+               if (dit.inTexted()
+                   && dit.pos() != dit.lastpos()
+                   && dit.paragraph().isLetter(dit.pos())
+                   && !isDeletedText(dit.paragraph(), dit.pos())) {
+                       if (!inword) {
+                               ++count;
+                               inword = true;
+                       }
+               } else if (inword)
+                       inword = false;
+       }
+
+       return count;
+}
+