X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=d8296e9795a5721e06dec63ab1f0656d794adcb7;hb=9577dae301866e69016c26300826114a611ea779;hp=d977e2c2112e45a8dade542c17cafbcfebdd3a78;hpb=0aca981637b878faab4893998e47abf7388d821d;p=lyx.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index d977e2c211..d8296e9795 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -24,12 +24,15 @@
 #include "Chktex.h"
 #include "Converter.h"
 #include "Counters.h"
+#include "DispatchResult.h"
 #include "DocIterator.h"
 #include "Encoding.h"
 #include "ErrorList.h"
 #include "Exporter.h"
 #include "Format.h"
 #include "FuncRequest.h"
+#include "FuncStatus.h"
+#include "IndicesList.h"
 #include "InsetIterator.h"
 #include "InsetList.h"
 #include "Language.h"
@@ -44,12 +47,14 @@
 #include "output_docbook.h"
 #include "output.h"
 #include "output_latex.h"
+#include "output_xhtml.h"
 #include "output_plaintext.h"
 #include "paragraph_funcs.h"
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
 #include "ParIterator.h"
 #include "PDFOptions.h"
+#include "SpellChecker.h"
 #include "sgml.h"
 #include "TexRow.h"
 #include "TexStream.h"
@@ -59,6 +64,7 @@
 #include "Undo.h"
 #include "VCBackend.h"
 #include "version.h"
+#include "WordLangTuple.h"
 #include "WordList.h"
 
 #include "insets/InsetBibitem.h"
@@ -79,6 +85,7 @@
 #include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/docstring_list.h"
 #include "support/ExceptionMessage.h"
 #include "support/FileName.h"
 #include "support/FileNameList.h"
@@ -91,6 +98,7 @@
 #include "support/os.h"
 #include "support/Package.h"
 #include "support/Path.h"
+#include "support/Systemcall.h"
 #include "support/textutils.h"
 #include "support/types.h"
 
@@ -118,11 +126,19 @@ namespace {
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-int const LYX_FORMAT = 348;  // uwestoehr: add support for \*phantom
+int const LYX_FORMAT = 361;  // jspitzm: bibliography custom width
 
 typedef map<string, bool> DepClean;
 typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
 
+void showPrintError(string const & name)
+{
+	docstring str = bformat(_("Could not print the document %1$s.\n"
+					    "Check that your printer is set up correctly."),
+			     makeDisplayPath(name, 50));
+	Alert::error(_("Print document failed"), str);
+}
+
 } // namespace anon
 
 class BufferSet : public std::set<Buffer const *> {};
@@ -145,7 +161,6 @@ public:
 	LyXVC lyxvc;
 	FileName temppath;
 	mutable TexRow texrow;
-	Buffer const * parent_buffer;
 
 	/// need to regenerate .tex?
 	DepClean dep_clean;
@@ -225,6 +240,22 @@ public:
 
 	/// our Text that should be wrapped in an InsetText
 	InsetText * inset;
+
+	/// This is here to force the test to be done whenever parent_buffer
+	/// is accessed.
+	Buffer const * parent() const { 
+		// if parent_buffer is not loaded, then it has been unloaded,
+		// which means that parent_buffer is an invalid pointer. So we
+		// set it to null in that case.
+		if (!theBufferList().isLoaded(parent_buffer))
+			parent_buffer = 0;
+		return parent_buffer; 
+	}
+	///
+	void setParent(Buffer const * pb) { parent_buffer = pb; }
+private:
+	/// So we can force access via the accessors.
+	mutable Buffer const * parent_buffer;
 };
 
 
@@ -248,10 +279,11 @@ static FileName createBufferTmpDir()
 
 
 Buffer::Impl::Impl(Buffer & parent, FileName const & file, bool readonly_)
-	: parent_buffer(0), lyx_clean(true), bak_clean(true), unnamed(false),
+	: lyx_clean(true), bak_clean(true), unnamed(false),
 	  read_only(readonly_), filename(file), file_fully_loaded(false),
 	  toc_backend(&parent), macro_lock(false), timestamp_(0),
-	  checksum_(0), wa_(0), undo_(parent), bibinfoCacheValid_(false)
+	  checksum_(0), wa_(0), undo_(parent), bibinfoCacheValid_(false),
+	  parent_buffer(0)
 {
 	temppath = createBufferTmpDir();
 	lyxvc.setBuffer(&parent);
@@ -428,10 +460,12 @@ string Buffer::logName(LogType * type) const
 	FileName const fname(addName(temppath(),
 				     onlyFilename(changeExtension(filename,
 								  ".log"))));
+
+	// FIXME: how do we know this is the name of the build log?
 	FileName const bname(
 		addName(path, onlyFilename(
 			changeExtension(filename,
-					formats.extension("literate") + ".out"))));
+					formats.extension(bufferFormat()) + ".out"))));
 
 	// If no Latex log or Build log is newer, show Build log
 
