Release-1.2.18-20021030

64 files changed, 3700 insertions, 1154 deletions

diff --git a/INSTALL b/INSTALL
index 4470c55..a741697 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
-DOXYGEN Version 1.2.18-20021020
+DOXYGEN Version 1.2.18-20021030
 
 Please read the installation section of the manual for instructions.
 
 --------
-Dimitri van Heesch (20 October 2002)
+Dimitri van Heesch (30 October 2002)
diff --git a/README b/README
index 8608a25..d0e6c78 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-DOXYGEN Version 1.2.18_20021020
+DOXYGEN Version 1.2.18_20021030
 
 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) (20 October 2002)
+Dimitri van Heesch (dimitri@stack.nl) (30 October 2002)
diff --git a/VERSION b/VERSION
index e36a3bf..298b8b4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.18-20021020
+1.2.18-20021030
diff --git a/addon/doxmlparser/include/doxmlintf.h b/addon/doxmlparser/include/doxmlintf.h
index 55eb946..7ab2c79 100644
--- a/addon/doxmlparser/include/doxmlintf.h
+++ b/addon/doxmlparser/include/doxmlintf.h
@@ -16,7 +16,16 @@
 #ifndef _DOXMLINTF_H
 #define _DOXMLINTF_H
 
-#include <qstring.h>
+/*! \file
+ *  \brief The interface to the object model provided by the XML parser 
+ *         library.
+ *
+ *  To start using this library one calls createObjectModel and then
+ *  uses the returned IDoxygen interface to read doxygen generated
+ *  XML output and navigate through the information contained in it.
+ *
+ *  @see createObjectModel()
+ */
 
 class IMember;
 class IDocIterator;
@@ -24,12 +33,20 @@ class ICompound;
 class ISection;
 class INode;
 
+/*! \brief Read only interface to a string. 
+ */
 class IString
 {
   public:
+    /*! Returns a latin1 character representation of the string. */
     virtual const char *latin1() const = 0;
+    /*! Returns a 16-bit unicode character representation of the character at 
+     *  position \a index in the string. The first character is at index 0.
+     */
     virtual unsigned short unicodeCharAt(int index) const = 0;
+    /*! Returns true if this string is empty or false otherwise */
     virtual bool isEmpty() const = 0;
+    /*! Returns the number of characters in the string. */
     virtual int length() const = 0;
 };
 
@@ -107,24 +124,6 @@ class IMemberReferenceIterator
     virtual void release() = 0;
 };
 
-class IEnumValue
-{
-  public:
-    virtual const IString * name() const = 0;
-    virtual const IString * initializer() const = 0;
-};
-
-class IEnumValueIterator 
-{
-  public:
-    virtual IEnumValue *toFirst() = 0;
-    virtual IEnumValue *toLast() = 0;
-    virtual IEnumValue *toNext() = 0;
-    virtual IEnumValue *toPrev() = 0;
-    virtual IEnumValue *current() const = 0;
-    virtual void release() = 0;
-};
-
 class IDoc
 {
   public:
@@ -161,8 +160,9 @@ class IDoc
       Entry,              // 28 -> IDocEntry
       Section,            // 29 -> IDocSection
       Preformatted,       // 30 -> IDocPreformatted
-      Symbol,             // 31 -> IDocSymbol
-      Root                // 32 -> IDocRoot
+      Verbatim,           // 31 -> IDocVerbatim
+      Symbol,             // 32 -> IDocSymbol
+      Root                // 33 -> IDocRoot
     };
     virtual Kind kind() const = 0;
 };
@@ -399,6 +399,12 @@ class IDocPreformatted : public IDoc
     virtual IDocIterator *contents() const = 0; 
 };
 
+class IDocVerbatim : public IDoc
+{
+  public:
+    virtual const IString *text() const = 0; 
+};
+
 class IDocSymbol : public IDoc
 {
   public:
@@ -499,7 +505,8 @@ class IMember
   public:
     enum MemberKind { Invalid=0,
                       Define, Property, Variable, Typedef, Enum,
-                      Function, Signal, Prototype, Friend, DCOP, Slot
+                      Function, Signal, Prototype, Friend, DCOP, Slot, 
+                      EnumValue
                     };
     virtual ICompound *compound() const = 0;
     virtual ISection *section() const = 0;
@@ -525,11 +532,80 @@ class IMember
     virtual int definitionLine() const = 0;
     virtual IMemberReference *reimplements() const = 0;
     virtual IMemberReferenceIterator *reimplementedBy() const = 0;
-    virtual IEnumValueIterator *enumValues() const = 0;
     virtual IDocRoot *briefDescription() const = 0;
     virtual IDocRoot *detailedDescription() const = 0;
 };
 
+class IDefine : public IMember
+{
+  public:
+};
+
+class IProperty : public IMember
+{
+  public:
+};
+
+class IVariable : public IMember
+{
+  public:
+};
+
+class ITypedef : public IMember
+{
+  public:
+};
+
+class IFunction : public IMember
+{
+  public:
+};
+
+class ISignal : public IMember
+{
+  public:
+};
+
+class IPrototype : public IMember
+{
+  public:
+};
+
+class IFriend : public IMember
+{
+  public:
+};
+
+class IDCOP : public IMember
+{
+  public:
+};
+
+class ISlot : public IMember
+{
+  public:
+};
+
+class IEnumValue : public IMember
+{
+  public:
+    virtual const IString * name() const = 0;
+};
+
+#if 0
+class IEnumValueIterator 
+{
+  public:
+    virtual IEnumValue *toFirst() = 0;
+    virtual IEnumValue *toLast() = 0;
+    virtual IEnumValue *toNext() = 0;
+    virtual IEnumValue *toPrev() = 0;
+    virtual IEnumValue *current() const = 0;
+    virtual void release() = 0;
+};
+#endif
+
+
 class IMemberIterator 
 {
   public:
@@ -541,6 +617,12 @@ class IMemberIterator
     virtual void release() = 0;
 };
 
+class IEnum : public IMember
+{
+  public:
+    virtual IMemberIterator *enumValues() const = 0;
+};
+
 /*! \brief The interface to a section in the object model. 
  *
  *  A compound can have a number of sections, where each
diff --git a/addon/doxmlparser/src/compoundhandler.cpp b/addon/doxmlparser/src/compoundhandler.cpp
index 623ac71..df69d2a 100644
--- a/addon/doxmlparser/src/compoundhandler.cpp
+++ b/addon/doxmlparser/src/compoundhandler.cpp
@@ -19,6 +19,7 @@
 #include "debug.h"
 #include "graphhandler.h"
 #include "sectionhandler.h"
+#include "loamhandler.h"
 
 //----------------------------------------------------------------------------
 
@@ -146,7 +147,7 @@ CompoundHandler::CompoundHandler(const QString &xmlDir)
     m_xmlDir(xmlDir), m_refCount(1), m_memberDict(257), m_memberNameDict(257),
     m_mainHandler(0), m_inheritanceGraph(0), m_collaborationGraph(0),
     m_includeDependencyGraph(0), m_includedByDependencyGraph(0), m_templateParamList(0),
-    m_titleHandler(0)
+    m_titleHandler(0), m_members(0)
 {
   m_superClasses.setAutoDelete(TRUE);
   m_subClasses.setAutoDelete(TRUE);
@@ -202,12 +203,10 @@ CompoundHandler::CompoundHandler(const QString &xmlDir)
   addEndHandler("innergroup");
 
   addStartHandler("templateparamlist",this,&CompoundHandler::startTemplateParamList);
-  addEndHandler("templateparamlist");
-
-  addStartHandler("param",this,&CompoundHandler::startParam);
-  addEndHandler("param");
 
   addStartHandler("title",this,&CompoundHandler::startTitle);
+
+  addStartHandler("listofallmembers",this,&CompoundHandler::startListOfAllMembers);
 }
 
 CompoundHandler::~CompoundHandler()
@@ -221,6 +220,8 @@ CompoundHandler::~CompoundHandler()
   delete m_collaborationGraph;
   delete m_includeDependencyGraph;
   delete m_includedByDependencyGraph;
+  delete m_templateParamList;
+  delete m_members;
 }
 
 void CompoundHandler::startSection(const QXmlAttributes& attrib)
@@ -298,17 +299,16 @@ void CompoundHandler::startInnerGroup(const QXmlAttributes& attrib)
   m_innerCompounds.append(new QString(attrib.value("refid")));
 }
 
-void CompoundHandler::startParam(const QXmlAttributes& attrib)
+void CompoundHandler::startTemplateParamList(const QXmlAttributes& attrib)
 {
-  ParamHandler *ph = new ParamHandler(this);
-  ph->startParam(attrib);
-  m_params.append(ph);
+  m_templateParamList = new TemplateParamListHandler(this);
+  m_templateParamList->startTemplateParamList(attrib);
 }
 
-void CompoundHandler::startTemplateParamList(const QXmlAttributes& attrib)
+void CompoundHandler::startListOfAllMembers(const QXmlAttributes& attrib)
 {
-  m_templateParamList = new TemplateParamListHandler(this);
-  m_templateParamList->startParam(attrib);
+  m_members = new ListOfAllMembersHandler(this);
+  m_members->startListOfAllMembers(attrib);
 }
 
 void CompoundHandler::addSuperClass(const QXmlAttributes& attrib)
@@ -388,11 +388,16 @@ void CompoundHandler::initialize(MainHandler *mh)
   {
     sec->initialize(this);
   }
+  if (m_members)
+  {
+    m_members->initialize(mh);
+  }
 }
 
 void CompoundHandler::insertMember(MemberHandler *mh)
 {
   m_memberDict.insert(mh->id()->latin1(),mh);
+  mh->initialize(m_mainHandler);
   QList<MemberHandler> *mhl = m_memberNameDict.find(mh->id()->latin1());
   if (mhl==0)
   {
@@ -478,7 +483,7 @@ IDocRoot *CompoundHandler::detailedDescription() const
 
 IMember *CompoundHandler::memberById(const char *id) const 
 { 
-  return m_memberDict[id]; 
+  return (IFunction*)m_memberDict[id]; 
 }
 
 IGraph *CompoundHandler::inheritanceGraph() const 
@@ -530,3 +535,10 @@ const IDocTitle *CompoundHandler::title() const
 {
   return m_titleHandler;
 }
+
+IMemberReferenceIterator *CompoundHandler::members() const
+{
+  return m_members ? m_members->members() : 0;
+}
+
+
diff --git a/addon/doxmlparser/src/compoundhandler.h b/addon/doxmlparser/src/compoundhandler.h
index b099be4..e68faf3 100644
--- a/addon/doxmlparser/src/compoundhandler.h
+++ b/addon/doxmlparser/src/compoundhandler.h
@@ -34,6 +34,7 @@ class SectionHandler;
 class ParamHandler;
 class TemplateParamListHandler;
 class TitleHandler;
+class ListOfAllMembersHandler;
 
 class RelatedCompound : public IRelatedCompound
 {
@@ -97,9 +98,9 @@ class CompoundHandler : public IClass,
     virtual void startInnerNamespace(const QXmlAttributes& attrib);
     virtual void startInnerFile(const QXmlAttributes& attrib);
     virtual void startInnerGroup(const QXmlAttributes& attrib);
-    virtual void startParam(const QXmlAttributes& attrib);
     virtual void startTitle(const QXmlAttributes& attrib);
     virtual void startTemplateParamList(const QXmlAttributes& attrib);
+    virtual void startListOfAllMembers(const QXmlAttributes& attrib);
     virtual void addref() { m_refCount++; }
 
     CompoundHandler(const QString &dirName);
@@ -133,6 +134,7 @@ class CompoundHandler : public IClass,
     int locationLine() const { return m_defLine; }
     int locationBodyStartLine() const { return m_defBodyStart; }
     int locationBodyEndLine() const { return m_defBodyEnd; }
+    IMemberReferenceIterator *members() const;
 
     // IFile implementation
     IGraph *includeDependencyGraph() const; 
@@ -171,6 +173,7 @@ class CompoundHandler : public IClass,
     ProgramListingHandler*         m_source;
     TemplateParamListHandler*      m_templateParamList;
     TitleHandler*                  m_titleHandler;
+    ListOfAllMembersHandler*       m_members;
 };
 
 void compoundhandler_init();
diff --git a/addon/doxmlparser/src/dochandler.cpp b/addon/doxmlparser/src/dochandler.cpp
index b822a90..e771761 100644
--- a/addon/doxmlparser/src/dochandler.cpp
+++ b/addon/doxmlparser/src/dochandler.cpp
@@ -1097,7 +1097,7 @@ void ImageHandler::endImage()
 DotFileHandler::DotFileHandler(IBaseHandler *parent)
   : m_parent(parent)
 {
-  addEndHandler("image",this,&DotFileHandler::endDotFile);
+  addEndHandler("dotfile",this,&DotFileHandler::endDotFile);
 }
 
 DotFileHandler::~DotFileHandler()
@@ -1328,6 +1328,32 @@ IDocIterator *PreformattedHandler::contents() const
 }
 
 //----------------------------------------------------------------------
+// VerbatimHandler
+//----------------------------------------------------------------------
+
+VerbatimHandler::VerbatimHandler(IBaseHandler *parent)
+  :  m_parent(parent)
+{
+  addEndHandler("verbatim",this,&VerbatimHandler::endVerbatim);
+}
+
+VerbatimHandler::~VerbatimHandler()
+{
+}
+
+void VerbatimHandler::startVerbatim(const QXmlAttributes&)
+{
+  m_parent->setDelegate(this);
+  m_curString="";
+}
+
+void VerbatimHandler::endVerbatim()
+{
+  m_text = m_curString;
+  m_parent->setDelegate(0);
+}
+
+//----------------------------------------------------------------------
 // SymbolHandler
 //----------------------------------------------------------------------
 
@@ -1393,6 +1419,7 @@ ParagraphHandler::ParagraphHandler(IBaseHandler *parent)
   addStartHandler("indexentry",this,&ParagraphHandler::startIndexEntry);
   addStartHandler("table",this,&ParagraphHandler::startTable);
   addStartHandler("preformatted",this,&ParagraphHandler::startPreformatted);
+  addStartHandler("verbatim",this,&ParagraphHandler::startVerbatim);
   addStartHandler("umlaut",this,&ParagraphHandler::startUmlaut);
   addStartHandler("acute",this,&ParagraphHandler::startAcute);
   addStartHandler("grave",this,&ParagraphHandler::startGrave);
@@ -1567,6 +1594,14 @@ void ParagraphHandler::startPreformatted(const QXmlAttributes& attrib)
   m_children.append(ph);
 }
 
+void ParagraphHandler::startVerbatim(const QXmlAttributes& attrib)
+{
+  addTextNode();
+  VerbatimHandler *vh = new VerbatimHandler(this);
+  vh->startVerbatim(attrib);
+  m_children.append(vh);
+}
+
 void ParagraphHandler::startUmlaut(const QXmlAttributes& attrib)
 {
   addTextNode();
diff --git a/addon/doxmlparser/src/dochandler.h b/addon/doxmlparser/src/dochandler.h
index 0e657f1..37c7df4 100644
--- a/addon/doxmlparser/src/dochandler.h
+++ b/addon/doxmlparser/src/dochandler.h
@@ -65,6 +65,7 @@ DEFINE_CLS_IMPL(DocRow);
 DEFINE_CLS_IMPL(DocEntry);
 DEFINE_CLS_IMPL(DocSection);
 DEFINE_CLS_IMPL(DocPreformatted);
+DEFINE_CLS_IMPL(DocVerbatim);
 DEFINE_CLS_IMPL(DocSymbol);
 DEFINE_CLS_IMPL(DocRoot);
 
@@ -190,6 +191,7 @@ class ParagraphHandler : public DocParaImpl,
     virtual void startIndexEntry(const QXmlAttributes& attrib);
     virtual void startTable(const QXmlAttributes& attrib);
     virtual void startPreformatted(const QXmlAttributes& attrib);
+    virtual void startVerbatim(const QXmlAttributes& attrib);
     virtual void startUmlaut(const QXmlAttributes& attrib);
     virtual void startAcute(const QXmlAttributes& attrib);
     virtual void startGrave(const QXmlAttributes& attrib);
@@ -1019,6 +1021,30 @@ class PreformattedIterator :
 
 //-----------------------------------------------------------------------------
 
+/*! \brief Node representing an preformatted section
+ */
+class VerbatimHandler : public DocVerbatimImpl, 
+                        public BaseHandler<VerbatimHandler>
+{
+    friend class VerbatimIterator;
+  public:
+    VerbatimHandler(IBaseHandler *parent);
+    virtual ~VerbatimHandler();
+    void startVerbatim(const QXmlAttributes& attrib);
+    void endVerbatim();
+
+    // IDocVerbatim
+    virtual Kind kind() const { return DocImpl::Verbatim; }
+    virtual const IString *text() const { return &m_text; }
+
+  private:
+    IBaseHandler   *m_parent;
+    StringImpl      m_text;
+};
+
+
+//-----------------------------------------------------------------------------
+
 /*! \brief Node representing an special symbol.
  *
  */
diff --git a/addon/doxmlparser/src/doxmlintf.h b/addon/doxmlparser/src/doxmlintf.h
index 55eb946..7ab2c79 100644
--- a/addon/doxmlparser/src/doxmlintf.h
+++ b/addon/doxmlparser/src/doxmlintf.h
@@ -16,7 +16,16 @@
 #ifndef _DOXMLINTF_H
 #define _DOXMLINTF_H
 
-#include <qstring.h>
+/*! \file
+ *  \brief The interface to the object model provided by the XML parser 
+ *         library.
+ *
+ *  To start using this library one calls createObjectModel and then
+ *  uses the returned IDoxygen interface to read doxygen generated
+ *  XML output and navigate through the information contained in it.
+ *
+ *  @see createObjectModel()
+ */
 
 class IMember;
 class IDocIterator;
@@ -24,12 +33,20 @@ class ICompound;
 class ISection;
 class INode;
 
+/*! \brief Read only interface to a string. 
+ */
 class IString
 {
   public:
+    /*! Returns a latin1 character representation of the string. */
     virtual const char *latin1() const = 0;
+    /*! Returns a 16-bit unicode character representation of the character at 
+     *  position \a index in the string. The first character is at index 0.
+     */
     virtual unsigned short unicodeCharAt(int index) const = 0;
+    /*! Returns true if this string is empty or false otherwise */
     virtual bool isEmpty() const = 0;
+    /*! Returns the number of characters in the string. */
     virtual int length() const = 0;
 };
 
@@ -107,24 +124,6 @@ class IMemberReferenceIterator
     virtual void release() = 0;
 };
 
-class IEnumValue
-{
-  public:
-    virtual const IString * name() const = 0;
-    virtual const IString * initializer() const = 0;
-};
-
-class IEnumValueIterator 
-{
-  public:
-    virtual IEnumValue *toFirst() = 0;
-    virtual IEnumValue *toLast() = 0;
-    virtual IEnumValue *toNext() = 0;
-    virtual IEnumValue *toPrev() = 0;
-    virtual IEnumValue *current() const = 0;
-    virtual void release() = 0;
-};
-
 class IDoc
 {
   public:
@@ -161,8 +160,9 @@ class IDoc
       Entry,              // 28 -> IDocEntry
       Section,            // 29 -> IDocSection
       Preformatted,       // 30 -> IDocPreformatted
-      Symbol,             // 31 -> IDocSymbol
-      Root                // 32 -> IDocRoot
+      Verbatim,           // 31 -> IDocVerbatim
+      Symbol,             // 32 -> IDocSymbol
+      Root                // 33 -> IDocRoot
     };
     virtual Kind kind() const = 0;
 };
@@ -399,6 +399,12 @@ class IDocPreformatted : public IDoc
     virtual IDocIterator *contents() const = 0; 
 };
 
+class IDocVerbatim : public IDoc
+{
+  public:
+    virtual const IString *text() const = 0; 
+};
+
 class IDocSymbol : public IDoc
 {
   public:
@@ -499,7 +505,8 @@ class IMember
   public:
     enum MemberKind { Invalid=0,
                       Define, Property, Variable, Typedef, Enum,
-                      Function, Signal, Prototype, Friend, DCOP, Slot
+                      Function, Signal, Prototype, Friend, DCOP, Slot, 
+                      EnumValue
                     };
     virtual ICompound *compound() const = 0;
     virtual ISection *section() const = 0;
@@ -525,11 +532,80 @@ class IMember
     virtual int definitionLine() const = 0;
     virtual IMemberReference *reimplements() const = 0;
     virtual IMemberReferenceIterator *reimplementedBy() const = 0;
-    virtual IEnumValueIterator *enumValues() const = 0;
     virtual IDocRoot *briefDescription() const = 0;
     virtual IDocRoot *detailedDescription() const = 0;
 };
 
+class IDefine : public IMember
+{
+  public:
+};
+
+class IProperty : public IMember
+{
+  public:
+};
+
+class IVariable : public IMember
+{
+  public:
+};
+
+class ITypedef : public IMember
+{
+  public:
+};
+
+class IFunction : public IMember
+{
+  public:
+};
+
+class ISignal : public IMember
+{
+  public:
+};
+
+class IPrototype : public IMember
+{
+  public:
+};
+
+class IFriend : public IMember
+{
+  public:
+};
+
+class IDCOP : public IMember
+{
+  public:
+};
+
+class ISlot : public IMember
+{
+  public:
+};
+
+class IEnumValue : public IMember
+{
+  public:
+    virtual const IString * name() const = 0;
+};
+
+#if 0
+class IEnumValueIterator 
+{
+  public:
+    virtual IEnumValue *toFirst() = 0;
+    virtual IEnumValue *toLast() = 0;
+    virtual IEnumValue *toNext() = 0;
+    virtual IEnumValue *toPrev() = 0;
+    virtual IEnumValue *current() const = 0;
+    virtual void release() = 0;
+};
+#endif
+
+
 class IMemberIterator 
 {
   public:
@@ -541,6 +617,12 @@ class IMemberIterator
     virtual void release() = 0;
 };
 
+class IEnum : public IMember
+{
+  public:
+    virtual IMemberIterator *enumValues() const = 0;
+};
+
 /*! \brief The interface to a section in the object model. 
  *
  *  A compound can have a number of sections, where each
diff --git a/addon/doxmlparser/src/doxmlparser.pro.in b/addon/doxmlparser/src/doxmlparser.pro.in
index ddbe82a..841a46c 100644
--- a/addon/doxmlparser/src/doxmlparser.pro.in
+++ b/addon/doxmlparser/src/doxmlparser.pro.in
@@ -4,12 +4,14 @@ HEADERS      =	basehandler.h mainhandler.h \
                 compoundhandler.h sectionhandler.h \
                 memberhandler.h paramhandler.h \
                 dochandler.h linkedtexthandler.h \
-                debug.h graphhandler.h stringimpl.h
+                debug.h graphhandler.h stringimpl.h \
+                loamhandler.h
 SOURCES      =	mainhandler.cpp \
                 compoundhandler.cpp sectionhandler.cpp \
                 memberhandler.cpp paramhandler.cpp \
                 dochandler.cpp linkedtexthandler.cpp \
-                basehandler.cpp debug.cpp graphhandler.cpp
+                basehandler.cpp debug.cpp graphhandler.cpp \
+                loamhandler.cpp
 unix:LIBS                  += -L../../../lib -lqtools 
 win32:INCLUDEPATH          += .
 win32-mingw:LIBS           += -L../../../lib -lqtools 
diff --git a/addon/doxmlparser/src/loamhandler.cpp b/addon/doxmlparser/src/loamhandler.cpp
new file mode 100644
index 0000000..de726c1
--- /dev/null
+++ b/addon/doxmlparser/src/loamhandler.cpp
@@ -0,0 +1,60 @@
+#include "loamhandler.h"
+#include "memberhandler.h"
+
+
+ListOfAllMembersHandler::ListOfAllMembersHandler(IBaseHandler *parent) : m_parent(parent)
+{
+  m_members.setAutoDelete(TRUE);
+
+  addStartHandler("member",this,&ListOfAllMembersHandler::startMember);
+  addStartHandler("name",this,&ListOfAllMembersHandler::startName);
+  addEndHandler("name",this,&ListOfAllMembersHandler::endName);
+
+  addEndHandler("listofallmembers",this,&ListOfAllMembersHandler::endListOfAllMembers);
+}
+
+void ListOfAllMembersHandler::initialize(MainHandler *mh)
+{
+  QListIterator<MemberReference> mli(m_members);
+  MemberReference *mr;
+  for (;(mr=mli.current());++mli)
+  {
+    mr->initialize(mh);
+  }
+}
+
+void ListOfAllMembersHandler::startMember(const QXmlAttributes& attrib)
+{
+  MemberReference *mr = new MemberReference;
+  mr->m_memId = attrib.value("refid");
+  // TODO: extract prot, virt, ambiguityscope and scope as well
+  m_members.append(new MemberReference);
+}
+
+void ListOfAllMembersHandler::startName(const QXmlAttributes&)
+{
+  m_curString="";
+}
+
+void ListOfAllMembersHandler::endName()
+{
+  ASSERT(m_members.getLast());
+  m_members.getLast()->m_name = m_curString;
+}
+
+void ListOfAllMembersHandler::startListOfAllMembers(const QXmlAttributes& /*attrib*/)
+{
+  m_parent->setDelegate(this);
+  debug(2,"listofallmembers start\n");
+}
+
+void ListOfAllMembersHandler::endListOfAllMembers()
+{
+  m_parent->setDelegate(0);
+  debug(2,"listofallmembers end\n");
+}
+
+IMemberReferenceIterator *ListOfAllMembersHandler::members() const
+{ 
+  return new MemberReferenceIterator(m_members); 
+}
diff --git a/addon/doxmlparser/src/loamhandler.h b/addon/doxmlparser/src/loamhandler.h
new file mode 100644
index 0000000..24c05b1
--- /dev/null
+++ b/addon/doxmlparser/src/loamhandler.h
@@ -0,0 +1,50 @@
+/******************************************************************************
+ *
+ * $Id$
+ *
+ *
+ * Copyright (C) 1997-2002 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
+#ifndef _LOAMHANDLER_H
+#define _LOAMHANDLER_H
+
+#include <qstring.h>
+#include <qlist.h>
+#include <doxmlintf.h>
+
+#include "basehandler.h"
+
+class MainHandler;
+class MemberReference;
+
+class ListOfAllMembersHandler : public BaseHandler<ListOfAllMembersHandler>
+{
+  public:
+    virtual void startMember(const QXmlAttributes& attrib);
+    virtual void startName(const QXmlAttributes& attrib);
+    virtual void endName();
+    virtual void startListOfAllMembers(const QXmlAttributes& attrib);
+    virtual void endListOfAllMembers();
+
+    ListOfAllMembersHandler(IBaseHandler *parent);
+    virtual ~ListOfAllMembersHandler() {}
+
+    void initialize(MainHandler *mh);
+
+    virtual IMemberReferenceIterator *members() const;
+
+  protected:
+    IBaseHandler *m_parent;
+    QList<MemberReference> m_members;
+};
+
+#endif
+
diff --git a/addon/doxmlparser/src/memberhandler.cpp b/addon/doxmlparser/src/memberhandler.cpp
index 74b1e32..ad35a91 100644
--- a/addon/doxmlparser/src/memberhandler.cpp
+++ b/addon/doxmlparser/src/memberhandler.cpp
@@ -39,6 +39,7 @@ class MemberTypeMap
       m_map.insert("friend",new int(IMember::Friend));
       m_map.insert("dcop",new int(IMember::DCOP));
       m_map.insert("slot",new int(IMember::Slot));
+      m_map.insert("enumvalue",new int(IMember::EnumValue));
     }
     IMember::MemberKind map(const QString &s)
     {
@@ -82,19 +83,28 @@ IMember *MemberReference::member() const
 //------------------------------------------------------------------------------
 
 
-EnumValueHandler::EnumValueHandler(IBaseHandler *parent) : m_parent(parent), m_brief(0), m_detailed(0)
+#if 0
+EnumValueHandler::EnumValueHandler(IBaseHandler *parent) : 
+  m_parent(parent), m_brief(0), m_detailed(0), m_linkedTextHandler(0)
 {
   addEndHandler("enumvalue",this,&EnumValueHandler::endEnumValue);
 
   addStartHandler("name",this,&EnumValueHandler::startName);
   addEndHandler("name",this,&EnumValueHandler::endName);
   addStartHandler("initializer",this,&EnumValueHandler::startInitializer);
-  addEndHandler("initializer",this,&EnumValueHandler::endInitializer);
 
   addStartHandler("briefdescription",this,&EnumValueHandler::startBriefDesc);
 
   addStartHandler("detaileddescription",this,&EnumValueHandler::startDetailedDesc);
 
+  m_initializer.setAutoDelete(TRUE);
+}
+
+EnumValueHandler::~EnumValueHandler()
+{
+  delete m_brief;
+  delete m_detailed;
+  delete m_linkedTextHandler;
 }
 
 void EnumValueHandler::startEnumValue(const QXmlAttributes& /*attrib*/)
