X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.cpp;h=6c899a95e8f7f65d86210de687f785cd7dfa85ce;hb=e2982037d9f981a6070c3cf90148bde33edbfdc9;hp=80357393904089d726e42b5d8e93f63143d5d1d2;hpb=4cd5bcefe9e54468df2454a8f6123526adc50aa0;p=lyx.git diff --git a/src/Text.cpp b/src/Text.cpp index 8035739390..6c899a95e8 100644 --- a/src/Text.cpp +++ b/src/Text.cpp @@ -53,10 +53,9 @@ #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/InsetSpace.h" #include "insets/InsetSpecialChar.h" #include "insets/InsetTabular.h" @@ -259,37 +258,59 @@ Font const Text::outerFont(pit_type par_offset) const } -void acceptChanges(ParagraphList & pars, BufferParams const & bparams) +static void acceptOrRejectChanges(ParagraphList & pars, + BufferParams const & bparams, Text::ChangeOp op) { pit_type pars_size = static_cast(pars.size()); - // first, accept changes within each individual paragraph - // (do not consider end-of-par) + // first, accept or 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].acceptChanges(0, pars[pit].size()); + // 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 imaginary end-of-par characters + // 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].isInserted(pos)) { - pars[pit].setChange(pos, Change(Change::UNCHANGED)); - } else if (pars[pit].isDeleted(pos)) { - if (pit == pars_size - 1) { - // we cannot remove a par break at the end of the last - // paragraph; instead, we mark it unchanged + 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 { - mergeParagraph(bparams, pars, pit); - --pit; - --pars_size; + 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_; @@ -430,20 +451,15 @@ void Text::readParToken(Paragraph & par, Lexer & lex, auto_ptr inset(new InsetTabular(buf)); inset->read(lex); par.insertInset(par.size(), inset.release(), font, change); - } else if (token == "\\lyxline") { - auto_ptr inset; - inset.reset(new InsetLine); - inset->setBuffer(*buf); - par.insertInset(par.size(), inset.release(), 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 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), @@ -503,6 +519,9 @@ void Text::readParagraph(Paragraph & par, Lexer & lex, // Initialize begin_of_body_ on load; redoParagraph maintains par.setBeginOfBody(); + + // mark paragraph for spell checking on load + // par.requestSpellCheck(); } @@ -580,7 +599,6 @@ static void breakParagraph(Text & text, pit_type par_offset, pos_type pos, // 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()); @@ -646,7 +664,6 @@ static void breakParagraph(Text & text, pit_type par_offset, pos_type pos, par.setPlainOrDefaultLayout(bparams.documentClass()); } - // layout stays the same with latex-environments if (keep_layout) { par.setLayout(tmp->layout()); par.setLabelWidthString(tmp->params().labelWidthString()); @@ -682,9 +699,10 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic) 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 @@ -717,10 +735,9 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic) break; // the character couldn't be deleted physically due to change tracking } - cur.buffer()->updateBuffer(); - // 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! @@ -833,7 +850,7 @@ 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() && @@ -841,7 +858,7 @@ void Text::insertChar(Cursor & cur, char_type c) 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 @@ -918,23 +935,17 @@ void Text::insertChar(Cursor & cur, char_type c) // 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; } } @@ -943,7 +954,7 @@ void Text::insertChar(Cursor & cur, char_type c) cur.buffer()->params().trackChanges); cur.checkBufferStructure(); -// cur.updateFlags(Update::Force); +// cur.screenUpdateFlags(Update::Force); bool boundary = cur.boundary() || tm.isRTLBoundary(cur.pit(), cur.pos() + 1); setCursor(cur, cur.pit(), cur.pos() + 1, false, boundary); @@ -1293,8 +1304,8 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op) cur.finishUndo(); cur.clearSelection(); setCursorIntern(cur, begPit, begPos); - cur.updateFlags(Update::Force); - cur.buffer()->updateBuffer(); + cur.screenUpdateFlags(Update::Force); + cur.forceBufferUpdate(); } @@ -1445,9 +1456,9 @@ bool Text::handleBibitems(Cursor & cur) cur.recordUndo(ATOMIC_UNDO, prevcur.pit()); mergeParagraph(bufparams, cur.text()->paragraphs(), prevcur.pit()); - cur.buffer()->updateBuffer(); + cur.forceBufferUpdate(); setCursorIntern(cur, prevcur.pit(), prevcur.pos()); - cur.updateFlags(Update::Force); + cur.screenUpdateFlags(Update::Force); return true; } @@ -1473,7 +1484,7 @@ bool Text::erase(Cursor & cur) cur.top().forwardPos(); if (was_inset) - cur.buffer()->updateBuffer(); + cur.forceBufferUpdate(); else cur.checkBufferStructure(); needsUpdate = true; @@ -1549,7 +1560,7 @@ bool Text::backspacePos0(Cursor & cur) } if (needsUpdate) { - cur.buffer()->updateBuffer(); + cur.forceBufferUpdate(); setCursorIntern(cur, prevcur.pit(), prevcur.pos()); } @@ -1589,7 +1600,7 @@ bool Text::backspace(Cursor & cur) bool const was_inset = cur.paragraph().isInset(cur.pos()); cur.paragraph().eraseChar(cur.pos(), cur.buffer()->params().trackChanges); if (was_inset) - cur.buffer()->updateBuffer(); + cur.forceBufferUpdate(); else cur.checkBufferStructure(); } @@ -1600,7 +1611,7 @@ bool Text::backspace(Cursor & cur) 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; @@ -1645,9 +1656,7 @@ bool Text::dissolveInset(Cursor & cur) cur.pit() = min(cur.lastpit(), spit); cur.pos() = min(cur.lastpos(), spos); } else - // this is the least that needs to be done (bug 6003) - // in the above case, pasteParagraphList handles this - cur.buffer()->updateBuffer(); + cur.forceBufferUpdate(); // Ensure the current language is set correctly (bug 6292) cur.text()->setCursor(cur, cur.pit(), cur.pos()); @@ -1834,10 +1843,11 @@ docstring Text::getPossibleLabel(Cursor const & cur) const 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; @@ -1847,12 +1857,13 @@ docstring Text::getPossibleLabel(Cursor const & cur) const 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... @@ -1866,7 +1877,7 @@ docstring Text::getPossibleLabel(Cursor const & cur) const if (layout->latextype != LATEX_PARAGRAPH) 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) { string const & ftype = static_cast(caption_inset)->type(); @@ -1886,9 +1897,6 @@ docstring Text::getPossibleLabel(Cursor const & cur) const } if (!name.empty()) - // FIXME - // we should allow customization of the separator or else change it - // once we have refstyle text = name + ':' + text; return text; @@ -1913,6 +1921,15 @@ docstring Text::asString(pit_type beg, pit_type end, int options) const } +void Text::forToc(docstring & os, size_t maxlen, bool shorten) const +{ + LASSERT(maxlen > 10, maxlen = 30); + 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) { @@ -2019,8 +2036,8 @@ bool Text::insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/ 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; }