* src/paragraph_funcs.cpp (breakParagraph): change parameter 'flag' to

[lyx.git] / src / insets / InsetERT.cpp

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 9a3e4eb320ac9537c62a2d62267b287376b0202c..1fe2af0af8db88a67729d13930a09de1f96457e2 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -23,6 +23,7 @@
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "Language.h"
+#include "Layout.h"
 #include "Color.h"
 #include "LyXAction.h"
 #include "Lexer.h"
@@ -196,6 +197,9 @@ int InsetERT::docbook(Buffer const &, odocstream & os,
 
 void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
+       BufferParams const & bp = cur.buffer().params();
+       LayoutPtr const layout =
+                       bp.getTextClass().defaultLayout();
        //lyxerr << "\nInsetERT::doDispatch (begin): cmd: " << cmd << endl;
        switch (cmd.action) {
 
@@ -229,9 +233,6 @@ void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
                // attributes.
                // FIXME: Change only the pasted paragraphs
 
-               BufferParams const & bp = cur.buffer().params();
-               LayoutPtr const layout =
-                       bp.getTextClass().defaultLayout();
                Font font = layout->font;
                // ERT contents has always latex_language
                font.setLanguage(latex_language);
@@ -255,10 +256,10 @@ void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
                // start of an existing paragraph get the buffer language
                // and not latex_language, so we take this brute force
                // approach.
-               // FIXME: what to do with those?
-               //text_.current_font.setLanguage(latex_language);
-               //text_.real_current_font.setLanguage(latex_language);
-
+               cur.current_font = layout->font;
+               cur.real_current_font = layout->font;
+               cur.current_font.setLanguage(latex_language);
+               cur.real_current_font.setLanguage(latex_language);
                InsetCollapsable::doDispatch(cur, cmd);
                break;
        }
@@ -301,7 +302,7 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
                case LFUN_FLOAT_WIDE_INSERT:
                case LFUN_WRAP_INSERT:
                case LFUN_FONT_BOLD:
-               case LFUN_FONT_CODE:
+               case LFUN_FONT_TYPEWRITER:
                case LFUN_FONT_DEFAULT:
                case LFUN_FONT_EMPH:
                case LFUN_FONT_FREE_APPLY:
@@ -340,7 +341,7 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
                case LFUN_MENU_OPEN:
                case LFUN_MENU_SEPARATOR_INSERT:
                case LFUN_BRANCH_INSERT:
-               case LFUN_CHARSTYLE_INSERT:
+               case LFUN_FLEX_INSERT:
                case LFUN_NOTE_INSERT:
                case LFUN_BOX_INSERT:
                case LFUN_NOTE_NEXT:
@@ -405,16 +406,13 @@ bool InsetERT::insetAllowed(Inset::Code /* code */) const
 }
 
 
-bool InsetERT::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetERT::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        Font tmpfont = mi.base.font;
        getDrawFont(mi.base.font);
        mi.base.font.realize(tmpfont);
        InsetCollapsable::metrics(mi, dim);
        mi.base.font = tmpfont;
-       bool const changed = dim_ != dim;
-       dim_ = dim;
-       return changed;
 }