-/* 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>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "buffer.h"
#include "bufferlist.h"
#include "LyXAction.h"
#include "version.h"
#include "LaTeX.h"
#include "Chktex.h"
-#include "frontends/LyXView.h"
#include "debug.h"
#include "LaTeXFeatures.h"
#include "lyxtext.h"
#include "gettext.h"
#include "language.h"
-#include "encoding.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/insetbib.h"
-#include "insets/insetcite.h"
-#include "insets/insetexternal.h"
-#include "insets/insetindex.h"
+#include "insets/insetbibitem.h"
+#include "insets/insetbibtex.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/insetminipage.h"
-#include "insets/insetfloat.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 "support/lyxlib.h"
#include "support/FileInfo.h"
#include "support/lyxmanip.h"
-#include "support/lyxalgo.h" // for lyx::count
+#include "support/lyxtime.h"
+
+#include <boost/bind.hpp>
+#include <boost/tuple/tuple.hpp>
+#include "support/BoostFormat.h"
#include <fstream>
#include <iomanip>
#include <sys/types.h>
#include <utime.h>
-
#ifdef HAVE_LOCALE
#include <locale>
#endif
using std::make_pair;
using std::vector;
using std::map;
-using std::max;
-using std::set;
using std::stack;
using std::list;
+using std::for_each;
using lyx::pos_type;
using lyx::textclass_type;
// all these externs should eventually be removed.
extern BufferList bufferlist;
-extern LyXAction lyxaction;
-
namespace {
-const int LYX_FORMAT = 220;
+const int LYX_FORMAT = 223;
} // namespace anon
-extern int tex_code_break_column;
-
-
Buffer::Buffer(string const & file, bool ronly)
- : paragraph(0), niceFile(true), lyx_clean(true), bak_clean(true),
- unnamed(false), dep_clean(0), read_only(ronly),
+ : niceFile(true), lyx_clean(true), bak_clean(true),
+ unnamed(false), read_only(ronly),
filename_(file), users(0)
{
lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl;
-// filename = file;
filepath_ = OnlyPath(file);
-// paragraph = 0;
-// lyx_clean = true;
-// bak_clean = true;
-// dep_clean = 0;
-// read_only = ronly;
-// unnamed = false;
-// users = 0;
lyxvc.buffer(this);
if (read_only || lyxrc.use_tempdir) {
tmppath = CreateBufferTmpDir();
} else {
tmppath.erase();
}
+
+ // set initial author
+ 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);
}
- Paragraph * par = paragraph;
- Paragraph * tmppar;
- while (par) {
- tmppar = par->next();
- delete par;
- par = tmppar;
- }
- paragraph = 0;
+ paragraphs.clear();
// Remove any previewed LaTeX snippets assocoated with this buffer.
grfx::Previews::get().removeLoader(this);
}
-pair<Buffer::LogType, string> const Buffer::getLogName(void) const
+pair<Buffer::LogType, string> const Buffer::getLogName() const
{
string const filename = getLatexName(false);
if (b_fi.exist() &&
(!f_fi.exist() || f_fi.getModificationTime() < b_fi.getModificationTime())) {
- lyxerr[Debug::FILES] << "Log name calculated as : " << bname << endl;
+ lyxerr[Debug::FILES] << "Log name calculated as: " << bname << endl;
return make_pair(Buffer::buildlog, bname);
}
- lyxerr[Debug::FILES] << "Log name calculated as : " << fname << endl;
+ lyxerr[Debug::FILES] << "Log name calculated as: " << fname << endl;
return make_pair(Buffer::latexlog, fname);
}
if (read_only != flag) {
read_only = flag;
updateTitles();
- users->owner()->getDialogs()->updateBufferDependent(false);
+ users->owner()->getDialogs().updateBufferDependent(false);
}
}
+AuthorList & Buffer::authors()
+{
+ return params.authorlist;
+}
+
+
/// Update window titles of all users
// Should work on a list
void Buffer::updateTitles() const
// We'll remove this later. (Lgb)
namespace {
-string last_inset_read;
+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
+ Alert::warning(_("Unknown document class"), msg);
+}
-#ifndef NO_COMPABILITY
-struct ErtComp
+} // anon
+
+int Buffer::readHeader(LyXLex & lex)
{
- ErtComp() : active(false), fromlayout(false), in_tabular(false) {
- }
- string contents;
- bool active;
- bool fromlayout;
- bool in_tabular;
- LyXFont font;
-};
+ int unknown_tokens = 0;
-std::stack<ErtComp> ert_stack;
-ErtComp ert_comp;
-#endif
+ while (lex.isOK()) {
+ lex.nextToken();
+ string const token = lex.getString();
-#ifdef WITH_WARNINGS
-#warning And _why_ is this here? (Lgb)
-#endif
-int unknown_layouts;
-int unknown_tokens;
+ if (token.empty())
+ continue;
-} // anon
+ 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
// changed to be public and have one parameter
// if par = 0 normal behavior
// else insert behavior
-// Returns false if "\the_end" is not read for formats >= 2.13. (Asger)
-bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par)
-{
- unknown_layouts = 0;
- unknown_tokens = 0;
-#ifndef NO_COMPABILITY
- ert_comp.contents.erase();
- ert_comp.active = false;
- ert_comp.fromlayout = false;
- ert_comp.in_tabular = false;
-#endif
- int pos = 0;
+// Returns false if "\the_end" is not read (Asger)
+bool Buffer::readBody(LyXLex & lex, ParagraphList::iterator pit)
+{
+ int unknown_tokens = 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 0
- if (file_format < 216 && params.language->lang() == "hebrew")
- font.setLanguage(default_language);
+ 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
-
- if (!par) {
- par = new Paragraph;
- par->layout(params.getLyXTextClass().defaultLayout());
+ 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;
+ << 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);
+ }
- paragraph = 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();
}
- Alert::alert(_("Textclass Loading Error!"), s,
- _("When reading " + fileName()));
- }
-
- if (unknown_tokens > 0) {
+#else
string s = _("Encountered ");
if (unknown_tokens == 1) {
s += _("one unknown token");
s += tostr(unknown_tokens);
s += _(" unknown tokens");
}
- Alert::alert(_("Textclass Loading Error!"), s,
- _("When reading " + fileName()));
+ Alert::warning(_("Document format failure"), s);
+#endif
}
return the_end_read;
}
-#ifndef NO_COMPABILITY
-
-Inset * Buffer::isErtInset(Paragraph * par, int pos) const
+int
+Buffer::readParagraph(LyXLex & lex, string const & token,
+ ParagraphList & pars, ParagraphList::iterator & pit,
+ Paragraph::depth_type & depth)
{
- Inset * inset;
- if ((par->getChar(pos) == Paragraph::META_INSET) &&
- (inset = par->getInset(pos)) &&
- (inset->lyxCode() == Inset::ERT_CODE))
- {
- return inset;
- }
- return 0;
-}
-
-void Buffer::insertErtContents(Paragraph * par, int & pos, bool set_inactive)
-{
- if (ert_comp.contents.find_first_not_of(' ') != string::npos) {
- // we only skip completely empty ERT (only spaces) otherwise
- // we have to insert it as is.
- string str(ert_comp.contents);
- lyxerr[Debug::INSETS] << "ERT contents:\n'"
- << str << "'" << endl;
- // check if we have already an ert inset a position earlier
- // if this is the case then we should insert the contents
- // inside the other ertinset as it is stupid to have various
- // ert in a row.
- Inset * inset;
- if ((pos > 0) && (inset=isErtInset(par, pos-1))) {
- // get the last paragraph from the inset before
- Paragraph * last = inset->firstParagraph();
- while(last->next())
- last = last->next();
- // create the new paragraph after the last one
- Paragraph * par = new Paragraph(last);
- par->layout(params.getLyXTextClass().defaultLayoutName());
- par->setInsetOwner(last->inInset());
- // set the contents
- LyXFont font(LyXFont::ALL_INHERIT, params.language);
- string::const_iterator cit = str.begin();
- string::const_iterator end = str.end();
- pos_type pos = 0;
- for (; cit != end; ++cit) {
- par->insertChar(pos++, *cit, font);
- }
- } else {
- Inset * inset =
- new InsetERT(params, params.language, str, true);
- par->insertInset(pos++, inset, ert_comp.font);
- }
- }
- ert_comp.contents.erase();
- ert_comp.fromlayout = false;
- if (set_inactive) {
- ert_comp.active = false;
- }
-}
-#endif
-
-
-bool
-Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
- Paragraph *& first_par,
- string const & token, int & pos,
- Paragraph::depth_type & depth,
- LyXFont & font
- )
-{
- bool the_end_read = false;
-#ifndef NO_COMPABILITY
-#ifndef NO_PEXTRA_REALLY
- // This is super temporary but is needed to get the compability
- // mode for minipages work correctly together with new tabulars.
- static int call_depth;
- ++call_depth;
- bool checkminipage = false;
- static Paragraph * minipar = 0;
- static Paragraph * parBeforeMinipage;
-#endif
-#endif
-
- // 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] != '\\') {
-#ifndef NO_COMPABILITY
- if (ert_comp.active) {
- ert_comp.contents += token;
- } else {
-#endif
- for (string::const_iterator cit = token.begin();
- cit != token.end(); ++cit) {
- par->insertChar(pos, (*cit), font);
- ++pos;
- }
-#ifndef NO_COMPABILITY
- }
-#endif
- } else if (token == "\\layout") {
-#ifndef NO_COMPABILITY
- bool old_fromlayout = ert_comp.fromlayout;
- bool create_new_par = true;
- ert_comp.in_tabular = false;
- // Do the insetert.
- if (!par->size() && par->previous() &&
- (par->previous()->size() == 1) &&
- isErtInset(par->previous(), par->previous()->size()-1))
- {
- int p = par->previous()->size();
- insertErtContents(par->previous(), p);
- create_new_par = false;
- } else {
- insertErtContents(par, pos);
- }
-#endif
- // 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);
-
-#if 0
- if (file_format < 216 && params.language->lang() == "hebrew")
- font.setLanguage(default_language);
-#endif
-
- lex.eatLine();
- string layoutname = lex.getString();
-
- LyXTextClass const & tclass = params.getLyXTextClass();
-
- if (layoutname.empty()) {
- layoutname = tclass.defaultLayoutName();
- }
-#ifndef NO_COMPABILITY
- if (compare_ascii_no_case(layoutname, "latex") == 0) {
- ert_comp.active = true;
- ert_comp.fromlayout = true;
- ert_comp.font = font;
- if (old_fromlayout)
- create_new_par = false;
- }
-#endif
- 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();
- }
-
-#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;
- }
- }
-
- 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
-#ifndef NO_COMPABILITY
- if (create_new_par) {
-#endif
- if (!first_par)
- first_par = par;
- else {
- par = new Paragraph(par);
- par->layout(params.getLyXTextClass().defaultLayout());
- }
- 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);
-#ifndef NO_COMPABILITY
- } else {
- // we duplicate code here because it's easier to remove
- // the code then of NO_COMPATIBILITY
- par->layout(layoutname);
- // Test whether the layout is obsolete.
- LyXLayout_ptr const & layout =
- params.getLyXTextClass()[par->layout()];
- if (!layout->obsoleted_by().empty())
- par->layout(layout->obsoleted_by());
- par->params().depth(depth);
- }
-#endif
-#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") {
-#ifndef NO_COMPABILITY
- insertErtContents(par, pos, false);
- ert_stack.push(ert_comp);
- ert_comp = ErtComp();
-#endif
- readInset(lex, par, pos, font);
-#ifndef NO_COMPABILITY
- ert_comp = ert_stack.top();
- ert_stack.pop();
- insertErtContents(par, pos);
-#endif
- } 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());
-#ifndef NO_COMPABILITY
- } else if (token == "\\latex") {
- lex.next();
- string const tok = lex.getString();
- if (tok == "no_latex") {
- // Do the insetert.
- insertErtContents(par, pos);
- } else if (tok == "latex") {
- ert_comp.active = true;
- ert_comp.font = font;
- } else if (tok == "default") {
- // Do the insetert.
- insertErtContents(par, pos);
- } else {
- lex.printError("Unknown LaTeX font flag "
- "`$$Token'");
- }
-#endif
- } 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 next_token = lex.getString();
- if (next_token == "\\-") {
- par->insertChar(pos, '-', font);
- } else if (next_token == "\\protected_separator"
- || next_token == "~") {
- par->insertChar(pos, ' ', font);
- } 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);
- }
- ++pos;
- } else if (token == "\\i") {
- Inset * inset = new InsetLatexAccent;
- inset->read(this, lex);
- par->insertInset(pos, inset, font);
- ++pos;
- } else if (token == "\\backslash") {
-#ifndef NO_COMPABILITY
- if (ert_comp.active) {
- ert_comp.contents += "\\";
- } else {
-#endif
- par->insertChar(pos, '\\', font);
- ++pos;
-#ifndef NO_COMPABILITY
- }
-#endif
-#ifndef NO_COMPABILITY
- } else if (token == "\\begin_float") {
- insertErtContents(par, pos);
- //insertErtContents(par, pos, false);
- //ert_stack.push(ert_comp);
- //ert_comp = ErtComp();
-
- // This is the compability reader. It can be removed in
- // LyX version 1.3.0. (Lgb)
- lex.next();
- string const tmptok = lex.getString();
- //lyxerr << "old float: " << tmptok << endl;
-
- Inset * inset = 0;
- stringstream old_float;
-
- if (tmptok == "footnote") {
- inset = new InsetFoot(params);
- old_float << "collapsed true\n";
- } else if (tmptok == "margin") {
- inset = new InsetMarginal(params);
- old_float << "collapsed true\n";
- } else if (tmptok == "fig") {
- inset = new InsetFloat(params, "figure");
- old_float << "wide false\n"
- << "collapsed false\n";
- } else if (tmptok == "tab") {
- inset = new InsetFloat(params, "table");
- old_float << "wide false\n"
- << "collapsed false\n";
- } else if (tmptok == "alg") {
- inset = new InsetFloat(params, "algorithm");
- old_float << "wide false\n"
- << "collapsed false\n";
- } else if (tmptok == "wide-fig") {
- inset = new InsetFloat(params, "figure");
- //InsetFloat * tmp = new InsetFloat("figure");
- //tmp->wide(true);
- //inset = tmp;
- old_float << "wide true\n"
- << "collapsed false\n";
- } else if (tmptok == "wide-tab") {
- inset = new InsetFloat(params, "table");
- //InsetFloat * tmp = new InsetFloat("table");
- //tmp->wide(true);
- //inset = tmp;
- old_float << "wide true\n"
- << "collapsed false\n";
- }
-
- if (!inset) {
-#ifndef NO_PEXTRA_REALLY
- --call_depth;
-#endif
- return false; // no end read yet
- }
-
- // Here we need to check for \end_deeper and handle that
- // before we do the footnote parsing.
- // This _is_ a hack! (Lgb)
- while (true) {
- lex.next();
- string const tmp = lex.getString();
- if (tmp == "\\end_deeper") {
- //lyxerr << "\\end_deeper caught!" << endl;
- if (!depth) {
- lex.printError("\\end_deeper: "
- "depth is already null");
- } else
- --depth;
-
- } else {
- old_float << tmp << ' ';
- break;
- }
- }
-
- old_float << lex.getLongString("\\end_float")
- << "\n\\end_inset\n";
- //lyxerr << "Float Body:\n" << old_float.str() << endl;
- // That this does not work seems like a bug
- // in stringstream. (Lgb)
- istringstream istr(old_float.str());
- LyXLex nylex(0, 0);
- nylex.setStream(istr);
- inset->read(this, nylex);
- par->insertInset(pos, inset, font);
- ++pos;
- insertErtContents(par, pos);
-
- // we have to reset the font as in the old format after a float
- // the font was automatically reset!
- font = LyXFont(LyXFont::ALL_INHERIT, params.language);
-#endif
+ static Change current_change;
+ int unknown = 0;
+
+ if (token == "\\layout") {
+ lex.pushToken(token);
+
+ 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);
+
+ // FIXME: goddamn InsetTabular makes us pass a Buffer
+ // not BufferParams
+ unknown += ::readParagraph(*this, *par, lex);
+
+ // 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 {
- Alert::alert(string(_("Textclass error")),
- string(_("The document uses an unknown textclass \"")) +
- lex.getString() + string("\"."),
- string(_("LyX will not be able to produce output correctly.")));
- 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
- Alert::alert(_("Textclass Loading Error!"),
- string(_("Can't load textclass ")) +
- params.getLyXTextClass().name(),
- _("-- substituting default"));
- 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());
-#ifndef NO_COMPABILITY
- } else if (token == "\\epsfig") { // obsolete
- // Indeed it is obsolete, but we HAVE to be backwards
- // compatible until 0.14, because otherwise all figures
- // in existing documents are irretrivably lost. (Asger)
- params.readGraphicsDriver(lex);
-#endif
- } 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 == "\\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();
- } 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'");
- }
- } 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);
-#ifndef NO_COMPABILITY
-#ifndef NO_PEXTRA_REALLY
- } else if (token == "\\pextra_type") {
- lex.nextToken();
- par->params().pextraType(lex.getInteger());
- } else if (token == "\\pextra_width") {
- lex.nextToken();
- par->params().pextraWidth(lex.getString());
- } else if (token == "\\pextra_widthp") {
- lex.nextToken();
- par->params().pextraWidthp(lex.getString());
- } else if (token == "\\pextra_alignment") {
- lex.nextToken();
- par->params().pextraAlignment(lex.getInteger());
- } else if (token == "\\pextra_hfill") {
- lex.nextToken();
- par->params().pextraHfill(lex.getInteger());
- } else if (token == "\\pextra_start_minipage") {
- lex.nextToken();
- par->params().pextraStartMinipage(lex.getInteger());
-#endif
-#endif
- } else if (token == "\\labelwidthstring") {
- lex.eatLine();
- par->params().labelWidthString(lex.getString());
- // do not delete this token, it is still needed!
- } else if (token == "\\newline") {
-#ifndef NO_COMPABILITY
- if (!ert_comp.in_tabular && ert_comp.active) {
- ert_comp.contents += char(Paragraph::META_NEWLINE);
+ lex.printError("\\end_deeper: " "depth is already null");
} else {
- // Since we cannot know it this is only a regular
- // newline or a tabular cell delimter we have to
- // handle the ERT here.
- insertErtContents(par, pos, false);
-
- par->insertChar(pos, Paragraph::META_NEWLINE, font);
- ++pos;
- }
-#else
- par->insertChar(pos, Paragraph::META_NEWLINE, font);
- ++pos;
-#endif
- } else if (token == "\\LyXTable") {
-#ifndef NO_COMPABILITY
- ert_comp.in_tabular = true;
-#endif
- Inset * inset = new InsetTabular(*this);
- inset->read(this, lex);
- par->insertInset(pos, inset, font);
- ++pos;
- } else if (token == "\\hfill") {
- par->insertChar(pos, Paragraph::META_HFILL, font);
- ++pos;
- } else if (token == "\\protected_separator") { // obsolete
- // This is a backward compability thingie. (Lgb)
- // Remove it later some time...introduced with fileformat
- // 2.16. (Lgb)
- LyXLayout_ptr const & layout = par->layout();
-
- if (layout->free_spacing || par->isFreeSpacing()) {
- par->insertChar(pos, ' ', font);
- } else {
- Inset * inset = new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
- par->insertInset(pos, inset, font);
- }
- ++pos;
- } else if (token == "\\bibitem") { // ale970302
- if (!par->bibkey) {
- InsetCommandParams p("bibitem", "dummy");
- par->bibkey = new InsetBibKey(p);
+ --depth;
}
- par->bibkey->read(this, lex);
- } else if (token == "\\the_end") {
-#ifndef NO_COMPABILITY
- // If we still have some ert active here we have to insert
- // it so we don't loose it. (Lgb)
- insertErtContents(par, pos);
-#endif
- the_end_read = true;
-#ifndef NO_COMPABILITY
-#ifndef NO_PEXTRA_REALLY
- if (minipar == par)
- par = 0;
- minipar = parBeforeMinipage = 0;
-#endif
-#endif
} else {
-#ifndef NO_COMPABILITY
- if (ert_comp.active) {
- ert_comp.contents += token;
- } else {
-#endif
- // This should be insurance for the future: (Asger)
- ++unknown_tokens;
- lex.eatLine();
- string const s = _("Unknown token: ") + token
- + " " + lex.text() + "\n";
- // 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));
-
-#ifndef NO_COMPABILITY
- }
-#endif
+ ++unknown;
}
-
-#ifndef NO_COMPABILITY
-#ifndef NO_PEXTRA_REALLY
- // I wonder if we could use this blanket fix for all the
- // checkminipage cases...
- // don't forget about ert paragraphs and compatibility read for'em
- if (par && (par->size() || !ert_comp.contents.empty())) {
- // It is possible that this will check to often,
- // but that should not be an correctness issue.
- // Only a speed issue.
- checkminipage = true;
- }
-
- // now check if we have a minipage paragraph as at this
- // point we already read all the necessary data!
- // this cannot be done in layout because there we did
- // not read yet the paragraph PEXTRA-params (Jug)
- //
- // BEGIN pextra_minipage compability
- // This should be removed in 1.3.x (Lgb)
- // I don't think we should remove this so fast (Jug)
-
- // This compability code is not perfect. In a couple
- // of rand cases it fails. When the minipage par is
- // the first par in the document, and when there are
- // none or only one regular paragraphs after the
- // minipage. Currently I am not investing any effort
- // in fixing those cases.
-
-// lyxerr << "Call depth: " << call_depth << endl;
-// lyxerr << "Checkminipage: " << checkminipage << endl;
-
- if (checkminipage && (call_depth == 1)) {
- checkminipage = false;
- if (minipar && (minipar != par) &&
- (par->params().pextraType() == Paragraph::PEXTRA_MINIPAGE)) {
- lyxerr << "minipages in a row" << endl;
- if (par->params().pextraStartMinipage()) {
- lyxerr << "start new minipage" << endl;
- // minipages in a row
- par->previous()->next(0);
- par->previous(0);
-
- Paragraph * tmp = minipar;
- while (tmp) {
- tmp->params().pextraType(0);
- tmp->params().pextraWidth(string());
- tmp->params().pextraWidthp(string());
- tmp->params().pextraAlignment(0);
- tmp->params().pextraHfill(false);
- tmp->params().pextraStartMinipage(false);
- tmp = tmp->next();
- }
- // create a new paragraph to insert the
- // minipages in the following case
- if (par->params().pextraStartMinipage() &&
- !par->params().pextraHfill()) {
- Paragraph * p = new Paragraph;
- p->layout(params.getLyXTextClass().defaultLayoutName());
-
- p->previous(parBeforeMinipage);
- parBeforeMinipage->next(p);
- p->next(0);
- p->params().depth(parBeforeMinipage->params().depth());
- parBeforeMinipage = p;
- }
- InsetMinipage * mini = new InsetMinipage(params);
- mini->pos(static_cast<InsetMinipage::Position>(par->params().pextraAlignment()));
- mini->pageWidth(LyXLength(par->params().pextraWidth()));
- if (!par->params().pextraWidthp().empty()) {
- lyxerr << "WP:" << mini->pageWidth().asString() << endl;
- mini->pageWidth(LyXLength((par->params().pextraWidthp())+"col%"));
- }
- Paragraph * op = mini->firstParagraph();
- mini->inset.paragraph(par);
- //
- // and free the old ones!
- //
- while(op) {
- Paragraph * pp = op->next();
- delete op;
- op = pp;
- }
- // Insert the minipage last in the
- // previous paragraph.
- if (par->params().pextraHfill()) {
- parBeforeMinipage->insertChar
- (parBeforeMinipage->size(),
- Paragraph::META_HFILL, font);
- }
- parBeforeMinipage->insertInset
- (parBeforeMinipage->size(), mini, font);
-
- minipar = par;
- } else {
- lyxerr << "new minipage par" << endl;
- //nothing to do just continue reading
- }
-
- } else if (minipar && (minipar != par)) {
- lyxerr << "last minipage par read" << endl;
- // The last paragraph read was not part of a
- // minipage but the par linked list is...
- // So we need to remove the last par from the
- // rest
- if (par->previous())
- par->previous()->next(0);
- par->previous(parBeforeMinipage);
- parBeforeMinipage->next(par);
- Paragraph * tmp = minipar;
- while (tmp) {
- tmp->params().pextraType(0);
- tmp->params().pextraWidth(string());
- tmp->params().pextraWidthp(string());
- tmp->params().pextraAlignment(0);
- tmp->params().pextraHfill(false);
- tmp->params().pextraStartMinipage(false);
- tmp = tmp->next();
- }
- depth = parBeforeMinipage->params().depth();
- // and set this depth on the par as it has not been set already
- par->params().depth(depth);
- minipar = parBeforeMinipage = 0;
- } else if (!minipar &&
- (par->params().pextraType() == Paragraph::PEXTRA_MINIPAGE)) {
- // par is the first paragraph in a minipage
- lyxerr << "begin minipage" << endl;
- // To minimize problems for
- // the users we will insert
- // the first minipage in
- // a sequence of minipages
- // in its own paragraph.
- Paragraph * p = new Paragraph;
- p->layout(params.getLyXTextClass().defaultLayoutName());
- p->previous(par->previous());
- p->next(0);
- p->params().depth(depth);
- par->params().depth(0);
- depth = 0;
- if (par->previous())
- par->previous()->next(p);
- par->previous(0);
- parBeforeMinipage = p;
- minipar = par;
- if (!first_par || (first_par == par))
- first_par = p;
-
- InsetMinipage * mini = new InsetMinipage(params);
- mini->pos(static_cast<InsetMinipage::Position>(minipar->params().pextraAlignment()));
- mini->pageWidth(LyXLength(minipar->params().pextraWidth()));
- if (!par->params().pextraWidthp().empty()) {
- lyxerr << "WP:" << mini->pageWidth().asString() << endl;
- mini->pageWidth(LyXLength((par->params().pextraWidthp())+"col%"));
- }
-
- Paragraph * op = mini->firstParagraph();
- mini->inset.paragraph(minipar);
- //
- // and free the old ones!
- //
- while(op) {
- Paragraph * pp = op->next();
- delete op;
- op = pp;
- }
-
- // Insert the minipage last in the
- // previous paragraph.
- if (minipar->params().pextraHfill()) {
- parBeforeMinipage->insertChar
- (parBeforeMinipage->size(),
- Paragraph::META_HFILL, font);
- }
- parBeforeMinipage->insertInset
- (parBeforeMinipage->size(), mini, font);
- } else if (par->params().pextraType() == Paragraph::PEXTRA_INDENT) {
- par->params().leftIndent(LyXLength(par->params().pextraWidth()));
- if (!par->params().pextraWidthp().empty()) {
- par->params().leftIndent(LyXLength((par->params().pextraWidthp())+"col%"));
- }
- }
- }
- // End of pextra_minipage compability
- --call_depth;
-#endif
-#endif
- 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();
for(string::const_iterator cit = str.begin();
cit != str.end(); ++cit) {
if (*cit == '\n') {
- if (autobreakrows && (par->size() || layout->keepempty)) {
- par->breakParagraph(params, pos,
- layout->isEnvironment());
- par = par->next();
+ if (autobreakrows && (!par->empty() || layout->keepempty)) {
+ breakParagraph(params, paragraphs, par, pos,
+ layout->isEnvironment());
+ ++par;
pos = 0;
space_inserted = true;
} else {
}
-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());
+
+ // 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;
+}
- Inset * inset = 0;
+
+// 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 InsetBibKey(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 == "Minipage") {
- inset = new InsetMinipage(params);
- } else if (tmptok == "Float") {
- lex.next();
- string tmptok = lex.getString();
- inset = new InsetFloat(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);
- ++pos;
- }
-}
-
-
-bool Buffer::readFile(LyXLex & lex, 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);
- if (file_format == LYX_FORMAT) {
- // current format
- } else if (file_format > LYX_FORMAT) {
- // future format
- Alert::alert(_("Warning!"),
- _("LyX file format is newer that what"),
- _("is supported in this LyX version. Expect some 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 (file_format < 220) {
- string const command = "lyx2lyx "
- + QuoteName(filename_);
- cmd_ret const ret = RunCommand(command);
- if (ret.first) {
- Alert::alert(_("ERROR!"),
- _("An error occured while "
- "running the conversion script."));
- return false;
- }
- istringstream is(ret.second);
- LyXLex tmplex(0, 0);
- tmplex.setStream(is);
- return readFile(tmplex);
- }
- }
- 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;
+ }
-#if 0
- // the_end was added in 213
- if (file_format < 213)
- the_end = true;
-#endif
+ // 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"));
- }
- return true;
- } else { // "\\lyxformat" not found
- Alert::alert(_("ERROR!"), _("Not a LyX file!"));
+ 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;
+ }
+ 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);
+ ofs << "\\end_header\n";
+
Paragraph::depth_type depth = 0;
// this will write out all the paragraphs
// using recursive descent.
- paragraph->writeFile(this, ofs, params, depth);
+ ParagraphList::iterator pit = paragraphs.begin();
+ ParagraphList::iterator pend = paragraphs.end();
+ for (; pit != pend; ++pit)
+ pit->write(this, ofs, params, depth);
// Write marker that shows file is complete
ofs << "\n\\the_end" << endl;
}
-string const Buffer::asciiParagraph(Paragraph const * par,
+string const Buffer::asciiParagraph(Paragraph const & par,
unsigned int linelen,
bool noparbreak) const
{
}
}
#else
- depth = par->params().depth();
+ depth = par.params().depth();
#endif
// First write the layout
- string const & tmp = par->layout()->name();
+ string const & tmp = par.layout()->name();
if (compare_no_case(tmp, "itemize") == 0) {
ltype = 1;
ltype_depth = depth + 1;
/* noindent ? */
/* what about the alignment */
-// } else {
-// lyxerr << "Should this ever happen?" << endl;
-// }
- // linelen <= 0 is special and means we don't have pargraph breaks
+ // linelen <= 0 is special and means we don't have paragraph breaks
string::size_type currlinelen = 0;
break;
default:
{
- string const parlab = par->params().labelString();
- buffer << parlab << " ";
+ string const parlab = par.params().labelString();
+ buffer << parlab << ' ';
currlinelen += parlab.length() + 1;
}
break;
// this is to change the linebreak to do it by word a bit more
// intelligent hopefully! (only in the case where we have a
- // max linelenght!) (Jug)
+ // max linelength!) (Jug)
string word;
- for (pos_type i = 0; i < par->size(); ++i) {
- char c = par->getUChar(params, i);
+ for (pos_type i = 0; i < par.size(); ++i) {
+ char c = par.getUChar(params, i);
switch (c) {
case Paragraph::META_INSET:
{
- Inset const * inset = par->getInset(i);
+ Inset const * inset = par.getInset(i);
if (inset) {
if (linelen > 0) {
buffer << word;
}
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;
}
}
}
buffer << word;
- return buffer.str().c_str();
+ return STRCONV(buffer.str());
}
{
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);
}
-void Buffer::writeFileAscii(ostream & ofs, int linelen)
+void Buffer::writeFileAscii(ostream & os, int linelen)
{
- Paragraph * par = paragraph;
- while (par) {
- ofs << asciiParagraph(par, linelen, par->previous() == 0);
- par = par->next();
+ ParagraphList::iterator beg = paragraphs.begin();
+ ParagraphList::iterator end = paragraphs.end();
+ ParagraphList::iterator it = beg;
+ for (; it != end; ++it) {
+ os << asciiParagraph(*it, linelen, it == beg);
}
- ofs << "\n";
+ os << "\n";
}
-bool use_babel;
-
void Buffer::makeLaTeXFile(string const & fname,
string const & original_path,
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;
}
void Buffer::makeLaTeXFile(ostream & os,
string const & original_path,
- bool nice, bool only_body, bool only_preamble)
-{
- niceFile = nice; // this will be used by Insetincludes.
-
- tex_code_break_column = lyxrc.ascii_linelen;
-
- // validate the buffer.
- lyxerr[Debug::LATEX] << " Validating buffer..." << endl;
- LaTeXFeatures features(params);
- validate(features);
- lyxerr[Debug::LATEX] << " Buffer validation done." << endl;
-
- texrow.reset();
- // The starting paragraph of the coming rows is the
- // first paragraph of the document. (Asger)
- texrow.start(paragraph, 0);
-
- if (!only_body && nice) {
- os << "%% " << lyx_docversion << " created this file. "
- "For more info, see http://www.lyx.org/.\n"
- "%% Do not edit unless you really know what "
- "you are doing.\n";
- texrow.newline();
- texrow.newline();
- }
- lyxerr[Debug::INFO] << "lyx header finished" << endl;
- // There are a few differences between nice LaTeX and usual files:
- // usual is \batchmode and has a
- // special input@path to allow the including of figures
- // with either \input or \includegraphics (what figinsets do).
- // batchmode is not set if there is a tex_code_break_column.
- // In this case somebody is interested in the generated LaTeX,
- // so this is OK. input@path is set when the actual parameter
- // original_path is set. This is done for usual tex-file, but not
- // for nice-latex-file. (Matthias 250696)
- if (!only_body) {
- if (!nice) {
- // code for usual, NOT nice-latex-file
- os << "\\batchmode\n"; // changed
- // from \nonstopmode
- texrow.newline();
- }
- if (!original_path.empty()) {
- string inputpath = os::external_path(original_path);
- subst(inputpath, "~", "\\string~");
- os << "\\makeatletter\n"
- << "\\def\\input@path{{"
- << inputpath << "/}}\n"
- << "\\makeatother\n";
- texrow.newline();
- texrow.newline();
- texrow.newline();
- }
-
- os << "\\documentclass";
-
- LyXTextClass const & tclass = params.getLyXTextClass();
-
- ostringstream options; // the document class options.
-
- if (tokenPos(tclass.opt_fontsize(),
- '|', params.fontsize) >= 0) {
- // only write if existing in list (and not default)
- options << params.fontsize << "pt,";
- }
-
-
- if (!params.use_geometry &&
- (params.paperpackage == BufferParams::PACKAGE_NONE)) {
- switch (params.papersize) {
- case BufferParams::PAPER_A4PAPER:
- options << "a4paper,";
- break;
- case BufferParams::PAPER_USLETTER:
- options << "letterpaper,";
- break;
- case BufferParams::PAPER_A5PAPER:
- options << "a5paper,";
- break;
- case BufferParams::PAPER_B5PAPER:
- options << "b5paper,";
- break;
- case BufferParams::PAPER_EXECUTIVEPAPER:
- options << "executivepaper,";
- break;
- case BufferParams::PAPER_LEGALPAPER:
- options << "legalpaper,";
- break;
- }
- }
-
- // if needed
- if (params.sides != tclass.sides()) {
- switch (params.sides) {
- case LyXTextClass::OneSide:
- options << "oneside,";
- break;
- case LyXTextClass::TwoSides:
- options << "twoside,";
- break;
- }
- }
-
- // if needed
- if (params.columns != tclass.columns()) {
- if (params.columns == 2)
- options << "twocolumn,";
- else
- options << "onecolumn,";
- }
-
- if (!params.use_geometry
- && params.orientation == BufferParams::ORIENTATION_LANDSCAPE)
- options << "landscape,";
-
- // language should be a parameter to \documentclass
- use_babel = false;
- ostringstream language_options;
- if (params.language->babel() == "hebrew"
- && default_language->babel() != "hebrew")
- // This seems necessary
- features.useLanguage(default_language);
-
- if (lyxrc.language_use_babel ||
- params.language->lang() != lyxrc.default_language ||
- features.hasLanguages()) {
- use_babel = true;
- language_options << features.getLanguages();
- language_options << params.language->babel();
- if (lyxrc.language_global_options)
- options << language_options.str() << ',';
- }
-
- // the user-defined options
- if (!params.options.empty()) {
- options << params.options << ',';
- }
-
- string strOptions(options.str().c_str());
- if (!strOptions.empty()) {
- strOptions = rtrim(strOptions, ",");
- os << '[' << strOptions << ']';
- }
-
- os << '{' << tclass.latexname() << "}\n";
- texrow.newline();
- // end of \documentclass defs
-
- // font selection must be done before loading fontenc.sty
- // The ae package is not needed when using OT1 font encoding.
- if (params.fonts != "default" &&
- (params.fonts != "ae" || lyxrc.fontenc != "default")) {
- os << "\\usepackage{" << params.fonts << "}\n";
- texrow.newline();
- if (params.fonts == "ae") {
- os << "\\usepackage{aecompl}\n";
- texrow.newline();
- }
- }
- // this one is not per buffer
- if (lyxrc.fontenc != "default") {
- os << "\\usepackage[" << lyxrc.fontenc
- << "]{fontenc}\n";
- texrow.newline();
- }
-
- if (params.inputenc == "auto") {
- string const doc_encoding =
- params.language->encoding()->LatexName();
-
- // Create a list with all the input encodings used
- // in the document
- set<string> encodings = features.getEncodingSet(doc_encoding);
-
- os << "\\usepackage[";
- std::copy(encodings.begin(), encodings.end(),
- std::ostream_iterator<string>(os, ","));
- os << doc_encoding << "]{inputenc}\n";
- texrow.newline();
- } else if (params.inputenc != "default") {
- os << "\\usepackage[" << params.inputenc
- << "]{inputenc}\n";
- texrow.newline();
- }
-
- // At the very beginning the text parameters.
- if (params.paperpackage != BufferParams::PACKAGE_NONE) {
- switch (params.paperpackage) {
- case BufferParams::PACKAGE_A4:
- os << "\\usepackage{a4}\n";
- texrow.newline();
- break;
- case BufferParams::PACKAGE_A4WIDE:
- os << "\\usepackage{a4wide}\n";
- texrow.newline();
- break;
- case BufferParams::PACKAGE_WIDEMARGINSA4:
- os << "\\usepackage[widemargins]{a4}\n";
- texrow.newline();
- break;
- }
- }
- if (params.use_geometry) {
- os << "\\usepackage{geometry}\n";
- texrow.newline();
- os << "\\geometry{verbose";
- if (params.orientation == BufferParams::ORIENTATION_LANDSCAPE)
- os << ",landscape";
- switch (params.papersize2) {
- case BufferParams::VM_PAPER_CUSTOM:
- if (!params.paperwidth.empty())
- os << ",paperwidth="
- << params.paperwidth;
- if (!params.paperheight.empty())
- os << ",paperheight="
- << params.paperheight;
- break;
- case BufferParams::VM_PAPER_USLETTER:
- os << ",letterpaper";
- break;
- case BufferParams::VM_PAPER_USLEGAL:
- os << ",legalpaper";
- break;
- case BufferParams::VM_PAPER_USEXECUTIVE:
- os << ",executivepaper";
- break;
- case BufferParams::VM_PAPER_A3:
- os << ",a3paper";
- break;
- case BufferParams::VM_PAPER_A4:
- os << ",a4paper";
- break;
- case BufferParams::VM_PAPER_A5:
- os << ",a5paper";
- break;
- case BufferParams::VM_PAPER_B3:
- os << ",b3paper";
- break;
- case BufferParams::VM_PAPER_B4:
- os << ",b4paper";
- break;
- case BufferParams::VM_PAPER_B5:
- os << ",b5paper";
- break;
- default:
- // default papersize ie BufferParams::VM_PAPER_DEFAULT
- switch (lyxrc.default_papersize) {
- case BufferParams::PAPER_DEFAULT: // keep compiler happy
- case BufferParams::PAPER_USLETTER:
- os << ",letterpaper";
- break;
- case BufferParams::PAPER_LEGALPAPER:
- os << ",legalpaper";
- break;
- case BufferParams::PAPER_EXECUTIVEPAPER:
- os << ",executivepaper";
- break;
- case BufferParams::PAPER_A3PAPER:
- os << ",a3paper";
- break;
- case BufferParams::PAPER_A4PAPER:
- os << ",a4paper";
- break;
- case BufferParams::PAPER_A5PAPER:
- os << ",a5paper";
- break;
- case BufferParams::PAPER_B5PAPER:
- os << ",b5paper";
- break;
- }
- }
- if (!params.topmargin.empty())
- os << ",tmargin=" << params.topmargin;
- if (!params.bottommargin.empty())
- os << ",bmargin=" << params.bottommargin;
- if (!params.leftmargin.empty())
- os << ",lmargin=" << params.leftmargin;
- if (!params.rightmargin.empty())
- os << ",rmargin=" << params.rightmargin;
- if (!params.headheight.empty())
- os << ",headheight=" << params.headheight;
- if (!params.headsep.empty())
- os << ",headsep=" << params.headsep;
- if (!params.footskip.empty())
- os << ",footskip=" << params.footskip;
- os << "}\n";
- texrow.newline();
- }
-
- if (tokenPos(tclass.opt_pagestyle(),
- '|', params.pagestyle) >= 0) {
- if (params.pagestyle == "fancy") {
- os << "\\usepackage{fancyhdr}\n";
- texrow.newline();
- }
- os << "\\pagestyle{" << params.pagestyle << "}\n";
- texrow.newline();
- }
-
- if (params.secnumdepth != tclass.secnumdepth()) {
- os << "\\setcounter{secnumdepth}{"
- << params.secnumdepth
- << "}\n";
- texrow.newline();
- }
- if (params.tocdepth != tclass.tocdepth()) {
- os << "\\setcounter{tocdepth}{"
- << params.tocdepth
- << "}\n";
- texrow.newline();
- }
-
- if (params.paragraph_separation) {
- switch (params.defskip.kind()) {
- case VSpace::SMALLSKIP:
- os << "\\setlength\\parskip{\\smallskipamount}\n";
- break;
- case VSpace::MEDSKIP:
- os << "\\setlength\\parskip{\\medskipamount}\n";
- break;
- case VSpace::BIGSKIP:
- os << "\\setlength\\parskip{\\bigskipamount}\n";
- break;
- case VSpace::LENGTH:
- os << "\\setlength\\parskip{"
- << params.defskip.length().asLatexString()
- << "}\n";
- break;
- default: // should never happen // Then delete it.
- os << "\\setlength\\parskip{\\medskipamount}\n";
- break;
- }
- texrow.newline();
-
- os << "\\setlength\\parindent{0pt}\n";
- texrow.newline();
- }
-
- // Now insert the LyX specific LaTeX commands...
-
- // The optional packages;
- string preamble(features.getPackages());
-
- // this might be useful...
- preamble += "\n\\makeatletter\n";
-
- // Some macros LyX will need
- string tmppreamble(features.getMacros());
-
- if (!tmppreamble.empty()) {
- preamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
- "LyX specific LaTeX commands.\n"
- + tmppreamble + '\n';
- }
-
- // the text class specific preamble
- tmppreamble = features.getTClassPreamble();
- if (!tmppreamble.empty()) {
- preamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
- "Textclass specific LaTeX commands.\n"
- + tmppreamble + '\n';
- }
-
- /* the user-defined preamble */
- if (!params.preamble.empty()) {
- preamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
- "User specified LaTeX commands.\n"
- + params.preamble + '\n';
- }
+ bool nice, bool only_body, bool only_preamble)
+{
+ niceFile = nice; // this will be used by Insetincludes.
- // Itemize bullet settings need to be last in case the user
- // defines their own bullets that use a package included
- // in the user-defined preamble -- ARRae
- // Actually it has to be done much later than that
- // since some packages like frenchb make modifications
- // at \begin{document} time -- JMarc
- string bullets_def;
- for (int i = 0; i < 4; ++i) {
- if (params.user_defined_bullets[i] != ITEMIZE_DEFAULTS[i]) {
- if (bullets_def.empty())
- bullets_def="\\AtBeginDocument{\n";
- bullets_def += " \\renewcommand{\\labelitemi";
- switch (i) {
- // `i' is one less than the item to modify
- case 0:
- break;
- case 1:
- bullets_def += 'i';
- break;
- case 2:
- bullets_def += "ii";
- break;
- case 3:
- bullets_def += 'v';
- break;
- }
- bullets_def += "}{" +
- params.user_defined_bullets[i].getText()
- + "}\n";
- }
- }
+ // validate the buffer.
+ lyxerr[Debug::LATEX] << " Validating buffer..." << endl;
+ LaTeXFeatures features(params);
+ validate(features);
+ lyxerr[Debug::LATEX] << " Buffer validation done." << endl;
- if (!bullets_def.empty())
- preamble += bullets_def + "}\n\n";
+ texrow.reset();
+ // The starting paragraph of the coming rows is the
+ // first paragraph of the document. (Asger)
+ texrow.start(&*(paragraphs.begin()), 0);
- int const nlines =
- int(lyx::count(preamble.begin(), preamble.end(), '\n'));
- for (int j = 0; j != nlines; ++j) {
+ if (!only_body && nice) {
+ os << "%% " << lyx_docversion << " created this file. "
+ "For more info, see http://www.lyx.org/.\n"
+ "%% Do not edit unless you really know what "
+ "you are doing.\n";
+ texrow.newline();
+ texrow.newline();
+ }
+ lyxerr[Debug::INFO] << "lyx header finished" << endl;
+ // There are a few differences between nice LaTeX and usual files:
+ // usual is \batchmode and has a
+ // special input@path to allow the including of figures
+ // with either \input or \includegraphics (what figinsets do).
+ // input@path is set when the actual parameter
+ // original_path is set. This is done for usual tex-file, but not
+ // for nice-latex-file. (Matthias 250696)
+ if (!only_body) {
+ if (!nice) {
+ // code for usual, NOT nice-latex-file
+ os << "\\batchmode\n"; // changed
+ // from \nonstopmode
texrow.newline();
}
-
- // We try to load babel late, in case it interferes
- // with other packages.
- if (use_babel) {
- string tmp = lyxrc.language_package;
- if (!lyxrc.language_global_options
- && tmp == "\\usepackage{babel}")
- tmp = string("\\usepackage[") +
- language_options.str().c_str() +
- "]{babel}";
- preamble += tmp + "\n";
- preamble += features.getBabelOptions();
+ if (!original_path.empty()) {
+ string inputpath = os::external_path(original_path);
+ subst(inputpath, "~", "\\string~");
+ os << "\\makeatletter\n"
+ << "\\def\\input@path{{"
+ << inputpath << "/}}\n"
+ << "\\makeatother\n";
+ texrow.newline();
+ texrow.newline();
+ texrow.newline();
}
- preamble += "\\makeatother\n";
-
- os << preamble;
+ // Write the preamble
+ params.writeLaTeX(os, features, texrow);
if (only_preamble)
return;
texrow.newline();
}
- latexParagraphs(os, paragraph, 0, texrow);
+ latexParagraphs(this, paragraphs, paragraphs.begin(), paragraphs.end(), os, texrow);
// add this just in case after all the paragraphs
os << endl;
// Just to be sure. (Asger)
texrow.newline();
- // tex_code_break_column's value is used to decide
- // if we are in batchmode or not (within mathed_write()
- // in math_write.C) so we must set it to a non-zero
- // value when we leave otherwise we save incorrect .lyx files.
- tex_code_break_column = lyxrc.ascii_linelen;
-
- lyxerr[Debug::INFO] << "Finished making latex file." << endl;
- lyxerr[Debug::INFO] << "Row count was " << texrow.rows()-1 << "." << endl;
+ lyxerr[Debug::INFO] << "Finished making LaTeX file." << endl;
+ lyxerr[Debug::INFO] << "Row count was " << texrow.rows() - 1
+ << '.' << endl;
// we want this to be true outside previews (for insetexternal)
niceFile = true;
}
-//
-// 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;
-
- // if only_body
- while (par != endpar) {
- Inset * in = par->inInset();
- // well we have to check if we are in an inset with unlimited
- // lenght (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
- was_title = true;
- } else if (was_title && !already_title) {
- ofs << "\\maketitle\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) {
- ofs << "\\maketitle\n";
- texrow.newline();
- }
-}
-
-
bool Buffer::isLatex() const
{
return params.getLyXTextClass().outputType() == LATEX;
}
-int Buffer::sgmlOpenTag(ostream & os, Paragraph::depth_type depth, bool mixcont,
- string const & latexname) const
-{
- if (!latexname.empty() && latexname != "!-- --") {
- if (!mixcont)
- os << string(" ",depth);
- os << "<" << latexname << ">";
- }
-
- if (!mixcont)
- os << endl;
-
- return mixcont?0:1;
-}
-
-
-int Buffer::sgmlCloseTag(ostream & os, Paragraph::depth_type depth, bool mixcont,
- string const & latexname) const
-{
- if (!latexname.empty() && latexname != "!-- --") {
- if (!mixcont)
- os << endl << string(" ",depth);
- os << "</" << latexname << ">";
- }
-
- if (!mixcont)
- os << endl;
-
- return mixcont?0:1;
-}
-
-
void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
{
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;
}
ofs << ">\n\n";
if (params.options.empty())
- sgmlOpenTag(ofs, 0, false, top_element);
+ sgml::openTag(ofs, 0, false, top_element);
else {
string top = top_element;
- top += " ";
+ top += ' ';
top += params.options;
- sgmlOpenTag(ofs, 0, false, top);
+ sgml::openTag(ofs, 0, false, top);
}
}
<< " -->\n";
Paragraph::depth_type depth = 0; // paragraph depth
- Paragraph * par = paragraph;
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";
- sgmlOpenTag(ofs, depth, false, temp);
-
- par = par->next();
+ sgml::openTag(ofs, depth, false, temp);
continue;
}
}
// environment tag closing
- for (; depth > par->params().depth(); --depth) {
- sgmlCloseTag(ofs, depth, false, environment_stack[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()) {
- sgmlCloseTag(ofs, depth, false, environment_stack[depth]);
+ sgml::closeTag(ofs, depth, false, environment_stack[depth]);
environment_stack[depth].erase();
if (depth)
--depth;
else
ofs << "</p>";
}
- sgmlOpenTag(ofs, depth, false, style->latexname());
+ sgml::openTag(ofs, depth, false, style->latexname());
break;
case LATEX_COMMAND:
- if (depth!= 0)
- sgmlError(par, 0,
- _("Error : Wrong depth for"
- " LatexType Command.\n"));
+ if (depth != 0)
+ sgmlError(&*pit, 0,
+ _("Error: Wrong depth for LatexType Command.\n"));
if (!environment_stack[depth].empty()) {
- sgmlCloseTag(ofs, depth, false, environment_stack[depth]);
+ sgml::closeTag(ofs, depth, false, environment_stack[depth]);
ofs << "</p>";
}
environment_stack[depth].erase();
- sgmlOpenTag(ofs, depth, false, style->latexname());
+ sgml::openTag(ofs, depth, false, style->latexname());
break;
case LATEX_ENVIRONMENT:
case LATEX_ITEM_ENVIRONMENT:
+ case LATEX_BIB_ENVIRONMENT:
{
string const & latexname = style->latexname();
- if (depth == par->params().depth()
+ if (depth == pit->params().depth()
&& environment_stack[depth] != latexname) {
- sgmlCloseTag(ofs, depth, false,
+ 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) {
if (depth == 0) {
- sgmlOpenTag(ofs, depth, false, "p");
+ sgml::openTag(ofs, depth, false, "p");
}
- sgmlOpenTag(ofs, depth, false, latexname);
+ sgml::openTag(ofs, depth, false, latexname);
if (environment_stack.size() == depth + 1)
environment_stack.push_back("!-- --");
else
item_name = "item";
- sgmlOpenTag(ofs, depth + 1, false, item_name);
+ sgml::openTag(ofs, depth + 1, false, item_name);
}
break;
default:
- sgmlOpenTag(ofs, depth, false, style->latexname());
+ sgml::openTag(ofs, depth, false, style->latexname());
break;
}
- simpleLinuxDocOnePar(ofs, par, depth);
-
- par = par->next();
+ simpleLinuxDocOnePar(ofs, &*pit, depth);
ofs << "\n";
// write closing SGML tags
break;
case LATEX_ENVIRONMENT:
case LATEX_ITEM_ENVIRONMENT:
+ case LATEX_BIB_ENVIRONMENT:
if (style->latexparam() == "CDATA")
ofs << "]]>";
break;
default:
- sgmlCloseTag(ofs, depth, false, style->latexname());
+ sgml::closeTag(ofs, depth, false, style->latexname());
break;
}
}
// Close open tags
for (int i = depth; i >= 0; --i)
- sgmlCloseTag(ofs, depth, false, environment_stack[i]);
+ sgml::closeTag(ofs, depth, false, environment_stack[i]);
if (!body_only) {
ofs << "\n\n";
- sgmlCloseTag(ofs, 0, false, top_element);
+ sgml::closeTag(ofs, 0, false, top_element);
}
ofs.close();
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) {
while (!tag_state.empty() && tag_close) {
PAR_TAG k = tag_state.top();
tag_state.pop();
- os << "</" << tag_name(k) << ">";
+ os << "</" << tag_name(k) << '>';
if (tag_close & k)
reset(tag_close,k);
else
for(list< PAR_TAG >::const_iterator j = temp.begin();
j != temp.end(); ++j) {
tag_state.push(*j);
- os << "<" << tag_name(*j) << ">";
+ os << '<' << tag_name(*j) << '>';
}
for(list< PAR_TAG >::const_iterator j = tag_open.begin();
j != tag_open.end(); ++j) {
tag_state.push(*j);
- os << "<" << tag_name(*j) << ">";
+ os << '<' << tag_name(*j) << '>';
}
char c = par->getChar(i);
os << c;
++char_line_count;
} else {
- string sgml_string;
- if (par->sgmlConvertChar(c, sgml_string)
- && !style->free_spacing && !par->isFreeSpacing())
- {
+ bool ws;
+ string str;
+ boost::tie(ws, str) = sgml::escapeChar(c);
+ if (ws && !style->free_spacing && !par->isFreeSpacing()) {
// in freespacing mode, spaces are
// non-breaking characters
if (desc_on) {// if char is ' ' then...
os << c;
}
} else {
- os << sgml_string;
- char_line_count += sgml_string.length();
+ os << str;
+ char_line_count += str.length();
}
}
font_old = font;
}
while (!tag_state.empty()) {
- os << "</" << tag_name(tag_state.top()) << ">";
+ os << "</" << tag_name(tag_state.top()) << '>';
tag_state.pop();
}
// 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 = paragraph;
-
niceFile = nice; // this will be used by Insetincludes.
LaTeXFeatures features(params);
string top = top_element;
top += " lang=\"";
top += params.language->code();
- top += "\"";
+ top += '"';
if (!params.options.empty()) {
- top += " ";
+ top += ' ';
top += params.options;
}
- sgmlOpenTag(ofs, 0, false, top);
+ sgml::openTag(ofs, 0, false, top);
ofs << "<!-- DocBook file was created by " << lyx_docversion
<< "\n See http://www.lyx.org/ for more information -->\n";
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;
for (; depth > par->params().depth(); --depth) {
if (environment_inner[depth] != "!-- --") {
item_name = "listitem";
- sgmlCloseTag(ofs, command_depth + depth, false, item_name);
+ sgml::closeTag(ofs, command_depth + depth, false, item_name);
if (environment_inner[depth] == "varlistentry")
- sgmlCloseTag(ofs, depth+command_depth, false, environment_inner[depth]);
+ sgml::closeTag(ofs, depth+command_depth, false, environment_inner[depth]);
}
- sgmlCloseTag(ofs, depth + command_depth, false, environment_stack[depth]);
+ sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]);
environment_stack[depth].erase();
environment_inner[depth].erase();
}
&& !environment_stack[depth].empty()) {
if (environment_inner[depth] != "!-- --") {
item_name= "listitem";
- sgmlCloseTag(ofs, command_depth+depth, false, item_name);
+ sgml::closeTag(ofs, command_depth+depth, false, item_name);
if (environment_inner[depth] == "varlistentry")
- sgmlCloseTag(ofs, depth + command_depth, false, environment_inner[depth]);
+ sgml::closeTag(ofs, depth + command_depth, false, environment_inner[depth]);
}
- sgmlCloseTag(ofs, depth + command_depth, false, environment_stack[depth]);
+ sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]);
environment_stack[depth].erase();
environment_inner[depth].erase();
// Write opening SGML tags.
switch (style->latextype) {
case LATEX_PARAGRAPH:
- sgmlOpenTag(ofs, depth + command_depth,
+ sgml::openTag(ofs, depth + command_depth,
false, style->latexname());
break;
case LATEX_COMMAND:
if (depth != 0)
sgmlError(par, 0,
- _("Error : Wrong depth for "
- "LatexType Command.\n"));
+ _("Error: Wrong depth for LatexType Command.\n"));
command_name = style->latexname();
if (cmd_depth < command_base) {
for (Paragraph::depth_type j = command_depth;
j >= command_base; --j) {
- sgmlCloseTag(ofs, j, false, command_stack[j]);
+ sgml::closeTag(ofs, j, false, command_stack[j]);
ofs << endl;
}
command_depth = command_base = cmd_depth;
} else if (cmd_depth <= command_depth) {
for (int j = command_depth;
j >= int(cmd_depth); --j) {
- sgmlCloseTag(ofs, j, false, command_stack[j]);
+ sgml::closeTag(ofs, j, false, command_stack[j]);
ofs << endl;
}
command_depth = cmd_depth;
if (lyx_code == Inset::LABEL_CODE) {
command_name += " id=\"";
command_name += (static_cast<InsetCommand *>(inset))->getContents();
- command_name += "\"";
+ command_name += '"';
desc_on = 3;
}
}
- sgmlOpenTag(ofs, depth + command_depth, false, command_name);
+ sgml::openTag(ofs, depth + command_depth, false, command_name);
- item_name = c_params.empty()?"title":c_params;
- sgmlOpenTag(ofs, depth + 1 + command_depth, false, item_name);
+ item_name = c_params.empty() ? "title" : c_params;
+ sgml::openTag(ofs, depth + 1 + command_depth, false, item_name);
break;
case LATEX_ENVIRONMENT:
}
environment_stack[depth] = style->latexname();
environment_inner[depth] = "!-- --";
- sgmlOpenTag(ofs, depth + command_depth, false, environment_stack[depth]);
+ sgml::openTag(ofs, depth + command_depth, false, environment_stack[depth]);
} else {
if (environment_inner[depth] != "!-- --") {
item_name= "listitem";
- sgmlCloseTag(ofs, command_depth + depth, false, item_name);
+ sgml::closeTag(ofs, command_depth + depth, false, item_name);
if (environment_inner[depth] == "varlistentry")
- sgmlCloseTag(ofs, depth + command_depth, false, environment_inner[depth]);
+ sgml::closeTag(ofs, depth + command_depth, false, environment_inner[depth]);
}
}
if (style->latexparam() == "CDATA")
ofs << "<![CDATA[";
else
- sgmlOpenTag(ofs, depth + command_depth, false, style->latexparam());
+ sgml::openTag(ofs, depth + command_depth, false, style->latexparam());
}
break;
}
desc_on = (style->labeltype == LABEL_MANUAL);
environment_inner[depth] = desc_on ? "varlistentry" : "listitem";
- sgmlOpenTag(ofs, depth + 1 + command_depth,
+ sgml::openTag(ofs, depth + 1 + command_depth,
false, environment_inner[depth]);
item_name = desc_on ? "term" : "para";
- sgmlOpenTag(ofs, depth + 1 + command_depth,
+ sgml::openTag(ofs, depth + 1 + command_depth,
false, item_name);
break;
default:
- sgmlOpenTag(ofs, depth + command_depth,
+ sgml::openTag(ofs, depth + command_depth,
false, style->latexname());
break;
}
simpleDocBookOnePar(ofs, par, desc_on,
depth + 1 + command_depth);
- par = par->next();
string end_tag;
// write closing SGML tags
switch (style->latextype) {
case LATEX_COMMAND:
end_tag = c_params.empty() ? "title" : c_params;
- sgmlCloseTag(ofs, depth + command_depth,
+ sgml::closeTag(ofs, depth + command_depth,
false, end_tag);
break;
case LATEX_ENVIRONMENT:
if (style->latexparam() == "CDATA")
ofs << "]]>";
else
- sgmlCloseTag(ofs, depth + command_depth, false, style->latexparam());
+ sgml::closeTag(ofs, depth + command_depth, false, style->latexparam());
}
break;
case LATEX_ITEM_ENVIRONMENT:
if (desc_on == 1) break;
- end_tag= "para";
- sgmlCloseTag(ofs, depth + 1 + command_depth, false, end_tag);
+ end_tag = "para";
+ sgml::closeTag(ofs, depth + 1 + command_depth, false, end_tag);
break;
case LATEX_PARAGRAPH:
- sgmlCloseTag(ofs, depth + command_depth, false, style->latexname());
+ sgml::closeTag(ofs, depth + command_depth, false, style->latexname());
break;
default:
- sgmlCloseTag(ofs, depth + command_depth, false, style->latexname());
+ sgml::closeTag(ofs, depth + command_depth, false, style->latexname());
break;
}
}
if (!environment_stack[depth].empty()) {
if (environment_inner[depth] != "!-- --") {
item_name = "listitem";
- sgmlCloseTag(ofs, command_depth + depth, false, item_name);
+ sgml::closeTag(ofs, command_depth + depth, false, item_name);
if (environment_inner[depth] == "varlistentry")
- sgmlCloseTag(ofs, depth + command_depth, false, environment_inner[depth]);
+ sgml::closeTag(ofs, depth + command_depth, false, environment_inner[depth]);
}
- sgmlCloseTag(ofs, depth + command_depth, false, environment_stack[depth]);
+ sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]);
}
}
for (int j = command_depth; j >= 0 ; --j)
if (!command_stack[j].empty()) {
- sgmlCloseTag(ofs, j, false, command_stack[j]);
+ sgml::closeTag(ofs, j, false, command_stack[j]);
ofs << endl;
}
ofs << "\n\n";
- sgmlCloseTag(ofs, 0, false, top_element);
+ sgml::closeTag(ofs, 0, false, top_element);
ofs.close();
// How to check for successful close
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()) {
}
} else {
char c = par->getChar(i);
- string sgml_string;
- par->sgmlConvertChar(c, sgml_string);
+ bool ws;
+ string str;
+ boost::tie(ws, str) = sgml::escapeChar(c);
if (style->pass_thru) {
os << c;
} else if (style->free_spacing || par->isFreeSpacing() || c != ' ') {
- os << sgml_string;
+ os << str;
} else if (desc_on ==1) {
++char_line_count;
os << "\n</term><listitem><para>";
{
if (!users->text) return 0;
- users->owner()->prohibitInput();
+ users->owner()->busy(true);
// get LaTeX-Filename
string const name = getLatexName();
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);
users->repaint();
users->fitCursor();
}
- users->owner()->allowInput();
+ users->owner()->busy(false);
return res;
}
void Buffer::validate(LaTeXFeatures & features) const
{
- Paragraph * par = paragraph;
LyXTextClass const & tclass = params.getLyXTextClass();
+ if (params.tracking_changes) {
+ 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");
- while (par) {
- // We don't use "lyxerr.debug" because of speed. (Asger)
- if (lyxerr.debugging(Debug::LATEX))
- lyxerr << "Paragraph: " << par << endl;
-
- // Now just follow the list of paragraphs and run
- // validate on each of them.
- par->validate(features);
-
- // and then the next paragraph
- par = par->next();
- }
+ for_each(paragraphs.begin(), paragraphs.end(),
+ boost::bind(&Paragraph::validate, _1, boost::ref(features)));
// the bullet shapes are buffer level not paragraph level
// so they are tested here
}
-// This function should be in Buffer because it's a buffer's property (ale)
-string const Buffer::getIncludeonlyList(char delim)
-{
- string lst;
- for (inset_iterator it = inset_iterator_begin();
- it != inset_iterator_end(); ++it) {
- if ((*it)->lyxCode() == Inset::INCLUDE_CODE) {
- InsetInclude * insetinc =
- static_cast<InsetInclude *>(*it);
- if (insetinc->isIncludeOnly()) {
- if (!lst.empty())
- lst += delim;
- lst += insetinc->getRelFileBaseName();
- }
- }
- }
- lyxerr[Debug::INFO] << "Includeonly(" << lst << ')' << endl;
- return lst;
-}
-
-
-vector<string> const Buffer::getLabelList()
+vector<string> const Buffer::getLabelList() const
{
/// if this is a child document and the parent is already loaded
/// Use the parent's list instead [ale990407]
if (!params.parentname.empty()
&& bufferlist.exists(params.parentname)) {
- Buffer * tmp = bufferlist.getBuffer(params.parentname);
+ Buffer const * tmp = bufferlist.getBuffer(params.parentname);
if (tmp)
return tmp->getLabelList();
}
vector<string> label_list;
- for (inset_iterator it = inset_iterator_begin();
- it != inset_iterator_end(); ++it) {
- vector<string> const l = (*it)->getLabelList();
+ for (inset_iterator it = inset_const_iterator_begin();
+ it != inset_const_iterator_end(); ++it) {
+ vector<string> const l = it->getLabelList();
label_list.insert(label_list.end(), l.begin(), l.end());
}
return label_list;
// This is also a buffer property (ale)
-vector<pair<string, string> > const Buffer::getBibkeyList() const
+void Buffer::fillWithBibKeys(vector<pair<string, string> > & keys) const
{
- typedef pair<string, string> StringPair;
/// if this is a child document and the parent is already loaded
- /// Use the parent's list instead [ale990412]
+ /// use the parent's list instead [ale990412]
if (!params.parentname.empty() && bufferlist.exists(params.parentname)) {
Buffer const * tmp = bufferlist.getBuffer(params.parentname);
- if (tmp)
- return tmp->getBibkeyList();
+ if (tmp) {
+ tmp->fillWithBibKeys(keys);
+ return;
+ }
}
- vector<StringPair> keys;
- Paragraph * par = paragraph;
- while (par) {
- if (par->bibkey) {
- string const key = par->bibkey->getContents();
- string const opt = par->bibkey->getOptions();
- string const ref = par->asString(this, false);
+ for (inset_iterator it = inset_const_iterator_begin();
+ it != inset_const_iterator_end(); ++it) {
+ if (it->lyxCode() == Inset::BIBTEX_CODE)
+ static_cast<InsetBibtex &>(*it).fillWithBibKeys(this, keys);
+ else if (it->lyxCode() == Inset::INCLUDE_CODE)
+ static_cast<InsetInclude &>(*it).fillWithBibKeys(keys);
+ else if (it->lyxCode() == Inset::BIBITEM_CODE) {
+ InsetBibitem & bib = static_cast<InsetBibitem &>(*it);
+ string const key = bib.getContents();
+ string const opt = bib.getOptions();
+ string const ref; // = pit->asString(this, false);
string const info = opt + "TheBibliographyRef" + ref;
-
- keys.push_back(StringPair(key, info));
- }
- par = par->next();
- }
-
- // Might be either using bibtex or a child has bibliography
- if (keys.empty()) {
- for (inset_iterator it = inset_const_iterator_begin();
- it != inset_const_iterator_end(); ++it) {
- // Search for Bibtex or Include inset
- if ((*it)->lyxCode() == Inset::BIBTEX_CODE) {
- vector<StringPair> tmp =
- static_cast<InsetBibtex*>(*it)->getKeys(this);
- keys.insert(keys.end(), tmp.begin(), tmp.end());
- } else if ((*it)->lyxCode() == Inset::INCLUDE_CODE) {
- vector<StringPair> const tmp =
- static_cast<InsetInclude*>(*it)->getKeys();
- keys.insert(keys.end(), tmp.begin(), tmp.end());
- }
+ keys.push_back(pair<string, string>(key, info));
}
}
-
- return keys;
}
bool Buffer::isDepClean(string const & name) const
{
- DEPCLEAN * item = dep_clean;
- while (item && item->master != name)
- item = item->next;
- if (!item) return true;
- return item->clean;
+ DepClean::const_iterator it = dep_clean_.find(name);
+ if (it == dep_clean_.end())
+ return true;
+ return it->second;
}
void Buffer::markDepClean(string const & name)
{
- if (!dep_clean) {
- dep_clean = new DEPCLEAN;
- dep_clean->clean = true;
- dep_clean->master = name;
- dep_clean->next = 0;
- } else {
- DEPCLEAN * item = dep_clean;
- while (item && item->master != name)
- item = item->next;
- if (item) {
- item->clean = true;
- } else {
- item = new DEPCLEAN;
- item->clean = true;
- item->master = name;
- item->next = 0;
- }
- }
+ dep_clean_[name] = true;
}
void Buffer::resizeInsets(BufferView * bv)
{
/// then remove all LyXText in text-insets
- Paragraph * par = paragraph;
- for (; par; par = par->next()) {
- par->resizeInsetsLyXText(bv);
- }
+ for_each(paragraphs.begin(), paragraphs.end(),
+ boost::bind(&Paragraph::resizeInsetsLyXText, _1, bv));
}
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();
}
-Buffer::inset_iterator::inset_iterator(Paragraph * paragraph, pos_type pos)
- : par(paragraph)
-{
- it = par->InsetIterator(pos);
- if (it == par->inset_iterator_end()) {
- par = par->next();
- setParagraph();
- }
-}
-
-
void Buffer::inset_iterator::setParagraph()
{
- while (par) {
- it = par->inset_iterator_begin();
- if (it != par->inset_iterator_end())
+ while (pit != pend) {
+ it = pit->insetlist.begin();
+ if (it != pit->insetlist.end())
return;
- par = par->next();
+ ++pit;
}
- //it = 0;
- // We maintain an invariant that whenever par = 0 then it = 0
}
for (inset_iterator it = inset_const_iterator_begin();
it != inset_const_iterator_end(); ++it)
{
- if ((*it)->id() == id_arg)
- return *it;
- Inset * in = (*it)->getInsetFromID(id_arg);
+ if (it->id() == id_arg)
+ return &(*it);
+ Inset * in = it->getInsetFromID(id_arg);
if (in)
return in;
}
}
-Paragraph * Buffer::getParFromID(int id) const
+ParagraphList::iterator Buffer::getParFromID(int id) const
{
- if (id < 0) return 0;
- Paragraph * par = paragraph;
- while (par) {
- if (par->id() == id) {
- return par;
- }
- Paragraph * tmp = par->getParFromID(id);
- if (tmp) {
- return tmp;
+#warning FIXME: const correctness! (Andre)
+ ParIterator it(const_cast<Buffer*>(this)->par_iterator_begin());
+ ParIterator end(const_cast<Buffer*>(this)->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 *it;
}
- par = par->next();
}
+
return 0;
}
ParIterator Buffer::par_iterator_begin()
{
- return ParIterator(paragraph);
+ return ParIterator(&*(paragraphs.begin()));
}
{
return ParIterator();
}
+
+ParConstIterator Buffer::par_iterator_begin() const
+{
+ return ParConstIterator(&*(paragraphs.begin()));
+}
+
+
+ParConstIterator Buffer::par_iterator_end() const
+{
+ return ParConstIterator();
+}
+
+
+
+void Buffer::addUser(BufferView * u)
+{
+ users = u;
+}
+
+
+void Buffer::delUser(BufferView *)
+{
+ users = 0;
+}
+
+
+Language const * Buffer::getLanguage() const
+{
+ return params.language;
+}
+
+
+string const Buffer::B_(string const & l10n) const
+{
+ if (messages_.get()) {
+ return messages_->get(l10n);
+ }
+
+ return _(l10n);
+}
+
+
+bool Buffer::isClean() const
+{
+ return lyx_clean;
+}
+
+
+bool Buffer::isBakClean() const
+{
+ return bak_clean;
+}
+
+
+void Buffer::markClean() const
+{
+ if (!lyx_clean) {
+ lyx_clean = true;
+ updateTitles();
+ }
+ // if the .lyx file has been saved, we don't need an
+ // autosave
+ bak_clean = true;
+}
+
+
+void Buffer::markBakClean()
+{
+ bak_clean = true;
+}
+
+
+void Buffer::setUnnamed(bool flag)
+{
+ unnamed = flag;
+}
+
+
+bool Buffer::isUnnamed()
+{
+ return unnamed;
+}
+
+
+void Buffer::markDirty()
+{
+ if (lyx_clean) {
+ lyx_clean = false;
+ updateTitles();
+ }
+ bak_clean = false;
+
+ DepClean::iterator it = dep_clean_.begin();
+ DepClean::const_iterator const end = dep_clean_.end();
+
+ for (; it != end; ++it) {
+ it->second = false;
+ }
+}
+
+
+string const & Buffer::fileName() const
+{
+ return filename_;
+}
+
+
+string const & Buffer::filePath() const
+{
+ return filepath_;
+}
+
+
+bool Buffer::isReadonly() const
+{
+ return read_only;
+}
+
+
+BufferView * Buffer::getUser() const
+{
+ return users;
+}
+
+
+void Buffer::setParentName(string const & name)
+{
+ params.parentname = name;
+}
+
+
+Buffer::inset_iterator::inset_iterator()
+ : pit(0), pend(0)
+{}
+
+
+Buffer::inset_iterator::inset_iterator(base_type p, base_type e)
+ : pit(p), pend(e)
+{
+ setParagraph();
+}
+
+
+Buffer::inset_iterator & Buffer::inset_iterator::operator++()
+{
+ if (pit != pend) {
+ ++it;
+ if (it == pit->insetlist.end()) {
+ ++pit;
+ setParagraph();
+ }
+ }
+ return *this;
+}
+
+
+Buffer::inset_iterator Buffer::inset_iterator::operator++(int)
+{
+ inset_iterator tmp = *this;
+ ++*this;
+ return tmp;
+}
+
+
+Buffer::inset_iterator::reference Buffer::inset_iterator::operator*()
+{
+ return *it.getInset();
+}
+
+
+Buffer::inset_iterator::pointer Buffer::inset_iterator::operator->()
+{
+ return it.getInset();
+}
+
+
+Paragraph * Buffer::inset_iterator::getPar()
+{
+ return &(*pit);
+}
+
+
+lyx::pos_type Buffer::inset_iterator::getPos() const
+{
+ return it.getPos();
+}
+
+
+bool operator==(Buffer::inset_iterator const & iter1,
+ Buffer::inset_iterator const & iter2)
+{
+ return iter1.pit == iter2.pit
+ && (iter1.pit == iter1.pend || iter1.it == iter2.it);
+}
+
+
+bool operator!=(Buffer::inset_iterator const & iter1,
+ Buffer::inset_iterator const & iter2)
+{
+ return !(iter1 == iter2);
+}
projects / lyx.git / blobdiff