Use new display() values to remove some inset hardcoding.

[features.git] / src / insets / InsetInclude.cpp

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 9a32d053ec4e8389375b5397df4749da28a1960f..d6936c837e6f3668ea279d3c78056aacfde06cd9 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -236,6 +236,13 @@ bool InsetInclude::isCompatibleCommand(string const & s)
 }
 
 
+bool InsetInclude::needsCProtection(bool const /*maintext*/, bool const fragile) const
+{
+       // We need to \cprotect all types in fragile context
+       return fragile;
+}
+
+
 void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action()) {
@@ -806,10 +813,8 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
                                ErrorList const & el = tmp->errorList("Export");
                                if (!el.empty())
                                        msg = bformat(from_ascii("%1$s\n\n%2$s\n\n%3$s"),
-                                               msg, el.begin()->error,
-                                               el.begin()->description);
-                               throw ExceptionMessage(ErrorException, _("Error: "),
-                                                      msg);
+                                               msg, el.begin()->error, el.begin()->description);
+                               throw ExceptionMessage(ErrorException, _("Error: "), msg);
                        }
                }
                runparams.encoding = oldEnc;
@@ -834,10 +839,8 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
                                                included_file.displayName());
                                if (!el.empty())
                                        msg = bformat(from_ascii("%1$s\n\n%2$s\n\n%3$s"),
-                                                       msg, el.begin()->error,
-                                                       el.begin()->description);
-                               throw ExceptionMessage(ErrorException, _("Error: "),
-                                                      msg);
+                                               msg, el.begin()->error, el.begin()->description);
+                               throw ExceptionMessage(ErrorException, _("Error: "), msg);
                        }
                }
        } else {
@@ -1156,7 +1159,7 @@ string InsetInclude::contextMenuName() const
 
 Inset::DisplayType InsetInclude::display() const
 {
-       return type(params()) == INPUT ? Inline : AlignCenter;
+       return type(params()) == INPUT ? Inline : Display;
 }