118 lines
4.4 KiB
Diff
118 lines
4.4 KiB
Diff
commit dfc82af001c56254c6fde0affd009f80e19b1548
|
|
Author: Dimitri van Heesch <doxygen@gmail.com>
|
|
Date: Mon Sep 21 12:20:57 2020 +0200
|
|
|
|
issue #8037: Links using @ref stopped working in doxygen 1.8.19
|
|
|
|
diff --git a/src/classdef.cpp b/src/classdef.cpp
|
|
index c3cd3ee2..5e2b2fa1 100644
|
|
--- a/src/classdef.cpp
|
|
+++ b/src/classdef.cpp
|
|
@@ -1248,6 +1248,7 @@ void ClassDefImpl::distributeMemberGroupDocumentation()
|
|
|
|
void ClassDefImpl::findSectionsInDocumentation()
|
|
{
|
|
+ docFindSections(briefDescription(),this,docFile());
|
|
docFindSections(documentation(),this,docFile());
|
|
if (m_impl->memberGroupSDict)
|
|
{
|
|
diff --git a/src/commentscan.l b/src/commentscan.l
|
|
index c151294d..ce495a1c 100644
|
|
--- a/src/commentscan.l
|
|
+++ b/src/commentscan.l
|
|
@@ -666,6 +666,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
|
|
optList = QCStringList::split(',',optStr);
|
|
}
|
|
auto it = docCmdMap.find(cmdName.data());
|
|
+ //printf("lookup command '%s' found=%d\n",cmdName.data(),it!=docCmdMap.end());
|
|
if (it!=docCmdMap.end()) // special action is required
|
|
{
|
|
int i=0;
|
|
diff --git a/src/docparser.cpp b/src/docparser.cpp
|
|
index 73131f67..b79f8c82 100644
|
|
--- a/src/docparser.cpp
|
|
+++ b/src/docparser.cpp
|
|
@@ -2448,8 +2448,8 @@ DocRef::DocRef(DocNode *parent,const QCString &target,const QCString &context) :
|
|
}
|
|
m_isSubPage = pd && pd->hasParentPage();
|
|
if (sec->type()!=SectionType::Page || m_isSubPage) m_anchor = sec->label();
|
|
- //printf("m_text=%s,m_ref=%s,m_file=%s,m_refToAnchor=%d type=%d\n",
|
|
- // m_text.data(),m_ref.data(),m_file.data(),m_refToAnchor,sec->type);
|
|
+ //printf("m_text=%s,m_ref=%s,m_file=%s,type=%d\n",
|
|
+ // m_text.data(),m_ref.data(),m_file.data(),m_refType);
|
|
return;
|
|
}
|
|
else if (resolveLink(context,target,TRUE,&compound,anchor))
|
|
diff --git a/src/filedef.cpp b/src/filedef.cpp
|
|
index f07201d4..b74fda9b 100644
|
|
--- a/src/filedef.cpp
|
|
+++ b/src/filedef.cpp
|
|
@@ -311,6 +311,7 @@ void FileDefImpl::distributeMemberGroupDocumentation()
|
|
|
|
void FileDefImpl::findSectionsInDocumentation()
|
|
{
|
|
+ docFindSections(briefDescription(),this,docFile());
|
|
docFindSections(documentation(),this,docFile());
|
|
if (m_memberGroupSDict)
|
|
{
|
|
diff --git a/src/groupdef.cpp b/src/groupdef.cpp
|
|
index 9b333567..7cd6cf26 100644
|
|
--- a/src/groupdef.cpp
|
|
+++ b/src/groupdef.cpp
|
|
@@ -228,6 +228,7 @@ void GroupDefImpl::distributeMemberGroupDocumentation()
|
|
|
|
void GroupDefImpl::findSectionsInDocumentation()
|
|
{
|
|
+ docFindSections(briefDescription(),this,docFile());
|
|
docFindSections(documentation(),this,docFile());
|
|
MemberGroupSDict::Iterator mgli(*m_memberGroupSDict);
|
|
MemberGroup *mg;
|
|
diff --git a/src/markdown.cpp b/src/markdown.cpp
|
|
index 3089b8e7..2e6ab3ea 100644
|
|
--- a/src/markdown.cpp
|
|
+++ b/src/markdown.cpp
|
|
@@ -2662,6 +2662,7 @@ QCString markdownFileNameToId(const QCString &fileName)
|
|
int i = baseFn.findRev('.');
|
|
if (i!=-1) baseFn = baseFn.left(i);
|
|
QCString baseName = substitute(substitute(substitute(baseFn," ","_"),"/","_"),":","_");
|
|
+ //printf("markdownFileNameToId(%s)=md_%s\n",qPrint(fileName),qPrint(baseName));
|
|
return "md_"+baseName;
|
|
}
|
|
|
|
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
|
|
index 6d179c21..2f92ea01 100644
|
|
--- a/src/memberdef.cpp
|
|
+++ b/src/memberdef.cpp
|
|
@@ -4838,6 +4838,7 @@ ClassDef *MemberDefImpl::accessorClass() const
|
|
|
|
void MemberDefImpl::findSectionsInDocumentation()
|
|
{
|
|
+ docFindSections(briefDescription(),this,docFile());
|
|
docFindSections(documentation(),this,docFile());
|
|
}
|
|
|
|
diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp
|
|
index 88eea5d2..65456ac0 100644
|
|
--- a/src/namespacedef.cpp
|
|
+++ b/src/namespacedef.cpp
|
|
@@ -349,6 +349,7 @@ void NamespaceDefImpl::distributeMemberGroupDocumentation()
|
|
|
|
void NamespaceDefImpl::findSectionsInDocumentation()
|
|
{
|
|
+ docFindSections(briefDescription(),this,docFile());
|
|
docFindSections(documentation(),this,docFile());
|
|
MemberGroupSDict::Iterator mgli(*memberGroupSDict);
|
|
MemberGroup *mg;
|
|
diff --git a/src/pagedef.cpp b/src/pagedef.cpp
|
|
index 09152def..75e50ed1 100644
|
|
--- a/src/pagedef.cpp
|
|
+++ b/src/pagedef.cpp
|
|
@@ -99,6 +99,7 @@ PageDefImpl::~PageDefImpl()
|
|
|
|
void PageDefImpl::findSectionsInDocumentation()
|
|
{
|
|
+ docFindSections(briefDescription(),this,docFile());
|
|
docFindSections(documentation(),this,docFile());
|
|
}
|
|
|