issue_8889 ".html_html" attached to some url links when linking to external library

albert-github · albert-github · commit fce99519dbc4 · 2021-11-16T14:25:18.000+01:00
Prevent on other, potential, places a double html extension.
diff --git a/src/classdef.cpp b/src/classdef.cpp
@@ -2086,7 +2086,7 @@ void ClassDefImpl::writeTagFile(TextStream &tagFile)
   if (isObjectiveC()) { tagFile << " objc=\"yes\""; }
   tagFile << ">\n";
   tagFile << "    <name>" << convertToXML(name()) << "</name>\n";
-  tagFile << "    <filename>" << convertToXML(getOutputFileBase()) << Doxygen::htmlFileExtension << "</filename>\n";
+  tagFile << "    <filename>" << convertToXML(addHtmlExtensionIfMissing(getOutputFileBase())) << "</filename>\n";
   if (!anchor().isEmpty())
   {
     tagFile << "    <anchor>" << convertToXML(anchor()) << "</anchor>\n";
@@ -2766,7 +2766,7 @@ void ClassDefImpl::writeQuickMemberLinks(OutputList &ol,const MemberDef *current
           ol.writeString("<a class=\"navtab\" ");
           ol.writeString("href=\"");
           if (createSubDirs) ol.writeString("../../");
-          ol.writeString(md->getOutputFileBase()+Doxygen::htmlFileExtension+"#"+md->anchor());
+          ol.writeString(addHtmlExtensionIfMissing(md->getOutputFileBase())+"#"+md->anchor());
           ol.writeString("\">");
           ol.writeString(convertToHtml(md->name()));
           ol.writeString("</a>");
diff --git a/src/conceptdef.cpp b/src/conceptdef.cpp
@@ -270,7 +270,7 @@ void ConceptDefImpl::writeTagFile(TextStream &tagFile)
 {
   tagFile << "  <compound kind=\"concept\">\n";
   tagFile << "    <name>" << convertToXML(name()) << "</name>\n";
-  tagFile << "    <filename>" << convertToXML(getOutputFileBase()) << Doxygen::htmlFileExtension << "</filename>\n";
+  tagFile << "    <filename>" << convertToXML(addHtmlExtensionIfMissing(getOutputFileBase())) << "</filename>\n";
   QCString idStr = id();
   if (!idStr.isEmpty())
   {
diff --git a/src/context.cpp b/src/context.cpp
@@ -1823,7 +1823,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                              g_globals.outputDir,
-                             g_globals.outputDir+Portable::pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                             g_globals.outputDir+Portable::pathSeparator()+addHtmlExtensionIfMissing(m_classDef->getOutputFileBase()),
                              relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
                             );
             }
@@ -1914,7 +1914,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                              g_globals.outputDir,
-                             g_globals.outputDir+Portable::pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                             g_globals.outputDir+Portable::pathSeparator()+addHtmlExtensionIfMissing(m_classDef->getOutputFileBase()),
                              relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
                             );
             }
@@ -2800,7 +2800,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portable::pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                  g_globals.outputDir+Portable::pathSeparator()+addHtmlExtensionIfMissing(m_fileDef->getOutputFileBase()),
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -2842,7 +2842,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portable::pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                  g_globals.outputDir+Portable::pathSeparator()+addHtmlExtensionIfMissing(m_fileDef->getOutputFileBase()),
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -3163,7 +3163,7 @@ class DirContext::Private : public DefinitionContext<DirContext::Private>
               graph->writeGraph(t,GOF_BITMAP,
                                 EOF_Html,
                                 g_globals.outputDir,
-                                g_globals.outputDir+Portable::pathSeparator()+m_dirDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                                g_globals.outputDir+Portable::pathSeparator()+addHtmlExtensionIfMissing(m_dirDef->getOutputFileBase()),
                                 relPathAsString(),
                                 TRUE,
                                 g_globals.dynSectionId,
@@ -3460,7 +3460,7 @@ class TextGeneratorHtml : public TextGeneratorIntf
       }
       m_ts << "href=\"";
       m_ts << externalRef(m_relPath,ref,TRUE);
-      if (!f.isEmpty()) m_ts << f << Doxygen::htmlFileExtension;
+      if (!f.isEmpty()) m_ts << addHtmlExtensionIfMissing(f);
       if (!anchor.isEmpty()) m_ts << "#" << anchor;
       m_ts << "\">";
       m_ts << convertToHtml(name);
