Release-1.2.6-20010401

INSTALL

-DOXYGEN Version 1.2.6-20010319
+DOXYGEN Version 1.2.6-20010401
 
 Please read the installation section of the manual for instructions.
 
 --------
-Dimitri van Heesch (19 March 2001)
+Dimitri van Heesch (01 April 2001)

Makefile.in

 DOCDIR = $(INSTALL)/share/doc/packages/doxygen
 
-#all: src/version.cpp configgen doxywizard 
+#all: src/version.cpp doxywizard 
 #	cd qtools ; $(MAKE)
 #	cd src ; $(MAKE)
 
@@ -9,7 +9,6 @@ clean: FORCE
 	cd doc ; $(MAKE) clean
 	cd qtools ; $(MAKE) clean
 	cd src ; $(MAKE) clean
-	cd addon/configgen ; $(MAKE) clean
 	cd addon/doxywizard ; $(MAKE) clean
 	cd addon/xmlread ; $(MAKE) clean
 	cd addon/xmlgen ; $(MAKE) clean
@@ -18,7 +17,6 @@ clean: FORCE
 
 distclean: clean
 	cd src ; $(MAKE) distclean
-	cd addon/configgen ; $(MAKE) distclean
 	cd addon/doxywizard ; $(MAKE) distclean
 	cd addon/xmlread ; $(MAKE) distclean
 	cd addon/xmlgen ; $(MAKE) distclean
@@ -26,19 +24,19 @@ distclean: clean
 	-rm -f bin/doxy*
 	-rm -f html
 	-rm -f objects/*.o
-	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen src/Makefile.doxytag 
+	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen 
+	-rm -f src/Makefile.doxytag src/Makefile.libdoxycfg
 	-rm -f src/Makefile.doxysearch qtools/Makefile.qtools
 	-rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile 
 	-rm -f .makeconfig .tmakeconfig
-	-rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro src/doxysearch.pro qtools/qtools.pro
+	-rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro src/doxysearch.pro qtools/qtools.pro src/libdoxycfg.pro
 	-rm -f src/version.cpp
-	-rm -r addon/configgen/Makefile addon/doxywizard/Makefile
-	-rm -f addon/configgen/Makefile.configgen 
+	-rm -r addon/doxywizard/Makefile
 	-rm -f addon/doxywizard/Makefile.doxywizard
-	-rm -f addon/configgen/configgen.pro addon/doxywizard/doxywizard.pro
-	-rm -f addon/configgen/obj/*.o
+	-rm -f addon/doxywizard/doxywizard.pro
 	-rm -f addon/doxywizard/obj/*.o
 	-rm -f addon/doxywizard/moc/moc_*
+	-rm -f addon/doxywizard/config.cpp
 	-rm -f addon/xmlread/xmlread.pro 
 	-rm -f addon/xmlread/Makefile addon/xmlread/Makefile.xmlread
 	-rm -f addon/xmlread/*.o

Makefile.win_make.in

@@ -13,9 +13,10 @@ distclean: clean
 	-del src\Makefile.libdoxygen \
 	     src\Makefile.doxygen \
 	     src\Makefile.doxytag \
-	     src\Makefile.doxysearch
+	     src\Makefile.doxysearch \
+	     src\Makefile.libdoxycfg
 	-del Makefile src\Makefile examples\Makefile doc\Makefile
-	-del src\libdoxygen.pro src\doxygen.pro src\doxytag.pro src\doxysearch.pro
+	-del src\libdoxygen.pro src\doxygen.pro src\doxytag.pro src\doxysearch.pro src\libdoxycfg.pro
 	-del src\version.cpp
 
 docs:

Makefile.win_nmake.in

@@ -23,9 +23,10 @@ distclean: clean
 	-del src\Makefile.libdoxygen \
 	     src\Makefile.doxygen \
 	     src\Makefile.doxytag \
-	     src\Makefile.doxysearch
+	     src\Makefile.doxysearch \
+	     src\Makefile.libdoxycfg
 	-del Makefile src\Makefile examples\Makefile doc\Makefile
-	-del src\libdoxygen.pro src\doxygen.pro src\doxytag.pro src\doxysearch.pro
+	-del src\libdoxygen.pro src\doxygen.pro src\doxytag.pro src\doxysearch.pro src\libdoxycfg.pro
 	-del src\version.cpp
 
 docs: FORCE

README

-DOXYGEN Version 1.2.6-20010319
+DOXYGEN Version 1.2.6-20010401
 
 Please read INSTALL for compilation instructions.
 
@@ -7,4 +7,4 @@ The latest version of doxygen can be obtained at
 
 Enjoy,
 
-Dimitri van Heesch (19 March 2001)
+Dimitri van Heesch (01 April 2001)

VERSION

-1.2.6-20010319
+1.2.6-20010401

addon/configgen/README

-The configgen tool is used to:
-- generate the parser for the configuration file based on 
-  the templates config_templ.h and config_templ.l
-- generate the GUI frontend "doxywizard" for creating a configuration 
-  file based on the templates doxywizard_templ.h and doxywizard_templ.cpp
-
-If you want to add a new configuration option to doxygen,
-then you should add a new entry the init() function in configgen.cpp
-
-After that you can do a "make install" in this directory to update 
-the config.l and config.h in doxygen's source directory.
-
--Dimitri

addon/configgen/config_templ.h

-/******************************************************************************
- *
- * 
- *
- * Copyright (C) 1997-2001 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 CONFIG_H
-#define CONFIG_H
-
-#ifndef DOXYWIZARD
-#include "qtbc.h"
-#endif
-#include <qstrlist.h>
-#include <qfile.h>
-
-extern void parseConfig(const QCString &config,const char *fn);
-extern void writeTemplateConfig(QFile *f,bool shortList);
-extern void checkConfig();
-extern void configStrToVal();
-extern void substituteEnvironmentVars();
-
-/*! \brief Namespace for configuration variables
- *
- *  This struct acts as a namespace that holds the global static variables
- *  read from a user-supplied configuration file.
- */
-struct Config
-{
-  static void init();
-
-#CONFIG Header
-};
-
-#endif

