issue doxygen#11491 [BUG] Space character is not rendered in code block

Author: doxygen

src/cmdmapper.cpp

@@ -184,7 +184,7 @@ static const CommandMap<HtmlTagType>  g_htmlTagMap =
   { "ol",         HtmlTagType::HTML_OL },
   { "ul",         HtmlTagType::HTML_UL },
   { "li",         HtmlTagType::HTML_LI },
-  { "tt",         HtmlTagType::XML_C /*HtmlTagType::HTML_CODE*/ },
+  { "tt",         HtmlTagType::HTML_TT },
   { "kbd",        HtmlTagType::HTML_KBD },
   { "em",         HtmlTagType::HTML_EMPHASIS },
   { "hr",         HtmlTagType::HTML_HR },

src/cmdmapper.h

@@ -214,6 +214,7 @@ enum class HtmlTagType
   HTML_TBODY     = 42,
   HTML_TFOOT     = 43,
   HTML_KBD       = 44,
+  HTML_TT        = 45,
 
   XML_CmdMask    = 0x100,
 

src/docbookvisitor.cpp

@@ -288,6 +288,7 @@ DB_VIS_C
       if (s.enable()) m_t << "<emphasis>";     else m_t << "</emphasis>";
       break;
     case DocStyleChange::Kbd:
+    case DocStyleChange::Typewriter:
     case DocStyleChange::Code:
       if (s.enable()) m_t << "<computeroutput>";   else m_t << "</computeroutput>";
       break;

src/docnode.cpp

@@ -143,6 +143,7 @@ const char *DocStyleChange::styleString() const
     case DocStyleChange::Underline:    return "u";
     case DocStyleChange::Ins:          return "ins";
     case DocStyleChange::Kbd:          return "kbd";
+    case DocStyleChange::Typewriter:   return "tt";
   }
   return "<invalid>";
 }
@@ -4802,6 +4803,9 @@ Token DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &
     case HtmlTagType::HTML_KBD:
         parser()->handleStyleEnter(thisVariant(),children(),DocStyleChange::Kbd,tagName,&parser()->context.token->attribs);
       break;
+    case HtmlTagType::HTML_TT:
+        parser()->handleStyleEnter(thisVariant(),children(),DocStyleChange::Typewriter,tagName,&parser()->context.token->attribs);
+      break;
     case HtmlTagType::HTML_EMPHASIS:
       if (!parser()->context.token->emptyTag) parser()->handleStyleEnter(thisVariant(),children(),DocStyleChange::Italic,tagName,&parser()->context.token->attribs);
       break;
@@ -5275,6 +5279,9 @@ Token DocPara::handleHtmlEndTag(const QCString &tagName)
     case HtmlTagType::HTML_KBD:
       parser()->handleStyleLeave(thisVariant(),children(),DocStyleChange::Kbd,tagName);
       break;
+    case HtmlTagType::HTML_TT:
+      parser()->handleStyleLeave(thisVariant(),children(),DocStyleChange::Typewriter,tagName);
+      break;
     case HtmlTagType::HTML_EMPHASIS:
       parser()->handleStyleLeave(thisVariant(),children(),DocStyleChange::Italic,tagName);
       break;

src/docnode.h

@@ -279,7 +279,8 @@ class DocStyleChange : public DocNode
                  Ins           = (1<<13),
                  S             = (1<<14),
                  Cite          = (1<<15),
-                 Kbd           = (1<<16)
+                 Kbd           = (1<<16),
+                 Typewriter    = (1<<17)
                };
 
     DocStyleChange(DocParser *parser,DocNodeVariant *parent,size_t position,Style s,

src/docparser.cpp

@@ -1493,6 +1493,9 @@ bool DocParser::defaultHandleToken(DocNodeVariant *parent,Token tok, DocNodeList
           case HtmlTagType::HTML_KBD:
             handleEnterLeaveStyle(DocStyleChange::Kbd);
             break;
+          case HtmlTagType::HTML_TT:
+            handleEnterLeaveStyle(DocStyleChange::Typewriter);
+            break;
           case HtmlTagType::HTML_EMPHASIS:
             handleEnterLeaveStyle(DocStyleChange::Italic);
             break;

src/htmldocvisitor.cpp

@@ -463,6 +463,18 @@ void HtmlDocVisitor::operator()(const DocStyleChange &s)
     case DocStyleChange::Kbd:
       if (s.enable()) m_t << "<kbd" << s.attribs().toString() << ">";    else m_t << "</kbd>";
       break;
+    case DocStyleChange::Typewriter:
+      if (s.enable())
+      {
+        m_t << "<span class=\"tt\"" << s.attribs().toString() << ">";
+        m_insidePre=true;
+      }
+      else
+      {
+        m_t << "</span>";
+        m_insidePre=false;
+      }
+      break;
     case DocStyleChange::Code:
       if (s.enable())
       {
@@ -472,9 +484,11 @@ void HtmlDocVisitor::operator()(const DocStyleChange &s)
           attribs.mergeAttribute("class","param");
         }
         m_t << "<code" << attribs.toString() << ">";
+        m_insidePre=true;
       }
       else
       {
+        m_insidePre=false;
         m_t << "</code>";
       }
       break;

src/latexdocvisitor.cpp

@@ -410,6 +410,7 @@ void LatexDocVisitor::operator()(const DocStyleChange &s)
       if (s.enable()) m_t << "{\\itshape ";     else m_t << "}";
       break;
     case DocStyleChange::Kbd:
+    case DocStyleChange::Typewriter:
     case DocStyleChange::Code:
       if (s.enable()) m_t << "{\\ttfamily ";   else m_t << "}";
       break;

src/mandocvisitor.cpp

@@ -148,6 +148,7 @@ void ManDocVisitor::operator()(const DocStyleChange &s)
       m_firstCol=FALSE;
       break;
     case DocStyleChange::Kbd:
+    case DocStyleChange::Typewriter:
     case DocStyleChange::Code:
       if (s.enable()) m_t << "\\fR";   else m_t << "\\fP";
       m_firstCol=FALSE;

src/markdown.cpp

@@ -1672,24 +1672,12 @@ int Markdown::Private::processCodeSpan(std::string_view data,size_t)
     return 0;  // no matching delimiter
   }
 
-  // trimming outside whitespaces
-  size_t f_begin = nb;
-  while (f_begin < end && data[f_begin]==' ')
-  {
-    f_begin++;
-  }
-  size_t f_end = end - nb;
-  while (f_end > nb && data[f_end-1]==' ')
-  {
-    f_end--;
-  }
-
   //printf("found code span '%s'\n",qPrint(QCString(data+f_begin).left(f_end-f_begin)));
 
   /* real code span */
-  if (f_begin < f_end)
+  if (nb+nb < end)
   {
-    QCString codeFragment = data.substr(f_begin, f_end-f_begin);
+    QCString codeFragment = data.substr(nb, end-nb-nb);
     out+="<tt>";
     out+=escapeSpecialChars(codeFragment);
     out+="</tt>";