From 9d39ec6cec4d830834f3230adb5def7b03c0c492 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 13 Feb 2019 19:27:34 +0100
Subject: Adjustment of xhtml1-transitional.dtd

Adding attributes:
- doxygen
to be able to validate doxygen generated xhtml documents.

Analogous to #6681 but now for the area tag (found in the doxygen tag example).
---
 testing/dtd/xhtml1-transitional.dtd | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/testing/dtd/xhtml1-transitional.dtd b/testing/dtd/xhtml1-transitional.dtd
index 4ac1571..6d63e50 100755
--- a/testing/dtd/xhtml1-transitional.dtd
+++ b/testing/dtd/xhtml1-transitional.dtd
@@ -34,6 +34,10 @@
          <!ATTLIST a
        added 
          doxygen     %URI;          #IMPLIED
+     - in
+         <!ATTLIST area
+       added
+         doxygen     %URI;          #IMPLIED
 -->
 
 <!--================ Character mnemonic entities =========================-->
@@ -885,12 +889,14 @@
   name        CDATA          #IMPLIED
   >
 
+<!-- added for doxygen: doxygen     %URI;          #IMPLIED -->
 <!ELEMENT area EMPTY>
 <!ATTLIST area
   %attrs;
   %focus;
   shape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
+  doxygen     %URI;          #IMPLIED
   href        %URI;          #IMPLIED
   nohref      (nohref)       #IMPLIED
   alt         %Text;         #REQUIRED
-- 
cgit v0.12


From 154521185297b3a72b47636edcc2a60fc2c579dd Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Sat, 16 Feb 2019 13:53:20 +0100
Subject: Adjustment of xhtml1-transitional.dtd

After small discussion conclusion was better to remove the obsolete `doxygen=`
---
 src/util.cpp                        |  4 ----
 testing/dtd/xhtml1-transitional.dtd | 12 ------------
 2 files changed, 16 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index 53b176d..b99753e 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -8220,10 +8220,6 @@ QCString externalRef(const QCString &relPath,const QCString &ref,bool href)
         result.prepend(relPath);
         l+=relPath.length();
       }
-      if (!href){
-        result.prepend("doxygen=\""+ref+":");
-        l+=10+ref.length();
-      }
       if (l>0 && result.at(l-1)!='/') result+='/';
       if (!href) result.append("\" ");
     }
diff --git a/testing/dtd/xhtml1-transitional.dtd b/testing/dtd/xhtml1-transitional.dtd
index 6d63e50..764c41a 100755
--- a/testing/dtd/xhtml1-transitional.dtd
+++ b/testing/dtd/xhtml1-transitional.dtd
@@ -30,14 +30,6 @@
          <!ATTLIST script
        added 
          async       (async)        #IMPLIED
-     - in
-         <!ATTLIST a
-       added 
-         doxygen     %URI;          #IMPLIED
-     - in
-         <!ATTLIST area
-       added
-         doxygen     %URI;          #IMPLIED
 -->
 
 <!--================ Character mnemonic entities =========================-->
@@ -654,7 +646,6 @@
 <!--================== 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
@@ -663,7 +654,6 @@
   charset     %Charset;      #IMPLIED
   type        %ContentType;  #IMPLIED
   name        NMTOKEN        #IMPLIED
-  doxygen     %URI;          #IMPLIED
   href        %URI;          #IMPLIED
   hreflang    %LanguageCode; #IMPLIED
   rel         %LinkTypes;    #IMPLIED
@@ -889,14 +879,12 @@
   name        CDATA          #IMPLIED
   >
 
-<!-- added for doxygen: doxygen     %URI;          #IMPLIED -->
 <!ELEMENT area EMPTY>
 <!ATTLIST area
   %attrs;
   %focus;
   shape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
-  doxygen     %URI;          #IMPLIED
   href        %URI;          #IMPLIED
   nohref      (nohref)       #IMPLIED
   alt         %Text;         #REQUIRED
-- 
cgit v0.12


From 4774ac1ef162e6d8ec83f33bf8ffb68fe44f5aa1 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Sat, 16 Feb 2019 14:50:51 +0100
Subject: Adjustment of xhtml1-transitional.dtd

- mapping changed due to missing `doxygen=`
- externalRef part changeddue to missing`doxygen=`
---
 src/context.cpp        | 2 +-
 src/dot.cpp            | 2 +-
 src/ftvhelp.cpp        | 2 +-
 src/htmldocvisitor.cpp | 2 +-
 src/htmlgen.cpp        | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/context.cpp b/src/context.cpp
