Fix some bugs in the bibinfo caching mechanism. Comments to follow.

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

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index 7aed200a4730a0f30490726616da8006b5335731..7225da7472dd46783ce325a814102b3dba826040 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"
@@ -44,7 +45,7 @@
 #include "support/lyxlib.h"
 #include "support/Translator.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 
 #include <sstream>
 
@@ -70,7 +71,7 @@ TempName::TempName()
 {
        FileName const tempname = FileName::tempName("lyxext");
        // must have an extension for the converter code to work correctly.
-       tempname_ = FileName(tempname.absFilename() + ".tmp");
+       tempname_ = FileName(tempname.absFileName() + ".tmp");
 }
 
 
@@ -104,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;
 }
@@ -159,7 +161,7 @@ void InsetExternalParams::write(Buffer const & buf, ostream & os) const
           << "\ttemplate " << templatename() << '\n';
 
        if (!filename.empty())
-               os << "\tfilename " << filename.outputFilename(buf.filePath()) << '\n';
+               os << "\tfilename " << filename.outputFileName(buf.filePath()) << '\n';
 
        if (!display)
                os << "\tdisplay false\n";
@@ -363,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);
 }
 
 
@@ -392,7 +393,7 @@ void InsetExternal::statusChanged() const
 
 void InsetExternal::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_EDIT: {
                InsetExternalParams p =  params();
@@ -414,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);
        }
@@ -430,12 +424,11 @@ void InsetExternal::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetExternal::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_EDIT:
        case LFUN_INSET_MODIFY:
        case LFUN_INSET_DIALOG_UPDATE:
-       case LFUN_INSET_SETTINGS:
                flag.setEnabled(true);
                return true;
 
@@ -445,12 +438,6 @@ bool InsetExternal::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetExternal::edit(Cursor & cur, bool, EntryDirection)
-{
-       showInsetDialog(&cur.bv());
-}
-
-
 bool InsetExternal::showInsetDialog(BufferView * bv) const
 {
        bv->showDialog("external", params2string(params(), bv->buffer()),
@@ -584,7 +571,7 @@ void InsetExternal::setParams(InsetExternalParams const & p)
                RenderMonitoredPreview * preview_ptr = renderer_->asMonitoredPreview();
                renderer_.reset(new RenderMonitoredPreview(this));
                preview_ptr = renderer_->asMonitoredPreview();
-               preview_ptr->fileChanged(boost::bind(&InsetExternal::fileChanged, this));
+               preview_ptr->fileChanged(bind(&InsetExternal::fileChanged, this));
                if (preview_ptr->monitoring())
                        preview_ptr->stopMonitoring();
                add_preview_and_start_loading(*preview_ptr, *this, buffer());
@@ -636,7 +623,7 @@ int InsetExternal::latex(odocstream & os, OutputParams const & runparams) const
        if (params_.draft) {
                // FIXME UNICODE
                os << "\\fbox{\\ttfamily{}"
-                  << from_utf8(params_.filename.outputFilename(buffer().filePath()))
+                  << from_utf8(params_.filename.outputFileName(buffer().filePath()))
                   << "}\n";
                return 1;
        }
@@ -696,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)
@@ -719,6 +716,12 @@ void InsetExternal::validate(LaTeXFeatures & features) const
        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);
@@ -754,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)