* 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 "errorlist.h"
#include "gettext.h"
#include "vc-backend.h"
-#include "lyxlex.h"
#include "LaTeX.h"
#include "ParagraphList.h"
#include "paragraph.h"
extern BufferList bufferlist;
+using namespace lyx::support;
+
namespace {
b->markDirty();
} else {
// Here, we should delete the autosave
- lyx::unlink(a);
+ unlink(a);
}
}
}
}
- // 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(ts);
}
b->lyxvc.file_found_hook(s);
return true;
}
- break;
- case -1:
+ break;
+ case -1:
string const file = MakeDisplayPath(s, 20);
// Here we probably should run
if (LyXVC::file_not_found_hook(s)) {
}
-Buffer * newFile(string const & filename, string const & templatename,
+Buffer * newFile(string const & filename, string const & templatename,
bool isNamed)
{
// get a free buffer
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());
}
-void parseErrors(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();
buf.texrow.getIdFromRow(errorrow, par_id, posstart);
int posend = -1;
buf.texrow.getIdFromRow(errorrow + 1, par_id, posend);
- buf.parseError(ErrorItem(cit->error_desc,
+ buf.error(ErrorItem(cit->error_desc,
cit->error_text,
par_id, posstart, posend));
}
}
-void parseErrors(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.parseError(*it);
+ for (; it != end; ++it)
+ buf.error(*it);
}