X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferview_funcs.C;h=1742f69441c020af5e37ae6eb58933d8388546aa;hb=f268743f8c014ef2dadd260fd1a3873cb1d2038b;hp=0afd78ff67db75ccdf2bf56254ac25ba21d1f1c2;hpb=c0156b402f4b344fb54f61f28b9dac054a9aea5d;p=lyx.git diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C index 0afd78ff67..1742f69441 100644 --- a/src/bufferview_funcs.C +++ b/src/bufferview_funcs.C @@ -3,12 +3,12 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean-Marc Lasgouttes * \author John Levon * \author Angus Leeming * - * Full author contact details are available in file CREDITS + * Full author contact details are available in file CREDITS. */ #include @@ -29,19 +29,27 @@ #include "frontends/LyXView.h" #include "frontends/Alert.h" +#include "mathed/math_cursor.h" -#include "support/lstrings.h" +#include "support/tostr.h" #include "Lsstream.h" #include "insets/updatableinset.h" +#include "insets/insettext.h" +#include +#include + +using namespace lyx::support; -#include "support/BoostFormat.h" namespace { + LyXFont freefont(LyXFont::ALL_IGNORE); bool toggleall(false); + } +namespace bv_funcs { // Set data using font and toggle // If successful, returns true @@ -63,7 +71,7 @@ bool font2string(LyXFont const & font, bool toggle, string & data) << "color " << font.color() << '\n' << "language " << lang << '\n' << "toggleall " << tostr(toggle); - data = os.str(); + data = STRCONV(os.str()); return true; } @@ -72,7 +80,7 @@ bool font2string(LyXFont const & font, bool toggle, string & data) // If successful, returns true bool string2font(string const & data, LyXFont & font, bool & toggle) { - istringstream is(data); + istringstream is(STRCONV(data)); LyXLex lex(0,0); lex.setStream(is); @@ -87,34 +95,26 @@ bool string2font(string const & data, LyXFont & font, bool & toggle) if (token == "family") { int const next = lex.getInteger(); - LyXFont::FONT_FAMILY const family = - static_cast(next); - font.setFamily(family); + font.setFamily(LyXFont::FONT_FAMILY(next)); } else if (token == "series") { int const next = lex.getInteger(); - LyXFont::FONT_SERIES const series = - static_cast(next); - font.setSeries(series); + font.setSeries(LyXFont::FONT_SERIES(next)); } else if (token == "shape") { int const next = lex.getInteger(); - LyXFont::FONT_SHAPE const shape = - static_cast(next); - font.setShape(shape); + font.setShape(LyXFont::FONT_SHAPE(next)); } else if (token == "size") { int const next = lex.getInteger(); - LyXFont::FONT_SIZE const size = - static_cast(next); - font.setSize(size); + font.setSize(LyXFont::FONT_SIZE(next)); } else if (token == "emph" || token == "underbar" || token == "noun" || token == "number") { int const next = lex.getInteger(); LyXFont::FONT_MISC_STATE const misc = - static_cast(next); + LyXFont::FONT_MISC_STATE(next); if (token == "emph") font.setEmph(misc); @@ -127,9 +127,7 @@ bool string2font(string const & data, LyXFont & font, bool & toggle) } else if (token == "color") { int const next = lex.getInteger(); - LColor::color const color = - static_cast(next); - font.setColor(color); + font.setColor(LColor::color(next)); } else if (token == "language") { string const next = lex.getString(); @@ -212,35 +210,31 @@ void number(BufferView * bv) toggleAndShow(bv, font); } + void lang(BufferView * bv, string const & l) { - LyXFont font(LyXFont::ALL_IGNORE); Language const * lang = languages.getLanguage(l); if (!lang) return; + LyXFont font(LyXFont::ALL_IGNORE); font.setLanguage(lang); toggleAndShow(bv, font); } -// Change environment depth. -// if decInc >= 0, increment depth -// if decInc < 0, decrement depth -void changeDepth(BufferView * bv, LyXText * text, int decInc) +bool changeDepth(BufferView * bv, LyXText * text, DEPTH_CHANGE type, bool test_only) { if (!bv->available() || !text) - return; - - bv->hideCursor(); - bv->update(BufferView::SELECT); - if (decInc >= 0) - text->incDepth(); - else - text->decDepth(); + return false; + + if (test_only) + return text->changeDepth(type, true); + + bool const changed = text->changeDepth(type, false); if (text->inset_owner) - bv->updateInset((Inset *)text->inset_owner); - bv->update(BufferView::SELECT); + bv->updateInset(text->inset_owner); + return changed; } @@ -297,6 +291,9 @@ string const currentState(BufferView * bv) if (!bv->available()) return string(); + if (mathcursor) + return mathcursor->info(); + ostringstream state; LyXText * text = bv->getLyXText(); @@ -326,22 +323,16 @@ string const currentState(BufferView * bv) buffer->params.getLyXTextClass().defaultfont(); font.reduce(defaultfont); -#if USE_BOOST_FORMAT - state << boost::format(_("Font: %1$s")) % font.stateText(&buffer->params); -#else - state << _("Font: ") << font.stateText(&buffer->params); -#endif + // avoid _(...) re-entrance problem + string const s = font.stateText(&buffer->params); + state << bformat(_("Font: %1$s"), s); + + // state << bformat(_("Font: %1$s"), font.stateText(&buffer->params)); // The paragraph depth int depth = text->getDepth(); - if (depth > 0) { -#if USE_BOOST_FORMAT - state << boost::format(_(", Depth: %1$d")) % depth; -#else - state << _(", Depth: ") << depth; -#endif - } - + if (depth > 0) + state << bformat(_(", Depth: %1$s"), tostr(depth)); // The paragraph spacing, but only if different from // buffer spacing. @@ -372,6 +363,8 @@ string const currentState(BufferView * bv) } #ifdef DEVEL_VERSION state << _(", Paragraph: ") << text->cursor.par()->id(); + state << " Inset: " << + (text->cursor.par()->inInset() ? text->cursor.par()->inInset()->id() : -1); #endif return STRCONV(state.str()); } @@ -391,23 +384,30 @@ void toggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall) } LyXText * text = bv->getLyXText(); - // FIXME: can this happen ?? - if (!text) - return; - - bv->hideCursor(); - bv->update(text, BufferView::SELECT); text->toggleFree(font, toggleall); - bv->update(text, BufferView::SELECT); + bv->update(); if (font.language() != ignore_language || font.number() != LyXFont::IGNORE) { LyXCursor & cursor = text->cursor; - text->computeBidiTables(bv->buffer(), *cursor.row()); + text->computeBidiTables(text->cursor.par(), *bv->buffer(), + text->cursorRow()); if (cursor.boundary() != - text->isBoundary(bv->buffer(), cursor.par(), cursor.pos(), + text->isBoundary(*bv->buffer(), *cursor.par(), cursor.pos(), text->real_current_font)) text->setCursor(cursor.par(), cursor.pos(), false, !cursor.boundary()); } } + + +// deletes a selection during an insertion +void replaceSelection(LyXText * lt) +{ + if (lt->selection.set()) { + lt->cutSelection(true, false); + lt->bv()->update(); + } +} + +}; // namespace bv_funcs