@@ -3747,7 +3747,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portable::pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                  g_globals.outputDir+Portable::pathSeparator()+addHtmlExtensionIfMissing(m_memberDef->getOutputFileBase()),
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -3805,7 +3805,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portable::pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                  g_globals.outputDir+Portable::pathSeparator()+addHtmlExtensionIfMissing(m_memberDef->getOutputFileBase()),
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -4614,7 +4614,7 @@ class ModuleContext::Private : public DefinitionContext<ModuleContext::Private>
               graph->writeGraph(t,GOF_BITMAP,
                                 EOF_Html,
                                 g_globals.outputDir,
-                                g_globals.outputDir+Portable::pathSeparator()+m_groupDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                                g_globals.outputDir+Portable::pathSeparator()+addHtmlExtensionIfMissing(m_groupDef->getOutputFileBase()),
                                 relPathAsString(),
                                 TRUE,
                                 g_globals.dynSectionId);
diff --git a/src/definition.cpp b/src/definition.cpp
@@ -1354,13 +1354,13 @@ QCString DefinitionImpl::navigationPathAsString() const
     if (m_impl->def->definitionType()==Definition::TypeGroup &&
         !toGroupDef(m_impl->def)->groupTitle().isEmpty())
     {
-      result+="<a class=\"el\" href=\"$relpath^"+m_impl->def->getOutputFileBase()+Doxygen::htmlFileExtension+"\">"+
+      result+="<a class=\"el\" href=\"$relpath^"+addHtmlExtensionIfMissing(m_impl->def->getOutputFileBase())+"\">"+
               convertToHtml(toGroupDef(m_impl->def)->groupTitle())+"</a>";
     }
     else if (m_impl->def->definitionType()==Definition::TypePage &&
              toPageDef(m_impl->def)->hasTitle())
     {
-      result+="<a class=\"el\" href=\"$relpath^"+m_impl->def->getOutputFileBase()+Doxygen::htmlFileExtension+"\">"+
+      result+="<a class=\"el\" href=\"$relpath^"+addHtmlExtensionIfMissing(m_impl->def->getOutputFileBase())+"\">"+
             convertToHtml((toPageDef(m_impl->def))->title())+"</a>";
     }
     else if (m_impl->def->definitionType()==Definition::TypeClass)
@@ -1370,13 +1370,13 @@ QCString DefinitionImpl::navigationPathAsString() const
       {
         name = name.left(name.length()-2);
       }
-      result+="<a class=\"el\" href=\"$relpath^"+m_impl->def->getOutputFileBase()+Doxygen::htmlFileExtension;
+      result+="<a class=\"el\" href=\"$relpath^"+addHtmlExtensionIfMissing(m_impl->def->getOutputFileBase());
       if (!m_impl->def->anchor().isEmpty()) result+="#"+m_impl->def->anchor();
       result+="\">"+convertToHtml(name)+"</a>";
     }
     else
     {
-      result+="<a class=\"el\" href=\"$relpath^"+m_impl->def->getOutputFileBase()+Doxygen::htmlFileExtension+"\">"+
+      result+="<a class=\"el\" href=\"$relpath^"+addHtmlExtensionIfMissing(m_impl->def->getOutputFileBase())+"\">"+
               convertToHtml(locName)+"</a>";
     }
   }
diff --git a/src/diagram.cpp b/src/diagram.cpp
@@ -255,7 +255,7 @@ static void writeMapArea(TextStream &t,const ClassDef *cd,QCString relPath,
     }
     t << "href=\"";
     t << externalRef(relPath,ref,TRUE);
