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

Store spellchecker_esc_chars as a docstring

Browse Source 
This is a minor optimization to avoid calling from_utf8() repeatedly
on a hot path.
This commit is contained in:
Jean-Marc Lasgouttes 2024-07-21 21:33:01 +02:00
parent 2f7d759108
commit 23379bb1d5
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/LyXRC.cpp
View File

@ -2419,7 +2419,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
case RC_ESC_CHARS: case RC_ESC_CHARS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
spellchecker_esc_chars != system_lyxrc.spellchecker_esc_chars) { spellchecker_esc_chars != system_lyxrc.spellchecker_esc_chars) {
os << "\\escape_chars \"" << spellchecker_esc_chars << "\"\n"; os << "\\escape_chars \"" << to_utf8(spellchecker_esc_chars) << "\"\n";
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;

2
src/LyXRC.h
View File

@ -372,7 +372,7 @@ public:
/// Alternate language for spellchecker /// Alternate language for spellchecker
std::string spellchecker_alt_lang; std::string spellchecker_alt_lang;
/// Escape characters /// Escape characters
std::string spellchecker_esc_chars; docstring spellchecker_esc_chars;
/// Accept compound words in spellchecker? /// Accept compound words in spellchecker?
bool spellchecker_accept_compound = false; bool spellchecker_accept_compound = false;
/// spellcheck continuously? /// spellcheck continuously?

4
src/Paragraph.cpp
View File

@ -4275,8 +4275,8 @@ bool Paragraph::isWordSeparator(pos_type pos, bool const ignore_deleted) const
return false; return false;
char_type const c = d->text_[pos]; char_type const c = d->text_[pos];
// We want to pass the escape chars to the spellchecker // We want to pass the escape chars to the spellchecker
docstring const escape_chars = from_utf8(lyxrc.spellchecker_esc_chars); return !isLetterChar(c) && !isDigitASCII(c)
return !isLetterChar(c) && !isDigitASCII(c) && !contains(escape_chars, c); && !contains(lyxrc.spellchecker_esc_chars, c);
} }

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

@ -1515,7 +1515,7 @@ void PrefSpellchecker::applyRC(LyXRC & rc) const
if (!speller.empty()) if (!speller.empty())
rc.spellchecker = speller; rc.spellchecker = speller;
rc.spellchecker_alt_lang = fromqstr(altLanguageED->text()); rc.spellchecker_alt_lang = fromqstr(altLanguageED->text());
rc.spellchecker_esc_chars = fromqstr(escapeCharactersED->text()); rc.spellchecker_esc_chars = qstring_to_ucs4(escapeCharactersED->text());
rc.spellchecker_accept_compound = compoundWordCB->isChecked(); rc.spellchecker_accept_compound = compoundWordCB->isChecked();
rc.spellcheck_continuously = spellcheckContinuouslyCB->isChecked(); rc.spellcheck_continuously = spellcheckContinuouslyCB->isChecked();
rc.spellcheck_notes = spellcheckNotesCB->isChecked(); rc.spellcheck_notes = spellcheckNotesCB->isChecked();