Math.lyx, Tutorial.lyx: fix some typos spotted by a user

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

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index a8b56d0773d27cdc2c121c4e9ffbfaedb5add992..d05c946ea49df9188988c73325f608a0030a2626 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -176,7 +176,7 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
                        // we can only output characters covered by the current
                        // encoding!
                        try {
-                               if (runparams.encoding->latexChar(c) == docstring(1, c))
+                               if (runparams.encoding->encodable(c))
                                        code += c;
                                else if (runparams.dryrun) {
                                        code += "<" + _("LyX Warning: ")
@@ -335,9 +335,12 @@ bool InsetListings::getStatus(Cursor & cur, FuncRequest const & cmd,
                case LFUN_INSET_DIALOG_UPDATE:
                        status.setEnabled(true);
                        return true;
-               case LFUN_CAPTION_INSERT:
-                       status.setEnabled(!params().isInline());
-                       return true;
+               case LFUN_CAPTION_INSERT: {
+                       if (params().isInline()) {
+                               status.setEnabled(false);
+                               return true;
+                       }
+               }
                default:
                        return InsetCollapsable::getStatus(cur, cmd, status);
        }
@@ -384,7 +387,7 @@ docstring InsetListings::getCaption(OutputParams const & runparams) const
        TexRow texrow;
        odocstringstream ods;
        otexstream os(ods, texrow);
-       ins->getOptArg(os, runparams);
+       ins->getArgs(os, runparams);
        ins->getArgument(os, runparams);
        // the caption may contain \label{} but the listings
        // package prefer caption={}, label={}