Release-1.3-rc2-20030126

Doxyfile

@@ -107,7 +107,7 @@ BINARY_TOC             = NO
 TOC_EXPAND             = NO
 DISABLE_INDEX          = NO
 ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
+GENERATE_TREEVIEW      = YES
 TREEVIEW_WIDTH         = 250
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output

INSTALL

-DOXYGEN Version 1.3-rc2-20030119
+DOXYGEN Version 1.3-rc2-20030126
 
 Please read the installation section of the manual 
 (http://www.doxygen.org/install.html) for instructions.
 
 --------
-Dimitri van Heesch (19 January 2003)
+Dimitri van Heesch (26 January 2003)

README

-DOXYGEN Version 1.3_rc2_20030119
+DOXYGEN Version 1.3_rc2_20030126
 
 Please read INSTALL for compilation instructions.
 
@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives.
 
 Enjoy,
 
-Dimitri van Heesch (dimitri@stack.nl) (19 January 2003)
+Dimitri van Heesch (dimitri@stack.nl) (26 January 2003)

VERSION

-1.3-rc2-20030119
+1.3-rc2-20030126

addon/doxmlparser/src/memberhandler.h

@@ -33,16 +33,17 @@ class LinkedTextImpl;
 class LinkedTextHandler;
 class DocHandler;
 
-struct MemberReference : public IMemberReference
+class MemberReference : public IMemberReference
 {
-  virtual ~MemberReference() {}
-  virtual IMember *member() const;
-  virtual const IString *memberName() const { return &m_name; }
-  void initialize(MainHandler *m);
-
-  QString      m_memId;
-  StringImpl   m_name;
-  MainHandler *m_mainHandler;
+  public:
+    virtual ~MemberReference() {}
+    virtual IMember *member() const;
+    virtual const IString *memberName() const { return &m_name; }
+    void initialize(MainHandler *m);
+
+    QString      m_memId;
+    StringImpl   m_name;
+    MainHandler *m_mainHandler;
 };
 
 class MemberReferenceIterator : public BaseIterator<IMemberReferenceIterator,IMemberReference,MemberReference>

packages/rpm/doxygen.spec

 Summary: A documentation system for C/C++.
 Name: doxygen
-Version: 1.3_rc2_20030119
+Version: 1.3_rc2_20030126
 Release: 1
 Epoch: 1
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz

src/classdef.cpp

@@ -2195,10 +2195,10 @@ void ClassDef::determineIntfUsageRelation()
 }
 #endif
 
-PackageDef *ClassDef::packageDef() const
-{
-  return m_fileDef ? m_fileDef->packageDef() : 0;
-}
+//PackageDef *ClassDef::packageDef() const
+//{
+//  return m_fileDef ? m_fileDef->packageDef() : 0;
+//}
 
 QCString ClassDef::compoundTypeString() const
 {

src/classdef.h

@@ -138,7 +138,7 @@ class ClassDef : public Definition
 
     /*! Returns the Java package this class is in or 0 if not applicable. 
      */ 
-    PackageDef   *packageDef() const;
+    //PackageDef   *packageDef() const;
 
     MemberDef    *getMemberByName(const QCString &);
     

src/config.l

@@ -1966,10 +1966,9 @@ void Config::create()
                     "If the GENERATE_TREEVIEW tag is set to YES, a side panel will be\n"
                     "generated containing a tree-like index structure (just like the one that \n"
                     "is generated for HTML Help). For this to work a browser that supports \n"
-                    "JavaScript and frames is required (for instance Mozilla, Netscape 4.0+, \n"
-                    "or Internet explorer 4.0+). Note that for large projects the tree generation \n"
-		    "can take a very long time. In such cases it is better to disable this feature. \n"
-		    "Windows users are probably better off using the HTML help feature. \n",
+                    "JavaScript, DHTML, CSS and frames is required (for instance Mozilla, \n"
+		    "Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are \n"
+		    "probably better off using the HTML help feature. \n",
                     FALSE
                  );
   cb->addDependency("GENERATE_HTML");

src/definition.cpp

@@ -664,3 +664,16 @@ const QList<ListItemInfo> *Definition::specialListItems() const
   return m_specialListItems;
 }
 
+
+QCString Definition::convertNameToFile(const char *name,bool allowDots) const
+{
+  if (!m_ref.isEmpty())
+  {
+    return name;
+  }
+  else
+  {
+    return ::convertNameToFile(name,allowDots);
+  }
+}
+

src/definition.h

@@ -132,6 +132,7 @@ class Definition
 
     void makePartOfGroup(GroupDef *gd);
     GroupList *partOfGroups() const { return m_partOfGroups; }
+    QCString convertNameToFile(const char *name,bool allowDots=FALSE) const;
 
   protected:
     int      m_startBodyLine;   // line number of the start of the definition

src/docparser.cpp

@@ -225,7 +225,7 @@ static QCString findAndCopyImage(const char *fileName,DocImage::Type type)
   return result;
 }
 
