X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=979b37ed5f27d220bfce3cec9f8954e5a8a4fc5c;hb=86fab2cefa122a5b0c0ee4ade472e41d9a3ff1cf;hp=48474c5f344916a143248b8014880b5cb3db297a;hpb=4ec167330f19e7385e57209dd2d33a850774fddb;p=lyx.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 48474c5f34..979b37ed5f 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,10 +64,12 @@
 #include "Undo.h"
 #include "VCBackend.h"
 #include "version.h"
+#include "WordLangTuple.h"
 #include "WordList.h"
 
 #include "insets/InsetBibitem.h"
 #include "insets/InsetBibtex.h"
+#include "insets/InsetBranch.h"
 #include "insets/InsetInclude.h"
 #include "insets/InsetText.h"
 
@@ -79,6 +86,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 +99,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 +127,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 = 364;  // spitz: branch suffixes for filenames
 
 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 *> {};
@@ -423,12 +440,29 @@ Undo & Buffer::undo()
 
 string Buffer::latexName(bool const no_path) const
 {
-	FileName latex_name = makeLatexName(d->filename);
+	FileName latex_name =
+		makeLatexName(exportFileName());
 	return no_path ? latex_name.onlyFileName()
 		: latex_name.absFilename();
 }
 
 
+FileName Buffer::exportFileName() const
+{
+	docstring const branch_suffix =
+		params().branchlist().getFilenameSuffix();
+	if (branch_suffix.empty())
+		return fileName();
+
+	string const name = fileName().onlyFileNameWithoutExt()
+		+ to_utf8(branch_suffix);
+	FileName res(fileName().onlyPath().absFilename() + "/" + name);
+	res.changeExtension(fileName().extension());
+
+	return res;
+}
+
+
 string Buffer::logName(LogType * type) const
 {
 	string const filename = latexName(false);
@@ -444,19 +478,38 @@ 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
+	// Also consider the master buffer log file
+	FileName masterfname = fname;
+	LogType mtype;
+	if (masterBuffer() != this) {
+		string const mlogfile = masterBuffer()->logName(&mtype);
+		masterfname = FileName(mlogfile);
+	}
 
+	// If no Latex log or Build log is newer, show Build log
 	if (bname.exists() &&
-	    (!fname.exists() || fname.lastModified() < bname.lastModified())) {
+	    ((!fname.exists() && !masterfname.exists())
+	     || (fname.lastModified() < bname.lastModified()
+	         && masterfname.lastModified() < bname.lastModified()))) {
 		LYXERR(Debug::FILES, "Log name calculated as: " << bname);
 		if (type)
 			*type = buildlog;
 		return bname.absFilename();
+	// If we have a newer master file log or only a master log, show this
+	} else if (fname != masterfname
+		   && (!fname.exists() && (masterfname.exists()
+		   || fname.lastModified() < masterfname.lastModified()))) {
+		LYXERR(Debug::FILES, "Log name calculated as: " << masterfname);
+		if (type)
+			*type = mtype;
+		return masterfname.absFilename();
 	}
 	LYXERR(Debug::FILES, "Log name calculated as: " << fname);
 	if (type)
@@ -509,6 +562,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];
@@ -930,7 +985,7 @@ bool Buffer::writeFile(FileName const & fname) const
 		return false;
 	}
 
-	removeAutosaveFile(d->filename.absFilename());
+	removeAutosaveFile();
 
 	saveCheckSum(d->filename);
 	message(str + _(" done."));
@@ -1002,9 +1057,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 << "...");
 
