cosmetics

[features.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index a76a2a9952b6d5251c201f69e14c3bcb142acfeb..54f5ece6d2d5172a3ef21f57c0a6f0eafeb564e6 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -49,21 +49,12 @@
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/lyxlib.h"
-
-
-namespace lyx {
+#include "support/textutils.h"
 
 using namespace std;
+using namespace lyx::support;
 
-using support::addName;
-using support::bformat;
-using support::FileName;
-using support::libFileSearch;
-using support::makeAbsPath;
-using support::makeDisplayPath;
-using support::onlyFilename;
-using support::onlyPath;
+namespace lyx {
 
 namespace Alert = frontend::Alert;
 
@@ -91,6 +82,9 @@ Buffer * checkAndLoadLyXFile(FileName const & filename)
 
        if (filename.isReadableFile()) {
                Buffer * b = theBufferList().newBuffer(filename.absFilename());
+               if (!b)
+                       // Buffer creation is not possible.
+                       return 0;
                if (!b->loadLyXFile(filename)) {
                        theBufferList().release(b);
                        return 0;
@@ -115,7 +109,9 @@ Buffer * newFile(string const & filename, string const & templatename,
 {
        // get a free buffer
        Buffer * b = theBufferList().newBuffer(filename);
-       BOOST_ASSERT(b);
+       if (!b)
+               // Buffer creation is not possible.
+               return 0;
 
        FileName tname;
        // use defaults.lyx as a default template if it exists.
@@ -187,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)
@@ -232,7 +257,7 @@ depth_type getItemDepth(ParIterator const & it)
                        if (prev_depth == min_depth)
                                return prev_par.itemdepth;
                }
-               min_depth = std::min(min_depth, prev_depth);
+               min_depth = min(min_depth, prev_depth);
                // small optimization: if we are at depth 0, we won't
                // find anything else
                if (prev_depth == 0)
@@ -415,6 +440,12 @@ void updateLabels(Buffer const & buf, ParIterator & parit)
 {
        BOOST_ASSERT(parit.pit() == 0);
 
+       // set the position of the text in the buffer to be able
+       // to resolve macros in it. This has nothing to do with
+       // labels, but by putting it here we avoid implementing
+       // a whole bunch of traversal routines just for this call.
+       parit.text()->setMacrocontextPosition(parit);
+
        depth_type maxdepth = 0;
        pit_type const lastpit = parit.lastpit();
        for ( ; parit.pit() <= lastpit ; ++parit.pit()) {