Merge branch 'albert-github-feature/issue_11240'

Author: doxygen

src/doctokenizer.l

@@ -1640,8 +1640,8 @@ static void handleHtmlTag(yyscan_t yyscanner,const char *text)
     // search for end of name
     while (i<(int)yyleng && !isspace((uint8_t)c) && c!='=' && c!= '>') { c=tagText.at(++i); }
     int endName=i;
-    HtmlAttrib opt;
-    opt.name  = tagText.mid(startName,endName-startName).lower();
+    QCString optName,optValue;
+    optName  = tagText.mid(startName,endName-startName).lower();
     // skip spaces
     while (i<(int)yyleng && isspace((uint8_t)c)) { c=tagText.at(++i); }
     if (tagText.at(i)=='=') // option has value
@@ -1677,20 +1677,20 @@ static void handleHtmlTag(yyscan_t yyscanner,const char *text)
         endAttrib=i;
         if (i<(int)yyleng) { c=tagText.at(++i);}
       }
-      opt.value  = tagText.mid(startAttrib,endAttrib-startAttrib);
-      if (opt.name == "align") opt.value = opt.value.lower();
-      else if (opt.name == "valign")
+      optValue  = tagText.mid(startAttrib,endAttrib-startAttrib);
+      if (optName == "align") optValue = optValue.lower();
+      else if (optName == "valign")
       {
-        opt.value = opt.value.lower();
-        if (opt.value == "center") opt.value="middle";
+        optValue = optValue.lower();
+        if (optValue == "center") optValue="middle";
       }
     }
     else // start next option
     {
     }
     //printf("=====> Adding option name=<%s> value=<%s>\n",
-    //    qPrint(opt.name),qPrint(opt.value));
-    yyextra->token.attribs.push_back(opt);
+    //    qPrint(optName),qPrint(optValue));
+    yyextra->token.attribs.emplace_back(optName,optValue);
   }
   yyextra->token.attribsStr = tagText.mid(startAttribList,i-startAttribList);
 }

src/htmlattrib.h

@@ -18,17 +18,69 @@
 #include <vector>
 
 #include "qcstring.h"
+#include "util.h"
 
 /*! \brief Class representing a HTML attribute. */
 struct HtmlAttrib
 {
+  HtmlAttrib(const QCString &n,const QCString &v) : name(n), value(v) {}
   QCString name;
   QCString value;
 };
 
 /*! \brief Class representing a list of HTML attributes. */
 class HtmlAttribList : public std::vector<HtmlAttrib>
 {
+  public:
+    void mergeAttribute(const QCString &optName,const QCString &optValue)
+    {
+      auto it = std::find_if(begin(),end(),
+                           [&optName](const auto &opt) { return opt.name==optName; });
+      if (it!=end()) // attribute name already in the list: append values
+      {
+        it->value += " " + optValue;
+      }
+      else // attribute name not yet in the list
+      {
+        emplace_back(optName,optValue);
+      }
+    }
+
+    QCString toString(QCString *pAltValue = nullptr) const
+    {
+      QCString result;
+      for (const auto &att : *this)
+      {
+        if (!att.value.isEmpty())  // ignore attribute without values as they
+                                   // are not XHTML compliant, with the exception
+                                   // of the alt attribute with the img tag
+        {
+          if (att.name=="alt" && pAltValue) // optionally return the value of alt separately
+                                            // need to convert <img> to <object> for SVG images,
+                                            // which do not support the alt attribute
+          {
+            *pAltValue = att.value;
+          }
+          else
+          {
+            result+=" "+att.name+"=\""+convertToXML(att.value)+"\"";
+          }
+        }
+        else if (att.name=="open")
+        {
+          // The open attribute is a boolean attribute.
+          // Specifies that the details should be visible (open) to the user
+          // As it is a boolean attribute the initialization value is of no interest
+          result+=" "+att.name+"=\"true\"";
+        }
+        else if (att.name=="nowrap") // In XHTML, attribute minimization is forbidden, and the nowrap attribute must be defined as <td nowrap="nowrap">.
+        {
+          result+=" "+att.name+"=\"nowrap\"";
+        }
+      }
+      return result;
+    }
+
 };
 
 #endif