@@ -1314,6 +1373,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()
@@ -1499,46 +1617,266 @@ 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_BRANCH_ADD:
+		case LFUN_BRANCHES_RENAME:
+		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_ADD: {
+		BranchList & branchList = params().branchlist();
+		docstring const branchName = func.argument();
+		if (branchName.empty()) {
+			dispatched = false;
 			break;
 		}
+		Branch * branch = branchList.find(branchName);
+		if (branch) {
+			LYXERR0("Branch " << branchName << " does already exist.");
+			dr.setError(true);
+			docstring const msg = 
+				bformat(_("Branch \"%1$s\" does already exist."), branchName);
+			dr.setMessage(msg);
+		} else {
+			branchList.add(branchName);
+			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();
-			// the case without a branch name is handled elsewhere
-			if (branchName.empty()) {
-				dispatched = false;
-				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_BRANCHES_RENAME: {
+		if (func.argument().empty())
+			break;
+
+		docstring const oldname = from_utf8(func.getArg(0));
+		docstring const newname = from_utf8(func.getArg(1));
+		InsetIterator it  = inset_iterator_begin(inset());
+		InsetIterator const end = inset_iterator_end(inset());
+		bool success = false;
+		for (; it != end; ++it) {
+			if (it->lyxCode() == BRANCH_CODE) {
+				InsetBranch & ins = static_cast<InsetBranch &>(*it);
+				if (ins.branch() == oldname) {
+					undo().recordUndo(it);
+					ins.rename(newname);
+					success = true;
+					continue;
+				}
+			}
+			if (it->lyxCode() == INCLUDE_CODE) {
+				// get buffer of external file
+				InsetInclude const & ins =
+					static_cast<InsetInclude const &>(*it);
+				Buffer * child = ins.getChildBuffer();
+				if (!child)
+					continue;
+				child->dispatch(func, dr);
 			}
-			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;
 		}
 
-		default:
-			dispatched = false;
+		if (success)
+			dr.update(Update::Force);
+		break;
+	}
+
+	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;
+		}
+
+		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);
 }
 
 
@@ -2067,6 +2405,35 @@ void Buffer::updateMacros() const
 }
 
 
+void Buffer::getUsedBranches(std::list<docstring> & result, bool const from_master) const
+{
+	InsetIterator it  = inset_iterator_begin(inset());
+	InsetIterator const end = inset_iterator_end(inset());
+	for (; it != end; ++it) {
+		if (it->lyxCode() == BRANCH_CODE) {
+			InsetBranch & br = static_cast<InsetBranch &>(*it);
+			docstring const name = br.branch();
+			if (!from_master && !params().branchlist().find(name))
+				result.push_back(name);
+			else if (from_master && !masterBuffer()->params().branchlist().find(name))
+				result.push_back(name);
+			continue;
+		}
+		if (it->lyxCode() == INCLUDE_CODE) {
+			// get buffer of external file
+			InsetInclude const & ins =
+				static_cast<InsetInclude const &>(*it);
+			Buffer * child = ins.getChildBuffer();
+			if (!child)
+				continue;
+			child->getUsedBranches(result, true);
+		}
+	}
+	// remove duplicates
+	result.unique();
+}
+
+
 void Buffer::updateMacroInstances() const
 {
 	LYXERR(Debug::MACROS, "updateMacroInstances for "
@@ -2229,14 +2596,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())
@@ -2258,14 +2626,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);
 	}
 }
 
@@ -2296,10 +2666,10 @@ void Buffer::structureChanged() const
 }
 
 
-void Buffer::errors(string const & err) const
+void Buffer::errors(string const & err, bool from_master) const
 {
 	if (gui_)
-		gui_->errors(err);
+		gui_->errors(err, from_master);
 }
 
 
@@ -2423,6 +2793,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
 {
@@ -2434,13 +2837,7 @@ void Buffer::autoSave() const
 
 	// emit message signal.
 	message(_("Autosaving current document..."));
-
-	// create autosave filename
-	string fpath = isUnnamed() ? lyxrc.document_path : filePath();
-	string fname = "#" + d->filename.onlyFileName() + "#";
-	FileName file_name = makeAbsPath(fname, fpath);
-
-	AutoSaveBuffer autosave(*this, file_name);
+	AutoSaveBuffer autosave(*this, getAutosaveFilename());
 	autosave.start();
 
 	markBakClean();
@@ -2450,16 +2847,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
 {
@@ -2506,6 +2925,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
@@ -2538,8 +2959,14 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
 		tmp_result_file, FileName(absFileName()), backend_format, format,
 		error_list);
 	// Emit the signal to show the error list.
-	if (format != backend_format)
+	if (format != backend_format) {
 		errors(error_type);
+		// also to the children, in case of master-buffer-view
+		std::vector<Buffer *> clist = getChildren();
+		for (vector<Buffer *>::const_iterator cit = clist.begin();
+		     cit != clist.end(); ++cit)
+			(*cit)->errors(error_type, true);
+	}
 	if (!success)
 		return false;
 
@@ -2548,7 +2975,7 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
 		return true;
 	}
 