index 8a3a784..6ddc141 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -3854,7 +3854,7 @@ class TextGeneratorHtml : public TextGeneratorIntf
       if (ref)
       {
         m_ts << "<a class=\"elRef\" ";
-        m_ts << externalLinkTarget() << externalRef(m_relPath,ref,FALSE);
+        m_ts << externalLinkTarget();
       }
       else
       {
diff --git a/src/dot.cpp b/src/dot.cpp
index 07a1a43..e5e1dfa 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -721,7 +721,7 @@ static bool insertMapFile(FTextStream &out,const QCString &mapFile,
   {
     QGString tmpstr;
     FTextStream tmpout(&tmpstr);
-    convertMapFile(tmpout,mapFile,relPath);
+    convertMapFile(tmpout,mapFile,relPath,TRUE);
     if (!tmpstr.isEmpty())
     {
       out << "<map name=\"" << mapLabel << "\" id=\"" << mapLabel << "\">" << endl;
diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp
index 5899bea..9e58591 100644
--- a/src/ftvhelp.cpp
+++ b/src/ftvhelp.cpp
@@ -286,7 +286,7 @@ void FTVHelp::generateLink(FTextStream &t,FTVNode *n)
       t << "<a class=\"elRef\" ";
       QCString result = externalLinkTarget();
       if (result != "") setTarget = TRUE;
-      t << result << externalRef("",n->ref,FALSE);
+      t << result;
     }
     else // local link
     {
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index 25166bc..fe45667 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -2195,7 +2195,7 @@ void HtmlDocVisitor::startLink(const QCString &ref,const QCString &file,
   if (!ref.isEmpty()) // link to entity imported via tag file
   {
     m_t << "<a class=\"elRef\" ";
-    m_t << externalLinkTarget() << externalRef(relPath,ref,FALSE);
+    m_t << externalLinkTarget();
   }
   else // local link
   {
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 2be7c5f..bd57d9b 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -1122,7 +1122,7 @@ void HtmlGenerator::startIndexItem(const char *ref,const char *f)
     if (ref)
     {
       t << "<a class=\"elRef\" ";
-      t << externalLinkTarget() << externalRef(relPath,ref,FALSE);
+      t << externalLinkTarget();
     }
     else
     {
@@ -1168,7 +1168,7 @@ void HtmlGenerator::writeObjectLink(const char *ref,const char *f,
   if (ref)
   {
     t << "<a class=\"elRef\" ";
-    t << externalLinkTarget() << externalRef(relPath,ref,FALSE);
+    t << externalLinkTarget();
   }
   else
   {
-- 
cgit v0.12


From e4ccf68c2320b626acef6a95a86a3cbe78415f55 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Sat, 16 Feb 2019 15:10:23 +0100
Subject: Adjustment of xhtml1-transitional.dtd

Some more ...
---
 src/diagram.cpp | 2 +-
 src/dot.cpp     | 1 -
 src/htmlgen.cpp | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/diagram.cpp b/src/diagram.cpp
index 83e42b3..7e2fe15 100644
--- a/src/diagram.cpp
+++ b/src/diagram.cpp
@@ -261,7 +261,7 @@ static void writeMapArea(FTextStream &t,ClassDef *cd,QCString relPath,
     t << "<area ";
     if (!ref.isEmpty()) 
     {
-      t << externalLinkTarget() << externalRef(relPath,ref,FALSE);
+      t << externalLinkTarget();
     }
     t << "href=\"";
     t << externalRef(relPath,ref,TRUE);
diff --git a/src/dot.cpp b/src/dot.cpp
index e5e1dfa..6972005 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -336,7 +336,6 @@ static QCString replaceRef(const QCString &buf,const QCString relPath,
         {
           result = externalLinkTarget();
 	  if (result != "") setTarget = TRUE;
-	  result += externalRef(relPath,ref,FALSE);
         }
         result+= href+"=\"";
         result+=externalRef(relPath,ref,TRUE);
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index bd57d9b..a1e0a37 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -556,7 +556,7 @@ void HtmlCodeGenerator::_writeCodeLink(const char *className,
   if (ref)
   {
     m_t << "<a class=\"" << className << "Ref\" ";
-    m_t << externalLinkTarget() << externalRef(m_relPath,ref,FALSE);
+    m_t << externalLinkTarget();
   }
   else
   {
-- 
cgit v0.12