X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInclude.cpp;h=137c5a17fb8c47548066e0536b1884615a7e1632;hb=62ca7f3ae55ad2e0c395cb554d71afab87de1ee3;hp=b6a4f0bc6d2756e2cf3dd8550a087ab62b547e55;hpb=6d20abb1b1573b4a77e01a6b555af0bfa9fe1b48;p=lyx.git

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index b6a4f0bc6d..6d512b4b7d 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Richard Heck (conversion to InsetCommand)
  *
  * Full author contact details are available in file CREDITS.
@@ -19,20 +19,23 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
+#include "ErrorList.h"
 #include "Exporter.h"
+#include "Format.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
+#include "LayoutFile.h"
+#include "LayoutModuleList.h"
 #include "LyX.h"
 #include "LyXRC.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
+#include "output_xhtml.h"
 #include "OutputParams.h"
-#include "TocBackend.h"
 #include "TextClass.h"
+#include "TocBackend.h"
 
 #include "frontends/alert.h"
 #include "frontends/Painter.h"
@@ -40,16 +43,19 @@
 #include "graphics/PreviewImage.h"
 #include "graphics/PreviewLoader.h"
 
-#include "insets/RenderPreview.h"
+#include "insets/InsetLabel.h"
 #include "insets/InsetListingsParams.h"
+#include "insets/RenderPreview.h"
 
+#include "support/convert.h"
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/FileNameList.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h" // contains
 #include "support/lyxalgo.h"
-#include "support/lyxlib.h"
-#include "support/convert.h"
 
 #include <boost/bind.hpp>
 
@@ -117,34 +123,99 @@ bool isInputOrInclude(InsetCommandParams const & params)
  	return t == INPUT || t == INCLUDE;
 }
 
+
+FileName const masterFileName(Buffer const & buffer)
+{
+	return buffer.masterBuffer()->fileName();
+}
+
+
+void add_preview(RenderMonitoredPreview &, InsetInclude const &, Buffer const &);
+
+
+string const parentFilename(Buffer const & buffer)
+{
+	return buffer.absFileName();
+}
+
+
+FileName const includedFilename(Buffer const & buffer,
+			      InsetCommandParams const & params)
+{
+	return makeAbsPath(to_utf8(params["filename"]),
+			onlyPath(parentFilename(buffer)));
+}
+
+
+InsetLabel * createLabel(Buffer * buf, docstring const & label_str)
+{
+	if (label_str.empty())
+		return 0;
+	InsetCommandParams icp(LABEL_CODE);
+	icp["name"] = label_str;
+	return new InsetLabel(buf, icp);
+}
+
 } // namespace anon
 
 
-InsetInclude::InsetInclude(InsetCommandParams const & p)
-	: InsetCommand(p, "include"), include_label(uniqueID()),
-	  preview_(new RenderMonitoredPreview(this)), set_label_(false)
+InsetInclude::InsetInclude(Buffer * buf, InsetCommandParams const & p)
+	: InsetCommand(buf, p, "include"), include_label(uniqueID()),
+	  preview_(new RenderMonitoredPreview(this)), failedtoload_(false),
+	  set_label_(false), label_(0), child_buffer_(0)
 {
 	preview_->fileChanged(boost::bind(&InsetInclude::fileChanged, this));
+
+	if (isListings(params())) {
+		InsetListingsParams listing_params(to_utf8(p["lstparams"]));
+		label_ = createLabel(buffer_, from_utf8(listing_params.getParamValue("label")));
+	}
 }
 
 
 InsetInclude::InsetInclude(InsetInclude const & other)
 	: InsetCommand(other), include_label(other.include_label),
-	  preview_(new RenderMonitoredPreview(this)), set_label_(false)
+	  preview_(new RenderMonitoredPreview(this)), failedtoload_(false),
+	  set_label_(false), label_(0), child_buffer_(0)
 {
 	preview_->fileChanged(boost::bind(&InsetInclude::fileChanged, this));
+
+	if (other.label_)
+		label_ = new InsetLabel(*other.label_);
 }
 
 
-CommandInfo const * InsetInclude::findInfo(string const & /* cmdName */)
+InsetInclude::~InsetInclude()
+{
+	delete label_;
+}
+
+
+void InsetInclude::setBuffer(Buffer & buffer)
+{
+	InsetCommand::setBuffer(buffer);
+	if (label_)
+		label_->setBuffer(buffer);
+}
+
+
+void InsetInclude::setChildBuffer(Buffer * buffer)
+{
+	child_buffer_ = buffer;
+}
+
+
+ParamInfo const & InsetInclude::findInfo(string const & /* cmdName */)
 {
 	// FIXME
 	// This is only correct for the case of listings, but it'll do for now.
 	// In the other cases, this second parameter should just be empty.
-	static const char * const paramnames[] = {"filename", "lstparams", ""};
-	static const bool isoptional[] = {false, true};
-	static const CommandInfo info = {2, paramnames, isoptional};
-	return &info;
+	static ParamInfo param_info_;
+	if (param_info_.empty()) {
+		param_info_.add("filename", ParamInfo::LATEX_REQUIRED);
+		param_info_.add("lstparams", ParamInfo::LATEX_OPTIONAL);
+	}
+	return param_info_;
 }
 
 
@@ -156,25 +227,53 @@ bool InsetInclude::isCompatibleCommand(string const & s)
 
 void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
