-/* This file is part of
- * ======================================================
+/**
+ * \file buffer.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
*
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
- *
- * This file is Copyright 1996-2001
- * Lars Gullik Bjønnes
- *
- * ======================================================
+ * Full author contact details are available in file CREDITS
*/
#include <config.h>
#include "language.h"
#include "exporter.h"
#include "Lsstream.h"
-#include "converter.h"
+#include "format.h"
#include "BufferView.h"
#include "ParagraphParameters.h"
#include "iterators.h"
#include "lyxtextclasslist.h"
#include "sgml.h"
#include "paragraph_funcs.h"
+#include "messages.h"
#include "author.h"
#include "frontends/LyXView.h"
#include "mathed/formulamacro.h"
#include "mathed/formula.h"
-#include "insets/inset.h"
#include "insets/inseterror.h"
-#include "insets/insetlabel.h"
-#include "insets/insetref.h"
-#include "insets/inseturl.h"
-#include "insets/insetnote.h"
-#include "insets/insetquotes.h"
-#include "insets/insetlatexaccent.h"
#include "insets/insetbibitem.h"
#include "insets/insetbibtex.h"
-#include "insets/insetcite.h"
-#include "insets/insetexternal.h"
-#include "insets/insetindex.h"
#include "insets/insetinclude.h"
-#include "insets/insettoc.h"
-#include "insets/insetparent.h"
-#include "insets/insetspecialchar.h"
#include "insets/insettext.h"
-#include "insets/insetert.h"
-#include "insets/insetgraphics.h"
-#include "insets/insetfoot.h"
-#include "insets/insetmarginal.h"
-#include "insets/insetoptarg.h"
-#include "insets/insetminipage.h"
-#include "insets/insetfloat.h"
-#include "insets/insetwrap.h"
-#include "insets/insettabular.h"
-#if 0
-#include "insets/insettheorem.h"
-#include "insets/insetlist.h"
-#endif
-#include "insets/insetcaption.h"
-#include "insets/insetfloatlist.h"
#include "frontends/Dialogs.h"
#include "frontends/Alert.h"
#include <boost/bind.hpp>
#include <boost/tuple/tuple.hpp>
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
#include <fstream>
#include <iomanip>
namespace {
-const int LYX_FORMAT = 222;
+const int LYX_FORMAT = 223;
} // namespace anon
}
// set initial author
- authorlist.record(Author(lyxrc.user_name, lyxrc.user_email));
+ authors().record(Author(lyxrc.user_name, lyxrc.user_email));
}
if (users)
users->buffer(0);
- if (!tmppath.empty()) {
- DestroyBufferTmpDir(tmppath);
+ if (!tmppath.empty() && destroyDir(tmppath) != 0) {
+#if USE_BOOST_FORMAT
+ boost::format fmt = _("Could not remove the temporary directory %1$s");
+ fmt % tmppath;
+ string msg = fmt.str();
+#else
+ string msg = _("Could not remove the temporary directory ") + tmppath;
+#endif
+ Alert::warning(_("Could not remove temporary directory"), msg);
}
paragraphs.clear();
AuthorList & Buffer::authors()
{
- return authorlist;
+ return params.authorlist;
}
// We'll remove this later. (Lgb)
namespace {
-string last_inset_read;
-
-#ifdef WITH_WARNINGS
-#warning And _why_ is this here? (Lgb)
+void unknownClass(string const & unknown)
+{
+ string msg =
+#if USE_BOOST_FORMAT
+ boost::io::str(boost::format(
+ _("Using the default document class, because the "
+ " class %1$s is unknown.")) % unknown);
+#else
+ _("Using the default document class, because the "
+ " class ") + unknown + (" is unknown.");
#endif
-int unknown_layouts;
-int unknown_tokens;
-vector<int> author_ids;
+ Alert::warning(_("Unknown document class"), msg);
+}
} // anon
+int Buffer::readHeader(LyXLex & lex)
+{
+ int unknown_tokens = 0;
+
+ while (lex.isOK()) {
+ lex.nextToken();
+ string const token = lex.getString();
+
+ if (token.empty())
+ continue;
+
+ if (token == "\\end_header")
+ break;
+
+ lyxerr[Debug::PARSER] << "Handling header token: `"
+ << token << '\'' << endl;
+
+ string unknown = params.readToken(lex, token);
+ if (!unknown.empty()) {
+ if (unknown[0] != '\\') {
+ unknownClass(unknown);
+ } else {
+ ++unknown_tokens;
+ }
+ }
+ }
+ return unknown_tokens;
+}
+
// candidate for move to BufferView
// (at least some parts in the beginning of the func)
// if par = 0 normal behavior
// else insert behavior
// Returns false if "\the_end" is not read (Asger)
-bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par)
+bool Buffer::readBody(LyXLex & lex, ParagraphList::iterator pit)
{
- unknown_layouts = 0;
- unknown_tokens = 0;
- author_ids.clear();
+ int unknown_tokens = 0;
- int pos = 0;
Paragraph::depth_type depth = 0;
bool the_end_read = false;
- Paragraph * first_par = 0;
- LyXFont font(LyXFont::ALL_INHERIT, params.language);
+ if (paragraphs.empty()) {
+ unknown_tokens += readHeader(lex);
- if (!par) {
- par = new Paragraph;
- par->layout(params.getLyXTextClass().defaultLayout());
+ if (!params.getLyXTextClass().load()) {
+ string theclass = params.getLyXTextClass().name();
+ string msg =
+#if USE_BOOST_FORMAT
+ boost::io::str(boost::format(
+ _("Using the default document class, because the "
+ " class %1$s could not be loaded.")) % theclass);
+#else
+ _("Using the default document class, because the "
+ " class ") + theclass + (" could not be loaded.");
+#endif
+ Alert::error(_("Can't load document class"), msg);
+ params.textclass = 0;
+ }
} else {
// We are inserting into an existing document
- users->text->breakParagraph(users);
- first_par = users->text->ownerParagraph();
- pos = 0;
- markDirty();
+ users->text->breakParagraph(paragraphs);
+
// We don't want to adopt the parameters from the
- // document we insert, so we skip until the text begins:
- while (lex.isOK()) {
- lex.nextToken();
- string const pretoken = lex.getString();
- if (pretoken == "\\layout") {
- lex.pushToken(pretoken);
- break;
- }
- }
+ // document we insert, so read them into a temporary buffer
+ // and then discard it
+
+ Buffer tmpbuf("", false);
+ tmpbuf.readHeader(lex);
}
while (lex.isOK()) {
lex.nextToken();
string const token = lex.getString();
- if (token.empty()) continue;
+ if (token.empty())
+ continue;
lyxerr[Debug::PARSER] << "Handling token: `"
<< token << '\'' << endl;
- the_end_read =
- parseSingleLyXformat2Token(lex, par, first_par,
- token, pos, depth,
- font);
- }
+ if (token == "\\the_end") {
+ the_end_read = true;
+ continue;
+ }
- if (!first_par)
- first_par = par;
+ unknown_tokens += readParagraph(lex, token, paragraphs, pit, depth);
+ }
- paragraphs.set(first_par);
- if (unknown_layouts > 0) {
- string s = _("Couldn't set the layout for ");
- if (unknown_layouts == 1) {
- s += _("one paragraph");
+ if (unknown_tokens > 0) {
+#if USE_BOOST_FORMAT
+ string s;
+ if (unknown_tokens == 1) {
+ boost::format fmt(_("Encountered one unknown token when reading the document %1$s."));
+ fmt % fileName();
+ s = fmt.str();
} else {
- s += tostr(unknown_layouts);
- s += _(" paragraphs");
+ boost::format fmt(_("Encountered %1$s unknown tokens when reading the document %2$s."));
+ fmt % tostr(unknown_tokens);
+ fmt % fileName();
+ s = fmt.str();
}
-#if USE_BOOST_FORMAT
- Alert::alert(_("Textclass Loading Error!"), s,
- boost::io::str(boost::format(_("When reading %1$s")) % fileName()));
#else
- Alert::alert(_("Textclass Loading Error!"), s,
- _("When reading ") + fileName());
-#endif
- }
-
- if (unknown_tokens > 0) {
string s = _("Encountered ");
if (unknown_tokens == 1) {
s += _("one unknown token");
s += tostr(unknown_tokens);
s += _(" unknown tokens");
}
-#if USE_BOOST_FORMAT
- Alert::alert(_("Textclass Loading Error!"), s,
- boost::io::str(boost::format(_("When reading %1$s")) % fileName()));
-#else
- Alert::alert(_("Textclass Loading Error!"), s,
- _("When reading ") + fileName());
+ Alert::warning(_("Document format failure"), s);
#endif
}
}
-namespace {
- // This stuff is, in the traditional LyX terminology, Super UGLY
- // but this code is too b0rken to admit of a better solution yet
- Change current_change;
-};
-
-
-bool
-Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
- Paragraph *& first_par,
- string const & token, int & pos,
- Paragraph::depth_type & depth,
- LyXFont & font
- )
+int
+Buffer::readParagraph(LyXLex & lex, string const & token,
+ ParagraphList & pars, ParagraphList::iterator & pit,
+ Paragraph::depth_type & depth)
{
- bool the_end_read = false;
-
- // The order of the tags tested may seem unnatural, but this
- // has been done in order to reduce the number of string
- // comparisons needed to recognize a given token. This leads
- // on large documents like UserGuide to a reduction of a
- // factor 5! (JMarc)
- if (token[0] != '\\') {
- for (string::const_iterator cit = token.begin();
- cit != token.end(); ++cit) {
- par->insertChar(pos, (*cit), font, current_change);
- ++pos;
- }
- } else if (token == "\\layout") {
- // reset the font as we start a new layout and if the font is
- // not ALL_INHERIT,document_language then it will be set to the
- // right values after this tag (Jug 20020420)
- font = LyXFont(LyXFont::ALL_INHERIT, params.language);
+ static Change current_change;
+ int unknown = 0;
- lex.eatLine();
- string layoutname = lex.getString();
+ if (token == "\\layout") {
+ lex.pushToken(token);
- LyXTextClass const & tclass = params.getLyXTextClass();
-
- if (layoutname.empty()) {
- layoutname = tclass.defaultLayoutName();
- }
- bool hasLayout = tclass.hasLayout(layoutname);
- if (!hasLayout) {
- lyxerr << "Layout '" << layoutname << "' does not"
- << " exist in textclass '" << tclass.name()
- << "'." << endl;
- lyxerr << "Trying to use default layout instead."
- << endl;
- layoutname = tclass.defaultLayoutName();
- }
+ Paragraph * par = new Paragraph();
+ par->params().depth(depth);
+ if (params.tracking_changes)
+ par->trackChanges();
+ LyXFont f(LyXFont::ALL_INHERIT, params.language);
+ par->setFont(0, f);
-#ifdef USE_CAPTION
- // The is the compability reading of layout caption.
- // It can be removed in LyX version 1.3.0. (Lgb)
- if (compare_ascii_no_case(layoutname, "caption") == 0) {
- // We expect that the par we are now working on is
- // really inside a InsetText inside a InsetFloat.
- // We also know that captions can only be
- // one paragraph. (Lgb)
-
- // We should now read until the next "\layout"
- // is reached.
- // This is probably not good enough, what if the
- // caption is the last par in the document (Lgb)
- istream & ist = lex.getStream();
- stringstream ss;
- string line;
- int begin = 0;
- while (true) {
- getline(ist, line);
- if (prefixIs(line, "\\layout")) {
- lex.pushToken(line);
- break;
- }
- if (prefixIs(line, "\\begin_inset"))
- ++begin;
- if (prefixIs(line, "\\end_inset")) {
- if (begin)
- --begin;
- else {
- lex.pushToken(line);
- break;
- }
- }
+ // FIXME: goddamn InsetTabular makes us pass a Buffer
+ // not BufferParams
+ unknown += ::readParagraph(*this, *par, lex);
- ss << line << '\n';
- }
- // Now we should have the whole layout in ss
- // we should now be able to give this to the
- // caption inset.
- ss << "\\end_inset\n";
-
- // This seems like a bug in stringstream.
- // We really should be able to use ss
- // directly. (Lgb)
- istringstream is(ss.str());
- LyXLex tmplex(0, 0);
- tmplex.setStream(is);
- Inset * inset = new InsetCaption;
- inset->Read(this, tmplex);
- par->InsertInset(pos, inset, font);
- ++pos;
- } else {
-#endif
- if (!first_par)
- first_par = par;
- else {
- par = new Paragraph(par);
- par->layout(params.getLyXTextClass().defaultLayout());
- if (params.tracking_changes)
- par->trackChanges();
- }
- pos = 0;
- par->layout(params.getLyXTextClass()[layoutname]);
- // Test whether the layout is obsolete.
- LyXLayout_ptr const & layout = par->layout();
- if (!layout->obsoleted_by().empty())
- par->layout(params.getLyXTextClass()[layout->obsoleted_by()]);
- par->params().depth(depth);
-#if USE_CAPTION
- }
-#endif
-
- } else if (token == "\\end_inset") {
- lyxerr << "Solitary \\end_inset. Missing \\begin_inset?.\n"
- << "Last inset read was: " << last_inset_read
- << endl;
- // Simply ignore this. The insets do not have
- // to read this.
- // But insets should read it, it is a part of
- // the inset isn't it? Lgb.
- } else if (token == "\\begin_inset") {
- readInset(lex, par, pos, font);
- } else if (token == "\\family") {
- lex.next();
- font.setLyXFamily(lex.getString());
- } else if (token == "\\series") {
- lex.next();
- font.setLyXSeries(lex.getString());
- } else if (token == "\\shape") {
- lex.next();
- font.setLyXShape(lex.getString());
- } else if (token == "\\size") {
- lex.next();
- font.setLyXSize(lex.getString());
- } else if (token == "\\lang") {
- lex.next();
- string const tok = lex.getString();
- Language const * lang = languages.getLanguage(tok);
- if (lang) {
- font.setLanguage(lang);
- } else {
- font.setLanguage(params.language);
- lex.printError("Unknown language `$$Token'");
- }
- } else if (token == "\\numeric") {
- lex.next();
- font.setNumber(font.setLyXMisc(lex.getString()));
- } else if (token == "\\emph") {
- lex.next();
- font.setEmph(font.setLyXMisc(lex.getString()));
- } else if (token == "\\bar") {
- lex.next();
- string const tok = lex.getString();
- // This is dirty, but gone with LyX3. (Asger)
- if (tok == "under")
- font.setUnderbar(LyXFont::ON);
- else if (tok == "no")
- font.setUnderbar(LyXFont::OFF);
- else if (tok == "default")
- font.setUnderbar(LyXFont::INHERIT);
- else
- lex.printError("Unknown bar font flag "
- "`$$Token'");
- } else if (token == "\\noun") {
- lex.next();
- font.setNoun(font.setLyXMisc(lex.getString()));
- } else if (token == "\\color") {
- lex.next();
- font.setLyXColor(lex.getString());
- } else if (token == "\\SpecialChar") {
- LyXLayout_ptr const & layout = par->layout();
-
- // Insets don't make sense in a free-spacing context! ---Kayvan
- if (layout->free_spacing || par->isFreeSpacing()) {
- if (lex.isOK()) {
- lex.next();
- string const next_token = lex.getString();
- if (next_token == "\\-") {
- par->insertChar(pos, '-', font, current_change);
- } else if (next_token == "~") {
- par->insertChar(pos, ' ', font, current_change);
- } else {
- lex.printError("Token `$$Token' "
- "is in free space "
- "paragraph layout!");
- --pos;
- }
- }
- } else {
- Inset * inset = new InsetSpecialChar;
- inset->read(this, lex);
- par->insertInset(pos, inset, font, current_change);
- }
- ++pos;
- } else if (token == "\\i") {
- Inset * inset = new InsetLatexAccent;
- inset->read(this, lex);
- par->insertInset(pos, inset, font, current_change);
- ++pos;
- } else if (token == "\\backslash") {
- par->insertChar(pos, '\\', font, current_change);
- ++pos;
+ // insert after
+ if (pit != pars.end())
+ ++pit;
+ pit = pars.insert(pit, par);
} else if (token == "\\begin_deeper") {
++depth;
} else if (token == "\\end_deeper") {
if (!depth) {
- lex.printError("\\end_deeper: "
- "depth is already null");
- }
- else
- --depth;
- } else if (token == "\\begin_preamble") {
- params.readPreamble(lex);
- } else if (token == "\\textclass") {
- lex.eatLine();
- pair<bool, textclass_type> pp =
- textclasslist.NumberOfClass(lex.getString());
- if (pp.first) {
- params.textclass = pp.second;
- } else {
-#if USE_BOOST_FORMAT
- Alert::alert(_("Textclass error"),
- boost::io::str(boost::format(_("The document uses an unknown textclass \"%1$s\".")) % lex.getString()),
- _("-- substituting default."));
-#else
- Alert::alert(
- _("Textclass error"),
- _("The document uses an unknown textclass ")
- + lex.getString(),
- _("-- substituting default."));
-#endif
- params.textclass = 0;
- }
- if (!params.getLyXTextClass().load()) {
- // if the textclass wasn't loaded properly
- // we need to either substitute another
- // or stop loading the file.
- // I can substitute but I don't see how I can
- // stop loading... ideas?? ARRae980418
-#if USE_BOOST_FORMAT
- Alert::alert(_("Textclass Loading Error!"),
- boost::io::str(boost::format(_("Can't load textclass %1$s")) %
- params.getLyXTextClass().name()),
- _("-- substituting default."));
-#else
- Alert::alert(_("Textclass Loading Error!"),
- _("Can't load textclass ")
- + params.getLyXTextClass().name(),
- _("-- substituting default."));
-#endif
- params.textclass = 0;
- }
- } else if (token == "\\options") {
- lex.eatLine();
- params.options = lex.getString();
- } else if (token == "\\language") {
- params.readLanguage(lex);
- } else if (token == "\\fontencoding") {
- lex.eatLine();
- } else if (token == "\\inputencoding") {
- lex.eatLine();
- params.inputenc = lex.getString();
- } else if (token == "\\graphics") {
- params.readGraphicsDriver(lex);
- } else if (token == "\\fontscheme") {
- lex.eatLine();
- params.fonts = lex.getString();
- } else if (token == "\\noindent") {
- par->params().noindent(true);
- } else if (token == "\\leftindent") {
- lex.nextToken();
- LyXLength value(lex.getString());
- par->params().leftIndent(value);
- } else if (token == "\\fill_top") {
- par->params().spaceTop(VSpace(VSpace::VFILL));
- } else if (token == "\\fill_bottom") {
- par->params().spaceBottom(VSpace(VSpace::VFILL));
- } else if (token == "\\line_top") {
- par->params().lineTop(true);
- } else if (token == "\\line_bottom") {
- par->params().lineBottom(true);
- } else if (token == "\\pagebreak_top") {
- par->params().pagebreakTop(true);
- } else if (token == "\\pagebreak_bottom") {
- par->params().pagebreakBottom(true);
- } else if (token == "\\start_of_appendix") {
- par->params().startOfAppendix(true);
- } else if (token == "\\paragraph_separation") {
- int tmpret = lex.findToken(string_paragraph_separation);
- if (tmpret == -1)
- ++tmpret;
- params.paragraph_separation =
- static_cast<BufferParams::PARSEP>(tmpret);
- } else if (token == "\\defskip") {
- lex.nextToken();
- params.defskip = VSpace(lex.getString());
- } else if (token == "\\quotes_language") {
- int tmpret = lex.findToken(string_quotes_language);
- if (tmpret == -1)
- ++tmpret;
- InsetQuotes::quote_language tmpl =
- InsetQuotes::EnglishQ;
- switch (tmpret) {
- case 0:
- tmpl = InsetQuotes::EnglishQ;
- break;
- case 1:
- tmpl = InsetQuotes::SwedishQ;
- break;
- case 2:
- tmpl = InsetQuotes::GermanQ;
- break;
- case 3:
- tmpl = InsetQuotes::PolishQ;
- break;
- case 4:
- tmpl = InsetQuotes::FrenchQ;
- break;
- case 5:
- tmpl = InsetQuotes::DanishQ;
- break;
- }
- params.quotes_language = tmpl;
- } else if (token == "\\quotes_times") {
- lex.nextToken();
- switch (lex.getInteger()) {
- case 1:
- params.quotes_times = InsetQuotes::SingleQ;
- break;
- case 2:
- params.quotes_times = InsetQuotes::DoubleQ;
- break;
- }
- } else if (token == "\\papersize") {
- int tmpret = lex.findToken(string_papersize);
- if (tmpret == -1)
- ++tmpret;
- else
- params.papersize2 = tmpret;
- } else if (token == "\\paperpackage") {
- int tmpret = lex.findToken(string_paperpackages);
- if (tmpret == -1) {
- ++tmpret;
- params.paperpackage = BufferParams::PACKAGE_NONE;
- } else
- params.paperpackage = tmpret;
- } else if (token == "\\use_geometry") {
- lex.nextToken();
- params.use_geometry = lex.getInteger();
- } else if (token == "\\use_amsmath") {
- lex.nextToken();
- params.use_amsmath = lex.getInteger();
- } else if (token == "\\use_natbib") {
- lex.nextToken();
- params.use_natbib = lex.getInteger();
- } else if (token == "\\use_numerical_citations") {
- lex.nextToken();
- params.use_numerical_citations = lex.getInteger();
- } else if (token == "\\tracking_changes") {
- lex.nextToken();
- params.tracking_changes = lex.getInteger();
- // mark the first paragraph
- if (params.tracking_changes)
- par->trackChanges();
- } else if (token == "\\author") {
- lex.nextToken();
- istringstream ss(lex.getString());
- Author a;
- ss >> a;
- int aid(authorlist.record(a));
- lyxerr << "aid is " << aid << endl;
- lyxerr << "listed aid is " << author_ids.size() << endl;
- author_ids.push_back(authorlist.record(a));
- } else if (token == "\\paperorientation") {
- int tmpret = lex.findToken(string_orientation);
- if (tmpret == -1)
- ++tmpret;
- params.orientation =
- static_cast<BufferParams::PAPER_ORIENTATION>(tmpret);
- } else if (token == "\\paperwidth") {
- lex.next();
- params.paperwidth = lex.getString();
- } else if (token == "\\paperheight") {
- lex.next();
- params.paperheight = lex.getString();
- } else if (token == "\\leftmargin") {
- lex.next();
- params.leftmargin = lex.getString();
- } else if (token == "\\topmargin") {
- lex.next();
- params.topmargin = lex.getString();
- } else if (token == "\\rightmargin") {
- lex.next();
- params.rightmargin = lex.getString();
- } else if (token == "\\bottommargin") {
- lex.next();
- params.bottommargin = lex.getString();
- } else if (token == "\\headheight") {
- lex.next();
- params.headheight = lex.getString();
- } else if (token == "\\headsep") {
- lex.next();
- params.headsep = lex.getString();
- } else if (token == "\\footskip") {
- lex.next();
- params.footskip = lex.getString();
- } else if (token == "\\paperfontsize") {
- lex.nextToken();
- params.fontsize = rtrim(lex.getString());
- } else if (token == "\\papercolumns") {
- lex.nextToken();
- params.columns = lex.getInteger();
- } else if (token == "\\papersides") {
- lex.nextToken();
- switch (lex.getInteger()) {
- default:
- case 1: params.sides = LyXTextClass::OneSide; break;
- case 2: params.sides = LyXTextClass::TwoSides; break;
- }
- } else if (token == "\\paperpagestyle") {
- lex.nextToken();
- params.pagestyle = rtrim(lex.getString());
- } else if (token == "\\bullet") {
- lex.nextToken();
- int const index = lex.getInteger();
- lex.nextToken();
- int temp_int = lex.getInteger();
- params.user_defined_bullets[index].setFont(temp_int);
- params.temp_bullets[index].setFont(temp_int);
- lex.nextToken();
- temp_int = lex.getInteger();
- params.user_defined_bullets[index].setCharacter(temp_int);
- params.temp_bullets[index].setCharacter(temp_int);
- lex.nextToken();
- temp_int = lex.getInteger();
- params.user_defined_bullets[index].setSize(temp_int);
- params.temp_bullets[index].setSize(temp_int);
- lex.nextToken();
- string const temp_str = lex.getString();
- if (temp_str != "\\end_bullet") {
- // this element isn't really necessary for
- // parsing but is easier for humans
- // to understand bullets. Put it back and
- // set a debug message?
- lex.printError("\\end_bullet expected, got" + temp_str);
- //how can I put it back?
- }
- } else if (token == "\\bulletLaTeX") {
- // The bullet class should be able to read this.
- lex.nextToken();
- int const index = lex.getInteger();
- lex.next();
- string temp_str = lex.getString();
- string sum_str;
- while (temp_str != "\\end_bullet") {
- // this loop structure is needed when user
- // enters an empty string since the first
- // thing returned will be the \\end_bullet
- // OR
- // if the LaTeX entry has spaces. Each element
- // therefore needs to be read in turn
- sum_str += temp_str;
- lex.next();
- temp_str = lex.getString();
- }
-
- params.user_defined_bullets[index].setText(sum_str);
- params.temp_bullets[index].setText(sum_str);
- } else if (token == "\\secnumdepth") {
- lex.nextToken();
- params.secnumdepth = lex.getInteger();
- } else if (token == "\\tocdepth") {
- lex.nextToken();
- params.tocdepth = lex.getInteger();
- } else if (token == "\\spacing") {
- lex.next();
- string const tmp = rtrim(lex.getString());
- Spacing::Space tmp_space = Spacing::Default;
- float tmp_val = 0.0;
- if (tmp == "single") {
- tmp_space = Spacing::Single;
- } else if (tmp == "onehalf") {
- tmp_space = Spacing::Onehalf;
- } else if (tmp == "double") {
- tmp_space = Spacing::Double;
- } else if (tmp == "other") {
- lex.next();
- tmp_space = Spacing::Other;
- tmp_val = lex.getFloat();
+ lex.printError("\\end_deeper: " "depth is already null");
} else {
- lex.printError("Unknown spacing token: '$$Token'");
- }
- // Small hack so that files written with klyx will be
- // parsed correctly.
- if (first_par) {
- par->params().spacing(Spacing(tmp_space, tmp_val));
- } else {
- params.spacing.set(tmp_space, tmp_val);
- }
- } else if (token == "\\paragraph_spacing") {
- lex.next();
- string const tmp = rtrim(lex.getString());
- if (tmp == "single") {
- par->params().spacing(Spacing(Spacing::Single));
- } else if (tmp == "onehalf") {
- par->params().spacing(Spacing(Spacing::Onehalf));
- } else if (tmp == "double") {
- par->params().spacing(Spacing(Spacing::Double));
- } else if (tmp == "other") {
- lex.next();
- par->params().spacing(Spacing(Spacing::Other,
- lex.getFloat()));
- } else {
- lex.printError("Unknown spacing token: '$$Token'");
+ --depth;
}
- } else if (token == "\\float_placement") {
- lex.nextToken();
- params.float_placement = lex.getString();
- } else if (token == "\\align") {
- int tmpret = lex.findToken(string_align);
- if (tmpret == -1)
- ++tmpret;
- int const tmpret2 = int(pow(2.0, tmpret));
- par->params().align(LyXAlignment(tmpret2));
- } else if (token == "\\added_space_top") {
- lex.nextToken();
- VSpace value = VSpace(lex.getString());
- // only add the length when value > 0 or
- // with option keep
- if ((value.length().len().value() != 0) ||
- value.keep() ||
- (value.kind() != VSpace::LENGTH))
- par->params().spaceTop(value);
- } else if (token == "\\added_space_bottom") {
- lex.nextToken();
- VSpace value = VSpace(lex.getString());
- // only add the length when value > 0 or
- // with option keep
- if ((value.length().len().value() != 0) ||
- value.keep() ||
- (value.kind() != VSpace::LENGTH))
- par->params().spaceBottom(value);
- } else if (token == "\\labelwidthstring") {
- lex.eatLine();
- par->params().labelWidthString(lex.getString());
- // do not delete this token, it is still needed!
- } else if (token == "\\newline") {
- par->insertChar(pos, Paragraph::META_NEWLINE, font, current_change);
- ++pos;
- } else if (token == "\\LyXTable") {
- Inset * inset = new InsetTabular(*this);
- inset->read(this, lex);
- par->insertInset(pos, inset, font, current_change);
- ++pos;
- } else if (token == "\\bibitem") { // ale970302
- InsetCommandParams p("bibitem", "dummy");
- InsetBibitem * inset = new InsetBibitem(p);
- inset->read(this, lex);
- par->insertInset(pos, inset, font, current_change);
- ++pos;
- } else if (token == "\\hfill") {
- par->insertChar(pos, Paragraph::META_HFILL, font, current_change);
- ++pos;
- } else if (token == "\\change_unchanged") {
- // Hack ! Needed for empty paragraphs :/
- if (!pos)
- par->cleanChanges();
- current_change = Change(Change::UNCHANGED);
- } else if (token == "\\change_inserted") {
- lex.nextToken();
- istringstream istr(lex.getString());
- int aid;
- lyx::time_type ct;
- istr >> aid;
- istr >> ct;
- current_change = Change(Change::INSERTED, author_ids[aid], ct);
- } else if (token == "\\change_deleted") {
- lex.nextToken();
- istringstream istr(lex.getString());
- int aid;
- lyx::time_type ct;
- istr >> aid;
- istr >> ct;
- current_change = Change(Change::DELETED, author_ids[aid], ct);
- } else if (token == "\\the_end") {
- the_end_read = true;
} else {
- // This should be insurance for the future: (Asger)
- ++unknown_tokens;
- lex.eatLine();
-#if USE_BOOST_FORMAT
- boost::format fmt(_("Unknown token: %1$s %2$s\n"));
- fmt % token % lex.text();
- string const s = fmt.str();
-#else
- string const s = _("Unknown token: ") + token
- + ' ' + lex.text() + '\n';
-#endif
- // we can do this here this way because we're actually reading
- // the buffer and don't care about LyXText right now.
- InsetError * new_inset = new InsetError(s);
- par->insertInset(pos, new_inset, LyXFont(LyXFont::ALL_INHERIT,
- params.language));
-
+ ++unknown;
}
-
- return the_end_read;
+ return unknown;
}
// needed to insert the selection
-void Buffer::insertStringAsLines(Paragraph *& par, pos_type & pos,
- LyXFont const & fn,string const & str) const
+void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos,
+ LyXFont const & fn,string const & str)
{
LyXLayout_ptr const & layout = par->layout();
cit != str.end(); ++cit) {
if (*cit == '\n') {
if (autobreakrows && (!par->empty() || layout->keepempty)) {
- breakParagraph(params, par, pos,
+ breakParagraph(params, paragraphs, par, pos,
layout->isEnvironment());
- par = par->next();
+ ++par;
pos = 0;
space_inserted = true;
} else {
} else if (*cit == '\t') {
if (!layout->free_spacing && !par->isFreeSpacing()) {
// tabs are like spaces here
- par->insertChar(pos, ' ', font, current_change);
+ par->insertChar(pos, ' ', font);
++pos;
space_inserted = true;
} else {
const pos_type nb = 8 - pos % 8;
for (pos_type a = 0; a < nb ; ++a) {
- par->insertChar(pos, ' ', font, current_change);
+ par->insertChar(pos, ' ', font);
++pos;
}
space_inserted = true;
}
-void Buffer::readInset(LyXLex & lex, Paragraph *& par,
- int & pos, LyXFont & font)
+bool Buffer::readFile(LyXLex & lex, string const & filename)
{
- // consistency check
- if (lex.getString() != "\\begin_inset") {
- lyxerr << "Buffer::readInset: Consistency check failed."
- << endl;
- }
+ bool ret = readFile(lex, filename, paragraphs.begin());
- Inset * inset = 0;
+ // 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;
+}
+
+
+// FIXME: all the below Alerts should give the filename..
+bool Buffer::readFile(LyXLex & lex, string const & filename,
+ ParagraphList::iterator pit)
+{
+ if (!lex.isOK()) {
+ Alert::error(_("Document could not be read"),
+ _("The specified document could not be read."));
+ return false;
+ }
lex.next();
- string const tmptok = lex.getString();
- last_inset_read = tmptok;
-
- // test the different insets
- if (tmptok == "LatexCommand") {
- InsetCommandParams inscmd;
- inscmd.read(lex);
-
- string const cmdName = inscmd.getCmdName();
-
- // This strange command allows LyX to recognize "natbib" style
- // citations: citet, citep, Citet etc.
- if (compare_ascii_no_case(cmdName.substr(0,4), "cite") == 0) {
- inset = new InsetCitation(inscmd);
- } else if (cmdName == "bibitem") {
- lex.printError("Wrong place for bibitem");
- inset = new InsetBibitem(inscmd);
- } else if (cmdName == "BibTeX") {
- inset = new InsetBibtex(inscmd);
- } else if (cmdName == "index") {
- inset = new InsetIndex(inscmd);
- } else if (cmdName == "include") {
- inset = new InsetInclude(inscmd, *this);
- } else if (cmdName == "label") {
- inset = new InsetLabel(inscmd);
- } else if (cmdName == "url"
- || cmdName == "htmlurl") {
- inset = new InsetUrl(inscmd);
- } else if (cmdName == "ref"
- || cmdName == "pageref"
- || cmdName == "vref"
- || cmdName == "vpageref"
- || cmdName == "prettyref") {
- if (!inscmd.getOptions().empty()
- || !inscmd.getContents().empty()) {
- inset = new InsetRef(inscmd, *this);
- }
- } else if (cmdName == "tableofcontents") {
- inset = new InsetTOC(inscmd);
- } else if (cmdName == "listofalgorithms") {
- inset = new InsetFloatList("algorithm");
- } else if (cmdName == "listoffigures") {
- inset = new InsetFloatList("figure");
- } else if (cmdName == "listoftables") {
- inset = new InsetFloatList("table");
- } else if (cmdName == "printindex") {
- inset = new InsetPrintIndex(inscmd);
- } else if (cmdName == "lyxparent") {
- inset = new InsetParent(inscmd, *this);
- }
- } else {
- bool alreadyread = false;
- if (tmptok == "Quotes") {
- inset = new InsetQuotes;
- } else if (tmptok == "External") {
- inset = new InsetExternal;
- } else if (tmptok == "FormulaMacro") {
- inset = new InsetFormulaMacro;
- } else if (tmptok == "Formula") {
- inset = new InsetFormula;
- } else if (tmptok == "Figure") { // Backward compatibility
-// inset = new InsetFig(100, 100, *this);
- inset = new InsetGraphics;
- } else if (tmptok == "Graphics") {
- inset = new InsetGraphics;
- } else if (tmptok == "Info") {// backwards compatibility
- inset = new InsetNote(this,
- lex.getLongString("\\end_inset"),
- true);
- alreadyread = true;
- } else if (tmptok == "Note") {
- inset = new InsetNote(params);
- } else if (tmptok == "Include") {
- InsetCommandParams p("Include");
- inset = new InsetInclude(p, *this);
- } else if (tmptok == "ERT") {
- inset = new InsetERT(params);
- } else if (tmptok == "Tabular") {
- inset = new InsetTabular(*this);
- } else if (tmptok == "Text") {
- inset = new InsetText(params);
- } else if (tmptok == "Foot") {
- inset = new InsetFoot(params);
- } else if (tmptok == "Marginal") {
- inset = new InsetMarginal(params);
- } else if (tmptok == "OptArg") {
- inset = new InsetOptArg(params);
- } else if (tmptok == "Minipage") {
- inset = new InsetMinipage(params);
- } else if (tmptok == "Float") {
- lex.next();
- string tmptok = lex.getString();
- inset = new InsetFloat(params, tmptok);
- } else if (tmptok == "Wrap") {
- lex.next();
- string tmptok = lex.getString();
- inset = new InsetWrap(params, tmptok);
-#if 0
- } else if (tmptok == "List") {
- inset = new InsetList;
- } else if (tmptok == "Theorem") {
- inset = new InsetList;
-#endif
- } else if (tmptok == "Caption") {
- inset = new InsetCaption(params);
- } else if (tmptok == "FloatList") {
- inset = new InsetFloatList;
- }
+ string const token(lex.getString());
- if (inset && !alreadyread) inset->read(this, lex);
- }
-
- if (inset) {
- par->insertInset(pos, inset, font, current_change);
- ++pos;
- }
-}
-
-
-bool Buffer::readFile(LyXLex & lex, string const & filename, Paragraph * par)
-{
- if (lex.isOK()) {
- lex.next();
- string const token(lex.getString());
- if (token == "\\lyxformat") { // the first token _must_ be...
- lex.eatLine();
- string tmp_format = lex.getString();
- //lyxerr << "LyX Format: `" << tmp_format << '\'' << endl;
- // if present remove ".," from string.
- string::size_type dot = tmp_format.find_first_of(".,");
- //lyxerr << " dot found at " << dot << endl;
- if (dot != string::npos)
- tmp_format.erase(dot, 1);
- file_format = strToInt(tmp_format);
- //lyxerr << "format: " << file_format << endl;
- if (file_format == LYX_FORMAT) {
- // current format
- } else if (file_format > LYX_FORMAT) {
- // future format
- Alert::alert(_("Warning!"),
- _("The file was created with a newer version of "
- "LyX. This is likely to cause problems."));
-
- } else if (file_format < LYX_FORMAT) {
- // old formats
- if (file_format < 200) {
- Alert::alert(_("ERROR!"),
- _("Old LyX file format found. "
- "Use LyX 0.10.x to read this!"));
- return false;
- } else if (!filename.empty()) {
- string command =
- LibFileSearch("lyx2lyx", "lyx2lyx");
- if (command.empty()) {
- Alert::alert(_("ERROR!"),
- _("Can't find conversion script."));
- return false;
- }
- command += " -t"
- +tostr(LYX_FORMAT) + ' '
- + QuoteName(filename);
- lyxerr[Debug::INFO] << "Running '"
- << command << '\''
- << endl;
- cmd_ret const ret = RunCommand(command);
- if (ret.first) {
- Alert::alert(_("ERROR!"),
- _("An error occured while "
- "running the conversion script."));
- return false;
- }
- istringstream is(STRCONV(ret.second));
- LyXLex tmplex(0, 0);
- tmplex.setStream(is);
- return readFile(tmplex, string(), par);
- } else {
- // This code is reached if lyx2lyx failed (for
- // some reason) to change the file format of
- // the file.
- lyx::Assert(false);
- return false;
- }
- }
- bool the_end = readLyXformat2(lex, par);
- params.setPaperStuff();
+ if (!lex.isOK()) {
+ Alert::error(_("Document could not be read"),
+ _("The specified document could not be read."));
+ return false;
+ }
+
+ // the first token _must_ be...
+ if (token != "\\lyxformat") {
+ Alert::error(_("Document format failure"),
+ _("The specified document is not a LyX document."));
+ return false;
+ }
- if (!the_end) {
- Alert::alert(_("Warning!"),
- _("Reading of document is not complete"),
- _("Maybe the document is truncated"));
+ lex.eatLine();
+ string tmp_format = lex.getString();
+ //lyxerr << "LyX Format: `" << tmp_format << '\'' << endl;
+ // if present remove ".," from string.
+ string::size_type dot = tmp_format.find_first_of(".,");
+ //lyxerr << " dot found at " << dot << endl;
+ if (dot != string::npos)
+ tmp_format.erase(dot, 1);
+ file_format = strToInt(tmp_format);
+ //lyxerr << "format: " << file_format << endl;
+ if (file_format == LYX_FORMAT) {
+ // current format
+ } else if (file_format > LYX_FORMAT) {
+ Alert::warning(_("Document format failure"),
+ _("This document was created with a newer version of "
+ "LyX. This is likely to cause problems."));
+ } else if (file_format < LYX_FORMAT) {
+ // old formats
+ if (file_format < 200) {
+ Alert::error(_("Document format failure"),
+ _("This LyX document is too old to be read "
+ "by this version of LyX. Try LyX 0.10."));
+ return false;
+ } else if (!filename.empty()) {
+ string command =
+ LibFileSearch("lyx2lyx", "lyx2lyx");
+ if (command.empty()) {
+ Alert::error(_("Conversion script not found"),
+ _("The document is from an earlier version "
+ "of LyX, but the conversion script lyx2lyx "
+ "could not be found."));
+ return false;
}
- return true;
- } else { // "\\lyxformat" not found
- Alert::alert(_("ERROR!"), _("Not a LyX file!"));
+ command += " -t"
+ +tostr(LYX_FORMAT) + ' '
+ + QuoteName(filename);
+ lyxerr[Debug::INFO] << "Running '"
+ << command << '\''
+ << endl;
+ cmd_ret const ret = RunCommand(command);
+ if (ret.first) {
+ Alert::error(_("Conversion script failed"),
+ _("The document is from an earlier version "
+ "of LyX, but the lyx2lyx script failed "
+ "to convert it."));
+ return false;
+ }
+ istringstream is(STRCONV(ret.second));
+ LyXLex tmplex(0, 0);
+ tmplex.setStream(is);
+ return readFile(tmplex, string(), pit);
+ } else {
+ // This code is reached if lyx2lyx failed (for
+ // some reason) to change the file format of
+ // the file.
+ lyx::Assert(false);
+ return false;
}
- } else
- Alert::alert(_("ERROR!"), _("Unable to read file!"));
- return false;
+ }
+ bool the_end = readBody(lex, pit);
+ params.setPaperStuff();
+
+ if (!the_end) {
+ Alert::error(_("Document format failure"),
+ _("The document ended unexpectedly, which means "
+ "that it is probably corrupted."));
+ }
+ return true;
}
// now write out the buffer paramters.
params.writeFile(ofs);
- // if we're tracking, list all possible authors
- if (params.tracking_changes) {
- AuthorList::Authors::const_iterator it = authorlist.begin();
- AuthorList::Authors::const_iterator end = authorlist.end();
- for (; it != end; ++it) {
- ofs << "\\author " << it->second << "\n";
- }
- }
-
+ ofs << "\\end_header\n";
+
Paragraph::depth_type depth = 0;
// this will write out all the paragraphs
/* noindent ? */
/* what about the alignment */
-// } else {
-// lyxerr << "Should this ever happen?" << endl;
-// }
// linelen <= 0 is special and means we don't have paragraph breaks
}
break;
- case Paragraph::META_NEWLINE:
- if (linelen > 0) {
- buffer << word << "\n";
- word.erase();
-
- pair<int, string> p = addDepth(depth,
- ltype_depth);
- buffer << p.second;
- currlinelen = p.first;
- }
- break;
-
- case Paragraph::META_HFILL:
- buffer << word << "\t";
- currlinelen += word.length() + 1;
- word.erase();
- break;
-
default:
if (c == ' ') {
if (linelen > 0 &&
currlinelen + word.length() > linelen - 10) {
buffer << "\n";
- pair<int, string> p =
- addDepth(depth, ltype_depth);
+ pair<int, string> p = addDepth(depth, ltype_depth);
buffer << p.second;
currlinelen = p.first;
}
{
ofstream ofs(fname.c_str());
if (!ofs) {
- Alert::err_alert(_("Error: Cannot write file:"), fname);
+ string const file = MakeDisplayPath(fname, 50);
+#if USE_BOOST_FORMAT
+ boost::format fmt(_("Could not save the document\n%1$s."));
+ fmt % file;
+ string text = fmt.str();
+#else
+ string text = _("Could not save the document\n");
+ text += file + ".";
+#endif
+ Alert::error(_("Could not save document"), text);
return;
}
writeFileAscii(ofs, linelen);
ofstream ofs(fname.c_str());
if (!ofs) {
- Alert::err_alert(_("Error: Cannot open file: "), fname);
+ string const file = MakeDisplayPath(fname, 50);
+#if USE_BOOST_FORMAT
+ boost::format fmt(_("Could not open the specified document\n%1$s."));
+ fmt % file;
+ string text = fmt.str();
+#else
+ string text = _("Could not open the specified document\n");
+ text += file + ".";
+#endif
+ Alert::error(_("Could not open file"), text);
return;
}
texrow.newline();
}
- latexParagraphs(os, &*(paragraphs.begin()), 0, texrow);
+ latexParagraphs(this, paragraphs, paragraphs.begin(), paragraphs.end(), os, texrow);
// add this just in case after all the paragraphs
os << endl;
}
-//
-// LaTeX all paragraphs from par to endpar, if endpar == 0 then to the end
-//
-void Buffer::latexParagraphs(ostream & ofs, Paragraph * par,
- Paragraph * endpar, TexRow & texrow,
- bool moving_arg) const
-{
- bool was_title = false;
- bool already_title = false;
- LyXTextClass const & tclass = params.getLyXTextClass();
-
- // if only_body
- while (par != endpar) {
- Inset * in = par->inInset();
- // well we have to check if we are in an inset with unlimited
- // length (all in one row) if that is true then we don't allow
- // any special options in the paragraph and also we don't allow
- // any environment other then "Standard" to be valid!
- if ((in == 0) || !in->forceDefaultParagraphs(in)) {
- LyXLayout_ptr const & layout = par->layout();
-
- if (layout->intitle) {
- if (already_title) {
- lyxerr <<"Error in latexParagraphs: You"
- " should not mix title layouts"
- " with normal ones." << endl;
- } else if (!was_title) {
- was_title = true;
- if (tclass.titletype() == TITLE_ENVIRONMENT) {
- ofs << "\\begin{"
- << tclass.titlename()
- << "}\n";
- texrow.newline();
- }
- }
- } else if (was_title && !already_title) {
- if (tclass.titletype() == TITLE_ENVIRONMENT) {
- ofs << "\\end{" << tclass.titlename()
- << "}\n";
- }
- else {
- ofs << "\\" << tclass.titlename()
- << "\n";
- }
- texrow.newline();
- already_title = true;
- was_title = false;
- }
-
- if (layout->isEnvironment() ||
- !par->params().leftIndent().zero())
- {
- par = par->TeXEnvironment(this, params, ofs, texrow);
- } else {
- par = par->TeXOnePar(this, params, ofs, texrow, moving_arg);
- }
- } else {
- par = par->TeXOnePar(this, params, ofs, texrow, moving_arg);
- }
- }
- // It might be that we only have a title in this document
- if (was_title && !already_title) {
- if (tclass.titletype() == TITLE_ENVIRONMENT) {
- ofs << "\\end{" << tclass.titlename()
- << "}\n";
- }
- else {
- ofs << "\\" << tclass.titlename()
- << "\n";
- }
- texrow.newline();
- }
-}
-
-
bool Buffer::isLatex() const
{
return params.getLyXTextClass().outputType() == LATEX;
ofstream ofs(fname.c_str());
if (!ofs) {
- Alert::alert(_("LYX_ERROR:"), _("Cannot write file"), fname);
+ string const file = MakeDisplayPath(fname, 50);
+#if USE_BOOST_FORMAT
+ boost::format fmt(_("Could not save the specified document\n%1$s.\n"));
+ fmt % file;
+ string text = fmt.str();
+#else
+ string text = _("Could not save the specified document\n");
+ text += file + _(".\n");
+#endif
+ Alert::error(_("Could not save document"), text);
return;
}
<< " -->\n";
Paragraph::depth_type depth = 0; // paragraph depth
- Paragraph * par = &*(paragraphs.begin());
string item_name;
vector<string> environment_stack(5);
- while (par) {
- LyXLayout_ptr const & style = par->layout();
+ ParagraphList::iterator pit = paragraphs.begin();
+ ParagraphList::iterator pend = paragraphs.end();
+ for (; pit != pend; ++pit) {
+ LyXLayout_ptr const & style = pit->layout();
// treat <toc> as a special case for compatibility with old code
- if (par->isInset(0)) {
- Inset * inset = par->getInset(0);
+ if (pit->isInset(0)) {
+ Inset * inset = pit->getInset(0);
Inset::Code lyx_code = inset->lyxCode();
if (lyx_code == Inset::TOC_CODE) {
string const temp = "toc";
sgml::openTag(ofs, depth, false, temp);
-
- par = par->next();
continue;
}
}
// environment tag closing
- for (; depth > par->params().depth(); --depth) {
+ for (; depth > pit->params().depth(); --depth) {
sgml::closeTag(ofs, depth, false, environment_stack[depth]);
environment_stack[depth].erase();
}
// write opening SGML tags
switch (style->latextype) {
case LATEX_PARAGRAPH:
- if (depth == par->params().depth()
+ if (depth == pit->params().depth()
&& !environment_stack[depth].empty()) {
sgml::closeTag(ofs, depth, false, environment_stack[depth]);
environment_stack[depth].erase();
break;
case LATEX_COMMAND:
- if (depth!= 0)
- sgmlError(par, 0,
+ if (depth != 0)
+ sgmlError(&*pit, 0,
_("Error: Wrong depth for LatexType Command.\n"));
if (!environment_stack[depth].empty()) {
{
string const & latexname = style->latexname();
- if (depth == par->params().depth()
+ if (depth == pit->params().depth()
&& environment_stack[depth] != latexname) {
sgml::closeTag(ofs, depth, false,
environment_stack[depth]);
environment_stack[depth].erase();
}
- if (depth < par->params().depth()) {
- depth = par->params().depth();
+ if (depth < pit->params().depth()) {
+ depth = pit->params().depth();
environment_stack[depth].erase();
}
if (environment_stack[depth] != latexname) {
break;
}
- simpleLinuxDocOnePar(ofs, par, depth);
-
- par = par->next();
+ simpleLinuxDocOnePar(ofs, &*pit, depth);
ofs << "\n";
// write closing SGML tags
PAR_TAG tag_close = NONE;
list < PAR_TAG > tag_open;
- LyXFont const font = par->getFont(params, i);
+ LyXFont const font = par->getFont(params, i, outerFont(par, paragraphs));
if (font_old.family() != font.family()) {
switch (family_type) {
// Print an error message.
-void Buffer::sgmlError(Paragraph * /*par*/, int /*pos*/,
+void Buffer::sgmlError(ParagraphList::iterator /*par*/, int /*pos*/,
string const & /*message*/) const
{
#ifdef WITH_WARNINGS
{
ofstream ofs(fname.c_str());
if (!ofs) {
- Alert::alert(_("LYX_ERROR:"), _("Cannot write file"), fname);
+ string const file = MakeDisplayPath(fname, 50);
+#if USE_BOOST_FORMAT
+ boost::format fmt(_("Could not save the specified document\n%1$s.\n"));
+ fmt % file;
+ string text = fmt.str();
+#else
+ string text = _("Could not save the specified document\n");
+ text += file + _(".\n");
+#endif
+ Alert::error(_("Could not save document"), text);
return;
}
- Paragraph * par = &*(paragraphs.begin());
-
niceFile = nice; // this will be used by Insetincludes.
LaTeXFeatures features(params);
string item_name;
string command_name;
- while (par) {
+ ParagraphList::iterator par = paragraphs.begin();
+ ParagraphList::iterator pend = paragraphs.end();
+
+ for (; par != pend; ++par) {
string sgmlparam;
string c_depth;
string c_params;
simpleDocBookOnePar(ofs, par, desc_on,
depth + 1 + command_depth);
- par = par->next();
string end_tag;
// write closing SGML tags
void Buffer::simpleDocBookOnePar(ostream & os,
- Paragraph * par, int & desc_on,
+ ParagraphList::iterator par, int & desc_on,
Paragraph::depth_type depth) const
{
bool emph_flag = false;
// parsing main loop
for (pos_type i = 0; i < par->size(); ++i) {
- LyXFont font = par->getFont(params, i);
+ LyXFont font = par->getFont(params, i, outerFont(par, paragraphs));
// handle <emphasis> tag
if (font_old.emph() != font.emph()) {
int res = chktex.run(terr); // run chktex
if (res == -1) {
- Alert::alert(_("chktex did not work!"),
- _("Could not run with file:"), name);
+ Alert::error(_("chktex failure"),
+ _("Could not run chktex successfully."));
} else if (res > 0) {
// Insert all errors as errors boxes
users->insertErrors(terr);
features.require("dvipost");
features.require("color");
}
-
+
// AMS Style is at document level
- if (params.use_amsmath || tclass.provides(LyXTextClass::amsmath))
+ if (params.use_amsmath == BufferParams::AMS_ON
+ || tclass.provides(LyXTextClass::amsmath))
features.require("amsmath");
for_each(paragraphs.begin(), paragraphs.end(),
void Buffer::changeLanguage(Language const * from, Language const * to)
{
+ lyxerr << "Changing Language!" << endl;
+
+ // Take care of l10n/i18n
+ updateDocLang(to);
ParIterator end = par_iterator_end();
for (ParIterator it = par_iterator_begin(); it != end; ++it)
}
+void Buffer::updateDocLang(Language const * nlang)
+{
+ messages_.reset(new Messages(nlang->code()));
+}
+
+
bool Buffer::isMultiLingual()
{
ParIterator end = par_iterator_end();
}
-Paragraph * Buffer::getParFromID(int id) const
+ParagraphList::iterator Buffer::getParFromID(int id) const
{
- if (id < 0)
- return 0;
-
- // why should we allow < 0 ??
- //lyx::Assert(id >= 0);
+#warning FIXME: const correctness! (Andre)
+ ParIterator it(const_cast<Buffer*>(this)->par_iterator_begin());
+ ParIterator end(const_cast<Buffer*>(this)->par_iterator_end());
- ParConstIterator it(par_iterator_begin());
- ParConstIterator end(par_iterator_end());
+#warning FIXME, perhaps this func should return a ParIterator? (Lgb)
+ if (id < 0) {
+ // John says this is called with id == -1 from undo
+ lyxerr << "getParFromID(), id: " << id << endl;
+ return 0;
+ }
for (; it != end; ++it) {
// go on then, show me how to remove
// the cast
if ((*it)->id() == id) {
- return const_cast<Paragraph*>(*it);
+ return *it;
}
}
}
+string const Buffer::B_(string const & l10n) const
+{
+ if (messages_.get()) {
+ return messages_->get(l10n);
+ }
+
+ return _(l10n);
+}
+
+
bool Buffer::isClean() const
{
return lyx_clean;
projects / lyx.git / blobdiff