X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCitation.cpp;h=e1f40eaebf04f7c14cfd377199f837e21bf0abea;hb=59e6610d8ad4d5c5a81d9a6b4ef73ae36231489a;hp=6f238f964d4a592ec6e9629fc780744b2f8e0ef8;hpb=c59375d67915077a2dbf7e8bb29768dc379fb797;p=lyx.git
diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index 6f238f964d..e1f40eaebf 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);
}
@@ -244,8 +258,8 @@ docstring InsetCitation::toolTip(BufferView const & bv, int, int) const
docstring tip;
tip += "
";
int count = 0;
- for (docstring const & key : keys) {
- docstring const key_info = bi.getInfo(key, buffer(), ci);
+ for (docstring const & kvar : keys) {
+ docstring const key_info = bi.getInfo(kvar, buffer(), ci);
// limit to reasonable size.
if (count > 9 && keys.size() > 11) {
tip.push_back(0x2026);// HORIZONTAL ELLIPSIS
@@ -375,9 +389,12 @@ docstring InsetCitation::complexLabel(bool for_xhtml) const
buffer().params().documentClass().addCiteMacro("!textafter", to_utf8(after));
*/
docstring label;
- vector 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 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()
@@ -413,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);
@@ -451,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.
@@ -568,8 +584,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, '(', ')')
@@ -592,8 +611,10 @@ void InsetCitation::latex(otexstream & os, OutputParams const & runparams) const
map pres = getQualifiedLists(getParam("pretextlist"));
map 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) << ']';