#include <boost/tuple/tuple.hpp>
#include <boost/bind.hpp>
+#include <algorithm>
#include <list>
#include <stack>
#include <sstream>
Paragraph::Paragraph(Paragraph const & par)
: itemdepth(par.itemdepth), insetlist(par.insetlist),
dim_(par.dim_),
- rows_(par.rows_), layout_(par.layout_),
+ rows_(par.rows_), rowSignature_(par.rowSignature_),
+ layout_(par.layout_),
text_(par.text_), begin_of_body_(par.begin_of_body_),
pimpl_(new Paragraph::Pimpl(*par.pimpl_, this))
{
rows_ = par.rows_;
dim_ = par.dim_;
+ rowSignature_ = par.rowSignature_;
layout_ = par.layout();
text_ = par.text_;
begin_of_body_ = par.begin_of_body_;
}
-InsetBase * Paragraph::getInset(pos_type pos)
-{
- BOOST_ASSERT(pos < size());
- return insetlist.get(pos);
-}
-
-
-InsetBase const * Paragraph::getInset(pos_type pos) const
-{
- BOOST_ASSERT(pos < size());
- return insetlist.get(pos);
-}
-
-
// Gets uninstantiated font setting at position.
LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
pos_type pos) const
Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
for (; cit != end; ++cit) {
- if (cit->pos() >= pos)
- return FontSpan(start, cit->pos());
+ if (cit->pos() >= pos) {
+ if (pos >= beginOfBody())
+ return FontSpan(std::max(start, beginOfBody()),
+ cit->pos());
+ else
+ return FontSpan(start,
+ std::min(beginOfBody() - 1,
+ cit->pos()));
+ }
start = cit->pos() + 1;
}
bool Paragraph::forceDefaultParagraphs() const
{
- return inInset() && inInset()->forceDefaultParagraphs(inInset());
+ return inInset() && inInset()->forceDefaultParagraphs(0);
}
if (output || running_change != Change::DELETED) {
OutputParams rp = runparams;
rp.free_spacing = style->free_spacing;
- rp.local_language = font.language();
+ rp.local_font = &font;
rp.intitle = style->intitle;
pimpl_->simpleTeXSpecialChars(buf, bparams,
os, texrow, rp,
}
-namespace {
-
-/// return true if the char is a meta-character for an inset
-inline
-bool IsInsetChar(char c)
-{
- return (c == Paragraph::META_INSET);
-}
-
-} // namespace anon
-
-
-
-bool Paragraph::isHfill(pos_type pos) const
-{
- return isInset(pos)
- && getInset(pos)->lyxCode() == InsetBase::HFILL_CODE;
-}
-
-
bool Paragraph::isNewline(pos_type pos) const
{
return isInset(pos)
}
-bool Paragraph::isSeparator(pos_type pos) const
-{
- return IsSeparatorChar(getChar(pos));
-}
-
-
bool Paragraph::isLineSeparator(pos_type pos) const
{
value_type const c = getChar(pos);
return IsLineSeparatorChar(c)
- || (IsInsetChar(c) && getInset(pos) &&
+ || (c == Paragraph::META_INSET && getInset(pos) &&
getInset(pos)->isLineSeparator());
}
if (IsPrintable(c))
os << c;
else if (c == META_INSET)
- getInset(i)->plaintext(buffer, os, runparams);
+ getInset(i)->textString(buffer, os, runparams);
}
return os.str();
}
-void Paragraph::markErased()
+void Paragraph::markErased(bool erased)
{
- pimpl_->markErased();
+ pimpl_->markErased(erased);
}