X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=aa6d936aec8e6fa00b4c92a4e71c386280e21078;hb=94f0968e9212f24997cfee0d17c6f060210edbc6;hp=8d8b019f2250276920420c39ec72aa5d83f75e06;hpb=285a41066be87585f890394f4345120c45131e98;p=lyx.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 8d8b019f22..aa6d936aec 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -77,12 +77,12 @@
 #include "mathed/MathMacroTemplate.h"
 #include "mathed/MathSupport.h"
 
+#include "graphics/PreviewLoader.h"
+
 #include "frontends/alert.h"
 #include "frontends/Delegates.h"
 #include "frontends/WorkAreaManager.h"
 
-#include "graphics/Previews.h"
-
 #include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
@@ -117,6 +117,7 @@
 
 using namespace std;
 using namespace lyx::support;
+using namespace lyx::graphics;
 
 namespace lyx {
 
@@ -125,9 +126,7 @@ namespace os = support::os;
 
 namespace {
 
-// Do not remove the comment below, so we get merge conflict in
-// independent branches. Instead add your own.
-int const LYX_FORMAT = 410; // rgh: dummy format for list->labeling
+int const LYX_FORMAT = LYX_FORMAT_LYX;
 
 typedef map<string, bool> DepClean;
 typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
@@ -150,6 +149,7 @@ public:
 
 	~Impl()
 	{
+		delete preview_loader_;
 		if (wa_) {
 			wa_->closeAll();
 			delete wa_;
@@ -257,12 +257,19 @@ public:
 	mutable bool bibfile_cache_valid_;
 	/// Cache of timestamps of .bib files
 	map<FileName, time_t> bibfile_status_;
+	/// Indicates whether the bibinfo has changed since the last time
+	/// we ran updateBuffer(), i.e., whether citation labels may need
+	/// to be updated.
+	mutable bool cite_labels_valid_;
 
 	mutable RefCache ref_cache_;
 
 	/// our Text that should be wrapped in an InsetText
 	InsetText * inset;
 
+	///
+	PreviewLoader * preview_loader_;
+
 	/// This is here to force the test to be done whenever parent_buffer
 	/// is accessed.
 	Buffer const * parent() const { 
@@ -327,10 +334,11 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
 	Buffer const * cloned_buffer)
 	: owner_(owner), lyx_clean(true), bak_clean(true), unnamed(false),
 	  read_only(readonly_), filename(file), file_fully_loaded(false),
-	  toc_backend(owner), macro_lock(false), timestamp_(0),
-	  checksum_(0), wa_(0), gui_(0), undo_(*owner), bibinfo_cache_valid_(false),
-		bibfile_cache_valid_(false), cloned_buffer_(cloned_buffer), 
-		doing_export(false), parent_buffer(0)
+	  toc_backend(owner), macro_lock(false), timestamp_(0), checksum_(0),
+	  wa_(0), gui_(0), undo_(*owner), bibinfo_cache_valid_(false), 
+	  bibfile_cache_valid_(false), cite_labels_valid_(false), 
+	  preview_loader_(0), cloned_buffer_(cloned_buffer),
+	  doing_export(false), parent_buffer(0)
 {
 	if (!cloned_buffer_) {
 		temppath = createBufferTmpDir();
@@ -347,6 +355,8 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
 	bibinfo_cache_valid_ = cloned_buffer_->d->bibinfo_cache_valid_;
 	bibfile_cache_valid_ = cloned_buffer_->d->bibfile_cache_valid_;
 	bibfile_status_ = cloned_buffer_->d->bibfile_status_;
+	cite_labels_valid_ = cloned_buffer_->d->cite_labels_valid_;
+	unnamed = cloned_buffer_->d->unnamed;
 }
 
 
@@ -390,7 +400,7 @@ Buffer::~Buffer()
 	Impl::BufferPositionMap::iterator end = d->children_positions.end();
 	for (; it != end; ++it) {
 		Buffer * child = const_cast<Buffer *>(it->first);
-		if (d->cloned_buffer_)
+		if (isClone())
 			delete child;
 		// The child buffer might have been closed already.
 		else if (theBufferList().isLoaded(child))
@@ -422,29 +432,50 @@ Buffer::~Buffer()
 
 Buffer * Buffer::clone() const
 {
+	BufferMap bufmap;
+	masterBuffer()->clone(bufmap);
+	BufferMap::iterator it = bufmap.find(this);
+	LASSERT(it != bufmap.end(), return 0);
+	return it->second;
+}
+
+
+void Buffer::clone(BufferMap & bufmap) const
+{
+	// have we already been cloned?
+	if (bufmap.find(this) != bufmap.end())
+		return;
+
 	Buffer * buffer_clone = new Buffer(fileName().absFileName(), false, this);
+	bufmap[this] = buffer_clone;
 	buffer_clone->d->macro_lock = true;
 	buffer_clone->d->children_positions.clear();
 	// FIXME (Abdel 09/01/2010): this is too complicated. The whole children_positions and
 	// math macro caches need to be rethought and simplified.
 	// I am not sure wether we should handle Buffer cloning here or in BufferList.
 	// Right now BufferList knows nothing about buffer clones.
-	Impl::BufferPositionMap::iterator it = d->children_positions.begin();
-	Impl::BufferPositionMap::iterator end = d->children_positions.end();
+	Impl::PositionScopeBufferMap::iterator it = d->position_to_children.begin();
+	Impl::PositionScopeBufferMap::iterator end = d->position_to_children.end();
 	for (; it != end; ++it) {
-		DocIterator dit = it->second.clone(buffer_clone);
+		DocIterator dit = it->first.clone(buffer_clone);
 		dit.setBuffer(buffer_clone);
-		Buffer * child = const_cast<Buffer *>(it->first);
-		Buffer * child_clone = child->clone();
+		Buffer * child = const_cast<Buffer *>(it->second.second);
+
+		child->clone(bufmap);
+		BufferMap::iterator const bit = bufmap.find(child);
+		LASSERT(bit != bufmap.end(), continue);
+		Buffer * child_clone = bit->second;
+
 		Inset * inset = dit.nextInset();
 		LASSERT(inset && inset->lyxCode() == INCLUDE_CODE, continue);
 		InsetInclude * inset_inc = static_cast<InsetInclude *>(inset);
 		inset_inc->setChildBuffer(child_clone);
 		child_clone->d->setParent(buffer_clone);
+		// FIXME Do we need to do this now, or can we wait until we run updateMacros()?
 		buffer_clone->setChild(dit, child_clone);
 	}
 	buffer_clone->d->macro_lock = false;
-	return buffer_clone;
+	return;
 }
 
 
@@ -597,7 +628,7 @@ string Buffer::logName(LogType * type) const
 	FileName const bname(
 		addName(path, onlyFileName(
 			changeExtension(filename,
-					formats.extension(bufferFormat()) + ".out"))));
+					formats.extension(params().bufferFormat()) + ".out"))));
 
 	// Also consider the master buffer log file
 	FileName masterfname = fname;
@@ -681,10 +712,10 @@ int Buffer::readHeader(Lexer & lex)
 	params().indiceslist().clear();
 	params().backgroundcolor = lyx::rgbFromHexName("#ffffff");
 	params().isbackgroundcolor = false;
-	params().fontcolor = lyx::rgbFromHexName("#000000");
+	params().fontcolor = RGBColor(0, 0, 0);
 	params().isfontcolor = false;
-	params().notefontcolor = lyx::rgbFromHexName("#cccccc");
-	params().boxbgcolor = lyx::rgbFromHexName("#ff0000");
+	params().notefontcolor = RGBColor(0xCC, 0xCC, 0xCC);
+	params().boxbgcolor = RGBColor(0xFF, 0, 0);
 	params().html_latex_start.clear();
 	params().html_latex_end.clear();
 	params().html_math_img_scale = 1.0;
@@ -830,7 +861,7 @@ bool Buffer::readDocument(Lexer & lex)
 	}
 	usermacros.clear();
 	updateMacros();
-	updateMacroInstances();
+	updateMacroInstances(InternalUpdate);
 	return res;
 }
 
