Release-1.3.6-20040413

INSTALL

-DOXYGEN Version 1.3.6-20040324
+DOXYGEN Version 1.3.6-20040413
 
 Please read the installation section of the manual 
 (http://www.doxygen.org/install.html) for instructions.
 
 --------
-Dimitri van Heesch (24 March 2004)
+Dimitri van Heesch (13 April 2004)

README

-DOXYGEN Version 1.3.6_20040324
+DOXYGEN Version 1.3.6_20040413
 
 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) (24 March 2004)
+Dimitri van Heesch (dimitri@stack.nl) (13 April 2004)

VERSION

-1.3.6-20040324
+1.3.6-20040413

doc/commands.doc

@@ -86,6 +86,7 @@ documentation:
 \refitem cmdifnot \\ifnot
 \refitem cmdimage \\image
 \refitem cmdinclude \\include
+\refitem cmdincludelineno \\includelineno
 \refitem cmdingroup \\ingroup
 \refitem cmdinternal \\internal
 \refitem cmdinvariant \\invariant
@@ -1308,6 +1309,15 @@ ALIASES  = "english=\if english" \
 
   \sa section \ref cmdexample "\\example" and \ref cmddontinclude "\\dontinclude".
 
+<hr>
+\section cmdincludelineno \includelineno <file-name>
+
+  \addindex \\includelineno
+  This command works the same way as \\include, but will add line 
+  numbers to the included file.
+
+  \sa section \ref cmdinclude "\\include".
+
 <hr>
 \section cmdline \line ( pattern )
 

doc/config.doc

@@ -188,6 +188,7 @@ followed by the descriptions of the tags grouped by category.
 \refitem cfg_sort_member_docs SORT_MEMBER_DOCS
 \refitem cfg_source_browser SOURCE_BROWSER
 \refitem cfg_strip_code_comments STRIP_CODE_COMMENTS
+\refitem cfg_strip_from_inc_path STRIP_FROM_INC_PATH
 \refitem cfg_strip_from_path STRIP_FROM_PATH
 \refitem cfg_subgrouping SUBGROUPING
 \refitem cfg_tab_size TAB_SIZE
@@ -326,16 +327,30 @@ followed by the descriptions of the tags grouped by category.
  If the \c FULL_PATH_NAMES tag is set to \c YES then the \c STRIP_FROM_PATH tag
  can be used to strip a user-defined part of the path. Stripping is
  only done if one of the specified strings matches the left-hand part of the 
- path.
+ path. The tag can be used to show relative paths in the file list.
+ If left blank the directory from which doxygen is run is used as the
+ path to strip.
+
+\anchor cfg_strip_from_inc_path
+<dt>\c STRIP_FROM_INC_PATH
+ The \c STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+ the path mentioned in the documentation of a class, which tells
+ the reader which header file to include in order to use a class. 
+ If left blank only the name of the header file containing the class
+ definition is used. Otherwise one should specify the include paths that 
+ are normally passed to the compiler using the -I flag.
+
+
 
 \anchor cfg_case_sense_names
 <dt>\c CASE_SENSE_NAMES <dd>
  \addindex CASE_SENSE_NAMES
- If the \c CASE_SENSE_NAMES tag is set to \c NO (the default) then doxygen
+ If the \c CASE_SENSE_NAMES tag is set to \c NO then doxygen
  will only generate file names in lower-case letters. If set to
  \c YES upper-case letters are also allowed. This is useful if you have
  classes or files whose names only differ in case and if your file system
- supports case sensitive file names.
+ supports case sensitive file names. Windows users are advised to set this
+ option to NO.
 
 \anchor cfg_short_names
 <dt>\c SHORT_NAMES <dd>
@@ -888,12 +903,16 @@ function's detailed documentation block.
 
  The following commands have a special meaning inside the header:
  <code>\$title</code>, <code>\$datetime</code>, <code>\$date</code>,
- <code>\$doxygenversion</code>, <code>\$projectname</code>, 
+ <code>\$doxygenversion</code>, <code>\$projectname</code>, and
  <code>\$projectnumber</code>. 
  Doxygen will replace them by respectively 
  the title of the page, the current date and time, only the current date,
  the version number of doxygen, the project name (see \c PROJECT_NAME), or the
- project number (see \c PROJECT_NUMBER).
+ project number (see \c PROJECT_NUMBER). 
+
+ If \c CREATE_SUBDIRS is enabled, the command <code>\$relpath\$</code> can be 
+ used to produce a relative path to the root of the HTML output directory,
+ e.g. use \$relpath\$doxygen.css, to refer to the standard style sheet.
    
  See also section \ref doxygen_usage for information on how to generate
  the default header that doxygen normally uses.

doc/language.doc

@@ -23,7 +23,7 @@ text fragments, generated by doxygen, can be produced in languages other
 than English (the default). The output language is chosen through the
 configuration file (with default name and known as Doxyfile).
 
-Currently (version 1.3.6-20040222), 28 languages 
+Currently (version 1.3.6-20040413), 28 languages 
 are supported (sorted alphabetically):
 Brazilian Portuguese, Catalan, Chinese, Chinese Traditional, Croatian,
 Czech, Danish, Dutch, English, Finnish, French, German, Greek,

packages/rpm/doxygen.spec

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

src/classdef.cpp

@@ -93,6 +93,7 @@ ClassDef::ClassDef(
   m_isStatic = FALSE;
   m_isObjC = FALSE;
   m_membersMerged = FALSE;
+  m_categoryOf = 0;
   QCString ns;
   extractNamespaceName(m_name,m_className,ns);
   //printf("m_name=%s m_className=%s ns=%s\n",m_name.data(),m_className.data(),ns.data());
@@ -141,6 +142,10 @@ QCString ClassDef::displayName() const
   {
     n=substitute(n,"::",".");
   }
+  if (m_compType==ClassDef::Protocol && n.right(2)=="-p")
+  {
+    n="< "+n.left(n.length()-2)+" >";
+  }
   return n;
 }
 
