X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.cpp;h=3a480b3e25e62af38d4919242a57a650953bc1b1;hb=c378fede8bd23299bb88c5d4385beb2b43ce5312;hp=861413dcd96245679e8e807ffcec3050e6bad551;hpb=32a53f8d6a19cd6b3ec91ef6afc862137ed0ffd5;p=lyx.git

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 861413dcd9..3a480b3e25 100644
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -28,7 +28,6 @@
 #include "LyX.h"
 #include "TextClass.h"
 #include "Paragraph.h"
-#include "paragraph_funcs.h"
 #include "ParagraphList.h"
 #include "ParagraphParameters.h"
 #include "ParIterator.h"
@@ -57,41 +56,47 @@ namespace lyx {
 namespace Alert = frontend::Alert;
 
 
-Buffer * checkAndLoadLyXFile(FileName const & filename)
+Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
 {
 	// File already open?
 	Buffer * checkBuffer = theBufferList().getBuffer(filename);
 	if (checkBuffer) {
-		if (checkBuffer->isClean())
+		// Sometimes (when setting the master buffer from a child)
+		// we accept a dirty buffer right away (otherwise we'd get
+		// an infinite loop (bug 5514).
+		// We also accept a dirty buffer when the document has not
+		// yet been saved to disk.
+		if (checkBuffer->isClean() || acceptDirty || !filename.exists())
 			return checkBuffer;
-		docstring const file = makeDisplayPath(filename.absFilename(), 20);
-		docstring text = bformat(_(
+		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")))
-			return checkBuffer;
-
-		// FIXME: should be LFUN_REVERT
-		theBufferList().release(checkBuffer);
-		// Load it again.
-		return checkAndLoadLyXFile(filename);
+		if (!Alert::prompt(_("Reload saved document?"),
+			  text, 0, 1,  _("&Reload"), _("&Keep Changes"))) {
+			// reload the document
+			if (!checkBuffer->reload())
+				return 0;
+		}
+		return checkBuffer;
 	}
 
 	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()));
+				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(filename) != Buffer::ReadSuccess) {
+			// do not save an emergency file when releasing the buffer
+			b->markClean();
 			theBufferList().release(b);
 			return 0;
 		}
@@ -100,10 +105,10 @@ Buffer * checkAndLoadLyXFile(FileName const & filename)
 
 	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;
 }
@@ -127,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);
@@ -141,7 +146,10 @@ Buffer * newFile(string const & filename, string const & templatename,
 	if (!isNamed) {
 		b->setUnnamed();
 		b->setFileName(filename);
-	}
+	} else
+		// in this case, the user chose the filename, so we assume that she
+		// really does want this file.
+		b->markDirty();
 
 	b->setReadonly(false);
 	b->setFullyLoaded(true);
@@ -150,56 +158,85 @@ Buffer * newFile(string const & filename, string const & templatename,
 }
 
 
-Buffer * newUnnamedFile(string const & templatename, FileName const & path)
+Buffer * newUnnamedFile(FileName const & path, string const & prefix,
+						string const & templatename)
 {
-	static int newfile_number;
-
-	FileName filename(path, 
-		"newfile" + convert<string>(++newfile_number) + ".lyx");
-	while (theBufferList().exists(filename)
-		|| filename.isReadableFile()) {
-		++newfile_number;
-		filename.set(path,
-			"newfile" +	convert<string>(newfile_number) + ".lyx");
+	static map<string, int> file_number;
+
+	FileName filename;
+
+	do {
+		filename.set(path, 
+			prefix + convert<string>(++file_number[prefix]) + ".lyx");
 	}
-	return newFile(filename.absFilename(), templatename, false);
+	while (theBufferList().exists(filename) || filename.isReadableFile());
+		
+	return newFile(filename.absFileName(), templatename, false);
 }
 
 
+/* 
+ * FIXME : merge with countChars. The structures of the two functions
+ * 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)
+ */
 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())
-		    && !dit.paragraph().isDeleted(dit.pos())) {
-			if (!inword) {
+	for (DocIterator dit = from ; dit != to ; ) {
+		if (!dit.inTexted()) {
+			dit.forwardPos();
+			continue;
+		}
+		
+		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)) {
+			Inset const * ins = par.getInset(pos);
+			if (ins && !ins->producesOutput()) {
+				//skip this inset
+				++dit.top().pos();
+				continue;
+			}
+			if (par.isWordSeparator(pos)) 
+				inword = false;
+			else if (!inword) {
 				++count;
 				inword = true;
 			}
-		} else if (inword)
-			inword = false;
+		}
+		dit.forwardPos();
 	}
 
 	return count;
 }
 
 
-int countChars(DocIterator const & from, DocIterator const & to, bool with_blanks)
+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;
+	for (DocIterator dit = from ; dit != to ; ) {
+		if (!dit.inTexted()) {
+			dit.forwardPos();
+			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->producesOutput()) {
+					//skip this inset
+					++dit.top().pos();
+					continue;
+				}
 				if (ins->isLetter())
 					++chars;
 				else if (with_blanks && ins->isSpace())
@@ -212,9 +249,33 @@ int countChars(DocIterator const & from, DocIterator const & to, bool with_blank
 					++blanks;
 			}
 		}
+		dit.forwardPos();
 	}
 
 	return chars + blanks;
 }
 
+
+Buffer * loadIfNeeded(FileName const & fname)
+{
+	Buffer * buffer = theBufferList().getBuffer(fname);
+	if (!buffer) {
+		if (!fname.exists())
+			return 0;
+
+		buffer = theBufferList().newBuffer(fname.absFileName());
+		if (!buffer)
+			// Buffer creation is not possible.
+			return 0;
+
+		if (buffer->loadLyXFile(fname) != Buffer::ReadSuccess) {
+			//close the buffer we just opened
+			theBufferList().release(buffer);
+			return 0;
+		}
+	}
+	return buffer;
+}
+
+
 } // namespace lyx