From 81da20ff839843634ee6db5f517bfcb7ef87d4b9 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sat, 7 Sep 2019 14:29:53 +0200 Subject: issue #6715: Errorneous matching of the immediately following block command after @ref (try 2) --- src/commentscan.l | 5 ----- src/doctokenizer.l | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/commentscan.l b/src/commentscan.l index 027f000..a495c5e 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -2720,11 +2720,6 @@ static bool handleCite(const QCString &s, const QCStringList &) static bool handleFormatBlock(const QCString &s, const QCStringList &optList) { - if (!g_spaceBeforeCmd.isEmpty()) - { - addOutput(g_spaceBeforeCmd); - g_spaceBeforeCmd.resize(0); - } if (optList.isEmpty()) { addOutput("@"+s+" "); diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 6c02bcf..311e445 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -353,8 +353,8 @@ ATTRNAME [a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF\-]* ATTRIB {ATTRNAME}{WS}*("="{WS}*(("\""[^\"]*"\"")|("'"[^\']*"'")|[^ \t\r\n'"><]+))? URLCHAR [a-z_A-Z0-9\!\~\,\:\;\'\$\?\@\&\%\#\.\-\+\/\=] URLMASK ({URLCHAR}+([({]{URLCHAR}*[)}])?)+ -FILESCHAR [a-z_A-Z0-9\\:\\\/\-\+@&#] -FILEECHAR [a-z_A-Z0-9\-\+@&#] +FILESCHAR [a-z_A-Z0-9\\:\\\/\-\+&#] +FILEECHAR [a-z_A-Z0-9\-\+&#] HFILEMASK ("."{FILESCHAR}*{FILEECHAR}+)+ FILEMASK ({FILESCHAR}*{FILEECHAR}+("."{FILESCHAR}*{FILEECHAR}+)*)|{HFILEMASK} LINKMASK [^ \t\n\r\\@<&${}]+("("[^\n)]*")")?({BLANK}*("const"|"volatile"){BLANK}+)? -- cgit v0.12