#include "encoding.h"
#include "lyxrc.h"
#include "debug.h"
+#include "paragraph_funcs.h"
#include "support/LAssert.h"
}
-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())));
}
}
Paragraph::value_type Paragraph::Pimpl::getChar(pos_type pos) const
{
-#if 0
+#if 1
// This is in the critical path for loading!
pos_type const siz = size();
}
-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) == '!'))) {
os << '\n';
texrow.newline();
- texrow.start(owner_, i + 1);
+ texrow.start(owner_->id(), i + 1);
column = 0;
} else if (style.free_spacing) {
os << '~';
LyXFont & font,
LyXFont & running_font,
LyXFont & basefont,
+ LyXFont const & outerfont,
bool & open_font,
Change::Type & running_change,
LyXLayout const & style,
column += running_font.latexWriteEndChanges(os, basefont, basefont);
open_font = false;
}
- basefont = owner_->getLayoutFont(bparams);
+ basefont = owner_->getLayoutFont(bparams, outerfont);
running_font = basefont;
if (font.family() == LyXFont::TYPEWRITER_FAMILY)
os << "\\\\\n";
}
texrow.newline();
- texrow.start(owner_, i + 1);
+ texrow.start(owner_->id(), i + 1);
column = 0;
break;
}
basefont,
basefont);
open_font = false;
- basefont = owner_->getLayoutFont(bparams);
+ basefont = owner_->getLayoutFont(bparams, outerfont);
running_font = basefont;
}
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;
}
}
}
-
-
-LyXFont const Paragraph::Pimpl::realizeFont(LyXFont const & font,
- BufferParams const & bparams) const
-{
- LyXFont tmpfont(font);
-
- // check for environment font information
- char par_depth = owner_->getDepth();
- Paragraph const * par = owner_;
- LyXTextClass const & tclass = bparams.getLyXTextClass();
-
- while (par && par->getDepth() && !tmpfont.resolved()) {
- par = par->outerHook();
- if (par) {
- tmpfont.realize(par->layout()->font);
- par_depth = par->getDepth();
- }
- }
-
- tmpfont.realize(tclass.defaultfont());
- return tmpfont;
-}