#include "Chktex.h"
#include "debug.h"
#include "encoding.h"
+#include "errorlist.h"
#include "exporter.h"
#include "format.h"
#include "funcrequest.h"
#include "output.h"
#include "output_docbook.h"
#include "output_latex.h"
-#include "output_linuxdoc.h"
#include "paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
namespace {
-int const LYX_FORMAT = 248;
+int const LYX_FORMAT = 249;
} // namespace anon
params().headsep.erase();
params().footskip.erase();
+ ErrorList & errorList = errorLists_["Parse"];
+
while (lex.isOK()) {
lex.next();
string const token = lex.getString();
"%1$s %2$s\n"),
token,
lex.getString());
- errorList_.push_back(ErrorItem(_("Document header error"),
+ errorList.push_back(ErrorItem(_("Document header error"),
s, -1, 0, 0));
}
}
}
if (begin_header_line) {
string const s = _("\\begin_header is missing");
- errorList_.push_back(ErrorItem(_("Document header error"),
+ errorList.push_back(ErrorItem(_("Document header error"),
s, -1, 0, 0));
}
// Returns false if "\end_document" is not read (Asger)
bool Buffer::readDocument(LyXLex & lex)
{
- errorList_.clear();
+ ErrorList & errorList = errorLists_["Parse"];
+ errorList.clear();
lex.next();
string const token = lex.getString();
if (token != "\\begin_document") {
string const s = _("\\begin_document is missing");
- errorList_.push_back(ErrorItem(_("Document header error"),
+ errorList.push_back(ErrorItem(_("Document header error"),
s, -1, 0, 0));
}
params().textclass = 0;
}
- bool const res = text().read(*this, lex);
+ bool const res = text().read(*this, lex, errorList);
for_each(text().paragraphs().begin(),
text().paragraphs().end(),
bind(&Paragraph::setInsetOwner, _1, &inset()));
updateBibfilesCache();
- // FIXME: the signal emission below is not needed for now because
- // there is a manual call to "LyXView::showErrorList(_("Parse"))"
- // in BufferView::pimpl::loadLyXFile()
- // Eventually, all manual call to "LyXView::showErrorList()" should
- // be replace with this signal emission.
- //
- // Send the "errors" signal in case of parsing errors
- //if (!errorList_.empty())
- // errors(_("Parse"));
-
return res;
}
paragraphs().clear();
LyXLex lex(0, 0);
lex.setFile(filename);
- bool ret = readFile(lex, filename);
+ if (!readFile(lex, filename))
+ return false;
// After we have read a file, we must ensure that the buffer
// language is set and used in the gui.
// If you know of a better place to put this, please tell me. (Lgb)
updateDocLang(params().language);
- return ret;
+ return true;
}
if (!openFileWrite(ofs, fname))
return;
- makeLaTeXFile(ofs, original_path,
+ writeLaTeXSource(ofs, original_path,
runparams, output_preamble, output_body);
ofs.close();
}
-void Buffer::makeLaTeXFile(ostream & os,
+void Buffer::writeLaTeXSource(ostream & os,
string const & original_path,
OutputParams const & runparams_in,
bool const output_preamble, bool const output_body)
}
-bool Buffer::isLinuxDoc() const
-{
- return params().getLyXTextClass().outputType() == LINUXDOC;
-}
-
-
bool Buffer::isLiterate() const
{
return params().getLyXTextClass().outputType() == LITERATE;
}
-bool Buffer::isSGML() const
-{
- LyXTextClass const & tclass = params().getLyXTextClass();
-
- return tclass.outputType() == LINUXDOC ||
- tclass.outputType() == DOCBOOK;
-}
-
-
-void Buffer::makeLinuxDocFile(string const & fname,
+void Buffer::makeDocBookFile(string const & fname,
OutputParams const & runparams,
bool const body_only)
{
+ lyxerr[Debug::LATEX] << "makeDocBookFile..." << endl;
+
ofstream ofs;
if (!openFileWrite(ofs, fname))
return;
- LaTeXFeatures features(*this, params(), runparams);
- validate(features);
-
- texrow().reset();
-
- LyXTextClass const & tclass = params().getLyXTextClass();
-
- string const & top_element = tclass.latexname();
-
- if (!body_only) {
- ofs << tclass.class_header();
-
- string preamble = params().preamble;
- string const name = runparams.nice ? changeExtension(pimpl_->filename, ".sgml")
- : fname;
- preamble += features.getIncludedFiles(name);
- preamble += features.getLyXSGMLEntities();
-
- if (!preamble.empty()) {
- ofs << " [ " << preamble << " ]";
- }
- ofs << ">\n\n";
-
- if (params().options.empty())
- sgml::openTag(ofs, top_element);
- else {
- string top = top_element;
- top += ' ';
- top += params().options;
- sgml::openTag(ofs, top);
- }
- }
-
- ofs << "<!-- LyX " << lyx_version
- << " created this file. For more info see http://www.lyx.org/"
- << " -->\n";
-
- linuxdocParagraphs(*this, paragraphs(), ofs, runparams);
-
- if (!body_only) {
- ofs << "\n\n";
- sgml::closeTag(ofs, top_element);
- }
+ writeDocBookSource(ofs, fname, runparams, body_only);
ofs.close();
if (ofs.fail())
}
-void Buffer::makeDocBookFile(string const & fname,
+void Buffer::writeDocBookSource(ostream & os, string const & fname,
OutputParams const & runparams,
bool const only_body)
{
- ofstream ofs;
- if (!openFileWrite(ofs, fname))
- return;
-
LaTeXFeatures features(*this, params(), runparams);
validate(features);
if (!only_body) {
if (runparams.flavor == OutputParams::XML)
- ofs << "<?xml version=\"1.0\" encoding=\""
+ os << "<?xml version=\"1.0\" encoding=\""
<< params().language->encoding()->name() << "\"?>\n";
- ofs << "<!DOCTYPE " << top_element << " ";
+ os << "<!DOCTYPE " << top_element << " ";
- if (! tclass.class_header().empty()) ofs << tclass.class_header();
+ if (! tclass.class_header().empty()) os << tclass.class_header();
else if (runparams.flavor == OutputParams::XML)
- ofs << "PUBLIC \"-//OASIS//DTD DocBook XML//EN\" "
+ os << "PUBLIC \"-//OASIS//DTD DocBook XML//EN\" "
<< "\"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\"";
else
- ofs << " PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\"";
+ os << " PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\"";
string preamble = params().preamble;
if (runparams.flavor != OutputParams::XML ) {
preamble += features.getLyXSGMLEntities();
if (!preamble.empty()) {
- ofs << "\n [ " << preamble << " ]";
+ os << "\n [ " << preamble << " ]";
}
- ofs << ">\n\n";
+ os << ">\n\n";
}
string top = top_element;
top += params().options;
}
- ofs << "<!-- " << ((runparams.flavor == OutputParams::XML)? "XML" : "SGML")
+ os << "<!-- " << ((runparams.flavor == OutputParams::XML)? "XML" : "SGML")
<< " file was created by LyX " << lyx_version
<< "\n See http://www.lyx.org/ for more information -->\n";
params().getLyXTextClass().counters().reset();
- sgml::openTag(ofs, top);
- ofs << '\n';
- docbookParagraphs(paragraphs(), *this, ofs, runparams);
- sgml::closeTag(ofs, top_element);
-
- ofs.close();
- if (ofs.fail())
- lyxerr << "File '" << fname << "' was not closed properly." << endl;
+ sgml::openTag(os, top);
+ os << '\n';
+ docbookParagraphs(paragraphs(), *this, os, runparams);
+ sgml::closeTag(os, top_element);
}
Alert::error(_("chktex failure"),
_("Could not run chktex successfully."));
} else if (res > 0) {
- // Insert all errors as errors boxes
- bufferErrors(*this, terr);
+ // Fill-in the error list with the TeX errors
+ bufferErrors(*this, terr, errorLists_["ChkTex"]);
}
busy(false);
+ errors("ChkTeX");
+
return res;
}
BOOST_ASSERT(nlang);
pimpl_->messages.reset(new Messages(nlang->code()));
+
+ updateLabels(*this);
}
}
-void Buffer::getSourceCode(ostream & os, lyx::pit_type par_begin, lyx::pit_type par_end)
+void Buffer::getSourceCode(ostream & os, lyx::pit_type par_begin, lyx::pit_type par_end, bool full_source)
{
OutputParams runparams;
runparams.nice = true;
runparams.flavor = OutputParams::LATEX;
runparams.linelen = lyxrc.ascii_linelen;
- runparams.par_begin = par_begin;
- runparams.par_end = par_end;
// No side effect of file copying and image conversion
runparams.dryrun = true;
- if (par_begin + 1 == par_end)
- os << "% Preview source code for paragraph " << par_begin << "\n\n";
- else
- os << "% Preview source code from paragraph " << par_begin << " to " << par_end - 1 << "\n\n";
- // output paragraphs
- if (isLatex()) {
- texrow().reset();
- latexParagraphs(*this, paragraphs(), os, texrow(), runparams);
- } else if (isLinuxDoc())
- linuxdocParagraphs(*this, paragraphs(), os, runparams);
- else // DocBook
- docbookParagraphs(paragraphs(), *this, os, runparams);
+ if (full_source) {
+ os << "% Preview source code\n\n";
+ if (isLatex())
+ writeLaTeXSource(os, filePath(), runparams, true, true);
+ else
+ writeDocBookSource(os, fileName(), runparams, false);
+ } else {
+ runparams.par_begin = par_begin;
+ runparams.par_end = par_end;
+ if (par_begin + 1 == par_end)
+ os << "% Preview source code for paragraph " << par_begin << "\n\n";
+ else
+ os << "% Preview source code from paragraph " << par_begin << " to " << par_end - 1 << "\n\n";
+ // output paragraphs
+ if (isLatex()) {
+ texrow().reset();
+ latexParagraphs(*this, paragraphs(), os, texrow(), runparams);
+ } else // DocBook
+ docbookParagraphs(paragraphs(), *this, os, runparams);
+ }
}
-ErrorList const & Buffer::getErrorList() const
+ErrorList const & Buffer::errorList(string const & type) const
{
- return errorList_;
-}
-
+ static ErrorList const emptyErrorList;
+ std::map<std::string, ErrorList>::const_iterator I = errorLists_.find(type);
+ if (I == errorLists_.end())
+ return emptyErrorList;
-void Buffer::setErrorList(ErrorList const & errorList) const
-{
- errorList_ = errorList;
+ return I->second;
}
-void Buffer::addError(ErrorItem const & errorItem) const
+ErrorList & Buffer::errorList(string const & type)
{
- errorList_.push_back(errorItem);
+ return errorLists_[type];
}
projects / lyx.git / blobdiff