@@ -493,6 +527,8 @@ int Buffer::readHeader(Lexer & lex)
 	params().clearLayoutModules();
 	params().clearRemovedModules();
 	params().pdfoptions().clear();
+	params().indiceslist().clear();
+	params().backgroundcolor = lyx::rgbFromHexName("#ffffff");
 
 	for (int i = 0; i < 4; ++i) {
 		params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];
@@ -595,6 +631,11 @@ bool Buffer::readDocument(Lexer & lex)
 			Buffer * master = 
 				checkAndLoadLyXFile(master_file, true);
 			if (master) {
+				// necessary e.g. after a reload
+				// to re-register the child (bug 5873)
+				// FIXME: clean up updateMacros (here, only
+				// child registering is needed).
+				master->updateMacros();
 				// set master as master buffer, but only
 				// if we are a real child
 				if (master->isChild(this))
@@ -605,9 +646,9 @@ bool Buffer::readDocument(Lexer & lex)
 				else if (master->isFullyLoaded())
 					LYXERR0("The master '"
 						<< params().master
-						<< "' assigned to this document '"
+						<< "' assigned to this document ("
 						<< absFileName()
-						<< "' does not include "
+						<< ") does not include "
 						"this document. Ignoring the master assignment.");
 			}
 		}
@@ -779,7 +820,7 @@ Buffer::ReadStatus Buffer::readFile(Lexer & lex, FileName const & filename,
 				     bformat(_("%1$s is from a different"
 					      " version of LyX, but a temporary"
 					      " file for converting it could"
-							    " not be created."),
+					      " not be created."),
 					      from_utf8(filename.absFilename())));
 			return failure;
 		}
@@ -789,7 +830,7 @@ Buffer::ReadStatus Buffer::readFile(Lexer & lex, FileName const & filename,
 				     bformat(_("%1$s is from a different"
 					       " version of LyX, but the"
 					       " conversion script lyx2lyx"
-							    " could not be found."),
+					       " could not be found."),
 					       from_utf8(filename.absFilename())));
 			return failure;
 		}
@@ -808,7 +849,7 @@ Buffer::ReadStatus Buffer::readFile(Lexer & lex, FileName const & filename,
 			Alert::error(_("Conversion script failed"),
 				     bformat(_("%1$s is from a different version"
 					      " of LyX, but the lyx2lyx script"
-							    " failed to convert it."),
+					      " failed to convert it."),
 					      from_utf8(filename.absFilename())));
 			return failure;
 		} else {
@@ -909,7 +950,7 @@ bool Buffer::writeFile(FileName const & fname) const
 		return false;
 	}
 
-	removeAutosaveFile(d->filename.absFilename());
+	removeAutosaveFile();
 
 	saveCheckSum(d->filename);
 	message(str + _(" done."));
