issue #8127 Java: xml output of preformatted (`<pre>`) block adds para-block for blank lines (hindering certain manual parsing)

Don't terminate a paragraph and remove the whitespace when inside a pre block, but output the blanks.

1 files changed, 18 insertions, 10 deletions

diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index 5b72b77..69f650d 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -811,18 +811,26 @@ RCSID "$"("Author"|"Date"|"Header"|"Id"|"Locker"|"Log"|"Name"|"RCSfile"|"Revisio
                        }
 <St_Para>({BLANK}*\n)+{BLANK}*\n{BLANK}* {
                          lineCount(yytext,yyleng);
-                         g_token->indent=computeIndent(yytext,(int)yyleng);
-                         int i;
-                         // put back the indentation (needed for list items)
-                         for (i=0;i<g_token->indent;i++)
+                         if (g_insidePre)
                          {
-                           unput(' ');
+                           g_token->chars=yytext;
+                           return TK_WHITESPACE;
+                         }
+                         else
+                         {
+                           g_token->indent=computeIndent(yytext,(int)yyleng);
+                           int i;
+                           // put back the indentation (needed for list items)
+                           for (i=0;i<g_token->indent;i++)
+                           {
+                             unput(' ');
+                           }
+                           // tell flex that after putting the last indent
+                           // back we are at the beginning of the line
+                           YY_CURRENT_BUFFER->yy_at_bol=1;
+                           // start of a new paragraph
+                           return TK_NEWPARA;
                          }
-                         // tell flex that after putting the last indent
-                         // back we are at the beginning of the line
-                         YY_CURRENT_BUFFER->yy_at_bol=1;
-                         // start of a new paragraph
-                         return TK_NEWPARA;
                        }
 <St_CodeOpt>{BLANK}*"{"(".")?{LABELID}"}" {
                          g_token->name = yytext;