#include "buffer.h"
#include "bufferlist.h"
-#include "lyx_main.h"
#include "LyXAction.h"
#include "lyxrc.h"
#include "lyxlex.h"
#include "version.h"
#include "LaTeX.h"
#include "Chktex.h"
-#include "frontends/LyXView.h"
#include "debug.h"
#include "LaTeXFeatures.h"
#include "lyxtext.h"
#include "ParagraphParameters.h"
#include "iterators.h"
#include "lyxtextclasslist.h"
+#include "sgml.h"
+#include "paragraph_funcs.h"
+
+#include "frontends/LyXView.h"
#include "mathed/formulamacro.h"
#include "mathed/formula.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/lyxmanip.h"
#include "support/lyxalgo.h" // for lyx::count
+#include <boost/bind.hpp>
+#include <boost/tuple/tuple.hpp>
+#include "BoostFormat.h"
+
#include <fstream>
#include <iomanip>
#include <map>
#include <sys/types.h>
#include <utime.h>
-
#ifdef HAVE_LOCALE
#include <locale>
#endif
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 = 221;
} // 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),
+ : niceFile(true), lyx_clean(true), bak_clean(true),
unnamed(false), dep_clean(0), 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();
DestroyBufferTmpDir(tmppath);
}
- 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 (read_only != flag) {
read_only = flag;
updateTitles();
- users->owner()->getDialogs()->updateBufferDependent(false);
+ users->owner()->getDialogs().updateBufferDependent(false);
}
}
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
{
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;
Paragraph::depth_type depth = 0;
bool the_end_read = false;
if (!par) {
par = new Paragraph;
- par->layout(textclasslist[params.textclass].defaultLayout());
+ par->layout(params.getLyXTextClass().defaultLayout());
} else {
// We are inserting into an existing document
users->text->breakParagraph(users);
if (token.empty()) continue;
lyxerr[Debug::PARSER] << "Handling token: `"
- << token << "'" << endl;
+ << token << '\'' << endl;
the_end_read =
parseSingleLyXformat2Token(lex, par, first_par,
if (!first_par)
first_par = par;
- paragraph = first_par;
+ paragraphs.set(first_par);
if (unknown_layouts > 0) {
string s = _("Couldn't set the layout for ");
s += tostr(unknown_layouts);
s += _(" paragraphs");
}
+#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
}
if (unknown_tokens > 0) {
s += tostr(unknown_tokens);
s += _(" unknown tokens");
}
+#if USE_BOOST_FORMAT
+ Alert::alert(_("Textclass Loading Error!"), s,
+ boost::io::str(boost::format(_("When reading %1$s")) % fileName()));
+#else
Alert::alert(_("Textclass Loading Error!"), s,
- _("When reading " + fileName()));
+ _("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(textclasslist[params.textclass].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,
)
{
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
// 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)
lex.eatLine();
string layoutname = lex.getString();
- LyXTextClass const & tclass = textclasslist[params.textclass];
+ 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"
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(textclasslist[params.textclass].defaultLayout());
+ par->layout(params.getLyXTextClass().defaultLayout());
}
pos = 0;
- par->layout(textclasslist[params.textclass][layoutname]);
+ par->layout(params.getLyXTextClass()[layoutname]);
// Test whether the layout is obsolete.
LyXLayout_ptr const & layout = par->layout();
if (!layout->obsoleted_by().empty())
- par->layout(textclasslist[params.textclass][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 =
- textclasslist[params.textclass][par->layout()];
- if (!layout->obsoleted_by().empty())
- par->layout(layout->obsoleted_by());
+ par->layout(params.getLyXTextClass()[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 == "~") {
+ } else if (next_token == "~") {
par->insertChar(pos, ' ', font);
} else {
lex.printError("Token `$$Token' "
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 << "placement htbp\n"
- << "wide false\n"
- << "collapsed false\n";
- } else if (tmptok == "tab") {
- inset = new InsetFloat(params, "table");
- old_float << "placement htbp\n"
- << "wide false\n"
- << "collapsed false\n";
- } else if (tmptok == "alg") {
- inset = new InsetFloat(params, "algorithm");
- old_float << "placement htbp\n"
- << "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 << "placement htbp\n"
- << "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 << "placement htbp\n"
- << "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
} 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()),
+ _("LyX will not be able to produce output correctly."));
+#else
+ Alert::alert(
+ _("Textclass error"),
+ _("The document uses an unknown textclass ")
+ + lex.getString(),
+ _("LyX will not be able to produce output correctly."));
+#endif
params.textclass = 0;
}
- if (!textclasslist[params.textclass].load()) {
+ if (!params.getLyXTextClass().load()) {
// if the textclass wasn't loaded properly
// we need to either substitute another
// or stop loading the file.
// I can substitute but I don't see how I can
// stop loading... ideas?? ARRae980418
+#if USE_BOOST_FORMAT
Alert::alert(_("Textclass Loading Error!"),
- string(_("Can't load textclass ")) +
- textclasslist[params.textclass].name(),
+ 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") {
int tmpret = lex.findToken(string_paragraph_separation);
if (tmpret == -1)
++tmpret;
- if (tmpret != LYX_LAYOUT_DEFAULT)
- params.paragraph_separation =
- static_cast<BufferParams::PARSEP>(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;
- if (tmpret != LYX_LAYOUT_DEFAULT) {
- 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;
+ 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()) {
int tmpret = lex.findToken(string_orientation);
if (tmpret == -1)
++tmpret;
- if (tmpret != LYX_LAYOUT_DEFAULT)
- params.orientation = static_cast<BufferParams::PAPER_ORIENTATION>(tmpret);
+ params.orientation =
+ static_cast<BufferParams::PAPER_ORIENTATION>(tmpret);
} else if (token == "\\paperwidth") {
lex.next();
params.paperwidth = lex.getString();
params.footskip = lex.getString();
} else if (token == "\\paperfontsize") {
lex.nextToken();
- params.fontsize = strip(lex.getString());
+ params.fontsize = rtrim(lex.getString());
} else if (token == "\\papercolumns") {
lex.nextToken();
params.columns = lex.getInteger();
}
} else if (token == "\\paperpagestyle") {
lex.nextToken();
- params.pagestyle = strip(lex.getString());
+ params.pagestyle = rtrim(lex.getString());
} else if (token == "\\bullet") {
lex.nextToken();
int const index = lex.getInteger();
params.tocdepth = lex.getInteger();
} else if (token == "\\spacing") {
lex.next();
- string const tmp = strip(lex.getString());
+ string const tmp = rtrim(lex.getString());
Spacing::Space tmp_space = Spacing::Default;
float tmp_val = 0.0;
if (tmp == "single") {
}
} else if (token == "\\paragraph_spacing") {
lex.next();
- string const tmp = strip(lex.getString());
+ string const tmp = rtrim(lex.getString());
if (tmp == "single") {
par->params().spacing(Spacing(Spacing::Single));
} else if (tmp == "onehalf") {
} else if (token == "\\align") {
int tmpret = lex.findToken(string_align);
if (tmpret == -1) ++tmpret;
- if (tmpret != LYX_LAYOUT_DEFAULT) { // tmpret != 99 ???
- int const tmpret2 = int(pow(2.0, tmpret));
- //lyxerr << "Tmpret2 = " << tmpret2 << endl;
- par->params().align(LyXAlignment(tmpret2));
- }
+ 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());
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);
- } 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);
} 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->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();
+#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
}
-#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(textclasslist[params.textclass].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(textclasslist[params.textclass].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;
}
+
// needed to insert the selection
void Buffer::insertStringAsLines(Paragraph *& par, pos_type & pos,
LyXFont const & fn,string const & str) const
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());
+ if (autobreakrows && (!par->empty() || layout->keepempty)) {
+ breakParagraph(params, par, pos,
+ layout->isEnvironment());
par = par->next();
pos = 0;
space_inserted = true;
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;
}
-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) {
- Alert::alert(_("ERROR!"),
- _("Old LyX file format found. "
- "Use LyX 1.2.x to read this!"));
+ } else if (!filename.empty()) {
+ string command =
+ LibFileSearch("lyx2lyx", "lyx2lyx");
+ if (command.empty()) {
+ Alert::alert(_("ERROR!"),
+ _("Can't find conversion script."));
+ return false;
+ }
+ command += " -t"
+ +tostr(LYX_FORMAT) + ' '
+ + QuoteName(filename);
+ lyxerr[Debug::INFO] << "Running '"
+ << command << '\''
+ << endl;
+ cmd_ret const ret = RunCommand(command);
+ if (ret.first) {
+ Alert::alert(_("ERROR!"),
+ _("An error occured while "
+ "running the conversion script."));
+ return false;
+ }
+ istringstream is(STRCONV(ret.second));
+ LyXLex tmplex(0, 0);
+ tmplex.setStream(is);
+ return readFile(tmplex, string());
+ } else {
+ // This code is reached if lyx2lyx failed (for
+ // some reason) to change the file format of
+ // the file.
+ lyx::Assert(false);
return false;
}
}
}
}
- if (writeFile(fileName(), false)) {
- markLyxClean();
+ if (writeFile(fileName())) {
+ markClean();
removeAutosaveFile(fileName());
} else {
// Saving failed, so backup is not backup
}
-// Returns false if unsuccesful
-bool Buffer::writeFile(string const & fname, bool flag) const
+bool Buffer::writeFile(string const & fname) const
{
- // if flag is false writeFile will not create any GUI
- // warnings, only cerr.
- // Needed for autosave in background or panic save (Matthias 120496)
-
if (read_only && (fname == fileName())) {
- // Here we should come with a question if we should
- // perform the write anyway.
- if (flag)
- lyxerr << _("Error! Document is read-only: ")
- << fname << endl;
- else
- Alert::alert(_("Error! Document is read-only: "),
- fname);
return false;
}
FileInfo finfo(fname);
if (finfo.exist() && !finfo.writable()) {
- // Here we should come with a question if we should
- // try to do the save anyway. (i.e. do a chmod first)
- if (flag)
- lyxerr << _("Error! Cannot write file: ")
- << fname << endl;
- else
- Alert::err_alert(_("Error! Cannot write file: "),
- fname);
return false;
}
ofstream ofs(fname.c_str());
if (!ofs) {
- if (flag)
- lyxerr << _("Error! Cannot open file: ")
- << fname << endl;
- else
- Alert::err_alert(_("Error! Cannot open file: "),
- fname);
return false;
}
// 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;
// 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;
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;
}
}
buffer << word;
- return buffer.str().c_str();
+ return STRCONV(buffer.str());
}
}
-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";
}
{
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);
texrow.reset();
// The starting paragraph of the coming rows is the
// first paragraph of the document. (Asger)
- texrow.start(paragraph, 0);
+ texrow.start(&*(paragraphs.begin()), 0);
if (!only_body && nice) {
os << "%% " << lyx_docversion << " created this file. "
// 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
+ // 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) {
os << "\\documentclass";
- LyXTextClass const & tclass = textclasslist[params.textclass];
+ LyXTextClass const & tclass = params.getLyXTextClass();
ostringstream options; // the document class options.
options << params.options << ',';
}
- string strOptions(options.str().c_str());
+ string strOptions(STRCONV(options.str()));
if (!strOptions.empty()) {
- strOptions = strip(strOptions, ',');
+ strOptions = rtrim(strOptions, ",");
os << '[' << strOptions << ']';
}
if (!lyxrc.language_global_options
&& tmp == "\\usepackage{babel}")
tmp = string("\\usepackage[") +
- language_options.str().c_str() +
+ STRCONV(language_options.str()) +
"]{babel}";
preamble += tmp + "\n";
preamble += features.getBabelOptions();
texrow.newline();
}
- latexParagraphs(os, paragraph, 0, texrow);
+ latexParagraphs(os, &*(paragraphs.begin()), 0, 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] << "Row count was " << texrow.rows() - 1
+ << '.' << endl;
// we want this to be true outside previews (for insetexternal)
niceFile = true;
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
+ // length (all in one row) if that is true then we don't allow
// any special options in the paragraph and also we don't allow
// any environment other then "Standard" to be valid!
if ((in == 0) || !in->forceDefaultParagraphs(in)) {
bool Buffer::isLatex() const
{
- return textclasslist[params.textclass].outputType() == LATEX;
+ return params.getLyXTextClass().outputType() == LATEX;
}
bool Buffer::isLinuxDoc() const
{
- return textclasslist[params.textclass].outputType() == LINUXDOC;
+ return params.getLyXTextClass().outputType() == LINUXDOC;
}
bool Buffer::isLiterate() const
{
- return textclasslist[params.textclass].outputType() == LITERATE;
+ return params.getLyXTextClass().outputType() == LITERATE;
}
bool Buffer::isDocBook() const
{
- return textclasslist[params.textclass].outputType() == DOCBOOK;
+ return params.getLyXTextClass().outputType() == DOCBOOK;
}
bool Buffer::isSGML() const
{
- LyXTextClass const & tclass = textclasslist[params.textclass];
+ LyXTextClass const & tclass = params.getLyXTextClass();
return tclass.outputType() == LINUXDOC ||
tclass.outputType() == DOCBOOK;
}
-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());
texrow.reset();
- LyXTextClass const & tclass = textclasslist[params.textclass];
+ LyXTextClass const & tclass = params.getLyXTextClass();
string top_element = tclass.latexname();
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;
+ Paragraph * par = &*(paragraphs.begin());
string item_name;
vector<string> environment_stack(5);
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:
" 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:
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;
}
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);
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();
}
return;
}
- Paragraph * par = paragraph;
+ Paragraph * par = &*(paragraphs.begin());
niceFile = nice; // this will be used by Insetincludes.
texrow.reset();
- LyXTextClass const & tclass = textclasslist[params.textclass];
+ LyXTextClass const & tclass = params.getLyXTextClass();
string top_element = tclass.latexname();
if (!only_body) {
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;
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
}
} 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>";
void Buffer::validate(LaTeXFeatures & features) const
{
- Paragraph * par = paragraph;
- LyXTextClass const & tclass = textclasslist[params.textclass];
+ LyXTextClass const & tclass = params.getLyXTextClass();
// AMS Style is at document level
if (params.use_amsmath || 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;
}
-Buffer::Lists const Buffer::getLists() const
-{
- Lists l;
- Paragraph * par = paragraph;
-
- LyXTextClass const & textclass = textclasslist[params.textclass];
- bool found = textclass.hasLayout("Caption");
- string const layout("Caption");
-
- while (par) {
-#ifdef WITH_WARNINGS
-#warning bogus type (Lgb)
-#endif
- char const labeltype = par->layout()->labeltype;
-
- if (labeltype >= LABEL_COUNTER_CHAPTER
- && labeltype <= LABEL_COUNTER_CHAPTER + params.tocdepth) {
- // insert this into the table of contents
- SingleList & item = l["TOC"];
- int depth = max(0, labeltype - textclass.maxcounter());
- item.push_back(TocItem(par, depth,
- par->asString(this, true)));
- }
- // For each paragraph, traverse its insets and look for
- // FLOAT_CODE
-
- if (found) {
- Paragraph::inset_iterator it =
- par->inset_iterator_begin();
- Paragraph::inset_iterator end =
- par->inset_iterator_end();
-
- for (; it != end; ++it) {
- if ((*it)->lyxCode() == Inset::FLOAT_CODE) {
- InsetFloat * il =
- static_cast<InsetFloat*>(*it);
-
- string const type = il->type();
-
- // Now find the caption in the float...
- // We now tranverse the paragraphs of
- // the inset...
- Paragraph * tmp = il->inset.paragraph();
- while (tmp) {
- if (tmp->layout()->name() == layout) {
- SingleList & item = l[type];
- string const str =
- tostr(item.size()+1) + ". " + tmp->asString(this, false);
- item.push_back(TocItem(tmp, 0 , str));
- }
- tmp = tmp->next();
- }
- }
- }
- } else {
- lyxerr << "Caption not found" << endl;
- }
-
- par = par->next();
- }
- return l;
-}
-
-
// This is also a buffer property (ale)
vector<pair<string, string> > const Buffer::getBibkeyList() const
{
}
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);
+ 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));
}
- par = par->next();
}
+ if (!keys.empty())
+ return keys;
+
// 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) {
+ // 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());
}
}
{
// Split command string into command and argument
string cmd;
- string line = frontStrip(command);
- string const arg = strip(frontStrip(split(line, cmd, ' ')));
+ string line = ltrim(command);
+ string const arg = trim(split(line, cmd, ' '));
return dispatch(lyxaction.LookupFunc(cmd), arg, result);
}
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));
}
}
-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
{
- if (id < 0) return 0;
- Paragraph * par = paragraph;
- while (par) {
- if (par->id() == id) {
- return par;
+ if (id < 0)
+ return 0;
+
+ ParagraphList::iterator it = paragraphs.begin();
+ ParagraphList::iterator end = paragraphs.end();
+ for (; it != end; ++it) {
+ if (it->id() == id) {
+ return &*it;
}
- Paragraph * tmp = par->getParFromID(id);
+ Paragraph * tmp = it->getParFromID(id);
if (tmp) {
return tmp;
}
- 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;
+}
+
+
+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 * tmp = dep_clean;
+ while (tmp) {
+ tmp->clean = false;
+ tmp = tmp->next;
+ }
+}
+
+
+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);
+}