From dfc82af001c56254c6fde0affd009f80e19b1548 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Mon, 21 Sep 2020 12:20:57 +0200 Subject: issue #8037: Links using @ref stopped working in doxygen 1.8.19 --- src/classdef.cpp | 1 + src/commentscan.l | 1 + src/docparser.cpp | 4 ++-- src/filedef.cpp | 1 + src/groupdef.cpp | 1 + src/markdown.cpp | 1 + src/memberdef.cpp | 1 + src/namespacedef.cpp | 1 + src/pagedef.cpp | 1 + 9 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/classdef.cpp b/src/classdef.cpp index c3cd3ee..5e2b2fa 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 c151294..ce495a1 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 73131f6..b79f8c8 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 f07201d..b74fda9 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 9b33356..7cd6cf2 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 3089b8e..2e6ab3e 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 6d179c2..2f92ea0 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 88eea5d..65456ac 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 09152de..75e50ed 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()); } -- cgit v0.12