summaryrefslogtreecommitdiffstats
path: root/src/markdown.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-10-28 21:49:39 (GMT)
committerGitHub <noreply@github.com>2020-10-28 21:49:39 (GMT)
commit2b2deebc054c7278f59db234024cd96f03aeadf3 (patch)
treeed04cd677ac87d0a0a085db6a54c18c47bc1eda6 /src/markdown.cpp
parent46cc5fcb0eda0988b3aa4309b8e156254b169ada (diff)
parentf674f5bbe7fdec97d8567b7256312d24a49ed924 (diff)
downloadDoxygen-2b2deebc054c7278f59db234024cd96f03aeadf3.zip
Doxygen-2b2deebc054c7278f59db234024cd96f03aeadf3.tar.gz
Doxygen-2b2deebc054c7278f59db234024cd96f03aeadf3.tar.bz2
Merge pull request #8131 from albert-github/feature/issue_8130
issue #8130 Markdown relative links - not working for other folders
Diffstat (limited to 'src/markdown.cpp')
-rw-r--r--src/markdown.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/markdown.cpp b/src/markdown.cpp
index 5240cd9..4abe10e 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
@@ -1050,7 +1050,11 @@ int Markdown::processLink(const char *data,int,int size)
if (!(Portable::isAbsolutePath(link) || isURL(link)))
{
QFileInfo forg(link);
- if (!(forg.exists() && forg.isReadable()))
+ if (forg.exists() && forg.isReadable())
+ {
+ link = forg.absFilePath().data();
+ }
+ else if (!(forg.exists() && forg.isReadable()))
{
QFileInfo fi(m_fileName);
QCString mdFile = m_fileName.left(m_fileName.length()-fi.fileName().length()) + link;
@@ -2077,7 +2081,7 @@ void Markdown::writeOneLineHeaderOrRuler(const char *data,int size)
int tmpSize = size;
if (data[size-1] == '\n') tmpSize--;
m_out.addStr(data,tmpSize);
-
+
if (hasLineBreak(data,size))
{
m_out.addStr("<br>");