addon/doxywizard/Makefile.in

 #
-# 
+# $Id$
 #
 # Copyright (C) 1997-2001 by Dimitri van Heesch.
 # 
@@ -10,30 +10,17 @@
 # See the GNU General Public License for more details.
 # 
 
-CFGGENBIN_DIR = ../configgen/bin
-CFGGENSRC_DIR = ../configgen
-
-all: $(CFGGENBIN_DIR)/configgen config.h config.l doxywizard.cpp doxywizard.h \
-     Makefile.doxywizard  
+all: config.l config.h Makefile.doxywizard  
 	$(MAKE) -f Makefile.doxywizard $@
 
-Makefile.doxywizard: doxywizard.pro doxywizard.t
-	$(ENV) $(PERL) $(TMAKE) doxywizard.pro >Makefile.doxywizard
-
-config.l: $(CFGGENBIN_DIR)/configgen $(CFGGENSRC_DIR)/config_templ.l
-	$(CFGGENBIN_DIR)/configgen $(CFGGENSRC_DIR)/config_templ.l >config.l
+config.l: 
+	$(CP) ../../src/config.l config.l
 
-config.h: $(CFGGENBIN_DIR)/configgen $(CFGGENSRC_DIR)/config_templ.h
-	$(CFGGENBIN_DIR)/configgen $(CFGGENSRC_DIR)/config_templ.h >config.h
+config.h:
+	$(CP) ../../src/config.h config.h
 
