anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename function

Browse Source
This commit is contained in:
Juergen Spitzmueller 2024-07-14 09:42:36 +02:00
parent 25dd2e29b7
commit 55d60ee24f
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BiblioInfo.cpp
View File

@ -1603,7 +1603,7 @@ BiblioInfo::CiteStringMap const BiblioInfo::getCiteStrings(
vector<CitationStyle> realStyles;
for (size_t i = 0; i != styles.size(); ++i) {
// exclude variants that are not supported in the current style
if (buf.masterParams().isActiveBiblatexCiteStyle(styles[i]))
if (buf.masterParams().isActiveCiteStyle(styles[i]))
realStyles.push_back(styles[i]);
}

4
src/BufferParams.cpp
View File

@ -3759,7 +3759,7 @@ string BufferParams::getCiteAlias(string const & s) const
vector<CitationStyle> const styles = citeStyles();
for (size_t i = 0; i != styles.size(); ++i) {
// only include variants that are supported in the current style
if (styles[i].name == s && isActiveBiblatexCiteStyle(styles[i])) {
if (styles[i].name == s && isActiveCiteStyle(styles[i])) {
realcmd = true;
break;
}
@ -3796,7 +3796,7 @@ vector<CitationStyle> BufferParams::citeStyles() const
}
bool BufferParams::isActiveBiblatexCiteStyle(CitationStyle const & cs) const
bool BufferParams::isActiveCiteStyle(CitationStyle const & cs) const
{
if (!useBiblatex())
// outside biblatex, all cite styles are active

4
src/BufferParams.h
View File

@ -527,8 +527,8 @@ public:
std::vector<std::string> citeCommands() const;
/// the available citation styles
std::vector<CitationStyle> citeStyles() const;
/// is the biblatex citestyle active in the current context?
bool isActiveBiblatexCiteStyle(CitationStyle const & cs) const;
/// is the citestyle active in the current context?
bool isActiveCiteStyle(CitationStyle const & cs) const;
/// Return the actual bibtex command (lyxrc or buffer param)
std::string const bibtexCommand(bool const warn = false) const;

2
src/frontends/qt/GuiCitation.cpp
View File

@ -945,7 +945,7 @@ bool GuiCitation::initialiseParams(string const & sdata)
vector<CitationStyle> const styles = documentBuffer().params().citeStyles();
for (size_t i = 0; i != styles.size(); ++i) {
// only include variants that are supported in the current style
if (documentBuffer().params().isActiveBiblatexCiteStyle(styles[i])) {
if (documentBuffer().params().isActiveCiteStyle(styles[i])) {
citeStyles_.push_back(styles[i]);
citeCmds_.push_back(cmds[i]);
}

2
src/frontends/qt/Menus.cpp
View File

@ -1750,7 +1750,7 @@ void MenuDefinition::expandCiteStyles(BufferView const * bv)
docstring label = cit->second;
CitationStyle ccs = citeStyleList[ii - 1];
// exclude variants that are not supported in the current style
while (!bp.isActiveBiblatexCiteStyle(ccs)) {
while (!bp.isActiveCiteStyle(ccs)) {
++ii;
ccs = citeStyleList[ii - 1];
}

2
src/insets/InsetCitation.cpp
View File

@ -381,7 +381,7 @@ CitationStyle asValidLatexCommand(BufferParams const & bp, string const & input,
CitationStyle this_cs = *it;
if (this_cs.name == normalized_input) {
// exclude variants that are not supported in the current style
if (!bp.isActiveBiblatexCiteStyle(this_cs)) {
if (!bp.isActiveCiteStyle(this_cs)) {
// citation not supported with current style
// reset to \cite
normalized_input = "cite";