X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCommand.cpp;h=7693d08fd7c70010f323eddd24956697932d09fd;hb=71b8019d56142397994e0ef2d4244ada51f199d5;hp=2e24d4d4e1d213f3d232fe6ee711f6c865099295;hpb=e15a8f3551f86a2ffa835c344256f2b4703fefb2;p=lyx.git

diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index 2e24d4d4e1..7693d08fd7 100644
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -15,6 +15,7 @@
 
 #include "Buffer.h"
 #include "BufferEncodings.h"
+#include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
@@ -43,12 +44,14 @@
 
 #include "support/debug.h"
 #include "support/gettext.h"
+#include "support/lstrings.h"
 
 #include "frontends/Application.h"
 
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 
 namespace lyx {
@@ -96,7 +99,8 @@ InsetCommand::~InsetCommand()
 
 void InsetCommand::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	button_.update(screenLabel(), editable() || clickable(*mi.base.bv, 0, 0));
+	button_.update(screenLabel(), editable() || clickable(*mi.base.bv, 0, 0),
+	               inheritFont());
 	button_.metrics(mi, dim);
 }
 
@@ -138,7 +142,11 @@ void InsetCommand::setParams(InsetCommandParams const & p)
 void InsetCommand::latex(otexstream & os, OutputParams const & runparams_in) const
 {
 	OutputParams runparams = runparams_in;
-	os << getCommand(runparams);
+	docstring command = getCommand(runparams);
+	if (buffer().params().use_minted
+	    && prefixIs(command, from_ascii("\\lstlistoflistings")))
+		command.erase(1, 3);
+	os << command;
 }
 
 
@@ -160,7 +168,8 @@ int InsetCommand::docbook(odocstream &, OutputParams const &) const
 
 void InsetCommand::validate(LaTeXFeatures & features) const
 {
-	if (params()["literal"] == "true")
+	if (params().info().hasParam("literal")
+	    && params()["literal"] == "true")
 		return;
 
 	ParamInfo::const_iterator it = params().info().begin();
@@ -340,7 +349,7 @@ bool decodeInsetParam(string const & name, string & data,
 		break;
 	}
 	case ERT_CODE: {
-		data = InsetERT::params2string(InsetCollapsable::Open);
+		data = InsetERT::params2string(InsetCollapsible::Open);
 		break;
 	}
 	case EXTERNAL_CODE: {