-doxywizard.cpp: $(CFGGENBIN_DIR)/configgen doxywizard_templ.cpp
-	$(CFGGENBIN_DIR)/configgen doxywizard_templ.cpp >doxywizard.cpp
-
-doxywizard.h: $(CFGGENBIN_DIR)/configgen doxywizard_templ.h
-	$(CFGGENBIN_DIR)/configgen doxywizard_templ.h >doxywizard.h
-
-$(CFGGENBIN_DIR)/configgen: $(CFGGENSRC_DIR)/configgen.cpp
-	$(MAKE) -C $(CFGGENSRC_DIR) 
+Makefile.doxywizard: doxywizard.pro 
+	$(ENV) $(PERL) $(TMAKE) doxywizard.pro >Makefile.doxywizard
 
 tmake: 
 	$(ENV) $(PERL) $(TMAKE) doxywizard.pro >Makefile.doxywizard
@@ -42,8 +29,7 @@ clean: Makefile.doxywizard
 	$(MAKE) -f Makefile.doxywizard clean 
 
 distclean: clean
-	$(RM) doxywizard.cpp doxywizard.h \
-              config.l config.h config.cpp Makefile.doxywizard
+	$(RM) Makefile.doxywizard config.l config.h config.cpp
 
 install:
 	$(INSTTOOL) -d $(INSTALL)/bin	

addon/doxywizard/doxywizard.h

