#include "debug.h"
#include "FuncRequest.h"
#include "FontIterator.h"
-#include "LColor.h"
-#include "LyXLength.h"
+#include "Color.h"
+#include "Length.h"
#include "LyXRC.h"
-#include "LyXText.h"
+#include "Text.h"
#include "MetricsInfo.h"
#include "ParagraphParameters.h"
#include "VSpace.h"
} // namespace anon
-TextMetrics::TextMetrics(BufferView * bv, LyXText * text)
+TextMetrics::TextMetrics(BufferView * bv, Text * text)
: bv_(bv), text_(text)
{
BOOST_ASSERT(bv_);
BOOST_ASSERT(mi.base.textwidth);
max_width_ = mi.base.textwidth;
- //lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
+ //lyxerr << "Text::metrics: width: " << mi.base.textwidth
// << " maxWidth: " << max_width_ << "\nfont: " << mi.base.font << endl;
bool changed = false;
// FIXME: this has nothing to do here and is the reason why text_ is not
// const.
if (par.checkBiblio(buffer.params().trackChanges))
- const_cast<LCursor &>(bv_->cursor()).posRight();
+ const_cast<Cursor &>(bv_->cursor()).posRight();
// Optimisation: this is used in the next two loops
// so better to calculate that once here.
// redo insets
// FIXME: We should always use getFont(), see documentation of
- // noFontChange() in InsetBase.h.
- LyXFont const bufferfont = buffer.params().getFont();
+ // noFontChange() in Inset.h.
+ Font const bufferfont = buffer.params().getFont();
InsetList::const_iterator ii = par.insetlist.begin();
InsetList::const_iterator iend = par.insetlist.end();
for (; ii != iend; ++ii) {
Dimension dim;
int const w = max_width_ - text_->leftMargin(buffer, max_width_, pit, ii->pos)
- right_margin;
- LyXFont const & font = ii->inset->noFontChange() ?
+ Font const & font = ii->inset->noFontChange() ?
bufferfont : text_->getFont(buffer, par, ii->pos);
MetricsInfo mi(bv_, font, w);
changed |= ii->inset->metrics(mi, dim);
result.x = text_->leftMargin(buffer, max_width_, pit, row.pos());
// is there a manual margin with a manual label
- LyXLayout_ptr const & layout = par.layout();
+ Layout_ptr const & layout = par.layout();
if (layout->margintype == MARGIN_MANUAL
&& layout->labeltype == LABEL_MANUAL) {
int const ns = numberOfSeparators(par, row);
bool disp_inset = false;
if (row.endpos() < par.size()) {
- InsetBase const * in = par.getInset(row.endpos());
+ Inset const * in = par.getInset(row.endpos());
if (in)
disp_inset = in->display();
}
return;
}
- LyXLayout_ptr const & layout = par.layout();
+ Layout_ptr const & layout = par.layout();
if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
row.endpos(addressBreakPoint(pos, par));
// ok, let us initialize the maxasc and maxdesc value.
// Only the fontsize count. The other properties
// are taken from the layoutfont. Nicer on the screen :)
- LyXLayout_ptr const & layout = par.layout();
+ Layout_ptr const & layout = par.layout();
// as max get the first character of this row then it can
// increase but not decrease the height. Just some point to
// start with so we don't have to do the assignment below too
// often.
Buffer const & buffer = *bv_->buffer();
- LyXFont font = text_->getFont(buffer, par, row.pos());
- LyXFont::FONT_SIZE const tmpsize = font.size();
+ Font font = text_->getFont(buffer, par, row.pos());
+ Font::FONT_SIZE const tmpsize = font.size();
font = text_->getLayoutFont(buffer, pit);
- LyXFont::FONT_SIZE const size = font.size();
+ Font::FONT_SIZE const size = font.size();
font.setSize(tmpsize);
- LyXFont labelfont = text_->getLabelFont(buffer, par);
+ Font labelfont = text_->getLabelFont(buffer, par);
FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
FontMetrics const & fontmetrics = theFontMetrics(font);
int labeladdon = 0;
pos_type const pos_end = row.endpos();
- LyXFont::FONT_SIZE maxsize =
+ Font::FONT_SIZE maxsize =
par.highestFontInRange(row.pos(), pos_end, size);
if (maxsize > font.size()) {
font.setSize(maxsize);
// FIXME: the correct way is to do the following is to move the
// following code in another method specially tailored for the
- // main LyXText. The following test is thus bogus.
+ // main Text. The following test is thus bogus.
// Top and bottom margin of the document (only at top-level)
if (main_text_) {
if (pit == 0 && row.pos() == 0)
{
Buffer const & buffer = *bv_->buffer();
- /// For the main LyXText, it is possible that this pit is not
+ /// For the main Text, it is possible that this pit is not
/// yet in the CoordCache when moving cursor up.
/// x Paragraph coordinate is always 0 for main text anyway.
int const xo = main_text_? 0 : bv_->coordCache().get(text_, pit).x_;
pos_type vc = row.pos();
pos_type end = row.endpos();
pos_type c = 0;
- LyXLayout_ptr const & layout = par.layout();
+ Layout_ptr const & layout = par.layout();
bool left_side = false;
}
-//int LyXText::pos2x(pit_type pit, pos_type pos) const
+//int Text::pos2x(pit_type pit, pos_type pos) const
//{
// ParagraphMetrics const & pm = parMetrics(pit);
// Row const & r = pm.rows()[row];
int defaultRowHeight()
{
- return int(theFontMetrics(LyXFont(LyXFont::ALL_SANE)).maxHeight() * 1.2);
+ return int(theFontMetrics(Font(Font::ALL_SANE)).maxHeight() * 1.2);
}
} // namespace lyx