Rename LatexRunParams::fragile as moving_arg.

[lyx.git] / src / insets / insetinclude.C

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index 58c806bce1184028ee05b2d5cf8f87e30147335c..5af3b2ccb7d4eb200c42001885ca3059d2effc6f 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -18,6 +18,7 @@
 #include "funcrequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
+#include "latexrunparams.h"
 #include "Lsstream.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
@@ -112,38 +113,31 @@ InsetInclude::~InsetInclude()
 
 dispatch_result InsetInclude::localDispatch(FuncRequest const & cmd)
 {
-       dispatch_result result = UNDISPATCHED;
-
        switch (cmd.action) {
+
        case LFUN_INSET_MODIFY: {
                InsetInclude::Params p;
                InsetIncludeMailer::string2params(cmd.argument, p);
-               if (p.cparams.getCmdName().empty())
-                       break;
-
-               set(p);
-               params_.masterFilename_ = cmd.view()->buffer()->fileName();
-
-               cmd.view()->updateInset(this);
-               result = DISPATCHED;
+               if (!p.cparams.getCmdName().empty()) {
+                       set(p);
+                       params_.masterFilename_ = cmd.view()->buffer()->fileName();
+                       cmd.view()->updateInset(this);
+               }
+               return DISPATCHED;
        }
-       break;
 
-       case LFUN_INSET_DIALOG_UPDATE: {
-               InsetIncludeMailer mailer(*this);
-               mailer.updateDialog(cmd.view());
-       }
-       break;
+       case LFUN_INSET_DIALOG_UPDATE: 
+               InsetIncludeMailer(*this).updateDialog(cmd.view());
+               return DISPATCHED;
 
        case LFUN_MOUSE_RELEASE:
-               edit(cmd.view(), cmd.x, cmd.y, cmd.button());
-               break;
+       case LFUN_INSET_EDIT:
+               InsetIncludeMailer(*this).showDialog(cmd.view());
+               return DISPATCHED;
 
        default:
-               break;
+               return UNDISPATCHED;
        }
-
-       return result;
 }
 
 
@@ -155,11 +149,8 @@ InsetInclude::Params const & InsetInclude::params() const
 
 bool InsetInclude::Params::operator==(Params const & o) const
 {
-       if (cparams == o.cparams && flag == o.flag &&
-           masterFilename_ == o.masterFilename_)
-               return true;
-
-       return false;
+       return cparams == o.cparams && flag == o.flag &&
+           masterFilename_ == o.masterFilename_;
 }
 
 
@@ -209,19 +200,6 @@ Inset * InsetInclude::clone(Buffer const & buffer, bool) const
 }
 
 
-void InsetInclude::edit(BufferView * bv, int, int, mouse_button::state)
-{
-       InsetIncludeMailer mailer(*this);
-       mailer.showDialog(bv);
-}
-
-
-void InsetInclude::edit(BufferView * bv, bool)
-{
-       edit(bv, 0, 0, mouse_button::none);
-}
-
-
 void InsetInclude::write(Buffer const *, ostream & os) const
 {
        os << "Include " << params_.cparams.getCommand() << '\n'
@@ -308,7 +286,7 @@ bool InsetInclude::loadIfNeeded() const
 
 
 int InsetInclude::latex(Buffer const * buffer, ostream & os,
-                       bool /*fragile*/, bool /*fs*/) const
+                       LatexRunParams const & runparams) const
 {
        string incfile(params_.cparams.getContents());
 
@@ -334,8 +312,7 @@ int InsetInclude::latex(Buffer const * buffer, ostream & os,
                // write it to a file (so far the complete file)
                string writefile = ChangeExtension(getFileName(), ".tex");
 
-               if (!buffer->tmppath.empty()
-                   && !buffer->niceFile) {
+               if (!buffer->tmppath.empty() && !runparams.nice) {
                        incfile = subst(incfile, '/','@');
 #ifdef __EMX__
                        incfile = subst(incfile, ':', '$');
@@ -349,9 +326,8 @@ int InsetInclude::latex(Buffer const * buffer, ostream & os,
 
                tmp->markDepClean(buffer->tmppath);
 
-               tmp->makeLaTeXFile(writefile,
-                                  OnlyPath(getMasterFilename()),
-                                  buffer->niceFile, true);
+               tmp->makeLaTeXFile(writefile, OnlyPath(getMasterFilename()),
+                                  runparams, true);
        }
 
        if (isVerbatim()) {
@@ -596,7 +572,9 @@ string const InsetInclude::PreviewImpl::latexString() const
                return string();
 
        ostringstream os;
-       parent().latex(view()->buffer(), os, false, false);
+       LatexRunParams runparams;
+       runparams.flavor = LatexRunParams::LATEX;
+       parent().latex(view()->buffer(), os, runparams);
 
        return STRCONV(os.str());
 }