+/******************************************************************************
+ *
+ * $Id$
+ *
+ * Copyright (C) 1997-2001 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 _DOXWIZARD_H
+#define _DOXWIZARD_H
+
+#include <qmainwindow.h>
+#include <qlist.h>
+#include <qdict.h>
+
+class IInput;
+class QToolBar;
+class QWidget;
+class QObject;
+class ConfigFile;
+class InputBool;
+class InputString;
+class InputStrList;
+class InputFile;
+class InputDir;
+class InputInt;
+
+class Wizard : public QMainWindow
+{
+  Q_OBJECT
+
+  public:
+    Wizard(int argc,char **argv);
+    ~Wizard(){};
+    void loadFile(const char *s);
+
+  private slots:
+    void newFile();
+    void loadFile();
+    void saveFile();
+    void saveAsFile();
+    void quit();
+    void changed();
+    void about();
+    void runDoxygen(); // Micha
+
+  signals:
+
+  private:
+    void refreshCaption();
+    QToolBar *fileTools;
+    bool hasChanged;
+    ConfigFile *cw;
+};
+
+class ConfigWidget
+{
+  public:
+    enum Kind { Int, String, StrList, Bool };
+    
+    ConfigWidget(QWidget *w,Kind k) : m_widget(w), m_kind(k) {}
+    
+    Kind kind() const { return m_kind; }
+    
+    InputString *getString() const 
+    { return m_kind==String ? (InputString *)m_widget : 0; }
+    
+    InputBool *getBool() const 
+    { return m_kind==Bool ? (InputBool *)m_widget : 0; }
+    
+    InputStrList *getStrList() const 
+    { return m_kind==StrList ? (InputStrList *)m_widget : 0; }
+    
+    InputInt *getInt() const 
+    { return m_kind==Int ? (InputInt *)m_widget : 0; }
+    
+  private:
+    QWidget *m_widget;
+    Kind m_kind;
+};
+
+class ConfigFile : public QWidget
+{
+  Q_OBJECT
+
+  public:
+    ConfigFile(QWidget *parent=0);
+    ~ConfigFile();
+    void init();
+    void addDependency(QDict<QObject> *switches,
+                       const QCString &dep,const QCString &name);
+
+  signals:
+    void changed();
+    
+  private slots:
+    void toggle(const char *,bool);
+
+  private:
+    QDict<IInput>          *m_inputWidgets;
+    QDict< QList<IInput> > *m_dependencies;
+    QDict<QObject>         *m_switches;
+};
+
+#endif

addon/doxywizard/doxywizard.pro.in

 #
-# 
+# $Id$
 #
 # Copyright (C) 1997-2001 by Dimitri van Heesch.
 #
@@ -22,24 +22,24 @@ CONFIG      =	qt warn_on $extraopts
 
 # header file for the project
 HEADERS     =	doxywizard.h \
-	        config.h \
                 version.h \
 		pagewidget.h \
                 inputstring.h \
                 inputbool.h \
 		inputstrlist.h \
 		inputint.h \
+		config.h \
 	        pixmaps.h
 
 # source flle for the project
 SOURCES     =	doxywizard.cpp \
-		config.cpp \
                 version.cpp \
 		pagewidget.cpp \
 		inputstring.cpp \
 		inputbool.cpp \
 		inputstrlist.cpp \
 		inputint.cpp \
+		config.cpp \
 		pixmaps.cpp
 
 # where to put the objects
@@ -50,3 +50,4 @@ MOC_DIR     =   moc
 
 # extra C++ compiler options
 TMAKE_CXXFLAGS += -DDOXYWIZARD
+

addon/doxywizard/input.h

+#ifndef _INPUT_H
+#define _INPUT_H
+
+class QObject;
+
+class IInput
+{
+  public:
+    virtual void init() = 0;
+    virtual void setEnabled(bool) = 0;
+    virtual QObject *qobject() = 0;
+};
+
+#endif

addon/doxywizard/inputbool.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *
@@ -36,7 +36,11 @@ void InputBool::init()
 
 void InputBool::setState( bool s )
 {
-  if (state!=s) emit changed();
+  if (state!=s) 
+  {
+    emit changed();
+    emit toggle(text(),s);
+  }
   state=s;
 }
 

addon/doxywizard/inputbool.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *
@@ -17,9 +17,11 @@
 
 #include <qcheckbox.h>
 
+#include "input.h"
+
 class PageWidget;
 
-class InputBool : public QCheckBox
+class InputBool : public QCheckBox, public IInput
 {
   Q_OBJECT
 
@@ -27,9 +29,13 @@ class InputBool : public QCheckBox
     InputBool( const QString &text, PageWidget *parent, bool &flag );
     ~InputBool(){};
     void init();
+    void setEnabled(bool b) { QCheckBox::setEnabled(b); }
+    QObject *qobject() { return this; }
+    bool getState() const { return state; }
 
   signals:
     void changed();
+    void toggle(const char *,bool);
 
   private slots:
     void setState(bool);

addon/doxywizard/inputint.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *

addon/doxywizard/inputint.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *
@@ -18,11 +18,13 @@
 #include <qwidget.h>
 #include <qstring.h>
 
+#include "input.h"
+
 class QLabel;
 class QSpinBox;
 class PageWidget;
 
-class InputInt : public QWidget
+class InputInt : public QWidget, public IInput
 {
   Q_OBJECT
 
@@ -32,6 +34,7 @@ class InputInt : public QWidget
     ~InputInt(){};
     void setEnabled(bool);
     void init();
+    QObject *qobject() { return this; }
 
   private:
     QLabel *lab;

addon/doxywizard/inputstring.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *

addon/doxywizard/inputstring.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *
@@ -19,13 +19,16 @@
 #include <qstring.h>
 #include <qdict.h>
 
+#include "qtbc.h"
+#include "input.h"
+
 class QLabel;
 class QLineEdit;
 class QPushButton;
 class QComboBox;
 class PageWidget;
 
-class InputString : public QWidget
+class InputString : public QWidget, public IInput
 {
   Q_OBJECT
 
@@ -42,6 +45,7 @@ class InputString : public QWidget
     void setEnabled(bool);
     void addValue(const char *s);
     void init();
+    QObject *qobject() { return this; }
 
   private:
     QLabel *lab;

addon/doxywizard/inputstrlist.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *

addon/doxywizard/inputstrlist.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *
@@ -18,6 +18,8 @@
 #include <qwidget.h>
 #include <qstring.h>
 
+#include "input.h"
+
 class QLabel;
 class QLineEdit;
 class QPushButton;
@@ -25,7 +27,7 @@ class QListBox;
 class PageWidget;
 class QStrList;
 
-class InputStrList : public QWidget
+class InputStrList : public QWidget, public IInput
 {
   Q_OBJECT
 
@@ -41,6 +43,7 @@ class InputStrList : public QWidget
     ~InputStrList() {};
     void setEnabled(bool);
     void init();
+    QObject *qobject() { return this; }
 
   private:
     QLabel *lab;

addon/doxywizard/pagewidget.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *

addon/doxywizard/pagewidget.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *

addon/doxywizard/pixmaps.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *

addon/doxywizard/pixmaps.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *

addon/configgen/qtbc.h → addon/doxywizard/qtbc.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *
@@ -26,11 +26,13 @@
 
 #if QT_VERSION >= 200
 
+#include <locale.h>
+
 #define GCI QCollection::Item
 
 #include <qcstring.h>
 #include <qstring.h>
-inline QCString convertToQCString(const QString &s) { return s.local8Bit(); }
+inline QCString convertToQCString(const QString &s) { return s.latin1(); }
 
 #else /* QT_VERSION < 200 */
 

