X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.C;h=fae278648eb63d135638af6dc90562d1a6199a53;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=a306de412efbce0716e08b1f3e0d13519da27e2d;hpb=04986c096a9bd58fe4e3e1fbb51d166aa60500ed;p=lyx.git

diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C
index a306de412e..fae278648e 100644
--- a/src/buffer_funcs.C
+++ b/src/buffer_funcs.C
@@ -32,39 +32,39 @@
 #include "pariterator.h"
 #include "lyxvc.h"
 #include "texrow.h"
+#include "TocBackend.h"
 #include "vc-backend.h"
-#include "toc.h"
 
 #include "frontends/Alert.h"
 
 #include "insets/insetbibitem.h"
+#include "insets/insetinclude.h"
 
 #include "support/filetools.h"
 #include "support/fs_extras.h"
 #include "support/lyxlib.h"
 
-#include <iostream>
-
 #include <boost/bind.hpp>
 #include <boost/filesystem/operations.hpp>
 
+
+namespace lyx {
+
 using namespace std;
 
-using lyx::pit_type;
-using lyx::support::bformat;
-using lyx::support::libFileSearch;
-using lyx::support::makeDisplayPath;
-using lyx::support::onlyFilename;
-using lyx::support::onlyPath;
-using lyx::support::unlink;
+using support::bformat;
+using support::libFileSearch;
+using support::makeDisplayPath;
+using support::onlyFilename;
+using support::onlyPath;
+using support::unlink;
 
 using std::min;
 using std::string;
 
+namespace Alert = frontend::Alert;
 namespace fs = boost::filesystem;
 
-extern BufferList bufferlist;
-
 namespace {
 
 bool readFile(Buffer * const b, string const & s)
@@ -73,9 +73,9 @@ bool readFile(Buffer * const b, string const & s)
 
 	// File information about normal file
 	if (!fs::exists(s)) {
-		string const file = makeDisplayPath(s, 50);
-		string text = bformat(_("The specified document\n%1$s"
-					"\ncould not be read."), file);
+		docstring const file = makeDisplayPath(s, 50);
+		docstring text = bformat(_("The specified document\n%1$s"
+						     "\ncould not be read."), file);
 		Alert::error(_("Could not read document"), text);
 		return false;
 	}
@@ -86,11 +86,11 @@ bool readFile(Buffer * const b, string const & s)
 	if (fs::exists(e) && fs::exists(s)
 	    && fs::last_write_time(e) > fs::last_write_time(s))
 	{
-		string const file = makeDisplayPath(s, 20);
-		string const text =
+		docstring const file = makeDisplayPath(s, 20);
+		docstring const text =
 			bformat(_("An emergency save of the document "
 				  "%1$s exists.\n\n"
-				  "Recover emergency save?"), file);
+					       "Recover emergency save?"), file);
 		switch (Alert::prompt(_("Load emergency save?"), text, 0, 2,
 				      _("&Recover"),  _("&Load Original"),
 				      _("&Cancel")))
@@ -112,11 +112,11 @@ bool readFile(Buffer * const b, string const & s)
 	if (fs::exists(a) && fs::exists(s)
 	    && fs::last_write_time(a) > fs::last_write_time(s))
 	{
-		string const file = makeDisplayPath(s, 20);
-		string const text =
+		docstring const file = makeDisplayPath(s, 20);
+		docstring const text =
 			bformat(_("The backup of the document "
 				  "%1$s is newer.\n\nLoad the "
-				  "backup instead?"), file);
+					       "backup instead?"), file);
 		switch (Alert::prompt(_("Load backup?"), text, 0, 2,
 				      _("&Load backup"), _("Load &original"),
 				      _("&Cancel") ))
