#include "bufferparams.h"
#include "BufferView.h"
#include "debug.h"
+#include "dispatchresult.h"
#include "encoding.h"
#include "funcrequest.h"
#include "gettext.h"
}
+double LyXText::spacing(Paragraph const & par) const
+{
+ if (par.params().spacing().isDefault())
+ return bv()->buffer()->params().spacing().getValue();
+ return par.params().spacing().getValue();
+}
+
+
BufferView * LyXText::bv() const
{
BOOST_ASSERT(bv_owner != 0);
}
-#warning FIXME This function seems to belong outside of LyxText.
-unsigned char LyXText::transformChar(unsigned char c, Paragraph const & par,
- pos_type pos) const
-{
- if (!Encodings::is_arabic(c))
- if (lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 && IsDigit(c))
- return c + (0xb0 - '0');
- else
- return c;
-
- unsigned char const prev_char = pos > 0 ? par.getChar(pos - 1) : ' ';
- unsigned char next_char = ' ';
-
- pos_type const par_size = par.size();
-
- for (pos_type i = pos + 1; i < par_size; ++i) {
- unsigned char const par_char = par.getChar(i);
- if (!Encodings::IsComposeChar_arabic(par_char)) {
- next_char = par_char;
- break;
- }
- }
-
- if (Encodings::is_arabic(next_char)) {
- if (Encodings::is_arabic(prev_char) &&
- !Encodings::is_arabic_special(prev_char))
- return Encodings::TransformChar(c, Encodings::FORM_MEDIAL);
- else
- return Encodings::TransformChar(c, Encodings::FORM_INITIAL);
- } else {
- if (Encodings::is_arabic(prev_char) &&
- !Encodings::is_arabic_special(prev_char))
- return Encodings::TransformChar(c, Encodings::FORM_FINAL);
- else
- return Encodings::TransformChar(c, Encodings::FORM_ISOLATED);
- }
-}
-
// This is the comments that some of the warnings below refers to.
// There are some issues in this file and I don't think they are
// really related to the FIX_DOUBLE_SPACE patch. I'd rather think that
return 0;
}
-
// The most common case is handled first (Asger)
if (IsPrintable(c)) {
if (!font.language()->RightToLeft()) {
if (Encodings::IsComposeChar_arabic(c))
return 0;
else
- c = transformChar(c, *pit, pos);
+ c = pit->transformChar(c, pos);
} else if (font.language()->lang() == "hebrew" &&
Encodings::IsComposeChar_hebrew(c))
return 0;
return font_metrics::width(c, font);
}
- if (c == Paragraph::META_INSET) {
- InsetOld * tmpinset = pit->getInset(pos);
- BOOST_ASSERT(tmpinset);
- if (tmpinset->lyxCode() == InsetOld::HFILL_CODE) {
- // Because of the representation as vertical lines
- return 3;
- }
- return tmpinset->width();
- }
+ if (c == Paragraph::META_INSET)
+ return pit->getInset(pos)->width();
if (IsSeparatorChar(c))
c = ' ';
// this is the way, LyX handles the 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()) {
+ if (pit->getDepth() == 0) {
if (pit->layout() == tclass.defaultLayout()) {
// find the previous same level paragraph
if (pit != ownerParagraphs().begin()) {
ParagraphList::iterator newpit =
- depthHook(pit, ownerParagraphs(),
- pit->getDepth());
- if (newpit == pit &&
- newpit->layout()->nextnoindent)
+ depthHook(pit, ownerParagraphs(), pit->getDepth());
+ if (newpit == pit && newpit->layout()->nextnoindent)
parindent.erase();
}
}
} else {
// find the next level paragraph
-
- ParagraphList::iterator newpar = outerHook(pit,
- ownerParagraphs());
+ ParagraphList::iterator newpar =
+ outerHook(pit, ownerParagraphs());
// make a corresponding row. Needed to call leftMargin()
-
// check wether it is a sufficent paragraph
- if (newpar != ownerParagraphs().end() &&
- newpar->layout()->isEnvironment()) {
+ if (newpar != ownerParagraphs().end()
+ && newpar->layout()->isEnvironment()) {
x = leftMargin(newpar, Row(newpar->size()));
}
- if (newpar != ownerParagraphs().end() &&
- pit->layout() == tclass.defaultLayout()) {
+ if (newpar != ownerParagraphs().end()
+ && pit->layout() == tclass.defaultLayout()) {
if (newpar->params().noindent())
parindent.erase();
- else {
+ else
parindent = newpar->layout()->parindent;
- }
-
}
}
LyXFont const labelfont = getLabelFont(pit);
switch (layout->margintype) {
case MARGIN_DYNAMIC:
- if (!layout->leftmargin.empty()) {
+ if (!layout->leftmargin.empty())
x += font_metrics::signedWidth(layout->leftmargin,
tclass.defaultfont());
- }
if (!pit->getLabelstring().empty()) {
x += font_metrics::signedWidth(layout->labelindent,
labelfont);
x += font_metrics::width(layout->labelsep, labelfont);
}
break;
+
case MARGIN_MANUAL:
x += font_metrics::signedWidth(layout->labelindent, labelfont);
// The width of an empty par, even with manual label, should be 0
}
}
break;
+
case MARGIN_STATIC:
x += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()) * 4
/ (pit->getDepth() + 4);
break;
+
case MARGIN_FIRST_DYNAMIC:
if (layout->labeltype == LABEL_MANUAL) {
if (row.pos() >= pit->beginningOfBody()) {
}
break;
- case MARGIN_RIGHT_ADDRESS_BOX:
- {
+ case MARGIN_RIGHT_ADDRESS_BOX: {
// ok, a terrible hack. The left margin depends on the widest
// row in this paragraph.
RowList::iterator rit = pit->rows.begin();
}
-int LyXText::rightMargin(Paragraph const & par,
- Buffer const & buf, Row const &) const
+int LyXText::rightMargin(Paragraph const & par, Buffer const & buf) const
{
LyXTextClass const & tclass = buf.params().getLyXTextClass();
LyXLayout_ptr const & layout = par.layout();
int LyXText::labelEnd(ParagraphList::iterator pit, Row const & row) const
{
- if (pit->layout()->margintype == MARGIN_MANUAL) {
- Row tmprow = row;
- tmprow.pos(pit->size());
- // return the beginning of the body
- return leftMargin(pit, tmprow);
- }
+ // labelEnd is only needed if the layout fills a flushleft label.
+ if (pit->layout()->margintype != MARGIN_MANUAL)
+ return 0;
- // LabelEnd is only needed if the layout
- // fills a flushleft label.
- return 0;
+ Row tmprow = row;
+ tmprow.pos(pit->size());
+ // return the beginning of the body
+ return leftMargin(pit, tmprow);
}
pos_type addressBreakPoint(pos_type i, Paragraph const & par)
{
pos_type const end = par.size();
-
+
for (; i < end; ++i)
if (par.isNewline(i))
return i + 1;
row.endpos(end);
return;
}
-
+
// maximum pixel width of a row.
- int width = workWidth()
- - rightMargin(*pit, *bv()->buffer(), row);
+ int width = workWidth() - rightMargin(*pit, *bv()->buffer());
// - leftMargin(pit, row);
// inset->textWidth() returns -1 via workWidth(),
point = i + 1;
break;
}
- // Break before...
+ // Break before...
if (i + 1 < end) {
InsetOld * in = pit->getInset(i + 1);
if (in && in->display()) {
}
char const c = pit->getChar(i);
-
+
if (i > endPosOfFontSpan) {
font = getFont(pit, i);
endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
}
-
+
{
int thiswidth = singleWidth(pit, i, c, font);
//<< x << " width: " << width << endl;
chunkwidth += thiswidth;
}
-
+
// break before a character that will fall off
// the right of the row
if (point == end || chunkwidth >= width - left) {
if (i > pos) {
point = i;
- break;
+ break;
}
}
// exit on last registered breakpoint:
+#if 0
+ // hack removed:
if (i + 1 < end)
- break;
+#endif
+ break;
}
InsetOld * in = pit->getInset(i);
// some insets are line separators too
if (pit->isLineSeparator(i)) {
// register breakpoint:
- point = i + 1;
+ point = i + 1;
chunkwidth = 0;
}
}
}
+#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 if (i == end && x < width) {
+ } else
+#endif
+ if (i == end && x < width) {
// maybe found one, but the par is short enough.
point = end;
}
// returns the minimum space a row needs on the screen in pixel
-void LyXText::fill(ParagraphList::iterator pit, Row & row, int paper_width) const
+void LyXText::fill(ParagraphList::iterator pit, Row & row, int workwidth) const
{
- int w;
// get the pure distance
pos_type const end = row.endpos();
LyXLayout_ptr const & layout = pit->layout();
-
- // special handling of the right address boxes
-#if 0
-//this is not working anymore
- if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
- int const tmpfill = row.fill();
- row.fill(0); // the minfill in leftMargin()
- w = leftMargin(pit, row);
- row.fill(tmpfill);
- } else {
- w = leftMargin(pit, row);
- }
-#else
- w = leftMargin(pit, row);
-#endif
+ int w = leftMargin(pit, row);
pos_type const body_pos = pit->beginningOfBody();
pos_type i = row.pos();
// We re-use the font resolution for the entire span when possible
LyXFont font = getFont(pit, i);
lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
- while (i < end) {
+ for ( ; i < end; ++i) {
if (body_pos > 0 && i == body_pos) {
w += font_metrics::width(layout->labelsep, getLabelFont(pit));
if (pit->isLineSeparator(i - 1))
w -= singleWidth(pit, i - 1);
- int left_margin = labelEnd(pit, row);
- if (w < left_margin)
- w = left_margin;
+ w = max(w, labelEnd(pit, row));
}
char const c = pit->getChar(i);
if (IsPrintable(c) && i > endPosOfFontSpan) {
endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
}
w += singleWidth(pit, i, c, font);
- ++i;
}
}
+
if (body_pos > 0 && body_pos >= end) {
w += font_metrics::width(layout->labelsep, getLabelFont(pit));
if (end > 0 && pit->isLineSeparator(end - 1))
w -= singleWidth(pit, end - 1);
- int const left_margin = labelEnd(pit, row);
- if (w < left_margin)
- w = left_margin;
+ w = max(w, labelEnd(pit, row));
}
- int const fill = paper_width - w - rightMargin(*pit, *bv()->buffer(), row);
+ int const fill = workwidth - w - rightMargin(*pit, *bv()->buffer());
row.fill(fill);
- row.width(paper_width - fill);
+ row.width(workwidth - fill);
}
for (pos_type i = row.pos(); i <= last; ++i)
w += singleWidth(pit, i);
- int fill = 0;
- string const & labwidstr = pit->params().labelWidthString();
- if (!labwidstr.empty()) {
- LyXFont const labfont = getLabelFont(pit);
- int const labwidth = font_metrics::width(labwidstr, labfont);
- fill = max(labwidth - w, 0);
- }
+ string const & label = pit->params().labelWidthString();
+ if (label.empty())
+ return 0;
- return fill;
+ return max(0, font_metrics::width(label, getLabelFont(pit)) - w);
}
{
if (inset_owner)
return inset_owner->backgroundColor();
- else
- return LColor::background;
+ return LColor::background;
}
// get the maximum ascent and the maximum descent
double layoutasc = 0;
double layoutdesc = 0;
- double tmptop = 0;
+ double const dh = defaultRowHeight();
// ok, let us initialize the maxasc and maxdesc value.
// Only the fontsize count. The other properties
LyXFont labelfont = getLabelFont(pit);
- double spacing_val = 1.0;
- if (!pit->params().spacing().isDefault())
- spacing_val = pit->params().spacing().getValue();
- else
- spacing_val = bv()->buffer()->params().spacing().getValue();
- //lyxerr << "spacing_val = " << spacing_val << endl;
-
// these are minimum values
- int maxasc = int(font_metrics::maxAscent(font) *
- layout->spacing.getValue() * spacing_val);
- int maxdesc = int(font_metrics::maxDescent(font) *
- layout->spacing.getValue() * spacing_val);
+ double const spacing_val = layout->spacing.getValue() * spacing(*pit);
+ //lyxerr << "spacing_val = " << spacing_val << endl;
+ int maxasc = int(font_metrics::maxAscent(font) * spacing_val);
+ int maxdesc = int(font_metrics::maxDescent(font) * spacing_val);
// insets may be taller
InsetList::iterator ii = pit->insetlist.begin();
InsetList::iterator iend = pit->insetlist.end();
for ( ; ii != iend; ++ii) {
if (ii->pos >= row.pos() && ii->pos < row.endpos()) {
- maxasc = max(maxasc, ii->inset->ascent());
+ maxasc = max(maxasc, ii->inset->ascent());
maxdesc = max(maxdesc, ii->inset->descent());
}
}
pit->highestFontInRange(row.pos(), pos_end, size);
if (maxsize > font.size()) {
font.setSize(maxsize);
- maxasc = max(maxasc, font_metrics::maxAscent(font));
+ maxasc = max(maxasc, font_metrics::maxAscent(font));
maxdesc = max(maxdesc, font_metrics::maxDescent(font));
}
row.ascent_of_text(maxasc);
// is it a top line?
- if (!row.pos()) {
+ if (row.pos() == 0) {
BufferParams const & bufparams = bv()->buffer()->params();
// some parksips VERY EASY IMPLEMENTATION
- if (bv()->buffer()->params().paragraph_separation ==
- BufferParams::PARSEP_SKIP)
+ if (bv()->buffer()->params().paragraph_separation
+ == BufferParams::PARSEP_SKIP
+ && pit != ownerParagraphs().begin()
+ && ((layout->isParagraph() && pit->getDepth() == 0)
+ || (boost::prior(pit)->layout()->isParagraph()
+ && boost::prior(pit)->getDepth() == 0)))
{
- if (layout->isParagraph()
- && pit->getDepth() == 0
- && pit != ownerParagraphs().begin())
- {
- maxasc += bufparams.getDefSkip().inPixels(*bv());
- } else if (pit != ownerParagraphs().begin() &&
- boost::prior(pit)->layout()->isParagraph() &&
- boost::prior(pit)->getDepth() == 0)
- {
- // is it right to use defskip here too? (AS)
maxasc += bufparams.getDefSkip().inPixels(*bv());
- }
}
// the top margin
if (pit == ownerParagraphs().begin() && !isInInset())
maxasc += PAPER_MARGIN;
- // add the vertical spaces, that the user added
+ // add user added vertical space
maxasc += getLengthMarkerHeight(*bv(), pit->params().spaceTop());
- // do not forget the DTP-lines!
- // there height depends on the font of the nearest character
- if (pit->params().lineTop())
-
- maxasc += 2 * font_metrics::ascent('x', getFont(pit, 0));
- // and now the pagebreaks
- if (pit->params().pagebreakTop())
- maxasc += 3 * defaultRowHeight();
-
if (pit->params().startOfAppendix())
- maxasc += 3 * defaultRowHeight();
+ maxasc += int(3 * dh);
// This is special code for the chapter, since the label of this
// layout is printed in an extra row
if (layout->counter == "chapter" && bufparams.secnumdepth >= 0) {
- float spacing_val = 1.0;
- if (!pit->params().spacing().isDefault()) {
- spacing_val = pit->params().spacing().getValue();
- } else {
- spacing_val = bufparams.spacing().getValue();
- }
-
- labeladdon = int(font_metrics::maxDescent(labelfont) *
- layout->spacing.getValue() *
- spacing_val)
- + int(font_metrics::maxAscent(labelfont) *
- layout->spacing.getValue() *
- spacing_val);
+ labeladdon = int(font_metrics::maxHeight(labelfont)
+ * layout->spacing.getValue() * spacing(*pit));
}
// special code for the top label
&& isFirstInSequence(pit, ownerParagraphs())
&& !pit->getLabelstring().empty())
{
- float spacing_val = 1.0;
- if (!pit->params().spacing().isDefault()) {
- spacing_val = pit->params().spacing().getValue();
- } else {
- spacing_val = bufparams.spacing().getValue();
- }
-
labeladdon = int(
- (font_metrics::maxAscent(labelfont) +
- font_metrics::maxDescent(labelfont)) *
- layout->spacing.getValue() *
- spacing_val
- + layout->topsep * defaultRowHeight()
- + layout->labelbottomsep * defaultRowHeight());
+ font_metrics::maxHeight(labelfont)
+ * layout->spacing.getValue()
+ * spacing(*pit)
+ + (layout->topsep + layout->labelbottomsep) * dh);
}
// And now the layout spaces, for example before and after
// a section, or between the items of a itemize or enumerate
// environment.
- if (!pit->params().pagebreakTop()) {
- ParagraphList::iterator prev =
- depthHook(pit, ownerParagraphs(),
- pit->getDepth());
- if (prev != pit && prev->layout() == layout &&
- prev->getDepth() == pit->getDepth() &&
- prev->getLabelWidthString() == pit->getLabelWidthString())
- {
- layoutasc = (layout->itemsep * defaultRowHeight());
- } else if (pit != ownerParagraphs().begin() || row.pos() != 0) {
- tmptop = layout->topsep;
-
- if (tmptop > 0)
- layoutasc = (tmptop * defaultRowHeight());
- } else if (pit->params().lineTop()) {
- tmptop = layout->topsep;
-
- if (tmptop > 0)
- layoutasc = (tmptop * defaultRowHeight());
- }
+ ParagraphList::iterator prev =
+ depthHook(pit, ownerParagraphs(), pit->getDepth());
+ if (prev != pit
+ && prev->layout() == layout
+ && prev->getDepth() == pit->getDepth()
+ && prev->getLabelWidthString() == pit->getLabelWidthString())
+ {
+ layoutasc = layout->itemsep * dh;
+ } else if (pit != ownerParagraphs().begin() || row.pos() != 0) {
+ if (layout->topsep > 0)
+ layoutasc = layout->topsep * dh;
+ }
- prev = outerHook(pit, ownerParagraphs());
- if (prev != ownerParagraphs().end()) {
- maxasc += int(prev->layout()->parsep * defaultRowHeight());
- } else if (pit != ownerParagraphs().begin()) {
- ParagraphList::iterator prior_pit = boost::prior(pit);
- if (prior_pit->getDepth() != 0 ||
- prior_pit->layout() == layout) {
- maxasc += int(layout->parsep * defaultRowHeight());
- }
+ prev = outerHook(pit, ownerParagraphs());
+ if (prev != ownerParagraphs().end()) {
+ maxasc += int(prev->layout()->parsep * dh);
+ } else if (pit != ownerParagraphs().begin()) {
+ ParagraphList::iterator prior_pit = boost::prior(pit);
+ if (prior_pit->getDepth() != 0 ||
+ prior_pit->layout() == layout) {
+ maxasc += int(layout->parsep * dh);
}
}
}
// add the vertical spaces, that the user added
maxdesc += getLengthMarkerHeight(*bv(), pit->params().spaceBottom());
- // do not forget the DTP-lines!
- // there height depends on the font of the nearest character
- if (pit->params().lineBottom())
- maxdesc += 2 * font_metrics::ascent('x',
- getFont(pit, max(pos_type(0), pit->size() - 1)));
-
- // and now the pagebreaks
- if (pit->params().pagebreakBottom())
- maxdesc += 3 * defaultRowHeight();
-
// and now the layout spaces, for example before and after
// a section, or between the items of a itemize or enumerate
// environment
- if (!pit->params().pagebreakBottom()
- && nextpit != ownerParagraphs().end()) {
- ParagraphList::iterator comparepit = pit;
- float usual = 0;
- float unusual = 0;
-
- if (comparepit->getDepth() > nextpit->getDepth()) {
- usual = (comparepit->layout()->bottomsep * defaultRowHeight());
- comparepit = depthHook(comparepit, ownerParagraphs(), nextpit->getDepth());
- if (comparepit->layout()!= nextpit->layout()
- || nextpit->getLabelWidthString() !=
- comparepit->getLabelWidthString())
+ if (nextpit != ownerParagraphs().end()) {
+ ParagraphList::iterator cpit = pit;
+ double usual = 0;
+ double unusual = 0;
+
+ if (cpit->getDepth() > nextpit->getDepth()) {
+ usual = cpit->layout()->bottomsep * dh;
+ cpit = depthHook(cpit, ownerParagraphs(), nextpit->getDepth());
+ if (cpit->layout() != nextpit->layout()
+ || nextpit->getLabelWidthString() != cpit->getLabelWidthString())
{
- unusual = (comparepit->layout()->bottomsep * defaultRowHeight());
+ unusual = cpit->layout()->bottomsep * dh;
}
- if (unusual > usual)
- layoutdesc = unusual;
- else
- layoutdesc = usual;
- } else if (comparepit->getDepth() == nextpit->getDepth()) {
-
- if (comparepit->layout() != nextpit->layout()
- || nextpit->getLabelWidthString() !=
- comparepit->getLabelWidthString())
- layoutdesc = int(comparepit->layout()->bottomsep * defaultRowHeight());
+ layoutdesc = max(unusual, usual);
+ } else if (cpit->getDepth() == nextpit->getDepth()) {
+ if (cpit->layout() != nextpit->layout()
+ || nextpit->getLabelWidthString() != cpit->getLabelWidthString())
+ layoutdesc = int(cpit->layout()->bottomsep * dh);
}
}
}
// incalculate the layout spaces
- maxasc += int(layoutasc * 2 / (2 + pit->getDepth()));
+ maxasc += int(layoutasc * 2 / (2 + pit->getDepth()));
maxdesc += int(layoutdesc * 2 / (2 + pit->getDepth()));
row.height(maxasc + maxdesc + labeladdon);
}
}
-
// First check, if there will be two blanks together or a blank at
// the beginning of a paragraph.
// I decided to handle blanks like normal characters, the main
bool const is_rtl =
pit->isRightToLeftPar(bv()->buffer()->params());
if (is_rtl)
- x = workWidth() > 0 ? rightMargin(*pit, *bv()->buffer(), row) : 0;
+ x = workWidth() > 0 ? rightMargin(*pit, *bv()->buffer()) : 0;
else
x = workWidth() > 0 ? leftMargin(pit, row) : 0;
// is it block, flushleft or flushright?
// set x how you need it
int align;
- if (pit->params().align() == LYX_ALIGN_LAYOUT) {
+ if (pit->params().align() == LYX_ALIGN_LAYOUT)
align = layout->align;
- } else {
+ else
align = pit->params().align();
- }
- // ERT insets should always be LEFT ALIGNED on screen
- InsetOld * inset = pit->inInset();
- if (inset && inset->owner() &&
- inset->owner()->lyxCode() == InsetOld::ERT_CODE)
- {
- align = LYX_ALIGN_LEFT;
- }
// Display-style insets should always be on a centred row
// The test on pit->size() is to catch zero-size pars, which
{
align = LYX_ALIGN_CENTER;
}
-
+
switch (align) {
- case LYX_ALIGN_BLOCK:
- {
- int const ns = numberOfSeparators(*pit, row);
- bool disp_inset = false;
- if (row.endpos() < pit->size()) {
- InsetOld * in = pit->getInset(row.endpos());
- if (in)
- disp_inset = in->display();
- }
- // If we have separators, this is not the last row of a
- // par, does not end in newline, and is not row above a
- // display inset... then stretch it
- if (ns
- && row.endpos() < pit->size()
- && !pit->isNewline(row.endpos() - 1)
- && !disp_inset
- ) {
- fill_separator = w / ns;
- } else if (is_rtl) {
- x += w;
+ case LYX_ALIGN_BLOCK: {
+ int const ns = numberOfSeparators(*pit, row);
+ bool disp_inset = false;
+ if (row.endpos() < pit->size()) {
+ InsetOld * in = pit->getInset(row.endpos());
+ if (in)
+ disp_inset = in->display();
+ }
+ // If we have separators, this is not the last row of a
+ // par, does not end in newline, and is not row above a
+ // display inset... then stretch it
+ if (ns
+ && row.endpos() < pit->size()
+ && !pit->isNewline(row.endpos() - 1)
+ && !disp_inset
+ ) {
+ fill_separator = w / ns;
+ } else if (is_rtl) {
+ x += w;
+ }
+ break;
}
- break;
- }
- case LYX_ALIGN_RIGHT:
+ case LYX_ALIGN_RIGHT:
x += w;
break;
- case LYX_ALIGN_CENTER:
+ case LYX_ALIGN_CENTER:
x += w / 2;
break;
}
pos_type body_pos = pit->beginningOfBody();
pos_type end = row.endpos();
- if (body_pos > 0 &&
- (body_pos > end ||
- !pit->isLineSeparator(body_pos - 1))) {
+ if (body_pos > 0
+ && (body_pos > end || !pit->isLineSeparator(body_pos - 1)))
+ {
x += font_metrics::width(layout->labelsep, getLabelFont(pit));
if (body_pos <= end)
x += fill_label_hfill;
void LyXText::Delete()
{
// this is a very easy implementation
-
LyXCursor old_cursor = cursor;
- int const old_cur_par_id = cursorPar()->id();
- int const old_cur_par_prev_id =
- old_cursor.par() ? getPar(old_cursor.par() - 1)->id() : -1;
// just move to the right
cursorRight(bv());
- // CHECK Look at the comment here.
- // This check is not very good...
- // The cursorRightIntern calls DeleteEmptyParagraphMechanism
- // and that can very well delete the par or par->previous in
- // old_cursor. Will a solution where we compare paragraph id's
- //work better?
- int iid = cursor.par() ? getPar(cursor.par() - 1)->id() : -1;
- if (iid == old_cur_par_prev_id && cursorPar()->id() != old_cur_par_id) {
- // delete-empty-paragraph-mechanism has done it
- return;
- }
-
// if you had success make a backspace
if (old_cursor.par() != cursor.par() || old_cursor.pos() != cursor.pos()) {
recordUndo(Undo::DELETE, this, old_cursor.par());
&& cursorPar()->getAlign() == tmppit->getAlign()) {
// Inherit bottom DTD from the paragraph below.
// (the one we are deleting)
- tmppit->params().lineBottom(cursorPar()->params().lineBottom());
tmppit->params().spaceBottom(cursorPar()->params().spaceBottom());
- tmppit->params().pagebreakBottom(cursorPar()->params().pagebreakBottom());
}
cursorLeft(bv());
Buffer & buf = *bv()->buffer();
BufferParams const & bufparams = buf.params();
LyXTextClass const & tclass = bufparams.getLyXTextClass();
+ ParagraphList::iterator const cpit = cursorPar();
- if (cursorPar() != tmppit
- && (cursorPar()->layout() == tmppit->layout()
- || tmppit->layout() == tclass.defaultLayout())
- && cursorPar()->getAlign() == tmppit->getAlign()) {
- mergeParagraph(bufparams,
- buf.paragraphs(), cursorPar());
+ if (cpit != tmppit
+ && (cpit->layout() == tmppit->layout()
+ || tmppit->layout() == tclass.defaultLayout())
+ && cpit->getAlign() == tmppit->getAlign()) {
+ mergeParagraph(bufparams, buf.paragraphs(), cpit);
- if (cursor.pos() && cursorPar()->isSeparator(cursor.pos() - 1))
+ if (cursor.pos() && cpit->isSeparator(cursor.pos() - 1))
cursor.pos(cursor.pos() - 1);
- // the row may have changed, block, hfills etc.
+ // the counters may have changed
updateCounters();
setCursor(cursor.par(), cursor.pos(), false);
}
setCurrentFont();
redoParagraph();
- setCursor(cursor.par(), cursor.pos(), false, !cursor.boundary());
+ setCursor(cursor.par(), cursor.pos(), false, cursor.boundary());
}
ParagraphList::iterator LyXText::cursorPar() const
{
- return getPar(cursor.par());
+ if (cursor.par() != cache_pos_) {
+ cache_pos_ = cursor.par();
+ cache_par_ = getPar(cache_pos_);
+ }
+ return cache_par_;
}
LyXText::getRowNearY(int y, ParagraphList::iterator & pit) const
{
//lyxerr << "getRowNearY: y " << y << endl;
+#if 0
+ ParagraphList::iterator const pend = ownerParagraphs().end();
+ pit = ownerParagraphs().begin();
+ while (int(pit->y + pit->height) < y && pit != pend)
+ ++pit;
+
+ RowList::iterator rit = pit->rows.begin();
+ RowList::iterator const rend = pit->rows.end();
+ while (int(pit->y + rit->y_offset()) < y && rit != rend)
+ ++rit;
+ return rit;
+#else
pit = boost::prior(ownerParagraphs().end());
RowList::iterator rit = lastRow();
previousRow(pit, rit);
return rit;
+#endif
}
//lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
// << " workWidth: " << workWidth() << "\nfont: " << mi.base.font << endl;
//BOOST_ASSERT(mi.base.textwidth);
- //anchor_y_ = 0;
// rebuild row cache. This recomputes height as well.
redoParagraphs(ownerParagraphs().begin(), ownerParagraphs().end());