addon/xmlgen/xml.cpp

@@ -60,7 +60,7 @@ class TextGeneratorXMLImpl : public TextGeneratorIntf
 
 void generateDTD()
 {
-  QCString fileName=Config::outputDir+"/xml/doxygen.dtd";
+  QCString fileName=Config::instance()->getString("OUTPUT_DIRECTORY")+"/xml/doxygen.dtd";
   QFile f(fileName);
   if (!f.open(IO_WriteOnly))
   {
@@ -440,49 +440,49 @@ void generateXMLForFile(FileDef *fd,QTextStream &t)
 
 void generateXML()
 {
-  if (Config::outputDir.isEmpty())
-    Config::outputDir=QDir::currentDirPath();
+  if (Config::instance()->getString("OUTPUT_DIRECTORY").isEmpty())
+    Config::instance()->getString("OUTPUT_DIRECTORY")=QDir::currentDirPath();
   else
   {
-    QDir dir(Config::outputDir);
+    QDir dir(Config::instance()->getString("OUTPUT_DIRECTORY"));
     if (!dir.exists())
     {
       dir.setPath(QDir::currentDirPath());
-      if (!dir.mkdir(Config::outputDir))
+      if (!dir.mkdir(Config::instance()->getString("OUTPUT_DIRECTORY")))
       {
         err("Error: tag OUTPUT_DIRECTORY: Output directory `%s' does not "
-            "exist and cannot be created\n",Config::outputDir.data());
+            "exist and cannot be created\n",Config::instance()->getString("OUTPUT_DIRECTORY").data());
         exit(1);
       }
-      else if (!Config::quietFlag)
+      else if (!Config::instance()->getBool("QUIET"))
       {
         err("Notice: Output directory `%s' does not exist. "
-            "I have created it for you.\n", Config::outputDir.data());
+            "I have created it for you.\n", Config::instance()->getString("OUTPUT_DIRECTORY").data());
       }
-      dir.cd(Config::outputDir);
+      dir.cd(Config::instance()->getString("OUTPUT_DIRECTORY"));
     }
-    Config::outputDir=dir.absPath();
+    Config::instance()->getString("OUTPUT_DIRECTORY")=dir.absPath();
   }
 
-  QDir dir(Config::outputDir);
+  QDir dir(Config::instance()->getString("OUTPUT_DIRECTORY"));
   if (!dir.exists())
   {
     dir.setPath(QDir::currentDirPath());
-    if (!dir.mkdir(Config::outputDir))
+    if (!dir.mkdir(Config::instance()->getString("OUTPUT_DIRECTORY")))
     {
-      err("Cannot create directory %s\n",Config::outputDir.data());
+      err("Cannot create directory %s\n",Config::instance()->getString("OUTPUT_DIRECTORY").data());
       return;
     }
   }
-  QDir xmlDir(Config::outputDir+"/xml");
-  if (!xmlDir.exists() && !xmlDir.mkdir(Config::outputDir+"/xml"))
+  QDir xmlDir(Config::instance()->getString("OUTPUT_DIRECTORY")+"/xml");
+  if (!xmlDir.exists() && !xmlDir.mkdir(Config::instance()->getString("OUTPUT_DIRECTORY")+"/xml"))
   {
-    err("Could not create xml directory in %s\n",Config::outputDir.data());
+    err("Could not create xml directory in %s\n",Config::instance()->getString("OUTPUT_DIRECTORY").data());
     return;
   }
   generateDTD();
   
-  QCString fileName=Config::outputDir+"/xml/doxygen.xml";
+  QCString fileName=Config::instance()->getString("OUTPUT_DIRECTORY")+"/xml/doxygen.xml";
   QFile f(fileName);
   if (!f.open(IO_WriteOnly))
   {

addon/xmlgen/xmlgen.pro.in

@@ -3,18 +3,18 @@ CONFIG       =	console warn_on $extraopt
 HEADERS      =	xml.h xml_dtd.h
 SOURCES      =	main.cpp xml.cpp
 DEPENDPATH   = ../../src
-unix:LIBS                  += -L../../lib -ldoxygen -lqtools 
+unix:LIBS                  += -L../../lib -ldoxygen -ldoxycfg -lqtools 
 win32:INCLUDEPATH          += .
-win32-mingw:LIBS           += -L../../lib -ldoxygen -lqtools 
-win32-msvc:LIBS            += qtools.lib doxygen.lib shell32.lib 
+win32-mingw:LIBS           += -L../../lib -ldoxygen -ldoxycfg -lqtools 
+win32-msvc:LIBS            += qtools.lib doxygen.lib doxycfg.lib shell32.lib 
 win32-msvc:TMAKE_LFLAGS    += /LIBPATH:..\..\lib
-win32-borland:LIBS         += qtools.lib doxygen.lib shell32.lib
+win32-borland:LIBS         += qtools.lib doxygen.lib doxycfg.lib shell32.lib
 win32-borland:TMAKE_LFLAGS += -L..\..\lib
 win32:TMAKE_CXXFLAGS       += -DQT_NODLL
 INCLUDEPATH                += ../../qtools ../../src
 DESTDIR                    =  ../../bin
 TARGET                     =  doxygen_xml
-unix:TARGETDEPS            =  ../../lib/libdoxygen.a
-win32:TARGETDEPS           =  ..\..\lib\doxygen.lib
+unix:TARGETDEPS            =  ../../lib/libdoxygen.a ../../lib/libdoxycfg.a
+win32:TARGETDEPS           =  ..\..\lib\doxygen.lib ../../lib/doxycfg.lib
 OBJECTS_DIR                =  obj
 

addon/xmlread/qtbc.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *

configure

@@ -26,7 +26,6 @@ f_plf_auto=NO
 f_prefix=/usr
 f_insttool=install
 f_english=NO
-f_configgen=NO
 f_wizard=NO
 f_xmlgen=NO
 
@@ -65,9 +64,6 @@ while test -n "$1";  do
     --install)
        shift; f_insttool=$1
        ;;
-    --with-configgen)
-       f_configgen=YES
-       ;;
     --with-doxywizard)
        f_wizard=YES
        ;;
