X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.C;h=52f9b6f5e325c6f70aca3f1daabeb7a74b1c3b8c;hb=798af7d8f3a34dbad048934819f9da724882d06d;hp=29f3cd49595f84f4403394ff10f5a828bacfab01;hpb=ed99f752f9b4ce52cf55cac2a94658fb087c7383;p=lyx.git

diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C
index 29f3cd4959..52f9b6f5e3 100644
--- a/src/buffer_funcs.C
+++ b/src/buffer_funcs.C
@@ -55,6 +55,7 @@ using namespace std;
 using support::bformat;
 using support::FileName;
 using support::libFileSearch;
+using support::makeAbsPath;
 using support::makeDisplayPath;
 using support::onlyFilename;
 using support::onlyPath;
@@ -100,7 +101,7 @@ bool readFile(Buffer * const b, FileName const & s)
 		case 0:
 			// the file is not saved if we load the emergency file.
 			b->markDirty();
-			return b->readFile(e.absFilename());
+			return b->readFile(e);
 		case 1:
 			break;
 		default:
@@ -127,7 +128,7 @@ bool readFile(Buffer * const b, FileName const & s)
 		case 0:
 			// the file is not saved if we load the autosave file.
 			b->markDirty();
-			return b->readFile(a.absFilename());
+			return b->readFile(a);
 		case 1:
 			// Here we delete the autosave
 			unlink(a);
@@ -136,7 +137,7 @@ bool readFile(Buffer * const b, FileName const & s)
 			return false;
 		}
 	}
-	return b->readFile(s.absFilename());
+	return b->readFile(s);
 }
 
 
@@ -185,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").absFilename();
+		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);
@@ -371,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);
@@ -409,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
@@ -462,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
@@ -608,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