X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.cpp;h=8e0d1beefda5a64ada774e747f6f67832ca7aab7;hb=2de30c62f8d671a8c8d4d52a6a7310e2c5ca84de;hp=e6905ad026133bb3f0b352c3d292225351c767f6;hpb=0437d8dc1a75f60406a818e49efd3c8c9b489294;p=lyx.git diff --git a/src/Text.cpp b/src/Text.cpp index e6905ad026..8e0d1beefd 100644 --- a/src/Text.cpp +++ b/src/Text.cpp @@ -69,6 +69,7 @@ #include "support/lyxalgo.h" #include "support/lyxtime.h" #include "support/textutils.h" +#include "support/unique_ptr.h" #include @@ -187,9 +188,8 @@ Text::Text(InsetText * owner, bool use_default_layout) Text::Text(InsetText * owner, Text const & text) - : owner_(owner) + : owner_(owner), pars_(text.pars_) { - pars_ = text.pars_; ParagraphList::iterator const end = pars_.end(); ParagraphList::iterator it = pars_.begin(); for (; it != end; ++it) @@ -376,8 +376,8 @@ void Text::readParToken(Paragraph & par, Lexer & lex, 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())); + errorList.push_back(ErrorItem(_("Layout Not Found"), s, + {par.id(), 0}, {par.id(), -1})); } par.setLayout(bp.documentClass()[layoutname]); @@ -403,7 +403,7 @@ void Text::readParToken(Paragraph & par, Lexer & lex, lex.eatLine(); docstring line = lex.getDocString(); errorList.push_back(ErrorItem(_("Unknown Inset"), line, - par.id(), 0, par.size())); + {par.id(), 0}, {par.id(), -1})); } } else if (token == "\\family") { lex.next(); @@ -464,8 +464,7 @@ void Text::readParToken(Paragraph & par, Lexer & lex, } else if (token == "\\SpecialChar" || (token == "\\SpecialCharNoPassThru" && !par.layout().pass_thru && !inset().isPassThru())) { - auto_ptr inset; - inset.reset(new InsetSpecialChar); + auto inset = make_unique(); inset->read(lex); inset->setBuffer(*buf); par.insertInset(par.size(), inset.release(), font, change); @@ -474,8 +473,7 @@ void Text::readParToken(Paragraph & par, Lexer & lex, docstring const s = ltrim(lex.getDocString(), "\\"); par.insert(par.size(), s, font, change); } else if (token == "\\IPAChar") { - auto_ptr inset; - inset.reset(new InsetIPAChar); + auto inset = make_unique(); inset->read(lex); inset->setBuffer(*buf); par.insertInset(par.size(), inset.release(), font, change); @@ -500,7 +498,7 @@ void Text::readParToken(Paragraph & par, Lexer & lex, } else if (token == "\\backslash") { par.appendChar('\\', font, change); } else if (token == "\\LyXTable") { - auto_ptr inset(new InsetTabular(buf)); + auto inset = make_unique(buf); inset->read(lex); par.insertInset(par.size(), inset.release(), font, change); } else if (token == "\\change_unchanged") { @@ -522,8 +520,7 @@ void Text::readParToken(Paragraph & par, Lexer & lex, "missing until the corresponding tracked changes " "are merged or this user edits the file again.\n"), aid), - par.id(), par.size(), par.size() + 1 - )); + {par.id(), par.size()}, {par.id(), par.size() + 1})); bp.addAuthor(Author(aid)); } if (token == "\\change_inserted") @@ -533,9 +530,10 @@ void Text::readParToken(Paragraph & par, Lexer & lex, } else { lex.eatLine(); errorList.push_back(ErrorItem(_("Unknown token"), - bformat(_("Unknown token: %1$s %2$s\n"), from_utf8(token), - lex.getDocString()), - par.id(), 0, par.size())); + bformat(_("Unknown token: %1$s %2$s\n"), + from_utf8(token), + lex.getDocString()), + {par.id(), 0}, {par.id(), -1})); } } @@ -588,7 +586,7 @@ class TextCompletionList : public CompletionList { public: /// - TextCompletionList(Cursor const & cur, WordList const * list) + TextCompletionList(Cursor const & cur, WordList const & list) : buffer_(cur.buffer()), list_(list) {} /// @@ -599,19 +597,19 @@ public: /// virtual size_t size() const { - return list_->size(); + return list_.size(); } /// virtual docstring const & data(size_t idx) const { - return list_->word(idx); + return list_.word(idx); } private: /// Buffer const * buffer_; /// - WordList const * list_; + WordList const & list_; }; @@ -740,12 +738,17 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic) Layout const & layout = cpar.layout(); if (cur.lastpos() == 0 && !cpar.allowEmpty()) { - if (changeDepthAllowed(cur, DEC_DEPTH)) + if (changeDepthAllowed(cur, DEC_DEPTH)) { changeDepth(cur, DEC_DEPTH); - else { + pit_type const prev = depthHook(cpit, cpar.getDepth()); + docstring const & lay = pars_[prev].layout().name(); + if (lay != layout.name()) + setLayout(cur, lay); + } else { docstring const & lay = cur.paragraph().usePlainLayout() ? tclass.plainLayoutName() : tclass.defaultLayoutName(); - setLayout(cur, lay); + if (lay != layout.name()) + setLayout(cur, lay); } return; } @@ -907,11 +910,11 @@ void Text::insertChar(Cursor & cur, char_type c) if (lyxrc.auto_number) { static docstring const number_operators = from_ascii("+-/*"); static docstring const number_unary_operators = from_ascii("+-"); - static docstring const number_seperators = from_ascii(".,:"); + static docstring const number_separators = from_ascii(".,:"); if (cur.current_font.fontInfo().number() == FONT_ON) { if (!isDigitASCII(c) && !contains(number_operators, c) && - !(contains(number_seperators, c) && + !(contains(number_separators, c) && cur.pos() != 0 && cur.pos() != cur.lastpos() && tm.displayFont(pit, cur.pos()).fontInfo().number() == FONT_ON && @@ -932,7 +935,7 @@ void Text::insertChar(Cursor & cur, char_type c) ) { setCharFont(pit, cur.pos() - 1, cur.current_font, tm.font_); - } else if (contains(number_seperators, c) + } else if (contains(number_separators, c) && cur.pos() >= 2 && tm.displayFont(pit, cur.pos() - 2).fontInfo().number() == FONT_ON) { setCharFont(pit, cur.pos() - 1, cur.current_font, @@ -1587,6 +1590,7 @@ bool Text::erase(Cursor & cur) return dissolveInset(cur); if (!par.isMergedOnEndOfParDeletion(cur.buffer()->params().track_changes)) { + cur.recordUndo(DELETE_UNDO); par.setChange(cur.pos(), Change(Change::DELETED)); cur.forwardPos(); needsUpdate = true; @@ -1601,7 +1605,7 @@ bool Text::erase(Cursor & cur) if (needsUpdate) { // 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()); + cur.top().setPitPos(cur.pit(), cur.pos()); cur.checkBufferStructure(); } @@ -1708,7 +1712,7 @@ bool Text::backspace(Cursor & cur) // A singlePar update is not enough in this case. // cur.screenUpdateFlags(Update::Force); - setCursor(cur.top(), cur.pit(), cur.pos()); + cur.top().setPitPos(cur.pit(), cur.pos()); return needsUpdate; } @@ -2152,7 +2156,7 @@ bool Text::completionSupported(Cursor const & cur) const CompletionList const * Text::createCompletionList(Cursor const & cur) const { - WordList const * list = theWordList(cur.getFont().language()->lang()); + WordList const & list = theWordList(cur.getFont().language()->lang()); return new TextCompletionList(cur, list); }