@@ -91,7 +87,7 @@ if test "$f_help" = y; then
 Usage: $0 [--help] [--shared] [--static] [--release] [--debug] 
           [--perl name] [--make name] [--dot name] [--platform target] 
           [--prefix dir] [--install name] [--english-only] 
-          [--with-configgen] [--with-doxywizard] [--with-xmlgen]
+          [--with-doxywizard] [--with-xmlgen]
 
 Options: 
 
@@ -124,10 +120,6 @@ Options:
 
   --english-only        Include support for English only.
 
-  --with-configgen      Build the configuration generator. This is only
-                        useful for doxygen developers that want to add
-                        new configuration options.
-
   --with-doxywizard     Build the GUI frontend for doxygen. This
                         requires Qt 2.x.x
 
@@ -380,7 +372,7 @@ TMAKE_CXXFLAGS += -DENGLISH_ONLY
 EOF
 fi
 
-f_inmakefiles="Makefile.in addon/xmlgen/Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/configgen/Makefile.in addon/doxywizard/Makefile.in addon/xmlread/Makefile.in"
+f_inmakefiles="Makefile.in addon/xmlgen/Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/xmlread/Makefile.in"
 
 for i in $f_inmakefiles ; do
      SRC=$i
@@ -398,9 +390,6 @@ EOF
        echo "all: src/version.cpp " >> $DST
        echo "	\$(MAKE) -C qtools" >> $DST
        echo "	\$(MAKE) -C src" >> $DST
