Properly fix handling of title layouts within insets (#11787)

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

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 6dca350078518ccf827e8a69d95dfce314e70eec..6eba05abde51d319d7ab81cc6cd49e3c4df05c76 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -65,8 +65,6 @@
 #include "support/mutex.h"
 #include "support/ExceptionMessage.h"
 
-#include "support/bind.h"
-
 using namespace std;
 using namespace lyx::support;
 
@@ -651,7 +649,7 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
                break;
        }
        case LISTINGS: {
-               // Here, listings and minted have sligthly different behaviors.
+               // Here, listings and minted have slightly different behaviors.
                // Using listings, it is always possible to have a caption,
                // even for non-floats. Using minted, only floats can have a
                // caption. So, with minted we use the following strategy.
@@ -939,7 +937,7 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
 }
 
 
-docstring InsetInclude::xhtml(XHTMLStream & xs, OutputParams const & rp) const
+docstring InsetInclude::xhtml(XMLStream & xs, OutputParams const & rp) const
 {
        if (rp.inComment)
                 return docstring();
@@ -949,11 +947,11 @@ docstring InsetInclude::xhtml(XHTMLStream & xs, OutputParams const & rp) const
        bool const listing = isListings(params());
        if (listing || isVerbatim(params())) {
                if (listing)
-                       xs << html::StartTag("pre");
+                       xs << xml::StartTag("pre");
                // FIXME: We don't know the encoding of the file, default to UTF-8.
                xs << includedFileName(buffer(), params()).fileContents("UTF-8");
                if (listing)
-                       xs << html::EndTag("pre");
+                       xs << xml::EndTag("pre");
                return docstring();
        }
 
@@ -990,10 +988,10 @@ docstring InsetInclude::xhtml(XHTMLStream & xs, OutputParams const & rp) const
                op.par_end = 0;
                ibuf->writeLyXHTMLSource(xs.os(), op, Buffer::IncludedFile);
        } else
-               xs << XHTMLStream::ESCAPE_NONE
+               xs << XMLStream::ESCAPE_NONE
                   << "<!-- Included file: "
                   << from_utf8(included_file.absFileName())
-                  << XHTMLStream::ESCAPE_NONE
+                  << XMLStream::ESCAPE_NONE
                         << " -->";
        
        return docstring();
@@ -1226,9 +1224,9 @@ string InsetInclude::contextMenuName() const
 }
 
 
-Inset::DisplayType InsetInclude::display() const
+Inset::RowFlags InsetInclude::rowFlags() const
 {
-       return type(params()) == INPUT ? Inline : AlignCenter;
+       return type(params()) == INPUT ? Inline : Display;
 }