@@ -868,7 +899,12 @@ Buffer::ReadStatus Buffer::readFile(FileName const & fn)
 {
 	FileName fname(fn);
 	Lexer lex;
-	lex.setFile(fname);
+	if (!lex.setFile(fname)) {
+		Alert::error(_("File Not Found"),
+			bformat(_("Unable to open file `%1$s'."), 
+			        from_utf8(fn.absFileName())));
+		return ReadFileNotFound;
+	}
 
 	int file_format;
 	ReadStatus const ret_plf = parseLyXFormat(lex, fn, file_format);
@@ -915,16 +951,35 @@ void Buffer::setFullyLoaded(bool value)
 }
 
 
-void Buffer::updatePreviews() const
+PreviewLoader * Buffer::loader() const
 {
-	if (graphics::Previews::status() != LyXRC::PREVIEW_OFF)
-		thePreviews().generateBufferPreviews(*this);
+	if (!isExporting() && lyxrc.preview == LyXRC::PREVIEW_OFF)
+		return 0;
+	if (!d->preview_loader_)
+		d->preview_loader_ = new PreviewLoader(*this);
+	return d->preview_loader_;
 }
 
 
 void Buffer::removePreviews() const
 {
-	thePreviews().removeLoader(*this);
+	delete d->preview_loader_;
+	d->preview_loader_ = 0;
+}
+
+
+void Buffer::updatePreviews() const
+{
+	PreviewLoader * ploader = loader();
+	if (!ploader)
+		return;
+
+	InsetIterator it = inset_iterator_begin(*d->inset);
+	InsetIterator const end = inset_iterator_end(*d->inset);
+	for (; it != end; ++it)
+		it->addPreview(it, *ploader);
+
+	ploader->startLoading();
 }
 
 
@@ -1055,13 +1110,18 @@ bool Buffer::save() const
 			backupName = FileName(addName(lyxrc.backupdir_path,
 						      mangledName));
 		}
-		// do not copy because of #6587
-		if (fileName().moveTo(backupName)) {
-			madeBackup = true;
-		} else {
+
+		// Except file is symlink do not copy because of #6587.
+		// Hard links have bad luck.
+		if (fileName().isSymLink())
+			madeBackup = fileName().copyTo(backupName);
+		else
+			madeBackup = fileName().moveTo(backupName);
+
+		if (!madeBackup) {
 			Alert::error(_("Backup failure"),
 				     bformat(_("Cannot create backup file %1$s.\n"
-					       "Please check whether the directory exists and is writeable."),
+					       "Please check whether the directory exists and is writable."),
 					     from_utf8(backupName.absFileName())));
 			//LYXERR(Debug::DEBUG, "Fs error: " << fe.what());
 		}
@@ -1081,6 +1141,11 @@ bool Buffer::save() const
 
 bool Buffer::writeFile(FileName const & fname) const
 {
+	// FIXME Do we need to do these here? I don't think writing
+	// the LyX file depends upon it. (RGH)
+	// updateBuffer();
+	// updateMacroInstances();
+
 	if (d->read_only && fname == d->filename)
 		return false;
 
@@ -1142,7 +1207,7 @@ docstring Buffer::emergencyWrite()
 	}
 
 	// 2) In HOME directory.
