]> git.lyx.org Git - lyx.git/blobdiff - src/bufferview_funcs.C
ws changes only
[lyx.git] / src / bufferview_funcs.C
index 373004ed0ed11db34ac8409ede1d3b5814ff69a6..b1c544bcb958e7b9617004729f988090b464430e 100644 (file)
@@ -3,45 +3,56 @@
  * 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 <config.h>
 
 #include "bufferview_funcs.h"
-#include "BufferView.h"
-#include "paragraph.h"
-#include "lyxfont.h"
-#include "lyxlex.h"
-#include "lyxtext.h"
+
+#include "author.h"
 #include "buffer.h"
-#include "lyx_cb.h"
-#include "language.h"
+#include "bufferparams.h"
+#include "BufferView.h"
 #include "gettext.h"
+#include "language.h"
+#include "LColor.h"
+#include "lyxlex.h"
+#include "lyxrow.h"
+#include "paragraph.h"
 #include "ParagraphParameters.h"
-#include "author.h"
-#include "changes.h"
 
-#include "frontends/LyXView.h"
 #include "frontends/Alert.h"
+#include "frontends/LyXView.h"
+
+#include "insets/insettext.h"
+
+#include "mathed/math_cursor.h"
 
-#include "support/lstrings.h"
-#include "Lsstream.h"
+#include "support/tostr.h"
 
-#include "insets/updatableinset.h"
+#include "support/std_sstream.h"
+
+using lyx::support::bformat;
+
+using std::istringstream;
+using std::ostringstream;
+using std::string;
 
-#include "BoostFormat.h"
 
 namespace {
+
 LyXFont freefont(LyXFont::ALL_IGNORE);
 bool toggleall(false);
+
 }
 
+namespace bv_funcs {
 
 // Set data using font and toggle
 // If successful, returns true
@@ -76,77 +87,67 @@ bool string2font(string const & data, LyXFont & font, bool & toggle)
        LyXLex lex(0,0);
        lex.setStream(is);
 
-       int Int = 0;
-       bool Bool = false;
-       string String;
-                       
        int nset = 0;
        while (lex.isOK()) {
-               lex.next();
-               string const token = lex.getString();
-
-               if (token == "family" ||
-                   token == "series" ||
-                   token == "shape" ||
-                   token == "size" ||
-                   token == "emph" ||
-                   token == "underbar" ||
-                   token == "noun" ||
-                   token == "number" ||
-                   token == "color") {
-                       lex.next();
-                       Int = lex.getInteger();
-               } else if (token == "language") {
-                       lex.next();
-                       String = lex.getString();
-               } else if (token == "toggleall") {
-                       lex.next();
-                       Bool = lex.getBool();
-               } else {
-                       // Unrecognised token
-                       break;
-               }
+               string token;
+               if (lex.next())
+                       token = lex.getString();
 
-               if (!lex.isOK())
+               if (token.empty() || !lex.next())
                        break;
-               ++nset;
 
                if (token == "family") {
-                       font.setFamily(static_cast<LyXFont::FONT_FAMILY>(Int));
-                       
+                       int const next = lex.getInteger();
+                       font.setFamily(LyXFont::FONT_FAMILY(next));
+
                } else if (token == "series") {
-                       font.setSeries(static_cast<LyXFont::FONT_SERIES>(Int));
+                       int const next = lex.getInteger();
+                       font.setSeries(LyXFont::FONT_SERIES(next));
 
                } else if (token == "shape") {
-                       font.setShape(static_cast<LyXFont::FONT_SHAPE>(Int));
+                       int const next = lex.getInteger();
+                       font.setShape(LyXFont::FONT_SHAPE(next));
 
                } else if (token == "size") {
-                       font.setSize(static_cast<LyXFont::FONT_SIZE>(Int));
+                       int const next = lex.getInteger();
+                       font.setSize(LyXFont::FONT_SIZE(next));
 
-               } else if (token == "emph") {
-                       font.setEmph(static_cast<LyXFont::FONT_MISC_STATE>(Int));
+               } else if (token == "emph" || token == "underbar" ||
+                          token == "noun" || token == "number") {
 
-               } else if (token == "underbar") {
-                       font.setUnderbar(static_cast<LyXFont::FONT_MISC_STATE>(Int));
+                       int const next = lex.getInteger();
+                       LyXFont::FONT_MISC_STATE const misc =
+                               LyXFont::FONT_MISC_STATE(next);
 
-               } else if (token == "noun") {
-                       font.setNoun(static_cast<LyXFont::FONT_MISC_STATE>(Int));
-
-               } else if (token == "number") {
-                       font.setNumber(static_cast<LyXFont::FONT_MISC_STATE>(Int));
+                       if (token == "emph")
+                           font.setEmph(misc);
+                       else if (token == "underbar")
+                               font.setUnderbar(misc);
+                       else if (token == "noun")
+                               font.setNoun(misc);
+                       else if (token == "number")
+                               font.setNumber(misc);
 
                } else if (token == "color") {
-                       font.setColor(static_cast<LColor::color>(Int));
+                       int const next = lex.getInteger();
+                       font.setColor(LColor::color(next));
 
                } else if (token == "language") {
-                       if (String == "ignore")
+                       string const next = lex.getString();
+                       if (next == "ignore")
                                font.setLanguage(ignore_language);
                        else
-                               font.setLanguage(languages.getLanguage(String));
+                               font.setLanguage(languages.getLanguage(next));
 
                } else if (token == "toggleall") {
-                       toggle = Bool;
+                       toggle = lex.getBool();
+
+               } else {
+                       // Unrecognised token
+                       break;
                }
+
+               ++nset;
        }
        return (nset > 0);
 }
