cosmetics

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index d38e3aaaa7f0a6c344fdde46e8aa14688e94e6aa..54f5ece6d2d5172a3ef21f57c0a6f0eafeb564e6 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -49,6 +49,7 @@
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/textutils.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -182,6 +183,35 @@ int countWords(DocIterator const & from, DocIterator const & to)
 }
 
 
+int countChars(DocIterator const & from, DocIterator const & to, bool with_blanks)
+{
+       int chars = 0;
+       int blanks = 0;
+       for (DocIterator dit = from ; dit != to ; dit.forwardPos()) {
+               Paragraph const & par = dit.paragraph();
+               pos_type const pos = dit.pos();
+
+               if (dit.inTexted() && pos != dit.lastpos() && !par.isDeleted(pos)) {
+                       if (par.isInset(pos)) {
+                               Inset const * ins = par.getInset(pos);
+                               if (ins->isLetter())
+                                       ++chars;
+                               else if (with_blanks && ins->isSpace())
+                                       ++blanks;
+                       } else {
+                               char_type const c = par.getChar(pos);
+                               if (isPrintableNonspace(c))
+                                       ++chars;
+                               else if (isSpace(c) && with_blanks)
+                                       ++blanks;
+                       }
+               }
+       }
+
+       return chars + blanks;
+}
+
+
 namespace {
 
 depth_type getDepth(DocIterator const & it)