Merge pull request doxygen#11211 from albert-github/feature/issue_11209

issue doxygen#11209 `<kbd>` tag gets rewritten as `<code>`

Author: doxygen

src/cmdmapper.cpp

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

src/cmdmapper.h

@@ -211,6 +211,7 @@ enum class HtmlTagType
   HTML_THEAD     = 41,
   HTML_TBODY     = 42,
   HTML_TFOOT     = 43,
+  HTML_KBD       = 44,
 
   XML_CmdMask    = 0x100,
 

src/docbookvisitor.cpp

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

src/docnode.cpp

@@ -142,6 +142,7 @@ const char *DocStyleChange::styleString() const
     case DocStyleChange::Del:          return "del";
     case DocStyleChange::Underline:    return "u";
     case DocStyleChange::Ins:          return "ins";
+    case DocStyleChange::Kbd:          return "kbd";
   }
   return "<invalid>";
 }
@@ -4782,6 +4783,9 @@ Token DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &
         parser()->handleStyleEnter(thisVariant(),children(),DocStyleChange::Code,tagName,&parser()->context.token->attribs);
       }
       break;
+    case HtmlTagType::HTML_KBD:
+        parser()->handleStyleEnter(thisVariant(),children(),DocStyleChange::Kbd,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;
@@ -5252,6 +5256,9 @@ Token DocPara::handleHtmlEndTag(const QCString &tagName)
     case HtmlTagType::HTML_CODE:
       parser()->handleStyleLeave(thisVariant(),children(),DocStyleChange::Code,tagName);
       break;
+    case HtmlTagType::HTML_KBD:
+      parser()->handleStyleLeave(thisVariant(),children(),DocStyleChange::Kbd,tagName);
+      break;
     case HtmlTagType::HTML_EMPHASIS:
       parser()->handleStyleLeave(thisVariant(),children(),DocStyleChange::Italic,tagName);
       break;

src/docnode.h

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

src/docparser.cpp

@@ -1513,6 +1513,16 @@ bool DocParser::defaultHandleToken(DocNodeVariant *parent,Token tok, DocNodeList
               handleStyleLeave(parent,children,DocStyleChange::Code,tokenName);
             }
             break;
+          case HtmlTagType::HTML_KBD:
+            if (!context.token->endTag)
+            {
+              handleStyleEnter(parent,children,DocStyleChange::Kbd,tokenName,&context.token->attribs);
+            }
+            else
+            {
+              handleStyleLeave(parent,children,DocStyleChange::Kbd,tokenName);
+            }
+            break;
           case HtmlTagType::HTML_EMPHASIS:
             if (!context.token->endTag)
             {

src/htmldocvisitor.cpp

@@ -505,6 +505,9 @@ void HtmlDocVisitor::operator()(const DocStyleChange &s)
     case DocStyleChange::Italic:
       if (s.enable()) m_t << "<em" << htmlAttribsToString(s.attribs()) << ">";     else m_t << "</em>";
       break;
+    case DocStyleChange::Kbd:
+      if (s.enable()) m_t << "<kbd" << htmlAttribsToString(s.attribs()) << ">";   else m_t << "</kbd>";
+      break;
     case DocStyleChange::Code:
       if (s.enable()) m_t << "<code" << htmlAttribsToString(s.attribs()) << ">";   else m_t << "</code>";
       break;

src/latexdocvisitor.cpp

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

src/mandocvisitor.cpp

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

src/perlmodgen.cpp

@@ -613,6 +613,7 @@ void PerlModDocVisitor::operator()(const DocStyleChange &s)
     case DocStyleChange::Preformatted:  style = "preformatted"; break;
     case DocStyleChange::Div:           style = "div"; break;
     case DocStyleChange::Span:          style = "span"; break;
+    case DocStyleChange::Kbd:           style = "kbd"; break;
   }
   openItem("style");
   m_output.addFieldQuotedString("style", style)