#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "buffer.h"
#include "bufferlist.h"
-#include "counters.h"
#include "LyXAction.h"
#include "lyxrc.h"
#include "lyxlex.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 "author.h"
#include "frontends/LyXView.h"
#include "insets/insetnote.h"
#include "insets/insetquotes.h"
#include "insets/insetlatexaccent.h"
-#include "insets/insetbib.h"
+#include "insets/insetbibitem.h"
+#include "insets/insetbibtex.h"
#include "insets/insetcite.h"
#include "insets/insetexternal.h"
#include "insets/insetindex.h"
#include "insets/insetgraphics.h"
#include "insets/insetfoot.h"
#include "insets/insetmarginal.h"
+#include "insets/insetoptarg.h"
#include "insets/insetminipage.h"
#include "insets/insetfloat.h"
+#include "insets/insetwrap.h"
#include "insets/insettabular.h"
#if 0
#include "insets/insettheorem.h"
#include "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 "BoostFormat.h"
#include <fstream>
#include <iomanip>
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;
namespace {
-const int LYX_FORMAT = 220;
+const int LYX_FORMAT = 222;
} // namespace anon
Buffer::Buffer(string const & file, bool ronly)
: niceFile(true), lyx_clean(true), bak_clean(true),
- unnamed(false), dep_clean(0), read_only(ronly),
- filename_(file), users(0), ctrs(new Counters)
+ unnamed(false), read_only(ronly),
+ filename_(file), users(0)
{
lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl;
-// filename = file;
filepath_ = OnlyPath(file);
-// 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
+ authorlist.record(Author(lyxrc.user_name, lyxrc.user_email));
}
}
-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);
}
}
+AuthorList & Buffer::authors()
+{
+ return authorlist;
+}
+
+
/// Update window titles of all users
// Should work on a list
void Buffer::updateTitles() const
string last_inset_read;
-#ifndef NO_COMPABILITY
-struct ErtComp
-{
- ErtComp() : active(false), fromlayout(false), in_tabular(false) {
- }
- string contents;
- bool active;
- bool fromlayout;
- bool in_tabular;
- LyXFont font;
-};
-
-std::stack<ErtComp> ert_stack;
-ErtComp ert_comp;
-#endif
-
#ifdef WITH_WARNINGS
#warning And _why_ is this here? (Lgb)
#endif
int unknown_layouts;
int unknown_tokens;
+vector<int> author_ids;
} // anon
// 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)
+// Returns false if "\the_end" is not read (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
+ author_ids.clear();
+
int pos = 0;
Paragraph::depth_type depth = 0;
bool the_end_read = false;
Paragraph * first_par = 0;
LyXFont font(LyXFont::ALL_INHERIT, params.language);
-#if 0
- if (file_format < 216 && params.language->lang() == "hebrew")
- font.setLanguage(default_language);
-#endif
-
if (!par) {
par = new Paragraph;
par->layout(params.getLyXTextClass().defaultLayout());
if (token.empty()) continue;
lyxerr[Debug::PARSER] << "Handling token: `"
- << token << "'" << endl;
+ << token << '\'' << endl;
the_end_read =
parseSingleLyXformat2Token(lex, par, first_par,
s += tostr(unknown_layouts);
s += _(" paragraphs");
}
+#if USE_BOOST_FORMAT
+ Alert::alert(_("Textclass Loading Error!"), s,
+ boost::io::str(boost::format(_("When reading %1$s")) % fileName()));
+#else
Alert::alert(_("Textclass Loading Error!"), s,
- _("When reading " + fileName()));
+ _("When reading ") + fileName());
+#endif
}
if (unknown_tokens > 0) {
s += tostr(unknown_tokens);
s += _(" unknown tokens");
}
+#if USE_BOOST_FORMAT
Alert::alert(_("Textclass Loading Error!"), s,
- _("When reading " + fileName()));
+ boost::io::str(boost::format(_("When reading %1$s")) % fileName()));
+#else
+ Alert::alert(_("Textclass Loading Error!"), s,
+ _("When reading ") + fileName());
+#endif
}
return the_end_read;
}
-#ifndef NO_COMPABILITY
-
-Inset * Buffer::isErtInset(Paragraph * par, int pos) const
-{
- 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
+namespace {
+ // This stuff is, in the traditional LyX terminology, Super UGLY
+ // but this code is too b0rken to admit of a better solution yet
+ Change current_change;
+};
bool
// 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);
+ par->insertChar(pos, (*cit), font, current_change);
++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();
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"
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());
+ if (params.tracking_changes)
+ par->trackChanges();
}
pos = 0;
par->layout(params.getLyXTextClass()[layoutname]);
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
// 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 == "\\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();
if (layout->free_spacing || par->isFreeSpacing()) {
if (lex.isOK()) {
lex.next();
- string next_token = lex.getString();
+ string const next_token = lex.getString();
if (next_token == "\\-") {
- par->insertChar(pos, '-', font);
- } else if (next_token == "\\protected_separator"
- || next_token == "~") {
- par->insertChar(pos, ' ', font);
+ par->insertChar(pos, '-', font, current_change);
+ } else if (next_token == "~") {
+ par->insertChar(pos, ' ', font, current_change);
} else {
lex.printError("Token `$$Token' "
"is in free space "
} else {
Inset * inset = new InsetSpecialChar;
inset->read(this, lex);
- par->insertInset(pos, inset, font);
+ par->insertInset(pos, inset, font, current_change);
}
++pos;
} else if (token == "\\i") {
Inset * inset = new InsetLatexAccent;
inset->read(this, lex);
- par->insertInset(pos, inset, font);
+ par->insertInset(pos, inset, font, current_change);
++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) {
- 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);
+ par->insertChar(pos, '\\', font, current_change);
++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
} else if (token == "\\begin_deeper") {
++depth;
} else if (token == "\\end_deeper") {
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.")));
+#if USE_BOOST_FORMAT
+ Alert::alert(_("Textclass error"),
+ boost::io::str(boost::format(_("The document uses an unknown textclass \"%1$s\".")) % lex.getString()),
+ _("-- substituting default."));
+#else
+ Alert::alert(
+ _("Textclass error"),
+ _("The document uses an unknown textclass ")
+ + lex.getString(),
+ _("-- substituting default."));
+#endif
params.textclass = 0;
}
if (!params.getLyXTextClass().load()) {
// or stop loading the file.
// I can substitute but I don't see how I can
// stop loading... ideas?? ARRae980418
+#if USE_BOOST_FORMAT
Alert::alert(_("Textclass Loading Error!"),
- string(_("Can't load textclass ")) +
- params.getLyXTextClass().name(),
- _("-- substituting default"));
+ boost::io::str(boost::format(_("Can't load textclass %1$s")) %
+ params.getLyXTextClass().name()),
+ _("-- substituting default."));
+#else
+ Alert::alert(_("Textclass Loading Error!"),
+ _("Can't load textclass ")
+ + params.getLyXTextClass().name(),
+ _("-- substituting default."));
+#endif
params.textclass = 0;
}
} else if (token == "\\options") {
} 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)
} else if (token == "\\use_numerical_citations") {
lex.nextToken();
params.use_numerical_citations = lex.getInteger();
+ } else if (token == "\\tracking_changes") {
+ lex.nextToken();
+ params.tracking_changes = lex.getInteger();
+ // mark the first paragraph
+ if (params.tracking_changes)
+ par->trackChanges();
+ } else if (token == "\\author") {
+ lex.nextToken();
+ istringstream ss(lex.getString());
+ Author a;
+ ss >> a;
+ int aid(authorlist.record(a));
+ lyxerr << "aid is " << aid << endl;
+ lyxerr << "listed aid is " << author_ids.size() << endl;
+ author_ids.push_back(authorlist.record(a));
} else if (token == "\\paperorientation") {
int tmpret = lex.findToken(string_orientation);
if (tmpret == -1)
params.float_placement = lex.getString();
} else if (token == "\\align") {
int tmpret = lex.findToken(string_align);
- if (tmpret == -1) ++tmpret;
+ if (tmpret == -1)
+ ++tmpret;
int const tmpret2 = int(pow(2.0, tmpret));
par->params().align(LyXAlignment(tmpret2));
} else if (token == "\\added_space_top") {
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);
- } 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);
+ par->insertChar(pos, Paragraph::META_NEWLINE, font, current_change);
++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);
+ par->insertInset(pos, inset, font, current_change);
++pos;
- } else if (token == "\\hfill") {
- par->insertChar(pos, Paragraph::META_HFILL, font);
+ } else if (token == "\\bibitem") { // ale970302
+ InsetCommandParams p("bibitem", "dummy");
+ InsetBibitem * inset = new InsetBibitem(p);
+ inset->read(this, lex);
+ par->insertInset(pos, inset, font, current_change);
++pos;
- } else if (token == "\\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);
- }
+ } else if (token == "\\hfill") {
+ par->insertChar(pos, Paragraph::META_HFILL, font, current_change);
++pos;
- } else if (token == "\\bibitem") { // ale970302
- if (!par->bibkey) {
- InsetCommandParams p("bibitem", "dummy");
- par->bibkey = new InsetBibKey(p);
- }
- par->bibkey->read(this, lex);
+ } else if (token == "\\change_unchanged") {
+ // Hack ! Needed for empty paragraphs :/
+ if (!pos)
+ par->cleanChanges();
+ current_change = Change(Change::UNCHANGED);
+ } else if (token == "\\change_inserted") {
+ lex.nextToken();
+ istringstream istr(lex.getString());
+ int aid;
+ lyx::time_type ct;
+ istr >> aid;
+ istr >> ct;
+ current_change = Change(Change::INSERTED, author_ids[aid], ct);
+ } else if (token == "\\change_deleted") {
+ lex.nextToken();
+ istringstream istr(lex.getString());
+ int aid;
+ lyx::time_type ct;
+ istr >> aid;
+ istr >> ct;
+ current_change = Change(Change::DELETED, author_ids[aid], ct);
} else if (token == "\\the_end") {
-#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;
} 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();
+#if USE_BOOST_FORMAT
+ boost::format fmt(_("Unknown token: %1$s %2$s\n"));
+ fmt % token % lex.text();
+ string const s = fmt.str();
+#else
string const s = _("Unknown token: ") + token
- + " " + lex.text() + "\n";
+ + ' ' + lex.text() + '\n';
+#endif
// we can do this here this way because we're actually reading
// the buffer and don't care about LyXText right now.
InsetError * new_inset = new InsetError(s);
par->insertInset(pos, new_inset, LyXFont(LyXFont::ALL_INHERIT,
params.language));
-#ifndef NO_COMPABILITY
- }
-#endif
}
return the_end_read;
}
+
// needed to insert the selection
void Buffer::insertStringAsLines(Paragraph *& par, pos_type & pos,
LyXFont const & fn,string const & str) const
} else if (*cit == '\t') {
if (!layout->free_spacing && !par->isFreeSpacing()) {
// tabs are like spaces here
- par->insertChar(pos, ' ', font);
+ par->insertChar(pos, ' ', font, current_change);
++pos;
space_inserted = true;
} else {
const pos_type nb = 8 - pos % 8;
for (pos_type a = 0; a < nb ; ++a) {
- par->insertChar(pos, ' ', font);
+ par->insertChar(pos, ' ', font, current_change);
++pos;
}
space_inserted = true;
inset = new InsetCitation(inscmd);
} else if (cmdName == "bibitem") {
lex.printError("Wrong place for bibitem");
- inset = new InsetBibKey(inscmd);
+ inset = new InsetBibitem(inscmd);
} else if (cmdName == "BibTeX") {
inset = new InsetBibtex(inscmd);
} else if (cmdName == "index") {
inset = new InsetParent(inscmd, *this);
}
} else {
- bool alreadyread = false;
if (tmptok == "Quotes") {
inset = new InsetQuotes;
} else if (tmptok == "External") {
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") {
inset = new InsetFoot(params);
} else if (tmptok == "Marginal") {
inset = new InsetMarginal(params);
+ } else if (tmptok == "OptArg") {
+ inset = new InsetOptArg(params);
} else if (tmptok == "Minipage") {
inset = new InsetMinipage(params);
} else if (tmptok == "Float") {
lex.next();
string tmptok = lex.getString();
inset = new InsetFloat(params, tmptok);
+ } else if (tmptok == "Wrap") {
+ lex.next();
+ string tmptok = lex.getString();
+ inset = new InsetWrap(params, tmptok);
#if 0
} else if (tmptok == "List") {
inset = new InsetList;
inset = new InsetFloatList;
}
- if (inset && !alreadyread) inset->read(this, lex);
+ if (inset)
+ inset->read(this, lex);
}
if (inset) {
- par->insertInset(pos, inset, font);
+ par->insertInset(pos, inset, font, current_change);
++pos;
}
}
-bool Buffer::readFile(LyXLex & lex, Paragraph * par)
+bool Buffer::readFile(LyXLex & lex, string const & filename, Paragraph * par)
{
if (lex.isOK()) {
lex.next();
if (token == "\\lyxformat") { // the first token _must_ be...
lex.eatLine();
string tmp_format = lex.getString();
- //lyxerr << "LyX Format: `" << tmp_format << "'" << endl;
+ //lyxerr << "LyX Format: `" << tmp_format << '\'' << endl;
// if present remove ".," from string.
string::size_type dot = tmp_format.find_first_of(".,");
//lyxerr << " dot found at " << dot << endl;
if (dot != string::npos)
tmp_format.erase(dot, 1);
file_format = strToInt(tmp_format);
+ //lyxerr << "format: " << file_format << endl;
if (file_format == LYX_FORMAT) {
// current format
} else if (file_format > LYX_FORMAT) {
// future format
Alert::alert(_("Warning!"),
- _("LyX file format is newer that what"),
- _("is supported in this LyX version. Expect some problems."));
+ _("The file was created with a newer version of "
+ "LyX. This is likely to cause problems."));
} else if (file_format < LYX_FORMAT) {
// old formats
_("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_);
+ } else if (!filename.empty()) {
+ string command =
+ LibFileSearch("lyx2lyx", "lyx2lyx");
+ if (command.empty()) {
+ Alert::alert(_("ERROR!"),
+ _("Can't find conversion script."));
+ return false;
+ }
+ command += " -t"
+ +tostr(LYX_FORMAT) + ' '
+ + QuoteName(filename);
+ lyxerr[Debug::INFO] << "Running '"
+ << command << '\''
+ << endl;
cmd_ret const ret = RunCommand(command);
if (ret.first) {
Alert::alert(_("ERROR!"),
- _("An error occured while "
- "running the conversion script."));
+ _("An error occured while "
+ "running the conversion script."));
return false;
}
- istringstream is(ret.second);
+ istringstream is(STRCONV(ret.second));
LyXLex tmplex(0, 0);
tmplex.setStream(is);
- return readFile(tmplex);
+ return readFile(tmplex, string(), par);
+ } else {
+ // This code is reached if lyx2lyx failed (for
+ // some reason) to change the file format of
+ // the file.
+ lyx::Assert(false);
+ return false;
}
}
bool the_end = readLyXformat2(lex, par);
params.setPaperStuff();
-#if 0
- // the_end was added in 213
- if (file_format < 213)
- the_end = true;
-#endif
-
if (!the_end) {
Alert::alert(_("Warning!"),
_("Reading of document is not complete"),
// now write out the buffer paramters.
params.writeFile(ofs);
+ // if we're tracking, list all possible authors
+ if (params.tracking_changes) {
+ AuthorList::Authors::const_iterator it = authorlist.begin();
+ AuthorList::Authors::const_iterator end = authorlist.end();
+ for (; it != end; ++it) {
+ ofs << "\\author " << it->second << "\n";
+ }
+ }
+
Paragraph::depth_type depth = 0;
// this will write out all the paragraphs
default:
{
string const parlab = par.params().labelString();
- buffer << parlab << " ";
+ 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;
}
}
buffer << word;
- return buffer.str().c_str();
+ return STRCONV(buffer.str());
}
}
-bool use_babel;
-
void Buffer::makeLaTeXFile(string const & fname,
string const & original_path,
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';
- }
-
- // 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";
- }
- }
-
- if (!bullets_def.empty())
- preamble += bullets_def + "}\n\n";
-
- int const nlines =
- int(lyx::count(preamble.begin(), preamble.end(), '\n'));
- for (int j = 0; j != nlines; ++j) {
- 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();
- }
-
- preamble += "\\makeatother\n";
-
- os << preamble;
+ // Write the preamble
+ params.writeLaTeX(os, features, texrow);
if (only_preamble)
return;
texrow.newline();
}
- latexParagraphs(os, &*(paragraphs.begin()), 0, texrow);
+ latexParagraphs(os, paragraphs.begin(), paragraphs.end(), texrow);
// add this just in case after all the paragraphs
os << endl;
// Just to be sure. (Asger)
texrow.newline();
- 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,
+void Buffer::latexParagraphs(ostream & ofs,
+ ParagraphList::iterator par,
+ ParagraphList::iterator endpar,
+ TexRow & texrow,
bool moving_arg) const
{
bool was_title = false;
bool already_title = false;
+ LyXTextClass const & tclass = params.getLyXTextClass();
// if only_body
while (par != endpar) {
lyxerr <<"Error in latexParagraphs: You"
" should not mix title layouts"
" with normal ones." << endl;
- } else
+ } else if (!was_title) {
was_title = true;
+ if (tclass.titletype() == TITLE_ENVIRONMENT) {
+ ofs << "\\begin{"
+ << tclass.titlename()
+ << "}\n";
+ texrow.newline();
+ }
+ }
} else if (was_title && !already_title) {
- ofs << "\\maketitle\n";
+ if (tclass.titletype() == TITLE_ENVIRONMENT) {
+ ofs << "\\end{" << tclass.titlename()
+ << "}\n";
+ }
+ else {
+ ofs << "\\" << tclass.titlename()
+ << "\n";
+ }
texrow.newline();
already_title = true;
was_title = false;
if (layout->isEnvironment() ||
!par->params().leftIndent().zero())
{
- par = par->TeXEnvironment(this, params, ofs, texrow);
+ par = TeXEnvironment(this, params, par, ofs, texrow);
} else {
- par = par->TeXOnePar(this, params, ofs, texrow, moving_arg);
+ par = TeXOnePar(this, params, par, ofs, texrow, moving_arg);
}
} else {
- par = par->TeXOnePar(this, params, ofs, texrow, moving_arg);
+ par = TeXOnePar(this, params, par, ofs, texrow, moving_arg);
}
}
// It might be that we only have a title in this document
if (was_title && !already_title) {
- ofs << "\\maketitle\n";
+ if (tclass.titletype() == TITLE_ENVIRONMENT) {
+ ofs << "\\end{" << tclass.titlename()
+ << "}\n";
+ }
+ else {
+ ofs << "\\" << tclass.titlename()
+ << "\n";
+ }
texrow.newline();
}
}
}
-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());
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);
}
}
Inset::Code lyx_code = inset->lyxCode();
if (lyx_code == Inset::TOC_CODE) {
string const temp = "toc";
- sgmlOpenTag(ofs, depth, false, temp);
+ sgml::openTag(ofs, depth, false, temp);
par = par->next();
continue;
// environment tag closing
for (; depth > par->params().depth(); --depth) {
- sgmlCloseTag(ofs, depth, false, environment_stack[depth]);
+ sgml::closeTag(ofs, depth, false, environment_stack[depth]);
environment_stack[depth].erase();
}
case LATEX_PARAGRAPH:
if (depth == par->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"));
+ _("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()
&& environment_stack[depth] != latexname) {
- sgmlCloseTag(ofs, depth, false,
+ sgml::closeTag(ofs, depth, false,
environment_stack[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;
}
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();
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);
}
while (!tag_state.empty()) {
- os << "</" << tag_name(tag_state.top()) << ">";
+ os << "</" << tag_name(tag_state.top()) << '>';
tag_state.pop();
}
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";
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;
}
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
{
if (!users->text) return 0;
- users->owner()->prohibitInput();
+ users->owner()->busy(true);
// get LaTeX-Filename
string const name = getLatexName();
users->repaint();
users->fitCursor();
}
- users->owner()->allowInput();
+ users->owner()->busy(false);
return res;
}
{
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))
features.require("amsmath");
}
-// 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 & inc = static_cast<InsetInclude &>(*it);
- if (inc.isIncludeOnly()) {
- if (!lst.empty())
- lst += delim;
- lst += inc.getRelFileBaseName();
- }
- }
- }
- lyxerr[Debug::INFO] << "Includeonly(" << lst << ')' << endl;
- return lst;
-}
-
-
vector<string> const Buffer::getLabelList() const
{
/// if this is a child document and the parent is already loaded
// 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();
- }
-
- vector<StringPair> keys;
- ParagraphList::iterator pit = paragraphs.begin();
- ParagraphList::iterator pend = paragraphs.end();
- for (; pit != pend; ++pit) {
- if (pit->bibkey) {
- string const key = pit->bibkey->getContents();
- string const opt = pit->bibkey->getOptions();
- string const ref = pit->asString(this, false);
- string const info = opt + "TheBibliographyRef" + ref;
-
- keys.push_back(StringPair(key, info));
+ if (tmp) {
+ tmp->fillWithBibKeys(keys);
+ return;
}
}
- // 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());
- }
+ 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(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;
}
}
-Counters & Buffer::counters() const
-{
- return *ctrs.get();
-}
-
-
void Buffer::inset_iterator::setParagraph()
{
while (pit != pend) {
if (id < 0)
return 0;
- ParagraphList::iterator it = paragraphs.begin();
- ParagraphList::iterator end = paragraphs.end();
+ // why should we allow < 0 ??
+ //lyx::Assert(id >= 0);
+
+ ParConstIterator it(par_iterator_begin());
+ ParConstIterator end(par_iterator_end());
+
for (; it != end; ++it) {
- if (it->id() == id) {
- return &*it;
- }
- Paragraph * tmp = it->getParFromID(id);
- if (tmp) {
- return tmp;
+ // go on then, show me how to remove
+ // the cast
+ if ((*it)->id() == id) {
+ return const_cast<Paragraph*>(*it);
}
}
+
return 0;
}
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)
{
updateTitles();
}
bak_clean = false;
- DEPCLEAN * tmp = dep_clean;
- while (tmp) {
- tmp->clean = false;
- tmp = tmp->next;
+
+ DepClean::iterator it = dep_clean_.begin();
+ DepClean::const_iterator const end = dep_clean_.end();
+
+ for (; it != end; ++it) {
+ it->second = false;
}
}