X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetRef.cpp;h=31c0187cc1cadfeb01035c69f69a777d7ce7782f;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=962c7ae603e8d6b440bdb05f8f6ed36fa51e9a8e;hpb=c513c26e62866a6dec6ed95d45aa938cf0a950f0;p=lyx.git

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index 962c7ae603..31c0187cc1 100644
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -69,11 +69,24 @@ ParamInfo const & InsetRef::findInfo(string const & /* cmdName */)
 		param_info_.add("name", ParamInfo::LATEX_OPTIONAL);
 		param_info_.add("reference", ParamInfo::LATEX_REQUIRED,
 				ParamInfo::HANDLING_ESCAPE);
+		param_info_.add("plural", ParamInfo::LYX_INTERNAL);
+		param_info_.add("caps", ParamInfo::LYX_INTERNAL);
+		param_info_.add("noprefix", ParamInfo::LYX_INTERNAL);
 	}
 	return param_info_;
 }
 
 
+namespace {
+
+void capitalize(docstring & s) {
+	char_type t = uppercase(s[0]);
+	s[0] = t;
+}
+
+}
+
+
 // the ref argument is the label name we are referencing.
 // we expect ref to be in the form: pfx:suffix.
 //
@@ -89,7 +102,7 @@ ParamInfo const & InsetRef::findInfo(string const & /* cmdName */)
 // label, thus: \prettyref{pfx:suffix}.
 //
 docstring InsetRef::getFormattedCmd(docstring const & ref, 
-	docstring & label, docstring & prefix) const
+	docstring & label, docstring & prefix, docstring const & caps) const
 {
 	static docstring const defcmd = from_ascii("\\ref");
 	static docstring const prtcmd = from_ascii("\\prettyref");
@@ -98,7 +111,7 @@ docstring InsetRef::getFormattedCmd(docstring const & ref,
 
 	// we have to have xxx:xxxxx...
 	if (label.empty()) {
-		LYXERR0("Label `" << ref << "' contains no prefix.");
+		LYXERR0("Label `" << ref << "' contains no `:' separator.");
 		label = ref;
 		prefix = from_ascii("");
 		return defcmd;
@@ -127,6 +140,9 @@ docstring InsetRef::getFormattedCmd(docstring const & ref,
 			return defcmd;
 		}
 	}
+	if (caps == "true") {
+		capitalize(prefix);
+	}
 	return from_ascii("\\") + prefix + from_ascii("ref");
 }
 
@@ -158,11 +174,27 @@ void InsetRef::latex(otexstream & os, OutputParams const & rp) const
 	else if (cmd == "formatted") {
 		docstring label;
 		docstring prefix;
-		docstring const fcmd = getFormattedCmd(data, label, prefix);
-		os << fcmd << '{' << label << '}';
+		docstring const fcmd = 
+			getFormattedCmd(data, label, prefix, getParam("caps"));
+		os << fcmd;
+		if (buffer().params().use_refstyle && getParam("plural") == "true")
+		    os << "[s]";
+		os << '{' << label << '}';
 	}
 	else if (cmd == "labelonly") {
-		os << getParam("reference");
+		docstring const & ref = getParam("reference");
+		if (getParam("noprefix") != "true")
+			os << ref;
+		else {
+			docstring prefix;
+			docstring suffix = split(ref, prefix, ':');
+			if (suffix.empty()) {
+		    LYXERR0("Label `" << ref << "' contains no `:' separator.");
+				os << ref;
+			} else {
+				os << suffix;
+			}
+		}
 	}
 	else {
 		// We don't want to output p_["name"], since that is only used 
@@ -233,8 +265,12 @@ docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const & op) const
 			        op.local_font->language()->lang());
 		else if (cmd == "eqref")
 			display_string = '(' + value + ')';
-		else if (cmd == "formatted")
+		else if (cmd == "formatted") {
 			display_string = il->prettyCounter();
+			if (buffer().params().use_refstyle && getParam("caps") == "true")
+				capitalize(display_string);
+			// it is hard to see what to do about plurals...
+		}
 		else if (cmd == "nameref")
 			// FIXME We don't really have the ability to handle these
 			// properly in XHTML output yet (bug #8599).
@@ -280,13 +316,29 @@ void InsetRef::updateBuffer(ParIterator const & it, UpdateType)
 	buffer().addReference(ref, this, it);
 
 	docstring label;
+	string const & cmd = getCmdName();
 	for (int i = 0; !types[i].latex_name.empty(); ++i) {
-		if (getCmdName() == types[i].latex_name) {
+		if (cmd == types[i].latex_name) {
 			label = _(types[i].short_gui_name);
 			break;
 		}
 	}
-	label += ref;
+
+	if (cmd != "labelonly")
+		label += ref;
+	else {
+		if (getParam("noprefix") != "true")
+			label += ref;
+		else {
+			docstring prefix;
+			docstring suffix = split(ref, prefix, ':');
+			if (suffix.empty()) {
+				label += ref;
+			} else {
+				label += suffix;
+			}
+		}
+	}
 	
 	if (!buffer().params().isLatex() && !getParam("name").empty()) {
 		label += "||";
@@ -327,7 +379,8 @@ void InsetRef::validate(LaTeXFeatures & features) const
 		docstring const data = getEscapedLabel(features.runparams());
 		docstring label;
 		docstring prefix;
-		docstring const fcmd = getFormattedCmd(data, label, prefix);
+		docstring const fcmd = 
+			getFormattedCmd(data, label, prefix, getParam("caps"));
 		if (buffer().params().use_refstyle) {
 			features.require("refstyle");
 			if (prefix == "cha")