X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.cpp;h=ff4512b5c6a1279774f434f957140bd294ad90cd;hb=01dc4e4b83a863c7503cb471a7b8adc19f134761;hp=dc51c93835c394dd24fa8d272b2450cf2b8afe45;hpb=5aa69caae596678c7af677fb59db4207970bdb04;p=lyx.git

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index dc51c93835..ff4512b5c6 100644
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -68,14 +68,14 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
 		// yet been saved to disk.
 		if (checkBuffer->isClean() || acceptDirty || !filename.exists())
 			return checkBuffer;
-		docstring const file = makeDisplayPath(filename.absFilename(), 20);
+		docstring const file = makeDisplayPath(filename.absFileName(), 20);
 		docstring const text = bformat(_(
 				"The document %1$s is already loaded and has unsaved changes.\n"
 				"Do you want to abandon your changes and reload the version on disk?"), file);
 		if (!Alert::prompt(_("Reload saved document?"),
 			  text, 0, 1,  _("&Reload"), _("&Keep Changes"))) {
 			// reload the document
-			if (!checkBuffer->reload())
+			if (checkBuffer->reload() != Buffer::ReadSuccess)
 				return 0;
 		}
 		return checkBuffer;
@@ -85,16 +85,16 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
 		if (!filename.isReadableFile()) {
 			docstring text = bformat(_("The file %1$s exists but is not "
 				"readable by the current user."),
-				from_utf8(filename.absFilename()));
+				from_utf8(filename.absFileName()));
 			Alert::error(_("File not readable!"), text);
 			return 0;
 		}
-		Buffer * b = theBufferList().newBuffer(filename.absFilename());
+		Buffer * b = theBufferList().newBuffer(filename.absFileName());
 		if (!b) {
 			// Buffer creation is not possible.
 			return 0;
 		}
-		if (!b->loadLyXFile(filename)) {
+		if (b->loadLyXFile() != Buffer::ReadSuccess) {
 			// do not save an emergency file when releasing the buffer
 			b->markClean();
 			theBufferList().release(b);
@@ -105,10 +105,10 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
 
 	docstring text = bformat(_("The document %1$s does not yet "
 		"exist.\n\nDo you want to create a new document?"),
-		from_utf8(filename.absFilename()));
+		from_utf8(filename.absFileName()));
 	if (!Alert::prompt(_("Create new document?"),
 			text, 0, 1, _("&Create"), _("Cancel")))
-		return newFile(filename.absFilename(), string(), true);
+		return newFile(filename.absFileName(), string(), true);
 
 	return 0;
 }
@@ -116,7 +116,7 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
 
 // FIXME newFile() should probably be a member method of Application...
 Buffer * newFile(string const & filename, string const & templatename,
-		 bool const isNamed)
+		 bool is_named)
 {
 	// get a free buffer
 	Buffer * b = theBufferList().newBuffer(filename);
@@ -132,8 +132,8 @@ Buffer * newFile(string const & filename, string const & templatename,
 		tname = makeAbsPath(templatename);
 
 	if (!tname.empty()) {
-		if (!b->readFile(tname)) {
-			docstring const file = makeDisplayPath(tname.absFilename(), 50);
+		if (b->loadThisLyXFile(tname) != Buffer::ReadSuccess) {
+			docstring const file = makeDisplayPath(tname.absFileName(), 50);
 			docstring const text  = bformat(
 				_("The specified document template\n%1$s\ncould not be read."),
 				file);
@@ -143,10 +143,12 @@ Buffer * newFile(string const & filename, string const & templatename,
 		}
 	}
 
-	if (!isNamed) {
+	if (is_named)
+		// in this case, the user chose the filename, so we
+		// assume that she really does want this file.
+		b->markDirty();
+	else
 		b->setUnnamed();
-		b->setFileName(filename);
-	}
 
 	b->setReadonly(false);
 	b->setFullyLoaded(true);
@@ -168,7 +170,7 @@ Buffer * newUnnamedFile(FileName const & path, string const & prefix,
 	}
 	while (theBufferList().exists(filename) || filename.isReadableFile());
 		
-	return newFile(filename.absFilename(), templatename, false);
+	return newFile(filename.absFileName(), templatename, false);
 }
 
 
@@ -177,12 +179,19 @@ Buffer * newUnnamedFile(FileName const & path, string const & prefix,
  * are similar but, unfortunately, they seem to have a different
  * notion of what to count. Since nobody ever complained about that,
  * this proves (again) that any number beats no number ! (JMarc)
+ * We have two use cases:
+ * 1. Count the words of the given range for document statistics
+ * - ignore inset content without output. (skipNoOutput == true)
+ * 2. Count the words to present a progress bar for the spell checker
+ * - has to count whole content. (skipNoOutput == false)
  */
-int countWords(DocIterator const & from, DocIterator const & to)
+int countWords(DocIterator const & from, DocIterator const & to,
+			   bool skipNoOutput)
 {
 	int count = 0;
 	bool inword = false;
-	for (DocIterator dit = from ; dit != to ; ) {
+	
+	for (DocIterator dit = from ; dit != to && !dit.atEnd(); ) {
 		if (!dit.inTexted()) {
 			dit.forwardPos();
 			continue;
@@ -190,13 +199,18 @@ int countWords(DocIterator const & from, DocIterator const & to)
 		
 		Paragraph const & par = dit.paragraph();
 		pos_type const pos = dit.pos();
-		
+
 		// Copied and adapted from isWordSeparator() in Paragraph
-		if (pos != dit.lastpos() && !par.isDeleted(pos)) {
+		if (pos == dit.lastpos()) {
+			inword = false;
+		} else if (!par.isDeleted(pos)) {
 			Inset const * ins = par.getInset(pos);
-			if (ins && !ins->producesOutput()) {
-				//skip this inset
+			if (ins && skipNoOutput && !ins->producesOutput()) {
+				// skip this inset
 				++dit.top().pos();
+				// stop if end of range was skipped
+				if (!to.atEnd() && dit >= to)
+					break;
 				continue;
 			}
 			if (par.isWordSeparator(pos)) 
@@ -260,12 +274,12 @@ Buffer * loadIfNeeded(FileName const & fname)
 		if (!fname.exists())
 			return 0;
 
-		buffer = theBufferList().newBuffer(fname.absFilename());
+		buffer = theBufferList().newBuffer(fname.absFileName());
 		if (!buffer)
 			// Buffer creation is not possible.
 			return 0;
 
-		if (!buffer->loadLyXFile(fname)) {
+		if (buffer->loadLyXFile() != Buffer::ReadSuccess) {
 			//close the buffer we just opened
 			theBufferList().release(buffer);
 			return 0;