* 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 "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/filetools.h"
#include "support/lyxlib.h"
+using lyx::support::bformat;
+using lyx::support::FileInfo;
+using lyx::support::IsFileWriteable;
+using lyx::support::LibFileSearch;
+using lyx::support::MakeDisplayPath;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::unlink;
-extern BufferList bufferlist;
+using std::string;
-using namespace lyx::support;
+extern BufferList bufferlist;
namespace {
}
}
}
- // 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);
}
// Fall through
case 1:
if (readFile(b, s)) {
- b->lyxvc.file_found_hook(s);
+ b->lyxvc().file_found_hook(s);
return true;
}
break;
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());
+ 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());
+ 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 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();
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.parseError(ErrorItem(cit->error_desc,
+ buf.texrow().getIdFromRow(errorrow + 1, par_id, posend);
+ 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);
+ buf.error(*it);
}