From 7640d1fbf5c1c775bc3278332c97f504fdbba1ab Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Tue, 18 Jul 2023 17:55:08 +0200 Subject: [PATCH] Remove bogus condition and add comments --- src/frontends/qt/GuiDocument.cpp | 4 ++-- src/frontends/qt/LaTeXHighlighter.cpp | 15 +++++++-------- src/frontends/qt/LaTeXHighlighter.h | 5 +---- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp index 3d717610af..e8c8c19e8a 100644 --- a/src/frontends/qt/GuiDocument.cpp +++ b/src/frontends/qt/GuiDocument.cpp @@ -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])); diff --git a/src/frontends/qt/LaTeXHighlighter.cpp b/src/frontends/qt/LaTeXHighlighter.cpp index c18983baa5..f4ce08fbbe 100644 --- a/src/frontends/qt/LaTeXHighlighter.cpp +++ b/src/frontends/qt/LaTeXHighlighter.cpp @@ -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) { diff --git a/src/frontends/qt/LaTeXHighlighter.h b/src/frontends/qt/LaTeXHighlighter.h index 5f7108b4b4..7a80d1fa26 100644 --- a/src/frontends/qt/LaTeXHighlighter.h +++ b/src/frontends/qt/LaTeXHighlighter.h @@ -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 -- 2.39.5