]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt/LaTeXHighlighter.cpp
No need (any longer?) to create a new view for lyxfiles-open
[lyx.git] / src / frontends / qt / LaTeXHighlighter.cpp
index 80e7a09cbd8bb66060f7fb850c8a680ce8506f7e..dba92704a353fd406ef6b2792dc223edf03326cb 100644 (file)
@@ -22,6 +22,12 @@ namespace frontend {
 
 LaTeXHighlighter::LaTeXHighlighter(QTextDocument * parent, bool at_letter, bool keyval)
        : QSyntaxHighlighter(parent), at_letter_(at_letter), keyval_(keyval)
+{
+       setupColors();
+}
+
+
+void LaTeXHighlighter::setupColors()
 {
        auto blend = [](QColor color1, QColor color2) {
                int r = 0.5 * (color1.red() + color2.red());
@@ -46,125 +52,38 @@ LaTeXHighlighter::LaTeXHighlighter(QTextDocument * parent, bool at_letter, bool
 
 void LaTeXHighlighter::highlightBlock(QString const & text)
 {
-#if QT_VERSION < 0x060000
-       // keyval
-       if (keyval_) {
-               // Highlight key-val options. Used in some option widgets.
-               static const QRegExp exprKeyvalkey("[^=,]+");
-               static const QRegExp exprKeyvalval("[^,]+");
-               int kvindex = exprKeyvalkey.indexIn(text);
-               while (kvindex >= 0) {
-                       int length = exprKeyvalkey.matchedLength();
-                       setFormat(kvindex, length, keyFormat);
-                       int kvvindex = exprKeyvalval.indexIn(text, kvindex + length);
-                       if (kvvindex > 0) {
-                               length += exprKeyvalval.matchedLength();
-                               setFormat(kvvindex, length, valFormat);
-                       }
-                       kvindex = exprKeyvalkey.indexIn(text, kvindex + length);
-               }
-       }
-       // $ $
-       static const QRegExp exprMath("\\$[^\\$]*\\$");
-       int index = exprMath.indexIn(text);
-       while (index >= 0) {
-               int length = exprMath.matchedLength();
-               setFormat(index, length, mathFormat);
-               index = exprMath.indexIn(text, index + length);
-       }
-       // [ ]
-       static const QRegExp exprStartDispMath("(\\\\\\[|"
-               "\\\\begin\\{equation\\**\\}|"
-               "\\\\begin\\{eqnarray\\**\\}|"
-               "\\\\begin\\{align(ed|at)*\\**\\}|"
-               "\\\\begin\\{flalign\\**\\}|"
-               "\\\\begin\\{gather\\**\\}|"
-               "\\\\begin\\{multline\\**\\}|"
-               "\\\\begin\\{array\\**\\}|"
-               "\\\\begin\\{cases\\**\\}"
-               ")");
-       static const QRegExp exprEndDispMath("(\\\\\\]|"
-               "\\\\end\\{equation\\**\\}|"
-               "\\\\end\\{eqnarray\\**\\}|"
-               "\\\\end\\{align(ed|at)*\\**\\}|"
-               "\\\\end\\{flalign\\**\\}|"
-               "\\\\end\\{gather\\**\\}|"
-               "\\\\end\\{multline\\**\\}|"
-               "\\\\end\\{array\\**\\}|"
-               "\\\\end\\{cases\\**\\}"
-               ")");
-       int startIndex = 0;
-       // if previous block was in 'disp math'
-       // start search from 0 (for end disp math)
-       // otherwise, start search from 'begin disp math'
-       if (previousBlockState() != 1)
-               startIndex = exprStartDispMath.indexIn(text);
-       while (startIndex >= 0) {
-               int endIndex = exprEndDispMath.indexIn(text, startIndex);
-               int length;
-               if (endIndex == -1) {
-                       setCurrentBlockState(1);
-                       length = text.length() - startIndex;
-               } else {
-                       length = endIndex - startIndex + exprEndDispMath.matchedLength();
-               }
-               setFormat(startIndex, length, mathFormat);
-               startIndex = exprStartDispMath.indexIn(text, startIndex + length);
-       }
-       // \whatever
-       static const QRegExp exprKeywordAtOther("\\\\[A-Za-z]+");
-       // \wh@tever
-       static const QRegExp exprKeywordAtLetter("\\\\[A-Za-z@]+");
-       QRegExp const & exprKeyword = at_letter_ ? exprKeywordAtLetter
-                                                : exprKeywordAtOther;
-       index = exprKeyword.indexIn(text);
-       while (index >= 0) {
-               int length = exprKeyword.matchedLength();
-               setFormat(index, length, keywordFormat);
-               index = exprKeyword.indexIn(text, index + length);
-       }
-       // %comment
-       // Treat a line as a comment starting at a percent sign
-       // * that is the first character in a line
-       // * that is preceded by
-       // ** an even number of backslashes
-       // ** any character other than a backslash
-       QRegExp exprComment("(?:^|[^\\\\])(?:\\\\\\\\)*(%).*$");
-       exprComment.indexIn(text);
-       index = exprComment.pos(1);
-       while (index >= 0) {
-               int const length = exprComment.matchedLength()
-                                - (index - exprComment.pos(0));
-               setFormat(index, length, commentFormat);
-               exprComment.indexIn(text, index + length);
-               index = exprComment.pos(1);
-       }
-       // <LyX Warning: ...>
-       QString lyxwarn = qt_("LyX Warning: ");
-       QRegExp exprWarning("<" + lyxwarn + "[^<]*>");
-       index = exprWarning.indexIn(text);
-       while (index >= 0) {
-               int length = exprWarning.matchedLength();
-               setFormat(index, length, warningFormat);
-               index = exprWarning.indexIn(text, index + length);
-       }
-#else
        // keyval
        if (keyval_) {
                // Highlight key-val options. Used in some option widgets.
-               static const QRegularExpression exprKeyvalkey("[^=,]+");
-               static const QRegularExpression exprKeyvalval("[^,]+");
+               // 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("[^,]+");
                QRegularExpressionMatch matchkey = exprKeyvalkey.match(text);
                int kvindex = matchkey.capturedStart(0);
                while (kvindex >= 0) {
                        int length = matchkey.capturedLength(0);
                        setFormat(kvindex, length, keyFormat);
-                       QRegularExpressionMatch matchval =
-                               exprKeyvalval.match(text, kvindex + length);
-                       int kvvindex = matchval.capturedStart(0);
-                       if (kvvindex > 0) {
-                               length += matchval.capturedLength(0);
-                               setFormat(kvvindex, length, valFormat);
+                       if (text.size() > kvindex + length && text.at(kvindex + length) == '=') {
+                               QRegularExpressionMatch matchgval =
+                                       exprKeyvalgval.match(text, kvindex + length);
+                               int kvvindex = matchgval.capturedStart(0);
+                               if (kvvindex > 0) {
+                                       int vlength = matchgval.capturedLength(0);
+                                       length += vlength;
+                                       setFormat(kvvindex, vlength, valFormat);
+                               } else {
+                                       QRegularExpressionMatch matchval =
+                                               exprKeyvalval.match(text, kvindex + length);
+                                       kvvindex = matchval.capturedStart(0);
+                                       if (kvvindex > 0) {
+                                               int vlength = matchval.capturedLength(0);
+                                               length += vlength;
+                                               setFormat(kvvindex, vlength, valFormat);
+                                       }
+                               }
                        }
                        matchkey = exprKeyvalkey.match(text, kvindex + length);
                        kvindex = matchkey.capturedStart(0);
@@ -264,7 +183,6 @@ void LaTeXHighlighter::highlightBlock(QString const & text)
                match = exprWarning.match(text, index + length);
                index = match.capturedStart(0);
        }
-#endif
 }
 
 } // namespace frontend