#include "lyxtext.h"
+#include "author.h"
#include "buffer.h"
#include "bufferparams.h"
#include "BufferView.h"
#include "cursor.h"
+#include "coordcache.h"
+#include "CutAndPaste.h"
#include "debug.h"
#include "dispatchresult.h"
#include "encoding.h"
+#include "errorlist.h"
#include "funcrequest.h"
+#include "factory.h"
+#include "FontIterator.h"
#include "gettext.h"
#include "language.h"
#include "LColor.h"
#include "frontends/font_metrics.h"
#include "frontends/LyXView.h"
+#include "frontends/Painter.h"
#include "insets/insettext.h"
+#include "insets/insetbibitem.h"
+#include "insets/insethfill.h"
+#include "insets/insetlatexaccent.h"
+#include "insets/insetline.h"
+#include "insets/insetnewline.h"
+#include "insets/insetpagebreak.h"
+#include "insets/insetoptarg.h"
+#include "insets/insetspace.h"
+#include "insets/insetspecialchar.h"
+#include "insets/insettabular.h"
#include "support/lstrings.h"
#include "support/textutils.h"
+#include "support/convert.h"
+#include <sstream>
+
+using lyx::pit_type;
using lyx::pos_type;
using lyx::word_location;
+using lyx::support::bformat;
using lyx::support::contains;
using lyx::support::lowercase;
+using lyx::support::split;
using lyx::support::uppercase;
+using lyx::cap::cutSelection;
+
+using std::auto_ptr;
using std::advance;
using std::distance;
using std::max;
+using std::min;
using std::endl;
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)
+{
+ pos_type const first = max(row.pos(), par.beginOfBody());
+ pos_type const last = row.endpos() - 1;
+ int n = 0;
+ for (pos_type p = first; p < last; ++p) {
+ if (par.isSeparator(p))
+ ++n;
+ }
+ return n;
+}
-namespace {
-unsigned int maxParagraphWidth(ParagraphList const & plist)
+int numberOfLabelHfills(Paragraph const & par, Row const & row)
{
- 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;
+ pos_type last = row.endpos() - 1;
+ pos_type first = row.pos();
+
+ // hfill *DO* count at the beginning of paragraphs!
+ if (first) {
+ while (first < last && par.isHfill(first))
+ ++first;
+ }
+
+ last = min(last, par.beginOfBody());
+ int n = 0;
+ for (pos_type p = first; p < last; ++p) {
+ if (par.isHfill(p))
+ ++n;
+ }
+ return n;
}
-} // namespace anon
+int numberOfHfills(Paragraph const & par, Row const & row)
+{
+ pos_type const last = row.endpos() - 1;
+ pos_type first = row.pos();
-BufferView * LyXText::bv()
+ // hfill *DO* count at the beginning of paragraphs!
+ if (first) {
+ while (first < last && par.isHfill(first))
+ ++first;
+ }
+
+ first = max(first, par.beginOfBody());
+
+ int n = 0;
+ for (pos_type p = first; p < last; ++p) {
+ if (par.isHfill(p))
+ ++n;
+ }
+ return n;
+}
+
+
+void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
+ string const & token, LyXFont & font)
{
- BOOST_ASSERT(bv_owner != 0);
- return bv_owner;
+ static Change change;
+
+ BufferParams const & bp = buf.params();
+
+ if (token[0] != '\\') {
+ string::const_iterator cit = token.begin();
+ for (; cit != token.end(); ++cit) {
+ par.insertChar(par.size(), (*cit), font, change);
+ }
+ } else if (token == "\\begin_layout") {
+ lex.eatLine();
+ string layoutname = lex.getString();
+
+ font = LyXFont(LyXFont::ALL_INHERIT, bp.language);
+ change = Change();
+
+ LyXTextClass const & tclass = bp.getLyXTextClass();
+
+ if (layoutname.empty()) {
+ layoutname = tclass.defaultLayoutName();
+ }
+
+ bool hasLayout = tclass.hasLayout(layoutname);
+
+ if (!hasLayout) {
+ 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.layout(bp.getLyXTextClass()[layoutname]);
+
+ // Test whether the layout is obsolete.
+ LyXLayout_ptr const & layout = par.layout();
+ if (!layout->obsoleted_by().empty())
+ par.layout(bp.getLyXTextClass()[layout->obsoleted_by()]);
+
+ par.params().read(lex);
+
+ } else if (token == "\\end_layout") {
+ lyxerr << "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"
+ << "Missing \\begin_inset?.\n";
+ } else if (token == "\\begin_inset") {
+ InsetBase * inset = readInset(lex, buf);
+ if (inset)
+ par.insertInset(par.size(), inset, font, change);
+ else {
+ lex.eatLine();
+ string line = lex.getString();
+ buf.error(ErrorItem(_("Unknown Inset"), line,
+ par.id(), 0, par.size()));
+ }
+ } else if (token == "\\family") {
+ lex.next();
+ font.setLyXFamily(lex.getString());
+ } else if (token == "\\series") {
+ lex.next();
+ font.setLyXSeries(lex.getString());
+ } else if (token == "\\shape") {
+ lex.next();
+ font.setLyXShape(lex.getString());
+ } else if (token == "\\size") {
+ lex.next();
+ font.setLyXSize(lex.getString());
+ } else if (token == "\\lang") {
+ lex.next();
+ string const tok = lex.getString();
+ Language const * lang = languages.getLanguage(tok);
+ if (lang) {
+ font.setLanguage(lang);
+ } else {
+ font.setLanguage(bp.language);
+ lex.printError("Unknown language `$$Token'");
+ }
+ } else if (token == "\\numeric") {
+ lex.next();
+ font.setNumber(font.setLyXMisc(lex.getString()));
+ } else if (token == "\\emph") {
+ lex.next();
+ font.setEmph(font.setLyXMisc(lex.getString()));
+ } else if (token == "\\bar") {
+ lex.next();
+ string const tok = lex.getString();
+
+ if (tok == "under")
+ font.setUnderbar(LyXFont::ON);
+ else if (tok == "no")
+ font.setUnderbar(LyXFont::OFF);
+ else if (tok == "default")
+ font.setUnderbar(LyXFont::INHERIT);
+ else
+ lex.printError("Unknown bar font flag "
+ "`$$Token'");
+ } else if (token == "\\noun") {
+ lex.next();
+ font.setNoun(font.setLyXMisc(lex.getString()));
+ } else if (token == "\\color") {
+ lex.next();
+ font.setLyXColor(lex.getString());
+ } else if (token == "\\InsetSpace" || token == "\\SpecialChar") {
+
+ // Insets don't make sense in a free-spacing context! ---Kayvan
+ if (par.isFreeSpacing()) {
+ if (token == "\\InsetSpace")
+ par.insertChar(par.size(), ' ', font, change);
+ else if (lex.isOK()) {
+ lex.next();
+ string const next_token = lex.getString();
+ if (next_token == "\\-")
+ par.insertChar(par.size(), '-', font, change);
+ else {
+ lex.printError("Token `$$Token' "
+ "is in free space "
+ "paragraph layout!");
+ }
+ }
+ } else {
+ auto_ptr<InsetBase> inset;
+ if (token == "\\SpecialChar" )
+ inset.reset(new InsetSpecialChar);
+ else
+ inset.reset(new InsetSpace);
+ inset->read(buf, lex);
+ par.insertInset(par.size(), inset.release(),
+ font, change);
+ }
+ } else if (token == "\\i") {
+ auto_ptr<InsetBase> inset(new InsetLatexAccent);
+ inset->read(buf, lex);
+ par.insertInset(par.size(), inset.release(), font, change);
+ } else if (token == "\\backslash") {
+ par.insertChar(par.size(), '\\', font, change);
+ } else if (token == "\\newline") {
+ auto_ptr<InsetBase> inset(new InsetNewline);
+ inset->read(buf, lex);
+ par.insertInset(par.size(), inset.release(), font, change);
+ } else if (token == "\\LyXTable") {
+ auto_ptr<InsetBase> inset(new InsetTabular(buf));
+ inset->read(buf, lex);
+ par.insertInset(par.size(), inset.release(), font, change);
+ } else if (token == "\\bibitem") {
+ InsetCommandParams p("bibitem", "dummy");
+ auto_ptr<InsetBibitem> inset(new InsetBibitem(p));
+ inset->read(buf, lex);
+ par.insertInset(par.size(), inset.release(), font, change);
+ } else if (token == "\\hfill") {
+ par.insertInset(par.size(), new InsetHFill, font, change);
+ } else if (token == "\\lyxline") {
+ par.insertInset(par.size(), new InsetLine, font, change);
+ } else if (token == "\\newpage") {
+ par.insertInset(par.size(), new InsetPagebreak, font, change);
+ } else if (token == "\\change_unchanged") {
+ // Hack ! Needed for empty paragraphs :/
+ // FIXME: is it still ??
+ if (!par.size())
+ par.cleanChanges();
+ change = Change(Change::UNCHANGED);
+ } else if (token == "\\change_inserted") {
+ 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.eatLine();
+ std::istringstream is(lex.getString());
+ int aid;
+ lyx::time_type ct;
+ is >> aid >> ct;
+ change = Change(Change::DELETED, bp.author_map[aid], ct);
+ } else {
+ lex.eatLine();
+ buf.error(ErrorItem(_("Unknown token"),
+ bformat(_("Unknown token: %1$s %2$s\n"), token, lex.getString()),
+ par.id(), 0, par.size()));
+ }
}
-double LyXText::spacing(Paragraph const & par) const
+void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
{
- if (par.params().spacing().isDefault())
- return bv()->buffer()->params().spacing().getValue();
- return par.params().spacing().getValue();
+ lex.nextToken();
+ string token = lex.getString();
+ LyXFont font;
+
+ while (lex.isOK()) {
+
+ readParToken(buf, par, lex, token, font);
+
+ lex.nextToken();
+ token = lex.getString();
+
+ if (token.empty())
+ continue;
+
+ if (token == "\\end_layout") {
+ //Ok, paragraph finished
+ break;
+ }
+
+ lyxerr[Debug::PARSER] << "Handling paragraph token: `"
+ << token << '\'' << endl;
+ if (token == "\\begin_layout" || token == "\\end_document"
+ || token == "\\end_inset" || token == "\\begin_deeper"
+ || token == "\\end_deeper") {
+ lex.pushToken(token);
+ lyxerr << "Paragraph ended in line "
+ << lex.getLineNo() << "\n"
+ << "Missing \\end_layout.\n";
+ break;
+ }
+ }
+}
+
+
+} // namespace anon
+
+
+BufferView * LyXText::bv()
+{
+ BOOST_ASSERT(bv_owner != 0);
+ return bv_owner;
}
}
-void LyXText::updateParPositions()
+double LyXText::spacing(Paragraph const & par) const
{
- ParagraphList::iterator pit = paragraphs().begin();
- ParagraphList::iterator end = paragraphs().end();
- for (height = 0; pit != end; ++pit) {
- pit->y = height;
- height += pit->height;
- }
+ if (par.params().spacing().isDefault())
+ return bv()->buffer()->params().spacing().getValue();
+ return par.params().spacing().getValue();
}
-int LyXText::textWidth() const
+int LyXText::width() const
{
- return textwidth_;
+ return dim_.wid;
}
-int LyXText::singleWidth(ParagraphList::iterator pit, pos_type pos) const
+int LyXText::height() const
{
- if (pos >= pit->size())
- return 0;
+ return dim_.height();
+}
+
- char const c = pit->getChar(pos);
- return singleWidth(pit, pos, c, getFont(pit, pos));
+int LyXText::singleWidth(Paragraph const & par, pos_type pos) const
+{
+ return singleWidth(par, pos, par.getChar(pos), getFont(par, pos));
}
-int LyXText::singleWidth(ParagraphList::iterator pit,
+int LyXText::singleWidth(Paragraph const & par,
pos_type pos, char c, LyXFont const & font) const
{
- if (pos >= 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 = 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 pit->getInset(pos)->width();
+ return par.getInset(pos)->width();
if (IsSeparatorChar(c))
c = ' ';
}
-int LyXText::leftMargin(ParagraphList::iterator pit) const
+int LyXText::leftMargin(pit_type pit) const
{
- return leftMargin(pit, pit->size());
+ BOOST_ASSERT(pit >= 0);
+ BOOST_ASSERT(pit < int(pars_.size()));
+ return leftMargin(pit, pars_[pit].size());
}
-int LyXText::leftMargin(ParagraphList::iterator 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 = 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 (pit->getDepth() == 0) {
- if (pit->layout() == tclass.defaultLayout()) {
- // find the previous same level paragraph
- if (pit != paragraphs().begin()) {
- ParagraphList::iterator newpit =
- depthHook(pit, paragraphs(), pit->getDepth());
- if (newpit == pit && 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
- ParagraphList::iterator newpar =
- outerHook(pit, paragraphs());
-
- // Make a corresponding row. Need to call leftMargin()
- // to check whether it is a sufficent paragraph.
- if (newpar != paragraphs().end()
- && newpar->layout()->isEnvironment()) {
- x = leftMargin(newpar);
- }
-
- if (newpar != paragraphs().end()
- && pit->layout() == tclass.defaultLayout()) {
- if (newpar->params().noindent())
- parindent.erase();
- else
- parindent = 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 (!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(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 (!pit->empty() && pos >= pit->beginOfBody()) {
- if (!pit->getLabelWidthString().empty()) {
- x += font_metrics::width(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
- / (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 >= 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(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 = pit->rows.begin();
- RowList::iterator end = pit->rows.end();
+ RowList::iterator rit = par.rows().begin();
+ RowList::iterator end = par.rows().end();
+#ifdef WITH_WARNINGS
#warning This is wrong.
- int minfill = textwidth_;
+#endif
+ int minfill = maxwidth_;
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 += textwidth_ / 2;
+ l_margin += maxwidth_ / 2;
break;
}
}
- if (!pit->params().leftIndent().zero())
- x += pit->params().leftIndent().inPixels(textWidth());
+ if (!par.params().leftIndent().zero())
+ l_margin += par.params().leftIndent().inPixels(maxwidth_);
LyXAlignment align;
- if (pit->params().align() == LYX_ALIGN_LAYOUT)
+ if (par.params().align() == LYX_ALIGN_LAYOUT)
align = layout->align;
else
- align = 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
- && !pit->params().noindent()
- // in tabulars and ert paragraphs are never indented!
- && (!pit->inInset()
- || !pit->inInset()->owner()
- || (pit->inInset()->owner()->lyxCode() != InsetOld::TABULAR_CODE
- && pit->inInset()->owner()->lyxCode() != InsetOld::ERT_CODE))
- && (pit->layout() != tclass.defaultLayout()
+ && !par.params().noindent()
+ // in charstyles, tabulars and ert paragraphs are never indented!
+ && (par.ownerCode() != InsetBase::TEXT_CODE
+ && 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(ParagraphList::iterator pit) const
+int LyXText::labelEnd(pit_type const pit) const
{
// labelEnd is only needed if the layout fills a flushleft label.
- if (pit->layout()->margintype != MARGIN_MANUAL)
+ if (pars_[pit].layout()->margintype != MARGIN_MANUAL)
return 0;
// return the beginning of the body
return leftMargin(pit);
};
-void LyXText::rowBreakPoint(ParagraphList::iterator pit, Row & row) const
+void LyXText::rowBreakPoint(pit_type const pit, Row & row) const
{
- pos_type const end = 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 = textWidth() - rightMargin(*pit); // - leftMargin(pit, row);
+ int width = maxwidth_ - rightMargin(par); // - leftMargin(pit, row);
if (width < 0) {
row.endpos(end);
return;
}
- LyXLayout_ptr const & layout = pit->layout();
+ LyXLayout_ptr const & layout = par.layout();
if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
- row.endpos(addressBreakPoint(pos, *pit));
+ row.endpos(addressBreakPoint(pos, par));
return;
}
- pos_type const body_pos = 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;
-
- // We re-use the font resolution for the entire font span when possible
- LyXFont font = getFont(pit, pos);
- lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(pos);
-
+ FontIterator fi = FontIterator(*this, par, pos);
pos_type point = end;
pos_type i = pos;
- for ( ; i < end; ++i) {
- if (pit->isNewline(i)) {
- point = i + 1;
- break;
- }
- // Break before...
- if (i + 1 < end) {
- if (pit->isInset(i + 1) && pit->getInset(i + 1)->display()) {
- point = i + 1;
- break;
- }
- // ...and after.
- if (pit->isInset(i) && pit->getInset(i)->display()) {
- point = i + 1;
- break;
- }
- }
-
- char const c = pit->getChar(i);
-
- if (i > endPosOfFontSpan) {
- font = getFont(pit, i);
- endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
- }
+ for ( ; i < end; ++i, ++fi) {
+ char const c = par.getChar(i);
{
- int thiswidth = singleWidth(pit, i, c, font);
+ 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 (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;
}
x += thiswidth;
- //lyxerr << "i: " << i << " x: "
- //<< x << " width: " << width << endl;
chunkwidth += thiswidth;
}
if (x >= width) {
// if no break before, break here
if (point == end || chunkwidth >= width - left) {
- if (i > pos) {
+ if (i > pos)
point = i;
- break;
- }
+ else
+ point = i + 1;
+
}
// exit on last registered breakpoint:
break;
}
- if (!pit->isInset(i) || pit->getInset(i)->isChar()) {
+ if (par.isNewline(i)) {
+ point = i + 1;
+ break;
+ }
+ // Break before...
+ if (i + 1 < end) {
+ if (par.isInset(i + 1) && par.getInset(i + 1)->display()) {
+ point = i + 1;
+ break;
+ }
+ // ...and after.
+ if (par.isInset(i) && par.getInset(i)->display()) {
+ point = i + 1;
+ break;
+ }
+ }
+
+ if (!par.isInset(i) || par.getInset(i)->isChar()) {
// some insets are line separators too
- if (pit->isLineSeparator(i)) {
+ if (par.isLineSeparator(i)) {
// register breakpoint:
point = i + 1;
chunkwidth = 0;
}
}
- if (i == end && x < width) {
- // maybe found one, but the par is short enough.
+ // maybe found one, but the par is short enough.
+ if (i == end && x < width)
point = end;
- }
// manual labels cannot be broken in LaTeX. But we
// want to make our on-screen rendering of footnotes
}
-// returns the minimum space a row needs on the screen in pixel
-void LyXText::fill(ParagraphList::iterator pit, Row & row, int workwidth) const
+void LyXText::setRowWidth(pit_type const pit, Row & row) const
{
// get the pure distance
pos_type const end = row.endpos();
- string labelsep = pit->layout()->labelsep;
+ Paragraph const & par = pars_[pit];
+ string labelsep = par.layout()->labelsep;
int w = leftMargin(pit, row.pos());
- pos_type const body_pos = pit->beginOfBody();
+ pos_type const body_pos = par.beginOfBody();
pos_type i = row.pos();
if (i < end) {
- // We re-use the font resolution for the entire span when possible
- LyXFont font = getFont(pit, i);
- lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
- for ( ; i < end; ++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 (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 = pit->getChar(i);
- if (IsPrintable(c) && i > endPosOfFontSpan) {
- // We need to get the next font
- font = getFont(pit, i);
- endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
- }
- w += singleWidth(pit, i, c, font);
+ 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 && 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));
}
- int const fill = workwidth - w - rightMargin(*pit);
- row.fill(fill);
- row.width(workwidth - fill);
+ row.width(w + rightMargin(par));
}
// returns the minimum space a manual label needs on the screen in pixel
-int LyXText::labelFill(ParagraphList::iterator pit, Row const & row) const
+int LyXText::labelFill(Paragraph const & par, Row const & row) const
{
- pos_type last = pit->beginOfBody();
+ pos_type last = par.beginOfBody();
BOOST_ASSERT(last > 0);
--last;
// a separator at this end does not count
- if (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 = 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(ParagraphList::iterator 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 = 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(*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::iterator ii = pit->insetlist.begin();
- InsetList::iterator iend = 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 =
- 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) {
// some parksips VERY EASY IMPLEMENTATION
if (bv()->buffer()->params().paragraph_separation
== BufferParams::PARSEP_SKIP
- && pit != paragraphs().begin()
- && ((layout->isParagraph() && pit->getDepth() == 0)
- || (boost::prior(pit)->layout()->isParagraph()
- && boost::prior(pit)->getDepth() == 0)))
+ && pit != 0
+ && ((layout->isParagraph() && par.getDepth() == 0)
+ || (pars_[pit - 1].layout()->isParagraph()
+ && pars_[pit - 1].getDepth() == 0)))
{
maxasc += bufparams.getDefSkip().inPixels(*bv());
}
- if (pit->params().startOfAppendix())
+ if (pars_[pit].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) {
labeladdon = int(font_metrics::maxHeight(labelfont)
- * layout->spacing.getValue() * spacing(*pit));
+ * layout->spacing.getValue()
+ * spacing(par));
}
// special code for the top label
|| layout->labeltype == LABEL_BIBLIO
|| layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
&& isFirstInSequence(pit, paragraphs())
- && !pit->getLabelstring().empty())
+ && !par.getLabelstring().empty())
{
labeladdon = int(
font_metrics::maxHeight(labelfont)
* layout->spacing.getValue()
- * spacing(*pit)
+ * spacing(par)
+ (layout->topsep + layout->labelbottomsep) * dh);
}
// a section, or between the items of a itemize or enumerate
// environment.
- ParagraphList::iterator prev =
- depthHook(pit, paragraphs(), pit->getDepth());
+ pit_type prev = depthHook(pit, pars_, par.getDepth());
if (prev != pit
- && prev->layout() == layout
- && prev->getDepth() == pit->getDepth()
- && prev->getLabelWidthString() == pit->getLabelWidthString())
+ && pars_[prev].layout() == layout
+ && pars_[prev].getDepth() == par.getDepth()
+ && pars_[prev].getLabelWidthString() == par.getLabelWidthString())
{
layoutasc = layout->itemsep * dh;
- } else if (pit != paragraphs().begin() || row.pos() != 0) {
+ } else if (pit != 0 || row.pos() != 0) {
if (layout->topsep > 0)
layoutasc = layout->topsep * dh;
}
- prev = outerHook(pit, paragraphs());
- if (prev != paragraphs().end()) {
- maxasc += int(prev->layout()->parsep * dh);
- } else if (pit != paragraphs().begin()) {
- ParagraphList::iterator prior_pit = boost::prior(pit);
- if (prior_pit->getDepth() != 0 ||
- prior_pit->layout() == layout) {
+ prev = outerHook(pit, pars_);
+ if (prev != pit_type(pars_.size())) {
+ maxasc += int(pars_[prev].layout()->parsep * dh);
+ } else if (pit != 0) {
+ if (pars_[pit - 1].getDepth() != 0 ||
+ pars_[pit - 1].layout() == layout) {
maxasc += int(layout->parsep * dh);
}
}
}
// is it a bottom line?
- if (row.endpos() >= 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
- ParagraphList::iterator nextpit = boost::next(pit);
- if (nextpit != paragraphs().end()) {
- ParagraphList::iterator cpit = pit;
+ pit_type nextpit = pit + 1;
+ if (nextpit != pit_type(pars_.size())) {
+ pit_type cpit = pit;
double usual = 0;
double unusual = 0;
- if (cpit->getDepth() > nextpit->getDepth()) {
- usual = cpit->layout()->bottomsep * dh;
- cpit = depthHook(cpit, paragraphs(), nextpit->getDepth());
- if (cpit->layout() != nextpit->layout()
- || nextpit->getLabelWidthString() != cpit->getLabelWidthString())
+ if (pars_[cpit].getDepth() > pars_[nextpit].getDepth()) {
+ usual = pars_[cpit].layout()->bottomsep * dh;
+ cpit = depthHook(cpit, paragraphs(), pars_[nextpit].getDepth());
+ if (pars_[cpit].layout() != pars_[nextpit].layout()
+ || pars_[nextpit].getLabelWidthString() != pars_[cpit].getLabelWidthString())
{
- unusual = cpit->layout()->bottomsep * dh;
+ unusual = pars_[cpit].layout()->bottomsep * dh;
}
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);
+ } else if (pars_[cpit].getDepth() == pars_[nextpit].getDepth()) {
+ if (pars_[cpit].layout() != pars_[nextpit].layout()
+ || pars_[nextpit].getLabelWidthString() != pars_[cpit].getLabelWidthString())
+ layoutdesc = int(pars_[cpit].layout()->bottomsep * dh);
}
}
}
// incalculate the layout spaces
- maxasc += int(layoutasc * 2 / (2 + pit->getDepth()));
- maxdesc += int(layoutdesc * 2 / (2 + pit->getDepth()));
+ 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));
+ row.ascent(maxasc + labeladdon);
+ row.descent(maxdesc);
}
-void LyXText::breakParagraph(ParagraphList & paragraphs, char keep_layout)
+namespace {
+
+}
+
+void LyXText::breakParagraph(LCursor & cur, char keep_layout)
{
+ BOOST_ASSERT(this == cur.text());
// allow only if at start or end, or all previous is new text
- ParagraphList::iterator cpit = cursorPar();
- if (cursor().pos() && cursor().pos() != cpit->size()
- && cpit->isChangeEdited(0, cursor().pos()))
+ Paragraph & cpar = cur.paragraph();
+ pit_type cpit = cur.pit();
+
+ if (cur.pos() != 0 && cur.pos() != cur.lastpos()
+ && cpar.isChangeEdited(0, cur.pos()))
return;
- LyXTextClass const & tclass =
- bv()->buffer()->params().getLyXTextClass();
- LyXLayout_ptr const & layout = cpit->layout();
+ LyXTextClass const & tclass = cur.buffer().params().getLyXTextClass();
+ LyXLayout_ptr const & layout = cpar.layout();
// this is only allowed, if the current paragraph is not empty
// or caption and if it has not the keepempty flag active
- if (cpit->empty() && !cpit->allowEmpty()
+ if (cur.lastpos() == 0 && !cpar.allowEmpty()
&& layout->labeltype != LABEL_SENSITIVE)
return;
// a layout change may affect also the following paragraph
- recUndo(cursor().par(), parOffset(undoSpan(cpit)) - 1);
+ recUndo(cur.pit(), undoSpan(cur.pit()) - 1);
// Always break behind a space
// It is better to erase the space (Dekel)
- if (cursor().pos() < cpit->size() && cpit->isLineSeparator(cursor().pos()))
- cpit->erase(cursor().pos());
+ if (cur.pos() != cur.lastpos() && cpar.isLineSeparator(cur.pos()))
+ cpar.erase(cur.pos());
// break the paragraph
if (keep_layout)
// 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)
- bool const isempty = cpit->allowEmpty() && cpit->empty();
- ::breakParagraph(bv()->buffer()->params(), paragraphs, cpit,
- cursor().pos(), keep_layout);
+ bool const isempty = cpar.allowEmpty() && cpar.empty();
+ ::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
+ cur.pos(), keep_layout);
- cpit = cursorPar();
- ParagraphList::iterator next_par = boost::next(cpit);
+ 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 (!cursor().pos())
+ if (cur.pos() == 0)
// set to standard-layout
- cpit->applyLayout(tclass.defaultLayout());
+ pars_[cpit].applyLayout(tclass.defaultLayout());
else
// set to standard-layout
- next_par->applyLayout(tclass.defaultLayout());
+ 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
- RowList::iterator crit = cpit->getRow(cursor().pos());
- if (cursor().pos() && crit->pos() == cursor().pos()
- && !cpit->isNewline(cursor().pos() - 1))
+ if (cur.pos() != 0 && cur.textRow().pos() == cur.pos()
+ && !pars_[cpit].isNewline(cur.pos() - 1))
{
- cursorLeft(bv());
+ cursorLeft(cur);
}
- while (!next_par->empty() && next_par->isNewline(0))
- next_par->erase(0);
+ while (!pars_[next_par].empty() && pars_[next_par].isNewline(0))
+ pars_[next_par].erase(0);
updateCounters();
- redoParagraph(cpit);
- redoParagraph(next_par);
// This check is necessary. Otherwise the new empty paragraph will
// be deleted automatically. And it is more friendly for the user!
- if (cursor().pos() || isempty)
- setCursor(next_par, 0);
+ if (cur.pos() != 0 || isempty)
+ setCursor(cur, cur.pit() + 1, 0);
else
- setCursor(cpit, 0);
-}
-
-
-// convenience function
-void LyXText::redoParagraph()
-{
- bv()->cursor().clearSelection();
- redoParagraph(cursorPar());
- setCursorIntern(cursor().par(), cursor().pos());
+ setCursor(cur, cur.pit(), 0);
}
// insert a character, moves all the following breaks in the
// same Paragraph one to the right and make a rebreak
-void LyXText::insertChar(char c)
+void LyXText::insertChar(LCursor & cur, char c)
{
- recordUndo(bv()->cursor(), Undo::INSERT);
+ BOOST_ASSERT(this == cur.text());
+ BOOST_ASSERT(c != Paragraph::META_INSET);
- // When the free-spacing option is set for the current layout,
- // disable the double-space checking
+ recordUndo(cur, Undo::INSERT);
+
+ Paragraph & par = cur.paragraph();
+ // try to remove this
+ pit_type const pit = cur.pit();
- bool const freeSpacing = cursorPar()->layout()->free_spacing ||
- cursorPar()->isFreeSpacing();
+ bool const freeSpacing = par.layout()->free_spacing ||
+ par.isFreeSpacing();
if (lyxrc.auto_number) {
static string const number_operators = "+-/*";
if (current_font.number() == LyXFont::ON) {
if (!IsDigit(c) && !contains(number_operators, c) &&
!(contains(number_seperators, c) &&
- cursor().pos() >= 1 &&
- cursor().pos() < cursorPar()->size() &&
- getFont(cursorPar(), cursor().pos()).number() == LyXFont::ON &&
- getFont(cursorPar(), cursor().pos() - 1).number() == LyXFont::ON)
+ cur.pos() != 0 &&
+ cur.pos() != cur.lastpos() &&
+ getFont(par, cur.pos()).number() == LyXFont::ON &&
+ getFont(par, cur.pos() - 1).number() == LyXFont::ON)
)
- number(); // Set current_font.number to OFF
+ number(cur); // Set current_font.number to OFF
} else if (IsDigit(c) &&
real_current_font.isVisibleRightToLeft()) {
- number(); // Set current_font.number to ON
+ number(cur); // Set current_font.number to ON
- if (cursor().pos() > 0) {
- char const c = cursorPar()->getChar(cursor().pos() - 1);
+ if (cur.pos() != 0) {
+ char const c = par.getChar(cur.pos() - 1);
if (contains(number_unary_operators, c) &&
- (cursor().pos() == 1 ||
- cursorPar()->isSeparator(cursor().pos() - 2) ||
- cursorPar()->isNewline(cursor().pos() - 2))
+ (cur.pos() == 1
+ || par.isSeparator(cur.pos() - 2)
+ || par.isNewline(cur.pos() - 2))
) {
- setCharFont(
- cursorPar(),
- cursor().pos() - 1,
- current_font);
- } else if (contains(number_seperators, c) &&
- cursor().pos() >= 2 &&
- getFont(
- cursorPar(),
- cursor().pos() - 2).number() == LyXFont::ON) {
- setCharFont(
- cursorPar(),
- cursor().pos() - 1,
- current_font);
+ setCharFont(pit, cur.pos() - 1, current_font);
+ } else if (contains(number_seperators, c)
+ && cur.pos() >= 2
+ && getFont(par, cur.pos() - 2).number() == LyXFont::ON) {
+ setCharFont(pit, cur.pos() - 1, current_font);
}
}
}
LyXFont realtmpfont = real_current_font;
LyXFont rawtmpfont = current_font;
+ // When the free-spacing option is set for the current layout,
+ // disable the double-space checking
if (!freeSpacing && IsLineSeparatorChar(c)) {
- if ((cursor().pos() > 0
- && cursorPar()->isLineSeparator(cursor().pos() - 1))
- || (cursor().pos() > 0
- && cursorPar()->isNewline(cursor().pos() - 1))
- || (cursor().pos() == 0)) {
+ if (cur.pos() == 0) {
static bool sent_space_message = false;
if (!sent_space_message) {
- if (cursor().pos() == 0)
- bv()->owner()->message(_("You cannot insert a space at the beginning of a paragraph. Please read the Tutorial."));
- else
- bv()->owner()->message(_("You cannot type two spaces this way. Please read the Tutorial."));
+ cur.message(_("You cannot insert a space at the "
+ "beginning of a paragraph. Please read the Tutorial."));
+ sent_space_message = true;
+ return;
+ }
+ }
+ BOOST_ASSERT(cur.pos() > 0);
+ if (par.isLineSeparator(cur.pos() - 1)
+ || par.isNewline(cur.pos() - 1)) {
+ static bool sent_space_message = false;
+ if (!sent_space_message) {
+ cur.message(_("You cannot type two spaces this way. "
+ "Please read the Tutorial."));
sent_space_message = true;
}
- charInserted();
return;
}
}
- // Here case LyXText::InsertInset already inserted the character
- if (c != Paragraph::META_INSET)
- cursorPar()->insertChar(cursor().pos(), c);
-
- setCharFont(cursorPar(), cursor().pos(), rawtmpfont);
+ par.insertChar(cur.pos(), c, rawtmpfont);
current_font = rawtmpfont;
real_current_font = realtmpfont;
- redoParagraph(cursorPar());
- setCursor(cursor().par(), cursor().pos() + 1, false, cursor().boundary());
-
+ setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
charInserted();
}
}
-void LyXText::prepareToPrint(ParagraphList::iterator pit, Row & row) const
+RowMetrics
+LyXText::computeRowMetrics(pit_type const pit, Row const & row) const
{
- double w = row.fill();
- double fill_hfill = 0;
- double fill_label_hfill = 0;
- double fill_separator = 0;
- double x = 0;
-
- bool const is_rtl =
- pit->isRightToLeftPar(bv()->buffer()->params());
+ RowMetrics result;
+ Paragraph const & par = pars_[pit];
+
+ double w = dim_.wid - row.width();
+
+ bool const is_rtl = isRTL(par);
if (is_rtl)
- x = rightMargin(*pit);
+ result.x = rightMargin(par);
else
- x = leftMargin(pit, row.pos());
+ result.x = leftMargin(pit, row.pos());
// is there a manual margin with a manual label
- LyXLayout_ptr const & layout = 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(*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 (!pit->empty())
+ if (!par.empty())
++nlh;
- if (nlh && !pit->getLabelWidthString().empty())
- fill_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(*pit, row);
+ int const nh = numberOfHfills(par, row);
if (nh) {
if (w > 0)
- fill_hfill = w / nh;
+ result.hfill = w / nh;
// 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()) < textWidth()) {
+ } else if (int(row.width()) < maxwidth_) {
// is it block, flushleft or flushright?
// set x how you need it
int align;
- if (pit->params().align() == LYX_ALIGN_LAYOUT)
+ if (par.params().align() == LYX_ALIGN_LAYOUT)
align = layout->align;
else
- align = pit->params().align();
+ align = par.params().align();
// Display-style insets should always be on a centred row
- // The test on 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 = pit->size() ? pit->getInset(row.pos()) : 0;
- if (!pit->empty()
- && pit->isInset(row.pos())
- && 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(*pit, row);
- bool disp_inset = false;
- if (row.endpos() < pit->size()) {
- InsetBase * 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;
+ case LYX_ALIGN_BLOCK: {
+ int const ns = numberOfSeparators(par, row);
+ bool disp_inset = false;
+ if (row.endpos() < par.size()) {
+ InsetBase const * in = par.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() < par.size()
+ && !par.isNewline(row.endpos() - 1)
+ && !disp_inset
+ ) {
+ result.separator = w / ns;
+ } else if (is_rtl) {
+ result.x += w;
}
- case LYX_ALIGN_RIGHT:
- x += w;
break;
- case LYX_ALIGN_CENTER:
- x += w / 2;
+ }
+ case LYX_ALIGN_RIGHT:
+ result.x += w;
+ break;
+ case LYX_ALIGN_CENTER:
+ result.x += w / 2;
break;
}
}
- bidi.computeTables(*pit, *bv()->buffer(), row);
+ bidi.computeTables(par, *bv()->buffer(), row);
if (is_rtl) {
- pos_type body_pos = pit->beginOfBody();
+ pos_type body_pos = par.beginOfBody();
pos_type end = row.endpos();
if (body_pos > 0
- && (body_pos > end || !pit->isLineSeparator(body_pos - 1)))
+ && (body_pos > end || !par.isLineSeparator(body_pos - 1)))
{
- x += font_metrics::width(layout->labelsep, getLabelFont(pit));
+ result.x += font_metrics::width(layout->labelsep, getLabelFont(par));
if (body_pos <= end)
- x += fill_label_hfill;
+ result.x += result.label_hfill;
}
}
- row.fill_hfill(fill_hfill);
- row.fill_label_hfill(fill_label_hfill);
- row.fill_separator(fill_separator);
- row.x(x);
+ return result;
}
// the cursor set functions have a special mechanism. When they
// realize, that you left an empty paragraph, they will delete it.
-void LyXText::cursorRightOneWord()
+void LyXText::cursorRightOneWord(LCursor & cur)
{
- cursorRightOneWord(cursor());
- setCursor(cursorPar(), cursor().pos());
+ BOOST_ASSERT(this == cur.text());
+ if (cur.pos() == cur.lastpos() && cur.pit() != cur.lastpit()) {
+ ++cur.pit();
+ cur.pos() = 0;
+ } else {
+ // Skip through initial nonword stuff.
+ // Treat floats and insets as words.
+ while (cur.pos() != cur.lastpos() && !cur.paragraph().isLetter(cur.pos()))
+ ++cur.pos();
+ // Advance through word.
+ while (cur.pos() != cur.lastpos() && cur.paragraph().isLetter(cur.pos()))
+ ++cur.pos();
+ }
+ setCursor(cur, cur.pit(), cur.pos());
}
-// Skip initial whitespace at end of word and move cursor to *start*
-// of prior word, not to end of next prior word.
-void LyXText::cursorLeftOneWord()
+void LyXText::cursorLeftOneWord(LCursor & cur)
{
- CursorSlice tmpcursor = cursor();
- cursorLeftOneWord(tmpcursor);
- setCursor(getPar(tmpcursor), tmpcursor.pos());
+ BOOST_ASSERT(this == cur.text());
+ if (cur.pos() == 0 && cur.pit() != 0) {
+ --cur.pit();
+ cur.pos() = cur.lastpos();
+ } else {
+ // Skip through initial nonword stuff.
+ // Treat floats and insets as words.
+ while (cur.pos() != 0 && !cur.paragraph().isLetter(cur.pos() - 1))
+ --cur.pos();
+ // Advance through word.
+ while (cur.pos() != 0 && cur.paragraph().isLetter(cur.pos() - 1))
+ --cur.pos();
+ }
+ setCursor(cur, cur.pit(), cur.pos());
}
-void LyXText::selectWord(word_location loc)
+void LyXText::selectWord(LCursor & cur, word_location loc)
{
- CursorSlice from = cursor();
- CursorSlice to = cursor();
+ BOOST_ASSERT(this == cur.text());
+ CursorSlice from = cur.top();
+ CursorSlice to = cur.top();
getWord(from, to, loc);
- if (cursor() != from)
- setCursor(from.par(), from.pos());
+ if (cur.top() != from)
+ setCursor(cur, from.pit(), from.pos());
if (to == from)
return;
- bv()->cursor().resetAnchor();
- setCursor(to.par(), to.pos());
- bv()->cursor().setSelection();
+ cur.resetAnchor();
+ setCursor(cur, to.pit(), to.pos());
+ cur.setSelection();
}
// Select the word currently under the cursor when no
// selection is currently set
-bool LyXText::selectWordWhenUnderCursor(word_location loc)
+bool LyXText::selectWordWhenUnderCursor(LCursor & cur, word_location loc)
{
- if (bv()->cursor().selection())
+ BOOST_ASSERT(this == cur.text());
+ if (cur.selection())
return false;
- selectWord(loc);
- return bv()->cursor().selection();
+ selectWord(cur, loc);
+ return cur.selection();
}
-void LyXText::acceptChange()
+void LyXText::acceptChange(LCursor & cur)
{
- LCursor & cur = bv()->cursor();
- if (!cur.selection() && cursorPar()->size())
+ BOOST_ASSERT(this == cur.text());
+ if (!cur.selection() && cur.lastpos() != 0)
return;
- if (cur.selBegin().par() == cur.par()) {
- CursorSlice const & startc = cur.selBegin();
- CursorSlice const & endc = cur.selEnd();
- recordUndo(cur, Undo::INSERT, cur.anchor().par());
- getPar(startc)->acceptChange(startc.pos(), endc.pos());
+ CursorSlice const & startc = cur.selBegin();
+ CursorSlice const & endc = cur.selEnd();
+ if (startc.pit() == endc.pit()) {
+ recordUndoSelection(cur, Undo::INSERT);
+ pars_[startc.pit()].acceptChange(startc.pos(), endc.pos());
finishUndo();
cur.clearSelection();
- redoParagraph(getPar(startc));
- setCursorIntern(startc.par(), 0);
+ setCursorIntern(cur, startc.pit(), 0);
}
+#ifdef WITH_WARNINGS
#warning handle multi par selection
+#endif
}
-void LyXText::rejectChange()
+void LyXText::rejectChange(LCursor & cur)
{
- LCursor & cur = bv()->cursor();
- if (!cur.selection() && cursorPar()->size())
+ BOOST_ASSERT(this == cur.text());
+ if (!cur.selection() && cur.lastpos() != 0)
return;
- if (cur.selBegin().par() == cur.selEnd().par()) {
- CursorSlice const & startc = cur.selBegin();
- CursorSlice const & endc = cur.selEnd();
- recordUndo(cur, Undo::INSERT, cur.anchor().par());
- getPar(startc)->rejectChange(startc.pos(), endc.pos());
+ CursorSlice const & startc = cur.selBegin();
+ CursorSlice const & endc = cur.selEnd();
+ if (startc.pit() == endc.pit()) {
+ recordUndoSelection(cur, Undo::INSERT);
+ pars_[startc.pit()].rejectChange(startc.pos(), endc.pos());
finishUndo();
cur.clearSelection();
- redoParagraph(getPar(startc));
- setCursorIntern(startc.par(), 0);
+ setCursorIntern(cur, startc.pit(), 0);
}
+#ifdef WITH_WARNINGS
#warning handle multi par selection
+#endif
}
// Delete from cursor up to the end of the current or next word.
-void LyXText::deleteWordForward()
+void LyXText::deleteWordForward(LCursor & cur)
{
- LCursor & cur = bv()->cursor();
- if (cursorPar()->empty())
- cursorRight(true);
+ BOOST_ASSERT(this == cur.text());
+ if (cur.lastpos() == 0)
+ cursorRight(cur);
else {
- CursorSlice tmpcursor = cursor();
- cur.selection() = true; // to avoid deletion
- cursorRightOneWord();
- setCursor(tmpcursor, tmpcursor.par(), tmpcursor.pos());
cur.resetAnchor();
- cursor() = tmpcursor;
+ cur.selection() = true;
+ cursorRightOneWord(cur);
cur.setSelection();
- cutSelection(true, false);
+ cutSelection(cur, true, false);
}
}
// Delete from cursor to start of current or prior word.
-void LyXText::deleteWordBackward()
+void LyXText::deleteWordBackward(LCursor & cur)
{
- LCursor & cur = bv()->cursor();
- if (cursorPar()->empty())
- cursorLeft(true);
+ BOOST_ASSERT(this == cur.text());
+ if (cur.lastpos() == 0)
+ cursorLeft(cur);
else {
- CursorSlice tmpcursor = cursor();
- cur.selection() = true; // to avoid deletion
- cursorLeftOneWord();
- setCursor(tmpcursor, tmpcursor.par(), tmpcursor.pos());
cur.resetAnchor();
- cursor() = tmpcursor;
+ cur.selection() = true;
+ cursorLeftOneWord(cur);
cur.setSelection();
- cutSelection(true, false);
+ cutSelection(cur, true, false);
}
}
// Kill to end of line.
-void LyXText::deleteLineForward()
+void LyXText::deleteLineForward(LCursor & cur)
{
- LCursor & cur = bv()->cursor();
- if (cursorPar()->empty()) {
+ BOOST_ASSERT(this == cur.text());
+ if (cur.lastpos() == 0) {
// Paragraph is empty, so we just go to the right
- cursorRight(true);
+ cursorRight(cur);
} else {
- CursorSlice tmpcursor = cursor();
- cur.selection() = true; // to avoid deletion
- cursorEnd();
- setCursor(tmpcursor, tmpcursor.par(), tmpcursor.pos());
cur.resetAnchor();
- cursor() = tmpcursor;
+ cur.selection() = true; // to avoid deletion
+ cursorEnd(cur);
cur.setSelection();
// What is this test for ??? (JMarc)
if (!cur.selection())
- deleteWordForward();
+ deleteWordForward(cur);
else
- cutSelection(true, false);
+ cutSelection(cur, true, false);
}
}
-void LyXText::changeCase(LyXText::TextCase action)
+void LyXText::changeCase(LCursor & cur, LyXText::TextCase action)
{
- LCursor & cur = bv()->cursor();
+ BOOST_ASSERT(this == cur.text());
CursorSlice from;
CursorSlice to;
from = cur.selBegin();
to = cur.selEnd();
} else {
- from = cursor();
+ from = cur.top();
getWord(from, to, lyx::PARTIAL_WORD);
- setCursor(to.par(), to.pos() + 1);
+ setCursor(cur, to.pit(), to.pos() + 1);
}
- recordUndo(cur, Undo::ATOMIC, cur.anchor().par());
+ recordUndoSelection(cur);
pos_type pos = from.pos();
- int par = from.par();
+ int par = from.pit();
- while (par != int(paragraphs().size()) &&
- (pos != to.pos() || par != to.par())) {
- ParagraphList::iterator pit = getPar(par);
- if (pos == pit->size()) {
+ while (par != int(pars_.size()) && (pos != to.pos() || par != to.pit())) {
+ pit_type pit = par;
+ if (pos == pars_[pit].size()) {
++par;
pos = 0;
continue;
}
- unsigned char c = pit->getChar(pos);
+ unsigned char c = pars_[pit].getChar(pos);
if (c != Paragraph::META_INSET) {
switch (action) {
case text_lowercase:
break;
}
}
+#ifdef WITH_WARNINGS
#warning changes
- pit->setChar(pos, c);
+#endif
+ pars_[pit].setChar(pos, c);
++pos;
}
}
-void LyXText::Delete()
+void LyXText::Delete(LCursor & cur)
{
- // this is a very easy implementation
- CursorSlice old_cursor = cursor();
-
- // just move to the right
- cursorRight(true);
-
- // if you had success make a backspace
- if (old_cursor.par() != cursor().par()
- || old_cursor.pos() != cursor().pos()) {
- recordUndo(bv()->cursor(), Undo::DELETE, old_cursor.par());
- backspace();
+ BOOST_ASSERT(this == cur.text());
+ if (cur.pos() != cur.lastpos()) {
+ 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?
}
-void LyXText::backspace()
+void LyXText::backspace(LCursor & cur)
{
- // Get the font that is used to calculate the baselineskip
- ParagraphList::iterator pit = cursorPar();
- pos_type lastpos = pit->size();
-
- if (cursor().pos() == 0) {
+ BOOST_ASSERT(this == cur.text());
+ if (cur.pos() == 0) {
// The cursor is at the beginning of a paragraph, so
// the the backspace will collapse two paragraphs into
// one.
// but it's not allowed unless it's new
- if (pit->isChangeEdited(0, pit->size()))
+ Paragraph & par = cur.paragraph();
+ if (par.isChangeEdited(0, par.size()))
return;
// we may paste some paragraphs
// is it an empty paragraph?
- if (lastpos == 0 || (lastpos == 1 && pit->isSeparator(0))) {
+ pos_type lastpos = cur.lastpos();
+ if (lastpos == 0 || (lastpos == 1 && par.isSeparator(0))) {
// This is an empty paragraph and we delete it just
// by moving the cursor one step
// left and let the DeleteEmptyParagraphMechanism
// handle the actual deletion of the paragraph.
- if (cursor().par()) {
- cursorLeft(bv());
- // the layout things can change the height of a row !
- redoParagraph();
+ if (cur.pit() != 0) {
+ cursorLeft(cur);
return;
}
}
- if (cursor().par() != 0)
- recordUndo(bv()->cursor(), Undo::DELETE, cursor().par() - 1);
+ if (cur.pit() != 0)
+ recordUndo(cur, Undo::DELETE, cur.pit() - 1);
- ParagraphList::iterator tmppit = cursorPar();
+ 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 (cursor().par() != 0) {
+ if (cur.pit() != 0) {
// steps into the above paragraph.
- setCursorIntern(cursor().par() - 1,
- getPar(cursor().par() - 1)->size(),
+ setCursorIntern(cur, cur.pit() - 1,
+ pars_[cur.pit() - 1].size(),
false);
}
// layout. I think it is a real bug of all other
// word processors to allow it. It confuses the user.
// Correction: Pasting is always allowed with standard-layout
- Buffer & buf = *bv()->buffer();
+ Buffer & buf = cur.buffer();
BufferParams const & bufparams = buf.params();
LyXTextClass const & tclass = bufparams.getLyXTextClass();
- ParagraphList::iterator const cpit = cursorPar();
+ pit_type const cpit = cur.pit();
if (cpit != tmppit
- && (cpit->layout() == tmppit->layout()
- || tmppit->layout() == tclass.defaultLayout())
- && cpit->getAlign() == tmppit->getAlign()) {
- mergeParagraph(bufparams, buf.paragraphs(), cpit);
+ && (pars_[cpit].layout() == pars_[tmppit].layout()
+ || pars_[tmppit].layout() == tclass.defaultLayout())
+ && pars_[cpit].getAlign() == pars_[tmppit].getAlign()) {
+ mergeParagraph(bufparams, pars_, cpit);
- if (cursor().pos() && cpit->isSeparator(cursor().pos() - 1))
- cursor().pos(cursor().pos() - 1);
+ if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1))
+ --cur.pos();
// the counters may have changed
updateCounters();
- setCursor(cursor().par(), cursor().pos(), false);
+ setCursor(cur, cur.pit(), cur.pos(), false);
}
} else {
// this is the code for a normal backspace, not pasting
// any paragraphs
- recordUndo(bv()->cursor(), Undo::DELETE);
+ recordUndo(cur, Undo::DELETE);
// 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)
- setCursorIntern(cursor().par(), cursor().pos() - 1,
- false, cursor().boundary());
- cursorPar()->erase(cursor().pos());
+ setCursorIntern(cur, cur.pit(), cur.pos() - 1,
+ false, cur.boundary());
+ cur.paragraph().erase(cur.pos());
}
- lastpos = cursorPar()->size();
- if (cursor().pos() == lastpos)
- setCurrentFont();
+ if (cur.pos() == cur.lastpos())
+ setCurrentFont(cur);
- redoParagraph();
- setCursor(cursor().par(), cursor().pos(), false, cursor().boundary());
+ setCursor(cur, cur.pit(), cur.pos(), false, cur.boundary());
}
-ParagraphList::iterator LyXText::cursorPar() const
-{
- //lyxerr << "### cursorPar: cursor: " << bv()->cursor() << endl;
- //lyxerr << "xxx cursorPar: cursor: " << cursor() << endl;
- return getPar(cursor().par());
-}
-
-
-RowList::iterator LyXText::cursorRow() const
-{
- return cursorPar()->getRow(cursor().pos());
-}
-
-
-ParagraphList::iterator LyXText::getPar(CursorSlice const & cur) const
-{
- return getPar(cur.par());
-}
-
-
-ParagraphList::iterator LyXText::getPar(int par) const
+Paragraph & LyXText::getPar(pit_type par) const
{
//lyxerr << "getPar: " << par << " from " << paragraphs().size() << endl;
BOOST_ASSERT(par >= 0);
BOOST_ASSERT(par < int(paragraphs().size()));
- ParagraphList::iterator pit = paragraphs().begin();
- advance(pit, par);
- return pit;
-}
-
-
-// y is relative to this LyXText's top
-RowList::iterator
-LyXText::getRowNearY(int y, ParagraphList::iterator & pit) const
-{
- BOOST_ASSERT(!paragraphs().empty());
- BOOST_ASSERT(!paragraphs().begin()->rows.empty());
-#if 1
- ParagraphList::iterator const
- pend = boost::prior(paragraphs().end());
- pit = paragraphs().begin();
- while (int(pit->y + pit->height) < y && pit != pend)
- ++pit;
-
- RowList::iterator rit = pit->rows.end();
- RowList::iterator const rbegin = pit->rows.begin();
- do {
- --rit;
- } while (rit != rbegin && int(pit->y + rit->y_offset()) > y);
-
- return rit;
-#else
- pit = boost::prior(paragraphs().end());
-
- RowList::iterator rit = lastRow();
- RowList::iterator rbegin = firstRow();
-
- while (rit != rbegin && int(pit->y + rit->y_offset()) > y)
- previousRow(pit, rit);
-
- return rit;
-#endif
-}
-
-
-int LyXText::getDepth() const
-{
- return cursorPar()->getDepth();
+ return paragraphs()[par];
}
-RowList::iterator LyXText::firstRow() const
+Row const & LyXText::firstRow() const
{
- return paragraphs().front().rows.begin();
+ return *paragraphs().front().rows().begin();
}
-RowList::iterator LyXText::lastRow() const
-{
- return boost::prior(endRow());
-}
-
-
-RowList::iterator LyXText::endRow() const
-{
- return paragraphs().back().rows.end();
-}
-
-
-void LyXText::nextRow(ParagraphList::iterator & pit,
- RowList::iterator & rit) const
-{
- ++rit;
- if (rit == pit->rows.end()) {
- ++pit;
- if (pit == paragraphs().end())
- --pit;
- else
- rit = pit->rows.begin();
- }
-}
-
-
-void LyXText::previousRow(ParagraphList::iterator & pit,
- RowList::iterator & rit) const
-{
- if (rit != pit->rows.begin())
- --rit;
- else {
- BOOST_ASSERT(pit != paragraphs().begin());
- --pit;
- rit = boost::prior(pit->rows.end());
- }
-}
-
-
-int LyXText::parOffset(ParagraphList::iterator pit) const
-{
- return distance(paragraphs().begin(), pit);
-}
-
-
-void LyXText::redoParagraphInternal(ParagraphList::iterator pit)
+void LyXText::redoParagraph(pit_type const pit)
{
// remove rows of paragraph, keep track of height changes
- height -= pit->height;
-
- // clear old data
- pit->rows.clear();
- pit->height = 0;
- pit->width = 0;
+ Paragraph & par = pars_[pit];
// redo insets
- InsetList::iterator ii = pit->insetlist.begin();
- InsetList::iterator iend = pit->insetlist.end();
+ InsetList::iterator ii = par.insetlist.begin();
+ InsetList::iterator iend = par.insetlist.end();
for (; ii != iend; ++ii) {
Dimension dim;
- int const w = textWidth() - leftMargin(pit) - rightMargin(*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
- pit->setBeginOfBody();
+ par.rows().clear();
+ Dimension dim;
+
+ par.setBeginOfBody();
pos_type z = 0;
do {
Row row(z);
rowBreakPoint(pit, row);
- z = row.endpos();
- fill(pit, row, textwidth_);
- prepareToPrint(pit, row);
+ setRowWidth(pit, row);
setHeightOfRow(pit, row);
- row.y_offset(pit->height);
- pit->rows.push_back(row);
- pit->width = std::max(pit->width, row.width());
- pit->height += row.height();
- } while (z < pit->size());
-
- height += pit->height;
- //lyxerr << "redoParagraph: " << pit->rows.size() << " rows\n";
-}
-
-
-void LyXText::redoParagraphs(ParagraphList::iterator pit,
- ParagraphList::iterator end)
-{
- for ( ; pit != end; ++pit)
- redoParagraphInternal(pit);
- updateParPositions();
-}
-
-
-void LyXText::redoParagraph(ParagraphList::iterator pit)
-{
- redoParagraphInternal(pit);
- updateParPositions();
-}
-
+ par.rows().push_back(row);
+ dim.wid = std::max(dim.wid, row.width());
+ dim.des += row.height();
+ z = row.endpos();
+ } while (z < par.size());
-void LyXText::fullRebreak()
-{
- redoParagraphs(paragraphs().begin(), paragraphs().end());
- bv()->cursor().resetAnchor();
+ dim.asc += par.rows()[0].ascent();
+ dim.des -= par.rows()[0].ascent();
+ par.dim_ = dim;
+ //lyxerr << "redoParagraph: " << par.rows().size() << " rows\n";
}
{
//BOOST_ASSERT(mi.base.textwidth);
if (mi.base.textwidth)
- textwidth_ = mi.base.textwidth;
+ maxwidth_ = 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.
- redoParagraphs(paragraphs().begin(), paragraphs().end());
+ // << " maxWidth: " << maxwidth_ << "\nfont: " << mi.base.font << endl;
+
+ 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, x, y);
}
+/*
// only used for inset right now. should also be used for main text
-void LyXText::drawSelection(PainterInfo & pi, int x, int y) 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;
-bool LyXText::isLastRow(ParagraphList::iterator pit, Row const & row) const
-{
- return row.endpos() >= pit->size()
- && boost::next(pit) == paragraphs().end();
-}
+ // is there a better way of getting these two iterators?
+ DocIterator beg = cur;
+ DocIterator end = cur;
+ beg.top() = cur.selBegin();
+ end.top() = cur.selEnd();
-bool LyXText::isFirstRow(ParagraphList::iterator pit, Row const & row) const
-{
- return row.pos() == 0 && pit == paragraphs().begin();
-}
+ // 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()];
-void LyXText::cursorLeftOneWord(CursorSlice & cur)
-{
- // treat HFills, floats and Insets as words
-
- ParagraphList::iterator pit = cursorPar();
- size_t pos = cur.pos();
-
- while (pos &&
- (pit->isSeparator(pos - 1) ||
- pit->isKomma(pos - 1) ||
- pit->isNewline(pos - 1)) &&
- !(pit->isHfill(pos - 1) ||
- pit->isInset(pos - 1)))
- --pos;
-
- if (pos &&
- (pit->isInset(pos - 1) ||
- pit->isHfill(pos - 1))) {
- --pos;
- } else if (!pos) {
- if (pit != paragraphs().begin()) {
- --pit;
- pos = pit->size();
- }
- } else { // Here, cur != 0
- while (pos > 0 && pit->isWord(pos - 1))
- --pos;
+ 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());
+ x1 = isRTL(par1) ? startx : 0;
+ x2 = isRTL(par1) ? 0 + dim_.wid : startx;
}
- cur.par(parOffset(pit));
- cur.pos(pos);
+ 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());
+ 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);
}
+*/
-void LyXText::cursorRightOneWord(CursorSlice & cur)
+void LyXText::drawSelection(PainterInfo & pi, int x, int) const
{
- // treat floats, HFills and Insets as words
- ParagraphList::iterator pit = cursorPar();
- pos_type pos = cur.pos();
+ LCursor & cur = pi.base.bv->cursor();
+ if (!cur.selection())
+ return;
+ if (!ptr_cmp(cur.text(), this))
+ return;
+
+ lyxerr << "draw selection at " << x << endl;
- if (pos == pit->size() &&
- boost::next(pit) != paragraphs().end()) {
- ++pit;
- pos = 0;
+ // 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 {
- // Skip through initial nonword stuff.
- while (pos < pit->size() && !pit->isWord(pos)) {
- ++pos;
- }
- // Advance through word.
- while (pos < pit->size() && pit->isWord(pos)) {
- ++pos;
- }
+ Row const & row1 = par1.getRow(beg.pos());
+ y1 = bv_funcs::getPos(beg).y_ - row1.ascent();
+ y2 = y1 + row1.height();
+ int const startx = cursorX(beg.top());
+ 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).y_ - row2.ascent();
+ Y2 = Y1 + row2.height();
+ int const endx = cursorX(end.top());
+ X1 = !isRTL(par2) ? 0 : endx;
+ X2 = !isRTL(par2) ? endx : 0 + dim_.wid;
}
- cur.par(parOffset(pit));
- cur.pos(pos);
+ 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 == pit_type(paragraphs().size());
+}
+
+
+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)
+void LyXText::getWord(CursorSlice & from, CursorSlice & to,
+ word_location const loc)
{
- ParagraphList::iterator from_par = getPar(from);
+ 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->isSeparator(from.pos())
- || from_par->isKomma(from.pos())
- || from_par->isNewline(from.pos())
- || from_par->isSeparator(from.pos() - 1)
- || from_par->isKomma(from.pos() - 1)
- || from_par->isNewline(from.pos() - 1)) {
+ if (from.pos() == 0 || from.pos() == from_par.size()
+ || !from_par.isLetter(from.pos())
+ || !from_par.isLetter(from.pos() - 1)) {
to = from;
return;
}
// no break here, we go to the next
case lyx::WHOLE_WORD:
- // Move cursor to the beginning, when not already there.
- if (from.pos() && !from_par->isSeparator(from.pos() - 1)
- && !(from_par->isKomma(from.pos() - 1)
- || from_par->isNewline(from.pos() - 1)))
- cursorLeftOneWord(from);
- break;
+ // If we are already at the beginning of a word, do nothing
+ 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
- cursorLeftOneWord(from);
+ while (from.pos() && from_par.isLetter(from.pos() - 1))
+ --from.pos();
break;
case lyx::NEXT_WORD:
lyxerr << "LyXText::getWord: NEXT_WORD not implemented yet"
<< endl;
break;
case lyx::PARTIAL_WORD:
+ // no need to move the 'from' cursor
break;
}
to = from;
- ParagraphList::iterator to_par = getPar(to);
- while (to.pos() < to_par->size()
- && !to_par->isSeparator(to.pos())
- && !to_par->isKomma(to.pos())
- && !to_par->isNewline(to.pos())
- && !to_par->isHfill(to.pos())
- && !to_par->isInset(to.pos()))
- {
- to.pos(to.pos() + 1);
- }
+ 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;
- ParagraphList::iterator pit = paragraphs().begin();
Paragraph::depth_type depth = 0;
while (lex.isOK()) {
lex.nextToken();
- string token = lex.getString();
+ string const token = lex.getString();
if (token.empty())
continue;
- if (in_inset_) {
-
- if (token == "\\end_inset") {
- the_end_read = true;
- break;
- }
-
- if (token == "\\end_document") {
- lex.printError("\\end_document read in inset! Error in document!");
- return false;
- }
-
- } else {
+ if (token == "\\end_inset") {
+ break;
+ }
- if (token == "\\end_document") {
- the_end_read = true;
- continue;
- }
+ if (token == "\\end_body") {
+ continue;
+ }
+ if (token == "\\begin_body") {
+ continue;
}
- // FIXME: ugly.
- int unknown = 0;
+ if (token == "\\end_document") {
+ return false;
+ }
if (token == "\\begin_layout") {
lex.pushToken(token);
par.params().depth(depth);
if (buf.params().tracking_changes)
par.trackChanges();
- LyXFont f(LyXFont::ALL_INHERIT, buf.params().language);
- par.setFont(0, f);
-
- // insert after
- if (pit != paragraphs().end())
- ++pit;
-
- pit = paragraphs().insert(pit, par);
+ par.setFont(0, LyXFont(LyXFont::ALL_INHERIT, buf.params().language));
+ pars_.push_back(par);
// FIXME: goddamn InsetTabular makes us pass a Buffer
// not BufferParams
- ::readParagraph(buf, *pit, lex);
+ ::readParagraph(buf, pars_.back(), lex);
} else if (token == "\\begin_deeper") {
++depth;
--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
{
- ParagraphList::iterator pit = getPar(cur);
- if (pit->rows.empty())
- return xo_;
- Row const & row = *pit->getRow(cur.pos());
- pos_type pos = cur.pos();
- pos_type cursor_vpos = 0;
- double x = row.x();
- double fill_separator = row.fill_separator();
- double fill_hfill = row.fill_hfill();
- double fill_label_hfill = row.fill_label_hfill();
+ pit_type const pit = cur.pit();
+ Paragraph const & par = pars_[pit];
+ if (par.rows().empty())
+ return 0;
+
+ Row const & row = par.getRow(cur.pos());
+
+ pos_type pos = cur.pos();
+ pos_type cursor_vpos = 0;
+
+ RowMetrics const m = computeRowMetrics(pit, row);
+ double x = m.x;
+
pos_type const row_pos = row.pos();
pos_type const end = row.endpos();
if (end <= row_pos)
cursor_vpos = row_pos;
else if (pos >= end)
- cursor_vpos = (pit->isRightToLeftPar(bv()->buffer()->params()))
- ? 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 = pit->beginOfBody();
+ pos_type body_pos = par.beginOfBody();
if (body_pos > 0 &&
- (body_pos > end || !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 += fill_label_hfill
- + font_metrics::width(pit->layout()->labelsep,
- getLabelFont(pit));
- if (pit->isLineSeparator(body_pos - 1))
- x -= singleWidth(pit, body_pos - 1);
+ x += m.label_hfill
+ + font_metrics::width(par.layout()->labelsep,
+ getLabelFont(par));
+ if (par.isLineSeparator(body_pos - 1))
+ x -= singleWidth(par, body_pos - 1);
}
- if (hfillExpansion(*pit, row, pos)) {
- x += singleWidth(pit, pos);
+ if (hfillExpansion(par, row, pos)) {
+ x += singleWidth(par, pos);
if (pos >= body_pos)
- x += fill_hfill;
+ x += m.hfill;
else
- x += fill_label_hfill;
- } else if (pit->isSeparator(pos)) {
- x += singleWidth(pit, pos);
+ x += m.label_hfill;
+ } else if (par.isSeparator(pos)) {
+ x += singleWidth(par, pos);
if (pos >= body_pos)
- x += fill_separator;
+ x += m.separator;
} else
- x += singleWidth(pit, pos);
+ x += singleWidth(par, pos);
}
- return xo_ + int(x);
+ return int(x);
}
int LyXText::cursorY(CursorSlice const & cur) const
{
- Paragraph & par = *getPar(cur);
- Row & row = *par.getRow(cur.pos());
- return yo_ + par.y + row.y_offset() + row.baseline();
+ Paragraph const & par = getPar(cur.pit());
+ int h = 0;
+ h -= pars_[0].rows()[0].ascent();
+ for (pit_type pit = 0; pit < cur.pit(); ++pit)
+ h += pars_[pit].height();
+ for (size_t rit = 0, rend = par.pos2row(cur.pos()); rit != rend; ++rit)
+ h += par.rows()[rit].height();
+ h += par.rows()[par.pos2row(cur.pos())].ascent();
+ return h;
+}
+
+
+// Returns the current font and depth as a message.
+string LyXText::currentState(LCursor & cur)
+{
+ BOOST_ASSERT(this == cur.text());
+ Buffer & buf = cur.buffer();
+ Paragraph const & par = cur.paragraph();
+ std::ostringstream os;
+
+ bool const show_change = buf.params().tracking_changes
+ && cur.pos() != cur.lastpos()
+ && par.lookupChange(cur.pos()) != Change::UNCHANGED;
+
+ if (show_change) {
+ Change change = par.lookupChangeFull(cur.pos());
+ Author const & a = buf.params().authors().get(change.author);
+ os << _("Change: ") << a.name();
+ if (!a.email().empty())
+ os << " (" << a.email() << ")";
+ if (change.changetime)
+ os << _(" at ") << ctime(&change.changetime);
+ os << " : ";
+ }
+
+ // I think we should only show changes from the default
+ // font. (Asger)
+ LyXFont font = real_current_font;
+ font.reduce(buf.params().getLyXTextClass().defaultfont());
+
+ // avoid _(...) re-entrance problem
+ string const s = font.stateText(&buf.params());
+ os << bformat(_("Font: %1$s"), s);
+
+ // os << bformat(_("Font: %1$s"), font.stateText(&buf.params));
+
+ // The paragraph depth
+ int depth = cur.paragraph().getDepth();
+ if (depth > 0)
+ os << bformat(_(", Depth: %1$d"), depth);
+
+ // The paragraph spacing, but only if different from
+ // buffer spacing.
+ Spacing const & spacing = par.params().spacing();
+ if (!spacing.isDefault()) {
+ os << _(", Spacing: ");
+ switch (spacing.getSpace()) {
+ case Spacing::Single:
+ os << _("Single");
+ break;
+ case Spacing::Onehalf:
+ os << _("OneHalf");
+ break;
+ case Spacing::Double:
+ os << _("Double");
+ break;
+ case Spacing::Other:
+ os << _("Other (") << spacing.getValueAsString() << ')';
+ break;
+ case Spacing::Default:
+ // should never happen, do nothing
+ break;
+ }
+ }
+
+#ifdef DEVEL_VERSION
+ os << _(", Inset: ") << &cur.inset();
+ 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());
+#endif
+ return os.str();
}
-CursorSlice & LyXText::cursor()
+string LyXText::getPossibleLabel(LCursor & cur) const
{
- //lyxerr << "# accessing slice " << findText(this) << endl;
- if (this != bv()->cursor().text()) {
- lyxerr << "cursor: " << bv()->cursor()
- << "\ntext: " << bv()->cursor().text()
- << "\nthis: " << this << endl;
- BOOST_ASSERT(false);
+ pit_type pit = cur.pit();
+
+ LyXLayout_ptr layout = pars_[pit].layout();
+
+ if (layout->latextype == LATEX_PARAGRAPH && pit != 0) {
+ LyXLayout_ptr const & layout2 = pars_[pit - 1].layout();
+ if (layout2->latextype != LATEX_PARAGRAPH) {
+ --pit;
+ layout = layout2;
+ }
}
- return bv()->cursor().current();
+
+ string text = layout->latexname().substr(0, 3);
+ if (layout->latexname() == "theorem")
+ text = "thm"; // Create a correct prefix for prettyref
+
+ text += ':';
+ if (layout->latextype == LATEX_PARAGRAPH || lyxrc.label_init_length < 0)
+ text.erase();
+
+ string par_text = pars_[pit].asString(cur.buffer(), false);
+ for (int i = 0; i < lyxrc.label_init_length; ++i) {
+ if (par_text.empty())
+ break;
+ string head;
+ par_text = split(par_text, head, ' ');
+ // Is it legal to use spaces in labels ?
+ if (i > 0)
+ text += '-';
+ text += head;
+ }
+
+ return text;
+}
+
+
+//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
+{
+ bool bound = false;
+ Row const & r = pars_[pit].rows()[row];
+ return r.pos() + getColumnNearX(pit, r, x, bound);
}
-CursorSlice const & LyXText::cursor() const
+//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();
+//}
+
+
+// x,y are screen coordinates
+// sets cursor only within this LyXText
+void LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
{
- if (this != bv()->cursor().text()) {
- lyxerr << "cursor: " << bv()->cursor()
- << "\ntext: " << bv()->cursor().text()
- << "\nthis: " << this << endl;
- BOOST_ASSERT(false);
+ pit_type pit = getPitNearY(y);
+ int yy = theCoords.get(this, pit).y_ - pars_[pit].ascent();
+ lyxerr << "setCursorFromCoordinates: 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();
}
- return bv()->cursor().current();
+
+ Row const & row = par.rows()[r];
+
+ lyxerr << "setCursorFromCoordinates: row " << r
+ << " from pos: " << row.pos() << endl;
+
+ bool bound = false;
+ int xx = x;
+ pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound);
+ setCursor(cur, pit, pos, true, bound);
}
projects / lyx.git / blobdiff