X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=1dc5d592e506f46f66ae3b360ffd4d37c48ad3cc;hb=5279d5a8a58b9e59442b9f3f504ea397274e2b19;hp=6f2303e6099066b0e335c8767c879cc9b9ebca16;hpb=a8d12fdd66491fe4bd30da359c53aab7f62a90f5;p=lyx.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 6f2303e609..1dc5d592e5 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -139,11 +139,11 @@ void showPrintError(string const & name)
 	Alert::error(_("Print document failed"), str);
 }
 
-/// a list of Buffers we cloned
-set<Buffer *> cloned_buffer_list;
+} // namespace anon
 
 
-} // namespace anon
+// A storehouse for the cloned buffers.
+list<CloneList *> cloned_buffers;
 
 
 class Buffer::Impl
@@ -160,7 +160,7 @@ public:
 		}
 		delete inset;
 	}
-	
+
 	/// search for macro in local (buffer) table or in children
 	MacroData const * getBufferMacro(docstring const & name,
 		DocIterator const & pos) const;
@@ -195,6 +195,9 @@ public:
 	/// is this an unnamed file (New...)?
 	bool unnamed;
 
+	/// is this an internal bufffer?
+	bool internal_buffer;
+
 	/// buffer is r/o
 	bool read_only;
 
@@ -276,7 +279,7 @@ public:
 
 	/// This is here to force the test to be done whenever parent_buffer
 	/// is accessed.
-	Buffer const * parent() const { 
+	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.
@@ -285,9 +288,9 @@ public:
 		// for the best.
 		if (!cloned_buffer_ && !theBufferList().isLoaded(parent_buffer))
 			parent_buffer = 0;
-		return parent_buffer; 
+		return parent_buffer;
 	}
-	
+
 	///
 	void setParent(Buffer const * pb) {
 		if (parent_buffer == pb)
@@ -305,13 +308,31 @@ public:
 	/// If non zero, this buffer is a clone of existing buffer \p cloned_buffer_
 	/// This one is useful for preview detached in a thread.
 	Buffer const * cloned_buffer_;
+	///
+	CloneList * clone_list_;
 	/// are we in the process of exporting this buffer?
 	mutable bool doing_export;
-	
+ 
+	/// compute statistics
+	/// \p from initial position
+	/// \p to points to the end position
+	void updateStatistics(DocIterator & from, DocIterator & to,
+						  bool skipNoOutput = true);
+	/// statistics accessor functions
+	int wordCount() const { return word_count_; }
+	int charCount(bool with_blanks) const {
+		return char_count_
+		+ (with_blanks ? blank_count_ : 0);
+	}
+
 private:
 	/// So we can force access via the accessors.
 	mutable Buffer const * parent_buffer;
 
+	int word_count_;
+	int char_count_;
+	int blank_count_;
+
 };
 
 
@@ -337,11 +358,12 @@ static FileName createBufferTmpDir()
 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), cite_labels_valid_(false), 
-	  preview_loader_(0), cloned_buffer_(cloned_buffer),
+	  internal_buffer(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),
+	  cite_labels_valid_(false), preview_loader_(0),
+	  cloned_buffer_(cloned_buffer), clone_list_(0),
 	  doing_export(false), parent_buffer(0)
 {
 	if (!cloned_buffer_) {
@@ -361,6 +383,7 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
 	bibfile_status_ = cloned_buffer_->d->bibfile_status_;
 	cite_labels_valid_ = cloned_buffer_->d->cite_labels_valid_;
 	unnamed = cloned_buffer_->d->unnamed;
+	internal_buffer = cloned_buffer_->d->internal_buffer;
 }
 
 
@@ -402,15 +425,27 @@ Buffer::~Buffer()
 	if (isClone()) {
 		// this is in case of recursive includes: we won't try to delete
 		// ourselves as a child.
-		cloned_buffer_list.erase(this);
+		d->clone_list_->erase(this);
 		// 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);
-				if (cloned_buffer_list.erase(child))
+				if (d->clone_list_->erase(child))
 					delete child;
 		}
+		// if we're the master buffer, then we should get rid of the list
+		// of clones
+		if (!parent()) {
+			// if this is not empty, we have leaked something. worse, one of the
+			// children still has a reference to this list.
+			LASSERT(d->clone_list_->empty(), /* */);
+			list<CloneList *>::iterator it =
+				find(cloned_buffers.begin(), cloned_buffers.end(), d->clone_list_);
+			LASSERT(it != cloned_buffers.end(), /* */);
+			cloned_buffers.erase(it);
+			delete d->clone_list_;
+		}
 		// FIXME Do we really need to do this right before we delete d?
 		// clear references to children in macro tables
 		d->children_positions.clear();
@@ -448,28 +483,24 @@ Buffer::~Buffer()
 }
 
 
