X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.cpp;h=6e8e612f94480f6c191a88de63209102359fdab1;hb=0362c6aae73c293d1c20277c12d362acfe0b2ef6;hp=b9f310cbdecbfddf4d776c5761c97abb0294dc17;hpb=9abb7db46800e554f57e865a3e768602ffd9d6f1;p=lyx.git

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index b9f310cbde..6e8e612f94 100644
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -49,7 +49,7 @@
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/lyxlib.h"
+#include "support/textutils.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -80,8 +80,18 @@ Buffer * checkAndLoadLyXFile(FileName const & filename)
 		return checkAndLoadLyXFile(filename);
 	}
 
-	if (filename.isReadableFile()) {
+	if (filename.exists()) {
+		if (!filename.isReadableFile()) {
+			docstring text = bformat(_("The file %1$s exists but is not "
+				"readable by the current user."),
+				from_utf8(filename.absFilename()));
+			Alert::error(_("File not readable!"), text);
+			return 0;
+		}
 		Buffer * b = theBufferList().newBuffer(filename.absFilename());
+		if (!b)
+			// Buffer creation is not possible.
+			return 0;
 		if (!b->loadLyXFile(filename)) {
 			theBufferList().release(b);
 			return 0;
@@ -106,7 +116,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.
@@ -178,6 +190,36 @@ 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()) {
+
+		if (!dit.inTexted()) continue;
+		Paragraph const & par = dit.paragraph();
+		pos_type const pos = dit.pos();
+
+		if (pos != dit.lastpos() && !par.isDeleted(pos)) {
+			if (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)
@@ -252,7 +294,7 @@ bool needEnumCounterReset(ParIterator const & it)
 // set the label of a paragraph. This includes the counters.
 void setLabel(Buffer const & buf, ParIterator & it)
 {
-	TextClass const & textclass = buf.params().getTextClass();
+	TextClass const & textclass = buf.params().textClass();
 	Paragraph & par = it.paragraph();
 	LayoutPtr const & layout = par.layout();
 	Counters & counters = textclass.counters();
@@ -406,6 +448,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()) {
@@ -434,7 +482,7 @@ void updateLabels(Buffer const & buf, bool childonly)
 {
 	Buffer const * const master = buf.masterBuffer();
 	// Use the master text class also for child documents
-	TextClass const & textclass = master->params().getTextClass();
+	TextClass const & textclass = master->params().textClass();
 
 	if (!childonly) {
 		// If this is a child document start with the master
@@ -468,14 +516,4 @@ void updateLabels(Buffer const & buf, bool childonly)
 }
 
 
-void checkBufferStructure(Buffer & buffer, ParIterator const & par_it)
-{
-	if (par_it->layout()->toclevel != Layout::NOT_IN_TOC) {
-		Buffer const * master = buffer.masterBuffer();
-		master->tocBackend().updateItem(par_it);
-		master->structureChanged();
-	}
-}
-
-
 } // namespace lyx