+
+	case LFUN_INSET_EDIT: {
+		editIncluded(to_utf8(params()["filename"]));
+		break;
+	}
 
 	case LFUN_INSET_MODIFY: {
+		// It should be OK just to invalidate the cache is setParams()
+		// If not....
+		// child_buffer_ = 0;
 		InsetCommandParams p(INCLUDE_CODE);
-		InsetCommandMailer::string2params("include", to_utf8(cmd.argument()), p);
+		if (cmd.getArg(0) == "changetype") {
+			InsetCommand::doDispatch(cur, cmd);
+			p = params();
+		} else
+			InsetCommand::string2params("include", to_utf8(cmd.argument()), p);
 		if (!p.getCmdName().empty()) {
 			if (isListings(p)){
-				InsetListingsParams par_old(to_utf8(params()["lstparams"]));
-				InsetListingsParams par_new(to_utf8(p["lstparams"]));
-				if (par_old.getParamValue("label") !=
-				    par_new.getParamValue("label")
-				    && !par_new.getParamValue("label").empty())
-					cur.bv().buffer().changeRefsIfUnique(
-						from_utf8(par_old.getParamValue("label")),
-						from_utf8(par_new.getParamValue("label")),
-						REF_CODE);
+				InsetListingsParams new_params(to_utf8(p["lstparams"]));
+				docstring const new_label =
+					from_utf8(new_params.getParamValue("label"));
+				
+				if (new_label.empty()) {
+					delete label_;
+					label_ = 0;
+				} else {
+					docstring old_label;
+					if (label_) 
+						old_label = label_->getParam("name");
+					else {
+						label_ = createLabel(buffer_, new_label);
+						label_->setBuffer(buffer());
+					}					
+
+					if (new_label != old_label) {
+						label_->updateCommand(new_label);
+						// the label might have been adapted (duplicate)
+						if (new_label != label_->getParam("name")) {
+							new_params.addParam("label", "{" + 
+								to_utf8(label_->getParam("name")) + "}", true);
+							p["lstparams"] = from_utf8(new_params.params());
+						}
+					}
+				}
 			}
-			set(p, cur.buffer());
-			cur.buffer().updateBibfilesCache();
+			setParams(p);
 		} else
 			cur.noUpdate();
 		break;
@@ -188,74 +287,97 @@ void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd)
 }
 
 
-namespace {
-
-FileName const masterFileName(Buffer const & buffer)
+void InsetInclude::editIncluded(string const & file)
 {
-	return buffer.masterBuffer()->fileName();
-}
-
-
-string const parentFilename(Buffer const & buffer)
-{
-	return buffer.absFileName();
+	string const ext = support::getExtension(file);
+	if (ext == "lyx") {
+		FuncRequest fr(LFUN_BUFFER_CHILD_OPEN, file);
+		lyx::dispatch(fr);
+	} else
+		// tex file or other text file in verbatim mode
+		formats.edit(buffer(),
+			support::makeAbsPath(file, support::onlyPath(buffer().absFileName())),
+			"text");
 }
 
 
-FileName const includedFilename(Buffer const & buffer,
-			      InsetCommandParams const & params)
+bool InsetInclude::getStatus(Cursor & cur, FuncRequest const & cmd,
+		FuncStatus & flag) const
 {
-	return makeAbsPath(to_utf8(params["filename"]),
-	       onlyPath(parentFilename(buffer)));
-}
+	switch (cmd.action()) {
 
+	case LFUN_INSET_EDIT:
+		flag.setEnabled(true);
+		return true;
 
-void add_preview(RenderMonitoredPreview &, InsetInclude const &, Buffer const &);
+	case LFUN_INSET_MODIFY:
+		if (cmd.getArg(0) == "changetype")
+			return InsetCommand::getStatus(cur, cmd, flag);
+		else
+			flag.setEnabled(true);
+		return true;
 
-} // namespace anon
+	default:
+		return InsetCommand::getStatus(cur, cmd, flag);
+	}
+}
 
 
-void InsetInclude::set(InsetCommandParams const & p, Buffer const & buffer)
+void InsetInclude::setParams(InsetCommandParams const & p)
 {
-	setParams(p);
+	// invalidate the cache
+	child_buffer_ = 0;
+
+	InsetCommand::setParams(p);
 	set_label_ = false;
 
 	if (preview_->monitoring())
 		preview_->stopMonitoring();
 
 	if (type(params()) == INPUT)
-		add_preview(*preview_, *this, buffer);
+		add_preview(*preview_, *this, buffer());
+
+	buffer().updateBibfilesCache();
 }
 
 
-Inset * InsetInclude::clone() const
+bool InsetInclude::isChildIncluded() const
 {
-	return new InsetInclude(*this);
+	std::list<std::string> includeonlys =
+		buffer().params().getIncludedChildren();
+	if (includeonlys.empty())
+		return true;
+	return (std::find(includeonlys.begin(),
+			  includeonlys.end(),
+			  to_utf8(params()["filename"])) != includeonlys.end());
 }
 
 