@@ -119,12 +129,9 @@ void EnumValueHandler::endName()
 
 void EnumValueHandler::startInitializer(const QXmlAttributes& /*attrib*/)
 {
-  m_curString="";
-}
-
-void EnumValueHandler::endInitializer()
-{
-  m_initializer = m_curString;
+  delete m_linkedTextHandler;
+  m_linkedTextHandler = new LinkedTextHandler(this,m_initializer);
+  m_linkedTextHandler->start("initializer");
 }
 
 void EnumValueHandler::startBriefDesc(const QXmlAttributes& attrib)
@@ -140,7 +147,7 @@ void EnumValueHandler::startDetailedDesc(const QXmlAttributes& attrib)
   docHandler->startDoc(attrib);
   m_detailed = docHandler;
 }
-
+#endif
 
 //------------------------------------------------------------------------------
 
@@ -149,13 +156,14 @@ MemberHandler::MemberHandler(IBaseHandler *parent)
 {
   //printf("MemberHandler::MemberHandler() %p\n",this);
   addEndHandler("memberdef",this,&MemberHandler::endMember);
+  addEndHandler("enumvalue",this,&MemberHandler::endMember);
 
   addStartHandler("type",this,&MemberHandler::startType);
   addStartHandler("initializer",this,&MemberHandler::startInitializer);
   addStartHandler("exception",this,&MemberHandler::startException);
-  addStartHandler("enumvalue",this,&MemberHandler::startEnumValue);
+  addStartHandler("enumvalue",this,&MemberHandler::startEnumValue2);
 
-  addStartHandler("name");
+  addStartHandler("name",this,&MemberHandler::startName);
   addEndHandler("name",this,&MemberHandler::endName);
 
   addStartHandler("param",this,&MemberHandler::startParam);
@@ -212,6 +220,7 @@ void MemberHandler::startMember(const QXmlAttributes& attrib)
 {
   m_parent->setDelegate(this);
   m_kindString = attrib.value("kind");
+  printf("startMember kindString=`%s'\n",m_kindString.data());
   m_kind = s_typeMap->map(m_kindString);
   m_id = attrib.value("id");
   m_virtualness = attrib.value("virt");
@@ -222,6 +231,29 @@ void MemberHandler::startMember(const QXmlAttributes& attrib)
       m_kindString.data(),m_id.data(),m_protection.data(),m_virtualness.data());
 }
 
+void MemberHandler::startEnumValue(const QXmlAttributes& attrib)
+{
+  m_parent->setDelegate(this);
+  m_kindString = "enumvalue";
+  printf("startEnumValue kindString=`%s'\n",m_kindString.data());
+  m_kind = s_typeMap->map(m_kindString);
+  m_id = attrib.value("id");
+  m_virtualness = "non-virtual";
+  m_protection = attrib.value("prot");
+  m_isConst = FALSE;
+  m_isVolatile = FALSE;
+  debug(2,"member kind=`%s' id=`%s' prot=`%s' virt=`%s'\n",
+      m_kindString.data(),m_id.data(),m_protection.data(),m_virtualness.data());
+}
+
+void MemberHandler::startEnumValue2(const QXmlAttributes& attrib)
+{
+  MemberHandler *mh = new MemberHandler(this);
+  mh->startEnumValue(attrib);
+  m_enumValues.append(mh);
+}
+
+
 void MemberHandler::startBriefDesc(const QXmlAttributes& attrib)
 {
   DocHandler *docHandler = new DocHandler(this);
@@ -328,6 +360,11 @@ void MemberHandler::startException(const QXmlAttributes &)
   m_linkedTextHandler->start("exception");
 }
 
+void MemberHandler::startName(const QXmlAttributes &)
+{
+  m_curString="";
+}
+
 void MemberHandler::endName()
 {
   m_name = m_curString.stripWhiteSpace();
@@ -348,13 +385,6 @@ void MemberHandler::startParam(const QXmlAttributes& attrib)
   }
 }
 
-void MemberHandler::startEnumValue(const QXmlAttributes& attrib)
-{
-  EnumValueHandler *evh = new EnumValueHandler(this);
-  evh->startEnumValue(attrib);
-  m_enumValues.append(evh);
-}
-
 void MemberHandler::startTemplateParamList(const QXmlAttributes&)
 {
   m_insideTemplateParamList = TRUE;
@@ -416,4 +446,9 @@ ISection *MemberHandler::section() const
   return m_section;
 }
 
+IMemberIterator *MemberHandler::enumValues() const
+{ 
+  return new MemberIterator(m_enumValues); 
+}
+
 
diff --git a/addon/doxmlparser/src/memberhandler.h b/addon/doxmlparser/src/memberhandler.h
index f76655c..6280013 100644
--- a/addon/doxmlparser/src/memberhandler.h
+++ b/addon/doxmlparser/src/memberhandler.h
@@ -51,6 +51,8 @@ class MemberReferenceIterator : public BaseIterator<IMemberReferenceIterator,IMe
       BaseIterator<IMemberReferenceIterator,IMemberReference,MemberReference>(list) {}
 };
 
+
+#if 0
 class EnumValueHandler : public IEnumValue, public BaseHandler<EnumValueHandler>
 {
   public:
@@ -65,12 +67,12 @@ class EnumValueHandler : public IEnumValue, public BaseHandler<EnumValueHandler>
 
     // IEnumValue
     virtual const IString *name() const { return &m_name; }
-    virtual const IString *initializer() const { return &m_initializer; }
+    virtual ILinkedTextIterator *initializer() const
+    { return new LinkedTextIterator(m_initializer); }
 
     void setName(const QString &name) { m_name=name; }
-    void setInitializer(const QString &init) { m_initializer=init; }
     
-    virtual ~EnumValueHandler() {  delete m_brief;  delete m_detailed; }
+    virtual ~EnumValueHandler();
     EnumValueHandler(IBaseHandler *parent);
 
     virtual IDocRoot *briefDescription() const
@@ -80,10 +82,11 @@ class EnumValueHandler : public IEnumValue, public BaseHandler<EnumValueHandler>
 
   private:
     StringImpl m_name;
-    StringImpl m_initializer;
+    QList<LinkedTextImpl> m_initializer;
     IBaseHandler *m_parent;
     DocHandler  *m_brief;
     DocHandler  *m_detailed;
+    LinkedTextHandler *m_linkedTextHandler;
 };
 
 class EnumValueIterator : public BaseIterator<IEnumValueIterator,IEnumValue,EnumValueHandler>
@@ -92,15 +95,29 @@ class EnumValueIterator : public BaseIterator<IEnumValueIterator,IEnumValue,Enum
     EnumValueIterator(const QList<EnumValueHandler> &list) : 
       BaseIterator<IEnumValueIterator,IEnumValue,EnumValueHandler>(list) {}
 };
+#endif
 
 
-class MemberHandler : public IMember, public BaseHandler<MemberHandler>
+class MemberHandler : public IDefine,
+                      public IProperty, 
+                      public IVariable,
+                      public ITypedef,
+                      public IFunction,
+                      public ISignal,
+                      public IPrototype,
+                      public IFriend,
+                      public IDCOP,
+                      public ISlot,
+                      public IEnum,
+                      public IEnumValue,
+                      public BaseHandler<MemberHandler>
 {
   public:
     virtual void startMember(const QXmlAttributes& attrib);
     virtual void endMember();
     virtual void startParam(const QXmlAttributes& attrib);
     virtual void startType(const QXmlAttributes& attrib);
+    virtual void startName(const QXmlAttributes& attrib);
     virtual void endName();
     virtual void startBriefDesc(const QXmlAttributes& attrib);
     virtual void startDetailedDesc(const QXmlAttributes& attrib);
@@ -116,6 +133,7 @@ class MemberHandler : public IMember, public BaseHandler<MemberHandler>
     virtual void startInitializer(const QXmlAttributes& attrib);
     virtual void startException(const QXmlAttributes& attrib);
     virtual void startEnumValue(const QXmlAttributes& attrib);
+    virtual void startEnumValue2(const QXmlAttributes& attrib);
     virtual void startTemplateParamList(const QXmlAttributes &attrib);
     virtual void endTemplateParamList();
 
@@ -172,13 +190,14 @@ class MemberHandler : public IMember, public BaseHandler<MemberHandler>
     { return m_reimplements; }
     virtual IMemberReferenceIterator *reimplementedBy() const
     { return new MemberReferenceIterator(m_reimplementedBy); }
-    virtual IEnumValueIterator *enumValues() const
-    { return new EnumValueIterator(m_enumValues); }
     virtual IDocRoot *briefDescription() const
     { return m_brief; }
     virtual IDocRoot *detailedDescription() const
     { return m_detailed; }
 
+    // IEnum
+    virtual IMemberIterator *enumValues() const;
+    
     void initialize(MainHandler *m);
     void setCompoundHandler(CompoundHandler *c);
     void setSectionHandler(SectionHandler *s);
@@ -212,16 +231,19 @@ class MemberHandler : public IMember, public BaseHandler<MemberHandler>
     bool m_isConst;
     bool m_isVolatile;
     LinkedTextHandler *m_linkedTextHandler;
-    QList<EnumValueHandler> m_enumValues;
+    QList<MemberHandler> m_enumValues;
     bool m_insideTemplateParamList;
     bool m_hasTemplateParamList;
 };
 
-class MemberIterator : public BaseIterator<IMemberIterator,IMember,MemberHandler>
+class MemberIterator : public BaseIteratorVia<IMemberIterator,
+                                        IMember,
+                                        MemberHandler,
+                                        IFunction>
 {
   public:
     MemberIterator(const QList<MemberHandler> &list) : 
-      BaseIterator<IMemberIterator,IMember,MemberHandler>(list) {}
+      BaseIteratorVia<IMemberIterator,IMember,MemberHandler,IFunction>(list) {}
 };
 
 void memberhandler_init();
diff --git a/addon/doxmlparser/src/paramhandler.cpp b/addon/doxmlparser/src/paramhandler.cpp
index ecfdda2..0278e86 100644
--- a/addon/doxmlparser/src/paramhandler.cpp
+++ b/addon/doxmlparser/src/paramhandler.cpp
@@ -20,10 +20,8 @@
 TemplateParamListHandler::TemplateParamListHandler(IBaseHandler *parent) : m_parent(parent)
 {
   addStartHandler("param",this,&TemplateParamListHandler::startParam);
-  //addEndHandler("param",this,&TemplateParamListHandler::endParam);
 
   addEndHandler("templateparamlist",this,&TemplateParamListHandler::endTemplateParamList);
-
 }
 
 void TemplateParamListHandler::startParam(const QXmlAttributes& attrib)
diff --git a/addon/doxmlparser/test/main.cpp b/addon/doxmlparser/test/main.cpp
index 7ac7720..067dfc9 100644
--- a/addon/doxmlparser/test/main.cpp
+++ b/addon/doxmlparser/test/main.cpp
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <doxmlintf.h>
+#include <qstring.h>
 
 /*! Dumps the contents of a hyperlinked text fragment as plain text to the
  *  output.
@@ -390,6 +391,15 @@ void DumpDoc(IDoc *doc,int level)
         InPrint(("<preformatted/>\n"));
       }
       break;
+    case IDoc::Verbatim:
+      {
+        InPrint(("<verbatim>\n"));
+        IDocVerbatim *vt = dynamic_cast<IDocVerbatim*>(doc);
+        ASSERT(vt!=0);
+        InPrint(("%s",vt->text()->latin1()));
+        InPrint(("<verbatim/>\n"));
+      }
+      break;
     case IDoc::Symbol:
       {
         IDocSymbol *sym = dynamic_cast<IDocSymbol*>(doc);
@@ -540,14 +550,22 @@ int main(int argc,char **argv)
         }
         mri->release();
 
-        IEnumValueIterator *evi = mem->enumValues();
-        IEnumValue *ev;
-        for (evi->toFirst();(ev=evi->current());evi->toNext())
+        if (mem->kind()==IMember::Enum) // we have found an enum
         {
-          printf("      Enum value `%s' init=`%s'\n",
-              ev->name()->latin1(),ev->initializer()->latin1());
+          IEnum *e = dynamic_cast<IEnum*>(mem);
+          IMemberIterator *evi = e->enumValues(); // get the enum values
+          IMember *mev;
+          for (evi->toFirst();(mev=evi->current());evi->toNext())
+          {
+            IEnumValue *ev = dynamic_cast<IEnumValue*>(mev);
+            ILinkedTextIterator *lti = ev->initializer();
+            QString init = linkedTextToString(lti);
+            lti->release();
+            printf("      Enum value `%s' init=`%s'\n",
+                ev->name()->latin1(),init.latin1());
+          }
+          evi->release();
         }
-        evi->release();
 
         pli = mem->templateParameters();
         if (pli)
diff --git a/addon/perlmod/DoxyModel.pm b/addon/perlmod/DoxyModel.pm
deleted file mode 100644
index 10454b9..0000000
--- a/addon/perlmod/DoxyModel.pm
+++ /dev/null
@@ -1,102 +0,0 @@
-sub section($$) {
-    my ($wrap, $name) = @_;
-    my $prefix = "Doxy" . $name;
-    return
-        [ "hash", "Doxy" . $wrap,
-          { 
-            members =>
-              [ "list", $prefix . "s",
-                [ "hash", $prefix,
-                  {
-                    kind => [ "field", $prefix . "Kind" ],
-                    name => [ "field", $prefix . "Name" ],
-                    virtualness => [ "field", $prefix . "Virtualness" ],
-                    protection => [ "field", $prefix . "Protection" ],
-                    type => [ "field", $prefix . "Type" ],
-                    parameters => 
-                      [ "list", $prefix . "Params",
-                        [ "hash", $prefix . "Param",
-                          {
-                            declaration_name => [ "field", $prefix . "ParamName" ],
-                            type => [ "field", $prefix . "ParamType" ],
-                          },
-                        ],
-                      ],
-                    detailed =>
-                      [ "hash", $prefix . "Detailed",
-                        {
-                          doc => [ "doc", $prefix . "DetailedDoc" ],
-                          return => [ "doc", $prefix . "Return" ],
-                          see => [ "doc", $prefix . "See" ],
-                          params =>
-                            [ "list", $prefix . "PDBlocks",
-                              [ "hash", $prefix . "PDBlock",
-                                {
-                                  parameters =>
-                                    [ "list", $prefix . "PDParams",
-                                      [ "hash", $prefix . "PDParam",
-                                        {
-                                          name => [ "field", $prefix . "PDParamName" ],
-                                        },
-                                      ],
-                                    ],
-                                  doc => [ "doc", $prefix . "PDDoc" ],
-                                },
-                              ],
-                            ],
-                        },
-                      ],
-                  },
-                ],
-              ],
-          },
-        ];
-}
-
-$doxymodel =
-    [ "hash", "DoxyTop",
-      {
-        files => 
-          [ "list", "DoxyFiles",
-            [ "hash", "DoxyFile",
-              {
-                name => [ "field", "DoxyFileName" ],
-                typedefs => section("FileTypedefs", "Typedef"),
-                variables => section("FileVariables", "Variable"),
-                functions => section("FileFunctions", "Function"),
-                detailed =>
-                  [ "hash", "DoxyFileDetailed",
-                    {
-                      doc => [ "doc", "DoxyFileDetailedDoc" ],
-                    },
-                  ],
-              },
-            ],
-          ],
-	classes => 
-	  [ "list", "DoxyClasses",
-	    [ "hash", "DoxyClass",
-	      {
-		name => [ "field", "DoxyClassName" ],
-		public_typedefs => section("ClassPublicTypedefs", "Typedef"),
-		public_methods => section("ClassPublicMethods", "Function"),
-		public_members => section("ClassPublicMembers", "Variable"),
-		protected_typedefs => section("ClassProtectedTypedefs", "Typedef"),
-		protected_methods => section("ClassProtectedMethods", "Function"),
-		protected_members => section("ClassProtectedMembers", "Variable"),
-		private_typedefs => section("ClassPrivateTypedefs", "Typedef"),
-		private_methods => section("ClassPrivateMethods", "Function"),
-		private_members => section("ClassPrivateMembers", "Variable"),
-                detailed =>
-		  [ "hash", "DoxyClassDetailed",
-		    {
-		      doc => [ "doc", "DoxyClassDetailedDoc" ],
- 		    },
-		  ],
-	      },
-	    ],
-	  ],
-      },
-    ];
-
-1;
diff --git a/addon/perlmod/README b/addon/perlmod/README
deleted file mode 100644
index 0938474..0000000
--- a/addon/perlmod/README
+++ /dev/null
@@ -1,43 +0,0 @@
-DoxyModel.pm: it is a Perl module with information about the structure
-of DoxyDocs.pm files.  It is used by Perl scripts that process the
-output generated by the Perl backend.
-   
-doxydocs-latex.pl: it is a Perl script which uses DoxyModel.pm and a
-generated DoxyDocs.pm to create the file doxydocs.tex. This file
-contains the documentation, this time in "TeX" format.  doxydocs.tex,
-however, can't been directly LaTeX'ed.
-
-doxydocs-latex.ltx: this is the LaTeX file which is LaTeX'ed to
-generate the PDF or DVI documentation.  It includes doxydocs.tex,
-generated by doxydocs-latex.pl above, and doxytemplate.tex, generated
-by doxytemplate-latex.pl -- see below.  This file is intended to be
-customized by users if they want to modify the format of the PDF or
-DVI output.
-
-doxytemplate-latex.pl: this is a Perl script which uses DoxyModel.pm
-to generate a doxytemplate.tex TeX file.  This file is included by   
-doxydocs-latex.ltx to maintain the compatibility with future versions
-of Doxygen; i.e. a customized doxydocs-latex.ltx should work with the
-output generated by future versions of Doxygen as long as it includes
-an updated doxydocs.tex.
-
-So what do you do to test my backend?
-
-1. You apply perlgen.diff and rebuild Doxygen.
-2. You save DoxyModel.pm, doxydocs-latex.pl, doxytemplate-latex.pl and
-doxydocs-latex.ltx to your test directory.
-3. You run doxytemplate-latex.pl to generate doxytemplate.tex.
-4. You generate DoxyDocs.pm by running Doxygen on the test code.  (You
-must enable the GENERATE_PERL option in your Doxyfile).
-5. You run doxydocs-latex.pl to generate doxydocs.tex from
-DoxyDocs.pm.
-6. You run pdflatex on doxydocs-latex.ltx to generate
-doxydocs-latex.pdf from doxydocs.tex and doxytemplate.tex.
-
-If you want to regenerate the PDF output after modifying the test code
-you only need to do the steps from 4 on.
-
-I also attach a main.h file I've used to test my backend and the
-corresponding main.pdf file I've generated from it.
-
-
diff --git a/addon/perlmod/doxydocs-latex.pl b/addon/perlmod/doxydocs-latex.pl
deleted file mode 100644
index c60ff65..0000000
--- a/addon/perlmod/doxydocs-latex.pl
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/perl
-# Copyright (C) 1997-2002 by Dimitri van Heesch.
-# Author: Miguel Lobo.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby 
-# granted. No representations are made about the suitability of this software 
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-#
-# Documents produced by Doxygen are derivative works derived from the
-# input used in their production; they are not affected by this license.
-
-# This script can be used to generate LaTeX output using the new Perl
-# intermediate format.  It is incomplete and experimental, so for the moment
-# you should use Doxygen"s standard LaTeX output.
-#
-# If you want to try this out, you should do:
-# doxygen configName		# This creates DoxyDocs.pm
-# perl -I. doxydocs-latex.pl	# This creates doxydocs.tex and doxytemplate.tex
-# latex doxydocs-latex.ltx	# This creates doxydocs-latex.dvi
-#
-# Notes:
-# - Your config file has to have Perl output enabled, of course.
-# - The Perl output format is only complete enough to document
-#   a simple C file; no classes by the moment :-).
-
-use DoxyModel;
-use DoxyDocs;
-
-sub latex_quote($) {
-    my $text = $_[0];
-    $text =~ s/[\\_&]/\\$&/g;
-    print TEXDOCS $text;
-}
-
-sub generate_doc($) {
-    my $doc = $_[0];
-    for my $item (@$doc) {
-	my $type = $$item{type};
-	if ($type eq "text") {
-	    latex_quote($$item{content});
-	} elsif ($type eq "para") {
-	    generate_doc($$item{content});
-#	    print TEXDOCS "\\par\n";
-	} elsif ($type eq "bold") {
-	    print TEXDOCS "\\textbf{";
-	    generate_doc($$item{content});
-	    print TEXDOCS "}";
-	} elsif ($type eq "emphasis") {
-	    print TEXDOCS "\\textit{";
-	    generate_doc($$item{content});
-	    print TEXDOCS "}";
-	} elsif ($type eq "url") {
-	    latex_quote($$item{content});
-	}
-    }
-}
-
-sub generate($$) {
-    my ($item, $model) = @_;
-    my ($type, $name) = @$model[0, 1];
-    if ($type eq "field") {
-	print TEXDOCS "\\" . $name . "{";
-	latex_quote($item);
-	print TEXDOCS "}";
-    } elsif ($type eq "doc") {
-	if (@$item) {
-	    print TEXDOCS "\\" . $name . "{";
-	    generate_doc($item);
-	    print TEXDOCS "}%\n";
-	} else {
-	    print TEXDOCS "\\" . $name . "Empty%\n";
-	}
-    } elsif ($type eq "hash") {
-	my ($key, $value);
-	while (($key, $submodel) = each %{$$model[2]}) {
-	    my $name = $$submodel[1];
-	    print TEXDOCS "\\def\\f" . $name . "{";
-	    if ($$item{$key}) {
-		generate($$item{$key}, $submodel);
-	    } else {
-	    	print TEXDOCS "\\" . $name . "Empty";
-	    }
-	    print TEXDOCS "}%\n";
-	}
-	print TEXDOCS "\\" . $name . "%\n";
-    } elsif ($type eq "list") {
-	my $index = 0;
-	if (@$item) {
-	    print TEXDOCS "\\" . $name . "{%\n";
-	    for my $subitem (@$item) {
-		if ($index) {
-		    print TEXDOCS "\\" . $name . "Sep%\n";
-		}
-		generate($subitem, $$model[2]);
-		$index++;
-	    }
-	    print TEXDOCS "}%\n";
-	} else {
-	    print TEXDOCS "\\" . $name . "Empty%\n";
-	}
-    }
-}
-
-open TEXDOCS, ">doxydocs.tex";
-generate($doxydocs, $doxymodel);
-close TEXDOCS;
diff --git a/addon/perlmod/doxytemplate-latex.pl b/addon/perlmod/doxytemplate-latex.pl
deleted file mode 100644
index 8caddf6..0000000
--- a/addon/perlmod/doxytemplate-latex.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-use DoxyModel;
-
-sub template($) {
-    my $model = $_[0];
-    my ($type, $name) = @$model[0, 1];
-    if ($type eq "field") {
-	print TEXTEMPLATE "\\def\\" . $name . "#1{#1}%\n";
-    } elsif ($type eq "doc") {
-	print TEXTEMPLATE "\\def\\" . $name . "#1{#1}%\n";
-    } elsif ($type eq "hash") {
-	my ($key, $value);
-	while (($key, $submodel) = each %{$$model[2]}) {
-	    my $subname = $$submodel[1];
-	    print TEXTEMPLATE "\\def\\" . $subname . "Empty{}%\n";
-	    print TEXTEMPLATE "\\def\\f" . $subname . "Empty{\\" . $subname . "Empty}%\n";
-	    template($submodel);
-	}
-	print TEXTEMPLATE "\\def\\" . $name . "{}%\n";
-    } elsif ($type eq "list") {
-	template($$model[2]);
-	print TEXTEMPLATE "\\def\\" . $name . "#1{#1}%\n";
-	print TEXTEMPLATE "\\def\\" . $name . "Sep{}%\n";
-    }
-}
-
-open TEXTEMPLATE, ">doxytemplate.tex";
-template($doxymodel);
-close TEXTEMPLATE;
diff --git a/doc/Doxyfile b/doc/Doxyfile
index e4cb868..c25878e 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -36,7 +36,8 @@ INPUT             = index.doc install.doc starting.doc docblocks.doc lists.doc \
 		    doxygen_usage.doc doxytag_usage.doc doxysearch_usage.doc \
                     doxywizard_usage.doc \
                     installdox_usage.doc output.doc autolink.doc \
-		    config.doc commands.doc htmlcmds.doc language.doc arch.doc
+		    config.doc commands.doc htmlcmds.doc language.doc \
+                    perlmod.doc perlmod_tree.doc arch.doc 
 FILE_PATTERNS     = *.cpp *.h *.doc
 EXAMPLE_PATH      = ../examples
 RECURSIVE         = NO
diff --git a/doc/doxygen_manual.tex b/doc/doxygen_manual.tex
index 91a6764..ffac9a7 100644
--- a/doc/doxygen_manual.tex
+++ b/doc/doxygen_manual.tex
@@ -72,6 +72,8 @@ Written by Dimitri van Heesch\\[2ex]
 \input{htmlcmds}
 \part{Developers Manual}
 \input{arch}
+\input{perlmod}
+%\input{perlmod_tree}
 \input{langhowto}
 \printindex
 \end{document}
diff --git a/doc/faq.doc b/doc/faq.doc
index 4f7ce54..7a85be4 100644
--- a/doc/faq.doc
+++ b/doc/faq.doc
@@ -62,7 +62,7 @@ PREDEFINED             = MY_MACRO()=
       manual for more information.
   </ol> 
 
-<li><b>When I set EXTRACT_ALL to NO non of my functions are shown in the documentation.</b></li>
+<li><b>When I set EXTRACT_ALL to NO none of my functions are shown in the documentation.</b></li>
 
 In order for global functions, variables, enums, typedefs, and defines 
 to be documented you should document the file in which these commands are
@@ -111,9 +111,9 @@ in the documentation of the class MyClassName regardless of the name of the actu
 header file in which the definition of MyClassName is contained.
 
 If you want doxygen to show that the include file should be included using
-brackets you should type:
+quotes instead of angle brackets you should type:
 \verbatim
-/*! \class MyClassName include.h "path/include.h"
+/*! \class MyClassName myhdr.h "path/myhdr.h"
  *
  *  Docs for MyClassName
  */
