Restore XHTML output for InsetListings.

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

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 7d6a2542e6204458e3e17bf4dbcac5f98fd14ed6..021dd4c7303f93652fb0483b2a8db4dfd89b9852 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -33,6 +33,7 @@
 #include "LyXRC.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
+#include "output_xhtml.h"
 #include "OutputParams.h"
 #include "TextClass.h"
 #include "TocBackend.h"
@@ -147,20 +148,20 @@ FileName const includedFilename(Buffer const & buffer,
 }
 
 
-InsetLabel * createLabel(docstring const & label_str)
+InsetLabel * createLabel(Buffer * buf, docstring const & label_str)
 {
        if (label_str.empty())
                return 0;
        InsetCommandParams icp(LABEL_CODE);
        icp["name"] = label_str;
-       return new InsetLabel(icp);
+       return new InsetLabel(buf, icp);
 }
 
 } // namespace anon
 
 
-InsetInclude::InsetInclude(InsetCommandParams const & p)
-       : InsetCommand(p, "include"), include_label(uniqueID()),
+InsetInclude::InsetInclude(Buffer * buf, InsetCommandParams const & p)
+       : InsetCommand(buf, p, "include"), include_label(uniqueID()),
          preview_(new RenderMonitoredPreview(this)), failedtoload_(false),
          set_label_(false), label_(0), child_buffer_(0)
 {
@@ -168,7 +169,7 @@ InsetInclude::InsetInclude(InsetCommandParams const & p)
 
        if (isListings(params())) {
                InsetListingsParams listing_params(to_utf8(p["lstparams"]));
-               label_ = createLabel(from_utf8(listing_params.getParamValue("label")));
+               label_ = createLabel(buffer_, from_utf8(listing_params.getParamValue("label")));
        }
 }
 
@@ -221,7 +222,6 @@ bool InsetInclude::isCompatibleCommand(string const & s)
 
 void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       LASSERT(cur.buffer() == &buffer(), return);
        switch (cmd.action) {
 
        case LFUN_INSET_EDIT: {
@@ -253,7 +253,7 @@ void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd)
                                        if (label_) 
                                                old_label = label_->getParam("name");
                                        else {
-                                               label_ = createLabel(new_label);
+                                               label_ = createLabel(buffer_, new_label);
                                                label_->setBuffer(buffer());
                                        }                                       
 
@@ -541,12 +541,16 @@ int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
                // argument. Should we set it to string(), or should makeLaTeXFile
                // make use of it somehow? (JMarc 20031002)
                // The included file might be written in a different encoding
+               // and language.
                Encoding const * const oldEnc = runparams.encoding;
+               Language const * const oldLang = runparams.master_language;
                runparams.encoding = &tmp->params().encoding();
+               runparams.master_language = buffer().params().language;
                tmp->makeLaTeXFile(writefile,
                                   masterFileName(buffer()).onlyPath().absFilename(),
                                   runparams, false);
                runparams.encoding = oldEnc;
+               runparams.master_language = oldLang;
        } else {
                // In this case, it's not a LyX file, so we copy the file
                // to the temp dir, so that .aux files etc. are not created
@@ -628,7 +632,7 @@ int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
 }
 
 
-docstring InsetInclude::xhtml(odocstream & os, OutputParams const &rp) const
+docstring InsetInclude::xhtml(XHTMLStream & xs, OutputParams const &rp) const
 {
        if (rp.inComment)
                 return docstring();
@@ -638,11 +642,11 @@ docstring InsetInclude::xhtml(odocstream & os, OutputParams const &rp) const
        bool const listing = isListings(params());
        if (listing || isVerbatim(params())) {
                if (listing)
-                       os << "<pre>\n";
+                       xs << StartTag("pre");
                // FIXME: We don't know the encoding of the file, default to UTF-8.
-               os << includedFilename(buffer(), params()).fileContents("UTF-8");
+               xs << includedFilename(buffer(), params()).fileContents("UTF-8");
                if (listing)
-                       os << "</pre>\n";
+                       xs << EndTag("pre");
                return docstring();
        }
 
@@ -654,9 +658,9 @@ docstring InsetInclude::xhtml(odocstream & os, OutputParams const &rp) const
                makeAbsPath(to_utf8(params()["filename"]), onlyPath(parent_filename));
        if (!isLyXFilename(included_file.absFilename())) {
                frontend::Alert::warning(_("Unsupported Inclusion"),
-                                        _("LyX does not know how to include non-LyX files when"
-                                          "generating HTML output. Offending file: ") +
-                                           params()["filename"]);
+                                        bformat(_("LyX does not know how to include non-LyX files when "
+                                                  "generating HTML output. Offending file:\n%1$s"),
+                                                   params()["filename"]));
                return docstring();
        }
 
@@ -674,7 +678,7 @@ docstring InsetInclude::xhtml(odocstream & os, OutputParams const &rp) const
        Buffer const * const ibuf = loadIfNeeded();
        if (!ibuf)
                return docstring();
-       ibuf->writeLyXHTMLSource(os, rp, true);
+       ibuf->writeLyXHTMLSource(xs.os(), rp, true);
        return docstring();
 }
 
@@ -946,7 +950,8 @@ void add_preview(RenderMonitoredPreview & renderer, InsetInclude const & inset,
 } // namespace anon
 
 
-void InsetInclude::addPreview(graphics::PreviewLoader & ploader) const
+void InsetInclude::addPreview(DocIterator const & /*inset_pos*/,
+       graphics::PreviewLoader & ploader) const
 {
        Buffer const & buffer = ploader.buffer();
        if (!preview_wanted(params(), buffer))
@@ -1016,18 +1021,18 @@ void InsetInclude::updateCommand()
        setParams(p);   
 }
 
-void InsetInclude::updateLabels(ParIterator const & it)
+void InsetInclude::updateLabels(ParIterator const & it, bool out)
 {
        Buffer const * const childbuffer = getChildBuffer();
        if (childbuffer) {
-               childbuffer->updateLabels(Buffer::UpdateChildOnly);
+               childbuffer->updateLabels(Buffer::UpdateChildOnly, out);
                return;
        }
        if (!isListings(params()))
                return;
 
        if (label_)
-               label_->updateLabels(it);
+               label_->updateLabels(it, out);
 
        InsetListingsParams const par(to_utf8(params()["lstparams"]));
        if (par.getParamValue("caption").empty()) {