-	string s = addName(package().home_dir().absFileName(), absFileName());
+	string s = addName(Package::get_home_dir().absFileName(), absFileName());
 	s += ".emergency";
 	lyxerr << ' ' << s << endl;
 	if (writeFile(FileName(s))) {
@@ -1182,7 +1247,7 @@ bool Buffer::write(ostream & ofs) const
 	// The top of the file should not be written by params().
 
 	// write out a comment in the top of the file
-	ofs << "#LyX " << lyx_version
+	ofs << "#LyX " << lyx_version_major << "." << lyx_version_minor
 	    << " created this file. For more info see http://www.lyx.org/\n"
 	    << "\\lyxformat " << LYX_FORMAT << "\n"
 	    << "\\begin_document\n";
@@ -1236,7 +1301,7 @@ bool Buffer::write(ostream & ofs) const
 bool Buffer::makeLaTeXFile(FileName const & fname,
 			   string const & original_path,
 			   OutputParams const & runparams_in,
-			   bool output_preamble, bool output_body) const
+			   OutputWhat output) const
 {
 	OutputParams runparams = runparams_in;
 
@@ -1246,7 +1311,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 		runparams.encoding = encodings.fromLyXName("utf8-plain");
 
 	string const encoding = runparams.encoding->iconvName();
-	LYXERR(Debug::LATEX, "makeLaTeXFile encoding: " << encoding << "...");
+	LYXERR(Debug::LATEX, "makeLaTeXFile encoding: " << encoding << ", fname=" << fname.realPath());
 
 	ofdocstream ofs;
 	try { ofs.reset(encoding); }
@@ -1264,10 +1329,18 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 	ErrorList & errorList = d->errorLists["Export"];
 	errorList.clear();
 	bool failed_export = false;
+	otexstream os(ofs, d->texrow);
+
+	// make sure we are ready to export
+	// this needs to be done before we validate
+	// FIXME Do we need to do this all the time? I.e., in children
+	// of a master we are exporting?
+	updateBuffer();
+	updateMacroInstances(OutputUpdate);
+
 	try {
-		d->texrow.reset();
-		writeLaTeXSource(ofs, original_path,
-		      runparams, output_preamble, output_body);
+		os.texrow().reset();
+		writeLaTeXSource(os, original_path, runparams, output);
 	}
 	catch (EncodingException & e) {
 		odocstringstream ods;
@@ -1309,10 +1382,10 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 }
 
 
-void Buffer::writeLaTeXSource(odocstream & os,
+void Buffer::writeLaTeXSource(otexstream & os,
 			   string const & original_path,
 			   OutputParams const & runparams_in,
-			   bool const output_preamble, bool const output_body) const
+         OutputWhat output) const
 {
 	// The child documents, if any, shall be already loaded at this point.
 
@@ -1327,6 +1400,11 @@ void Buffer::writeLaTeXSource(odocstream & os,
 	validate(features);
 	LYXERR(Debug::LATEX, "  Buffer validation done.");
 
+	bool const output_preamble =
+		output == FullSource || output == OnlyPreamble;
+	bool const output_body =
+	  output == FullSource || output == OnlyBody;
+
 	// The starting paragraph of the coming rows is the
 	// first paragraph of the document. (Asger)
 	if (output_preamble && runparams.nice) {
@@ -1334,41 +1412,29 @@ void Buffer::writeLaTeXSource(odocstream & os,
 			"For more info, see http://www.lyx.org/.\n"
 			"%% Do not edit unless you really know what "
 			"you are doing.\n";
-		d->texrow.newline();
-		d->texrow.newline();
 	}
 	LYXERR(Debug::INFO, "lyx document header finished");
 
-	// Don't move this behind the parent_buffer=0 code below,
-	// because then the macros will not get the right "redefinition"
-	// flag as they don't see the parent macros which are output before.
-	updateMacros();
-
-	// fold macros if possible, still with parent buffer as the
-	// macros will be put in the prefix anyway.
-	updateMacroInstances();
-
 	// There are a few differences between nice LaTeX and usual files:
-	// usual is \batchmode and has a
-	// special input@path to allow the including of figures
-	// with either \input or \includegraphics (what figinsets do).
-	// input@path is set when the actual parameter
-	// original_path is set. This is done for usual tex-file, but not
-	// for nice-latex-file. (Matthias 250696)
+	// usual files have \batchmode and special input@path to allow
+	// inclusion of figures specified by an explicitly relative path
+	// (i.e., a path starting with './' or '../') with either \input or
+	// \includegraphics, as the TEXINPUTS method doesn't work in this case.
+	// input@path is set when the actual parameter original_path is set.
+	// This is done for usual tex-file, but not for nice-latex-file.
+	// (Matthias 250696)
 	// Note that input@path is only needed for something the user does
 	// in the preamble, included .tex files or ERT, files included by
 	// LyX work without it.
 	if (output_preamble) {
 		if (!runparams.nice) {
 			// code for usual, NOT nice-latex-file
-			os << "\\batchmode\n"; // changed
-			// from \nonstopmode
-			d->texrow.newline();
+			os << "\\batchmode\n"; // changed from \nonstopmode
 		}
 		if (!original_path.empty()) {
 			// FIXME UNICODE
 			// We don't know the encoding of inputpath
-			docstring const inputpath = from_utf8(support::latex_path(original_path));
+			docstring const inputpath = from_utf8(original_path);
 			docstring uncodable_glyphs;
 			Encoding const * const enc = runparams.encoding;
 			if (enc) {
@@ -1386,22 +1452,42 @@ void Buffer::writeLaTeXSource(odocstream & os,
 
 			// warn user if we found uncodable glyphs.
 			if (!uncodable_glyphs.empty()) {
-				frontend::Alert::warning(_("Uncodable character in file path"),
-						support::bformat(_("The path of your document\n"
-						  "(%1$s)\n"
-						  "contains glyphs that are unknown in the\n"
-						  "current document encoding (namely %2$s).\n"
-						  "This will likely result in incomplete output.\n\n"
-						  "Choose an appropriate document encoding (such as utf8)\n"
-						  "or change the file path name."), inputpath, uncodable_glyphs));
+				frontend::Alert::warning(
+					_("Uncodable character in file path"),
+					support::bformat(
+					  _("The path of your document\n"
+					    "(%1$s)\n"
+					    "contains glyphs that are unknown "
+					    "in the current document encoding "
+					    "(namely %2$s). This may result in "
+					    "incomplete output, unless "
+					    "TEXINPUTS contains the document "
+					    "directory and you don't use "
+					    "explicitly relative paths (i.e., "
+					    "paths starting with './' or "
+					    "'../') in the preamble or in ERT."
+					    "\n\nIn case of problems, choose "
+					    "an appropriate document encoding\n"
+					    "(such as utf8) or change the "
+					    "file path name."),
+					  inputpath, uncodable_glyphs));
 			} else {
+				string docdir =
+					support::latex_path(original_path);
+				if (contains(docdir, '#')) {
+					docdir = subst(docdir, "#", "\\#");
+					os << "\\catcode`\\#=11"
+					      "\\def\\#{#}\\catcode`\\#=6\n";
+				}
+				if (contains(docdir, '%')) {
+					docdir = subst(docdir, "%", "\\%");
+					os << "\\catcode`\\%=11"
+					      "\\def\\%{%}\\catcode`\\%=14\n";
+				}
 				os << "\\makeatletter\n"
 				   << "\\def\\input@path{{"
-				   << inputpath << "/}}\n"
+				   << docdir << "/}}\n"
 				   << "\\makeatother\n";
-				d->texrow.newline();
-				d->texrow.newline();
-				d->texrow.newline();
 			}
 		}
 
@@ -1413,7 +1499,6 @@ void Buffer::writeLaTeXSource(odocstream & os,
 		runparams.use_polyglossia = features.usePolyglossia();
 		// Write the preamble
 		runparams.use_babel = params().writeLaTeX(os, features,
-							  d->texrow,
 							  d->filename.onlyPath());
 
 		runparams.use_japanese = features.isRequired("japanese");
@@ -1423,19 +1508,18 @@ void Buffer::writeLaTeXSource(odocstream & os,
 
 		// make the body.
 		os << "\\begin{document}\n";
-		d->texrow.newline();
 
 		// output the parent macros
 		MacroSet::iterator it = parentMacros.begin();
 		MacroSet::iterator end = parentMacros.end();
 		for (; it != end; ++it) {
-			int num_lines = (*it)->write(os, true);
-			d->texrow.newlines(num_lines);
+			int num_lines = (*it)->write(os.os(), true);
+			os.texrow().newlines(num_lines);
 		}
 		
 	} // output_preamble
 
-	d->texrow.start(paragraphs().begin()->id(), 0);
+	os.texrow().start(paragraphs().begin()->id(), 0);
 
 	LYXERR(Debug::INFO, "preamble finished, now the body.");
 
@@ -1449,7 +1533,7 @@ void Buffer::writeLaTeXSource(odocstream & os,
 	}
 
 	// the real stuff
-	latexParagraphs(*this, text(), os, d->texrow, runparams);
+	latexParagraphs(*this, text(), os, runparams);
 
 	// Restore the parenthood if needed
 	if (output_preamble)
@@ -1457,11 +1541,9 @@ void Buffer::writeLaTeXSource(odocstream & os,
 
 	// add this just in case after all the paragraphs
 	os << endl;
-	d->texrow.newline();
 
 	if (output_preamble) {
 		os << "\\end{document}\n";
-		d->texrow.newline();
 		LYXERR(Debug::LATEX, "makeLaTeXFile...done");
 	} else {
 		LYXERR(Debug::LATEX, "LaTeXFile for inclusion made.");
@@ -1469,7 +1551,7 @@ void Buffer::writeLaTeXSource(odocstream & os,
 	runparams_in.encoding = runparams.encoding;
 
 	// Just to be sure. (Asger)
-	d->texrow.newline();
+	os.texrow().newline();
 
 	//for (int i = 0; i<d->texrow.rows(); i++) {
 	// int id,pos;
@@ -1478,31 +1560,13 @@ void Buffer::writeLaTeXSource(odocstream & os,
 	//}
 
 	LYXERR(Debug::INFO, "Finished making LaTeX file.");
-	LYXERR(Debug::INFO, "Row count was " << d->texrow.rows() - 1 << '.');
-}
-
-
-bool Buffer::isLatex() const
-{
-	return params().documentClass().outputType() == LATEX;
-}
-
-
-bool Buffer::isLiterate() const
-{
-	return params().documentClass().outputType() == LITERATE;
-}
-
-
-bool Buffer::isDocBook() const
-{
-	return params().documentClass().outputType() == DOCBOOK;
+	LYXERR(Debug::INFO, "Row count was " << os.texrow().rows() - 1 << '.');
 }
 
 
 void Buffer::makeDocBookFile(FileName const & fname,
 			      OutputParams const & runparams,
-			      bool const body_only) const
+			      OutputWhat output) const
 {
 	LYXERR(Debug::LATEX, "makeDocBookFile...");
 
@@ -1510,7 +1574,12 @@ void Buffer::makeDocBookFile(FileName const & fname,
 	if (!openFileWrite(ofs, fname))
 		return;
 
-	writeDocBookSource(ofs, fname.absFileName(), runparams, body_only);
+	// make sure we are ready to export
+	// this needs to be done before we validate
+	updateBuffer();
+	updateMacroInstances(OutputUpdate);
+
+	writeDocBookSource(ofs, fname.absFileName(), runparams, output);
 
 	ofs.close();
 	if (ofs.fail())
@@ -1520,7 +1589,7 @@ void Buffer::makeDocBookFile(FileName const & fname,
 
 void Buffer::writeDocBookSource(odocstream & os, string const & fname,
 			     OutputParams const & runparams,
-			     bool const only_body) const
+			     OutputWhat output) const
 {
 	LaTeXFeatures features(*this, params(), runparams);
 	validate(features);
@@ -1530,7 +1599,12 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
 	DocumentClass const & tclass = params().documentClass();
 	string const top_element = tclass.latexname();
 
-	if (!only_body) {
+	bool const output_preamble =
+		output == FullSource || output == OnlyPreamble;
+	bool const output_body =
+	  output == FullSource || output == OnlyBody;
+
+	if (output_preamble) {
 		if (runparams.flavor == OutputParams::XML)
 			os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
 
@@ -1565,37 +1639,36 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
 		os << ">\n\n";
 	}
 
-	string top = top_element;
-	top += " lang=\"";
-	if (runparams.flavor == OutputParams::XML)
-		top += params().language->code();
-	else
-		top += params().language->code().substr(0, 2);
-	top += '"';
-
-	if (!params().options.empty()) {
-		top += ' ';
-		top += params().options;
+	if (output_body) {
+		string top = top_element;
+		top += " lang=\"";
+		if (runparams.flavor == OutputParams::XML)
+			top += params().language->code();
+		else
+			top += params().language->code().substr(0, 2);
+		top += '"';
+	
+		if (!params().options.empty()) {
+			top += ' ';
+			top += params().options;
+		}
+	
+		os << "<!-- " << ((runparams.flavor == OutputParams::XML)? "XML" : "SGML")
+				<< " file was created by LyX " << lyx_version
+				<< "\n  See http://www.lyx.org/ for more information -->\n";
+	
+		params().documentClass().counters().reset();
+	
+		sgml::openTag(os, top);
+		os << '\n';
+		docbookParagraphs(text(), *this, os, runparams);
+		sgml::closeTag(os, top_element);
 	}
-
-	os << "<!-- " << ((runparams.flavor == OutputParams::XML)? "XML" : "SGML")
-	    << " file was created by LyX " << lyx_version
-	    << "\n  See http://www.lyx.org/ for more information -->\n";
-
-	params().documentClass().counters().reset();
-
-	updateMacros();
-
-	sgml::openTag(os, top);
-	os << '\n';
-	docbookParagraphs(text(), *this, os, runparams);
-	sgml::closeTag(os, top_element);
 }
 
 
 void Buffer::makeLyXHTMLFile(FileName const & fname,
-			      OutputParams const & runparams,
-			      bool const body_only) const
+			      OutputParams const & runparams) const
 {
 	LYXERR(Debug::LATEX, "makeLyXHTMLFile...");
 
@@ -1603,7 +1676,12 @@ void Buffer::makeLyXHTMLFile(FileName const & fname,
 	if (!openFileWrite(ofs, fname))
 		return;
 
-	writeLyXHTMLSource(ofs, runparams, body_only);
+	// make sure we are ready to export
+	// this has to be done before we validate
+	updateBuffer(UpdateMaster, OutputUpdate);
+	updateMacroInstances(OutputUpdate);
+
+	writeLyXHTMLSource(ofs, runparams, FullSource);
 
 	ofs.close();
 	if (ofs.fail())
@@ -1613,16 +1691,18 @@ void Buffer::makeLyXHTMLFile(FileName const & fname,
 
 void Buffer::writeLyXHTMLSource(odocstream & os,
 			     OutputParams const & runparams,
-			     bool const only_body) const
+			     OutputWhat output) const
 {
 	LaTeXFeatures features(*this, params(), runparams);
 	validate(features);
-	updateBuffer(UpdateMaster, OutputUpdate);
 	d->bibinfo_.makeCitationLabels(*this);
-	updateMacros();
-	updateMacroInstances();
 
-	if (!only_body) {
+	bool const output_preamble =
+		output == FullSource || output == OnlyPreamble;
+	bool const output_body =
+	  output == FullSource || output == OnlyBody;
+
+	if (output_preamble) {
 		os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 		   << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN\" \"http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd\">\n"
 		   // FIXME Language should be set properly.
@@ -1634,7 +1714,9 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
 
 		docstring const & doctitle = features.htmlTitle();
 		os << "<title>"
-		   << (doctitle.empty() ? from_ascii("LyX Document") : doctitle)
+		   << (doctitle.empty() ? 
+		         from_ascii("LyX Document") : 
+		         html::htmlize(doctitle, XHTMLStream::ESCAPE_ALL))
 		   << "</title>\n";
 
 		os << "\n<!-- Text Class Preamble -->\n"
@@ -1649,14 +1731,34 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
 				<< styleinfo
 				<< "</style>\n";
 		}
-		os << "</head>\n<body>\n";
+
+		bool const needfg = params().fontcolor != RGBColor(0, 0, 0);
+		bool const needbg = params().backgroundcolor != RGBColor(0xFF, 0xFF, 0xFF);
+		if (needfg || needbg) {
+				os << "<style type='text/css'>\nbody {\n";
+				if (needfg)
+				   os << "  color: "
+					    << from_ascii(X11hexname(params().fontcolor))
+					    << ";\n";
+				if (needbg)
+				   os << "  background-color: "
+					    << from_ascii(X11hexname(params().backgroundcolor))
+					    << ";\n";
+				os << "}\n</style>\n";
+		}
+		os << "</head>\n";
+	}
+
+	if (output_body) {
+		os << "<body>\n";
+		XHTMLStream xs(os);
+		params().documentClass().counters().reset();
+		xhtmlParagraphs(text(), *this, xs, runparams);
+		os << "</body>\n";
 	}
 
-	XHTMLStream xs(os);
-	params().documentClass().counters().reset();
-	xhtmlParagraphs(text(), *this, xs, runparams);
-	if (!only_body)
-		os << "</body>\n</html>\n";
+	if (output_preamble)
+		os << "</html>\n";
 }
 
 
@@ -1706,8 +1808,6 @@ void Buffer::validate(LaTeXFeatures & features) const
 {
 	params().validate(features);
 
-	updateMacros();
-
 	for_each(paragraphs().begin(), paragraphs().end(),
 		 bind(&Paragraph::validate, _1, ref(features)));
 
@@ -1769,12 +1869,14 @@ void Buffer::updateBibfilesCache(UpdateScope scope) const
 	}
 	d->bibfile_cache_valid_ = true;
 	d->bibinfo_cache_valid_ = false;
+	d->cite_labels_valid_ = false;
 }
 
 
 void Buffer::invalidateBibinfoCache() const
 {
 	d->bibinfo_cache_valid_ = false;
+	d->cite_labels_valid_ = false;
 	// also invalidate the cache for the parent buffer
 	Buffer const * const pbuf = d->parent();
 	if (pbuf)
@@ -1786,6 +1888,7 @@ void Buffer::invalidateBibfileCache() const
 {
 	d->bibfile_cache_valid_ = false;
 	d->bibinfo_cache_valid_ = false;
+	d->cite_labels_valid_ = false;
 	// also invalidate the cache for the parent buffer
 	Buffer const * const pbuf = d->parent();
 	if (pbuf)
@@ -1835,6 +1938,7 @@ void Buffer::checkIfBibInfoCacheIsValid() const
 		time_t prevw = d->bibfile_status_[*ei];
 		if (lastw != prevw) {
 			d->bibinfo_cache_valid_ = false;
+			d->cite_labels_valid_ = false;
 			d->bibfile_status_[*ei] = lastw;
 		}
 	}
@@ -1885,6 +1989,12 @@ void Buffer::addBibTeXInfo(docstring const & key, BibTeXInfo const & bi) const
 }
 
 
+bool Buffer::citeLabelsValid() const
+{
+	return masterBuffer()->d->cite_labels_valid_;
+}
+
+
 bool Buffer::isDepClean(string const & name) const
 {
 	DepClean::const_iterator const it = d->dep_clean.find(name);
@@ -1900,21 +2010,6 @@ void Buffer::markDepClean(string const & name)
 }
 
 
-bool Buffer::isExportableFormat(string const & format) const
-{
-		typedef vector<Format const *> Formats;
-		Formats formats;
-		formats = exportableFormats(true);
-		Formats::const_iterator fit = formats.begin();
-		Formats::const_iterator end = formats.end();
-		for (; fit != end ; ++fit) {
-			if ((*fit)->name() == format)
-				return true;
-		}
-		return false;
-}
-
-
 bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 {
 	if (isInternal()) {
@@ -1943,7 +2038,15 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 
 		case LFUN_BUFFER_EXPORT: {
 			docstring const arg = cmd.argument();
-			enable = arg == "custom" || isExportable(to_utf8(arg));
+			if (arg == "custom") {
+				enable = true;
+				break;
+			}
+			string format = to_utf8(arg);
+			size_t pos = format.find(' ');
+			if (pos != string::npos)
+				format = format.substr(0, pos);
+			enable = params().isExportable(format);
 			if (!enable)
 				flag.message(bformat(
 					_("Don't know how to export to format: %1$s"), arg));
@@ -1951,11 +2054,11 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 		}
 
 		case LFUN_BUFFER_CHKTEX:
-			enable = isLatex() && !lyxrc.chktex_command.empty();
+			enable = params().isLatex() && !lyxrc.chktex_command.empty();
 			break;
 
 		case LFUN_BUILD_PROGRAM:
-			enable = isExportable("program");
+			enable = params().isExportable("program");
 			break;
 
 		case LFUN_BRANCH_ACTIVATE: 
@@ -2015,16 +2118,16 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 		break;
 
 	case LFUN_BUFFER_EXPORT: {
-		bool success = doExport(argument, false, false);
-		dr.setError(!success);
-		if (!success)
+		ExportStatus const status = doExport(argument, false);
+		dr.setError(status != ExportSuccess);
+		if (status != ExportSuccess)
 			dr.setMessage(bformat(_("Error exporting to format: %1$s."), 
 					      func.argument()));
 		break;
 	}
 
 	case LFUN_BUILD_PROGRAM:
-		doExport("program", true, false);
+		doExport("program", true);
 		break;
 
 	case LFUN_BUFFER_CHKTEX:
@@ -2056,7 +2159,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 				break;
 
 		} else {
-			doExport(format_name, true, false, filename);
+			doExport(format_name, true, filename);
 		}
 
 		// Substitute $$FName for filename
@@ -2066,7 +2169,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 
 		// Execute the command in the background
 		Systemcall call;
-		call.startscript(Systemcall::DontWait, command);
+		call.startscript(Systemcall::DontWait, command, filePath());
 		break;
 	}
 
@@ -2203,10 +2306,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 			break;
 		}
 
-		bool const update_unincluded =
-				params().maintain_unincluded_children
-				&& !params().getIncludedChildren().empty();
-		if (!doExport("dvi", true, update_unincluded)) {
+		if (!doExport("dvi", true)) {
 			showPrintError(absFileName());
 			dr.setMessage(_("Error exporting to DVI."));
 			break;
@@ -2244,7 +2344,8 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 				command2 += quoteName(psname);
 				// First run dvips.
 				// If successful, then spool command
-				res = one.startscript(Systemcall::Wait, command);
+				res = one.startscript(Systemcall::Wait, command,
+						      filePath());
 
 				if (res == 0) {
 					// If there's no GUI, we have to wait on this command. Otherwise,
@@ -2252,7 +2353,8 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 					// file, before it can be printed!!
 					Systemcall::Starttype stype = use_gui ?
 						Systemcall::DontWait : Systemcall::Wait;
-					res = one.startscript(stype, command2);
+					res = one.startscript(stype, command2,
+							      filePath());
 				}
 			} else {
 				// case 2: print directly to a printer
@@ -2261,7 +2363,8 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 				// as above....
 				Systemcall::Starttype stype = use_gui ?
 					Systemcall::DontWait : Systemcall::Wait;
-				res = one.startscript(stype, command + quoteName(dviname));
+				res = one.startscript(stype, command +
+						quoteName(dviname), filePath());
 			}
 
 		} else {
@@ -2284,7 +2387,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 			// as above....
 			Systemcall::Starttype stype = use_gui ?
 				Systemcall::DontWait : Systemcall::Wait;
-			res = one.startscript(stype, command);
+			res = one.startscript(stype, command, filePath());
 		}
 
 		if (res == 0) 
@@ -2296,18 +2399,6 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 		break;
 	}
 
-	case LFUN_BUFFER_LANGUAGE: {
-		Language const * oldL = params().language;
-		Language const * newL = languages.getLanguage(argument);
-		if (!newL || oldL == newL)
-			break;
-		if (oldL->rightToLeft() == newL->rightToLeft() && !isMultiLingual()) {
-			changeLanguage(oldL, newL);
-			dr.forceBufferUpdate();
-		}
-		break;
-	}
-
 	default:
 		dispatched = false;
 		break;
@@ -2442,6 +2533,8 @@ bool Buffer::isExternallyModified(CheckMethod method) const
 void Buffer::saveCheckSum() const
 {
 	FileName const & file = d->filename;
+
+	file.refresh();
 	if (file.exists()) {
 		d->timestamp_ = file.lastModified();
 		d->checksum_ = file.checksum();
@@ -2546,7 +2639,7 @@ Buffer const * Buffer::parent() const
 ListOfBuffers Buffer::allRelatives() const
 {
 	ListOfBuffers lb = masterBuffer()->getDescendents();
-	lb.push_front(const_cast<Buffer *>(this));
+	lb.push_front(const_cast<Buffer *>(masterBuffer()));
 	return lb;
 }
 
@@ -2608,6 +2701,12 @@ ListOfBuffers Buffer::getChildren() const
 {
 	ListOfBuffers v;
 	collectChildren(v, false);
+	// Make sure we have not included ourselves.
+	ListOfBuffers::iterator bit = find(v.begin(), v.end(), this);
+	if (bit != v.end()) {
+		LYXERR0("Recursive include detected in `" << fileName() << "'.");
+		v.erase(bit);
+	}
 	return v;
 }
 
@@ -2616,6 +2715,12 @@ ListOfBuffers Buffer::getDescendents() const
 {
 	ListOfBuffers v;
 	collectChildren(v, true);
+	// Make sure we have not included ourselves.
+	ListOfBuffers::iterator bit = find(v.begin(), v.end(), this);
+	if (bit != v.end()) {
+		LYXERR0("Recursive include detected in `" << fileName() << "'.");
+		v.erase(bit);
+	}
 	return v;
 }
 
@@ -2687,7 +2792,9 @@ MacroData const * Buffer::Impl::getBufferMacro(docstring const & name,
 			break;
 
 		// scope ends behind pos?
-		if (pos < it->second.first) {
+		if (pos < it->second.first
+			&& (cloned_buffer_ ||
+			    theBufferList().isLoaded(it->second.second))) {
 			// look for macro in external file
 			macro_lock = true;
 			MacroData const * data
@@ -2921,7 +3028,7 @@ void Buffer::getUsedBranches(std::list<docstring> & result, bool const from_mast
 }
 
 
-void Buffer::updateMacroInstances() const
+void Buffer::updateMacroInstances(UpdateType utype) const
 {
 	LYXERR(Debug::MACROS, "updateMacroInstances for "
 		<< d->filename.onlyFileName());
@@ -2939,7 +3046,7 @@ void Buffer::updateMacroInstances() const
 		MacroContext mc = MacroContext(this, it);
 		for (DocIterator::idx_type i = 0; i < n; ++i) {
 			MathData & data = minset->cell(i);
-			data.updateMacros(0, mc);
+			data.updateMacros(0, mc, utype);
 		}
 	}
 }
@@ -3081,28 +3188,16 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to,
 
 void Buffer::getSourceCode(odocstream & os, string const format,
 			   pit_type par_begin, pit_type par_end,
-			   bool full_source) const
+			   OutputWhat output) const
 {
 	OutputParams runparams(&params().encoding());
 	runparams.nice = true;
-	runparams.flavor = getOutputFlavor(format);
+	runparams.flavor = params().getOutputFlavor(format);
 	runparams.linelen = lyxrc.plaintext_linelen;
 	// No side effect of file copying and image conversion
 	runparams.dryrun = true;
 
-	if (full_source) {
-		os << "% " << _("Preview source code") << "\n\n";
-		d->texrow.reset();
-		d->texrow.newline();
-		d->texrow.newline();
-		if (isDocBook())
-			writeDocBookSource(os, absFileName(), runparams, false);
-		else if (runparams.flavor == OutputParams::HTML)
-			writeLyXHTMLSource(os, runparams, false);
-		else
-			// latex or literate
-			writeLaTeXSource(os, string(), runparams, true, true);
-	} else {
+	if (output == CurrentParagraph) {
 		runparams.par_begin = par_begin;
 		runparams.par_end = par_end;
 		if (par_begin + 1 == par_end) {
@@ -3121,26 +3216,44 @@ void Buffer::getSourceCode(odocstream & os, string const format,
 		texrow.newline();
 		texrow.newline();
 		// output paragraphs
-		if (isDocBook())
+		if (params().isDocBook())
 			docbookParagraphs(text(), *this, os, runparams);
 		else if (runparams.flavor == OutputParams::HTML) {
 			XHTMLStream xs(os);
 			xhtmlParagraphs(text(), *this, xs, runparams);
-		} else 
+		} else {
 			// latex or literate
-			latexParagraphs(*this, text(), os, texrow, runparams);
+			otexstream ots(os, texrow);
+			latexParagraphs(*this, text(), ots, runparams);
+		}
+	} else {
+		os << "% ";
+		if (output == FullSource) 
+			os << _("Preview source code");
+		else if (output == OnlyPreamble)
+			os << _("Preview preamble");
+		else if (output == OnlyBody)
+			os << _("Preview body");
+		os << "\n\n";
+		d->texrow.reset();
+		d->texrow.newline();
+		d->texrow.newline();
+		if (params().isDocBook())
+			writeDocBookSource(os, absFileName(), runparams, output);
+		else if (runparams.flavor == OutputParams::HTML)
+			writeLyXHTMLSource(os, runparams, output);
+		else {
+			// latex or literate
+			otexstream ots(os, d->texrow);
+			writeLaTeXSource(ots, string(), runparams, output);
+		}
 	}
 }
 
 
 ErrorList & Buffer::errorList(string const & type) const
 {
-	static ErrorList emptyErrorList;
-	map<string, ErrorList>::iterator it = d->errorLists.find(type);
-	if (it == d->errorLists.end())
-		return emptyErrorList;
-
-	return it->second;
+	return d->errorLists[type];
 }
 
 
@@ -3364,124 +3477,96 @@ bool Buffer::autoSave() const
 }
 
 
-string Buffer::bufferFormat() const
-{
-	string format = params().documentClass().outputFormat();
-	if (format == "latex") {
-		if (params().useNonTeXFonts)
-			return "xetex";
-		if (params().encoding().package() == Encoding::japanese)
-			return "platex";
+// helper class, to guarantee this gets reset properly
+class Buffer::MarkAsExporting {
+public:
+	MarkAsExporting(Buffer const * buf) : buf_(buf)
+	{
+		LASSERT(buf_, /* */);
+		buf_->setExportStatus(true);
 	}
-	return format;
-}
-
-
-string Buffer::getDefaultOutputFormat() const
-{
-	if (!params().default_output_format.empty()
-	    && params().default_output_format != "default")
-		return params().default_output_format;
-	typedef vector<Format const *> Formats;
-	Formats formats = exportableFormats(true);
-	if (isDocBook()
-	    || isLiterate()
-	    || params().useNonTeXFonts
-	    || params().encoding().package() == Encoding::japanese) {
-		if (formats.empty())
-			return string();
-		// return the first we find
-		return formats.front()->name();
+	~MarkAsExporting()
+	{
+		buf_->setExportStatus(false);
 	}
-	return lyxrc.default_view_format;
-}
-
+private:
+	Buffer const * const buf_;
+};
 
-OutputParams::FLAVOR Buffer::getOutputFlavor(string const format) const
-{
-	string const dformat = (format.empty() || format == "default") ?
-		getDefaultOutputFormat() : format;
-	DefaultFlavorCache::const_iterator it =
-		default_flavors_.find(dformat);
 
-	if (it != default_flavors_.end())
-		return it->second;
 
-	OutputParams::FLAVOR result = OutputParams::LATEX;
-	
-	if (dformat == "xhtml")
-		result = OutputParams::HTML;
-	else {
-		// Try to determine flavor of default output format
-		vector<string> backs = backends();
-		if (find(backs.begin(), backs.end(), dformat) == backs.end()) {
-			// Get shortest path to format
-			Graph::EdgePath path;
-			for (vector<string>::const_iterator it = backs.begin();
-			    it != backs.end(); ++it) {
-				Graph::EdgePath p = theConverters().getPath(*it, dformat);
-				if (!p.empty() && (path.empty() || p.size() < path.size())) {
-					path = p;
-				}
-			}
-			if (!path.empty())
-				result = theConverters().getFlavor(path);
-		}
-	}
-	// cache this flavor
-	default_flavors_[dformat] = result;
-	return result;
+void Buffer::setExportStatus(bool e) const
+{
+	d->doing_export = e;	
+	ListOfBuffers clist = getDescendents();
+	ListOfBuffers::const_iterator cit = clist.begin();
+	ListOfBuffers::const_iterator const cen = clist.end();
+	for (; cit != cen; ++cit)
+		(*cit)->d->doing_export = e;
 }
 
 
-namespace {
-	// helper class, to guarantee this gets reset properly
-	class MarkAsExporting	{
-	public:
-		MarkAsExporting(Buffer const * buf) : buf_(buf) 
-		{
-			LASSERT(buf_, /* */);
-			buf_->setExportStatus(true);
-		}
-		~MarkAsExporting() 
-		{
-			buf_->setExportStatus(false);
-		}
-	private:
-		Buffer const * const buf_;
-	};
+bool Buffer::isExporting() const
+{
+	return d->doing_export;
 }
 
 
-void Buffer::setExportStatus(bool e) const
+Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir)
+	const
 {
-	d->doing_export = e;	
+	string result_file;
+	return doExport(target, put_in_tempdir, result_file);
 }
 
-
-bool Buffer::isExporting() const
+Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir,
+	string & result_file) const
 {
-	return d->doing_export;
+	bool const update_unincluded =
+			params().maintain_unincluded_children
+			&& !params().getIncludedChildren().empty();
+
+	// (1) export with all included children (omit \includeonly)
+	if (update_unincluded) { 
+		ExportStatus const status = 
+			doExport(target, put_in_tempdir, true, result_file);
+		if (status != ExportSuccess)
+			return status;
+	}
+	// (2) export with included children only
+	return doExport(target, put_in_tempdir, false, result_file);
 }
 
 
-bool Buffer::doExport(string const & format, bool put_in_tempdir,
+Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir,
 	bool includeall, string & result_file) const
 {
+	LYXERR(Debug::FILES, "target=" << target);
+	OutputParams runparams(&params().encoding());
+	string format = target;
+	string dest_filename;
+	size_t pos = target.find(' ');
+	if (pos != string::npos) {
+		dest_filename = target.substr(pos + 1, target.length() - pos - 1);
+		format = target.substr(0, pos);
+		runparams.export_folder = FileName(dest_filename).onlyPath().realPath();
+		FileName(dest_filename).onlyPath().createPath();
+		LYXERR(Debug::FILES, "format=" << format << ", dest_filename=" << dest_filename << ", export_folder=" << runparams.export_folder);
+	}
 	MarkAsExporting exporting(this);
 	string backend_format;
-	OutputParams runparams(&params().encoding());
 	runparams.flavor = OutputParams::LATEX;
 	runparams.linelen = lyxrc.plaintext_linelen;
 	runparams.includeall = includeall;
-	vector<string> backs = backends();
+	vector<string> backs = params().backends();
+	Converters converters = theConverters();
 	if (find(backs.begin(), backs.end(), format) == backs.end()) {
 		// Get shortest path to format
-		theConverters().buildGraph();
+		converters.buildGraph();
 		Graph::EdgePath path;
 		for (vector<string>::const_iterator it = backs.begin();
 		     it != backs.end(); ++it) {
-			Graph::EdgePath p = theConverters().getPath(*it, format);
+			Graph::EdgePath p = converters.getPath(*it, format);
 			if (!p.empty() && (path.empty() || p.size() < path.size())) {
 				backend_format = *it;
 				path = p;
@@ -3495,17 +3580,20 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
 					_("No information for exporting the format %1$s."),
 					formats.prettyName(format)));
 			}
-			return false;
+			return ExportNoPathToFormat;
 		}
-		runparams.flavor = theConverters().getFlavor(path);
+		runparams.flavor = converters.getFlavor(path);
 
 	} else {
 		backend_format = format;
+		LYXERR(Debug::FILES, "backend_format=" << backend_format);
 		// FIXME: Don't hardcode format names here, but use a flag
 		if (backend_format == "pdflatex")
 			runparams.flavor = OutputParams::PDFLATEX;
 		else if (backend_format == "luatex")
 			runparams.flavor = OutputParams::LUATEX;
+		else if (backend_format == "dviluatex")
+			runparams.flavor = OutputParams::DVILUATEX;
 		else if (backend_format == "xetex")
 			runparams.flavor = OutputParams::XETEX;
 	}
@@ -3514,9 +3602,7 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
 	filename = addName(temppath(), filename);
 	filename = changeExtension(filename,
 				   formats.extension(backend_format));
-
-	// fix macros
-	updateMacroInstances();
+	LYXERR(Debug::FILES, "filename=" << filename);
 
 	// Plain text backend
 	if (backend_format == "text") {
@@ -3544,37 +3630,47 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
 	} else if (backend_format == "lyx")
 		writeFile(FileName(filename));
 	// Docbook backend
-	else if (isDocBook()) {
+	else if (params().isDocBook()) {
 		runparams.nice = !put_in_tempdir;
 		makeDocBookFile(FileName(filename), runparams);
 	}
 	// LaTeX backend
 	else if (backend_format == format) {
 		runparams.nice = true;
-		if (!makeLaTeXFile(FileName(filename), string(), runparams))
-			return false;
+		if (!makeLaTeXFile(FileName(filename), string(), runparams)) {
+			if (d->cloned_buffer_) {
+				d->cloned_buffer_->d->errorLists["Export"] =
+					d->errorLists["Export"];
+			}
+			return ExportError;
+		}
 	} else if (!lyxrc.tex_allows_spaces
 		   && contains(filePath(), ' ')) {
 		Alert::error(_("File name error"),
 			   _("The directory path to the document cannot contain spaces."));
-		return false;
+		return ExportTexPathHasSpaces;
 	} else {
 		runparams.nice = false;
-		if (!makeLaTeXFile(FileName(filename), filePath(), runparams))
-			return false;
+		if (!makeLaTeXFile(FileName(filename), filePath(), runparams)) {
+			if (d->cloned_buffer_) {
+				d->cloned_buffer_->d->errorLists["Export"] =
+					d->errorLists["Export"];
+			}
+			return ExportError;
+		}
 	}
 
 	string const error_type = (format == "program")
-		? "Build" : bufferFormat();
+		? "Build" : params().bufferFormat();
 	ErrorList & error_list = d->errorLists[error_type];
 	string const ext = formats.extension(format);
 	FileName const tmp_result_file(changeExtension(filename, ext));
-	bool const success = theConverters().convert(this, FileName(filename),
+	bool const success = converters.convert(this, FileName(filename),
 		tmp_result_file, FileName(absFileName()), backend_format, format,
 		error_list);
 
 	// Emit the signal to show the error list or copy it back to the
-	// cloned Buffer so that it cab be emitted afterwards.
+	// cloned Buffer so that it can be emitted afterwards.
 	if (format != backend_format) {
 		if (d->cloned_buffer_) {
 			d->cloned_buffer_->d->errorLists[error_type] = 
@@ -3587,6 +3683,10 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
 		ListOfBuffers::const_iterator const cen = clist.end();
 		for (; cit != cen; ++cit) {
 			if (d->cloned_buffer_) {
+				// Enable reverse search by copying back the
+				// texrow object to the cloned buffer.
+				// FIXME: this is not thread safe.
+				(*cit)->d->cloned_buffer_->d->texrow = (*cit)->d->texrow;
 				(*cit)->d->cloned_buffer_->d->errorLists[error_type] = 
 					(*cit)->d->errorLists[error_type];
 			} else
@@ -3600,24 +3700,28 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
 		// FIXME: There is a possibility of concurrent access to texrow
 		// here from the main GUI thread that should be securized.
 		d->cloned_buffer_->d->texrow = d->texrow;
-		string const error_type = bufferFormat();
+		string const error_type = params().bufferFormat();
 		d->cloned_buffer_->d->errorLists[error_type] = d->errorLists[error_type];
 	}
 
 	if (!success)
-		return false;
+		return ExportConverterError;
 
 	if (put_in_tempdir) {
 		result_file = tmp_result_file.absFileName();
-		return true;
+		return ExportSuccess;
 	}
 
-	result_file = changeExtension(d->exportFileName().absFileName(), ext);
+	if (dest_filename.empty())
+		result_file = changeExtension(d->exportFileName().absFileName(), ext);
+	else
+		result_file = dest_filename;
 	// We need to copy referenced files (e. g. included graphics
 	// if format == "dvi") to the result dir.
 	vector<ExportedFile> const files =
 		runparams.exportdata->externalFiles(format);
-	string const dest = onlyPath(result_file);
+	string const dest = runparams.export_folder.empty() ?
+		onlyPath(result_file) : runparams.export_folder;
 	bool use_force = use_gui ? lyxrc.export_overwrite == ALL_FILES
 				 : force_overwrite == ALL_FILES;
 	CopyStatus status = use_force ? FORCE : SUCCESS;
@@ -3626,14 +3730,27 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
 	vector<ExportedFile>::const_iterator const en = files.end();
 	for (; it != en && status != CANCEL; ++it) {
 		string const fmt = formats.getFormatFromFile(it->sourceName);
+		string fixedName = it->exportName;
+		if (!runparams.export_folder.empty()) {
+			// Relative pathnames starting with ../ will be sanitized
+			// if exporting to a different folder
+			while (fixedName.substr(0, 3) == "../")
+				fixedName = fixedName.substr(3, fixedName.length() - 3);
+		}
+		FileName fixedFileName = makeAbsPath(fixedName, dest);
+		fixedFileName.onlyPath().createPath();
 		status = copyFile(fmt, it->sourceName,
-			makeAbsPath(it->exportName, dest),
-			it->exportName, status == FORCE);
+			fixedFileName,
+			it->exportName, status == FORCE,
+			runparams.export_folder.empty());
 	}
 
 	if (status == CANCEL) {
 		message(_("Document export cancelled."));
-	} else if (tmp_result_file.exists()) {
+		return ExportCancel;
+	} 
+	
+	if (tmp_result_file.exists()) {
 		// Finally copy the main file
 		use_force = use_gui ? lyxrc.export_overwrite != NO_FILES
 				    : force_overwrite != NO_FILES;
@@ -3642,87 +3759,50 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
 		status = copyFile(format, tmp_result_file,
 			FileName(result_file), result_file,
 			status == FORCE);
-		message(bformat(_("Document exported as %1$s "
-			"to file `%2$s'"),
-			formats.prettyName(format),
-			makeDisplayPath(result_file)));
+		if (status == CANCEL) {
+			message(_("Document export cancelled."));
+			return ExportCancel;
+		} else {
+			message(bformat(_("Document exported as %1$s "
+				"to file `%2$s'"),
+				formats.prettyName(format),
+				makeDisplayPath(result_file)));
+		}
 	} else {
 		// This must be a dummy converter like fax (bug 1888)
 		message(bformat(_("Document exported as %1$s"),
 			formats.prettyName(format)));
 	}
 
-	return true;
+	return ExportSuccess;
 }
 
 
-bool Buffer::doExport(string const & format, bool put_in_tempdir,
-		      bool includeall) const
+Buffer::ExportStatus Buffer::preview(string const & format) const
 {
-	string result_file;
-	// (1) export with all included children (omit \includeonly)
-	if (includeall && !doExport(format, put_in_tempdir, true, result_file))
-		return false;
-	// (2) export with included children only
-	return doExport(format, put_in_tempdir, false, result_file);
+	bool const update_unincluded =
+			params().maintain_unincluded_children
+			&& !params().getIncludedChildren().empty();
+	return preview(format, update_unincluded);
 }
 
-
-bool Buffer::preview(string const & format, bool includeall) const
+Buffer::ExportStatus Buffer::preview(string const & format, bool includeall) const
 {
 	MarkAsExporting exporting(this);
 	string result_file;
 	// (1) export with all included children (omit \includeonly)
-	if (includeall && !doExport(format, true, true))
-		return false;
-	// (2) export with included children only
-	if (!doExport(format, true, false, result_file))
-		return false;
-	return formats.view(*this, FileName(result_file), format);
-}
-
-
-bool Buffer::isExportable(string const & format) const
-{
-	vector<string> backs = backends();
-	for (vector<string>::const_iterator it = backs.begin();
-	     it != backs.end(); ++it)
-		if (theConverters().isReachable(*it, format))
-			return true;
-	return false;
-}
-
-
-vector<Format const *> Buffer::exportableFormats(bool only_viewable) const
-{
-	vector<string> const backs = backends();
-	vector<Format const *> result =
-		theConverters().getReachable(backs[0], only_viewable, true);
-	for (vector<string>::const_iterator it = backs.begin() + 1;
-	     it != backs.end(); ++it) {
-		vector<Format const *>  r =
-			theConverters().getReachable(*it, only_viewable, false);
-		result.insert(result.end(), r.begin(), r.end());
+	if (includeall) { 
+		ExportStatus const status = doExport(format, true, true, result_file);
+		if (status != ExportSuccess)
+			return status;
 	}
-	return result;
-}
-
-
-vector<string> Buffer::backends() const
-{
-	vector<string> v;
-	v.push_back(bufferFormat());
-	// FIXME: Don't hardcode format names here, but use a flag
-	if (v.back() == "latex") {
-		v.push_back("pdflatex");
-		v.push_back("luatex");
-		v.push_back("xetex");
-	} else if (v.back() == "xetex")
-		v.push_back("luatex");
-	v.push_back("xhtml");
-	v.push_back("text");
-	v.push_back("lyx");
-	return v;
+	// (2) export with included children only
+	ExportStatus const status = doExport(format, true, false, result_file);
+	if (status != ExportSuccess)
+		return status;
+	if (!formats.view(*this, FileName(result_file), format))
+		return PreviewError;
+	return PreviewSuccess;
 }
 
 
@@ -3760,7 +3840,7 @@ Buffer::ReadStatus Buffer::loadEmergency()
 		if (success) {
 			if (isReadonly()) {
 				Alert::warning(_("File is read-only"),
-					bformat(_("An emergency file is succesfully loaded, "
+					bformat(_("An emergency file is successfully loaded, "
 					"but the original file %1$s is marked read-only. "
 					"Please make sure to save the document as a different "
 					"file."), from_utf8(d->filename.absFileName())));
@@ -3822,7 +3902,7 @@ Buffer::ReadStatus Buffer::loadAutosave()
 		if (ret_llf == ReadSuccess) {
 			if (isReadonly()) {
 				Alert::warning(_("File is read-only"),
-					bformat(_("A backup file is succesfully loaded, "
+					bformat(_("A backup file is successfully loaded, "
 					"but the original file %1$s is marked read-only. "
 					"Please make sure to save the document as a "
 					"different file."), 
@@ -3872,24 +3952,56 @@ Buffer::ReadStatus Buffer::loadThisLyXFile(FileName const & fn)
 
 void Buffer::bufferErrors(TeXErrors const & terr, ErrorList & errorList) const
 {
-	TeXErrors::Errors::const_iterator cit = terr.begin();
+	TeXErrors::Errors::const_iterator it = terr.begin();
 	TeXErrors::Errors::const_iterator end = terr.end();
+	ListOfBuffers clist = getDescendents();
+	ListOfBuffers::const_iterator cen = clist.end();
 
-	for (; cit != end; ++cit) {
+	for (; it != end; ++it) {
 		int id_start = -1;
 		int pos_start = -1;
-		int errorRow = cit->error_in_line;
-		bool found = d->texrow.getIdFromRow(errorRow, id_start,
-						       pos_start);
+		int errorRow = it->error_in_line;
+		Buffer const * buf = 0;
+		Impl const * p = d;
+		if (it->child_name.empty())
+		    p->texrow.getIdFromRow(errorRow, id_start, pos_start);
+		else {
+			// The error occurred in a child
+			ListOfBuffers::const_iterator cit = clist.begin();
+			for (; cit != cen; ++cit) {
+				string const child_name =
+					DocFileName(changeExtension(
+						(*cit)->absFileName(), "tex")).
+							mangledFileName();
+				if (it->child_name != child_name)
+					continue;
+				(*cit)->d->texrow.getIdFromRow(errorRow,
+							id_start, pos_start);
+				if (id_start != -1) {
+					buf = d->cloned_buffer_
+						? (*cit)->d->cloned_buffer_->d->owner_
+						: (*cit)->d->owner_;
+					p = (*cit)->d;
+					break;
+				}
+			}
+		}
 		int id_end = -1;
 		int pos_end = -1;
+		bool found;
 		do {
 			++errorRow;
-			found = d->texrow.getIdFromRow(errorRow, id_end, pos_end);
+			found = p->texrow.getIdFromRow(errorRow, id_end, pos_end);
 		} while (found && id_start == id_end && pos_start == pos_end);
 
-		errorList.push_back(ErrorItem(cit->error_desc,
-			cit->error_text, id_start, pos_start, pos_end));
+		if (id_start != id_end) {
+			// Next registered position is outside the inset where
+			// the error occurred, so signal end-of-paragraph
+			pos_end = 0;
+		}
+
+		errorList.push_back(ErrorItem(it->error_desc,
+			it->error_text, id_start, pos_start, pos_end, buf));
 	}
 }
 
@@ -3953,6 +4065,7 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 		return;
 
 	d->bibinfo_cache_valid_ = true;
+	d->cite_labels_valid_ = true;
 	cbuf.tocBackend().update();
 	if (scope == UpdateMaster)
 		cbuf.structureChanged();
@@ -4048,10 +4161,12 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
 	// Compute the item depth of the paragraph
 	par.itemdepth = getItemDepth(it);
 
-	if (layout.margintype == MARGIN_MANUAL
-	    || layout.latextype == LATEX_BIB_ENVIRONMENT) {
+	if (layout.margintype == MARGIN_MANUAL) {
 		if (par.params().labelWidthString().empty())
 			par.params().labelWidthString(par.expandLabel(layout, bp));
+	} else if (layout.latextype == LATEX_BIB_ENVIRONMENT) {
+		// we do not need to do anything here, since the empty case is
+		// handled during export.
 	} else {
 		par.params().labelWidthString(docstring());
 	}
@@ -4202,8 +4317,9 @@ int Buffer::spellCheck(DocIterator & from, DocIterator & to,
 	WordLangTuple wl;
 	suggestions.clear();
 	word_lang = WordLangTuple();
+	bool const to_end = to.empty();
+	DocIterator const end = to_end ? doc_iterator_end(this) : to;
 	// OK, we start from here.
-	DocIterator const end = doc_iterator_end(this);
 	for (; from != end; from.forwardPos()) {
 		// We are only interested in text so remove the math CursorSlice.
 		while (from.inMathed()) {
@@ -4211,8 +4327,8 @@ int Buffer::spellCheck(DocIterator & from, DocIterator & to,
 			from.pos()++;
 		}
 		// If from is at the end of the document (which is possible
-		// when leaving the mathed) LyX will crash later.
-		if (from == end)
+		// when leaving the mathed) LyX will crash later otherwise.
+		if (from.atEnd() || (!to_end && from >= end))
 			break;
 		to = from;
 		from.paragraph().spellCheck();
@@ -4249,6 +4365,7 @@ Buffer::ReadStatus Buffer::reload()
 		updateTitles();
 		markClean();
 		message(bformat(_("Document %1$s reloaded."), disp_fn));
+		d->undo_.clear();
 	} else {
 		message(bformat(_("Could not reload document %1$s."), disp_fn));
 	}