/**
- * \file text.C
+ * \file src/text.C
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
#include "lyxtext.h"
+#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 "encoding.h"
+#include "errorlist.h"
#include "funcrequest.h"
+#include "factory.h"
+#include "FontIterator.h"
#include "gettext.h"
#include "language.h"
+#include "LColor.h"
#include "lyxlength.h"
+#include "lyxlex.h"
#include "lyxrc.h"
#include "lyxrow.h"
#include "lyxrow_funcs.h"
+#include "metricsinfo.h"
+#include "paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "rowpainter.h"
-#include "text_funcs.h"
-#include "undo_funcs.h"
+#include "undo.h"
#include "vspace.h"
#include "WordLangTuple.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"
-using bv_funcs::number;
+#include <boost/current_function.hpp>
+#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;
-/// top, right, bottom pixel margin
-extern int const PAPER_MARGIN = 20;
-/// margin for changebar
-extern int const CHANGEBAR_MARGIN = 10;
-/// left margin
-extern int const LEFT_MARGIN = PAPER_MARGIN + CHANGEBAR_MARGIN;
-
-
-
-int bibitemMaxWidth(BufferView *, LyXFont const &);
-
+namespace {
-BufferView * LyXText::bv()
+int numberOfSeparators(Paragraph const & par, Row const & row)
{
- BOOST_ASSERT(bv_owner != 0);
- return bv_owner;
+ 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;
}
-BufferView * LyXText::bv() const
+int numberOfLabelHfills(Paragraph const & par, Row const & row)
{
- BOOST_ASSERT(bv_owner != 0);
- return bv_owner;
-}
+ 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;
+ }
-void LyXText::updateRowPositions()
-{
- ParagraphList::iterator pit = ownerParagraphs().begin();
- ParagraphList::iterator end = ownerParagraphs().end();
- for (height = 0; pit != end; ++pit) {
- RowList::iterator rit = pit->rows.begin();
- RowList::iterator rend = pit->rows.end();
- for ( ; rit != rend ; rit = ++rit) {
- rit->y(height);
- height += rit->height();
- }
+ last = min(last, par.beginOfBody());
+ int n = 0;
+ for (pos_type p = first; p < last; ++p) {
+ if (par.isHfill(p))
+ ++n;
}
+ return n;
}
-int LyXText::workWidth() const
+int numberOfHfills(Paragraph const & par, Row const & row)
{
- return inset_owner ? inset_owner->textWidth() : bv()->workWidth();
-}
+ pos_type const 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;
+ }
+ first = max(first, par.beginOfBody());
-int LyXText::getRealCursorX() const
-{
- int x = cursor.x();
- if (the_locking_inset && (the_locking_inset->getLyXText(bv())!= this))
- x = the_locking_inset->getLyXText(bv())->getRealCursorX();
- return x;
+ int n = 0;
+ for (pos_type p = first; p < last; ++p) {
+ if (par.isHfill(p))
+ ++n;
+ }
+ return n;
}
-#warning FIXME This function seems to belong outside of LyxText.
-unsigned char LyXText::transformChar(unsigned char c, Paragraph const & par,
- pos_type pos) const
+void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
+ string const & token, LyXFont & font, Change & change)
{
- if (!Encodings::is_arabic(c))
- if (lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 && IsDigit(c))
- return c + (0xb0 - '0');
- else
- return c;
+ BufferParams const & bp = buf.params();
- unsigned char const prev_char = pos > 0 ? par.getChar(pos - 1) : ' ';
- unsigned char next_char = ' ';
+ 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();
- pos_type const par_size = par.size();
+ font = LyXFont(LyXFont::ALL_INHERIT, bp.language);
+ change = Change();
- for (pos_type i = pos + 1; i < par_size; ++i) {
- unsigned char const par_char = par.getChar(i);
- if (!Encodings::IsComposeChar_arabic(par_char)) {
- next_char = par_char;
- break;
+ LyXTextClass const & tclass = bp.getLyXTextClass();
+
+ if (layoutname.empty()) {
+ layoutname = tclass.defaultLayoutName();
}
- }
- if (Encodings::is_arabic(next_char)) {
- if (Encodings::is_arabic(prev_char) &&
- !Encodings::is_arabic_special(prev_char))
- return Encodings::TransformChar(c, Encodings::FORM_MEDIAL);
+ bool hasLayout = tclass.hasLayout(layoutname);
+
+ if (!hasLayout) {
+ buf.error(ErrorItem(_("Unknown layout"),
+ bformat(_("Layout '%1$s' does not exist 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 << BOOST_CURRENT_FUNCTION
+ << ": Solitary \\end_layout in line "
+ << lex.getLineNo() << "\n"
+ << "Missing \\begin_layout?.\n";
+ } else if (token == "\\end_inset") {
+ 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);
+ 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
- return Encodings::TransformChar(c, Encodings::FORM_INITIAL);
+ 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 {
- if (Encodings::is_arabic(prev_char) &&
- !Encodings::is_arabic_special(prev_char))
- return Encodings::TransformChar(c, Encodings::FORM_FINAL);
- else
- return Encodings::TransformChar(c, Encodings::FORM_ISOLATED);
+ lex.eatLine();
+ buf.error(ErrorItem(_("Unknown token"),
+ bformat(_("Unknown token: %1$s %2$s\n"), token, lex.getString()),
+ par.id(), 0, par.size()));
}
}
-// This is the comments that some of the warnings below refers to.
-// There are some issues in this file and I don't think they are
-// really related to the FIX_DOUBLE_SPACE patch. I'd rather think that
-// this is a problem that has been here almost from day one and that a
-// larger userbase with differenct access patters triggers the bad
-// behaviour. (segfaults.) What I think happen is: In several places
-// we store the paragraph in the current cursor and then moves the
-// cursor. This movement of the cursor will delete paragraph at the
-// old position if it is now empty. This will make the temporary
-// pointer to the old cursor paragraph invalid and dangerous to use.
-// And is some cases this will trigger a segfault. I have marked some
-// of the cases where this happens with a warning, but I am sure there
-// are others in this file and in text2.C. There is also a note in
-// Delete() that you should read. In Delete I store the paragraph->id
-// instead of a pointer to the paragraph. I am pretty sure this faulty
-// use of temporary pointers to paragraphs that might have gotten
-// invalidated (through a cursor movement) before they are used, are
-// the cause of the strange crashes we get reported often.
-//
-// It is very tiresom to change this code, especially when it is as
-// hard to read as it is. Help to fix all the cases where this is done
-// would be greately appreciated.
-//
-// Lgb
-
-int LyXText::singleWidth(ParagraphList::iterator pit, pos_type pos) const
+
+void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
{
- if (pos >= pit->size())
- return 0;
+ lex.nextToken();
+ string token = lex.getString();
+ LyXFont font;
+ Change change;
- char const c = pit->getChar(pos);
- LyXFont const & font = getFont(pit, pos);
- return singleWidth(pit, pos, c, font);
-}
+ while (lex.isOK()) {
+ readParToken(buf, par, lex, token, font, change);
-int LyXText::singleWidth(ParagraphList::iterator pit,
- pos_type pos, char c, LyXFont const & font) const
-{
- if (pos >= pit->size()) {
- lyxerr << "in singleWidth(), pos: " << pos << endl;
- BOOST_ASSERT(false);
- return 0;
- }
+ lex.nextToken();
+ token = lex.getString();
+ if (token.empty())
+ continue;
- // The most common case is handled first (Asger)
- if (IsPrintable(c)) {
- 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 = transformChar(c, *pit, pos);
- } else if (font.language()->lang() == "hebrew" &&
- Encodings::IsComposeChar_hebrew(c))
- return 0;
+ if (token == "\\end_layout") {
+ //Ok, paragraph finished
+ break;
}
- return font_metrics::width(c, font);
- }
- if (c == Paragraph::META_INSET) {
- InsetOld * tmpinset = pit->getInset(pos);
- BOOST_ASSERT(tmpinset);
- if (tmpinset->lyxCode() == InsetOld::HFILL_CODE) {
- // Because of the representation as vertical lines
- return 3;
+ 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;
}
- return tmpinset->width();
}
-
- if (IsSeparatorChar(c))
- c = ' ';
- return font_metrics::width(c, font);
+ // Initialize begin_of_body_ on load; redoParagraph maintains
+ par.setBeginOfBody();
}
-lyx::pos_type LyXText::log2vis(lyx::pos_type pos) const
-{
- if (bidi_start == -1)
- return pos;
- else
- return log2vis_list[pos - bidi_start];
-}
+} // namespace anon
+
-lyx::pos_type LyXText::vis2log(lyx::pos_type pos) const
+BufferView * LyXText::bv() const
{
- if (bidi_start == -1)
- return pos;
- else
- return vis2log_list[pos - bidi_start];
+ BOOST_ASSERT(bv_owner != 0);
+ return bv_owner;
}
-lyx::pos_type LyXText::bidi_level(lyx::pos_type pos) const
+double LyXText::spacing(Paragraph const & par) const
{
- if (bidi_start == -1)
- return 0;
- else
- return bidi_levels[pos - bidi_start];
+ if (par.params().spacing().isDefault())
+ return bv()->buffer()->params().spacing().getValue();
+ return par.params().spacing().getValue();
}
-bool LyXText::bidi_InRange(lyx::pos_type pos) const
+int LyXText::width() const
{
- return bidi_start == -1 ||
- (bidi_start <= pos && pos <= bidi_end);
+ return dim_.wid;
}
-void LyXText::computeBidiTables(ParagraphList::iterator pit,
- Buffer const & buf, RowList::iterator row) const
+int LyXText::height() const
{
- bidi_same_direction = true;
- if (!lyxrc.rtl_support) {
- bidi_start = -1;
- return;
- }
-
- InsetOld * inset = pit->inInset();
- if (inset && inset->owner() &&
- inset->owner()->lyxCode() == InsetOld::ERT_CODE) {
- bidi_start = -1;
- return;
- }
-
- bidi_start = row->pos();
- bidi_end = lastPos(*pit, row);
-
- if (bidi_start > bidi_end) {
- bidi_start = -1;
- return;
- }
-
- if (bidi_end + 2 - bidi_start >
- static_cast<pos_type>(log2vis_list.size())) {
- pos_type new_size =
- (bidi_end + 2 - bidi_start < 500) ?
- 500 : 2 * (bidi_end + 2 - bidi_start);
- log2vis_list.resize(new_size);
- vis2log_list.resize(new_size);
- bidi_levels.resize(new_size);
- }
-
- vis2log_list[bidi_end + 1 - bidi_start] = -1;
- log2vis_list[bidi_end + 1 - bidi_start] = -1;
-
- BufferParams const & bufparams = buf.params();
- pos_type stack[2];
- bool const rtl_par =
- pit->isRightToLeftPar(bufparams);
- int level = 0;
- bool rtl = false;
- bool rtl0 = false;
- pos_type const body_pos = pit->beginningOfBody();
-
- for (pos_type lpos = bidi_start; lpos <= bidi_end; ++lpos) {
- bool is_space = pit->isLineSeparator(lpos);
- pos_type const pos =
- (is_space && lpos + 1 <= bidi_end &&
- !pit->isLineSeparator(lpos + 1) &&
- !pit->isNewline(lpos + 1))
- ? lpos + 1 : lpos;
- LyXFont font = pit->getFontSettings(bufparams, pos);
- if (pos != lpos && 0 < lpos && rtl0 && font.isRightToLeft() &&
- font.number() == LyXFont::ON &&
- pit->getFontSettings(bufparams, lpos - 1).number()
- == LyXFont::ON) {
- font = pit->getFontSettings(bufparams, lpos);
- is_space = false;
- }
-
-
- bool new_rtl = font.isVisibleRightToLeft();
- bool new_rtl0 = font.isRightToLeft();
- int new_level;
-
- if (lpos == body_pos - 1
- && row->pos() < body_pos - 1
- && is_space) {
- new_level = (rtl_par) ? 1 : 0;
- new_rtl = new_rtl0 = rtl_par;
- } else if (new_rtl0)
- new_level = (new_rtl) ? 1 : 2;
- else
- new_level = (rtl_par) ? 2 : 0;
-
- if (is_space && new_level >= level) {
- new_level = level;
- new_rtl = rtl;
- new_rtl0 = rtl0;
- }
-
- int new_level2 = new_level;
-
- if (level == new_level && rtl0 != new_rtl0) {
- --new_level2;
- log2vis_list[lpos - bidi_start] = (rtl) ? 1 : -1;
- } else if (level < new_level) {
- log2vis_list[lpos - bidi_start] = (rtl) ? -1 : 1;
- if (new_level > rtl_par)
- bidi_same_direction = false;
- } else
- log2vis_list[lpos - bidi_start] = (new_rtl) ? -1 : 1;
- rtl = new_rtl;
- rtl0 = new_rtl0;
- bidi_levels[lpos - bidi_start] = new_level;
-
- while (level > new_level2) {
- pos_type old_lpos = stack[--level];
- int delta = lpos - old_lpos - 1;
- if (level % 2)
- delta = -delta;
- log2vis_list[lpos - bidi_start] += delta;
- log2vis_list[old_lpos - bidi_start] += delta;
- }
- while (level < new_level)
- stack[level++] = lpos;
- }
+ return dim_.height();
+}
- while (level > 0) {
- pos_type const old_lpos = stack[--level];
- int delta = bidi_end - old_lpos;
- if (level % 2)
- delta = -delta;
- log2vis_list[old_lpos - bidi_start] += delta;
- }
- pos_type vpos = bidi_start - 1;
- for (pos_type lpos = bidi_start;
- lpos <= bidi_end; ++lpos) {
- vpos += log2vis_list[lpos - bidi_start];
- vis2log_list[vpos - bidi_start] = lpos;
- log2vis_list[lpos - bidi_start] = vpos;
- }
+int LyXText::singleWidth(Paragraph const & par, pos_type pos) const
+{
+ return singleWidth(par, pos, par.getChar(pos), getFont(par, pos));
}
-// This method requires a previous call to ComputeBidiTables()
-bool LyXText::isBoundary(Buffer const & buf, Paragraph const & par,
- pos_type pos) const
+int LyXText::singleWidth(Paragraph const & par,
+ pos_type pos, char c, LyXFont const & font) const
{
- if (!lyxrc.rtl_support || pos == 0)
- return false;
-
- if (!bidi_InRange(pos - 1)) {
- /// This can happen if pos is the first char of a row.
- /// Returning false in this case is incorrect!
- return false;
+ // The most common case is handled first (Asger)
+ if (IsPrintable(c)) {
+ Language const * language = font.language();
+ if (language->RightToLeft()) {
+ if ((lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 ||
+ lyxrc.font_norm_type == LyXRC::ISO_10646_1)
+ && language->lang() == "arabic") {
+ if (Encodings::IsComposeChar_arabic(c))
+ return 0;
+ c = par.transformChar(c, pos);
+ } else if (language->lang() == "hebrew" &&
+ Encodings::IsComposeChar_hebrew(c))
+ return 0;
+ }
+ return font_metrics::width(c, font);
}
- bool const rtl = bidi_level(pos - 1) % 2;
- bool const rtl2 = bidi_InRange(pos)
- ? bidi_level(pos) % 2
- : par.isRightToLeftPar(buf.params());
- return rtl != rtl2;
+ if (c == Paragraph::META_INSET)
+ return par.getInset(pos)->width();
+
+ return font_metrics::width(c, font);
}
-bool LyXText::isBoundary(Buffer const & buf, Paragraph const & par,
- pos_type pos, LyXFont const & font) const
+int LyXText::leftMargin(pit_type pit) const
{
- if (!lyxrc.rtl_support)
- return false; // This is just for speedup
-
- bool const rtl = font.isVisibleRightToLeft();
- bool const rtl2 = bidi_InRange(pos)
- ? bidi_level(pos) % 2
- : par.isRightToLeftPar(buf.params());
- return rtl != rtl2;
+ BOOST_ASSERT(pit >= 0);
+ BOOST_ASSERT(pit < int(pars_.size()));
+ return leftMargin(pit, pars_[pit].size());
}
-int LyXText::leftMargin(ParagraphList::iterator pit, Row const & row) 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 = LEFT_MARGIN;
-
- x += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
-
- // this is the way, LyX handles the LaTeX-Environments.
- // I have had this idea very late, so it seems to be a
- // later added hack and this is true
- if (!pit->getDepth()) {
- if (pit->layout() == tclass.defaultLayout()) {
- // find the previous same level paragraph
- if (pit != ownerParagraphs().begin()) {
- ParagraphList::iterator newpit =
- depthHook(pit, ownerParagraphs(),
- pit->getDepth());
- if (newpit == pit &&
- newpit->layout()->nextnoindent)
- parindent.erase();
- }
- }
- } else {
- // find the next level paragraph
-
- ParagraphList::iterator newpar = outerHook(pit,
- ownerParagraphs());
+ int l_margin = 0;
- // make a corresponding row. Needed to call leftMargin()
+ if (isMainText())
+ l_margin += changebarMargin();
- // check wether it is a sufficent paragraph
- if (newpar != ownerParagraphs().end() &&
- newpar->layout()->isEnvironment()) {
- x = leftMargin(newpar, Row(newpar->size()));
- }
+ l_margin += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
- if (newpar != ownerParagraphs().end() &&
- pit->layout() == tclass.defaultLayout()) {
- if (newpar->params().noindent())
- parindent.erase();
- else {
- parindent = newpar->layout()->parindent;
+ 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;
}
-
}
}
- LyXFont const labelfont = getLabelFont(pit);
+ // This happens after sections in standard classes. The 1.3.x
+ // code compared depths too, but it does not seem necessary
+ // (JMarc)
+ if (par.layout() == tclass.defaultLayout()
+ && pit > 0 && pars_[pit - 1].layout()->nextnoindent)
+ parindent.erase();
+
+ LyXFont const labelfont = getLabelFont(par);
switch (layout->margintype) {
case MARGIN_DYNAMIC:
- if (!layout->leftmargin.empty()) {
- x += font_metrics::signedWidth(layout->leftmargin,
+ if (!layout->leftmargin.empty())
+ 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() && row.pos() >= pit->beginningOfBody()) {
- 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 (row.pos() >= pit->beginningOfBody()) {
- 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 (row.pos()
+ } else if (pos != 0
// Special case to fix problems with
// theorems (JMarc)
|| (layout->labeltype == LABEL_STATIC
&& layout->latextype == LATEX_ENVIRONMENT
- && !isFirstInSequence(pit, ownerParagraphs()))) {
- 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;
- case MARGIN_RIGHT_ADDRESS_BOX:
- {
+ case MARGIN_RIGHT_ADDRESS_BOX: {
+#if 0
// ok, a terrible hack. The left margin depends on the widest
- // row in this paragraph. Do not care about footnotes, they
- // are *NOT* allowed in the LaTeX realisation of this layout.
-
- // find the first row of this paragraph
- RowList::iterator rit = pit->rows.begin();
- RowList::iterator end = pit->rows.end();
- int minfill = rit->fill();
+ // row in this paragraph.
+ RowList::iterator rit = par.rows().begin();
+ RowList::iterator end = par.rows().end();
+#ifdef WITH_WARNINGS
+#warning This is wrong.
+#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.
+ l_margin += maxwidth_ / 2;
+ break;
}
- break;
}
- if (workWidth() > 0 && !pit->params().leftIndent().zero()) {
- LyXLength const len = pit->params().leftIndent();
- int const tw = inset_owner ?
- inset_owner->latexTextWidth(bv()) : workWidth();
- x += len.inPixels(tw);
- }
+ 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 (row.pos() == 0) {
- if ((layout->labeltype == LABEL_NO_LABEL
- || layout->labeltype == LABEL_TOP_ENVIRONMENT
- || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
- || (layout->labeltype == LABEL_STATIC
- && layout->latextype == LATEX_ENVIRONMENT
- && !isFirstInSequence(pit, ownerParagraphs())))
- && 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() ||
- bv()->buffer()->params().paragraph_separation ==
- BufferParams::PARSEP_INDENT)) {
- x += font_metrics::signedWidth(parindent,
- tclass.defaultfont());
- } else if (layout->labeltype == LABEL_BIBLIO) {
- // ale970405 Right width for bibitems
- x += bibitemMaxWidth(bv(), tclass.defaultfont());
- }
+ if (pos == 0
+ && (layout->labeltype == LABEL_NO_LABEL
+ || layout->labeltype == LABEL_TOP_ENVIRONMENT
+ || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
+ || (layout->labeltype == LABEL_STATIC
+ && layout->latextype == LATEX_ENVIRONMENT
+ && !isFirstInSequence(pit, pars_)))
+ && align == LYX_ALIGN_BLOCK
+ && !par.params().noindent()
+ // in some insets, paragraphs are never indented
+ && !(par.inInset() && par.inInset()->neverIndent())
+ // display style insets are always centered, omit indentation
+ && !(!par.empty()
+ && par.isInset(pos)
+ && par.getInset(pos)->display())
+ && (par.layout() != tclass.defaultLayout()
+ || bv()->buffer()->params().paragraph_separation ==
+ BufferParams::PARSEP_INDENT))
+ {
+ l_margin += font_metrics::signedWidth(parindent, tclass.defaultfont());
}
- return x;
+ return l_margin;
}
-int LyXText::rightMargin(ParagraphList::iterator pit,
- Buffer const & buf, Row const &) const
+int LyXText::rightMargin(Paragraph const & par) const
{
- LyXTextClass const & tclass = buf.params().getLyXTextClass();
- LyXLayout_ptr const & layout = pit->layout();
+ // We do not want rightmargins on inner texts.
+ if (bv()->text() != this)
+ return 0;
- return PAPER_MARGIN
+ LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
+ int const r_margin =
+ ::rightMargin()
+ font_metrics::signedWidth(tclass.rightmargin(),
- tclass.defaultfont());
- + font_metrics::signedWidth(layout->rightmargin,
- tclass.defaultfont())
- * 4 / (pit->getDepth() + 4);
+ tclass.defaultfont())
+ + font_metrics::signedWidth(par.layout()->rightmargin,
+ tclass.defaultfont())
+ * 4 / (par.getDepth() + 4);
+
+ return r_margin;
}
-int LyXText::labelEnd(ParagraphList::iterator pit, Row const & row) const
+int LyXText::labelEnd(pit_type const pit) const
{
- if (pit->layout()->margintype == MARGIN_MANUAL) {
- Row tmprow = row;
- tmprow.pos(pit->size());
- // return the beginning of the body
- return leftMargin(pit, tmprow);
- }
-
- // LabelEnd is only needed if the layout
- // fills a flushleft label.
- return 0;
+ // labelEnd is only needed if the layout fills a flushleft label.
+ if (pars_[pit].layout()->margintype != MARGIN_MANUAL)
+ return 0;
+ // return the beginning of the body
+ return leftMargin(pit);
}
// this needs special handling - only newlines count as a break point
pos_type addressBreakPoint(pos_type i, Paragraph const & par)
{
- for (; i < par.size(); ++i) {
+ pos_type const end = par.size();
+
+ for (; i < end; ++i)
if (par.isNewline(i))
- return i;
- }
+ return i + 1;
- return par.size();
+ return end;
}
};
-pos_type LyXText::rowBreakPoint(ParagraphList::iterator pit,
- Row const & row) const
+void LyXText::rowBreakPoint(pit_type const pit, Row & row) const
{
- // maximum pixel width of a row.
- int width = workWidth()
- - rightMargin(pit, *bv()->buffer(), row);
+ Paragraph const & par = pars_[pit];
+ pos_type const end = par.size();
+ pos_type const pos = row.pos();
+ if (pos == end) {
+ row.endpos(end);
+ return;
+ }
- // inset->textWidth() returns -1 via workWidth(),
- // but why ?
- if (width < 0)
- return pit->size();
+ // maximum pixel width of a 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)
- return addressBreakPoint(row.pos(), *pit);
+ if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
+ row.endpos(addressBreakPoint(pos, par));
+ return;
+ }
- pos_type const pos = row.pos();
- pos_type const body_pos = pit->beginningOfBody();
- pos_type const last = pit->size();
- pos_type point = last;
+ pos_type const body_pos = par.beginOfBody();
- if (pos == last)
- return last;
// Now we iterate through until we reach the right margin
// or the end of the par, then choose the possible break
// nearest that.
- int const left = leftMargin(pit, row);
+ int const left = leftMargin(pit, pos);
int x = left;
// pixel width since last breakpoint
int chunkwidth = 0;
+ FontIterator fi = FontIterator(*this, par, pos);
+ pos_type point = end;
pos_type i = pos;
-
- // We re-use the font resolution for the entire font span when possible
- LyXFont font = getFont(pit, i);
- lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
-
- for (; i < last; ++i) {
- if (pit->isNewline(i)) {
- point = i;
- break;
- }
-
- char const c = pit->getChar(i);
- if (i > endPosOfFontSpan) {
- font = getFont(pit, i);
- endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
- }
-
- int thiswidth;
+ for ( ; i < end; ++i, ++fi) {
+ char const c = par.getChar(i);
+ int thiswidth = singleWidth(par, i, c, *fi);
// add the auto-hfill from label end to the body
if (body_pos && i == body_pos) {
- thiswidth = font_metrics::width(layout->labelsep, getLabelFont(pit));
- if (pit->isLineSeparator(i - 1))
- thiswidth -= singleWidth(pit, i - 1);
- int left_margin = labelEnd(pit, row);
- if (thiswidth + x < left_margin)
- thiswidth = left_margin - x;
- thiswidth += singleWidth(pit, i, c, font);
- } else {
- thiswidth = singleWidth(pit, i, c, font);
+ 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;
chunkwidth += thiswidth;
- InsetOld * in = pit->isInset(i) ? pit->getInset(i) : 0;
-
// break before a character that will fall off
// the right of the row
if (x >= width) {
// if no break before, break here
- if (point == last || chunkwidth >= (width - left)) {
- if (pos < i)
- point = i - 1;
- else
+ if (point == end || chunkwidth >= width - left) {
+ if (i > pos)
point = i;
+ else
+ point = i + 1;
+
}
+ // exit on last registered breakpoint:
break;
}
- if (!in || in->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)) {
- point = i;
+ if (par.isLineSeparator(i)) {
+ // register breakpoint:
+ point = i + 1;
chunkwidth = 0;
}
- continue;
}
-
- continue;
}
- if (point == last && x >= width) {
- // didn't find one, break at the point we reached the edge
- point = i;
- } else if (i == last && x < width) {
- // found one, but we fell off the end of the par, so prefer
- // that.
- point = last;
- }
+ // 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
// etc. still break
if (body_pos && point < body_pos)
- point = body_pos - 1;
+ point = body_pos;
- return point;
+ row.endpos(point);
}
-// returns the minimum space a row needs on the screen in pixel
-int LyXText::fill(ParagraphList::iterator pit,
- RowList::iterator row, int paper_width) const
+void LyXText::setRowWidth(pit_type const pit, Row & row) const
{
- if (paper_width < 0)
- return 0;
-
- int w;
// get the pure distance
- pos_type const last = lastPos(*pit, row);
+ pos_type const end = row.endpos();
- LyXLayout_ptr const & layout = pit->layout();
+ Paragraph const & par = pars_[pit];
+ string const & labelsep = par.layout()->labelsep;
+ int w = leftMargin(pit, row.pos());
- // special handling of the right address boxes
- if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
- int const tmpfill = row->fill();
- row->fill(0); // the minfill in MarginLeft()
- w = leftMargin(pit, *row);
- row->fill(tmpfill);
- } else
- w = leftMargin(pit, *row);
-
- pos_type const body_pos = pit->beginningOfBody();
- pos_type i = row->pos();
-
- if (! pit->empty() && i <= last) {
- // We re-use the font resolution for the entire span when possible
- LyXFont font = getFont(pit, i);
- lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
- while (i <= last) {
+ pos_type const body_pos = par.beginOfBody();
+ pos_type i = row.pos();
+
+ if (i < end) {
+ FontIterator fi = FontIterator(*this, par, i);
+ for ( ; i < end; ++i, ++fi) {
if (body_pos > 0 && i == body_pos) {
- w += font_metrics::width(layout->labelsep, getLabelFont(pit));
- if (pit->isLineSeparator(i - 1))
- w -= singleWidth(pit, i - 1);
- int left_margin = labelEnd(pit, *row);
- if (w < left_margin)
- w = left_margin;
- }
- 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 += font_metrics::width(labelsep, getLabelFont(par));
+ if (par.isLineSeparator(i - 1))
+ w -= singleWidth(par, i - 1);
+ w = max(w, labelEnd(pit));
}
- w += singleWidth(pit, i, c, font);
- ++i;
+ char const c = par.getChar(i);
+ w += singleWidth(par, i, c, *fi);
}
}
- if (body_pos > 0 && body_pos > last) {
- w += font_metrics::width(layout->labelsep, getLabelFont(pit));
- if (last >= 0 && pit->isLineSeparator(last))
- w -= singleWidth(pit, last);
- int const left_margin = labelEnd(pit, *row);
- if (w < left_margin)
- w = left_margin;
- }
- int const fill = paper_width - w - rightMargin(pit, *bv()->buffer(), *row);
-
- // If this case happens, it means that our calculation
- // of the widths of the chars when we do rowBreakPoint()
- // went wrong for some reason. Typically in list bodies.
- // Things just about hobble on anyway, though you'll end
- // up with a "fill_separator" less than zero, which corresponds
- // to inter-word spacing being too small. Hopefully this problem
- // will die when the label hacks die.
- if (lyxerr.debugging() && fill < 0) {
- lyxerr[Debug::GUI] << "Eek, fill() was < 0: " << fill
- << " w " << w << " paper_width " << paper_width
- << " right margin " << rightMargin(pit, *bv()->buffer(), *row) << endl;
+ if (body_pos > 0 && body_pos >= end) {
+ w += font_metrics::width(labelsep, getLabelFont(par));
+ if (end > 0 && par.isLineSeparator(end - 1))
+ w -= singleWidth(par, end - 1);
+ w = max(w, labelEnd(pit));
}
- return 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->beginningOfBody();
+ pos_type last = par.beginOfBody();
BOOST_ASSERT(last > 0);
- // -1 because a label ends either with a space that is in the label,
- // or with the beginning of a footnote that is outside the label.
+ // -1 because a label ends with a space that is in the label
--last;
// a separator at this end does not count
- if (pit->isLineSeparator(last))
+ if (par.isLineSeparator(last))
--last;
int w = 0;
- pos_type i = row.pos();
- while (i <= last) {
- w += singleWidth(pit, i);
- ++i;
- }
+ for (pos_type i = row.pos(); i <= last; ++i)
+ w += singleWidth(par, i);
- int fill = 0;
- string const & labwidstr = pit->params().labelWidthString();
- if (!labwidstr.empty()) {
- LyXFont const labfont = getLabelFont(pit);
- int const labwidth = font_metrics::width(labwidstr, labfont);
- fill = max(labwidth - w, 0);
- }
+ string const & label = par.params().labelWidthString();
+ if (label.empty())
+ return 0;
- return fill;
+ return max(0, font_metrics::width(label, getLabelFont(par)) - w);
}
-LColor::color LyXText::backgroundColor() const
+LColor_color LyXText::backgroundColor() const
{
- if (inset_owner)
- return inset_owner->backgroundColor();
- else
- return LColor::background;
+ return LColor_color(LColor::color(background_color_));
}
-void LyXText::setHeightOfRow(ParagraphList::iterator pit, RowList::iterator rit)
+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;
- double tmptop = 0;
+ double const dh = defaultRowHeight();
// 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, rit->pos());
+ // 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(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);
- double spacing_val = 1.0;
- if (!pit->params().spacing().isDefault())
- spacing_val = pit->params().spacing().getValue();
- else
- spacing_val = bv()->buffer()->params().spacing().getValue();
+ // these are minimum values
+ double const spacing_val = layout->spacing.getValue() * spacing(par);
//lyxerr << "spacing_val = " << spacing_val << endl;
-
- int maxasc = int(font_metrics::maxAscent(font) *
- layout->spacing.getValue() * spacing_val);
- int maxdesc = int(font_metrics::maxDescent(font) *
- layout->spacing.getValue() * spacing_val);
-
- pos_type const pos_end = lastPos(*pit, rit);
- int labeladdon = 0;
- int maxwidth = 0;
-
- if (!pit->empty()) {
- // We re-use the font resolution for the entire font span when possible
- LyXFont font = getFont(pit, rit->pos());
- lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(rit->pos());
-
- // Optimisation
- Paragraph const & par = *pit;
-
- // Check if any insets are larger
- for (pos_type pos = rit->pos(); pos <= pos_end; ++pos) {
- // Manual inlined optimised version of common case of
- // "maxwidth += singleWidth(pit, pos);"
- char const c = par.getChar(pos);
-
- if (IsPrintable(c)) {
- if (pos > endPosOfFontSpan) {
- // We need to get the next font
- font = getFont(pit, pos);
- endPosOfFontSpan = par.getEndPosOfFontSpan(pos);
- }
- if (! font.language()->RightToLeft()) {
- maxwidth += font_metrics::width(c, font);
- } else {
- // Fall-back to normal case
- maxwidth += singleWidth(pit, pos, c, font);
- // And flush font cache
- endPosOfFontSpan = 0;
- }
- } else {
- // Special handling of insets - are any larger?
- if (par.isInset(pos)) {
- InsetOld const * tmpinset = par.getInset(pos);
- if (tmpinset) {
- maxwidth += tmpinset->width();
- maxasc = max(maxasc, tmpinset->ascent());
- maxdesc = max(maxdesc, tmpinset->descent());
- }
- } else {
- // Fall-back to normal case
- maxwidth += singleWidth(pit, pos, c, font);
- // And flush font cache
- endPosOfFontSpan = 0;
- }
- }
+ 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 = 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());
+ maxdesc = max(maxdesc, ii->inset->descent());
}
}
// Check if any custom fonts are larger (Asger)
// This is not completely correct, but we can live with the small,
// cosmetic error for now.
+ int labeladdon = 0;
+ pos_type const pos_end = row.endpos();
+
LyXFont::FONT_SIZE maxsize =
- pit->highestFontInRange(rit->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 = max(maxasc, font_metrics::maxAscent(font));
maxdesc = max(maxdesc, font_metrics::maxDescent(font));
}
++maxasc;
++maxdesc;
- rit->ascent_of_text(maxasc);
+ row.ascent(maxasc);
// is it a top line?
- if (!rit->pos()) {
+ if (row.pos() == 0) {
BufferParams const & bufparams = bv()->buffer()->params();
// some parksips VERY EASY IMPLEMENTATION
- if (bv()->buffer()->params().paragraph_separation ==
- BufferParams::PARSEP_SKIP)
+ if (bv()->buffer()->params().paragraph_separation
+ == BufferParams::PARSEP_SKIP
+ && pit != 0
+ && ((layout->isParagraph() && par.getDepth() == 0)
+ || (pars_[pit - 1].layout()->isParagraph()
+ && pars_[pit - 1].getDepth() == 0)))
{
- if (layout->isParagraph()
- && pit->getDepth() == 0
- && pit != ownerParagraphs().begin())
- {
- maxasc += bufparams.getDefSkip().inPixels(*bv());
- } else if (pit != ownerParagraphs().begin() &&
- boost::prior(pit)->layout()->isParagraph() &&
- boost::prior(pit)->getDepth() == 0)
- {
- // is it right to use defskip here too? (AS)
maxasc += bufparams.getDefSkip().inPixels(*bv());
- }
}
- // the top margin
- if (pit == ownerParagraphs().begin() && !isInInset())
- maxasc += PAPER_MARGIN;
-
- // add the vertical spaces, that the user added
- maxasc += getLengthMarkerHeight(*bv(), pit->params().spaceTop());
-
- // do not forget the DTP-lines!
- // there height depends on the font of the nearest character
- if (pit->params().lineTop())
-
- maxasc += 2 * font_metrics::ascent('x', getFont(pit, 0));
- // and now the pagebreaks
- if (pit->params().pagebreakTop())
- maxasc += 3 * defaultRowHeight();
-
- if (pit->params().startOfAppendix())
- maxasc += 3 * defaultRowHeight();
+ 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->labeltype == LABEL_COUNTER_CHAPTER
- && bufparams.secnumdepth >= 0)
- {
- float spacing_val = 1.0;
- if (!pit->params().spacing().isDefault()) {
- spacing_val = pit->params().spacing().getValue();
- } else {
- spacing_val = bufparams.spacing().getValue();
- }
-
- labeladdon = int(font_metrics::maxDescent(labelfont) *
- layout->spacing.getValue() *
- spacing_val)
- + int(font_metrics::maxAscent(labelfont) *
- layout->spacing.getValue() *
- spacing_val);
+ if (layout->counter == "chapter"
+ && !par.params().labelString().empty()) {
+ labeladdon = int(font_metrics::maxHeight(labelfont)
+ * layout->spacing.getValue()
+ * spacing(par));
}
// special code for the top label
if ((layout->labeltype == LABEL_TOP_ENVIRONMENT
|| layout->labeltype == LABEL_BIBLIO
|| layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
- && isFirstInSequence(pit, ownerParagraphs())
- && !pit->getLabelstring().empty())
+ && isFirstInSequence(pit, paragraphs())
+ && !par.getLabelstring().empty())
{
- float spacing_val = 1.0;
- if (!pit->params().spacing().isDefault()) {
- spacing_val = pit->params().spacing().getValue();
- } else {
- spacing_val = bufparams.spacing().getValue();
- }
-
labeladdon = int(
- (font_metrics::maxAscent(labelfont) +
- font_metrics::maxDescent(labelfont)) *
- layout->spacing.getValue() *
- spacing_val
- + layout->topsep * defaultRowHeight()
- + layout->labelbottomsep * defaultRowHeight());
+ font_metrics::maxHeight(labelfont)
+ * layout->spacing.getValue()
+ * spacing(par)
+ + (layout->topsep + layout->labelbottomsep) * dh);
}
- // And now the layout spaces, for example before and after
+ // Add the layout spaces, for example before and after
// a section, or between the items of a itemize or enumerate
// environment.
- if (!pit->params().pagebreakTop()) {
- ParagraphList::iterator prev =
- depthHook(pit, ownerParagraphs(),
- pit->getDepth());
- if (prev != pit && prev->layout() == layout &&
- prev->getDepth() == pit->getDepth() &&
- prev->getLabelWidthString() == pit->getLabelWidthString())
- {
- layoutasc = (layout->itemsep * defaultRowHeight());
- } else if (rit != firstRow()) {
- tmptop = layout->topsep;
-
- //if (boost::prior(pit)->getDepth() >= pit->getDepth())
- // tmptop -= getPar(previousRow(rit))->layout()->bottomsep;
-
- if (tmptop > 0)
- layoutasc = (tmptop * defaultRowHeight());
- } else if (pit->params().lineTop()) {
- tmptop = layout->topsep;
-
- if (tmptop > 0)
- layoutasc = (tmptop * defaultRowHeight());
- }
+ pit_type prev = depthHook(pit, pars_, par.getDepth());
+ if (prev != pit
+ && pars_[prev].layout() == layout
+ && pars_[prev].getDepth() == par.getDepth()
+ && pars_[prev].getLabelWidthString() == par.getLabelWidthString())
+ {
+ layoutasc = layout->itemsep * dh;
+ } else if (pit != 0 || row.pos() != 0) {
+ if (layout->topsep > 0)
+ layoutasc = layout->topsep * dh;
+ }
- prev = outerHook(pit, ownerParagraphs());
- if (prev != ownerParagraphs().end()) {
- maxasc += int(prev->layout()->parsep * defaultRowHeight());
- } else if (pit != ownerParagraphs().begin()) {
- ParagraphList::iterator prior_pit = boost::prior(pit);
- if (prior_pit->getDepth() != 0 ||
- prior_pit->layout() == layout) {
- maxasc += int(layout->parsep * defaultRowHeight());
- }
+ prev = outerHook(pit, 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 (boost::next(rit) == pit->rows.end()) {
- // the bottom margin
- ParagraphList::iterator nextpit = boost::next(pit);
- if (nextpit == ownerParagraphs().end() && !isInInset())
- maxdesc += PAPER_MARGIN;
-
- // add the vertical spaces, that the user added
- maxdesc += getLengthMarkerHeight(*bv(), pit->params().spaceBottom());
-
- // do not forget the DTP-lines!
- // there height depends on the font of the nearest character
- if (pit->params().lineBottom())
- maxdesc += 2 * font_metrics::ascent('x',
- getFont(pit, max(pos_type(0), pit->size() - 1)));
-
- // and now the pagebreaks
- if (pit->params().pagebreakBottom())
- maxdesc += 3 * defaultRowHeight();
-
- // and now the layout spaces, for example before and after
+ 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
- if (!pit->params().pagebreakBottom()
- && nextpit != ownerParagraphs().end()) {
- ParagraphList::iterator comparepit = pit;
- float usual = 0;
- float unusual = 0;
-
- if (comparepit->getDepth() > nextpit->getDepth()) {
- usual = (comparepit->layout()->bottomsep * defaultRowHeight());
- comparepit = depthHook(comparepit, ownerParagraphs(), nextpit->getDepth());
- if (comparepit->layout()!= nextpit->layout()
- || nextpit->getLabelWidthString() !=
- comparepit->getLabelWidthString())
+ pit_type nextpit = pit + 1;
+ if (nextpit != pit_type(pars_.size())) {
+ pit_type cpit = pit;
+ double usual = 0;
+ double unusual = 0;
+
+ 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 = (comparepit->layout()->bottomsep * defaultRowHeight());
+ unusual = pars_[cpit].layout()->bottomsep * dh;
}
- if (unusual > usual)
- layoutdesc = unusual;
- else
- layoutdesc = usual;
- } else if (comparepit->getDepth() == nextpit->getDepth()) {
-
- if (comparepit->layout() != nextpit->layout()
- || nextpit->getLabelWidthString() !=
- comparepit->getLabelWidthString())
- layoutdesc = int(comparepit->layout()->bottomsep * defaultRowHeight());
+ layoutdesc = max(unusual, usual);
+ } else if (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()));
-
- rit->height(maxasc + maxdesc + labeladdon);
- rit->baseline(maxasc + labeladdon);
- rit->top_of_text(rit->baseline() - font_metrics::maxAscent(font));
-
- double x = 0;
- rit->width(int(maxwidth + x));
- if (inset_owner) {
- width = max(0, workWidth());
- RowList::iterator rit = firstRow();
- RowList::iterator end = endRow();
- ParagraphList::iterator it = ownerParagraphs().begin();
- while (rit != end) {
- if (rit->width() > width)
- width = rit->width();
- nextRow(it, rit);
- }
+ maxasc += int(layoutasc * 2 / (2 + pars_[pit].getDepth()));
+ maxdesc += int(layoutdesc * 2 / (2 + pars_[pit].getDepth()));
+
+ // 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 == pit_type(pars_.size()) &&
+ row.endpos() == par.size())
+ maxdesc += 20;
}
+
+ row.ascent(maxasc + labeladdon);
+ row.descent(maxdesc);
}
-void LyXText::breakParagraph(ParagraphList & paragraphs, 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
- if (cursor.pos() && cursor.pos() != cursor.par()->size()
- && cursor.par()->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 = cursor.par()->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 (cursor.par()->empty() && !cursor.par()->allowEmpty()
+ // this is only allowed, if the current paragraph is not empty
+ // or caption and if it has not the keepempty flag active
+ if (cur.lastpos() == 0 && !cpar.allowEmpty()
&& layout->labeltype != LABEL_SENSITIVE)
return;
- recordUndo(bv(), Undo::ATOMIC, cursor.par());
+ // a layout change may affect also the following paragraph
+ recUndo(cur.pit(), undoSpan(cur.pit()) - 1);
// Always break behind a space
- //
// It is better to erase the space (Dekel)
- if (cursor.pos() < cursor.par()->size()
- && cursor.par()->isLineSeparator(cursor.pos()))
- cursor.par()->erase(cursor.pos());
+ 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();
-
- // 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)
- bool const isempty = (cursor.par()->allowEmpty() && cursor.par()->empty());
- ::breakParagraph(bv()->buffer()->params(), paragraphs, cursor.par(),
- cursor.pos(), keep_layout);
-
-#warning Trouble Point! (Lgb)
- // When ::breakParagraph is called from within an inset we must
- // ensure that the correct ParagraphList is used. Today that is not
- // the case and the Buffer::paragraphs is used. Not good. (Lgb)
- ParagraphList::iterator next_par = boost::next(cursor.par());
+ 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.
+ bool const isempty = cpar.allowEmpty() && cpar.empty();
+
+ ::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
+ cur.pos(), preserve_layout);
+
+ // After this, neither paragraph contains any rows!
+
+ 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 (sensitive) {
+ if (cur.pos() == 0)
// set to standard-layout
- cursor.par()->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
- if (cursor.pos() && cursorRow()->pos() == cursor.pos()
- && !cursor.par()->isNewline(cursor.pos() - 1))
- {
- cursorLeft(bv());
- }
+ while (!pars_[next_par].empty() && pars_[next_par].isNewline(0))
+ pars_[next_par].erase(0);
- while (!next_par->empty() && next_par->isNewline(0))
- next_par->erase(0);
-
- updateCounters();
- redoParagraph(cursor.par());
- 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 (cursor.pos() || isempty)
- setCursor(next_par, 0);
+ if (cur.pos() != 0 || isempty)
+ setCursor(cur, cur.pit() + 1, 0);
else
- setCursor(cursor.par(), 0);
-}
-
-
-// convenience function
-void LyXText::redoParagraph()
-{
- clearSelection();
- redoParagraph(cursor.par());
- 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(), Undo::INSERT, cursor.par());
+ 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 = cursor.par()->layout()->free_spacing ||
- cursor.par()->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() < cursor.par()->size() &&
- getFont(cursor.par(), cursor.pos()).number() == LyXFont::ON &&
- getFont(cursor.par(), 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(bv()); // Set current_font.number to OFF
+ number(cur); // Set current_font.number to OFF
} else if (IsDigit(c) &&
real_current_font.isVisibleRightToLeft()) {
- number(bv()); // Set current_font.number to ON
+ number(cur); // Set current_font.number to ON
- if (cursor.pos() > 0) {
- char const c = cursor.par()->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 ||
- cursor.par()->isSeparator(cursor.pos() - 2) ||
- cursor.par()->isNewline(cursor.pos() - 2))
+ (cur.pos() == 1
+ || par.isSeparator(cur.pos() - 2)
+ || par.isNewline(cur.pos() - 2))
) {
- setCharFont(
- cursor.par(),
- cursor.pos() - 1,
- current_font);
- } else if (contains(number_seperators, c) &&
- cursor.pos() >= 2 &&
- getFont(
- cursor.par(),
- cursor.pos() - 2).number() == LyXFont::ON) {
- setCharFont(
- cursor.par(),
- 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);
}
}
}
}
-
// First check, if there will be two blanks together or a blank at
// the beginning of a paragraph.
// I decided to handle blanks like normal characters, the main
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
- && cursor.par()->isLineSeparator(cursor.pos() - 1))
- || (cursor.pos() > 0
- && cursor.par()->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))
+ && par.lookupChange(cur.pos() - 1) != Change::DELETED) {
+ 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)
- cursor.par()->insertChar(cursor.pos(), c);
-
- setCharFont(cursor.par(), cursor.pos(), rawtmpfont);
+ par.insertChar(cur.pos(), c, rawtmpfont);
current_font = rawtmpfont;
real_current_font = realtmpfont;
- redoParagraph(cursor.par());
- setCursor(cursor.par(), cursor.pos() + 1, false, cursor.boundary());
-
+ setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
charInserted();
}
void LyXText::charInserted()
{
- // Here we could call finishUndo for every 20 characters inserted.
+ // Here we call finishUndo for every 20 characters inserted.
// This is from my experience how emacs does it. (Lgb)
static unsigned int counter;
if (counter < 20) {
}
-void LyXText::prepareToPrint(ParagraphList::iterator pit,
- RowList::iterator const rit) const
+RowMetrics
+LyXText::computeRowMetrics(pit_type const pit, Row const & row) const
{
- double w = rit->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 = workWidth() > 0 ? rightMargin(pit, *bv()->buffer(), *rit) : 0;
+ result.x = rightMargin(par);
else
- x = workWidth() > 0 ? leftMargin(pit, *rit) : 0;
+ 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, rit);
+ 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, *rit) / 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, rit);
+ 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(rit->width()) < workWidth()) {
+ } 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();
- }
- InsetOld * inset = 0;
- // ERT insets should always be LEFT ALIGNED on screen
- inset = pit->inInset();
- if (inset && inset->owner() &&
- inset->owner()->lyxCode() == InsetOld::ERT_CODE)
+ else
+ align = par.params().align();
+
+ // Display-style insets should always be on a centred row
+ // The test on par.size() is to catch zero-size pars, which
+ // would trigger the assert in Paragraph::getInset().
+ //inset = par.size() ? par.getInset(row.pos()) : 0;
+ if (!par.empty()
+ && par.isInset(row.pos())
+ && par.getInset(row.pos())->display())
{
- align = LYX_ALIGN_LEFT;
+ align = LYX_ALIGN_CENTER;
}
switch (align) {
- case LYX_ALIGN_BLOCK:
- {
- int const ns = numberOfSeparators(*pit, rit);
- RowList::iterator next_row = boost::next(rit);
+ 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
- && next_row != pit->rows.end()
- && !pit->isNewline(next_row->pos() - 1)
+ && row.endpos() < par.size()
+ && !par.isNewline(row.endpos() - 1)
+ && !disp_inset
) {
- fill_separator = w / ns;
+ result.separator = w / ns;
} else if (is_rtl) {
- x += w;
+ result.x += w;
}
break;
- }
- case LYX_ALIGN_RIGHT:
- x += w;
+ }
+ case LYX_ALIGN_RIGHT:
+ result.x += w;
break;
- case LYX_ALIGN_CENTER:
- x += w / 2;
+ case LYX_ALIGN_CENTER:
+ result.x += w / 2;
break;
}
}
- computeBidiTables(pit, *bv()->buffer(), rit);
+ bidi.computeTables(par, *bv()->buffer(), row);
if (is_rtl) {
- pos_type body_pos = pit->beginningOfBody();
- pos_type last = lastPos(*pit, rit);
-
- if (body_pos > 0 &&
- (body_pos - 1 > last ||
- !pit->isLineSeparator(body_pos - 1))) {
- x += font_metrics::width(layout->labelsep, getLabelFont(pit));
- if (body_pos - 1 <= last)
- x += fill_label_hfill;
+ pos_type body_pos = par.beginOfBody();
+ pos_type end = row.endpos();
+
+ if (body_pos > 0
+ && (body_pos > end || !par.isLineSeparator(body_pos - 1)))
+ {
+ result.x += font_metrics::width(layout->labelsep, getLabelFont(par));
+ if (body_pos <= end)
+ result.x += result.label_hfill;
}
}
- rit->fill_hfill(fill_hfill);
- rit->fill_label_hfill(fill_label_hfill);
- rit->fill_separator(fill_separator);
- rit->x(x);
+ return result;
}
-// important for the screen
-
-
// the cursor set functions have a special mechanism. When they
// realize, that you left an empty paragraph, they will delete it.
-// They also delete the corresponding row
-void LyXText::cursorRightOneWord()
+bool LyXText::cursorRightOneWord(LCursor & cur)
{
- ::cursorRightOneWord(cursor, ownerParagraphs());
- setCursor(cursor.par(), cursor.pos());
+ BOOST_ASSERT(this == cur.text());
+
+ 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 (old.pos() != old.lastpos() && !old.paragraph().isLetter(old.pos()))
+ ++old.pos();
+ // Advance through word.
+ while (old.pos() != old.lastpos() && old.paragraph().isLetter(old.pos()))
+ ++old.pos();
+ }
+ return setCursor(cur, old.pit(), old.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()
+bool LyXText::cursorLeftOneWord(LCursor & cur)
{
- LyXCursor tmpcursor = cursor;
- ::cursorLeftOneWord(tmpcursor, ownerParagraphs());
- setCursor(tmpcursor.par(), tmpcursor.pos());
+ BOOST_ASSERT(this == cur.text());
+
+ 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 (old.pos() != 0 && !old.paragraph().isLetter(old.pos() - 1))
+ --old.pos();
+ // Advance through word.
+ while (old.pos() != 0 && old.paragraph().isLetter(old.pos() - 1))
+ --old.pos();
+ }
+ return setCursor(cur, old.pit(), old.pos());
}
-void LyXText::selectWord(word_location loc)
+void LyXText::selectWord(LCursor & cur, word_location loc)
{
- LyXCursor from = cursor;
- LyXCursor to;
- ::getWord(from, to, loc, ownerParagraphs());
- if (cursor != from)
- setCursor(from.par(), from.pos());
+ BOOST_ASSERT(this == cur.text());
+ CursorSlice from = cur.top();
+ CursorSlice to = cur.top();
+ getWord(from, to, loc);
+ if (cur.top() != from)
+ setCursor(cur, from.pit(), from.pos());
if (to == from)
return;
- selection.cursor = cursor;
- setCursor(to.par(), to.pos());
- 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 (!selection.set()) {
- selectWord(loc);
- return selection.set();
- }
- return false;
+ BOOST_ASSERT(this == cur.text());
+ if (cur.selection())
+ return false;
+ selectWord(cur, loc);
+ return cur.selection();
}
-void LyXText::acceptChange()
+void LyXText::acceptChange(LCursor & cur)
{
- if (!selection.set() && cursor.par()->size())
+ BOOST_ASSERT(this == cur.text());
+ if (!cur.selection() && cur.lastpos() != 0)
return;
- if (selection.start.par() == selection.end.par()) {
- LyXCursor & startc = selection.start;
- LyXCursor & endc = selection.end;
- recordUndo(bv(), Undo::INSERT, startc.par());
- startc.par()->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();
- clearSelection();
- redoParagraph(startc.par());
- setCursorIntern(startc.par(), 0);
+ cur.clearSelection();
+ setCursorIntern(cur, startc.pit(), 0);
}
+#ifdef WITH_WARNINGS
#warning handle multi par selection
+#endif
}
-void LyXText::rejectChange()
+void LyXText::rejectChange(LCursor & cur)
{
- if (!selection.set() && cursor.par()->size())
+ BOOST_ASSERT(this == cur.text());
+ if (!cur.selection() && cur.lastpos() != 0)
return;
- if (selection.start.par() == selection.end.par()) {
- LyXCursor & startc = selection.start;
- LyXCursor & endc = selection.end;
- recordUndo(bv(), Undo::INSERT, startc.par());
- startc.par()->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();
- clearSelection();
- redoParagraph(startc.par());
- setCursorIntern(startc.par(), 0);
+ cur.clearSelection();
+ setCursorIntern(cur, startc.pit(), 0);
}
+#ifdef WITH_WARNINGS
#warning handle multi par selection
-}
-
-
-// This function is only used by the spellchecker for NextWord().
-// It doesn't handle LYX_ACCENTs and probably never will.
-WordLangTuple const
-LyXText::selectNextWordToSpellcheck(float & value)
-{
- if (the_locking_inset) {
- WordLangTuple word = the_locking_inset->selectNextWordToSpellcheck(bv(), value);
- if (!word.word().empty()) {
- value += float(cursor.y());
- value /= float(height);
- return word;
- }
- // we have to go on checking so move cursor to the next char
- if (cursor.pos() == cursor.par()->size()) {
- if (boost::next(cursor.par()) == ownerParagraphs().end())
- return word;
- cursor.par(boost::next(cursor.par()));
- cursor.pos(0);
- } else
- cursor.pos(cursor.pos() + 1);
- }
- ParagraphList::iterator tmppit = cursor.par();
-
- // If this is not the very first word, skip rest of
- // current word because we are probably in the middle
- // of a word if there is text here.
- if (cursor.pos() || cursor.par() != ownerParagraphs().begin()) {
- while (cursor.pos() < cursor.par()->size()
- && cursor.par()->isLetter(cursor.pos()))
- cursor.pos(cursor.pos() + 1);
- }
-
- // Now, skip until we have real text (will jump paragraphs)
- while (true) {
- ParagraphList::iterator cpit = cursor.par();
- pos_type const cpos(cursor.pos());
-
- if (cpos == cpit->size()) {
- if (boost::next(cpit) != ownerParagraphs().end()) {
- cursor.par(boost::next(cpit));
- cursor.pos(0);
- continue;
- }
- break;
- }
-
- bool const is_good_inset = cpit->isInset(cpos)
- && cpit->getInset(cpos)->allowSpellcheck();
-
- if (!isDeletedText(*cpit, cpos)
- && (is_good_inset || cpit->isLetter(cpos)))
- break;
-
- cursor.pos(cpos + 1);
- }
-
- // now check if we hit an inset so it has to be a inset containing text!
- if (cursor.pos() < cursor.par()->size() &&
- cursor.par()->isInset(cursor.pos())) {
- // lock the inset!
- FuncRequest cmd(bv(), LFUN_INSET_EDIT, "left");
- cursor.par()->getInset(cursor.pos())->localDispatch(cmd);
- // now call us again to do the above trick
- // but obviously we have to start from down below ;)
- return bv()->text->selectNextWordToSpellcheck(value);
- }
-
- // Update the value if we changed paragraphs
- if (cursor.par() != tmppit) {
- setCursor(cursor.par(), cursor.pos());
- value = float(cursor.y())/float(height);
- }
-
- // Start the selection from here
- selection.cursor = cursor;
-
- string lang_code = getFont(cursor.par(), cursor.pos()).language()->code();
- // and find the end of the word (insets like optional hyphens
- // and ligature break are part of a word)
- while (cursor.pos() < cursor.par()->size()
- && cursor.par()->isLetter(cursor.pos())
- && !isDeletedText(*cursor.par(), cursor.pos()))
- cursor.pos(cursor.pos() + 1);
-
- // Finally, we copy the word to a string and return it
- string str;
- if (selection.cursor.pos() < cursor.pos()) {
- pos_type i;
- for (i = selection.cursor.pos(); i < cursor.pos(); ++i) {
- if (!cursor.par()->isInset(i))
- str += cursor.par()->getChar(i);
- }
- }
- return WordLangTuple(str, lang_code);
-}
-
-
-// This one is also only for the spellchecker
-void LyXText::selectSelectedWord()
-{
- if (the_locking_inset) {
- the_locking_inset->selectSelectedWord(bv());
- return;
- }
- // move cursor to the beginning
- setCursor(selection.cursor.par(), selection.cursor.pos());
-
- // set the sel cursor
- selection.cursor = cursor;
-
- // now find the end of the word
- while (cursor.pos() < cursor.par()->size()
- && cursor.par()->isLetter(cursor.pos()))
- cursor.pos(cursor.pos() + 1);
-
- setCursor(cursor.par(), cursor.pos());
-
- // finally set the selection
- setSelection();
+#endif
}
// Delete from cursor up to the end of the current or next word.
-void LyXText::deleteWordForward()
+void LyXText::deleteWordForward(LCursor & cur)
{
- if (cursor.par()->empty())
- cursorRight(bv());
+ BOOST_ASSERT(this == cur.text());
+ if (cur.lastpos() == 0)
+ cursorRight(cur);
else {
- LyXCursor tmpcursor = cursor;
- selection.set(true); // to avoid deletion
- cursorRightOneWord();
- setCursor(tmpcursor, tmpcursor.par(), tmpcursor.pos());
- selection.cursor = cursor;
- cursor = tmpcursor;
- setSelection();
-
- // Great, CutSelection() gets rid of multiple spaces.
- cutSelection(true, false);
+ cur.resetAnchor();
+ cur.selection() = true;
+ cursorRightOneWord(cur);
+ cur.setSelection();
+ cutSelection(cur, true, false);
}
}
// Delete from cursor to start of current or prior word.
-void LyXText::deleteWordBackward()
+void LyXText::deleteWordBackward(LCursor & cur)
{
- if (cursor.par()->empty())
- cursorLeft(bv());
+ BOOST_ASSERT(this == cur.text());
+ if (cur.lastpos() == 0)
+ cursorLeft(cur);
else {
- LyXCursor tmpcursor = cursor;
- selection.set(true); // to avoid deletion
- cursorLeftOneWord();
- setCursor(tmpcursor, tmpcursor.par(), tmpcursor.pos());
- selection.cursor = cursor;
- cursor = tmpcursor;
- setSelection();
- cutSelection(true, false);
+ cur.resetAnchor();
+ cur.selection() = true;
+ cursorLeftOneWord(cur);
+ cur.setSelection();
+ cutSelection(cur, true, false);
}
}
// Kill to end of line.
-void LyXText::deleteLineForward()
+void LyXText::deleteLineForward(LCursor & cur)
{
- if (cursor.par()->empty())
+ BOOST_ASSERT(this == cur.text());
+ if (cur.lastpos() == 0) {
// Paragraph is empty, so we just go to the right
- cursorRight(bv());
- else {
- LyXCursor tmpcursor = cursor;
- // We can't store the row over a regular setCursor
- // so we set it to 0 and reset it afterwards.
- selection.set(true); // to avoid deletion
- cursorEnd();
- setCursor(tmpcursor, tmpcursor.par(), tmpcursor.pos());
- selection.cursor = cursor;
- cursor = tmpcursor;
- setSelection();
+ cursorRight(cur);
+ } else {
+ cur.resetAnchor();
+ cur.selection() = true; // to avoid deletion
+ cursorEnd(cur);
+ cur.setSelection();
// What is this test for ??? (JMarc)
- if (!selection.set()) {
- deleteWordForward();
- } else {
- cutSelection(true, false);
- }
+ if (!cur.selection())
+ deleteWordForward(cur);
+ else
+ cutSelection(cur, true, false);
}
}
-void LyXText::changeCase(LyXText::TextCase action)
+void LyXText::changeCase(LCursor & cur, LyXText::TextCase action)
{
- LyXCursor from;
- LyXCursor to;
+ BOOST_ASSERT(this == cur.text());
+ CursorSlice from;
+ CursorSlice to;
- if (selection.set()) {
- from = selection.start;
- to = selection.end;
+ if (cur.selection()) {
+ from = cur.selBegin();
+ to = cur.selEnd();
} else {
- from = cursor;
- ::getWord(from, to, lyx::PARTIAL_WORD, ownerParagraphs());
- setCursor(to.par(), to.pos() + 1);
+ from = cur.top();
+ getWord(from, to, lyx::PARTIAL_WORD);
+ setCursor(cur, to.pit(), to.pos() + 1);
}
- recordUndo(bv(), Undo::ATOMIC, from.par(), to.par());
+ recordUndoSelection(cur);
pos_type pos = from.pos();
- ParagraphList::iterator pit = from.par();
+ int par = from.pit();
- while (pit != ownerParagraphs().end() &&
- (pos != to.pos() || pit != to.par())) {
- if (pos == pit->size()) {
- ++pit;
+ 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);
- if (!IsInsetChar(c)) {
+ unsigned char c = pars_[pit].getChar(pos);
+ if (c != Paragraph::META_INSET) {
switch (action) {
case text_lowercase:
c = lowercase(c);
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
-
- LyXCursor old_cursor = cursor;
- int const old_cur_par_id = old_cursor.par()->id();
- int const old_cur_par_prev_id =
- (old_cursor.par() != ownerParagraphs().begin() ?
- boost::prior(old_cursor.par())->id() : -1);
-
- // just move to the right
- cursorRight(bv());
-
- // CHECK Look at the comment here.
- // This check is not very good...
- // The cursorRightIntern calls DeleteEmptyParagrapgMechanism
- // and that can very well delete the par or par->previous in
- // old_cursor. Will a solution where we compare paragraph id's
- //work better?
- if ((cursor.par() != ownerParagraphs().begin() ? boost::prior(cursor.par())->id() : -1)
- == old_cur_par_prev_id
- && cursor.par()->id() != old_cur_par_id) {
- // delete-empty-paragraph-mechanism has done it
- return;
- }
-
- // if you had success make a backspace
- if (old_cursor.par() != cursor.par() || old_cursor.pos() != cursor.pos()) {
- LyXCursor tmpcursor = cursor;
- // to make sure undo gets the right cursor position
- cursor = old_cursor;
- recordUndo(bv(), Undo::DELETE, cursor.par());
- cursor = tmpcursor;
- 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);
+ } else if (cur.pit() != cur.lastpit()) {
+ LCursor scur = cur;
+
+ setCursorIntern(cur, cur.pit()+1, 0, false, false);
+ if (pars_[cur.pit()].layout() == pars_[scur.pit()].layout()) {
+ recordUndo(scur, Undo::DELETE, scur.pit());
+ backspace(cur);
+ } else {
+ setCursorIntern(scur, scur.pit(), scur.pos(), false, scur.boundary());
+ }
}
}
-void LyXText::backspace()
+void LyXText::backspace(LCursor & cur)
{
- // Get the font that is used to calculate the baselineskip
- pos_type lastpos = cursor.par()->size();
-
- if (cursor.pos() == 0) {
- // The cursor is at the beginning of a paragraph,
- // so the the backspace will collapse two paragraphs into one.
+ 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 (cursor.par()->isChangeEdited(0, cursor.par()->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 && cursor.par()->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() != ownerParagraphs().begin()) {
- ParagraphList::iterator tmppit = boost::prior(cursor.par());
- if (cursor.par()->layout() == tmppit->layout()
- && cursor.par()->getAlign() == tmppit->getAlign()) {
- // Inherit bottom DTD from the paragraph below.
- // (the one we are deleting)
- tmppit->params().lineBottom(cursor.par()->params().lineBottom());
- tmppit->params().spaceBottom(cursor.par()->params().spaceBottom());
- tmppit->params().pagebreakBottom(cursor.par()->params().pagebreakBottom());
- }
-
- cursorLeft(bv());
-
- // the layout things can change the height of a row !
- redoParagraph();
+ 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);
return;
}
}
- if (cursor.par() != ownerParagraphs().begin()) {
- recordUndo(bv(), Undo::DELETE,
- boost::prior(cursor.par()),
- cursor.par());
- }
+ if (cur.pit() != 0)
+ recordUndo(cur, Undo::DELETE, cur.pit() - 1);
- ParagraphList::iterator tmppit = cursor.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 (cursor.par() != ownerParagraphs().begin()) {
+ if (cur.pit() != 0) {
// steps into the above paragraph.
- setCursorIntern(boost::prior(cursor.par()),
- boost::prior(cursor.par())->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();
+ // Correction (Jug 20050717): Remove check about alignment!
+ Buffer & buf = cur.buffer();
BufferParams const & bufparams = buf.params();
LyXTextClass const & tclass = bufparams.getLyXTextClass();
+ pit_type const cpit = cur.pit();
- if (cursor.par() != tmppit
- && (cursor.par()->layout() == tmppit->layout()
- || tmppit->layout() == tclass.defaultLayout())
- && cursor.par()->getAlign() == tmppit->getAlign()) {
- mergeParagraph(bufparams,
- buf.paragraphs(), cursor.par());
+ if (cpit != tmppit
+ && (pars_[cpit].layout() == pars_[tmppit].layout()
+ || pars_[tmppit].layout() == tclass.defaultLayout()))
+ {
+ mergeParagraph(bufparams, pars_, cpit);
- if (cursor.pos() && cursor.par()->isSeparator(cursor.pos() - 1))
- cursor.pos(cursor.pos() - 1);
+ if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1))
+ --cur.pos();
- // the row may have changed, block, hfills etc.
- updateCounters();
- setCursor(cursor.par(), cursor.pos(), false);
+ // the counters may have changed
+ updateCounters(cur.buffer());
+ setCursor(cur, cur.pit(), cur.pos(), false);
}
} else {
// this is the code for a normal backspace, not pasting
// any paragraphs
- recordUndo(bv(), Undo::DELETE, cursor.par());
+ 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());
- cursor.par()->erase(cursor.pos());
+ setCursorIntern(cur, cur.pit(), cur.pos() - 1,
+ false, cur.boundary());
+ cur.paragraph().erase(cur.pos());
}
- lastpos = cursor.par()->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());
}
-RowList::iterator LyXText::cursorRow() const
+Row const & LyXText::firstRow() const
{
- return getRow(cursor.par(), cursor.pos());
+ return *paragraphs().front().rows().begin();
+}
+
+
+bool LyXText::redoParagraph(pit_type const pit)
+{
+ // remove rows of paragraph, keep track of height changes
+ 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 = par.insetlist.begin();
+ InsetList::iterator iend = par.insetlist.end();
+ for (; ii != iend; ++ii) {
+ Dimension dim;
+ int const w = maxwidth_ - leftMargin(pit, ii->pos) - rightMargin(par);
+ MetricsInfo mi(bv(), getFont(par, ii->pos), w);
+ ii->inset->metrics(mi, dim);
+ }
+
+ // rebreak the paragraph
+ par.rows().clear();
+ Dimension dim;
+
+ par.setBeginOfBody();
+ pos_type z = 0;
+ do {
+ Row row(z);
+ rowBreakPoint(pit, row);
+ setRowWidth(pit, row);
+ setHeightOfRow(pit, row);
+ par.rows().push_back(row);
+ dim.wid = std::max(dim.wid, row.width());
+ dim.des += row.height();
+ z = row.endpos();
+ } while (z < par.size());
+
+ // Make sure that if a par ends in newline, there is one more row
+ // under it
+ // FIXME this is a dirty trick. Now the _same_ position in the
+ // paragraph occurs in _two_ different rows, and has two different
+ // display positions, leading to weird behaviour when moving up/down.
+ if (z > 0 && par.isNewline(z - 1)) {
+ Row row(z - 1);
+ row.endpos(z - 1);
+ setRowWidth(pit, row);
+ setHeightOfRow(pit, row);
+ par.rows().push_back(row);
+ dim.des += row.height();
+ }
+
+ dim.asc += par.rows()[0].ascent();
+ dim.des -= par.rows()[0].ascent();
+
+ bool const same = dim == par.dim();
+
+ par.dim() = dim;
+ //lyxerr << "redoParagraph: " << par.rows().size() << " rows\n";
+
+ return !same;
+}
+
+
+void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
+{
+ //BOOST_ASSERT(mi.base.textwidth);
+ if (mi.base.textwidth)
+ maxwidth_ = mi.base.textwidth;
+ //lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
+ // << " 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();
+ }
+
+ dim.wid = w;
+ dim.asc = pars_[0].ascent();
+ dim.des = h - dim.asc;
+
+ dim_ = dim;
}
-RowList::iterator LyXText::getRow(LyXCursor const & cur) const
+// only used for inset right now. should also be used for main text
+void LyXText::draw(PainterInfo & pi, int x, int y) const
{
- return getRow(cur.par(), cur.pos());
+ paintTextInset(*this, pi, x, y);
}
-RowList::iterator
-LyXText::getRow(ParagraphList::iterator pit, pos_type pos) const
+#if 0
+// only used for inset right now. should also be used for main text
+void LyXText::drawSelection(PainterInfo & pi, int x , int) const
{
- RowList::iterator rit = boost::prior(pit->rows.end());
- RowList::iterator const begin = pit->rows.begin();
+ LCursor & cur = pi.base.bv->cursor();
+ if (!cur.selection())
+ return;
+ if (!ptr_cmp(cur.text(), this))
+ return;
+
+ lyxerr << "draw selection at " << x << endl;
+
+ DocIterator beg = cur.selectionBegin();
+ DocIterator end = cur.selectionEnd();
+
+ // 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(), beg.boundary());
+ Row const & row2 = par2.getRow(end.pos(), end.boundary());
+
+ 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;
- while (rit != begin && rit->pos() > pos)
- --rit;
+ // paint big rectangle in one go
+ pi.pain.fillRectangle(x, y1, dim_.wid, y2 - y1, LColor::selection);
- return rit;
+ // 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);
}
+#else
-// returns pointer to some fancy row 'below' specified row
-RowList::iterator LyXText::cursorIRow() const
+void LyXText::drawSelection(PainterInfo & pi, int x, int) const
{
- return getRow(cursor.par(), cursor.pos());
+ 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;
+
+ DocIterator beg = cur.selectionBegin();
+ DocIterator end = cur.selectionEnd();
+
+ // 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(), beg.boundary());
+ 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(), end.boundary());
+ 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(), beg.boundary())
+ == &par2.getRow(end.pos(), end.boundary()))
+ {
+ // paint only one rectangle
+ int const b( !isRTL(par1) ? x + x1 : x + X1 );
+ int const w( !isRTL(par1) ? X2 - x1 : x2 - X1 );
+ pi.pain.fillRectangle(b, y1, w, y2 - y1, LColor::selection);
+ return;
+ }
+
+ lyxerr[Debug::DEBUG] << " y1: " << y1 << " y2: " << y2
+ << "X1:" << X1 << " x2: " << X2 << " wid: " << dim_.wid
+ << endl;
+
+ // 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);
+}
+#endif
+
+bool LyXText::isLastRow(pit_type pit, Row const & row) const
+{
+ return row.endpos() >= pars_[pit].size()
+ && pit + 1 == pit_type(paragraphs().size());
}
-RowList::iterator LyXText::getRowNearY(int y,
- ParagraphList::iterator & pit) const
+bool LyXText::isFirstRow(pit_type pit, Row const & row) const
{
- //lyxerr << "getRowNearY: y " << y << endl;
+ return row.pos() == 0 && pit == 0;
+}
- pit = boost::prior(ownerParagraphs().end());
- RowList::iterator rit = lastRow();
- RowList::iterator rbegin = firstRow();
+void LyXText::getWord(CursorSlice & from, CursorSlice & to,
+ word_location const loc)
+{
+ 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.isLetter(from.pos())
+ || !from_par.isLetter(from.pos() - 1)) {
+ to = from;
+ return;
+ }
+ // no break here, we go to the next
- while (rit != rbegin && static_cast<int>(rit->y()) > y)
- previousRow(pit, rit);
+ case lyx::WHOLE_WORD:
+ // 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
- return rit;
+ case lyx::PREVIOUS_WORD:
+ // always move the cursor to the beginning of previous word
+ 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;
+ Paragraph & to_par = pars_[to.pit()];
+ while (to.pos() < to_par.size() && to_par.isLetter(to.pos()))
+ ++to.pos();
}
-int LyXText::getDepth() const
+void LyXText::write(Buffer const & buf, std::ostream & os) const
{
- return cursor.par()->getDepth();
+ ParagraphList::const_iterator pit = paragraphs().begin();
+ ParagraphList::const_iterator end = paragraphs().end();
+ Paragraph::depth_type dth = 0;
+ for (; pit != end; ++pit)
+ pit->write(buf, os, buf.params(), dth);
}
-RowList::iterator LyXText::firstRow() const
+bool LyXText::read(Buffer const & buf, LyXLex & lex)
{
- return ownerParagraphs().front().rows.begin();
+ Paragraph::depth_type depth = 0;
+
+ while (lex.isOK()) {
+ lex.nextToken();
+ string const token = lex.getString();
+
+ if (token.empty())
+ continue;
+
+ if (token == "\\end_inset") {
+ break;
+ }
+
+ if (token == "\\end_body") {
+ continue;
+ }
+
+ if (token == "\\begin_body") {
+ continue;
+ }
+
+ if (token == "\\end_document") {
+ return false;
+ }
+
+ if (token == "\\begin_layout") {
+ lex.pushToken(token);
+
+ Paragraph par;
+ par.params().depth(depth);
+ if (buf.params().tracking_changes)
+ par.trackChanges();
+ 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, pars_.back(), lex);
+
+ } else if (token == "\\begin_deeper") {
+ ++depth;
+ } else if (token == "\\end_deeper") {
+ if (!depth) {
+ lex.printError("\\end_deeper: " "depth is already null");
+ } else {
+ --depth;
+ }
+ } else {
+ lyxerr << "Handling unknown body token: `"
+ << token << '\'' << endl;
+ }
+ }
+ return true;
}
-RowList::iterator LyXText::lastRow() const
+int LyXText::ascent() const
{
- return boost::prior(endRow());
+ return dim_.asc;
}
-RowList::iterator LyXText::endRow() const
+int LyXText::descent() const
{
- return ownerParagraphs().back().rows.end();
+ return dim_.des;
}
-void LyXText::nextRow(ParagraphList::iterator & pit,
- RowList::iterator & rit) const
+int LyXText::cursorX(CursorSlice const & sl, bool boundary) const
{
- ++rit;
- if (rit == pit->rows.end()) {
- ++pit;
- if (pit == ownerParagraphs().end())
- --pit;
+ pit_type const pit = sl.pit();
+ Paragraph const & par = pars_[pit];
+ if (par.rows().empty())
+ return 0;
+
+ pos_type ppos = sl.pos();
+ // Correct position in front of big insets
+ bool const boundary_correction = ppos != 0 && boundary;
+ if (boundary_correction)
+ --ppos;
+
+ Row const & row = par.getRow(sl.pos(), boundary);
+
+ 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 (ppos >= end)
+ cursor_vpos = isRTL(par) ? row_pos : end;
+ else if (ppos > row_pos && ppos >= end)
+ // Place cursor after char at (logical) position pos - 1
+ cursor_vpos = (bidi.level(ppos - 1) % 2 == 0)
+ ? bidi.log2vis(ppos - 1) + 1 : bidi.log2vis(ppos - 1);
+ else
+ // Place cursor before char at (logical) position ppos
+ cursor_vpos = (bidi.level(ppos) % 2 == 0)
+ ? bidi.log2vis(ppos) : bidi.log2vis(ppos) + 1;
+
+ pos_type body_pos = par.beginOfBody();
+ if (body_pos > 0 &&
+ (body_pos > end || !par.isLineSeparator(body_pos - 1)))
+ body_pos = 0;
+
+ // Use font span to speed things up, see below
+ FontSpan font_span;
+ LyXFont font;
+
+ 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(par.layout()->labelsep,
+ getLabelFont(par));
+ if (par.isLineSeparator(body_pos - 1))
+ x -= singleWidth(par, body_pos - 1);
+ }
+
+ // Use font span to speed things up, see above
+ if (pos < font_span.first || pos > font_span.last) {
+ font_span = par.fontSpan(pos);
+ font = getFont(par, pos);
+ }
+
+ x += singleWidth(par, pos, par.getChar(pos), font);
+
+ if (hfillExpansion(par, row, pos))
+ x += (pos >= body_pos) ? m.hfill : m.label_hfill;
+ else if (par.isSeparator(pos) && pos >= body_pos)
+ x += m.separator;
+ }
+
+ // see correction above
+ if (boundary_correction)
+ if (getFont(par, ppos).isVisibleRightToLeft())
+ x -= singleWidth(par, ppos);
else
- rit = pit->rows.begin();
+ x += singleWidth(par, ppos);
+
+ // Make sure inside an inset we always count from the left
+ // edge (bidi!) -- MV
+ if (sl.pos() < par.size()) {
+ font = getFont(par, sl.pos());
+ if (!boundary && font.isVisibleRightToLeft()
+ && par.isInset(sl.pos()))
+ x -= par.getInset(sl.pos())->width();
+ }
+ return int(x);
+}
+
+
+int LyXText::cursorY(CursorSlice const & sl, bool boundary) const
+{
+ //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();
+ int pos = sl.pos();
+ if (pos && boundary)
+ --pos;
+ size_t const rend = par.pos2row(pos);
+ for (size_t rit = 0; rit != rend; ++rit)
+ h += par.rows()[rit].height();
+ h += par.rows()[rend].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();
+ os << _(", Boundary: ") << cur.boundary();
+// Row & row = cur.textRow();
+// os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
+#endif
+ return os.str();
}
-void LyXText::previousRow(ParagraphList::iterator & pit,
- RowList::iterator & rit) const
+string LyXText::getPossibleLabel(LCursor & cur) const
{
- if (rit != pit->rows.begin())
- --rit;
- else {
- BOOST_ASSERT(pit != ownerParagraphs().begin());
- --pit;
- rit = boost::prior(pit->rows.end());
+ 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;
+ }
}
+
+ 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
+{
+ 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);
}
-bool LyXText::noRows() 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
+bool LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
{
- return ownerParagraphs().begin()->rows.empty();
+ 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;
+
+ return setCursor(cur, pit, pos, true, bound);
}
projects / lyx.git / blobdiff