-       if test $f_configgen = YES; then
-         echo "	\$(MAKE) -C addon/configgen" >> $DST
-       fi
        if test $f_wizard = YES; then
          echo "	\$(MAKE) -C addon/doxywizard" >> $DST
        fi
@@ -417,7 +406,7 @@ EOF
      echo "  Created $DST from $SRC..."
 done
 
-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/doxygen.pro.in src/doxytag.pro.in src/doxysearch.pro.in addon/configgen/configgen.pro.in addon/doxywizard/doxywizard.pro.in addon/xmlread/xmlread.pro.in addon/xmlgen/xmlgen.pro.in" 
+f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in src/doxysearch.pro.in addon/doxywizard/doxywizard.pro.in addon/xmlread/xmlread.pro.in addon/xmlgen/xmlgen.pro.in" 
 
 for i in $f_inprofiles ; do
      SRC=$i

doc/commands.doc

@@ -77,6 +77,7 @@ documentation:
 <li> \refitem cmdfile \file
 <li> \refitem cmdfn \fn
 <li> \refitem cmdhideinitializer \hideinitializer
+<li> \refitem cmdhtmlinclude \htmlinclude
 <li> \refitem cmdhtmlonly \htmlonly
 <li> \refitem cmdif \if
 <li> \refitem cmdimage \image
@@ -899,7 +900,7 @@ Public/Protected/Private/... section.
 \subsection cmdanchor \anchor <word>
 
   \addindex \anchor
-  This command places an invisble, named anchor into to documentation
+  This command places an invisible, named anchor into to documentation
   to which you can refer with the \\ref command.
 
   \sa section \ref cmdref "\\ref".
@@ -1118,6 +1119,20 @@ Public/Protected/Private/... section.
   The command is equivalent to pasting the file in the documentation and
   placing \\verbatim and \\endverbatim commands around it. 
 
+  Files or directories that doxygen should look for can be specified using the 
+  \ref cfg_example_path "EXAMPLE_PATH" tag of Doxygen's configuration file.
+
+<hr>
+\subsection cmdhtmlinclude \htmlinclude <file-name>
+
+  \addindex \htmlinclude
+  This command includes the file \<file-name\> as is in the HTML documentation.
+  The command is equivalent to pasting the file in the documentation and
+  placing \\htmlonly and \\endhtmlonly commands around it.
+
+  Files or directories that doxygen should look for can be specified using the 
+  \ref cfg_example_path "EXAMPLE_PATH" tag of Doxygen's configuration file.
+
 <hr>
 <h2>\htmlonly <center> --- \endhtmlonly 
     Commands for visual enhancements

doc/htmlcmds.doc

@@ -91,7 +91,7 @@ documentation. Note that all attributes of a HTML tag are ignored
 <li>\c </VAR>  Ends a \c </VAR> section.
 </ul>
 
-The special HTML characters entities that are recognized by Doxygen:
+The special HTML character entities that are recognized by Doxygen:
 
 <ul>
 <li>\c &copy; the copyright symbol
@@ -107,6 +107,11 @@ The special HTML characters entities that are recognized by Doxygen:
 <li>\c &?tilde; where ? is one of {A,N,O,a,n,o},
        writes a character with a tilde accent (like &atilde;).
 <li>\c &szlig; write a sharp s (i.e. &szlig;) to the output.
+<li>\c &?cedil; where ? is one of {c,C},
+       writes a c-cedille (like &ccedil;).
+<li>\c &?ring; where ? is one of {a,A},
+       writes an \c a with a ring (like &aring;).
+<li>\c &nbsp; a non breakable space.
 </ul>
 
 */

packages/rpm/doxygen.spec

 Name: doxygen
-Version: 1.2.6-20010319
+Version: 1.2.6-20010401
 Summary: documentation system for C, C++ and IDL
 Release: 1
 Source0: doxygen-%{version}.src.tar.gz

