X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCitation.cpp;h=24441268984d2525395e8a913f08ab108faad25c;hb=22e6659780390a19174d1bf896317a5baf9e40d7;hp=40b8c1d3ce080c9132c13c23248f0de0dfc77e3a;hpb=fd8b4aebb0ee6404a4532abb9934886b19edd108;p=lyx.git

diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index 40b8c1d3ce..2444126898 100644
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -42,9 +42,6 @@ using namespace lyx::support;
 
 namespace lyx {
 
-ParamInfo InsetCitation::param_info_;
-
-
 InsetCitation::InsetCitation(Buffer * buf, InsetCommandParams const & p)
 	: InsetCommand(buf, p)
 {
@@ -55,22 +52,38 @@ InsetCitation::InsetCitation(Buffer * buf, InsetCommandParams const & p)
 InsetCitation::~InsetCitation()
 {
 	if (isBufferLoaded())
-		buffer().removeBiblioTempFiles();
+		/* We do not use buffer() because Coverity believes that this
+		 * may throw an exception. Actually this code path is not
+		 * taken when buffer_ == 0 */
+		buffer_->removeBiblioTempFiles();
 }
 
 
+// May well be over-ridden when session settings are loaded
+// in GuiCitation. Unfortunately, that will not happen until
+// such a dialog is created.
+bool InsetCitation::last_literal = true;
+
+
 ParamInfo const & InsetCitation::findInfo(string const & /* cmdName */)
 {
+	static ParamInfo param_info_;
+
 	// standard cite does only take one argument, but biblatex, jurabib
 	// and natbib extend this to two arguments, so
 	// we have to allow both here. InsetCitation takes care that
 	// LaTeX output is nevertheless correct.
 	if (param_info_.empty()) {
-		param_info_.add("after", ParamInfo::LATEX_OPTIONAL);
-		param_info_.add("before", ParamInfo::LATEX_OPTIONAL);
+		param_info_.add("after", ParamInfo::LATEX_OPTIONAL,
+				ParamInfo::HANDLING_LATEXIFY);
+		param_info_.add("before", ParamInfo::LATEX_OPTIONAL,
+				ParamInfo::HANDLING_LATEXIFY);
 		param_info_.add("key", ParamInfo::LATEX_REQUIRED);
-		param_info_.add("pretextlist", ParamInfo::LATEX_OPTIONAL);
-		param_info_.add("posttextlist", ParamInfo::LATEX_OPTIONAL);
+		param_info_.add("pretextlist", ParamInfo::LATEX_OPTIONAL,
+				ParamInfo::HANDLING_LATEXIFY);
+		param_info_.add("posttextlist", ParamInfo::LATEX_OPTIONAL,
+				ParamInfo::HANDLING_LATEXIFY);
+		param_info_.add("literal", ParamInfo::LYX_INTERNAL);
 	}
 	return param_info_;
 }
@@ -144,6 +157,7 @@ void InsetCitation::doDispatch(Cursor & cur, FuncRequest & cmd)
 			cmd = FuncRequest(LFUN_INSET_MODIFY, "changetype " + newcmdname);
 		}
 	}
+		// fall through
 	default:
 		InsetCommand::doDispatch(cur, cmd);
 	}
@@ -312,15 +326,6 @@ inline docstring wrapCitation(docstring const & key,
 			html::htmlize(content, XHTMLStream::ESCAPE_ALL) + "</a>";
 }
 
-docstring protectArgument(docstring & arg, char const l = '[',
-			  char const r = ']')
-{
-	if (contains(arg, l) || contains(arg, r))
-		// protect brackets
-		arg = '{' + arg + '}';
-	return arg;
-}
-
 } // anonymous namespace
 
 
@@ -384,9 +389,12 @@ docstring InsetCitation::complexLabel(bool for_xhtml) const
 	buffer().params().documentClass().addCiteMacro("!textafter", to_utf8(after));
 	*/
 	docstring label;
-	vector<docstring> keys = getVectorFromString(key);
+	// we only really want the last 'false', to suppress trimming, but
+	// we need to give the other defaults, too, to set it.
+	vector<docstring> keys =
+		getVectorFromString(key, from_ascii(","), false, false);
 	CitationStyle cs = getCitationStyle(buffer().masterParams(),
-					    cite_type, buffer().masterParams().citeStyles());
+			cite_type, buffer().masterParams().citeStyles());
 	bool const qualified = cs.hasQualifiedList
 		&& (keys.size() > 1
 		    || !getParam("pretextlist").empty()
@@ -422,8 +430,7 @@ docstring InsetCitation::basicLabel(bool for_xhtml) const
 	do {
 		// if there is no comma, then everything goes into key
 		// and keys will be empty.
-		keys = trim(split(keys, key, ','));
-		key = trim(key);
+		keys = split(keys, key, ',');
 		if (!label.empty())
 			label += ", ";
 		label += wrapCitation(key, key, for_xhtml);
@@ -460,7 +467,7 @@ void InsetCitation::addToToc(DocIterator const & cpit, bool output_active,
 							 UpdateType, TocBackend & backend) const
 {
 	// NOTE
-	// BiblioInfo::collectCitedEntries() uses the TOC to collect the citations 
+	// BiblioInfo::collectCitedEntries() uses the TOC to collect the citations
 	// from the document. It is used indirectly, via BiblioInfo::makeCitationLables,
 	// by both XHTML and plaintext output. So, if we change what goes into the TOC,
 	// then we will also need to change that routine.
@@ -545,7 +552,10 @@ void InsetCitation::forOutliner(docstring & os, size_t const, bool const) const
 // engine, e.g. \cite[]{} for the basic engine.
 void InsetCitation::latex(otexstream & os, OutputParams const & runparams) const
 {
-	BiblioInfo const & bi = buffer().masterBibInfo();
+	// When this is a child compiled on its own, we use the childs
+	// own bibinfo, else the master's
+	BiblioInfo const & bi = runparams.is_child
+			? buffer().masterBibInfo() : buffer().bibInfo();
 	docstring const key = getParam("key");
 	// "keyonly" command: output the plain key and stop.
 	if (getCmdName() == "keyonly") {
@@ -577,8 +587,11 @@ void InsetCitation::latex(otexstream & os, OutputParams const & runparams) const
 	if (qualified)
 		os << "s";
 
-	docstring before = getParam("before");
-	docstring after  = getParam("after");
+	ParamInfo const & pinfo = findInfo(string());
+	docstring before = params().prepareCommand(runparams, getParam("before"),
+						   pinfo["before"].handling());
+	docstring after = params().prepareCommand(runparams, getParam("after"),
+						   pinfo["after"].handling());
 	if (!before.empty() && cs.textBefore) {
 		if (qualified)
 			os << '(' << protectArgument(before, '(', ')')
@@ -601,8 +614,10 @@ void InsetCitation::latex(otexstream & os, OutputParams const & runparams) const
 			map<docstring, docstring> pres = getQualifiedLists(getParam("pretextlist"));
 			map<docstring, docstring> posts = getQualifiedLists(getParam("posttextlist"));
 			for (docstring const & k: keys) {
-				docstring bef = pres[k];
-				docstring aft  = posts[k];
+				docstring bef = params().prepareCommand(runparams, pres[k],
+				                   pinfo["pretextlist"].handling());
+				docstring aft = params().prepareCommand(runparams, posts[k],
+				                   pinfo["posttextlist"].handling());
 				if (!bef.empty())
 					os << '[' << protectArgument(bef)
 					   << "][" << protectArgument(aft) << ']';