@@ -212,35 +213,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) {
-               font.setLanguage(lang);
-               toggleAndShow(bv, font);
-       } else
-               Alert::alert(_("Error! unknown language"),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;
+               return false;
 
-       bv->hideCursor();
-       bv->update(BufferView::SELECT);
-       if (decInc >= 0)
-               text->incDepth();
-       else
-               text->decDepth();
+       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,23 +294,25 @@ string const currentState(BufferView * bv)
        if (!bv->available())
                return string();
 
+       if (mathcursor)
+               return mathcursor->info();
+
        ostringstream state;
 
        LyXText * text = bv->getLyXText();
        Buffer * buffer = bv->buffer();
-       LyXCursor const & c(text->cursor);
+       LyXCursor const & c = text->cursor;
 
-       bool const show_change = buffer->params.tracking_changes
-               && c.pos() != c.par()->size()
-               && c.par()->lookupChange(c.pos()) != Change::UNCHANGED;
+       bool const show_change = buffer->params().tracking_changes
+               && text->cursor.pos() != text->cursorPar()->size()
+               && text->cursorPar()->lookupChange(c.pos()) != Change::UNCHANGED;
 
        if (show_change) {
-               Change change(c.par()->lookupChangeFull(c.pos()));
-               Author const & a(bv->buffer()->authors().get(change.author));
+               Change change = text->cursorPar()->lookupChangeFull(c.pos());
+               Author const & a = bv->buffer()->params().authors().get(change.author);
                state << _("Change: ") << a.name();
-               if (!a.email().empty()) {
+               if (!a.email().empty())
                        state << " (" << a.email() << ")";
-               }
                if (change.changetime)
                        state << _(" at ") << ctime(&change.changetime);
                state << " : ";
@@ -322,32 +321,24 @@ string const currentState(BufferView * bv)
        // I think we should only show changes from the default
        // font. (Asger)
        LyXFont font = text->real_current_font;
-       LyXFont const & defaultfont =
-               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
+       font.reduce(buffer->params().getLyXTextClass().defaultfont());
+
+       // 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.
-       if (!text->cursor.par()->params().spacing().isDefault()) {
+       if (!text->cursorPar()->params().spacing().isDefault()) {
                Spacing::Space cur_space =
-                       text->cursor.par()->params().spacing().getSpace();
+                       text->cursorPar()->params().spacing().getSpace();
                state << _(", Spacing: ");
 
                switch (cur_space) {
@@ -362,7 +353,7 @@ string const currentState(BufferView * bv)
                        break;
                case Spacing::Other:
                        state << _("Other (")
-                             << text->cursor.par()->params().spacing().getValue()
+                             << text->cursorPar()->params().spacing().getValue()
                              << ')';
                        break;
                case Spacing::Default:
@@ -371,9 +362,20 @@ string const currentState(BufferView * bv)
                }
        }
 #ifdef DEVEL_VERSION
-       state << _(", Paragraph: ") << text->cursor.par()->id();
+       state << _(", Paragraph: ") << text->cursorPar()->id();
+       state << _(", Position: ") << text->cursor.pos();
+       RowList::iterator rit = text->cursorRow();
+       state << bformat(_(", Row b:%1$d e:%2$d"), rit->pos(), rit->end());
+       state << _(", Inset: ");
+       InsetOld * inset = text->cursorPar()->inInset();
+       if (inset)
+               state << inset << " id: " << inset->id()
+                     << " text: " << inset->getLyXText(bv, true)
+                                               << " owner: " << inset->owner();
+       else
+               state << -1;
 #endif
-       return STRCONV(state.str());
+       return state.str();
 }
 
 
@@ -391,23 +393,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->cursorPar(), *bv->buffer(),
+                       text->cursorRow());
                if (cursor.boundary() !=
-                   text->isBoundary(bv->buffer(), cursor.par(), cursor.pos(),
+                   text->isBoundary(*bv->buffer(), *text->cursorPar(), 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