anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove bogus condition and add comments

Browse Source
This commit is contained in:
Juergen Spitzmueller 2023-07-18 17:55:08 +02:00
parent eadc8ab147
commit 7640d1fbf5
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt/GuiDocument.cpp
View File

@ -1774,8 +1774,8 @@ GuiDocument::GuiDocument(GuiView & lv)
pdfSupportModule->subjectLE));
pdfSupportModule->keywordsLE->setValidator(new NoNewLineValidator(
pdfSupportModule->keywordsLE));
(void) new LaTeXHighlighter(pdfSupportModule->optionsTE->document(), true, true, true);
(void) new LaTeXHighlighter(pdfSupportModule->metadataTE->document(), true, true, true);
(void) new LaTeXHighlighter(pdfSupportModule->optionsTE->document(), true, true);
(void) new LaTeXHighlighter(pdfSupportModule->metadataTE->document(), true, true);
for (int i = 0; backref_opts[i][0]; ++i)
pdfSupportModule->backrefCO->addItem(qt_(backref_opts_gui[i]));

15
src/frontends/qt/LaTeXHighlighter.cpp
View File

@ -20,8 +20,8 @@ namespace lyx {
namespace frontend {
LaTeXHighlighter::LaTeXHighlighter(QTextDocument * parent, bool at_letter, bool keyval, bool optsnippet)
: QSyntaxHighlighter(parent), at_letter_(at_letter), keyval_(keyval), optsnippet_(optsnippet)
LaTeXHighlighter::LaTeXHighlighter(QTextDocument * parent, bool at_letter, bool keyval)
: QSyntaxHighlighter(parent), at_letter_(at_letter), keyval_(keyval)
{
auto blend = [](QColor color1, QColor color2) {
int r = 0.5 * (color1.red() + color2.red());
@ -49,13 +49,12 @@ void LaTeXHighlighter::highlightBlock(QString const & text)
// keyval
if (keyval_) {
// Highlight key-val options. Used in some option widgets.
static QRegularExpression exprKeyvalkey("[^=,]+");
static QRegularExpression exprKeyvalgval("[^,]+{[^}]+}");
// 1. The keys. Might or might not have values
static QRegularExpression exprKeyvalkey("[^=,{]+");
// 2. These are grouped values such as "key1={val,val},key2=val"
static QRegularExpression exprKeyvalgval("[^=,{]+{[^}]+}");
// 3. And normal values if we don't find grouped ones
static QRegularExpression exprKeyvalval("[^,]+");
if (optsnippet_) {
static QRegularExpression exprKeyvalkey("^=,+");
static QRegularExpression exprKeyvalval("^,+");
}
QRegularExpressionMatch matchkey = exprKeyvalkey.match(text);
int kvindex = matchkey.capturedStart(0);
while (kvindex >= 0) {

5
src/frontends/qt/LaTeXHighlighter.h
View File

@ -27,8 +27,7 @@ class LaTeXHighlighter : public QSyntaxHighlighter
public:
explicit LaTeXHighlighter(QTextDocument * parent,
bool at_letter = false,
bool keyval = false,
bool optsnippet = false);
bool keyval = false);
protected:
void highlightBlock(QString const & text) override;
@ -44,8 +43,6 @@ private:
bool const at_letter_;
// highlight keyval options?
bool const keyval_;
// option snippet?
bool const optsnippet_;
};
} // namespace frontend