qtools/Makefile.in

 #
-# 
+# $Id$
 #
 # Copyright (C) 1997-2000 by Dimitri van Heesch.
 # 

qtools/qarray.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QArray template/macro class
 **

qtools/qasciidict.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QAsciiDict template class
 **

qtools/qbuffer.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QBuffer class
 **

qtools/qbuffer.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QBuffer class
 **

qtools/qcollection.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of base class for all collection classes
 **

qtools/qcollection.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of base class for all collection classes
 **

qtools/qcstring.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of extended char array operations, and QByteArray and
 ** QCString classes

qtools/qcstring.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of the extended char array operations,
 ** and QByteArray and QCString classes

qtools/qdatastream.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QDataStream class
 **

qtools/qdatastream.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QDataStream class
 **

qtools/qdatetime.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of date and time classes
 **

qtools/qdatetime.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of date and time classes
 **

qtools/qdict.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QDict template class
 **

qtools/qdir.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QDir class
 **

qtools/qdir.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QDir class
 **

qtools/qdir_unix.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QDirclass
 **

qtools/qdir_win32.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *

qtools/qfeatures.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Global feature selection
 **

qtools/qfile.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QFile class
 **

qtools/qfile.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QFile class
 **

qtools/qfile_unix.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QFileInfo class
 **

qtools/qfile_win32.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *

qtools/qfiledefs_p.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Common macros and system include files for QFile, QFileInfo and QDir.
 **

qtools/qfileinfo.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QFileInfo class
 **

qtools/qfileinfo.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QFileInfo class
 **

qtools/qfileinfo_unix.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QFileInfo class
 **

qtools/qfileinfo_win32.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *

qtools/qgarray.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QGArray class
 **

qtools/qgarray.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QGArray class
 **

qtools/qgdict.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QGDict and QGDictIterator classes
 **

qtools/qgdict.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QGDict and QGDictIterator classes
 **

qtools/qgeneric.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Macros for pasting tokens; utilized by our generic classes
 **

qtools/qglist.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QGList and QGListIterator classes
 **

qtools/qglist.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QGList and QGListIterator classes
 **

qtools/qglobal.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Global functions
 **

qtools/qglobal.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Global type declarations and definitions
 **

qtools/qgvector.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QGVector class
 **

qtools/qgvector.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QGVector class
 **

qtools/qintdict.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QIntDict template class
 **

qtools/qiodevice.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QIODevice class
 **

qtools/qiodevice.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QIODevice class
 **

qtools/qlist.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QList template/macro class
 **

qtools/qmap.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QMap
 **

qtools/qmap.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QMap class
 **

qtools/qptrdict.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QPtrDict template class
 **

qtools/qqueue.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QQueue template/macro class
 **

qtools/qregexp.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QRegExp class
 **

qtools/qregexp.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QRegExp class
 **

qtools/qshared.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QShared struct
 **

qtools/qsortedlist.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QList template/macro class
 **

qtools/qstack.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QStack template/macro class
 **

qtools/qstring.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of the QString class and related Unicode functions
 **

qtools/qstring.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of the QString class, and related Unicode
 ** functions.

qtools/qstringlist.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QStringList
 **

qtools/qstringlist.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QStringList class
 **

qtools/qstrlist.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QStrList, QStrIList and QStrListIterator classes
 **

qtools/qstrvec.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QStrVec and QStrIVec classes
 **

qtools/qtextcodec.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QTextCodec class
 **

qtools/qtextcodec.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QTextCodec class
 **

qtools/qtextstream.cpp

 /****************************************************************************
-** 
+** $Id$
 **
 ** Implementation of QTextStream class
 **

qtools/qtextstream.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QTextStream class
 **

qtools/qtl.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of Qt template library classes
 **

qtools/qvaluelist.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QValueList class
 **

qtools/qvaluestack.h

 /****************************************************************************
-** 
+** $Id$
 **
 ** Definition of QValueStack class
 **