@@ -187,18 +187,36 @@ EXCLUDE_PATTERNS = */test/*
 Put a \% in front of the class name. Like this: \%MyClass. Doxygen will then
 remove the % and keep the word unlinked.
 
+<li><b>My favourite programming language is X. Can I still use doxygen?</b>
+
+No, not as such; doxygen needs to understand the structure of what it reads. 
+If you don't mind spending some time on it, there are several options:
+- If the grammer of X is close to C or C++, then it is probably not too hard to
+  tweak src/scanner.l a bit so the language is supported. This is done
+  for all other languages directly supported by doxygen 
+  (i.e. Java, IDL, C#, PHP).
+- If the grammer of X is somewhat different than you can write an input
+  filter that translates X into something similar enough to C/C++ for
+  doxygen to understand (this approach is taken for VB, Object Pascal, and
+  Javascript, see http://www.stack.nl/~dimitri/doxygen/download.html#helpers).
+- If the grammer is completely different one could write a parser for X and 
+  write a backend that produces a similar syntax tree as is done by 
+  src/scanner.l (and also by src/tagreader.cpp while reading tag files).
+
 <li><b>Help! I get the cryptic message 
  "input buffer overflow, can't enlarge buffer because scanner uses REJECT"</b>
 
-This error happens when doxygen lexical scanner has a rules that matches
-more than 16K input character in one go. I've seen this happening 
+This error happens when doxygen lexical scanner has a rule that matches
+more than 16K of input characters in one go. I've seen this happening 
 on a very large generated file (\>16K lines), where the built-in preprocessor 
 converted it into an empty file (with \>16K of newlines). Another case
 where this might happen is if you have lines in your code with more than
 16K characters. 
 
-If you have ran into such a case and want me to fix it, you
-should send me a code fragment that triggers the message.
+If you have run into such a case and want me to fix it, you
+should send me a code fragment that triggers the message. The workaround
+the problem put some line-breaks into your file, split it up into smaller 
+parts, or exclude it from the input using EXCLUDE.
 
 <li><b>How did doxygen get its name?</b>
 
@@ -211,7 +229,7 @@ generator -> gen
 \endverbatim
 
 At the time I was looking into lex and yacc, where a lot of things start with
-"yy", so the "y" slipped in and made things pronouncable.
+"yy", so the "y" slipped in and made things pronounceable.
 
 <li><b>What was the reason to develop doxygen?</b>
 
diff --git a/doc/index.doc b/doc/index.doc
index 130922d..b04cc8a 100644
--- a/doc/index.doc
+++ b/doc/index.doc
@@ -27,7 +27,7 @@ Version: $(VERSION)
 
 <h2>Introduction</h2>
 Doxygen is a documentation system for C++, C, Java, IDL 
-(Corba, Microsoft, and KDE-DCOP flavors) and to some extent PHP. 
+(Corba, Microsoft, and KDE-DCOP flavors) and to some extent PHP and C#. 
 
 It can help you in three ways:
 <ol>
@@ -105,6 +105,7 @@ The third part provides information for developers:
 <ul>
 <li>Section \ref arch gives a global overview of how doxygen is internally
     structured.
+<li>Section \ref perlmod shows how to use the PerlMod output.
 <li>Section \ref langhowto explains how to add support for new
               output languages.
 </ul>
diff --git a/doc/install.doc b/doc/install.doc
index 1387f13..3bba13e 100644
--- a/doc/install.doc
+++ b/doc/install.doc
@@ -557,15 +557,15 @@ http://www.trolltech.com/products/download/qt-win-noncomm.html
 Doxygen was developed and tested under Linux using the following 
 open-source tools:
 <ul>
-<li>EGCS version 2.91.66
+<li>GCC version 2.95.3
 <li>GNU flex version 2.5.4
-<li>GNU bison version 1.25
-<li>GNU make version 3.76.1
-<li>Perl version 5.005_02 
-<li>VIM version 5.4
-<li>Netscape 4.61
+<li>GNU bison version 1.35
+<li>GNU make version 3.79.1
+<li>Perl version 5.005_03 
+<li>VIM version 5.8
+<li>Mozilla 1.0
 <li>Troll Tech's tmake version 1.3 (included in the distribution) 
-<li>teTeX version 0.9
+<li>teTeX version 1.0
 <li>CVS 1.10.7
 </ul>
 
diff --git a/doc/language.doc b/doc/language.doc
index 1df07fe..c3e2fda 100644
--- a/doc/language.doc
+++ b/doc/language.doc
@@ -25,7 +25,7 @@ Doxygen has built-in support for multiple languages. This means
 that the text fragments that doxygen generates can be produced in
 languages other than English (the default) at configuration time.
 
-Currently (version 1.2.14-20020317), 28 languages 
+Currently (version 1.2.18-20021020), 28 languages 
 are supported (sorted alphabetically): 
 Brazilian Portuguese, Catalan, Chinese, Chinese Traditional, Croatian, 
 Czech, Danish, Dutch, English, Finnish, 
@@ -79,7 +79,7 @@ when the translator was updated.
       <TD>Croatian</TD>  
       <TD>Boris Bralo</TD>
       <TD>boris.bralo@NOSPAM.zg.tel.hr</TD>
-      <TD>up-to-date</TD>
+      <TD>1.2.18</TD>
   </TR>
   <TR BGCOLOR="#ffffff">
       <TD>Czech</TD>  
@@ -139,13 +139,13 @@ when the translator was updated.
       <TD>Italian</TD>  
       <TD>Alessandro Falappa<br>Ahmed Aldo Faisal</TD>
       <TD>alessandro@NOSPAM.falappa.net<br>aaf23@NOSPAM.cam.ac.uk</TD>
-      <TD>up-to-date</TD>
+      <TD>1.2.18</TD>
   </TR>
   <TR BGCOLOR="#ffffff">
       <TD>Japanese</TD>  
       <TD>Ryunosuke Sato<br>Kenji Nagamatsu</TD>
       <TD>puyo@NOSPAM.mint.freemail.ne.jp<br>naga@NOSPAM.joyful.club.ne.jp</TD>
-      <TD>up-to-date</TD>
+      <TD>1.2.18</TD>
   </TR>
   <TR BGCOLOR="#ffffff">
       <TD>Korean</TD>  
@@ -169,7 +169,7 @@ when the translator was updated.
       <TD>Portuguese</TD>  
       <TD>Rui Godinho Lopes</TD>
       <TD>ruiglopes@NOSPAM.yahoo.com</TD>
-      <TD>up-to-date</TD>
+      <TD>1.2.18</TD>
   </TR>
   <TR BGCOLOR="#ffffff">
       <TD>Romanian</TD>  
@@ -193,7 +193,7 @@ when the translator was updated.
       <TD>Slovak</TD>  
       <TD>Stanislav Kudl&aacute;&#x010d;</TD>
       <TD>skudlac@NOSPAM.pobox.sk</TD>
-      <TD>up-to-date</TD>
+      <TD>1.2.18</TD>
   </TR>
   <TR BGCOLOR="#ffffff">
       <TD>Slovene</TD>  
@@ -239,7 +239,7 @@ when the translator was updated.
   \hline
   Chinese Traditional & Gary Lee & {\tt garylee@ecosine.com.tw} & 1.2.16 \\
   \hline
-  Croatian & Boris Bralo & {\tt boris.bralo@zg.tel.hr} & up-to-date \\
+  Croatian & Boris Bralo & {\tt boris.bralo@zg.tel.hr} & 1.2.18 \\
   \hline
   Czech & Petr P\v{r}ikryl & {\tt prikrylp@skil.cz} & up-to-date \\
   \hline
@@ -260,10 +260,10 @@ when the translator was updated.
   \hline
   Hungarian & F\"{o}ldv\'{a}ri Gy\"{o}rgy & {\tt foldvari@diatronltd.com} & 1.2.1 \\
   \hline
-  Italian & Alessandro Falappa & {\tt alessandro@falappa.net} & up-to-date \\
+  Italian & Alessandro Falappa & {\tt alessandro@falappa.net} & 1.2.18 \\
    & Ahmed Aldo Faisal & {\tt aaf23@cam.ac.uk} &  \\
   \hline
-  Japanese & Ryunosuke Sato & {\tt puyo@mint.freemail.ne.jp} & up-to-date \\
+  Japanese & Ryunosuke Sato & {\tt puyo@mint.freemail.ne.jp} & 1.2.18 \\
    & Kenji Nagamatsu & {\tt naga@joyful.club.ne.jp} &  \\
   \hline
   Korean & Richard Kim & {\tt ryk@dspwiz.com} & 1.2.13 \\
@@ -273,7 +273,7 @@ when the translator was updated.
   Polish & Piotr Kaminski & {\tt Piotr.Kaminski@ctm.gdynia.pl} & 1.2.17 \\
    & Grzegorz Kowal & {\tt g\_kowal@poczta.onet.pl} &  \\
   \hline
-  Portuguese & Rui Godinho Lopes & {\tt ruiglopes@yahoo.com} & up-to-date \\
+  Portuguese & Rui Godinho Lopes & {\tt ruiglopes@yahoo.com} & 1.2.18 \\
   \hline
   Romanian & Alexandru Iosup & {\tt aiosup@yahoo.com} & 1.2.16 \\
   \hline
@@ -281,7 +281,7 @@ when the translator was updated.
   \hline
   Serbian & Dejan Milosavljevic & {\tt dmilos@email.com} & 1.2.17 \\
   \hline
-  Slovak & Stanislav Kudl\'{a}\v{c} & {\tt skudlac@pobox.sk} & up-to-date \\
+  Slovak & Stanislav Kudl\'{a}\v{c} & {\tt skudlac@pobox.sk} & 1.2.18 \\
   \hline
   Slovene & Matjaz Ostroversnik & {\tt matjaz.ostroversnik@zrs-tk.si} & 1.2.16 \\
   \hline
diff --git a/doc/perlmod.doc b/doc/perlmod.doc
new file mode 100644
index 0000000..becbdf2
--- /dev/null
+++ b/doc/perlmod.doc
@@ -0,0 +1,190 @@
+/*! \page perlmod Perl Module output format documentation
+
+\addindex perlmod
+
+<p>Since version 1.2.18, Doxygen can generate a new output format we 
+have called the &quot;Perl Module output format&quot;.  It has been 
+designed as an intermediate format that can be used to generate new 
+and customized output without having to modify the Doxygen source. 
+Therefore, its purpose is similar to the XML output format that can be 
+also generated by Doxygen.  The XML output format is more standard, 
+but the Perl Module output format is possibly simpler and easier to 
+use.
+
+<p>The Perl Module output format is still experimental at the moment 
+and could be changed in incompatible ways in future versions, although 
+this should not be very probable.  It is also lacking some features of 
+other Doxygen backends.  However, it can be already used to generate 
+useful output, as shown by the Perl Module-based LaTeX generator.
+
+<p>Please report any bugs or problems you find in the Perl Module 
+backend or the Perl Module-based LaTeX generator to the 
+doxygen-develop mailing list.  Suggestions are welcome as well.
+
+\section using_perlmod_fmt Using the Perl Module output format.
+
+<p>When the <b>GENERATE_PERLMOD</b> tag is enabled in the Doxyfile, 
+running Doxygen generates a number of files in the <b>perlmod/</b> 
+subdirectory of your output directory.  These files are the following:
+
+<ul>
+
+<li><b>DoxyDocs.pm</b>.  This is the Perl module that actually
+contains the documentation, in the Perl Module format described 
+\ref doxydocs_format "below".
+
+<li><b>DoxyModel.pm</b>.  This Perl module describes the structure of
+<b>DoxyDocs.pm</b>, independently of the actual documentation.  See 
+\ref doxymodel_format "below" for details.
+
+<li><b>doxyrules.make</b>.  This file contains the make rules to build 
+and clean the files that are generated from the Doxyfile.  Also 
+contains the paths to those files and other relevant information. This 
+file is intended to be included by your own Makefile.
+
+<li><b>Makefile</b>.  This is a simple Makefile including 
+<b>doxyrules.make</b>.
+
+</ul>
+
+<p>To make use of the documentation stored in DoxyDocs.pm you can use
+one of the default Perl Module-based generators provided by Doxygen
+(at the moment this includes the Perl Module-based LaTeX generator,
+see \ref perlmod_latex "below") or write your own customized
+generator.  This should not be too hard if you have some knowledge of
+Perl and it's the main purpose of including the Perl Module backend in
+Doxygen.  See \ref doxydocs_format "below" for details on how
+to do this.
+
+\section perlmod_latex Using the Perl Module-based LaTeX generator.
+
+<p>The Perl Module-based LaTeX generator is pretty experimental and
+incomplete at the moment, but you could find it useful nevertheless.
+It can generate documentation for functions, typedefs and variables
+within files and classes and can be customized quite a lot by
+redefining TeX macros.  However, there is still no documentation on
+how to do this.
+
+<p>Setting the <b>PERLMOD_LATEX</b> tag to <b>YES</b> in the Doxyfile 
+enables the creation of some additional files in the <b>perlmod/</b> 
+subdirectory of your output directory.  These files contain the Perl 
+scripts and LaTeX code necessary to generate PDF and DVI output from 
+the Perl Module output, using PDFLaTeX and LaTeX respectively.  Rules 
+to automate the use of these files are also added to 
+<b>doxyrules.make</b> and the <b>Makefile</b>.
+
+<p>The additional generated files are the following:
+
+<ul>
+
+<li><b>doxylatex.pl</b>.  This Perl script uses DoxyDocs.pm and 
+DoxyModel.pm to generate <b>doxydocs.tex</b>, a TeX file containing 
+the documentation in a format that can be accessed by LaTeX code. This 
+file is not directly LaTeXable.
+
+<li><b>doxyformat.tex</b>.  This file contains the LaTeX code that 
+transforms the documentation from doxydocs.tex into LaTeX text 
+suitable to be LaTeX'ed and presented to the user.
+
+<li><b>doxylatex-template.pl</b>.  This Perl script uses DoxyModel.pm 
+to generate <b>doxytemplate.tex</b>, a TeX file defining default 
+values for some macros.  doxytemplate.tex is included by 
+doxyformat.tex to avoid the need of explicitly defining some macros.
+
+<li><b>doxylatex.tex</b>.  This is a very simple LaTeX document that 
+loads some packages and includes doxyformat.tex and doxydocs.tex. This 
+document is LaTeX'ed to produce the PDF and DVI documentation by the 
+rules added to <b>doxyrules.make</b>.
+
+</ul>
+
+\subsection pm_pdf_gen Simple creation of PDF and DVI output using the Perl Module-based LaTeX generator.
+
+<p>To try this you need to have installed LaTeX, PDFLaTeX and the 
+packages used by <b>doxylatex.tex</b>.
+
+<ol>
+
+<li>Update your Doxyfile to the latest version using:
+
+<pre>doxygen -u Doxyfile</pre>
+
+<li>Set both <b>GENERATE_PERLMOD</b> and <b>PERLMOD_LATEX</b> tags to 
+YES in your Doxyfile.
+
+<li>Run Doxygen on your Doxyfile:
+
+<pre>doxygen Doxyfile</pre>
+
+<li>A <b>perlmod/</b> subdirectory should have appeared in your output 
+directory.  Enter the <b>perlmod/</b> subdirectory and run:
+
+<pre>make pdf</pre>
+
+<p>This should generate a <b>doxylatex.pdf</b> with the documentation 
+in PDF format.
+
+<li>Run:
+
+<pre>make dvi</pre>
+
+<p>This should generate a <b>doxylatex.dvi</b> with the documentation 
+in DVI format.
+
+</ol>
+
+\section doxydocs_format Perl Module documentation format.
+
+<p>The Perl Module documentation generated by Doxygen is stored in 
+<b>DoxyDocs.pm</b>.  This is a very simple Perl module that contains 
+only two statements: an assigment to the variable <b>$doxydocs</b> and 
+the customary <b>1;</b> statement which usually ends Perl modules.  
+The documentation is stored in the variable <b>$doxydocs</b>, which 
+can then be accessed by a Perl script using <b>DoxyDocs.pm</b>.
+
+<p><b>$doxydocs</b> contains a tree-like structure composed of three 
+types of nodes: strings, hashes and lists.
+
+<ul>
+
+<li><b>Strings</b>.  These are normal Perl strings.  They can be of 
+any length can contain any character.  Their semantics depends on 
+their location within the tree.  This type of node has no children.
+
+<li><b>Hashes</b>.  These are references to anonymous Perl hashes.  A 
+hash can have multiple fields, each with a different key.  The value 
+of a hash field can be a string, a hash or a list, and its semantics 
+depends on the key of the hash field and the location of the hash 
+within the tree.  The values of the hash fields are the children of 
+the node.
+
+<li><b>Lists</b>.  These are references to anonymous Perl lists.  A 
+list has an undefined number of elements, which are the children of 
+the node.  Each element has the same type (string, hash or list) and 
+the same semantics, depending on the location of the list within the 
+tree.
+
+</ul>
+
+<p>As you can see, the documentation contained in <b>$doxydocs</b>
+does not present any special impediment to be processed by a simple
+Perl script.  To be able to generate meaningful output using the
+documentation contained in <b>$doxydocs</b> you'll probably need to
+know the semantics of the nodes of the documentation tree, which we
+present in \ref perlmod_tree "this page".
+
+\section doxymodel_format Data structure describing the Perl Module documentation tree.
+
+<p>You might be interested in processing the documentation contained
+in <b>DoxyDocs.pm</b> without needing to take into account the
+semantics of each node of the documentation tree.  For this purpose,
+Doxygen generates a <b>DoxyModel.pm</b> file which contains a data
+structure describing the type and children of each node in the
+documentation tree.
+
+<p>The rest of this section is to be written yet, but in the meantime
+you can look at the Perl scripts generated by Doxygen (such as
+<b>doxylatex.pl</b> or <b>doxytemplate-latex.pl</b>) to get an idea on
+how to use <b>DoxyModel.pm</b>.
+
+*/
diff --git a/doc/perlmod_tree.doc b/doc/perlmod_tree.doc
new file mode 100644
index 0000000..0d412ba
--- /dev/null
+++ b/doc/perlmod_tree.doc
@@ -0,0 +1,377 @@
+/*! \page perlmod_tree Nodes in the documentation tree of the Perl Module output format
+
+<h2>Nodes in the documentation tree of the Perl Module output
+format.</h2>
+
+This is a description of the structure of the documentation tree in
+<b>DoxyDocs.pm</b>.  Each item in the list below describes a node in
+the tree, and the format of the description is as follows:
+
+<ul>
+<li>[ key =&gt; ] <b>Name</b> <i>(type)</i>.  Explanation of the content.
+</ul>
+
+Where
+
+<ul>
+
+<li>The "key =&gt;" part only appears if the parent node is a hash.
+"key" is the key for this node.
+
+<li><b>"Name"</b> is a unique name for the node, defined in
+DoxyModel.pm.
+
+<li><i>"(type)"</i> is the type of the node: "string" for string
+nodes, "hash" for hash nodes, "list" for list nodes, and "doc" for
+documentation subtrees.  The structure of documentation subtrees is
+not described anywhere yet, but you can look for example at
+<b>doxylatex.pl</b> to see how to process it.
+
+</ul>
+
+The meaning of each node in the documentation tree is as follows:
+<ul>
+<li> <b>Root</b> <i>(hash)</i>. Root node.
+<ul>
+<li>classes =&gt; <b>Classes</b> <i>(list)</i>. Documented classes.
+<ul>
+<li> <b>Class</b> <i>(hash)</i>. A documented class.
+<ul>
+<li>protected_members =&gt; <b>ClassProtectedMembers</b> <i>(hash)</i>. Information about the protected members in the class.
+<ul>
+<li>members =&gt; <b>ClassProtectedMemberList</b> <i>(list)</i>. protected member list.
+<ul>
+<li> <b>ClassProtectedMember</b> <i>(hash)</i>. A protected member.
+<ul>
+<li>protection =&gt; <b>ClassProtectedMemberProtection</b> <i>(string)</i>. Protection of the protected member.
+<li>detailed =&gt; <b>ClassProtectedMemberDetailed</b> <i>(hash)</i>. Detailed information about the protected member.
+<ul>
+<li>doc =&gt; <b>ClassProtectedMemberDetailedDoc</b> <i>(doc)</i>. Detailed documentation for the protected member.
+<li>see =&gt; <b>ClassProtectedMemberSee</b> <i>(doc)</i>. "See also" documentation for the protected member.
+</ul>
+<li>kind =&gt; <b>ClassProtectedMemberKind</b> <i>(string)</i>. Kind of protected member (usually "variable").
+<li>name =&gt; <b>ClassProtectedMemberName</b> <i>(string)</i>. Name of the protected member.
+<li>type =&gt; <b>ClassProtectedMemberType</b> <i>(string)</i>. Data type of the protected member.
+</ul>
+</ul>
+</ul>
+<li>detailed =&gt; <b>ClassDetailed</b> <i>(hash)</i>. Detailed information about the class.
+<ul>
+<li>doc =&gt; <b>ClassDetailedDoc</b> <i>(doc)</i>. Detailed documentation block for the class.
+</ul>
+<li>protected_typedefs =&gt; <b>ClassProtectedTypedefs</b> <i>(hash)</i>. Information about the protected typedefs in the class.
+<ul>
+<li>members =&gt; <b>ClassProtectedTypedefList</b> <i>(list)</i>. protected typedef list.
+<ul>
+<li> <b>ClassProtectedTypedef</b> <i>(hash)</i>. A protected typedef.
+<ul>
+<li>protection =&gt; <b>ClassProtectedTypedefProtection</b> <i>(string)</i>. Protection of the protected typedef.
+<li>detailed =&gt; <b>ClassProtectedTypedefDetailed</b> <i>(hash)</i>. Detailed information about the protected typedef.
+<ul>
+<li>doc =&gt; <b>ClassProtectedTypedefDetailedDoc</b> <i>(doc)</i>. Detailed documentation for the protected typedef.
+<li>see =&gt; <b>ClassProtectedTypedefSee</b> <i>(doc)</i>. "See also" documentation for the protected typedef.
+</ul>
+<li>kind =&gt; <b>ClassProtectedTypedefKind</b> <i>(string)</i>. Kind of protected typedef (usually "typedef").
+<li>name =&gt; <b>ClassProtectedTypedefName</b> <i>(string)</i>. Name of the protected typedef.
+<li>type =&gt; <b>ClassProtectedTypedefType</b> <i>(string)</i>. Data type of the protected typedef.
+</ul>
+</ul>
+</ul>
+<li>name =&gt; <b>ClassName</b> <i>(string)</i>. Name of the class.
+<li>private_members =&gt; <b>ClassPrivateMembers</b> <i>(hash)</i>. Information about the private members in the class.
+<ul>
+<li>members =&gt; <b>ClassPrivateMemberList</b> <i>(list)</i>. private member list.
+<ul>
+<li> <b>ClassPrivateMember</b> <i>(hash)</i>. A private member.
+<ul>
+<li>protection =&gt; <b>ClassPrivateMemberProtection</b> <i>(string)</i>. Protection of the private member.
+<li>detailed =&gt; <b>ClassPrivateMemberDetailed</b> <i>(hash)</i>. Detailed information about the private member.
+<ul>
+<li>doc =&gt; <b>ClassPrivateMemberDetailedDoc</b> <i>(doc)</i>. Detailed documentation for the private member.
+<li>see =&gt; <b>ClassPrivateMemberSee</b> <i>(doc)</i>. "See also" documentation for the private member.
+</ul>
+<li>kind =&gt; <b>ClassPrivateMemberKind</b> <i>(string)</i>. Kind of private member (usually "variable").
+<li>name =&gt; <b>ClassPrivateMemberName</b> <i>(string)</i>. Name of the private member.
+<li>type =&gt; <b>ClassPrivateMemberType</b> <i>(string)</i>. Data type of the private member.
+</ul>
+</ul>
+</ul>
+<li>private_typedefs =&gt; <b>ClassPrivateTypedefs</b> <i>(hash)</i>. Information about the private typedefs in the class.
+<ul>
+<li>members =&gt; <b>ClassPrivateTypedefList</b> <i>(list)</i>. private typedef list.
+<ul>
+<li> <b>ClassPrivateTypedef</b> <i>(hash)</i>. A private typedef.
+<ul>
+<li>protection =&gt; <b>ClassPrivateTypedefProtection</b> <i>(string)</i>. Protection of the private typedef.
+<li>detailed =&gt; <b>ClassPrivateTypedefDetailed</b> <i>(hash)</i>. Detailed information about the private typedef.
+<ul>
+<li>doc =&gt; <b>ClassPrivateTypedefDetailedDoc</b> <i>(doc)</i>. Detailed documentation for the private typedef.
+<li>see =&gt; <b>ClassPrivateTypedefSee</b> <i>(doc)</i>. "See also" documentation for the private typedef.
+</ul>
+<li>kind =&gt; <b>ClassPrivateTypedefKind</b> <i>(string)</i>. Kind of private typedef (usually "typedef").
+<li>name =&gt; <b>ClassPrivateTypedefName</b> <i>(string)</i>. Name of the private typedef.
+<li>type =&gt; <b>ClassPrivateTypedefType</b> <i>(string)</i>. Data type of the private typedef.
+</ul>
+</ul>
+</ul>
+<li>protected_methods =&gt; <b>ClassProtectedMethods</b> <i>(hash)</i>. Information about the protected methods in the class.
+<ul>
+<li>members =&gt; <b>ClassProtectedMethodList</b> <i>(list)</i>. protected method list.
+<ul>
+<li> <b>ClassProtectedMethod</b> <i>(hash)</i>. A protected method.
+<ul>
+<li>parameters =&gt; <b>ClassProtectedMethodParams</b> <i>(list)</i>. List of the parameters of the protected method.
+<ul>
+<li> <b>ClassProtectedMethodParam</b> <i>(hash)</i>. A parameter of the protected method.
+<ul>
+<li>declaration_name =&gt; <b>ClassProtectedMethodParamName</b> <i>(string)</i>. The name of the parameter.
+<li>type =&gt; <b>ClassProtectedMethodParamType</b> <i>(string)</i>. The data type of the parameter.
+</ul>
+</ul>
+<li>protection =&gt; <b>ClassProtectedMethodProtection</b> <i>(string)</i>. Protection of the protected method.
+<li>virtualness =&gt; <b>ClassProtectedMethodVirtualness</b> <i>(string)</i>. Virtualness of the protected method.
+<li>detailed =&gt; <b>ClassProtectedMethodDetailed</b> <i>(hash)</i>. Detailed information about the protected method.
+<ul>
+<li>params =&gt; <b>ClassProtectedMethodPDBlocks</b> <i>(list)</i>. List of parameter documentation blocks for the protected method.
+<ul>
+<li> <b>ClassProtectedMethodPDBlock</b> <i>(hash)</i>. A parameter documentation block for the protected method.
+<ul>
+<li>parameters =&gt; <b>ClassProtectedMethodPDParams</b> <i>(list)</i>. Parameter list for this parameter documentation block.
+<ul>
+<li> <b>ClassProtectedMethodPDParam</b> <i>(hash)</i>. A parameter documented by this documentation block.
+<ul>
+<li>name =&gt; <b>ClassProtectedMethodPDParamName</b> <i>(string)</i>. Name of the parameter.
+</ul>
+</ul>
+<li>doc =&gt; <b>ClassProtectedMethodPDDoc</b> <i>(doc)</i>. Documentation for this parameter documentation block.
+</ul>
+</ul>
+<li>doc =&gt; <b>ClassProtectedMethodDetailedDoc</b> <i>(doc)</i>. Detailed documentation for the protected method.
+<li>see =&gt; <b>ClassProtectedMethodSee</b> <i>(doc)</i>. "See also" documentation for the protected method.
+<li>return =&gt; <b>ClassProtectedMethodReturn</b> <i>(doc)</i>. Documentation about the return value of the protected method.
+</ul>
+<li>kind =&gt; <b>ClassProtectedMethodKind</b> <i>(string)</i>. Kind of protected method (usually "function").
+<li>name =&gt; <b>ClassProtectedMethodName</b> <i>(string)</i>. Name of the protected method.
+<li>type =&gt; <b>ClassProtectedMethodType</b> <i>(string)</i>. Data type returned by the protected method.
+<li>static =&gt; <b>ClassProtectedMethodStatic</b> <i>(string)</i>. Whether the protected method is static.
+</ul>
+</ul>
+</ul>
+<li>public_typedefs =&gt; <b>ClassPublicTypedefs</b> <i>(hash)</i>. Information about the public typedefs in the class.
+<ul>
+<li>members =&gt; <b>ClassPublicTypedefList</b> <i>(list)</i>. public typedef list.
+<ul>
+<li> <b>ClassPublicTypedef</b> <i>(hash)</i>. A public typedef.
+<ul>
+<li>protection =&gt; <b>ClassPublicTypedefProtection</b> <i>(string)</i>. Protection of the public typedef.
+<li>detailed =&gt; <b>ClassPublicTypedefDetailed</b> <i>(hash)</i>. Detailed information about the public typedef.
+<ul>
+<li>doc =&gt; <b>ClassPublicTypedefDetailedDoc</b> <i>(doc)</i>. Detailed documentation for the public typedef.
+<li>see =&gt; <b>ClassPublicTypedefSee</b> <i>(doc)</i>. "See also" documentation for the public typedef.
+</ul>
+<li>kind =&gt; <b>ClassPublicTypedefKind</b> <i>(string)</i>. Kind of public typedef (usually "typedef").
+<li>name =&gt; <b>ClassPublicTypedefName</b> <i>(string)</i>. Name of the public typedef.
+<li>type =&gt; <b>ClassPublicTypedefType</b> <i>(string)</i>. Data type of the public typedef.
+</ul>
+</ul>
+</ul>
+<li>public_members =&gt; <b>ClassPublicMembers</b> <i>(hash)</i>. Information about the public members in the class.
+<ul>
+<li>members =&gt; <b>ClassPublicMemberList</b> <i>(list)</i>. public member list.
+<ul>
+<li> <b>ClassPublicMember</b> <i>(hash)</i>. A public member.
+<ul>
+<li>protection =&gt; <b>ClassPublicMemberProtection</b> <i>(string)</i>. Protection of the public member.
+<li>detailed =&gt; <b>ClassPublicMemberDetailed</b> <i>(hash)</i>. Detailed information about the public member.
+<ul>
+<li>doc =&gt; <b>ClassPublicMemberDetailedDoc</b> <i>(doc)</i>. Detailed documentation for the public member.
+<li>see =&gt; <b>ClassPublicMemberSee</b> <i>(doc)</i>. "See also" documentation for the public member.
+</ul>
+<li>kind =&gt; <b>ClassPublicMemberKind</b> <i>(string)</i>. Kind of public member (usually "variable").
+<li>name =&gt; <b>ClassPublicMemberName</b> <i>(string)</i>. Name of the public member.
+<li>type =&gt; <b>ClassPublicMemberType</b> <i>(string)</i>. Data type of the public member.
+</ul>
+</ul>
+</ul>
+<li>private_methods =&gt; <b>ClassPrivateMethods</b> <i>(hash)</i>. Information about the private methods in the class.
+<ul>
+<li>members =&gt; <b>ClassPrivateMethodList</b> <i>(list)</i>. private method list.
+<ul>
+<li> <b>ClassPrivateMethod</b> <i>(hash)</i>. A private method.
+<ul>
+<li>parameters =&gt; <b>ClassPrivateMethodParams</b> <i>(list)</i>. List of the parameters of the private method.
+<ul>
+<li> <b>ClassPrivateMethodParam</b> <i>(hash)</i>. A parameter of the private method.
+<ul>
+<li>declaration_name =&gt; <b>ClassPrivateMethodParamName</b> <i>(string)</i>. The name of the parameter.
+<li>type =&gt; <b>ClassPrivateMethodParamType</b> <i>(string)</i>. The data type of the parameter.
+</ul>
+</ul>
+<li>protection =&gt; <b>ClassPrivateMethodProtection</b> <i>(string)</i>. Protection of the private method.
+<li>virtualness =&gt; <b>ClassPrivateMethodVirtualness</b> <i>(string)</i>. Virtualness of the private method.
+<li>detailed =&gt; <b>ClassPrivateMethodDetailed</b> <i>(hash)</i>. Detailed information about the private method.
+<ul>
+<li>params =&gt; <b>ClassPrivateMethodPDBlocks</b> <i>(list)</i>. List of parameter documentation blocks for the private method.
+<ul>
+<li> <b>ClassPrivateMethodPDBlock</b> <i>(hash)</i>. A parameter documentation block for the private method.
+<ul>
+<li>parameters =&gt; <b>ClassPrivateMethodPDParams</b> <i>(list)</i>. Parameter list for this parameter documentation block.
+<ul>
+<li> <b>ClassPrivateMethodPDParam</b> <i>(hash)</i>. A parameter documented by this documentation block.
+<ul>
+<li>name =&gt; <b>ClassPrivateMethodPDParamName</b> <i>(string)</i>. Name of the parameter.
+</ul>
+</ul>
+<li>doc =&gt; <b>ClassPrivateMethodPDDoc</b> <i>(doc)</i>. Documentation for this parameter documentation block.
+</ul>
+</ul>
+<li>doc =&gt; <b>ClassPrivateMethodDetailedDoc</b> <i>(doc)</i>. Detailed documentation for the private method.
+<li>see =&gt; <b>ClassPrivateMethodSee</b> <i>(doc)</i>. "See also" documentation for the private method.
+<li>return =&gt; <b>ClassPrivateMethodReturn</b> <i>(doc)</i>. Documentation about the return value of the private method.
+</ul>
+<li>kind =&gt; <b>ClassPrivateMethodKind</b> <i>(string)</i>. Kind of private method (usually "function").
+<li>name =&gt; <b>ClassPrivateMethodName</b> <i>(string)</i>. Name of the private method.
+<li>type =&gt; <b>ClassPrivateMethodType</b> <i>(string)</i>. Data type returned by the private method.
+<li>static =&gt; <b>ClassPrivateMethodStatic</b> <i>(string)</i>. Whether the private method is static.
+</ul>
+</ul>
+</ul>
+<li>public_methods =&gt; <b>ClassPublicMethods</b> <i>(hash)</i>. Information about the public methods in the class.
+<ul>
+<li>members =&gt; <b>ClassPublicMethodList</b> <i>(list)</i>. public method list.
+<ul>
+<li> <b>ClassPublicMethod</b> <i>(hash)</i>. A public method.
+<ul>
+<li>parameters =&gt; <b>ClassPublicMethodParams</b> <i>(list)</i>. List of the parameters of the public method.
+<ul>
+<li> <b>ClassPublicMethodParam</b> <i>(hash)</i>. A parameter of the public method.
+<ul>
+<li>declaration_name =&gt; <b>ClassPublicMethodParamName</b> <i>(string)</i>. The name of the parameter.
+<li>type =&gt; <b>ClassPublicMethodParamType</b> <i>(string)</i>. The data type of the parameter.
+</ul>
+</ul>
+<li>protection =&gt; <b>ClassPublicMethodProtection</b> <i>(string)</i>. Protection of the public method.
+<li>virtualness =&gt; <b>ClassPublicMethodVirtualness</b> <i>(string)</i>. Virtualness of the public method.
+<li>detailed =&gt; <b>ClassPublicMethodDetailed</b> <i>(hash)</i>. Detailed information about the public method.
+<ul>
+<li>params =&gt; <b>ClassPublicMethodPDBlocks</b> <i>(list)</i>. List of parameter documentation blocks for the public method.
+<ul>
+<li> <b>ClassPublicMethodPDBlock</b> <i>(hash)</i>. A parameter documentation block for the public method.
+<ul>
+<li>parameters =&gt; <b>ClassPublicMethodPDParams</b> <i>(list)</i>. Parameter list for this parameter documentation block.
+<ul>
+<li> <b>ClassPublicMethodPDParam</b> <i>(hash)</i>. A parameter documented by this documentation block.
+<ul>
+<li>name =&gt; <b>ClassPublicMethodPDParamName</b> <i>(string)</i>. Name of the parameter.
+</ul>
+</ul>
+<li>doc =&gt; <b>ClassPublicMethodPDDoc</b> <i>(doc)</i>. Documentation for this parameter documentation block.
+</ul>
+</ul>
+<li>doc =&gt; <b>ClassPublicMethodDetailedDoc</b> <i>(doc)</i>. Detailed documentation for the public method.
+<li>see =&gt; <b>ClassPublicMethodSee</b> <i>(doc)</i>. "See also" documentation for the public method.
+<li>return =&gt; <b>ClassPublicMethodReturn</b> <i>(doc)</i>. Documentation about the return value of the public method.
+</ul>
+<li>kind =&gt; <b>ClassPublicMethodKind</b> <i>(string)</i>. Kind of public method (usually "function").
+<li>name =&gt; <b>ClassPublicMethodName</b> <i>(string)</i>. Name of the public method.
+<li>type =&gt; <b>ClassPublicMethodType</b> <i>(string)</i>. Data type returned by the public method.
+<li>static =&gt; <b>ClassPublicMethodStatic</b> <i>(string)</i>. Whether the public method is static.
+</ul>
+</ul>
+</ul>
+</ul>
+</ul>
+<li>files =&gt; <b>Files</b> <i>(list)</i>. Documented files.
+<ul>
+<li> <b>File</b> <i>(hash)</i>. A documented file.
+<ul>
+<li>detailed =&gt; <b>FileDetailed</b> <i>(hash)</i>. Detailed information about the file.
+<ul>
+<li>doc =&gt; <b>FileDetailedDoc</b> <i>(doc)</i>. Detailed documentation block for the file.
+</ul>
+<li>functions =&gt; <b>FileFunctions</b> <i>(hash)</i>. Information about the functions in the file.
+<ul>
+<li>members =&gt; <b>FileFunctionList</b> <i>(list)</i>. function list.
+<ul>
+<li> <b>FileFunction</b> <i>(hash)</i>. A function.
+<ul>
+<li>parameters =&gt; <b>FileFunctionParams</b> <i>(list)</i>. List of the parameters of the function.
+<ul>
+<li> <b>FileFunctionParam</b> <i>(hash)</i>. A parameter of the function.
+<ul>
+<li>declaration_name =&gt; <b>FileFunctionParamName</b> <i>(string)</i>. The name of the parameter.
+<li>type =&gt; <b>FileFunctionParamType</b> <i>(string)</i>. The data type of the parameter.
+</ul>
+</ul>
+<li>protection =&gt; <b>FileFunctionProtection</b> <i>(string)</i>. Protection of the function.
+<li>virtualness =&gt; <b>FileFunctionVirtualness</b> <i>(string)</i>. Virtualness of the function.
+<li>detailed =&gt; <b>FileFunctionDetailed</b> <i>(hash)</i>. Detailed information about the function.
+<ul>
+<li>params =&gt; <b>FileFunctionPDBlocks</b> <i>(list)</i>. List of parameter documentation blocks for the function.
+<ul>
+<li> <b>FileFunctionPDBlock</b> <i>(hash)</i>. A parameter documentation block for the function.
+<ul>
+<li>parameters =&gt; <b>FileFunctionPDParams</b> <i>(list)</i>. Parameter list for this parameter documentation block.
+<ul>
+<li> <b>FileFunctionPDParam</b> <i>(hash)</i>. A parameter documented by this documentation block.
+<ul>
+<li>name =&gt; <b>FileFunctionPDParamName</b> <i>(string)</i>. Name of the parameter.
+</ul>
+</ul>
+<li>doc =&gt; <b>FileFunctionPDDoc</b> <i>(doc)</i>. Documentation for this parameter documentation block.
+</ul>
+</ul>
+<li>doc =&gt; <b>FileFunctionDetailedDoc</b> <i>(doc)</i>. Detailed documentation for the function.
+<li>see =&gt; <b>FileFunctionSee</b> <i>(doc)</i>. "See also" documentation for the function.
+<li>return =&gt; <b>FileFunctionReturn</b> <i>(doc)</i>. Documentation about the return value of the function.
+</ul>
+<li>kind =&gt; <b>FileFunctionKind</b> <i>(string)</i>. Kind of function (usually "function").
+<li>name =&gt; <b>FileFunctionName</b> <i>(string)</i>. Name of the function.
+<li>type =&gt; <b>FileFunctionType</b> <i>(string)</i>. Data type returned by the function.
+<li>static =&gt; <b>FileFunctionStatic</b> <i>(string)</i>. Whether the function is static.
+</ul>
+</ul>
+</ul>
+<li>name =&gt; <b>FileName</b> <i>(string)</i>. Name of the file.
+<li>variables =&gt; <b>FileVariables</b> <i>(hash)</i>. Information about the variables in the file.
+<ul>
+<li>members =&gt; <b>FileVariableList</b> <i>(list)</i>. variable list.
+<ul>
+<li> <b>FileVariable</b> <i>(hash)</i>. A variable.
+<ul>
+<li>protection =&gt; <b>FileVariableProtection</b> <i>(string)</i>. Protection of the variable.
+<li>detailed =&gt; <b>FileVariableDetailed</b> <i>(hash)</i>. Detailed information about the variable.
+<ul>
+<li>doc =&gt; <b>FileVariableDetailedDoc</b> <i>(doc)</i>. Detailed documentation for the variable.
+<li>see =&gt; <b>FileVariableSee</b> <i>(doc)</i>. "See also" documentation for the variable.
+</ul>
+<li>kind =&gt; <b>FileVariableKind</b> <i>(string)</i>. Kind of variable (usually "variable").
+<li>name =&gt; <b>FileVariableName</b> <i>(string)</i>. Name of the variable.
+<li>type =&gt; <b>FileVariableType</b> <i>(string)</i>. Data type of the variable.
+</ul>
+</ul>
+</ul>
+<li>typedefs =&gt; <b>FileTypedefs</b> <i>(hash)</i>. Information about the typedefs in the file.
+<ul>
+<li>members =&gt; <b>FileTypedefList</b> <i>(list)</i>. typedef list.
+<ul>
+<li> <b>FileTypedef</b> <i>(hash)</i>. A typedef.
+<ul>
+<li>protection =&gt; <b>FileTypedefProtection</b> <i>(string)</i>. Protection of the typedef.
+<li>detailed =&gt; <b>FileTypedefDetailed</b> <i>(hash)</i>. Detailed information about the typedef.
+<ul>
+<li>doc =&gt; <b>FileTypedefDetailedDoc</b> <i>(doc)</i>. Detailed documentation for the typedef.
+<li>see =&gt; <b>FileTypedefSee</b> <i>(doc)</i>. "See also" documentation for the typedef.
+</ul>
+<li>kind =&gt; <b>FileTypedefKind</b> <i>(string)</i>. Kind of typedef (usually "typedef").
+<li>name =&gt; <b>FileTypedefName</b> <i>(string)</i>. Name of the typedef.
+<li>type =&gt; <b>FileTypedefType</b> <i>(string)</i>. Data type of the typedef.
+</ul>
+</ul>
+</ul>
+</ul>
+</ul>
+</ul>
+</ul>
+
+*/
diff --git a/packages/rpm/doxygen.spec b/packages/rpm/doxygen.spec
index 43a985a..ec9ada9 100644
--- a/packages/rpm/doxygen.spec
+++ b/packages/rpm/doxygen.spec
@@ -1,6 +1,6 @@
 Summary: A documentation system for C/C++.
 Name: doxygen