-	result_file = changeExtension(absFileName(), ext);
+	result_file = changeExtension(exportFileName().absFilename(), ext);
 	// We need to copy referenced files (e. g. included graphics
 	// if format == "dvi") to the result dir.
 	vector<ExportedFile> const files =
@@ -2635,6 +3062,7 @@ vector<string> Buffer::backends() const
 			v.push_back("pdflatex");
 	}
 	v.push_back("text");
+	v.push_back("xhtml");
 	v.push_back("lyx");
 	return v;
 }
@@ -2784,7 +3212,7 @@ void Buffer::updateLabels(UpdateScope scope) const
 			// 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_)
-				structureChanged();	
+				structureChanged();
 
 			// was buf referenced from the master (i.e. not in bufToUpdate anymore)?
 			if (bufToUpdate.find(this) == bufToUpdate.end())
@@ -2909,9 +3337,10 @@ 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));
+			par.params().labelWidthString(par.expandLabel(layout, bp));
 	} else {
 		par.params().labelWidthString(docstring());
 	}
@@ -2954,9 +3383,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:
@@ -2977,31 +3404,10 @@ 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)));
+		string const & lang = par.getParLanguage(bp)->code();
+		par.params().labelString(counters.theCounter(enumcounter, lang));
 
 		break;
 	}
@@ -3014,10 +3420,11 @@ static void setLabel(Buffer const & buf, ParIterator & it)
 		else {
 			docstring name = buf.B_(textclass.floats().getType(type).name());
 			if (counters.hasCounter(from_utf8(type))) {
+				string const & lang = par.getParLanguage(bp)->code();
 				counters.step(from_utf8(type));
 				full_label = bformat(from_ascii("%1$s %2$s:"), 
 						     name, 
-						     counters.theCounter(from_utf8(type)));
+						     counters.theCounter(from_utf8(type), lang));
 			} else
 				full_label = bformat(from_ascii("%1$s #:"), name);	
 		}
@@ -3034,8 +3441,7 @@ static void setLabel(Buffer const & buf, ParIterator & it)
 	case LABEL_CENTERED_TOP_ENVIRONMENT:
 	case LABEL_STATIC:	
 	case LABEL_BIBLIO:
-		par.params().labelString(
-			par.translateIfPossible(layout.labelstring(), bp));
+		par.params().labelString(par.expandLabel(layout, bp));
 		break;
 	}
 }
@@ -3072,41 +3478,28 @@ void Buffer::updateLabels(ParIterator & parit) const
 }
 
 
-bool Buffer::nextWord(DocIterator & from, DocIterator & to,
-	docstring & word) const
+int Buffer::spellCheck(DocIterator & from, DocIterator & to,
+	WordLangTuple & word_lang, docstring_list & suggestions) const
 {
-	bool inword = false;
-	bool ignoreword = false;
-	string lang_code;
-	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;
+	int progress = 0;
+	WordLangTuple wl;
+	suggestions.clear();
+	word_lang = WordLangTuple();
+	// 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())
+			from.forwardInset();
+		to = from;
+		if (from.paragraph().spellCheck(from.pos(), to.pos(), wl, suggestions)) {
+			word_lang = wl;
+			break;
 		}
-		to.forwardPos();
+		from = to;
+		++progress;
 	}
-
-	return false;
+	return progress;
 }
 
 } // namespace lyx