#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())));
}
}
}
-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)) {
++i;
- } else {
- any_erased = true;
- }
+ }
--count;
}
- return any_erased;
+ return end - i;
}
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)
basefont,
basefont);
open_font = false;
- basefont = owner_->getLayoutFont(bparams);
+ basefont = owner_->getLayoutFont(bparams, outerfont);
running_font = basefont;
}
}
}
}
-
-
-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;
-}