Merge pull request #7790 from albert-github/feature/issue_7595

issue #7595 Links from one Markdown file to another do not work

1 files changed, 4 insertions, 2 deletions

diff --git a/src/markdown.cpp b/src/markdown.cpp
index 937e5e0..b04ab2a 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
@@ -2591,7 +2591,7 @@ QCString markdownFileNameToId(const QCString &fileName)
   QCString baseFn  = stripFromPath(QFileInfo(fileName).absFilePath().utf8());
   int i = baseFn.findRev('.');
   if (i!=-1) baseFn = baseFn.left(i);
-  QCString baseName = substitute(substitute(baseFn," ","_"),"/","_");
+  QCString baseName = substitute(substitute(substitute(baseFn," ","_"),"/","_"),":","_");
   return "md_"+baseName;
 }
 
@@ -2658,7 +2658,8 @@ void MarkdownOutlineParser::parseInput(const char *fileName,
   QCString titleFn = QFileInfo(fileName).baseName().utf8();
   QCString fn      = QFileInfo(fileName).fileName().utf8();
   static QCString mdfileAsMainPage = Config_getString(USE_MDFILE_AS_MAINPAGE);
-  if (id.isEmpty()) id = markdownFileNameToId(fileName);
+  bool wasEmpty = id.isEmpty();
+  if (wasEmpty) id = markdownFileNameToId(fileName);
   if (!isExplicitPage(docs))
   {
     if (!mdfileAsMainPage.isEmpty() &&
@@ -2679,6 +2680,7 @@ void MarkdownOutlineParser::parseInput(const char *fileName,
     else
     {
       if (title.isEmpty()) title = titleFn;
+      if (!wasEmpty) docs.prepend("@anchor " +  markdownFileNameToId(fileName) + "\n");
       docs.prepend("@page "+id+" "+title+"\n");
     }
   }