Pure HTML output for math macros.

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

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index 0001b3775f4d8f7741a0565fa78e2a5faf2f5c48..058b4be3218c6071e1b16b53ba3aa16ab6af75b1 100644 (file)
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -29,6 +29,7 @@
 #include "LyXRC.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
+#include "output_latex.h"
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
@@ -69,8 +70,6 @@ namespace external {
 TempName::TempName()
 {
        FileName const tempname = FileName::tempName("lyxext");
-       // FIXME: This is unsafe
-       tempname.removeFile();
        // must have an extension for the converter code to work correctly.
        tempname_ = FileName(tempname.absFilename() + ".tmp");
 }
@@ -106,7 +105,8 @@ InsetExternalParams::InsetExternalParams()
        if (defaultTemplateName.empty()) {
                external::TemplateManager const & etm =
                        external::TemplateManager::get();
-               templatename_ = etm.getTemplates().begin()->first;
+               if (!etm.getTemplates().empty())
+                       templatename_ = etm.getTemplates().begin()->first;
        } else
                templatename_ = defaultTemplateName;
 }
@@ -365,10 +365,9 @@ bool InsetExternalParams::read(Buffer const & buffer, Lexer & lex)
 }
 
 
-InsetExternal::InsetExternal(Buffer & buf)
-       : renderer_(new RenderButton)
+InsetExternal::InsetExternal(Buffer * buf)
+       : Inset(buf), renderer_(new RenderButton)
 {
-       Inset::setBuffer(buf);
 }
 
 
@@ -416,13 +415,6 @@ void InsetExternal::doDispatch(Cursor & cur, FuncRequest & cmd)
                        params2string(params(), cur.bv().buffer()));
                break;
 
-       case LFUN_MOUSE_RELEASE:
-               if (!cur.selection() && cmd.button() == mouse_button::button1)
-                       cur.bv().showDialog("external",
-                               params2string(params(), cur.bv().buffer()),
-                               this);
-               break;
-
        default:
                Inset::doDispatch(cur, cmd);
        }
@@ -446,11 +438,11 @@ bool InsetExternal::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetExternal::edit(Cursor & cur, bool, EntryDirection)
+bool InsetExternal::showInsetDialog(BufferView * bv) const
 {
-       cur.bv().showDialog("external",
-               params2string(params(), cur.bv().buffer()),
-               this);
+       bv->showDialog("external", params2string(params(), bv->buffer()),
+               const_cast<InsetExternal *>(this));
+       return true;
 }
 
 
@@ -541,6 +533,12 @@ InsetExternalParams const & InsetExternal::params() const
 }
 
 
+void InsetExternal::updatePreview()
+{
+       setParams(params_);
+}
+
+
 void InsetExternal::setParams(InsetExternalParams const & p)
 {
        params_ = p;
@@ -685,6 +683,16 @@ int InsetExternal::docbook(odocstream & os,
 }
 
 
+docstring InsetExternal::xhtml(XHTMLStream  & /*xs*/,
+                       OutputParams const & /*rp*/) const
+{
+//     external::writeExternal(params_, "XHTML", buffer(), os,
+//                                    *(runparams.exportdata), false,
+//                                    runparams.dryrun || runparams.inComment);
+       return docstring();
+}
+
+
 void InsetExternal::validate(LaTeXFeatures & features) const
 {
        if (params_.draft)
@@ -702,11 +710,18 @@ void InsetExternal::validate(LaTeXFeatures & features) const
                format = "LaTeX";
                break;
        case OutputParams::PDFLATEX:
+       case OutputParams::XETEX:
                format = "PDFLaTeX";
                break;
        case OutputParams::XML:
                format = "DocBook";
                break;
+       case OutputParams::HTML:
+               format = "html";
+               break;
+       case OutputParams::TEXT:
+               format = "text";
+               break;
        }
        external::Template::Formats::const_iterator cit =
                et.formats.find(format);
@@ -742,7 +757,8 @@ void InsetExternal::validate(LaTeXFeatures & features) const
 }
 
 
-void InsetExternal::addPreview(graphics::PreviewLoader & ploader) const
+void InsetExternal::addPreview(DocIterator const & /*inset_pos*/,
+       graphics::PreviewLoader & ploader) const        
 {
        RenderMonitoredPreview * const ptr = renderer_->asMonitoredPreview();
        if (!ptr)