From 55d60ee24f44d30627ceae7971206edb74202e29 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 14 Jul 2024 09:42:36 +0200 Subject: [PATCH] Rename function --- src/BiblioInfo.cpp | 2 +- src/BufferParams.cpp | 4 ++-- src/BufferParams.h | 4 ++-- src/frontends/qt/GuiCitation.cpp | 2 +- src/frontends/qt/Menus.cpp | 2 +- src/insets/InsetCitation.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp index 1292ef3303..d70de5d169 100644 --- a/src/BiblioInfo.cpp +++ b/src/BiblioInfo.cpp @@ -1603,7 +1603,7 @@ BiblioInfo::CiteStringMap const BiblioInfo::getCiteStrings( vector 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]); } diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index aa538e6d61..a5215f6fc8 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -3759,7 +3759,7 @@ string BufferParams::getCiteAlias(string const & s) const vector 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 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 diff --git a/src/BufferParams.h b/src/BufferParams.h index 2178d65677..9bfd16d492 100644 --- a/src/BufferParams.h +++ b/src/BufferParams.h @@ -527,8 +527,8 @@ public: std::vector citeCommands() const; /// the available citation styles std::vector 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; diff --git a/src/frontends/qt/GuiCitation.cpp b/src/frontends/qt/GuiCitation.cpp index ea10d171e4..e9f9ec9937 100644 --- a/src/frontends/qt/GuiCitation.cpp +++ b/src/frontends/qt/GuiCitation.cpp @@ -945,7 +945,7 @@ bool GuiCitation::initialiseParams(string const & sdata) vector 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]); } diff --git a/src/frontends/qt/Menus.cpp b/src/frontends/qt/Menus.cpp index 30575bb2eb..abd625509c 100644 --- a/src/frontends/qt/Menus.cpp +++ b/src/frontends/qt/Menus.cpp @@ -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]; } diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp index bf5f3526e5..87130462e0 100644 --- a/src/insets/InsetCitation.cpp +++ b/src/insets/InsetCitation.cpp @@ -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"; -- 2.39.5