+
+2003-11-25 André Pönitz <poenitz@gmx.net>
+
+ * InsetList.[Ch] (begein, end): inline as suggested by profiler
+
+ * lyxtext.h (leftMargin/rightMargin): simplify interface
+
+ * rowpainter.C:
+ * text.C:
+ * text2.C:
+ * text3.C: adjust
+
2003-11-24 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* lyxfunc.C (dispatch): propogate the bibtex databases from the
}
-InsetList::iterator InsetList::begin()
-{
- return list.begin();
-}
-
-
-InsetList::iterator InsetList::end()
-{
- return list.end();
-}
-
-
-InsetList::const_iterator InsetList::begin() const
-{
- return list.begin();
-}
-
-
-InsetList::const_iterator InsetList::end() const
-{
- return list.end();
-}
-
-
InsetList::iterator InsetList::insetIterator(pos_type pos)
{
InsetTable search_elem(pos, 0);
///
~InsetList();
///
- iterator begin();
+ iterator begin() { return list.begin(); }
///
- iterator end();
+ iterator end() { return list.end(); }
///
- const_iterator begin() const;
+ const_iterator begin() const { return list.begin(); }
///
- const_iterator end() const;
+ const_iterator end() const { return list.end(); }
+ ///
+ bool empty() const { return list.empty(); }
///
iterator insetIterator(lyx::pos_type pos);
///
int sx = UpdatableInset::scroll(false);
if (recursive)
- sx += inset.scroll(recursive);
+ sx += inset.scroll(false);
return sx;
}
void InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
{
//lyxerr << "InsetText::metrics: width: " << mi.base.textwidth << endl;
- textwidth_ = max(40, mi.base.textwidth - 30);
- BufferView * bv = mi.base.bv;
- setViewCache(bv);
+ textwidth_ = mi.base.textwidth;
+ mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
+ setViewCache(mi.base.bv);
text_.metrics(mi, dim);
dim.asc += TEXT_TO_INSET_OFFSET;
dim.des += TEXT_TO_INSET_OFFSET;
dim.wid += 2 * TEXT_TO_INSET_OFFSET;
+ mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
dim_ = dim;
}
-int InsetText::textWidth() const
-{
- return textwidth_;
-}
-
-
void InsetText::draw(PainterInfo & pi, int x, int y) const
{
- // update our idea of where we are. Clearly, we should
- // not have to know this information.
+ // update our idea of where we are
xo_ = x;
yo_ = y;
- int const start_x = x;
-
BufferView * bv = pi.base.bv;
Painter & pain = pi.pain;
// repaint the background if needed
if (backgroundColor() != LColor::background)
- clearInset(bv, start_x + TEXT_TO_INSET_OFFSET, y);
+ clearInset(bv, xo_ + TEXT_TO_INSET_OFFSET, y);
bv->hideCursor();
paintTextInset(*bv, text_, x, y);
if (drawFrame_ == ALWAYS || drawFrame_ == LOCKED)
- drawFrame(pain, start_x);
+ drawFrame(pain, xo_);
}
}
-void InsetText::clearInset(BufferView * bv, int start_x, int baseline) const
+void InsetText::clearInset(BufferView * bv, int x, int y) const
{
Painter & pain = bv->painter();
int w = dim_.wid;
int h = dim_.asc + dim_.des;
- int ty = baseline - dim_.asc;
+ int ty = y - dim_.asc;
if (ty < 0) {
h += ty;
h = pain.paperHeight();
if (xo_ + w > pain.paperWidth())
w = pain.paperWidth();
- pain.fillRectangle(start_x + 1, ty + 1, w - 3, h - 1, backgroundColor());
+ pain.fillRectangle(x + 1, ty + 1, w - 3, h - 1, backgroundColor());
}
///
void metrics(MetricsInfo &, Dimension &) const;
///
- int textWidth() const;
- ///
void draw(PainterInfo & pi, int x, int y) const;
///
std::string const editMessage() const;
public:
/// Constructor
LyXText(BufferView *, InsetText *, bool ininset, ParagraphList & plist);
-
- // Copy assignment
- LyXText & operator=(LyXText const &);
-
+ ///
void init(BufferView *);
- /// update all cached row positions
- void updateRowPositions();
+ /// update y coordinate cache of all paragraphs
+ void updateParPositions();
///
LyXFont getFont(ParagraphList::iterator pit, lyx::pos_type pos) const;
///
///
RowList::iterator cursorRow() const;
- /** returns a pointer to the row near the specified y-coordinate
- (relative to the whole text). y is set to the real beginning
- of this row
+ /** returns an iterator pointing to the row near the specified
+ * y-coordinate (relative to the whole text). y is set to the
+ * real beginning of this row
*/
RowList::iterator getRowNearY(int y,
ParagraphList::iterator & pit) const;
///
void gotoInset(InsetOld::Code code, bool same_content);
- ///
- int workWidth() const;
+ /// current max text width
+ int textWidth() const;
- /** Updates all counters starting BEHIND the row. Changed paragraphs
- * with a dynamic left margin will be rebroken. */
+ /// updates all counters
void updateCounters();
- /**
- * Returns an inset if inset was hit, or 0 if not.
- */
+ /// Returns an inset if inset was hit, or 0 if not.
InsetOld * checkInsetHit(int x, int y);
///
* in LaTeX the beginning of the text fits in some cases
* (for example sections) exactly the label-width.
*/
- int leftMargin(ParagraphList::iterator pit, Row const & row) const;
+ int leftMargin(ParagraphList::iterator pit, lyx::pos_type pos) const;
+ int leftMargin(ParagraphList::iterator pit) const;
///
- int rightMargin(Paragraph const & par, Buffer const &) const;
+ int rightMargin(Paragraph const & par) const;
/** this calculates the specified parameters. needed when setting
* the cursor and when creating a visible row */
bool checkAndActivateInset(bool front);
- // Public Variables
public:
///
int height;
///
unsigned int width;
+ ///
+ int textwidth_;
/// the current font settings
LyXFont current_font;
/// the current font
int yo_;
- // Private Functions
private:
/// rebreaks the given par
void redoParagraphInternal(ParagraphList::iterator pit);
int labelFill(ParagraphList::iterator pit, Row const & row) const;
/// FIXME
- int labelEnd(ParagraphList::iterator pit, Row const & row) const;
+ int labelEnd(ParagraphList::iterator pit) const;
///
void charInserted();
void number();
/// is the cursor paragraph right-to-left?
bool rtl() const;
-
- // Private Variables
-private:
-
- /// prohibit this as long as there are back pointers...
- LyXText(LyXText const &);
-
- // cache for cursorPar()
- mutable ParagraphList::iterator cache_par_;
- mutable int cache_pos_;
};
/// return the default height of a row in pixels, considering font zoom
namespace os = lyx::support::os;
-
int main(int argc, char * argv[])
{
#ifdef HAVE_IOS
InsetBibitem * Paragraph::bibitem() const
{
- InsetList::const_iterator it = insetlist.begin();
- if (it != insetlist.end() && it->inset->lyxCode() == InsetOld::BIBTEX_CODE)
- return static_cast<InsetBibitem *>(it->inset);
+ if (!insetlist.empty()) {
+ InsetOld * inset = insetlist.begin()->inset;
+ if (inset->lyxCode() == InsetOld::BIBTEX_CODE)
+ return static_cast<InsetBibitem *>(inset);
+ }
return 0;
}
// only allow the actual removal if it was /new/ text
if (changetype != Change::INSERTED) {
if (owner_->text_[pos] == Paragraph::META_INSET) {
- InsetOld * i(owner_->getInset(pos));
- i->markErased();
+ owner_->getInset(pos)->markErased();
}
return false;
}
int Paragraph::Pimpl::erase(pos_type start, pos_type end)
{
pos_type i = start;
- pos_type count = end - start;
- while (count) {
- if (!erase(i)) {
+ for (pos_type count = end - start; count; --count) {
+ if (!erase(i))
++i;
- }
- --count;
}
return end - i;
}
using std::max;
using std::string;
-extern int PAPER_MARGIN;
+extern int NEST_MARGIN;
extern int CHANGEBAR_MARGIN;
-extern int LEFT_MARGIN;
namespace {
int xo, int yo)
: bv_(bv), pain_(bv_.painter()), text_(text), rit_(rit), row_(*rit),
pit_(pit), xo_(xo), yo_(yo), x_(row_.x()),
- width_(text_.workWidth()),
+ width_(text_.textWidth()),
separator_(row_.fill_separator()),
hfill_(row_.fill_hfill()),
label_hfill_(row_.fill_label_hfill())
int RowPainter::leftMargin() const
{
- return text_.leftMargin(pit_, row_);
+ return text_.leftMargin(pit_, row_.pos());
}
if ((startpit != pit_ && startrow != rit_ && is_rtl) ||
(endpit != pit_ && endrow != rit_ && !is_rtl)) {
pain_.fillRectangle(int(xo_ + tmpx),
- yo_, int(bv_.workWidth() - tmpx), h, LColor::selection);
+ yo_, int(width_ - tmpx), h, LColor::selection);
}
}
return;
// FIXME: can be just width_ ?
- int const ww = bv_.workWidth();
+ int const ww = width_;
int y = yo_;
}
for (Paragraph::depth_type i = 1; i <= depth; ++i) {
- int const w = PAPER_MARGIN / 5;
+ int const w = NEST_MARGIN / 5;
int x = int(w * i + xo_);
// only consider the changebar space if we're drawing outer left
if (xo_ == 0)
if (parparams.startOfAppendix())
y_top += paintAppendixStart(yo_ + y_top + 2 * defaultRowHeight());
- // the top margin
- if (text_.isFirstRow(pit_, row_) && !text_.isInInset())
- y_top += PAPER_MARGIN;
-
// draw the additional space if needed:
y_top += paintLengthMarker(_("Space above"), parparams.spaceTop(),
yo_ + y_top);
double x = x_;
if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
x = ((is_rtl ? leftMargin() : x_)
- + ww - text_.rightMargin(*pit_, *bv_.buffer())) / 2;
+ + ww - text_.rightMargin(*pit_)) / 2;
x -= font_metrics::width(str, font) / 2;
} else if (is_rtl) {
x = ww - leftMargin() -
{
ParagraphParameters const & parparams = pit_->params();
int y_bottom = row_.height() - 1;
-
- // the bottom margin
- if (text_.isLastRow(pit_, row_) && !text_.isInInset())
- y_bottom -= PAPER_MARGIN;
-
int const ww = bv_.workWidth();
// draw the additional space if needed:
LyXFont const font = getLabelFont();
int const size = int(0.75 * font_metrics::maxAscent(font));
int const y = yo_ + row_.baseline() - size;
- int x = is_rtl ? LEFT_MARGIN : ww - PAPER_MARGIN - size;
+ int x = is_rtl ? NEST_MARGIN + CHANGEBAR_MARGIN: ww - size;
if (row_.fill() <= size)
x += (size - row_.fill() + 1) * (is_rtl ? -1 : 1);
string const & str = pit_->layout()->endlabelstring();
double const x = is_rtl ?
x_ - font_metrics::width(str, font)
- : ww - text_.rightMargin(*pit_, *bv_.buffer()) - row_.fill();
+ : ww - text_.rightMargin(*pit_) - row_.fill();
pain_.text(int(x), yo_ + row_.baseline(), str, font);
break;
}
using std::string;
-/// top, right, bottom pixel margin
-extern int const PAPER_MARGIN = 20;
+/// some space for drawing the 'nested' markers (in pixel)
+extern int const NEST_MARGIN = 20;
/// margin for changebar
extern int const CHANGEBAR_MARGIN = 10;
-/// left margin
-extern int const LEFT_MARGIN = PAPER_MARGIN + CHANGEBAR_MARGIN;
-
-
-
-int bibitemMaxWidth(BufferView *, LyXFont const &);
namespace {
}
-void LyXText::updateRowPositions()
+void LyXText::updateParPositions()
{
ParagraphList::iterator pit = ownerParagraphs().begin();
ParagraphList::iterator end = ownerParagraphs().end();
}
-int LyXText::workWidth() const
+int LyXText::textWidth() const
{
- return inset_owner ? inset_owner->textWidth() : bv()->workWidth();
+ return textwidth_;
}
return 0;
char const c = pit->getChar(pos);
- LyXFont const & font = getFont(pit, pos);
- return singleWidth(pit, pos, c, font);
+ return singleWidth(pit, pos, c, getFont(pit, pos));
}
}
-int LyXText::leftMargin(ParagraphList::iterator pit, Row const & row) const
+int LyXText::leftMargin(ParagraphList::iterator pit) const
+{
+ return leftMargin(pit, pit->size());
+}
+
+
+int LyXText::leftMargin(ParagraphList::iterator pit, pos_type pos) const
{
LyXTextClass const & tclass =
bv()->buffer()->params().getLyXTextClass();
string parindent = layout->parindent;
- int x = LEFT_MARGIN;
+ int x = NEST_MARGIN + CHANGEBAR_MARGIN;
x += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
- // this is the way, LyX handles the LaTeX-Environments.
+ // This is the way LyX handles LaTeX-Environments.
// I have had this idea very late, so it seems to be a
// later added hack and this is true
if (pit->getDepth() == 0) {
ParagraphList::iterator newpar =
outerHook(pit, ownerParagraphs());
- // make a corresponding row. Needed to call leftMargin()
- // check wether it is a sufficent paragraph
+ // Make a corresponding row. Need to call leftMargin()
+ // to check whether it is a sufficent paragraph.
if (newpar != ownerParagraphs().end()
&& newpar->layout()->isEnvironment()) {
- x = leftMargin(newpar, Row(newpar->size()));
+ x = leftMargin(newpar);
}
if (newpar != ownerParagraphs().end()
case MARGIN_MANUAL:
x += font_metrics::signedWidth(layout->labelindent, labelfont);
// The width of an empty par, even with manual label, should be 0
- if (!pit->empty() && row.pos() >= pit->beginOfBody()) {
+ if (!pit->empty() && pos >= pit->beginOfBody()) {
if (!pit->getLabelWidthString().empty()) {
x += font_metrics::width(pit->getLabelWidthString(),
labelfont);
case MARGIN_FIRST_DYNAMIC:
if (layout->labeltype == LABEL_MANUAL) {
- if (row.pos() >= pit->beginOfBody()) {
+ if (pos >= pit->beginOfBody()) {
x += font_metrics::signedWidth(layout->leftmargin,
labelfont);
} else {
x += font_metrics::signedWidth(layout->labelindent,
labelfont);
}
- } else if (row.pos()
+ } else if (pos != 0
// Special case to fix problems with
// theorems (JMarc)
|| (layout->labeltype == LABEL_STATIC
RowList::iterator rit = pit->rows.begin();
RowList::iterator end = pit->rows.end();
#warning This is wrong.
- int minfill = workWidth() / 2;
+ int minfill = textwidth_;
for ( ; rit != end; ++rit)
if (rit->fill() < minfill)
minfill = rit->fill();
x += font_metrics::signedWidth(layout->leftmargin,
tclass.defaultfont());
x += minfill;
+ break;
}
- break;
}
- if (workWidth() > 0 && !pit->params().leftIndent().zero()) {
- LyXLength const len = pit->params().leftIndent();
+ if (!pit->params().leftIndent().zero()) {
int const tw = inset_owner ?
- inset_owner->latexTextWidth(bv()) : workWidth();
- x += len.inPixels(tw);
+ inset_owner->latexTextWidth(bv()) : textWidth();
+ x += pit->params().leftIndent().inPixels(tw);
}
LyXAlignment align;
align = pit->params().align();
// set the correct parindent
- if (row.pos() == 0) {
+ if (pos == 0) {
if ((layout->labeltype == LABEL_NO_LABEL
|| layout->labeltype == LABEL_TOP_ENVIRONMENT
|| layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
BufferParams::PARSEP_INDENT)) {
x += font_metrics::signedWidth(parindent,
tclass.defaultfont());
- } else if (layout->labeltype == LABEL_BIBLIO) {
- // ale970405 Right width for bibitems
- x += bibitemMaxWidth(bv(), tclass.defaultfont());
}
}
}
-int LyXText::rightMargin(Paragraph const & par, Buffer const & buf) const
+int LyXText::rightMargin(Paragraph const & par) const
{
- LyXTextClass const & tclass = buf.params().getLyXTextClass();
- LyXLayout_ptr const & layout = par.layout();
+ LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
- return PAPER_MARGIN
+ return
+ font_metrics::signedWidth(tclass.rightmargin(),
tclass.defaultfont())
- + font_metrics::signedWidth(layout->rightmargin,
+ + font_metrics::signedWidth(par.layout()->rightmargin,
tclass.defaultfont())
* 4 / (par.getDepth() + 4);
}
-int LyXText::labelEnd(ParagraphList::iterator pit, Row const & row) const
+int LyXText::labelEnd(ParagraphList::iterator pit) const
{
// labelEnd is only needed if the layout fills a flushleft label.
if (pit->layout()->margintype != MARGIN_MANUAL)
return 0;
-
- Row tmprow = row;
- tmprow.pos(pit->size());
// return the beginning of the body
- return leftMargin(pit, tmprow);
+ return leftMargin(pit);
}
return;
}
- // maximum pixel width of a row.
- int width = workWidth() - rightMargin(*pit, *bv()->buffer());
-// - leftMargin(pit, row);
-
- // inset->textWidth() returns -1 via workWidth(),
- // but why ?
+ // maximum pixel width of a row
+ int width = textWidth() - rightMargin(*pit); // - leftMargin(pit, row);
if (width < 0) {
row.endpos(end);
return;
// or the end of the par, then choose the possible break
// nearest that.
- int const left = leftMargin(pit, row);
+ int const left = leftMargin(pit, pos);
int x = left;
// pixel width since last breakpoint
}
// Break before...
if (i + 1 < end) {
- InsetOld * in = pit->getInset(i + 1);
- if (in && in->display()) {
+ if (pit->isInset(i + 1) && pit->getInset(i + 1)->display()) {
point = i + 1;
break;
}
// ...and after.
- in = pit->getInset(i);
- if (in && in->display()) {
+ if (pit->isInset(i) && pit->getInset(i)->display()) {
point = i + 1;
break;
}
if (pit->isLineSeparator(i - 1))
add -= singleWidth(pit, i - 1);
- add = std::max(add, labelEnd(pit, row) - x);
+ add = std::max(add, labelEnd(pit) - x);
thiswidth += add;
}
chunkwidth += thiswidth;
}
-
// break before a character that will fall off
// the right of the row
if (x >= width) {
}
}
// exit on last registered breakpoint:
-#if 0
- // hack removed:
- if (i + 1 < end)
-#endif
break;
}
- InsetOld * in = pit->getInset(i);
- if (!in || in->isChar()) {
+ if (!pit->isInset(i) || pit->getInset(i)->isChar()) {
// some insets are line separators too
if (pit->isLineSeparator(i)) {
// register breakpoint:
}
}
-#if 0
- // hack removed (connected with the #if 0 above):
- if (point == end && i != end && x >= width) {
- // didn't find one, break at the point we reached the edge
- point = i + 1;
- } else
-#endif
if (i == end && x < width) {
// maybe found one, but the par is short enough.
point = end;
// get the pure distance
pos_type const end = row.endpos();
- LyXLayout_ptr const & layout = pit->layout();
- int w = leftMargin(pit, row);
+ string labelsep = pit->layout()->labelsep;
+ int w = leftMargin(pit, row.pos());
pos_type const body_pos = pit->beginOfBody();
pos_type i = row.pos();
lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
for ( ; i < end; ++i) {
if (body_pos > 0 && i == body_pos) {
- w += font_metrics::width(layout->labelsep, getLabelFont(pit));
+ w += font_metrics::width(labelsep, getLabelFont(pit));
if (pit->isLineSeparator(i - 1))
w -= singleWidth(pit, i - 1);
- w = max(w, labelEnd(pit, row));
+ w = max(w, labelEnd(pit));
}
char const c = pit->getChar(i);
if (IsPrintable(c) && i > endPosOfFontSpan) {
}
if (body_pos > 0 && body_pos >= end) {
- w += font_metrics::width(layout->labelsep, getLabelFont(pit));
+ w += font_metrics::width(labelsep, getLabelFont(pit));
if (end > 0 && pit->isLineSeparator(end - 1))
w -= singleWidth(pit, end - 1);
- w = max(w, labelEnd(pit, row));
+ w = max(w, labelEnd(pit));
}
- int const fill = workwidth - w - rightMargin(*pit, *bv()->buffer());
+ int const fill = workwidth - w - rightMargin(*pit);
row.fill(fill);
row.width(workwidth - fill);
}
maxasc += bufparams.getDefSkip().inPixels(*bv());
}
- // the top margin
- if (pit == ownerParagraphs().begin() && !isInInset())
- maxasc += PAPER_MARGIN;
-
// add user added vertical space
maxasc += getLengthMarkerHeight(*bv(), pit->params().spaceTop());
// is it a bottom line?
if (row.endpos() >= pit->size()) {
- // the bottom margin
- ParagraphList::iterator nextpit = boost::next(pit);
- if (nextpit == ownerParagraphs().end() && !isInInset())
- maxdesc += PAPER_MARGIN;
-
// add the vertical spaces, that the user added
maxdesc += getLengthMarkerHeight(*bv(), pit->params().spaceBottom());
// and now the layout spaces, for example before and after
// a section, or between the items of a itemize or enumerate
// environment
+ ParagraphList::iterator nextpit = boost::next(pit);
if (nextpit != ownerParagraphs().end()) {
ParagraphList::iterator cpit = pit;
double usual = 0;
bool const is_rtl =
pit->isRightToLeftPar(bv()->buffer()->params());
if (is_rtl)
- x = workWidth() > 0 ? rightMargin(*pit, *bv()->buffer()) : 0;
+ x = rightMargin(*pit);
else
- x = workWidth() > 0 ? leftMargin(pit, row) : 0;
+ x = leftMargin(pit, row.pos());
// is there a manual margin with a manual label
LyXLayout_ptr const & layout = pit->layout();
// we don't have to look at the alignment if it is ALIGN_LEFT and
// if the row is already larger then the permitted width as then
// we force the LEFT_ALIGN'edness!
- } else if (int(row.width()) < workWidth()) {
+ } else if (int(row.width()) < textWidth()) {
// is it block, flushleft or flushright?
// set x how you need it
int align;
ParagraphList::iterator LyXText::cursorPar() const
{
return getPar(cursor.par());
-#warning have a look at this again later.
- // We need some method to mark the cache as invalidated when
- // the paragraph it points get removed, for this to work.
- if (cursor.par() != cache_pos_) {
- cache_pos_ = cursor.par();
- cache_par_ = getPar(cache_pos_);
- }
- return cache_par_;
}
InsetList::iterator iend = pit->insetlist.end();
for (; ii != iend; ++ii) {
Dimension dim;
- MetricsInfo mi(bv(), getFont(pit, ii->pos), workWidth());
+ int const w = textWidth() - leftMargin(pit) - rightMargin(*pit);
+ MetricsInfo mi(bv(), getFont(pit, ii->pos), w);
ii->inset->metrics(mi, dim);
}
// rebreak the paragraph
pit->setBeginOfBody();
- int const ww = workWidth();
pos_type z = 0;
do {
Row row(z);
rowBreakPoint(pit, row);
z = row.endpos();
- fill(pit, row, ww);
+ fill(pit, row, textwidth_);
prepareToPrint(pit, row);
setHeightOfRow(pit, row);
row.y_offset(pit->height);
{
for ( ; pit != end; ++pit)
redoParagraphInternal(pit);
- updateRowPositions();
+ updateParPositions();
}
void LyXText::redoParagraph(ParagraphList::iterator pit)
{
redoParagraphInternal(pit);
- updateRowPositions();
+ updateParPositions();
}
void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
{
- //lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
- // << " workWidth: " << workWidth() << "\nfont: " << mi.base.font << endl;
//BOOST_ASSERT(mi.base.textwidth);
+ if (mi.base.textwidth)
+ textwidth_ = mi.base.textwidth;
+ //lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
+ // << " textWidth: " << textWidth() << "\nfont: " << mi.base.font << endl;
- // rebuild row cache. This recomputes height as well.
+ // Rebuild row cache. This recomputes height as well.
redoParagraphs(ownerParagraphs().begin(), ownerParagraphs().end());
width = maxParagraphWidth(ownerParagraphs());
using std::string;
-LyXText::LyXText(BufferView * bv, InsetText * inset, bool ininset,
+LyXText::LyXText(BufferView * bv, InsetText * inset, bool in_inset,
ParagraphList & paragraphs)
- : height(0), width(0), inset_owner(inset), bv_owner(bv),
- in_inset_(ininset), paragraphs_(¶graphs), xo_(0), yo_(0),
- cache_pos_(-1)
+ : height(0), width(0), textwidth_(bv ? bv->workWidth() : 100),
+ inset_owner(inset), bv_owner(bv),
+ in_inset_(in_inset), paragraphs_(¶graphs), xo_(0), yo_(0)
{}
-LyXText & LyXText::operator=(LyXText const & lt)
-{
- // Copy all public variables
- height = lt.height;
- width = lt.width;
- current_font = lt.current_font;
- real_current_font = lt.real_current_font;
- defaultfont_ = lt.defaultfont_;
- inset_owner = lt.inset_owner;
- bv_owner = lt.bv_owner;
- bidi = lt.bidi;
- in_inset_ = lt.in_inset_;
- paragraphs_ = lt.paragraphs_;
- xo_ = lt.xo_;
- yo_ = lt.yo_;
-
- // Copy all the private variables
-
- // we cannot initailize a iterator with a singular iterator.
- //cache_par_ = lt.cache_par_;
- cache_pos_ = lt.cache_pos_;
-
- return *this;
-}
-
-
void LyXText::init(BufferView * bview)
{
bv_owner = bview;
width = 0;
height = 0;
- cache_pos_ = -1;
current_font = getFont(beg, 0);
start = pit;
}
- ParagraphList::iterator pastend = boost::next(end);
-
if (!test_only)
recUndo(parOffset(start), parOffset(end));
if (test_only)
return changed;
- redoParagraphs(start, pastend);
+ redoParagraphs(start, boost::next(end));
// We need to actually move the text->cursor. I don't
// understand why ...
// If the mask is completely neutral, tell user
if (font == LyXFont(LyXFont::ALL_IGNORE)) {
// Could only happen with user style
- bv()->owner()->message(_("No font change defined. Use Character under the Layout menu to define font change."));
+ bv()->owner()->message(_("No font change defined. "
+ "Use Character under the Layout menu to define font change."));
return;
}
{
int const cur_labeltype = pit->layout()->labeltype;
- if (cur_labeltype != LABEL_ENUMERATE &&
- cur_labeltype != LABEL_ITEMIZE)
+ if (cur_labeltype != LABEL_ENUMERATE && cur_labeltype != LABEL_ITEMIZE)
return;
int const cur_depth = pit->getDepth();
// The character will not be inserted a second time
insertChar(Paragraph::META_INSET);
// If we enter a highly editable inset the cursor should be before
- // the inset. After an Undo LyX tries to call inset->edit(...)
+ // the inset. After an undo LyX tries to call inset->edit(...)
// and fails if the cursor is behind the inset and getInset
// does not return the inset!
if (isHighlyEditableInset(inset))
deleteEmptyParagraphMechanism(old_cursor);
}
-//x,y are coordinates relative to this LyXText
+// x,y are coordinates relative to this LyXText
void LyXText::setCursorFromCoordinates(LyXCursor & cur, int x, int y)
{
// Get the row first.
}
-
bool LyXText::checkAndActivateInset(bool front)
{
if (cursor.pos() == cursorPar()->size())
extern string current_layout;
-extern int bibitemMaxWidth(BufferView *, LyXFont const &);
// the selection possible is needed, that only motion events are
// used, where the bottom press event was on the drawing area too
DispatchResult LyXText::dispatch(FuncRequest const & cmd)
{
//lyxerr[Debug::ACTION] << "LyXText::dispatch: cmd: " << cmd << endl;
- lyxerr << "LyXText::dispatch: cmd: " << cmd << endl;
BufferView * bv = cmd.view();
projects / features.git / commitdiff