-Version: 1.2.18_20021020
+Version: 1.2.18_20021030
 Release: 1
 Epoch: 1
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
diff --git a/src/Makefile.in b/src/Makefile.in
index f52fa9d..4dda18e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -51,7 +51,7 @@ clean: Makefile.libdoxygen Makefile.doxygen Makefile.doxytag Makefile.doxysearch
 	$(MAKE) -f Makefile.doxysearch clean
 
 distclean: clean
-	-$(RM) scanner.cpp doc.cpp code.cpp config.cpp pre.cpp ce_lex.cpp \
+	-$(RM) scanner.cpp code.cpp config.cpp pre.cpp ce_lex.cpp \
                ce_parse.cpp ce_parse.h doxytag.cpp tag.cpp \
 	       declinfo.cpp defargs.cpp commentcnv.cpp doctokenizer.cpp
 
diff --git a/src/config.l b/src/config.l
index fd1d117..ab77a02 100644
--- a/src/config.l
+++ b/src/config.l
@@ -1580,7 +1580,7 @@ void Config::create()
   cb = addBool(
                     "GENERATE_DEPRECATEDLIST",
                     "The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or \n"
-                    "disable (NO) the deprecated list. This list is created by putting "
+                    "disable (NO) the deprecated list. This list is created by putting \n"
 		    "\\deprecated commands in the documentation.\n",
                     TRUE
 	         );
@@ -1986,7 +1986,7 @@ void Config::create()
   cs->addDependency("GENERATE_LATEX");
   cs = addString(
                     "LATEX_CMD_NAME",
-                    "The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be "
+                    "The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be \n"
                     "invoked. If left blank `latex' will be used as the default command name. \n"
                    );
   cs->setDefaultValue("latex");
@@ -2202,6 +2202,15 @@ void Config::create()
 		    "moment. \n",
 		    FALSE
                  );
+  cb = addBool(  
+                    "PERLMOD_LATEX",
+                    "If the PERLMOD_LATEX tag is set to YES Doxygen will generate \n"
+                    "the necessary Makefile rules, Perl scripts and LaTeX code to be able \n"
+		    "to generate PDF and DVI output from the Perl module output.\n",
+		    FALSE
+                 );
+  cb->addDependency("GENERATE_PERLMOD");
+
   //-----------------------------------------------------------------------------------------------
   addInfo(  "Preprocessor","Configuration options related to the preprocessor   ");
   //-----------------------------------------------------------------------------------------------
