#include "buffer_funcs.h"
#include "Buffer.h"
#include "BufferList.h"
-#include "BufferParams.h"
-#include "DocIterator.h"
-#include "Counters.h"
-#include "ErrorList.h"
-#include "Floating.h"
-#include "FloatList.h"
-#include "InsetList.h"
-#include "Language.h"
-#include "LaTeX.h"
-#include "Layout.h"
-#include "LyX.h"
-#include "TextClass.h"
-#include "Paragraph.h"
-#include "ParagraphList.h"
-#include "ParagraphParameters.h"
-#include "ParIterator.h"
-#include "TexRow.h"
-#include "Text.h"
-#include "TocBackend.h"
+#include "LyXVC.h"
#include "frontends/alert.h"
-#include "insets/InsetBibitem.h"
-#include "insets/InsetInclude.h"
-
#include "support/lassert.h"
#include "support/convert.h"
#include "support/debug.h"
+#include "support/FileName.h"
#include "support/filetools.h"
#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/textutils.h"
+#include "support/mutex.h"
using namespace std;
using namespace lyx::support;
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() != Buffer::ReadSuccess)
- return 0;
+ int res = Alert::prompt(_("Reload saved document?"),
+ text, 2, 2, _("Yes, &Reload"), _("No, &Keep Changes"), _("&Cancel"));
+ switch (res) {
+ case 0: {
+ // reload the document
+ if (checkBuffer->reload() != Buffer::ReadSuccess)
+ return nullptr;
+ return checkBuffer;
+ }
+ case 1:
+ // keep changes
+ return checkBuffer;
+ case 2:
+ // cancel
+ return nullptr;
}
- 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()));
- Alert::error(_("File not readable!"), text);
- return 0;
+ bool const exists = filename.exists();
+ bool const tryVC = exists ? false : LyXVC::fileInVC(filename);
+ if (exists || tryVC) {
+ if (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 nullptr;
+ }
+ if (filename.extension() == "lyx" && filename.isFileEmpty()) {
+ // Makes it possible to open an empty (0 bytes) .lyx file
+ return newFile(filename.absFileName(), "", true);
+ }
}
Buffer * b = theBufferList().newBuffer(filename.absFileName());
if (!b) {
// Buffer creation is not possible.
- return 0;
+ return nullptr;
}
if (b->loadLyXFile() != Buffer::ReadSuccess) {
// do not save an emergency file when releasing the buffer
b->markClean();
theBufferList().release(b);
- return 0;
+ return nullptr;
}
return b;
}
"exist.\n\nDo you want to create a new document?"),
from_utf8(filename.absFileName()));
if (!Alert::prompt(_("Create new document?"),
- text, 0, 1, _("&Create"), _("Cancel")))
+ text, 0, 1, _("&Yes, Create New Document"), _("&No, Do Not Create")))
return newFile(filename.absFileName(), string(), true);
- return 0;
+ return nullptr;
}
Buffer * b = theBufferList().newBuffer(filename);
if (!b)
// Buffer creation is not possible.
- return 0;
+ return nullptr;
FileName tname;
// use defaults.lyx as a default template if it exists.
file);
Alert::error(_("Could not read template"), text);
theBufferList().release(b);
- return 0;
+ return nullptr;
}
}
string const & templatename)
{
static map<string, int> file_number;
+ static Mutex mutex;
+ Mutex::Locker locker(&mutex);
FileName filename;
do {
- filename.set(path,
+ filename.set(path,
prefix + convert<string>(++file_number[prefix]) + ".lyx");
}
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)
- * 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,
- bool skipNoOutput)
-{
- int count = 0;
- bool inword = false;
-
- for (DocIterator dit = from ; dit != to && !dit.atEnd(); ) {
- 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()) {
- inword = false;
- } else if (!par.isDeleted(pos)) {
- Inset const * ins = par.getInset(pos);
- 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))
- inword = false;
- else if (!inword) {
- ++count;
- inword = true;
- }
- }
- dit.forwardPos();
- }
- return count;
-}
-
-
-int countChars(DocIterator const & from, DocIterator const & to,
- bool with_blanks)
-{
- int chars = 0;
- int blanks = 0;
- 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())
- ++blanks;
- } else {
- char_type const c = par.getChar(pos);
- if (isPrintableNonspace(c))
- ++chars;
- else if (isSpace(c) && with_blanks)
- ++blanks;
- }
- }
- dit.forwardPos();
- }
-
- return chars + blanks;
+ return newFile(filename.absFileName(), templatename, false);
}
{
Buffer * buffer = theBufferList().getBuffer(fname);
if (!buffer) {
- if (!fname.exists())
- return 0;
+ if (!fname.exists() && !LyXVC::fileInVC(fname))
+ return nullptr;
buffer = theBufferList().newBuffer(fname.absFileName());
if (!buffer)
// Buffer creation is not possible.
- return 0;
+ return nullptr;
if (buffer->loadLyXFile() != Buffer::ReadSuccess) {
//close the buffer we just opened
theBufferList().release(buffer);
- return 0;
+ return nullptr;
}
}
return buffer;
projects / lyx.git / blobdiff