@@ -981,9 +1022,13 @@ bool Buffer::write(ostream & ofs) const
 
 bool Buffer::makeLaTeXFile(FileName const & fname,
 			   string const & original_path,
-			   OutputParams const & runparams,
+			   OutputParams const & runparams_in,
 			   bool output_preamble, bool output_body) const
 {
+	OutputParams runparams = runparams_in;
+	if (params().useXetex)
+		runparams.flavor = OutputParams::XETEX;
+
 	string const encoding = runparams.encoding->iconvName();
 	LYXERR(Debug::LATEX, "makeLaTeXFile encoding: " << encoding << "...");
 
@@ -1150,8 +1195,8 @@ void Buffer::writeLaTeXSource(odocstream & os,
 	// This happens for example if only a child document is printed.
 	Buffer const * save_parent = 0;
 	if (output_preamble) {
-		save_parent = d->parent_buffer;
-		d->parent_buffer = 0;
+		save_parent = d->parent();
+		d->setParent(0);
 	}
 
 	// the real stuff
@@ -1159,7 +1204,7 @@ void Buffer::writeLaTeXSource(odocstream & os,
 
 	// Restore the parenthood if needed
 	if (output_preamble)
-		d->parent_buffer = save_parent;
+		d->setParent(save_parent);
 
 	// add this just in case after all the paragraphs
 	os << endl;
@@ -1293,6 +1338,65 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
 }
 
 
+void Buffer::makeLyXHTMLFile(FileName const & fname,
+			      OutputParams const & runparams,
+			      bool const body_only) const
+{
+	LYXERR(Debug::LATEX, "makeLYXHTMLFile...");
+
+	ofdocstream ofs;
+	if (!openFileWrite(ofs, fname))
+		return;
+
+	writeLyXHTMLSource(ofs, runparams, body_only);
+
+	ofs.close();
+	if (ofs.fail())
+		lyxerr << "File '" << fname << "' was not closed properly." << endl;
+}
+
+
+void Buffer::writeLyXHTMLSource(odocstream & os,
+			     OutputParams const & runparams,
+			     bool const only_body) const
+{
+	LaTeXFeatures features(*this, params(), runparams);
+	validate(features);
+
+	d->texrow.reset();
+
+	if (!only_body) {
+		os << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"" <<
+			" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
+		// FIXME Language should be set properly.
+		os << "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n";
+		// FIXME Header
+		os << "<head>\n";
+		// FIXME Presumably need to set this right
+		os << "<meta http-equiv=\"Content-type\" content=\"text/html;charset=UTF-8\" />\n";
+		// FIXME Get this during validation? What about other meta-data?
+		os << "<title>TBA</title>\n";
+
+		os << features.getTClassHTMLPreamble();
+
+		os << '\n';
+
+		docstring const styleinfo = features.getTClassHTMLStyles();
+		if (!styleinfo.empty()) {
+			os << "<style type='text/css'>\n";
+			os << styleinfo;
+			os << "</style>\n";
+		}
+		os << "</head>\n<body>\n";
+	}
+
+	params().documentClass().counters().reset();
+	xhtmlParagraphs(paragraphs(), *this, os, runparams);
+	if (!only_body)
+		os << "</body>\n</html>\n";
+}
+
+
 // chktex should be run with these flags disabled: 3, 22, 25, 30, 38(?)
 // Other flags: -wall -v0 -x
 int Buffer::runChktex()
@@ -1352,8 +1456,9 @@ void Buffer::validate(LaTeXFeatures & features) const
 void Buffer::getLabelList(vector<docstring> & list) const
 {
 	// If this is a child document, use the parent's list instead.
-	if (d->parent_buffer) {
-		d->parent_buffer->getLabelList(list);
+	Buffer const * const pbuf = d->parent();
+	if (pbuf) {
+		pbuf->getLabelList(list);
 		return;
 	}
 
@@ -1368,11 +1473,12 @@ void Buffer::getLabelList(vector<docstring> & list) const
 }
 
 
-void Buffer::updateBibfilesCache() const
+void Buffer::updateBibfilesCache(UpdateScope scope) const
 {
 	// If this is a child document, use the parent's cache instead.
-	if (d->parent_buffer) {
-		d->parent_buffer->updateBibfilesCache();
+	Buffer const * const pbuf = d->parent();
+	if (pbuf && scope != UpdateChildOnly) {
+		pbuf->updateBibfilesCache();
 		return;
 	}
 
@@ -1390,7 +1496,7 @@ void Buffer::updateBibfilesCache() const
 				static_cast<InsetInclude &>(*it);
 			inset.updateBibfilesCache();
 			support::FileNameList const & bibfiles =
-					inset.getBibfilesCache(*this);
+					inset.getBibfilesCache();
 			d->bibfilesCache_.insert(d->bibfilesCache_.end(),
 				bibfiles.begin(),
 				bibfiles.end());
@@ -1407,15 +1513,16 @@ void Buffer::invalidateBibinfoCache()
 }
 
 
-support::FileNameList const & Buffer::getBibfilesCache() const
+support::FileNameList const & Buffer::getBibfilesCache(UpdateScope scope) const
 {
 	// If this is a child document, use the parent's cache instead.
-	if (d->parent_buffer)
-		return d->parent_buffer->getBibfilesCache();
+	Buffer const * const pbuf = d->parent();
+	if (pbuf && scope != UpdateChildOnly)
+		return pbuf->getBibfilesCache();
 
 	// We update the cache when first used instead of at loading time.
 	if (d->bibfilesCache_.empty())
-		const_cast<Buffer *>(this)->updateBibfilesCache();
+		const_cast<Buffer *>(this)->updateBibfilesCache(scope);
 
 	return d->bibfilesCache_;
 }
@@ -1475,41 +1582,207 @@ void Buffer::markDepClean(string const & name)
 }
 
 
-bool Buffer::dispatch(string const & command, bool * result)
+bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
+{
+	switch (cmd.action) {
+		case LFUN_BUFFER_EXPORT: {
+			docstring const arg = cmd.argument();
+			bool enable = arg == "custom" || isExportable(to_utf8(arg));
+			if (!enable)
+				flag.message(bformat(
+					_("Don't know how to export to format: %1$s"), arg));
+			flag.setEnabled(enable);
+			break;
+		}
+
+		case LFUN_BRANCH_ACTIVATE: 
+		case LFUN_BRANCH_DEACTIVATE: {
+		BranchList const & branchList = params().branchlist();
+		docstring const branchName = cmd.argument();
+		flag.setEnabled(!branchName.empty()
+				&& branchList.find(branchName));
+			break;
+		}
+
+		case LFUN_BUFFER_PRINT:
+			// if no Buffer is present, then of course we won't be called!
+			flag.setEnabled(true);
+			break;
+
+		default:
+			return false;
+	}
+	return true;
+}
+
+
+void Buffer::dispatch(string const & command, DispatchResult & result)
 {
 	return dispatch(lyxaction.lookupFunc(command), result);
 }
 
 
-bool Buffer::dispatch(FuncRequest const & func, bool * result)
+// NOTE We can end up here even if we have no GUI, because we are called
+// by LyX::exec to handled command-line requests. So we may need to check 
+// whether we have a GUI or not. The boolean use_gui holds this information.
+void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 {
+	// We'll set this back to false if need be.
 	bool dispatched = true;
 
 	switch (func.action) {
-		case LFUN_BUFFER_EXPORT: {
-			bool const tmp = doExport(to_utf8(func.argument()), false);
-			if (result)
-				*result = tmp;
+	case LFUN_BUFFER_EXPORT: {
+		bool success = doExport(to_utf8(func.argument()), false);
+		dr.setError(success);
+		if (!success)
+			dr.setMessage(bformat(_("Error exporting to format: %1$s."), 
+					      func.argument()));
+		break;
+	}
+
+	case LFUN_BRANCH_ACTIVATE:
+	case LFUN_BRANCH_DEACTIVATE: {
+		BranchList & branchList = params().branchlist();
+		docstring const branchName = func.argument();
+		// the case without a branch name is handled elsewhere
+		if (branchName.empty()) {
+			dispatched = false;
 			break;
 		}
+		Branch * branch = branchList.find(branchName);
+		if (!branch) {
+			LYXERR0("Branch " << branchName << " does not exist.");
+			dr.setError(true);
+			docstring const msg = 
+				bformat(_("Branch \"%1$s\" does not exist."), branchName);
+			dr.setMessage(msg);
+		} else {
+			branch->setSelected(func.action == LFUN_BRANCH_ACTIVATE);
+			dr.setError(false);
+			dr.update(Update::Force);
+		}
+		break;
+	}
 
-		case LFUN_BRANCH_ACTIVATE:
-		case LFUN_BRANCH_DEACTIVATE: {
-			BranchList & branchList = params().branchlist();
-			docstring const branchName = func.argument();
-			Branch * branch = branchList.find(branchName);
-			if (!branch)
-				LYXERR0("Branch " << branchName << " does not exist.");
-			else
-				branch->setSelected(func.action == LFUN_BRANCH_ACTIVATE);
-			if (result)
-				*result = true;
+	case LFUN_BUFFER_PRINT: {
+		// we'll assume there's a problem until we succeed
+		dr.setError(true); 
+		string target = func.getArg(0);
+		string target_name = func.getArg(1);
+		string command = func.getArg(2);
+
+		if (target.empty()
+		    || target_name.empty()
+		    || command.empty()) {
+			LYXERR0("Unable to parse " << func.argument());
+			docstring const msg = 
+				bformat(_("Unable to parse \"%1$s\""), func.argument());
+			dr.setMessage(msg);
+			break;
+		}
+		if (target != "printer" && target != "file") {
+			LYXERR0("Unrecognized target \"" << target << '"');
+			docstring const msg = 
+				bformat(_("Unrecognized target \"%1$s\""), from_utf8(target));
+			dr.setMessage(msg);
+			break;
 		}
 
-		default:
-			dispatched = false;
+		if (!doExport("dvi", true)) {
+			showPrintError(absFileName());
+			dr.setMessage(_("Error exporting to DVI."));
+			break;
+		}
+
+		// Push directory path.
+		string const path = temppath();
+		// Prevent the compiler from optimizing away p
+		FileName pp(path);
+		PathChanger p(pp);
+
+		// there are three cases here:
+		// 1. we print to a file
+		// 2. we print directly to a printer
+		// 3. we print using a spool command (print to file first)
+		Systemcall one;
+		int res = 0;
+		string const dviname = changeExtension(latexName(true), "dvi");
+
+		if (target == "printer") {
+			if (!lyxrc.print_spool_command.empty()) {
+				// case 3: print using a spool
+				string const psname = changeExtension(dviname,".ps");
+				command += ' ' + lyxrc.print_to_file
+					+ quoteName(psname)
+					+ ' '
+					+ quoteName(dviname);
+
+				string command2 = lyxrc.print_spool_command + ' ';
+				if (target_name != "default") {
+					command2 += lyxrc.print_spool_printerprefix
+						+ target_name
+						+ ' ';
+				}
+				command2 += quoteName(psname);
+				// First run dvips.
+				// If successful, then spool command
+				res = one.startscript(Systemcall::Wait, command);
+
+				if (res == 0) {
+					// If there's no GUI, we have to wait on this command. Otherwise,
+					// LyX deletes the temporary directory, and with it the spooled
+					// file, before it can be printed!!
+					Systemcall::Starttype stype = use_gui ?
+						Systemcall::DontWait : Systemcall::Wait;
+					res = one.startscript(stype, command2);
+				}
+			} else {
+				// case 2: print directly to a printer
+				if (target_name != "default")
+					command += ' ' + lyxrc.print_to_printer + target_name + ' ';
+				// as above....
+				Systemcall::Starttype stype = use_gui ?
+					Systemcall::DontWait : Systemcall::Wait;
+				res = one.startscript(stype, command + quoteName(dviname));
+			}
+
+		} else {
+			// case 1: print to a file
+			FileName const filename(makeAbsPath(target_name, filePath()));
+			FileName const dvifile(makeAbsPath(dviname, path));
+			if (filename.exists()) {
+				docstring text = bformat(
+					_("The file %1$s already exists.\n\n"
+					  "Do you want to overwrite that file?"),
+					makeDisplayPath(filename.absFilename()));
+				if (Alert::prompt(_("Overwrite file?"),
+						  text, 0, 1, _("&Overwrite"), _("&Cancel")) != 0)
+					break;
+			}
+			command += ' ' + lyxrc.print_to_file
+				+ quoteName(filename.toFilesystemEncoding())
+				+ ' '
+				+ quoteName(dvifile.toFilesystemEncoding());
+			// as above....
+			Systemcall::Starttype stype = use_gui ?
+				Systemcall::DontWait : Systemcall::Wait;
+			res = one.startscript(stype, command);
+		}
+
+		if (res == 0) 
+			dr.setError(false);
+		else {
+			dr.setMessage(_("Error running external commands."));
+			showPrintError(absFileName());
+		}
+		break;
+	}
+
+	default:
+		dispatched = false;
+		break;
 	}
-	return dispatched;
+	dr.dispatched(dispatched);
 }
 
 
@@ -1703,14 +1976,14 @@ bool Buffer::isReadonly() const
 void Buffer::setParent(Buffer const * buffer)
 {
 	// Avoids recursive include.
-	d->parent_buffer = buffer == this ? 0 : buffer;
+	d->setParent(buffer == this ? 0 : buffer);
 	updateMacros();
 }
 
 
 Buffer const * Buffer::parent() const
 {
-	return d->parent_buffer;
+	return d->parent();
 }
 
 
@@ -1742,10 +2015,11 @@ std::vector<Buffer const *> Buffer::allRelatives() const
 
 Buffer const * Buffer::masterBuffer() const
 {
-	if (!d->parent_buffer)
+	Buffer const * const pbuf = d->parent();
+	if (!pbuf)
 		return this;
 
-	return d->parent_buffer->masterBuffer();
+	return pbuf->masterBuffer();
 }
 
 
@@ -1765,6 +2039,25 @@ DocIterator Buffer::firstChildPosition(Buffer const * child)
 }
 
 
+std::vector<Buffer *> Buffer::getChildren() const
+{
+	std::vector<Buffer *> clist;
+	// loop over children
+	Impl::BufferPositionMap::iterator it = d->children_positions.begin();
+	Impl::BufferPositionMap::iterator end = d->children_positions.end();
+	for (; it != end; ++it) {
+		Buffer * child = const_cast<Buffer *>(it->first);
+		clist.push_back(child);
+		// there might be grandchildren
+		std::vector<Buffer *> glist = child->getChildren();
+		for (vector<Buffer *>::const_iterator git = glist.begin();
+		     git != glist.end(); ++git)
+			clist.push_back(*git);
+	}
+	return clist;
+}
+
+
 template<typename M>
 typename M::iterator greatest_below(M & m, typename M::key_type const & x)
 {
@@ -1869,9 +2162,10 @@ MacroData const * Buffer::getMacro(docstring const & name,
 		return data;
 
 	// If there is a master buffer, query that
-	if (d->parent_buffer) {
+	Buffer const * const pbuf = d->parent();
+	if (pbuf) {
 		d->macro_lock = true;
-		MacroData const * macro	= d->parent_buffer->getMacro(
+		MacroData const * macro	= pbuf->getMacro(
 			name, *this, false);
 		d->macro_lock = false;
 		if (macro)
@@ -1929,8 +2223,7 @@ void Buffer::updateMacros(DocIterator & it, DocIterator & scope) const
 			// is it a nested text inset?
 			if (iit->inset->asInsetText()) {
 				// Inset needs its own scope?
-				InsetText const * itext
-				= iit->inset->asInsetText();
+				InsetText const * itext = iit->inset->asInsetText();
 				bool newScope = itext->isMacroScope();
 
 				// scope which ends just behind the inset
@@ -1947,19 +2240,19 @@ void Buffer::updateMacros(DocIterator & it, DocIterator & scope) const
 			// is it an external file?
 			if (iit->inset->lyxCode() == INCLUDE_CODE) {
 				// get buffer of external file
-				InsetInclude const & inset
-					= static_cast<InsetInclude const &>(*iit->inset);
+				InsetInclude const & inset =
+					static_cast<InsetInclude const &>(*iit->inset);
 				d->macro_lock = true;
-				Buffer * child = inset.loadIfNeeded(*this);
+				Buffer * child = inset.getChildBuffer();
 				d->macro_lock = false;
 				if (!child)
 					continue;
 
 				// register its position, but only when it is
 				// included first in the buffer
-				if (d->children_positions.find(child)
-					== d->children_positions.end())
-					d->children_positions[child] = it;
+				if (d->children_positions.find(child) ==
+					d->children_positions.end())
+						d->children_positions[child] = it;
 
 				// register child with its scope
 				d->position_to_children[it] = Impl::ScopeBuffer(scope, child);
@@ -1970,8 +2263,8 @@ void Buffer::updateMacros(DocIterator & it, DocIterator & scope) const
 				continue;
 
 			// get macro data
-			MathMacroTemplate & macroTemplate
-			= static_cast<MathMacroTemplate &>(*iit->inset);
+			MathMacroTemplate & macroTemplate =
+				static_cast<MathMacroTemplate &>(*iit->inset);
 			MacroContext mc(*this, it);
 			macroTemplate.updateToContext(mc);
 
@@ -2065,8 +2358,9 @@ void Buffer::listMacroNames(MacroNameSet & macros) const
 		it->first->listMacroNames(macros);
 
 	// call parent
-	if (d->parent_buffer)
-		d->parent_buffer->listMacroNames(macros);
+	Buffer const * const pbuf = d->parent();
+	if (pbuf)
+		pbuf->listMacroNames(macros);
 
 	d->macro_lock = false;
 }
@@ -2074,11 +2368,12 @@ void Buffer::listMacroNames(MacroNameSet & macros) const
 
 void Buffer::listParentMacros(MacroSet & macros, LaTeXFeatures & features) const
 {
-	if (!d->parent_buffer)
+	Buffer const * const pbuf = d->parent();
+	if (!pbuf)
 		return;
 
 	MacroNameSet names;
-	d->parent_buffer->listMacroNames(names);
+	pbuf->listMacroNames(names);
 
 	// resolve macros
 	MacroNameSet::iterator it = names.begin();
@@ -2086,7 +2381,7 @@ void Buffer::listParentMacros(MacroSet & macros, LaTeXFeatures & features) const
 	for (; it != end; ++it) {
 		// defined?
 		MacroData const * data =
-		d->parent_buffer->getMacro(*it, *this, false);
+		pbuf->getMacro(*it, *this, false);
 		if (data) {
 			macros.insert(data);
 
@@ -2102,7 +2397,7 @@ void Buffer::listParentMacros(MacroSet & macros, LaTeXFeatures & features) const
 
 Buffer::References & Buffer::references(docstring const & label)
 {
-	if (d->parent_buffer)
+	if (d->parent())
 		return const_cast<Buffer *>(masterBuffer())->references(label);
 
 	RefCache::iterator it = d->ref_cache_.find(label);
@@ -2137,7 +2432,7 @@ InsetLabel const * Buffer::insetLabel(docstring const & label) const
 
 void Buffer::clearReferenceCache() const
 {
-	if (!d->parent_buffer)
+	if (!d->parent())
 		d->ref_cache_.clear();
 }
 
@@ -2178,14 +2473,15 @@ void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
 {
 	OutputParams runparams(&params().encoding());
 	runparams.nice = true;
-	runparams.flavor = OutputParams::LATEX;
+	runparams.flavor = params().useXetex ? 
+		OutputParams::XETEX : OutputParams::LATEX;
 	runparams.linelen = lyxrc.plaintext_linelen;
 	// No side effect of file copying and image conversion
 	runparams.dryrun = true;
 
-	d->texrow.reset();
 	if (full_source) {
 		os << "% " << _("Preview source code") << "\n\n";
+		d->texrow.reset();
 		d->texrow.newline();
 		d->texrow.newline();
 		if (isDocBook())
@@ -2207,14 +2503,16 @@ void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
 					convert<docstring>(par_end - 1))
 			   << "\n\n";
 		}
-		d->texrow.newline();
-		d->texrow.newline();
+		TexRow texrow;
+		texrow.reset();
+		texrow.newline();
+		texrow.newline();
 		// output paragraphs
 		if (isDocBook())
 			docbookParagraphs(paragraphs(), *this, os, runparams);
 		else 
 			// latex or literate
-			latexParagraphs(*this, text(), os, d->texrow, runparams);
+			latexParagraphs(*this, text(), os, texrow, runparams);
 	}
 }
 
@@ -2372,6 +2670,39 @@ int AutoSaveBuffer::generateChild()
 } // namespace anon
 
 
+FileName Buffer::getAutosaveFilename() const
+{
+	// if the document is unnamed try to save in the backup dir, else
+	// in the default document path, and as a last try in the filePath, 
+	// which will most often be the temporary directory
+	string fpath;
+	if (isUnnamed())
+		fpath = lyxrc.backupdir_path.empty() ? lyxrc.document_path
+			: lyxrc.backupdir_path;
+	if (!isUnnamed() || fpath.empty() || !FileName(fpath).exists())
+		fpath = filePath();
+
+	string const fname = "#" + d->filename.onlyFileName() + "#";
+	return makeAbsPath(fname, fpath);
+}
+
+
+void Buffer::removeAutosaveFile() const
+{
+	FileName const f = getAutosaveFilename();
+	if (f.exists())
+		f.removeFile();
+}
+
+
+void Buffer::moveAutosaveFile(support::FileName const & oldauto) const
+{
+	FileName const newauto = getAutosaveFilename();
+	if (!(oldauto == newauto || oldauto.moveTo(newauto)))
+		LYXERR0("Unable to remove autosave file `" << oldauto << "'!");
+}
+
+
 // Perfect target for a thread...
 void Buffer::autoSave() const
 {
@@ -2383,14 +2714,7 @@ void Buffer::autoSave() const
 
 	// emit message signal.
 	message(_("Autosaving current document..."));
-
-	// create autosave filename
-	string fname = filePath();
-	fname += '#';
-	fname += d->filename.onlyFileName();
-	fname += '#';
-
-	AutoSaveBuffer autosave(*this, FileName(fname));
+	AutoSaveBuffer autosave(*this, getAutosaveFilename());
 	autosave.start();
 
 	markBakClean();
@@ -2400,16 +2724,38 @@ void Buffer::autoSave() const
 
 string Buffer::bufferFormat() const
 {
-	if (isDocBook())
-		return "docbook";
-	if (isLiterate())
-		return "literate";
-	if (params().encoding().package() == Encoding::japanese)
-		return "platex";
-	return "latex";
+	string format = params().documentClass().outputFormat();
+	if (format == "latex") {
+		if (params().useXetex)
+			return "xetex";
+		if (params().encoding().package() == Encoding::japanese)
+			return "platex";
+	}
+	return format;
 }
 
 
+string Buffer::getDefaultOutputFormat() const
+{
+	if (!params().defaultOutputFormat.empty()
+	    && params().defaultOutputFormat != "default")
+		return params().defaultOutputFormat;
+	typedef vector<Format const *> Formats;
+	Formats formats = exportableFormats(true);
+	if (isDocBook()
+	    || isLiterate()
+	    || params().useXetex
+	    || params().encoding().package() == Encoding::japanese) {
+		if (formats.empty())
+			return string();
+		// return the first we find
+		return formats.front()->name();
+	}
+	return lyxrc.default_view_format;
+}
+
+
+
 bool Buffer::doExport(string const & format, bool put_in_tempdir,
 	string & result_file) const
 {
@@ -2456,6 +2802,8 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
 	if (backend_format == "text")
 		writePlaintextFile(*this, FileName(filename), runparams);
 	// no backend
+	else if (backend_format == "xhtml")
+		makeLyXHTMLFile(FileName(filename), runparams);
 	else if (backend_format == "lyx")
 		writeFile(FileName(filename));
 	// Docbook backend
@@ -2585,6 +2933,7 @@ vector<string> Buffer::backends() const
 			v.push_back("pdflatex");
 	}
 	v.push_back("text");
+	v.push_back("xhtml");
 	v.push_back("lyx");
 	return v;
 }
@@ -2710,7 +3059,13 @@ void Buffer::bufferErrors(TeXErrors const & terr, ErrorList & errorList) const
 }
 
 
-void Buffer::updateLabels(bool childonly) const
+void Buffer::setBuffersForInsets() const
+{
+	inset().setBuffer(const_cast<Buffer &>(*this)); 
+}
+
+
+void Buffer::updateLabels(UpdateScope scope) const
 {
 	// Use the master text class also for child documents
 	Buffer const * const master = masterBuffer();
@@ -2720,11 +3075,11 @@ void Buffer::updateLabels(bool childonly) const
 	// master comes back we can see which of them were actually seen (i.e.
 	// via an InsetInclude). The remaining ones in the set need still be updated.
 	static std::set<Buffer const *> bufToUpdate;
-	if (!childonly) {
+	if (scope == UpdateMaster) {
 		// If this is a child document start with the master
 		if (master != this) {
 			bufToUpdate.insert(this);
-			master->updateLabels(false);
+			master->updateLabels();
 			// Do this here in case the master has no gui associated with it. Then, 
 			// the TocModel is not updated and TocModel::toc_ is invalid (bug 5699).
 			if (!master->gui_)
@@ -2744,7 +3099,6 @@ void Buffer::updateLabels(bool childonly) const
 
 	// update all caches
 	clearReferenceCache();
-	inset().setBuffer(const_cast<Buffer &>(*this));
 	updateMacros();
 
 	Buffer & cbuf = const_cast<Buffer &>(*this);
@@ -2760,7 +3114,7 @@ void Buffer::updateLabels(bool childonly) const
 		return;
 
 	cbuf.tocBackend().update();
-	if (!childonly)
+	if (scope == UpdateMaster)
 		cbuf.structureChanged();
 }
 
@@ -2854,7 +3208,8 @@ static void setLabel(Buffer const & buf, ParIterator & it)
 	// Compute the item depth of the paragraph
 	par.itemdepth = getItemDepth(it);
 
-	if (layout.margintype == MARGIN_MANUAL) {
+	if (layout.margintype == MARGIN_MANUAL
+	    || layout.latextype == LATEX_BIB_ENVIRONMENT) {
 		if (par.params().labelWidthString().empty())
 			par.params().labelWidthString(par.translateIfPossible(layout.labelstring(), bp));
 	} else {
@@ -2899,9 +3254,7 @@ static void setLabel(Buffer const & buf, ParIterator & it)
 	}
 
 	case LABEL_ENUMERATE: {
-		// FIXME: Yes I know this is a really, really! bad solution
-		// (Lgb)
-		docstring enumcounter = from_ascii("enum");
+		docstring enumcounter = layout.counter.empty() ? from_ascii("enum") : layout.counter;
 
 		switch (par.itemdepth) {
 		case 2:
@@ -2922,31 +3275,9 @@ static void setLabel(Buffer const & buf, ParIterator & it)
 		// Maybe we have to reset the enumeration counter.
 		if (needEnumCounterReset(it))
 			counters.reset(enumcounter);
-
 		counters.step(enumcounter);
 
-		string format;
-
-		switch (par.itemdepth) {
-		case 0:
-			format = N_("\\arabic{enumi}.");
-			break;
-		case 1:
-			format = N_("(\\alph{enumii})");
-			break;
-		case 2:
-			format = N_("\\roman{enumiii}.");
-			break;
-		case 3:
-			format = N_("\\Alph{enumiv}.");
-			break;
-		default:
-			// not a valid enumdepth...
-			break;
-		}
-
-		par.params().labelString(counters.counterLabel(
-			par.translateIfPossible(from_ascii(format), bp)));
+		par.params().labelString(counters.theCounter(enumcounter));
 
 		break;
 	}
@@ -3016,4 +3347,79 @@ void Buffer::updateLabels(ParIterator & parit) const
 	}
 }
 
+
+bool Buffer::nextWord(DocIterator & from, DocIterator & to,
+	docstring & word) const
+{
+	bool inword = false;
+	bool ignoreword = false;
+	string lang_code;
+	// Go backward a bit if needed in order to return the word currently
+	// pointed by 'from'.
+	while (from && from.pos() && isLetter(from))
+		from.backwardPos();
+	// OK, we start from here.
+	to = from;
+	while (to.depth()) {
+		if (isLetter(to)) {
+			if (!inword) {
+				inword = true;
+				ignoreword = false;
+				from = to;
+				word.clear();
+				lang_code = to.paragraph().getFontSettings(params(),
+					to.pos()).language()->code();
+			}
+			// Insets like optional hyphens and ligature
+			// break are part of a word.
+			if (!to.paragraph().isInset(to.pos())) {
+				char_type const c = to.paragraph().getChar(to.pos());
+				word += c;
+				if (isDigit(c))
+					ignoreword = true;
+			}
+		} else { // !isLetter(cur)
+			if (inword && !word.empty() && !ignoreword)
+				return true;
+			inword = false;
+		}
+		to.forwardPos();
+	}
+	from = to;
+	word.clear();
+	return false;
+}
+
+
+int Buffer::spellCheck(DocIterator & from, DocIterator & to,
+	WordLangTuple & word_lang, docstring_list & suggestions) const
+{
+	int progress = 0;
+	SpellChecker::Result res = SpellChecker::OK;
+	SpellChecker * speller = theSpellChecker();
+	suggestions.clear();
+	docstring word;
+	while (nextWord(from, to, word)) {
+		++progress;
+		string lang_code = lyxrc.spellchecker_use_alt_lang
+		      ? lyxrc.spellchecker_alt_lang
+		      : from.paragraph().getFontSettings(params(), from.pos()).language()->code();
+		WordLangTuple wl(word, lang_code);
+		res = speller->check(wl);
+		// ... just bail out if the spellchecker reports an error.
+		if (!speller->error().empty()) {
+			throw ExceptionMessage(WarningException,
+				_("The spellchecker has failed."), speller->error());
+		}
+		if (res != SpellChecker::OK && res != SpellChecker::IGNORED_WORD) {
+			word_lang = wl;
+			break;
+		}
+		from = to;
+	}
+	while (!(word = speller->nextMiss()).empty())
+		suggestions.push_back(word);
+	return progress;
+}
+
 } // namespace lyx