]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insetinclude.C
fix #832
[lyx.git] / src / insets / insetinclude.C
index 60cc1b2269be721721a06f08f7e3095e7ddb35e0..1cb80029f30f2c309ad92aaff0855dff14ee0d04 100644 (file)
+/**
+ * \file insetinclude.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS
+ */
 
 #include <config.h>
 
-#include <cstdlib>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include FORMS_H_LOCATION 
 #include "insetinclude.h"
-#include "filedlg.h" 
 #include "buffer.h"
 #include "bufferlist.h"
+#include "BufferView.h"
 #include "debug.h"
-#include "support/filetools.h"
-#include "lyxrc.h"
-#include "LyXView.h"
-#include "LaTeXFeatures.h"
-#include "lyx_gui_misc.h" // CancelCloseBoxCB
+#include "funcrequest.h"
 #include "gettext.h"
-#include "include_form.h"
+#include "LaTeXFeatures.h"
+#include "Lsstream.h"
+#include "lyxlex.h"
+#include "lyxrc.h"
+#include "Lsstream.h"
+
+#include "frontends/Dialogs.h"
+#include "frontends/LyXView.h"
+#include "frontends/Painter.h"
+
+#include "support/filetools.h"
 #include "support/FileInfo.h"
-#include "layout.h"
-#include "lyxfunc.h"
+#include "support/FileMonitor.h"
+#include "support/lstrings.h" // contains
+#include "support/tostr.h"
+
+#include "graphics/PreviewedInset.h"
+#include "graphics/PreviewImage.h"
+
+#include <boost/bind.hpp>
+
+#include <cstdlib>
 
 using std::ostream;
 using std::endl;
 using std::vector;
 using std::pair;
 
-extern BufferView * current_view;
-
 extern BufferList bufferlist;
 
 
