* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
* \author Alfredo Braunstein
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*
*/
#include <config.h>
#include "buffer_funcs.h"
-#include "bufferlist.h"
+
#include "buffer.h"
+#include "bufferlist.h"
+#include "bufferparams.h"
+#include "dociterator.h"
#include "errorlist.h"
#include "gettext.h"
-#include "vc-backend.h"
-#include "lyxlex.h"
#include "LaTeX.h"
-#include "ParagraphList.h"
#include "paragraph.h"
+#include "lyxvc.h"
+#include "texrow.h"
+#include "vc-backend.h"
#include "frontends/Alert.h"
#include "support/filetools.h"
-#include "support/FileInfo.h"
+#include "support/fs_extras.h"
#include "support/lyxlib.h"
+#include <boost/bind.hpp>
+#include <boost/filesystem/operations.hpp>
-extern BufferList bufferlist;
+using lyx::support::bformat;
+using lyx::support::LibFileSearch;
+using lyx::support::MakeDisplayPath;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::unlink;
-using namespace lyx::support;
+using std::string;
+namespace fs = boost::filesystem;
+
+extern BufferList bufferlist;
namespace {
-bool readFile(Buffer * b, string const & s)
+bool readFile(Buffer * const b, string const & s)
{
- string ts(s);
- string e = OnlyPath(s);
- string a = e;
- // File information about normal file
- FileInfo fileInfo(s);
+ BOOST_ASSERT(b);
- if (!fileInfo.exist()) {
+ // File information about normal file
+ if (!fs::exists(s)) {
string const file = MakeDisplayPath(s, 50);
string text = bformat(_("The specified document\n%1$s"
"\ncould not be read."), file);
}
// Check if emergency save file exists and is newer.
- e += OnlyFilename(s) + ".emergency";
- FileInfo fileInfoE(e);
-
- bool use_emergency = false;
-
- if (fileInfoE.exist() && fileInfo.exist()) {
- if (fileInfoE.getModificationTime()
- > fileInfo.getModificationTime()) {
- string const file = MakeDisplayPath(s, 20);
- string text = bformat(_("An emergency save of the document %1$s exists.\n"
- "\nRecover emergency save?"), file);
- int const ret = Alert::prompt(_("Load emergency save?"),
- text, 0, 1, _("&Recover"), _("&Load Original"));
+ string const e = OnlyPath(s) + OnlyFilename(s) + ".emergency";
- if (ret == 0) {
- ts = e;
- // the file is not saved if we load the
- // emergency file.
- b->markDirty();
- use_emergency = true;
- }
+ if (fs::exists(e) && fs::exists(s)
+ && fs::last_write_time(e) > fs::last_write_time(s))
+ {
+ string const file = MakeDisplayPath(s, 20);
+ string const text =
+ bformat(_("An emergency save of the document "
+ "%1$s exists.\n\n"
+ "Recover emergency save?"), file);
+ switch (Alert::prompt(_("Load emergency save?"), text, 0, 2,
+ _("&Recover"), _("&Load Original"),
+ _("&Cancel")))
+ {
+ case 0:
+ // the file is not saved if we load the emergency file.
+ b->markDirty();
+ return b->readFile(e);
+ case 1:
+ break;
+ default:
+ return false;
}
}
- if (!use_emergency) {
- // Now check if autosave file is newer.
- a += '#';
- a += OnlyFilename(s);
- a += '#';
- FileInfo fileInfoA(a);
- if (fileInfoA.exist() && fileInfo.exist()) {
- if (fileInfoA.getModificationTime()
- > fileInfo.getModificationTime()) {
- string const file = MakeDisplayPath(s, 20);
- string text = bformat(_("The backup of the document %1$s is newer.\n\n"
- "Load the backup instead?"), file);
- int const ret = Alert::prompt(_("Load backup?"),
- text, 0, 1, _("&Load backup"), _("Load &original"));
-
- if (ret == 0) {
- ts = a;
- // the file is not saved if we load the
- // autosave file.
- b->markDirty();
- } else {
- // Here, we should delete the autosave
- unlink(a);
- }
- }
+ // Now check if autosave file is newer.
+ string const a = OnlyPath(s) + '#' + OnlyFilename(s) + '#';
+
+ if (fs::exists(a) && fs::exists(s)
+ && fs::last_write_time(a) > fs::last_write_time(s))
+ {
+ string const file = MakeDisplayPath(s, 20);
+ string const text =
+ bformat(_("The backup of the document "
+ "%1$s is newer.\n\nLoad the "
+ "backup instead?"), file);
+ switch (Alert::prompt(_("Load backup?"), text, 0, 2,
+ _("&Load backup"), _("Load &original"),
+ _("&Cancel") ))
+ {
+ case 0:
+ // the file is not saved if we load the autosave file.
+ b->markDirty();
+ return b->readFile(a);
+ case 1:
+ // Here we delete the autosave
+ unlink(a);
+ break;
+ default:
+ return false;
}
}
- // not sure if this is the correct place to begin LyXLex
- LyXLex lex(0, 0);
- lex.setFile(ts);
-
- return b->readFile(lex, ts);
+ return b->readFile(s);
}
bool loadLyXFile(Buffer * b, string const & s)
{
- switch (IsFileWriteable(s)) {
- case 0:
- b->setReadonly(true);
- // Fall through
- case 1:
+ BOOST_ASSERT(b);
+
+ if (fs::is_readable(s)) {
if (readFile(b, s)) {
- b->lyxvc.file_found_hook(s);
+ b->lyxvc().file_found_hook(s);
+ if (!fs::is_writable(s))
+ b->setReadonly(true);
return true;
}
- break;
- case -1:
+ } else {
string const file = MakeDisplayPath(s, 20);
// Here we probably should run
if (LyXVC::file_not_found_hook(s)) {
- string text = bformat(_("Do you want to retrieve the document"
- " %1$s from version control?"), file);
+ string const text =
+ bformat(_("Do you want to retrieve the document"
+ " %1$s from version control?"), file);
int const ret = Alert::prompt(_("Retrieve from version control?"),
text, 0, 1, _("&Retrieve"), _("&Cancel"));
return loadLyXFile(b, s);
}
}
- break;
}
return false;
}
Buffer * newFile(string const & filename, string const & templatename,
- bool isNamed)
+ bool const isNamed)
{
// get a free buffer
Buffer * b = bufferlist.newBuffer(filename);
+ BOOST_ASSERT(b);
string tname;
// use defaults.lyx as a default template if it exists.
tname = templatename;
if (!tname.empty()) {
- bool templateok = false;
- LyXLex lex(0, 0);
- lex.setFile(tname);
- if (lex.isOK()) {
- if (b->readFile(lex, tname)) {
- templateok = true;
- }
- }
- if (!templateok) {
+ if (!b->readFile(tname)) {
string const file = MakeDisplayPath(tname, 50);
- string text = bformat(_("The specified document template\n%1$s\n"
- "could not be read."), file);
+ string const text = bformat(_("The specified document template\n%1$s\ncould not be read."), file);
Alert::error(_("Could not read template"), text);
// no template, start with empty buffer
- b->paragraphs.push_back(Paragraph());
- b->paragraphs.begin()->layout(b->params.getLyXTextClass().defaultLayout());
}
- } else { // start with empty buffer
- b->paragraphs.push_back(Paragraph());
- b->paragraphs.begin()->layout(b->params.getLyXTextClass().defaultLayout());
}
if (!isNamed) {
}
b->setReadonly(false);
- b->updateDocLang(b->params.language);
+ b->fully_loaded(true);
+ b->updateDocLang(b->params().language);
return b;
}
-void bufferErrors(Buffer const & buf, TeXErrors const & terr)
+void bufferErrors(Buffer const & buf, TeXErrors const & terr)
{
TeXErrors::Errors::const_iterator cit = terr.begin();
TeXErrors::Errors::const_iterator end = terr.end();
int par_id = -1;
int posstart = -1;
int const errorrow = cit->error_in_line;
- buf.texrow.getIdFromRow(errorrow, par_id, posstart);
+ buf.texrow().getIdFromRow(errorrow, par_id, posstart);
int posend = -1;
- buf.texrow.getIdFromRow(errorrow + 1, par_id, posend);
+ buf.texrow().getIdFromRow(errorrow + 1, par_id, posend);
buf.error(ErrorItem(cit->error_desc,
cit->error_text,
par_id, posstart, posend));
}
-void bufferErrors(Buffer const & buf, ErrorList const & el)
+void bufferErrors(Buffer const & buf, ErrorList const & el)
{
- ErrorList::const_iterator it = el.begin();
- ErrorList::const_iterator end = el.end();
-
- for (; it != end; ++it)
- buf.error(*it);
+ for_each(el.begin(), el.end(), bind(ref(buf.error), _1));
}
else
return "latex";
}
+
+
+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())
+ && !isDeletedText(dit.paragraph(), dit.pos())) {
+ if (!inword) {
+ ++count;
+ inword = true;
+ }
+ } else if (inword)
+ inword = false;
+ }
+
+ return count;
+}
projects / lyx.git / blobdiff