#include "author.h"
#include "buffer.h"
+#include "buffer_funcs.h"
#include "bufferparams.h"
#include "BufferView.h"
#include "cursor.h"
+#include "coordcache.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "dispatchresult.h"
#include "frontends/font_metrics.h"
#include "frontends/LyXView.h"
+#include "frontends/Painter.h"
#include "insets/insettext.h"
#include "insets/insetbibitem.h"
#include "support/lstrings.h"
#include "support/textutils.h"
-#include "support/tostr.h"
+#include "support/convert.h"
#include <sstream>
-using lyx::par_type;
+using lyx::pit_type;
using lyx::pos_type;
using lyx::word_location;
using std::string;
-/// some space for drawing the 'nested' markers (in pixel)
-extern int const NEST_MARGIN = 20;
-/// margin for changebar
-extern int const CHANGEBAR_MARGIN = 10;
-/// right margin
-extern int const RIGHT_MARGIN = 10;
-
-
namespace {
int numberOfSeparators(Paragraph const & par, Row const & row)
}
-unsigned int maxParagraphWidth(ParagraphList const & plist)
-{
- unsigned int width = 0;
- ParagraphList::const_iterator pit = plist.begin();
- ParagraphList::const_iterator end = plist.end();
- for (; pit != end; ++pit)
- width = std::max(width, pit->width);
- return width;
-}
-
-
int numberOfLabelHfills(Paragraph const & par, Row const & row)
{
pos_type last = row.endpos() - 1;
}
-int readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
- string const & token)
+void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
+ string const & token, LyXFont & font)
{
- static LyXFont font;
static Change change;
BufferParams const & bp = buf.params();
bool hasLayout = tclass.hasLayout(layoutname);
if (!hasLayout) {
- lyxerr << "Layout '" << layoutname << "' does not"
- << " exist in textclass '" << tclass.name()
- << "'." << endl;
- lyxerr << "Trying to use default layout instead."
- << endl;
+ buf.error(ErrorItem(_("Unknown layout"),
+ bformat(_("Layout '%1$s' does not exists in textclass '%2$s'\nTrying to use the default instead.\n"),
+ layoutname, tclass.name()), par.id(), 0, par.size()));
layoutname = tclass.defaultLayoutName();
}
par.params().read(lex);
} else if (token == "\\end_layout") {
- lyxerr << "Solitary \\end_layout in line " << lex.getLineNo() << "\n"
+ lyxerr << BOOST_CURRENT_FUNCTION
+ << ": Solitary \\end_layout in line "
+ << lex.getLineNo() << "\n"
<< "Missing \\begin_layout?.\n";
} else if (token == "\\end_inset") {
- lyxerr << "Solitary \\end_inset in line " << lex.getLineNo() << "\n"
+ lyxerr << BOOST_CURRENT_FUNCTION
+ << ": Solitary \\end_inset in line "
+ << lex.getLineNo() << "\n"
<< "Missing \\begin_inset?.\n";
} else if (token == "\\begin_inset") {
InsetBase * inset = readInset(lex, buf);
string line = lex.getString();
buf.error(ErrorItem(_("Unknown Inset"), line,
par.id(), 0, par.size()));
- return 1;
}
} else if (token == "\\family") {
lex.next();
par.cleanChanges();
change = Change(Change::UNCHANGED);
} else if (token == "\\change_inserted") {
- lex.nextToken();
+ lex.eatLine();
std::istringstream is(lex.getString());
int aid;
lyx::time_type ct;
is >> aid >> ct;
change = Change(Change::INSERTED, bp.author_map[aid], ct);
} else if (token == "\\change_deleted") {
- lex.nextToken();
+ lex.eatLine();
std::istringstream is(lex.getString());
int aid;
lyx::time_type ct;
buf.error(ErrorItem(_("Unknown token"),
bformat(_("Unknown token: %1$s %2$s\n"), token, lex.getString()),
par.id(), 0, par.size()));
- return 1;
}
- return 0;
}
-int readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
+void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
{
- int unknown = 0;
-
lex.nextToken();
string token = lex.getString();
+ LyXFont font;
while (lex.isOK()) {
- unknown += readParToken(buf, par, lex, token);
+ readParToken(buf, par, lex, token, font);
lex.nextToken();
token = lex.getString();
break;
}
}
-
- return unknown;
+ // Initialize begin_of_body_ on load; redoParagraph maintains
+ par.setBeginOfBody();
}
} // namespace anon
-BufferView * LyXText::bv()
-{
- BOOST_ASSERT(bv_owner != 0);
- return bv_owner;
-}
-
BufferView * LyXText::bv() const
{
}
-void LyXText::updateParPositions()
-{
- par_type pit = 0;
- par_type end = pars_.size();
- for (height_ = 0; pit != end; ++pit) {
- pars_[pit].y = height_;
- height_ += pars_[pit].height;
- }
-}
-
-
int LyXText::width() const
{
- return width_;
+ return dim_.wid;
}
int LyXText::height() const
{
- return height_;
+ return dim_.height();
}
-int LyXText::singleWidth(par_type par, pos_type pos) const
+int LyXText::singleWidth(Paragraph const & par, pos_type pos) const
{
- if (pos >= pars_[par].size())
- return 0;
-
- char const c = pars_[par].getChar(pos);
- return singleWidth(par, pos, c, getFont(par, pos));
+ return singleWidth(par, pos, par.getChar(pos), getFont(par, pos));
}
-int LyXText::singleWidth(par_type pit,
+int LyXText::singleWidth(Paragraph const & par,
pos_type pos, char c, LyXFont const & font) const
{
- if (pos >= pars_[pit].size()) {
- lyxerr << "in singleWidth(), pos: " << pos << endl;
- BOOST_ASSERT(false);
- return 0;
- }
+ BOOST_ASSERT(pos < par.size());
// The most common case is handled first (Asger)
if (IsPrintable(c)) {
- if (!font.language()->RightToLeft()) {
+ if (font.language()->RightToLeft()) {
if ((lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 ||
lyxrc.font_norm_type == LyXRC::ISO_10646_1)
&& font.language()->lang() == "arabic") {
if (Encodings::IsComposeChar_arabic(c))
return 0;
- else
- c = pars_[pit].transformChar(c, pos);
+ c = par.transformChar(c, pos);
} else if (font.language()->lang() == "hebrew" &&
- Encodings::IsComposeChar_hebrew(c))
+ Encodings::IsComposeChar_hebrew(c))
return 0;
}
return font_metrics::width(c, font);
}
if (c == Paragraph::META_INSET)
- return pars_[pit].getInset(pos)->width();
+ return par.getInset(pos)->width();
if (IsSeparatorChar(c))
c = ' ';
}
-int LyXText::leftMargin(par_type pit) const
+int LyXText::leftMargin(pit_type pit) const
{
+ BOOST_ASSERT(pit >= 0);
+ BOOST_ASSERT(pit < int(pars_.size()));
return leftMargin(pit, pars_[pit].size());
}
-int LyXText::leftMargin(par_type pit, pos_type pos) const
+int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
{
+ BOOST_ASSERT(pit >= 0);
+ BOOST_ASSERT(pit < int(pars_.size()));
+ Paragraph const & par = pars_[pit];
+ BOOST_ASSERT(pos >= 0);
+ BOOST_ASSERT(pos <= par.size());
+ //lyxerr << "LyXText::leftMargin: pit: " << pit << " pos: " << pos << endl;
LyXTextClass const & tclass =
bv()->buffer()->params().getLyXTextClass();
- LyXLayout_ptr const & layout = pars_[pit].layout();
+ LyXLayout_ptr const & layout = par.layout();
string parindent = layout->parindent;
- int x = NEST_MARGIN + CHANGEBAR_MARGIN;
+ int l_margin = 0;
- x += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
+ if (isMainText())
+ l_margin += changebarMargin();
- // 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 (pars_[pit].getDepth() == 0) {
- if (pars_[pit].layout() == tclass.defaultLayout()) {
- // find the previous same level paragraph
- if (pit != 0) {
- par_type newpit =
- depthHook(pit, paragraphs(), pars_[pit].getDepth());
- if (newpit == pit && pars_[newpit].layout()->nextnoindent)
+ l_margin += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
+
+ if (par.getDepth() != 0) {
+ // find the next level paragraph
+ pit_type newpar = outerHook(pit, pars_);
+ if (newpar != pit_type(pars_.size())) {
+ if (pars_[newpar].layout()->isEnvironment()) {
+ l_margin = leftMargin(newpar);
+ }
+ if (par.layout() == tclass.defaultLayout()) {
+ if (pars_[newpar].params().noindent())
parindent.erase();
+ else
+ parindent = pars_[newpar].layout()->parindent;
}
}
- } else {
- // find the next level paragraph
- par_type newpar = outerHook(pit, pars_);
-
- // Make a corresponding row. Need to call leftMargin()
- // to check whether it is a sufficent paragraph.
- if (newpar != par_type(pars_.size())
- && pars_[newpar].layout()->isEnvironment()) {
- x = leftMargin(newpar);
- }
-
- if (newpar != par_type(paragraphs().size())
- && pars_[pit].layout() == tclass.defaultLayout()) {
- if (pars_[newpar].params().noindent())
- parindent.erase();
- else
- parindent = pars_[newpar].layout()->parindent;
- }
}
- LyXFont const labelfont = getLabelFont(pit);
+ LyXFont const labelfont = getLabelFont(par);
switch (layout->margintype) {
case MARGIN_DYNAMIC:
if (!layout->leftmargin.empty())
- x += font_metrics::signedWidth(layout->leftmargin,
+ l_margin += font_metrics::signedWidth(layout->leftmargin,
tclass.defaultfont());
- if (!pars_[pit].getLabelstring().empty()) {
- x += font_metrics::signedWidth(layout->labelindent,
+ if (!par.getLabelstring().empty()) {
+ l_margin += font_metrics::signedWidth(layout->labelindent,
labelfont);
- x += font_metrics::width(pars_[pit].getLabelstring(),
+ l_margin += font_metrics::width(par.getLabelstring(),
labelfont);
- x += font_metrics::width(layout->labelsep, labelfont);
+ l_margin += font_metrics::width(layout->labelsep, labelfont);
}
break;
case MARGIN_MANUAL:
- x += font_metrics::signedWidth(layout->labelindent, labelfont);
+ l_margin += font_metrics::signedWidth(layout->labelindent, labelfont);
// The width of an empty par, even with manual label, should be 0
- if (!pars_[pit].empty() && pos >= pars_[pit].beginOfBody()) {
- if (!pars_[pit].getLabelWidthString().empty()) {
- x += font_metrics::width(pars_[pit].getLabelWidthString(),
+ if (!par.empty() && pos >= par.beginOfBody()) {
+ if (!par.getLabelWidthString().empty()) {
+ l_margin += font_metrics::width(par.getLabelWidthString(),
labelfont);
- x += font_metrics::width(layout->labelsep, labelfont);
+ l_margin += font_metrics::width(layout->labelsep, labelfont);
}
}
break;
case MARGIN_STATIC:
- x += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()) * 4
- / (pars_[pit].getDepth() + 4);
+ l_margin += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()) * 4
+ / (par.getDepth() + 4);
break;
case MARGIN_FIRST_DYNAMIC:
if (layout->labeltype == LABEL_MANUAL) {
- if (pos >= pars_[pit].beginOfBody()) {
- x += font_metrics::signedWidth(layout->leftmargin,
+ if (pos >= par.beginOfBody()) {
+ l_margin += font_metrics::signedWidth(layout->leftmargin,
labelfont);
} else {
- x += font_metrics::signedWidth(layout->labelindent,
+ l_margin += font_metrics::signedWidth(layout->labelindent,
labelfont);
}
} else if (pos != 0
// theorems (JMarc)
|| (layout->labeltype == LABEL_STATIC
&& layout->latextype == LATEX_ENVIRONMENT
- && !isFirstInSequence(pit, paragraphs()))) {
- x += font_metrics::signedWidth(layout->leftmargin,
+ && !isFirstInSequence(pit, pars_))) {
+ l_margin += font_metrics::signedWidth(layout->leftmargin,
labelfont);
} else if (layout->labeltype != LABEL_TOP_ENVIRONMENT
&& layout->labeltype != LABEL_BIBLIO
&& layout->labeltype !=
LABEL_CENTERED_TOP_ENVIRONMENT) {
- x += font_metrics::signedWidth(layout->labelindent,
+ l_margin += font_metrics::signedWidth(layout->labelindent,
labelfont);
- x += font_metrics::width(layout->labelsep, labelfont);
- x += font_metrics::width(pars_[pit].getLabelstring(),
+ l_margin += font_metrics::width(layout->labelsep, labelfont);
+ l_margin += font_metrics::width(par.getLabelstring(),
labelfont);
}
break;
#if 0
// ok, a terrible hack. The left margin depends on the widest
// row in this paragraph.
- RowList::iterator rit = pars_[pit].rows.begin();
- RowList::iterator end = pars_[pit].rows.end();
+ RowList::iterator rit = par.rows().begin();
+ RowList::iterator end = par.rows().end();
#ifdef WITH_WARNINGS
#warning This is wrong.
#endif
for ( ; rit != end; ++rit)
if (rit->fill() < minfill)
minfill = rit->fill();
- x += font_metrics::signedWidth(layout->leftmargin,
+ l_margin += font_metrics::signedWidth(layout->leftmargin,
tclass.defaultfont());
- x += minfill;
+ l_margin += minfill;
#endif
// also wrong, but much shorter.
- x += maxwidth_ / 2;
+ l_margin += maxwidth_ / 2;
break;
}
}
-
- if (!pars_[pit].params().leftIndent().zero())
- x += pars_[pit].params().leftIndent().inPixels(maxwidth_);
+ if (!par.params().leftIndent().zero())
+ l_margin += par.params().leftIndent().inPixels(maxwidth_);
LyXAlignment align;
- if (pars_[pit].params().align() == LYX_ALIGN_LAYOUT)
+ if (par.params().align() == LYX_ALIGN_LAYOUT)
align = layout->align;
else
- align = pars_[pit].params().align();
+ align = par.params().align();
// set the correct parindent
if (pos == 0
|| layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
|| (layout->labeltype == LABEL_STATIC
&& layout->latextype == LATEX_ENVIRONMENT
- && !isFirstInSequence(pit, paragraphs())))
+ && !isFirstInSequence(pit, pars_)))
&& align == LYX_ALIGN_BLOCK
- && !pars_[pit].params().noindent()
- // in tabulars and ert paragraphs are never indented!
- && (pars_[pit].ownerCode() != InsetOld::TABULAR_CODE
- && pars_[pit].ownerCode() != InsetOld::ERT_CODE)
- && (pars_[pit].layout() != tclass.defaultLayout()
+ && !par.params().noindent()
+ // display style insets are always centered, omit indentation
+ && !(!par.empty()
+ && par.isInset(pos)
+ && par.getInset(pos)->display())
+ // in charstyles, tabulars and ert paragraphs are never indented!
+ && ((par.ownerCode() != InsetBase::TEXT_CODE || isMainText())
+ && par.ownerCode() != InsetBase::ERT_CODE
+ && par.ownerCode() != InsetBase::CHARSTYLE_CODE)
+ && (par.layout() != tclass.defaultLayout()
|| bv()->buffer()->params().paragraph_separation ==
BufferParams::PARSEP_INDENT))
{
- x += font_metrics::signedWidth(parindent, tclass.defaultfont());
+ l_margin += font_metrics::signedWidth(parindent, tclass.defaultfont());
}
- return x;
+ return l_margin;
}
int LyXText::rightMargin(Paragraph const & par) const
{
- LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
+ // We do not want rightmargins on inner texts.
+ if (bv()->text() != this)
+ return 0;
- return
- RIGHT_MARGIN
+ LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
+ int const r_margin =
+ ::rightMargin()
+ font_metrics::signedWidth(tclass.rightmargin(),
- tclass.defaultfont())
+ tclass.defaultfont())
+ font_metrics::signedWidth(par.layout()->rightmargin,
- tclass.defaultfont())
+ tclass.defaultfont())
* 4 / (par.getDepth() + 4);
+
+ return r_margin;
}
-int LyXText::labelEnd(par_type pit) const
+int LyXText::labelEnd(pit_type const pit) const
{
// labelEnd is only needed if the layout fills a flushleft label.
if (pars_[pit].layout()->margintype != MARGIN_MANUAL)
};
-void LyXText::rowBreakPoint(par_type pit, Row & row) const
+void LyXText::rowBreakPoint(pit_type const pit, Row & row) const
{
- pos_type const end = pars_[pit].size();
+ Paragraph const & par = pars_[pit];
+ pos_type const end = par.size();
pos_type const pos = row.pos();
if (pos == end) {
row.endpos(end);
}
// maximum pixel width of a row
- int width = maxwidth_ - rightMargin(pars_[pit]); // - leftMargin(pit, row);
+ int width = maxwidth_ - rightMargin(par); // - leftMargin(pit, row);
if (width < 0) {
row.endpos(end);
return;
}
- LyXLayout_ptr const & layout = pars_[pit].layout();
+ LyXLayout_ptr const & layout = par.layout();
if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
- row.endpos(addressBreakPoint(pos, pars_[pit]));
+ row.endpos(addressBreakPoint(pos, par));
return;
}
- pos_type const body_pos = pars_[pit].beginOfBody();
+ pos_type const body_pos = par.beginOfBody();
// Now we iterate through until we reach the right margin
// pixel width since last breakpoint
int chunkwidth = 0;
- FontIterator fi = FontIterator(*this, pit, pos);
+ FontIterator fi = FontIterator(*this, par, pos);
pos_type point = end;
pos_type i = pos;
for ( ; i < end; ++i, ++fi) {
- char const c = pars_[pit].getChar(i);
+ char const c = par.getChar(i);
{
- int thiswidth = singleWidth(pit, i, c, *fi);
+ int thiswidth = singleWidth(par, i, c, *fi);
// add the auto-hfill from label end to the body
if (body_pos && i == body_pos) {
- int add = font_metrics::width(layout->labelsep, getLabelFont(pit));
- if (pars_[pit].isLineSeparator(i - 1))
- add -= singleWidth(pit, i - 1);
+ int add = font_metrics::width(layout->labelsep, getLabelFont(par));
+ if (par.isLineSeparator(i - 1))
+ add -= singleWidth(par, i - 1);
add = std::max(add, labelEnd(pit) - x);
thiswidth += add;
break;
}
- if (pars_[pit].isNewline(i)) {
+ if (par.isNewline(i)) {
point = i + 1;
break;
}
// Break before...
if (i + 1 < end) {
- if (pars_[pit].isInset(i + 1) && pars_[pit].getInset(i + 1)->display()) {
+ if (par.isInset(i + 1) && par.getInset(i + 1)->display()) {
point = i + 1;
break;
}
// ...and after.
- if (pars_[pit].isInset(i) && pars_[pit].getInset(i)->display()) {
+ if (par.isInset(i) && par.getInset(i)->display()) {
point = i + 1;
break;
}
}
- if (!pars_[pit].isInset(i) || pars_[pit].getInset(i)->isChar()) {
+ if (!par.isInset(i) || par.getInset(i)->isChar()) {
// some insets are line separators too
- if (pars_[pit].isLineSeparator(i)) {
+ if (par.isLineSeparator(i)) {
// register breakpoint:
point = i + 1;
chunkwidth = 0;
}
-void LyXText::setRowWidth(par_type pit, Row & row) const
+void LyXText::setRowWidth(pit_type const pit, Row & row) const
{
// get the pure distance
pos_type const end = row.endpos();
- string labelsep = pars_[pit].layout()->labelsep;
+ Paragraph const & par = pars_[pit];
+ string const & labelsep = par.layout()->labelsep;
int w = leftMargin(pit, row.pos());
- pos_type const body_pos = pars_[pit].beginOfBody();
+ pos_type const body_pos = par.beginOfBody();
pos_type i = row.pos();
if (i < end) {
- FontIterator fi = FontIterator(*this, pit, i);
+ FontIterator fi = FontIterator(*this, par, i);
for ( ; i < end; ++i, ++fi) {
if (body_pos > 0 && i == body_pos) {
- w += font_metrics::width(labelsep, getLabelFont(pit));
- if (pars_[pit].isLineSeparator(i - 1))
- w -= singleWidth(pit, i - 1);
+ w += font_metrics::width(labelsep, getLabelFont(par));
+ if (par.isLineSeparator(i - 1))
+ w -= singleWidth(par, i - 1);
w = max(w, labelEnd(pit));
}
- char const c = pars_[pit].getChar(i);
- w += singleWidth(pit, i, c, *fi);
+ char const c = par.getChar(i);
+ w += singleWidth(par, i, c, *fi);
}
}
if (body_pos > 0 && body_pos >= end) {
- w += font_metrics::width(labelsep, getLabelFont(pit));
- if (end > 0 && pars_[pit].isLineSeparator(end - 1))
- w -= singleWidth(pit, end - 1);
+ w += font_metrics::width(labelsep, getLabelFont(par));
+ if (end > 0 && par.isLineSeparator(end - 1))
+ w -= singleWidth(par, end - 1);
w = max(w, labelEnd(pit));
}
- row.width(w + rightMargin(pars_[pit]));
+ row.width(w + rightMargin(par));
}
// returns the minimum space a manual label needs on the screen in pixel
-int LyXText::labelFill(par_type pit, Row const & row) const
+int LyXText::labelFill(Paragraph const & par, Row const & row) const
{
- pos_type last = pars_[pit].beginOfBody();
+ pos_type last = par.beginOfBody();
BOOST_ASSERT(last > 0);
--last;
// a separator at this end does not count
- if (pars_[pit].isLineSeparator(last))
+ if (par.isLineSeparator(last))
--last;
int w = 0;
for (pos_type i = row.pos(); i <= last; ++i)
- w += singleWidth(pit, i);
+ w += singleWidth(par, i);
- string const & label = pars_[pit].params().labelWidthString();
+ string const & label = par.params().labelWidthString();
if (label.empty())
return 0;
- return max(0, font_metrics::width(label, getLabelFont(pit)) - w);
+ return max(0, font_metrics::width(label, getLabelFont(par)) - w);
}
}
-void LyXText::setHeightOfRow(par_type pit, Row & row)
+void LyXText::setHeightOfRow(pit_type const pit, Row & row)
{
+ Paragraph const & par = pars_[pit];
// get the maximum ascent and the maximum descent
double layoutasc = 0;
double layoutdesc = 0;
// 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 = pars_[pit].layout();
+ LyXLayout_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.
- LyXFont font = getFont(pit, row.pos());
+ LyXFont font = getFont(par, row.pos());
LyXFont::FONT_SIZE const tmpsize = font.size();
font = getLayoutFont(pit);
LyXFont::FONT_SIZE const size = font.size();
font.setSize(tmpsize);
- LyXFont labelfont = getLabelFont(pit);
+ LyXFont labelfont = getLabelFont(par);
// these are minimum values
- double const spacing_val =
- layout->spacing.getValue() * spacing(pars_[pit]);
+ double const spacing_val = layout->spacing.getValue() * spacing(par);
//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::const_iterator ii = pars_[pit].insetlist.begin();
- InsetList::const_iterator iend = pars_[pit].insetlist.end();
+ InsetList::const_iterator ii = par.insetlist.begin();
+ InsetList::const_iterator iend = par.insetlist.end();
for ( ; ii != iend; ++ii) {
if (ii->pos >= row.pos() && ii->pos < row.endpos()) {
maxasc = max(maxasc, ii->inset->ascent());
pos_type const pos_end = row.endpos();
LyXFont::FONT_SIZE maxsize =
- pars_[pit].highestFontInRange(row.pos(), pos_end, size);
+ par.highestFontInRange(row.pos(), pos_end, size);
if (maxsize > font.size()) {
font.setSize(maxsize);
maxasc = max(maxasc, font_metrics::maxAscent(font));
++maxasc;
++maxdesc;
- row.ascent_of_text(maxasc);
+ row.ascent(maxasc);
// is it a top line?
if (row.pos() == 0) {
if (bv()->buffer()->params().paragraph_separation
== BufferParams::PARSEP_SKIP
&& pit != 0
- && ((layout->isParagraph() && pars_[pit].getDepth() == 0)
+ && ((layout->isParagraph() && par.getDepth() == 0)
|| (pars_[pit - 1].layout()->isParagraph()
&& pars_[pit - 1].getDepth() == 0)))
{
maxasc += bufparams.getDefSkip().inPixels(*bv());
}
- if (pars_[pit].params().startOfAppendix())
+ if (par.params().startOfAppendix())
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) {
+ if (layout->counter == "chapter"
+ && !par.params().labelString().empty()) {
labeladdon = int(font_metrics::maxHeight(labelfont)
* layout->spacing.getValue()
- * spacing(pars_[pit]));
+ * spacing(par));
}
// special code for the top label
|| layout->labeltype == LABEL_BIBLIO
|| layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
&& isFirstInSequence(pit, paragraphs())
- && !pars_[pit].getLabelstring().empty())
+ && !par.getLabelstring().empty())
{
labeladdon = int(
font_metrics::maxHeight(labelfont)
* layout->spacing.getValue()
- * spacing(pars_[pit])
+ * spacing(par)
+ (layout->topsep + layout->labelbottomsep) * dh);
}
// a section, or between the items of a itemize or enumerate
// environment.
- par_type prev = depthHook(pit, pars_, pars_[pit].getDepth());
+ pit_type prev = depthHook(pit, pars_, par.getDepth());
if (prev != pit
&& pars_[prev].layout() == layout
- && pars_[prev].getDepth() == pars_[pit].getDepth()
- && pars_[prev].getLabelWidthString() == pars_[pit].getLabelWidthString())
+ && pars_[prev].getDepth() == par.getDepth()
+ && pars_[prev].getLabelWidthString() == par.getLabelWidthString())
{
layoutasc = layout->itemsep * dh;
} else if (pit != 0 || row.pos() != 0) {
}
prev = outerHook(pit, pars_);
- if (prev != par_type(pars_.size())) {
+ if (prev != pit_type(pars_.size())) {
maxasc += int(pars_[prev].layout()->parsep * dh);
} else if (pit != 0) {
if (pars_[pit - 1].getDepth() != 0 ||
}
// is it a bottom line?
- if (row.endpos() >= pars_[pit].size()) {
+ if (row.endpos() >= par.size()) {
// add the layout spaces, for example before and after
// a section, or between the items of a itemize or enumerate
// environment
- par_type nextpit = pit + 1;
- if (nextpit != par_type(pars_.size())) {
- par_type cpit = pit;
+ pit_type nextpit = pit + 1;
+ if (nextpit != pit_type(pars_.size())) {
+ pit_type cpit = pit;
double usual = 0;
double unusual = 0;
maxasc += int(layoutasc * 2 / (2 + pars_[pit].getDepth()));
maxdesc += int(layoutdesc * 2 / (2 + pars_[pit].getDepth()));
- row.height(maxasc + maxdesc + labeladdon);
- row.baseline(maxasc + labeladdon);
- row.top_of_text(row.baseline() - font_metrics::maxAscent(font));
+ // Top and bottom margin of the document (only at top-level)
+ if (bv_owner->text() == this) {
+ if (pit == 0 && row.pos() == 0)
+ maxasc += 20;
+ if (pit + 1 == pars_.size() && row.endpos() == par.size())
+ maxdesc += 20;
+ }
+
+ row.ascent(maxasc + labeladdon);
+ row.descent(maxdesc);
}
-void LyXText::breakParagraph(LCursor & cur, char keep_layout)
+namespace {
+
+}
+
+void LyXText::breakParagraph(LCursor & cur, bool keep_layout)
{
BOOST_ASSERT(this == cur.text());
// allow only if at start or end, or all previous is new text
Paragraph & cpar = cur.paragraph();
- par_type cpit = cur.par();
+ pit_type cpit = cur.pit();
if (cur.pos() != 0 && cur.pos() != cur.lastpos()
&& cpar.isChangeEdited(0, cur.pos()))
return;
// a layout change may affect also the following paragraph
- recUndo(cur.par(), undoSpan(cur.par()) - 1);
+ recUndo(cur.pit(), undoSpan(cur.pit()) - 1);
// Always break behind a space
// It is better to erase the space (Dekel)
if (cur.pos() != cur.lastpos() && cpar.isLineSeparator(cur.pos()))
cpar.erase(cur.pos());
- // break the paragraph
+ // How should the layout for the new paragraph be?
+ int preserve_layout = 0;
if (keep_layout)
- keep_layout = 2;
+ preserve_layout = 2;
else
- keep_layout = layout->isEnvironment();
+ preserve_layout = layout->isEnvironment();
+
+ // We need to remember this before we break the paragraph, because
+ // that invalidates the layout variable
+ bool sensitive = layout->labeltype == LABEL_SENSITIVE;
- // we need to set this before we insert the paragraph. IMO the
- // breakParagraph call should return a bool if it inserts the
- // paragraph before or behind and we should react on that one
- // but we can fix this in 1.3.0 (Jug 20020509)
+ // we need to set this before we insert the paragraph.
bool const isempty = cpar.allowEmpty() && cpar.empty();
+
::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
- cur.pos(), keep_layout);
+ cur.pos(), preserve_layout);
+
+ // After this, neither paragraph contains any rows!
- cpit = cur.par();
- par_type next_par = cpit + 1;
+ cpit = cur.pit();
+ pit_type next_par = cpit + 1;
// well this is the caption hack since one caption is really enough
- if (layout->labeltype == LABEL_SENSITIVE) {
- if (!cur.pos())
+ if (sensitive) {
+ if (cur.pos() == 0)
// set to standard-layout
pars_[cpit].applyLayout(tclass.defaultLayout());
else
pars_[next_par].applyLayout(tclass.defaultLayout());
}
- // if the cursor is at the beginning of a row without prior newline,
- // move one row up!
- // This touches only the screen-update. Otherwise we would may have
- // an empty row on the screen
- if (cur.pos() != 0 && cur.textRow().pos() == cur.pos()
- && !pars_[cpit].isNewline(cur.pos() - 1))
- {
- cursorLeft(cur);
- }
-
while (!pars_[next_par].empty() && pars_[next_par].isNewline(0))
pars_[next_par].erase(0);
- updateCounters();
- redoParagraph(cpit);
- redoParagraph(next_par);
+ updateCounters(cur.buffer());
// This check is necessary. Otherwise the new empty paragraph will
// be deleted automatically. And it is more friendly for the user!
if (cur.pos() != 0 || isempty)
- setCursor(cur, cur.par() + 1, 0);
+ setCursor(cur, cur.pit() + 1, 0);
else
- setCursor(cur, cur.par(), 0);
-}
-
-
-// convenience function
-void LyXText::redoParagraph(LCursor & cur)
-{
- BOOST_ASSERT(this == cur.text());
- cur.clearSelection();
- redoParagraph(cur.par());
- setCursorIntern(cur, cur.par(), cur.pos());
+ setCursor(cur, cur.pit(), 0);
}
Paragraph & par = cur.paragraph();
// try to remove this
- par_type pit = cur.par();
+ pit_type const pit = cur.pit();
bool const freeSpacing = par.layout()->free_spacing ||
par.isFreeSpacing();
!(contains(number_seperators, c) &&
cur.pos() != 0 &&
cur.pos() != cur.lastpos() &&
- getFont(pit, cur.pos()).number() == LyXFont::ON &&
- getFont(pit, cur.pos() - 1).number() == LyXFont::ON)
+ getFont(par, cur.pos()).number() == LyXFont::ON &&
+ getFont(par, cur.pos() - 1).number() == LyXFont::ON)
)
number(cur); // Set current_font.number to OFF
} else if (IsDigit(c) &&
setCharFont(pit, cur.pos() - 1, current_font);
} else if (contains(number_seperators, c)
&& cur.pos() >= 2
- && getFont(pit, cur.pos() - 2).number() == LyXFont::ON) {
+ && getFont(par, cur.pos() - 2).number() == LyXFont::ON) {
setCharFont(pit, cur.pos() - 1, current_font);
}
}
cur.message(_("You cannot insert a space at the "
"beginning of a paragraph. Please read the Tutorial."));
sent_space_message = true;
- return;
}
+ return;
}
BOOST_ASSERT(cur.pos() > 0);
if (par.isLineSeparator(cur.pos() - 1)
current_font = rawtmpfont;
real_current_font = realtmpfont;
- redoParagraph(cur);
- setCursor(cur, cur.par(), cur.pos() + 1, false, cur.boundary());
+ //setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
+ setCursor(cur, cur.pit(), cur.pos() + 1, false, true);
charInserted();
}
}
-RowMetrics LyXText::computeRowMetrics(par_type pit, Row const & row) const
+RowMetrics
+LyXText::computeRowMetrics(pit_type const pit, Row const & row) const
{
RowMetrics result;
+ Paragraph const & par = pars_[pit];
- double w = width_ - row.width();
+ double w = dim_.wid - row.width();
- bool const is_rtl = isRTL(pars_[pit]);
+ bool const is_rtl = isRTL(par);
if (is_rtl)
- result.x = rightMargin(pars_[pit]);
+ result.x = rightMargin(par);
else
result.x = leftMargin(pit, row.pos());
// is there a manual margin with a manual label
- LyXLayout_ptr const & layout = pars_[pit].layout();
+ LyXLayout_ptr const & layout = par.layout();
if (layout->margintype == MARGIN_MANUAL
&& layout->labeltype == LABEL_MANUAL) {
/// We might have real hfills in the label part
- int nlh = numberOfLabelHfills(pars_[pit], row);
+ int nlh = numberOfLabelHfills(par, row);
// A manual label par (e.g. List) has an auto-hfill
// between the label text and the body of the
// paragraph too.
// But we don't want to do this auto hfill if the par
// is empty.
- if (!pars_[pit].empty())
+ if (!par.empty())
++nlh;
- if (nlh && !pars_[pit].getLabelWidthString().empty())
- result.label_hfill = labelFill(pit, row) / double(nlh);
+ if (nlh && !par.getLabelWidthString().empty())
+ result.label_hfill = labelFill(par, row) / double(nlh);
}
// are there any hfills in the row?
- int const nh = numberOfHfills(pars_[pit], row);
+ int const nh = numberOfHfills(par, row);
if (nh) {
if (w > 0)
// is it block, flushleft or flushright?
// set x how you need it
int align;
- if (pars_[pit].params().align() == LYX_ALIGN_LAYOUT)
+ if (par.params().align() == LYX_ALIGN_LAYOUT)
align = layout->align;
else
- align = pars_[pit].params().align();
+ align = par.params().align();
// Display-style insets should always be on a centred row
- // The test on pars_[pit].size() is to catch zero-size pars, which
+ // The test on par.size() is to catch zero-size pars, which
// would trigger the assert in Paragraph::getInset().
- //inset = pars_[pit].size() ? pars_[pit].getInset(row.pos()) : 0;
- if (!pars_[pit].empty()
- && pars_[pit].isInset(row.pos())
- && pars_[pit].getInset(row.pos())->display())
+ //inset = par.size() ? par.getInset(row.pos()) : 0;
+ if (!par.empty()
+ && par.isInset(row.pos())
+ && par.getInset(row.pos())->display())
{
align = LYX_ALIGN_CENTER;
}
switch (align) {
case LYX_ALIGN_BLOCK: {
- int const ns = numberOfSeparators(pars_[pit], row);
+ int const ns = numberOfSeparators(par, row);
bool disp_inset = false;
- if (row.endpos() < pars_[pit].size()) {
- InsetBase const * in = pars_[pit].getInset(row.endpos());
+ if (row.endpos() < par.size()) {
+ InsetBase const * in = par.getInset(row.endpos());
if (in)
disp_inset = in->display();
}
// par, does not end in newline, and is not row above a
// display inset... then stretch it
if (ns
- && row.endpos() < pars_[pit].size()
- && !pars_[pit].isNewline(row.endpos() - 1)
+ && row.endpos() < par.size()
+ && !par.isNewline(row.endpos() - 1)
&& !disp_inset
) {
result.separator = w / ns;
}
}
- bidi.computeTables(pars_[pit], *bv()->buffer(), row);
+ bidi.computeTables(par, *bv()->buffer(), row);
if (is_rtl) {
- pos_type body_pos = pars_[pit].beginOfBody();
+ pos_type body_pos = par.beginOfBody();
pos_type end = row.endpos();
if (body_pos > 0
- && (body_pos > end || !pars_[pit].isLineSeparator(body_pos - 1)))
+ && (body_pos > end || !par.isLineSeparator(body_pos - 1)))
{
- result.x += font_metrics::width(layout->labelsep, getLabelFont(pit));
+ result.x += font_metrics::width(layout->labelsep, getLabelFont(par));
if (body_pos <= end)
result.x += result.label_hfill;
}
// the cursor set functions have a special mechanism. When they
// realize, that you left an empty paragraph, they will delete it.
-void LyXText::cursorRightOneWord(LCursor & cur)
+bool LyXText::cursorRightOneWord(LCursor & cur)
{
BOOST_ASSERT(this == cur.text());
- if (cur.pos() == cur.lastpos() && cur.par() != cur.lastpar()) {
- ++cur.par();
- cur.pos() = 0;
+
+ LCursor old = cur;
+
+ if (old.pos() == old.lastpos() && old.pit() != old.lastpit()) {
+ ++old.pit();
+ old.pos() = 0;
} else {
// Skip through initial nonword stuff.
// Treat floats and insets as words.
- while (cur.pos() != cur.lastpos() && !cur.paragraph().isWord(cur.pos()))
- ++cur.pos();
+ while (old.pos() != old.lastpos() && !old.paragraph().isLetter(old.pos()))
+ ++old.pos();
// Advance through word.
- while (cur.pos() != cur.lastpos() && cur.paragraph().isWord(cur.pos()))
- ++cur.pos();
+ while (old.pos() != old.lastpos() && old.paragraph().isLetter(old.pos()))
+ ++old.pos();
}
- setCursor(cur, cur.par(), cur.pos());
+ return setCursor(cur, old.pit(), old.pos());
}
-void LyXText::cursorLeftOneWord(LCursor & cur)
+bool LyXText::cursorLeftOneWord(LCursor & cur)
{
BOOST_ASSERT(this == cur.text());
- if (cur.pos() == 0 && cur.par() != 0) {
- --cur.par();
- cur.pos() = cur.lastpos();
+
+ LCursor old = cur;
+
+ if (old.pos() == 0 && old.pit() != 0) {
+ --old.pit();
+ old.pos() = old.lastpos();
} else {
// Skip through initial nonword stuff.
// Treat floats and insets as words.
- while (cur.pos() != 0 && !cur.paragraph().isWord(cur.pos() - 1))
- --cur.pos();
+ while (old.pos() != 0 && !old.paragraph().isLetter(old.pos() - 1))
+ --old.pos();
// Advance through word.
- while (cur.pos() != 0 && cur.paragraph().isWord(cur.pos() - 1))
- --cur.pos();
+ while (old.pos() != 0 && old.paragraph().isLetter(old.pos() - 1))
+ --old.pos();
}
- setCursor(cur, cur.par(), cur.pos());
+ return setCursor(cur, old.pit(), old.pos());
}
CursorSlice to = cur.top();
getWord(from, to, loc);
if (cur.top() != from)
- setCursor(cur, from.par(), from.pos());
+ setCursor(cur, from.pit(), from.pos());
if (to == from)
return;
cur.resetAnchor();
- setCursor(cur, to.par(), to.pos());
+ setCursor(cur, to.pit(), to.pos());
cur.setSelection();
}
CursorSlice const & startc = cur.selBegin();
CursorSlice const & endc = cur.selEnd();
- if (startc.par() == endc.par()) {
+ if (startc.pit() == endc.pit()) {
recordUndoSelection(cur, Undo::INSERT);
- pars_[startc.par()].acceptChange(startc.pos(), endc.pos());
+ pars_[startc.pit()].acceptChange(startc.pos(), endc.pos());
finishUndo();
cur.clearSelection();
- redoParagraph(startc.par());
- setCursorIntern(cur, startc.par(), 0);
+ setCursorIntern(cur, startc.pit(), 0);
}
#ifdef WITH_WARNINGS
#warning handle multi par selection
CursorSlice const & startc = cur.selBegin();
CursorSlice const & endc = cur.selEnd();
- if (startc.par() == endc.par()) {
+ if (startc.pit() == endc.pit()) {
recordUndoSelection(cur, Undo::INSERT);
- pars_[startc.par()].rejectChange(startc.pos(), endc.pos());
+ pars_[startc.pit()].rejectChange(startc.pos(), endc.pos());
finishUndo();
cur.clearSelection();
- redoParagraph(startc.par());
- setCursorIntern(cur, startc.par(), 0);
+ setCursorIntern(cur, startc.pit(), 0);
}
#ifdef WITH_WARNINGS
#warning handle multi par selection
} else {
from = cur.top();
getWord(from, to, lyx::PARTIAL_WORD);
- setCursor(cur, to.par(), to.pos() + 1);
+ setCursor(cur, to.pit(), to.pos() + 1);
}
recordUndoSelection(cur);
pos_type pos = from.pos();
- int par = from.par();
+ int par = from.pit();
- while (par != int(pars_.size()) && (pos != to.pos() || par != to.par())) {
- par_type pit = par;
+ while (par != int(pars_.size()) && (pos != to.pos() || par != to.pit())) {
+ pit_type pit = par;
if (pos == pars_[pit].size()) {
++par;
pos = 0;
{
BOOST_ASSERT(this == cur.text());
if (cur.pos() != cur.lastpos()) {
- recordUndo(cur, Undo::DELETE, cur.par());
- setCursorIntern(cur, cur.par(), cur.pos() + 1, false, cur.boundary());
+ recordUndo(cur, Undo::DELETE, cur.pit());
+ setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
backspace(cur);
}
// should we do anything in an else branch?
// left and let the DeleteEmptyParagraphMechanism
// handle the actual deletion of the paragraph.
- if (cur.par() != 0) {
+ if (cur.pit() != 0) {
+ // For KeepEmpty layouts we need to get
+ // rid of the keepEmpty setting first.
+ // And the only way to do this is to
+ // reset the layout to something
+ // else: f.ex. the default layout.
+ if (par.allowEmpty()) {
+ Buffer & buf = cur.buffer();
+ BufferParams const & bparams = buf.params();
+ par.layout(bparams.getLyXTextClass().defaultLayout());
+ }
+
cursorLeft(cur);
- // the layout things can change the height of a row !
- redoParagraph(cur);
return;
}
}
- if (cur.par() != 0)
- recordUndo(cur, Undo::DELETE, cur.par() - 1);
+ if (cur.pit() != 0)
+ recordUndo(cur, Undo::DELETE, cur.pit() - 1);
- par_type tmppit = cur.par();
+ pit_type tmppit = cur.pit();
// We used to do cursorLeftIntern() here, but it is
// not a good idea since it triggers the auto-delete
// mechanism. So we do a cursorLeftIntern()-lite,
// without the dreaded mechanism. (JMarc)
- if (cur.par() != 0) {
+ if (cur.pit() != 0) {
// steps into the above paragraph.
- setCursorIntern(cur, cur.par() - 1,
- pars_[cur.par() - 1].size(),
+ setCursorIntern(cur, cur.pit() - 1,
+ pars_[cur.pit() - 1].size(),
false);
}
Buffer & buf = cur.buffer();
BufferParams const & bufparams = buf.params();
LyXTextClass const & tclass = bufparams.getLyXTextClass();
- par_type const cpit = cur.par();
+ pit_type const cpit = cur.pit();
if (cpit != tmppit
&& (pars_[cpit].layout() == pars_[tmppit].layout()
|| pars_[tmppit].layout() == tclass.defaultLayout())
&& pars_[cpit].getAlign() == pars_[tmppit].getAlign()) {
- mergeParagraph(bufparams, buf.paragraphs(), cpit);
+ mergeParagraph(bufparams, pars_, cpit);
if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1))
--cur.pos();
// the counters may have changed
- updateCounters();
- setCursor(cur, cur.par(), cur.pos(), false);
+ updateCounters(cur.buffer());
+ setCursor(cur, cur.pit(), cur.pos(), false);
}
} else {
// this is the code for a normal backspace, not pasting
// not a good idea since it triggers the auto-delete
// mechanism. So we do a cursorLeftIntern()-lite,
// without the dreaded mechanism. (JMarc)
- setCursorIntern(cur, cur.par(), cur.pos() - 1,
+ setCursorIntern(cur, cur.pit(), cur.pos() - 1,
false, cur.boundary());
cur.paragraph().erase(cur.pos());
}
if (cur.pos() == cur.lastpos())
setCurrentFont(cur);
- redoParagraph(cur);
- setCursor(cur, cur.par(), cur.pos(), false, cur.boundary());
+ setCursor(cur, cur.pit(), cur.pos(), false, cur.boundary());
}
-Paragraph & LyXText::getPar(par_type par) const
+Paragraph & LyXText::getPar(pit_type par) const
{
//lyxerr << "getPar: " << par << " from " << paragraphs().size() << endl;
BOOST_ASSERT(par >= 0);
}
-// y is relative to this LyXText's top
-Row const & LyXText::getRowNearY(int y, par_type & pit) const
-{
- BOOST_ASSERT(!paragraphs().empty());
- BOOST_ASSERT(!paragraphs().begin()->rows.empty());
- par_type const pend = paragraphs().size() - 1;
- pit = 0;
- while (int(pars_[pit].y + pars_[pit].height) < y && pit != pend)
- ++pit;
-
- RowList::iterator rit = pars_[pit].rows.end();
- RowList::iterator const rbegin = pars_[pit].rows.begin();
- do {
- --rit;
- } while (rit != rbegin && int(pars_[pit].y + rit->y_offset()) > y);
-
- return *rit;
-}
-
-
Row const & LyXText::firstRow() const
{
- return *paragraphs().front().rows.begin();
+ return *paragraphs().front().rows().begin();
}
-void LyXText::redoParagraphInternal(par_type pit)
+bool LyXText::redoParagraph(pit_type const pit)
{
// remove rows of paragraph, keep track of height changes
- height_ -= pars_[pit].height;
-
- // clear old data
- pars_[pit].rows.clear();
- pars_[pit].height = 0;
- pars_[pit].width = 0;
+ Paragraph & par = pars_[pit];
+
+ // Add bibitem insets if necessary
+ if (par.layout()->labeltype == LABEL_BIBLIO) {
+ bool hasbibitem(false);
+ if (!par.insetlist.empty()
+ // Insist on it being in pos 0
+ && par.getChar(0) == Paragraph::META_INSET) {
+ InsetBase * inset = par.insetlist.begin()->inset;
+ if (inset->lyxCode() == InsetBase::BIBITEM_CODE)
+ hasbibitem = true;
+ }
+ if (!hasbibitem) {
+ InsetBibitem * inset(new
+ InsetBibitem(InsetCommandParams("bibitem")));
+ par.insertInset(0, static_cast<InsetBase *>(inset));
+ bv()->cursor().posRight();
+ }
+ }
// redo insets
- InsetList::iterator ii = pars_[pit].insetlist.begin();
- InsetList::iterator iend = pars_[pit].insetlist.end();
+ InsetList::iterator ii = par.insetlist.begin();
+ InsetList::iterator iend = par.insetlist.end();
for (; ii != iend; ++ii) {
Dimension dim;
- int const w = maxwidth_ - leftMargin(pit) - rightMargin(pars_[pit]);
- MetricsInfo mi(bv(), getFont(pit, ii->pos), w);
+ int const w = maxwidth_ - leftMargin(pit) - rightMargin(par);
+ MetricsInfo mi(bv(), getFont(par, ii->pos), w);
ii->inset->metrics(mi, dim);
}
// rebreak the paragraph
- pars_[pit].setBeginOfBody();
+ par.rows().clear();
+ Dimension dim;
+
+ par.setBeginOfBody();
pos_type z = 0;
do {
Row row(z);
rowBreakPoint(pit, row);
setRowWidth(pit, row);
setHeightOfRow(pit, row);
- row.y_offset(pars_[pit].height);
- pars_[pit].rows.push_back(row);
- pars_[pit].width = std::max(pars_[pit].width, row.width());
- pars_[pit].height += row.height();
+ par.rows().push_back(row);
+ dim.wid = std::max(dim.wid, row.width());
+ dim.des += row.height();
z = row.endpos();
- } while (z < pars_[pit].size());
+ } while (z < par.size());
- height_ += pars_[pit].height;
- //lyxerr << "redoParagraph: " << pars_[pit].rows.size() << " rows\n";
-}
-
-
-void LyXText::redoParagraphs(par_type pit, par_type end)
-{
- for (; pit != end; ++pit)
- redoParagraphInternal(pit);
- updateParPositions();
- updateCounters();
-}
+ dim.asc += par.rows()[0].ascent();
+ dim.des -= par.rows()[0].ascent();
+ bool const same = dim == par.dim();
-void LyXText::redoParagraph(par_type pit)
-{
- redoParagraphInternal(pit);
- updateParPositions();
-}
+ par.dim() = dim;
+ //lyxerr << "redoParagraph: " << par.rows().size() << " rows\n";
-
-void LyXText::fullRebreak()
-{
- redoParagraphs(0, paragraphs().size());
- bv()->cursor().resetAnchor();
+ return !same;
}
if (mi.base.textwidth)
maxwidth_ = mi.base.textwidth;
//lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
- //<< " maxWidth: " << maxwidth << "\nfont: " << mi.base.font
- //<< endl;
-
- // Rebuild row cache. This recomputes height as well.
- redoParagraphs(0, paragraphs().size());
+ // << " maxWidth: " << maxwidth_ << "\nfont: " << mi.base.font << endl;
+ // save the caller's font locally:
+ font_ = mi.base.font;
+
+ unsigned int h = 0;
+ unsigned int w = 0;
+ for (pit_type pit = 0, n = paragraphs().size(); pit != n; ++pit) {
+ redoParagraph(pit);
+ Paragraph & par = paragraphs()[pit];
+ h += par.height();
+ if (w < par.width())
+ w = par.width();
+ }
- width_ = maxParagraphWidth(paragraphs());
+ dim.wid = w;
+ dim.asc = pars_[0].ascent();
+ dim.des = h - dim.asc;
- // final dimension
- dim.asc = firstRow().ascent_of_text();
- dim.des = height_ - dim.asc;
- dim.wid = width_;
+ dim_ = dim;
}
// only used for inset right now. should also be used for main text
void LyXText::draw(PainterInfo & pi, int x, int y) const
{
- xo_ = x;
- yo_ = y;
- paintTextInset(*this, pi);
+ paintTextInset(*this, pi, x, y);
}
+/*
// only used for inset right now. should also be used for main text
-void LyXText::drawSelection(PainterInfo &, int, int) const
+void LyXText::drawSelection(PainterInfo & pi, int x , int) const
{
- //lyxerr << "LyXText::drawSelection at " << x << " " << y << endl;
+ LCursor & cur = pi.base.bv->cursor();
+ if (!cur.selection())
+ return;
+ if (!ptr_cmp(cur.text(), this))
+ return;
+
+ lyxerr << "draw selection at " << x << endl;
+
+ // is there a better way of getting these two iterators?
+ DocIterator beg = cur;
+ DocIterator end = cur;
+
+ beg.top() = cur.selBegin();
+ end.top() = cur.selEnd();
+
+ // the selection doesn't touch the visible screen
+ if (bv_funcs::status(pi.base.bv, beg) == bv_funcs::CUR_BELOW
+ || bv_funcs::status(pi.base.bv, end) == bv_funcs::CUR_ABOVE)
+ return;
+
+ Paragraph const & par1 = pars_[beg.pit()];
+ Paragraph const & par2 = pars_[end.pit()];
+
+ Row const & row1 = par1.getRow(beg.pos());
+ Row const & row2 = par2.getRow(end.pos());
+
+ int y1,x1,x2;
+ if (bv_funcs::status(pi.base.bv, beg) == bv_funcs::CUR_ABOVE) {
+ y1 = 0;
+ x1 = 0;
+ x2 = 0;
+ } else {
+ y1 = bv_funcs::getPos(beg).y_ - row1.ascent();
+ int const startx = cursorX(beg.top(), begin.boundary());
+ x1 = isRTL(par1) ? startx : 0;
+ x2 = isRTL(par1) ? 0 + dim_.wid : startx;
+ }
+
+ int y2,X1,X2;
+ if (bv_funcs::status(pi.base.bv, end) == bv_funcs::CUR_BELOW) {
+ y2 = pi.base.bv->workHeight();
+ X1 = 0;
+ X2 = 0;
+ } else {
+ y2 = bv_funcs::getPos(end).y_ + row2.descent();
+ int const endx = cursorX(end.top(), end.boundary());
+ X1 = isRTL(par2) ? 0 : endx;
+ X2 = isRTL(par2) ? endx : 0 + dim_.wid;
+ }
+
+ lyxerr << " y1: " << y1 << " y2: " << y2
+ << " xo: " << xo_ << " wid: " << dim_.wid
+ << endl;
+
+ // paint big rectangle in one go
+ pi.pain.fillRectangle(x, y1, dim_.wid, y2 - y1, LColor::selection);
+
+ // reset background at begin of first selected line
+ pi.pain.fillRectangle(x + x1, y1, x2 - x1, row1.height(),
+ LColor::background);
+
+ // reset background at end of last selected line
+ pi.pain.fillRectangle(x + X1, y2 - row2.height(),
+ X2 - X1, row2.height(), LColor::background);
}
+*/
-bool LyXText::isLastRow(par_type pit, Row const & row) const
+void LyXText::drawSelection(PainterInfo & pi, int x, int) const
+{
+ LCursor & cur = pi.base.bv->cursor();
+ if (!cur.selection())
+ return;
+ if (!ptr_cmp(cur.text(), this))
+ return;
+
+ lyxerr[Debug::DEBUG]
+ << BOOST_CURRENT_FUNCTION
+ << "draw selection at " << x
+ << endl;
+
+ // is there a better way of getting these two iterators?
+ DocIterator beg = cur;
+ DocIterator end = cur;
+
+ beg.top() = cur.selBegin();
+ end.top() = cur.selEnd();
+
+ // the selection doesn't touch the visible screen
+ if (bv_funcs::status(pi.base.bv, beg) == bv_funcs::CUR_BELOW
+ || bv_funcs::status(pi.base.bv, end) == bv_funcs::CUR_ABOVE)
+ return;
+
+ Paragraph const & par1 = pars_[beg.pit()];
+ Paragraph const & par2 = pars_[end.pit()];
+
+ bool const above = (bv_funcs::status(pi.base.bv, beg)
+ == bv_funcs::CUR_ABOVE);
+ bool const below = (bv_funcs::status(pi.base.bv, end)
+ == bv_funcs::CUR_BELOW);
+ int y1,y2,x1,x2;
+ if (above) {
+ y1 = 0;
+ y2 = 0;
+ x1 = 0;
+ x2 = dim_.wid;
+ } else {
+ Row const & row1 = par1.getRow(beg.pos());
+ y1 = bv_funcs::getPos(beg, beg.boundary()).y_ - row1.ascent();
+ y2 = y1 + row1.height();
+ int const startx = cursorX(beg.top(), beg.boundary());
+ x1 = !isRTL(par1) ? startx : 0;
+ x2 = !isRTL(par1) ? 0 + dim_.wid : startx;
+ }
+
+ int Y1,Y2,X1,X2;
+ if (below) {
+ Y1 = pi.base.bv->workHeight();
+ Y2 = pi.base.bv->workHeight();
+ X1 = 0;
+ X2 = dim_.wid;
+ } else {
+ Row const & row2 = par2.getRow(end.pos());
+ Y1 = bv_funcs::getPos(end, end.boundary()).y_ - row2.ascent();
+ Y2 = Y1 + row2.height();
+ int const endx = cursorX(end.top(), end.boundary());
+ X1 = !isRTL(par2) ? 0 : endx;
+ X2 = !isRTL(par2) ? endx : 0 + dim_.wid;
+ }
+
+ if (!above && !below && &par1.getRow(beg.pos())
+ == &par2.getRow(end.pos()))
+ {
+ // paint only one rectangle
+ pi.pain.fillRectangle(x + x1, y1, X2 - x1, y2 - y1,
+ LColor::selection);
+ return;
+ }
+
+ // paint upper rectangle
+ pi.pain.fillRectangle(x + x1, y1, x2 - x1, y2 - y1,
+ LColor::selection);
+ // paint bottom rectangle
+ pi.pain.fillRectangle(x + X1, Y1, X2 - X1, Y2 - Y1,
+ LColor::selection);
+ // paint center rectangle
+ pi.pain.fillRectangle(x, y2, dim_.wid,
+ Y1 - y2, LColor::selection);
+}
+
+
+bool LyXText::isLastRow(pit_type pit, Row const & row) const
{
return row.endpos() >= pars_[pit].size()
- && pit + 1 == par_type(paragraphs().size());
+ && pit + 1 == pit_type(paragraphs().size());
}
-bool LyXText::isFirstRow(par_type pit, Row const & row) const
+bool LyXText::isFirstRow(pit_type pit, Row const & row) const
{
return row.pos() == 0 && pit == 0;
}
void LyXText::getWord(CursorSlice & from, CursorSlice & to,
word_location const loc)
{
- Paragraph const & from_par = pars_[from.par()];
+ Paragraph const & from_par = pars_[from.pit()];
switch (loc) {
case lyx::WHOLE_WORD_STRICT:
if (from.pos() == 0 || from.pos() == from_par.size()
- || !from_par.isWord(from.pos())
- || !from_par.isWord(from.pos() - 1)) {
+ || !from_par.isLetter(from.pos())
+ || !from_par.isLetter(from.pos() - 1)) {
to = from;
return;
}
case lyx::WHOLE_WORD:
// If we are already at the beginning of a word, do nothing
- if (!from.pos() || !from_par.isWord(from.pos() - 1))
+ if (!from.pos() || !from_par.isLetter(from.pos() - 1))
break;
// no break here, we go to the next
case lyx::PREVIOUS_WORD:
// always move the cursor to the beginning of previous word
- while (from.pos() && from_par.isWord(from.pos() - 1))
+ while (from.pos() && from_par.isLetter(from.pos() - 1))
--from.pos();
break;
case lyx::NEXT_WORD:
break;
}
to = from;
- Paragraph & to_par = pars_[to.par()];
- while (to.pos() < to_par.size() && to_par.isWord(to.pos()))
+ Paragraph & to_par = pars_[to.pit()];
+ while (to.pos() < to_par.size() && to_par.isLetter(to.pos()))
++to.pos();
}
{
static Change current_change;
- bool the_end_read = false;
Paragraph::depth_type depth = 0;
while (lex.isOK()) {
continue;
if (token == "\\end_inset") {
- the_end_read = true;
break;
}
+ if (token == "\\end_body") {
+ continue;
+ }
+
+ if (token == "\\begin_body") {
+ continue;
+ }
+
if (token == "\\end_document") {
-#ifdef WITH_WARNINGS
-#warning Look here!
-#endif
-#if 0
- lex.printError("\\end_document read in inset! Error in document!");
-#endif
return false;
}
- // FIXME: ugly.
- int unknown = 0;
-
if (token == "\\begin_layout") {
lex.pushToken(token);
--depth;
}
} else {
- ++unknown;
+ lyxerr << "Handling unknown body token: `"
+ << token << '\'' << endl;
}
-
}
- return the_end_read;
+ return true;
}
int LyXText::ascent() const
{
- return firstRow().ascent_of_text();
+ return dim_.asc;
}
int LyXText::descent() const
{
- return height_ - firstRow().ascent_of_text();
+ return dim_.des;
}
-int LyXText::cursorX(CursorSlice const & cur) const
+int LyXText::cursorX(CursorSlice const & sl, bool boundary) const
{
- par_type pit = cur.par();
- if (pars_[pit].rows.empty())
- return xo_;
+ pit_type const pit = sl.pit();
+ Paragraph const & par = pars_[pit];
+ if (par.rows().empty())
+ return 0;
- Row const & row = *pars_[pit].getRow(cur.pos());
+ pos_type pos = sl.pos();
+ //// Correct position in front of big insets
+ //if (pos && boundary)
+ // --pos;
+
+ Row const & row = par.getRow(pos);
- pos_type pos = cur.pos();
pos_type cursor_vpos = 0;
RowMetrics const m = computeRowMetrics(pit, row);
if (end <= row_pos)
cursor_vpos = row_pos;
else if (pos >= end)
- cursor_vpos = isRTL(pars_[pit]) ? row_pos : end;
+ cursor_vpos = isRTL(par) ? row_pos : end;
else if (pos > row_pos && pos >= end)
// Place cursor after char at (logical) position pos - 1
cursor_vpos = (bidi.level(pos - 1) % 2 == 0)
cursor_vpos = (bidi.level(pos) % 2 == 0)
? bidi.log2vis(pos) : bidi.log2vis(pos) + 1;
- pos_type body_pos = pars_[pit].beginOfBody();
+ pos_type body_pos = par.beginOfBody();
if (body_pos > 0 &&
- (body_pos > end || !pars_[pit].isLineSeparator(body_pos - 1)))
+ (body_pos > end || !par.isLineSeparator(body_pos - 1)))
body_pos = 0;
for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
pos_type pos = bidi.vis2log(vpos);
if (body_pos > 0 && pos == body_pos - 1) {
x += m.label_hfill
- + font_metrics::width(pars_[pit].layout()->labelsep,
- getLabelFont(pit));
- if (pars_[pit].isLineSeparator(body_pos - 1))
- x -= singleWidth(pit, body_pos - 1);
+ + font_metrics::width(par.layout()->labelsep,
+ getLabelFont(par));
+ if (par.isLineSeparator(body_pos - 1))
+ x -= singleWidth(par, body_pos - 1);
}
- if (hfillExpansion(pars_[pit], row, pos)) {
- x += singleWidth(pit, pos);
+ if (hfillExpansion(par, row, pos)) {
+ x += singleWidth(par, pos);
if (pos >= body_pos)
x += m.hfill;
else
x += m.label_hfill;
- } else if (pars_[pit].isSeparator(pos)) {
- x += singleWidth(pit, pos);
+ } else if (par.isSeparator(pos)) {
+ x += singleWidth(par, pos);
if (pos >= body_pos)
x += m.separator;
} else
- x += singleWidth(pit, pos);
+ x += singleWidth(par, pos);
}
- return xo_ + int(x);
+
+ // see correction above
+ //if (pos && boundary)
+ // x += singleWidth(par, pos + 1);
+
+ return int(x);
}
-int LyXText::cursorY(CursorSlice const & cur) const
+int LyXText::cursorY(CursorSlice const & sl, bool boundary) const
{
- Paragraph const & par = getPar(cur.par());
- Row const & row = *par.getRow(cur.pos());
- return yo_ + par.y + row.y_offset() + row.baseline();
+ //lyxerr << "LyXText::cursorY: boundary: " << boundary << std::endl;
+ Paragraph const & par = getPar(sl.pit());
+ int h = 0;
+ h -= pars_[0].rows()[0].ascent();
+ for (pit_type pit = 0; pit < sl.pit(); ++pit)
+ h += pars_[pit].height();
+ //size_t const rend = par.pos2row(sl.pos() - boundary ? 1 : 0);
+ size_t const rend = par.pos2row(sl.pos());
+ for (size_t rit = 0; rit != rend; ++rit)
+ h += par.rows()[rit].height();
+ h += par.rows()[rend].ascent();
+ return h;
}
// The paragraph depth
int depth = cur.paragraph().getDepth();
if (depth > 0)
- os << bformat(_(", Depth: %1$s"), tostr(depth));
+ os << bformat(_(", Depth: %1$d"), depth);
// The paragraph spacing, but only if different from
// buffer spacing.
os << _("Double");
break;
case Spacing::Other:
- os << _("Other (") << spacing.getValue() << ')';
+ os << _("Other (") << spacing.getValueAsString() << ')';
break;
case Spacing::Default:
// should never happen, do nothing
break;
}
}
+
#ifdef DEVEL_VERSION
os << _(", Inset: ") << &cur.inset();
- os << _(", Paragraph: ") << cur.par();
+ os << _(", Paragraph: ") << cur.pit();
os << _(", Id: ") << par.id();
os << _(", Position: ") << cur.pos();
- Row & row = cur.textRow();
- os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
+// Row & row = cur.textRow();
+// os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
#endif
return os.str();
}
string LyXText::getPossibleLabel(LCursor & cur) const
{
- par_type pit = cur.par();
+ pit_type pit = cur.pit();
LyXLayout_ptr layout = pars_[pit].layout();
}
-int LyXText::dist(int x, int y) const
+//pos_type LyXText::x2pos(pit_type pit, int row, int x) const
+//{
+// int lastx = 0;
+// int currx = 0;
+// Paragraph const & par = pars_[pit];
+// Row const & r = par.rows()[row];
+// int pos = r.pos();
+// for (; currx < x && pos < r.endpos(); ++pos) {
+// lastx = currx;
+// currx += singleWidth(par, pos);
+// }
+// if (abs(lastx - x) < abs(currx - x) && pos != r.pos())
+// --pos;
+// return pos;
+//}
+
+
+pos_type LyXText::x2pos(pit_type pit, int row, int x) const
{
- int xx = 0;
- int yy = 0;
+ BOOST_ASSERT(row < int(pars_[pit].rows().size()));
+ bool bound = false;
+ Row const & r = pars_[pit].rows()[row];
+ return r.pos() + getColumnNearX(pit, r, x, bound);
+}
+
- if (x < xo_)
- xx = xo_ - x;
- else if (x > xo_ + int(width_))
- xx = x - xo_ - width_;
+//int LyXText::pos2x(pit_type pit, pos_type pos) const
+//{
+// Paragraph const & par = pars_[pit];
+// Row const & r = par.rows()[row];
+// int x = 0;
+// pos -= r.pos();
+//}
- if (y < yo_ - ascent())
- yy = yo_ - ascent() - y;
- else if (y > yo_ + descent())
- yy = y - yo_ - descent();
- return xx + yy;
+// x,y are screen coordinates
+// sets cursor only within this LyXText
+void LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
+{
+ pit_type pit = getPitNearY(y);
+ int yy = theCoords.get(this, pit).y_ - pars_[pit].ascent();
+ lyxerr[Debug::DEBUG]
+ << BOOST_CURRENT_FUNCTION
+ << ": x: " << x
+ << " y: " << y
+ << " pit: " << pit
+ << " yy: " << yy << endl;
+
+ Paragraph const & par = pars_[pit];
+ int r = 0;
+ BOOST_ASSERT(par.rows().size());
+ for (; r < int(par.rows().size()) - 1; ++r) {
+ Row const & row = par.rows()[r];
+ if (int(yy + row.height()) > y)
+ break;
+ yy += row.height();
+ }
+
+ Row const & row = par.rows()[r];
+
+ lyxerr[Debug::DEBUG]
+ << BOOST_CURRENT_FUNCTION
+ << ": row " << r
+ << " from pos: " << row.pos()
+ << endl;
+
+ bool bound = false;
+ int xx = x;
+ pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound);
+
+ lyxerr[Debug::DEBUG]
+ << BOOST_CURRENT_FUNCTION
+ << ": setting cursor pit: " << pit
+ << " pos: " << pos
+ << endl;
+
+ setCursor(cur, pit, pos, true, bound);
}
projects / lyx.git / blobdiff