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

18 files changed, 26 insertions, 1 deletions

diff --git a/addon/doxywizard/images/tunecolor.png b/addon/doxywizard/images/tunecolor.png
index 4c7dd9d..9e595e4 100755
--- a/addon/doxywizard/images/tunecolor.png
+++ b/addon/doxywizard/images/tunecolor.png
diff --git a/doc/doxywizard_expert.png b/doc/doxywizard_expert.png
index 93fd4ee..5eb14d4 100644
--- a/doc/doxywizard_expert.png
+++ b/doc/doxywizard_expert.png
diff --git a/doc/doxywizard_main.png b/doc/doxywizard_main.png
index e57c144..b170e15 100644
--- a/doc/doxywizard_main.png
+++ b/doc/doxywizard_main.png
diff --git a/doc/doxywizard_menu.png b/doc/doxywizard_menu.png
index 37adc46..7f37192 100644
--- a/doc/doxywizard_menu.png
+++ b/doc/doxywizard_menu.png
diff --git a/doc/doxywizard_page1.png b/doc/doxywizard_page1.png
index ee3181d..3e008d0 100644
--- a/doc/doxywizard_page1.png
+++ b/doc/doxywizard_page1.png
diff --git a/doc/doxywizard_page2.png b/doc/doxywizard_page2.png
index dc9b5a8..8343902 100644
--- a/doc/doxywizard_page2.png
+++ b/doc/doxywizard_page2.png
diff --git a/doc/doxywizard_page3.png b/doc/doxywizard_page3.png
index f75e63f..0201981 100644
--- a/doc/doxywizard_page3.png
+++ b/doc/doxywizard_page3.png
diff --git a/doc/doxywizard_page4.png b/doc/doxywizard_page4.png
index e4f4361..1068e6c 100644
--- a/doc/doxywizard_page4.png
+++ b/doc/doxywizard_page4.png
diff --git a/doc/extsearch_flow.png b/doc/extsearch_flow.png
index e99450c..b6dc26c 100644
--- a/doc/extsearch_flow.png
+++ b/doc/extsearch_flow.png
diff --git a/doc/infoflow.png b/doc/infoflow.png
index d975be1..f676724 100644
--- a/doc/infoflow.png
+++ b/doc/infoflow.png
diff --git a/src/dot.cpp b/src/dot.cpp
index 0d8502d..0944a02 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -1515,6 +1515,7 @@ DotNode::DotNode(int n,const char *lab,const char *tip, const char *url,
   , m_visible(FALSE)
   , m_truncated(Unknown)
   , m_distance(1000)
+  , m_renumbered(false)
 {
 }
 
@@ -2287,7 +2288,11 @@ void DotNode::renumberNodes(int &number)
     DotNode *cn;
     for (dnlic.toFirst();(cn=dnlic.current());++dnlic)
     {
-      cn->renumberNodes(number);
+      if (!cn->m_renumbered)
+      {
+        cn->m_renumbered = true;
+        cn->renumberNodes(number);
+      }
     }
   }
 }
diff --git a/src/dot.h b/src/dot.h
index 20a1f29..dc77789 100644
--- a/src/dot.h
+++ b/src/dot.h
@@ -122,6 +122,7 @@ class DotNode
     bool             m_visible;   //!< is the node visible in the output
     TruncState       m_truncated; //!< does the node have non-visible children/parents
     int              m_distance;  //!< shortest path to the root node
+    bool             m_renumbered;//!< indicates if the node has been renumbered (to prevent endless loops)
 
     friend class DotGfxHierarchyTable;
     friend class DotClassGraph;
diff --git a/templates/html/mag.png b/templates/html/mag.png
index 492f71f..858fea5 100644
--- a/templates/html/mag.png
+++ b/templates/html/mag.png
diff --git a/templates/html/mag_sel.png b/templates/html/mag_sel.png
index 81f6040..39c0ed5 100644
--- a/templates/html/mag_sel.png
+++ b/templates/html/mag_sel.png
diff --git a/templates/html/search_l.png b/templates/html/search_l.png
index c872f4d..fd5f7da 100644
--- a/templates/html/search_l.png
+++ b/templates/html/search_l.png
diff --git a/templates/html/search_r.png b/templates/html/search_r.png
index 97ee8b4..1af5d21 100644
--- a/templates/html/search_r.png
+++ b/templates/html/search_r.png
diff --git a/testing/dtd/xhtml1-transitional.dtd b/testing/dtd/xhtml1-transitional.dtd
index 628f27a..4ac1571 100755
--- a/testing/dtd/xhtml1-transitional.dtd
+++ b/testing/dtd/xhtml1-transitional.dtd
@@ -20,6 +20,21 @@
    $Date: 2002/08/01 18:37:55 $
 
 -->
+<!--
+     Note:
+     This is an adjusted version of the official document only to be used
+     for validation of doxygen generated documents.
+
+     Adjustments:
+     - in
+         <!ATTLIST script
+       added 
+         async       (async)        #IMPLIED
+     - in
+         <!ATTLIST a
+       added 
+         doxygen     %URI;          #IMPLIED
+-->
 
 <!--================ Character mnemonic entities =========================-->
 
@@ -363,6 +378,7 @@
   >
 
 <!-- script statements, which may include CDATA sections -->
+<!-- added for doxygen:  async       (async)        #IMPLIED -->
 <!ELEMENT script (#PCDATA)>
 <!ATTLIST script
   id          ID             #IMPLIED
@@ -370,6 +386,7 @@
   type        %ContentType;  #REQUIRED
   language    CDATA          #IMPLIED
   src         %URI;          #IMPLIED
+  async       (async)        #IMPLIED
   defer       (defer)        #IMPLIED
   xml:space   (preserve)     #FIXED 'preserve'
   >
@@ -633,6 +650,7 @@
 <!--================== The Anchor Element ================================-->
 
 <!-- content is %Inline; except that anchors shouldn't be nested -->
+<!-- added for doxygen: doxygen     %URI;          #IMPLIED -->
 
 <!ELEMENT a %a.content;>
 <!ATTLIST a
@@ -641,6 +659,7 @@
   charset     %Charset;      #IMPLIED
   type        %ContentType;  #IMPLIED
   name        NMTOKEN        #IMPLIED
+  doxygen     %URI;          #IMPLIED
   href        %URI;          #IMPLIED
   hreflang    %LanguageCode; #IMPLIED
   rel         %LinkTypes;    #IMPLIED
diff --git a/testing/sample.png b/testing/sample.png
index 3ff17d8..5c9f51f 100644
--- a/testing/sample.png
+++ b/testing/sample.png