using lyx::pos_type;
-using lyx::support::contains;
using lyx::support::subst;
using std::distance;
Paragraph::Paragraph()
- : y(0), height(0), begin_of_body_(0),
- pimpl_(new Paragraph::Pimpl(this))
+ : begin_of_body_(0), pimpl_(new Paragraph::Pimpl(this))
{
- //lyxerr << "sizeof Paragraph::Pimpl: " << sizeof(Paragraph::Pimpl) << endl;
itemdepth = 0;
params().clear();
}
Paragraph::Paragraph(Paragraph const & par)
: itemdepth(par.itemdepth), insetlist(par.insetlist),
- rows(par.rows), y(par.y), height(par.height),
- width(par.width), layout_(par.layout_),
+ dim_(par.dim_),
+ rows_(par.rows_), layout_(par.layout_),
text_(par.text_), begin_of_body_(par.begin_of_body_),
pimpl_(new Paragraph::Pimpl(*par.pimpl_, this))
{
for (; it != end; ++it)
it->inset = it->inset->clone().release();
- rows = par.rows;
- y = par.y;
- height = par.height;
- width = par.width;
+ rows_ = par.rows_;
+ dim_ = par.dim_;
layout_ = par.layout();
text_ = par.text_;
begin_of_body_ = par.begin_of_body_;
}
-bool Paragraph::insetAllowed(InsetOld_code code)
+bool Paragraph::insetAllowed(InsetBase_code code)
{
return !pimpl_->inset_owner || pimpl_->inset_owner->insetAllowed(code);
}
}
-LyXFont const Paragraph::getLabelFont(BufferParams const & bparams,
- LyXFont const & outerfont) const
+LyXFont const Paragraph::getLabelFont
+ (BufferParams const & bparams, LyXFont const & outerfont) const
{
LyXFont tmpfont = layout()->labelfont;
tmpfont.setLanguage(getParLanguage(bparams));
}
-LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams,
- LyXFont const & outerfont) const
+LyXFont const Paragraph::getLayoutFont
+ (BufferParams const & bparams, LyXFont const & outerfont) const
{
LyXFont tmpfont = layout()->font;
tmpfont.setLanguage(getParLanguage(bparams));
/// Returns the height of the highest font in range
-LyXFont_size
-Paragraph::highestFontInRange(pos_type startpos, pos_type endpos,
- LyXFont_size def_size) const
+LyXFont_size Paragraph::highestFontInRange
+ (pos_type startpos, pos_type endpos, LyXFont_size def_size) const
{
if (pimpl_->fontlist.empty())
return def_size;
++column;
}
if (!asdefault)
- column += startTeXParParams(bparams, os,
+ column += startTeXParParams(bparams, os,
runparams.moving_arg);
}
}
-bool Paragraph::isKomma(pos_type pos) const
-{
- return IsKommaChar(getChar(pos));
-}
-
-
/// Used by the spellchecker
bool Paragraph::isLetter(pos_type pos) const
{
- value_type const c = getChar(pos);
- if (IsLetterChar(c))
- return true;
if (isInset(pos))
return getInset(pos)->isLetter();
- // We want to pass the ' and escape chars to ispell
- string const extra = lyxrc.isp_esc_chars + '\'';
- return contains(extra, c);
-}
-
-
-bool Paragraph::isWord(pos_type pos) const
-{
- if (isInset(pos))
- return getInset(pos)->isLetter();
- value_type const c = getChar(pos);
- return !(IsSeparatorChar(c)
- || IsKommaChar(c)
- || IsInsetChar(c));
+ else {
+ value_type const c = getChar(pos);
+ return IsLetterChar(c) || IsDigit(c);
+ }
}
}
-RowList::iterator Paragraph::getRow(pos_type pos)
+Row & Paragraph::getRow(pos_type pos)
{
- RowList::iterator rit = rows.end();
- RowList::iterator const begin = rows.begin();
+ RowList::iterator rit = rows_.end();
+ RowList::iterator const begin = rows_.begin();
for (--rit; rit != begin && rit->pos() > pos; --rit)
;
- return rit;
+ return *rit;
}
-RowList::const_iterator Paragraph::getRow(pos_type pos) const
+Row const & Paragraph::getRow(pos_type pos) const
{
- RowList::const_iterator rit = rows.end();
- RowList::const_iterator const begin = rows.begin();
+ RowList::const_iterator rit = rows_.end();
+ RowList::const_iterator const begin = rows_.begin();
for (--rit; rit != begin && rit->pos() > pos; --rit)
;
- return rit;
+ return *rit;
}
-size_t Paragraph::row(pos_type pos) const
+size_t Paragraph::pos2row(pos_type pos) const
{
- RowList::const_iterator rit = rows.end();
- RowList::const_iterator const begin = rows.begin();
+ RowList::const_iterator rit = rows_.end();
+ RowList::const_iterator const begin = rows_.begin();
for (--rit; rit != begin && rit->pos() > pos; --rit)
;
return Encodings::TransformChar(c, Encodings::FORM_ISOLATED);
}
}
+
+
+void Paragraph::dump() const
+{
+ lyxerr << "Paragraph::dump: rows.size(): " << rows_.size() << endl;
+ for (size_t i = 0; i != rows_.size(); ++i) {
+ lyxerr << " row " << i << ": ";
+ rows_[i].dump();
+ }
+}
+
+//void Paragraph::metrics(MetricsInfo & mi, Dimension & dim, LyXText & text)
+//{
+//}
+//
+//
+//void draw(PainterInfo & pi, int x, int y, LyXText & text) const
+//{
+//}
+