#include "lyxfont.h"
#include "version.h"
#include "mathed/formulamacro.h"
-#include "insets/lyxinset.h"
+#include "mathed/formula.h"
+#include "insets/inset.h"
#include "insets/inseterror.h"
#include "insets/insetlabel.h"
#include "insets/insetref.h"
#include "exporter.h"
#include "Lsstream.h"
#include "converter.h"
+#include "BufferView.h"
+#include "ParagraphParameters.h"
-using std::stringstream;
using std::ostream;
using std::ofstream;
using std::ifstream;
namespace {
-const int LYX_FORMAT = 218;
+const int LYX_FORMAT = 220;
} // namespace anon
DestroyBufferTmpDir(tmppath);
}
- LyXParagraph * par = paragraph;
- LyXParagraph * tmppar;
+ Paragraph * par = paragraph;
+ Paragraph * tmppar;
while (par) {
tmppar = par->next();
delete par;
string const Buffer::getLatexName(bool no_path) const
{
+ string name = ChangeExtension(MakeLatexName(filename), ".tex");
if (no_path)
- return OnlyFilename(ChangeExtension(MakeLatexName(filename),
- ".tex"));
+ return OnlyFilename(name);
else
- return ChangeExtension(MakeLatexName(filename),
- ".tex");
+ return name;
}
defaults.params = params;
// add an empty paragraph. Is this enough?
- defaults.paragraph = new LyXParagraph;
+ defaults.paragraph = new Paragraph;
return defaults.writeFile(defaults.filename, false);
}
}
+// We'll remove this later. (Lgb)
+namespace {
+
+string last_inset_read;
+
+struct ErtComp
+{
+ ErtComp() : active(false), in_tabular(false) {
+ }
+ string contents;
+ bool active;
+ bool in_tabular;
+};
+
+std::stack<ErtComp> ert_stack;
+ErtComp ert_comp;
+
+
+} // anon
+
+
+int unknown_layouts;
+
// candidate for move to BufferView
// (at least some parts in the beginning of the func)
//
// if par = 0 normal behavior
// else insert behavior
// Returns false if "\the_end" is not read for formats >= 2.13. (Asger)
-bool Buffer::readLyXformat2(LyXLex & lex, LyXParagraph * par)
+bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par)
{
+ unknown_layouts = 0;
+#ifdef NO_LATEX
+ ert_comp.contents.erase();
+ ert_comp.active = false;
+ ert_comp.in_tabular = false;
+#endif
+
int pos = 0;
- char depth = 0; // signed or unsigned?
+ Paragraph::depth_type depth = 0;
bool the_end_read = false;
- LyXParagraph * return_par = 0;
+ Paragraph * first_par = 0;
LyXFont font(LyXFont::ALL_INHERIT, params.language);
if (file_format < 216 && params.language->lang() == "hebrew")
font.setLanguage(default_language);
- // If we are inserting, we cheat and get a token in advance
- bool has_token = false;
- string pretoken;
if (!par) {
- par = new LyXParagraph;
+ par = new Paragraph;
} else {
- users->text->BreakParagraph(users);
- return_par = users->text->FirstParagraph();
+ // We are inserting into an existing document
+ users->text->breakParagraph(users);
+ first_par = users->text->firstParagraph();
pos = 0;
markDirty();
// We don't want to adopt the parameters from the
// document we insert, so we skip until the text begins:
while (lex.IsOK()) {
lex.nextToken();
- pretoken = lex.GetString();
+ string const pretoken = lex.GetString();
if (pretoken == "\\layout") {
- has_token = true;
+ lex.pushToken(pretoken);
break;
}
}
}
while (lex.IsOK()) {
- if (has_token) {
- has_token = false;
- } else {
- lex.nextToken();
- pretoken = lex.GetString();
- }
+ lex.nextToken();
+ string const token = lex.GetString();
- if (pretoken.empty()) continue;
+ if (token.empty()) continue;
+
+ lyxerr[Debug::PARSER] << "Handling token: `"
+ << token << "'" << endl;
the_end_read =
- parseSingleLyXformat2Token(lex, par, return_par,
- pretoken, pos, depth,
- font
- );
+ parseSingleLyXformat2Token(lex, par, first_par,
+ token, pos, depth,
+ font);
}
- if (!return_par)
- return_par = par;
+ if (!first_par)
+ first_par = par;
- paragraph = return_par;
-
- return the_end_read;
-}
+ paragraph = first_par;
+ if (unknown_layouts > 0) {
+ string s = _("Couldn't set the layout for ");
+ if (unknown_layouts == 1) {
+ s += _("one paragraph");
+ } else {
+ s += tostr(unknown_layouts);
+ s += _(" paragraphs");
+ }
+ WriteAlert(_("Textclass Loading Error!"), s,
+ _("When reading " + fileName()));
+ }
-// We'll remove this later. (Lgb)
-namespace {
+ return the_end_read;
+}
-string last_inset_read;
-} // anon
+void Buffer::insertErtContents(Paragraph * par, int & pos,
+ LyXFont const & font, bool set_inactive)
+{
+ if (!ert_comp.contents.empty()) {
+ lyxerr[Debug::INSETS] << "ERT contents:\n"
+ << ert_comp.contents << endl;
+ Inset * inset = new InsetERT(ert_comp.contents);
+ par->insertInset(pos++, inset, font);
+ ert_comp.contents.erase();
+ }
+ if (set_inactive) {
+ ert_comp.active = false;
+ }
+}
bool
-Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
- LyXParagraph *& return_par,
+Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
+ Paragraph *& first_par,
string const & token, int & pos,
- char & depth, LyXFont & font
+ Paragraph::depth_type & depth,
+ LyXFont & font
)
{
bool the_end_read = false;
static int call_depth;
++call_depth;
bool checkminipage = false;
- static LyXParagraph * minipar;
- static LyXParagraph * parBeforeMinipage;
+ static Paragraph * minipar;
+ static Paragraph * parBeforeMinipage;
#endif
if (token[0] != '\\') {
+#ifdef NO_LATEX
+ 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);
+ cit != token.end(); ++cit) {
+ par->insertChar(pos, (*cit), font);
++pos;
}
checkminipage = true;
+#ifdef NO_LATEX
+ }
+#endif
} else if (token == "\\i") {
Inset * inset = new InsetLatexAccent;
- inset->Read(this, lex);
- par->InsertInset(pos, inset, font);
+ inset->read(this, lex);
+ par->insertInset(pos, inset, font);
++pos;
} else if (token == "\\layout") {
+#ifdef NO_LATEX
+ ert_comp.in_tabular = false;
+ // Do the insetert.
+ insertErtContents(par, pos, font);
+#endif
lex.EatLine();
string const layoutname = lex.GetString();
pair<bool, LyXTextClass::LayoutList::size_type> pp
= textclasslist.NumberOfLayout(params.textclass,
layoutname);
+#ifdef NO_LATEX
+ if (compare_no_case(layoutname, "latex") == 0) {
+ ert_comp.active = true;
+ }
+#endif
#ifdef USE_CAPTION
// The is the compability reading of layout caption.
// It can be removed in LyX version 1.3.0. (Lgb)
++pos;
} else {
#endif
- if (!return_par)
- return_par = par;
+ if (!first_par)
+ first_par = par;
else {
- par->fitToSize();
- par = new LyXParagraph(par);
+ par = new Paragraph(par);
}
pos = 0;
if (pp.first) {
// layout not found
// use default layout "Standard" (0)
par->layout = 0;
+ ++unknown_layouts;
+ string const s = _("Layout had to be changed from\n")
+ + layoutname + _(" to ")
+ + textclasslist.NameOfLayout(params.textclass, par->layout);
+ InsetError * new_inset = new InsetError(s);
+ par->insertInset(0, new_inset);
}
// Test whether the layout is obsolete.
LyXLayout const & layout =
.NumberOfLayout(params.textclass,
layout.obsoleted_by())
.second;
- par->params.depth(depth);
+ par->params().depth(depth);
font = LyXFont(LyXFont::ALL_INHERIT, params.language);
if (file_format < 216
&& params.language->lang() == "hebrew")
istringstream istr(old_float.str());
LyXLex nylex(0, 0);
nylex.setStream(istr);
- inset->Read(this, nylex);
- par->InsertInset(pos, inset, font);
+ inset->read(this, nylex);
+ par->insertInset(pos, inset, font);
++pos;
} else if (token == "\\begin_deeper") {
++depth;
lex.EatLine();
params.fonts = lex.GetString();
} else if (token == "\\noindent") {
- par->params.noindent(true);
+ par->params().noindent(true);
} else if (token == "\\fill_top") {
- par->params.spaceTop(VSpace(VSpace::VFILL));
+ par->params().spaceTop(VSpace(VSpace::VFILL));
} else if (token == "\\fill_bottom") {
- par->params.spaceBottom(VSpace(VSpace::VFILL));
+ par->params().spaceBottom(VSpace(VSpace::VFILL));
} else if (token == "\\line_top") {
- par->params.lineTop(true);
+ par->params().lineTop(true);
} else if (token == "\\line_bottom") {
- par->params.lineBottom(true);
+ par->params().lineBottom(true);
} else if (token == "\\pagebreak_top") {
- par->params.pagebreakTop(true);
+ par->params().pagebreakTop(true);
} else if (token == "\\pagebreak_bottom") {
- par->params.pagebreakBottom(true);
+ par->params().pagebreakBottom(true);
} else if (token == "\\start_of_appendix") {
- par->params.startOfAppendix(true);
+ par->params().startOfAppendix(true);
} else if (token == "\\paragraph_separation") {
int tmpret = lex.FindToken(string_paragraph_separation);
if (tmpret == -1) ++tmpret;
}
// Small hack so that files written with klyx will be
// parsed correctly.
- if (return_par) {
- par->params.spacing(Spacing(tmp_space, tmp_val));
+ if (first_par) {
+ par->params().spacing(Spacing(tmp_space, tmp_val));
} else {
params.spacing.set(tmp_space, tmp_val);
}
lex.next();
string const tmp = strip(lex.GetString());
if (tmp == "single") {
- par->params.spacing(Spacing(Spacing::Single));
+ par->params().spacing(Spacing(Spacing::Single));
} else if (tmp == "onehalf") {
- par->params.spacing(Spacing(Spacing::Onehalf));
+ par->params().spacing(Spacing(Spacing::Onehalf));
} else if (tmp == "double") {
- par->params.spacing(Spacing(Spacing::Double));
+ par->params().spacing(Spacing(Spacing::Double));
} else if (tmp == "other") {
lex.next();
- par->params.spacing(Spacing(Spacing::Other,
+ par->params().spacing(Spacing(Spacing::Other,
lex.GetFloat()));
} else {
lex.printError("Unknown spacing token: '$$Token'");
} else if (token == "\\size") {
lex.next();
font.setLyXSize(lex.GetString());
+#ifndef NO_LATEX
+#ifdef WITH_WARNINGS
+#warning compatability hack needed
+#endif
} else if (token == "\\latex") {
lex.next();
string const tok = lex.GetString();
else
lex.printError("Unknown LaTeX font flag "
"`$$Token'");
+#else
+ } else if (token == "\\latex") {
+ lex.next();
+ string const tok = lex.GetString();
+ if (tok == "no_latex") {
+ // Do the insetert.
+ insertErtContents(par, pos, font);
+ } else if (tok == "latex") {
+ ert_comp.active = true;
+ } else if (tok == "default") {
+ // Do the insetert.
+ insertErtContents(par, pos, font);
+ } else {
+ lex.printError("Unknown LaTeX font flag "
+ "`$$Token'");
+ }
+#endif
} else if (token == "\\lang") {
lex.next();
string const tok = lex.GetString();
if (tmpret != LYX_LAYOUT_DEFAULT) { // tmpret != 99 ???
int const tmpret2 = int(pow(2.0, tmpret));
//lyxerr << "Tmpret2 = " << tmpret2 << endl;
- par->params.align(LyXAlignment(tmpret2));
+ par->params().align(LyXAlignment(tmpret2));
}
} else if (token == "\\added_space_top") {
lex.nextToken();
- par->params.spaceTop(VSpace(lex.GetString()));
+ par->params().spaceTop(VSpace(lex.GetString()));
} else if (token == "\\added_space_bottom") {
lex.nextToken();
- par->params.spaceBottom(VSpace(lex.GetString()));
+ par->params().spaceBottom(VSpace(lex.GetString()));
#ifndef NO_PEXTRA_REALLY
} else if (token == "\\pextra_type") {
lex.nextToken();
- par->params.pextraType(lex.GetInteger());
+ par->params().pextraType(lex.GetInteger());
} else if (token == "\\pextra_width") {
lex.nextToken();
- par->params.pextraWidth(lex.GetString());
+ par->params().pextraWidth(lex.GetString());
} else if (token == "\\pextra_widthp") {
lex.nextToken();
- par->params.pextraWidthp(lex.GetString());
+ par->params().pextraWidthp(lex.GetString());
} else if (token == "\\pextra_alignment") {
lex.nextToken();
- par->params.pextraAlignment(lex.GetInteger());
+ par->params().pextraAlignment(lex.GetInteger());
} else if (token == "\\pextra_hfill") {
lex.nextToken();
- par->params.pextraHfill(lex.GetInteger());
+ par->params().pextraHfill(lex.GetInteger());
} else if (token == "\\pextra_start_minipage") {
lex.nextToken();
- par->params.pextraStartMinipage(lex.GetInteger());
+ par->params().pextraStartMinipage(lex.GetInteger());
#endif
} else if (token == "\\labelwidthstring") {
lex.EatLine();
- par->params.labelWidthString(lex.GetString());
+ par->params().labelWidthString(lex.GetString());
// do not delete this token, it is still needed!
} else if (token == "\\end_inset") {
lyxerr << "Solitary \\end_inset. Missing \\begin_inset?.\n"
// But insets should read it, it is a part of
// the inset isn't it? Lgb.
} else if (token == "\\begin_inset") {
+#ifdef NO_LATEX
+ insertErtContents(par, pos, font, false);
+ ert_stack.push(ert_comp);
+ ert_comp = ErtComp();
+#endif
readInset(lex, par, pos, font);
+#ifdef NO_LATEX
+ ert_comp = ert_stack.top();
+ ert_stack.pop();
+#endif
} else if (token == "\\SpecialChar") {
LyXLayout const & layout =
textclasslist.Style(params.textclass,
- par->GetLayout());
+ par->getLayout());
// Insets don't make sense in a free-spacing context! ---Kayvan
if (layout.free_spacing) {
lex.next();
string next_token = lex.GetString();
if (next_token == "\\-") {
- par->InsertChar(pos, '-', font);
+ par->insertChar(pos, '-', font);
} else if (next_token == "\\protected_separator"
|| next_token == "~") {
- par->InsertChar(pos, ' ', font);
+ par->insertChar(pos, ' ', font);
} else {
lex.printError("Token `$$Token' "
"is in free space "
}
} else {
Inset * inset = new InsetSpecialChar;
- inset->Read(this, lex);
- par->InsertInset(pos, inset, font);
+ inset->read(this, lex);
+ par->insertInset(pos, inset, font);
}
++pos;
} else if (token == "\\newline") {
- par->InsertChar(pos, LyXParagraph::META_NEWLINE, font);
+#ifdef NO_LATEX
+
+ 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, font, false);
+
+ par->insertChar(pos, Paragraph::META_NEWLINE, font);
+ ++pos;
+ }
+#else
+ par->insertChar(pos, Paragraph::META_NEWLINE, font);
++pos;
+#endif
} else if (token == "\\LyXTable") {
+#ifdef NO_LATEX
+ ert_comp.in_tabular = true;
+#endif
Inset * inset = new InsetTabular(*this);
- inset->Read(this, lex);
- par->InsertInset(pos, inset, font);
+ inset->read(this, lex);
+ par->insertInset(pos, inset, font);
++pos;
// because of OLD_TABULAR_READ where tabulars have been
// one paragraph.
checkminipage = true;
} else if (token == "\\hfill") {
- par->InsertChar(pos, LyXParagraph::META_HFILL, font);
+ par->insertChar(pos, Paragraph::META_HFILL, font);
++pos;
} else if (token == "\\protected_separator") { // obsolete
// This is a backward compability thingie. (Lgb)
// 2.16. (Lgb)
LyXLayout const & layout =
textclasslist.Style(params.textclass,
- par->GetLayout());
+ par->getLayout());
if (layout.free_spacing) {
- par->InsertChar(pos, ' ', font);
+ par->insertChar(pos, ' ', font);
} else {
Inset * inset = new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
- par->InsertInset(pos, inset, font);
+ par->insertInset(pos, inset, font);
}
++pos;
} else if (token == "\\bibitem") { // ale970302
InsetCommandParams p("bibitem", "dummy");
par->bibkey = new InsetBibKey(p);
}
- par->bibkey->Read(this, lex);
+ par->bibkey->read(this, lex);
} else if (token == "\\backslash") {
- par->InsertChar(pos, '\\', font);
+#ifdef NO_LATEX
+ if (ert_comp.active) {
+ ert_comp.contents += "\\";
+ } else {
+#endif
+ par->insertChar(pos, '\\', font);
++pos;
+#ifdef NO_LATEX
+ }
+#endif
} else if (token == "\\the_end") {
+#ifdef NO_LATEX
+ //Â If we still have some ert active here we have to insert
+ // it so we don't loose it. (Lgb)
+ insertErtContents(par, pos, font);
+#endif
the_end_read = true;
minipar = parBeforeMinipage = 0;
} else {
+#ifdef NO_LATEX
+ if (ert_comp.active) {
+ ert_comp.contents += token;
+ } else {
+#endif
// This should be insurance for the future: (Asger)
lex.printError("Unknown token `$$Token'. "
"Inserting as text.");
string::const_iterator cit = token.begin();
string::const_iterator end = token.end();
for (; cit != end; ++cit) {
- par->InsertChar(pos, (*cit), font);
+ par->insertChar(pos, (*cit), font);
++pos;
}
+#ifdef NO_LATEX
+ }
+#endif
}
#ifndef NO_PEXTRA_REALLY
// now check if we have a minipage paragraph as at this
if (checkminipage && (call_depth == 1)) {
checkminipage = false;
if (minipar && (minipar != par) &&
- (par->params.pextraType()==LyXParagraph::PEXTRA_MINIPAGE))
+ (par->params().pextraType()==Paragraph::PEXTRA_MINIPAGE))
{
lyxerr << "minipages in a row" << endl;
- if (par->params.pextraStartMinipage()) {
+ if (par->params().pextraStartMinipage()) {
lyxerr << "start new minipage" << endl;
// minipages in a row
par->previous()->next(0);
par->previous(0);
- LyXParagraph * tmp = minipar;
+ 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->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())
+ if (par->params().pextraStartMinipage() &&
+ !par->params().pextraHfill())
{
- LyXParagraph * p = new LyXParagraph;
+ Paragraph * p = new Paragraph;
p->layout = 0;
p->previous(parBeforeMinipage);
parBeforeMinipage->next(p);
p->next(0);
- p->params.depth(parBeforeMinipage->params.depth());
+ p->params().depth(parBeforeMinipage->params().depth());
parBeforeMinipage = p;
}
InsetMinipage * mini = new InsetMinipage;
- mini->pos(static_cast<InsetMinipage::Position>(par->params.pextraAlignment()));
- mini->width(par->params.pextraWidth());
- if (!par->params.pextraWidthp().empty()) {
+ mini->pos(static_cast<InsetMinipage::Position>(par->params().pextraAlignment()));
+ mini->width(par->params().pextraWidth());
+ if (!par->params().pextraWidthp().empty()) {
lyxerr << "WP:" << mini->width() << endl;
- mini->width(tostr(par->params.pextraWidthp())+"%");
+ mini->width(tostr(par->params().pextraWidthp())+"%");
}
- mini->inset.par = par;
+ mini->inset.paragraph(par);
// Insert the minipage last in the
// previous paragraph.
- if (par->params.pextraHfill()) {
- parBeforeMinipage->InsertChar
- (parBeforeMinipage->size(), LyXParagraph::META_HFILL);
+ if (par->params().pextraHfill()) {
+ parBeforeMinipage->insertChar
+ (parBeforeMinipage->size(), Paragraph::META_HFILL);
}
- parBeforeMinipage->InsertInset
+ parBeforeMinipage->insertInset
(parBeforeMinipage->size(), mini);
minipar = par;
par->previous()->next(0);
par->previous(parBeforeMinipage);
parBeforeMinipage->next(par);
- LyXParagraph * tmp = minipar;
+ 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->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();
+ depth = parBeforeMinipage->params().depth();
minipar = parBeforeMinipage = 0;
} else if (!minipar &&
- (par->params.pextraType() == LyXParagraph::PEXTRA_MINIPAGE))
+ (par->params().pextraType() == Paragraph::PEXTRA_MINIPAGE))
{
// par is the first paragraph in a minipage
lyxerr << "begin minipage" << endl;
// the first minipage in
// a sequence of minipages
// in its own paragraph.
- LyXParagraph * p = new LyXParagraph;
+ Paragraph * p = new Paragraph;
p->layout = 0;
p->previous(par->previous());
p->next(0);
- p->params.depth(depth);
- par->params.depth(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 (!return_par || (return_par == par))
- return_par = p;
+ if (!first_par || (first_par == par))
+ first_par = p;
InsetMinipage * mini = new InsetMinipage;
- mini->pos(static_cast<InsetMinipage::Position>(minipar->params.pextraAlignment()));
- mini->width(minipar->params.pextraWidth());
- if (!par->params.pextraWidthp().empty()) {
+ mini->pos(static_cast<InsetMinipage::Position>(minipar->params().pextraAlignment()));
+ mini->width(minipar->params().pextraWidth());
+ if (!par->params().pextraWidthp().empty()) {
lyxerr << "WP:" << mini->width() << endl;
- mini->width(tostr(par->params.pextraWidthp())+"%");
+ mini->width(tostr(par->params().pextraWidthp())+"%");
}
- mini->inset.par = minipar;
+ mini->inset.paragraph(minipar);
// Insert the minipage last in the
// previous paragraph.
- if (minipar->params.pextraHfill()) {
- parBeforeMinipage->InsertChar
- (parBeforeMinipage->size(),LyXParagraph::META_HFILL);
+ if (minipar->params().pextraHfill()) {
+ parBeforeMinipage->insertChar
+ (parBeforeMinipage->size(),Paragraph::META_HFILL);
}
- parBeforeMinipage->InsertInset
+ parBeforeMinipage->insertInset
(parBeforeMinipage->size(), mini);
}
}
}
-void Buffer::readInset(LyXLex & lex, LyXParagraph *& par,
+void Buffer::readInset(LyXLex & lex, Paragraph *& par,
int & pos, LyXFont & font)
{
// consistency check
// test the different insets
if (tmptok == "LatexCommand") {
InsetCommandParams inscmd;
- inscmd.Read(lex);
+ inscmd.read(lex);
string const cmdName = inscmd.getCmdName();
inset = new InsetFloatList;
}
- if (inset) inset->Read(this, lex);
+ if (inset) inset->read(this, lex);
}
if (inset) {
- par->InsertInset(pos, inset, font);
+ par->insertInset(pos, inset, font);
++pos;
}
}
-bool Buffer::readFile(LyXLex & lex, LyXParagraph * par)
+bool Buffer::readFile(LyXLex & lex, Paragraph * par)
{
if (lex.IsOK()) {
lex.next();
}
-
// Should probably be moved to somewhere else: BufferView? LyXView?
bool Buffer::save() const
{
_exit(0)
*/
- // Should proabaly have some more error checking here.
+ // Should probably have some more error checking here.
// Should be cleaned up in 0.13, at least a bit.
// Doing it this way, also makes the inodes stay the same.
// This is still not a very good solution, in particular we
}
} else {
lyxerr << "LyX was not able to make "
- "backupcopy. Beware." << endl;
+ "backup copy. Beware." << endl;
}
}
}
// now write out the buffer paramters.
params.writeFile(ofs);
- char depth = 0;
+ Paragraph::depth_type depth = 0;
// this will write out all the paragraphs
// using recursive descent.
}
-string const Buffer::asciiParagraph(LyXParagraph const * par,
+string const Buffer::asciiParagraph(Paragraph const * par,
unsigned int linelen) const
{
ostringstream buffer;
- char depth = 0;
+ Paragraph::depth_type depth = 0;
int ltype = 0;
- int ltype_depth = 0;
+ Paragraph::depth_type ltype_depth = 0;
unsigned int currlinelen = 0;
bool ref_printed = false;
int islatex = 0;
if (!par->previous()) {
// begins or ends a deeper area ?
- if (depth != par->params.depth()) {
- if (par->params.depth() > depth) {
- while (par->params.depth() > depth) {
+ if (depth != par->params().depth()) {
+ if (par->params().depth() > depth) {
+ while (par->params().depth() > depth) {
++depth;
}
} else {
- while (par->params.depth() < depth) {
+ while (par->params().depth() < depth) {
--depth;
}
}
} else {
lyxerr << "Should this ever happen?" << endl;
}
-
+
+#ifndef NO_LATEX
LyXFont const font1 = LyXFont(LyXFont::ALL_INHERIT, params.language);
- for (LyXParagraph::size_type i = 0; i < par->size(); ++i) {
+#endif
+ for (Paragraph::size_type i = 0; i < par->size(); ++i) {
if (!i && !noparbreak) {
if (linelen > 0)
buffer << "\n\n";
- for (char j = 0; j < depth; ++j)
+ for (Paragraph::depth_type j = 0; j < depth; ++j)
buffer << " ";
currlinelen = depth * 2;
switch (ltype) {
}
break;
default:
- buffer << par->params.labelString() << " ";
+ buffer << par->params().labelString() << " ";
break;
}
if (ltype_depth > depth) {
- for (char j = ltype_depth - 1; j > depth; --j)
+ for (Paragraph::depth_type j = ltype_depth - 1;
+ j > depth; --j)
buffer << " ";
currlinelen += (ltype_depth-depth)*2;
}
}
- LyXFont const font2 = par->GetFontSettings(params, i);
+#ifndef NO_LATEX
+ LyXFont const font2 = par->getFontSettings(params, i);
if (font1.latex() != font2.latex()) {
if (font2.latex() == LyXFont::OFF)
islatex = 0;
} else {
islatex = 0;
}
+#endif
- char c = par->GetUChar(params, i);
+ char c = par->getUChar(params, i);
if (islatex)
continue;
switch (c) {
- case LyXParagraph::META_INSET:
+ case Paragraph::META_INSET:
{
- Inset const * inset = par->GetInset(i);
+ Inset const * inset = par->getInset(i);
if (inset) {
- if (!inset->Ascii(this, buffer)) {
+ if (!inset->ascii(this, buffer)) {
string dummy;
string const s =
rsplit(buffer.str().c_str(),
}
break;
- case LyXParagraph::META_NEWLINE:
+ case Paragraph::META_NEWLINE:
if (linelen > 0) {
buffer << "\n";
- for (char j = 0; j < depth; ++j)
+ for (Paragraph::depth_type j = 0;
+ j < depth; ++j)
buffer << " ";
}
currlinelen = depth * 2;
if (ltype_depth > depth) {
- for (char j = ltype_depth;
- j > depth; --j)
+ for (Paragraph::depth_type j = ltype_depth;
+ j > depth; --j)
buffer << " ";
currlinelen += (ltype_depth - depth) * 2;
}
break;
- case LyXParagraph::META_HFILL:
+ case Paragraph::META_HFILL:
buffer << "\t";
break;
(c == ' ') && ((i + 2) < par->size()))
{
buffer << "\n";
- for (char j = 0; j < depth; ++j)
+ for (Paragraph::depth_type j = 0;
+ j < depth; ++j)
buffer << " ";
currlinelen = depth * 2;
if (ltype_depth > depth) {
- for (char j = ltype_depth;
+ for (Paragraph::depth_type j = ltype_depth;
j > depth; --j)
buffer << " ";
currlinelen += (ltype_depth-depth)*2;
} else if (c != '\0')
buffer << c;
else if (c == '\0')
- lyxerr.debug() << "writeAsciiFile: NULL char in structure." << endl;
+ lyxerr[Debug::INFO] << "writeAsciiFile: NULL char in structure." << endl;
++currlinelen;
break;
}
void Buffer::writeFileAscii(ostream & ofs, int linelen)
{
- LyXParagraph * par = paragraph;
+ Paragraph * par = paragraph;
while (par) {
ofs << asciiParagraph(par, linelen);
par = par->next();
texrow.newline();
texrow.newline();
}
- lyxerr.debug() << "lyx header finished" << endl;
+ lyxerr[Debug::INFO] << "lyx header finished" << endl;
// There are a few differences between nice LaTeX and usual files:
// usual is \batchmode and has a
// special input@path to allow the including of figures
ofs << "\\begin{document}\n";
texrow.newline();
} // only_body
- lyxerr.debug() << "preamble finished, now the body." << endl;
+ lyxerr[Debug::INFO] << "preamble finished, now the body." << endl;
if (!lyxrc.language_auto_begin) {
ofs << subst(lyxrc.language_command_begin, "$$lang",
lyxerr << "File was not closed properly." << endl;
}
- lyxerr.debug() << "Finished making latex file." << endl;
+ lyxerr[Debug::INFO] << "Finished making latex file." << endl;
}
//
// LaTeX all paragraphs from par to endpar, if endpar == 0 then to the end
//
-void Buffer::latexParagraphs(ostream & ofs, LyXParagraph * par,
- LyXParagraph * endpar, TexRow & texrow) const
+void Buffer::latexParagraphs(ostream & ofs, Paragraph * par,
+ Paragraph * endpar, TexRow & texrow) const
{
bool was_title = false;
bool already_title = false;
}
-void Buffer::sgmlOpenTag(ostream & os, int depth,
+void Buffer::sgmlOpenTag(ostream & os, Paragraph::depth_type depth,
string const & latexname) const
{
if (!latexname.empty() && latexname != "!-- --")
- os << string(depth, ' ') << "<" << latexname << ">\n";
+ os << "<!-- " << depth << " -->" << "<" << latexname << ">";
+ //os << string(depth, ' ') << "<" << latexname << ">\n";
}
-void Buffer::sgmlCloseTag(ostream & os, int depth,
+void Buffer::sgmlCloseTag(ostream & os, Paragraph::depth_type depth,
string const & latexname) const
{
if (!latexname.empty() && latexname != "!-- --")
- os << string(depth, ' ') << "</" << latexname << ">\n";
+ os << "<!-- " << depth << " -->" << "</" << latexname << ">\n";
+ //os << string(depth, ' ') << "</" << latexname << ">\n";
}
<< " created this file. For more info see http://www.lyx.org/"
<< " -->\n";
- int depth = 0; // paragraph depth
- LyXParagraph * par = paragraph;
+ Paragraph::depth_type depth = 0; // paragraph depth
+ Paragraph * par = paragraph;
string item_name;
vector<string> environment_stack(5);
par->layout);
// treat <toc> as a special case for compatibility with old code
- if (par->GetChar(0) == LyXParagraph::META_INSET) {
- Inset * inset = par->GetInset(0);
- Inset::Code lyx_code = inset->LyxCode();
+ if (par->getChar(0) == Paragraph::META_INSET) {
+ Inset * inset = par->getInset(0);
+ Inset::Code lyx_code = inset->lyxCode();
if (lyx_code == Inset::TOC_CODE){
string const temp = "toc";
sgmlOpenTag(ofs, depth, temp);
}
// environment tag closing
- for (; depth > par->params.depth(); --depth) {
+ for (; depth > par->params().depth(); --depth) {
sgmlCloseTag(ofs, depth, environment_stack[depth]);
environment_stack[depth].erase();
}
// write opening SGML tags
switch (style.latextype) {
case LATEX_PARAGRAPH:
- if (depth == par->params.depth()
+ if (depth == par->params().depth()
&& !environment_stack[depth].empty()) {
sgmlCloseTag(ofs, depth, environment_stack[depth]);
environment_stack[depth].erase();
case LATEX_COMMAND:
if (depth!= 0)
- LinuxDocError(par, 0,
+ linuxDocError(par, 0,
_("Error : Wrong depth for"
" LatexType Command.\n"));
case LATEX_ENVIRONMENT:
case LATEX_ITEM_ENVIRONMENT:
- if (depth == par->params.depth()
+ if (depth == par->params().depth()
&& environment_stack[depth] != style.latexname()) {
sgmlCloseTag(ofs, depth,
environment_stack[depth]);
environment_stack[depth].erase();
}
- if (depth < par->params.depth()) {
- depth = par->params.depth();
+ if (depth < par->params().depth()) {
+ depth = par->params().depth();
environment_stack[depth].erase();
}
if (environment_stack[depth] != style.latexname()) {
break;
}
- SimpleLinuxDocOnePar(ofs, par, depth);
+ simpleLinuxDocOnePar(ofs, par, depth);
par = par->next();
}
-void Buffer::DocBookHandleCaption(ostream & os, string & inner_tag,
- int depth, int desc_on,
- LyXParagraph * & par)
+void Buffer::docBookHandleCaption(ostream & os, string & inner_tag,
+ Paragraph::depth_type depth, int desc_on,
+ Paragraph * & par)
{
- LyXParagraph * tpar = par;
+ Paragraph * tpar = par;
while (tpar
&& (tpar->layout != textclasslist.NumberOfLayout(params.textclass,
"Caption").second))
"Caption").second) {
sgmlOpenTag(os, depth + 1, inner_tag);
string extra_par;
- SimpleDocBookOnePar(os, extra_par, tpar,
+ simpleDocBookOnePar(os, extra_par, tpar,
desc_on, depth + 2);
sgmlCloseTag(os, depth+1, inner_tag);
if (!extra_par.empty())
// Handle internal paragraph parsing -- layout already processed.
-void Buffer::SimpleLinuxDocOnePar(ostream & os,
- LyXParagraph * par, int /*depth*/)
+void Buffer::simpleLinuxDocOnePar(ostream & os,
+ Paragraph * par,
+ Paragraph::depth_type /*depth*/)
{
LyXLayout const & style = textclasslist.Style(params.textclass,
- par->GetLayout());
+ par->getLayout());
string::size_type char_line_count = 5; // Heuristic choice ;-)
// gets paragraph main font
stack < PAR_TAG > tag_state;
// parsing main loop
- for (LyXParagraph::size_type i = 0; i < par->size(); ++i) {
+ for (Paragraph::size_type i = 0; i < par->size(); ++i) {
PAR_TAG tag_close = NONE;
list < PAR_TAG > tag_open;
os << "<" << tag_name(*j) << ">";
}
- char c = par->GetChar(i);
+ char c = par->getChar(i);
- if (c == LyXParagraph::META_INSET) {
- Inset * inset = par->GetInset(i);
- inset->Linuxdoc(this, os);
+ if (c == Paragraph::META_INSET) {
+ Inset * inset = par->getInset(i);
+ inset->linuxdoc(this, os);
font_old = font;
continue;
}
- if (font.latex() == LyXFont::ON || style.latexparam() == "CDATA") {
+ if (
+#ifndef NO_LATEX
+ font.latex() == LyXFont::ON ||
+#endif
+ style.latexparam() == "CDATA") {
// "TeX"-Mode on == > SGML-Mode on.
if (c != '\0')
os << c;
// Print an error message.
-void Buffer::LinuxDocError(LyXParagraph * par, int pos,
+void Buffer::linuxDocError(Paragraph * par, int pos,
string const & message)
{
// insert an error marker in text
InsetError * new_inset = new InsetError(message);
- par->InsertInset(pos, new_inset);
+ par->insertInset(pos, new_inset);
}
return;
}
- LyXParagraph * par = paragraph;
+ Paragraph * par = paragraph;
niceFile = nice; // this will be used by Insetincludes.
vector<string> command_stack(10);
bool command_flag = false;
- int command_depth = 0;
- int command_base = 0;
- int cmd_depth = 0;
- int depth = 0; // paragraph depth
+ Paragraph::depth_type command_depth = 0;
+ Paragraph::depth_type command_base = 0;
+ Paragraph::depth_type cmd_depth = 0;
+ Paragraph::depth_type depth = 0; // paragraph depth
string item_name;
string command_name;
par->layout);
// environment tag closing
- for (; depth > par->params.depth(); --depth) {
+ for (; depth > par->params().depth(); --depth) {
if (environment_inner[depth] != "!-- --") {
item_name = "listitem";
sgmlCloseTag(ofs, command_depth + depth,
environment_inner[depth].erase();
}
- if (depth == par->params.depth()
+ if (depth == par->params().depth()
&& environment_stack[depth] != style.latexname()
&& !environment_stack[depth].empty()) {
if (environment_inner[depth] != "!-- --") {
case LATEX_COMMAND:
if (depth != 0)
- LinuxDocError(par, 0,
+ linuxDocError(par, 0,
_("Error : Wrong depth for "
"LatexType Command.\n"));
if (command_flag) {
if (cmd_depth < command_base) {
- for (int j = command_depth; j >= command_base; --j)
+ for (Paragraph::depth_type j = command_depth; j >= command_base; --j)
sgmlCloseTag(ofs, j, command_stack[j]);
command_depth = command_base = cmd_depth;
} else if (cmd_depth <= command_depth) {
- for (int j = command_depth; j >= cmd_depth; --j)
+ for (int j = command_depth; j >= int(cmd_depth); --j)
sgmlCloseTag(ofs, j, command_stack[j]);
command_depth = cmd_depth;
} else
command_flag = true;
}
if (command_stack.size() == command_depth + 1)
- command_stack.push_back("");
+ command_stack.push_back(string());
command_stack[command_depth] = command_name;
// treat label as a special case for
// more WYSIWYM handling.
- if (par->GetChar(0) == LyXParagraph::META_INSET) {
- Inset * inset = par->GetInset(0);
- Inset::Code lyx_code = inset->LyxCode();
+ if (par->getChar(0) == Paragraph::META_INSET) {
+ Inset * inset = par->getInset(0);
+ Inset::Code lyx_code = inset->lyxCode();
if (lyx_code == Inset::LABEL_CODE){
command_name += " id=\"";
command_name += (static_cast<InsetCommand *>(inset))->getContents();
case LATEX_ENVIRONMENT:
case LATEX_ITEM_ENVIRONMENT:
- if (depth < par->params.depth()) {
- depth = par->params.depth();
+ if (depth < par->params().depth()) {
+ depth = par->params().depth();
environment_stack[depth].erase();
}
}
string extra_par;
- SimpleDocBookOnePar(ofs, extra_par, par, desc_on,
+ simpleDocBookOnePar(ofs, extra_par, par, desc_on,
depth + 1 + command_depth);
par = par->next();
}
// Close open tags
- for (; depth >= 0; --depth) {
+ for (int d = depth; d >= 0; --d) {
if (!environment_stack[depth].empty()) {
if (environment_inner[depth] != "!-- --") {
item_name = "listitem";
}
}
- for (int j = command_depth; j >= command_base; --j)
+ for (int j = command_depth; j >= 0 ; --j)
if (!command_stack[j].empty())
sgmlCloseTag(ofs, j, command_stack[j]);
}
-void Buffer::SimpleDocBookOnePar(ostream & os, string & extra,
- LyXParagraph * par, int & desc_on,
- int depth) const
+void Buffer::simpleDocBookOnePar(ostream & os, string & extra,
+ Paragraph * par, int & desc_on,
+ Paragraph::depth_type depth) const
{
bool emph_flag = false;
LyXLayout const & style = textclasslist.Style(params.textclass,
- par->GetLayout());
+ par->getLayout());
LyXFont font_old = style.labeltype == LABEL_MANUAL ? style.labelfont : style.font;
int char_line_count = depth;
- if (!style.free_spacing)
- os << string(depth,' ');
+ //if (!style.free_spacing)
+ // os << string(depth,' ');
// parsing main loop
- for (LyXParagraph::size_type i = 0;
+ for (Paragraph::size_type i = 0;
i < par->size(); ++i) {
LyXFont font = par->getFont(params, i);
}
}
- char c = par->GetChar(i);
+ char c = par->getChar(i);
- if (c == LyXParagraph::META_INSET) {
- Inset * inset = par->GetInset(i);
- std::ostringstream ost;
- inset->DocBook(this, ost);
+ if (c == Paragraph::META_INSET) {
+ Inset * inset = par->getInset(i);
+ ostringstream ost;
+ inset->docBook(this, ost);
string tmp_out = ost.str().c_str();
//
else
os << tmp_out;
}
+#ifndef NO_LATEX
} else if (font.latex() == LyXFont::ON) {
// "TeX"-Mode on ==> SGML-Mode on.
if (c != '\0')
os << c;
++char_line_count;
+#endif
} else {
string sgml_string;
if (par->linuxDocConvertChar(c, sgml_string)
// <term> not closed...
os << "</term>";
}
- os << '\n';
+ if(style.free_spacing) os << '\n';
}
{
if (!users->text) return 0;
- ProhibitInput(users);
+ users->owner()->prohibitInput();
// get LaTeX-Filename
string const name = getLatexName();
users->redraw();
users->fitCursor(users->text);
}
- AllowInput(users);
+ users->owner()->allowInput();
return res;
}
void Buffer::validate(LaTeXFeatures & features) const
{
- LyXParagraph * par = paragraph;
+ Paragraph * par = paragraph;
LyXTextClass const & tclass =
textclasslist.TextClass(params.textclass);
string lst;
for (inset_iterator it = inset_iterator_begin();
it != inset_iterator_end(); ++it) {
- if ((*it)->LyxCode() == Inset::INCLUDE_CODE) {
+ if ((*it)->lyxCode() == Inset::INCLUDE_CODE) {
InsetInclude * insetinc =
static_cast<InsetInclude *>(*it);
if (insetinc->isIncludeOnly()) {
}
}
}
- lyxerr.debug() << "Includeonly(" << lst << ')' << endl;
+ lyxerr[Debug::INFO] << "Includeonly(" << lst << ')' << endl;
return lst;
}
Buffer::Lists const Buffer::getLists() const
{
Lists l;
- LyXParagraph * par = paragraph;
+ Paragraph * par = paragraph;
bool found;
LyXTextClassList::size_type cap;
boost::tie(found, cap) = textclasslist
while (par) {
char const labeltype =
textclasslist.Style(params.textclass,
- par->GetLayout()).labeltype;
+ par->getLayout()).labeltype;
if (labeltype >= LABEL_COUNTER_CHAPTER
&& labeltype <= LABEL_COUNTER_CHAPTER + params.tocdepth) {
int depth = max(0,
labeltype -
textclasslist.TextClass(params.textclass).maxcounter());
- item.push_back(TocItem(par, depth, par->String(this, true)));
+ item.push_back(TocItem(par, depth, par->asString(this, true)));
}
// For each paragrph, traverse its insets and look for
// FLOAT_CODE
if (found) {
- LyXParagraph::inset_iterator it =
+ Paragraph::inset_iterator it =
par->inset_iterator_begin();
- LyXParagraph::inset_iterator end =
+ Paragraph::inset_iterator end =
par->inset_iterator_end();
for (; it != end; ++it) {
- if ((*it)->LyxCode() == Inset::FLOAT_CODE) {
+ if ((*it)->lyxCode() == Inset::FLOAT_CODE) {
InsetFloat * il =
static_cast<InsetFloat*>(*it);
// Now find the caption in the float...
// We now tranverse the paragraphs of
// the inset...
- LyXParagraph * tmp = il->inset.par;
+ Paragraph * tmp = il->inset.paragraph();
while (tmp) {
if (tmp->layout == cap) {
SingleList & item = l[type];
string const str =
- tostr(item.size()+1) + ". " + tmp->String(this, false);
+ tostr(item.size()+1) + ". " + tmp->asString(this, false);
item.push_back(TocItem(tmp, 0 , str));
}
tmp = tmp->next();
}
vector<pair<string, string> > keys;
- LyXParagraph * par = paragraph;
+ Paragraph * par = paragraph;
while (par) {
if (par->bibkey)
keys.push_back(pair<string, string>(par->bibkey->getContents(),
- par->String(this, false)));
+ par->asString(this, false)));
par = par->next();
}
for (inset_iterator it = inset_iterator_begin();
it != inset_iterator_end(); ++it) {
// Search for Bibtex or Include inset
- if ((*it)->LyxCode() == Inset::BIBTEX_CODE) {
+ if ((*it)->lyxCode() == Inset::BIBTEX_CODE) {
vector<pair<string,string> > tmp =
static_cast<InsetBibtex*>(*it)->getKeys(this);
keys.insert(keys.end(), tmp.begin(), tmp.end());
- } else if ((*it)->LyxCode() == Inset::INCLUDE_CODE) {
+ } else if ((*it)->lyxCode() == Inset::INCLUDE_CODE) {
vector<pair<string,string> > const tmp =
static_cast<InsetInclude*>(*it)->getKeys();
keys.insert(keys.end(), tmp.begin(), tmp.end());
}
-bool Buffer::Dispatch(string const & command)
+bool Buffer::dispatch(string const & command)
{
// Split command string into command and argument
string cmd;
string line = frontStrip(command);
string const arg = strip(frontStrip(split(line, cmd, ' ')));
- return Dispatch(lyxaction.LookupFunc(cmd), arg);
+ return dispatch(lyxaction.LookupFunc(cmd), arg);
}
-bool Buffer::Dispatch(int action, string const & argument)
+bool Buffer::dispatch(int action, string const & argument)
{
bool dispatched = true;
switch (action) {
}
-void Buffer::resize()
-{
- /// resize the BufferViews!
- if (users)
- users->resize();
-}
-
-
void Buffer::resizeInsets(BufferView * bv)
{
/// then remove all LyXText in text-insets
- LyXParagraph * par = paragraph;
+ Paragraph * par = paragraph;
for (; par; par = par->next()) {
par->resizeInsetsLyXText(bv);
}
}
-void Buffer::ChangeLanguage(Language const * from, Language const * to)
+void Buffer::redraw()
+{
+ users->redraw();
+ users->fitCursor(users->text);
+}
+
+
+void Buffer::changeLanguage(Language const * from, Language const * to)
{
- LyXParagraph * par = paragraph;
+ Paragraph * par = paragraph;
while (par) {
- par->ChangeLanguage(params, from, to);
+ par->changeLanguage(params, from, to);
par = par->next();
}
}
bool Buffer::isMultiLingual()
{
- LyXParagraph * par = paragraph;
+ Paragraph * par = paragraph;
while (par) {
if (par->isMultiLingual(params))
return true;
}
-Buffer::inset_iterator::inset_iterator(LyXParagraph * paragraph,
- LyXParagraph::size_type pos)
+Buffer::inset_iterator::inset_iterator(Paragraph * paragraph,
+ Paragraph::size_type pos)
: par(paragraph)
{
it = par->InsetIterator(pos);
if (it == par->inset_iterator_end()) {
par = par->next();
- SetParagraph();
+ setParagraph();
}
}
-void Buffer::inset_iterator::SetParagraph()
+void Buffer::inset_iterator::setParagraph()
{
while (par) {
it = par->inset_iterator_begin();
//it = 0;
// We maintain an invariant that whenever par = 0 then it = 0
}
+
+
+Inset * Buffer::getInsetFromID(int id_arg) const
+{
+ 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 (in)
+ return in;
+ }
+ return 0;
+}
+
+
+Paragraph * Buffer::getParFromID(int id) const
+{
+ if (id < 0) return 0;
+ Paragraph * par = paragraph;
+ while (par) {
+ if (par->id() == id) {
+ return par;
+ }
+ Paragraph * tmp = par->getParFromID(id);
+ if (tmp) {
+ return tmp;
+ }
+ par = par->next();
+ }
+ return 0;
+}
projects / lyx.git / blobdiff