X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.cpp;h=c4cac8892ecd726c09a02d1a26e8db10c2d4615d;hb=d4ac337f0bd89c279b2133e2475a662a3ada641b;hp=86fd90360e10d033ae32311c45cfe3ababe7bc68;hpb=a6325095c4ab830a8ebb3b176313b200ebde1dab;p=lyx.git diff --git a/src/Text.cpp b/src/Text.cpp index 86fd90360e..c4cac8892e 100644 --- a/src/Text.cpp +++ b/src/Text.cpp @@ -30,6 +30,7 @@ #include "Cursor.h" #include "CutAndPaste.h" #include "DispatchResult.h" +#include "Encoding.h" #include "ErrorList.h" #include "FuncRequest.h" #include "factory.h" @@ -143,7 +144,7 @@ void breakParagraphConservative(BufferParams const & bparams, tmp.setInsetOwner(&par.inInset()); tmp.makeSameLayout(par); - LASSERT(pos <= par.size(), /**/); + LASSERT(pos <= par.size(), return); if (pos < par.size()) { // move everything behind the break position to the new paragraph @@ -383,10 +384,10 @@ void Text::readParToken(Paragraph & par, Lexer & lex, // 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 + // in this case, default layout maps to empty layout if (layoutname == tclass.defaultLayoutName()) layoutname = tclass.plainLayoutName(); - } else { + } else { // otherwise, the empty layout maps to the default if (layoutname == tclass.plainLayoutName()) layoutname = tclass.defaultLayoutName(); @@ -571,7 +572,7 @@ 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(); } @@ -582,11 +583,11 @@ class TextCompletionList : public CompletionList public: /// TextCompletionList(Cursor const & cur, WordList const * list) - : buffer_(cur.buffer()), pos_(0), list_(list) + : buffer_(cur.buffer()), list_(list) {} /// virtual ~TextCompletionList() {} - + /// virtual bool sorted() const { return true; } /// @@ -599,13 +600,11 @@ public: { return list_->word(idx); } - + private: /// Buffer const * buffer_; /// - size_t pos_; - /// WordList const * list_; }; @@ -613,7 +612,7 @@ private: bool Text::empty() const { return pars_.empty() || (pars_.size() == 1 && pars_[0].empty() - // FIXME: Should we consider the labeled type as empty too? + // FIXME: Should we consider the labeled type as empty too? && pars_[0].layout().labeltype == LABEL_NO_LABEL); } @@ -630,10 +629,10 @@ double Text::spacing(Paragraph const & par) 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_layout == false * - keep current depth and layout when keep_layout == true */ -static void breakParagraph(Text & text, pit_type par_offset, pos_type pos, +static void breakParagraph(Text & text, pit_type par_offset, pos_type pos, bool keep_layout) { BufferParams const & bparams = text.inset().buffer().params(); @@ -726,7 +725,7 @@ static void breakParagraph(Text & text, pit_type par_offset, pos_type pos, void Text::breakParagraph(Cursor & cur, bool inverse_logic) { - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); Paragraph & cpar = cur.paragraph(); pit_type cpit = cur.pit(); @@ -737,8 +736,11 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic) if (cur.lastpos() == 0 && !cpar.allowEmpty()) { if (changeDepthAllowed(cur, DEC_DEPTH)) changeDepth(cur, DEC_DEPTH); - else - setLayout(cur, tclass.defaultLayoutName()); + else { + docstring const & lay = cur.paragraph().usePlainLayout() + ? tclass.plainLayoutName() : tclass.defaultLayoutName(); + setLayout(cur, lay); + } return; } @@ -750,7 +752,7 @@ 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 = layout.isEnvironment() + bool keep_layout = layout.isEnvironment() || (layout.isParagraph() && layout.parbreak_is_newline); if (inverse_logic) keep_layout = !keep_layout; @@ -883,7 +885,7 @@ void Text::insertStringAsParagraphs(Cursor & cur, docstring const & str, // same Paragraph one to the right and make a rebreak void Text::insertChar(Cursor & cur, char_type c) { - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); cur.recordUndo(INSERT_UNDO); @@ -934,40 +936,40 @@ void Text::insertChar(Cursor & cur, char_type c) } // In Bidi text, we want spaces to be treated in a special way: spaces - // which are between words in different languages should get the - // paragraph's language; otherwise, spaces should keep the language + // which are between words in different languages should get the + // paragraph's language; otherwise, spaces should keep the language // they were originally typed in. This is only in effect while typing; // after the text is already typed in, the user can always go back and // explicitly set the language of a space as desired. But 99.9% of the // time, what we're doing here is what the user actually meant. - // + // // The following cases are the ones in which the language of the space // should be changed to match that of the containing paragraph. In the - // depictions, lowercase is LTR, uppercase is RTL, underscore (_) + // depictions, lowercase is LTR, uppercase is RTL, underscore (_) // represents a space, pipe (|) represents the cursor position (so the // character before it is the one just typed in). The different cases // are depicted logically (not visually), from left to right: - // + // // 1. A_a| // 2. a_A| // // Theoretically, there are other situations that we should, perhaps, deal - // with (e.g.: a|_A, A|_a). In practice, though, there really isn't any + // with (e.g.: a|_A, A|_a). In practice, though, there really isn't any // point (to understand why, just try to create this situation...). if ((cur.pos() >= 2) && (par.isLineSeparator(cur.pos() - 1))) { - // get font in front and behind the space in question. But do NOT + // 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 = 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(); - + if (pre_space_rtl != post_space_rtl) { - // Set the space's language to match the language of the + // Set the space's language to match the language of the // adjacent character whose direction is the paragraph's // direction; don't touch other properties of the font - Language const * lang = + Language const * lang = (pre_space_rtl == par.isRTL(buffer.params())) ? pre_space_font.language() : post_space_font.language(); @@ -976,7 +978,7 @@ void Text::insertChar(Cursor & cur, char_type c) par.setFont(cur.pos() - 1, space_font); } } - + // Next check, if there will be two blanks together or a blank at // the beginning of a paragraph. // I decided to handle blanks like normal characters, the main @@ -992,6 +994,7 @@ void Text::insertChar(Cursor & cur, char_type c) "beginning of a paragraph. Please read the Tutorial.")); return; } + // LASSERT: Is it safe to continue here? LASSERT(cur.pos() > 0, /**/); if ((par.isLineSeparator(cur.pos() - 1) || par.isNewline(cur.pos() - 1)) && !par.isDeleted(cur.pos() - 1)) { @@ -1002,6 +1005,16 @@ void Text::insertChar(Cursor & cur, char_type c) } } + // Prevent to insert uncodable characters in verbatim and ERT + // (workaround for bug 9012) + if (cur.paragraph().isPassThru() && cur.current_font.language()) { + Encoding const * e = cur.current_font.language()->encoding(); + if (!e->encodable(c)) { + cur.message(_("Character is uncodable in verbatim paragraphs.")); + return; + } + } + par.insertChar(cur.pos(), c, cur.current_font, cur.buffer()->params().trackChanges); cur.checkBufferStructure(); @@ -1032,7 +1045,7 @@ void Text::charInserted(Cursor & cur) && !par.isWordSeparator(cur.pos() - 2) && par.isWordSeparator(cur.pos() - 1)) { // get the word in front of cursor - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); cur.paragraph().updateWords(); } } @@ -1043,7 +1056,7 @@ void Text::charInserted(Cursor & cur) bool Text::cursorForwardOneWord(Cursor & cur) { - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); pos_type const lastpos = cur.lastpos(); pit_type pit = cur.pit(); @@ -1058,7 +1071,7 @@ bool Text::cursorForwardOneWord(Cursor & cur) return false; } - if (lyxrc.mac_like_word_movement) { + if (lyxrc.mac_like_cursor_movement) { // Skip through trailing punctuation and spaces. while (pos != lastpos && (par.isChar(pos) || par.isSpace(pos))) ++pos; @@ -1069,7 +1082,7 @@ bool Text::cursorForwardOneWord(Cursor & cur) else while (pos != lastpos && !par.isWordSeparator(pos)) ++pos; } else { - LASSERT(pos < lastpos, /**/); // see above + LASSERT(pos < lastpos, return false); // see above if (!par.isWordSeparator(pos)) while (pos != lastpos && !par.isWordSeparator(pos)) ++pos; @@ -1081,7 +1094,7 @@ bool Text::cursorForwardOneWord(Cursor & cur) // Skip over white space while (pos != lastpos && par.isSpace(pos)) - ++pos; + ++pos; } return setCursor(cur, pit, pos); @@ -1090,7 +1103,7 @@ bool Text::cursorForwardOneWord(Cursor & cur) bool Text::cursorBackwardOneWord(Cursor & cur) { - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); pit_type pit = cur.pit(); pos_type pos = cur.pos(); @@ -1100,7 +1113,7 @@ bool Text::cursorBackwardOneWord(Cursor & cur) if (pos == 0 && pit != 0) return setCursor(cur, pit - 1, getPar(pit - 1).size()); - if (lyxrc.mac_like_word_movement) { + if (lyxrc.mac_like_cursor_movement) { // Skip through punctuation and spaces. while (pos != 0 && (par.isChar(pos - 1) || par.isSpace(pos - 1))) --pos; @@ -1131,7 +1144,7 @@ bool Text::cursorBackwardOneWord(Cursor & cur) bool Text::cursorVisLeftOneWord(Cursor & cur) { - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); pos_type left_pos, right_pos; bool left_is_letter, right_is_letter; @@ -1143,9 +1156,9 @@ bool Text::cursorVisLeftOneWord(Cursor & cur) // collect some information about current cursor position temp_cur.getSurroundingPos(left_pos, right_pos); - left_is_letter = + left_is_letter = (left_pos > -1 ? !temp_cur.paragraph().isWordSeparator(left_pos) : false); - right_is_letter = + 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 @@ -1161,14 +1174,14 @@ bool Text::cursorVisLeftOneWord(Cursor & cur) break; } - return setCursor(cur, temp_cur.pit(), temp_cur.pos(), + return setCursor(cur, temp_cur.pit(), temp_cur.pos(), true, temp_cur.boundary()); } bool Text::cursorVisRightOneWord(Cursor & cur) { - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); pos_type left_pos, right_pos; bool left_is_letter, right_is_letter; @@ -1180,9 +1193,9 @@ bool Text::cursorVisRightOneWord(Cursor & cur) // collect some information about current cursor position temp_cur.getSurroundingPos(left_pos, right_pos); - left_is_letter = + left_is_letter = (left_pos > -1 ? !temp_cur.paragraph().isWordSeparator(left_pos) : false); - right_is_letter = + 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 @@ -1192,22 +1205,22 @@ bool Text::cursorVisRightOneWord(Cursor & cur) // 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(), + temp_cur.buffer()->params(), left_pos).isRightToLeft()) || (right_is_letter && !temp_cur.paragraph().getFontSettings( - temp_cur.buffer()->params(), + temp_cur.buffer()->params(), right_pos).isRightToLeft())) break; } - return setCursor(cur, temp_cur.pit(), temp_cur.pos(), + return setCursor(cur, temp_cur.pit(), temp_cur.pos(), true, temp_cur.boundary()); } void Text::selectWord(Cursor & cur, word_location loc) { - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); CursorSlice from = cur.top(); CursorSlice to = cur.top(); getWord(from, to, loc); @@ -1225,14 +1238,14 @@ void Text::selectWord(Cursor & cur, word_location loc) void Text::selectAll(Cursor & cur) { - LASSERT(this == cur.text(), /**/); + LBUFERR(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); + setCursor(cur, 0, 0); } else { setCursor(cur, 0, 0); cur.resetAnchor(); @@ -1246,7 +1259,7 @@ void Text::selectAll(Cursor & cur) // selection is currently set bool Text::selectWordWhenUnderCursor(Cursor & cur, word_location loc) { - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); if (cur.selection()) return false; selectWord(cur, loc); @@ -1256,7 +1269,7 @@ bool Text::selectWordWhenUnderCursor(Cursor & cur, word_location loc) void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op) { - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); if (!cur.selection()) { bool const changed = cur.paragraph().isChanged(cur.pos()); @@ -1295,11 +1308,11 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op) 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 { @@ -1411,7 +1424,7 @@ void Text::rejectChanges() void Text::deleteWordForward(Cursor & cur) { - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); if (cur.lastpos() == 0) cursorForward(cur); else { @@ -1427,7 +1440,7 @@ void Text::deleteWordForward(Cursor & cur) void Text::deleteWordBackward(Cursor & cur) { - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); if (cur.lastpos() == 0) cursorBackward(cur); else { @@ -1444,7 +1457,7 @@ void Text::deleteWordBackward(Cursor & cur) // Kill to end of line. void Text::changeCase(Cursor & cur, TextCase action) { - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); CursorSlice from; CursorSlice to; @@ -1516,7 +1529,7 @@ bool Text::handleBibitems(Cursor & cur) setCursorIntern(cur, prevcur.pit(), prevcur.pos()); cur.screenUpdateFlags(Update::Force); return true; - } + } // otherwise reset to default cur.paragraph().setPlainOrDefaultLayout(bufparams.documentClass()); @@ -1573,7 +1586,7 @@ bool Text::erase(Cursor & cur) bool Text::backspacePos0(Cursor & cur) { - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); if (cur.pit() == 0) return false; @@ -1626,7 +1639,7 @@ bool Text::backspacePos0(Cursor & cur) bool Text::backspace(Cursor & cur) { - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); bool needsUpdate = false; if (cur.pos() == 0) { if (cur.pit() == 0) @@ -1758,7 +1771,7 @@ void Text::write(ostream & os) const } -bool Text::read(Lexer & lex, +bool Text::read(Lexer & lex, ErrorList & errorList, InsetText * insetPtr) { Buffer const & buf = owner_->buffer(); @@ -1815,12 +1828,12 @@ bool Text::read(Lexer & lex, Paragraph par; par.setInsetOwner(insetPtr); par.params().depth(depth); - par.setFont(0, Font(inherit_font, + par.setFont(0, Font(inherit_font, buf.params().language)); par.setPlainOrDefaultLayout(buf.params().documentClass()); pars_.push_back(par); } - + return res; } @@ -1828,7 +1841,7 @@ bool Text::read(Lexer & lex, // Returns the current font and depth as a message. docstring Text::currentState(Cursor const & cur) const { - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); Buffer & buf = *cur.buffer(); Paragraph const & par = cur.paragraph(); odocstringstream os; @@ -1927,7 +1940,7 @@ 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) @@ -2014,7 +2027,7 @@ void Text::forToc(docstring & os, size_t maxlen, bool shorten) const void Text::charsTranspose(Cursor & cur) { - LASSERT(this == cur.text(), /**/); + LBUFERR(this == cur.text()); pos_type pos = cur.pos(); @@ -2090,7 +2103,7 @@ docstring Text::previousWord(CursorSlice const & sl) const getWord(from, to, PREVIOUS_WORD); if (sl == from || to == from) return docstring(); - + Paragraph const & par = sl.paragraph(); return par.asString(from.pos(), to.pos()); } @@ -2113,16 +2126,16 @@ CompletionList const * Text::createCompletionList(Cursor const & cur) const bool Text::insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/) -{ - LASSERT(cur.bv().cursor() == cur, /**/); +{ + LBUFERR(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());