More requires --> required, for C++2a.

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

diff --git a/src/insets/InsetScript.cpp b/src/insets/InsetScript.cpp
index fec226fe3a52b6c2f6ce53becde410bf82d68b0b..f87f6c474765f4a6b6888b442f8580cb69f4dbc8 100644 (file)
--- a/src/insets/InsetScript.cpp
+++ b/src/insets/InsetScript.cpp
@@ -81,7 +81,7 @@ ScriptTranslatorLoc const & scripttranslator_loc()
        return translator;
 }
 
-} // anon
+} // namespace
 
 
 InsetScriptParams::InsetScriptParams()
@@ -160,6 +160,8 @@ Inset::DisplayType InsetScript::display() const
 void InsetScript::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        int const shift = params_.shift(mi.base.font);
+       // Remember the value of the outser font, so that it can be used in cursorPos.
+       outer_font_ = mi.base.font;
        Changer dummy = mi.base.changeScript();
        InsetText::metrics(mi, dim);
        dim.asc -= shift;
@@ -178,8 +180,7 @@ void InsetScript::draw(PainterInfo & pi, int x, int y) const
 void InsetScript::cursorPos(BufferView const & bv,
                CursorSlice const & sl, bool boundary, int & x, int & y) const
 {
-       Font const font = bv.textMetrics(&text()).displayFont(sl.pit(), sl.pos());
-       int const shift = params_.shift(font.fontInfo());
+       int const shift = params_.shift(outer_font_);
        InsetText::cursorPos(bv, sl, boundary, x, y);
        y += shift;
 }
@@ -235,7 +236,7 @@ bool InsetScript::insetAllowed(InsetCode code) const
        case BOX_CODE:
        case BRANCH_CODE:
        case CAPTION_CODE:
-       case COLLAPSABLE_CODE:
+       case COLLAPSIBLE_CODE:
        case FLOAT_CODE:
        case FLOAT_LIST_CODE:
        case FOOT_CODE:
@@ -280,6 +281,7 @@ bool InsetScript::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_PREVIEW_INSERT:
        case LFUN_QUOTE_INSERT:
        case LFUN_TABULAR_INSERT:
+       case LFUN_TABULAR_STYLE_INSERT:
        case LFUN_WRAP_INSERT:
                flag.setEnabled(false);
                return true;