X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText3.cpp;h=80f782d8057101f000534312a2ac6f9c3c7deb9b;hb=6c977615633e5e132494b9a7fa778588210f9c95;hp=52f0e0dda6a616d6cde70cd5934266a9363244ce;hpb=701367b4c52e34b0a2b5daf78b9a48c9771b0d94;p=lyx.git diff --git a/src/Text3.cpp b/src/Text3.cpp index 52f0e0dda6..80f782d805 100644 --- a/src/Text3.cpp +++ b/src/Text3.cpp @@ -268,7 +268,7 @@ static void outline(OutlineOp mode, Cursor & cur) DocumentClass const & tc = buf.params().documentClass(); - int const thistoclevel = start->layout()->toclevel; + int const thistoclevel = start->layout().toclevel; int toclevel; // Move out (down) from this section header @@ -276,7 +276,7 @@ static void outline(OutlineOp mode, Cursor & cur) ++finish; // Seek the one (on same level) below for (; finish != end; ++finish) { - toclevel = finish->layout()->toclevel; + toclevel = finish->layout().toclevel; if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel) { break; } @@ -291,7 +291,7 @@ static void outline(OutlineOp mode, Cursor & cur) // Search previous same-level header above do { --dest; - toclevel = dest->layout()->toclevel; + toclevel = dest->layout().toclevel; } while(dest != bgn && (toclevel == Layout::NOT_IN_TOC || toclevel > thistoclevel)); @@ -324,14 +324,15 @@ static void outline(OutlineOp mode, Cursor & cur) pit_type const len = distance(start, finish); buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, pit + len - 1); for (; start != finish; ++start) { - toclevel = start->layout()->toclevel; + toclevel = start->layout().toclevel; if (toclevel == Layout::NOT_IN_TOC) continue; - for (size_t i = 0; i != tc.layoutCount(); ++i) { - LayoutPtr const & lt = tc.layout(i); - if (lt->toclevel == toclevel + 1 && - start->layout()->labeltype == lt->labeltype) { - start->setLayout(lt); + DocumentClass::const_iterator lit = tc.begin(); + DocumentClass::const_iterator len = tc.end(); + for (; lit != len; ++lit) { + if (lit->toclevel == toclevel + 1 && + start->layout().labeltype == lit->labeltype) { + start->setLayout(*lit); break; } } @@ -342,14 +343,15 @@ static void outline(OutlineOp mode, Cursor & cur) pit_type const len = distance(start, finish); buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, pit + len - 1); for (; start != finish; ++start) { - toclevel = start->layout()->toclevel; + toclevel = start->layout().toclevel; if (toclevel == Layout::NOT_IN_TOC) continue; - for (size_t i = 0; i != tc.layoutCount(); ++i) { - LayoutPtr const & lt = tc.layout(i); - if (lt->toclevel == toclevel - 1 && - start->layout()->labeltype == lt->labeltype) { - start->setLayout(lt); + DocumentClass::const_iterator lit = tc.begin(); + DocumentClass::const_iterator len = tc.end(); + for (; lit != len; ++lit) { + if (lit->toclevel == toclevel - 1 && + start->layout().labeltype == lit->labeltype) { + start->setLayout(*lit); break; } } @@ -600,25 +602,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) needsUpdate |= cursorDownParagraph(cur); break; - case LFUN_SCREEN_UP_SELECT: - needsUpdate |= cur.selHandle(true); - if (cur.pit() == 0 && cur.textRow().pos() == 0) - cur.undispatched(); - else { - tm.cursorPrevious(cur); - } - break; - - case LFUN_SCREEN_DOWN_SELECT: - needsUpdate |= cur.selHandle(true); - if (cur.pit() == cur.lastpit() - && cur.textRow().endpos() == cur.lastpos()) - cur.undispatched(); - else { - tm.cursorNext(cur); - } - break; - case LFUN_LINE_BEGIN: case LFUN_LINE_BEGIN_SELECT: needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_BEGIN_SELECT); @@ -842,7 +825,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) /* Paragraph & par = pars_[cur.pit()]; if (inset->lyxCode() == LABEL_CODE - && par.layout()->labeltype == LABEL_COUNTER) { + && par.layout().labeltype == LABEL_COUNTER) { // Go to the end of the paragraph // Warning: Because of Change-Tracking, the last // position is 'size()' and not 'size()-1': @@ -869,7 +852,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) break; case LFUN_SPACE_INSERT: - if (cur.paragraph().layout()->free_spacing) + if (cur.paragraph().layout().free_spacing) insertChar(cur, ' '); else { doInsertInset(cur, this, cmd, false, false); @@ -995,7 +978,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) break; case LFUN_SERVER_GET_LAYOUT: - cur.message(cur.paragraph().layout()->name()); + cur.message(cur.paragraph().layout().name()); break; case LFUN_LAYOUT: { @@ -1003,7 +986,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) LYXERR(Debug::INFO, "LFUN_LAYOUT: (arg) " << to_utf8(layout)); Paragraph const & para = cur.paragraph(); - docstring const old_layout = para.layout()->name(); + docstring const old_layout = para.layout().name(); DocumentClass const & tclass = bv->buffer().params().documentClass(); if (layout.empty()) @@ -1026,7 +1009,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) // If the entry is obsolete, use the new one instead. if (hasLayout) { - docstring const & obs = tclass[layout]->obsoleted_by(); + docstring const & obs = tclass[layout].obsoleted_by(); if (!obs.empty()) layout = obs; } @@ -1045,7 +1028,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) pit_type spit = cur.selBegin().pit(); pit_type epit = cur.selEnd().pit() + 1; while (spit != epit) { - if (pars_[spit].layout()->name() != old_layout) { + if (pars_[spit].layout().name() != old_layout) { change_layout = true; break; } @@ -1090,8 +1073,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) Paragraph & par = cur.paragraph(); pos_type pos = cur.pos(); BufferParams const & bufparams = bv->buffer().params(); - LayoutPtr const & style = par.layout(); - if (!style->pass_thru + Layout const & style = par.layout(); + if (!style.pass_thru && par.getFontSettings(bufparams, pos).language()->lang() != "hebrew") { // this avoids a double undo // FIXME: should not be needed, ideally @@ -1107,14 +1090,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) else c = par.getChar(pos - 1); string arg = to_utf8(cmd.argument()); - if (arg == "single") - cur.insert(new InsetQuotes(c, - bufparams.quotes_language, - InsetQuotes::SingleQ)); - else - cur.insert(new InsetQuotes(c, - bufparams.quotes_language, - InsetQuotes::DoubleQ)); + cur.insert(new InsetQuotes(c, bufparams.quotes_language, + (arg == "single") ? InsetQuotes::SingleQuotes + : InsetQuotes::DoubleQuotes)); cur.posForward(); } else @@ -1430,7 +1408,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case LFUN_INDEX_PRINT: case LFUN_NOMENCL_PRINT: case LFUN_TOC_INSERT: - case LFUN_HFILL_INSERT: case LFUN_LINE_INSERT: case LFUN_NEWPAGE_INSERT: case LFUN_PAGEBREAK_INSERT: @@ -1849,7 +1826,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, return true; case LFUN_BIBITEM_INSERT: - enable = (cur.paragraph().layout()->labeltype == LABEL_BIBLIO + enable = (cur.paragraph().layout().labeltype == LABEL_BIBLIO && cur.pos() == 0); break; @@ -1886,6 +1863,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, code = NOTE_CODE; else if (cmd.argument() == "ref") code = REF_CODE; + else if (cmd.argument() == "space") + code = SPACE_CODE; else if (cmd.argument() == "toc") code = TOC_CODE; else if (cmd.argument() == "vspace") @@ -1961,7 +1940,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_OPTIONAL_INSERT: code = OPTARG_CODE; enable = cur.paragraph().insetList().count(OPTARG_CODE) - < cur.paragraph().layout()->optionalargs; + < cur.paragraph().layout().optionalargs; break; case LFUN_ENVIRONMENT_INSERT: code = BOX_CODE; @@ -1988,7 +1967,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, // always allow this, since we will inset a raw quote // if an inset is not allowed. break; - case LFUN_HFILL_INSERT: case LFUN_SPECIALCHAR_INSERT: code = SPECIALCHAR_CODE; break; @@ -2109,7 +2087,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_OUTLINE_DOWN: case LFUN_OUTLINE_IN: case LFUN_OUTLINE_OUT: - enable = (cur.paragraph().layout()->toclevel != Layout::NOT_IN_TOC); + enable = (cur.paragraph().layout().toclevel != Layout::NOT_IN_TOC); break; case LFUN_WORD_DELETE_FORWARD: @@ -2133,8 +2111,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_DOWN_SELECT: case LFUN_PARAGRAPH_UP_SELECT: case LFUN_PARAGRAPH_DOWN_SELECT: - case LFUN_SCREEN_UP_SELECT: - case LFUN_SCREEN_DOWN_SELECT: case LFUN_LINE_BEGIN_SELECT: case LFUN_LINE_END_SELECT: case LFUN_WORD_FORWARD_SELECT: