X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCitation.cpp;h=ba45f691a37cbe0cef69fdab1313ca90e6e2c02a;hb=d6a93143ec2146210d79f58cac42f9608da86100;hp=167fc241d299cbeec1f9726630dc7e97e2e1c508;hpb=fab87917eab29ee0ac97808cc1f2292989a5156a;p=lyx.git

diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index 167fc241d2..ba45f691a3 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)
 {
@@ -62,8 +59,16 @@ InsetCitation::~InsetCitation()
 }
 
 
+// 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
@@ -152,7 +157,7 @@ void InsetCitation::doDispatch(Cursor & cur, FuncRequest & cmd)
 			cmd = FuncRequest(LFUN_INSET_MODIFY, "changetype " + newcmdname);
 		}
 	}
-		// fall through
+	// fall through
 	default:
 		InsetCommand::doDispatch(cur, cmd);
 	}
@@ -547,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") {
@@ -579,10 +587,11 @@ void InsetCitation::latex(otexstream & os, OutputParams const & runparams) const
 	if (qualified)
 		os << "s";
 
+	ParamInfo const & pinfo = findInfo(string());
 	docstring before = params().prepareCommand(runparams, getParam("before"),
-						   param_info_["before"].handling());
+						   pinfo["before"].handling());
 	docstring after = params().prepareCommand(runparams, getParam("after"),
-						   param_info_["after"].handling());
+						   pinfo["after"].handling());
 	if (!before.empty() && cs.textBefore) {
 		if (qualified)
 			os << '(' << protectArgument(before, '(', ')')
@@ -606,9 +615,9 @@ void InsetCitation::latex(otexstream & os, OutputParams const & runparams) const
 			map<docstring, docstring> posts = getQualifiedLists(getParam("posttextlist"));
 			for (docstring const & k: keys) {
 				docstring bef = params().prepareCommand(runparams, pres[k],
-									param_info_["pretextlist"].handling());
-				docstring aft  = params().prepareCommand(runparams, posts[k],
-									 param_info_["posttextlist"].handling());
+				                   pinfo["pretextlist"].handling());
+				docstring aft = params().prepareCommand(runparams, posts[k],
+				                   pinfo["posttextlist"].handling());
 				if (!bef.empty())
 					os << '[' << protectArgument(bef)
 					   << "][" << protectArgument(aft) << ']';