/**
- * \file src/text.cpp
+ * \file src/Text.cpp
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
* \author Dov Feldstern
* \author Jean-Marc Lasgouttes
* \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
* \author Stefan Schimanski
* \author Dekel Tsur
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
*
* Full author contact details are available in file CREDITS.
*/
#include "buffer_funcs.h"
#include "BufferParams.h"
#include "BufferView.h"
-#include "bufferview_funcs.h"
+#include "Changes.h"
+#include "CompletionList.h"
#include "Cursor.h"
-#include "ParIterator.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 "InsetList.h"
#include "Language.h"
-#include "Color.h"
+#include "Layout.h"
#include "Length.h"
#include "Lexer.h"
+#include "lyxfind.h"
#include "LyXRC.h"
-#include "Row.h"
-#include "MetricsInfo.h"
#include "Paragraph.h"
-#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
-#include "rowpainter.h"
-#include "Undo.h"
+#include "ParIterator.h"
+#include "TextClass.h"
+#include "TextMetrics.h"
#include "VSpace.h"
#include "WordLangTuple.h"
-
-#include "frontends/FontMetrics.h"
-#include "frontends/Painter.h"
+#include "WordList.h"
#include "insets/InsetText.h"
#include "insets/InsetBibitem.h"
#include "insets/InsetCaption.h"
-#include "insets/InsetHFill.h"
-#include "insets/InsetLine.h"
#include "insets/InsetNewline.h"
-#include "insets/InsetPagebreak.h"
-#include "insets/InsetOptArg.h"
+#include "insets/InsetNewpage.h"
+#include "insets/InsetArgument.h"
#include "insets/InsetSpace.h"
#include "insets/InsetSpecialChar.h"
#include "insets/InsetTabular.h"
+#include "support/debug.h"
+#include "support/docstream.h"
+#include "support/gettext.h"
+#include "support/lassert.h"
#include "support/lstrings.h"
#include "support/textutils.h"
-#include "support/convert.h"
-#include <boost/current_function.hpp>
+#include <boost/next_prior.hpp>
#include <sstream>
-using std::auto_ptr;
-using std::advance;
-using std::distance;
-using std::max;
-using std::min;
-using std::endl;
-using std::string;
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::bformat;
-using support::contains;
-using support::lowercase;
-using support::split;
-using support::uppercase;
-
using cap::cutSelection;
using cap::pasteParagraphList;
-using frontend::FontMetrics;
+static bool moveItem(Paragraph & fromPar, pos_type fromPos,
+ Paragraph & toPar, pos_type toPos, BufferParams const & params)
+{
+ // Note: moveItem() does not honour change tracking!
+ // Therefore, it should only be used for breaking and merging paragraphs
+
+ // We need a copy here because the character at fromPos is going to be erased.
+ Font const tmpFont = fromPar.getFontSettings(params, fromPos);
+ Change const tmpChange = fromPar.lookupChange(fromPos);
+
+ if (Inset * tmpInset = fromPar.getInset(fromPos)) {
+ fromPar.releaseInset(fromPos);
+ // The inset is not in fromPar any more.
+ if (!toPar.insertInset(toPos, tmpInset, tmpFont, tmpChange)) {
+ delete tmpInset;
+ return false;
+ }
+ return true;
+ }
+
+ char_type const tmpChar = fromPar.getChar(fromPos);
+ fromPar.eraseChar(fromPos, false);
+ toPar.insertChar(toPos, tmpChar, tmpFont, tmpChange);
+ return true;
+}
+
+
+void breakParagraphConservative(BufferParams const & bparams,
+ ParagraphList & pars, pit_type par_offset, pos_type pos)
+{
+ // create a new paragraph
+ Paragraph & tmp = *pars.insert(boost::next(pars.begin(), par_offset + 1),
+ Paragraph());
+ Paragraph & par = pars[par_offset];
+
+ tmp.setInsetOwner(&par.inInset());
+ tmp.makeSameLayout(par);
+
+ LASSERT(pos <= par.size(), /**/);
+
+ if (pos < par.size()) {
+ // move everything behind the break position to the new paragraph
+ pos_type pos_end = par.size() - 1;
+
+ for (pos_type i = pos, j = 0; i <= pos_end; ++i) {
+ if (moveItem(par, pos, tmp, j, bparams)) {
+ ++j;
+ }
+ }
+ // Move over the end-of-par change information
+ tmp.setChange(tmp.size(), par.lookupChange(par.size()));
+ par.setChange(par.size(), Change(bparams.trackChanges ?
+ Change::INSERTED : Change::UNCHANGED));
+ }
+}
+
+
+void mergeParagraph(BufferParams const & bparams,
+ ParagraphList & pars, pit_type par_offset)
+{
+ Paragraph & next = pars[par_offset + 1];
+ Paragraph & par = pars[par_offset];
+
+ pos_type pos_end = next.size() - 1;
+ pos_type pos_insert = par.size();
+
+ // the imaginary end-of-paragraph character (at par.size()) has to be
+ // marked as unmodified. Otherwise, its change is adopted by the first
+ // character of the next paragraph.
+ if (par.isChanged(par.size())) {
+ LYXERR(Debug::CHANGES,
+ "merging par with inserted/deleted end-of-par character");
+ par.setChange(par.size(), Change(Change::UNCHANGED));
+ }
+
+ Change change = next.lookupChange(next.size());
+
+ // move the content of the second paragraph to the end of the first one
+ for (pos_type i = 0, j = pos_insert; i <= pos_end; ++i) {
+ if (moveItem(next, 0, par, j, bparams)) {
+ ++j;
+ }
+ }
+
+ // move the change of the end-of-paragraph character
+ par.setChange(par.size(), change);
+
+ pars.erase(boost::next(pars.begin(), par_offset + 1));
+}
+
+
+Text::Text(InsetText * owner, bool use_default_layout)
+ : owner_(owner), autoBreakRows_(false), undo_counter_(0)
+{
+ pars_.push_back(Paragraph());
+ Paragraph & par = pars_.back();
+ par.setInsetOwner(owner);
+ DocumentClass const & dc = owner->buffer().params().documentClass();
+ if (use_default_layout)
+ par.setDefaultLayout(dc);
+ else
+ par.setPlainLayout(dc);
+}
+
+
+Text::Text(InsetText * owner, Text const & text)
+ : owner_(owner), autoBreakRows_(text.autoBreakRows_), undo_counter_(0)
+{
+ pars_ = text.pars_;
+ ParagraphList::iterator const end = pars_.end();
+ ParagraphList::iterator it = pars_.begin();
+ for (; it != end; ++it)
+ it->setInsetOwner(owner);
+}
+
+
+pit_type Text::depthHook(pit_type pit, depth_type depth) const
+{
+ pit_type newpit = pit;
+
+ if (newpit != 0)
+ --newpit;
+
+ while (newpit != 0 && pars_[newpit].getDepth() > depth)
+ --newpit;
+
+ if (pars_[newpit].getDepth() > depth)
+ return pit;
+
+ return newpit;
+}
+
+
+pit_type Text::outerHook(pit_type par_offset) const
+{
+ Paragraph const & par = pars_[par_offset];
+
+ if (par.getDepth() == 0)
+ return pars_.size();
+ return depthHook(par_offset, depth_type(par.getDepth() - 1));
+}
-namespace {
-void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
+bool Text::isFirstInSequence(pit_type par_offset) const
+{
+ Paragraph const & par = pars_[par_offset];
+
+ pit_type dhook_offset = depthHook(par_offset, par.getDepth());
+
+ if (dhook_offset == par_offset)
+ return true;
+
+ Paragraph const & dhook = pars_[dhook_offset];
+
+ return dhook.layout() != par.layout()
+ || dhook.getDepth() != par.getDepth();
+}
+
+
+Font const Text::outerFont(pit_type par_offset) const
+{
+ depth_type par_depth = pars_[par_offset].getDepth();
+ FontInfo tmpfont = inherit_font;
+
+ // Resolve against environment font information
+ while (par_offset != pit_type(pars_.size())
+ && par_depth
+ && !tmpfont.resolved()) {
+ par_offset = outerHook(par_offset);
+ if (par_offset != pit_type(pars_.size())) {
+ tmpfont.realize(pars_[par_offset].layout().font);
+ par_depth = pars_[par_offset].getDepth();
+ }
+ }
+
+ return Font(tmpfont);
+}
+
+
+static void acceptOrRejectChanges(ParagraphList & pars,
+ BufferParams const & bparams, Text::ChangeOp op)
+{
+ pit_type pars_size = static_cast<pit_type>(pars.size());
+
+ // first, accept or reject changes within each individual
+ // paragraph (do not consider end-of-par)
+ for (pit_type pit = 0; pit < pars_size; ++pit) {
+ // prevent assertion failure
+ if (!pars[pit].empty()) {
+ if (op == Text::ACCEPT)
+ pars[pit].acceptChanges(0, pars[pit].size());
+ else
+ pars[pit].rejectChanges(0, pars[pit].size());
+ }
+ }
+
+ // next, accept or reject imaginary end-of-par characters
+ for (pit_type pit = 0; pit < pars_size; ++pit) {
+ pos_type pos = pars[pit].size();
+ if (pars[pit].isChanged(pos)) {
+ // keep the end-of-par char if it is inserted and accepted
+ // or when it is deleted and rejected.
+ if (pars[pit].isInserted(pos) == (op == Text::ACCEPT)) {
+ pars[pit].setChange(pos, Change(Change::UNCHANGED));
+ } else {
+ if (pit == pars_size - 1) {
+ // we cannot remove a par break at the end of the last
+ // paragraph; instead, we mark it unchanged
+ pars[pit].setChange(pos, Change(Change::UNCHANGED));
+ } else {
+ mergeParagraph(bparams, pars, pit);
+ --pit;
+ --pars_size;
+ }
+ }
+ }
+ }
+}
+
+
+void acceptChanges(ParagraphList & pars, BufferParams const & bparams)
+{
+ acceptOrRejectChanges(pars, bparams, Text::ACCEPT);
+}
+
+
+void rejectChanges(ParagraphList & pars, BufferParams const & bparams)
+{
+ acceptOrRejectChanges(pars, bparams, Text::REJECT);
+}
+
+
+InsetText const & Text::inset() const
+{
+ return *owner_;
+}
+
+
+void Text::readParToken(Paragraph & par, Lexer & lex,
string const & token, Font & font, Change & change, ErrorList & errorList)
{
- BufferParams const & bp = buf.params();
+ Buffer * buf = const_cast<Buffer *>(&owner_->buffer());
+ BufferParams const & bp = buf->params();
if (token[0] != '\\') {
-#if 0
- string::const_iterator cit = token.begin();
- for (; cit != token.end(); ++cit)
- par.insertChar(par.size(), (*cit), font, change);
-#else
docstring dstr = lex.getDocString();
- docstring::const_iterator cit = dstr.begin();
- docstring::const_iterator cend = dstr.end();
- for (; cit != cend; ++cit)
- par.insertChar(par.size(), *cit, font, change);
-#endif
+ par.appendString(dstr, font, change);
+
} else if (token == "\\begin_layout") {
lex.eatLine();
docstring layoutname = lex.getDocString();
- font = Font(Font::ALL_INHERIT, bp.language);
+ font = Font(inherit_font, bp.language);
change = Change(Change::UNCHANGED);
- TextClass const & tclass = bp.getTextClass();
+ DocumentClass const & tclass = bp.documentClass();
- if (layoutname.empty()) {
+ if (layoutname.empty())
layoutname = tclass.defaultLayoutName();
- }
- bool hasLayout = tclass.hasLayout(layoutname);
-
- if (!hasLayout) {
- errorList.push_back(ErrorItem(_("Unknown layout"),
- bformat(_("Layout '%1$s' does not exist in textclass '%2$s'\nTrying to use the default instead.\n"),
- layoutname, from_utf8(tclass.name())), par.id(), 0, par.size()));
- layoutname = tclass.defaultLayoutName();
+ if (owner_->forcePlainLayout()) {
+ // in this case only the empty layout is allowed
+ layoutname = tclass.plainLayoutName();
+ } else if (par.usePlainLayout()) {
+ // in this case, default layout maps to empty layout
+ if (layoutname == tclass.defaultLayoutName())
+ layoutname = tclass.plainLayoutName();
+ } else {
+ // otherwise, the empty layout maps to the default
+ if (layoutname == tclass.plainLayoutName())
+ layoutname = tclass.defaultLayoutName();
}
- par.layout(bp.getTextClass()[layoutname]);
+ // When we apply an unknown layout to a document, we add this layout to the textclass
+ // of this document. For example, when you apply class article to a beamer document,
+ // all unknown layouts such as frame will be added to document class article so that
+ // these layouts can keep their original names.
+ tclass.addLayoutIfNeeded(layoutname);
+
+ par.setLayout(bp.documentClass()[layoutname]);
// Test whether the layout is obsolete.
- Layout_ptr const & layout = par.layout();
- if (!layout->obsoleted_by().empty())
- par.layout(bp.getTextClass()[layout->obsoleted_by()]);
+ Layout const & layout = par.layout();
+ if (!layout.obsoleted_by().empty())
+ par.setLayout(bp.documentClass()[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";
+ LYXERR0("Solitary \\end_layout in line " << lex.lineNumber() << "\n"
+ << "Missing \\begin_layout ?");
} else if (token == "\\end_inset") {
- lyxerr << BOOST_CURRENT_FUNCTION
- << ": Solitary \\end_inset in line "
- << lex.getLineNo() << "\n"
- << "Missing \\begin_inset?.\n";
+ LYXERR0("Solitary \\end_inset in line " << lex.lineNumber() << "\n"
+ << "Missing \\begin_inset ?");
} else if (token == "\\begin_inset") {
Inset * inset = readInset(lex, buf);
if (inset)
}
} else if (token == "\\family") {
lex.next();
- font.setLyXFamily(lex.getString());
+ setLyXFamily(lex.getString(), font.fontInfo());
} else if (token == "\\series") {
lex.next();
- font.setLyXSeries(lex.getString());
+ setLyXSeries(lex.getString(), font.fontInfo());
} else if (token == "\\shape") {
lex.next();
- font.setLyXShape(lex.getString());
+ setLyXShape(lex.getString(), font.fontInfo());
} else if (token == "\\size") {
lex.next();
- font.setLyXSize(lex.getString());
+ setLyXSize(lex.getString(), font.fontInfo());
} else if (token == "\\lang") {
lex.next();
string const tok = lex.getString();
}
} else if (token == "\\numeric") {
lex.next();
- font.setNumber(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setNumber(setLyXMisc(lex.getString()));
} else if (token == "\\emph") {
lex.next();
- font.setEmph(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setEmph(setLyXMisc(lex.getString()));
} else if (token == "\\bar") {
lex.next();
string const tok = lex.getString();
if (tok == "under")
- font.setUnderbar(Font::ON);
+ font.fontInfo().setUnderbar(FONT_ON);
else if (tok == "no")
- font.setUnderbar(Font::OFF);
+ font.fontInfo().setUnderbar(FONT_OFF);
else if (tok == "default")
- font.setUnderbar(Font::INHERIT);
+ font.fontInfo().setUnderbar(FONT_INHERIT);
else
lex.printError("Unknown bar font flag "
"`$$Token'");
+ } else if (token == "\\strikeout") {
+ lex.next();
+ font.fontInfo().setStrikeout(setLyXMisc(lex.getString()));
+ } else if (token == "\\uuline") {
+ lex.next();
+ font.fontInfo().setUuline(setLyXMisc(lex.getString()));
+ } else if (token == "\\uwave") {
+ lex.next();
+ font.fontInfo().setUwave(setLyXMisc(lex.getString()));
} else if (token == "\\noun") {
lex.next();
- font.setNoun(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setNoun(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<Inset> 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 == "\\backslash") {
- par.insertChar(par.size(), '\\', font, change);
- } else if (token == "\\newline") {
- auto_ptr<Inset> inset(new InsetNewline);
- inset->read(buf, lex);
+ setLyXColor(lex.getString(), font.fontInfo());
+ } else if (token == "\\SpecialChar") {
+ auto_ptr<Inset> inset;
+ inset.reset(new InsetSpecialChar);
+ inset->read(lex);
+ inset->setBuffer(*buf);
par.insertInset(par.size(), inset.release(), font, change);
+ } else if (token == "\\backslash") {
+ par.appendChar('\\', font, change);
} else if (token == "\\LyXTable") {
auto_ptr<Inset> inset(new InsetTabular(buf));
- inset->read(buf, lex);
+ inset->read(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 == "\\clearpage") {
- par.insertInset(par.size(), new InsetClearPage, font, change);
- } else if (token == "\\cleardoublepage") {
- par.insertInset(par.size(), new InsetClearDoublePage, font, change);
} else if (token == "\\change_unchanged") {
change = Change(Change::UNCHANGED);
- } else if (token == "\\change_inserted") {
- lex.eatLine();
- std::istringstream is(lex.getString());
- unsigned int aid;
- time_type ct;
- is >> aid >> ct;
- if (aid >= bp.author_map.size()) {
- errorList.push_back(ErrorItem(_("Change tracking error"),
- bformat(_("Unknown author index for insertion: %1$d\n"), aid),
- par.id(), 0, par.size()));
- change = Change(Change::UNCHANGED);
- } else
- change = Change(Change::INSERTED, bp.author_map[aid], ct);
- } else if (token == "\\change_deleted") {
+ } else if (token == "\\change_inserted" || token == "\\change_deleted") {
lex.eatLine();
- std::istringstream is(lex.getString());
+ istringstream is(lex.getString());
unsigned int aid;
- time_type ct;
+ time_t ct;
is >> aid >> ct;
- if (aid >= bp.author_map.size()) {
+ map<unsigned int, int> const & am = bp.author_map;
+ if (am.find(aid) == am.end()) {
errorList.push_back(ErrorItem(_("Change tracking error"),
- bformat(_("Unknown author index for deletion: %1$d\n"), aid),
+ bformat(_("Unknown author index for change: %1$d\n"), aid),
par.id(), 0, par.size()));
change = Change(Change::UNCHANGED);
- } else
- change = Change(Change::DELETED, bp.author_map[aid], ct);
+ } else {
+ if (token == "\\change_inserted")
+ change = Change(Change::INSERTED, am.find(aid)->second, ct);
+ else
+ change = Change(Change::DELETED, am.find(aid)->second, ct);
+ }
} else {
lex.eatLine();
errorList.push_back(ErrorItem(_("Unknown token"),
}
-void readParagraph(Buffer const & buf, Paragraph & par, Lexer & lex,
+void Text::readParagraph(Paragraph & par, Lexer & lex,
ErrorList & errorList)
{
lex.nextToken();
Change change(Change::UNCHANGED);
while (lex.isOK()) {
- readParToken(buf, par, lex, token, font, change, errorList);
+ readParToken(par, lex, token, font, change, errorList);
lex.nextToken();
token = lex.getString();
break;
}
- LYXERR(Debug::PARSER) << "Handling paragraph token: `"
- << token << '\'' << endl;
+ LYXERR(Debug::PARSER, "Handling paragraph token: `" << token << '\'');
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"
+ << lex.lineNumber() << "\n"
<< "Missing \\end_layout.\n";
break;
}
// Initialize begin_of_body_ on load; redoParagraph maintains
par.setBeginOfBody();
+
+ // mark paragraph for spell checking on load
+ // par.requestSpellCheck();
}
-} // namespace anon
+class TextCompletionList : public CompletionList
+{
+public:
+ ///
+ TextCompletionList(Cursor const & cur, WordList const * list)
+ : buffer_(cur.buffer()), pos_(0), list_(list)
+ {}
+ ///
+ virtual ~TextCompletionList() {}
+
+ ///
+ virtual bool sorted() const { return true; }
+ ///
+ virtual size_t size() const
+ {
+ return list_->size();
+ }
+ ///
+ virtual docstring const & data(size_t idx) const
+ {
+ return list_->word(idx);
+ }
+
+private:
+ ///
+ Buffer const * buffer_;
+ ///
+ size_t pos_;
+ ///
+ WordList const * list_;
+};
bool Text::empty() const
{
return pars_.empty() || (pars_.size() == 1 && pars_[0].empty()
// FIXME: Should we consider the labeled type as empty too?
- && pars_[0].layout()->labeltype == LABEL_NO_LABEL);
+ && pars_[0].layout().labeltype == LABEL_NO_LABEL);
}
-double Text::spacing(Buffer const & buffer,
- Paragraph const & par) const
+double Text::spacing(Paragraph const & par) const
{
if (par.params().spacing().isDefault())
- return buffer.params().spacing().getValue();
+ return owner_->buffer().params().spacing().getValue();
return par.params().spacing().getValue();
}
-int Text::singleWidth(Buffer const & buffer, Paragraph const & par,
- pos_type pos) const
-{
- return singleWidth(par, pos, par.getChar(pos),
- getFont(buffer, par, pos));
-}
-
-
-int Text::singleWidth(Paragraph const & par,
- pos_type pos, char_type c, Font const & font) const
+/**
+ * This breaks a paragraph at the specified position.
+ * The new paragraph will:
+ * - Decrease depth by one (or change layout to default layout) when
+ * keep_layout == false
+ * - keep current depth and layout when keep_layout == true
+ */
+static void breakParagraph(Text & text, pit_type par_offset, pos_type pos,
+ bool keep_layout)
{
- // The most common case is handled first (Asger)
- if (isPrintable(c)) {
- Language const * language = font.language();
- if (language->rightToLeft()) {
- if (language->lang() == "arabic_arabtex" ||
- language->lang() == "arabic_arabi" ||
- language->lang() == "farsi") {
- if (Encodings::isComposeChar_arabic(c))
- return 0;
- c = par.transformChar(c, pos);
- } else if (language->lang() == "hebrew" &&
- Encodings::isComposeChar_hebrew(c))
- return 0;
- }
- return theFontMetrics(font).width(c);
+ BufferParams const & bparams = text.inset().buffer().params();
+ ParagraphList & pars = text.paragraphs();
+ // create a new paragraph, and insert into the list
+ ParagraphList::iterator tmp =
+ pars.insert(boost::next(pars.begin(), par_offset + 1),
+ Paragraph());
+
+ Paragraph & par = pars[par_offset];
+
+ // remember to set the inset_owner
+ tmp->setInsetOwner(&par.inInset());
+ // without doing that we get a crash when typing <Return> at the
+ // end of a paragraph
+ tmp->setPlainOrDefaultLayout(bparams.documentClass());
+
+ // layout stays the same with latex-environments
+ if (keep_layout) {
+ tmp->setLayout(par.layout());
+ tmp->setLabelWidthString(par.params().labelWidthString());
+ tmp->params().depth(par.params().depth());
+ } else if (par.params().depth() > 0) {
+ Paragraph const & hook = pars[text.outerHook(par_offset)];
+ tmp->setLayout(hook.layout());
+ // not sure the line below is useful
+ tmp->setLabelWidthString(par.params().labelWidthString());
+ tmp->params().depth(hook.params().depth());
}
- if (c == Paragraph::META_INSET)
- return par.getInset(pos)->width();
+ bool const isempty = (par.allowEmpty() && par.empty());
- return theFontMetrics(font).width(c);
-}
+ if (!isempty && (par.size() > pos || par.empty())) {
+ tmp->setLayout(par.layout());
+ tmp->params().align(par.params().align());
+ tmp->setLabelWidthString(par.params().labelWidthString());
+ tmp->params().depth(par.params().depth());
+ tmp->params().noindent(par.params().noindent());
-int Text::leftMargin(Buffer const & buffer, int max_width, pit_type pit) const
-{
- BOOST_ASSERT(pit >= 0);
- BOOST_ASSERT(pit < int(pars_.size()));
- return leftMargin(buffer, max_width, pit, pars_[pit].size());
-}
+ // move everything behind the break position
+ // to the new paragraph
+ /* Note: if !keepempty, empty() == true, then we reach
+ * here with size() == 0. So pos_end becomes - 1. This
+ * doesn't cause problems because both loops below
+ * enforce pos <= pos_end and 0 <= pos
+ */
+ pos_type pos_end = par.size() - 1;
-int Text::leftMargin(Buffer const & buffer, int max_width,
- 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 << "Text::leftMargin: pit: " << pit << " pos: " << pos << endl;
- TextClass const & tclass = buffer.params().getTextClass();
- Layout_ptr const & layout = par.layout();
-
- docstring parindent = layout->parindent;
-
- int l_margin = 0;
-
- if (isMainText(buffer))
- l_margin += changebarMargin();
-
- l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
- tclass.leftmargin());
-
- 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(buffer, max_width, newpar);
- }
- if (par.layout() == tclass.defaultLayout()) {
- if (pars_[newpar].params().noindent())
- parindent.erase();
- else
- parindent = pars_[newpar].layout()->parindent;
+ for (pos_type i = pos, j = 0; i <= pos_end; ++i) {
+ if (moveItem(par, pos, *tmp, j, bparams)) {
+ ++j;
}
}
}
- // 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();
-
- Font const labelfont = getLabelFont(buffer, par);
- FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
-
- switch (layout->margintype) {
- case MARGIN_DYNAMIC:
- if (!layout->leftmargin.empty()) {
- l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
- layout->leftmargin);
+ // Move over the end-of-par change information
+ tmp->setChange(tmp->size(), par.lookupChange(par.size()));
+ par.setChange(par.size(), Change(bparams.trackChanges ?
+ Change::INSERTED : Change::UNCHANGED));
+
+ if (pos) {
+ // Make sure that we keep the language when
+ // breaking paragraph.
+ if (tmp->empty()) {
+ Font changed = tmp->getFirstFontSettings(bparams);
+ Font const & old = par.getFontSettings(bparams, par.size());
+ changed.setLanguage(old.language());
+ tmp->setFont(0, changed);
}
- if (!par.getLabelstring().empty()) {
- l_margin += labelfont_metrics.signedWidth(layout->labelindent);
- l_margin += labelfont_metrics.width(par.getLabelstring());
- l_margin += labelfont_metrics.width(layout->labelsep);
- }
- break;
-
- case MARGIN_MANUAL: {
- l_margin += labelfont_metrics.signedWidth(layout->labelindent);
- // The width of an empty par, even with manual label, should be 0
- if (!par.empty() && pos >= par.beginOfBody()) {
- if (!par.getLabelWidthString().empty()) {
- docstring labstr = par.getLabelWidthString();
- l_margin += labelfont_metrics.width(labstr);
- l_margin += labelfont_metrics.width(layout->labelsep);
- }
- }
- break;
- }
- case MARGIN_STATIC: {
- l_margin += theFontMetrics(buffer.params().getFont()).
- signedWidth(layout->leftmargin) * 4 / (par.getDepth() + 4);
- break;
+ return;
}
- case MARGIN_FIRST_DYNAMIC:
- if (layout->labeltype == LABEL_MANUAL) {
- if (pos >= par.beginOfBody()) {
- l_margin += labelfont_metrics.signedWidth(layout->leftmargin);
- } else {
- l_margin += labelfont_metrics.signedWidth(layout->labelindent);
- }
- } else if (pos != 0
- // Special case to fix problems with
- // theorems (JMarc)
- || (layout->labeltype == LABEL_STATIC
- && layout->latextype == LATEX_ENVIRONMENT
- && !isFirstInSequence(pit, pars_))) {
- l_margin += labelfont_metrics.signedWidth(layout->leftmargin);
- } else if (layout->labeltype != LABEL_TOP_ENVIRONMENT
- && layout->labeltype != LABEL_BIBLIO
- && layout->labeltype !=
- LABEL_CENTERED_TOP_ENVIRONMENT) {
- l_margin += labelfont_metrics.signedWidth(layout->labelindent);
- l_margin += labelfont_metrics.width(layout->labelsep);
- l_margin += labelfont_metrics.width(par.getLabelstring());
- }
- break;
-
- case MARGIN_RIGHT_ADDRESS_BOX: {
-#if 0
- // ok, a terrible hack. The left margin depends on the widest
- // row in this paragraph.
- RowList::iterator rit = par.rows().begin();
- RowList::iterator end = par.rows().end();
- // FIXME: This is wrong.
- int minfill = max_width;
- for ( ; rit != end; ++rit)
- if (rit->fill() < minfill)
- minfill = rit->fill();
- l_margin += theFontMetrics(params.getFont()).signedWidth(layout->leftmargin);
- l_margin += minfill;
-#endif
- // also wrong, but much shorter.
- l_margin += max_width / 2;
- break;
+ if (!isempty) {
+ bool const soa = par.params().startOfAppendix();
+ par.params().clear();
+ // do not lose start of appendix marker (bug 4212)
+ par.params().startOfAppendix(soa);
+ par.setPlainOrDefaultLayout(bparams.documentClass());
}
- }
-
- if (!par.params().leftIndent().zero())
- l_margin += par.params().leftIndent().inPixels(max_width);
- LyXAlignment align;
-
- if (par.params().align() == LYX_ALIGN_LAYOUT)
- align = layout->align;
- else
- align = par.params().align();
-
- // set the correct parindent
- 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(buffer))
- // display style insets are always centered, omit indentation
- && !(!par.empty()
- && par.isInset(pos)
- && par.getInset(pos)->display())
- && (par.layout() != tclass.defaultLayout()
- || buffer.params().paragraph_separation ==
- BufferParams::PARSEP_INDENT))
- {
- l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
- parindent);
+ // layout stays the same with latex-environments
+ if (keep_layout) {
+ par.setLayout(tmp->layout());
+ par.setLabelWidthString(tmp->params().labelWidthString());
+ par.params().depth(tmp->params().depth());
}
-
- return l_margin;
}
-Color_color Text::backgroundColor() const
+void Text::breakParagraph(Cursor & cur, bool inverse_logic)
{
- return Color_color(Color::color(background_color_));
-}
-
-
-void Text::breakParagraph(Cursor & cur, bool keep_layout)
-{
- BOOST_ASSERT(this == cur.text());
+ LASSERT(this == cur.text(), /**/);
Paragraph & cpar = cur.paragraph();
pit_type cpit = cur.pit();
- TextClass const & tclass = cur.buffer().params().getTextClass();
- Layout_ptr const & layout = cpar.layout();
+ DocumentClass const & tclass = cur.buffer()->params().documentClass();
+ Layout 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 (cur.lastpos() == 0 && !cpar.allowEmpty() &&
- layout->labeltype != LABEL_SENSITIVE)
+ if (cur.lastpos() == 0 && !cpar.allowEmpty()) {
+ if (changeDepthAllowed(cur, DEC_DEPTH))
+ changeDepth(cur, DEC_DEPTH);
+ else
+ setLayout(cur, tclass.defaultLayoutName());
return;
+ }
// a layout change may affect also the following paragraph
recUndo(cur, cur.pit(), undoSpan(cur.pit()) - 1);
// Always break behind a space
// It is better to erase the space (Dekel)
if (cur.pos() != cur.lastpos() && cpar.isLineSeparator(cur.pos()))
- cpar.eraseChar(cur.pos(), cur.buffer().params().trackChanges);
+ cpar.eraseChar(cur.pos(), cur.buffer()->params().trackChanges);
// What should the layout for the new paragraph be?
- int preserve_layout = 0;
- if (keep_layout)
- preserve_layout = 2;
- else
- preserve_layout = layout->isEnvironment();
+ bool keep_layout = inverse_logic ?
+ !layout.isEnvironment()
+ : layout.isEnvironment();
// We need to remember this before we break the paragraph, because
// that invalidates the layout variable
- bool sensitive = layout->labeltype == LABEL_SENSITIVE;
+ bool sensitive = layout.labeltype == LABEL_SENSITIVE;
// we need to set this before we insert the paragraph.
bool const isempty = cpar.allowEmpty() && cpar.empty();
- lyx::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
- cur.pos(), preserve_layout);
+ lyx::breakParagraph(*this, cpit, cur.pos(), keep_layout);
// After this, neither paragraph contains any rows!
if (sensitive) {
if (cur.pos() == 0)
// set to standard-layout
+ //FIXME Check if this should be plainLayout() in some cases
pars_[cpit].applyLayout(tclass.defaultLayout());
else
// set to standard-layout
+ //FIXME Check if this should be plainLayout() in some cases
pars_[next_par].applyLayout(tclass.defaultLayout());
}
while (!pars_[next_par].empty() && pars_[next_par].isNewline(0)) {
- if (!pars_[next_par].eraseChar(0, cur.buffer().params().trackChanges))
+ if (!pars_[next_par].eraseChar(0, cur.buffer()->params().trackChanges))
break; // the character couldn't be deleted physically due to change tracking
}
- updateLabels(cur.buffer());
-
// A singlePar update is not enough in this case.
- cur.updateFlags(Update::Force);
+ cur.screenUpdateFlags(Update::Force);
+ cur.forceBufferUpdate();
// This check is necessary. Otherwise the new empty paragraph will
// be deleted automatically. And it is more friendly for the user!
}
+// needed to insert the selection
+void Text::insertStringAsLines(DocIterator const & dit, docstring const & str,
+ Font const & font)
+{
+ BufferParams const & bparams = owner_->buffer().params();
+ pit_type pit = dit.pit();
+ pos_type pos = dit.pos();
+
+ // insert the string, don't insert doublespace
+ bool space_inserted = true;
+ for (docstring::const_iterator cit = str.begin();
+ cit != str.end(); ++cit) {
+ Paragraph & par = pars_[pit];
+ if (*cit == '\n') {
+ if (autoBreakRows_ && (!par.empty() || par.allowEmpty())) {
+ lyx::breakParagraph(*this, pit, pos,
+ par.layout().isEnvironment());
+ ++pit;
+ pos = 0;
+ space_inserted = true;
+ } else {
+ continue;
+ }
+ // do not insert consecutive spaces if !free_spacing
+ } else if ((*cit == ' ' || *cit == '\t') &&
+ space_inserted && !par.isFreeSpacing()) {
+ continue;
+ } else if (*cit == '\t') {
+ if (!par.isFreeSpacing()) {
+ // tabs are like spaces here
+ par.insertChar(pos, ' ', font, bparams.trackChanges);
+ ++pos;
+ space_inserted = true;
+ } else {
+ par.insertChar(pos, *cit, font, bparams.trackChanges);
+ ++pos;
+ space_inserted = true;
+ }
+ } else if (!isPrintable(*cit)) {
+ // Ignore unprintables
+ continue;
+ } else {
+ // just insert the character
+ par.insertChar(pos, *cit, font, bparams.trackChanges);
+ ++pos;
+ space_inserted = (*cit == ' ');
+ }
+ }
+}
+
+
+// turn double CR to single CR, others are converted into one
+// blank. Then insertStringAsLines is called
+void Text::insertStringAsParagraphs(DocIterator const & dit, docstring const & str,
+ Font const & font)
+{
+ docstring linestr = str;
+ bool newline_inserted = false;
+
+ for (string::size_type i = 0, siz = linestr.size(); i < siz; ++i) {
+ if (linestr[i] == '\n') {
+ if (newline_inserted) {
+ // we know that \r will be ignored by
+ // insertStringAsLines. Of course, it is a dirty
+ // trick, but it works...
+ linestr[i - 1] = '\r';
+ linestr[i] = '\n';
+ } else {
+ linestr[i] = ' ';
+ newline_inserted = true;
+ }
+ } else if (isPrintable(linestr[i])) {
+ newline_inserted = false;
+ }
+ }
+ insertStringAsLines(dit, linestr, font);
+}
+
+
// insert a character, moves all the following breaks in the
// same Paragraph one to the right and make a rebreak
void Text::insertChar(Cursor & cur, char_type c)
{
- BOOST_ASSERT(this == cur.text());
- BOOST_ASSERT(c != Paragraph::META_INSET);
+ LASSERT(this == cur.text(), /**/);
- recordUndo(cur, Undo::INSERT);
+ cur.recordUndo(INSERT_UNDO);
- Buffer const & buffer = cur.buffer();
+ TextMetrics const & tm = cur.bv().textMetrics(this);
+ Buffer const & buffer = *cur.buffer();
Paragraph & par = cur.paragraph();
// try to remove this
pit_type const pit = cur.pit();
- bool const freeSpacing = par.layout()->free_spacing ||
+ bool const freeSpacing = par.layout().free_spacing ||
par.isFreeSpacing();
if (lyxrc.auto_number) {
static docstring const number_unary_operators = from_ascii("+-");
static docstring const number_seperators = from_ascii(".,:");
- if (current_font.number() == Font::ON) {
+ if (cur.current_font.fontInfo().number() == FONT_ON) {
if (!isDigit(c) && !contains(number_operators, c) &&
!(contains(number_seperators, c) &&
cur.pos() != 0 &&
cur.pos() != cur.lastpos() &&
- getFont(buffer, par, cur.pos()).number() == Font::ON &&
- getFont(buffer, par, cur.pos() - 1).number() == Font::ON)
+ tm.displayFont(pit, cur.pos()).fontInfo().number() == FONT_ON &&
+ tm.displayFont(pit, cur.pos() - 1).fontInfo().number() == FONT_ON)
)
number(cur); // Set current_font.number to OFF
} else if (isDigit(c) &&
- real_current_font.isVisibleRightToLeft()) {
+ cur.real_current_font.isVisibleRightToLeft()) {
number(cur); // Set current_font.number to ON
if (cur.pos() != 0) {
|| par.isSeparator(cur.pos() - 2)
|| par.isNewline(cur.pos() - 2))
) {
- setCharFont(buffer, pit, cur.pos() - 1, current_font);
+ setCharFont(pit, cur.pos() - 1, cur.current_font,
+ tm.font_);
} else if (contains(number_seperators, c)
&& cur.pos() >= 2
- && getFont(buffer, par, cur.pos() - 2).number() == Font::ON) {
- setCharFont(buffer, pit, cur.pos() - 1, current_font);
+ && tm.displayFont(pit, cur.pos() - 2).fontInfo().number() == FONT_ON) {
+ setCharFont(pit, cur.pos() - 1, cur.current_font,
+ tm.font_);
}
}
}
if ((cur.pos() >= 2) && (par.isLineSeparator(cur.pos() - 1))) {
// get font in front and behind the space in question. But do NOT
// use getFont(cur.pos()) because the character c is not inserted yet
- Font const & pre_space_font = getFont(buffer, par, cur.pos() - 2);
- Font const & post_space_font = real_current_font;
+ Font const pre_space_font = tm.displayFont(cur.pit(), cur.pos() - 2);
+ Font const & post_space_font = cur.real_current_font;
bool pre_space_rtl = pre_space_font.isVisibleRightToLeft();
bool post_space_rtl = post_space_font.isVisibleRightToLeft();
// adjacent character whose direction is the paragraph's
// direction; don't touch other properties of the font
Language const * lang =
- (pre_space_rtl == par.isRightToLeftPar(buffer.params())) ?
+ (pre_space_rtl == par.isRTL(buffer.params())) ?
pre_space_font.language() : post_space_font.language();
- Font space_font = getFont(buffer, par, cur.pos() - 1);
+ Font space_font = tm.displayFont(cur.pit(), cur.pos() - 1);
space_font.setLanguage(lang);
par.setFont(cur.pos() - 1, space_font);
}
// disable the double-space checking
if (!freeSpacing && isLineSeparatorChar(c)) {
if (cur.pos() == 0) {
- static bool sent_space_message = false;
- if (!sent_space_message) {
- cur.message(_("You cannot insert a space at the "
- "beginning of a paragraph. Please read the Tutorial."));
- sent_space_message = true;
- }
+ cur.message(_(
+ "You cannot insert a space at the "
+ "beginning of a paragraph. Please read the Tutorial."));
return;
}
- BOOST_ASSERT(cur.pos() > 0);
+ LASSERT(cur.pos() > 0, /**/);
if ((par.isLineSeparator(cur.pos() - 1) || par.isNewline(cur.pos() - 1))
- && !par.isDeleted(cur.pos() - 1)) {
- static bool sent_space_message = false;
- if (!sent_space_message) {
- cur.message(_("You cannot type two spaces this way. "
- "Please read the Tutorial."));
- sent_space_message = true;
- }
+ && !par.isDeleted(cur.pos() - 1)) {
+ cur.message(_(
+ "You cannot type two spaces this way. "
+ "Please read the Tutorial."));
return;
}
}
- par.insertChar(cur.pos(), c, current_font, cur.buffer().params().trackChanges);
- checkBufferStructure(cur.buffer(), cur);
+ par.insertChar(cur.pos(), c, cur.current_font,
+ cur.buffer()->params().trackChanges);
+ cur.checkBufferStructure();
-// cur.updateFlags(Update::Force);
- setCursor(cur.top(), cur.pit(), cur.pos() + 1);
- charInserted();
+// cur.screenUpdateFlags(Update::Force);
+ bool boundary = cur.boundary()
+ || tm.isRTLBoundary(cur.pit(), cur.pos() + 1);
+ setCursor(cur, cur.pit(), cur.pos() + 1, false, boundary);
+ charInserted(cur);
}
-void Text::charInserted()
+void Text::charInserted(Cursor & cur)
{
+ Paragraph & par = cur.paragraph();
+
// 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) {
- ++counter;
+ if (undo_counter_ < 20) {
+ ++undo_counter_;
} else {
- finishUndo();
- counter = 0;
+ cur.finishUndo();
+ undo_counter_ = 0;
+ }
+
+ // register word if a non-letter was entered
+ if (cur.pos() > 1
+ && !par.isWordSeparator(cur.pos() - 2)
+ && par.isWordSeparator(cur.pos() - 1)) {
+ // get the word in front of cursor
+ LASSERT(this == cur.text(), /**/);
+ cur.paragraph().updateWords();
}
}
// the cursor set functions have a special mechanism. When they
// realize, that you left an empty paragraph, they will delete it.
-bool Text::cursorRightOneWord(Cursor & cur)
+bool Text::cursorForwardOneWord(Cursor & cur)
{
- BOOST_ASSERT(this == cur.text());
+ LASSERT(this == cur.text(), /**/);
+
+ pos_type const lastpos = cur.lastpos();
+ pit_type pit = cur.pit();
+ pos_type pos = cur.pos();
+ Paragraph const & par = cur.paragraph();
+
+ // Paragraph boundary is a word boundary
+ if (pos == lastpos) {
+ if (pit != cur.lastpit())
+ return setCursor(cur, pit + 1, 0);
+ else
+ return false;
+ }
- Cursor old = cur;
+ if (lyxrc.mac_like_word_movement) {
+ // Skip through trailing punctuation and spaces.
+ while (pos != lastpos && (par.isChar(pos) || par.isSpace(pos)))
+ ++pos;
- if (old.pos() == old.lastpos() && old.pit() != old.lastpit()) {
- ++old.pit();
- old.pos() = 0;
+ // Skip over either a non-char inset or a full word
+ if (pos != lastpos && par.isWordSeparator(pos))
+ ++pos;
+ else while (pos != lastpos && !par.isWordSeparator(pos))
+ ++pos;
} else {
- // Advance through word.
- while (old.pos() != old.lastpos() && old.paragraph().isLetter(old.pos()))
- ++old.pos();
- // Skip through trailing nonword stuff.
- while (old.pos() != old.lastpos() && !old.paragraph().isLetter(old.pos()))
- ++old.pos();
+ LASSERT(pos < lastpos, /**/); // see above
+ if (!par.isWordSeparator(pos))
+ while (pos != lastpos && !par.isWordSeparator(pos))
+ ++pos;
+ else if (par.isChar(pos))
+ while (pos != lastpos && par.isChar(pos))
+ ++pos;
+ else if (!par.isSpace(pos)) // non-char inset
+ ++pos;
+
+ // Skip over white space
+ while (pos != lastpos && par.isSpace(pos))
+ ++pos;
}
- return setCursor(cur, old.pit(), old.pos());
+
+ return setCursor(cur, pit, pos);
}
-bool Text::cursorLeftOneWord(Cursor & cur)
+bool Text::cursorBackwardOneWord(Cursor & cur)
{
- BOOST_ASSERT(this == cur.text());
+ LASSERT(this == cur.text(), /**/);
+
+ pit_type pit = cur.pit();
+ pos_type pos = cur.pos();
+ Paragraph & par = cur.paragraph();
- Cursor old = cur;
+ // Paragraph boundary is a word boundary
+ if (pos == 0 && pit != 0)
+ return setCursor(cur, pit - 1, getPar(pit - 1).size());
- if (old.pos() == 0 && old.pit() != 0) {
- --old.pit();
- old.pos() = old.lastpos();
+ if (lyxrc.mac_like_word_movement) {
+ // Skip through punctuation and spaces.
+ while (pos != 0 && (par.isChar(pos - 1) || par.isSpace(pos - 1)))
+ --pos;
+
+ // Skip over either a non-char inset or a full word
+ if (pos != 0 && par.isWordSeparator(pos - 1) && !par.isChar(pos - 1))
+ --pos;
+ else while (pos != 0 && !par.isWordSeparator(pos - 1))
+ --pos;
} else {
- // Skip through initial nonword stuff.
- 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();
+ // Skip over white space
+ while (pos != 0 && par.isSpace(pos - 1))
+ --pos;
+
+ if (pos != 0 && !par.isWordSeparator(pos - 1))
+ while (pos != 0 && !par.isWordSeparator(pos - 1))
+ --pos;
+ else if (pos != 0 && par.isChar(pos - 1))
+ while (pos != 0 && par.isChar(pos - 1))
+ --pos;
+ else if (pos != 0 && !par.isSpace(pos - 1)) // non-char inset
+ --pos;
+ }
+
+ return setCursor(cur, pit, pos);
+}
+
+
+bool Text::cursorVisLeftOneWord(Cursor & cur)
+{
+ LASSERT(this == cur.text(), /**/);
+
+ pos_type left_pos, right_pos;
+ bool left_is_letter, right_is_letter;
+
+ Cursor temp_cur = cur;
+
+ // always try to move at least once...
+ while (temp_cur.posVisLeft(true /* skip_inset */)) {
+
+ // collect some information about current cursor position
+ temp_cur.getSurroundingPos(left_pos, right_pos);
+ left_is_letter =
+ (left_pos > -1 ? !temp_cur.paragraph().isWordSeparator(left_pos) : false);
+ right_is_letter =
+ (right_pos > -1 ? !temp_cur.paragraph().isWordSeparator(right_pos) : false);
+
+ // if we're not at a letter/non-letter boundary, continue moving
+ if (left_is_letter == right_is_letter)
+ continue;
+
+ // we should stop when we have an LTR word on our right or an RTL word
+ // on our left
+ if ((left_is_letter && temp_cur.paragraph().getFontSettings(
+ temp_cur.buffer()->params(), left_pos).isRightToLeft())
+ || (right_is_letter && !temp_cur.paragraph().getFontSettings(
+ temp_cur.buffer()->params(), right_pos).isRightToLeft()))
+ break;
}
- return setCursor(cur, old.pit(), old.pos());
+
+ return setCursor(cur, temp_cur.pit(), temp_cur.pos(),
+ true, temp_cur.boundary());
+}
+
+
+bool Text::cursorVisRightOneWord(Cursor & cur)
+{
+ LASSERT(this == cur.text(), /**/);
+
+ pos_type left_pos, right_pos;
+ bool left_is_letter, right_is_letter;
+
+ Cursor temp_cur = cur;
+
+ // always try to move at least once...
+ while (temp_cur.posVisRight(true /* skip_inset */)) {
+
+ // collect some information about current cursor position
+ temp_cur.getSurroundingPos(left_pos, right_pos);
+ left_is_letter =
+ (left_pos > -1 ? !temp_cur.paragraph().isWordSeparator(left_pos) : false);
+ right_is_letter =
+ (right_pos > -1 ? !temp_cur.paragraph().isWordSeparator(right_pos) : false);
+
+ // if we're not at a letter/non-letter boundary, continue moving
+ if (left_is_letter == right_is_letter)
+ continue;
+
+ // we should stop when we have an LTR word on our right or an RTL word
+ // on our left
+ if ((left_is_letter && temp_cur.paragraph().getFontSettings(
+ temp_cur.buffer()->params(),
+ left_pos).isRightToLeft())
+ || (right_is_letter && !temp_cur.paragraph().getFontSettings(
+ temp_cur.buffer()->params(),
+ right_pos).isRightToLeft()))
+ break;
+ }
+
+ return setCursor(cur, temp_cur.pit(), temp_cur.pos(),
+ true, temp_cur.boundary());
}
void Text::selectWord(Cursor & cur, word_location loc)
{
- BOOST_ASSERT(this == cur.text());
+ LASSERT(this == cur.text(), /**/);
CursorSlice from = cur.top();
CursorSlice to = cur.top();
getWord(from, to, loc);
setCursor(cur, from.pit(), from.pos());
if (to == from)
return;
- cur.resetAnchor();
+ if (!cur.selection())
+ cur.resetAnchor();
setCursor(cur, to.pit(), to.pos());
cur.setSelection();
+ cur.setWordSelection(true);
+}
+
+
+void Text::selectAll(Cursor & cur)
+{
+ LASSERT(this == cur.text(), /**/);
+ if (cur.lastpos() == 0 && cur.lastpit() == 0)
+ return;
+ // If the cursor is at the beginning, make sure the cursor ends there
+ if (cur.pit() == 0 && cur.pos() == 0) {
+ setCursor(cur, cur.lastpit(), getPar(cur.lastpit()).size());
+ cur.resetAnchor();
+ setCursor(cur, 0, 0);
+ } else {
+ setCursor(cur, 0, 0);
+ cur.resetAnchor();
+ setCursor(cur, cur.lastpit(), getPar(cur.lastpit()).size());
+ }
+ cur.setSelection();
}
// selection is currently set
bool Text::selectWordWhenUnderCursor(Cursor & cur, word_location loc)
{
- BOOST_ASSERT(this == cur.text());
+ LASSERT(this == cur.text(), /**/);
if (cur.selection())
return false;
selectWord(cur, loc);
void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
{
- BOOST_ASSERT(this == cur.text());
+ LASSERT(this == cur.text(), /**/);
- if (!cur.selection())
- return;
+ if (!cur.selection()) {
+ bool const changed = cur.paragraph().isChanged(cur.pos());
+ if (!(changed && findNextChange(&cur.bv())))
+ return;
+ }
- recordUndoSelection(cur, Undo::ATOMIC);
+ cur.recordUndoSelection();
pit_type begPit = cur.selectionBegin().pit();
pit_type endPit = cur.selectionEnd().pit();
pos_type right = (pit == endPit ? endPos : parSize);
if (op == ACCEPT) {
- pars_[pit].acceptChanges(cur.buffer().params(), left, right);
+ pars_[pit].acceptChanges(left, right);
} else {
- pars_[pit].rejectChanges(cur.buffer().params(), left, right);
+ pars_[pit].rejectChanges(left, right);
}
}
// instead, we mark it unchanged
pars_[pit].setChange(pos, Change(Change::UNCHANGED));
} else {
- mergeParagraph(cur.buffer().params(), pars_, pit);
+ mergeParagraph(cur.buffer()->params(), pars_, pit);
--endPit;
--pit;
}
// we mark the par break at the end of the last paragraph unchanged
pars_[pit].setChange(pos, Change(Change::UNCHANGED));
} else {
- mergeParagraph(cur.buffer().params(), pars_, pit);
+ mergeParagraph(cur.buffer()->params(), pars_, pit);
--endPit;
--pit;
}
// finally, invoke the DEPM
- deleteEmptyParagraphMechanism(begPit, endPit, cur.buffer().params().trackChanges);
+ deleteEmptyParagraphMechanism(begPit, endPit, cur.buffer()->params().trackChanges);
//
- finishUndo();
+ cur.finishUndo();
cur.clearSelection();
setCursorIntern(cur, begPit, begPos);
- cur.updateFlags(Update::Force);
- updateLabels(cur.buffer());
+ cur.screenUpdateFlags(Update::Force);
+ cur.forceBufferUpdate();
}
-void Text::acceptChanges(BufferParams const & bparams)
+void Text::acceptChanges()
{
+ BufferParams const & bparams = owner_->buffer().params();
lyx::acceptChanges(pars_, bparams);
deleteEmptyParagraphMechanism(0, pars_.size() - 1, bparams.trackChanges);
}
-void Text::rejectChanges(BufferParams const & bparams)
+void Text::rejectChanges()
{
+ BufferParams const & bparams = owner_->buffer().params();
pit_type pars_size = static_cast<pit_type>(pars_.size());
// first, reject changes within each individual paragraph
// (do not consider end-of-par)
for (pit_type pit = 0; pit < pars_size; ++pit) {
if (!pars_[pit].empty()) // prevent assertion failure
- pars_[pit].rejectChanges(bparams, 0, pars_[pit].size());
+ pars_[pit].rejectChanges(0, pars_[pit].size());
}
// next, reject imaginary end-of-par characters
}
-// Delete from cursor up to the end of the current or next word.
void Text::deleteWordForward(Cursor & cur)
{
- BOOST_ASSERT(this == cur.text());
+ LASSERT(this == cur.text(), /**/);
if (cur.lastpos() == 0)
- cursorRight(cur);
+ cursorForward(cur);
else {
cur.resetAnchor();
- cur.selection() = true;
- cursorRightOneWord(cur);
+ cur.setSelection(true);
+ cursorForwardOneWord(cur);
cur.setSelection();
cutSelection(cur, true, false);
- checkBufferStructure(cur.buffer(), cur);
+ cur.checkBufferStructure();
}
}
-// Delete from cursor to start of current or prior word.
void Text::deleteWordBackward(Cursor & cur)
{
- BOOST_ASSERT(this == cur.text());
+ LASSERT(this == cur.text(), /**/);
if (cur.lastpos() == 0)
- cursorLeft(cur);
+ cursorBackward(cur);
else {
cur.resetAnchor();
- cur.selection() = true;
- cursorLeftOneWord(cur);
+ cur.setSelection(true);
+ cursorBackwardOneWord(cur);
cur.setSelection();
cutSelection(cur, true, false);
- checkBufferStructure(cur.buffer(), cur);
+ cur.checkBufferStructure();
}
}
// Kill to end of line.
-void Text::deleteLineForward(Cursor & cur)
-{
- BOOST_ASSERT(this == cur.text());
- if (cur.lastpos() == 0) {
- // Paragraph is empty, so we just go to the right
- cursorRight(cur);
- } else {
- cur.resetAnchor();
- cur.selection() = true; // to avoid deletion
- cursorEnd(cur);
- cur.setSelection();
- // What is this test for ??? (JMarc)
- if (!cur.selection())
- deleteWordForward(cur);
- else
- cutSelection(cur, true, false);
- checkBufferStructure(cur.buffer(), cur);
- }
-}
-
-
-void Text::changeCase(Cursor & cur, Text::TextCase action)
+void Text::changeCase(Cursor & cur, TextCase action)
{
- BOOST_ASSERT(this == cur.text());
+ LASSERT(this == cur.text(), /**/);
CursorSlice from;
CursorSlice to;
+ bool gotsel = false;
if (cur.selection()) {
from = cur.selBegin();
to = cur.selEnd();
+ gotsel = true;
} else {
from = cur.top();
getWord(from, to, PARTIAL_WORD);
- cursorRightOneWord(cur);
+ cursorForwardOneWord(cur);
}
- recordUndoSelection(cur, Undo::ATOMIC);
+ cur.recordUndoSelection();
pit_type begPit = from.pit();
pit_type endPit = to.pit();
pos_type begPos = from.pos();
pos_type endPos = to.pos();
- bool const trackChanges = cur.buffer().params().trackChanges;
-
pos_type right = 0; // needed after the for loop
for (pit_type pit = begPit; pit <= endPit; ++pit) {
- pos_type parSize = pars_[pit].size();
-
- pos_type pos = (pit == begPit ? begPos : 0);
- right = (pit == endPit ? endPos : parSize);
-
- // process sequences of modified characters; in change
- // tracking mode, this approach results in much better
- // usability than changing case on a char-by-char basis
- docstring changes;
-
- bool capitalize = true;
-
- for (; pos < right; ++pos) {
- char_type oldChar = pars_[pit].getChar(pos);
- char_type newChar = oldChar;
-
- // ignore insets and don't play with deleted text!
- if (oldChar != Paragraph::META_INSET && !pars_[pit].isDeleted(pos)) {
- switch (action) {
- case text_lowercase:
- newChar = lowercase(oldChar);
- break;
- case text_capitalization:
- if (capitalize) {
- newChar = uppercase(oldChar);
- capitalize = false;
- }
- break;
- case text_uppercase:
- newChar = uppercase(oldChar);
- break;
- }
- }
-
- if (!pars_[pit].isLetter(pos) || pars_[pit].isDeleted(pos)) {
- capitalize = true; // permit capitalization again
- }
-
- if (oldChar != newChar) {
- changes += newChar;
- }
-
- if (oldChar == newChar || pos == right - 1) {
- if (oldChar != newChar) {
- pos++; // step behind the changing area
- }
- int erasePos = pos - changes.size();
- for (size_t i = 0; i < changes.size(); i++) {
- pars_[pit].insertChar(pos, changes[i],
- pars_[pit].getFontSettings(cur.buffer().params(),
- erasePos),
- trackChanges);
- if (!pars_[pit].eraseChar(erasePos, trackChanges)) {
- ++erasePos;
- ++pos; // advance
- ++right; // expand selection
- }
- }
- changes.clear();
- }
- }
+ Paragraph & par = pars_[pit];
+ pos_type const pos = (pit == begPit ? begPos : 0);
+ right = (pit == endPit ? endPos : par.size());
+ par.changeCase(cur.buffer()->params(), pos, right, action);
}
// the selection may have changed due to logically-only deleted chars
- setCursor(cur, begPit, begPos);
- cur.resetAnchor();
- setCursor(cur, endPit, right);
- cur.setSelection();
+ if (gotsel) {
+ setCursor(cur, begPit, begPos);
+ cur.resetAnchor();
+ setCursor(cur, endPit, right);
+ cur.setSelection();
+ } else
+ setCursor(cur, endPit, right);
- checkBufferStructure(cur.buffer(), cur);
+ cur.checkBufferStructure();
}
bool Text::handleBibitems(Cursor & cur)
{
- if (cur.paragraph().layout()->labeltype != LABEL_BIBLIO)
+ if (cur.paragraph().layout().labeltype != LABEL_BIBLIO)
return false;
+
+ if (cur.pos() != 0)
+ return false;
+
+ BufferParams const & bufparams = cur.buffer()->params();
+ Paragraph const & par = cur.paragraph();
+ Cursor prevcur = cur;
+ if (cur.pit() > 0) {
+ --prevcur.pit();
+ prevcur.pos() = prevcur.lastpos();
+ }
+ Paragraph const & prevpar = prevcur.paragraph();
+
// if a bibitem is deleted, merge with previous paragraph
// if this is a bibliography item as well
- if (cur.pos() == 0) {
- BufferParams const & bufparams = cur.buffer().params();
- Paragraph const & par = cur.paragraph();
- Cursor prevcur = cur;
- if (cur.pit() > 0) {
- --prevcur.pit();
- prevcur.pos() = prevcur.lastpos();
- }
- Paragraph const & prevpar = prevcur.paragraph();
- if (cur.pit() > 0 && par.layout() == prevpar.layout()) {
- recordUndo(cur, Undo::ATOMIC, prevcur.pit());
- mergeParagraph(bufparams, cur.text()->paragraphs(),
- prevcur.pit());
- updateLabels(cur.buffer());
- setCursorIntern(cur, prevcur.pit(), prevcur.pos());
- cur.updateFlags(Update::Force);
- // if not, reset the paragraph to default
- } else
- cur.paragraph().layout(
- bufparams.getTextClass().defaultLayout());
+ if (cur.pit() > 0 && par.layout() == prevpar.layout()) {
+ cur.recordUndo(ATOMIC_UNDO, prevcur.pit());
+ mergeParagraph(bufparams, cur.text()->paragraphs(),
+ prevcur.pit());
+ cur.forceBufferUpdate();
+ setCursorIntern(cur, prevcur.pit(), prevcur.pos());
+ cur.screenUpdateFlags(Update::Force);
return true;
- }
- return false;
+ }
+
+ // otherwise reset to default
+ cur.paragraph().setPlainOrDefaultLayout(bufparams.documentClass());
+ return true;
}
bool Text::erase(Cursor & cur)
{
- BOOST_ASSERT(this == cur.text());
+ LASSERT(this == cur.text(), return false);
bool needsUpdate = false;
Paragraph & par = cur.paragraph();
if (cur.pos() != cur.lastpos()) {
// this is the code for a normal delete, not pasting
// any paragraphs
- recordUndo(cur, Undo::DELETE);
- if(!par.eraseChar(cur.pos(), cur.buffer().params().trackChanges)) {
+ cur.recordUndo(DELETE_UNDO);
+ bool const was_inset = cur.paragraph().isInset(cur.pos());
+ if(!par.eraseChar(cur.pos(), cur.buffer()->params().trackChanges))
// the character has been logically deleted only => skip it
cur.top().forwardPos();
- }
- checkBufferStructure(cur.buffer(), cur);
+
+ if (was_inset)
+ cur.forceBufferUpdate();
+ else
+ cur.checkBufferStructure();
needsUpdate = true;
} else {
if (cur.pit() == cur.lastpit())
return dissolveInset(cur);
- if (!par.isMergedOnEndOfParDeletion(cur.buffer().params().trackChanges)) {
+ if (!par.isMergedOnEndOfParDeletion(cur.buffer()->params().trackChanges)) {
par.setChange(cur.pos(), Change(Change::DELETED));
cur.forwardPos();
needsUpdate = true;
// Make sure the cursor is correct. Is this really needed?
// No, not really... at least not here!
cur.text()->setCursor(cur.top(), cur.pit(), cur.pos());
- checkBufferStructure(cur.buffer(), cur);
+ cur.checkBufferStructure();
}
return needsUpdate;
bool Text::backspacePos0(Cursor & cur)
{
- BOOST_ASSERT(this == cur.text());
+ LASSERT(this == cur.text(), /**/);
if (cur.pit() == 0)
return false;
bool needsUpdate = false;
- BufferParams const & bufparams = cur.buffer().params();
- TextClass const & tclass = bufparams.getTextClass();
+ BufferParams const & bufparams = cur.buffer()->params();
+ DocumentClass const & tclass = bufparams.documentClass();
ParagraphList & plist = cur.text()->paragraphs();
Paragraph const & par = cur.paragraph();
Cursor prevcur = cur;
// is it an empty paragraph?
if (cur.lastpos() == 0
|| (cur.lastpos() == 1 && par.isSeparator(0))) {
- recordUndo(cur, Undo::ATOMIC, prevcur.pit(), cur.pit());
+ cur.recordUndo(ATOMIC_UNDO, prevcur.pit(), cur.pit());
plist.erase(boost::next(plist.begin(), cur.pit()));
needsUpdate = true;
}
// is previous par empty?
else if (prevcur.lastpos() == 0
|| (prevcur.lastpos() == 1 && prevpar.isSeparator(0))) {
- recordUndo(cur, Undo::ATOMIC, prevcur.pit(), cur.pit());
+ cur.recordUndo(ATOMIC_UNDO, prevcur.pit(), cur.pit());
plist.erase(boost::next(plist.begin(), prevcur.pit()));
needsUpdate = true;
}
// layouts. 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
+ // or the empty layout.
else if (par.layout() == prevpar.layout()
- || par.layout() == tclass.defaultLayout()) {
- recordUndo(cur, Undo::ATOMIC, prevcur.pit());
+ || tclass.isDefaultLayout(par.layout())
+ || tclass.isPlainLayout(par.layout())) {
+ cur.recordUndo(ATOMIC_UNDO, prevcur.pit());
mergeParagraph(bufparams, plist, prevcur.pit());
needsUpdate = true;
}
if (needsUpdate) {
- updateLabels(cur.buffer());
+ cur.forceBufferUpdate();
setCursorIntern(cur, prevcur.pit(), prevcur.pos());
}
bool Text::backspace(Cursor & cur)
{
- BOOST_ASSERT(this == cur.text());
+ LASSERT(this == cur.text(), /**/);
bool needsUpdate = false;
if (cur.pos() == 0) {
if (cur.pit() == 0)
Paragraph & prev_par = pars_[cur.pit() - 1];
- if (!prev_par.isMergedOnEndOfParDeletion(cur.buffer().params().trackChanges)) {
+ if (!prev_par.isMergedOnEndOfParDeletion(cur.buffer()->params().trackChanges)) {
prev_par.setChange(prev_par.size(), Change(Change::DELETED));
setCursorIntern(cur, cur.pit() - 1, prev_par.size());
return true;
} else {
// this is the code for a normal backspace, not pasting
// any paragraphs
- recordUndo(cur, Undo::DELETE);
- // We used to do cursorLeftIntern() here, but it is
+ cur.recordUndo(DELETE_UNDO);
+ // We used to do cursorBackwardIntern() here, but it is
// not a good idea since it triggers the auto-delete
- // mechanism. So we do a cursorLeftIntern()-lite,
+ // mechanism. So we do a cursorBackwardIntern()-lite,
// without the dreaded mechanism. (JMarc)
setCursorIntern(cur, cur.pit(), cur.pos() - 1,
false, cur.boundary());
- cur.paragraph().eraseChar(cur.pos(), cur.buffer().params().trackChanges);
- checkBufferStructure(cur.buffer(), cur);
+ bool const was_inset = cur.paragraph().isInset(cur.pos());
+ cur.paragraph().eraseChar(cur.pos(), cur.buffer()->params().trackChanges);
+ if (was_inset)
+ cur.forceBufferUpdate();
+ else
+ cur.checkBufferStructure();
}
if (cur.pos() == cur.lastpos())
- setCurrentFont(cur);
+ cur.setCurrentFont();
needsUpdate |= handleBibitems(cur);
// A singlePar update is not enough in this case.
-// cur.updateFlags(Update::Force);
+// cur.screenUpdateFlags(Update::Force);
setCursor(cur.top(), cur.pit(), cur.pos());
return needsUpdate;
}
-bool Text::dissolveInset(Cursor & cur) {
- BOOST_ASSERT(this == cur.text());
+bool Text::dissolveInset(Cursor & cur)
+{
+ LASSERT(this == cur.text(), return false);
- if (isMainText(*cur.bv().buffer()) || cur.inset().nargs() != 1)
+ if (isMainText() || cur.inset().nargs() != 1)
return false;
- recordUndoInset(cur);
+ cur.recordUndoInset();
+ cur.setMark(false);
cur.selHandle(false);
// save position
pos_type spos = cur.pos();
ParagraphList plist;
if (cur.lastpit() != 0 || cur.lastpos() != 0)
plist = paragraphs();
- cur.popLeft();
+ cur.popBackward();
// store cursor offset
if (spit == 0)
spos += cur.pos();
spit += cur.pit();
- Buffer & b = cur.buffer();
+ Buffer & b = *cur.buffer();
cur.paragraph().eraseChar(cur.pos(), b.params().trackChanges);
if (!plist.empty()) {
// ERT paragraphs have the Language latex_language.
// change it to the buffer language.
ParagraphList::iterator it = plist.begin();
ParagraphList::iterator it_end = plist.end();
- for (; it != it_end; it++) {
- it->changeLanguage(b.params(), latex_language,
- b.getLanguage());
- }
+ for (; it != it_end; it++)
+ it->changeLanguage(b.params(), latex_language, b.language());
- pasteParagraphList(cur, plist, b.params().textclass,
+ pasteParagraphList(cur, plist, b.params().documentClassPtr(),
b.errorList("Paste"));
// restore position
- cur.pit() = std::min(cur.lastpit(), spit);
- cur.pos() = std::min(cur.lastpos(), spos);
- }
+ cur.pit() = min(cur.lastpit(), spit);
+ cur.pos() = min(cur.lastpos(), spos);
+ } else
+ cur.forceBufferUpdate();
+
+ // Ensure the current language is set correctly (bug 6292)
+ cur.text()->setCursor(cur, cur.pit(), cur.pos());
cur.clearSelection();
cur.resetAnchor();
return true;
}
-// only used for inset right now. should also be used for main text
-void Text::draw(PainterInfo & pi, int x, int y) const
-{
- paintTextInset(*this, pi, x, y);
-}
-
-
-// only used for inset right now. should also be used for main text
-void Text::drawSelection(PainterInfo & pi, int x, int) const
-{
- Cursor & 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();
-
- BufferView & bv = *pi.base.bv;
-
- // the selection doesn't touch the visible screen?
- if (bv_funcs::status(&bv, beg) == bv_funcs::CUR_BELOW
- || bv_funcs::status(&bv, end) == bv_funcs::CUR_ABOVE)
- return;
-
- TextMetrics const & tm = bv.textMetrics(this);
- ParagraphMetrics const & pm1 = tm.parMetrics(beg.pit());
- ParagraphMetrics const & pm2 = tm.parMetrics(end.pit());
- Row const & row1 = pm1.getRow(beg.pos(), beg.boundary());
- Row const & row2 = pm2.getRow(end.pos(), end.boundary());
-
- // clip above
- int middleTop;
- bool const clipAbove =
- (bv_funcs::status(&bv, beg) == bv_funcs::CUR_ABOVE);
- if (clipAbove)
- middleTop = 0;
- else
- middleTop = bv_funcs::getPos(bv, beg, beg.boundary()).y_ + row1.descent();
-
- // clip below
- int middleBottom;
- bool const clipBelow =
- (bv_funcs::status(&bv, end) == bv_funcs::CUR_BELOW);
- if (clipBelow)
- middleBottom = bv.workHeight();
- else
- middleBottom = bv_funcs::getPos(bv, end, end.boundary()).y_ - row2.ascent();
-
- // start and end in the same line?
- if (!(clipAbove || clipBelow) && &row1 == &row2)
- // then only draw this row's selection
- drawRowSelection(pi, x, row1, beg, end, false, false);
- else {
- if (!clipAbove) {
- // get row end
- DocIterator begRowEnd = beg;
- begRowEnd.pos() = row1.endpos();
- begRowEnd.boundary(true);
-
- // draw upper rectangle
- drawRowSelection(pi, x, row1, beg, begRowEnd, false, true);
- }
-
- if (middleTop < middleBottom) {
- // draw middle rectangle
- pi.pain.fillRectangle(x, middleTop,
- tm.width(), middleBottom - middleTop,
- Color::selection);
- }
-
- if (!clipBelow) {
- // get row begin
- DocIterator endRowBeg = end;
- endRowBeg.pos() = row2.pos();
- endRowBeg.boundary(false);
-
- // draw low rectangle
- drawRowSelection(pi, x, row2, endRowBeg, end, true, false);
- }
- }
-}
-
-
-void Text::drawRowSelection(PainterInfo & pi, int x, Row const & row,
- DocIterator const & beg, DocIterator const & end,
- bool drawOnBegMargin, bool drawOnEndMargin) const
-{
- BufferView & bv = *pi.base.bv;
- Buffer & buffer = *bv.buffer();
- TextMetrics const & tm = bv.textMetrics(this);
- DocIterator cur = beg;
- int x1 = cursorX(bv, beg.top(), beg.boundary());
- int x2 = cursorX(bv, end.top(), end.boundary());
- int y1 = bv_funcs::getPos(bv, cur, cur.boundary()).y_ - row.ascent();
- int y2 = y1 + row.height();
-
- // draw the margins
- if (drawOnBegMargin) {
- if (isRTL(buffer, beg.paragraph()))
- pi.pain.fillRectangle(x + x1, y1, tm.width() - x1, y2 - y1, Color::selection);
- else
- pi.pain.fillRectangle(x, y1, x1, y2 - y1, Color::selection);
- }
-
- if (drawOnEndMargin) {
- if (isRTL(buffer, beg.paragraph()))
- pi.pain.fillRectangle(x, y1, x2, y2 - y1, Color::selection);
- else
- pi.pain.fillRectangle(x + x2, y1, tm.width() - x2, y2 - y1, Color::selection);
- }
-
- // if we are on a boundary from the beginning, it's probably
- // a RTL boundary and we jump to the other side directly as this
- // segement is 0-size and confuses the logic below
- if (cur.boundary())
- cur.boundary(false);
-
- // go through row and draw from RTL boundary to RTL boundary
- while (cur < end) {
- bool drawNow = false;
-
- // simplified cursorRight code below which does not
- // descend into insets and which does not go into the
- // next line. Compare the logic with the original cursorRight
-
- // if left of boundary -> just jump to right side
- // but for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
- if (cur.boundary()) {
- cur.boundary(false);
- } else if (isRTLBoundary(buffer, cur.paragraph(), cur.pos() + 1)) {
- // in front of RTL boundary -> Stay on this side of the boundary because:
- // ab|cDDEEFFghi -> abc|DDEEFFghi
- ++cur.pos();
- cur.boundary(true);
- drawNow = true;
- } else {
- // move right
- ++cur.pos();
-
- // line end?
- if (cur.pos() == row.endpos())
- cur.boundary(true);
- }
-
- if (x1 == -1) {
- // the previous segment was just drawn, now the next starts
- x1 = cursorX(bv, cur.top(), cur.boundary());
- }
-
- if (!(cur < end) || drawNow) {
- x2 = cursorX(bv, cur.top(), cur.boundary());
- pi.pain.fillRectangle(x + min(x1,x2), y1, abs(x2 - x1), y2 - y1,
- Color::selection);
-
- // reset x1, so it is set again next round (which will be on the
- // right side of a boundary or at the selection end)
- x1 = -1;
- }
- }
-}
-
-
-
-bool Text::isLastRow(pit_type pit, Row const & row) const
-{
- return row.endpos() >= pars_[pit].size()
- && pit + 1 == pit_type(paragraphs().size());
-}
-
-
-bool Text::isFirstRow(pit_type pit, Row const & row) const
-{
- return row.pos() == 0 && pit == 0;
-}
-
-
void Text::getWord(CursorSlice & from, CursorSlice & to,
- word_location const loc)
+ word_location const loc) const
{
- Paragraph const & from_par = pars_[from.pit()];
- switch (loc) {
- case 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
-
- case 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
-
- case 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 NEXT_WORD:
- lyxerr << "Text::getWord: NEXT_WORD not implemented yet"
- << endl;
- break;
- case 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();
+ pars_[to.pit()].locateWord(from.pos(), to.pos(), loc);
}
-void Text::write(Buffer const & buf, std::ostream & os) const
+void Text::write(ostream & os) const
{
+ Buffer const & buf = owner_->buffer();
ParagraphList::const_iterator pit = paragraphs().begin();
ParagraphList::const_iterator end = paragraphs().end();
depth_type dth = 0;
for (; pit != end; ++pit)
- pit->write(buf, os, buf.params(), dth);
+ pit->write(os, buf.params(), dth);
// Close begin_deeper
for(; dth > 0; --dth)
}
-bool Text::read(Buffer const & buf, Lexer & lex, ErrorList & errorList)
+bool Text::read(Lexer & lex,
+ ErrorList & errorList, InsetText * insetPtr)
{
+ Buffer const & buf = owner_->buffer();
depth_type depth = 0;
+ bool res = true;
while (lex.isOK()) {
lex.nextToken();
if (token == "\\begin_body")
continue;
- if (token == "\\end_document")
- return false;
+ if (token == "\\end_document") {
+ res = false;
+ break;
+ }
if (token == "\\begin_layout") {
lex.pushToken(token);
Paragraph par;
+ par.setInsetOwner(insetPtr);
par.params().depth(depth);
- par.setFont(0, Font(Font::ALL_INHERIT, buf.params().language));
+ par.setFont(0, Font(inherit_font, buf.params().language));
pars_.push_back(par);
+ readParagraph(pars_.back(), lex, errorList);
- // FIXME: goddamn InsetTabular makes us pass a Buffer
- // not BufferParams
- lyx::readParagraph(buf, pars_.back(), lex, errorList);
-
+ // register the words in the global word list
+ pars_.back().updateWords();
} else if (token == "\\begin_deeper") {
++depth;
} else if (token == "\\end_deeper") {
- if (!depth) {
+ if (!depth)
lex.printError("\\end_deeper: " "depth is already null");
- } else {
+ else
--depth;
- }
} else {
- lyxerr << "Handling unknown body token: `"
- << token << '\'' << endl;
- }
- }
- return true;
-}
-
-int Text::cursorX(BufferView const & bv, CursorSlice const & sl,
- bool boundary) const
-{
- TextMetrics const & tm = bv.textMetrics(sl.text());
- pit_type const pit = sl.pit();
- Paragraph const & par = pars_[pit];
- ParagraphMetrics const & pm = tm.parMetrics(pit);
- if (pm.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 = pm.getRow(sl.pos(), boundary);
-
- pos_type cursor_vpos = 0;
-
- Buffer const & buffer = *bv.buffer();
- RowMetrics const m = tm.computeRowMetrics(pit, row);
- double x = m.x;
- Bidi bidi;
- bidi.computeTables(par, buffer, row);
-
- pos_type const row_pos = row.pos();
- pos_type const end = row.endpos();
- // Spaces at logical line breaks in bidi text must be skipped during
- // cursor positioning. However, they may appear visually in the middle
- // of a row; they must be skipped, wherever they are...
- // * logically "abc_[HEBREW_\nHEBREW]"
- // * visually "abc_[_WERBEH\nWERBEH]"
- pos_type skipped_sep_vpos = -1;
-
- if (end <= row_pos)
- cursor_vpos = row_pos;
- else if (ppos >= end)
- cursor_vpos = isRTL(buffer, 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;
- Font font;
-
- // If the last logical character is a separator, skip it, unless
- // it's in the last row of a paragraph; see skipped_sep_vpos declaration
- if (end > 0 && end < par.size() && par.isSeparator(end - 1))
- skipped_sep_vpos = bidi.log2vis(end - 1);
-
- for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
- // Skip the separator which is at the logical end of the row
- if (vpos == skipped_sep_vpos)
- continue;
- pos_type pos = bidi.vis2log(vpos);
- if (body_pos > 0 && pos == body_pos - 1) {
- FontMetrics const & labelfm = theFontMetrics(
- getLabelFont(buffer, par));
- x += m.label_hfill + labelfm.width(par.layout()->labelsep);
- if (par.isLineSeparator(body_pos - 1))
- x -= singleWidth(buffer, 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(buffer, par, pos);
+ LYXERR0("Handling unknown body token: `" << token << '\'');
}
-
- x += singleWidth(par, pos, par.getChar(pos), font);
-
- if (par.hfillExpansion(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 (isRTL(buffer, sl, boundary))
- x -= singleWidth(buffer, par, ppos);
- else
- x += singleWidth(buffer, par, ppos);
}
- return int(x);
-}
-
-
-int Text::cursorY(BufferView const & bv, CursorSlice const & sl, bool boundary) const
-{
- //lyxerr << "Text::cursorY: boundary: " << boundary << std::endl;
- ParagraphMetrics const & pm = bv.parMetrics(this, sl.pit());
- if (pm.rows().empty())
- return 0;
-
- int h = 0;
- h -= bv.parMetrics(this, 0).rows()[0].ascent();
- for (pit_type pit = 0; pit < sl.pit(); ++pit) {
- h += bv.parMetrics(this, pit).height();
+ // avoid a crash on weird documents (bug 4859)
+ if (pars_.empty()) {
+ Paragraph par;
+ par.setInsetOwner(insetPtr);
+ par.params().depth(depth);
+ par.setFont(0, Font(inherit_font,
+ buf.params().language));
+ par.setPlainOrDefaultLayout(buf.params().documentClass());
+ pars_.push_back(par);
}
- int pos = sl.pos();
- if (pos && boundary)
- --pos;
- size_t const rend = pm.pos2row(pos);
- for (size_t rit = 0; rit != rend; ++rit)
- h += pm.rows()[rit].height();
- h += pm.rows()[rend].ascent();
- return h;
+
+ return res;
}
-
// Returns the current font and depth as a message.
-docstring Text::currentState(Cursor & cur)
+docstring Text::currentState(Cursor const & cur) const
{
- BOOST_ASSERT(this == cur.text());
- Buffer & buf = cur.buffer();
+ LASSERT(this == cur.text(), /**/);
+ Buffer & buf = *cur.buffer();
Paragraph const & par = cur.paragraph();
odocstringstream os;
Change change = par.lookupChange(cur.pos());
- if (change.type != Change::UNCHANGED) {
+ if (change.changed()) {
Author const & a = buf.params().authors().get(change.author);
os << _("Change: ") << a.name();
if (!a.email().empty())
// I think we should only show changes from the default
// font. (Asger)
// No, from the document font (MV)
- Font font = real_current_font;
- font.reduce(buf.params().getFont());
+ Font font = cur.real_current_font;
+ font.fontInfo().reduce(buf.params().getFont().fontInfo());
os << bformat(_("Font: %1$s"), font.stateText(&buf.params()));
if (!par.empty() && cur.pos() < par.size()) {
// Force output of code point, not character
size_t const c = par.getChar(cur.pos());
- os << _(", Char: 0x") << std::hex << c;
+ os << _(", Char: 0x") << hex << c;
}
os << _(", Boundary: ") << cur.boundary();
// Row & row = cur.textRow();
}
-docstring Text::getPossibleLabel(Cursor & cur) const
+docstring Text::getPossibleLabel(Cursor const & cur) const
{
pit_type pit = cur.pit();
- Layout_ptr layout = pars_[pit].layout();
+ Layout const * layout = &(pars_[pit].layout());
docstring text;
- docstring par_text = pars_[pit].asString(cur.buffer(), false);
- for (int i = 0; i < lyxrc.label_init_length; ++i) {
+ docstring par_text = pars_[pit].asString();
+
+ // The return string of math matrices might contain linebreaks
+ par_text = subst(par_text, '\n', '-');
+ int const numwords = 3;
+ for (int i = 0; i < numwords; ++i) {
if (par_text.empty())
break;
docstring head;
text += '-';
text += head;
}
+
+ // Make sure it isn't too long
+ unsigned int const max_label_length = 32;
+ if (text.size() > max_label_length)
+ text.resize(max_label_length);
- // No need for a prefix if the user said so.
- if (lyxrc.label_init_length <= 0)
- return text;
-
- // Will contain the label type.
+ // Will contain the label prefix.
docstring name;
// For section, subsection, etc...
if (layout->latextype == LATEX_PARAGRAPH && pit != 0) {
- Layout_ptr const & layout2 = pars_[pit - 1].layout();
+ Layout const * layout2 = &(pars_[pit - 1].layout());
if (layout2->latextype != LATEX_PARAGRAPH) {
--pit;
layout = layout2;
}
}
if (layout->latextype != LATEX_PARAGRAPH)
- name = from_ascii(layout->latexname());
-
- // for captions, we just take the caption type
- Inset * caption_inset = cur.innerInsetOfType(Inset::CAPTION_CODE);
- if (caption_inset)
- name = from_ascii(static_cast<InsetCaption *>(caption_inset)->type());
-
- // If none of the above worked, we'll see if we're inside various
- // types of insets and take our abbreviation from them.
- if (name.empty()) {
- Inset::Code const codes[] = {
- Inset::FLOAT_CODE,
- Inset::WRAP_CODE,
- Inset::FOOT_CODE
- };
- for (unsigned int i = 0; i < (sizeof codes / sizeof codes[0]); ++i) {
- Inset * float_inset = cur.innerInsetOfType(codes[i]);
- if (float_inset) {
- name = float_inset->name();
- break;
- }
+ name = layout->refprefix;
+
+ // For captions, we just take the caption type
+ Inset * caption_inset = cur.innerInsetOfType(CAPTION_CODE);
+ if (caption_inset) {
+ string const & ftype = static_cast<InsetCaption *>(caption_inset)->type();
+ FloatList const & fl = cur.buffer()->params().documentClass().floats();
+ if (fl.typeExist(ftype)) {
+ Floating const & flt = fl.getType(ftype);
+ name = from_utf8(flt.refPrefix());
}
+ if (name.empty())
+ name = from_utf8(ftype.substr(0,3));
}
- // Create a correct prefix for prettyref
- if (name == "theorem")
- name = from_ascii("thm");
- else if (name == "Foot")
- name = from_ascii("fn");
- else if (name == "listing")
- name = from_ascii("lst");
+ // If none of the above worked, see if the inset knows.
+ if (name.empty()) {
+ InsetLayout const & il = cur.inset().getLayout();
+ name = il.refprefix();
+ }
if (!name.empty())
- text = name.substr(0, 3) + ':' + text;
+ // FIXME refstyle
+ // We should allow customization of the separator or else change it
+ text = name + ':' + text;
return text;
}
-void Text::setCursorFromCoordinates(Cursor & cur, int const x, int const y)
+docstring Text::asString(int options) const
{
- BOOST_ASSERT(this == cur.text());
- pit_type pit = getPitNearY(cur.bv(), y);
-
- TextMetrics const & tm = cur.bv().textMetrics(this);
- ParagraphMetrics const & pm = tm.parMetrics(pit);
-
- int yy = cur.bv().coordCache().get(this, pit).y_ - pm.ascent();
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
- << ": x: " << x
- << " y: " << y
- << " pit: " << pit
- << " yy: " << yy << endl;
-
- int r = 0;
- BOOST_ASSERT(pm.rows().size());
- for (; r < int(pm.rows().size()) - 1; ++r) {
- Row const & row = pm.rows()[r];
- if (int(yy + row.height()) > y)
- break;
- yy += row.height();
- }
-
- Row const & row = pm.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()
- + tm.getColumnNearX(pit, row, xx, bound);
+ return asString(0, pars_.size(), options);
+}
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
- << ": setting cursor pit: " << pit
- << " pos: " << pos
- << endl;
- setCursor(cur, pit, pos, true, bound);
- // remember new position.
- cur.setTargetX();
+docstring Text::asString(pit_type beg, pit_type end, int options) const
+{
+ size_t i = size_t(beg);
+ docstring str = pars_[i].asString(options);
+ for (++i; i != size_t(end); ++i) {
+ str += '\n';
+ str += pars_[i].asString(options);
+ }
+ return str;
}
+
void Text::charsTranspose(Cursor & cur)
{
- BOOST_ASSERT(this == cur.text());
+ LASSERT(this == cur.text(), /**/);
pos_type pos = cur.pos();
return;
// Store the characters to be transposed (including font information).
- char_type char1 = par.getChar(pos1);
+ char_type const char1 = par.getChar(pos1);
Font const font1 =
- par.getFontSettings(cur.buffer().params(), pos1);
+ par.getFontSettings(cur.buffer()->params(), pos1);
- char_type char2 = par.getChar(pos2);
+ char_type const char2 = par.getChar(pos2);
Font const font2 =
- par.getFontSettings(cur.buffer().params(), pos2);
+ par.getFontSettings(cur.buffer()->params(), pos2);
// And finally, we are ready to perform the transposition.
// Track the changes if Change Tracking is enabled.
- bool const trackChanges = cur.buffer().params().trackChanges;
+ bool const trackChanges = cur.buffer()->params().trackChanges;
- recordUndo(cur);
+ cur.recordUndo();
par.eraseChar(pos2, trackChanges);
par.eraseChar(pos1, trackChanges);
par.insertChar(pos1, char2, font2, trackChanges);
par.insertChar(pos2, char1, font1, trackChanges);
- checkBufferStructure(cur.buffer(), cur);
+ cur.checkBufferStructure();
// After the transposition, move cursor to after the transposition.
setCursor(cur, cur.pit(), pos2);
}
+DocIterator Text::macrocontextPosition() const
+{
+ return macrocontext_position_;
+}
+
+
+void Text::setMacrocontextPosition(DocIterator const & pos)
+{
+ macrocontext_position_ = pos;
+}
+
+
+docstring Text::previousWord(CursorSlice const & sl) const
+{
+ CursorSlice from = sl;
+ CursorSlice to = sl;
+ getWord(from, to, PREVIOUS_WORD);
+ if (sl == from || to == from)
+ return docstring();
+
+ Paragraph const & par = sl.paragraph();
+ return par.asString(from.pos(), to.pos());
+}
+
+
+bool Text::completionSupported(Cursor const & cur) const
+{
+ Paragraph const & par = cur.paragraph();
+ return cur.pos() > 0
+ && (cur.pos() >= par.size() || par.isWordSeparator(cur.pos()))
+ && !par.isWordSeparator(cur.pos() - 1);
+}
+
+
+CompletionList const * Text::createCompletionList(Cursor const & cur) const
+{
+ WordList const * list = theWordList(*cur.getFont().language());
+ return new TextCompletionList(cur, list);
+}
+
+
+bool Text::insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/)
+{
+ LASSERT(cur.bv().cursor() == cur, /**/);
+ cur.insert(s);
+ cur.bv().cursor() = cur;
+ if (!(cur.result().screenUpdate() & Update::Force))
+ cur.screenUpdateFlags(cur.result().screenUpdate() | Update::SinglePar);
+ return true;
+}
+
+
+docstring Text::completionPrefix(Cursor const & cur) const
+{
+ return previousWord(cur.top());
+}
+
} // namespace lyx