issue doxygen#11309 Markdown blockquotes with lists do not render as expected

Author: doxygen

src/doctokenizer.l

@@ -614,6 +614,15 @@ SHOWDATE ([0-9]{4}"-"[0-9]{1,2}"-"[0-9]{1,2})?({WS}*[0-9]{1,2}":"[0-9]{1,2}(":"[
                          QCString value = Portable::getenv(name);
                          for (int i=static_cast<int>(value.length())-1;i>=0;i--) unput(value.at(i));
                        }
+<St_Para>"<blockquote>&zwj;"  {
+                         // for a markdown inserted block quote,
+                         // tell flex that after putting the last indent
+                         // back we are at the beginning of the line, see issue #11309
+                         YY_CURRENT_BUFFER->yy_at_bol=1;
+                         lineCount(yytext,yyleng);
+                         handleHtmlTag(yyscanner,yytext);
+                         return Token::make_TK_HTMLTAG();
+                       }
 <St_Para>{HTMLTAG}     { /* html tag */
                          lineCount(yytext,yyleng);
                          handleHtmlTag(yyscanner,yytext);

src/markdown.cpp

@@ -2796,7 +2796,7 @@ size_t Markdown::Private::writeBlockQuote(std::string_view data)
       j--;
     }
     AUTO_TRACE_ADD("indent={} i={} j={} end={} level={} line={}",indent,i,j,end,level,Trace::trunc(&data[i]));
-    if (level==0 && j<end-1)
+    if (level==0 && j<end-1 && !isListMarker(data.substr(j)) && !isHRuler(data.substr(j)))
     {
       level = curLevel; // lazy
     }
@@ -2835,7 +2835,7 @@ size_t Markdown::Private::writeBlockQuote(std::string_view data)
       }
       for (int l=level;l<decrLevel;l++)
       {
-        out += "</blockquote>";
+        out += "</blockquote>\\ilinebr ";
       }
     }
     if (level==0)