Merge branch 'master' of github.com:doxygen/doxygen

Author: doxygen

addon/doxywizard/expert.cpp

@@ -117,25 +117,32 @@ static void translateOption(QDomElement &configRoot,const QDomElement &translati
 {
   QDomElement docsVal   = configRoot.firstChildElement();
   QDomElement trDocsVal = translationRoot.firstChildElement();
-  bool first=true;
-  if (!docsVal.isNull()   && docsVal.tagName()==SA("docs") &&
-      !trDocsVal.isNull() && trDocsVal.tagName()==SA("docs"))
+  while (!docsVal.isNull() && !trDocsVal.isNull())
   {
-    //qDebug() << "id=" << configRoot.attribute(SA("id")) << "trId=" << translationRoot.attribute(SA("id"));
-    docsVal.parentNode().replaceChild(trDocsVal,docsVal);
-  }
-  docsVal = configRoot.firstChildElement().nextSiblingElement();
-  // disable options docs (already part of the translation)
-  while (!docsVal.isNull())
-  {
-    //qDebug() << "tagName" << docsVal.tagName();
     if (docsVal.tagName()==SA("docs") && getFilter(docsVal, mode))
     {
-      docsVal.removeAttribute(SA("filter"));
-      // we just need a value so we don't have an empty filter (and thus potential a match on doxywizard later on).
-      docsVal.setAttribute(SA("filter"),SA("dummy"));
+      if (trDocsVal.tagName()==SA("docs") && getFilter(trDocsVal, mode))
+      {
+        QDomNode oldText = docsVal.firstChild();
+        oldText.setNodeValue (trDocsVal.text());
+        docsVal = docsVal.nextSiblingElement();
+        trDocsVal = trDocsVal.nextSiblingElement();
+      }
+      else
+      {
+        trDocsVal = trDocsVal.nextSiblingElement();
+      }
+    }
+    else
+    {
+      docsVal = docsVal.nextSiblingElement();
     }
-    else if (docsVal.tagName()==SA("value") && docsVal.hasAttribute(SA("desc")))
+  }
+  docsVal = configRoot.firstChildElement();
+  // Just handle value tags
+  while (!docsVal.isNull())
+  {
+    if (docsVal.tagName()==SA("value") && docsVal.hasAttribute(SA("desc")))
     {
       //qDebug() << "attribute" << docsVal.attribute(SA("desc"));
       translateEnumDescription(docsVal,translationRoot);

src/config.xml

@@ -3153,11 +3153,11 @@ doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
  @note The header is subject to change so you typically
  have to regenerate the default header when upgrading to a newer version of
  Doxygen.
- The following commands have a special meaning inside the header (and footer):
 ]]>
       </docs>
       <docs filter="documentation">
 <![CDATA[
+ The following markers have a special meaning inside the header and footer:
  <dl>
  <dt><code>$title</code><dd>will be replaced with the project name.
  <dt><code>$datetime</code><dd>will be replaced with the current date and time.

src/configgen.py

@@ -19,6 +19,7 @@
 from xml.dom import Node
 import io
 import glob
+import os
 
 messages = {}
 
@@ -1108,9 +1109,14 @@ def main():
         print(" * python configgen.py -doc %s to regenerate this file!" % configFile)
         print(" */")
         # process header
+        foundHeader = False
+        foundFooter = False
         for n in elem.childNodes:
             if n.nodeType == Node.ELEMENT_NODE and n.nodeName == "header":
+                foundHeader = True
                 parseHeaderDoc(n, mode)
+        if not foundHeader:
+            print("/*! \\page %s"%re.sub(".xml",'',os.path.basename(configFile)))
         # generate list with all commands
         commandsList = ()
         for n in elem.childNodes:
@@ -1127,7 +1133,10 @@ def main():
         # process footers
         for n in elem.childNodes:
             if n.nodeType == Node.ELEMENT_NODE and n.nodeName == "footer":
+                foundFooter = True
                 parseFooterDoc(n, mode)
+        if not foundFooter:
+            print("*/")
     elif sys.argv[1] == "-maph":
         print("/* WARNING: This file is generated!")
         print(" * Do not edit this file, but edit %s instead and run" % configFile)