Release-1.2.3-20001105

7 files changed, 51 insertions, 50 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index cd4138d..586b439 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -20,18 +20,18 @@ all: Makefile.doxygen Makefile.doxytag Makefile.doxysearch Makefile
 	$(MAKE) -f Makefile.doxysearch $@
 
 Makefile.doxygen: doxygen.pro doxygen.t 
-	$(PERL) $(TMAKE) doxygen.pro >Makefile.doxygen
+	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) doxygen.pro >Makefile.doxygen
 
 Makefile.doxytag: doxytag.pro doxytag.t 
-	$(PERL) $(TMAKE) doxytag.pro >Makefile.doxytag
+	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) doxytag.pro >Makefile.doxytag
 
 Makefile.doxysearch: doxysearch.pro
-	$(PERL) $(TMAKE) doxysearch.pro >Makefile.doxysearch
+	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) doxysearch.pro >Makefile.doxysearch
 
 tmake: 
-	$(PERL) $(TMAKE) doxygen.pro >Makefile.doxygen
-	$(PERL) $(TMAKE) doxytag.pro >Makefile.doxytag
-	$(PERL) $(TMAKE) doxysearch.pro >Makefile.doxysearch
+	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) doxygen.pro >Makefile.doxygen
+	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) doxytag.pro >Makefile.doxytag
+	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) doxysearch.pro >Makefile.doxysearch
 
 clean: Makefile.doxygen Makefile.doxytag Makefile.doxysearch
 	$(MAKE) -f Makefile.doxygen    clean 
