anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-10 10:56:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LaTeXHighlighter: handle grouped values with commas in keyval options

Browse Source
This commit is contained in:
Juergen Spitzmueller 2023-07-18 17:35:48 +02:00
parent 9e308ddb03
commit eadc8ab147
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,7 @@ void LaTeXHighlighter::highlightBlock(QString const & text)
if (keyval_) {
// Highlight key-val options. Used in some option widgets.
static QRegularExpression exprKeyvalkey("[^=,]+");
static QRegularExpression exprKeyvalgval("[^,]+{[^}]+}");
static QRegularExpression exprKeyvalval("[^,]+");
if (optsnippet_) {
static QRegularExpression exprKeyvalkey("^=,+");
@ -61,13 +62,22 @@ void LaTeXHighlighter::highlightBlock(QString const & text)
int length = matchkey.capturedLength(0);
setFormat(kvindex, length, keyFormat);
if (text.size() > kvindex + length && text.at(kvindex + length) == '=') {
QRegularExpressionMatch matchval =
exprKeyvalval.match(text, kvindex + length);
int kvvindex = matchval.capturedStart(0);
QRegularExpressionMatch matchgval =
exprKeyvalgval.match(text, kvindex + length);
int kvvindex = matchgval.capturedStart(0);
if (kvvindex > 0) {
int vlength = matchval.capturedLength(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);