@@ -2263,7 +2272,7 @@ void Config::create()
   cl->addDependency("ENABLE_PREPROCESSING");
   cl = addList(
                     "EXPAND_AS_DEFINED",
-                    "If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then \n"
+                    "If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then \n"
                     "this tag can be used to specify a list of macro names that should be expanded. \n"
                     "The macro definition that is found in the sources will be used. \n"
                     "Use the PREDEFINED tag if you want to use a different macro definition. \n" 
diff --git a/src/docparser.cpp b/src/docparser.cpp
index 097b30d..a5f07f5 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -46,6 +46,8 @@
 
 //---------------------------------------------------------------------------
 
+//---------------------------------------------------------------------------
+
 // global variables during a call to validatingParseDoc
 static bool        g_hasParamCommand;
 static MemberDef * g_memberDef;
@@ -112,6 +114,104 @@ static void docParserPopContext()
 
 //---------------------------------------------------------------------------
 
+/*! search for an image in the imageNameDict and if found
+ * copies the image to the output directory (which is the
+ * html directory if type==0 or the latex directory if type==1)
+ */
+static QCString findAndCopyImage(const char *fileName,DocImage::Type type)
+{
+  QCString result;
+  bool ambig;
+  FileDef *fd;
+  //printf("Search for %s\n",fileName);
+  if ((fd=findFileDef(Doxygen::imageNameDict,fileName,ambig)))
+  {
+    QFile inImage(QString(fd->absFilePath().data()));
+    if (inImage.open(IO_ReadOnly))
+    {
+      result = fileName;
+      int i;
+      if ((i=result.findRev('/'))!=-1 || (i=result.findRev('\\'))!=-1)
+      {
+	result.right(result.length()-i-1);
+      }
+      QCString outputDir;
+      switch(type)
+      {
+        case DocImage::Html: 
+	  if (!Config_getBool("GENERATE_HTML")) return result;
+	  outputDir = Config_getString("HTML_OUTPUT");
+	  break;
+        case DocImage::Latex: 
+	  if (!Config_getBool("GENERATE_LATEX")) return result;
+	  outputDir = Config_getString("LATEX_OUTPUT");
+	  break;
+        case DocImage::Rtf:
+	  if (!Config_getBool("GENERATE_RTF")) return result;
+	  outputDir = Config_getString("RTF_OUTPUT");
+	  break;
+      }
+      QCString outputFile = outputDir+"/"+result;
+      QFile outImage(QString(outputFile.data()));
+      if (outImage.open(IO_WriteOnly)) // copy the image
+      {
+	char *buffer = new char[inImage.size()];
+	inImage.readBlock(buffer,inImage.size());
+	outImage.writeBlock(buffer,inImage.size());
+	outImage.flush();
+	delete buffer;
+      }
+      else
+      {
+	warn(g_fileName,doctokenizerYYlineno,
+	    "Warning: could not write output image %s",outputFile.data());
+      }
+    }
+    else
+    {
+      warn(g_fileName,doctokenizerYYlineno,
+	  "Warning: could not open image %s",fileName);
+    }
+
+    if (type==DocImage::Latex && Config_getBool("USE_PDFLATEX") && 
+	fd->name().right(4)==".eps"
+       )
+    { // we have an .eps image in pdflatex mode => convert it to a pdf.
+      QCString outputDir = Config_getString("LATEX_OUTPUT");
+      QCString baseName  = fd->name().left(fd->name().length()-4);
+      QCString epstopdfArgs(4096);
+      epstopdfArgs.sprintf("\"%s/%s.eps\" --outfile=\"%s/%s.pdf\"",
+                           outputDir.data(), baseName.data(),
+			   outputDir.data(), baseName.data());
+      if (iSystem("epstopdf",epstopdfArgs,TRUE)!=0)
+      {
+	err("Error: Problems running epstopdf. Check your TeX installation!\n");
+      }
+      return baseName;
+    }
+  }
+  else if (ambig)
+  {
+    QCString text;
+    text.sprintf("Warning: image file name %s is ambigious.\n",fileName);
+    text+="Possible candidates:\n";
+    text+=showFileDefMatches(Doxygen::imageNameDict,fileName);
+    warn(g_fileName,doctokenizerYYlineno,text);
+  }
+  else
+  {
+    result=fileName;
+    if (result.left(5)!="http:" && result.left(6)!="https:")
+    {
+      warn(g_fileName,doctokenizerYYlineno,
+           "Warning: image file %s is not found in IMAGE_PATH: "  
+	   "assuming external image.",fileName
+          );
+    }
+  }
+  return result;
+}
+
 static void checkArgumentName(const QString &name,bool isParam)
 {                
   if (g_memberDef==0) return; // not a member
@@ -583,6 +683,7 @@ static bool defaultHandleToken(DocNode *parent,int tok, QList<DocNode> &children
             children.append(new DocStyleChange(parent,g_nodeStack.count(),DocStyleChange::Italic,TRUE));
             int retval=handleStyleArgument(parent,children,tokenName);
             children.append(new DocStyleChange(parent,g_nodeStack.count(),DocStyleChange::Italic,FALSE));
+            children.append(new DocWhiteSpace(parent," "));
             if (retval==TK_NEWPARA) goto handlepara;
           }
           break;
@@ -591,6 +692,7 @@ static bool defaultHandleToken(DocNode *parent,int tok, QList<DocNode> &children
             children.append(new DocStyleChange(parent,g_nodeStack.count(),DocStyleChange::Bold,TRUE));
             int retval=handleStyleArgument(parent,children,tokenName);
             children.append(new DocStyleChange(parent,g_nodeStack.count(),DocStyleChange::Bold,FALSE));
+            children.append(new DocWhiteSpace(parent," "));
             if (retval==TK_NEWPARA) goto handlepara;
           }
           break;
@@ -599,6 +701,7 @@ static bool defaultHandleToken(DocNode *parent,int tok, QList<DocNode> &children
             children.append(new DocStyleChange(parent,g_nodeStack.count(),DocStyleChange::Code,TRUE));
             int retval=handleStyleArgument(parent,children,tokenName);
             children.append(new DocStyleChange(parent,g_nodeStack.count(),DocStyleChange::Code,FALSE));
+            children.append(new DocWhiteSpace(parent," "));
             if (retval==TK_NEWPARA) goto handlepara;
           }
           break;
@@ -1406,6 +1509,10 @@ DocRef::DocRef(DocNode *parent,const QString &target) :
       m_file = compound->getOutputFileBase();
       m_ref  = compound->getReference();
     }
+    else
+    {
+      err("%s:%d: Internal error: resolveLink successful but no compound found!\n",__FILE__,__LINE__);
+    }
   }
   else // oops, bogus target
   {
@@ -1456,6 +1563,11 @@ DocLink::DocLink(DocNode *parent,const QString &target) :
   Definition *compound;
   PageInfo *page;
   QCString anchor;
+  m_refText = target;
+  if (!m_refText.isEmpty() && m_refText.at(0)=='#')
+  {
+    m_refText = m_refText.right(m_refText.length()-1);
+  }
   if (resolveLink(g_context,stripKnownExtensions(target),g_inSeeBlock,
                   &compound,&page,anchor))
   {
@@ -1548,6 +1660,14 @@ QString DocLink::parse(bool isJavaLink)
   }
 endlink:
 
+  if (isJavaLink)
+  {
+    if (m_children.isEmpty()) // no link text
+    {
+      m_children.append(new DocWord(this,m_refText));
+    }
+  }
+
   handlePendingStyleCommands(this,m_children);
   DBG(("DocLink::parse() end\n"));
   DocNode *n=g_nodeStack.pop();
@@ -2671,7 +2791,7 @@ int DocParamList::parse(const QString &cmdName)
     }
     else if (m_type==DocParamSect::RetVal)
     {
-      g_hasParamCommand=TRUE;
+      //g_hasParamCommand=TRUE;
       checkArgumentName(g_token->name,FALSE);
     }
     m_params.append(g_token->name);
@@ -2876,7 +2996,7 @@ void DocPara::handleImage(const QString &cmdName)
     return;
   }
   doctokenizerYYsetStatePara();
-  DocImage *img = new DocImage(this,g_token->name,t);
+  DocImage *img = new DocImage(this,findAndCopyImage(g_token->name,t),t);
   m_children.append(img);
   img->parse();
 }
@@ -3043,16 +3163,19 @@ int DocPara::handleCommand(const QString &cmdName)
       m_children.append(new DocStyleChange(this,g_nodeStack.count(),DocStyleChange::Italic,TRUE));
       retval=handleStyleArgument(this,m_children,cmdName); 
       m_children.append(new DocStyleChange(this,g_nodeStack.count(),DocStyleChange::Italic,FALSE));
+      m_children.append(new DocWhiteSpace(this," "));
       break;
     case CMD_BOLD:
       m_children.append(new DocStyleChange(this,g_nodeStack.count(),DocStyleChange::Bold,TRUE));
       retval=handleStyleArgument(this,m_children,cmdName); 
       m_children.append(new DocStyleChange(this,g_nodeStack.count(),DocStyleChange::Bold,FALSE));
+      m_children.append(new DocWhiteSpace(this," "));
       break;
     case CMD_CODE:
       m_children.append(new DocStyleChange(this,g_nodeStack.count(),DocStyleChange::Code,TRUE));
       retval=handleStyleArgument(this,m_children,cmdName); 
       m_children.append(new DocStyleChange(this,g_nodeStack.count(),DocStyleChange::Code,FALSE));
+      m_children.append(new DocWhiteSpace(this," "));
       break;
     case CMD_BSLASH:
       m_children.append(new DocSymbol(this,DocSymbol::BSlash));
diff --git a/src/docparser.h b/src/docparser.h
index 1a79812..1c78ada4 100644
--- a/src/docparser.h
+++ b/src/docparser.h
@@ -586,6 +586,7 @@ class DocLink : public CompAccept<DocLink>, public DocNode
     QString  m_file;
     QString  m_ref;
     QString  m_anchor;
+    QString  m_refText;
 };
 
 /*! @brief Node representing a reference to some item */
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 8874917..22b12e5 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -1482,11 +1482,20 @@ static bool isVarWithConstructor(Entry *root)
   bool result=FALSE;
   bool typeIsClass;
   Definition *ctx = 0;
+  FileDef *fd = 0;
+  bool ambig;
   if (root->parent && root->parent->section&Entry::COMPOUND_MASK)
   { // inside a class
     result=FALSE;
     goto done;
   }
+  else if ((fd = findFileDef(Doxygen::inputNameDict,root->fileName,ambig)) &&
+       fd->name().right(2)==".c"
+     )
+  { // inside a .c file
+    result=FALSE;
+    goto done;
+  }
   if (root->type.isEmpty()) 
   {
     result=FALSE;
@@ -1534,7 +1543,7 @@ static bool isVarWithConstructor(Entry *root)
         //printf("resType=%s\n",resType.data());
         if (resType=="int"    || resType=="long" || resType=="float" || 
             resType=="double" || resType=="char" || resType=="signed" || 
-            resType=="const"  || resType=="unsigned") 
+            resType=="const"  || resType=="unsigned" || resType=="void") 
         {
           result=FALSE; // type keyword -> function prototype
           goto done;
@@ -3450,9 +3459,11 @@ static void computeClassRelations()
     if ((cd==0 || (!cd->hasDocumentation() && !cd->isReference())) && 
         bName.right(2)!="::")
     {
-      if (!root->name.isEmpty() && root->name[0]!='@' &&
-          (guessSection(root->fileName)==Entry::HEADER_SEC || Config_getBool("EXTRACT_LOCAL_CLASSES")) &&
-          (root->protection!=Private || Config_getBool("EXTRACT_PRIVATE"))
+      if (!root->name.isEmpty() && root->name[0]!='@' && // normal name
+          (guessSection(root->fileName)==Entry::HEADER_SEC || 
+           Config_getBool("EXTRACT_LOCAL_CLASSES")) && // not defined in source file
+          (root->protection!=Private || Config_getBool("EXTRACT_PRIVATE")) && // hidden by protection
+          !Config_getBool("HIDE_UNDOC_CLASSES") // undocumented class are visible
          )
         warn_undoc(
                    root->fileName,root->startLine,
@@ -7175,6 +7186,10 @@ void readConfiguration(int argc, char **argv)
   /* Set the global html file extension. */ 
   Doxygen::htmlFileExtension = Config_getString("HTML_FILE_EXTENSION");
 
+  /* Perlmod wants to know the path to the config file.*/
+  QFileInfo configFileInfo(configName);
+  setPerlModDoxyfile(configFileInfo.absFilePath());
+
   /* init the special lists */
   Doxygen::specialLists->setAutoDelete(TRUE);
   Doxygen::specialLists->insert("todo",
diff --git a/src/entry.h b/src/entry.h
index ba926d7..c619d48 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -133,14 +133,14 @@ struct Grouping
   {
     GROUPING_LOWEST,
     GROUPING_AUTO_WEAK =
-      GROUPING_LOWEST,   //!< membership in group was defined via @weakgroup @{ @}
-    GROUPING_AUTO_ADD,    //!< membership in group was defined via @add[to]group @{ @}
-    GROUPING_AUTO_DEF,    //!< membership in group was defined via @defgroup @{ @}
+    GROUPING_LOWEST,   //!< membership in group was defined via \@weakgroup \@{ \@}
+    GROUPING_AUTO_ADD,    //!< membership in group was defined via \@add[to]group \@{ \@}
+    GROUPING_AUTO_DEF,    //!< membership in group was defined via \@defgroup \@{ \@}
     GROUPING_AUTO_HIGHEST =
-      GROUPING_AUTO_DEF,
-    GROUPING_INGROUP,      //!< membership in group was defined by @ingroup
+    GROUPING_AUTO_DEF,
+    GROUPING_INGROUP,      //!< membership in group was defined by \@ingroup
     GROUPING_HIGHEST =
-      GROUPING_INGROUP
+    GROUPING_INGROUP
   };
 
   static const char *getGroupPriName( GroupPri_t priority )
@@ -265,8 +265,8 @@ class Entry
     QList<ArgumentList> *tArgLists; //!< template argument declarations
     QCString	 program;     //!< the program text
     QCString     initializer; //!< initial value (for variables)
-    QCString     includeFile; //!< include file (2 arg of \class, must be unique)
-    QCString     includeName; //!< include name (3 arg of \class)
+    QCString     includeFile; //!< include file (2 arg of \\class, must be unique)
+    QCString     includeName; //!< include name (3 arg of \\class)
     QCString     doc;         //!< documentation block (partly parsed)
     int          docLine;     //!< line number at which the documentation was found
     QCString     docFile;     //!< file in which the documentation was found
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index 3269aeb..b9ef2d6 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -133,25 +133,25 @@ void HtmlDocVisitor::visit(DocStyleChange *s)
   switch (s->style())
   {
     case DocStyleChange::Bold:
-      if (s->enable()) m_t << "<b>";      else m_t << "</b> ";
+      if (s->enable()) m_t << "<b>";      else m_t << "</b>";
       break;
     case DocStyleChange::Italic:
-      if (s->enable()) m_t << "<em>";     else m_t << "</em> ";
+      if (s->enable()) m_t << "<em>";     else m_t << "</em>";
       break;
     case DocStyleChange::Code:
-      if (s->enable()) m_t << "<code>";   else m_t << "</code> ";
+      if (s->enable()) m_t << "<code>";   else m_t << "</code>";
       break;
     case DocStyleChange::Subscript:
-      if (s->enable()) m_t << "<sub>";    else m_t << "</sub> ";
+      if (s->enable()) m_t << "<sub>";    else m_t << "</sub>";
       break;
     case DocStyleChange::Superscript:
-      if (s->enable()) m_t << "<sup>";    else m_t << "</sup> ";
+      if (s->enable()) m_t << "<sup>";    else m_t << "</sup>";
       break;
     case DocStyleChange::Center:
-      if (s->enable()) m_t << "<center>"; else m_t << "</center> ";
+      if (s->enable()) m_t << "<center>"; else m_t << "</center>";
       break;
     case DocStyleChange::Small:
-      if (s->enable()) m_t << "<small>";  else m_t << "</small> ";
+      if (s->enable()) m_t << "<small>";  else m_t << "</small>";
       break;
   }
 }
diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
index 33fdf40..027c0d8 100644
--- a/src/htmlhelp.cpp
+++ b/src/htmlhelp.cpp
@@ -337,13 +337,13 @@ void HtmlHelp::initialize()
   s_languageDict.insert("dutch",    new QCString("0x413 Dutch"));
   s_languageDict.insert("finnish",  new QCString("0x40B Finnish"));
   s_languageDict.insert("french",   new QCString("0x40C French"));
-  s_languageDict.insert("german",   new QCString("0x40C German"));
+  s_languageDict.insert("german",   new QCString("0x407 German"));
   s_languageDict.insert("greece",   new QCString("0x408 Greece"));
   s_languageDict.insert("hungarian",new QCString("0x40E Hungarian"));
   s_languageDict.insert("italian",  new QCString("0x410 Italian"));
   s_languageDict.insert("norwegian",new QCString("0x814 Norwegian"));
-  s_languageDict.insert("polish",   new QCString("0x815 Polish"));
-  s_languageDict.insert("portugese",new QCString("0x815 Portuguese(Portugal)"));
+  s_languageDict.insert("polish",   new QCString("0x415 Polish"));
+  s_languageDict.insert("portugese",new QCString("0x816 Portuguese(Portugal)"));
   s_languageDict.insert("brazil",   new QCString("0x416 Portuguese(Brazil)"));
   s_languageDict.insert("russian",  new QCString("0x419 Russian"));
   s_languageDict.insert("spanish",  new QCString("0x40A Spannish(Traditional Sort)"));
diff --git a/src/libdoxygen.t b/src/libdoxygen.t
index 6b6b32e..ae86907 100644
--- a/src/libdoxygen.t
+++ b/src/libdoxygen.t
@@ -59,9 +59,6 @@ sub GenerateDep {
 #$ GenerateDep("defargs.cpp","defargs.l");
 	$(LEX) -PdefargsYY -t defargs.l >defargs.cpp
 
-#$ GenerateDep("doc.cpp","doc.l");
-	$(LEX) -PdocYY -t doc.l >doc.cpp
-
 #$ GenerateDep("doctokenizer.cpp","doctokenizer.l");
 	$(LEX) -PdoctokenizerYY -t doctokenizer.l >doctokenizer.cpp
 
diff --git a/src/outputgen.h b/src/outputgen.h
index b82c0af..f25bd8b 100644
--- a/src/outputgen.h
+++ b/src/outputgen.h
@@ -90,17 +90,17 @@ class BaseOutputDocInterface : public BaseCodeDocInterface
                           const QCString &,bool)  {} 
     virtual void parseText(const QCString &)  {}
     
-    /*! Start of a bullet list: e.g. \c <ul> in html. writeListItem() is
+    /*! Start of a bullet list: e.g. \c \<ul\> in html. writeListItem() is
      *  Used for the bullet items.
      */
     virtual void startItemList()  = 0;
 
     /*! Writes a list item for a bullet or enumerated 
-     *  list: e.g. \c <li> in html 
+     *  list: e.g. \c \<li\> in html 
      */
     virtual void writeListItem()  = 0;
 
-    /*! Ends a bullet list: e.g. \c </ul> in html */
+    /*! Ends a bullet list: e.g. \c \</ul\> in html */
     virtual void endItemList()    = 0;
 
     /*! Writes an ASCII string to the output. Converts characters that have
@@ -184,19 +184,19 @@ class BaseOutputDocInterface : public BaseCodeDocInterface
     /*! Writes a horizontal ruler to the output */
     virtual void writeRuler() = 0;
     
-    /*! Starts a description list: e.g. \c <dl> in HTML 
+    /*! Starts a description list: e.g. \c \<dl\> in HTML 
      *  Items are surrounded by startDescItem() and endDescItem()
      */
     virtual void startDescription() = 0;
 
-    /*! Ends a description list: e.g. \c </dl> in HTML */
+    /*! Ends a description list: e.g. \c \</dl\> in HTML */
     virtual void endDescription() = 0;
 
-    /*! Starts an item of a description list: e.g. \c <dt> in HTML. */
+    /*! Starts an item of a description list: e.g. \c \<dt\> in HTML. */
     virtual void startDescItem() = 0;
 
     /*! Ends an item of a description list and starts the 
-     *  description itself: e.g. \c <dd> in HTML. 
+     *  description itself: e.g. \c \<dd\> in HTML. 
      */
     virtual void endDescItem() = 0;
 
diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp
index 377488b..596aa0b 100644
--- a/src/perlmodgen.cpp
+++ b/src/perlmodgen.cpp
@@ -102,9 +102,11 @@ class PerlModOutput
 {
 public:
 
-  PerlModOutput(PerlModOutputStream *os) : m_stream(os), m_indentation(0) { m_spaces[0] = 0; }
+  PerlModOutput() : m_stream(0), m_indentation(0) { m_spaces[0] = 0; }
   virtual ~PerlModOutput() { }
 
+  inline void setPerlModOutputStream(PerlModOutputStream *os) { m_stream = os; }
+
   inline PerlModOutput &openSave() { iopenSave(); return *this; }
   inline PerlModOutput &closeSave(QString &s) { icloseSave(s); return *this; }
   
@@ -479,8 +481,9 @@ void PerlModDocVisitor::visit(DocSymbol *sy)
   case DocSymbol::BSlash:  s = "\\\\"; break;
   case DocSymbol::Copy:    s = "(c)"; break;
   case DocSymbol::Apos:    s = "\\\'"; break;
-  default:
+  case DocSymbol::Unknown:
     err("Error: unknown symbol found\n");
+    break;
   }
   enterText();
   if (c != 0)
@@ -509,8 +512,6 @@ void PerlModDocVisitor::visit(DocStyleChange *s)
   case DocStyleChange::Superscript: 	break; // superscript
   case DocStyleChange::Center: 		break; // center
   case DocStyleChange::Small: 		break; // small
-  default:
-    err("Error: unknown style found.\n");
   }
 }
 
@@ -618,7 +619,7 @@ void PerlModDocVisitor::visitPre(DocAutoList *l)
   openItem(l->isEnumList() ? "ordered_list" : "itemized_list");
   openSubBlock("content");
 }
-void PerlModDocVisitor::visitPost(DocAutoList *) { closeSubBlock(); }
+void PerlModDocVisitor::visitPost(DocAutoList *) { closeSubBlock(); closeItem(); }
 
 void PerlModDocVisitor::visitPre(DocAutoListItem *) { openSubBlock(); }
 void PerlModDocVisitor::visitPost(DocAutoListItem *) { closeSubBlock(); }
@@ -644,7 +645,7 @@ void PerlModDocVisitor::visitPost(DocRoot *)
 void PerlModDocVisitor::visitPre(DocSimpleSect *s)
 {
   leaveText();
-  const char *type;
+  const char *type = 0;
   switch (s->type())
   {
   case DocSimpleSect::See:		type = "see"; break;
@@ -662,7 +663,9 @@ void PerlModDocVisitor::visitPre(DocSimpleSect *s)
   case DocSimpleSect::Remark:		type = "remark"; break;
   case DocSimpleSect::Attention:	type = "attention"; break;
   case DocSimpleSect::User:		type = "par"; break;
-  default:	    			type = "illegal"; break;
+  case DocSimpleSect::Unknown:
+    err("Error: unknown simple section found\n");
+    break;
   }
   m_output.openSave().openList(type);
 }
@@ -995,7 +998,9 @@ void PerlModDocVisitor::visitPre(DocParamSect *s)
   case DocParamSect::Param:     type = "params"; break;
   case DocParamSect::RetVal:    type = "retvals"; break;
   case DocParamSect::Exception: type = "exceptions"; break;
-  default: ASSERT(0);
+  case DocParamSect::Unknown:
+    err("Error: unknown parameter section found\n");
+    break;
   }
   m_output.openSave().openList(type);
 }
@@ -1103,13 +1108,15 @@ static void addTemplateArgumentList(ArgumentList *al,PerlModOutput &output,const
   output.closeList();
 }
 
-//static void addMemberTemplateLists(MemberDef *md,PerlModOutput &output)
-//{
-//  ClassDef *cd = md->getClassDef();
-//  const char *cname = cd ? cd->name().data() : 0;
-//  if (md->templateArguments()) // function template prefix
-//    addTemplateArgumentList(md->templateArguments(),output,cname);
-//}
+#if 0
+static void addMemberTemplateLists(MemberDef *md,PerlModOutput &output)
+{
+  ClassDef *cd = md->getClassDef();
+  const char *cname = cd ? cd->name().data() : 0;
+  if (md->templateArguments()) // function template prefix
+    addTemplateArgumentList(md->templateArguments(),output,cname);
+}
+#endif
 
 static void addTemplateList(ClassDef *cd,PerlModOutput &output)
 {
@@ -1161,7 +1168,59 @@ static const char *getVirtualnessName(Specifier virt)
   return 0;
 }
 
