X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.C;h=52f9b6f5e325c6f70aca3f1daabeb7a74b1c3b8c;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=fae278648eb63d135638af6dc90562d1a6199a53;hpb=2734cc154853c61a7ea54bfeea3adc908f68bdc5;p=lyx.git

diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C
index fae278648e..52f9b6f5e3 100644
--- a/src/buffer_funcs.C
+++ b/src/buffer_funcs.C
@@ -53,7 +53,9 @@ namespace lyx {
 using namespace std;
 
 using support::bformat;
+using support::FileName;
 using support::libFileSearch;
+using support::makeAbsPath;
 using support::makeDisplayPath;
 using support::onlyFilename;
 using support::onlyPath;
@@ -67,13 +69,13 @@ namespace fs = boost::filesystem;
 
 namespace {
 
-bool readFile(Buffer * const b, string const & s)
+bool readFile(Buffer * const b, FileName const & s)
 {
 	BOOST_ASSERT(b);
 
 	// File information about normal file
-	if (!fs::exists(s)) {
-		docstring const file = makeDisplayPath(s, 50);
+	if (!fs::exists(s.toFilesystemEncoding())) {
+		docstring const file = makeDisplayPath(s.absFilename(), 50);
 		docstring text = bformat(_("The specified document\n%1$s"
 						     "\ncould not be read."), file);
 		Alert::error(_("Could not read document"), text);
@@ -81,12 +83,13 @@ bool readFile(Buffer * const b, string const & s)
 	}
 
 	// Check if emergency save file exists and is newer.
-	string const e = onlyPath(s) + onlyFilename(s) + ".emergency";
+	FileName const e(s.absFilename() + ".emergency");
 
-	if (fs::exists(e) && fs::exists(s)
-	    && fs::last_write_time(e) > fs::last_write_time(s))
+	if (fs::exists(e.toFilesystemEncoding()) &&
+	    fs::exists(s.toFilesystemEncoding()) &&
+	    fs::last_write_time(e.toFilesystemEncoding()) > fs::last_write_time(s.toFilesystemEncoding()))
 	{
-		docstring const file = makeDisplayPath(s, 20);
+		docstring const file = makeDisplayPath(s.absFilename(), 20);
 		docstring const text =
 			bformat(_("An emergency save of the document "
 				  "%1$s exists.\n\n"
@@ -107,12 +110,13 @@ bool readFile(Buffer * const b, string const & s)
 	}
 
 	// Now check if autosave file is newer.
-	string const a = onlyPath(s) + '#' + onlyFilename(s) + '#';
+	FileName const a(onlyPath(s.absFilename()) + '#' + onlyFilename(s.absFilename()) + '#');
 
-	if (fs::exists(a) && fs::exists(s)
-	    && fs::last_write_time(a) > fs::last_write_time(s))
+	if (fs::exists(a.toFilesystemEncoding()) &&
+	    fs::exists(s.toFilesystemEncoding()) &&
+	    fs::last_write_time(a.toFilesystemEncoding()) > fs::last_write_time(s.toFilesystemEncoding()))
 	{
-		docstring const file = makeDisplayPath(s, 20);
+		docstring const file = makeDisplayPath(s.absFilename(), 20);
 		docstring const text =
 			bformat(_("The backup of the document "
 				  "%1$s is newer.\n\nLoad the "
@@ -141,19 +145,19 @@ bool readFile(Buffer * const b, string const & s)
 
 
 
-bool loadLyXFile(Buffer * b, string const & s)
+bool loadLyXFile(Buffer * b, FileName const & s)
 {
 	BOOST_ASSERT(b);
 
-	if (fs::is_readable(s)) {
+	if (fs::is_readable(s.toFilesystemEncoding())) {
 		if (readFile(b, s)) {
 			b->lyxvc().file_found_hook(s);
-			if (!fs::is_writable(s))
+			if (!fs::is_writable(s.toFilesystemEncoding()))
 				b->setReadonly(true);
 			return true;
 		}
 	} else {
-		docstring const file = makeDisplayPath(s, 20);
+		docstring const file = makeDisplayPath(s.absFilename(), 20);
 		// Here we probably should run
 		if (LyXVC::file_not_found_hook(s)) {
 			docstring const text =
@@ -182,16 +186,16 @@ Buffer * newFile(string const & filename, string const & templatename,
 	Buffer * b = theBufferList().newBuffer(filename);
 	BOOST_ASSERT(b);
 
-	string tname;
+	FileName tname;
 	// use defaults.lyx as a default template if it exists.
 	if (templatename.empty())
 		tname = libFileSearch("templates", "defaults.lyx");
 	else
-		tname = templatename;
+		tname = makeAbsPath(templatename);
 
 	if (!tname.empty()) {
 		if (!b->readFile(tname)) {
-			docstring const file = makeDisplayPath(tname, 50);
+			docstring const file = makeDisplayPath(tname.absFilename(), 50);
 			docstring const text  = bformat(
 				_("The specified document template\n%1$s\ncould not be read."),
 				file);
@@ -368,33 +372,35 @@ void setLabel(Buffer const & buf, ParIterator & it, LyXTextClass const & textcla
 	// Compute the item depth of the paragraph
 	par.itemdepth = getItemDepth(it);
 
-	// erase what was there before
-	par.params().labelString(docstring());
-
 	if (layout->margintype == MARGIN_MANUAL) {
 		if (par.params().labelWidthString().empty())
-			par.setLabelWidthString(buf.translateLabel(layout->labelstring()));
+			par.params().labelWidthString(par.translateIfPossible(layout->labelstring(), buf.params()));
 	} else {
-		par.setLabelWidthString(docstring());
+		par.params().labelWidthString(docstring());
 	}
 
+	// Optimisation: setLabel() can be called for each for each
+	// paragraph of the document. So we make the string static to
+	// avoid the repeated instanciation.
+	static docstring itemlabel;
+
 	// is it a layout that has an automatic label?
 	if (layout->labeltype == LABEL_COUNTER) {
 		if (layout->toclevel <= buf.params().secnumdepth
 		    && (layout->latextype != LATEX_ENVIRONMENT
 			|| isFirstInSequence(it.pit(), it.plist()))) {
 			counters.step(layout->counter);
-			docstring label = expandLabel(buf, layout,
-						      par.params().appendix());
-			par.params().labelString(label);
-		}
+			par.params().labelString(
+				par.expandLabel(layout, buf.params()));
+		} else
+			par.params().labelString(docstring());
+
 	} else if (layout->labeltype == LABEL_ITEMIZE) {
 		// At some point of time we should do something more
 		// clever here, like:
 		//   par.params().labelString(
 		//    buf.params().user_defined_bullet(par.itemdepth).getText());
 		// for now, use a simple hardcoded label
-		docstring itemlabel;
 		switch (par.itemdepth) {
 		case 0:
 			itemlabel = char_type(0x2022);
@@ -406,11 +412,11 @@ void setLabel(Buffer const & buf, ParIterator & it, LyXTextClass const & textcla
 			itemlabel = char_type(0x2217);
 			break;
 		case 3:
-			itemlabel += char_type(0x2219); // or 0x00b7
+			itemlabel = char_type(0x2219); // or 0x00b7
 			break;
 		}
-
 		par.params().labelString(itemlabel);
+
 	} else if (layout->labeltype == LABEL_ENUMERATE) {
 		// FIXME
 		// Yes I know this is a really, really! bad solution
@@ -459,46 +465,51 @@ void setLabel(Buffer const & buf, ParIterator & it, LyXTextClass const & textcla
 			break;
 		}
 
-		par.params().labelString(counters.counterLabel(buf.B_(format)));
+		par.params().labelString(counters.counterLabel(
+			par.translateIfPossible(from_ascii(format), buf.params())));
+
 	} else if (layout->labeltype == LABEL_BIBLIO) {// ale970302
 		counters.step(from_ascii("bibitem"));
 		int number = counters.value(from_ascii("bibitem"));
 		if (par.bibitem())
 			par.bibitem()->setCounter(number);
-		par.params().labelString(buf.translateLabel(layout->labelstring()));
-		// In biblio should't be following counters but...
+
+		par.params().labelString(
+			par.translateIfPossible(layout->labelstring(), buf.params()));
+		// In biblio shouldn't be following counters but...
 	} else if (layout->labeltype == LABEL_SENSITIVE) {
 		// Search for the first float or wrap inset in the iterator
-		docstring type;
 		size_t i = it.depth();
+		InsetBase * in;
 		while (i > 0) {
 			--i;
-			InsetBase * const in = &it[i].inset();
+			in = &it[i].inset();
 			if (in->lyxCode() == InsetBase::FLOAT_CODE
-			    || in->lyxCode() == InsetBase::WRAP_CODE) {
-				type = in->getInsetName();
+			    || in->lyxCode() == InsetBase::WRAP_CODE)
 				break;
-			}
 		}
+		docstring const & type = in->getInsetName();
 
-		docstring s;
 		if (!type.empty()) {
 			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()));
+			par.params().labelString(par.translateIfPossible(
+				bformat(from_ascii("%1$s #:"), from_utf8(fl.name())),
+				buf.params()));
 		} else {
 			// par->SetLayout(0);
-			s = buf.translateLabel(layout->labelstring());
+			par.params().labelString(par.translateIfPossible(
+				layout->labelstring(), buf.params()));
 		}
 
-		par.params().labelString(s);
 	} else if (layout->labeltype == LABEL_NO_LABEL)
 		par.params().labelString(docstring());
 	else
-		par.params().labelString(buf.translateLabel(layout->labelstring()));
+		par.params().labelString(
+			par.translateIfPossible(layout->labelstring(), buf.params()));
 }
 
 } // anon namespace
@@ -605,30 +616,4 @@ void updateLabels(Buffer const & buf, bool childonly)
 }
 
 
-docstring expandLabel(Buffer const & buf,
-		      LyXLayout_ptr const & layout, bool appendix)
-{
-	LyXTextClass const & tclass = buf.params().getLyXTextClass();
-
-	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 != docstring::npos) {
-		size_t const j = fmt.find('@', i + 1);
-		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