namespace lyx {
-ParamInfo InsetCitation::param_info_;
-
-
InsetCitation::InsetCitation(Buffer * buf, InsetCommandParams const & p)
: InsetCommand(buf, 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_;
}
cmd = FuncRequest(LFUN_INSET_MODIFY, "changetype " + newcmdname);
}
}
+ // fall through
default:
InsetCommand::doDispatch(cur, cmd);
}
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()
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);
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.
// 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") {
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) {
- if (contains(before, '(') || contains(before, ')'))
- // protect parens
- before = '{' + before + '}';
- if (contains(after, '(') || contains(after, ')'))
- // protect parens
- after = '{' + after + '}';
- os << '(' << before << ")(" << after << ')';
- } else
- os << '[' << before << "][" << after << ']';
+ if (qualified)
+ os << '(' << protectArgument(before, '(', ')')
+ << ")(" << protectArgument(after, '(', ')') << ')';
+ else
+ os << '[' << protectArgument(before) << "]["
+ << protectArgument(after) << ']';
} else if (!after.empty() && cs.textAfter) {
- if (qualified) {
- if (contains(after, '(') || contains(after, ')'))
- // protect parens
- after = '{' + after + '}';
- os << '(' << after << ')';
- } else
- os << '[' << after << ']';
+ if (qualified)
+ os << '(' << protectArgument(after, '(', ')') << ')';
+ else
+ os << '[' << protectArgument(after) << ']';
}
if (!bi.isBibtex(key))
map<docstring, docstring> pres = getQualifiedLists(getParam("pretextlist"));
map<docstring, docstring> posts = getQualifiedLists(getParam("posttextlist"));
for (docstring const & k: keys) {
- docstring const bef = pres[k];
- docstring const 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 << '[' << bef << "][" << aft << ']';
+ os << '[' << protectArgument(bef)
+ << "][" << protectArgument(aft) << ']';
else if (!aft.empty())
- os << '[' << aft << ']';
+ os << '[' << protectArgument(aft) << ']';
os << '{' << k << '}';
}
} else
projects / lyx.git / blobdiff