Merge branch 'albert-github-feature/bug_at_user'

Author: doxygen

src/commentscan.h

@@ -115,6 +115,7 @@ class CommentScanner
     void leaveCompound(const QCString &fileName,int line,const QCString &name);
     void open(Entry *e,const QCString &fileName,int line,bool implicit=false);
     void close(Entry *e,const QCString &fileName,int line,bool foundInline,bool implicit=false);
+    static bool isCommand(const QCString &cmdName);
   private:
     struct Private;
     std::unique_ptr<Private> p;

src/commentscan.l

@@ -5175,4 +5175,10 @@ void CommentScanner::close(Entry *e,const QCString &fileName,int lineNr,bool fou
   yyextra->docGroup.close(e,fileName,lineNr,foundInline,implicit);
 }
 
+bool CommentScanner::isCommand(const QCString &cmdName)
+{
+  return (docCmdMap.find(cmdName.str()) != docCmdMap.end());
+}
+
+
 #include "commentscan.l.h"

src/markdown.cpp

@@ -45,6 +45,8 @@
 #include "doxygen.h"
 #include "commentscan.h"
 #include "entry.h"
+#include "commentcnv.h"
+#include "cmdmapper.h"
 #include "config.h"
 #include "message.h"
 #include "portable.h"
@@ -1240,6 +1242,7 @@ int Markdown::Private::processLink(const std::string_view data,size_t offset)
 {
   AUTO_TRACE("data='{}' offset={}",Trace::trunc(data),offset);
   const size_t size = data.size();
+
   QCString content;
   QCString link;
   QCString title;
@@ -1660,10 +1663,28 @@ int Markdown::Private::processLink(const std::string_view data,size_t offset)
         out+=" ";
         out+=externalLinkTarget();
         out+=">";
-        content = content.simplifyWhiteSpace();
+      }
+
+      content = content.simplifyWhiteSpace();
+      bool foundNameRef = false;
+      if (!content.isEmpty() && (content.at(0)=='#' || content.at(0)=='@'))
+      {
+        size_t endOfId=1;
+        while (endOfId<content.length() && isId(content.at(endOfId))) endOfId++;
+        QCString user = content.mid(1,endOfId-1);
+        if (!user.isEmpty() && (content.at(0)=='#' || (!CommentScanner::isCommand(user) && Mappers::cmdMapper->map(user)==CommandType::UNKNOWN)))
+        {
+          // assume @name or #name instead of command
+          out+='@';
+          out+=content;
+          foundNameRef = true;
+        }
+      }
+      if (!foundNameRef)
+      {
         processInline(std::string_view(content.str()));
-        out+="</a>";
       }
+      out+="</a>";
     }
     else // avoid link to e.g. F[x](y)
     {