-docstring const InsetInclude::getScreenLabel(Buffer const & buf) const
+docstring InsetInclude::screenLabel() const
 {
 	docstring temp;
 
 	switch (type(params())) {
 		case INPUT:
-			temp = buf.B_("Input");
+			temp = buffer().B_("Input");
 			break;
 		case VERB:
-			temp = buf.B_("Verbatim Input");
+			temp = buffer().B_("Verbatim Input");
 			break;
 		case VERBAST:
-			temp = buf.B_("Verbatim Input*");
+			temp = buffer().B_("Verbatim Input*");
 			break;
 		case INCLUDE:
-			temp = buf.B_("Include");
+			if (isChildIncluded())
+				temp = buffer().B_("Include");
+			else
+				temp += buffer().B_("Include (excluded)");
 			break;
 		case LISTINGS:
 			temp = listings_label_;
 			break;
 		case NONE:
-			BOOST_ASSERT(false);
+			LASSERT(false, /**/);
 	}
 
 	temp += ": ";
@@ -269,109 +391,86 @@ docstring const InsetInclude::getScreenLabel(Buffer const & buf) const
 }
 
 
-namespace {
-
-/// return the child buffer if the file is a LyX doc and is loaded
-Buffer * getChildBuffer(Buffer const & buffer, InsetCommandParams const & params)
+Buffer * InsetInclude::getChildBuffer() const
 {
-	if (isVerbatim(params) || isListings(params))
-		return 0;
-
-	string const included_file = includedFilename(buffer, params).absFilename();
-	if (!isLyXFilename(included_file))
-		return 0;
+	Buffer * childBuffer = loadIfNeeded(); 
 
-	Buffer * childBuffer = theBufferList().getBuffer(included_file);
-
-	//FIXME RECURSIVE INCLUDES
-	if (childBuffer == & buffer)
-		return 0;
-	else
-		return childBuffer;
+	// FIXME: recursive includes
+	return (childBuffer == &buffer()) ? 0 : childBuffer;
 }
 
-} // namespace anon
-
 
-/// return true if the file is or got loaded.
-Buffer * loadIfNeeded(Buffer const & parent, InsetCommandParams const & params)
+Buffer * InsetInclude::loadIfNeeded() const
 {
-	if (isVerbatim(params) || isListings(params))
+	// This is for background export and preview. We don't even want to
+	// try to load the cloned child document again.
+	if (buffer().isClone())
+		return child_buffer_;
+	
+	// Don't try to load it again if we failed before.
+	if (failedtoload_ || isVerbatim(params()) || isListings(params()))
 		return 0;
 
-	string const parent_filename = parent.absFileName();
-	FileName const included_file = makeAbsPath(to_utf8(params["filename"]),
-			   onlyPath(parent_filename));
+	FileName const included_file = includedFilename(buffer(), params());
+	// Use cached Buffer if possible.
+	if (child_buffer_ != 0) {
+		if (theBufferList().isLoaded(child_buffer_)
+    		// additional sanity check: make sure the Buffer really is
+		    // associated with the file we want.
+		    && child_buffer_ == theBufferList().getBuffer(included_file))
+			return child_buffer_;
+		// Buffer vanished, so invalidate cache and try to reload.
+		child_buffer_ = 0;
+	}
 
-	if (!isLyXFilename(included_file.absFilename()))
+	if (!isLyXFilename(included_file.absFileName()))
 		return 0;
 
-	Buffer * child = theBufferList().getBuffer(included_file.absFilename());
+	Buffer * child = theBufferList().getBuffer(included_file);
 	if (!child) {
 		// the readonly flag can/will be wrong, not anymore I think.
 		if (!included_file.exists())
 			return 0;
 
-		child = theBufferList().newBuffer(included_file.absFilename());
+		child = theBufferList().newBuffer(included_file.absFileName());
+		if (!child)
+			// Buffer creation is not possible.
+			return 0;
+
 		if (!child->loadLyXFile(included_file)) {
+			failedtoload_ = true;
 			//close the buffer we just opened
 			theBufferList().release(child);
 			return 0;
 		}
+	
+		if (!child->errorList("Parse").empty()) {
+			// FIXME: Do something.
+		}
 	}
-	child->setParent(&parent);
+	child->setParent(&buffer());
+	// Cache the child buffer.
+	child_buffer_ = child;
 	return child;
 }
 
 
