X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBiblioInfo.cpp;h=3298990a00d4e8a7486efa6c1f8eba3f2d094d69;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=db397a4f7df91c0a8ebf87f60de19591783f1ca5;hpb=1b1f8dd235ba8e168348cd23c824063f2595a0c5;p=lyx.git

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index db397a4f7d..3298990a00 100644
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -665,7 +665,7 @@ docstring BibTeXInfo::getValueForKey(string const & oldkey, Buffer const & buf,
 		key = oldkey.substr(6);
 		cleanit = true;
 	}
-		
+
 	docstring ret = operator[](key);
 	if (ret.empty() && xref)
 		ret = (*xref)[key];
@@ -680,6 +680,10 @@ docstring BibTeXInfo::getValueForKey(string const & oldkey, Buffer const & buf,
 			ret = bib_key_;
 		else if (key == "label")
 			ret = label_;
+		else if (key == "modifier" && modifier_ != 0)
+			ret = modifier_;
+		else if (key == "numericallabel")
+			ret = cite_number_;
 		else if (key == "abbrvauthor")
 			// Special key to provide abbreviated author names.
 			ret = getAbbreviatedAuthor(buf, false);
@@ -714,7 +718,7 @@ docstring BibTeXInfo::getValueForKey(string const & oldkey, Buffer const & buf,
 	}
 	if (cleanit)
 		return html::cleanAttr(ret);
-	
+
 	return ret;
 }
 
@@ -981,7 +985,7 @@ void BiblioInfo::makeCitationLabels(Buffer const & buf)
 {
 	collectCitedEntries(buf);
 	CiteEngineType const engine_type = buf.params().citeEngineType();
-	bool const numbers = (engine_type == ENGINE_TYPE_NUMERICAL);
+	bool const numbers = (engine_type & ENGINE_TYPE_NUMERICAL);
 
 	int keynumber = 0;
 	char modifier = 0;