X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.cpp;h=0dd44340dcf2ee861e589b17dcfe1b5f05f73cea;hb=175711046db2b986550318fa78d901628de28cb8;hp=a3cadd2ff9ed0803bd0035dbfd76e2f7ad8a7cf8;hpb=70b3d3adccdda2daf9346b995575f9ee658ac5d3;p=lyx.git

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index a3cadd2ff9..0dd44340dc 100644
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -1168,7 +1168,7 @@ bool TextClass::readCiteEngine(Lexer & lexrc, ReadType rt, bool const add)
 				cite_command_aliases_[s] = lyx_cmd;
 		}
 		vector<string> const stardescs = getVectorFromString(stardesc, "!");
-		int size = stardesc.size();
+		int size = int(stardesc.size());
 		if (size > 0)
 			cs.stardesc = stardescs[0];
 		if (size > 1)
@@ -1205,14 +1205,14 @@ bool TextClass::readCiteEngine(Lexer & lexrc, ReadType rt, bool const add)
 
 	// Add the styles from AddToCiteEngine to the class' styles
 	// (but only if they are not yet defined)
-	for (auto const cis : class_cite_styles_) {
+	for (auto const & cis : class_cite_styles_) {
 		// Only consider the current CiteEngineType
 		if (!(type & cis.first))
 			continue;
-		for (auto const ciss : cis.second) {
+		for (auto const & ciss : cis.second) {
 			bool defined = false;
 			// Check if the style "name" is already def'ed
-			for (auto const av : getCiteStyles(cis.first))
+			for (auto const & av : getCiteStyles(cis.first))
 				if (av.name == ciss.name)
 					defined = true;
 			if (!defined) {
@@ -1280,36 +1280,58 @@ bool TextClass::readCiteFormat(Lexer & lexrc, ReadType rt)
 			continue;
 		if (initchar == '!' || initchar == '_' || prefixIs(etype, "B_")) {
 			bool defined = false;
+			bool aydefined = false;
+			bool numdefined = false;
 			// Check if the macro is already def'ed
-			for (auto const cm : cite_macros_) {
+			for (auto const & cm : cite_macros_) {
 				if (!(type & cm.first))
 					continue;
-				if (cm.second.find(etype) != cm.second.end())
-					defined = true;
+				if (cm.second.find(etype) != cm.second.end()) {
+					if (type == cm.first)
+						// defined as default or specific type
+						defined = true;
+					if (cm.first == ENGINE_TYPE_AUTHORYEAR)
+						// defined for author-year
+						aydefined = true;
+					else if (cm.first == ENGINE_TYPE_NUMERICAL)
+						// defined for numerical
+						numdefined = true;
+				}
 			}
 			if (!defined || overwrite) {
-				if (type & ENGINE_TYPE_AUTHORYEAR)
+				if (type & ENGINE_TYPE_AUTHORYEAR && (type != ENGINE_TYPE_DEFAULT || !aydefined))
 					cite_macros_[ENGINE_TYPE_AUTHORYEAR][etype] = definition;
-				if (type & ENGINE_TYPE_NUMERICAL)
+				if (type & ENGINE_TYPE_NUMERICAL && (type != ENGINE_TYPE_DEFAULT || !numdefined))
 					cite_macros_[ENGINE_TYPE_NUMERICAL][etype] = definition;
-				if (type & ENGINE_TYPE_DEFAULT)
+				if (type == ENGINE_TYPE_DEFAULT)
 					cite_macros_[ENGINE_TYPE_DEFAULT][etype] = definition;
 			}
 		} else {
 			bool defined = false;
+			bool aydefined = false;
+			bool numdefined = false;
 			// Check if the format is already def'ed
-			for (auto const cm : cite_formats_) {
+			for (auto const & cm : cite_formats_) {
 				if (!(type & cm.first))
 					continue;
-				if (cm.second.find(etype) != cm.second.end())
-					defined = true;
+				if (cm.second.find(etype) != cm.second.end()) {
+					if (type == cm.first)
+						// defined as default or specific type
+						defined = true;
+					if (cm.first == ENGINE_TYPE_AUTHORYEAR)
+						// defined for author-year
+						aydefined = true;
+					else if (cm.first == ENGINE_TYPE_NUMERICAL)
+						// defined for numerical
+						numdefined = true;
+				}
 			}
 			if (!defined || overwrite){
-				if (type & ENGINE_TYPE_AUTHORYEAR)
+				if (type & ENGINE_TYPE_AUTHORYEAR && (type != ENGINE_TYPE_DEFAULT || !aydefined))
 					cite_formats_[ENGINE_TYPE_AUTHORYEAR][etype] = definition;
-				if (type & ENGINE_TYPE_NUMERICAL)
+				if (type & ENGINE_TYPE_NUMERICAL && (type != ENGINE_TYPE_DEFAULT || !numdefined))
 					cite_formats_[ENGINE_TYPE_NUMERICAL][etype] = definition;
-				if (type & ENGINE_TYPE_DEFAULT)
+				if (type == ENGINE_TYPE_DEFAULT)
 					cite_formats_[ENGINE_TYPE_DEFAULT][etype] = definition;
 			}
 		}
@@ -1927,7 +1949,9 @@ Layout const & DocumentClass::htmlTOCLayout() const
 string const DocumentClass::getCiteFormat(CiteEngineType const & type,
 	string const & entry, bool const punct, string const & fallback) const
 {
-	string default_format = "{%fullnames:author%[[%fullnames:author%, ]][[{%fullnames:editor%[[%fullnames:editor%, ed., ]]}]]}\"%title%\"{%journal%[[, {!<i>!}%journal%{!</i>!}]][[{%publisher%[[, %publisher%]][[{%institution%[[, %institution%]]}]]}]]}{%year%[[ (%year%)]]}{%pages%[[, %pages%]]}";
+	string default_format = "{%fullnames:author%[[%fullnames:author%, ]][[{%fullnames:editor%[[%fullnames:editor%, ed., ]]}]]}"
+				"\"%title%\"{%journal%[[, {!<i>!}%journal%{!</i>!}]][[{%publisher%[[, %publisher%]]"
+				"[[{%institution%[[, %institution%]]}]]}]]}{%year%[[ (%year%)]]}{%pages%[[, %pages%]]}";
 	if (punct)
 		default_format += ".";