-/*! Collects the parameters found with @param or @retval commands
+/*! Collects the parameters found with \@param or \@retval commands
  *  in a global list g_paramsFound. If \a isParam is set to TRUE
  *  and the parameter is not an actual parameter of the current
  *  member g_memberDef, than a warning is raised (unless warnings

src/filename.cpp

@@ -35,13 +35,18 @@ void FileName::generateDiskNames()
   //QCString commonPrefix;
   FileDef *fd=first();
   int count=0;
-  while (fd) { if (!fd->isReference()) count++; fd=next(); }
+  while (fd) 
+  { 
+    if (!fd->isReference()) count++; 
+    fd=next(); 
+  }
   if (count==1)
   {
     fd=first();
     // skip references
     while (fd && fd->isReference()) fd=next();
     // name if unique, so diskname is simply the name
+    //printf("!!!!!!!! Unique disk name=%s for fd=%s\n",name.data(),fd->diskname.data());
     fd->diskname=name.copy();
   }
   else if (count>1) // multiple occurrences of the same file name
@@ -84,6 +89,7 @@ void FileName::generateDiskNames()
       {
         QCString prefix = fd->path.right(fd->path.length()-j-1);
         fd->setName(prefix+name);
+        //printf("!!!!!!!! non unique disk name=%s for fd=%s\n",(prefix+name).data(),fd->diskname.data());
         fd->diskname=prefix+name;
       }
       fd=next();

src/ftvhelp.h

@@ -13,8 +13,10 @@
 
 #include "qtbc.h"
 #include <qtextstream.h>
+#include <qlist.h>
 
 class QFile;
+struct FTVNode;
 
 /*! A class that generated the FTV Help specific file.
  *  This file is used in conjunction with additional FTV web browser code
@@ -30,7 +32,7 @@ class FTVHelp
     int  incContentsDepth();
     int  decContentsDepth();
     /*! return the current depth of the contents tree */ 
-    int  contentsDepth() { return m_dc; }
+    int  contentsDepth() const { return m_indent; }
     void addContentsItem(bool isDir,
                          const char *ref,
                          const char *file,
@@ -38,11 +40,18 @@ class FTVHelp
                          const char *name);
 
   private:
+    void generateTreeView();
+    void generateTree(QTextStream &t,const QList<FTVNode> &nl,int level);
+    void generateIndent(QTextStream &t,FTVNode *n,int level);
+    void generateLink(QTextStream &t,FTVNode *n);
     FTVHelp();
+   ~FTVHelp();
     QFile *m_cf; 
     QTextStream m_cts;
-    int m_dc;
+    //int m_dc;
     static FTVHelp *m_theInstance;
+    QList<FTVNode> *m_indentNodes;
+    int m_indent;
 };
 
 #endif /* FTVHELP_H */

src/latexdocvisitor.cpp

@@ -597,14 +597,14 @@ void LatexDocVisitor::visitPost(DocHtmlTable *t)
   }
   else
   {
-    m_t << "\\\\\\hline\n\\end{TabularC}\n";
+    m_t << "\\end{TabularC}\n";
   }
 }
 
 void LatexDocVisitor::visitPre(DocHtmlCaption *)
 {
   if (m_hide) return;
-  m_t << "\\\\\\hline\n\\end{TabularC}\n\\centering\n\\caption{";
+  m_t << "\\end{TabularC}\n\\centering\n\\caption{";
 }
 
 void LatexDocVisitor::visitPost(DocHtmlCaption *) 

src/scanner.l

@@ -1853,6 +1853,11 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
 				     	    current->reset();
 					  }
   					}
+<FindFields>"["				{ // attribute list in IDL
+					  squareCount=1;
+					  lastSquareContext = YY_START;
+					  BEGIN(SkipSquare);
+  					}
   /*
 <FindFieldArg>","			{ unput(*yytext); BEGIN(FindFields); }
   */

src/tagreader.cpp

@@ -1054,6 +1054,7 @@ void TagFileParser::buildLists(Entry *root)
     
     QString fullName = m_tagName+":"+tfi->path+stripPath(tfi->name);
     fe->fileName = fullName;
+    //printf("new FileDef() filename=%s\n",tfi->filename.data());
     FileDef *fd = new FileDef(m_tagName+":"+tfi->path,
                               tfi->name,m_tagName,
                               tfi->filename

src/translator_jp.h

@@ -41,7 +41,7 @@ class TranslatorJapaneseEn : public TranslatorEnglish
     /*! returns the name of the package that is included by LaTeX */
     virtual QCString idLanguageCharset()
     {
-#ifdef _WIN32
+#ifdef __CYGWIN__
       return "Shift_JIS";
 #else
       return "euc-jp";
@@ -61,13 +61,13 @@ class TranslatorJapaneseEn : public TranslatorEnglish
     }
 };
 
-class TranslatorJapanese : public TranslatorAdapter_1_2_18
+class TranslatorJapanese : public Translator
 {
  private:
   /*! The decode() can change euc into sjis */
   inline QCString decode(const QCString & sInput)
     {
-#ifdef _WIN32
+#ifdef __CYGWIN__
       return JapaneseEucToSjis(sInput);
 #else
       return sInput;
@@ -83,7 +83,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_2_18
     /*! returns the name of the package that is included by LaTeX */
     virtual QCString idLanguageCharset()
     {
-#ifdef _WIN32
+#ifdef __CYGWIN__
       return "Shift_JIS";
 #else
       return "euc-jp";
@@ -1387,5 +1387,23 @@ class TranslatorJapanese : public TranslatorAdapter_1_2_18
     {
       return "非推奨一覧";
     }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.18
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a header for declaration section of the events found in 
+     * a C# program
+     */
+    virtual QCString trEvents()
+    {
+      return "イベント";
+    }
+    /*! Header used for the documentation section of a class' events. */
+    virtual QCString trEventDocumentation()
+    {
+      return "イベントの解説";
+    }
+
 };
 #endif