-static void generatePerlModForMember(MemberDef *md,PerlModOutput &output,Definition *)
+static QString pathDoxyfile;
+static QString pathDoxyExec;
+
+void setPerlModDoxyfile(const QString &qs)
+{
+  pathDoxyfile = qs;
+  pathDoxyExec = QDir::currentDirPath();
+}
+
+class PerlModGenerator
+{
+public:
+
+  PerlModOutput output;
+
+  QString pathDoxyModelPM;
+  QString pathDoxyDocsTex;
+  QString pathDoxyFormatTex;
+  QString pathDoxyLatexTex;
+  QString pathDoxyLatexDVI;
+  QString pathDoxyLatexPDF;
+  QString pathDoxyTemplateTex;
+  QString pathDoxyDocsPM;
+  QString pathDoxyLatexPL;
+  QString pathDoxyLatexTemplatePL;
+  QString pathDoxyRules;
+  QString pathMakefile;
+
+  void generatePerlModForMember(MemberDef *md,Definition *);
+  void generatePerlModSection(Definition *d,
+			      MemberList *ml,const char *name,const char *header=0);
+  void addListOfAllMembers(ClassDef *cd, PerlModOutput &output);
+  void generatePerlModForClass(ClassDef *cd, PerlModOutput &output);
+  void generatePerlModForNamespace(NamespaceDef *nd, PerlModOutput &output);
+  void generatePerlModForFile(FileDef *fd, PerlModOutput &output);
+  void generatePerlModForGroup(GroupDef *gd, PerlModOutput &output);
+  void generatePerlModForPage(PageInfo *pi, PerlModOutput &output);
+  
+  bool createOutputFile(QFile &f, const char *s);
+  bool createOutputDir(QDir &perlModDir);
+  bool generateDoxyLatexTex();
+  bool generateDoxyFormatTex();
+  bool generateDoxyModelPM();
+  bool generateDoxyLatexPL();
+  bool generateDoxyLatexTemplatePL();
+  bool generateDoxyRules();
+  bool generateMakefile();
+  bool generatePerlModOutput();
+
+  void generate();
+};
+
+void PerlModGenerator::generatePerlModForMember(MemberDef *md,Definition *)
 {
   
   // + declaration/definition arg lists
@@ -1184,7 +1243,6 @@ static void generatePerlModForMember(MemberDef *md,PerlModOutput &output,Definit
   case MemberDef::Define:      memType="define";    break;
   case MemberDef::EnumValue:   ASSERT(0);           break;
   case MemberDef::Property:    memType="property";  break;
-  case MemberDef::Event:       memType="event";     break;
   case MemberDef::Variable:    memType="variable";  break;
   case MemberDef::Typedef:     memType="typedef";   break;
   case MemberDef::Enumeration: memType="enum";      break;
@@ -1194,6 +1252,7 @@ static void generatePerlModForMember(MemberDef *md,PerlModOutput &output,Definit
   case MemberDef::Friend:      memType="friend";    isFunc=TRUE; break;
   case MemberDef::DCOP:        memType="dcop";      isFunc=TRUE; break;
   case MemberDef::Slot:        memType="slot";      isFunc=TRUE; break;
+  case MemberDef::Event:       memType="event";     break;
   }
 
   QCString scopeName;
@@ -1324,8 +1383,8 @@ static void generatePerlModForMember(MemberDef *md,PerlModOutput &output,Definit
   output.closeHash();
 }
 
-static void generatePerlModSection(Definition *d,PerlModOutput &output,
-				MemberList *ml,const char *name,const char *header=0)
+void PerlModGenerator::generatePerlModSection(Definition *d,
+					      MemberList *ml,const char *name,const char *header)
 {
   if (ml->count()==0) return; // empty list
 
@@ -1339,13 +1398,13 @@ static void generatePerlModSection(Definition *d,PerlModOutput &output,
   MemberDef *md;
   for (mli.toFirst();(md=mli.current());++mli)
   {
-    generatePerlModForMember(md,output,d);
+    generatePerlModForMember(md,d);
   }
   output.closeList()
     .closeHash();
 }
 
-static void addListOfAllMembers(ClassDef *cd, PerlModOutput &output)
+void PerlModGenerator::addListOfAllMembers(ClassDef *cd, PerlModOutput &output)
 {
   output.openList("all_members");
   MemberNameInfoSDict::Iterator mnii(*cd->memberNameInfoSDict());
@@ -1376,7 +1435,7 @@ static void addListOfAllMembers(ClassDef *cd, PerlModOutput &output)
   output.closeList();
 }
 
-static void generatePerlModForClass(ClassDef *cd, PerlModOutput &output)
+void PerlModGenerator::generatePerlModForClass(ClassDef *cd, PerlModOutput &output)
 {
   // + brief description
   // + detailed description
@@ -1465,31 +1524,31 @@ static void generatePerlModForClass(ClassDef *cd, PerlModOutput &output)
   MemberGroupSDict::Iterator mgli(*cd->memberGroupSDict);
   MemberGroup *mg;
   for (;(mg=mgli.current());++mgli)
-    generatePerlModSection(cd,output,mg->members(),"user_defined",mg->header());
-
-  generatePerlModSection(cd,output,&cd->pubTypes,"public_typedefs");
-  generatePerlModSection(cd,output,&cd->pubMethods,"public_methods");
-  generatePerlModSection(cd,output,&cd->pubAttribs,"public_members");
-  generatePerlModSection(cd,output,&cd->pubSlots,"public_slots");
-  generatePerlModSection(cd,output,&cd->signals,"signals");
-  generatePerlModSection(cd,output,&cd->dcopMethods,"dcop_methods");
-  generatePerlModSection(cd,output,&cd->properties,"properties");
-  generatePerlModSection(cd,output,&cd->pubStaticMethods,"public_static_methods");
-  generatePerlModSection(cd,output,&cd->pubStaticAttribs,"public_static_members");
-  generatePerlModSection(cd,output,&cd->proTypes,"protected_typedefs");
-  generatePerlModSection(cd,output,&cd->proMethods,"protected_methods");
-  generatePerlModSection(cd,output,&cd->proAttribs,"protected_members");
-  generatePerlModSection(cd,output,&cd->proSlots,"protected_slots");
-  generatePerlModSection(cd,output,&cd->proStaticMethods,"protected_static_methods");
-  generatePerlModSection(cd,output,&cd->proStaticAttribs,"protected_static_members");
-  generatePerlModSection(cd,output,&cd->priTypes,"private_typedefs");
-  generatePerlModSection(cd,output,&cd->priMethods,"private_methods");
-  generatePerlModSection(cd,output,&cd->priAttribs,"private_members");
-  generatePerlModSection(cd,output,&cd->priSlots,"private_slots");
-  generatePerlModSection(cd,output,&cd->priStaticMethods,"private_static_methods");
-  generatePerlModSection(cd,output,&cd->priStaticAttribs,"private_static_members");
-  generatePerlModSection(cd,output,&cd->friends,"friend_methods");
-  generatePerlModSection(cd,output,&cd->related,"related_methods");
+    generatePerlModSection(cd,mg->members(),"user_defined",mg->header());
+
+  generatePerlModSection(cd,&cd->pubTypes,"public_typedefs");
+  generatePerlModSection(cd,&cd->pubMethods,"public_methods");
+  generatePerlModSection(cd,&cd->pubAttribs,"public_members");
+  generatePerlModSection(cd,&cd->pubSlots,"public_slots");
+  generatePerlModSection(cd,&cd->signals,"signals");
+  generatePerlModSection(cd,&cd->dcopMethods,"dcop_methods");
+  generatePerlModSection(cd,&cd->properties,"properties");
+  generatePerlModSection(cd,&cd->pubStaticMethods,"public_static_methods");
+  generatePerlModSection(cd,&cd->pubStaticAttribs,"public_static_members");
+  generatePerlModSection(cd,&cd->proTypes,"protected_typedefs");
+  generatePerlModSection(cd,&cd->proMethods,"protected_methods");
+  generatePerlModSection(cd,&cd->proAttribs,"protected_members");
+  generatePerlModSection(cd,&cd->proSlots,"protected_slots");
+  generatePerlModSection(cd,&cd->proStaticMethods,"protected_static_methods");
+  generatePerlModSection(cd,&cd->proStaticAttribs,"protected_static_members");
+  generatePerlModSection(cd,&cd->priTypes,"private_typedefs");
+  generatePerlModSection(cd,&cd->priMethods,"private_methods");
+  generatePerlModSection(cd,&cd->priAttribs,"private_members");
+  generatePerlModSection(cd,&cd->priSlots,"private_slots");
+  generatePerlModSection(cd,&cd->priStaticMethods,"private_static_methods");
+  generatePerlModSection(cd,&cd->priStaticAttribs,"private_static_members");
+  generatePerlModSection(cd,&cd->friends,"friend_methods");
+  generatePerlModSection(cd,&cd->related,"related_methods");
 
   addPerlModDocBlock(output,"brief",cd->getDefFileName(),cd->getDefLine(),cd->name(),0,cd->briefDescription());
   addPerlModDocBlock(output,"detailed",cd->getDefFileName(),cd->getDefLine(),cd->name(),0,cd->documentation());
@@ -1523,7 +1582,7 @@ static void generatePerlModForClass(ClassDef *cd, PerlModOutput &output)
   output.closeHash();
 }
 
-static void generatePerlModForNamespace(NamespaceDef *nd, PerlModOutput &output)
+void PerlModGenerator::generatePerlModForNamespace(NamespaceDef *nd, PerlModOutput &output)
 {
   // + contained class definitions
   // + contained namespace definitions
@@ -1568,14 +1627,14 @@ static void generatePerlModForNamespace(NamespaceDef *nd, PerlModOutput &output)
   MemberGroupSDict::Iterator mgli(*nd->memberGroupSDict);
   MemberGroup *mg;
   for (;(mg=mgli.current());++mgli)
-    generatePerlModSection(nd,output,mg->members(),"user-defined",mg->header());
+    generatePerlModSection(nd,mg->members(),"user-defined",mg->header());
 
-  generatePerlModSection(nd,output,&nd->decDefineMembers,"defines");
-  generatePerlModSection(nd,output,&nd->decProtoMembers,"prototypes");
-  generatePerlModSection(nd,output,&nd->decTypedefMembers,"typedefs");
-  generatePerlModSection(nd,output,&nd->decEnumMembers,"enums");
-  generatePerlModSection(nd,output,&nd->decFuncMembers,"functions");
-  generatePerlModSection(nd,output,&nd->decVarMembers,"variables");
+  generatePerlModSection(nd,&nd->decDefineMembers,"defines");
+  generatePerlModSection(nd,&nd->decProtoMembers,"prototypes");
+  generatePerlModSection(nd,&nd->decTypedefMembers,"typedefs");
+  generatePerlModSection(nd,&nd->decEnumMembers,"enums");
+  generatePerlModSection(nd,&nd->decFuncMembers,"functions");
+  generatePerlModSection(nd,&nd->decVarMembers,"variables");
 
   addPerlModDocBlock(output,"brief",nd->getDefFileName(),nd->getDefLine(),0,0,nd->briefDescription());
   addPerlModDocBlock(output,"detailed",nd->getDefFileName(),nd->getDefLine(),0,0,nd->documentation());
@@ -1583,7 +1642,7 @@ static void generatePerlModForNamespace(NamespaceDef *nd, PerlModOutput &output)
   output.closeHash();
 }
 
-static void generatePerlModForFile(FileDef *fd, PerlModOutput &output)
+void PerlModGenerator::generatePerlModForFile(FileDef *fd, PerlModOutput &output)
 {
   // + includes files
   // + includedby files
@@ -1633,12 +1692,12 @@ static void generatePerlModForFile(FileDef *fd, PerlModOutput &output)
   }
   output.closeList();
   
-  generatePerlModSection(fd,output,&fd->decDefineMembers,"defines");
-  generatePerlModSection(fd,output,&fd->decProtoMembers,"prototypes");
-  generatePerlModSection(fd,output,&fd->decTypedefMembers,"typedefs");
-  generatePerlModSection(fd,output,&fd->decEnumMembers,"enums");
-  generatePerlModSection(fd,output,&fd->decFuncMembers,"functions");
-  generatePerlModSection(fd,output,&fd->decVarMembers,"variables");
+  generatePerlModSection(fd,&fd->decDefineMembers,"defines");
+  generatePerlModSection(fd,&fd->decProtoMembers,"prototypes");
+  generatePerlModSection(fd,&fd->decTypedefMembers,"typedefs");
+  generatePerlModSection(fd,&fd->decEnumMembers,"enums");
+  generatePerlModSection(fd,&fd->decFuncMembers,"functions");
+  generatePerlModSection(fd,&fd->decVarMembers,"variables");
 
   addPerlModDocBlock(output,"brief",fd->getDefFileName(),fd->getDefLine(),0,0,fd->briefDescription());
   addPerlModDocBlock(output,"detailed",fd->getDefFileName(),fd->getDefLine(),0,0,fd->documentation());
@@ -1646,7 +1705,7 @@ static void generatePerlModForFile(FileDef *fd, PerlModOutput &output)
   output.closeHash();
 }
 
-static void generatePerlModForGroup(GroupDef *gd, PerlModOutput &output)
+void PerlModGenerator::generatePerlModForGroup(GroupDef *gd, PerlModOutput &output)
 {
   // + members
   // + member groups
@@ -1734,14 +1793,14 @@ static void generatePerlModForGroup(GroupDef *gd, PerlModOutput &output)
   MemberGroupSDict::Iterator mgli(*gd->memberGroupSDict);
   MemberGroup *mg;
   for (;(mg=mgli.current());++mgli)
-    generatePerlModSection(gd,output,mg->members(),"user-defined",mg->header());
+    generatePerlModSection(gd,mg->members(),"user-defined",mg->header());
 
-  generatePerlModSection(gd,output,&gd->decDefineMembers,"defines");
-  generatePerlModSection(gd,output,&gd->decProtoMembers,"prototypes");
-  generatePerlModSection(gd,output,&gd->decTypedefMembers,"typedefs");
-  generatePerlModSection(gd,output,&gd->decEnumMembers,"enums");
-  generatePerlModSection(gd,output,&gd->decFuncMembers,"functions");
-  generatePerlModSection(gd,output,&gd->decVarMembers,"variables");
+  generatePerlModSection(gd,&gd->decDefineMembers,"defines");
+  generatePerlModSection(gd,&gd->decProtoMembers,"prototypes");
+  generatePerlModSection(gd,&gd->decTypedefMembers,"typedefs");
+  generatePerlModSection(gd,&gd->decEnumMembers,"enums");
+  generatePerlModSection(gd,&gd->decFuncMembers,"functions");
+  generatePerlModSection(gd,&gd->decVarMembers,"variables");
 
   addPerlModDocBlock(output,"brief",gd->getDefFileName(),gd->getDefLine(),0,0,gd->briefDescription());
   addPerlModDocBlock(output,"detailed",gd->getDefFileName(),gd->getDefLine(),0,0,gd->documentation());
@@ -1749,7 +1808,7 @@ static void generatePerlModForGroup(GroupDef *gd, PerlModOutput &output)
   output.closeHash();
 }
 
-static void generatePerlModForPage(PageInfo *pi, PerlModOutput &output)
+void PerlModGenerator::generatePerlModForPage(PageInfo *pi, PerlModOutput &output)
 {
   // + name
   // + title
@@ -1767,16 +1826,76 @@ static void generatePerlModForPage(PageInfo *pi, PerlModOutput &output)
   addPerlModDocBlock(output,"detailed",pi->defFileName,pi->defLine,0,0,pi->doc);
 }
 
-void generatePerlMod()
+bool PerlModGenerator::generatePerlModOutput()
 {
-  // + classes
-  // + namespaces
-  // + files
-  // - packages
-  // + groups
-  // + related pages
-  // - examples
+  QFile outputFile;
+  if (!createOutputFile(outputFile, pathDoxyDocsPM))
+    return false;
+  
+  QTextStream outputTextStream(&outputFile);
+  PerlModOutputStream outputStream(&outputTextStream);
+  output.setPerlModOutputStream(&outputStream);
+  output.add("$doxydocs =\n").openHash();
+  
+  output.openList("classes");
+  ClassSDict::Iterator cli(Doxygen::classSDict);
+  ClassDef *cd;
+  for (cli.toFirst();(cd=cli.current());++cli)
+    generatePerlModForClass(cd,output);
+  output.closeList();
+
+  output.openList("namespaces");
+  NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
+  NamespaceDef *nd;
+  for (nli.toFirst();(nd=nli.current());++nli)
+    generatePerlModForNamespace(nd,output);
+  output.closeList();
+
+  output.openList("files");
+  FileNameListIterator fnli(Doxygen::inputNameList);
+  FileName *fn;
+  for (;(fn=fnli.current());++fnli)
+  {
+    FileNameIterator fni(*fn);
+    FileDef *fd;
+    for (;(fd=fni.current());++fni)
+      generatePerlModForFile(fd,output);
+  }
+  output.closeList();
+
+  output.openList("groups");
+  GroupSDict::Iterator gli(Doxygen::groupSDict);
+  GroupDef *gd;
+  for (;(gd=gli.current());++gli)
+    generatePerlModForGroup(gd,output);
+  output.closeList();
+
+  output.openList("pages");
+  PageSDict::Iterator pdi(*Doxygen::pageSDict);
+  PageInfo *pi=0;
+  for (pdi.toFirst();(pi=pdi.current());++pdi)
+    generatePerlModForPage(pi,output);
+  if (Doxygen::mainPage)
+    generatePerlModForPage(Doxygen::mainPage,output);
+  output.closeList();
+
+  output.closeHash().add(";\n1;\n");
+  return true;
+}
+
+bool PerlModGenerator::createOutputFile(QFile &f, const char *s)
+{
+  f.setName(s);
+  if (!f.open(IO_WriteOnly))
+  {
+    err("Cannot open file %s for writing!\n", s);
+    return false;
+  }
+  return true;
+}
 
+bool PerlModGenerator::createOutputDir(QDir &perlModDir)
+{
   QCString outputDirectory = Config_getString("OUTPUT_DIRECTORY");
   if (outputDirectory.isEmpty())
   {
@@ -1811,75 +1930,620 @@ void generatePerlMod()
     if (!dir.mkdir(outputDirectory))
     {
       err("Cannot create directory %s\n",outputDirectory.data());
-      return;
+      return false;
     }
   }
  
-  QDir perlmodDir(outputDirectory+"/perlmod");
-  if (!perlmodDir.exists() && !perlmodDir.mkdir(outputDirectory+"/perlmod"))
+  perlModDir.setPath(outputDirectory+"/perlmod");
+  if (!perlModDir.exists() && !perlModDir.mkdir(outputDirectory+"/perlmod"))
   {
     err("Could not create perlmod directory in %s\n",outputDirectory.data());
-    return;
+    return false;
+  }
+  return true;
+}
+
+bool PerlModGenerator::generateDoxyModelPM()
+{
+  QFile doxyModelPM;
+  if (!createOutputFile(doxyModelPM, pathDoxyModelPM))
+    return false;
+
+  QTextStream doxyModelPMStream(&doxyModelPM);
+  doxyModelPMStream << 
+    "sub memberlist($) {\n"
+    "    my $prefix = $_[0];\n"
+    "    return\n"
+    "\t[ \"hash\", $prefix . \"s\",\n"
+    "\t  {\n"
+    "\t    members =>\n"
+    "\t      [ \"list\", $prefix . \"List\",\n"
+    "\t\t[ \"hash\", $prefix,\n"
+    "\t\t  {\n"
+    "\t\t    kind => [ \"string\", $prefix . \"Kind\" ],\n"
+    "\t\t    name => [ \"string\", $prefix . \"Name\" ],\n"
+    "\t\t    static => [ \"string\", $prefix . \"Static\" ],\n"
+    "\t\t    virtualness => [ \"string\", $prefix . \"Virtualness\" ],\n"
+    "\t\t    protection => [ \"string\", $prefix . \"Protection\" ],\n"
+    "\t\t    type => [ \"string\", $prefix . \"Type\" ],\n"
+    "\t\t    parameters =>\n"
+    "\t\t      [ \"list\", $prefix . \"Params\",\n"
+    "\t\t\t[ \"hash\", $prefix . \"Param\",\n"
+    "\t\t\t  {\n"
+    "\t\t\t    declaration_name => [ \"string\", $prefix . \"ParamName\" ],\n"
+    "\t\t\t    type => [ \"string\", $prefix . \"ParamType\" ],\n"
+    "\t\t\t  },\n"
+    "\t\t\t],\n"
+    "\t\t      ],\n"
+    "\t\t    detailed =>\n"
+    "\t\t      [ \"hash\", $prefix . \"Detailed\",\n"
+    "\t\t\t{\n"
+    "\t\t\t  doc => [ \"doc\", $prefix . \"DetailedDoc\" ],\n"
+    "\t\t\t  return => [ \"doc\", $prefix . \"Return\" ],\n"
+    "\t\t\t  see => [ \"doc\", $prefix . \"See\" ],\n"
+    "\t\t\t  params =>\n"
+    "\t\t\t    [ \"list\", $prefix . \"PDBlocks\",\n"
+    "\t\t\t      [ \"hash\", $prefix . \"PDBlock\",\n"
+    "\t\t\t\t{\n"
+    "\t\t\t\t  parameters =>\n"
+    "\t\t\t\t    [ \"list\", $prefix . \"PDParams\",\n"
+    "\t\t\t\t      [ \"hash\", $prefix . \"PDParam\",\n"
+    "\t\t\t\t\t{\n"
+    "\t\t\t\t\t  name => [ \"string\", $prefix . \"PDParamName\" ],\n"
+    "\t\t\t\t\t},\n"
+    "\t\t\t\t      ],\n"
+    "\t\t\t\t    ],\n"
+    "\t\t\t\t  doc => [ \"doc\", $prefix . \"PDDoc\" ],\n"
+    "\t\t\t\t},\n"
+    "\t\t\t      ],\n"
+    "\t\t\t    ],\n"
+    "\t\t\t},\n"
+    "\t\t      ],\n"
+    "\t\t  },\n"
+    "\t\t],\n"
+    "\t      ],\n"
+    "\t  },\n"
+    "\t];\n"
+    "}\n"
+    "\n"
+    "$doxymodel =\n"
+    "    [ \"hash\", \"Root\",\n"
+    "      {\n"
+    "\tfiles =>\n"
+    "\t  [ \"list\", \"Files\",\n"
+    "\t    [ \"hash\", \"File\",\n"
+    "\t      {\n"
+    "\t\tname => [ \"string\", \"FileName\" ],\n"
+    "\t\ttypedefs => memberlist(\"FileTypedef\"),\n"
+    "\t\tvariables => memberlist(\"FileVariable\"),\n"
+    "\t\tfunctions => memberlist(\"FileFunction\"),\n"
+    "\t\tdetailed =>\n"
+    "\t\t  [ \"hash\", \"FileDetailed\",\n"
+    "\t\t    {\n"
+    "\t\t      doc => [ \"doc\", \"FileDetailedDoc\" ],\n"
+    "\t\t    },\n"
+    "\t\t  ],\n"
+    "\t      },\n"
+    "\t    ],\n"
+    "\t  ],\n"
+    "\tclasses =>\n"
+    "\t  [ \"list\", \"Classes\",\n"
+    "\t    [ \"hash\", \"Class\",\n"
+    "\t      {\n"
+    "\t\tname => [ \"string\", \"ClassName\" ],\n"
+    "\t\tpublic_typedefs => memberlist(\"ClassPublicTypedef\"),\n"
+    "\t\tpublic_methods => memberlist(\"ClassPublicMethod\"),\n"
+    "\t\tpublic_members => memberlist(\"ClassPublicMember\"),\n"
+    "\t\tprotected_typedefs => memberlist(\"ClassProtectedTypedef\"),\n"
+    "\t\tprotected_methods => memberlist(\"ClassProtectedMethod\"),\n"
+    "\t\tprotected_members => memberlist(\"ClassProtectedMember\"),\n"
+    "\t\tprivate_typedefs => memberlist(\"ClassPrivateTypedef\"),\n"
+    "\t\tprivate_methods => memberlist(\"ClassPrivateMethod\"),\n"
+    "\t\tprivate_members => memberlist(\"ClassPrivateMember\"),\n"
+    "\t\tdetailed =>\n"
+    "\t\t  [ \"hash\", \"ClassDetailed\",\n"
+    "\t\t    {\n"
+    "\t\t      doc => [ \"doc\", \"ClassDetailedDoc\" ],\n"
+    " \t\t    },\n"
+    "\t\t  ],\n"
+    "\t      },\n"
+    "\t    ],\n"
+    "\t  ],\n"
+    "      },\n"
+    "    ];\n"
+    "\n"
+    "1;\n";
+
+  return true;
+}
+
+bool PerlModGenerator::generateDoxyRules()
+{
+  QFile doxyRules;
+  if (!createOutputFile(doxyRules, pathDoxyRules))
+    return false;
+
+  bool perlmodLatex = Config_getBool("PERLMOD_LATEX");
+
+  QTextStream doxyRulesStream(&doxyRules);
+  doxyRulesStream <<
+    "DOXYEXECPATH = " << pathDoxyExec << "\n"
+    "DOXYFILE = " << pathDoxyfile << "\n"
+    "DOXYDOCS_PM = " << pathDoxyDocsPM << "\n"
+    "DOXYMODEL_PM = " << pathDoxyModelPM << "\n"
+    "DOXYRULES = " << pathDoxyRules << "\n";
+  if (perlmodLatex)
+    doxyRulesStream <<
+      "DOXYLATEX_PL = " << pathDoxyLatexPL << "\n"
+      "DOXYLATEXTEMPLATE_PL = " << pathDoxyLatexTemplatePL << "\n"
+      "DOXYTEMPLATE_TEX = " << pathDoxyTemplateTex << "\n"
+      "DOXYDOCS_TEX = " << pathDoxyDocsTex << "\n"
+      "DOXYFORMAT_TEX = " << pathDoxyFormatTex << "\n"
+      "DOXYLATEX_TEX = " << pathDoxyLatexTex << "\n"
+      "DOXYLATEX_DVI = " << pathDoxyLatexDVI << "\n"
+      "DOXYLATEX_PDF = " << pathDoxyLatexPDF << "\n";
+
+  doxyRulesStream <<
+    "\n"
+    ".PHONY: clean-perlmod\n"
+    "clean-perlmod:\n"
+    "\trm -f $(DOXYMODEL_PM) $(DOXYDOCS_PM)";
+  if (perlmodLatex)
+    doxyRulesStream <<
+      " \\\n"
+      "\t$(DOXYLATEX_PL) $(DOXYLATEXTEMPLATE_PL) \\\n"
+      "\t$(DOXYDOCS_TEX) $(DOXYTEMPLATE_TEX) \\\n"
+      "\t$(DOXYFORMAT_TEX) $(DOXYLATEX_TEX) \\\n"
+      "\t$(DOXYLATEX_PDF) $(DOXYLATEX_DVI) \\\n"
+      "\t$(addprefix $(DOXYLATEX_TEX:tex=),out aux log)";
+  doxyRulesStream << "\n\n";
+
+  doxyRulesStream <<
+    "$(DOXYRULES) $(DOXYMAKEFILE) $(DOXYMODEL_PM) $(DOXYDOCS_PM)";
+  if (perlmodLatex) {
+    doxyRulesStream <<
+      " \\\n"
+      "$(DOXYLATEX_PL) $(DOXYLATEXTEMPLATE_PL) \\\n"
+      "$(DOXYFORMAT_TEX) $(DOXYLATEX_TEX)";
+  }
+  doxyRulesStream <<
+    ": $(DOXYFILE)\n"
+    "\tcd $(DOXYEXECPATH) ; doxygen \"$<\"\n";
+
+  if (perlmodLatex) {
+    doxyRulesStream <<
+      "\n"
+      "$(DOXYDOCS_TEX): $(DOXYLATEX_PL) $(DOXYDOCS_PM)\n"
+      "\tperl -I\"$(<D)\" \"$<\" >\"$@\"\n"
+      "\n"
+      "$(DOXYTEMPLATE_TEX): $(DOXYLATEXTEMPLATE_PL) $(DOXYMODEL_PM)\n"
+      "\tperl -I\"$(<D)\" \"$<\" >\"$@\"\n"
+      "\n"
+      "$(DOXYLATEX_PDF) $(DOXYLATEX_DVI): $(DOXYLATEX_TEX) $(DOXYFORMAT_TEX) $(DOXYTEMPLATE_TEX) $(DOXYDOCS_TEX)\n"
+      "\n"
+      "$(DOXYLATEX_PDF): $(DOXYLATEX_TEX)\n"
+      "\tpdflatex -interaction=nonstopmode \"$<\"\n"
+      "\n"
+      "$(DOXYLATEX_DVI): $(DOXYLATEX_TEX)\n"
+      "\tlatex -interaction=nonstopmode \"$<\"\n";
   }
 
-  QCString fileName=outputDirectory+"/perlmod/DoxyDocs.pm";
-  QFile f(fileName);
-  if (!f.open(IO_WriteOnly))
-  {
-    err("Cannot open file %s for writing!\n",fileName.data());
-    return;
+  return true;
+}
+
+bool PerlModGenerator::generateMakefile()
+{
+  QFile makefile;
+  if (!createOutputFile(makefile, pathMakefile))
+    return false;
+
+  bool perlmodLatex = Config_getBool("PERLMOD_LATEX");
+
+  QTextStream makefileStream(&makefile);
+  makefileStream <<
+    ".PHONY: default clean" << (perlmodLatex ? " pdf" : "") << "\n"
+    "default: " << (perlmodLatex ? "pdf" : "clean") << "\n"
+    "\n"
+    "include " << pathDoxyRules << "\n"
+    "\n"
+    "clean: clean-perlmod\n";
+
+  if (perlmodLatex) {
+    makefileStream <<
+      "pdf: $(DOXYLATEX_PDF)\n"
+      "dvi: $(DOXYLATEX_DVI)\n";
   }
-  
-  QTextStream t(&f);
-  PerlModOutputStream os(&t);
-  PerlModOutput output(&os);
-  output.add("$doxydocs =\n").openHash();
-  
-  output.openList("classes");
-  ClassSDict::Iterator cli(Doxygen::classSDict);
-  ClassDef *cd;
-  for (cli.toFirst();(cd=cli.current());++cli)
-    generatePerlModForClass(cd,output);
-  output.closeList();
 
-  output.openList("namespaces");
-  NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
-  NamespaceDef *nd;
-  for (nli.toFirst();(nd=nli.current());++nli)
-    generatePerlModForNamespace(nd,output);
-  output.closeList();
+  return true;
+}
+
+bool PerlModGenerator::generateDoxyLatexTemplatePL()
+{
+  QFile doxyLatexTemplatePL;
+  if (!createOutputFile(doxyLatexTemplatePL, pathDoxyLatexTemplatePL))
+    return false;
+
+  QTextStream doxyLatexTemplatePLStream(&doxyLatexTemplatePL);
+  doxyLatexTemplatePLStream << 
+    "use DoxyModel;\n"
+    "\n"
+    "sub template($) {\n"
+    "\tmy $model = $_[0];\n"
+    "\tmy ($type, $name) = @$model[0, 1];\n"
+    "\tif ($type eq \"string\") {\n"
+    "\t\tprint \"\\\\def\\\\\" . $name . \"#1{#1}%\\n\";\n"
+    "\t} elsif ($type eq \"doc\") {\n"
+    "\t\tprint \"\\\\def\\\\\" . $name . \"#1{#1}%\\n\";\n"
+    "\t} elsif ($type eq \"hash\") {\n"
+    "\t\tmy ($key, $value);\n"
+    "\t\twhile (($key, $submodel) = each %{$$model[2]}) {\n"
+    "\t\t\tmy $subname = $$submodel[1];\n"
+    "\t\t\tprint \"\\\\def\\\\\" . $subname . \"Empty{}%\\n\";\n"
+    "\t\t\tprint \"\\\\def\\\\field\" . $subname . \"Empty{\\\\\" . $subname . \"Empty}%\\n\";\n"
+    "\t\t\ttemplate($submodel);\n"
+    "\t\t}\n"
+    "\t\tprint \"\\\\def\\\\\" . $name . \"{}%\\n\";\n"
+    "\t} elsif ($type eq \"list\") {\n"
+    "\t\ttemplate($$model[2]);\n"
+    "\t\tprint \"\\\\def\\\\\" . $name . \"#1{#1}%\\n\";\n"
+    "\t\tprint \"\\\\def\\\\\" . $name . \"Sep{}%\\n\";\n"
+    "\t}\n"
+    "}\n"
+    "\n"
+    "template($doxymodel);\n";
+
+  return true;
+}
+
+bool PerlModGenerator::generateDoxyLatexPL()
+{
+  QFile doxyLatexPL;
+  if (!createOutputFile(doxyLatexPL, pathDoxyLatexPL))
+    return false;
+
+  QTextStream doxyLatexPLStream(&doxyLatexPL);
+  doxyLatexPLStream << 
+    "use DoxyModel;\n"
+    "use DoxyDocs;\n"
+    "\n"
+    "sub latex_quote($) {\n"
+    "\tmy $text = $_[0];\n"
+    "\t$text =~ s/\\\\/\\\\textbackslash /g;\n"
+    "\t$text =~ s/~/\\\\textasciitilde /g;\n"
+    "\t$text =~ s/</\\\\textasciiless /g;\n"
+    "\t$text =~ s/>/\\\\textasciigreater /g;\n"
+    "\t$text =~ s/\\\\^/\\\\textasciicircum /g;\n"
+    "\t$text =~ s/[\\$&%#_{}]/\\\\$&/g;\n"
+    "\tprint $text;\n"
+    "}\n"
+    "\n"
+    "sub generate_doc($) {\n"
+    "\tmy $doc = $_[0];\n"
+    "\tfor my $item (@$doc) {\n"
+    "\t\tmy $type = $$item{type};\n"
+    "\t\tif ($type eq \"text\") {\n"
+    "\t\t\tlatex_quote($$item{content});\n"
+    "\t\t} elsif ($type eq \"para\") {\n"
+    "\t\t\tgenerate_doc($$item{content});\n"
+    "#\t\t\tprint \"\\\\par\\n\";\n"
+    "\t\t} elsif ($type eq \"bold\") {\n"
+    "\t\t\tprint \"\\\\textbf{\";\n"
+    "\t\t\tgenerate_doc($$item{content});\n"
+    "\t\t\tprint \"}\";\n"
+    "\t\t} elsif ($type eq \"emphasis\") {\n"
+    "\t\t\tprint \"\\\\textit{\";\n"
+    "\t\t\tgenerate_doc($$item{content});\n"
+    "\t\t\tprint \"}\";\n"
+    "\t\t} elsif ($type eq \"url\") {\n"
+    "\t\t\tlatex_quote($$item{content});\n"
+    "\t\t}\n"
+    "\t}\n"
+    "}\n"
+    "\n"
+    "sub generate($$) {\n"
+    "\tmy ($item, $model) = @_;\n"
+    "\tmy ($type, $name) = @$model[0, 1];\n"
+    "\tif ($type eq \"string\") {\n"
+    "\t\tprint \"\\\\\" . $name . \"{\";\n"
+    "\t\tlatex_quote($item);\n"
+    "\t\tprint \"}\";\n"
+    "\t} elsif ($type eq \"doc\") {\n"
+    "\t\tif (@$item) {\n"
+    "\t\t\tprint \"\\\\\" . $name . \"{\";\n"
+    "\t\t\tgenerate_doc($item);\n"
+    "\t\t\tprint \"}%\\n\";\n"
+    "\t\t} else {\n"
+    "\t\t\tprint \"\\\\\" . $name . \"Empty%\\n\";\n"
+    "\t\t}\n"
+    "\t} elsif ($type eq \"hash\") {\n"
+    "\t\tmy ($key, $value);\n"
+    "\t\twhile (($key, $submodel) = each %{$$model[2]}) {\n"
+    "\t\t\tmy $subname = $$submodel[1];\n"
+    "\t\t\tprint \"\\\\def\\\\field\" . $subname . \"{\";\n"
+    "\t\t\tif ($$item{$key}) {\n"
+    "\t\t\t\tgenerate($$item{$key}, $submodel);\n"
+    "\t\t\t} else {\n"
+    "\t\t\t\t\tprint \"\\\\\" . $subname . \"Empty%\\n\";\n"
+    "\t\t\t}\n"
+    "\t\t\tprint \"}%\\n\";\n"
+    "\t\t}\n"
+    "\t\tprint \"\\\\\" . $name . \"%\\n\";\n"
+    "\t} elsif ($type eq \"list\") {\n"
+    "\t\tmy $index = 0;\n"
+    "\t\tif (@$item) {\n"
+    "\t\t\tprint \"\\\\\" . $name . \"{%\\n\";\n"
+    "\t\t\tfor my $subitem (@$item) {\n"
+    "\t\t\t\tif ($index) {\n"
+    "\t\t\t\t\tprint \"\\\\\" . $name . \"Sep%\\n\";\n"
+    "\t\t\t\t}\n"
+    "\t\t\t\tgenerate($subitem, $$model[2]);\n"
+    "\t\t\t\t$index++;\n"
+    "\t\t\t}\n"
+    "\t\t\tprint \"}%\\n\";\n"
+    "\t\t} else {\n"
+    "\t\t\tprint \"\\\\\" . $name . \"Empty%\\n\";\n"
+    "\t\t}\n"
+    "\t}\n"
+    "}\n"
+    "\n"
+    "generate($doxydocs, $doxymodel);\n";
+
+  return true;
+}
+
+bool PerlModGenerator::generateDoxyFormatTex()
+{
+  QFile doxyFormatTex;
+  if (!createOutputFile(doxyFormatTex, pathDoxyFormatTex))
+    return false;
+
+  QTextStream doxyFormatTexStream(&doxyFormatTex);
+  doxyFormatTexStream << 
+    "\\input{" << pathDoxyTemplateTex << "}\n"
+    "\n"
+    "\\newbox\\BoxA\n"
+    "\\dimendef\\DimenA=151\\relax\n"
+    "\\dimendef\\DimenB=152\\relax\n"
+    "\\countdef\\ZoneDepth=151\\relax\n"
+    "\n"
+    "\\def\\Ifxcscs#1#2{%\n"
+    "\\expandafter\\let\\expandafter\\Ifxcscsa\\csname#1\\endcsname%\n"
+    "\\expandafter\\let\\expandafter\\Ifxcscsb\\csname#2\\endcsname%\n"
+    "\\ifx\\Ifxcscsa\\Ifxcscsb}%\n"
+    "\n"
+    "\\def\\Cs#1{\\csname#1\\endcsname}%\n"
+    "\\def\\Defcs#1{\\expandafter\\def\\csname#1\\endcsname}%\n"
+    "\\def\\Letcs#1{\\expandafter\\let\\csname#1\\endcsname}%\n"
+    "\\def\\Heading#1{\\vskip 4mm\\relax\\textbf{#1}}%\n"
+    "\\def\\See#1{\\begin{flushleft}\\Heading{See also: }#1\\end{flushleft}}%\n"
+    "\n"
+    "\\def\\Frame#1{\\vskip 3mm\\relax\\fbox{ \\vbox{\\hsize0.95\\hsize\\vskip 1mm\\relax%\n"
+    "\\raggedright#1\\vskip 0.5mm\\relax} }}%\n"
+    "\n"
+    "\\def\\Zone#1#2#3{%\n"
+    "\\Defcs{#1}{\n"
+    "\\advance\\ZoneDepth1\\relax%\n"
+    "\\Letcs{Mode\\number\\ZoneDepth}0%\n"
+    "\\Letcs{Present\\number\\ZoneDepth}0%\n"
+    "#2%\n"
+    "\\expandafter\\if\\Cs{Present\\number\\ZoneDepth}1%\n"
+    "\\advance\\ZoneDepth-1\\relax%\n"
+    "\\Letcs{Present\\number\\ZoneDepth}1%\n"
+    "\\expandafter\\if\\Cs{Mode\\number\\ZoneDepth}1%\n"
+    "\\advance\\ZoneDepth1\\relax%\n"
+    "\\Letcs{Mode\\number\\ZoneDepth}1%\n"
+    "#3%\n"
+    "\\advance\\ZoneDepth-1\\relax\\fi%\n"
+    "\\advance\\ZoneDepth1\\relax\\fi%\n"
+    "\\advance\\ZoneDepth-1\\relax}}%\n"
+    "\n"
+    "\\def\\Member#1#2{%\n"
+    "\\Defcs{Test#1}{\\Cs{field#1Detailed}%\n"
+    "\\Ifxcscs{field#1DetailedDoc}{field#1DetailedDocEmpty}\\else\\Letcs{Present#1}1\\fi}\n"
+    "\\Defcs{#1}{\\Letcs{Present#1}0%\n"
+    "\\Cs{Test#1}\\if1\\Cs{Present#1}\\Letcs{Present\\number\\ZoneDepth}1%\n"
+    "\\if1\\Cs{Mode\\number\\ZoneDepth}#2\\fi\\fi}}%\n"
+    "%\n"
+    "\\def\\TypedefMemberList#1#2{%\n"
+    "\\Defcs{#1DetailedDoc}##1{\\vskip 5.5mm\\relax##1}%\n"
+    "\\Defcs{#1Name}##1{\\textbf{##1}}%\n"
+    "\\Defcs{#1See}##1{\\See{##1}}%\n"
+    "%\n"
+    "\\Zone{#1s}{\\Cs{field#1List}}{\\subsubsection{#2}\\Cs{field#1List}}%\n"
+    "\\Member{#1}{\\Frame{typedef \\Cs{field#1Type} \\Cs{field#1Name}}%\n"
+    "\\Cs{field#1DetailedDoc}\\Cs{field#1See}\\vskip 5mm\\relax}}%\n"
+    "\n"
+    "\\def\\VariableMemberList#1#2{%\n"
+    "\\Defcs{#1DetailedDoc}##1{\\vskip 5.5mm\\relax##1}%\n"
+    "\\Defcs{#1Name}##1{\\textbf{##1}}%\n"
+    "\\Defcs{#1See}##1{\\See{##1}}%\n"
+    "%\n"
+    "\\Zone{#1s}{\\Cs{field#1List}}{\\subsubsection{#2}\\Cs{field#1List}}%\n"
+    "\\Member{#1}{\\Frame{\\Cs{field#1Type}{} \\Cs{field#1Name}}%\n"
+    "\\Cs{field#1DetailedDoc}\\Cs{field#1See}\\vskip 5mm\\relax}}%\n"
+    "\n"
+    "\\def\\FunctionMemberList#1#2{%\n"
+    "\\Defcs{#1PDParamName}##1{\\textit{##1}}%\n"
+    "\\Defcs{#1PDParam}{\\Cs{field#1PDParamName}}%\n"
+    "\\Defcs{#1PDParamsSep}{, }%\n"
+    "\\Defcs{#1PDBlocksSep}{\\vskip 2mm\\relax}%\n"
+    "%\n"
+    "\\Defcs{#1PDBlocks}##1{%\n"
+    "\\Heading{Parameters:}\\vskip 1.5mm\\relax%\n"
+    "\\DimenA0pt\\relax%\n"
+    "\\Defcs{#1PDBlock}{\\setbox\\BoxA\\hbox{\\Cs{field#1PDParams}}%\n"
+    "\\ifdim\\DimenA<\\wd\\BoxA\\DimenA\\wd\\BoxA\\fi}%\n"
+    "##1%\n"
+    "\\advance\\DimenA3mm\\relax\n"
+    "\\DimenB\\hsize\\advance\\DimenB-\\DimenA\\relax%\n"
+    "\\Defcs{#1PDBlock}{\\hbox to\\hsize{\\vtop{\\hsize\\DimenA\\relax%\n"
+    "\\Cs{field#1PDParams}}\\hfill%\n"
+    "\\vtop{\\hsize\\DimenB\\relax\\Cs{field#1PDDoc}}}}%\n"
+    "##1}%\n"
+    "%\n"
+    "\\Defcs{#1ParamName}##1{\\textit{##1}}%\n"
+    "\\Defcs{#1Param}{\\Cs{field#1ParamType}{} \\Cs{field#1ParamName}}%\n"
+    "\\Defcs{#1ParamsSep}{, }%\n"
+    "%\n"
+    "\\Defcs{#1Name}##1{\\textbf{##1}}%\n"
+    "\\Defcs{#1See}##1{\\See{##1}}%\n"
+    "\\Defcs{#1Return}##1{\\Heading{Returns: }##1}%\n"
+    "\\Defcs{field#1Title}{\\Frame{\\Cs{field#1Type}{} \\Cs{field#1Name}(\\Cs{field#1Params})}}%\n"
+    "%\n"
+    "\\Zone{#1s}{\\Cs{field#1List}}{\\subsubsection{#2}\\Cs{field#1List}}%\n"
+    "\\Member{#1}{\n"
+    "\\Cs{field#1Title}\\vskip 6mm\\relax\\Cs{field#1DetailedDoc}%\n"
+    "\\Cs{field#1Return}\\Cs{field#1PDBlocks}\\Cs{field#1See}\\vskip 5mm\\relax}}\n"
+    "\n"
+    "\\TypedefMemberList{FileTypedef}{Typedefs}%\n"
+    "\\VariableMemberList{FileVariable}{Variables}%\n"
+    "\\FunctionMemberList{FileFunction}{Functions}%\n"
+    "\n"
+    "\\def\\FileDetailed{\\fieldFileDetailedDoc\\par}%\n"
+    "\n"
+    "\\def\\TestFile{\\fieldFileTypedefs\\fieldFileVariables\\fieldFileFunctions}%\n"
+    "\\Zone{File}{\\TestFile}{\\subsection{\\fieldFileName}\\fieldFileDetailed\\TestFile}%\n"
+    "\n"
+    "\\TypedefMemberList{ClassPublicTypedef}{Public Typedefs}\n"
+    "\\TypedefMemberList{ClassProtectedTypedef}{Protected Typedefs}\n"
+    "\\TypedefMemberList{ClassPrivateTypedef}{Private Typedefs}\n"
+    "\\VariableMemberList{ClassPublicMember}{Public Members}\n"
+    "\\VariableMemberList{ClassProtectedMember}{Protected Members}\n"
+    "\\VariableMemberList{ClassPrivateMember}{Private Members}\n"
+    "\\FunctionMemberList{ClassPublicMethod}{Public Methods}\n"
+    "\\FunctionMemberList{ClassProtectedMethod}{Protected Methods}\n"
+    "\\FunctionMemberList{ClassPrivateMethod}{Private Methods}\n"
+    "\n"
+    "\\def\\ClassDetailed{\\fieldClassDetailedDoc\\par}%\n"
+    "\n"
+    "\\def\\TestClass{%\n"
+    "\\fieldClassPublicTypedefs\\fieldClassPublicMembers\\fieldClassPublicMethods%\n"
+    "\\fieldClassProtectedTypedefs\\fieldClassProtectedMembers\\fieldClassProtectedMethods%\n"
+    "\\fieldClassPrivateTypedefs\\fieldClassPrivateMembers\\fieldClassPrivateMethods}%\n"
+    "\n"
+    "\\Zone{Class}{\\TestClass}{\\subsection{\\fieldClassName}\\fieldClassDetailed\\TestClass}%\n"
+    "\n"
+    "\\Zone{AllFiles}{\\fieldFiles}{\\section{Files}\\fieldFiles}%\n"
+    "\\Zone{AllClasses}{\\fieldClasses}{\\section{Classes}\\fieldClasses}%\n"
+    "\n"
+    "\\newlength{\\oldparskip}%\n"
+    "\\newlength{\\oldparindent}%\n"
+    "\\newlength{\\oldfboxrule}%\n"
+    "\n"
+    "\\ZoneDepth0%\n"
+    "\\Letcs{Mode0}1%\n"
+    "\n"
+    "\\def\\EmitDoxyDocs{%\n"
+    "\\setlength{\\oldparskip}{\\parskip}%\n"
+    "\\setlength{\\oldparindent}{\\parindent}%\n"
+    "\\setlength{\\oldfboxrule}{\\fboxrule}%\n"
+    "\\setlength{\\parskip}{0cm}%\n"
+    "\\setlength{\\parindent}{0cm}%\n"
+    "\\setlength{\\fboxrule}{1pt}%\n"
+    "\\AllFiles\\AllClasses%\n"
+    "\\setlength{\\parskip}{\\oldparskip}%\n"
+    "\\setlength{\\parindent}{\\oldparindent}%\n"
+    "\\setlength{\\fboxrule}{\\oldfboxrule}}\n";
+
+  return true;
+}
+
+bool PerlModGenerator::generateDoxyLatexTex()
+{
+  QFile doxyLatexTex;
+  if (!createOutputFile(doxyLatexTex, pathDoxyLatexTex))
+    return false;
+
+  QTextStream doxyLatexTexStream(&doxyLatexTex);
+  doxyLatexTexStream <<
+    "\\documentclass[a4paper,12pt]{article}\n"
+    "\\usepackage[latin1]{inputenc}\n"
+    "\\usepackage[none]{hyphenat}\n"
+    "\\usepackage[T1]{fontenc}\n"
+    "\\usepackage{hyperref}\n"
+    "\\usepackage{times}\n"
+    "\n"
+    "\\input{doxyformat}\n"
+    "\n"
+    "\\begin{document}\n"
+    "\\input{" << pathDoxyDocsTex << "}\n"
+    "\\EmitDoxyDocs\n"
+    "\\end{document}\n";
+
+  return true;
+}
+
+void PerlModGenerator::generate()
+{
+  // + classes
+  // + namespaces
+  // + files
+  // - packages
+  // + groups
+  // + related pages
+  // - examples
 
-  output.openList("files");
-  FileNameListIterator fnli(Doxygen::inputNameList);
-  FileName *fn;
-  for (;(fn=fnli.current());++fnli)
-  {
-    FileNameIterator fni(*fn);
-    FileDef *fd;
-    for (;(fd=fni.current());++fni)
-      generatePerlModForFile(fd,output);
+  QDir perlModDir;
+  if (!createOutputDir(perlModDir))
+    return;
+
+  bool perlmodLatex = Config_getBool("PERLMOD_LATEX");
+
+  pathDoxyDocsPM = perlModDir.absPath() + "/DoxyDocs.pm";
+  pathDoxyModelPM = perlModDir.absPath() + "/DoxyModel.pm";
+  pathMakefile = perlModDir.absPath() + "/Makefile";
+  pathDoxyRules = perlModDir.absPath() + "/doxyrules.make";
+
+  if (perlmodLatex) {
+    pathDoxyTemplateTex = perlModDir.absPath() + "/doxytemplate.tex";
+    pathDoxyFormatTex = perlModDir.absPath() + "/doxyformat.tex";
+    pathDoxyLatexTex = perlModDir.absPath() + "/doxylatex.tex";
+    pathDoxyLatexDVI = perlModDir.absPath() + "/doxylatex.dvi";
+    pathDoxyLatexPDF = perlModDir.absPath() + "/doxylatex.pdf";
+    pathDoxyDocsTex = perlModDir.absPath() + "/doxydocs.tex";
+    pathDoxyLatexPL = perlModDir.absPath() + "/doxylatex.pl";
+    pathDoxyLatexTemplatePL = perlModDir.absPath() + "/doxylatex-template.pl";
   }
-  output.closeList();
 
-  output.openList("groups");
-  GroupSDict::Iterator gli(Doxygen::groupSDict);
-  GroupDef *gd;
-  for (;(gd=gli.current());++gli)
-    generatePerlModForGroup(gd,output);
-  output.closeList();
+  if (!(generatePerlModOutput()
+	&& generateDoxyModelPM()
+	&& generateMakefile()
+	&& generateDoxyRules()))
+    return;
 
-  output.openList("pages");
-  PageSDict::Iterator pdi(*Doxygen::pageSDict);
-  PageInfo *pi=0;
-  for (pdi.toFirst();(pi=pdi.current());++pdi)
-    generatePerlModForPage(pi,output);
-  if (Doxygen::mainPage)
-    generatePerlModForPage(Doxygen::mainPage,output);
-  output.closeList();
+  if (perlmodLatex) {
+    if (!(generateDoxyLatexTemplatePL()
+	  && generateDoxyLatexPL()
+	  && generateDoxyLatexTex()
+	  && generateDoxyFormatTex()))
+      return;
+  }
+}
 
-  output.closeHash().add(";\n1;\n");
+void generatePerlMod()
+{
+  PerlModGenerator pmg;
+  pmg.generate();
 }
 
 // Local Variables:
 // c-basic-offset: 2
 // End:
+
+/* This elisp function for XEmacs makes Control-Z transform
+   the text in the region into a valid C string.
+
+  (global-set-key '(control z) (lambda () (interactive)
+   (save-excursion
+    (if (< (mark) (point)) (exchange-point-and-mark))
+    (let ((start (point)) (replacers 
+     '(("\\\\" "\\\\\\\\")
+       ("\"" "\\\\\"")
+       ("\t" "\\\\t")
+       ("^.*$" "\"\\&\\\\n\""))))
+     (while replacers   
+      (while (re-search-forward (caar replacers) (mark) t)
+       (replace-match (cadar replacers) t))
+      (goto-char start)
+      (setq replacers (cdr replacers)))))))
+*/
diff --git a/src/perlmodgen.h b/src/perlmodgen.h
index a60042b..ec8c623 100644
--- a/src/perlmodgen.h
+++ b/src/perlmodgen.h
@@ -15,6 +15,9 @@
 #ifndef PERLMODGEN_H
 #define PERLMODGEN_H
 
-void generatePerlMod();
+class QString;
+
+extern void setPerlModDoxyfile(const QString &);
+extern void generatePerlMod();
 
 #endif
diff --git a/src/translator_es.h b/src/translator_es.h
index f5b5d72..41b5acd 100644
--- a/src/translator_es.h
+++ b/src/translator_es.h
@@ -138,7 +138,7 @@ class TranslatorSpanish : public TranslatorAdapter_1_2_7
     // quick reference sections
 
     /*! This is put above each page as a link to the list of all groups of 
-     *  compounds or files (see the \group command).
+     *  compounds or files (see the \\group command).
      */
     virtual QCString trModules()
     { return "Módulos"; }
diff --git a/src/translator_fr.h b/src/translator_fr.h
index 79645eb..c956de5 100644
--- a/src/translator_fr.h
+++ b/src/translator_fr.h
@@ -39,6 +39,8 @@
  * -------------+------------------------------------------------------------
  *  2002-09-24  | Update for new since 1.2.17
  * -------------+------------------------------------------------------------
+ *  2002-10-22  | Update for new since 1.2.18
+ * -------------+------------------------------------------------------------
  */ 
 #ifndef TRANSLATOR_FR_H
 #define TRANSLATOR_FR_H
@@ -146,7 +148,7 @@ class TranslatorFrench : public TranslatorAdapter_1_2_17
     // quick reference sections
 
     /*! This is put above each page as a link to the list of all groups of 
-     *  compounds or files (see the \group command).
+     *  compounds or files (see the \\group command).
      */
     QCString trModules()
     { return "Modules"; }
@@ -1282,6 +1284,22 @@ class TranslatorFrench : public TranslatorAdapter_1_2_17
       return "Liste obsolète";
     }
 
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.18
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a header for declaration section of the events found in 
+     * a C# program
+     */
+    virtual QCString trEvents()
+    {
+      return "Evènements";
+    }
+    /*! Header used for the documentation section of a class' events. */
+    virtual QCString trEventDocumentation()
+    {
+      return "Documentation des évènements";
+    }
 
 };
 #endif
diff --git a/src/translator_hu.h b/src/translator_hu.h
index 2a0797c..ff3ba87 100644
--- a/src/translator_hu.h
+++ b/src/translator_hu.h
@@ -127,7 +127,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_2_1
     // quick reference sections
 
     /*! This is put above each page as a link to the list of all groups of 
-     *  compounds or files (see the \group command).
+     *  compounds or files (see the \\group command).
      */
     QCString trModules()
     { return "Modulok"; }
diff --git a/src/translator_it.h b/src/translator_it.h
index fffee07..98604f2 100644
--- a/src/translator_it.h
+++ b/src/translator_it.h
@@ -180,7 +180,7 @@ class TranslatorItalian : public TranslatorAdapter_1_2_18
     // quick reference sections
 
     /*! This is put above each page as a link to the list of all groups of
-     *  compounds or files (see the \group command).
+     *  compounds or files (see the \\group command).
      */
     QCString trModules()
     { return "Moduli"; }
diff --git a/src/translator_jp.h b/src/translator_jp.h
index c3debfb..f1a788d 100644
--- a/src/translator_jp.h
+++ b/src/translator_jp.h
@@ -172,7 +172,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_2_18
     // quick reference sections
 
     /*! This is put above each page as a link to the list of all groups of
-     *  compounds or files (see the \group command).
+     *  compounds or files (see the \\group command).
      */
     virtual QCString trModules()
     { return decode("¥â¥¸¥å¡¼¥ë"); }
diff --git a/src/translator_pl.h b/src/translator_pl.h
index 3754594..9dced0d 100644
--- a/src/translator_pl.h
+++ b/src/translator_pl.h
@@ -144,7 +144,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17
     // quick reference sections
 
     /*! This is put above each page as a link to the list of all groups of 
-     *  compounds or files (see the \group command).
+     *  compounds or files (see the \\group command).
      */
     QCString trModules()
     { return "Modu³y"; }
diff --git a/src/translator_pt.h b/src/translator_pt.h
index eb05d0c..ff0bade 100644
--- a/src/translator_pt.h
+++ b/src/translator_pt.h
@@ -158,7 +158,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_2_18
     // quick reference sections
 
     /*! This is put above each page as a link to the list of all groups of
-     *  compounds or files (see the \group command).
+     *  compounds or files (see the \\group command).
      */
     QCString trModules()
     { return "Módulos"; }
diff --git a/src/translator_ro.h b/src/translator_ro.h
index 07c2bd9..22209de 100644
--- a/src/translator_ro.h
+++ b/src/translator_ro.h
@@ -167,7 +167,7 @@ class TranslatorRomanian: public TranslatorAdapter_1_2_16
     // quick reference sections
 
     /*! This is put above each page as a link to the list of all groups of 
-     *  compounds or files (see the \group command).
+     *  compounds or files (see the \\group command).
      */
     virtual QCString trModules()
     { return "Module"; }
diff --git a/src/util.cpp b/src/util.cpp
index a265a15..2141530 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -2570,6 +2570,7 @@ bool generateLink(OutputDocInterface &od,const char *clName,
       linkText=linkText.right(linkText.length()-2);
     }
   }
+  //printf("generateLink linkText=%s\n",linkText.data());
   if (resolveLink(clName,lr,inSeeBlock,&compound,&pageInfo,anchor))
   {
     if (pageInfo) // link to page
@@ -2596,6 +2597,10 @@ bool generateLink(OutputDocInterface &od,const char *clName,
         writePageRef(od,compound->getOutputFileBase(),anchor);
       }
     }
+    else
+    {
+      err("%s:%d: Internal error: resolveLink successful but no compound found!\n",__FILE__,__LINE__);
+    }
     return TRUE;
   }
   else // link could not be found
@@ -3267,7 +3272,7 @@ QList<ArgumentList> *copyArgumentLists(const QList<ArgumentList> *srcLists)
  *  that make up specialized classes. The switch \a parentOnly 
  *  determines whether or not a template "at the end" of a scope 
  *  should be considered, e.g. with \a parentOnly is \c TRUE, A<T>::B<S> will 
- *  try to strip <T> and not <S>, while \a parentOnly is \c FALSE will 
+ *  try to strip \<T\> and not \<S\>, while \a parentOnly is \c FALSE will 
  *  strip both unless A<T> or B<S> are specialized template classes. 
  */
 QCString stripTemplateSpecifiersFromScope(const QCString &fullName,
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
index 80054c8..b148133 100644
--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
@@ -573,6 +573,13 @@ static void generateXMLForMember(MemberDef *md,QTextStream &ti,QTextStream &t,De
           linkifyText(TextGeneratorXMLImpl(t),scopeName,md->name(),a->defval);
           t << "</defval>" << endl;
         }
+        if (defArg && defArg->hasDocumentation())
+        {
+          t << "          <briefdescription>";
+          writeXMLDocBlock(t,md->getDefFileName(),md->getDefLine(),
+                           scopeName,md,defArg->docs);
+          t << "</briefdescription>" << endl;
+        }
         t << "        </param>" << endl;
         if (defArg) ++defAli;
       }
@@ -610,7 +617,19 @@ static void generateXMLForMember(MemberDef *md,QTextStream &ti,QTextStream &t,De
       MemberDef *emd;
       for (emli.toFirst();(emd=emli.current());++emli)
       {
-        t << "        <enumvalue>" << endl;
+        ti << "    <member refid=\"" << emd->getOutputFileBase() 
+           << "_1" << emd->anchor() << "\" kind=\"enumvalue\"><name>" 
+           << convertToXML(emd->name()) << "</name></member>" << endl;
+
+        t << "        <enumvalue id=\"" << emd->getOutputFileBase() << "_1" 
+          << emd->anchor() << "\" prot=\"";
+        switch (emd->protection())
+        {
+          case Public:    t << "public";    break;
+          case Protected: t << "protected"; break;
+          case Private:   t << "private";   break;
+        }
+        t << "\">" << endl;
         t << "          <name>";
         writeXMLString(t,emd->name());
         t << "</name>" << endl;
diff --git a/wintools/Doxygen.dsp b/wintools/Doxygen.dsp
index c19e181..1387c8e 100644
--- a/wintools/Doxygen.dsp
+++ b/wintools/Doxygen.dsp
@@ -24,7 +24,7 @@ CFG=Doxygen - Win32 Debug
 # Begin Project
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName "Doxygen"
-# PROP Scc_LocalPath ".."
+# PROP Scc_LocalPath "."
 CPP=xicl6.exe
 RSC=rc.exe
 
@@ -42,15 +42,16 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\qtools" /I "..\src" /I "..\libpng" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /D "QT_NO_CODECS" /FR /YX /FD /Zm200 /c
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG" /d "QT_NO_CODECS"
+# ADD CPP /nologo /W3 /GX /O2 /I "..\src" /I "..\qtools" /I "..\libpng" /D "ENGLISH_ONLY" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=snBsc.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 qtools.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"Release"
 
 !ELSEIF  "$(CFG)" == "Doxygen - Win32 Debug"
 
@@ -66,15 +67,17 @@ LINK32=xilink6.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\qtools" /I "..\src" /I "..\libpng" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "QT_NO_CODECS" /FR /YX /FD /Zm200 /GZ /c
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG" /d "QT_NO_CODECS"
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\src" /I "..\qtools" /I "..\libpng" /D "ENGLISH_ONLY" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+# SUBTRACT RSC /x
 BSC32=snBsc.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 qtools.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Debug"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
@@ -87,10 +90,6 @@ LINK32=xilink6.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\libpng\adler32.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\ce_lex.cpp
 # End Source File
 # Begin Source File
@@ -107,15 +106,15 @@ SOURCE=..\src\classlist.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\code.cpp
+SOURCE=..\src\cmdmapper.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\commentcnv.cpp
+SOURCE=..\src\code.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\compress.c
+SOURCE=..\src\commentcnv.cpp
 # End Source File
 # Begin Source File
 
@@ -127,10 +126,6 @@ SOURCE=..\src\cppvalue.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\crc32.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\debug.cpp
 # End Source File
 # Begin Source File
@@ -155,15 +150,15 @@ SOURCE=..\src\definition.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\deflate.c
+SOURCE=..\src\diagram.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\diagram.cpp
+SOURCE=..\src\docparser.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\doc.cpp
+SOURCE=..\src\doctokenizer.cpp
 # End Source File
 # Begin Source File
 
@@ -199,7 +194,7 @@ SOURCE=..\src\groupdef.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\gzio.c
+SOURCE=..\src\htmldocvisitor.cpp
 # End Source File
 # Begin Source File
 
@@ -219,35 +214,15 @@ SOURCE=..\src\index.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\infblock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\infcodes.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\inffast.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\inflate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\inftrees.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\infutil.c
+SOURCE=..\src\instdox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\instdox.cpp
+SOURCE=..\src\language.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\language.cpp
+SOURCE=..\src\latexdocvisitor.cpp
 # End Source File
 # Begin Source File
 
@@ -263,6 +238,10 @@ SOURCE=..\src\main.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\mandocvisitor.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\mangen.cpp
 # End Source File
 # Begin Source File
@@ -303,7 +282,7 @@ SOURCE=..\src\packagedef.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\png.c
+SOURCE=..\src\perlmodgen.cpp
 # End Source File
 # Begin Source File
 
@@ -311,187 +290,27 @@ SOURCE=..\src\pngenc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\pngerror.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pnggccrd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngget.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngmem.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngpread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngrio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngrtran.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngrutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngset.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngtrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngvcrd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngwio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngwrite.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngwtran.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngwutil.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\pre.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\qtools\qbuffer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qcollection.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qcstring.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qdatastream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qdatetime.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qdir.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qdir_win32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qfile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qfile_win32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qfileinfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qfileinfo_win32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qgarray.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qgdict.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qglist.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qglobal.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qgvector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qiodevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qmap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qregexp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qstring.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qstringlist.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qtextcodec.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qtextstream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qxml.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\reflist.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\rtfgen.cpp
+SOURCE=..\src\rtfdocvisitor.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\scanner.cpp
+SOURCE=..\src\rtfgen.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\searchindex.cpp
+SOURCE=..\src\rtfstyle.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\suffixtree.cpp
+SOURCE=..\src\scanner.cpp
 # End Source File
 # Begin Source File
 
@@ -503,14 +322,6 @@ SOURCE=..\src\translator.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\trees.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\uncompr.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\util.cpp
 # End Source File
 # Begin Source File
@@ -519,11 +330,11 @@ SOURCE=..\src\version.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\xmlgen.cpp
+SOURCE=..\src\xmldocvisitor.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\zutil.c
+SOURCE=..\src\xmlgen.cpp
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -547,6 +358,10 @@ SOURCE=..\src\classlist.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\cmdmapper.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\code.h
 # End Source File
 # Begin Source File
@@ -591,15 +406,15 @@ SOURCE=..\src\definition.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\deflate.h
+SOURCE=..\src\diagram.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\diagram.h
+SOURCE=..\src\docparser.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\doc.h
+SOURCE=..\src\doctokenizer.h
 # End Source File
 # Begin Source File
 
@@ -643,6 +458,10 @@ SOURCE=..\src\groupdef.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\htmldocvisitor.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\htmlgen.h
 # End Source File
 # Begin Source File
@@ -659,47 +478,31 @@ SOURCE=..\src\index.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\infblock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\infcodes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\inffast.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\inffixed.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\inftrees.h
+SOURCE=..\src\instdox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\infutil.h
+SOURCE=..\src\lang_cfg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\instdox.h
+SOURCE=..\src\language.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\lang_cfg.h
+SOURCE=..\src\latexdocvisitor.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\language.h
+SOURCE=..\src\latexgen.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\latexgen.h
+SOURCE=..\src\logos.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\logos.h
+SOURCE=..\src\mandocvisitor.h
 # End Source File
 # Begin Source File
 
@@ -747,15 +550,7 @@ SOURCE=..\src\page.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\png.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngasmrd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngconf.h
+SOURCE=..\src\perlmodgen.h
 # End Source File
 # Begin Source File
 
@@ -771,179 +566,15 @@ SOURCE=..\src\printdocvisitor.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\qtools\qarray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qasciidict.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qbuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qcollection.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qconfig.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qcstring.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qdatastream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qdatetime.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qdict.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qdir.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qfeatures.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qfiledefs_p.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qfileinfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qgarray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qgdict.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qgeneric.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qglist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qglobal.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qgvector.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qintdict.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qiodevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qmodules.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qptrdict.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qqueue.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qregexp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qshared.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qsortedlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qstack.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qstring.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qstringlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qstrlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qstrvec.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\qtbc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\qtools\qtextcodec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qtextstream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qtl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qvaluelist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qvaluestack.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qvector.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qxml.h
+SOURCE=..\src\reflist.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\reflist.h
+SOURCE=..\src\rtfdocvisitor.h
 # End Source File
 # Begin Source File
 
@@ -951,11 +582,11 @@ SOURCE=..\src\rtfgen.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\scanner.h
+SOURCE=..\src\rtfstyle.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\searchindex.h
+SOURCE=..\src\scanner.h
 # End Source File
 # Begin Source File
 
@@ -967,10 +598,6 @@ SOURCE=..\src\sortdict.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\suffixtree.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\tagreader.h
 # End Source File
 # Begin Source File
@@ -979,127 +606,51 @@ SOURCE=..\src\translator.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\translator_adapter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_br.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_cn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_cz.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_de.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_dk.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\translator_en.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\translator_es.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_fi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_fr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_gr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_hr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_hu.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_it.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_jp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_kr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_nl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_no.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_pl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_pt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_ro.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_ru.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_se.h
+SOURCE=..\src\treeview.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\translator_si.h
-# End Source File
-# Begin Source File
+SOURCE=..\src\unistd.h
 
-SOURCE=..\src\translator_sk.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "Doxygen - Win32 Release"
 
-SOURCE=..\src\translator_std.h
-# End Source File
-# Begin Source File
+USERDEP__UNIST="..\src\ce_lex.cpp"	"..\src\code.cpp"	"..\src\commentcnv.cpp"	"..\src\config.cpp"	"..\src\declinfo.cpp"	"..\src\defargs.cpp"	"..\src\doctokenizer.cpp"	"..\src\formula.cpp"	"..\src\pre.cpp"	"..\src\scanner.cpp"	"..\src\util.cpp"	
+# Begin Custom Build
+InputPath=..\src\unistd.h
 
-SOURCE=..\src\translator_tw.h
-# End Source File
-# Begin Source File
+"$(InputPath)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	echo /* this is a dummy file, that is needed for compiling files that are > $(InputPath) 
+	echo  * generated with flex under Windows 95/NT. >> $(InputPath) 
+	echo  */ >> $(InputPath) 
+	echo #if defined(_MSC_VER) >> $(InputPath) 
+	echo #include ^<io.h^> >> $(InputPath) 
+	echo #endif >> $(InputPath) 
+	
+# End Custom Build
 
-SOURCE=..\src\translator_ua.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "Doxygen - Win32 Debug"
 
-SOURCE=..\libpng\trees.h
-# End Source File
-# Begin Source File
+# PROP Ignore_Default_Tool 1
+USERDEP__UNIST="..\src\ce_lex.cpp"	"..\src\code.cpp"	"..\src\commentcnv.cpp"	"..\src\config.cpp"	"..\src\declinfo.cpp"	"..\src\defargs.cpp"	"..\src\doctokenizer.cpp"	"..\src\formula.cpp"	"..\src\pre.cpp"	"..\src\scanner.cpp"	"..\src\util.cpp"	
+# Begin Custom Build
+InputPath=..\src\unistd.h
+
+"$(InputPath)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	echo /* this is a dummy file, that is needed for compiling files that are > $(InputPath) 
+	echo  * generated with flex under Windows 95/NT. >> $(InputPath) 
+	echo  */ >> $(InputPath) 
+	echo #if defined(_MSC_VER) >> $(InputPath) 
+	echo #include ^<io.h^> >> $(InputPath) 
+	echo #endif >> $(InputPath) 
+	
+# End Custom Build
 
-SOURCE=..\src\treeview.h
-# End Source File
-# Begin Source File
+!ENDIF 
 
-SOURCE=..\src\unistd.h
 # End Source File
 # Begin Source File
 
@@ -1111,24 +662,12 @@ SOURCE=..\src\version.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\xmlgen.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\zconf.h
+SOURCE=..\src\xmldocvisitor.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\zlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\zutil.h
+SOURCE=..\src\xmlgen.h
 # End Source File
 # End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
 # End Target
 # End Project
diff --git a/wintools/Doxygen.dsw b/wintools/Doxygen.dsw
index 6e7bceb..90728a8 100644
--- a/wintools/Doxygen.dsw
+++ b/wintools/Doxygen.dsw
@@ -3,13 +3,111 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "Doxygen"=".\Doxygen.dsp" - Package Owner=<4>
+Project: "Doxygen"=.\Doxygen.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
     begin source code control
     Doxygen
-    ..
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libpng
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib.dsp
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Doxysearch
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "Doxysearch"=.\Doxysearch.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    Doxysearch
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name Doxytag
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "Doxytag"=.\Doxytag.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    Doxytag
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name qtools
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "libpng"=.\libpng.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    libpng
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "qtools"=.\qtools.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    qtools
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "zlib"=.\zlib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    zlib
+    .
     end source code control
 }}}
 
@@ -23,6 +121,10 @@ Global:
 
 Package=<5>
 {{{
+    begin source code control
+    Doxygen
+    .
+    end source code control
 }}}
 
 Package=<3>
diff --git a/wintools/Doxysearch.dsp b/wintools/Doxysearch.dsp
new file mode 100644
index 0000000..e0bba31
--- /dev/null
+++ b/wintools/Doxysearch.dsp
@@ -0,0 +1,97 @@
+# Microsoft Developer Studio Project File - Name="Doxysearch" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Doxysearch - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "Doxysearch.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "Doxysearch.mak" CFG="Doxysearch - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Doxysearch - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Doxysearch - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "Doxysearch"
+# PROP Scc_LocalPath "."
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Doxysearch - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\src" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "NDEBUG" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=snBsc.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "Doxysearch - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\src" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "_DEBUG" /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+# SUBTRACT RSC /x
+BSC32=snBsc.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# SUBTRACT LINK32 /nodefaultlib
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Doxysearch - Win32 Release"
+# Name "Doxysearch - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\src\doxysearch.cpp
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/wintools/Doxysearch.dsw b/wintools/Doxysearch.dsw
new file mode 100644
index 0000000..4a93e06
--- /dev/null
+++ b/wintools/Doxysearch.dsw
@@ -0,0 +1,33 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "Doxysearch"=".\Doxysearch.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    Doxysearch
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/wintools/Doxytag.dsp b/wintools/Doxytag.dsp
new file mode 100644
index 0000000..5c896d5
--- /dev/null
+++ b/wintools/Doxytag.dsp
@@ -0,0 +1,173 @@
+# Microsoft Developer Studio Project File - Name="Doxytag" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Doxytag - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "Doxytag.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "Doxytag.mak" CFG="Doxytag - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Doxytag - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Doxytag - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "Doxytag"
+# PROP Scc_LocalPath "."
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Doxytag - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\src" /I "..\qtools" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "NDEBUG" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=snBsc.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 qtools.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"Release"
+
+!ELSEIF  "$(CFG)" == "Doxytag - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\src" /I "..\qtools" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "_DEBUG" /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+# SUBTRACT RSC /x
+BSC32=snBsc.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 qtools.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Debug"
+# SUBTRACT LINK32 /nodefaultlib
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Doxytag - Win32 Release"
+# Name "Doxytag - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\src\doxytag.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\logos.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\searchindex.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\suffixtree.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\version.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\src\logos.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\searchindex.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\suffixtree.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\unistd.h
+
+!IF  "$(CFG)" == "Doxytag - Win32 Release"
+
+USERDEP__UNIST="..\src\doxytag.cpp"	
+# Begin Custom Build
+InputPath=..\src\unistd.h
+
+"$(InputPath)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	echo /* this is a dummy file, that is needed for compiling files that are > $(InputPath) 
+	echo  * generated with flex under Windows 95/NT. >> $(InputPath) 
+	echo  */ >> $(InputPath) 
+	echo #if defined(_MSC_VER) >> $(InputPath) 
+	echo #include ^<io.h^> >> $(InputPath) 
+	echo #endif >> $(InputPath) 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Doxytag - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__UNIST="..\src\doxytag.cpp"	
+# Begin Custom Build
+InputPath=..\src\unistd.h
+
+"$(InputPath)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	echo /* this is a dummy file, that is needed for compiling files that are > $(InputPath) 
+	echo  * generated with flex under Windows 95/NT. >> $(InputPath) 
+	echo  */ >> $(InputPath) 
+	echo #if defined(_MSC_VER) >> $(InputPath) 
+	echo #include ^<io.h^> >> $(InputPath) 
+	echo #endif >> $(InputPath) 
+	
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\version.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/wintools/Doxytag.dsw b/wintools/Doxytag.dsw
new file mode 100644
index 0000000..b64be4a
--- /dev/null
+++ b/wintools/Doxytag.dsw
@@ -0,0 +1,33 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "Doxytag"=".\Doxytag.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    Doxytag
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/wintools/README b/wintools/README
index 4f3e599..e7ef5f2 100644
--- a/wintools/README
+++ b/wintools/README
@@ -1,9 +1,20 @@
 The files Doxygen.dsw and Doxygen.dsp can
 be used to build doxygen from within 
-Microsoft's Developer Studio 6.0.
+Microsoft's Developer Studio 6.0, and
+converted for use with DevStudio .NET.
 
-These files are created and maintained by 
-Simon Goodwin <simon.goodwin@atd.co.uk>. 
-Please contact him in case of question or
-problems with these files. 
+The project has been compartmentalised
+in the course of development of Doxygen
+1.2.19 so that there are separate project
+files for the Doxysearch and Doxytag tools
+and for the three libraries zlib, libpng
+and qtools. Credit for this update is due
+to Jorge Ramos for the original idea, and
+Johan Eriksson <johan.eriksson@uab.ericsson.se>
+for the current implementation. 
+
+These files are maintained by Simon Goodwin
+<simon.goodwin@atd.co.uk>. Please contact him
+in the event of questions or problems with
+these files. 
 
diff --git a/wintools/libpng.dsp b/wintools/libpng.dsp
new file mode 100644
index 0000000..f651b91
--- /dev/null
+++ b/wintools/libpng.dsp
@@ -0,0 +1,326 @@
+# Microsoft Developer Studio Project File - Name="libpng" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libpng - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libpng.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libpng.mak" CFG="libpng - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libpng - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libpng - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "libpng"
+# PROP Scc_LocalPath "."
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\libpng" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=snBsc.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=xilink6.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\libpng" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /I /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=snBsc.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=xilink6.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libpng - Win32 Release"
+# Name "libpng - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\libpng\png.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngerror.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pnggccrd.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngget.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngmem.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngpread.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngread.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngrio.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngrtran.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngrutil.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngset.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngtrans.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngvcrd.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngwio.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngwrite.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngwtran.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngwutil.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\libpng\png.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngasmrd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngconf.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/wintools/libpng.dsw b/wintools/libpng.dsw
new file mode 100644
index 0000000..353ef6c
--- /dev/null
+++ b/wintools/libpng.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "libpng"=".\libpng.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/wintools/qtools.dsp b/wintools/qtools.dsp
new file mode 100644
index 0000000..0cf982c
--- /dev/null
+++ b/wintools/qtools.dsp
@@ -0,0 +1,357 @@
+# Microsoft Developer Studio Project File - Name="qtools" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=qtools - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "qtools.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "qtools.mak" CFG="qtools - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "qtools - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "qtools - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "qtools"
+# PROP Scc_LocalPath "."
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "qtools - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\qtools" /D "QT_NO_CODECS" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "qtools - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\qtools" /D "QT_NO_CODECS" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /I /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "qtools - Win32 Release"
+# Name "qtools - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\qtools\qbuffer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qcollection.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qcstring.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qdatastream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qdatetime.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qdir.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qdir_win32.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qfile.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qfile_win32.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qfileinfo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qfileinfo_win32.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qgarray.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qgdict.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qglist.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qglobal.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qgvector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qiodevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qmap.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qregexp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qstring.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qstringlist.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qtextcodec.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qtextstream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qxml.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\qtools\qarray.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qasciidict.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qbuffer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qcollection.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qconfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qcstring.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qdatastream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qdatetime.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qdict.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qdir.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qfeatures.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qfile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qfiledefs_p.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qfileinfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qgarray.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qgdict.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qgeneric.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qglist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qglobal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qgvector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qintdict.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qiodevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qlist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qmap.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qmodules.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qptrdict.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qqueue.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qregexp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qshared.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qsortedlist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qstack.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qstring.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qstringlist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qstrlist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qstrvec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qtextcodec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qtextstream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qtl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qvaluelist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qvaluestack.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qvector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qxml.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/wintools/qtools.dsw b/wintools/qtools.dsw
new file mode 100644
index 0000000..2549ea2
--- /dev/null
+++ b/wintools/qtools.dsw
@@ -0,0 +1,33 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "qtools"=".\qtools.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    qtools
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/wintools/zlib.dsp b/wintools/zlib.dsp
new file mode 100644
index 0000000..ba723ab
--- /dev/null
+++ b/wintools/zlib.dsp
@@ -0,0 +1,193 @@
+# Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=zlib - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "zlib.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "zlib"
+# PROP Scc_LocalPath "."
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "zlib - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\libpng" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\libpng" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /I /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "zlib - Win32 Release"
+# Name "zlib - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\libpng\adler32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\compress.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\crc32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\deflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\gzio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\infblock.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\infcodes.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\inffast.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\inflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\inftrees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\infutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\trees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\uncompr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\zutil.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\libpng\deflate.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\infblock.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\infcodes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\inffast.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\inffixed.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\inftrees.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\infutil.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\trees.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\zconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\zlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\zutil.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/wintools/zlib.dsw b/wintools/zlib.dsw
new file mode 100644
index 0000000..7a57279
--- /dev/null
+++ b/wintools/zlib.dsw
@@ -0,0 +1,33 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "zlib"=".\zlib.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    zlib
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+