#include <config.h>
#include "buffer.h"
+#include "buffer_funcs.h"
#include "bufferlist.h"
#include "LyXAction.h"
#include "lyxrc.h"
#include "errorlist.h"
#include "Lsstream.h"
#include "format.h"
-#include "BufferView.h"
#include "ParagraphParameters.h"
#include "iterators.h"
#include "lyxtextclasslist.h"
#include "mathed/formulamacro.h"
#include "mathed/formula.h"
-#include "insets/inseterror.h"
#include "insets/insetbibitem.h"
#include "insets/insetbibtex.h"
#include "insets/insetinclude.h"
#include "graphics/Previews.h"
+#include "support/LAssert.h"
#include "support/textutils.h"
#include "support/filetools.h"
#include "support/path.h"
#include "support/FileInfo.h"
#include "support/lyxmanip.h"
#include "support/lyxtime.h"
+#include "support/gzstream.h"
#include <boost/bind.hpp>
#include <boost/tuple/tuple.hpp>
#include <locale>
#endif
+using namespace lyx::support;
+
#ifndef CXX_GLOBAL_CSTD
using std::pow;
#endif
namespace {
-const int LYX_FORMAT = 223;
+const int LYX_FORMAT = 225;
+
+bool openFileWrite(ofstream & ofs, string const & fname)
+{
+ ofs.open(fname.c_str());
+ if (!ofs) {
+ string const file = MakeDisplayPath(fname, 50);
+ string text = bformat(_("Could not open the specified "
+ "document\n%1$s."), file);
+ Alert::error(_("Could not open file"), text);
+ return false;
+ }
+ return true;
+}
+
} // namespace anon
Buffer::Buffer(string const & file, bool ronly)
: niceFile(true), lyx_clean(true), bak_clean(true),
unnamed(false), read_only(ronly),
- filename_(file), users(0)
+ filename_(file)
{
lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl;
filepath_ = OnlyPath(file);
// here the buffer should take care that it is
// saved properly, before it goes into the void.
- // make sure that views using this buffer
- // forgets it.
- if (users)
- users->buffer(0);
+ closing();
if (!tmppath.empty() && destroyDir(tmppath) != 0) {
Alert::warning(_("Could not remove temporary directory"),
paragraphs.clear();
// Remove any previewed LaTeX snippets assocoated with this buffer.
- grfx::Previews::get().removeLoader(this);
+ lyx::graphics::Previews::get().removeLoader(this);
}
{
if (read_only != flag) {
read_only = flag;
- updateTitles();
- users->owner()->getDialogs().updateBufferDependent(false);
+ readonly(flag);
}
}
}
-/// Update window titles of all users
-// Should work on a list
-void Buffer::updateTitles() const
-{
- if (users)
- users->owner()->updateWindowTitle();
-}
-
-
-/// Reset autosave timer of all users
-// Should work on a list
-void Buffer::resetAutosaveTimers() const
-{
- if (users)
- users->owner()->resetAutosaveTimer();
-}
-
-
void Buffer::setFileName(string const & newfile)
{
filename_ = MakeAbsPath(newfile);
lyxerr[Debug::PARSER] << "Handling header token: `"
<< token << '\'' << endl;
+
string unknown = params.readToken(lex, token);
if (!unknown.empty()) {
if (unknown[0] != '\\') {
unknownClass(unknown);
} else {
++unknown_tokens;
+ string const s = bformat(_("Unknown token: "
+ "%1$s %2$s\n"),
+ token,
+ lex.getString());
+ error(ErrorItem(_("Header error"), s,
+ -1, 0, 0));
}
}
}
// Returns false if "\the_end" is not read (Asger)
bool Buffer::readBody(LyXLex & lex, ParagraphList::iterator pit)
{
- int unknown_tokens = 0;
-
Paragraph::depth_type depth = 0;
bool the_end_read = false;
if (paragraphs.empty()) {
- unknown_tokens += readHeader(lex);
-
+ readHeader(lex);
if (!params.getLyXTextClass().load()) {
string theclass = params.getLyXTextClass().name();
Alert::error(_("Can't load document class"), bformat(
params.textclass = 0;
}
} else {
- // We are inserting into an existing document
- users->text->breakParagraph(paragraphs);
-
// We don't want to adopt the parameters from the
// document we insert, so read them into a temporary buffer
// and then discard it
continue;
}
- unknown_tokens += readParagraph(lex, token, paragraphs, pit, depth);
- }
-
-
- if (unknown_tokens > 0) {
- string s;
- if (unknown_tokens == 1) {
- s = bformat(_("Encountered one unknown token when reading "
- "the document %1$s."), fileName());
- } else {
- s = bformat(_("Encountered %1$s unknown tokens when reading "
- "the document %2$s."), tostr(unknown_tokens), fileName());
- }
- Alert::warning(_("Document format failure"), s);
+ readParagraph(lex, token, paragraphs, pit, depth);
}
return the_end_read;
int Buffer::readParagraph(LyXLex & lex, string const & token,
- ParagraphList & pars, ParagraphList::iterator & pit,
- Paragraph::depth_type & depth)
+ ParagraphList & pars, ParagraphList::iterator & pit,
+ Paragraph::depth_type & depth)
{
static Change current_change;
int unknown = 0;
if (token == "\\layout") {
lex.pushToken(token);
- Paragraph * par = new Paragraph();
- par->params().depth(depth);
+ Paragraph par;
+ par.params().depth(depth);
if (params.tracking_changes)
- par->trackChanges();
+ par.trackChanges();
LyXFont f(LyXFont::ALL_INHERIT, params.language);
- par->setFont(0, f);
-
- // FIXME: goddamn InsetTabular makes us pass a Buffer
- // not BufferParams
- unknown += ::readParagraph(*this, *par, lex);
+ par.setFont(0, f);
// insert after
if (pit != pars.end())
++pit;
+
pit = pars.insert(pit, par);
+
+ // FIXME: goddamn InsetTabular makes us pass a Buffer
+ // not BufferParams
+ ::readParagraph(*this, *pit, lex);
+
} else if (token == "\\begin_deeper") {
++depth;
} else if (token == "\\end_deeper") {
for(string::const_iterator cit = str.begin();
cit != str.end(); ++cit) {
if (*cit == '\n') {
- if (autobreakrows && (!par->empty() || layout->keepempty)) {
+ if (autobreakrows && (!par->empty() || par->allowEmpty())) {
breakParagraph(params, paragraphs, par, pos,
layout->isEnvironment());
++par;
}
// do not insert consecutive spaces if !free_spacing
} else if ((*cit == ' ' || *cit == '\t') &&
- space_inserted && !layout->free_spacing &&
- !par->isFreeSpacing())
- {
+ space_inserted && !par->isFreeSpacing()) {
continue;
} else if (*cit == '\t') {
- if (!layout->free_spacing && !par->isFreeSpacing()) {
+ if (!par->isFreeSpacing()) {
// tabs are like spaces here
par->insertChar(pos, ' ', font);
++pos;
// This code is reached if lyx2lyx failed (for
// some reason) to change the file format of
// the file.
- lyx::Assert(false);
+ Assert(false);
return false;
}
}
} else {
// Saving failed, so backup is not backup
if (lyxrc.make_backup) {
- lyx::rename(s, fileName());
+ rename(s, fileName());
}
return false;
}
return false;
}
+ bool const compressed = (fname.substr(fname.size() - 3, 3) == ".gz");
+
+ if (compressed) {
+ gz::ogzstream ofs(fname.c_str());
+
+ if (!ofs)
+ return false;
+
+ return do_writeFile(ofs);
+
+ }
+
ofstream ofs(fname.c_str());
- if (!ofs) {
+ if (!ofs)
return false;
- }
+
+ return do_writeFile(ofs);
+}
+
+
+bool Buffer::do_writeFile(ostream & ofs) const
+{
#ifdef HAVE_LOCALE
// Use the standard "C" locale for file output.
// this will write out all the paragraphs
// using recursive descent.
- ParagraphList::iterator pit = paragraphs.begin();
- ParagraphList::iterator pend = paragraphs.end();
+ ParagraphList::const_iterator pit = paragraphs.begin();
+ ParagraphList::const_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;
- ofs.close();
+ // Shouldn't really be needed....
+ //ofs.close();
// how to check if close went ok?
// Following is an attempt... (BE 20001011)
bool noparbreak) const
{
ostringstream buffer;
- Paragraph::depth_type depth = 0;
int ltype = 0;
Paragraph::depth_type ltype_depth = 0;
bool ref_printed = false;
-// if (!par->previous()) {
-#if 0
- // begins or ends a deeper area ?
- if (depth != par->params().depth()) {
- if (par->params().depth() > depth) {
- while (par->params().depth() > depth) {
- ++depth;
- }
- } else {
- while (par->params().depth() < depth) {
- --depth;
- }
- }
- }
-#else
- depth = par.params().depth();
-#endif
+ Paragraph::depth_type depth = par.params().depth();
// First write the layout
string const & tmp = par.layout()->name();
switch (c) {
case Paragraph::META_INSET:
{
- Inset const * inset = par.getInset(i);
+ InsetOld const * inset = par.getInset(i);
if (inset) {
if (linelen > 0) {
buffer << word;
void Buffer::writeFileAscii(string const & fname, int linelen)
{
- ofstream ofs(fname.c_str());
- if (!ofs) {
- string const file = MakeDisplayPath(fname, 50);
- string text = bformat(_("Could not save the document\n%1$s."), file);
- Alert::error(_("Could not save document"), text);
+ ofstream ofs;
+ if (!::openFileWrite(ofs, fname))
return;
- }
writeFileAscii(ofs, linelen);
}
}
-
void Buffer::makeLaTeXFile(string const & fname,
string const & original_path,
- bool nice, bool only_body, bool only_preamble)
+ LatexRunParams const & runparams,
+ bool output_preamble, bool output_body)
{
lyxerr[Debug::LATEX] << "makeLaTeXFile..." << endl;
- ofstream ofs(fname.c_str());
- if (!ofs) {
- string const file = MakeDisplayPath(fname, 50);
- string text = bformat(_("Could not open the specified document\n%1$s."),
- file);
- Alert::error(_("Could not open file"), text);
+ ofstream ofs;
+ if (!::openFileWrite(ofs, fname))
return;
- }
- makeLaTeXFile(ofs, original_path, nice, only_body, only_preamble);
+ makeLaTeXFile(ofs, original_path,
+ runparams, output_preamble, output_body);
ofs.close();
if (ofs.fail()) {
void Buffer::makeLaTeXFile(ostream & os,
string const & original_path,
- bool nice, bool only_body, bool only_preamble)
+ LatexRunParams const & runparams_in,
+ bool output_preamble, bool output_body)
{
- niceFile = nice; // this will be used by Insetincludes.
+ LatexRunParams runparams = runparams_in;
+ niceFile = runparams.nice; // this will be used by Insetincludes.
// validate the buffer.
lyxerr[Debug::LATEX] << " Validating buffer..." << endl;
// first paragraph of the document. (Asger)
texrow.start(paragraphs.begin()->id(), 0);
- if (!only_body && nice) {
+ if (output_preamble && runparams.nice) {
os << "%% " << lyx_docversion << " created this file. "
"For more info, see http://www.lyx.org/.\n"
"%% Do not edit unless you really know what "
// input@path is set when the actual parameter
// original_path is set. This is done for usual tex-file, but not
// for nice-latex-file. (Matthias 250696)
- if (!only_body) {
- if (!nice) {
+ if (output_preamble) {
+ if (!runparams.nice) {
// code for usual, NOT nice-latex-file
os << "\\batchmode\n"; // changed
// from \nonstopmode
}
// Write the preamble
- params.writeLaTeX(os, features, texrow);
+ runparams.use_babel = params.writeLaTeX(os, features, texrow);
- if (only_preamble)
+ if (!output_body)
return;
// make the body.
os << "\\begin{document}\n";
texrow.newline();
- } // only_body
+ } // output_preamble
lyxerr[Debug::INFO] << "preamble finished, now the body." << endl;
if (!lyxrc.language_auto_begin) {
texrow.newline();
}
- latexParagraphs(this, paragraphs, os, texrow, false);
+ latexParagraphs(this, paragraphs, os, texrow, runparams);
// add this just in case after all the paragraphs
os << endl;
texrow.newline();
}
- if (!only_body) {
+ if (output_preamble) {
os << "\\end{document}\n";
texrow.newline();
void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
{
- ofstream ofs(fname.c_str());
-
- if (!ofs) {
- string const file = MakeDisplayPath(fname, 50);
- string text = bformat(_("Could not save the specified document\n%1$s.\n"),
- file);
- Alert::error(_("Could not save document"), text);
+ ofstream ofs;
+ if (!::openFileWrite(ofs, fname))
return;
- }
niceFile = nice; // this will be used by included files.
ofs << "<!doctype linuxdoc system";
string preamble = params.preamble;
- const string name = nice ? ChangeExtension(filename_, ".sgml")
+ string const name = nice ? ChangeExtension(filename_, ".sgml")
: fname;
preamble += features.getIncludedFiles(name);
preamble += features.getLyXSGMLEntities();
string item_name;
vector<string> environment_stack(5);
- users->resetErrorList();
-
ParagraphList::iterator pit = paragraphs.begin();
ParagraphList::iterator pend = paragraphs.end();
for (; pit != pend; ++pit) {
LyXLayout_ptr const & style = pit->layout();
// treat <toc> as a special case for compatibility with old code
if (pit->isInset(0)) {
- Inset * inset = pit->getInset(0);
- Inset::Code lyx_code = inset->lyxCode();
- if (lyx_code == Inset::TOC_CODE) {
+ InsetOld * inset = pit->getInset(0);
+ InsetOld::Code lyx_code = inset->lyxCode();
+ if (lyx_code == InsetOld::TOC_CODE) {
string const temp = "toc";
sgml::openTag(ofs, depth, false, temp);
continue;
case LATEX_COMMAND:
if (depth != 0)
- sgmlError(pit, 0,
- _("Error: Wrong depth for LatexType Command.\n"));
+ error(ErrorItem(_("Error:"), _("Wrong depth for LatexType Command.\n"), pit->id(), 0, pit->size()));
if (!environment_stack[depth].empty()) {
sgml::closeTag(ofs, depth, false, environment_stack[depth]);
// we want this to be true outside previews (for insetexternal)
niceFile = true;
-
- users->showErrorList(_("LinuxDoc"));
}
char c = par->getChar(i);
if (c == Paragraph::META_INSET) {
- Inset * inset = par->getInset(i);
+ InsetOld * inset = par->getInset(i);
inset->linuxdoc(this, os);
font_old = font;
continue;
bool ws;
string str;
boost::tie(ws, str) = sgml::escapeChar(c);
- if (ws && !style->free_spacing && !par->isFreeSpacing()) {
+ if (ws && !par->isFreeSpacing()) {
// in freespacing mode, spaces are
// non-breaking characters
if (desc_on) {// if char is ' ' then...
}
-// Print an error message.
-void Buffer::sgmlError(ParagraphList::iterator pit, int pos,
- string const & message) const
-{
- users->addError(ErrorItem(message, string(), pit->id(), pos, pos));
-}
-
-
void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
{
- ofstream ofs(fname.c_str());
- if (!ofs) {
- string const file = MakeDisplayPath(fname, 50);
- string text = bformat(_("Could not save the specified document\n%1$s.\n"),
- file);
- Alert::error(_("Could not save document"), text);
+ ofstream ofs;
+ if (!::openFileWrite(ofs, fname))
return;
- }
niceFile = nice; // this will be used by Insetincludes.
<< " PUBLIC \"-//OASIS//DTD DocBook V4.1//EN\"";
string preamble = params.preamble;
- const string name = nice ? ChangeExtension(filename_, ".sgml")
+ string const name = nice ? ChangeExtension(filename_, ".sgml")
: fname;
preamble += features.getIncludedFiles(name);
preamble += features.getLyXSGMLEntities();
string item_name;
string command_name;
- users->resetErrorList();
-
ParagraphList::iterator par = paragraphs.begin();
ParagraphList::iterator pend = paragraphs.end();
// environment tag closing
for (; depth > par->params().depth(); --depth) {
- if (environment_inner[depth] != "!-- --") {
+ if (environment_inner[depth] != "!-- --" && !environment_inner[depth].empty()) {
item_name = "listitem";
sgml::closeTag(ofs, command_depth + depth, false, item_name);
if (environment_inner[depth] == "varlistentry")
case LATEX_COMMAND:
if (depth != 0)
- sgmlError(par, 0,
- _("Error: Wrong depth for LatexType Command.\n"));
+ error(ErrorItem(_("Error"), _("Wrong depth for LatexType Command."), par->id(), 0, par->size()));
command_name = style->latexname();
sgmlparam = style->latexparam();
c_params = split(sgmlparam, c_depth,'|');
- cmd_depth = lyx::atoi(c_depth);
+ cmd_depth = atoi(c_depth);
if (command_flag) {
if (cmd_depth < command_base) {
// This is a hack while paragraphs can't have
// attributes, like id in this case.
if (par->isInset(0)) {
- Inset * inset = par->getInset(0);
- Inset::Code lyx_code = inset->lyxCode();
- if (lyx_code == Inset::LABEL_CODE) {
+ InsetOld * inset = par->getInset(0);
+ InsetOld::Code lyx_code = inset->lyxCode();
+ if (lyx_code == InsetOld::LABEL_CODE) {
command_name += " id=\"";
command_name += (static_cast<InsetCommand *>(inset))->getContents();
command_name += '"';
// we want this to be true outside previews (for insetexternal)
niceFile = true;
- users->showErrorList(_("DocBook"));
}
if (par->isInset(i)) {
- Inset * inset = par->getInset(i);
+ InsetOld * inset = par->getInset(i);
// don't print the inset in position 0 if desc_on == 3 (label)
if (i || desc_on != 3) {
if (style->latexparam() == "CDATA")
if (style->pass_thru) {
os << c;
- } else if (style->free_spacing || par->isFreeSpacing() || c != ' ') {
+ } else if (par->isFreeSpacing() || c != ' ') {
os << str;
- } else if (desc_on ==1) {
+ } else if (desc_on == 1) {
++char_line_count;
os << "\n</term><listitem><para>";
desc_on = 2;
// Other flags: -wall -v0 -x
int Buffer::runChktex()
{
- if (!users->text) return 0;
-
- users->owner()->busy(true);
+ busy(true);
// get LaTeX-Filename
string const name = getLatexName();
}
Path p(path); // path to LaTeX file
- users->owner()->message(_("Running chktex..."));
-
- // Remove all error insets
- bool const removedErrorInsets = users->removeAutoInsets();
+ message(_("Running chktex..."));
// Generate the LaTeX file if neccessary
- makeLaTeXFile(name, org_path, false);
+ LatexRunParams runparams;
+ runparams.flavor = LatexRunParams::LATEX;
+ runparams.nice = false;
+ makeLaTeXFile(name, org_path, runparams);
TeXErrors terr;
Chktex chktex(lyxrc.chktex_command, name, filePath());
if (res == -1) {
Alert::error(_("chktex failure"),
- _("Could not run chktex successfully."));
+ _("Could not run chktex successfully."));
} else if (res > 0) {
// Insert all errors as errors boxes
- ErrorList el (*this, terr);
- users->setErrorList(el);
- users->showErrorList(_("ChkTeX"));
+ bufferErrors(*this, terr);
}
- // if we removed error insets before we ran chktex or if we inserted
- // error insets after we ran chktex, this must be run:
- if (removedErrorInsets || res) {
-#warning repaint needed here, or do you mean update() ?
- users->repaint();
- users->fitCursor();
- }
- users->owner()->busy(false);
+ busy(false);
return res;
}
}
-vector<string> const Buffer::getLabelList() const
+void Buffer::getLabelList(std::vector<string> & list) 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 const * tmp = bufferlist.getBuffer(params.parentname);
- if (tmp)
- return tmp->getLabelList();
+ if (tmp) {
+ tmp->getLabelList(list);
+ return;
+ }
}
- vector<string> label_list;
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());
+ it->getLabelList(list);
}
- return label_list;
}
// This is also a buffer property (ale)
-void Buffer::fillWithBibKeys(vector<pair<string, string> > & keys) const
+void Buffer::fillWithBibKeys(std::vector<std::pair<string, string> > & keys) const
{
/// if this is a child document and the parent is already loaded
/// use the parent's list instead [ale990412]
for (inset_iterator it = inset_const_iterator_begin();
it != inset_const_iterator_end(); ++it) {
- if (it->lyxCode() == Inset::BIBTEX_CODE)
+ if (it->lyxCode() == InsetOld::BIBTEX_CODE)
static_cast<InsetBibtex &>(*it).fillWithBibKeys(this, keys);
- else if (it->lyxCode() == Inset::INCLUDE_CODE)
+ else if (it->lyxCode() == InsetOld::INCLUDE_CODE)
static_cast<InsetInclude &>(*it).fillWithBibKeys(keys);
- else if (it->lyxCode() == Inset::BIBITEM_CODE) {
+ else if (it->lyxCode() == InsetOld::BIBITEM_CODE) {
InsetBibitem & bib = static_cast<InsetBibitem &>(*it);
string const key = bib.getContents();
string const opt = bib.getOptions();
}
-void Buffer::resizeInsets(BufferView * bv)
-{
- /// then remove all LyXText in text-insets
- for_each(paragraphs.begin(), paragraphs.end(),
- boost::bind(&Paragraph::resizeInsetsLyXText, _1, bv));
-}
-
-
-void Buffer::redraw()
-{
-#warning repaint needed here, or do you mean update() ?
- users->repaint();
- users->fitCursor();
-}
-
-
void Buffer::changeLanguage(Language const * from, Language const * to)
{
lyxerr << "Changing Language!" << endl;
ParIterator end = par_iterator_end();
for (ParIterator it = par_iterator_begin(); it != end; ++it)
- (*it)->changeLanguage(params, from, to);
+ it->changeLanguage(params, from, to);
}
{
ParIterator end = par_iterator_end();
for (ParIterator it = par_iterator_begin(); it != end; ++it)
- if ((*it)->isMultiLingual(params))
+ if (it->isMultiLingual(params))
return true;
return false;
}
-Inset * Buffer::getInsetFromID(int id_arg) const
+InsetOld * 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);
+ InsetOld * in = it->getInsetFromID(id_arg);
if (in)
return in;
}
ParIterator Buffer::getParFromID(int id) const
{
#warning FIXME: const correctness! (Andre)
- ParIterator it(const_cast<Buffer*>(this)->par_iterator_begin());
- ParIterator end(const_cast<Buffer*>(this)->par_iterator_end());
+ ParIterator it = const_cast<Buffer*>(this)->par_iterator_begin();
+ ParIterator end = const_cast<Buffer*>(this)->par_iterator_end();
#warning FIXME, perhaps this func should return a ParIterator? (Lgb)
if (id < 0) {
}
for (; it != end; ++it)
- if ((*it)->id() == id)
+ if (it->id() == id)
return it;
return end;
bool Buffer::hasParWithID(int id) const
{
- ParIterator it(const_cast<Buffer*>(this)->par_iterator_begin());
- ParIterator end(const_cast<Buffer*>(this)->par_iterator_end());
+ ParConstIterator it = par_iterator_begin();
+ ParConstIterator end = par_iterator_end();
if (id < 0) {
// John says this is called with id == -1 from undo
}
for (; it != end; ++it)
- if ((*it)->id() == id)
+ if (it->id() == id)
return true;
return false;
ParConstIterator Buffer::par_iterator_begin() const
{
- return ParConstIterator(paragraphs.begin(), paragraphs);
+ return ParConstIterator(const_cast<ParagraphList&>(paragraphs).begin(), paragraphs);
}
ParConstIterator Buffer::par_iterator_end() const
{
- return ParConstIterator(paragraphs.end(), paragraphs);
-}
-
-
-
-void Buffer::addUser(BufferView * u)
-{
- users = u;
-}
-
-
-void Buffer::delUser(BufferView *)
-{
- users = 0;
+ return ParConstIterator(const_cast<ParagraphList&>(paragraphs).end(), paragraphs);
}
}
-BufferView * Buffer::getUser() const
-{
- return users;
-}
-
-
void Buffer::setParentName(string const & name)
{
params.parentname = name;
Buffer::inset_iterator::inset_iterator()
- : pit(0), pend(0)
+ : pit(), pend()
{}
}
+Buffer::inset_iterator Buffer::inset_iterator_begin()
+{
+ return inset_iterator(paragraphs.begin(), paragraphs.end());
+}
+
+
+Buffer::inset_iterator Buffer::inset_iterator_end()
+{
+ return inset_iterator(paragraphs.end(), paragraphs.end());
+}
+
+
+Buffer::inset_iterator Buffer::inset_const_iterator_begin() const
+{
+ return inset_iterator(const_cast<ParagraphList&>(paragraphs).begin(),
+ const_cast<ParagraphList&>(paragraphs).end());
+}
+
+
+Buffer::inset_iterator Buffer::inset_const_iterator_end() const
+{
+ return inset_iterator(const_cast<ParagraphList&>(paragraphs).end(),
+ const_cast<ParagraphList&>(paragraphs).end());
+}
+
+
Buffer::inset_iterator & Buffer::inset_iterator::operator++()
{
if (pit != pend) {
Buffer::inset_iterator::reference Buffer::inset_iterator::operator*()
{
- return *it.getInset();
+ return *it->inset;
}
Buffer::inset_iterator::pointer Buffer::inset_iterator::operator->()
{
- return it.getInset();
+ return it->inset;
}
lyx::pos_type Buffer::inset_iterator::getPos() const
{
- return it.getPos();
+ return it->pos;
}