Fix use of std::regex_match

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

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index f604a1fb9d2e0028005a57524e643037b60e35c9..a2f7216eaa1b580328f6598030d629869f0e5851 100644 (file)
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -33,6 +33,7 @@
 #include "output_latex.h"
 #include "output_xhtml.h"
 #include "texstream.h"
+#include "xml.h"
 #include "TocBackend.h"
 
 #include "frontends/alert.h"
@@ -769,42 +770,35 @@ int InsetExternal::plaintext(odocstringstream & os,
 }
 
 
-int InsetExternal::docbook(odocstream & os,
-                          OutputParams const & runparams) const
+void InsetExternal::generateXML(XMLStream & xs, OutputParams const & runparams, std::string const & format) const
 {
        bool const external_in_tmpdir = !runparams.nice;
        bool const dryrun = runparams.dryrun || runparams.inComment;
        odocstringstream ods;
        otexstream ots(ods);
        external::RetVal retval =
-               external::writeExternal(params_, "DocBook", buffer(), ots,
-                   *(runparams.exportdata), external_in_tmpdir, dryrun);
+                       external::writeExternal(params_, format, buffer(), ots,
+                                               *(runparams.exportdata), external_in_tmpdir, dryrun);
        if (retval == external::KILLED) {
                LYXERR0("External template preparation killed.");
                if (buffer().isClone() && buffer().isExporting())
                        throw ConversionException();
        }
-       os << ods.str();
-       return int(count(ods.str().begin(), ods.str().end(), '\n'));
+       xs << XMLStream::ESCAPE_NONE << ods.str();
+}
+
+
+void InsetExternal::docbook(XMLStream & xs,
+                            OutputParams const & runparams) const
+{
+       generateXML(xs, runparams, "DocBook");
 }
 
 
-docstring InsetExternal::xhtml(XHTMLStream & xs,
+docstring InsetExternal::xhtml(XMLStream & xs,
                        OutputParams const & runparams) const
 {
-       bool const external_in_tmpdir = !runparams.nice;
-       bool const dryrun = runparams.dryrun || runparams.inComment;
-       odocstringstream ods;
-       otexstream ots(ods);
-       external::RetVal retval =
-               external::writeExternal(params_, "XHTML", buffer(), ots,
-                   *(runparams.exportdata), external_in_tmpdir, dryrun);
-       if (retval == external::KILLED) {
-               LYXERR0("External template preparation killed.");
-               if (buffer().isClone() && buffer().isExporting())
-                       throw ConversionException();
-       }
-       xs << XHTMLStream::ESCAPE_NONE << ods.str();
+       generateXML(xs, runparams, "XHTML");
        return docstring();
 }
 
@@ -831,7 +825,7 @@ void InsetExternal::validate(LaTeXFeatures & features) const
        case OutputParams::XETEX:
                format = "PDFLaTeX";
                break;
-       case OutputParams::XML:
+       case OutputParams::DOCBOOK5:
                format = "DocBook";
                break;
        case OutputParams::HTML: