X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCitation.cpp;h=564ea5bb9a5e75b1b72516c4a2aa22bd2a8b5916;hb=cc3e227cba3571bb8c383cd41348b932e3104df3;hp=fe752246f53460ba85c554d9113ff5db0a93c3fa;hpb=ba39d2de04ebe3754f944692a454b91eef4e6177;p=lyx.git
diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index fe752246f5..564ea5bb9a 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,15 +52,23 @@ InsetCitation::InsetCitation(Buffer * buf, InsetCommandParams const & p)
InsetCitation::~InsetCitation()
{
if (isBufferLoaded())
- /* Coverity believes that this may throw an exception, but
- * actually this code path is not taken when buffer_ == 0 */
- // coverity[fun_call_w_exception]
- 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
@@ -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);
}
@@ -253,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
@@ -324,15 +329,17 @@ inline docstring wrapCitation(docstring const & key,
} // anonymous namespace
-map InsetCitation::getQualifiedLists(docstring const p) const
+vector> InsetCitation::getQualifiedLists(docstring const p) const
{
vector ps =
getVectorFromString(p, from_ascii("\t"));
- std::map res;
+ QualifiedList res;
for (docstring const & s: ps) {
- docstring key;
- docstring val = split(s, key, ' ');
- res[key] = val;
+ docstring key = s;
+ docstring val;
+ if (contains(s, ' '))
+ val = split(s, key, ' ');
+ res.push_back(make_pair(key, val));
}
return res;
}
@@ -384,15 +391,18 @@ 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()
|| !getParam("posttextlist").empty());
- map pres = getQualifiedLists(getParam("pretextlist"));
- map posts = getQualifiedLists(getParam("posttextlist"));
+ QualifiedList pres = getQualifiedLists(getParam("pretextlist"));
+ QualifiedList posts = getQualifiedLists(getParam("posttextlist"));
CiteItem ci;
ci.textBefore = getParam("before");
@@ -422,8 +432,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);
@@ -436,6 +445,18 @@ docstring InsetCitation::basicLabel(bool for_xhtml) const
return '[' + label + ']';
}
+
+bool InsetCitation::forceLTR(OutputParams const & rp) const
+{
+ // We have to force LTR for numeric references
+ // [= bibliography, plain BibTeX, numeric natbib
+ // and biblatex]. Except for XeTeX/bidi. See #3005.
+ if (rp.useBidiPackage())
+ return false;
+ return (buffer().masterParams().citeEngine() == "basic"
+ || buffer().masterParams().citeEngineType() == ENGINE_TYPE_NUMERICAL);
+}
+
docstring InsetCitation::screenLabel() const
{
return cache.screen_label;
@@ -451,8 +472,8 @@ void InsetCitation::updateBuffer(ParIterator const &, UpdateType)
cache.recalculate = false;
cache.generated_label = glabel;
unsigned int const maxLabelChars = 45;
- cache.screen_label = glabel.substr(0, maxLabelChars + 1);
- support::truncateWithEllipsis(cache.screen_label, maxLabelChars);
+ cache.screen_label = glabel;
+ support::truncateWithEllipsis(cache.screen_label, maxLabelChars, true);
}
@@ -460,7 +481,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 +566,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,10 +601,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, '(', ')')
@@ -600,13 +625,31 @@ void InsetCitation::latex(otexstream & os, OutputParams const & runparams) const
os << '{' << escape(cleanupWhitespace(key)) << '}';
else {
if (qualified) {
- map pres = getQualifiedLists(getParam("pretextlist"));
- map 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());
+ QualifiedList pres = getQualifiedLists(getParam("pretextlist"));
+ QualifiedList posts = getQualifiedLists(getParam("posttextlist"));
+ for (docstring const & k : keys) {
+ docstring prenote;
+ QualifiedList::iterator it = pres.begin();
+ for (; it != pres.end() ; ++it) {
+ if ((*it).first == k) {
+ prenote = (*it).second;
+ pres.erase(it);
+ break;
+ }
+ }
+ docstring bef = params().prepareCommand(runparams, prenote,
+ pinfo["pretextlist"].handling());
+ docstring postnote;
+ QualifiedList::iterator pit = posts.begin();
+ for (; pit != posts.end() ; ++pit) {
+ if ((*pit).first == k) {
+ postnote = (*pit).second;
+ posts.erase(pit);
+ break;
+ }
+ }
+ docstring aft = params().prepareCommand(runparams, postnote,
+ pinfo["posttextlist"].handling());
if (!bef.empty())
os << '[' << protectArgument(bef)
<< "][" << protectArgument(aft) << ']';