-void resetParentBuffer(Buffer const * parent, InsetCommandParams const & params,
-	bool close_it)
-{
-	if (isVerbatim(params) || isListings(params))
-		return;
-
-	string const parent_filename = parent->absFileName();
-	FileName const included_file = makeAbsPath(to_utf8(params["filename"]),
-			   onlyPath(parent_filename));
-
-	if (!isLyXFilename(included_file.absFilename()))
-		return;
-
-	Buffer * child = theBufferList().getBuffer(included_file.absFilename());
-	// File not opened, nothing to close.
-	if (!child)
-		return;
-
-	// Child document has a different parent, don't close it.
-	if (child->parent() != parent)
-		return;
-
-	//close the buffer.
-	child->setParent(0);
-	if (close_it)
-		theBufferList().release(child);
-	else
-		updateLabels(*child);
-}
-
-
-int InsetInclude::latex(Buffer const & buffer, odocstream & os,
-			OutputParams const & runparams) const
+int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
 {
-	string incfile(to_utf8(params()["filename"]));
+	string incfile = to_utf8(params()["filename"]);
 
 	// Do nothing if no file name has been specified
 	if (incfile.empty())
 		return 0;
 
-	FileName const included_file = includedFilename(buffer, params());
+	FileName const included_file = includedFilename(buffer(), params());
 
-	//Check we're not trying to include ourselves.
-	//FIXME RECURSIVE INCLUDE
-	//This isn't sufficient, as the inclusion could be downstream.
-	//But it'll have to do for now.
+	// Check we're not trying to include ourselves.
+	// FIXME RECURSIVE INCLUDE
+	// This isn't sufficient, as the inclusion could be downstream.
+	// But it'll have to do for now.
 	if (isInputOrInclude(params()) &&
-		buffer.absFileName() == included_file.absFilename())
+		buffer().absFileName() == included_file.absFileName())
 	{
 		Alert::error(_("Recursive input"),
 			       bformat(_("Attempted to include file %1$s in itself! "
@@ -379,21 +478,29 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
 		return 0;
 	}
 
-	Buffer const * const masterBuffer = buffer.masterBuffer();
+	Buffer const * const masterBuffer = buffer().masterBuffer();
 
 	// if incfile is relative, make it relative to the master
 	// buffer directory.
-	if (!absolutePath(incfile)) {
+	if (!FileName::isAbsolute(incfile)) {
 		// FIXME UNICODE
-		incfile = to_utf8(makeRelPath(from_utf8(included_file.absFilename()),
+		incfile = to_utf8(makeRelPath(from_utf8(included_file.absFileName()),
 					      from_utf8(masterBuffer->filePath())));
 	}
 
 	// write it to a file (so far the complete file)
-	string const exportfile = changeExtension(incfile, ".tex");
-	string const mangled =
-		DocFileName(changeExtension(included_file.absFilename(),".tex")).
+	string exportfile;
+	string mangled;
+	// bug 5681
+	if (type(params()) == LISTINGS) {
+		exportfile = incfile;
+		mangled = DocFileName(included_file).mangledFilename();
+	} else {
+		exportfile = changeExtension(incfile, ".tex");
+		mangled = DocFileName(changeExtension(included_file.absFileName(), ".tex")).
 			mangledFilename();
+	}
+
 	FileName const writefile(makeAbsPath(mangled, masterBuffer->temppath()));
 
 	if (!runparams.nice)
@@ -412,60 +519,63 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
 		//Don't try to load or copy the file if we're
 		//in a comment or doing a dryrun
 	} else if (isInputOrInclude(params()) &&
-		 isLyXFilename(included_file.absFilename())) {
+		 isLyXFilename(included_file.absFileName())) {
 		//if it's a LyX file and we're inputting or including,
 		//try to load it so we can write the associated latex
-		if (!loadIfNeeded(buffer, params()))
+		if (!loadIfNeeded())
 			return false;
 
-		Buffer * tmp = theBufferList().getBuffer(included_file.absFilename());
+		Buffer * tmp = theBufferList().getBuffer(included_file);
 
-		if (tmp->params().getBaseClass() != masterBuffer->params().getBaseClass()) {
+		if (tmp->params().baseClass() != masterBuffer->params().baseClass()) {
 			// FIXME UNICODE
 			docstring text = bformat(_("Included file `%1$s'\n"
-						"has textclass `%2$s'\n"
-							     "while parent file has textclass `%3$s'."),
-					      included_file.displayName(),
-					      from_utf8(tmp->params().getTextClass().name()),
-					      from_utf8(masterBuffer->params().getTextClass().name()));
-			Alert::warning(_("Different textclasses"), text);
-			//return 0;
+				"has textclass `%2$s'\n"
+				"while parent file has textclass `%3$s'."),
+				included_file.displayName(),
+				from_utf8(tmp->params().documentClass().name()),
+				from_utf8(masterBuffer->params().documentClass().name()));
+			Alert::warning(_("Different textclasses"), text, true);
 		}
 
 		// Make sure modules used in child are all included in master
-		//FIXME It might be worth loading the children's modules into the master
-		//over in BufferParams rather than doing this check.
-		vector<string> const masterModules = masterBuffer->params().getModules();
-		vector<string> const childModules = tmp->params().getModules();
-		vector<string>::const_iterator it = childModules.begin();
-		vector<string>::const_iterator end = childModules.end();
+		// FIXME It might be worth loading the children's modules into the master
+		// over in BufferParams rather than doing this check.
+		LayoutModuleList const masterModules = masterBuffer->params().getModules();
+		LayoutModuleList const childModules = tmp->params().getModules();
+		LayoutModuleList::const_iterator it = childModules.begin();
+		LayoutModuleList::const_iterator end = childModules.end();
 		for (; it != end; ++it) {
 			string const module = *it;
-			vector<string>::const_iterator found =
+			LayoutModuleList::const_iterator found =
 				find(masterModules.begin(), masterModules.end(), module);
-			if (found != masterModules.end()) {
+			if (found == masterModules.end()) {
 				docstring text = bformat(_("Included file `%1$s'\n"
-							"uses module `%2$s'\n"
-							"which is not used in parent file."),
-				       included_file.displayName(), from_utf8(module));
+					"uses module `%2$s'\n"
+					"which is not used in parent file."),
+					included_file.displayName(), from_utf8(module));
 				Alert::warning(_("Module not found"), text);
 			}
 		}
 
 		tmp->markDepClean(masterBuffer->temppath());
 
-// FIXME: handle non existing files
-// FIXME: Second argument is irrelevant!
-// since only_body is true, makeLaTeXFile will not look at second
-// argument. Should we set it to string(), or should makeLaTeXFile
-// make use of it somehow? (JMarc 20031002)
+		// FIXME: handle non existing files
+		// FIXME: Second argument is irrelevant!
+		// since only_body is true, makeLaTeXFile will not look at second
+		// argument. Should we set it to string(), or should makeLaTeXFile
+		// make use of it somehow? (JMarc 20031002)
 		// The included file might be written in a different encoding
+		// and language.
 		Encoding const * const oldEnc = runparams.encoding;
+		Language const * const oldLang = runparams.master_language;
 		runparams.encoding = &tmp->params().encoding();
+		runparams.master_language = buffer().params().language;
 		tmp->makeLaTeXFile(writefile,
-				   masterFileName(buffer).onlyPath().absFilename(),
+				   masterFileName(buffer()).onlyPath().absFileName(),
 				   runparams, false);
 		runparams.encoding = oldEnc;
+		runparams.master_language = oldLang;
 	} else {
 		// In this case, it's not a LyX file, so we copy the file
 		// to the temp dir, so that .aux files etc. are not created
@@ -480,7 +590,7 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
 				LYXERR(Debug::LATEX,
 					to_utf8(bformat(_("Could not copy the file\n%1$s\n"
 								  "into the temporary directory."),
-						   from_utf8(included_file.absFilename()))));
+						   from_utf8(included_file.absFileName()))));
 				return 0;
 			}
 		}