-FD_include * create_form_include(void)
-{
-  FL_OBJECT * obj;
-  FD_include * fdui = (FD_include *) fl_calloc(1, sizeof(FD_include));
-
-  fdui->include = fl_bgn_form(FL_NO_BOX, 340, 210);
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 340, 210, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 70, 160, 90, "");
-  fdui->browsebt = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 30, 100, 30, idex(_("Browse|#B")));
-    fl_set_button_shortcut(obj, scex(_("Browse|#B")), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, include_cb, 0);
-  fdui->flag1 = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 180, 70, 150, 30, idex(_("Don't typeset|#D")));
-    fl_set_button_shortcut(obj, scex(_("Don't typeset|#D")), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  obj = fl_add_button(FL_RETURN_BUTTON, 120, 170, 100, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, include_cb, 1);
-  obj = fl_add_button(FL_NORMAL_BUTTON, 230, 170, 100, 30, idex(_("Cancel|^[")));
-    fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, include_cb, 2);
-  obj = fl_add_button(FL_NORMAL_BUTTON, 230, 130, 100, 30, idex(_("Load|#L")));
-    fl_set_button_shortcut(obj, scex(_("Load|#L")), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, include_cb, 5);
-  fdui->input = obj = fl_add_input(FL_NORMAL_INPUT, 10, 30, 210, 30, idex(_("File name:|#F")));
-    fl_set_input_shortcut(obj, scex(_("File name:|#F")), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-  fdui->flag41 = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 180, 100, 150, 30, idex(_("Visible space|#s")));
-    fl_set_button_shortcut(obj, scex(_("Visible space|#s")), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-
-  fdui->include_grp = fl_bgn_group();
-  fdui->flag4 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 130, 160, 30, idex(_("Verbatim|#V")));
-    fl_set_button_shortcut(obj, scex(_("Verbatim|#V")), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, include_cb, 10);
-  fdui->flag2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 100, 160, 30, idex(_("Use input|#i")));
-    fl_set_button_shortcut(obj, scex(_("Use input|#i")), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, include_cb, 11);
-  fdui->flag3 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 70, 160, 30, idex(_("Use include|#U")));
-    fl_set_button_shortcut(obj, scex(_("Use include|#U")), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, include_cb, 11);
-  fl_end_group();
-
-  fl_end_form();
-
-  //fdui->include->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-
-FD_include * form = 0;
-
-extern "C"
-void include_cb(FL_OBJECT *, long arg)
-{
-    
-       InsetInclude * inset = static_cast<InsetInclude*>(form->include->u_vdata);
-       switch (arg) {
-       case 0:
-       {
-               // Should browsing too be disabled in RO-mode?
-               LyXFileDlg fileDlg;
-               string const mpath = OnlyPath(inset->getMasterFilename());
-                string ext;
-    
-               if (fl_get_button(form->flag2)) // Use Input Button
-                       ext = "*.tex";
-               else if (fl_get_button(form->flag4)) // Verbatim all files
-                       ext = "*";
-                else
-                        ext = "*.lyx";
-               // launches dialog
-               fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
-    
-               // Use by default the master's path
-               string const filename =
-                       fileDlg.Select(_("Select Child Document"),
-                                      mpath, ext, 
-                                      inset->getContents());
-               XFlush(fl_get_display());
-               // check selected filename
-               if (!filename.empty()) {
-                       string const filename2 = MakeRelPath(filename,
-                                                            mpath);
-                       if (prefixIs(filename2, ".."))
-                               fl_set_input(form->input,
-                                            filename.c_str());
-                       else
-                               fl_set_input(form->input,
-                                            filename2.c_str());
-               }
-               break;
-       }
+class InsetInclude::PreviewImpl : public grfx::PreviewedInset {
+public:
+       ///
+       PreviewImpl(InsetInclude & p) : PreviewedInset(p) {}
 
-       case 1:
-               if (!current_view->buffer()->isReadonly()) {
-                       inset->setContents(fl_get_input(form->input));
-                       // don't typeset
-                       inset->setNoLoad(fl_get_button(form->flag1));
-                       if (fl_get_button(form->flag2))
-                               inset->setInput();
-                       else if (fl_get_button(form->flag3))
-                               inset->setInclude();
-                       else if (fl_get_button(form->flag4)) {
-                               inset->setVerb();
-                               inset->setVisibleSpace(fl_get_button(form->flag41));
-                       }
-                       
-                       fl_hide_form(form->include);
-                       current_view->updateInset(inset, true);
-                       break;
-               } // fall through
-               
-       case 2:
-               fl_hide_form(form->include);
-               break;
-       case 5:
-               if (!current_view->buffer()->isReadonly()) {
-                       inset->setContents(fl_get_input(form->input));
-                       inset->setNoLoad(fl_get_button(form->flag1));
-                       if (fl_get_button(form->flag2))
-                               inset->setInput();
-                       else if (fl_get_button(form->flag3))
-                               inset->setInclude();
-                       else if (fl_get_button(form->flag4)) {
-                               inset->setVerb();
-                               inset->setVisibleSpace(fl_get_button(form->flag41));
-                       }
-                       
-                       fl_hide_form(form->include);
-                       current_view->updateInset(inset, true);
-                       current_view->owner()->getLyXFunc()->Dispatch(LFUN_CHILDOPEN, inset->getContents());
-                }
-                break;
-               
-        case 10:
-                fl_activate_object(form->flag41);
-                fl_set_object_lcol(form->flag41, FL_BLACK); 
-                break;
-        case 11:
-                fl_deactivate_object(form->flag41);
-                fl_set_object_lcol(form->flag41, FL_INACTIVE);
-               fl_set_button(form->flag41, 0);
-                break;
+       ///
+       bool previewWanted() const;
+       ///
+       string const latexString() const;
+       ///
+       InsetInclude & parent() const {
+               return *static_cast<InsetInclude*>(inset());
        }
-}
 
+       ///
+       bool monitoring() const { return monitor_.get(); }
+       ///
+       void startMonitoring();
+       ///
+       void stopMonitoring() { monitor_.reset(); }
 
-static inline
-string unique_id() {
-       static unsigned int seed = 1000;
+private:
+       /// Invoked by monitor_ should the parent file change.
+       void restartLoading();
+       ///
+       boost::scoped_ptr<FileMonitor> monitor_;
+};
 
-       std::ostringstream ost;
-       ost << "file" << ++seed;
 
-       // Needed if we use lyxstring.
-       return ost.str().c_str();
+namespace {
+
+string const uniqueID()
+{
+       static unsigned int seed = 1000;
+       return "file" + tostr(++seed);
 }
 
+} // namespace anon
+
+
+InsetInclude::InsetInclude(Params const & p)
+       : params_(p), include_label(uniqueID()),
+         preview_(new PreviewImpl(*this))
+{}
+
 
-InsetInclude::InsetInclude(InsetCommandParams const & p, Buffer const & bf)
-       : InsetCommand(p), master(&bf)
+InsetInclude::InsetInclude(InsetCommandParams const & p, Buffer const & b)
+       : include_label(uniqueID()),
+         preview_(new PreviewImpl(*this))
 {
-       flag = InsetInclude::INCLUDE;
-       noload = false;
-       include_label = unique_id();
+       params_.cparams = p;
+       params_.masterFilename_ = b.fileName();
 }
 
 
 InsetInclude::~InsetInclude()
 {
-       if (form && form->include->u_vdata == this) {
-               // this inset is in the popup so hide the popup 
-               // and remove the reference to this inset. ARRae
-               if (form->include) {
-                       if (form->include->visible) {
-                               fl_hide_form(form->include);
-                       }
-                       fl_free_form(form->include);
+       InsetIncludeMailer mailer(*this);
+       mailer.hideDialog();
+}
+
+
+dispatch_result InsetInclude::localDispatch(FuncRequest const & cmd)
+{
+       switch (cmd.action) {
+
+       case LFUN_INSET_MODIFY: {
+               InsetInclude::Params p;
+               InsetIncludeMailer::string2params(cmd.argument, p);
+               if (!p.cparams.getCmdName().empty()) {
+                       set(p);
+                       params_.masterFilename_ = cmd.view()->buffer()->fileName();
+                       cmd.view()->updateInset(this);
                }
-               fl_free(form);
-               form = 0;
+               return DISPATCHED;
        }
-}
 
+       case LFUN_INSET_DIALOG_UPDATE: 
+               InsetIncludeMailer(*this).updateDialog(cmd.view());
+               return DISPATCHED;
 
-Inset * InsetInclude::Clone(Buffer const & buffer) const
-{ 
-       InsetInclude * ii = new InsetInclude (params(), buffer); 
-       ii->setNoLoad(isNoLoad());
-       // By default, the newly created inset is of `include' type,
-       // so we do not test this case.
-       if (isInput())
-               ii->setInput();
-       else if (isVerb()) {
-               ii->setVerb();
-               ii->setVisibleSpace(isVerbVisibleSpace());
+       case LFUN_MOUSE_RELEASE:
+       case LFUN_INSET_EDIT:
+               InsetIncludeMailer(*this).showDialog(cmd.view());
+               return DISPATCHED;
+
+       default:
+               return UNDISPATCHED;
        }
-       return ii;
 }
 
 
-void InsetInclude::Edit(BufferView * bv, int, int, unsigned int)
+InsetInclude::Params const & InsetInclude::params() const
 {
-       if (bv->buffer()->isReadonly())
-               WarnReadonly(bv->buffer()->fileName());
+       return params_;
+}
 
-       if (!form) {
-                form = create_form_include();
-               fl_set_form_atclose(form->include, CancelCloseBoxCB, 0);
-       }
-        form->include->u_vdata = this;
-    
-        fl_set_input(form->input, getContents().c_str());
-       fl_set_button(form->flag1, int(isNoLoad()));
-       fl_set_button(form->flag2, int(isInput()));
-       fl_set_button(form->flag3, int(isInclude()));
-       fl_set_button(form->flag4, int(isVerb()));
-        if (isVerb()) 
-            fl_set_button(form->flag41, int(isVerbVisibleSpace()));
-        else {
-           fl_set_button(form->flag41, 0);
-            fl_deactivate_object(form->flag41);
-           fl_set_object_lcol(form->flag41, FL_INACTIVE);
-       }
-       
-        if (form->include->visible) {
-               fl_raise_form(form->include);
-       } else {
-               fl_show_form(form->include,
-                            FL_PLACE_MOUSE | FL_FREE_SIZE, FL_TRANSIENT,
-                            _("Include"));
+
+bool InsetInclude::Params::operator==(Params const & o) const
+{
+       return cparams == o.cparams && flag == o.flag &&
+           masterFilename_ == o.masterFilename_;
+}
+
+
+bool InsetInclude::Params::operator!=(Params const & o) const
+{
+       return !(*this == o);
+}
+
+
+void InsetInclude::set(Params const & p)
+{
+       params_ = p;
+
+       string command;
+
+       switch (params_.flag) {
+               case INCLUDE:
+                       command="include";
+                       break;
+               case VERB:
+                       command="verbatiminput";
+                       break;
+               case INPUT:
+                       command="input";
+                       break;
+               case VERBAST:
+                       command="verbatiminput*";
+                       break;
        }
+
+       params_.cparams.setCmdName(command);
+
+       if (preview_->monitoring())
+               preview_->stopMonitoring();
+
+       if (grfx::PreviewedInset::activated() && params_.flag == INPUT)
+               preview_->generatePreview();
 }
 
 
-void InsetInclude::Write(Buffer const *, ostream & os) const
+Inset * InsetInclude::clone(Buffer const & buffer, bool) const
 {
-       os << "Include " << getCommand() << "\n";
+       Params p(params_);
+       p.masterFilename_ = buffer.fileName();
+
+       return new InsetInclude(p);
 }
 
 
-void InsetInclude::Read(Buffer const * buf, LyXLex & lex)
+void InsetInclude::write(Buffer const *, ostream & os) const
 {
-       InsetCommand::Read(buf, lex);
-    
-       if (getCmdName() == "include")
-               setInclude();
-       else if (getCmdName() == "input")
-               setInput();
-       else if (contains(getCmdName(), "verbatim")) {
-               setVerb();
-               if (getCmdName() == "verbatiminput*")
-                       setVisibleSpace(true);
+       os << "Include " << params_.cparams.getCommand() << '\n'
+          << "preview " << tostr(params_.cparams.preview()) << '\n';
+}
+
+
+void InsetInclude::read(Buffer const *, LyXLex & lex)
+{
+       params_.cparams.read(lex);
+
+       if (params_.cparams.getCmdName() == "include")
+               params_.flag = INCLUDE;
+       else if (params_.cparams.getCmdName() == "input")
+               params_.flag = INPUT;
+       /* FIXME: is this logic necessary now ? */
+       else if (contains(params_.cparams.getCmdName(), "verbatim")) {
+               params_.flag = VERB;
+               if (params_.cparams.getCmdName() == "verbatiminput*")
+                       params_.flag = VERBAST;
        }
 }
 
 
-bool InsetInclude::display() const 
+bool InsetInclude::display() const
 {
-       return !isInput();
+       return !(params_.flag == INPUT);
 }
 
 
-string const InsetInclude::getScreenLabel() const
+string const InsetInclude::getScreenLabel(Buffer const *) const
 {
        string temp;
-       if (isInput())
-               temp += _("Input");
-       else if (isVerb()) {
-               temp += _("Verbatim Input");
-               if (isVerbVisibleSpace()) temp += '*';
-       } else temp += _("Include");
-       temp += ": ";
-       
-       if (getContents().empty()) {
-               temp+= "???";
-       } else {
-               temp+= getContents();
+
+       switch (params_.flag) {
+               case INPUT: temp += _("Input"); break;
+               case VERB: temp += _("Verbatim Input"); break;
+               case VERBAST: temp += _("Verbatim Input*"); break;
+               case INCLUDE: temp += _("Include"); break;
        }
+
+       temp += ": ";
+
+       if (params_.cparams.getContents().empty())
+               temp += "???";
+       else
+               temp += params_.cparams.getContents();
+
        return temp;
 }
 
 
 string const InsetInclude::getFileName() const
 {
-       return MakeAbsPath(getContents(), 
+       return MakeAbsPath(params_.cparams.getContents(),
                           OnlyPath(getMasterFilename()));
 }
 
 
 string const InsetInclude::getMasterFilename() const
 {
-       return master->fileName();
+       return params_.masterFilename_;
 }
 
 
 bool InsetInclude::loadIfNeeded() const
 {
-       if (isNoLoad() || isVerb()) return false;
-       if (!IsLyXFilename(getFileName())) return false;
-       
-       if (bufferlist.exists(getFileName())) return true;
-       
+       if (isVerbatim())
+               return false;
+
+       if (!IsLyXFilename(getFileName()))
+               return false;
+
+       if (bufferlist.exists(getFileName()))
+               return true;
+
        // the readonly flag can/will be wrong, not anymore I think.
        FileInfo finfo(getFileName());
-       bool const ro = !finfo.writable();
-       return bufferlist.readFile(getFileName(), ro) != 0;
+       if (!finfo.isOK())
+               return false;
+
+       return bufferlist.loadLyXFile(getFileName(), false) != 0;
 }
 
 
-int InsetInclude::Latex(Buffer const * buffer, ostream & os,
+int InsetInclude::latex(Buffer const * buffer, ostream & os,
                        bool /*fragile*/, bool /*fs*/) const
 {
-       string incfile(getContents());
-       
+       string incfile(params_.cparams.getContents());
+
        // Do nothing if no file name has been specified
        if (incfile.empty())
                return 0;
-    
+
        if (loadIfNeeded()) {
                Buffer * tmp = bufferlist.getBuffer(getFileName());
 
+               // FIXME: this should be a GUI warning
                if (tmp->params.textclass != buffer->params.textclass) {
-                       lyxerr << "ERROR: Cannot handle include file `"
+                       lyxerr << "WARNING: Included file `"
                               << MakeDisplayPath(getFileName())
-                              << "' which has textclass `"
-                              << textclasslist.NameOfClass(tmp->params.textclass)
-                              << "' instead of `"
-                              << textclasslist.NameOfClass(buffer->params.textclass)
+                              << "' has textclass `"
+                              << tmp->params.getLyXTextClass().name()
+                              << "' while parent file has textclass `"
+                              << buffer->params.getLyXTextClass().name()
                               << "'." << endl;
-                       return 0;
+                       //return 0;
                }
-               
+
                // write it to a file (so far the complete file)
                string writefile = ChangeExtension(getFileName(), ".tex");
+
                if (!buffer->tmppath.empty()
                    && !buffer->niceFile) {
                        incfile = subst(incfile, '/','@');
@@ -391,29 +323,29 @@ int InsetInclude::Latex(Buffer const * buffer, ostream & os,
                writefile = ChangeExtension(writefile, ".tex");
                lyxerr[Debug::LATEX] << "incfile:" << incfile << endl;
                lyxerr[Debug::LATEX] << "writefile:" << writefile << endl;
-               
+
                tmp->markDepClean(buffer->tmppath);
-               
+
                tmp->makeLaTeXFile(writefile,
-                                  OnlyPath(getMasterFilename()), 
+                                  OnlyPath(getMasterFilename()),
                                   buffer->niceFile, true);
-       } 
+       }
 
-       if (isVerb()) {
-               os << '\\' << getCmdName() << '{' << incfile << '}';
-       } else if (isInput()) {
+       if (isVerbatim()) {
+               os << '\\' << params_.cparams.getCmdName() << '{' << incfile << '}';
+       } else if (params_.flag == INPUT) {
                // \input wants file with extension (default is .tex)
                if (!IsLyXFilename(getFileName())) {
-                       os << '\\' << getCmdName() << '{' << incfile << '}';
+                       os << '\\' << params_.cparams.getCmdName() << '{' << incfile << '}';
                } else {
-                       os << '\\' << getCmdName() << '{'
+                       os << '\\' << params_.cparams.getCmdName() << '{'
                           << ChangeExtension(incfile, ".tex")
                           <<  '}';
                }
        } else {
                // \include don't want extension and demands that the
                // file really have .tex
-               os << '\\' << getCmdName() << '{'
+               os << '\\' << params_.cparams.getCmdName() << '{'
                   << ChangeExtension(incfile, string())
                   << '}';
        }
@@ -422,14 +354,22 @@ int InsetInclude::Latex(Buffer const * buffer, ostream & os,
 }
 
 
-int InsetInclude::Linuxdoc(Buffer const * buffer, ostream & os) const
+int InsetInclude::ascii(Buffer const *, ostream & os, int) const
 {
-       string incfile(getContents());
-       
+       if (isVerbatim())
+               os << GetFileContents(getFileName());
+       return 0;
+}
+
+
+int InsetInclude::linuxdoc(Buffer const * buffer, ostream & os) const
+{
+       string incfile(params_.cparams.getContents());
+
        // Do nothing if no file name has been specified
        if (incfile.empty())
                return 0;
-    
+
        if (loadIfNeeded()) {
                Buffer * tmp = bufferlist.getBuffer(getFileName());
 
@@ -446,29 +386,30 @@ int InsetInclude::Linuxdoc(Buffer const * buffer, ostream & os) const
 
                lyxerr[Debug::LATEX] << "incfile:" << incfile << endl;
                lyxerr[Debug::LATEX] << "writefile:" << writefile << endl;
-               
+
                tmp->makeLinuxDocFile(writefile, buffer->niceFile, true);
-       } 
+       }
 
-       if (isVerb()) {
-               os << "<inlinegraphic fileref=\"" << '&' << include_label << ';'
-                  << "\" format=\"linespecific\">"
-                  << "</inlinegraphic>";
-       } else 
+       if (isVerbatim()) {
+               os << "<![CDATA["
+                  << GetFileContents(getFileName())
+                  << "]]>";
+       } else
                os << '&' << include_label << ';';
-       
+
        return 0;
 }
 
 
-int InsetInclude::DocBook(Buffer const * buffer, ostream & os) const
+int InsetInclude::docbook(Buffer const * buffer, ostream & os,
+                         bool /*mixcont*/) const
 {
-       string incfile(getContents());
+       string incfile(params_.cparams.getContents());
 
        // Do nothing if no file name has been specified
        if (incfile.empty())
                return 0;
-    
+
        if (loadIfNeeded()) {
                Buffer * tmp = bufferlist.getBuffer(getFileName());
 
@@ -484,50 +425,54 @@ int InsetInclude::DocBook(Buffer const * buffer, ostream & os) const
 
                lyxerr[Debug::LATEX] << "incfile:" << incfile << endl;
                lyxerr[Debug::LATEX] << "writefile:" << writefile << endl;
-               
+
                tmp->makeDocBookFile(writefile, buffer->niceFile, true);
-       } 
+       }
 
-       if (isVerb()) {
-               os << "<inlinegraphic fileref=\"" << '&' << include_label << ';'
-                  << "\" format=\"linespecific\">"
-                  << "</inlinegraphic>";
-       } else 
+       if (isVerbatim()) {
+               os << "<inlinegraphic fileref=\""
+                  << '&' << include_label << ';'
+                  << "\" format=\"linespecific\">";
+       } else
                os << '&' << include_label << ';';
-       
+
        return 0;
 }
 
 
-void InsetInclude::Validate(LaTeXFeatures & features) const
+void InsetInclude::validate(LaTeXFeatures & features) const
 {
 
-       string incfile(getContents());
-       string writefile; // = ChangeExtension(getFileName(), ".sgml");
+       string incfile(params_.cparams.getContents());
+       string writefile;
 
-       if (!master->tmppath.empty() && !master->niceFile) {
+       Buffer const * const b = bufferlist.getBuffer(getMasterFilename());
+
+       if (b && !b->tmppath.empty() && !b->niceFile && !isVerbatim()) {
                incfile = subst(incfile, '/','@');
-               writefile = AddName(master->tmppath, incfile);
+               writefile = AddName(b->tmppath, incfile);
        } else
                writefile = getFileName();
-               // Use the relative path.
-               //writefile = incfile;
 
        if (IsLyXFilename(getFileName()))
                writefile = ChangeExtension(writefile, ".sgml");
 
-       features.IncludedFiles[include_label] = writefile;
+       features.includeFile(include_label, writefile);
 
-       if (isVerb())
-               features.verbatim = true;
+       if (isVerbatim())
+               features.require("verbatim");
 
        // Here we must do the fun stuff...
        // Load the file in the include if it needs
        // to be loaded:
        if (loadIfNeeded()) {
                // a file got loaded
-               Buffer * tmp = bufferlist.getBuffer(getFileName());
-               tmp->validate(features);
+               Buffer * const tmp = bufferlist.getBuffer(getFileName());
+               if (tmp) {
+                       if (b)
+                               tmp->niceFile = b->niceFile;
+                       tmp->validate(features);
+               }
        }
 }
 
@@ -538,7 +483,7 @@ vector<string> const InsetInclude::getLabelList() const
 
        if (loadIfNeeded()) {
                Buffer * tmp = bufferlist.getBuffer(getFileName());
-               tmp->setParentName(""); 
+               tmp->setParentName("");
                l = tmp->getLabelList();
                tmp->setParentName(getMasterFilename());
        }
@@ -547,16 +492,168 @@ vector<string> const InsetInclude::getLabelList() const
 }
 
 
-vector<pair<string,string> > const InsetInclude::getKeys() const
+void InsetInclude::fillWithBibKeys(vector<pair<string,string> > & keys) const
 {
-       vector<pair<string,string> > keys;
-       
        if (loadIfNeeded()) {
                Buffer * tmp = bufferlist.getBuffer(getFileName());
-               tmp->setParentName(""); 
-               keys = tmp->getBibkeyList();
+               tmp->setParentName("");
+               tmp->fillWithBibKeys(keys);
                tmp->setParentName(getMasterFilename());
        }
+}
+
+
+int InsetInclude::ascent(BufferView * bv, LyXFont const & font) const
+{
+       return preview_->previewReady() ?
+               preview_->pimage()->ascent() : InsetButton::ascent(bv, font);
+}
+
+
+int InsetInclude::descent(BufferView * bv, LyXFont const & font) const
+{
+       return preview_->previewReady() ?
+               preview_->pimage()->descent() : InsetButton::descent(bv, font);
+}
+
+
+int InsetInclude::width(BufferView * bv, LyXFont const & font) const
+{
+       return preview_->previewReady() ?
+               preview_->pimage()->width() : InsetButton::width(bv, font);
+}
+
+
+void InsetInclude::draw(BufferView * bv, LyXFont const & font, int y,
+                       float & xx) const
+{
+       cache(bv);
+       if (!preview_->previewReady()) {
+               InsetButton::draw(bv, font, y, xx);
+               return;
+       }
+
+       if (!preview_->monitoring())
+               preview_->startMonitoring();
+
+       int const x = int(xx);
+       int const w = width(bv, font);
+       int const d = descent(bv, font);
+       int const a = ascent(bv, font);
+       int const h = a + d;
+
+       bv->painter().image(x, y - a, w, h,
+                           *(preview_->pimage()->image()));
+
+       xx += w;
+}
+
+
+//
+// preview stuff
+//
+
+void InsetInclude::addPreview(grfx::PreviewLoader & ploader) const
+{
+       preview_->addPreview(ploader);
+}
+
+
+bool InsetInclude::PreviewImpl::previewWanted() const
+{
+       return parent().params_.flag == InsetInclude::INPUT &&
+               parent().params_.cparams.preview() &&
+               IsFileReadable(parent().getFileName());
+}
+
+
+string const InsetInclude::PreviewImpl::latexString() const
+{
+       if (!view() || !view()->buffer())
+               return string();
+
+       ostringstream os;
+       parent().latex(view()->buffer(), os, false, false);
+
+       return STRCONV(os.str());
+}
+
+
+void InsetInclude::PreviewImpl::startMonitoring()
+{
+       monitor_.reset(new FileMonitor(parent().getFileName(), 2000));
+       monitor_->connect(boost::bind(&PreviewImpl::restartLoading, this));
+       monitor_->start();
+}
+
+
+void InsetInclude::PreviewImpl::restartLoading()
+{
+       lyxerr << "restartLoading()" << std::endl;
+       removePreview();
+       if (view())
+               view()->updateInset(&parent());
+       generatePreview();
+}
+
+
+string const InsetIncludeMailer::name_("include");
+
+InsetIncludeMailer::InsetIncludeMailer(InsetInclude & inset)
+       : inset_(inset)
+{}
+
+
+string const InsetIncludeMailer::inset2string() const
+{
+       return params2string(inset_.params());
+}
+
+
+void InsetIncludeMailer::string2params(string const & in,
+                                      InsetInclude::Params & params)
+{
+       params = InsetInclude::Params();
+
+       if (in.empty())
+               return;
        
-       return keys;
+       istringstream data(STRCONV(in));
+       LyXLex lex(0,0);
+       lex.setStream(data);
+
+       if (lex.isOK()) {
+               lex.next();
+               string const token = lex.getString();
+               if (token != name_)
+                       return;
+       }
+
+       // This is part of the inset proper that is usually swallowed
+       // by Buffer::readInset
+       if (lex.isOK()) {
+               lex.next();
+               string const token = lex.getString();
+               if (token != "Include")
+                       return;
+       }
+
+       if (lex.isOK()) {
+               InsetInclude inset(params);
+               inset.read(0, lex);
+               params = inset.params();
+       }
+}
+
+
+string const
+InsetIncludeMailer::params2string(InsetInclude::Params const & params)
+{
+       InsetInclude inset(params);
+       inset.set(params);
+       ostringstream data;
+       data << name_ << ' ';
+       inset.write(0, data);
+       data << "\\end_inset\n";
+       return STRCONV(data.str());
 }