-Buffer * Buffer::clone() const
+Buffer * Buffer::cloneFromMaster() const
 {
 	BufferMap bufmap;
-	masterBuffer()->clone(bufmap);
+	cloned_buffers.push_back(new CloneList());
+	CloneList * clones = cloned_buffers.back();
+
+	masterBuffer()->cloneWithChildren(bufmap, clones);
 
 	// make sure we got cloned
 	BufferMap::const_iterator bit = bufmap.find(this);
 	LASSERT(bit != bufmap.end(), return 0);
 	Buffer * cloned_buffer = bit->second;
 
-	// record the list of cloned buffers in the cloned master
-	cloned_buffer_list.clear();
-	BufferMap::iterator it = bufmap.begin();
-	BufferMap::iterator en = bufmap.end();
-	for (; it != en; ++it)
-		cloned_buffer_list.insert(it->second);
-
 	return cloned_buffer;
 }
 
 
-void Buffer::clone(BufferMap & bufmap) const
+void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList * clones) const
 {
 	// have we already been cloned?
 	if (bufmap.find(this) != bufmap.end())
@@ -477,6 +508,8 @@ void Buffer::clone(BufferMap & bufmap) const
 
 	Buffer * buffer_clone = new Buffer(fileName().absFileName(), false, this);
 	bufmap[this] = buffer_clone;
+	clones->insert(buffer_clone);
+	buffer_clone->d->clone_list_ = clones;
 	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
@@ -490,7 +523,7 @@ void Buffer::clone(BufferMap & bufmap) const
 		dit.setBuffer(buffer_clone);
 		Buffer * child = const_cast<Buffer *>(it->second.second);
 
-		child->clone(bufmap);
+		child->cloneWithChildren(bufmap, clones);
 		BufferMap::iterator const bit = bufmap.find(child);
 		LASSERT(bit != bufmap.end(), continue);
 		Buffer * child_clone = bit->second;
@@ -508,6 +541,18 @@ void Buffer::clone(BufferMap & bufmap) const
 }
 
 
+Buffer * Buffer::cloneBufferOnly() const {
+	cloned_buffers.push_back(new CloneList());
+	CloneList * clones = cloned_buffers.back();
+	Buffer * buffer_clone = new Buffer(fileName().absFileName(), false, this);
+	clones->insert(buffer_clone);
+	buffer_clone->d->clone_list_ = clones;
+	// we won't be cloning the children
+	buffer_clone->d->children_positions.clear();
+	return buffer_clone;
+}
+
+
 bool Buffer::isClone() const
 {
 	return d->cloned_buffer_;
@@ -749,6 +794,7 @@ int Buffer::readHeader(Lexer & lex)
 	params().html_latex_end.clear();
 	params().html_math_img_scale = 1.0;
 	params().output_sync_macro.erase();
+	params().local_layout.clear();
 
 	for (int i = 0; i < 4; ++i) {
 		params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];
@@ -848,7 +894,7 @@ bool Buffer::readDocument(Lexer & lex)
 		FileName const master_file = makeAbsPath(params().master,
 			   onlyPath(absFileName()));
 		if (isLyXFileName(master_file.absFileName())) {
-			Buffer * master = 
+			Buffer * master =
 				checkAndLoadLyXFile(master_file, true);
 			if (master) {
 				// necessary e.g. after a reload
@@ -873,7 +919,7 @@ bool Buffer::readDocument(Lexer & lex)
 			}
 		}
 	}
-	
+
 	// assure we have a default index
 	params().indiceslist().addDefault(B_("Index"));
 
@@ -930,7 +976,7 @@ Buffer::ReadStatus Buffer::readFile(FileName const & fn)
 	Lexer lex;
 	if (!lex.setFile(fname)) {
 		Alert::error(_("File Not Found"),
-			bformat(_("Unable to open file `%1$s'."), 
+			bformat(_("Unable to open file `%1$s'."),
 			        from_utf8(fn.absFileName())));
 		return ReadFileNotFound;
 	}
@@ -948,7 +994,7 @@ Buffer::ReadStatus Buffer::readFile(FileName const & fn)
 		return readFile(tmpFile);
 	}
 
-	// FIXME: InsetInfo needs to know whether the file is under VCS 
+	// FIXME: InsetInfo needs to know whether the file is under VCS
 	// during the parse process, so this has to be done before.
 	lyxvc().file_found_hook(d->filename);
 
@@ -962,7 +1008,7 @@ Buffer::ReadStatus Buffer::readFile(FileName const & fn)
 
 	d->file_fully_loaded = true;
 	d->read_only = !d->filename.isWritable();
-	params().compressed = d->filename.isZippedFile();
+	params().compressed = formats.isZippedFile(d->filename);
 	saveCheckSum();
 	return ReadSuccess;
 }
