#include "ErrorList.h"
#include "FuncRequest.h"
#include "factory.h"
+#include "InsetList.h"
#include "Language.h"
+#include "Layout.h"
#include "Length.h"
#include "Lexer.h"
#include "lyxfind.h"
#include "LyXRC.h"
#include "Paragraph.h"
-#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "ParIterator.h"
#include "TextClass.h"
#include "TextMetrics.h"
-#include "VSpace.h"
#include "WordLangTuple.h"
#include "WordList.h"
#include "insets/InsetText.h"
#include "insets/InsetBibitem.h"
#include "insets/InsetCaption.h"
-#include "insets/InsetLine.h"
#include "insets/InsetNewline.h"
#include "insets/InsetNewpage.h"
-#include "insets/InsetOptArg.h"
+#include "insets/InsetArgument.h"
+#include "insets/InsetIPAMacro.h"
#include "insets/InsetSpace.h"
#include "insets/InsetSpecialChar.h"
#include "insets/InsetTabular.h"
+#include "support/convert.h"
#include "support/debug.h"
#include "support/docstream.h"
#include "support/gettext.h"
#include <boost/next_prior.hpp>
+#include <limits>
#include <sstream>
+
+// TODO: replace if in Text::readParToken() with compile time switch
+#if 0
+
+#include "support/metahash.h"
+
+typedef boost::mpl::string<'\\end','_lay','out'> end_layout;
+typedef boost::mpl::string<'\\end','in','set'> end_inset;
+
+void foo()
+{
+ std::string token = "\\end_layout";
+
+ switch (boost::hash_value(token)) {
+ case lyx::support::hash_string<end_layout>::value:
+ return;
+ case lyx::support::hash_string<end_inset>::value:
+ return;
+ default: ;
+ };
+
+}
+#endif
+
+
using namespace std;
using namespace lyx::support;
using cap::cutSelection;
using cap::pasteParagraphList;
-namespace {
+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(), /**/);
-void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
+ 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));
+}
+
+
+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;
+ depth_type prev_par_depth = 0;
+ // Resolve against environment font information
+ while (par_offset != pit_type(pars_.size())
+ && par_depth != prev_par_depth
+ && par_depth
+ && !tmpfont.resolved()) {
+ prev_par_depth = par_depth;
+ 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] != '\\') {
docstring dstr = lex.getDocString();
if (layoutname.empty())
layoutname = tclass.defaultLayoutName();
- if (par.forcePlainLayout()) {
+ if (owner_->forcePlainLayout()) {
// in this case only the empty layout is allowed
layoutname = tclass.plainLayoutName();
} else if (par.usePlainLayout()) {
// 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);
+ bool const added_one = tclass.addLayoutIfNeeded(layoutname);
+ if (added_one) {
+ // Warn the user.
+ docstring const s = bformat(_("Layout `%1$s' was not found."), layoutname);
+ errorList.push_back(
+ ErrorItem(_("Layout Not Found"), s, par.id(), 0, par.size()));
+ }
par.setLayout(bp.documentClass()[layoutname]);
}
} else if (token == "\\numeric") {
lex.next();
- font.fontInfo().setNumber(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setNumber(setLyXMisc(lex.getString()));
} else if (token == "\\emph") {
lex.next();
- font.fontInfo().setEmph(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setEmph(setLyXMisc(lex.getString()));
} else if (token == "\\bar") {
lex.next();
string const tok = lex.getString();
"`$$Token'");
} else if (token == "\\strikeout") {
lex.next();
- font.fontInfo().setStrikeout(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setStrikeout(setLyXMisc(lex.getString()));
} else if (token == "\\uuline") {
lex.next();
- font.fontInfo().setUuline(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setUuline(setLyXMisc(lex.getString()));
} else if (token == "\\uwave") {
lex.next();
- font.fontInfo().setUwave(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setUwave(setLyXMisc(lex.getString()));
} else if (token == "\\noun") {
lex.next();
- font.fontInfo().setNoun(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setNoun(setLyXMisc(lex.getString()));
} else if (token == "\\color") {
lex.next();
setLyXColor(lex.getString(), font.fontInfo());
} else if (token == "\\SpecialChar") {
- auto_ptr<Inset> inset;
- inset.reset(new InsetSpecialChar);
- inset->read(lex);
- par.insertInset(par.size(), inset.release(),
- font, change);
+ 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 == "\\IPAChar") {
+ auto_ptr<Inset> inset;
+ inset.reset(new InsetIPAChar);
+ 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(const_cast<Buffer &>(buf)));
+ auto_ptr<Inset> inset(new InsetTabular(buf));
inset->read(lex);
par.insertInset(par.size(), inset.release(), font, change);
- } else if (token == "\\lyxline") {
- par.insertInset(par.size(), new InsetLine, font, change);
} else if (token == "\\change_unchanged") {
change = Change(Change::UNCHANGED);
} else if (token == "\\change_inserted" || token == "\\change_deleted") {
lex.eatLine();
istringstream is(lex.getString());
- unsigned int aid;
+ int aid;
time_t ct;
is >> aid >> ct;
- map<unsigned int, int> const & am = bp.author_map;
+ BufferParams::AuthorMap const & am = bp.author_map;
if (am.find(aid) == am.end()) {
errorList.push_back(ErrorItem(_("Change tracking error"),
bformat(_("Unknown author index for change: %1$d\n"), aid),
}
-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();
// 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)
- : buffer_(cur.buffer()), pos_(0)
+ TextCompletionList(Cursor const & cur, WordList const * list)
+ : buffer_(cur.buffer()), pos_(0), list_(list)
{}
///
virtual ~TextCompletionList() {}
///
virtual size_t size() const
{
- return theWordList().size();
+ return list_->size();
}
///
virtual docstring const & data(size_t idx) const
{
- return theWordList().word(idx);
+ return list_->word(idx);
}
private:
Buffer const * buffer_;
///
size_t pos_;
+ ///
+ WordList const * list_;
};
}
-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();
}
+/**
+ * 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)
+{
+ 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());
+
+ 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());
+ }
+
+ bool const isempty = (par.allowEmpty() && par.empty());
+
+ 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());
+
+ // 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;
+
+ 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));
+
+ 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);
+ }
+
+ return;
+ }
+
+ 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 (keep_layout) {
+ par.setLayout(tmp->layout());
+ par.setLabelWidthString(tmp->params().labelWidthString());
+ par.params().depth(tmp->params().depth());
+ }
+}
+
+
void Text::breakParagraph(Cursor & cur, bool inverse_logic)
{
LASSERT(this == cur.text(), /**/);
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);
+ cur.recordUndo();
// Always break behind a space
// It is better to erase the space (Dekel)
cpar.eraseChar(cur.pos(), cur.buffer()->params().trackChanges);
// What should the layout for the new paragraph be?
- bool keep_layout = inverse_logic ?
- !layout.isEnvironment()
- : layout.isEnvironment();
+ bool keep_layout = layout.isEnvironment()
+ || (layout.isParagraph() && layout.parbreak_is_newline);
+ if (inverse_logic)
+ keep_layout = !keep_layout;
// We need to remember this before we break the paragraph, because
// that invalidates the layout variable
// 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(), keep_layout);
+ lyx::breakParagraph(*this, cpit, cur.pos(), keep_layout);
// After this, neither paragraph contains any rows!
break; // the character couldn't be deleted physically due to change tracking
}
- cur.buffer()->updateLabels();
-
// 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(Cursor & cur, docstring const & str,
+ Font const & font)
+{
+ BufferParams const & bparams = owner_->buffer().params();
+ pit_type pit = cur.pit();
+ pos_type pos = cur.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 == ' ');
+ }
+ }
+ setCursor(cur, pit, pos);
+}
+
+
+// turn double CR to single CR, others are converted into one
+// blank. Then insertStringAsLines is called
+void Text::insertStringAsParagraphs(Cursor & cur, 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(cur, 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)
static docstring const number_seperators = from_ascii(".,:");
if (cur.current_font.fontInfo().number() == FONT_ON) {
- if (!isDigit(c) && !contains(number_operators, c) &&
+ if (!isDigitASCII(c) && !contains(number_operators, c) &&
!(contains(number_seperators, c) &&
cur.pos() != 0 &&
cur.pos() != cur.lastpos() &&
tm.displayFont(pit, cur.pos() - 1).fontInfo().number() == FONT_ON)
)
number(cur); // Set current_font.number to OFF
- } else if (isDigit(c) &&
+ } else if (isDigitASCII(c) &&
cur.real_current_font.isVisibleRightToLeft()) {
number(cur); // Set current_font.number to ON
|| par.isSeparator(cur.pos() - 2)
|| par.isNewline(cur.pos() - 2))
) {
- setCharFont(buffer, pit, cur.pos() - 1, cur.current_font,
+ setCharFont(pit, cur.pos() - 1, cur.current_font,
tm.font_);
} else if (contains(number_seperators, c)
&& cur.pos() >= 2
&& tm.displayFont(pit, cur.pos() - 2).fontInfo().number() == FONT_ON) {
- setCharFont(buffer, pit, cur.pos() - 1, cur.current_font,
+ setCharFont(pit, cur.pos() - 1, cur.current_font,
tm.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;
}
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;
}
}
cur.buffer()->params().trackChanges);
cur.checkBufferStructure();
-// cur.updateFlags(Update::Force);
- bool boundary = tm.isRTLBoundary(cur.pit(), cur.pos() + 1);
+// 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);
}
// 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 {
cur.finishUndo();
- counter = 0;
+ undo_counter_ = 0;
}
// register word if a non-letter was entered
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);
}
LASSERT(this == cur.text(), /**/);
if (!cur.selection()) {
- Change const & change = cur.paragraph().lookupChange(cur.pos());
- if (!(change.changed() && findNextChange(&cur.bv())))
+ bool const changed = cur.paragraph().isChanged(cur.pos());
+ if (!(changed && findNextChange(&cur.bv())))
return;
}
pos_type left = (pit == begPit ? begPos : 0);
pos_type right = (pit == endPit ? endPos : parSize);
-
+
+ if (left == right)
+ // there is no change here
+ continue;
+
if (op == ACCEPT) {
pars_[pit].acceptChanges(left, right);
} else {
cur.finishUndo();
cur.clearSelection();
setCursorIntern(cur, begPit, begPos);
- cur.updateFlags(Update::Force);
- cur.buffer()->updateLabels();
+ 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
cur.recordUndo(ATOMIC_UNDO, prevcur.pit());
mergeParagraph(bufparams, cur.text()->paragraphs(),
prevcur.pit());
- cur.buffer()->updateLabels();
+ cur.forceBufferUpdate();
setCursorIntern(cur, prevcur.pit(), prevcur.pos());
- cur.updateFlags(Update::Force);
+ cur.screenUpdateFlags(Update::Force);
return true;
}
cur.top().forwardPos();
if (was_inset)
- cur.buffer()->updateLabels();
+ cur.forceBufferUpdate();
else
cur.checkBufferStructure();
needsUpdate = true;
}
if (needsUpdate) {
- cur.buffer()->updateLabels();
+ cur.forceBufferUpdate();
setCursorIntern(cur, prevcur.pit(), prevcur.pos());
}
bool const was_inset = cur.paragraph().isInset(cur.pos());
cur.paragraph().eraseChar(cur.pos(), cur.buffer()->params().trackChanges);
if (was_inset)
- cur.buffer()->updateLabels();
+ cur.forceBufferUpdate();
else
cur.checkBufferStructure();
}
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;
{
LASSERT(this == cur.text(), return false);
- if (isMainText(cur.bv().buffer()) || cur.inset().nargs() != 1)
+ if (isMainText() || cur.inset().nargs() != 1)
return false;
cur.recordUndoInset();
spit += cur.pit();
Buffer & b = *cur.buffer();
cur.paragraph().eraseChar(cur.pos(), b.params().trackChanges);
+
if (!plist.empty()) {
+ // see bug 7319
+ // we clear the cache so that we won't get conflicts with labels
+ // that get pasted into the buffer. we should update this before
+ // its being empty matters. if not (i.e., if we encounter bugs),
+ // then this should instead be:
+ // cur.buffer().updateBuffer();
+ // but we'll try the cheaper solution here.
+ cur.buffer()->clearReferenceCache();
+
// ERT paragraphs have the Language latex_language.
// This is invalid outside of ERT, so we need to
// change it to the buffer language.
ParagraphList::iterator it = plist.begin();
ParagraphList::iterator it_end = plist.end();
- for (; it != it_end; it++)
+ for (; it != it_end; ++it)
it->changeLanguage(b.params(), latex_language, b.language());
pasteParagraphList(cur, plist, b.params().documentClassPtr(),
cur.pit() = min(cur.lastpit(), spit);
cur.pos() = min(cur.lastpos(), spos);
}
+
+ 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;
}
-void Text::write(Buffer const & buf, 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;
}
-bool Text::read(Buffer const & buf, Lexer & lex,
+bool Text::read(Lexer & lex,
ErrorList & errorList, InsetText * insetPtr)
{
+ Buffer const & buf = owner_->buffer();
depth_type depth = 0;
bool res = true;
par.params().depth(depth);
par.setFont(0, Font(inherit_font, buf.params().language));
pars_.push_back(par);
-
- // FIXME: goddamn InsetTabular makes us pass a Buffer
- // not BufferParams
- lyx::readParagraph(buf, pars_.back(), lex, errorList);
+ readParagraph(pars_.back(), lex, errorList);
// register the words in the global word list
- CursorSlice sl = CursorSlice(*insetPtr);
- sl.pit() = pars_.size() - 1;
pars_.back().updateWords();
} else if (token == "\\begin_deeper") {
++depth;
return res;
}
+
// Returns the current font and depth as a message.
docstring Text::currentState(Cursor const & cur) const
{
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())
docstring text;
docstring par_text = pars_[pit].asString();
- string piece;
- // the return string of math matrices might contain linebreaks
+
+ // The return string of math matrices might contain linebreaks
par_text = subst(par_text, '\n', '-');
- for (int i = 0; i < lyxrc.label_init_length; ++i) {
+ 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)
- name = from_ascii(layout->latexname());
+ name = layout->refprefix;
- // for captions, we just take the caption type
+ // For captions, we just take the caption type
Inset * caption_inset = cur.innerInsetOfType(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()) {
- InsetCode const codes[] = {
- FLOAT_CODE,
- WRAP_CODE,
- 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;
- }
+ 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;
+ text = name + ':' + text;
+
+ // We need a unique label
+ docstring label = text;
+ int i = 1;
+ while (cur.buffer()->insetLabel(label)) {
+ label = text + '-' + convert<docstring>(i);
+ ++i;
+ }
- return text;
+ return label;
}
}
+void Text::forToc(docstring & os, size_t maxlen, bool shorten) const
+{
+ if (maxlen == 0)
+ maxlen = std::numeric_limits<std::size_t>::max();
+ else
+ LASSERT(maxlen >= 8, maxlen = TOC_ENTRY_LENGTH);
+ for (size_t i = 0; i != pars_.size() && os.length() < maxlen; ++i)
+ pars_[i].forToc(os, maxlen);
+ if (shorten && os.length() >= maxlen)
+ os = os.substr(0, maxlen - 3) + from_ascii("...");
+}
+
void Text::charsTranspose(Cursor & cur)
{
CompletionList const * Text::createCompletionList(Cursor const & cur) const
{
- return new TextCompletionList(cur);
+ WordList const * list = theWordList(*cur.getFont().language());
+ return new TextCompletionList(cur, list);
}
LASSERT(cur.bv().cursor() == cur, /**/);
cur.insert(s);
cur.bv().cursor() = cur;
- if (!(cur.disp_.update() & Update::Force))
- cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+ if (!(cur.result().screenUpdate() & Update::Force))
+ cur.screenUpdateFlags(cur.result().screenUpdate() | Update::SinglePar);
return true;
}