@@ -2044,7 +2049,7 @@ void ClassDef::mergeMembers()
               //printf("same member found srcMi->virt=%d dstMi->virt=%d\n",srcMi->virt,dstMi->virt);
               if ((srcMi->virt!=Normal && dstMi->virt!=Normal) ||
                   bClass->name()+"::"+srcMi->scopePath == dstMi->scopePath ||
-                  dstMd->getClassDef()->compoundType()==ClassDef::Interface
+                  dstMd->getClassDef()->compoundType()==Interface
                  ) 
               {
                 found=TRUE;
@@ -2184,6 +2189,52 @@ void ClassDef::mergeMembers()
 
 //----------------------------------------------------------------------------
 
+/*! Merges the members of a Objective-C category into this class.
+ */
+void ClassDef::mergeCategory(ClassDef *category)
+{
+  category->m_categoryOf = this;
+    
+  MemberNameInfoSDict *srcMnd  = category->m_allMemberNameInfoSDict;
+  MemberNameInfoSDict *dstMnd  =           m_allMemberNameInfoSDict;
+
+  MemberNameInfoSDict::Iterator srcMnili(*srcMnd);
+  MemberNameInfo *srcMni;
+  for ( ; (srcMni=srcMnili.current()) ; ++srcMnili)
+  {
+    MemberNameInfo *dstMni=dstMnd->find(srcMni->memberName());
+    if (dstMni) // method is already defined in the class
+    {
+      // TODO: we should remove the other member and insert this one.
+    }
+    else // new method name
+    {
+      // create a deep copy of the list (only the MemberInfo's will be 
+      // copied, not the actual MemberDef's)
+      MemberNameInfo *newMni = 0;
+      newMni = new MemberNameInfo(srcMni->memberName()); 
+
+      // copy the member(s) from the category to this class
+      MemberNameInfoIterator mnii(*srcMni);
+      MemberInfo *mi;
+      for (;(mi=mnii.current());++mnii)
+      {
+        //printf("Adding!\n");
+        MemberInfo *newMi=new MemberInfo(mi->memberDef,mi->prot,mi->virt,mi->inherited);
+        newMi->scopePath=mi->scopePath;
+        newMi->ambigClass=mi->ambigClass;
+        newMi->ambiguityResolutionScope=mi->ambiguityResolutionScope.copy();
+        newMni->append(newMi);
+      }
+
+      // add it to the dictionary
+      dstMnd->append(newMni->memberName(),newMni);
+    }
+  }
+}
+
+//----------------------------------------------------------------------------
+
 void ClassDef::addUsedClass(ClassDef *cd,const char *accessName)
 {
   if (m_usesImplClassDict==0) 
@@ -2418,13 +2469,9 @@ void ClassDef::determineIntfUsageRelation()
 }
 #endif
 
-//PackageDef *ClassDef::packageDef() const
-//{
-//  return m_fileDef ? m_fileDef->packageDef() : 0;
-//}
-
 QCString ClassDef::compoundTypeString() const
 {
+  if (m_compType==Interface && m_isObjC) return "class";
   switch (m_compType)
   {
     case Class:     return "class";
@@ -2773,7 +2820,6 @@ MemberDef *ClassDef::getMemberByName(const QCString &name)
 {
   MemberDef *xmd = 0;
   MemberNameInfo *mni = m_allMemberNameInfoSDict->find(name);
-  //printf("getMemberByName(%s)=%p\n",name.data(),mni);
   if (mni)
   {
     const int maxInheritanceDepth = 100000;
@@ -2783,8 +2829,9 @@ MemberDef *ClassDef::getMemberByName(const QCString &name)
     for (mnii.toFirst();(mi=mnii.current());++mnii)
     {
       ClassDef *mcd=mi->memberDef->getClassDef();
-      //printf("found member in %s\n",mcd->name().data());
       int m=minClassDistance(this,mcd);
+      //printf("found member in %s linkable=%d m=%d\n",
+      //    mcd->name().data(),mcd->isLinkable(),m);
       if (m<mdist && mcd->isLinkable())
       {
         mdist=m;
@@ -2792,6 +2839,7 @@ MemberDef *ClassDef::getMemberByName(const QCString &name)
       }
     }
   }
+  //printf("getMemberByName(%s)=%p\n",name.data(),xmd);
   return xmd;
 }
 

src/classdef.h

@@ -202,6 +202,8 @@ class ClassDef : public Definition
     /*! Returns TRUE if this class is implemented in Objective-C */
     bool isObjectiveC() const { return m_isObjC; }
 
+    ClassDef *categoryOf() const { return m_categoryOf; }
+
     /*! returns the name of the class including outer classes, but not
      *  including namespaces.
      */
@@ -273,6 +275,7 @@ class ClassDef : public Definition
     void setNamespace(NamespaceDef *nd) { m_nspace = nd; }
     void setTemplateArguments(ArgumentList *al);
     void mergeMembers();
+    void mergeCategory(ClassDef *category);
     void setFileDef(FileDef *fd) { m_fileDef=fd; }
     //void determineImplUsageRelation();
     //void determineIntfUsageRelation();
@@ -442,6 +445,11 @@ class ClassDef : public Definition
 
     /*! class name with outer class scope, but without namespace scope. */
     QCString m_className;
+
+    /*! If this class is a Objective-C category, then this points to the
+     *  class which is extended.
+     */
+    ClassDef *m_categoryOf;
 };
 
 /*! \brief Class that contains information about a usage relation. 

src/classlist.cpp

@@ -102,15 +102,15 @@ void ClassSDict::writeDeclaration(OutputList &ol,const ClassDef::CompoundType *f
           }
           ol.startMemberItem(FALSE);
           QCString tmp = cd->compoundTypeString();
-          QCString cname;
-          if (Config_getBool("OPTIMIZE_OUTPUT_JAVA"))
-          {
-            cname = substitute(cd->className(),"::",".");
-          }
-          else
-          {
-            cname = cd->className();
-          }
+          QCString cname = cd->displayName();
+          //if (Config_getBool("OPTIMIZE_OUTPUT_JAVA"))
+          //{
+          //  cname = substitute(cd->className(),"::",".");
+          //}
+          //else
+          //{
+          //  cname = cd->className();
+          //}
           ol.writeString(tmp);
           ol.writeString(" ");
           ol.insertMemberAlign();
@@ -141,12 +141,12 @@ void ClassSDict::writeDeclaration(OutputList &ol,const ClassDef::CompoundType *f
             {
               ol.pushGeneratorState();
               ol.disableAllBut(OutputGenerator::Html);
-              ol.endEmphasis();
+              //ol.endEmphasis();
               ol.docify(" ");
               ol.startTextLink(cd->getOutputFileBase(),"_details");
               ol.parseText(theTranslator->trMore());
               ol.endTextLink();
-              ol.startEmphasis();
+              //ol.startEmphasis();
               ol.popGeneratorState();
             }
             ol.endMemberDescription();

src/cmdmapper.cpp

@@ -105,6 +105,7 @@ CommandMap cmdMap[] =
   { "enddot",        CMD_ENDDOT },
   { "manonly",       CMD_MANONLY },
   { "endmanonly",    CMD_ENDMANONLY },
+  { "includelineno", CMD_INCWITHLINES },
   { 0,               0 }
 };
 

src/cmdmapper.h

@@ -105,7 +105,8 @@ enum CommandType
   CMD_DOT          = 71,
   CMD_ENDDOT       = 72,
   CMD_MANONLY      = 73,
-  CMD_ENDMANONLY   = 74
+  CMD_ENDMANONLY   = 74,
+  CMD_INCWITHLINES = 75
 };
 
 enum HtmlTagType

src/compound.xsd

@@ -121,6 +121,8 @@
     <xsd:attribute name="virt" type="DoxVirtualKind" />
     <xsd:attribute name="volatile" type="DoxBool" />
     <xsd:attribute name="mutable" type="DoxBool" />
+    <xsd:attribute name="readable" type="DoxBool" use="optional"/>
+    <xsd:attribute name="writable" type="DoxBool" use="optional"/>
   </xsd:complexType>
 
   <xsd:complexType name="descriptionType" mixed="true">

src/compound_xsd.h

@@ -121,6 +121,8 @@
 "    <xsd:attribute name=\"virt\" type=\"DoxVirtualKind\" />\n"
 "    <xsd:attribute name=\"volatile\" type=\"DoxBool\" />\n"
 "    <xsd:attribute name=\"mutable\" type=\"DoxBool\" />\n"
+"    <xsd:attribute name=\"readable\" type=\"DoxBool\" use=\"optional\"/>\n"
+"    <xsd:attribute name=\"writable\" type=\"DoxBool\" use=\"optional\"/>\n"
 "  </xsd:complexType>\n"
 "\n"
 "  <xsd:complexType name=\"descriptionType\" mixed=\"true\">\n"

src/config.l

@@ -829,6 +829,41 @@ void Config::substituteEnvironmentVars()
   }
 }
 
+static void cleanUpPaths(QStrList &str)
+{
+  char *sfp = str.first();
+  while (sfp)
+  {
+    register char *p = sfp;
+    if (p)
+    {
+      char c;
+      while ((c=*p))
+      {
+	if (c=='\\') *p='/';
+	p++;
+      }
+    }
+    QCString path = sfp;
+    if ((path.at(0)!='/' && (path.length()<=2 || path.at(1)!=':')) ||
+	path.at(path.length()-1)!='/'
+       )
+    {
+      QFileInfo fi(path);
+      if (fi.exists() && fi.isDir())
+      {
+	int i = str.at();
+	str.remove();
+	if (str.at()==i) // did not remove last item
+	  str.insert(i,fi.absFilePath()+"/");
+	else
+	  str.append(fi.absFilePath()+"/");
+      }
+    }
+    sfp = str.next();
+  }
+}
+
 void Config::check()
 {
   //if (!projectName.isEmpty())
@@ -903,36 +938,12 @@ void Config::check()
   }
   else
   {
-    while (sfp)
-    {
-      register char *p = sfp;
-      if (p)
-      {
-	char c;
-	while ((c=*p))
-	{
-	  if (c=='\\') *p='/';
-	  p++;
-	}
-      }
-      QCString path = sfp;
-      if (path.at(0)!='/' && (path.length()<=2 || path.at(1)!=':'))
-      {
-	QFileInfo fi(path);
-	if (fi.exists() && fi.isDir())
-	{
-	  int i = stripFromPath.at();
-	  stripFromPath.remove();
-	  if (stripFromPath.at()==i) // did not remove last item
-	    stripFromPath.insert(i,fi.absFilePath()+"/");
-	  else
-	    stripFromPath.append(fi.absFilePath()+"/");
-	}
-      }
-      sfp = stripFromPath.next();
-    }
+    cleanUpPaths(stripFromPath);
   }
-  
+
+  // expand the relative stripFromPath values
+  QStrList &stripFromIncPath = Config_getList("STRIP_FROM_INC_PATH");
+  cleanUpPaths(stripFromIncPath);
   
   // Test to see if HTML header is valid
   QCString &headerFile = Config_getString("HTML_HEADER");
@@ -1102,6 +1113,22 @@ void Config::check()
     filePatternList.append("*.inc");
     filePatternList.append("*.m");
     filePatternList.append("*.mm");
+#if !defined(_WIN32)
+    // unix => case sensitive match => also include useful uppercase versions
+    filePatternList.append("*.C");
+    filePatternList.append("*.CC"); 
+    filePatternList.append("*.C++");
+    filePatternList.append("*.II");
+    filePatternList.append("*.I++");
+    filePatternList.append("*.H");
+    filePatternList.append("*.HH");
+    filePatternList.append("*.H++");
+    filePatternList.append("*.CS");
+    filePatternList.append("*.PHP");
+    filePatternList.append("*.PHP3");
+    filePatternList.append("*.M");
+    filePatternList.append("*.MM");
+#endif
   }
 
   // add default pattern if needed
@@ -1495,11 +1522,20 @@ void Config::create()
                     "If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag \n"
                     "can be used to strip a user-defined part of the path. Stripping is \n"
                     "only done if one of the specified strings matches the left-hand part of \n"
-                    "the path. It is allowed to use relative paths in the argument list. \n"
+                    "the path. The tag can be used to show relative paths in the file list. \n"
 		    "If left blank the directory from which doxygen is run is used as the \n"
 		    "path to strip. \n"
                  );
   cl->addDependency("FULL_PATH_NAMES");
+  cl = addList(
+                    "STRIP_FROM_INC_PATH",
+                    "The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of \n"
+		    "the path mentioned in the documentation of a class, which tells \n"
+		    "the reader which header file to include in order to use a class. \n"
+		    "If left blank only the name of the header file containing the class \n"
+		    "definition is used. Otherwise one should specify the include paths that \n"
+		    "are normally passed to the compiler using the -I flag.\n"
+                 );
   cb = addBool(
                     "SHORT_NAMES",
 		    "If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter \n"
@@ -2454,7 +2490,7 @@ void Config::create()
                     "INCLUDE_PATH",
                     "The INCLUDE_PATH tag can be used to specify one or more directories that \n"
                     "contain include files that are not input files but should be processed by \n"
-                    "the preprocessor. \n"
+                    "the preprocessor.\n"
                  );
   cl->setWidgetType(ConfigList::Dir);
   cl->addDependency("ENABLE_PREPROCESSING");

src/docparser.cpp

@@ -1247,6 +1247,8 @@ void DocInclude::parse()
   DBG(("DocInclude::parse(file=%s,text=%s)\n",m_file.data(),m_text.data()));
   switch(m_type)
   {
+    case IncWithLines:
+      // fall through
     case Include:
       // fall through
     case DontInclude:
@@ -3819,6 +3821,9 @@ int DocPara::handleCommand(const QString &cmdName)
     case CMD_INCLUDE:
       handleInclude(cmdName,DocInclude::Include);
       break;
+    case CMD_INCWITHLINES:
+      handleInclude(cmdName,DocInclude::IncWithLines);
+      break;
     case CMD_DONTINCLUDE:
       handleInclude(cmdName,DocInclude::DontInclude);
       break;

src/docparser.h

@@ -380,7 +380,7 @@ class DocVerbatim : public DocNode
 class DocInclude : public DocNode
 {
   public:
-    enum Type { Include, DontInclude, VerbInclude, HtmlInclude };
+    enum Type { Include, DontInclude, VerbInclude, HtmlInclude, IncWithLines };
     DocInclude(DocNode *parent,const QString &file,
                const QString context, Type t,
                bool isExample,const QString exampleFile) : 

src/doxygen.cpp

@@ -488,6 +488,10 @@ static void addIncludeFile(ClassDef *cd,FileDef *ifd,Entry *root)
           iName=iName.mid(1,iName.length()-2); // strip quotes or brackets
         }
       }
+      else if (!Config_getList("STRIP_FROM_INC_PATH").isEmpty()) 
+      {
+        iName=stripFromIncludePath(fd->absFilePath());
+      }
       else // use name of the file containing the class definition
       {
         iName=fd->name();
@@ -822,21 +826,6 @@ static void addClassToContext(Entry *root)
     cd->setBriefDescription(root->brief,root->briefFile,root->briefLine);
     cd->insertUsedFile(root->fileName);
 
-    //int bi;
-    //if (root->objc && (bi=fullName.find('<'))!=-1 && root->extends->count()==0)
-    //{
-    //  // add protocols as base classes
-    //  int be=fullName.find('>'),len;
-    //  static QRegExp re("[A-Z_a-z][A-Z_a-z0-9]*");
-    //  int p=0;
-    //  while ((p=re.match(fullName,bi+1,&len))!=-1 && p<be)
-    //  {
-    //    QCString baseName = fullName.mid(p,len);
-    //    printf("Adding artifical base class %s to %s\n",baseName.data(),fullName.data());
-    //    root->extends->append(new BaseInfo(baseName,Public,Normal));
-    //    bi=p+len; 
-    //  }
-    //}
 
     // add class to the list
     //printf("ClassDict.insert(%s)\n",resolveDefines(fullName).data());
@@ -5754,9 +5743,25 @@ static void createTemplateInstanceMembers()
 static void buildCompleteMemberLists()
 {
   ClassDef *cd;
-  // merge the member list of base classes into the inherited classes.
+  // merge members of categories into the class they extend
   ClassSDict::Iterator cli(Doxygen::classSDict);
   for (cli.toFirst();(cd=cli.current());++cli)
+  {
+    int i=cd->name().find('(');
+    if (i!=-1) // it is an Objective-C category
+    {
+      QCString baseName=cd->name().left(i);
+      ClassDef *baseClass=Doxygen::classSDict.find(baseName);
+      if (baseClass)
+      {
+        //printf("*** merging members of category %s into %s\n",
+        //    cd->name().data(),baseClass->name().data());
+        baseClass->mergeCategory(cd);
+      }
+    }
+  }
+  // merge the member list of base classes into the inherited classes.
+  for (cli.toFirst();(cd=cli.current());++cli)
   {
     if (// !cd->isReference() && // not an external class
          cd->subClasses()->count()==0 && // is a root of the hierarchy
@@ -8372,6 +8377,7 @@ void generateOutput()
       exit(1);
     }
     Doxygen::tagFile.setDevice(tag);
+    Doxygen::tagFile.setEncoding(QTextStream::Latin1);
     Doxygen::tagFile << "<?xml version='1.0' encoding='ISO-8859-1' standalone='yes'?>" << endl;
     Doxygen::tagFile << "<tagfile>" << endl;
   }

src/entry.h

@@ -38,7 +38,8 @@ struct ListItemInfo
 struct BaseInfo 
 {
   /*! Creates an object representing an inheritance relation */
-  BaseInfo(const char *n,Protection p,Specifier v) : name(n),prot(p),virt(v) {}
+  BaseInfo(const char *n,Protection p,Specifier v) : 
+    name(n),prot(p),virt(v) {}
   QCString   name; //!< the name of the base class
   Protection prot; //!< inheritance type
   Specifier  virt; //!< virtualness

src/filedef.cpp

@@ -55,7 +55,7 @@ class DevNullCodeDocInterface : public BaseCodeDocInterface
 
 
 /*! create a new file definition, where \a p is the file path, 
-    \a the file name, and \a ref is an HTML anchor name if the
+    \a nm the file name, and \a ref is an HTML anchor name if the
     file was read from a tag file or 0 otherwise
 */
 FileDef::FileDef(const char *p,const char *nm,

src/htmldocvisitor.cpp

@@ -171,6 +171,7 @@ void HtmlDocVisitor::visit(DocStyleChange *s)
         m_insidePre=FALSE;
         m_t << "</pre>";
       }
+      break;
     case DocStyleChange::Div:
       if (s->enable()) m_t << "<div" << htmlAttribsToString(s->attribs()) << ">";  else m_t << "</div>";
       break;
@@ -245,9 +246,18 @@ void HtmlDocVisitor::visit(DocInclude *inc)
   switch(inc->type())
   {
     case DocInclude::Include: 
-      m_t << "<div class=\"fragment\"><pre>";
+      m_t << "<pre class=\"fragment\"><div>";
       parseCode(m_ci,inc->context(),inc->text().latin1(),inc->isExample(),inc->exampleFile());
-      m_t << "</pre></div>"; 
+      m_t << "</div></pre>"; 
+    case DocInclude::IncWithLines:
+      { 
+         m_t << "<div class=\"fragment\"><pre>";
+         QFileInfo cfi( inc->file() );
+         FileDef fd( cfi.dirPath(), cfi.fileName() );
+         parseCode(m_ci,inc->context(),inc->text().latin1(),inc->isExample(),inc->exampleFile(), &fd);
+         m_t << "</pre></div>"; 
+      }
+      break;
       break;
     case DocInclude::DontInclude: 
       break;
@@ -255,9 +265,9 @@ void HtmlDocVisitor::visit(DocInclude *inc)
       m_t << inc->text(); 
       break;
     case DocInclude::VerbInclude: 
-      m_t << "<div class=\"fragment\"><pre>";
+      m_t << "<pre class=\"fragment\"><div>";
       filter(inc->text());
-      m_t << "</pre></div>"; 
+      m_t << "</div></pre>"; 
       break;
   }
 }
@@ -268,7 +278,7 @@ void HtmlDocVisitor::visit(DocIncOperator *op)
   //    op->type(),op->isFirst(),op->isLast(),op->text().data());
   if (op->isFirst()) 
   {
-    if (!m_hide) m_t << "<div class=\"fragment\"><pre>";
+    if (!m_hide) m_t << "<pre class=\"fragment\"><div>";
     pushEnabled();
     m_hide=TRUE;
   }
@@ -282,7 +292,7 @@ void HtmlDocVisitor::visit(DocIncOperator *op)
   if (op->isLast())  
   {
     popEnabled();
-    if (!m_hide) m_t << "</pre></div>"; 
+    if (!m_hide) m_t << "</div></pre>"; 
   }
   else
   {

src/htmlgen.cpp

@@ -34,11 +34,12 @@
 #include "htmldocvisitor.h"
 #include "index.h"
 #include "pagedef.h"
+#include "debug.h"
 
 // #define GROUP_COLOR "#ff8080"
 
-#define DBG_HTML(x) x;
-//#define DBG_HTML(x) 
+//#define DBG_HTML(x) x;
+#define DBG_HTML(x) 
 
 static const char *defaultStyleSheet = 
 "H1 {\n"
@@ -308,7 +309,7 @@ void HtmlGenerator::writeStyleSheetFile(QFile &file)
 }
 
 static void writeDefaultHeaderFile(QTextStream &t, const char *title,
-                                   const char *relPath)
+                                   const char *relPath,bool usePathCmd)
 {
   t << "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n"
     "<html><head>" 
@@ -321,7 +322,11 @@ static void writeDefaultHeaderFile(QTextStream &t, const char *title,
   t << "href=\"";
   if (Config_getString("HTML_STYLESHEET").isEmpty())
   {
-    t << relPath << "doxygen.css";
+    if (usePathCmd) 
+      t << "$relpath$";
+    else
+      t << relPath;
+    t << "doxygen.css";
   }
   else
   {
@@ -344,7 +349,7 @@ void HtmlGenerator::writeHeaderFile(QFile &file)
 #if QT_VERSION >= 200
   t.setEncoding(QTextStream::Latin1);
 #endif
-  writeDefaultHeaderFile(t,"$title",relativePathToRoot(0));
+  writeDefaultHeaderFile(t,"$title",relativePathToRoot(0),TRUE);
 }
 
 void HtmlGenerator::writeFooterFile(QFile &file)
@@ -390,11 +395,11 @@ void HtmlGenerator::startFile(const char *name,const char *,
   lastFile = fileName;
   if (g_header.isEmpty()) 
   {
-    writeDefaultHeaderFile(t,dispTitle,relPath);
+    writeDefaultHeaderFile(t,dispTitle,relPath,FALSE);
   }
   else
   {
-    t << substituteKeywords(g_header,convertToHtml(lastTitle));
+    t << substituteKeywords(g_header,convertToHtml(lastTitle),relPath);
   }
   t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen " 
     << versionString << " -->" << endl;
@@ -442,11 +447,22 @@ static void writePageFooter(QTextStream &t,const QCString &lastTitle,
     t << endl << "<a href=\"http://www.doxygen.org/index.html\">";
     t << endl << "<img src=\"" << relPath << "doxygen.png\" alt=\"doxygen\" " 
       << "align=\"middle\" border=0 >" << "</a> " << versionString << " ";
-    t << "</small></address>\n</body>\n</html>\n";
+    t << "</small></address>";
+    if (Debug::isFlagSet(Debug::Validate))
+    {
+      t << "<p><a href=\"http://validator.w3.org/check/referer\">"
+           "<img border=\"0\" src=\"http://www.w3.org/Icons/valid-html401\""
+           " height=\"31\" width=\"88\" alt=\"This page is Valid HTML 4.01 "
+           "Transitional!\"></a><a href=\"http://jigsaw.w3.org/css-validator/\">"
+           "<img style=\"border:0;width:88px;height:31px\" "
+           "src=\"http://jigsaw.w3.org/css-validator/images/vcss\" "
+           "alt=\"This page uses valid CSS!\"></a></p>";
+    }
+    t << "\n</body>\n</html>\n";
   }
   else
   {
-    t << substituteKeywords(g_footer,convertToHtml(lastTitle));
+    t << substituteKeywords(g_footer,convertToHtml(lastTitle),relPath);
   }
 }
 
@@ -1482,11 +1498,11 @@ void HtmlGenerator::writeSearchPage()
 #endif
       if (g_header.isEmpty()) 
       {
-        writeDefaultHeaderFile(t,"Search",0);
+        writeDefaultHeaderFile(t,"Search",0,FALSE);
       }
       else
       {
-        t << substituteKeywords(g_header,"Search");
+        t << substituteKeywords(g_header,"Search","");
       }
       t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen " 
         << versionString << " -->" << endl;

src/htmlgen.h

@@ -112,8 +112,8 @@ class HtmlGenerator : public OutputGenerator
     void writeRuler()    { t << "<hr>"; }
     void writeAnchor(const char *,const char *name) 
                          { t << "<a name=\"" << name <<"\"></a>"; }
-    void startCodeFragment() { t << "<div class=\"fragment\"><pre>"; }
-    void endCodeFragment()   { t << "</pre></div>"; } 
+    void startCodeFragment() { t << "<pre class=\"fragment\"><div>"; }
+    void endCodeFragment()   { t << "</div></pre>"; } 
     void writeLineNumber(const char *,const char *,const char *,int);
     void startCodeLine() { col=0; }
     void endCodeLine()   { codify("\n"); }

src/index.cpp

@@ -3048,7 +3048,7 @@ void writeIndex(OutputList &ol)
   QCString defFileName = 
     Doxygen::mainPage ? Doxygen::mainPage->getDefFileName().data() : "<generated>";
   int defLine =
-    Doxygen::mainPage ? Doxygen::mainPage->getDefLine() : 1;
+    Doxygen::mainPage ? Doxygen::mainPage->getDefLine() : -1;
 
   QCString title;
   if (!mainPageHasTitle())

src/latexdocvisitor.cpp

@@ -15,7 +15,7 @@
  * input used in their production; they are not affected by this license.
  *
  */
-
+#include <qfileinfo.h> 
 #include "latexdocvisitor.h"
 #include "docparser.h"
 #include "language.h"
@@ -308,6 +308,15 @@ void LatexDocVisitor::visit(DocInclude *inc)
   if (m_hide) return;
   switch(inc->type())
   {
+    case DocInclude::IncWithLines:
+      { 
+         m_t << "\n\n\\footnotesize\\begin{verbatim}"; 
+         QFileInfo cfi( inc->file() );
+         FileDef fd( cfi.dirPath(), cfi.fileName() );
+         parseCode(m_ci,inc->context(),inc->text().latin1(),inc->isExample(),inc->exampleFile(), &fd);
+         m_t << "\\end{verbatim}\n\\normalsize" << endl; 
+      }
+      break;    
     case DocInclude::Include: 
       m_t << "\n\n\\footnotesize\\begin{verbatim}"; 
       parseCode(m_ci,inc->context(),inc->text().latin1(),inc->isExample(),inc->exampleFile());

src/mandocvisitor.cpp

@@ -25,6 +25,7 @@
 #include "dot.h"
 #include "util.h"
 #include "message.h"
+#include <qfileinfo.h> 
 
 ManDocVisitor::ManDocVisitor(QTextStream &t,BaseCodeDocInterface &ci) 
   : DocVisitor(DocVisitor_Man), m_t(t), m_ci(ci), m_insidePre(FALSE), m_hide(FALSE), m_firstCol(TRUE),
@@ -220,6 +221,19 @@ void ManDocVisitor::visit(DocInclude *inc)
   if (m_hide) return;
   switch(inc->type())
   {
+    case DocInclude::IncWithLines:
+      { 
+         if (!m_firstCol) m_t << endl;
+         m_t << ".PP" << endl;
+         m_t << ".nf" << endl;
+         QFileInfo cfi( inc->file() );
+         FileDef fd( cfi.dirPath(), cfi.fileName() );
+         parseCode(m_ci,inc->context(),inc->text().latin1(),inc->isExample(),inc->exampleFile(), &fd);
+         if (!m_firstCol) m_t << endl;
+         m_t << ".PP" << endl;
+         m_firstCol=TRUE;
+      }
+      break;
     case DocInclude::Include: 
       if (!m_firstCol) m_t << endl;
       m_t << ".PP" << endl;

src/memberlist.cpp

@@ -323,7 +323,7 @@ void MemberList::writeDeclarations(OutputList &ol,
   {
     //printf("subtitle=`%s'\n",subtitle);
     ol.startMemberSubtitle();
-    ol.parseDoc("<generated>",1,0,0,subtitle,FALSE,FALSE);
+    ol.parseDoc("<generated>",-1,0,0,subtitle,FALSE,FALSE);
     ol.endMemberSubtitle();
   }
 
@@ -347,7 +347,7 @@ void MemberList::writeDeclarations(OutputList &ol,
       {
         //printf("Member group has docs!\n");
         ol.startMemberGroupDocs();
-        ol.parseDoc("<generated>",1,0,0,mg->documentation()+"\n",FALSE,FALSE);
+        ol.parseDoc("<generated>",-1,0,0,mg->documentation()+"\n",FALSE,FALSE);
         ol.endMemberGroupDocs();
       }
       ol.startMemberGroup();

src/perlmodgen.cpp

@@ -642,6 +642,18 @@ void PerlModDocVisitor::visit(DocInclude *inc)
   const char *type = 0;
   switch(inc->type())
   {
+  case DocInclude::IncWithLines:
+  #if 0
+      { 
+         m_t << "<div class=\"fragment\"><pre>";
+         QFileInfo cfi( inc->file() );
+         FileDef fd( cfi.dirPath(), cfi.fileName() );
+         parseCode(m_ci,inc->context(),inc->text().latin1(),inc->isExample(),inc->exampleFile(), &fd);
+         m_t << "</pre></div>"; 
+      }
+      break;
+  #endif
+    return;
   case DocInclude::Include:
 #if 0
     m_output.add("<programlisting>");

src/pre.l

@@ -1862,12 +1862,12 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
   					}
 <DefineText>\\[\r]?\n			{ 
 					  g_defLitText+=yytext;
-  					  outputChar('\n');
+					  outputChar('\n');
   					  g_defText += ' '; g_yyLineNr++; 
 					}
 <DefineText>\n				{
-					  g_defLitText+=yytext;
 					  QCString comment=extractTrailingComment(g_defLitText);
+					  g_defLitText+=yytext;
 					  if (!comment.isEmpty())
 					  {
 					    outputArray(comment,comment.length());

src/printdocvisitor.h

@@ -170,6 +170,7 @@ class PrintDocVisitor : public DocVisitor
       switch(inc->type())
       {
         case DocInclude::Include: printf("include"); break;
+        case DocInclude::IncWithLines: printf("incwithlines"); break;
         case DocInclude::DontInclude: printf("dontinclude"); break;
         case DocInclude::HtmlInclude: printf("htmlinclude"); break;
         case DocInclude::VerbInclude: printf("verbinclude"); break;

src/rtfdocvisitor.cpp

@@ -26,6 +26,7 @@
 #include "util.h"
 #include "rtfstyle.h"
 #include "message.h"
+#include <qfileinfo.h> 
 
 RTFDocVisitor::RTFDocVisitor(QTextStream &t,BaseCodeDocInterface &ci) 
   : DocVisitor(DocVisitor_RTF), m_t(t), m_ci(ci), m_insidePre(FALSE), m_hide(FALSE), m_indentLevel(1) 
@@ -366,7 +367,19 @@ void RTFDocVisitor::visit(DocInclude *inc)
   if (m_hide) return;
   switch(inc->type())
   {
-    case DocInclude::Include: 
+   case DocInclude::IncWithLines:
+      { 
+         m_t << "{" << endl;
+         m_t << "\\par" << endl;
+         m_t << rtf_Style_Reset << getStyle("CodeExample");
+         QFileInfo cfi( inc->file() );
+         FileDef fd( cfi.dirPath(), cfi.fileName() );
+         parseCode(m_ci,inc->context(),inc->text().latin1(),inc->isExample(),inc->exampleFile(), &fd);
+         m_t << "\\par" << endl; 
+         m_t << "}" << endl;
+      }
+      break;
+   case DocInclude::Include: 
       m_t << "{" << endl;
       m_t << "\\par" << endl;
       m_t << rtf_Style_Reset << getStyle("CodeExample");

src/scanner.l

@@ -79,7 +79,8 @@ static int              lastSkipHtmlCommentContext;
 static int              lastIfContext;
 static int              lastInternalDocContext;
 static int              lastPreLineCtrlContext;
-static int              lastSkipVerbStringContext;;
+static int              lastSkipVerbStringContext;
+static int              lastCommentInArgContext;
 static int              nextDefContext;
 static int              overloadContext;
 static Protection	protection;
@@ -130,6 +131,7 @@ static bool             insideD = FALSE;		//!< processing D code?
 static bool             insidePHP = FALSE;		//!< processing PHP code?
 static bool             insideCppQuote = FALSE;
 static bool             insideObjC = FALSE;             //!< processing Objective C code?
+static bool             insideProtocolList = FALSE;
 
 static int              argRoundCount;
 static int              argSharpCount;
@@ -806,6 +808,7 @@ PHPKW	  ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
 %x      ObjCReturnType
 %x      ObjCParams
 %x      ObjCParamType
+%x      ObjCProtocolList
 %x	QtPropType
 %x	QtPropName
 %x	QtPropRW
@@ -2745,6 +2748,7 @@ PHPKW	  ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
 					    // as documentation for the argument
 					    fullArgString+=yytext;
 					    lastCopyArgChar=0;
+					    lastCommentInArgContext=YY_START;
 					    if (yytext[1]=='/')
 					      BEGIN( CopyArgCommentLine );
 					    else
@@ -2794,6 +2798,7 @@ PHPKW	  ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
 					    lastCopyArgChar=*yytext;
 					    QCString text=&yytext[1];
 					    text=text.stripWhiteSpace();
+					    lastCommentInArgContext=YY_START;
 					    fullArgString+=text;
 					    if (text.find("//")!=-1)
 					      BEGIN( CopyArgCommentLine );
@@ -2806,13 +2811,13 @@ PHPKW	  ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
 <CopyArgComment>"*/"			{ fullArgString+=yytext; 
   					  if (lastCopyArgChar!=0)
 					    unput(lastCopyArgChar); 
-                                          BEGIN( ReadFuncArgType ); 
+                                          BEGIN( lastCommentInArgContext ); 
 					}
 <CopyArgCommentLine>\n			{ fullArgString+=yytext;
   					  yyLineNr++;
   					  if (lastCopyArgChar!=0)
 					    unput(lastCopyArgChar);
-					  BEGIN( ReadFuncArgType );
+					  BEGIN( lastCommentInArgContext );
   					}
 <CopyArgCommentLine>[^\\\@\n]+		{ fullArgString+=yytext; }
 <CopyArgCommentLine>.			{ fullArgString+=*yytext; }
@@ -3347,10 +3352,25 @@ PHPKW	  ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
 <CompoundName>{SCOPENAME}{BN}*/"<"	{
   					  sharpCount = 0;
   					  current->name = yytext ;
+					  if (current->section==Entry::PROTOCOL_SEC)
+					  {
+					    current->name+="-p";
+					  }
 					  lineCount();
 					  lastClassTemplSpecContext = ClassVar;
-					  BEGIN( ClassTemplSpec );
+					  if (insideObjC) // protocol list
+					  {
+					    BEGIN( ObjCProtocolList );
+					  }
+					  else // C++ template specialization
+					  {
+					    BEGIN( ClassTemplSpec );
+					  }
 					}
+<ObjCProtocolList>"<"			{
+  					  insideProtocolList=TRUE;
+  					  BEGIN( Bases );
+  					}
 <ClassTemplSpec>">"({BN}*"::"{BN}*{SCOPENAME})?	{
 					  current->name += yytext;
 					  lineCount();
@@ -3386,8 +3406,12 @@ PHPKW	  ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
 <CompoundName>{SCOPENAME}		{ 
 					  current->name = yytext ;
 					  lineCount();
-					  if (current->section == Entry::PROTOCOL_SEC || 
-					      current->section == Entry::OBJCIMPL_SEC)
+					  if (current->section == Entry::PROTOCOL_SEC)
+					  {
+					    current->name += "-p";
+					  }
+					  if (current->section == Entry::PROTOCOL_SEC /*|| 
+					      current->section == Entry::OBJCIMPL_SEC*/)
 					  {
 					    unput('{'); // fake start of body
 					  }
@@ -3440,21 +3464,9 @@ PHPKW	  ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
 					  }
 					  else
 					  {
-					    //if (isTypedef)
-					    //{
-					    //  //QCString dest = extractName(current->name);
-				   	    //  //printf("3>>>>>>>>>> adding %s->%s\n",yytext,current->name.data());
-					    //  QCString scope;
-					    //  if (current_root->section & Entry::SCOPE_MASK) scope=current_root->name;
-                                            //  Doxygen::typedefDict.insert(yytext,new TypedefInfo(current->name,scope));
-					    //  //current->extends->append(
-					    //  //   new BaseInfo(yytext,Public,Normal)
-					    //  //		      );
-					    //}
 					    current->type += ' ' ;
 					    current->type += current->name ;
 					    current->name = yytext ;
-					    //BEGIN( FindMembers );
 					  }
   					}
 <ClassVar>[(\[]				{
@@ -3532,19 +3544,8 @@ PHPKW	  ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
 <BasesProt>{BN}				{ lineCount(); }
 <BasesProt>.				{ unput(*yytext); BEGIN(Bases); }
 <Bases>("::")?{BN}*({ID}{BN}*"::"{BN}*)*{ID}	{ 
-  					  //QCString bName = yytext;
-					  //bName = bName.stripWhiteSpace();
-  					  //bool globalScope = bName.at(0)==':' && baseName.isEmpty();
-  					  //if (!globalScope)
-  					  //  baseName += bName;
-					  //else
-					  //  baseName += (bName.data()+2);
   					  baseName+=yytext;
 					  current->args += ' ';
-					  //if (!globalScope)
-					  //  current->args += bName;
-					  //else
-					  //  current->args += (bName.data()+2);
 					  current->args += yytext;
 					}
 <Bases>{BN}*{ID}("."{ID})*		{ // Java style class
@@ -3553,16 +3554,17 @@ PHPKW	  ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
 					  current->args += ' ';
 					  current->args += name;
     					}
-<Bases>^{B}*/[\-+]			{
-  					  if (!insideObjC)
-					  { 
+<ClassVar,Bases>\n/{BN}*		{
+                                          if (!insideObjC) 
+					  {
 					    REJECT;
 					  }
 					  else
 					  {
-					    unput('{'); // insert start of fake body
+					    yyLineNr++;
+					    unput('{');
 					  }
-  					}
+					}
 <ClassVar,Bases>"@end"			{ // empty ObjC interface
   					  unput('d'); // insert fake body: {}@end
   					  unput('n'); 
@@ -3577,11 +3579,19 @@ PHPKW	  ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
 					  specName = &current->name;
 					  BEGIN ( Specialization );
 					}
-<Bases>"<"   	       	                { baseName += *yytext;
+<Bases>"<"   	       	                { 
   					  sharpCount=1; 
 					  lastSkipSharpContext = YY_START;
-					  specName = &baseName;
-					  BEGIN ( Specialization );
+					  if (insideObjC) // start of protocol list
+					  {
+					    unput(',');
+					  }
+					  else // template specialization
+					  {
+                                            baseName += *yytext;
+					    specName = &baseName;
+					    BEGIN ( Specialization );
+					  }
 					}
 <Specialization>"<"			{ *specName += *yytext;
   					  sharpCount++;
@@ -3606,22 +3616,46 @@ PHPKW	  ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
 <SkipRound>")"				{ if (--roundCount<=0)
 					    BEGIN ( lastSkipRoundContext );
 					}
-<Bases>","|({BN}+"implements"{BN}*)	{ lineCount();
-                                          current->args += ',' ; 
+<Bases>","|">"|({BN}+"implements"{BN}*)	{ lineCount();
+                                          if (insideProtocolList)
+					  {
+					    baseName+="-p";
+					  }
+					  else
+					  {
+                                            current->args += ',' ; 
+					  }
 					  current->name = removeRedundantWhiteSpace(current->name);
   					  if (!baseName.isEmpty())
+					  {
   					    current->extends->append(
 					      new BaseInfo(baseName,baseProt,baseVirt)
 					    );
+					  }
 					  if (current->section==Entry::INTERFACE_SEC || 
 					      insideJava || insidePHP || insideCS || 
 					      insideD || insideObjC)
+					  {
 					    baseProt=Public;
+					  }
 					  else
+					  {
 					    baseProt=Private;
+					  }
 					  baseVirt=Normal;
 					  baseName.resize(0);
-					  BEGIN(BasesProt);
+                                          if (*yytext=='>')
+					  { // end of a ObjC protocol list
+  					    insideProtocolList=FALSE;
+					  }
+					  else
+					  {
+					    if (*yytext==',' && insideObjC) // Begin of protocol list
+					    {
+  					      insideProtocolList=TRUE;
+					    }
+					    BEGIN(BasesProt);
+					  }
 					}
 <Bases>{B}*"{"{B}*			{ current->fileName = yyFileName ;
 					  current->startLine = yyLineNr ;

src/tagreader.cpp

@@ -950,6 +950,7 @@ void TagFileParser::buildMemberList(Entry *ce,QList<TagMemberInfo> &members)
     else if (tmi->kind=="typedef")
     {
       me->section = Entry::VARIABLE_SEC; //Entry::TYPEDEF_SEC;
+      me->type.prepend("typedef ");
       me->mtype = Method;
     }
     else if (tmi->kind=="enumeration")
@@ -975,6 +976,7 @@ void TagFileParser::buildMemberList(Entry *ce,QList<TagMemberInfo> &members)
     else if (tmi->kind=="friend")
     {
       me->section = Entry::FUNCTION_SEC;
+      me->type.prepend("friend ");
       me->mtype = Method;
     }
     else if (tmi->kind=="dcop")

src/translator_hu.h

@@ -21,15 +21,32 @@
   *
   * Extended, revised and updated by
   * Ákos Kiss  <akiss@users.sourceforge.net>
+  *
+  * Further extended, revised and updated by
+  * Tamási Ferenc <tf551@hszk.bme.hu>
   */
 
 #ifndef TRANSLATOR_HU_H
 #define TRANSLATOR_HU_H
 
 #include "translator.h"
+#include "../qtools/qdatetime.h"
 
 class TranslatorHungarian : public Translator
 {
+  private:
+    const char * zed(char c)
+    {
+        switch (c & ~('a' ^ 'A')) {
+            case 'B': case 'C': case 'D': case 'F': case 'G':
+            case 'H': case 'J': case 'K': case 'L': case 'M':
+            case 'N': case 'P': case 'Q': case 'R': case 'S':
+            case 'T': case 'V': case 'W': case 'X': case 'Z':
+                return "  ";
+            default:
+                return "z ";
+        }
+    }
   public:
 
     // --- Language control methods -------------------
@@ -110,12 +127,9 @@ class TranslatorHungarian : public Translator
     QCString trIncludingInheritedMembers()
     { return " osztály tagjainak teljes listája, az örökölt tagokkal együtt."; }
     
-    /*! this is put at the author sections at the bottom of man pages.
-     *  parameter s is name of the project name.
-     */
     QCString trGeneratedAutomatically(const char *s)
     { QCString result="Ezt a dokumentációt a Doxygen készítette ";
-      if (s) result+=(QCString)" a(z) "+s+(QCString)" projekthez";
+      if (s) result+=(QCString)" a" + zed(s[0])+s+(QCString)" projekthez";
       result+=" a forráskódból."; 
       return result;
     }
@@ -512,7 +526,7 @@ class TranslatorHungarian : public Translator
     /*! this text is put before a class diagram */
     QCString trClassDiagram(const char *clName)
     {
-      return (QCString)"A(z) "+clName+" osztály származási diagramja:";
+      return (QCString)"A"+zed(clName[0])+clName+" osztály származási diagramja:";
     }
     
     /*! this text is generated when the \\internal command is used. */
@@ -835,12 +849,12 @@ class TranslatorHungarian : public Translator
     /*! this text is put before a collaboration diagram */
     QCString trCollaborationDiagram(const char *clName)
     {
-      return (QCString)"A(z) "+clName+" osztály együttmûködési diagramja:";
+      return (QCString)"A"+zed(clName[0])+clName+" osztály együttmûködési diagramja:";
     }
     /*! this text is put before an include dependency graph */
     QCString trInclDepGraph(const char *fName)
     {
-      return (QCString)"A(z) "+fName+" definíciós fájl függési gráfja:";
+      return (QCString)"A"+zed(fName[0])+fName+" definíciós fájl függési gráfja:";
     }
     /*! header that is put before the list of constructor/destructors. */
     QCString trConstructorDocumentation()

src/util.cpp

@@ -368,12 +368,8 @@ QCString generateMarker(int id)
   return result;
 }
 
-/*! strip part of \a path if it matches
- *  one of the paths in the Config_getList("STRIP_FROM_PATH") list
- */
-QCString stripFromPath(const QCString &path)
+static QCString stripFromPath(const QCString &path,QStrList &l)
 {
-  QStrList &l = Config_getList("STRIP_FROM_PATH");
   const char *s=l.first();
   while (s)
   {
@@ -387,6 +383,22 @@ QCString stripFromPath(const QCString &path)
   return path;
 }
 
+/*! strip part of \a path if it matches
+ *  one of the paths in the Config_getList("STRIP_FROM_PATH") list
+ */
+QCString stripFromPath(const QCString &path)
+{
+  return stripFromPath(path,Config_getList("STRIP_FROM_PATH"));
+}
+
+/*! strip part of \a path if it matches
+ *  one of the paths in the Config_getList("INCLUDE_PATH") list
+ */
+QCString stripFromIncludePath(const QCString &path)
+{
+  return stripFromPath(path,Config_getList("STRIP_FROM_INC_PATH"));
+}
+
 /*! try to determine if \a name is a source or a header file name by looking
  * at the extension. A number of variations is allowed in both upper and 
  * lower case) If anyone knows or uses another extension please let me know :-)
@@ -759,19 +771,20 @@ bool accessibleViaUsingNamespace(const NamespaceSDict *nl,
  */
 int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item)
 {
-  //printf("<isAccesibleFrom(%s,%s)\n",scope->name().data(),item->name().data());
-  QCString key=scope->name()+"+"+item->name();
+  //fprintf(stderr,"<isAccesibleFrom(scope=%s,item=%s itemScope=%s)\n",
+  //    scope->name().data(),item->name().data(),item->getOuterScope()->name().data());
+  QCString key=scope->name()+"+"+item->qualifiedName();
   int *pval=g_accessibilityCache.find(key);
   int result=0; // assume we found it
   int i;
   if (pval) // value was cached
   {
-    //printf("> found cached value=%d\n",*pval);
+    //fprintf(stderr,"> found cached value=%d\n",*pval);
     return *pval; 
   }
   if (item->getOuterScope()==scope) 
   {
-    //printf("> found it\n");
+    //fprintf(stderr,"> found it\n");
   }
   else if (scope==Doxygen::globalScope)
   {
@@ -780,17 +793,17 @@ int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item)
       ClassSDict *cl = fileScope->getUsedClasses();
       if (accessibleViaUsingClass(cl,fileScope,item)) 
       {
-        //printf("> found via used class\n");
+        //fprintf(stderr,"> found via used class\n");
         goto done;
       }
       NamespaceSDict *nl = fileScope->getUsedNamespaces();
       if (accessibleViaUsingNamespace(nl,fileScope,item)) 
       {
-        //printf("> found via used namespace\n");
+        //fprintf(stderr,"> found via used namespace\n");
         goto done;
       }
     }
-    //printf("> reached global scope\n");
+    //fprintf(stderr,"> reached global scope\n");
     result=-1; // not found in path to globalScope
   }
   else // keep searching
@@ -802,19 +815,19 @@ int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item)
       ClassSDict *cl = nscope->getUsedClasses();
       if (accessibleViaUsingClass(cl,fileScope,item)) 
       {
-        //printf("> found via used class\n");
+        //fprintf(stderr,"> found via used class\n");
         goto done;
       }
       NamespaceSDict *nl = nscope->getUsedNamespaces();
       if (accessibleViaUsingNamespace(nl,fileScope,item)) 
       {
-        //printf("> found via used namespace\n");
+        //fprintf(stderr,"> found via used namespace\n");
         goto done;
       }
     }
     // repeat for the parent scope
     i=isAccessibleFrom(scope->getOuterScope(),fileScope,item);
-    //printf("> result=%d\n",i);
+    //fprintf(stderr,"> result=%d\n",i);
     result= (i==-1) ? -1 : i+1;
   }
 done:
@@ -838,7 +851,7 @@ int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item,
   //printf("<isAccesibleFrom(%s,%s,%s)\n",scope?scope->name().data():"<global>",
   //                                      item?item->name().data():"<none>",
   //                                      explicitScopePart.data());
-  QCString key=scope->name()+"+"+item->name()+"+"+explicitScopePart;
+  QCString key=scope->name()+"+"+item->qualifiedName()+"+"+explicitScopePart;
   int *pval=g_accessibilityCache.find(key);
   int result=0; // assume we found it
   if (pval) // value was cached
@@ -1019,6 +1032,7 @@ ClassDef *getResolvedClassRec(Definition *scope,
   {
     //printf("  found type %x name=%s\n",
     //       d->definitionType(),d->name().data());
+
     // only look at classes and members
     if (d->definitionType()==Definition::TypeClass ||
         d->definitionType()==Definition::TypeMember)
@@ -1042,9 +1056,10 @@ ClassDef *getResolvedClassRec(Definition *scope,
         else if (d->definitionType()==Definition::TypeMember)
         {
           MemberDef *md = (MemberDef *)d;
+          //printf("  member isTypedef()=%d\n",md->isTypedef());
           if (md->isTypedef()) // d is a typedef
           {
-            //printf("found typedef!\n");
+            //printf("    found typedef!\n");
             QCString spec;
             ClassDef *typedefClass = newResolveTypedef(fileScope,md,&spec);
 
@@ -1056,13 +1071,17 @@ ClassDef *getResolvedClassRec(Definition *scope,
             {
               minDistance=distance;
               bestMatch = typedefClass; 
-              //printf("bestTypeDef=%p\n",md);
+              //printf("      bestTypeDef=%p\n",md);
               bestTypedef = md;
               bestTemplSpec = spec;
             }
           }
         }
       } // if definition accessible
+      else
+      {
+        //printf("  Not accessible!\n");
+      }
     } // if definition is a class or member
   } // foreach definition
   if (pTypeDef) 
@@ -1683,6 +1702,11 @@ QCString yearToString()
 
 int minClassDistance(ClassDef *cd,ClassDef *bcd,int level)
 {
+  if (bcd->categoryOf()) // use class that is being extended in case of 
+                         // an Objective-C category
+  {
+    bcd=bcd->categoryOf();
+  }
   if (cd==bcd) return level; 
   if (level==256)
   {
@@ -3425,7 +3449,7 @@ QCString showFileDefMatches(const FileNameDict *fnDict,const char *n)
 
 //----------------------------------------------------------------------
 
-QCString substituteKeywords(const QCString &s,const char *title)
+QCString substituteKeywords(const QCString &s,const char *title,const QCString &relPath)
 {
   QCString result = s.copy();
   if (title) result = substitute(result,"$title",title);
@@ -3435,6 +3459,7 @@ QCString substituteKeywords(const QCString &s,const char *title)
   result = substitute(result,"$doxygenversion",versionString);
   result = substitute(result,"$projectname",Config_getString("PROJECT_NAME"));
   result = substitute(result,"$projectnumber",Config_getString("PROJECT_NUMBER"));
+  result = substitute(result,"$relpath$",relPath);
   return result;
 }
     

src/util.h

@@ -154,9 +154,10 @@ QCString generateMarker(int id);
 void writeExample(OutputList &ol,ExampleSDict *el);
 QCString stripAnonymousNamespaceScope(const QCString &s);
 QCString stripFromPath(const QCString &path);
+QCString stripFromIncludePath(const QCString &path);
 bool rightScopeMatch(const QCString &scope, const QCString &name);
 bool leftScopeMatch(const QCString &scope, const QCString &name);
-QCString substituteKeywords(const QCString &s,const char *title);
+QCString substituteKeywords(const QCString &s,const char *title,const QCString &relPath="");
 int getPrefixIndex(const QCString &name);
 QCString removeAnonymousScopes(const QCString &s);
 QCString replaceAnonymousScopes(const QCString &s);

src/xmldocvisitor.cpp

@@ -26,6 +26,7 @@
 #include "dot.h"
 #include "message.h"
 #include "util.h"
+#include <qfileinfo.h> 
 
 XmlDocVisitor::XmlDocVisitor(QTextStream &t,BaseCodeDocInterface &ci) 
   : DocVisitor(DocVisitor_XML), m_t(t), m_ci(ci), m_insidePre(FALSE), m_hide(FALSE) 
@@ -213,6 +214,15 @@ void XmlDocVisitor::visit(DocInclude *inc)
   if (m_hide) return;
   switch(inc->type())
   {
+    case DocInclude::IncWithLines:
+      { 
+         m_t << "<programlisting>";
+         QFileInfo cfi( inc->file() );
+         FileDef fd( cfi.dirPath(), cfi.fileName() );
+         parseCode(m_ci,inc->context(),inc->text().latin1(),inc->isExample(),inc->exampleFile(), &fd);
+         m_t << "</programlisting>"; 
+      }
+      break;    
     case DocInclude::Include: 
       m_t << "<programlisting>";
       parseCode(m_ci,inc->context(),inc->text().latin1(),inc->isExample(),inc->exampleFile());

src/xmlgen.cpp

@@ -590,6 +590,15 @@ static void generateXMLForMember(MemberDef *md,QTextStream &ti,QTextStream &t,De
 
     t << "\"";
   }
+  else if (md->memberType() == MemberDef::Property)
+  {
+    t << " readable=\"";
+    if (md->isReadable()) t << "yes"; else t << "no";
+    t << "\" writable=\"";
+    if (md->isWritable()) t << "yes"; else t << "no";
+    t << "\"";
+  }
+
 
   t << ">" << endl;