#include <config.h>
#include "paragraph_pimpl.h"
-#include "LaTeXFeatures.h"
-#include "texrow.h"
-#include "language.h"
+
#include "bufferparams.h"
+#include "debug.h"
#include "encoding.h"
+#include "language.h"
+#include "LaTeXFeatures.h"
+#include "latexrunparams.h"
#include "lyxrc.h"
-#include "debug.h"
#include "paragraph_funcs.h"
+#include "texrow.h"
#include "support/LAssert.h"
}
-Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner, bool same_ids)
+Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner)
: params(p.params), owner_(owner)
{
inset_owner = p.inset_owner;
text = p.text;
fontlist = p.fontlist;
- if (same_ids)
- id_ = p.id_;
- else
- id_ = paragraph_id++;
+ id_ = paragraph_id++;
if (p.tracking())
changes_.reset(new Changes(*p.changes_.get()));
}
-void Paragraph::Pimpl::setContentsFromPar(Paragraph const * par)
+void Paragraph::Pimpl::setContentsFromPar(Paragraph const & par)
{
- lyx::Assert(par);
- text = par->pimpl_->text;
- if (par->pimpl_->tracking()) {
- changes_.reset(new Changes(*(par->pimpl_->changes_.get())));
+ text = par.pimpl_->text;
+ if (par.pimpl_->tracking()) {
+ changes_.reset(new Changes(*(par.pimpl_->changes_.get())));
}
}
}
-bool Paragraph::Pimpl::erasePos(pos_type pos)
-{
- lyx::Assert(pos < size());
-
- if (tracking()) {
- Change::Type changetype(changes_->lookup(pos));
- changes_->record(Change(Change::DELETED), pos);
-
- // only allow the actual removal if it was /new/ text
- if (changetype != Change::INSERTED) {
- if (text[pos] == Paragraph::META_INSET) {
- Inset * i(owner_->getInset(pos));
- i->markErased();
- }
- return false;
- }
- }
-
- eraseIntern(pos);
- return true;
-}
-
-
void Paragraph::Pimpl::eraseIntern(pos_type pos)
{
// if it is an inset, delete the inset entry
}
-void Paragraph::Pimpl::erase(pos_type pos)
+bool Paragraph::Pimpl::erase(pos_type pos)
{
- erasePos(pos);
+ lyx::Assert(pos < size());
+
+ if (tracking()) {
+ Change::Type changetype(changes_->lookup(pos));
+ changes_->record(Change(Change::DELETED), pos);
+
+ // only allow the actual removal if it was /new/ text
+ if (changetype != Change::INSERTED) {
+ if (text[pos] == Paragraph::META_INSET) {
+ Inset * i(owner_->getInset(pos));
+ i->markErased();
+ }
+ return false;
+ }
+ }
+
+ eraseIntern(pos);
+ return true;
}
-bool Paragraph::Pimpl::erase(pos_type start, pos_type end)
+int Paragraph::Pimpl::erase(pos_type start, pos_type end)
{
pos_type i = start;
pos_type count = end - start;
- bool any_erased = false;
-
while (count) {
- if (!erasePos(i)) {
+ if (!erase(i)) {
++i;
- } else {
- any_erased = true;
}
--count;
}
- return any_erased;
+ return end - i;
}
&& getChar(i - 1) != ' '
&& (i < size() - 1)
// same in FreeSpacing mode
- && !style.free_spacing
- && !owner_->isFreeSpacing()
+ && !owner_->isFreeSpacing()
// In typewriter mode, we want to avoid
// ! . ? : at the end of a line
&& !(font.family() == LyXFont::TYPEWRITER_FAMILY
|| getChar(i - 1) == '!'))) {
os << '\n';
texrow.newline();
- texrow.start(owner_, i + 1);
+ texrow.start(owner_->id(), i + 1);
column = 0;
} else if (style.free_spacing) {
os << '~';
BufferParams const & bparams,
ostream & os,
TexRow & texrow,
- bool moving_arg,
+ LatexRunParams const & runparams,
LyXFont & font,
LyXFont & running_font,
LyXFont & basefont,
if (font.family() == LyXFont::TYPEWRITER_FAMILY)
os << '~';
- if (moving_arg)
+ if (runparams.moving_arg)
os << "\\protect ";
os << "\\\\\n";
}
texrow.newline();
- texrow.start(owner_, i + 1);
+ texrow.start(owner_->id(), i + 1);
column = 0;
break;
}
running_font = basefont;
}
- int tmp = inset->latex(buf, os, moving_arg,
- style.free_spacing);
+ int tmp = inset->latex(buf, os, runparams);
if (close)
os << '}';
for (int j = 0; j < tmp; ++j) {
texrow.newline();
}
- texrow.start(owner_, i + 1);
+ texrow.start(owner_->id(), i + 1);
column = 0;
} else {
column += int(os.tellp()) - len;
InsetList::iterator icit = owner_->insetlist.begin();
InsetList::iterator iend = owner_->insetlist.end();
for (; icit != iend; ++icit) {
- if (icit.getInset()) {
- icit.getInset()->validate(features);
+ if (icit->inset) {
+ icit->inset->validate(features);
if (layout.needprotect &&
- icit.getInset()->lyxCode() == Inset::FOOT_CODE)
+ icit->inset->lyxCode() == Inset::FOOT_CODE)
features.require("NeedLyXFootnoteCode");
}
}