Added inset-select-all to emacs bindings

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

diff --git a/src/insets/InsetScript.cpp b/src/insets/InsetScript.cpp
index 2cb15a2da41b6a0d02923ff927142ff11ae26e64..779464c7cd84009463d160963ec0da1bcf725000 100644 (file)
--- a/src/insets/InsetScript.cpp
+++ b/src/insets/InsetScript.cpp
@@ -68,14 +68,16 @@ ScriptTranslatorLoc const init_scripttranslator_loc()
 
 ScriptTranslator const & scripttranslator()
 {
-       static ScriptTranslator translator = init_scripttranslator();
+       static ScriptTranslator const translator =
+           init_scripttranslator();
        return translator;
 }
 
 
 ScriptTranslatorLoc const & scripttranslator_loc()
 {
-       static ScriptTranslatorLoc translator = init_scripttranslator_loc();
+       static ScriptTranslatorLoc const translator =
+           init_scripttranslator_loc();
        return translator;
 }
 
@@ -272,7 +274,6 @@ bool InsetScript::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_FLOAT_LIST_INSERT:
        case LFUN_FLOAT_WIDE_INSERT:
        case LFUN_FOOTNOTE_INSERT:
-       case LFUN_HFILL_INSERT:
        case LFUN_INDEX_PRINT:
        case LFUN_LISTING_INSERT:
        case LFUN_MARGINALNOTE_INSERT:
@@ -314,11 +315,11 @@ docstring InsetScript::toolTip(BufferView const &, int, int) const
 {
        OutputParams rp(&buffer().params().encoding());
        odocstringstream ods;
-       InsetText::plaintext(ods, rp);
+       InsetText::plaintext(ods, rp, 200);
        docstring content_tip = ods.str();
        // shorten it if necessary
-       if (content_tip.size() > 200)
-               content_tip = content_tip.substr(0, 200) + "...";
+       if (content_tip.size() >= 200)
+               content_tip = content_tip.substr(0, 197) + "...";
        docstring res = scripttranslator_loc().find(params_.type);
        if (!content_tip.empty())
                res += from_ascii(": ") + content_tip;
@@ -326,10 +327,11 @@ docstring InsetScript::toolTip(BufferView const &, int, int) const
 }
 
 
-int InsetScript::plaintext(odocstream & os, OutputParams const & runparams) const
+int InsetScript::plaintext(odocstringstream & os,
+        OutputParams const & runparams, size_t max_length) const
 {
        odocstringstream oss;
-       InsetText::plaintext(oss, runparams);
+       InsetText::plaintext(oss, runparams, max_length);
        docstring const text = oss.str();
        switch (params_.type) {
        case InsetScriptParams::Subscript:
@@ -353,7 +355,7 @@ int InsetScript::plaintext(odocstream & os, OutputParams const & runparams) cons
                os << '[' << buffer().B_("superscript") << ':';
                break;
        }
-       InsetText::plaintext(os, runparams);
+       InsetText::plaintext(os, runparams, max_length);
        os << ']';
 
        return PLAINTEXT_NEWLINE;