@@ -153,12 +153,12 @@ bool loadLyXFile(Buffer * b, string const & s)
 			return true;
 		}
 	} else {
-		string const file = makeDisplayPath(s, 20);
+		docstring const file = makeDisplayPath(s, 20);
 		// Here we probably should run
 		if (LyXVC::file_not_found_hook(s)) {
-			string const text =
+			docstring const text =
 				bformat(_("Do you want to retrieve the document"
-					  " %1$s from version control?"), file);
+						       " %1$s from version control?"), file);
 			int const ret = Alert::prompt(_("Retrieve from version control?"),
 				text, 0, 1, _("&Retrieve"), _("&Cancel"));
 
@@ -174,12 +174,12 @@ bool loadLyXFile(Buffer * b, string const & s)
 	return false;
 }
 
-
+// FIXME newFile() should probably be a member method of Application...
 Buffer * newFile(string const & filename, string const & templatename,
 		 bool const isNamed)
 {
 	// get a free buffer
-	Buffer * b = bufferlist.newBuffer(filename);
+	Buffer * b = theBufferList().newBuffer(filename);
 	BOOST_ASSERT(b);
 
 	string tname;
@@ -191,10 +191,12 @@ Buffer * newFile(string const & filename, string const & templatename,
 
 	if (!tname.empty()) {
 		if (!b->readFile(tname)) {
-			string const file = makeDisplayPath(tname, 50);
-			string const text  = bformat(_("The specified document template\n%1$s\ncould not be read."), file);
+			docstring const file = makeDisplayPath(tname, 50);
+			docstring const text  = bformat(
+				_("The specified document template\n%1$s\ncould not be read."),
+				file);
 			Alert::error(_("Could not read template"), text);
-			bufferlist.release(b);
+			theBufferList().release(b);
 			return 0;
 		}
 	}
@@ -212,7 +214,8 @@ Buffer * newFile(string const & filename, string const & templatename,
 }
 
 
-void bufferErrors(Buffer const & buf, TeXErrors const & terr)
+void bufferErrors(Buffer const & buf, TeXErrors const & terr,
+				  ErrorList & errorList)
 {
 	TeXErrors::Errors::const_iterator cit = terr.begin();
 	TeXErrors::Errors::const_iterator end = terr.end();
@@ -231,23 +234,15 @@ void bufferErrors(Buffer const & buf, TeXErrors const & terr)
 							  pos_end);
 		} while (found && id_start == id_end && pos_start == pos_end);
 
-		buf.addError(ErrorItem(cit->error_desc,
+		errorList.push_back(ErrorItem(cit->error_desc,
 			cit->error_text, id_start, pos_start, pos_end));
 	}
 }
 
 
-void bufferErrors(Buffer const & buf, ErrorList const & el)
-{
-	buf.setErrorList(el);
-}
-
-
 string const bufferFormat(Buffer const & buffer)
 {
-	if (buffer.isLinuxDoc())
-		return "linuxdoc";
-	else if (buffer.isDocBook())
+	if (buffer.isDocBook())
 		return "docbook";
 	else if (buffer.isLiterate())
 		return "literate";
@@ -265,7 +260,7 @@ int countWords(DocIterator const & from, DocIterator const & to)
 		if (dit.inTexted()
 		    && dit.pos() != dit.lastpos()
 		    && dit.paragraph().isLetter(dit.pos())
-		    && !isDeletedText(dit.paragraph(), dit.pos())) {
+		    && !dit.paragraph().isDeleted(dit.pos())) {
 			if (!inword) {
 				++count;
 				inword = true;
@@ -280,9 +275,9 @@ int countWords(DocIterator const & from, DocIterator const & to)
 
 namespace {
 
-lyx::depth_type getDepth(DocIterator const & it)
+depth_type getDepth(DocIterator const & it)
 {
-	lyx::depth_type depth = 0;
+	depth_type depth = 0;
 	for (size_t i = 0 ; i < it.depth() ; ++i)
 		if (!it[i].inset().inMathed())
 			depth += it[i].paragraph().getDepth() + 1;
@@ -290,7 +285,7 @@ lyx::depth_type getDepth(DocIterator const & it)
 	return depth - 1;
 }
 
-lyx::depth_type getItemDepth(ParIterator const & it)
+depth_type getItemDepth(ParIterator const & it)
 {
 	Paragraph const & par = *it;
 	LYX_LABEL_TYPES const labeltype = par.layout()->labeltype;
@@ -299,7 +294,7 @@ lyx::depth_type getItemDepth(ParIterator const & it)
 		return 0;
 
 	// this will hold the lowest depth encountered up to now.
-	lyx::depth_type min_depth = getDepth(it);
+	depth_type min_depth = getDepth(it);
 	ParIterator prev_it = it;
 	while (true) {
 		if (prev_it.pit())
@@ -316,7 +311,7 @@ lyx::depth_type getItemDepth(ParIterator const & it)
 		// We search for the first paragraph with same label
 		// that is not more deeply nested.
 		Paragraph & prev_par = *prev_it;
-		lyx::depth_type const prev_depth = getDepth(prev_it);
+		depth_type const prev_depth = getDepth(prev_it);
 		if (labeltype == prev_par.layout()->labeltype) {
 			if (prev_depth < min_depth) {
 				return prev_par.itemdepth + 1;
@@ -339,7 +334,7 @@ bool needEnumCounterReset(ParIterator const & it)
 {
 	Paragraph const & par = *it;
 	BOOST_ASSERT(par.layout()->labeltype == LABEL_ENUMERATE);
-	lyx::depth_type const cur_depth = par.getDepth();
+	depth_type const cur_depth = par.getDepth();
 	ParIterator prev_it = it;
 	while (prev_it.pit()) {
 		--prev_it.top().pit();
@@ -353,11 +348,9 @@ bool needEnumCounterReset(ParIterator const & it)
 
 
 // set the label of a paragraph. This includes the counters.
-void setLabel(Buffer const & buf, ParIterator & it)
+void setLabel(Buffer const & buf, ParIterator & it, LyXTextClass const & textclass)
 {
 	Paragraph & par = *it;
-	BufferParams const & bufparams = buf.params();
-	LyXTextClass const & textclass = bufparams.getLyXTextClass();
 	LyXLayout_ptr const & layout = par.layout();
 	Counters & counters = textclass.counters();
 
@@ -376,13 +369,13 @@ void setLabel(Buffer const & buf, ParIterator & it)
 	par.itemdepth = getItemDepth(it);
 
 	// erase what was there before
-	par.params().labelString(string());
+	par.params().labelString(docstring());
 
 	if (layout->margintype == MARGIN_MANUAL) {
 		if (par.params().labelWidthString().empty())
-			par.setLabelWidthString(layout->labelstring());
+			par.setLabelWidthString(buf.translateLabel(layout->labelstring()));
 	} else {
-		par.setLabelWidthString(string());
+		par.setLabelWidthString(docstring());
 	}
 
 	// is it a layout that has an automatic label?
@@ -391,29 +384,29 @@ void setLabel(Buffer const & buf, ParIterator & it)
 		    && (layout->latextype != LATEX_ENVIRONMENT
 			|| isFirstInSequence(it.pit(), it.plist()))) {
 			counters.step(layout->counter);
-			string label = expandLabel(buf, layout,
-						   par.params().appendix());
+			docstring label = expandLabel(buf, layout,
+						      par.params().appendix());
 			par.params().labelString(label);
 		}
 	} else if (layout->labeltype == LABEL_ITEMIZE) {
 		// At some point of time we should do something more
 		// clever here, like:
 		//   par.params().labelString(
-		//    bufparams.user_defined_bullet(par.itemdepth).getText());
+		//    buf.params().user_defined_bullet(par.itemdepth).getText());
 		// for now, use a simple hardcoded label
-		string itemlabel;
+		docstring itemlabel;
 		switch (par.itemdepth) {
 		case 0:
-			itemlabel = "*";
+			itemlabel = char_type(0x2022);
 			break;
 		case 1:
-			itemlabel = "-";
+			itemlabel = char_type(0x2013);
 			break;
 		case 2:
-			itemlabel = "@";
+			itemlabel = char_type(0x2217);
 			break;
 		case 3:
-			itemlabel = "·";
+			itemlabel += char_type(0x2219); // or 0x00b7
 			break;
 		}
 
@@ -422,7 +415,7 @@ void setLabel(Buffer const & buf, ParIterator & it)
 		// FIXME
 		// Yes I know this is a really, really! bad solution
 		// (Lgb)
-		string enumcounter = "enum";
+		docstring enumcounter = from_ascii("enum");
 
 		switch (par.itemdepth) {
 		case 2:
@@ -468,15 +461,15 @@ void setLabel(Buffer const & buf, ParIterator & it)
 
 		par.params().labelString(counters.counterLabel(buf.B_(format)));
 	} else if (layout->labeltype == LABEL_BIBLIO) {// ale970302
-		counters.step("bibitem");
-		int number = counters.value("bibitem");
+		counters.step(from_ascii("bibitem"));
+		int number = counters.value(from_ascii("bibitem"));
 		if (par.bibitem())
 			par.bibitem()->setCounter(number);
-		par.params().labelString(buf.B_(layout->labelstring()));
+		par.params().labelString(buf.translateLabel(layout->labelstring()));
 		// In biblio should't be following counters but...
 	} else if (layout->labeltype == LABEL_SENSITIVE) {
 		// Search for the first float or wrap inset in the iterator
-		string type;
+		docstring type;
 		size_t i = it.depth();
 		while (i > 0) {
 			--i;
@@ -488,40 +481,40 @@ void setLabel(Buffer const & buf, ParIterator & it)
 			}
 		}
 
-		string s;
+		docstring s;
 		if (!type.empty()) {
-			Floating const & fl = textclass.floats().getType(type);
-
-			counters.step(fl.type());
+			Floating const & fl = textclass.floats().getType(to_ascii(type));
+			// FIXME UNICODE
+			counters.step(from_ascii(fl.type()));
 
 			// Doesn't work... yet.
 			s = bformat(_("%1$s #:"), buf.B_(fl.name()));
 		} else {
 			// par->SetLayout(0);
-			s = buf.B_(layout->labelstring());
+			s = buf.translateLabel(layout->labelstring());
 		}
 
 		par.params().labelString(s);
 	} else if (layout->labeltype == LABEL_NO_LABEL)
-		par.params().labelString(string());
+		par.params().labelString(docstring());
 	else
-		par.params().labelString(buf.B_(layout->labelstring()));
+		par.params().labelString(buf.translateLabel(layout->labelstring()));
 }
 
 } // anon namespace
 
 
-bool updateCurrentLabel(Buffer const & buf, 
-	ParIterator & it)	
+bool updateCurrentLabel(Buffer const & buf,
+	ParIterator & it)
 {
     if (it == par_iterator_end(buf.inset()))
-        return false;
+	return false;
 
-//	if (it.lastpit == 0 && LyXText::isMainText())
+//	if (it.lastpit == 0 && LyXText::isMainText(buf))
 //		return false;
 
 	switch (it->layout()->labeltype) {
-		
+
 	case LABEL_NO_LABEL:
 	case LABEL_MANUAL:
 	case LABEL_BIBLIO:
@@ -529,7 +522,7 @@ bool updateCurrentLabel(Buffer const & buf,
 	case LABEL_CENTERED_TOP_ENVIRONMENT:
 	case LABEL_STATIC:
 	case LABEL_ITEMIZE:
-		setLabel(buf, it);
+		setLabel(buf, it, buf.params().getLyXTextClass());
 		return true;
 
 	case LABEL_SENSITIVE:
@@ -544,35 +537,46 @@ bool updateCurrentLabel(Buffer const & buf,
 }
 
 
-void updateLabels(Buffer const & buf, 
-	ParIterator & from, ParIterator & to)
+void updateLabels(Buffer const & buf,
+	ParIterator & from, ParIterator & to, bool childonly)
 {
 	for (ParIterator it = from; it != to; ++it) {
 		if (it.pit() > it.lastpit())
 			return;
 		if (!updateCurrentLabel (buf, it)) {
-			updateLabels(buf);
+			updateLabels(buf, childonly);
 			return;
 		}
 	}
 }
 
 
-void updateLabels(Buffer const & buf, 
-	ParIterator & iter)
+void updateLabels(Buffer const & buf, ParIterator & iter, bool childonly)
 {
 	if (updateCurrentLabel(buf, iter))
 		return;
 
-	updateLabels(buf);
+	updateLabels(buf, childonly);
 }
 
 
-void updateLabels(Buffer const & buf)
+void updateLabels(Buffer const & buf, bool childonly)
 {
-	// start over the counters
-	buf.params().getLyXTextClass().counters().reset();
-	
+	// Use the master text class also for child documents
+	LyXTextClass const & textclass = buf.params().getLyXTextClass();
+
+	if (!childonly) {
+		// If this is a child document start with the master
+		Buffer const * const master = buf.getMasterBuffer();
+		if (master != &buf) {
+			updateLabels(*master);
+			return;
+		}
+
+		// start over the counters
+		textclass.counters().reset();
+	}
+
 	ParIterator const end = par_iterator_end(buf.inset());
 
 	for (ParIterator it = par_iterator_begin(buf.inset()); it != end; ++it) {
@@ -585,32 +589,46 @@ void updateLabels(Buffer const & buf)
 			it->params().depth(0);
 
 		// set the counter for this paragraph
-		setLabel(buf, it);
+		setLabel(buf, it, textclass);
+
+		// Now included docs
+		InsetList::const_iterator iit = it->insetlist.begin();
+		InsetList::const_iterator end = it->insetlist.end();
+		for (; iit != end; ++iit) {
+			if (iit->inset->lyxCode() == InsetBase::INCLUDE_CODE)
+				static_cast<InsetInclude const *>(iit->inset)
+					->updateLabels(buf);
+		}
 	}
 
-	lyx::toc::updateToc(buf);
+	const_cast<Buffer &>(buf).tocBackend().update();
 }
 
 
-string expandLabel(Buffer const & buf,
-	LyXLayout_ptr const & layout, bool appendix)
+docstring expandLabel(Buffer const & buf,
+		      LyXLayout_ptr const & layout, bool appendix)
 {
 	LyXTextClass const & tclass = buf.params().getLyXTextClass();
 
-	string fmt = buf.B_(appendix ? layout->labelstring_appendix()
-			    : layout->labelstring());
+	docstring fmt = buf.translateLabel(appendix ?
+			layout->labelstring_appendix() :
+			layout->labelstring());
 
 	// handle 'inherited level parts' in 'fmt',
 	// i.e. the stuff between '@' in   '@Section@.\arabic{subsection}'
 	size_t const i = fmt.find('@', 0);
-	if (i != string::npos) {
+	if (i != docstring::npos) {
 		size_t const j = fmt.find('@', i + 1);
-		if (j != string::npos) {
-			string parent(fmt, i + 1, j - i - 1);
-			string label = expandLabel(buf, tclass[parent], appendix);
-			fmt = string(fmt, 0, i) + label + string(fmt, j + 1, string::npos);
+		if (j != docstring::npos) {
+			docstring parent(fmt, i + 1, j - i - 1);
+			// FIXME UNICODE
+			docstring label = expandLabel(buf, tclass[to_utf8(parent)], appendix);
+			fmt = docstring(fmt, 0, i) + label + docstring(fmt, j + 1, docstring::npos);
 		}
 	}
 
 	return tclass.counters().counterLabel(fmt);
 }
+
+
+} // namespace lyx