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

Formalia

Browse Source
This commit is contained in:
Juergen Spitzmueller 2019-04-19 09:03:47 +02:00
parent d228ce5613
commit 5e385d0513
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/TextClass.cpp
View File

@ -1168,7 +1168,7 @@ bool TextClass::readCiteEngine(Lexer & lexrc, ReadType rt, bool const add)
cite_command_aliases_[s] = lyx_cmd; cite_command_aliases_[s] = lyx_cmd;
} }
vector<string> const stardescs = getVectorFromString(stardesc, "!"); vector<string> const stardescs = getVectorFromString(stardesc, "!");
int size = stardesc.size(); int size = int(stardesc.size());
if (size > 0) if (size > 0)
cs.stardesc = stardescs[0]; cs.stardesc = stardescs[0];
if (size > 1) if (size > 1)
@ -1205,14 +1205,14 @@ bool TextClass::readCiteEngine(Lexer & lexrc, ReadType rt, bool const add)
// Add the styles from AddToCiteEngine to the class' styles // Add the styles from AddToCiteEngine to the class' styles
// (but only if they are not yet defined) // (but only if they are not yet defined)
for (auto const cis : class_cite_styles_) { for (auto const & cis : class_cite_styles_) {
// Only consider the current CiteEngineType // Only consider the current CiteEngineType
if (!(type & cis.first)) if (!(type & cis.first))
continue; continue;
for (auto const ciss : cis.second) { for (auto const & ciss : cis.second) {
bool defined = false; bool defined = false;
// Check if the style "name" is already def'ed // Check if the style "name" is already def'ed
for (auto const av : getCiteStyles(cis.first)) for (auto const & av : getCiteStyles(cis.first))
if (av.name == ciss.name) if (av.name == ciss.name)
defined = true; defined = true;
if (!defined) { if (!defined) {
@ -1281,7 +1281,7 @@ bool TextClass::readCiteFormat(Lexer & lexrc, ReadType rt)
if (initchar == '!' || initchar == '_' || prefixIs(etype, "B_")) { if (initchar == '!' || initchar == '_' || prefixIs(etype, "B_")) {
bool defined = false; bool defined = false;
// Check if the macro is already def'ed // Check if the macro is already def'ed
for (auto const cm : cite_macros_) { for (auto const & cm : cite_macros_) {
if (!(type & cm.first)) if (!(type & cm.first))
continue; continue;
if (cm.second.find(etype) != cm.second.end()) if (cm.second.find(etype) != cm.second.end())
@ -1298,7 +1298,7 @@ bool TextClass::readCiteFormat(Lexer & lexrc, ReadType rt)
} else { } else {
bool defined = false; bool defined = false;
// Check if the format is already def'ed // Check if the format is already def'ed
for (auto const cm : cite_formats_) { for (auto const & cm : cite_formats_) {
if (!(type & cm.first)) if (!(type & cm.first))
continue; continue;
if (cm.second.find(etype) != cm.second.end()) if (cm.second.find(etype) != cm.second.end())