@@ -488,17 +598,21 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
 
 	string const tex_format = (runparams.flavor == OutputParams::LATEX) ?
 			"latex" : "pdflatex";
-	if (isVerbatim(params())) {
+	switch (type(params())) {
+	case VERB:
+	case VERBAST: {
 		incfile = latex_path(incfile);
 		// FIXME UNICODE
 		os << '\\' << from_ascii(params().getCmdName()) << '{'
 		   << from_utf8(incfile) << '}';
-	} else if (type(params()) == INPUT) {
+		break;
+	} 
+	case INPUT: {
 		runparams.exportdata->addExternalFile(tex_format, writefile,
 						      exportfile);
 
 		// \input wants file with extension (default is .tex)
-		if (!isLyXFilename(included_file.absFilename())) {
+		if (!isLyXFilename(included_file.absFileName())) {
 			incfile = latex_path(incfile);
 			// FIXME UNICODE
 			os << '\\' << from_ascii(params().getCmdName())
@@ -510,7 +624,9 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
 			os << '\\' << from_ascii(params().getCmdName())
 			   << '{' << from_utf8(incfile) <<  '}';
 		}
-	} else if (type(params()) == LISTINGS) {
+		break;
+	} 
+	case LISTINGS: {
 		os << '\\' << from_ascii(params().getCmdName());
 		string const opt = to_utf8(params()["lstparams"]);
 		// opt is set in QInclude dialog and should have passed validation.
@@ -518,7 +634,9 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
 		if (!params.params().empty())
 			os << "[" << from_utf8(params.params()) << "]";
 		os << '{'  << from_utf8(incfile) << '}';
-	} else {
+		break;
+	} 
+	case INCLUDE: {
 		runparams.exportdata->addExternalFile(tex_format, writefile,
 						      exportfile);
 
@@ -529,31 +647,82 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
 		// FIXME UNICODE
 		os << '\\' << from_ascii(params().getCmdName()) << '{'
 		   << from_utf8(incfile) << '}';
+		break;
+	}
+	case NONE:
+		break;
 	}
 
 	return 0;
 }
 
 
-int InsetInclude::plaintext(Buffer const & buffer, odocstream & os,
-			    OutputParams const &) const
+docstring InsetInclude::xhtml(XHTMLStream & xs, OutputParams const &rp) const
+{
+	if (rp.inComment)
+		 return docstring();
+
+	// For verbatim and listings, we just include the contents of the file as-is.
+	// In the case of listings, we wrap it in <pre>.
+	bool const listing = isListings(params());
+	if (listing || isVerbatim(params())) {
+		if (listing)
+			xs << html::StartTag("pre");
+		// FIXME: We don't know the encoding of the file, default to UTF-8.
+		xs << includedFilename(buffer(), params()).fileContents("UTF-8");
+		if (listing)
+			xs << html::EndTag("pre");
+		return docstring();
+	}
+
+	// We don't (yet) know how to Input or Include non-LyX files.
+	// (If we wanted to get really arcane, we could run some tex2html
+	// converter on the included file. But that's just masochistic.)
+	FileName const included_file = includedFilename(buffer(), params());
+	if (!isLyXFilename(included_file.absFileName())) {
+		frontend::Alert::warning(_("Unsupported Inclusion"),
+					 bformat(_("LyX does not know how to include non-LyX files when "
+					           "generating HTML output. Offending file:\n%1$s"),
+					            params()["filename"]));
+		return docstring();
+	}
+
+	// In the other cases, we will generate the HTML and include it.
+
+	// Check we're not trying to include ourselves.
+	// FIXME RECURSIVE INCLUDE
+	if (buffer().absFileName() == included_file.absFileName()) {
+		Alert::error(_("Recursive input"),
+			       bformat(_("Attempted to include file %1$s in itself! "
+			       "Ignoring inclusion."), params()["filename"]));
+		return docstring();
+	}
+
+	Buffer const * const ibuf = loadIfNeeded();
+	if (!ibuf)
+		return docstring();
+	ibuf->writeLyXHTMLSource(xs.os(), rp, true);
+	return docstring();
+}
+
+
+int InsetInclude::plaintext(odocstream & os, OutputParams const &) const
 {
 	if (isVerbatim(params()) || isListings(params())) {
-		os << '[' << getScreenLabel(buffer) << '\n';
+		os << '[' << screenLabel() << '\n';
 		// FIXME: We don't know the encoding of the file, default to UTF-8.
-		os << includedFilename(buffer, params()).fileContents("UTF-8");
+		os << includedFilename(buffer(), params()).fileContents("UTF-8");
 		os << "\n]";
 		return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 	} else {
-		docstring const str = '[' + getScreenLabel(buffer) + ']';
+		docstring const str = '[' + screenLabel() + ']';
 		os << str;
 		return str.size();
 	}
 }
 
 
-int InsetInclude::docbook(Buffer const & buffer, odocstream & os,
-			  OutputParams const & runparams) const
+int InsetInclude::docbook(odocstream & os, OutputParams const & runparams) const
 {
 	string incfile = to_utf8(params()["filename"]);
 
@@ -561,13 +730,13 @@ int InsetInclude::docbook(Buffer const & buffer, odocstream & os,
 	if (incfile.empty())
 		return 0;
 
-	string const included_file = includedFilename(buffer, params()).absFilename();
+	string const included_file = includedFilename(buffer(), params()).absFileName();
 
-	//Check we're not trying to include ourselves.
-	//FIXME RECURSIVE INCLUDE
-	//This isn't sufficient, as the inclusion could be downstream.
-	//But it'll have to do for now.
-	if (buffer.absFileName() == included_file) {
+	// Check we're not trying to include ourselves.
+	// FIXME RECURSIVE INCLUDE
+	// This isn't sufficient, as the inclusion could be downstream.
+	// But it'll have to do for now.
+	if (buffer().absFileName() == included_file) {
 		Alert::error(_("Recursive input"),
 			       bformat(_("Attempted to include file %1$s in itself! "
 			       "Ignoring inclusion."), from_utf8(incfile)));
@@ -578,12 +747,12 @@ int InsetInclude::docbook(Buffer const & buffer, odocstream & os,
 	string const exportfile = changeExtension(incfile, ".sgml");
 	DocFileName writefile(changeExtension(included_file, ".sgml"));
 
-	if (loadIfNeeded(buffer, params())) {
-		Buffer * tmp = theBufferList().getBuffer(included_file);
+	if (loadIfNeeded()) {
+		Buffer * tmp = theBufferList().getBuffer(FileName(included_file));
 
 		string const mangled = writefile.mangledFilename();
 		writefile = makeAbsPath(mangled,
-					buffer.masterBuffer()->temppath());
+					buffer().masterBuffer()->temppath());
 		if (!runparams.nice)
 			incfile = mangled;
 
@@ -615,9 +784,10 @@ void InsetInclude::validate(LaTeXFeatures & features) const
 	string incfile = to_utf8(params()["filename"]);
 	string writefile;
 
-	Buffer const & buffer = features.buffer();
+	LASSERT(&buffer() == &features.buffer(), /**/);
 
-	string const included_file = includedFilename(buffer, params()).absFilename();
+	string const included_file =
+		includedFilename(buffer(), params()).absFileName();
 
 	if (isLyXFilename(included_file))
 		writefile = changeExtension(included_file, ".sgml");
@@ -627,7 +797,7 @@ void InsetInclude::validate(LaTeXFeatures & features) const
 	if (!features.runparams().nice && !isVerbatim(params()) && !isListings(params())) {
 		incfile = DocFileName(writefile).mangledFilename();
 		writefile = makeAbsPath(incfile,
-					buffer.masterBuffer()->temppath()).absFilename();
+					buffer().masterBuffer()->temppath()).absFileName();
 	}
 
 	features.includeFile(include_label, writefile);
@@ -640,87 +810,60 @@ void InsetInclude::validate(LaTeXFeatures & features) const
 	// Here we must do the fun stuff...
 	// Load the file in the include if it needs
 	// to be loaded:
-	if (loadIfNeeded(buffer, params())) {
+	if (loadIfNeeded()) {
 		// a file got loaded
-		Buffer * const tmp = theBufferList().getBuffer(included_file);
+		Buffer * const tmp = theBufferList().getBuffer(FileName(included_file));
 		// make sure the buffer isn't us
 		// FIXME RECURSIVE INCLUDES
 		// This is not sufficient, as recursive includes could be
 		// more than a file away. But it will do for now.
-		if (tmp && tmp != & buffer) {
+		if (tmp && tmp != &buffer()) {
 			// We must temporarily change features.buffer,
 			// otherwise it would always be the master buffer,
 			// and nested includes would not work.
 			features.setBuffer(*tmp);
 			tmp->validate(features);
-			features.setBuffer(buffer);
+			features.setBuffer(buffer());
 		}
 	}
 }
 
 
-void InsetInclude::getLabelList(Buffer const & buffer,
-				vector<docstring> & list) const
+void InsetInclude::fillWithBibKeys(BiblioInfo & keys,
+	InsetIterator const & /*di*/) const
 {
-	if (isListings(params())) {
-		InsetListingsParams p(to_utf8(params()["lstparams"]));
-		string label = p.getParamValue("label");
-		if (!label.empty())
-			list.push_back(from_utf8(label));
-	}
-	else if (loadIfNeeded(buffer, params())) {
-		string const included_file = includedFilename(buffer, params()).absFilename();
-		Buffer * tmp = theBufferList().getBuffer(included_file);
-		tmp->setParent(0);
-		tmp->getLabelList(list);
-		tmp->setParent(const_cast<Buffer *>(&buffer));
+	if (loadIfNeeded()) {
+		string const included_file = includedFilename(buffer(), params()).absFileName();
+		Buffer * tmp = theBufferList().getBuffer(FileName(included_file));
+		BiblioInfo const & newkeys = tmp->localBibInfo();
+		keys.mergeBiblioInfo(newkeys);
 	}
 }
 
 
-void InsetInclude::fillWithBibKeys(Buffer const & buffer,
-		BiblioInfo & keys, InsetIterator const & /*di*/) const
+void InsetInclude::updateBibfilesCache()
 {
-	if (loadIfNeeded(buffer, params())) {
-		string const included_file = includedFilename(buffer, params()).absFilename();
-		Buffer * tmp = theBufferList().getBuffer(included_file);
-		//FIXME This is kind of a dirty hack and should be made reasonable.
-		tmp->setParent(0);
-		keys.fillWithBibKeys(tmp);
-		tmp->setParent(&buffer);
-	}
+	Buffer const * const child = getChildBuffer();
+	if (child)
+		child->updateBibfilesCache(Buffer::UpdateChildOnly);
 }
 
 
-void InsetInclude::updateBibfilesCache(Buffer const & buffer)
+support::FileNameList const &
+	InsetInclude::getBibfilesCache() const
 {
-	Buffer * const tmp = getChildBuffer(buffer, params());
-	if (tmp) {
-		tmp->setParent(0);
-		tmp->updateBibfilesCache();
-		tmp->setParent(&buffer);
-	}
-}
-
+	Buffer const * const child = getChildBuffer();
+	if (child)
+		return child->getBibfilesCache(Buffer::UpdateChildOnly);
 
-FileNameList const &
-InsetInclude::getBibfilesCache(Buffer const & buffer) const
-{
-	Buffer * const tmp = getChildBuffer(buffer, params());
-	if (tmp) {
-		tmp->setParent(0);
-		FileNameList const & cache = tmp->getBibfilesCache();
-		tmp->setParent(&buffer);
-		return cache;
-	}
-	static FileNameList const empty;
+	static support::FileNameList const empty;
 	return empty;
 }
 
 
 void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	BOOST_ASSERT(mi.base.bv);
+	LASSERT(mi.base.bv, /**/);
 
 	bool use_preview = false;
 	if (RenderPreview::status() != LyXRC::PREVIEW_OFF) {
@@ -734,8 +877,7 @@ void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const
 	} else {
 		if (!set_label_) {
 			set_label_ = true;
-			button_.update(getScreenLabel(mi.base.bv->buffer()),
-				       true);
+			button_.update(screenLabel(), true);
 		}
 		button_.metrics(mi, dim);
 	}
@@ -747,7 +889,7 @@ void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetInclude::draw(PainterInfo & pi, int x, int y) const
 {
-	BOOST_ASSERT(pi.base.bv);
+	LASSERT(pi.base.bv, /**/);
 
 	bool use_preview = false;
 	if (RenderPreview::status() != LyXRC::PREVIEW_OFF) {
@@ -763,6 +905,12 @@ void InsetInclude::draw(PainterInfo & pi, int x, int y) const
 }
 
 
+docstring InsetInclude::contextMenu(BufferView const &, int, int) const
+{
+	return from_ascii("context-include");
+}
+
+
 Inset::DisplayType InsetInclude::display() const
 {
 	return type(params()) == INPUT ? Inline : AlignCenter;
@@ -797,14 +945,14 @@ bool preview_wanted(InsetCommandParams const & params, Buffer const & buffer)
 }
 
 
-docstring const latex_string(InsetInclude const & inset, Buffer const & buffer)
+docstring latexString(InsetInclude const & inset)
 {
 	odocstringstream os;
 	// We don't need to set runparams.encoding since this will be done
 	// by latex() anyway.
 	OutputParams runparams(0);
 	runparams.flavor = OutputParams::LATEX;
-	inset.latex(buffer, os, runparams);
+	inset.latex(os, runparams);
 
 	return os.str();
 }
@@ -817,7 +965,7 @@ void add_preview(RenderMonitoredPreview & renderer, InsetInclude const & inset,
 	if (RenderPreview::status() != LyXRC::PREVIEW_OFF &&
 	    preview_wanted(params, buffer)) {
 		renderer.setAbsFile(includedFilename(buffer, params));
-		docstring const snippet = latex_string(inset, buffer);
+		docstring const snippet = latexString(inset);
 		renderer.addPreview(snippet, buffer);
 	}
 }
@@ -825,76 +973,104 @@ void add_preview(RenderMonitoredPreview & renderer, InsetInclude const & inset,
 } // namespace anon
 
 
-void InsetInclude::addPreview(graphics::PreviewLoader & ploader) const
+void InsetInclude::addPreview(DocIterator const & /*inset_pos*/,
+	graphics::PreviewLoader & ploader) const
 {
 	Buffer const & buffer = ploader.buffer();
-	if (preview_wanted(params(), buffer)) {
-		preview_->setAbsFile(includedFilename(buffer, params()));
-		docstring const snippet = latex_string(*this, buffer);
-		preview_->addPreview(snippet, ploader);
-	}
+	if (!preview_wanted(params(), buffer))
+		return;
+	preview_->setAbsFile(includedFilename(buffer, params()));
+	docstring const snippet = latexString(*this);
+	preview_->addPreview(snippet, ploader);
 }
 
 
-void InsetInclude::addToToc(TocList & toclist, Buffer const & buffer,
-	ParConstIterator const & pit) const
+void InsetInclude::addToToc(DocIterator const & cpit)
 {
+	TocBackend & backend = buffer().tocBackend();
+
 	if (isListings(params())) {
+		if (label_)
+			label_->addToToc(cpit);
+
 		InsetListingsParams p(to_utf8(params()["lstparams"]));
 		string caption = p.getParamValue("caption");
 		if (caption.empty())
 			return;
-		Toc & toc = toclist["listing"];
-		docstring const str = convert<docstring>(toc.size() + 1)
+		Toc & toc = backend.toc("listing");
+		docstring str = convert<docstring>(toc.size() + 1)
 			+ ". " +  from_utf8(caption);
-		// This inset does not have a valid ParConstIterator
-		// so it has to use the iterator of its parent paragraph
+		DocIterator pit = cpit;
 		toc.push_back(TocItem(pit, 0, str));
 		return;
 	}
-	Buffer const * const childbuffer = getChildBuffer(buffer, params());
+	Buffer const * const childbuffer = getChildBuffer();
 	if (!childbuffer)
 		return;
 
+	Toc & toc = backend.toc("child");
+	docstring str = childbuffer->fileName().displayName();
+	toc.push_back(TocItem(cpit, 0, str));
+
+	TocList & toclist = backend.tocs();
+	childbuffer->tocBackend().update();
 	TocList const & childtoclist = childbuffer->tocBackend().tocs();
 	TocList::const_iterator it = childtoclist.begin();
 	TocList::const_iterator const end = childtoclist.end();
 	for(; it != end; ++it)
 		toclist[it->first].insert(toclist[it->first].end(),
-				it->second.begin(), it->second.end());
-}
-
-
-void InsetInclude::updateLabels(Buffer const & buffer, ParIterator const &)
-{
-	Buffer const * const childbuffer = getChildBuffer(buffer, params());
-	if (childbuffer)
-		lyx::updateLabels(*childbuffer, true);
-	else if (isListings(params())) {
-		InsetListingsParams const par(to_utf8(params()["lstparams"]));
-		if (par.getParamValue("caption").empty())
-			listings_label_.clear();
-		else {
-			Counters & counters = buffer.params().getTextClass().counters();
-			docstring const cnt = from_ascii("listing");
-			if (counters.hasCounter(cnt)) {
-				counters.step(cnt);
-				listings_label_ = buffer.B_("Program Listing ")
-					+ convert<docstring>(counters.value(cnt));
-			} else
-				listings_label_ = buffer.B_("Program Listing");
-		}
-	}
+			it->second.begin(), it->second.end());
 }
 
 
-void InsetInclude::registerEmbeddedFiles(Buffer const & buffer,
-	EmbeddedFiles & files) const
+void InsetInclude::updateCommand()
 {
-	// include and input are temprarily not considered.
-	if (isVerbatim(params()) || isListings(params()))
-		files.registerFile(includedFilename(buffer, params()).absFilename(),
-			false, this);
+	if (!label_)
+		return;
+
+	docstring old_label = label_->getParam("name");
+	label_->updateCommand(old_label, false);
+	// the label might have been adapted (duplicate)
+	docstring new_label = label_->getParam("name");
+	if (old_label == new_label)
+		return;
+
+	// update listings parameters...
+	InsetCommandParams p(INCLUDE_CODE);
+	p = params();
+	InsetListingsParams par(to_utf8(params()["lstparams"]));
+	par.addParam("label", "{" + to_utf8(new_label) + "}", true);
+	p["lstparams"] = from_utf8(par.params());
+	setParams(p);	
 }
 
+void InsetInclude::updateBuffer(ParIterator const & it, UpdateType utype)
+{
+	Buffer const * const childbuffer = getChildBuffer();
+	if (childbuffer) {
+		childbuffer->updateBuffer(Buffer::UpdateChildOnly, utype);
+		return;
+	}
+	if (!isListings(params()))
+		return;
+
+	if (label_)
+		label_->updateBuffer(it, utype);
+
+	InsetListingsParams const par(to_utf8(params()["lstparams"]));
+	if (par.getParamValue("caption").empty()) {
+		listings_label_ = buffer().B_("Program Listing");
+		return;
+	}
+	Buffer const & master = *buffer().masterBuffer();
+	Counters & counters = master.params().documentClass().counters();
+	docstring const cnt = from_ascii("listing");
+	listings_label_ = master.B_("Program Listing");
+	if (counters.hasCounter(cnt)) {
+		counters.step(cnt, utype);
+		listings_label_ += " " + convert<docstring>(counters.value(cnt));
+	}
+}
+
+
 } // namespace lyx