From de3284ba9adb688f5ccbbe1992700fb7e3115628 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Sat, 30 Jul 2016 22:42:01 -0400 Subject: [PATCH] Activate export of external material for XHTML. As of this commit, this is ineffective, since no changes have been made to external_templates. (cherry picked from commit daf7cd4c05f55c7eb957df7076ec91dcd2eca543) --- src/insets/InsetExternal.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp index 8e89ead8be..d524cfca99 100644 --- a/src/insets/InsetExternal.cpp +++ b/src/insets/InsetExternal.cpp @@ -30,6 +30,7 @@ #include "MetricsInfo.h" #include "OutputParams.h" #include "output_latex.h" +#include "output_xhtml.h" #include "TocBackend.h" #include "frontends/alert.h" @@ -753,12 +754,17 @@ int InsetExternal::docbook(odocstream & os, } -docstring InsetExternal::xhtml(XHTMLStream & /*xs*/, - OutputParams const & /*rp*/) const +docstring InsetExternal::xhtml(XHTMLStream & xs, + OutputParams const & runparams) const { -// external::writeExternal(params_, "XHTML", buffer(), os, -// *(runparams.exportdata), false, -// runparams.dryrun || runparams.inComment); + bool const external_in_tmpdir = !runparams.nice; + bool const dryrun = runparams.dryrun || runparams.inComment; + TexRow texrow; + odocstringstream ods; + otexstream ots(ods, texrow); + external::writeExternal(params_, "XHTML", buffer(), ots, + *(runparams.exportdata), external_in_tmpdir, dryrun); + xs << XHTMLStream::ESCAPE_NONE << ods.str(); return docstring(); }