namespace frontend {
-LaTeXHighlighter::LaTeXHighlighter(QTextDocument * parent, bool at_letter)
- : QSyntaxHighlighter(parent), at_letter_(at_letter)
+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());
mathFormat.setForeground(blend(Qt::red, text_color));
warningFormat.setForeground(Qt::red);
warningFormat.setFontWeight(QFont::Bold);
+ keyFormat.setForeground(blend(Qt::darkRed, text_color));
+ keyFormat.setFontWeight(QFont::Bold);
+ valFormat.setForeground(blend(Qt::darkGreen, text_color));
}
void LaTeXHighlighter::highlightBlock(QString const & text)
{
+ // keyval
+ if (keyval_) {
+ // Highlight key-val options. Used in some option widgets.
+ // 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);
+ 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);
+ }
+ }
// $ $
- static const QRegExp exprMath("\\$[^\\$]*\\$");
- int index = exprMath.indexIn(text);
+ static const QRegularExpression exprMath("\\$[^\\$]*\\$");
+ QRegularExpressionMatch match = exprMath.match(text);
+ int index = match.capturedStart(0);
while (index >= 0) {
- int length = exprMath.matchedLength();
+ int length = match.capturedLength(0);
setFormat(index, length, mathFormat);
- index = exprMath.indexIn(text, index + length);
+ match = exprMath.match(text, index + length);
+ index = match.capturedStart(0);
}
// [ ]
- static const QRegExp exprStartDispMath("(\\\\\\[|"
+ static const QRegularExpression exprStartDispMath("(\\\\\\[|"
"\\\\begin\\{equation\\**\\}|"
"\\\\begin\\{eqnarray\\**\\}|"
"\\\\begin\\{align(ed|at)*\\**\\}|"
"\\\\begin\\{array\\**\\}|"
"\\\\begin\\{cases\\**\\}"
")");
- static const QRegExp exprEndDispMath("(\\\\\\]|"
+ static const QRegularExpression exprEndDispMath("(\\\\\\]|"
"\\\\end\\{equation\\**\\}|"
"\\\\end\\{eqnarray\\**\\}|"
"\\\\end\\{align(ed|at)*\\**\\}|"
// 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);
+ if (previousBlockState() != 1) {
+ match = exprStartDispMath.match(text);
+ startIndex = match.capturedStart(0);
+ }
while (startIndex >= 0) {
- int endIndex = exprEndDispMath.indexIn(text, startIndex);
+ match = exprEndDispMath.match(text, startIndex);
+ int endIndex = match.capturedStart(0);
int length;
if (endIndex == -1) {
setCurrentBlockState(1);
length = text.length() - startIndex;
} else {
- length = endIndex - startIndex + exprEndDispMath.matchedLength();
+ length = endIndex - startIndex + match.capturedLength(0);
}
setFormat(startIndex, length, mathFormat);
- startIndex = exprStartDispMath.indexIn(text, startIndex + length);
+ match = exprStartDispMath.match(text, startIndex + length);
+ startIndex = match.capturedStart(0);
}
// \whatever
- static const QRegExp exprKeywordAtOther("\\\\[A-Za-z]+");
+ static const QRegularExpression exprKeywordAtOther("\\\\[A-Za-z]+");
// \wh@tever
- static const QRegExp exprKeywordAtLetter("\\\\[A-Za-z@]+");
- QRegExp const & exprKeyword = at_letter_ ? exprKeywordAtLetter
- : exprKeywordAtOther;
- index = exprKeyword.indexIn(text);
+ static const QRegularExpression exprKeywordAtLetter("\\\\[A-Za-z@]+");
+ QRegularExpression const & exprKeyword = at_letter_
+ ? exprKeywordAtLetter : exprKeywordAtOther;
+ match = exprKeyword.match(text);
+ index = match.capturedStart(0);
while (index >= 0) {
- int length = exprKeyword.matchedLength();
+ int length = match.capturedLength(0);
setFormat(index, length, keywordFormat);
- index = exprKeyword.indexIn(text, index + length);
+ match = exprKeyword.match(text, index + length);
+ index = match.capturedStart(0);
}
// %comment
// Treat a line as a comment starting at a percent sign
// * that is preceded by
// ** an even number of backslashes
// ** any character other than a backslash
- QRegExp exprComment("(?:^|[^\\\\])(?:\\\\\\\\)*(%).*$");
- exprComment.indexIn(text);
- index = exprComment.pos(1);
+ QRegularExpression exprComment("(?:^|[^\\\\])(?:\\\\\\\\)*(%).*$");
+ match = exprComment.match(text);
+ index = match.capturedStart(1);
while (index >= 0) {
- int const length = exprComment.matchedLength()
- - (index - exprComment.pos(0));
+ int const length = match.capturedLength(0)
+ - (index - match.capturedStart(0));
setFormat(index, length, commentFormat);
- exprComment.indexIn(text, index + length);
- index = exprComment.pos(1);
+ match = exprComment.match(text, index + length);
+ index = match.capturedStart(1);
}
// <LyX Warning: ...>
QString lyxwarn = qt_("LyX Warning: ");
- QRegExp exprWarning("<" + lyxwarn + "[^<]*>");
- index = exprWarning.indexIn(text);
+ QRegularExpression exprWarning("<" + lyxwarn + "[^<]*>");
+ match = exprWarning.match(text);
+ index = match.capturedStart(0);
while (index >= 0) {
- int length = exprWarning.matchedLength();
+ int length = match.capturedLength(0);
setFormat(index, length, warningFormat);
- index = exprWarning.indexIn(text, index + length);
+ match = exprWarning.match(text, index + length);
+ index = match.capturedStart(0);
}
}
projects / lyx.git / blobdiff