bug_746577 Problem locating unresolvable @ref in case of a MSC image

- get better filename and line number (in case of inline image the end of the inline image)
- in case link don't exist don't create it

Author: albert-github

src/docparser.cpp

@@ -2079,11 +2079,16 @@ IDocNodeASTPtr validatingParseText(IDocParser &parserIntf,const QCString &input)
   return ast;
 }
 
-IDocNodeASTPtr createRef(IDocParser &parserIntf,const QCString &target,const QCString &context)
+IDocNodeASTPtr createRef(IDocParser &parserIntf,const QCString &target,const QCString &context, const QCString &srcFile, int srcLine )
 {
   DocParser *parser = dynamic_cast<DocParser*>(&parserIntf);
   assert(parser!=0);
   if (parser==0) return 0;
+  if (!srcFile.isEmpty())
+  {
+    parser->context.fileName = srcFile;
+    parser->tokenizer.setLineNr(srcLine);
+  }
   return std::make_unique<DocNodeAST>(DocRef(parser,0,target,context));
 }
 

src/docparser.h

@@ -87,7 +87,7 @@ IDocNodeASTPtr validatingParseDoc(IDocParser &parserIntf,const QCString &fileNam
  */
 IDocNodeASTPtr validatingParseText(IDocParser &parser,const QCString &input);
 
-IDocNodeASTPtr createRef(IDocParser &parser,const QCString &target,const QCString &context);
+IDocNodeASTPtr createRef(IDocParser &parser,const QCString &target,const QCString &context, const QCString &srcFile = "", int srcLine = -1);
 
 //--------------------------------------------------------------------------------
 

src/msc.cpp

@@ -29,7 +29,7 @@
 static const int maxCmdLine = 40960;
 
 static bool convertMapFile(TextStream &t,const QCString &mapName,const QCString &relPath,
-                           const QCString &context)
+                           const QCString &context,const QCString &srcFile,int srcLine)
 {
   std::ifstream f = Portable::openInputStream(mapName);
   if (!f.is_open())
@@ -63,17 +63,22 @@ static bool convertMapFile(TextStream &t,const QCString &mapName,const QCString
       if (y2<y1) { int temp=y2; y2=y1; y1=temp; }
       if (x2<x1) { int temp=x2; x2=x1; x1=temp; }
 
-      t << "<area href=\"";
 
+      bool link = false;
       if ( isRef )
       {
         // handle doxygen \ref tag URL reference
 
         auto parser { createDocParser() };
-        auto dfAst  { createRef( *parser.get(), url, context ) };
+        auto dfAst  { createRef( *parser.get(), url, context, srcFile, srcLine) };
         auto dfAstImpl = dynamic_cast<const DocNodeAST*>(dfAst.get());
         const DocRef *df = std::get_if<DocRef>(&dfAstImpl->root);
         t << externalRef(relPath,df->ref(),TRUE);
+        if (!df->file().isEmpty() || !df->anchor().isEmpty())
+        {
+          link = true;
+          t << "<area href=\"";
+        }
         if (!df->file().isEmpty())
         {
           QCString fn = df->file();
@@ -87,11 +92,16 @@ static bool convertMapFile(TextStream &t,const QCString &mapName,const QCString
       }
       else
       {
+        link = true;
+        t << "<area href=\"";
         t << url;
       }
-      t << "\" shape=\"rect\" coords=\""
-        << x1 << "," << y1 << "," << x2 << "," << y2 << "\""
-        << " alt=\"\"/>\n";
+      if (link)
+      {
+        t << "\" shape=\"rect\" coords=\""
+          << x1 << "," << y1 << "," << x2 << "," << y2 << "\""
+          << " alt=\"\"/>\n";
+      }
     }
   }
 
@@ -204,7 +214,7 @@ static QCString getMscImageMapFromFile(const QCString& inFile, const QCString& /
     return "";
 
   TextStream t;
-  convertMapFile(t, outFile, relPath, context);
+  convertMapFile(t, outFile, relPath, context, srcFile, srcLine);
 
   Dir().remove(outFile.str());