diff --git a/src/diagram.cpp b/src/diagram.cpp
index 4808565..517433a 100644
--- a/src/diagram.cpp
+++ b/src/diagram.cpp
@@ -1235,13 +1235,15 @@ void ClassDiagram::writeFigure(QTextStream &output,const char *path,
   if (Config::usePDFLatexFlag)
   {
     QCString epstopdfCmd(4096);
-    epstopdfCmd.sprintf("epstopdf \"%s.eps\" -outfile=\"%s.pdf\"",
-                   epsBaseName.data(),epsBaseName.data());
+    //epstopdfCmd.sprintf("epstopdf \"%s.eps\" -outfile=\"%s.pdf\"",
+    //               epsBaseName.data(),epsBaseName.data());
+    //printf("Converting eps using `%s'\n",epstopdfCmd.data());
     if (iSystem(epstopdfCmd)!=0)
     {
        err("Error: Problems running epstopdf. Check your TeX installation!\n");
        return;
     }
+    printf("done\n");
   }
 }
 
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 6d390b5..6c268cf 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -1717,14 +1717,16 @@ static void buildMemberList(Entry *root)
                )
             {
               // see if we need to create a new member
-              found=nsName==rnsName || // members are in the same namespace
-                    ((fd!=0 && // no external reference
+              found=(nd && rnd && nsName==rnsName) ||   // members are in the same namespace
+                    ((fd!=0 &&                          // no external reference and
                       fd->absFilePath()==root->fileName // prototype in the same file
                      ) || 
-                     md->getGroupDef()!=0 // member is part of a group
+                     md->getGroupDef()!=0               // member is part of a group
                     ); 
               // otherwise, allow a duplicate global member with the same argument list
               
+              //printf("combining function with prototype found=%d `%s'<->`%s'!\n",
+              //    found,fd->absFilePath().data(),root->fileName.data());
               // merge members documentation and properties
               mergeArguments(root->argList,md->argumentList());
               if (!md->documentation() && !root->doc.isEmpty())
@@ -1963,12 +1965,16 @@ static void transferFunctionDocumentation()
       if (md->isPrototype()) mdec=md;
       if (md->isFunction() && !md->isStatic() && !md->isPrototype()) mdef=md;
     }
+    //printf("mdef=(%p,%s) mdec=(%p,%s)\n",
+    //    mdef, mdef ? mdef->name().data() : "",
+    //    mdec, mdec ? mdec->name().data() : "");
     if (mdef && mdec && 
         matchArguments(mdef->argumentList(),mdec->argumentList())
        ) /* match found */
     {
       //printf("Found member %s: def in %s and dec in %s\n",
-      //    mn->memberName(),mdef->getFileDef()->name(),mdec->getFileDef()->name());
+      //    mn->memberName(),mdef->getFileDef()->name().data(),
+      //    mdec->getFileDef()->name().data());
       
       /* copy documentation between function definition and declaration */
       if (mdec->briefDescription())
@@ -2520,6 +2526,8 @@ static void addMemberDocs(Entry *root,
   }
   else  
   {
+    //printf("Adding docs md->docs=`%s' root->docs=`%s'!\n",
+    //     md->documentation().data(),root->doc.data());
     // documentation outside a compound overrides the documentation inside it
     if ( /* !md->isStatic() && !root->stat &&   do not replace doc of a static */
         (
@@ -5118,29 +5126,19 @@ static void copyStyleSheet()
 static void readFiles(BufStr &output)
 {
   QCString *s=inputFiles.first();
-//  char *p=output.data();
   while (s)
   {
     QCString fileName=*s;
 
-    //int fileSize=fi->fileInfo()->size();
     int fileNameSize=fileName.length();
-    //int streamLength=fileSize+fileNameSize+4; 
-
-    //QCString fileText(streamLength);
 
     // add begin filename marker
-//    *p++=0x06; 
     output.addChar(0x06);
     // copy filename
-//    memcpy(p,fileName.data(),fileNameSize);
-//    p+=fileNameSize;
     output.addArray(fileName.data(),fileNameSize);
     
     // add end filename marker
-//    *p++=0x06;
     output.addChar(0x06);
-//    *p++='\n'; // to make ^ work while scanning the first line of a file!
     output.addChar('\n');
     if (Config::preprocessingFlag)
     {
@@ -5158,10 +5156,7 @@ static void readFiles(BufStr &output)
     s=inputFiles.next();
     //printf("-------> adding new line\n");
   }
-//  *p++='\0';
   output.addChar(0);
-  //printf("Output after preprocessing:\n---------\n%s\n----------\n",output.data());
-  //printf("Final length = %d\n",p-output.data());
 }
 
 //----------------------------------------------------------------------------
@@ -5177,7 +5172,8 @@ static int readDir(QFileInfo *fi,
             QStrList *patList,
             QStrList *exclPatList,
             StringList *resultList,
-            StringDict *resultDict
+            StringDict *resultDict,
+            bool errorIfNotExist
            )
 {
   QDir dir((const char *)fi->absFilePath());
@@ -5193,7 +5189,7 @@ static int readDir(QFileInfo *fi,
   {
     if (exclDict==0 || exclDict->find(cfi->absFilePath())==0) 
     { // file should not be excluded
-      if (!cfi->exists() || !cfi->isReadable())
+      if ((!cfi->exists() || !cfi->isReadable()) && errorIfNotExist)
       {
          err("Error: source %s is not a readable file or directory... skipping.\n",cfi->absFilePath().data());
       }
@@ -5233,7 +5229,7 @@ static int readDir(QFileInfo *fi,
       {
         cfi->setFile(cfi->absFilePath());
         totalSize+=readDir(cfi,fnList,fnDict,exclDict,
-            patList,exclPatList,resultList,resultDict);
+            patList,exclPatList,resultList,resultDict,errorIfNotExist);
       }
     }
     ++it;
@@ -5288,7 +5284,8 @@ static int readFileOrDirectory(const char *s,
                         QStrList *patList,
                         QStrList *exclPatList,
                         StringList *resultList,
-                        StringDict *resultDict
+                        StringDict *resultDict,
+                        bool errorIfNotExist=TRUE
                        )
 {
   QFileInfo fi(s);
@@ -5297,7 +5294,7 @@ static int readFileOrDirectory(const char *s,
   {
     if (exclDict==0 || exclDict->find(fi.absFilePath())==0)
     {
-      if (!fi.exists() || !fi.isReadable())
+      if ((!fi.exists() || !fi.isReadable()) && errorIfNotExist)
       {
         err("Error: source %s is not a readable file or directory... skipping.\n",s);
       }
@@ -5333,7 +5330,7 @@ static int readFileOrDirectory(const char *s,
       }
       else if (fi.isDir()) // readable dir
         totalSize+=readDir(&fi,fnList,fnDict,exclDict,patList,
-            exclPatList,resultList,resultDict);
+            exclPatList,resultList,resultDict,errorIfNotExist);
     }
   }
   return totalSize;
@@ -5725,7 +5722,7 @@ int main(int argc,char **argv)
   while (s)
   {
     readFileOrDirectory(s,0,0,0,&Config::filePatternList,
-                        0,0,&excludeNameDict);
+                        0,0,&excludeNameDict,FALSE);
     s=Config::excludeSources.next();
   }
 
diff --git a/src/filedef.h b/src/filedef.h
index dea9e73..fe3a761 100644
--- a/src/filedef.h
+++ b/src/filedef.h
@@ -124,7 +124,8 @@ class FileDef : public Definition
     //void setGenerateSource(bool b) { isSource=b; }
     bool generateSourceFile() const 
     { return !isReference() && 
-              (Config::sourceBrowseFlag || Config::verbatimHeaderFlag); 
+              (Config::sourceBrowseFlag || Config::verbatimHeaderFlag) &&
+              name().right(4)!=".doc" && name().right(4)!=".txt"; 
     }
 
     void addIncludeDependency(FileDef *fd,const char *incName,bool local);
diff --git a/src/index.cpp b/src/index.cpp
index 383b41f..41f8636 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -631,23 +631,23 @@ void writeNamespaceIndex(OutputList &ol)
     if (nd->isLinkableInProject())
     {
       ol.writeStartAnnoItem("namespace",nd->getOutputFileBase(),0,nd->name());
-      ol.docify(" (");
       if (!nd->briefDescription().isEmpty())
       {
+        ol.docify(" (");
         OutputList briefOutput(&ol);
         parseDoc(briefOutput,
                  nd->getDefFileName(),nd->getDefLine(),
                  nd->name(),0,
                  abbreviate(nd->briefDescription(),nd->name()));
         ol+=briefOutput;
+        ol.docify(")");
       }
-      else
-      {
-        ol.startEmphasis();
-        parseText(ol,theTranslator->trNoDescriptionAvailable());
-        ol.endEmphasis();
-      }
-      ol.docify(")");
+      //else
+      //{
+      //  ol.startEmphasis();
+      //  parseText(ol,theTranslator->trNoDescriptionAvailable());
+      //  ol.endEmphasis();
+      //}
       ol.writeEndAnnoItem(nd->getOutputFileBase());
       if (hasHtmlHelp)
       {
@@ -707,23 +707,23 @@ void writeAnnotatedClassList(OutputList &ol)
         default:                   type="interface"; break;
       }
       ol.writeStartAnnoItem(type,cd->getOutputFileBase(),0,cd->displayName());
-      ol.docify(" (");
       if (!cd->briefDescription().isEmpty())
       {
+        ol.docify(" (");
         OutputList briefOutput(&ol);
         parseDoc(briefOutput,
                  cd->getDefFileName(),cd->getDefLine(),
                  cd->name(),0,
                  abbreviate(cd->briefDescription(),cd->name()));
         ol+=briefOutput;
+        ol.docify(")");
       }
-      else
-      {
-        ol.startEmphasis();
-        parseText(ol,theTranslator->trNoDescriptionAvailable());
-        ol.endEmphasis();
-      }
-      ol.docify(")");
+      //else
+      //{
+      //  ol.startEmphasis();
+      //  parseText(ol,theTranslator->trNoDescriptionAvailable());
+      //  ol.endEmphasis();
+      //}
       ol.writeEndAnnoItem(cd->getOutputFileBase());
       if (Config::generateHtml && Config::htmlHelpFlag)
       {
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 7a20e12..662a8f3 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -189,6 +189,7 @@ static void writeTemplatePrefix(OutputList &ol,ArgumentList *al,bool br=TRUE)
   while (a)
   {
     ol.docify(a->type);
+    ol.docify(" ");
     ol.docify(a->name);
     if (a->defval.length()!=0)
     {
diff --git a/src/scanner.l b/src/scanner.l
index 5d8484e..abf1b26 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -1309,7 +1309,7 @@ TITLE     [tT][iI][tT][lL][eE]
 					  if ( *yytext == ',' )
 					  {
 					    int i=oldType.length(); 
-					    while (i>0 && (oldType[i-1]=='*' || oldType[i-1]==' ')) i--;
+					    while (i>0 && (oldType[i-1]=='*' || oldType[i-1]=='&' || oldType[i-1]==' ')) i--;
 					    current->type = oldType.left(i);
 					    current->doc  = oldDocs;
 					  }