-    t << cd->getOutputFileBase() << Doxygen::htmlFileExtension;
+    t << addHtmlExtensionIfMissing(cd->getOutputFileBase());
     if (!cd->anchor().isEmpty())
     {
       t << "#" << cd->anchor();
diff --git a/src/dirdef.cpp b/src/dirdef.cpp
@@ -466,7 +466,7 @@ void DirDefImpl::writeTagFile(TextStream &tagFile)
   tagFile << "  <compound kind=\"dir\">\n";
   tagFile << "    <name>" << convertToXML(displayName()) << "</name>\n";
   tagFile << "    <path>" << convertToXML(name()) << "</path>\n";
-  tagFile << "    <filename>" << convertToXML(getOutputFileBase()) << Doxygen::htmlFileExtension << "</filename>\n";
+  tagFile << "    <filename>" << addHtmlExtensionIfMissing(getOutputFileBase()) << "</filename>\n";
   for (const auto &lde : LayoutDocManager::instance().docEntries(LayoutDocManager::Directory))
   {
     switch (lde->kind())
diff --git a/src/docsets.cpp b/src/docsets.cpp
@@ -261,7 +261,7 @@ void DocSets::addContentsItem(bool isDir,
       }
       else if (!file.isEmpty()) // doxygen generated file
       {
-        p->nts << file << Doxygen::htmlFileExtension;
+        p->nts << addHtmlExtensionIfMissing(file);
       }
       p->nts << "</Path>\n";
       if (!file.isEmpty() && !anchor.isEmpty())
@@ -513,8 +513,7 @@ void DocSets::writeToken(TextStream &t,
     t << "      <Scope>" << convertToXML(scope) << "</Scope>\n";
   }
   t << "    </TokenIdentifier>\n";
-  t << "    <Path>" << d->getOutputFileBase()
-                    << Doxygen::htmlFileExtension << "</Path>\n";
+  t << "    <Path>" << addHtmlExtensionIfMissing(d->getOutputFileBase()) << "</Path>\n";
   if (!anchor.isEmpty())
   {
     t << "    <Anchor>" << anchor << "</Anchor>\n";
diff --git a/src/dotdirdeps.cpp b/src/dotdirdeps.cpp
@@ -154,7 +154,7 @@ static void drawDirectory(TextStream &t, const DirDef *const directory, const Do
       "style=\""     << getDirectoryBorderStyle(property)                            << "\", "
       "fillcolor=\"" << getDirectoryBackgroundColor(directory->level()-startLevel)   << "\", "
       "color=\""     << getDirectoryBorderColor(property)                            << "\", "
-      "URL=\""       << directory->getOutputFileBase() << Doxygen::htmlFileExtension << "\""
+      "URL=\""       << addHtmlExtensionIfMissing(directory->getOutputFileBase())    << "\""
       "];\n";
   directoriesInGraph.insert(std::make_pair(directory->getOutputFileBase().str(), directory));
 }
@@ -187,7 +187,7 @@ static void drawClusterOpening(TextStream &outputStream, const DirDef *const dir
   outputStream << "\", "
       "fontname=\"" << Config_getString(DOT_FONTNAME) << "\", "
       "fontsize=\"" << Config_getInt(DOT_FONTSIZE) << "\", "
-      "URL=\"" << directory->getOutputFileBase() << Doxygen::htmlFileExtension << "\""
+      "URL=\"" << addHtmlExtensionIfMissing(directory->getOutputFileBase()) << "\""
       "]\n";
   if (!isAncestor)
   {
@@ -386,7 +386,7 @@ void writeDotDirDepGraph(TextStream &t,const DirDef *dd,bool linkRelations)
         t << " [headlabel=\"" << (uint)nrefs << "\", labeldistance=1.5";
         if (linkRelations)
         {
-          t << " headhref=\"" << relationName << Doxygen::htmlFileExtension << "\"";
+          t << " headhref=\"" << addHtmlExtensionIfMissing(relationName) << "\"";
         }
         t << "];\n";
       }
diff --git a/src/dotfilepatcher.cpp b/src/dotfilepatcher.cpp
@@ -153,7 +153,7 @@ static QCString replaceRef(const QCString &buf,const QCString &relPath,
         std::unique_ptr<DocRef>     df     { createRef( *parser.get(), link.mid(5), context ) };
         result+=externalRef(relPath,df->ref(),TRUE);
         if (!df->file().isEmpty())
-          result += df->file() + Doxygen::htmlFileExtension;
+          result += addHtmlExtensionIfMissing(df->file());
         if (!df->anchor().isEmpty())
           result += "#" + df->anchor();
         result += "\"";
diff --git a/src/dotgroupcollaboration.cpp b/src/dotgroupcollaboration.cpp
@@ -101,7 +101,7 @@ void DotGroupCollaboration::buildGraph(const GroupDef* gd)
   // Add classes
   for (const auto &def : gd->getClasses())
   {
-    tmp_url = def->getReference()+"$"+def->getOutputFileBase()+Doxygen::htmlFileExtension;
+    tmp_url = def->getReference()+"$"+addHtmlExtensionIfMissing(def->getOutputFileBase());
     if (!def->anchor().isEmpty())
     {
       tmp_url+="#"+def->anchor();
@@ -112,21 +112,21 @@ void DotGroupCollaboration::buildGraph(const GroupDef* gd)
   // Add namespaces
   for (const auto &def : gd->getNamespaces())
   {
-    tmp_url = def->getReference()+"$"+def->getOutputFileBase()+Doxygen::htmlFileExtension;
+    tmp_url = def->getReference()+"$"+addHtmlExtensionIfMissing(def->getOutputFileBase());
     addCollaborationMember( def, tmp_url, DotGroupCollaboration::tnamespace );
   }
 
   // Add files
   for (const auto &def : gd->getFiles())
   {
-    tmp_url = def->getReference()+"$"+def->getOutputFileBase()+Doxygen::htmlFileExtension;
+    tmp_url = def->getReference()+"$"+addHtmlExtensionIfMissing(def->getOutputFileBase());
     addCollaborationMember( def, tmp_url, DotGroupCollaboration::tfile );
   }
 
   // Add pages
   for (const auto &def : gd->getPages())
   {
-    tmp_url = def->getReference()+"$"+def->getOutputFileBase()+Doxygen::htmlFileExtension;
+    tmp_url = def->getReference()+"$"+addHtmlExtensionIfMissing(def->getOutputFileBase());
     addCollaborationMember( def, tmp_url, DotGroupCollaboration::tpages );
   }
 
@@ -135,7 +135,7 @@ void DotGroupCollaboration::buildGraph(const GroupDef* gd)
   {
     for(const auto def : gd->getDirs())
     {
-      tmp_url = def->getReference()+"$"+def->getOutputFileBase()+Doxygen::htmlFileExtension;
+      tmp_url = def->getReference()+"$"+addHtmlExtensionIfMissing(def->getOutputFileBase());
       addCollaborationMember( def, tmp_url, DotGroupCollaboration::tdir );
     }
   }
@@ -146,7 +146,7 @@ void DotGroupCollaboration::addMemberList( MemberList* ml )
   if ( ml==0 || ml->empty() ) return;
   for (const auto &def : *ml)
   {
-    QCString tmp_url = def->getReference()+"$"+def->getOutputFileBase()+Doxygen::htmlFileExtension
+    QCString tmp_url = def->getReference()+"$"+addHtmlExtensionIfMissing(def->getOutputFileBase());
       +"#"+def->anchor();
     addCollaborationMember( def, tmp_url, DotGroupCollaboration::tmember );
   }
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
@@ -10473,10 +10473,10 @@ static void dumpSymbol(TextStream &t,Definition *d)
   QCString scope;
   if (d->getOuterScope() && d->getOuterScope()!=Doxygen::globalScope)
   {
-    scope = d->getOuterScope()->getOutputFileBase()+Doxygen::htmlFileExtension;
+    scope = addHtmlExtensionIfMissing(d->getOuterScope()->getOutputFileBase());
   }
   t << "REPLACE INTO symbols (symbol_id,scope_id,name,file,line) VALUES('"
-    << d->getOutputFileBase()+Doxygen::htmlFileExtension+anchor << "','"
+    << addHtmlExtensionIfMissing(d->getOutputFileBase())+anchor << "','"
     << scope << "','"
     << d->name() << "','"
     << d->getDefFileName() << "','"
diff --git a/src/eclipsehelp.cpp b/src/eclipsehelp.cpp
@@ -188,7 +188,7 @@ void EclipseHelp::addContentsItem(
         indent();
         m_tocstream << "<topic label=\"" << convertToXML(name) << "\"";
         m_tocstream << " href=\"" << convertToXML(m_pathprefix)
-                    << file << Doxygen::htmlFileExtension;
+                    << addHtmlExtensionIfMissing(file);
         if (!anchor.isEmpty())
         {
           m_tocstream << "#" << anchor;
diff --git a/src/filedef.cpp b/src/filedef.cpp
@@ -318,7 +318,7 @@ void FileDefImpl::writeTagFile(TextStream &tagFile)
   tagFile << "  <compound kind=\"file\">\n";
   tagFile << "    <name>" << convertToXML(name()) << "</name>\n";
   tagFile << "    <path>" << convertToXML(getPath()) << "</path>\n";
-  tagFile << "    <filename>" << convertToXML(getOutputFileBase()) << Doxygen::htmlFileExtension << "</filename>\n";
+  tagFile << "    <filename>" << addHtmlExtensionIfMissing(getOutputFileBase()) << "</filename>\n";
   for (const auto &ii : m_includeList)
   {
     const FileDef *fd=ii.fileDef;
@@ -1070,7 +1070,7 @@ void FileDefImpl::writeQuickMemberLinks(OutputList &ol,const MemberDef *currentM
           ol.writeString("<a class=\"navtab\" ");
           ol.writeString("href=\"");
           if (createSubDirs) ol.writeString("../../");
-          ol.writeString(md->getOutputFileBase()+Doxygen::htmlFileExtension+"#"+md->anchor());
+          ol.writeString(addHtmlExtensionIfMissing(md->getOutputFileBase())+"#"+md->anchor());
           ol.writeString("\">");
           ol.writeString(convertToHtml(md->localName()));
           ol.writeString("</a>");
diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp
@@ -451,8 +451,7 @@ void FTVHelp::generateTree(TextStream &t, const std::vector<FTVNode*> &nl,int le
       }
       if (srcRef)
       {
-        t << "<a href=\"" << srcRef->getSourceFileBase()
-          << Doxygen::htmlFileExtension
+        t << "<a href=\"" << addHtmlExtensionIfMissing(srcRef->getSourceFileBase())
           << "\">";
       }
       if (n->def && n->def->definitionType()==Definition::TypeGroup)
diff --git a/src/groupdef.cpp b/src/groupdef.cpp
@@ -613,7 +613,7 @@ void GroupDefImpl::writeTagFile(TextStream &tagFile)
   tagFile << "  <compound kind=\"group\">\n";
   tagFile << "    <name>" << convertToXML(name()) << "</name>\n";
   tagFile << "    <title>" << convertToXML(m_title) << "</title>\n";
-  tagFile << "    <filename>" << convertToXML(getOutputFileBase()) << Doxygen::htmlFileExtension << "</filename>\n";
+  tagFile << "    <filename>" << addHtmlExtensionIfMissing(getOutputFileBase()) << "</filename>\n";
   for (const auto &lde : LayoutDocManager::instance().docEntries(LayoutDocManager::Group))
   {
     switch (lde->kind())
@@ -1303,7 +1303,7 @@ void GroupDefImpl::writeQuickMemberLinks(OutputList &ol,const MemberDef *current
         ol.writeString("<a class=\"navtab\" ");
         ol.writeString("href=\"");
         if (createSubDirs) ol.writeString("../../");
-        ol.writeString(md->getOutputFileBase()+Doxygen::htmlFileExtension+"#"+md->anchor());
+        ol.writeString(addHtmlExtensionIfMissing(md->getOutputFileBase())+"#"+md->anchor());
         ol.writeString("\">");
         ol.writeString(convertToHtml(md->localName()));
         ol.writeString("</a>");
diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
@@ -174,7 +174,7 @@ void HtmlHelpIndex::addItem(const QCString &level1,const QCString &level2,
 
 static QCString field2URL(const IndexField *f,bool checkReversed)
 {
-  QCString result = f->url + Doxygen::htmlFileExtension;
+  QCString result = addHtmlExtensionIfMissing(f->url);
   if (!f->anchor.isEmpty() && (!checkReversed || f->reversed))
   {
     // HTML Help needs colons in link anchors to be escaped in the .hhk file.
@@ -665,7 +665,7 @@ void HtmlHelp::addContentsItem(bool isDir,
       if (!(binaryTOC && isDir))
       {
         p->cts << "<param name=\"Local\" value=\"";
-        p->cts << file << Doxygen::htmlFileExtension;
+        p->cts << addHtmlExtensionIfMissing(file);
         if (!anchor.isEmpty()) p->cts << "#" << anchor;
         p->cts << "\">";
       }
diff --git a/src/layout.cpp b/src/layout.cpp
@@ -130,7 +130,7 @@ QCString LayoutNavEntry::url() const
   if ((kind()!=LayoutNavEntry::User && kind()!=LayoutNavEntry::UserGroup) ||
       (kind()==LayoutNavEntry::UserGroup && url.left(9)=="usergroup"))
   {
-    url+=Doxygen::htmlFileExtension;
+    url = addHtmlExtensionIfMissing(url);
   }
   else if (url.left(5)=="@ref " || url.left(5)=="\\ref ")
   {
@@ -141,7 +141,7 @@ QCString LayoutNavEntry::url() const
     {
       if (d && d->isLinkable())
       {
-        url=d->getOutputFileBase()+Doxygen::htmlFileExtension;
+        url=addHtmlExtensionIfMissing(d->getOutputFileBase());
         if (!anchor.isEmpty())
         {
           url+="#"+anchor;
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
diff --git a/src/msc.cpp b/src/msc.cpp
diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp
diff --git a/src/pagedef.cpp b/src/pagedef.cpp
diff --git a/src/qhp.cpp b/src/qhp.cpp
diff --git a/src/searchindex.cpp b/src/searchindex.cpp

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ void ConceptDefImpl::writeTagFile(TextStream &tagFile)`
`270`	`270`	`{`
`271`	`271`	`tagFile << " <compound kind=\"concept\">\n";`
`272`	`272`	`tagFile << " <name>" << convertToXML(name()) << "</name>\n";`
`273`		`- tagFile << " <filename>" << convertToXML(getOutputFileBase()) << Doxygen::htmlFileExtension << "</filename>\n";`
	`273`	`+ tagFile << " <filename>" << convertToXML(addHtmlExtensionIfMissing(getOutputFileBase())) << "</filename>\n";`
`274`	`274`	`QCString idStr = id();`
`275`	`275`	`if (!idStr.isEmpty())`
`276`	`276`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1354,13 +1354,13 @@ QCString DefinitionImpl::navigationPathAsString() const`
`1354`	`1354`	`if (m_impl->def->definitionType()==Definition::TypeGroup &&`
`1355`	`1355`	`!toGroupDef(m_impl->def)->groupTitle().isEmpty())`
`1356`	`1356`	`{`
`1357`		`- result+="<a class=\"el\" href=\"$relpath^"+m_impl->def->getOutputFileBase()+Doxygen::htmlFileExtension+"\">"+`
	`1357`	`+ result+="<a class=\"el\" href=\"$relpath^"+addHtmlExtensionIfMissing(m_impl->def->getOutputFileBase())+"\">"+`
`1358`	`1358`	`convertToHtml(toGroupDef(m_impl->def)->groupTitle())+"</a>";`
`1359`	`1359`	`}`
`1360`	`1360`	`else if (m_impl->def->definitionType()==Definition::TypePage &&`
`1361`	`1361`	`toPageDef(m_impl->def)->hasTitle())`
`1362`	`1362`	`{`
`1363`		`- result+="<a class=\"el\" href=\"$relpath^"+m_impl->def->getOutputFileBase()+Doxygen::htmlFileExtension+"\">"+`
	`1363`	`+ result+="<a class=\"el\" href=\"$relpath^"+addHtmlExtensionIfMissing(m_impl->def->getOutputFileBase())+"\">"+`
`1364`	`1364`	`convertToHtml((toPageDef(m_impl->def))->title())+"</a>";`
`1365`	`1365`	`}`
`1366`	`1366`	`else if (m_impl->def->definitionType()==Definition::TypeClass)`
`@@ -1370,13 +1370,13 @@ QCString DefinitionImpl::navigationPathAsString() const`
`1370`	`1370`	`{`
`1371`	`1371`	`name = name.left(name.length()-2);`
`1372`	`1372`	`}`
`1373`		`- result+="<a class=\"el\" href=\"$relpath^"+m_impl->def->getOutputFileBase()+Doxygen::htmlFileExtension;`
	`1373`	`+ result+="<a class=\"el\" href=\"$relpath^"+addHtmlExtensionIfMissing(m_impl->def->getOutputFileBase());`
`1374`	`1374`	`if (!m_impl->def->anchor().isEmpty()) result+="#"+m_impl->def->anchor();`
`1375`	`1375`	`result+="\">"+convertToHtml(name)+"</a>";`
`1376`	`1376`	`}`
`1377`	`1377`	`else`
`1378`	`1378`	`{`
`1379`		`- result+="<a class=\"el\" href=\"$relpath^"+m_impl->def->getOutputFileBase()+Doxygen::htmlFileExtension+"\">"+`
	`1379`	`+ result+="<a class=\"el\" href=\"$relpath^"+addHtmlExtensionIfMissing(m_impl->def->getOutputFileBase())+"\">"+`
`1380`	`1380`	`convertToHtml(locName)+"</a>";`
`1381`	`1381`	`}`
`1382`	`1382`	`}`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ static void writeMapArea(TextStream &t,const ClassDef *cd,QCString relPath,`
`255`	`255`	`}`
`256`	`256`	`t << "href=\"";`
`257`	`257`	`t << externalRef(relPath,ref,TRUE);`
`258`		`- t << cd->getOutputFileBase() << Doxygen::htmlFileExtension;`
	`258`	`+ t << addHtmlExtensionIfMissing(cd->getOutputFileBase());`
`259`	`259`	`if (!cd->anchor().isEmpty())`
`260`	`260`	`{`
`261`	`261`	`t << "#" << cd->anchor();`
Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ void DirDefImpl::writeTagFile(TextStream &tagFile)`
`466`	`466`	`tagFile << " <compound kind=\"dir\">\n";`
`467`	`467`	`tagFile << " <name>" << convertToXML(displayName()) << "</name>\n";`
`468`	`468`	`tagFile << " <path>" << convertToXML(name()) << "</path>\n";`
`469`		`- tagFile << " <filename>" << convertToXML(getOutputFileBase()) << Doxygen::htmlFileExtension << "</filename>\n";`
	`469`	`+ tagFile << " <filename>" << addHtmlExtensionIfMissing(getOutputFileBase()) << "</filename>\n";`
`470`	`470`	`for (const auto &lde : LayoutDocManager::instance().docEntries(LayoutDocManager::Directory))`
`471`	`471`	`{`
`472`	`472`	`switch (lde->kind())`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ void DocSets::addContentsItem(bool isDir,`
`261`	`261`	`}`
`262`	`262`	`else if (!file.isEmpty()) // doxygen generated file`
`263`	`263`	`{`
`264`		`- p->nts << file << Doxygen::htmlFileExtension;`
	`264`	`+ p->nts << addHtmlExtensionIfMissing(file);`
`265`	`265`	`}`
`266`	`266`	`p->nts << "</Path>\n";`
`267`	`267`	`if (!file.isEmpty() && !anchor.isEmpty())`
`@@ -513,8 +513,7 @@ void DocSets::writeToken(TextStream &t,`
`513`	`513`	`t << " <Scope>" << convertToXML(scope) << "</Scope>\n";`
`514`	`514`	`}`
`515`	`515`	`t << " </TokenIdentifier>\n";`
`516`		`- t << " <Path>" << d->getOutputFileBase()`
`517`		`- << Doxygen::htmlFileExtension << "</Path>\n";`
	`516`	`+ t << " <Path>" << addHtmlExtensionIfMissing(d->getOutputFileBase()) << "</Path>\n";`
`518`	`517`	`if (!anchor.isEmpty())`
`519`	`518`	`{`
`520`	`519`	`t << " <Anchor>" << anchor << "</Anchor>\n";`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ static void drawDirectory(TextStream &t, const DirDef *const directory, const Do`
`154`	`154`	`"style=\"" << getDirectoryBorderStyle(property) << "\", "`
`155`	`155`	`"fillcolor=\"" << getDirectoryBackgroundColor(directory->level()-startLevel) << "\", "`
`156`	`156`	`"color=\"" << getDirectoryBorderColor(property) << "\", "`
`157`		`- "URL=\"" << directory->getOutputFileBase() << Doxygen::htmlFileExtension << "\""`
	`157`	`+ "URL=\"" << addHtmlExtensionIfMissing(directory->getOutputFileBase()) << "\""`
`158`	`158`	`"];\n";`
`159`	`159`	`directoriesInGraph.insert(std::make_pair(directory->getOutputFileBase().str(), directory));`
`160`	`160`	`}`
`@@ -187,7 +187,7 @@ static void drawClusterOpening(TextStream &outputStream, const DirDef *const dir`
`187`	`187`	`outputStream << "\", "`
`188`	`188`	`"fontname=\"" << Config_getString(DOT_FONTNAME) << "\", "`
`189`	`189`	`"fontsize=\"" << Config_getInt(DOT_FONTSIZE) << "\", "`
`190`		`- "URL=\"" << directory->getOutputFileBase() << Doxygen::htmlFileExtension << "\""`
	`190`	`+ "URL=\"" << addHtmlExtensionIfMissing(directory->getOutputFileBase()) << "\""`
`191`	`191`	`"]\n";`
`192`	`192`	`if (!isAncestor)`
`193`	`193`	`{`
`@@ -386,7 +386,7 @@ void writeDotDirDepGraph(TextStream &t,const DirDef *dd,bool linkRelations)`
`386`	`386`	`t << " [headlabel=\"" << (uint)nrefs << "\", labeldistance=1.5";`
`387`	`387`	`if (linkRelations)`
`388`	`388`	`{`
`389`		`- t << " headhref=\"" << relationName << Doxygen::htmlFileExtension << "\"";`
	`389`	`+ t << " headhref=\"" << addHtmlExtensionIfMissing(relationName) << "\"";`
`390`	`390`	`}`
`391`	`391`	`t << "];\n";`
`392`	`392`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ void DotGroupCollaboration::buildGraph(const GroupDef* gd)`
`101`	`101`	`// Add classes`
`102`	`102`	`for (const auto &def : gd->getClasses())`
`103`	`103`	`{`
`104`		`- tmp_url = def->getReference()+"$"+def->getOutputFileBase()+Doxygen::htmlFileExtension;`
	`104`	`+ tmp_url = def->getReference()+"$"+addHtmlExtensionIfMissing(def->getOutputFileBase());`
`105`	`105`	`if (!def->anchor().isEmpty())`
`106`	`106`	`{`
`107`	`107`	`tmp_url+="#"+def->anchor();`
`@@ -112,21 +112,21 @@ void DotGroupCollaboration::buildGraph(const GroupDef* gd)`
`112`	`112`	`// Add namespaces`
`113`	`113`	`for (const auto &def : gd->getNamespaces())`
`114`	`114`	`{`
`115`		`- tmp_url = def->getReference()+"$"+def->getOutputFileBase()+Doxygen::htmlFileExtension;`
	`115`	`+ tmp_url = def->getReference()+"$"+addHtmlExtensionIfMissing(def->getOutputFileBase());`
`116`	`116`	`addCollaborationMember( def, tmp_url, DotGroupCollaboration::tnamespace );`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`// Add files`
`120`	`120`	`for (const auto &def : gd->getFiles())`
`121`	`121`	`{`
`122`		`- tmp_url = def->getReference()+"$"+def->getOutputFileBase()+Doxygen::htmlFileExtension;`
	`122`	`+ tmp_url = def->getReference()+"$"+addHtmlExtensionIfMissing(def->getOutputFileBase());`
`123`	`123`	`addCollaborationMember( def, tmp_url, DotGroupCollaboration::tfile );`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`// Add pages`
`127`	`127`	`for (const auto &def : gd->getPages())`
`128`	`128`	`{`
`129`		`- tmp_url = def->getReference()+"$"+def->getOutputFileBase()+Doxygen::htmlFileExtension;`
	`129`	`+ tmp_url = def->getReference()+"$"+addHtmlExtensionIfMissing(def->getOutputFileBase());`
`130`	`130`	`addCollaborationMember( def, tmp_url, DotGroupCollaboration::tpages );`
`131`	`131`	`}`
`132`	`132`
`@@ -135,7 +135,7 @@ void DotGroupCollaboration::buildGraph(const GroupDef* gd)`
`135`	`135`	`{`
`136`	`136`	`for(const auto def : gd->getDirs())`
`137`	`137`	`{`
`138`		`- tmp_url = def->getReference()+"$"+def->getOutputFileBase()+Doxygen::htmlFileExtension;`
	`138`	`+ tmp_url = def->getReference()+"$"+addHtmlExtensionIfMissing(def->getOutputFileBase());`
`139`	`139`	`addCollaborationMember( def, tmp_url, DotGroupCollaboration::tdir );`
`140`	`140`	`}`
`141`	`141`	`}`
`@@ -146,7 +146,7 @@ void DotGroupCollaboration::addMemberList( MemberList* ml )`
`146`	`146`	`if ( ml==0 \|\| ml->empty() ) return;`
`147`	`147`	`for (const auto &def : *ml)`
`148`	`148`	`{`
`149`		`- QCString tmp_url = def->getReference()+"$"+def->getOutputFileBase()+Doxygen::htmlFileExtension`
	`149`	`+ QCString tmp_url = def->getReference()+"$"+addHtmlExtensionIfMissing(def->getOutputFileBase());`
`150`	`150`	`+"#"+def->anchor();`
`151`	`151`	`addCollaborationMember( def, tmp_url, DotGroupCollaboration::tmember );`
`152`	`152`	`}`