@@ -1020,7 +1066,7 @@ Buffer::ReadStatus Buffer::parseLyXFormat(Lexer & lex,
 			bformat(_("%1$s is not a readable LyX document."),
 				from_utf8(fn.absFileName())));
 		return ReadNoLyXFormat;
-	}	
+	}
 
 	string tmp_format;
 	lex >> tmp_format;
@@ -1037,7 +1083,7 @@ Buffer::ReadStatus Buffer::parseLyXFormat(Lexer & lex,
 }
 
 
-Buffer::ReadStatus Buffer::convertLyXFormat(FileName const & fn, 
+Buffer::ReadStatus Buffer::convertLyXFormat(FileName const & fn,
 	FileName & tmpfile, int from_format)
 {
 	tmpfile = FileName::tempName("Buffer_convertLyXFormat");
@@ -1115,7 +1161,7 @@ bool Buffer::save() const
 
 	// ask if the disk file has been externally modified (use checksum method)
 	if (fileName().exists() && isExternallyModified(checksum_method)) {
-		docstring text = 
+		docstring text =
 			bformat(_("Document %1$s has been externally modified. "
 				"Are you sure you want to overwrite this file?"), file);
 		int const ret = Alert::prompt(_("Overwrite modified file?"),
@@ -1468,9 +1514,8 @@ void Buffer::writeLaTeXSource(otexstream & os,
 			Encoding const * const enc = runparams.encoding;
 			if (enc) {
 				for (size_t n = 0; n < inputpath.size(); ++n) {
-					docstring const glyph =
-						docstring(1, inputpath[n]);
-					if (enc->latexChar(inputpath[n], true) != glyph) {
+					if (!enc->encodable(inputpath[n])) {
+						docstring const glyph(1, inputpath[n]);
 						LYXERR0("Uncodable character '"
 							<< glyph
 							<< "' in input path!");
@@ -1545,7 +1590,7 @@ void Buffer::writeLaTeXSource(otexstream & os,
 			int num_lines = (*it)->write(os.os(), true);
 			os.texrow().newlines(num_lines);
 		}
-		
+
 	} // output_preamble
 
 	os.texrow().start(paragraphs().begin()->id(), 0);
@@ -1676,18 +1721,18 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
 		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);
@@ -1729,7 +1774,7 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
 	bool const output_preamble =
 		output == FullSource || output == OnlyPreamble;
 	bool const output_body =
-	  output == FullSource || output == OnlyBody;
+	  output == FullSource || output == OnlyBody || output == IncludedFile;
 
 	if (output_preamble) {
 		os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@ -1743,47 +1788,83 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
 
 		docstring const & doctitle = features.htmlTitle();
 		os << "<title>"
-		   << (doctitle.empty() ? 
-		         from_ascii("LyX Document") : 
+		   << (doctitle.empty() ?
+		         from_ascii("LyX Document") :
 		         html::htmlize(doctitle, XHTMLStream::ESCAPE_ALL))
 		   << "</title>\n";
 
-		os << "\n<!-- Text Class Preamble -->\n"
-		   << features.getTClassHTMLPreamble()
-		   << "\n<!-- Preamble Snippets -->\n"
-		   << from_utf8(features.getPreambleSnippets());
-
-		os << "\n<!-- Layout-provided Styles -->\n";
-		docstring const styleinfo = features.getTClassHTMLStyles();
-		if (!styleinfo.empty()) {
-			os << "<style type='text/css'>\n"
-				<< styleinfo
-				<< "</style>\n";
-		}
+		docstring styles = features.getTClassHTMLPreamble();
+		if (!styles.empty())
+			os << "\n<!-- Text Class Preamble -->\n" << styles << '\n';
+
+		styles = from_utf8(features.getPreambleSnippets());
+		if (!styles.empty())
+			os << "\n<!-- Preamble Snippets -->\n" << styles << '\n';
+
+		// we will collect CSS information in a stream, and then output it
+		// either here, as part of the header, or else in a separate file.
+		odocstringstream css;
+		styles = from_utf8(features.getCSSSnippets());
+		if (!styles.empty())
+			css << "/* LyX Provided Styles */\n" << styles << '\n';
+
+		styles = features.getTClassHTMLStyles();
+		if (!styles.empty())
+			css << "/* Layout-provided Styles */\n" << styles << '\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";
+				css << "\nbody {\n";
 				if (needfg)
-				   os << "  color: "
+				   css << "  color: "
 					    << from_ascii(X11hexname(params().fontcolor))
 					    << ";\n";
 				if (needbg)
-				   os << "  background-color: "
+				   css << "  background-color: "
 					    << from_ascii(X11hexname(params().backgroundcolor))
 					    << ";\n";
-				os << "}\n</style>\n";
+				css << "}\n";
+		}
+		
+		docstring const dstyles = css.str();
+		if (!dstyles.empty()) {
+			bool written = false;
+			if (params().html_css_as_file) {
+				// open a file for CSS info
+				ofdocstream ocss;
+				string const fcssname = addName(temppath(), "docstyle.css");
+				FileName const fcssfile = FileName(fcssname);
+				if (openFileWrite(ocss, fcssfile)) {
+					ocss << dstyles;
+					ocss.close();
+					written = true;
+					// write link to header
+					os << "<link rel='stylesheet' href='docstyle.css' type='text/css' />\n";
+					// register file
+					runparams.exportdata->addExternalFile("xhtml", fcssfile);
+				}
+			}
+			// we are here if the CSS is supposed to be written to the header
+			// or if we failed to write it to an external file.
+			if (!written) {
+				os << "<style type='text/css'>\n"
+					 << dstyles
+					 << "\n</style>\n";
+			}
 		}
 		os << "</head>\n";
 	}
 
 	if (output_body) {
-		os << "<body>\n";
+		bool const output_body_tag = (output != IncludedFile);
+		if (output_body_tag)
+			os << "<body>\n";
 		XHTMLStream xs(os);
 		params().documentClass().counters().reset();
 		xhtmlParagraphs(text(), *this, xs, runparams);
-		os << "</body>\n";
+		if (output_body_tag)
+			os << "</body>\n";
 	}
 
 	if (output_preamble)
@@ -2024,6 +2105,24 @@ bool Buffer::citeLabelsValid() const
 }
 
 
+void Buffer::removeBiblioTempFiles() const
+{
+	// We remove files that contain LaTeX commands specific to the
+	// particular bibliographic style being used, in order to avoid
+	// LaTeX errors when we switch style.
+	FileName const aux_file(addName(temppath(), changeExtension(latexName(),".aux")));
+	FileName const bbl_file(addName(temppath(), changeExtension(latexName(),".bbl")));
+	LYXERR(Debug::FILES, "Removing the .aux file " << aux_file);
+	aux_file.removeFile();
+	LYXERR(Debug::FILES, "Removing the .bbl file " << bbl_file);
+	bbl_file.removeFile();
+	// Also for the parent buffer
+	Buffer const * const pbuf = parent();
+	if (pbuf)
+		pbuf->removeBiblioTempFiles();
+}
+
+
 bool Buffer::isDepClean(string const & name) const
 {
 	DepClean::const_iterator const it = d->dep_clean.find(name);
@@ -2090,14 +2189,6 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 			enable = params().isExportable("program");
 			break;
 
-		case LFUN_BRANCH_ACTIVATE: 
-		case LFUN_BRANCH_DEACTIVATE: {
-			BranchList const & branchList = params().branchlist();
-			docstring const branchName = cmd.argument();
-			enable = !branchName.empty() && branchList.find(branchName);
-			break;
-		}
-
 		case LFUN_BRANCH_ADD:
 		case LFUN_BRANCHES_RENAME:
 		case LFUN_BUFFER_PRINT:
@@ -2123,7 +2214,7 @@ void Buffer::dispatch(string const & command, DispatchResult & 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 
+// 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)
 {
@@ -2150,7 +2241,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 		ExportStatus const status = doExport(argument, false);
 		dr.setError(status != ExportSuccess);
 		if (status != ExportSuccess)
-			dr.setMessage(bformat(_("Error exporting to format: %1$s."), 
+			dr.setMessage(bformat(_("Error exporting to format: %1$s."),
 					      func.argument()));
 		break;
 	}
@@ -2249,31 +2340,6 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 		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.screenUpdate(Update::Force);
-			dr.forceBufferUpdate();
-		}
-		break;
-	}
-
 	case LFUN_BRANCHES_RENAME: {
 		if (func.argument().empty())
 			break;
@@ -2313,7 +2379,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 
 	case LFUN_BUFFER_PRINT: {
 		// we'll assume there's a problem until we succeed
-		dr.setError(true); 
+		dr.setError(true);
 		string target = func.getArg(0);
 		string target_name = func.getArg(1);
 		string command = func.getArg(2);
@@ -2322,14 +2388,14 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 		    || target_name.empty()
 		    || command.empty()) {
 			LYXERR0("Unable to parse " << func.argument());
-			docstring const msg = 
+			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 = 
+			docstring const msg =
 				bformat(_("Unrecognized target \"%1$s\""), from_utf8(target));
 			dr.setMessage(msg);
 			break;
@@ -2419,7 +2485,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 			res = one.startscript(stype, command, filePath());
 		}
 
-		if (res == 0) 
+		if (res == 0)
 			dr.setError(false);
 		else {
 			dr.setMessage(_("Error running external commands."));
@@ -2607,7 +2673,13 @@ bool Buffer::isUnnamed() const
 /// retrieving fileName() nor for checking if it is unnamed or not.
 bool Buffer::isInternal() const
 {
-	return fileName().extension() == "internal";
+	return d->internal_buffer;
+}
+
+
+void Buffer::setInternal(bool flag)
+{
+	d->internal_buffer = flag;
 }
 
 
@@ -2703,7 +2775,7 @@ DocIterator Buffer::firstChildPosition(Buffer const * child)
 
 bool Buffer::hasChildren() const
 {
-	return !d->children_positions.empty();	
+	return !d->children_positions.empty();
 }
 
 
@@ -2719,7 +2791,7 @@ void Buffer::collectChildren(ListOfBuffers & clist, bool grand_children) const
 		if (bit != clist.end())
 			continue;
 		clist.push_back(child);
-		if (grand_children) 
+		if (grand_children)
 			// there might be grandchildren
 			child->collectChildren(clist, true);
 	}
@@ -2933,7 +3005,7 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope)
 				it.pop_back();
 				continue;
 			}
-			
+
 			if (iit->inset->asInsetTabular()) {
 				CursorSlice slice(*iit->inset);
 				size_t const numcells = slice.nargs();
@@ -3245,11 +3317,18 @@ void Buffer::getSourceCode(odocstream & os, string const format,
 		texrow.newline();
 		texrow.newline();
 		// output paragraphs
-		if (params().isDocBook())
-			docbookParagraphs(text(), *this, os, runparams);
-		else if (runparams.flavor == OutputParams::HTML) {
+		if (runparams.flavor == OutputParams::HTML) {
 			XHTMLStream xs(os);
+			setMathFlavor(runparams);
 			xhtmlParagraphs(text(), *this, xs, runparams);
+		} else if (runparams.flavor == OutputParams::TEXT) {
+			bool dummy;
+			// FIXME Handles only one paragraph, unlike the others.
+			// Probably should have some routine with a signature like them.
+			writePlaintextParagraph(*this,
+				text().paragraphs()[par_begin], os, runparams, dummy);
+		} else if (params().isDocBook()) {
+			docbookParagraphs(text(), *this, os, runparams);
 		} else {
 			// latex or literate
 			otexstream ots(os, texrow);
@@ -3257,7 +3336,7 @@ void Buffer::getSourceCode(odocstream & os, string const format,
 		}
 	} else {
 		os << "% ";
-		if (output == FullSource) 
+		if (output == FullSource)
 			os << _("Preview source code");
 		else if (output == OnlyPreamble)
 			os << _("Preview preamble");
@@ -3267,11 +3346,16 @@ void Buffer::getSourceCode(odocstream & os, string const format,
 		d->texrow.reset();
 		d->texrow.newline();
 		d->texrow.newline();
-		if (params().isDocBook())
-			writeDocBookSource(os, absFileName(), runparams, output);
-		else if (runparams.flavor == OutputParams::HTML)
+		if (runparams.flavor == OutputParams::HTML) {
 			writeLyXHTMLSource(os, runparams, output);
-		else {
+		} else if (runparams.flavor == OutputParams::TEXT) {
+			if (output == OnlyPreamble) {
+				os << _("% Plaintext does not have a preamble.");
+			} else
+				writePlaintextFile(*this, os, runparams);
+		} else if (params().isDocBook()) {
+				writeDocBookSource(os, absFileName(), runparams, output);
+		} else {
 			// latex or literate
 			otexstream ots(os, d->texrow);
 			writeLaTeXSource(ots, string(), runparams, output);
@@ -3380,7 +3464,7 @@ private:
 int AutoSaveBuffer::generateChild()
 {
 #if defined(__APPLE__)
-	/* FIXME fork() is not usable for autosave on Mac OS X 10.6 (snow leopard) 
+	/* FIXME fork() is not usable for autosave on Mac OS X 10.6 (snow leopard)
 	 *   We should use something else like threads.
 	 *
 	 * Since I do not know how to determine at run time what is the OS X
@@ -3440,7 +3524,7 @@ FileName Buffer::getEmergencyFileName() const
 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, 
+	// 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())
@@ -3473,7 +3557,7 @@ void Buffer::moveAutosaveFile(support::FileName const & oldauto) const
 }
 
 
-bool Buffer::autoSave() const 
+bool Buffer::autoSave() const
 {
 	Buffer const * buf = d->cloned_buffer_ ? d->cloned_buffer_ : this;
 	if (buf->d->bak_clean || isReadonly())
@@ -3481,7 +3565,7 @@ bool Buffer::autoSave() const
 
 	message(_("Autosaving current document..."));
 	buf->d->bak_clean = true;
-	
+
 	FileName const fname = getAutosaveFileName();
 	if (d->cloned_buffer_) {
 		// If this buffer is cloned, we assume that
@@ -3495,7 +3579,7 @@ bool Buffer::autoSave() const
 		}
 		// failed to write/rename tmp_ret so try writing direct
 		return writeFile(fname);
-	} else {	
+	} else {
 		/// This function is deprecated as the frontend needs to take care
 		/// of cloning the buffer and autosaving it in another thread. It
 		/// is still here to allow (QT_VERSION < 0x040400).
@@ -3526,7 +3610,7 @@ private:
 
 void Buffer::setExportStatus(bool e) const
 {
-	d->doing_export = e;	
+	d->doing_export = e;
 	ListOfBuffers clist = getDescendents();
 	ListOfBuffers::const_iterator cit = clist.begin();
 	ListOfBuffers::const_iterator const cen = clist.end();
@@ -3556,8 +3640,8 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 			&& !params().getIncludedChildren().empty();
 
 	// (1) export with all included children (omit \includeonly)
-	if (update_unincluded) { 
-		ExportStatus const status = 
+	if (update_unincluded) {
+		ExportStatus const status =
 			doExport(target, put_in_tempdir, true, result_file);
 		if (status != ExportSuccess)
 			return status;
@@ -3567,6 +3651,25 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 }
 
 
+void Buffer::setMathFlavor(OutputParams & op) const
+{
+	switch (params().html_math_output) {
+	case BufferParams::MathML:
+		op.math_flavor = OutputParams::MathAsMathML;
+		break;
+	case BufferParams::HTML:
+		op.math_flavor = OutputParams::MathAsHTML;
+		break;
+	case BufferParams::Images:
+		op.math_flavor = OutputParams::MathAsImages;
+		break;
+	case BufferParams::LaTeX:
+		op.math_flavor = OutputParams::MathAsLaTeX;
+		break;
+	}
+}
+
+
 Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir,
 	bool includeall, string & result_file) const
 {
@@ -3611,7 +3714,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 			}
 			return ExportNoPathToFormat;
 		}
-		runparams.flavor = converters.getFlavor(path);
+		runparams.flavor = converters.getFlavor(path, this);
 
 	} else {
 		backend_format = format;
@@ -3641,20 +3744,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 	// HTML backend
 	else if (backend_format == "xhtml") {
 		runparams.flavor = OutputParams::HTML;
-		switch (params().html_math_output) {
-		case BufferParams::MathML: 
-			runparams.math_flavor = OutputParams::MathAsMathML; 
-			break;
-		case BufferParams::HTML: 
-			runparams.math_flavor = OutputParams::MathAsHTML; 
-			break;
-		case BufferParams::Images:
-			runparams.math_flavor = OutputParams::MathAsImages; 
-			break;
-		case BufferParams::LaTeX:
-			runparams.math_flavor = OutputParams::MathAsLaTeX; 
-			break;
-		}
+		setMathFlavor(runparams);
 		makeLyXHTMLFile(FileName(filename), runparams);
 	} else if (backend_format == "lyx")
 		writeFile(FileName(filename));
@@ -3666,13 +3756,11 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 	// LaTeX backend
 	else if (backend_format == format) {
 		runparams.nice = true;
-		if (!makeLaTeXFile(FileName(filename), string(), runparams)) {
-			if (d->cloned_buffer_) {
-				d->cloned_buffer_->d->errorLists["Export"] =
-					d->errorLists["Export"];
-			}
+		bool const success = makeLaTeXFile(FileName(filename), string(), runparams);
+		if (d->cloned_buffer_)
+			d->cloned_buffer_->d->errorLists["Export"] = d->errorLists["Export"];
+		if (!success)
 			return ExportError;
-		}
 	} else if (!lyxrc.tex_allows_spaces
 		   && contains(filePath(), ' ')) {
 		Alert::error(_("File name error"),
@@ -3680,13 +3768,12 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 		return ExportTexPathHasSpaces;
 	} else {
 		runparams.nice = false;
-		if (!makeLaTeXFile(FileName(filename), filePath(), runparams)) {
-			if (d->cloned_buffer_) {
-				d->cloned_buffer_->d->errorLists["Export"] =
-					d->errorLists["Export"];
-			}
+		bool const success = makeLaTeXFile(
+			FileName(filename), filePath(), runparams);
+		if (d->cloned_buffer_)
+			d->cloned_buffer_->d->errorLists["Export"] = d->errorLists["Export"];
+		if (!success)
 			return ExportError;
-		}
 	}
 
 	string const error_type = (format == "program")
@@ -3702,9 +3789,9 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 	// cloned Buffer so that it can be emitted afterwards.
 	if (format != backend_format) {
 		if (d->cloned_buffer_) {
-			d->cloned_buffer_->d->errorLists[error_type] = 
+			d->cloned_buffer_->d->errorLists[error_type] =
 				d->errorLists[error_type];
-		} else 
+		} else
 			errors(error_type);
 		// also to the children, in case of master-buffer-view
 		ListOfBuffers clist = getDescendents();
@@ -3716,7 +3803,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 				// 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->cloned_buffer_->d->errorLists[error_type] =
 					(*cit)->d->errorLists[error_type];
 			} else
 				(*cit)->errors(error_type, true);
@@ -3754,7 +3841,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 	bool use_force = use_gui ? lyxrc.export_overwrite == ALL_FILES
 				 : force_overwrite == ALL_FILES;
 	CopyStatus status = use_force ? FORCE : SUCCESS;
-	
+
 	vector<ExportedFile>::const_iterator it = files.begin();
 	vector<ExportedFile>::const_iterator const en = files.end();
 	for (; it != en && status != CANCEL; ++it) {
@@ -3777,8 +3864,8 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 	if (status == CANCEL) {
 		message(_("Document export cancelled."));
 		return ExportCancel;
-	} 
-	
+	}
+
 	if (tmp_result_file.exists()) {
 		// Finally copy the main file
 		use_force = use_gui ? lyxrc.export_overwrite != NO_FILES
@@ -3820,7 +3907,7 @@ Buffer::ExportStatus Buffer::preview(string const & format, bool includeall) con
 	MarkAsExporting exporting(this);
 	string result_file;
 	// (1) export with all included children (omit \includeonly)
-	if (includeall) { 
+	if (includeall) {
 		ExportStatus const status = doExport(format, true, true, result_file);
 		if (status != ExportSuccess)
 			return status;
@@ -3849,14 +3936,14 @@ Buffer::ReadStatus Buffer::extractFromVC()
 Buffer::ReadStatus Buffer::loadEmergency()
 {
 	FileName const emergencyFile = getEmergencyFileName();
-	if (!emergencyFile.exists() 
+	if (!emergencyFile.exists()
 		  || emergencyFile.lastModified() <= d->filename.lastModified())
 		return ReadFileNotFound;
 
 	docstring const file = makeDisplayPath(d->filename.absFileName(), 20);
 	docstring const text = bformat(_("An emergency save of the document "
 		"%1$s exists.\n\nRecover emergency save?"), file);
-	
+
 	int const load_emerg = Alert::prompt(_("Load emergency save?"), text,
 		0, 2, _("&Recover"), _("&Load Original"), _("&Cancel"));
 
@@ -3881,7 +3968,7 @@ Buffer::ReadStatus Buffer::loadEmergency()
 		str += "\n\n" + bformat(_("Remove emergency file now?\n(%1$s)"),
 			makeDisplayPath(emergencyFile.absFileName()));
 
-		int const del_emerg = 
+		int const del_emerg =
 			Alert::prompt(_("Delete emergency file?"), str, 1, 1,
 				_("&Remove"), _("&Keep"));
 		if (del_emerg == 0) {
@@ -3913,16 +4000,16 @@ Buffer::ReadStatus Buffer::loadAutosave()
 {
 	// Now check if autosave file is newer.
 	FileName const autosaveFile = getAutosaveFileName();
-	if (!autosaveFile.exists() 
-		  || autosaveFile.lastModified() <= d->filename.lastModified()) 
+	if (!autosaveFile.exists()
+		  || autosaveFile.lastModified() <= d->filename.lastModified())
 		return ReadFileNotFound;
 
 	docstring const file = makeDisplayPath(d->filename.absFileName(), 20);
-	docstring const text = bformat(_("The backup of the document %1$s " 
+	docstring const text = bformat(_("The backup of the document %1$s "
 		"is newer.\n\nLoad the backup instead?"), file);
 	int const ret = Alert::prompt(_("Load backup?"), text, 0, 2,
 		_("&Load backup"), _("Load &original"),	_("&Cancel"));
-	
+
 	switch (ret)
 	{
 	case 0: {
@@ -3934,7 +4021,7 @@ Buffer::ReadStatus Buffer::loadAutosave()
 					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."), 
+					"different file."),
 					from_utf8(d->filename.absFileName())));
 			}
 			markDirty();
@@ -3964,7 +4051,7 @@ Buffer::ReadStatus Buffer::loadLyXFile()
 	ReadStatus const ret_re = loadEmergency();
 	if (ret_re == ReadSuccess || ret_re == ReadCancel)
 		return ret_re;
-	
+
 	ReadStatus const ret_ra = loadAutosave();
 	if (ret_ra == ReadSuccess || ret_ra == ReadCancel)
 		return ret_ra;
@@ -4037,7 +4124,7 @@ void Buffer::bufferErrors(TeXErrors const & terr, ErrorList & errorList) const
 
 void Buffer::setBuffersForInsets() const
 {
-	inset().setBuffer(const_cast<Buffer &>(*this)); 
+	inset().setBuffer(const_cast<Buffer &>(*this));
 }
 
 
@@ -4046,7 +4133,7 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 	// Use the master text class also for child documents
 	Buffer const * const master = masterBuffer();
 	DocumentClass const & textclass = master->params().documentClass();
-	
+
 	// do this only if we are the top-level Buffer
 	if (master == this)
 		reloadBibInfoCache();
@@ -4060,7 +4147,7 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 		if (master != this) {
 			bufToUpdate.insert(this);
 			master->updateBuffer(UpdateMaster, utype);
-			// Do this here in case the master has no gui associated with it. Then, 
+			// 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->d->gui_)
 				structureChanged();
@@ -4277,13 +4364,13 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
 			if (counters.hasCounter(from_utf8(type))) {
 				string const & lang = par.getParLanguage(bp)->code();
 				counters.step(from_utf8(type), utype);
-				full_label = bformat(from_ascii("%1$s %2$s:"), 
-						     name, 
+				full_label = bformat(from_ascii("%1$s %2$s:"),
+						     name,
 						     counters.theCounter(from_utf8(type), lang));
 			} else
-				full_label = bformat(from_ascii("%1$s #:"), name);	
+				full_label = bformat(from_ascii("%1$s #:"), name);
 		}
-		par.params().labelString(full_label);	
+		par.params().labelString(full_label);
 		break;
 	}
 
@@ -4294,7 +4381,7 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
 	case LABEL_MANUAL:
 	case LABEL_TOP_ENVIRONMENT:
 	case LABEL_CENTERED_TOP_ENVIRONMENT:
-	case LABEL_STATIC:	
+	case LABEL_STATIC:
 	case LABEL_BIBLIO:
 		par.params().labelString(par.expandLabel(layout, bp));
 		break;
@@ -4324,7 +4411,7 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const
 			masterBuffer()->params().documentClass().counters().
 					setActiveLayout(parit->layout());
 		}
-		
+
 		// set the counter for this paragraph
 		d->setLabel(parit, utype);
 
@@ -4378,6 +4465,77 @@ int Buffer::spellCheck(DocIterator & from, DocIterator & to,
 }
 
 
+void Buffer::Impl::updateStatistics(DocIterator & from, DocIterator & to, bool skipNoOutput)
+{
+	bool inword = false;
+	word_count_ = 0;
+	char_count_ = 0;
+	blank_count_ = 0;
+ 
+	for (DocIterator dit = from ; dit != to && !dit.atEnd(); ) {
+		if (!dit.inTexted()) {
+			dit.forwardPos();
+			continue;
+		}
+		
+		Paragraph const & par = dit.paragraph();
+		pos_type const pos = dit.pos();
+		
+		// Copied and adapted from isWordSeparator() in Paragraph
+		if (pos == dit.lastpos()) {
+			inword = false;
+		} else {
+			Inset const * ins = par.getInset(pos);
+			if (ins && skipNoOutput && !ins->producesOutput()) {
+				// skip this inset
+				++dit.top().pos();
+				// stop if end of range was skipped
+				if (!to.atEnd() && dit >= to)
+					break;
+				continue;
+			} else if (!par.isDeleted(pos)) {
+				if (par.isWordSeparator(pos)) 
+					inword = false;
+				else if (!inword) {
+					++word_count_;
+					inword = true;
+				}
+				if (ins && ins->isLetter())
+					++char_count_;
+				else if (ins && ins->isSpace())
+					++blank_count_;
+				else {
+					char_type const c = par.getChar(pos);
+					if (isPrintableNonspace(c))
+						++char_count_;
+					else if (isSpace(c))
+						++blank_count_;
+				}
+			}
+		}
+		dit.forwardPos();
+	}
+}
+
+
+void Buffer::updateStatistics(DocIterator & from, DocIterator & to, bool skipNoOutput) const
+{
+	d->updateStatistics(from, to, skipNoOutput);
+}
+
+
+int Buffer::wordCount() const
+{
+	return d->wordCount();
+}
+
+
+int Buffer::charCount(bool with_blanks) const
+{
+	return d->charCount(with_blanks);
+}
+
+
 Buffer::ReadStatus Buffer::reload()
 {
 	setBusy(true);
@@ -4387,6 +4545,8 @@ Buffer::ReadStatus Buffer::reload()
 	d->filename.refresh();
 	docstring const disp_fn = makeDisplayPath(d->filename.absFileName());
 
+	// clear parent. this will get reset if need be.
+	d->setParent(0);
 	ReadStatus const status = loadLyXFile();
 	if (status == ReadSuccess) {
 		updateBuffer();
@@ -4397,7 +4557,7 @@ Buffer::ReadStatus Buffer::reload()
 		d->undo_.clear();
 	} else {
 		message(bformat(_("Could not reload document %1$s."), disp_fn));
-	}	
+	}
 	setBusy(false);
 	removePreviews();
 	updatePreviews();