Release-1.5.0

INSTALL

-DOXYGEN Version 1.4.7-20061004
+DOXYGEN Version 1.5.0
 
 Please read the installation section of the manual 
 (http://www.doxygen.org/install.html) for instructions.
 
 --------
-Dimitri van Heesch (04 October 2006)
+Dimitri van Heesch (17 October 2006)

README

-DOXYGEN Version 1.4.7_20061004
+DOXYGEN Version 1.5.0
 
 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) (04 October 2006)
+Dimitri van Heesch (dimitri@stack.nl) (17 October 2006)

addon/doxywizard/doxywizard.cpp

@@ -47,35 +47,6 @@ QCString getResourcePath()
   return result;
 }
 
-#if 0
-#define GRAPHVIZ_PATH    "/Applications/Graphviz.app"
-#define DOT_PATH         GRAPHVIZ_PATH "/Contents/MacOS"
-#define DOT_LOCATION     DOT_PATH "/dot"
-
-bool checkIfDotInstalled()
-{
-  QFileInfo fi(GRAPHVIZ_PATH);
-  if (fi.exists() && fi.isDir())
-  {
-    fi.setFile(DOT_LOCATION);
-    if (fi.exists() && fi.isFile())
-    {
-      return TRUE;
-    }
-  }
-  return FALSE;
-}
-
-void setDotPath()
-{
-  if (checkIfDotInstalled())
-  {
-    Config_getString("DOT_PATH")=DOT_PATH;
-    //Config_getBool("HAVE_DOT")=TRUE;
-  }
-}
-#endif
-
 void setDotPath()
 {
   Config_getString("DOT_PATH")=getResourcePath();
@@ -235,11 +206,12 @@ Step2::Step2(QWidget *parent) : QWidget(parent,"Step2")
   layout->addWidget(f);
 
   m_optimizeLang = new QButtonGroup("Select programming language to optimize the results for",this);
-  gbox = new QGridLayout( m_optimizeLang, 4, 1, 8, 0 );
+  gbox = new QGridLayout( m_optimizeLang, 5, 1, 8, 0 );
   gbox->addRowSpacing( 0, fontMetrics().lineSpacing()+2 );
   gbox->addWidget(new QRadioButton("Optimize for C++ output",m_optimizeLang),1,0);
   gbox->addWidget(new QRadioButton("Optimize for Java output",m_optimizeLang),2,0);
   gbox->addWidget(new QRadioButton("Optimize for C output",m_optimizeLang),3,0);
+  gbox->addWidget(new QRadioButton("Optimize for C# output",m_optimizeLang),4,0);
   m_optimizeLang->setButton(0);
   layout->addWidget(m_optimizeLang);
 
@@ -279,6 +251,7 @@ OptLang Step2::optimizeFor() const
     case 0:  return Lang_Cpp;
     case 1:  return Lang_Java;
     case 2:  return Lang_C;
+    case 3:  return Lang_CS;
   }
   return Lang_Cpp;
 }
@@ -302,6 +275,7 @@ void Step2::setOptimizeFor(OptLang lang)
     case Lang_Cpp:  m_optimizeLang->setButton(0); break;
     case Lang_Java: m_optimizeLang->setButton(1); break;
     case Lang_C:    m_optimizeLang->setButton(2); break;
+    case Lang_CS:   m_optimizeLang->setButton(3); break;
   }
 }
 
@@ -1048,6 +1022,12 @@ void MainWidget::launchWizard()
         Config_getBool("OPTIMIZE_OUTPUT_FOR_C")=TRUE;
         Config_getBool("OPTIMIZE_OUTPUT_JAVA")=FALSE;
         break;
+      case Lang_CS:
+        Config_getBool("OPTIMIZE_OUTPUT_FOR_C")=FALSE;
+        Config_getBool("OPTIMIZE_OUTPUT_JAVA")=TRUE;
+        Config_getBool("EXTRACT_STATIC")=TRUE;
+        Config_getBool("EXTRACT_LOCAL_CLASSES")=TRUE;
+        break;
     }
 
     // step3

addon/doxywizard/doxywizard.h

@@ -18,7 +18,7 @@ class QProcess;
 class QTimer;
 class QPopupMenu;
 
-enum OptLang { Lang_Cpp, Lang_C, Lang_Java };
+enum OptLang { Lang_Cpp, Lang_C, Lang_Java, Lang_CS };
 enum HtmlStyle { HS_Plain, HS_TreeView, HS_CHM };
 enum TexStyle { TS_PDFHyper, TS_PDF, TS_PS };
 enum DiagramMode { DM_None, DM_Builtin, DM_Dot };

configure

@@ -16,11 +16,11 @@
 # shell script to configure doxygen
 
 doxygen_version_major=1
-doxygen_version_minor=4
-doxygen_version_revision=7
+doxygen_version_minor=5
+doxygen_version_revision=0
 
 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package.
-doxygen_version_mmn=20061004
+doxygen_version_mmn=NO
 
 bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
 

doc/htmlcmds.doc

@@ -36,7 +36,11 @@ of a HTML tag are passed on to the HTML output only
 <li><tt>\<CAPTION\></tt> Starts a caption. Use within a table only.
 <li><tt>\</CAPTION\></tt> Ends a caption. Use within a table only.
 <li><tt>\<CODE\></tt>  Starts a piece of text displayed in a typewriter font.
+                       Note that for C# code, this command is equivalent to 
+                       \ref cmdcode "\\code".
 <li><tt>\</CODE\></tt> End a <tt>\<CODE\></tt> section.
+                       Note that for C# code, this command is equivalent to
+                       \ref cmdendcode "\\endcode".
 <li><tt>\<DD\></tt>    Starts an item description.
 <li><tt>\<DFN\></tt>   Starts a piece of text displayed in a typewriter font.
 <li><tt>\</DFN\></tt>  Ends a <tt>\<DFN\></tt> section.

doc/index.doc

@@ -97,7 +97,7 @@ The second part forms a reference manual:
               used within the documentation.
 <li>Section \ref htmlcmds shows an overview of the HTML commands that
               can be used within the documentation.
-<li>Section \ref xmlcmds shows an overview of the XML commands that
+<li>Section \ref xmlcmds shows an overview of the C# style XML commands that
               can be used within the documentation.
 </ul>
 

doc/install.doc

@@ -344,6 +344,8 @@ of doxygen (\<=1.2.17) will not work correctly with newer versions of
 graphviz (\>=1.8.8). The effect of this incompatibility is that
 generated graphs in HTML are not properly clickable. For doxygen 1.3
 it is recommended to use at least graphviz 1.8.10 or higher.
+For doxygen 1.4.7 or higher it is recommended to 
+use GraphViz 2.8 or higher to avoid font issues.
 
 <b>Red Hat 9.0 problems</b>
 
@@ -359,6 +361,39 @@ before running make.
 
 \section install_src_windows Compiling from source on Windows
 
+From version 1.5.0 onwards, build files are provided for Visual Studio 2005.
+Also the free "Express" version of Developer Studio can be used to compile doxygen.
+Alternatively, you can compile doxygen \ref install_src_unix "the Unix way" using 
+<a href="http://en.wikipedia.org/wiki/Cygwin">Cygwin</a>
+or <a href="http://www.mingw.org/">MinGW</a>.
+
+Before you can compile doxygen you need to download and install the C++ compiler of
+Visual Studio. Since Microsoft apparently wants to lure everyone into using their 
+.NET stuff, you need to
+<a href="http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/">
+do some manual steps</a> in order to setup a proper working environment for building
+native win32 applications.
+
+Once your environment is setup, you 
+can <a href="http://www.stack.nl/~dimitri/doxygen/download.html#latestsrc">download</a> 
+the source distribution of doxygen and unpack it. 
+If you don't have a tool like WinZip, then I suggest to download 
+<a href="http://sourceforge.net/projects/unxutils/">unxutils</a>
+and untar the archive from within a command box using
+\verbatim
+  tar zxvf doxygen-version.src.tar.gz
+\endverbatim
+Inside the archive you will find a \c winbuild directory containing a \c Doxygen.sln
+file. Just open this file in Visual Studio. You can now build the Doxygen, Doxytag,
+and Doxywizard projects for Release or Debug to compile the executables. 
+
+Note that compiling Doxywizard currently requires a <a href="http://www.trolltech.com/products/qt/qt3">
+commercial license for Qt 3</a>.
+
+Also read the next section for additional tools you may need to install.
+
+<!--
+
 Currently, I have only compiled doxygen for Windows using Microsoft's 
 Visual C++ (version 6.0). For other compilers you may need to edit the 
 perl script in <code>wintools/make.pl</code> a bit. 
@@ -507,8 +542,41 @@ Compilation is now done by performing the following steps:
     documentation can be generated. 
 </ol>
 
+-->
+
 \section install_bin_windows Installing the binaries on Windows
 
+Doxygen comes as a self-installing archive, so installation is extremely simple.
+Just follow the dialogs.
+
+After installation it is recommended to also download and install GraphViz
+(version 2.8 or better is highly recommended). Doxygen can use the \c dot tool 
+of the GraphViz package to render nicer diagrams, see the 
+\ref cfg_have_dot "HAVE_DOT" option in the configuration file.
+
+If you want to produce compressed HTML files (see \ref 
+cfg_generate_htmlhelp "GENERATE_HTMLHELP") in the config file, then 
+you need the Microsoft HTML help workshop. 
+You can download it from 
+<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/htmlhelp/html/vsconHH1Start.asp">Microsoft</a>.
+
+In order to generate PDF output or use scientific formulas you will also need to
+install <a href="http://en.wikipedia.org/wiki/LaTeX">LaTeX</a> and 
+<a href="http://en.wikipedia.org/wiki/Ghostscript">Ghostscript</a>. 
+
+For LaTeX a number of distributions exists. Popular onces that should work with
+doxygen are <a href="http://www.miktex.org">MikTex</a> 
+and <a href="http://www.xemtex.org">XemTex</a>.
+
+Ghostscript can be <a href="http://sourceforge.net/projects/ghostscript/">downloaded</a> 
+from Sourceforge.
+
+After installing LaTeX and Ghostscript you'll need to make sure the tools
+latex.exe, pdflatex.exe, and gswin32c.exe are present in the search path of a
+command box. Follow <a href="http://www.computerhope.com/issues/ch000549.htm">these</a>
+instructions if you are unsure and run the commands from a command box to verify it works.
+
+<!--
 There is no fancy installation procedure at the moment (if anyone can
 add it in a location independent way please let me know).
 
@@ -566,21 +634,23 @@ features:
     and the collaboration graphs.
 </ul>
 
+-->
+
 \section build_tools Tools used to develop doxygen
 
-Doxygen was developed and tested under Linux using the following 
+Doxygen was developed and tested under Linux &amp; MacOSX using the following 
 open-source tools:
 <ul>
-<li>GCC version 3.3.1
-<li>GNU flex version 2.5.4
+<li>GCC version 3.3.6 (Linux) and 4.0.1 (MacOSX)
+<li>GNU flex version 2.5.33 (Linux) and 2.5.4 (MacOSX)
 <li>GNU bison version 1.75
 <li>GNU make version 3.80
 <li>Perl version 5.8.1
 <li>VIM version 6.2
-<li>Mozilla 1.0
+<li>Firefox 1.5
 <li>Troll Tech's tmake version 1.3 (included in the distribution) 
-<li>teTeX version 1.0
-<li>CVS 1.10.7
+<li>teTeX version 2.0.2
+<li>CVS 1.12.12
 </ul>
 
 \htmlonly

doc/language.doc

@@ -59,7 +59,7 @@ when the translator was updated.
   <tr bgcolor="#ffffff">
     <td>Arabic</td>
     <td>Moaz Reyad</td>
-    <td><moazreyad at yahoo dot com></td>
+    <td>moazreyad at yahoo dot com</td>
     <td>1.4.6</td>
   </tr>
   <tr bgcolor="#ffffff">
@@ -126,7 +126,7 @@ when the translator was updated.
     <td>French</td>
     <td>Xavier Outhier</td>
     <td>xouthier at yahoo dot fr</td>
-    <td>1.4.6</td>
+    <td>up-to-date</td>
   </tr>
   <tr bgcolor="#ffffff">
     <td>German</td>
@@ -197,7 +197,7 @@ when the translator was updated.
   <tr bgcolor="#ffffff">
     <td>Persian</td>
     <td>Ali Nadalizadeh</td>
-    <td><nadalisoft at yahoo dot com></td>
+    <td>nadalisoft at yahoo dot com</td>
     <td>1.4.6</td>
   </tr>
   <tr bgcolor="#ffffff">
@@ -239,7 +239,7 @@ when the translator was updated.
   <tr bgcolor="#ffffff">
     <td>Slovene</td>
     <td>Matja&#x017e; Ostrover&#x0161;nik</td>
-    <td>matjaz.ostroversnik at ztm dot si</td>
+    <td>matjaz.ostroversnik at ostri dot org</td>
     <td>1.4.6</td>
   </tr>
   <tr bgcolor="#ffffff">
@@ -277,7 +277,7 @@ when the translator was updated.
   \hline
   Afrikaans & Johan Prinsloo & {\tt\tiny johan@zippysnoek.com} & 1.4.6 \\
   \hline
-  Arabic & Moaz Reyad & {\tt\tiny <moazreyad@yahoo.com>} & 1.4.6 \\
+  Arabic & Moaz Reyad & {\tt\tiny moazreyad@yahoo.com} & 1.4.6 \\
   \hline
   Brazilian Portuguese & Fabio "FJTC" Jun Takada Chino & {\tt\tiny jun-chino@uol.com.br} & up-to-date \\
   \hline
@@ -302,7 +302,7 @@ when the translator was updated.
   \hline
   Finnish & Olli Korhonen & {\tt\tiny olli.korhonen lost@cyberspace} & obsolete \\
   \hline
-  French & Xavier Outhier & {\tt\tiny xouthier@yahoo.fr} & 1.4.6 \\
+  French & Xavier Outhier & {\tt\tiny xouthier@yahoo.fr} & up-to-date \\
   \hline
   German & Jens Seidel & {\tt\tiny jensseidel@users.sf.net} & up-to-date \\
   \hline
@@ -333,7 +333,7 @@ when the translator was updated.
   \hline
   Norwegian & Lars Erik Jordet & {\tt\tiny lejordet@gmail.com} & 1.4.6 \\
   \hline
-  Persian & Ali Nadalizadeh & {\tt\tiny <nadalisoft@yahoo.com>} & 1.4.6 \\
+  Persian & Ali Nadalizadeh & {\tt\tiny nadalisoft@yahoo.com} & 1.4.6 \\
   \hline
   Polish & Piotr Kaminski & {\tt\tiny Piotr.Kaminski@ctm.gdynia.pl} & 1.4.6 \\
   ~ & Grzegorz Kowal & {\tt\tiny g\_kowal@poczta.onet.pl} & ~ \\
@@ -348,7 +348,7 @@ when the translator was updated.
   \hline
   Slovak & Stanislav Kudl\'{a}\v{c} & {\tt\tiny skudlac@pobox.sk} & 1.2.18 \\
   \hline
-  Slovene & Matja\v{z} Ostrover\v{s}nik & {\tt\tiny matjaz.ostroversnik@ztm.si} & 1.4.6 \\
+  Slovene & Matja\v{z} Ostrover\v{s}nik & {\tt\tiny matjaz.ostroversnik@ostri.org} & 1.4.6 \\
   \hline
   Spanish & Francisco Oltra Thennet & {\tt\tiny foltra@puc.cl} & 1.4.6 \\
   \hline

doc/maintainers.txt

@@ -13,7 +13,7 @@ TranslatorAfrikaans
 Johan Prinsloo: johan@zippysnoek.com
 
 TranslatorArabic
-Moaz Reyad: <moazreyad@yahoo.com>
+Moaz Reyad: moazreyad@yahoo.com
 
 TranslatorBrazilian
 Fabio "FJTC" Jun Takada Chino: jun-chino@uol.com.br
@@ -86,7 +86,7 @@ TranslatorNorwegian
 Lars Erik Jordet: lejordet@gmail.com
 
 TranslatorPersian
-Ali Nadalizadeh: <nadalisoft@yahoo.com>
+Ali Nadalizadeh: nadalisoft@yahoo.com
 
 TranslatorPolish 
 Piotr Kaminski: Piotr.Kaminski@ctm.gdynia.pl
@@ -108,7 +108,7 @@ TranslatorSlovak
 Stanislav Kudl&aacute;&ccaron;: skudlac@pobox.sk
 
 TranslatorSlovene
-Matja&zcaron; Ostrover&scaron;nik: matjaz.ostroversnik@ztm.si
+Matja&zcaron; Ostrover&scaron;nik: matjaz.ostroversnik@ostri.org
 
 TranslatorSpanish 
 Francisco Oltra Thennet: foltra@puc.cl

doc/translator.py

@@ -46,6 +46,8 @@
   2004/10/04 - Reporting of not called translator methods added.
   2004/10/05 - Modified to check only doxygen/src sources for the previous report.
   2005/02/28 - Slight modification to generate "mailto.txt" auxiliary file.
+  2005/08/15 - Doxygen's root directory determined primarily from DOXYGEN 
+               environment variable. When not found, then relatively to the script.
   """                               
 
 from __future__ import generators
@@ -1177,12 +1179,16 @@ class TrManager:
         this will process only translator_cz.h source.
         """
         
-        # Determine the path to the script and the absolute path to the
-        # Doxygen's root subdirectory.
+        # Determine the path to the script and its name.
         self.script = os.path.abspath(sys.argv[0]) 
         self.script_path, self.script_name = os.path.split(self.script) 
         self.script_path = os.path.abspath(self.script_path)
-        self.doxy_path = os.path.abspath(os.path.join(self.script_path, '..'))    
+        
+        # Determine the absolute path to the Doxygen's root subdirectory.
+        # If DOXYGEN environment variable is not found, the directory is
+        # determined from the path of the script.
+        doxy_default = os.path.join(self.script_path, '..')    
+        self.doxy_path = os.path.abspath(os.getenv('DOXYGEN', doxy_default))
         
         # Get the explicit arguments of the script.
         self.script_argLst = sys.argv[1:]
@@ -1369,9 +1375,8 @@ class TrManager:
         the translator methods are included in the list. The file names 
         are searched in doxygen/src directory.
         """ 
-        srcdir = os.path.join(self.doxy_path, 'src')
         files = []
-        for item in os.listdir(srcdir):
+        for item in os.listdir(self.src_path):
             # Split the bare name to get the extension.
             name, ext = os.path.splitext(item)
             ext = ext.lower()
@@ -1379,7 +1384,7 @@ class TrManager:
             # Include only .cpp and .h files (case independent) and exclude
             # the files where the checked identifiers are defined.
             if ext == '.cpp' or (ext == '.h' and name.find('translator') == -1):
-                fname = os.path.join(srcdir, item)
+                fname = os.path.join(self.src_path, item)
                 assert os.path.isfile(fname) # assumes no directory with the ext
                 files.append(fname)          # full name
         return files
@@ -1624,7 +1629,7 @@ class TrManager:
         
         Fills the dictionary classId -> [(name, e-mail), ...]."""
         
-        fname = os.path.join(self.script_path, self.maintainersFileName)
+        fname = os.path.join(self.doc_path, self.maintainersFileName)
 
         # Include the maintainers file to the group of files checked with
         # respect to the modification time.
@@ -1678,7 +1683,7 @@ class TrManager:
         # Check the last modification time of the template file. It is the
         # last file from the group that decide whether the documentation
         # should or should not be generated.
-        fTplName = os.path.join(self.script_path, self.languageTplFileName)
+        fTplName = os.path.join(self.doc_path, self.languageTplFileName)
         tim = os.path.getmtime(fTplName)
         if tim > self.lastModificationTime:
             self.lastModificationTime = tim

doc/translator_report.txt

@@ -8,7 +8,7 @@ German, Greek, Hungarian, Indonesian, Italian, Japanese (+En), Korean
 (+En), Lithuanian, Norwegian, Persian, Polish, Portuguese, Romanian,
 Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
 
-Of them, 12 translators are up-to-date, 21 translators are based on
+Of them, 13 translators are up-to-date, 20 translators are based on
 some adapter class, and 2 are English based.
 
 ----------------------------------------------------------------------
@@ -17,16 +17,17 @@ alphabetically). This means that they derive from the Translator class
 and they implement all 194 of the required methods. Anyway, there
 still may be some details listed even for them:
 
-  TranslatorBrazilian -- Remove the obsolete methods (never used).
+  TranslatorBrazilian
   TranslatorCatalan
   TranslatorChinese
   TranslatorCroatian
   TranslatorCzech
-  TranslatorDanish -- Change the base class to Translator.
-  TranslatorDutch -- Remove the obsolete methods (never used).
-  TranslatorEnglish -- Remove the obsolete methods (never used).
+  TranslatorDanish
+  TranslatorDutch
+  TranslatorEnglish
+  TranslatorFrench
   TranslatorGerman
-  TranslatorItalian -- Change the base class to Translator.
+  TranslatorItalian
   TranslatorJapanese -- Remove the obsolete methods (never used).
   TranslatorRussian
 
@@ -46,7 +47,6 @@ must be implemented to become up-to-date:
   TranslatorKorean                1.4.6 	 2 methods to implement
   TranslatorIndonesian            1.4.6 	 1 method to implement
   TranslatorHungarian             1.4.6 	 2 methods to implement
-  TranslatorFrench                1.4.6 	 1 method to implement
   TranslatorChinesetraditional    1.4.6 	 1 method to implement
   TranslatorArabic                1.4.6 	 1 method to implement
   TranslatorAfrikaans             1.4.6 	 2 methods to implement
@@ -105,24 +105,6 @@ TranslatorArabic   (TranslatorAdapter_1_4_6)  1 method to implement
     virtual QCString trNoDescriptionAvailable()
 
 
-TranslatorBrazilian   (Translator)
--------------------
-
-  Implements 194 of the required methods.
-
-  Obsolete methods (should be removed, never used):
-
-    virtual QCString trHeaderFilesDescription()
-    virtual QCString trField(bool first_capital, bool singular)
-    virtual QCString trPackageDocumentation()
-    virtual QCString trSources()
-    virtual QCString trReimplementedForInternalReasons()
-    virtual QCString trInterfaces()
-    virtual QCString trHeaderFiles()
-    virtual QCString trBugsAndLimitations()
-    virtual QCString trNoDescriptionAvailable()
-
-
 TranslatorChinesetraditional   (TranslatorAdapter_1_4_6)  1 method to implement
 ----------------------------
 
@@ -145,60 +127,6 @@ TranslatorChinesetraditional   (TranslatorAdapter_1_4_6)  1 method to implement
     virtual QCString trNoDescriptionAvailable()
 
 
-TranslatorDanish   (TranslatorAdapter_1_3_9)
-----------------
-
-  Implements 194 of the required methods.
-
-  Obsolete methods (should be removed, never used):
-
-    virtual QCString trHeaderFilesDescription()
-    virtual QCString trField(bool first_capital, bool singular)
-    virtual QCString trPackageDocumentation()
-    virtual QCString trSources()
-    virtual QCString trReimplementedForInternalReasons()
-    virtual QCString trInterfaces()
-    virtual QCString trHeaderFiles()
-    virtual QCString trBugsAndLimitations()
-    virtual QCString trNoDescriptionAvailable()
-
-
-TranslatorDutch   (Translator)
----------------
-
-  Implements 194 of the required methods.
-
-  Obsolete methods (should be removed, never used):
-
-    QCString trHeaderFilesDescription()
-    virtual QCString trField(bool first_capital, bool singular)
-    QCString trPackageDocumentation()
-    QCString trSources()
-    QCString trReimplementedForInternalReasons()
-    QCString trInterfaces()
-    QCString trHeaderFiles()
-    QCString trBugsAndLimitations()
-    QCString trNoDescriptionAvailable()
-
-
-TranslatorEnglish   (Translator)
------------------
-
-  Implements 194 of the required methods.
-
-  Obsolete methods (should be removed, never used):
-
-    virtual QCString trHeaderFilesDescription()
-    virtual QCString trField(bool first_capital, bool singular)
-    virtual QCString trPackageDocumentation()
-    virtual QCString trSources()
-    virtual QCString trReimplementedForInternalReasons()
-    virtual QCString trInterfaces()
-    virtual QCString trHeaderFiles()
-    virtual QCString trBugsAndLimitations()
-    virtual QCString trNoDescriptionAvailable()
-
-
 TranslatorFinnish   (TranslatorEnglish)  96 methods to implement
 -----------------
 
@@ -315,28 +243,6 @@ TranslatorFinnish   (TranslatorEnglish)  96 methods to implement
     QCString trNoDescriptionAvailable()
 
 
-TranslatorFrench   (TranslatorAdapter_1_4_6)  1 method to implement
-----------------
-
-  Implements 193 of the required methods.
-
-  Missing methods (should be implemented):
-
-    virtual QCString trCallerGraph()
-
-  Obsolete methods (should be removed, never used):
-
-    virtual QCString trHeaderFilesDescription()
-    virtual QCString trField(bool first_capital, bool singular)
-    virtual QCString trPackageDocumentation()
-    virtual QCString trSources()
-    virtual QCString trReimplementedForInternalReasons()
-    virtual QCString trInterfaces()
-    virtual QCString trHeaderFiles()
-    virtual QCString trBugsAndLimitations()
-    virtual QCString trNoDescriptionAvailable()
-
-
 TranslatorGreek   (TranslatorAdapter_1_2_11)  27 methods to implement
 ---------------
 
@@ -418,12 +324,6 @@ TranslatorIndonesian   (TranslatorAdapter_1_4_6)  1 method to implement
     virtual QCString trNoDescriptionAvailable()
 
 
-TranslatorItalian   (TranslatorAdapter_1_4_6)
------------------
-
-  Implements 194 of the required methods.
-
-
 TranslatorJapanese   (Translator)
 ------------------
 

src/docparser.cpp

@@ -158,7 +158,8 @@ static QCString findAndCopyImage(const char *fileName,DocImage::Type type)
   //printf("Search for %s\n",fileName);
   if ((fd=findFileDef(Doxygen::imageNameDict,fileName,ambig)))
   {
-    QFile inImage(QString(fd->absFilePath().data()));
+    QCString inputFile = fd->absFilePath();
+    QFile inImage(inputFile);
     if (inImage.open(IO_ReadOnly))
     {
       result = fileName;
@@ -185,7 +186,9 @@ static QCString findAndCopyImage(const char *fileName,DocImage::Type type)
 	  break;
       }
       QCString outputFile = outputDir+"/"+result;
-      QFile outImage(QString(outputFile.data()));
+      if (outputFile!=inputFile) // prevent copying to ourself
+      {
+        QFile outImage(outputFile.data());
         if (outImage.open(IO_WriteOnly)) // copy the image
         {
           char *buffer = new char[inImage.size()];
@@ -200,6 +203,7 @@ static QCString findAndCopyImage(const char *fileName,DocImage::Type type)
               "Warning: could not write output image %s",outputFile.data());
         }
       }
+    }
     else
     {
       warn_doc_error(g_fileName,doctokenizerYYlineno,

src/doctokenizer.l

@@ -195,7 +195,7 @@ static void handleHtmlTag()
   {
     char c=tagText.at(i);
     // skip spaces
-    while (i<yyleng && c==' ') { c=tagText.at(++i); }
+    while (i<yyleng && isspace(c)) { c=tagText.at(++i); }
     // check for end of the tag
     if (c == '>') break;
     // Check for XML style "empty" tag.
@@ -206,17 +206,17 @@ static void handleHtmlTag()
     }
     startName=i;
     // search for end of name
-    while (i<yyleng && c!=' ' && c!='=') { c=tagText.at(++i); }
+    while (i<yyleng && !isspace(c) && c!='=') { c=tagText.at(++i); }
     endName=i;
     HtmlAttrib opt;
     opt.name  = tagText.mid(startName,endName-startName).lower(); 
     // skip spaces
-    while (i<yyleng && c==' ') { c=tagText.at(++i); } 
+    while (i<yyleng && isspace(c)) { c=tagText.at(++i); } 
     if (tagText.at(i)=='=') // option has value
     {
       c=tagText.at(++i);
       // skip spaces
-      while (i<yyleng && c==' ') { c=tagText.at(++i); } 
+      while (i<yyleng && isspace(c)) { c=tagText.at(++i); } 
       if (tagText.at(i)=='\'') // option '...'
       {
         c=tagText.at(++i);
@@ -240,7 +240,7 @@ static void handleHtmlTag()
       {
 	startAttrib=i;
 	// search for separator
-        while (i<yyleng && c!=' ') { c=tagText.at(++i); } 
+        while (i<yyleng && !isspace(c)) { c=tagText.at(++i); } 
 	endAttrib=i;
 	if (i<yyleng) c=tagText.at(++i);
       }
@@ -261,7 +261,7 @@ static QString stripEmptyLines(const char *s)
   for (;;)
   {
     int c;
-    while ((c=s[p]) && (c==' ' || c=='\t' || c=='\r')) p++;
+    while ((c=s[p]) && isspace(c)) p++;
     if (s[p]=='\n') result=++p; else break;
   }
   return &s[result];

src/doxygen.cpp

@@ -1041,14 +1041,18 @@ static void addClassToContext(EntryNav *rootNav)
   {
      scName=rootNav->parent()->name();
   }
-  // name without parent's scope
+  // name without parent's scope: TODO: is this still true?
   QCString fullName = root->name;
 
   // strip off any template parameters (but not those for specializations)
   fullName=stripTemplateSpecifiersFromScope(fullName);
 
   // name with scope
-  QCString qualifiedName = scName.isEmpty() ? fullName : scName+"::"+fullName;
+  QCString qualifiedName = fullName;
+  if (!scName.isEmpty() && !leftScopeMatch(fullName,scName))
+  {
+    qualifiedName.prepend(scName+"::");
+  }
 
   ClassDef *cd = getClass(qualifiedName);
 

src/htmlgen.cpp

@@ -1825,7 +1825,7 @@ static void writeDefaultQuickLinks(QTextStream &t,bool compact,
     QCString searchFor = fixSpaces(theTranslator->trSearchForIndex());
     if (searchFor.at(0)=='S') searchFor="<u>S</u>"+searchFor.mid(1);
     t << "    <li>\n";
-    t << "      <form action=\"search.php\" method=\"get\">\n";
+    t << "      <form action=\"" << relPath << "search.php\" method=\"get\">\n";
     t << "        <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\">\n";
     t << "          <tr>\n";
     t << "            <td><label>&nbsp;" << searchFor << "&nbsp;</label></td>\n";

src/latexdocvisitor.cpp

@@ -36,7 +36,7 @@ static QString escapeLabelName(const char *s)
     switch (c)
     {
       case '%': result+="\\%"; break;
-      case '|': result+="\\tt{\"|}"; break;
+      case '|': result+="\\texttt{\"|}"; break;
       case '!': result+="\"!"; break;
       default: result+=c;
     }
@@ -69,7 +69,7 @@ QString LatexDocVisitor::escapeMakeIndexChars(const char *s)
       case '!': m_t << "\"!"; break;
       case '"': m_t << "\"\""; break;
       case '@': m_t << "\"@"; break;
-      case '|': m_t << "\\tt{\"|}"; break;
+      case '|': m_t << "\\texttt{\"|}"; break;
       case '[': m_t << "["; break;
       case ']': m_t << "]"; break;
       default:  str[0]=c; filter(str); break;
@@ -191,7 +191,7 @@ void LatexDocVisitor::visit(DocURL *u)
     if (u->isEmail()) m_t << "mailto:";
     m_t << u->url() << "}";
   }
-  m_t << "\\tt{";
+  m_t << "{\\tt ";
   filter(u->url());
   m_t << "}";
 }
@@ -972,7 +972,7 @@ void LatexDocVisitor::visitPre(DocXRefItem *x)
   }
   else
   {
-    m_t << "\\bf{";
+    m_t << "{\\bf ";
   }
   m_insideItem=TRUE;
   filter(x->title());

src/memberdef.cpp

@@ -963,12 +963,14 @@ void MemberDef::setDefinitionTemplateParameterLists(QList<ArgumentList> *lists)
 void MemberDef::writeLink(OutputList &ol,ClassDef *,NamespaceDef *,
                       FileDef *fd,GroupDef *gd,bool onlyText)
 {
+  static bool optimizeOutputJava = Config_getBool("OPTIMIZE_OUTPUT_JAVA");
+  static bool hideScopeNames     = Config_getBool("HIDE_SCOPE_NAMES");
   makeResident();
   LockingPtr<MemberDef> lock(this,this);
-  QCString sep = Config_getBool("OPTIMIZE_OUTPUT_JAVA") ? "." : "::";
+  QCString sep = optimizeOutputJava ? "." : "::";
   QCString n = name();
-  if (m_impl->classDef && gd) n.prepend(m_impl->classDef->name()+sep);
-  else if (m_impl->nspace && (gd || fd)) n.prepend(m_impl->nspace->name()+sep);
+  if (!hideScopeNames && m_impl->classDef && gd) n.prepend(m_impl->classDef->name()+sep);
+  else if (!hideScopeNames && m_impl->nspace && (gd || fd)) n.prepend(m_impl->nspace->name()+sep);
   if (isObjCMethod())
   {
     if (isStatic()) ol.docify("+ "); else ol.docify("- ");

src/objcache.cpp

@@ -17,6 +17,7 @@
 
 #include <stdio.h>
 #include <assert.h>
+#include <qglobal.h>
 #include "objcache.h"
 
 //----------------------------------------------------------------------
@@ -176,11 +177,10 @@ void ObjCache::moveToFront(int index)
 
 unsigned int ObjCache::hash(void *addr)
 {
-  static bool isPtr64 = sizeof(addr)==8 && sizeof(long)==8;
-
-  unsigned long key = (unsigned long)addr;
+  static bool isPtr64 = sizeof(addr)==8;
   if (isPtr64)
   {
+    uint64 key = (uint64)addr;
     // Thomas Wang's 64 bit Mix Function
     key += ~(key << 32);
     key ^=  (key >> 22);
@@ -190,18 +190,20 @@ unsigned int ObjCache::hash(void *addr)
     key ^=  (key >> 15);
     key += ~(key << 27);
     key ^=  (key >> 31);
+    return key & (m_size-1);
   }
   else
   {
     // Thomas Wang's 32 bit Mix Function
+    unsigned long key = (unsigned long)addr;
     key += ~(key << 15);
     key ^=  (key >> 10);
     key +=  (key << 3);
     key ^=  (key >> 6);
     key += ~(key << 11);
     key ^=  (key >> 16);
-  }
     return key & (m_size-1);
+  }
 }
 
 ObjCache::HashNode *ObjCache::hashFind(void *obj)

src/pyscanner.l

@@ -290,8 +290,8 @@ static void appendDocBlock() {
 
 static void handleCommentBlock(const QCString &doc,bool brief)
 {
-  //printf("handleCommentBlock(doc=[%s] brief=%d docBlockInBody=%d\n",
-  //    doc.data(),brief,docBlockInBody);
+  //printf("handleCommentBlock(doc=[%s] brief=%d docBlockInBody=%d docBlockJavaStyle=%d\n",
+  //    doc.data(),brief,docBlockInBody,docBlockJavaStyle);
 
   // TODO: Fix me
   docBlockInBody=FALSE;
@@ -310,7 +310,7 @@ static void handleCommentBlock(const QCString &doc,bool brief)
 	yyFileName, // file
 	brief ? current->briefLine : current->docLine,   // line of block start
 	docBlockInBody ? FALSE : brief, 
-	docBlockJavaStyle, // javadoc style
+	FALSE, //docBlockJavaStyle, // javadoc style
 	docBlockInBody,
 	protection,
         position,
@@ -854,7 +854,7 @@ STARTDOCSYMS      ^{B}"##"/[^#]
      ")"                { // end of parameter list
                         }
 
-     ":"                {
+     ":"{B}             {
 			  g_specialBlock = TRUE; // expecting a docstring
 			  bodyEntry = current;
                           BEGIN( FunctionBody );

src/translator_br.h

@@ -183,10 +183,6 @@ class TranslatorBrazilian : public Translator
     virtual QCString trFileList()
     { return "Lista de Arquivos"; }
 
-    /*! This is put above each page as a link to the list of all verbatim headers */
-    virtual QCString trHeaderFiles()
-    { return "Arquivos de Cabeçalho (Headers)"; }
-
     /*! This is put above each page as a link to all members of compounds. */
     virtual QCString trCompoundMembers()
     {
@@ -321,10 +317,6 @@ class TranslatorBrazilian : public Translator
       return result;
     }
 
-    /*! This is an introduction to the page with the list of all header files. */
-    virtual QCString trHeaderFilesDescription()
-    { return "Estes são os arquivos de cabeçalho que compõe a API:"; }
-
     /*! This is an introduction to the page with the list of all examples */
     virtual QCString trExamplesDescription()
     { return "Esta é a lista com todos os exemplos:"; }
@@ -337,15 +329,6 @@ class TranslatorBrazilian : public Translator
     virtual QCString trModulesDescription()
     { return "Esta é a lista com todos os módulos:"; }
 
-    /*! This sentences is used in the annotated class/file lists if no brief
-     * description is given.
-     */
-    virtual QCString trNoDescriptionAvailable()
-    { return "Sem descrição disponível"; }
-
-    // index titles (the project name is prepended for these)
-
-
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return "\nDocumentação"; }
@@ -546,18 +529,10 @@ class TranslatorBrazilian : public Translator
     virtual QCString trForInternalUseOnly()
     { return "Apenas para uso interno."; }
 
-    /*! this text is generated when the \\reimp command is used. */
-    virtual QCString trReimplementedForInternalReasons()
-    { return "Reimplementado por razões internas. A API não foi modificada."; }
-
     /*! this text is generated when the \\warning command is used. */
     virtual QCString trWarning()
     { return "Aviso"; }
 
-    /*! this text is generated when the \\bug command is used. */
-    virtual QCString trBugsAndLimitations()
-    { return "Problemas e Limitações"; }
-
     /*! this text is generated when the \\version command is used. */
     virtual QCString trVersion()
     { return "Versão"; }
@@ -832,10 +807,6 @@ class TranslatorBrazilian : public Translator
 // new since 0.49-991003
 //////////////////////////////////////////////////////////////////////////
 
-    virtual QCString trSources()
-    {
-      return "Códigos-Fonte";
-    }
     virtual QCString trDefinedAtLineInSourceFile()
     {
       return "Definição na linha @0 do arquivo @1.";
@@ -1138,11 +1109,6 @@ class TranslatorBrazilian : public Translator
 // new since 1.2.4
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used for Java interfaces in the summary section of Java packages */
-    virtual QCString trInterfaces()
-    {
-      return "Interfaces";
-    }
     /*! Used for Java classes in the summary section of Java packages */
     virtual QCString trClasses()
     {
@@ -1175,11 +1141,6 @@ class TranslatorBrazilian : public Translator
     {
       return "Pacotes";
     }
-    /*! Used as a chapter title for Latex & RTF output */
-    virtual QCString trPackageDocumentation()
-    {
-      return "Pacotes";
-    }
     /*! Text shown before a multi-line define */
     virtual QCString trDefineValue()
     {
@@ -1316,17 +1277,6 @@ class TranslatorBrazilian : public Translator
       return result;
     }
 
-    /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names
-     *  of the category.
-     */
-    virtual QCString trField(bool first_capital, bool singular)
-    {
-      QCString result((first_capital ? "Campo" : "campo"));
-      if (!singular)  result+="s";
-      return result;
-    }
-
     /*! This is used for translation of the word that will possibly
      *  be followed by a single name or by a list of names
      *  of the category.

src/translator_dk.h

@@ -79,7 +79,7 @@
 #ifndef TRANSLATOR_DK_H
 #define TRANSLATOR_DK_H
 
-class TranslatorDanish : public TranslatorAdapter_1_3_9
+class TranslatorDanish : public Translator
 {
   public:
 
@@ -225,10 +225,6 @@ class TranslatorDanish : public TranslatorAdapter_1_3_9
     virtual QCString trFileList()
     { return "Filoversigt"; }
 
-    /*! This is put above each page as a link to the list of all verbatim headers */
-    virtual QCString trHeaderFiles()
-    { return "Headerfiler"; }
-
     /*! This is put above each page as a link to all members of compounds. */
     virtual QCString trCompoundMembers()
     {
@@ -338,10 +334,6 @@ class TranslatorDanish : public TranslatorAdapter_1_3_9
       return result;
     }
 
-    /*! This is an introduction to the page with the list of all header files. */
-    virtual QCString trHeaderFilesDescription()
-    { return "Her er de headerfiler, der udgør API'en:"; }
-
     /*! This is an introduction to the page with the list of all examples */
     virtual QCString trExamplesDescription()
     { return "Her er en liste over alle eksempler:"; }
@@ -354,15 +346,6 @@ class TranslatorDanish : public TranslatorAdapter_1_3_9
     virtual QCString trModulesDescription()
     { return "Her er en liste over alle moduler:"; }
 
-    /*! This sentences is used in the annotated class/file lists if no brief
-     * description is given.
-     */
-    virtual QCString trNoDescriptionAvailable()
-    { return "Ikke beskrevet"; }
-
-    // index titles (the project name is prepended for these)
-
-
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return "Dokumentation"; }
@@ -558,19 +541,10 @@ class TranslatorDanish : public TranslatorAdapter_1_3_9
     virtual QCString trForInternalUseOnly()
     { return "Kun til intern brug."; }
 
-    /*! this text is generated when the \\reimp command is used. */
-    virtual QCString trReimplementedForInternalReasons()
-    { return "Metoden er genimplementeret af interne grunde; "
-	  "API'en er ikke påvirket."; }
-
     /*! this text is generated when the \\warning command is used. */
     virtual QCString trWarning()
     { return "Advarsel"; }
 
-    /*! this text is generated when the \\bug command is used. */
-    virtual QCString trBugsAndLimitations()
-    { return "Fejl og begrænsninger"; }
-
     /*! this text is generated when the \\version command is used. */
     virtual QCString trVersion()
     { return "Version"; }
@@ -843,9 +817,6 @@ class TranslatorDanish : public TranslatorAdapter_1_3_9
 // new since 0.49-991003
 //////////////////////////////////////////////////////////////////////////
 
-    virtual QCString trSources()
-    { return "Kilder"; /* Tranlation?? */ }
-
     virtual QCString trDefinedAtLineInSourceFile()
     {
       return "Defineret på linje @0 i filen @1.";
@@ -1122,11 +1093,6 @@ class TranslatorDanish : public TranslatorAdapter_1_3_9
 // new since 1.2.4
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used for Java interfaces in the summary section of Java packages */
-    virtual QCString trInterfaces()
-    {
-      return "Grænseflader";
-    }
     /*! Used for Java classes in the summary section of Java packages */
     virtual QCString trClasses()
     {
@@ -1158,11 +1124,6 @@ class TranslatorDanish : public TranslatorAdapter_1_3_9
     {
       return "Pakker";
     }
-    /*! Used as a chapter title for Latex & RTF output */
-    virtual QCString trPackageDocumentation()
-    {
-      return "Pakke-dokumentation";
-    }
     /*! Text shown before a multi-line define */
     virtual QCString trDefineValue()
     {
@@ -1267,15 +1228,6 @@ class TranslatorDanish : public TranslatorAdapter_1_3_9
       return createNoun(first_capital, singular, "medlem", "mer");
     }
 
-    /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names
-     *  of the category.
-     */
-    virtual QCString trField(bool first_capital, bool singular)
-    {
-      return createNoun(first_capital, singular, "felt", "er");
-    }
-
     /*! This is used for translation of the word that will possibly
      *  be followed by a single name or by a list of names
      *  of the category.

src/translator_en.h

@@ -194,10 +194,6 @@ class TranslatorEnglish : public Translator
     virtual QCString trFileList()
     { return "File List"; }
 
-    /*! This is put above each page as a link to the list of all verbatim headers */
-    virtual QCString trHeaderFiles()
-    { return "Header Files"; }
-
     /*! This is put above each page as a link to all members of compounds. */
     virtual QCString trCompoundMembers()
     { 
@@ -330,10 +326,6 @@ class TranslatorEnglish : public Translator
       return result;
     }
 
-    /*! This is an introduction to the page with the list of all header files. */
-    virtual QCString trHeaderFilesDescription()
-    { return "Here are the header files that make up the API:"; }
-
     /*! This is an introduction to the page with the list of all examples */
     virtual QCString trExamplesDescription()
     { return "Here is a list of all examples:"; }
@@ -346,15 +338,8 @@ class TranslatorEnglish : public Translator
     virtual QCString trModulesDescription()
     { return "Here is a list of all modules:"; }
 
-    /*! This sentences is used in the annotated class/file lists if no brief
-     * description is given. 
-     */
-    virtual QCString trNoDescriptionAvailable()
-    { return "No description available"; }
-    
     // index titles (the project name is prepended for these) 
 
-
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return "Documentation"; }
@@ -555,18 +540,10 @@ class TranslatorEnglish : public Translator
     virtual QCString trForInternalUseOnly()
     { return "For internal use only."; }
 
-    /*! this text is generated when the \\reimp command is used. */
-    virtual QCString trReimplementedForInternalReasons()
-    { return "Reimplemented for internal reasons; the API is not affected."; }
-
     /*! this text is generated when the \\warning command is used. */
     virtual QCString trWarning()
     { return "Warning"; }
 
-    /*! this text is generated when the \\bug command is used. */
-    virtual QCString trBugsAndLimitations()
-    { return "Bugs and limitations"; }
-
     /*! this text is generated when the \\version command is used. */
     virtual QCString trVersion()
     { return "Version"; }
@@ -841,10 +818,6 @@ class TranslatorEnglish : public Translator
 // new since 0.49-991003
 //////////////////////////////////////////////////////////////////////////
 
-    virtual QCString trSources()
-    {
-      return "Sources";
-    }
     virtual QCString trDefinedAtLineInSourceFile()
     {
       return "Definition at line @0 of file @1.";
@@ -1151,11 +1124,6 @@ class TranslatorEnglish : public Translator
 // new since 1.2.4
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used for Java interfaces in the summary section of Java packages */
-    virtual QCString trInterfaces()
-    {
-      return "Interfaces";
-    }
     /*! Used for Java classes in the summary section of Java packages */
     virtual QCString trClasses()
     {
@@ -1188,11 +1156,6 @@ class TranslatorEnglish : public Translator
     {
       return "Packages";
     }
-    /*! Used as a chapter title for Latex & RTF output */
-    virtual QCString trPackageDocumentation()
-    {
-      return "Package Documentation";
-    }
     /*! Text shown before a multi-line define */
     virtual QCString trDefineValue()
     {
@@ -1329,17 +1292,6 @@ class TranslatorEnglish : public Translator
       return result; 
     }
    
-    /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
-     *  of the category.
-     */
-    virtual QCString trField(bool first_capital, bool singular)
-    { 
-      QCString result((first_capital ? "Field" : "field"));
-      if (!singular)  result+="s";
-      return result; 
-    }
-
     /*! This is used for translation of the word that will possibly
      *  be followed by a single name or by a list of names 
      *  of the category.

src/translator_it.h

@@ -19,6 +19,7 @@
  *
  * Revision history
  *
+ *  2006/10: made class to derive directly from Translator class (reported in Petr Prikryl October 9 translator report)
  *  2006/06: updated translation of new items used since version 1.4.6
  *  2006/05: translated new items used since version 1.4.6
  *           corrected typo in trPackageMembers method
@@ -77,7 +78,7 @@
 #ifndef TRANSLATOR_IT_H
 #define TRANSLATOR_IT_H
 
-class TranslatorItalian : public TranslatorAdapter_1_4_6
+class TranslatorItalian : public Translator
 {
   public:
 

src/translator_nl.h

@@ -91,8 +91,6 @@ class TranslatorDutch : public Translator
     { return "Klasse Lijst"; }
     QCString trFileList()
     { return "File Lijst"; }
-    QCString trHeaderFiles()
-    { return "Header Lijst"; }
     QCString trCompoundMembers()
     { return "Klasse Members"; }
     QCString trFileMembers()
@@ -136,16 +134,12 @@ class TranslatorDutch : public Translator
       else result+="de files waartoe ze behoren:";
       return result;
     }
-    QCString trHeaderFilesDescription()
-    { return "Hieronder volgen de header files die de API vormen:"; }
     QCString trExamplesDescription()
     { return "Hieronder volgt de lijst met alle voorbeelden:"; }
     QCString trRelatedPagesDescription()
     { return "Hieronder volgt de lijst met alle pagina's die gerelateerde documentatie bevatten:"; }
     QCString trModulesDescription()
     { return "Hieronder volgt de lijst met alle modules:"; }
-    QCString trNoDescriptionAvailable()
-    { return "Geen korte beschrijving beschikbaar"; }
 
     QCString trDocumentation()
     { return "Documentatie"; }
@@ -217,14 +211,8 @@ class TranslatorDutch : public Translator
     }
     QCString trForInternalUseOnly()
     { return "Alleen voor intern gebruik."; }
-    QCString trReimplementedForInternalReasons()
-    { return "Om interne redenen opnieuwd geïmplemented; "
-             "de API wordt er niet door beïnvloed."; 
-    }
     QCString trWarning()
     { return "Waarschuwing"; }
-    QCString trBugsAndLimitations()
-    { return "Fouten en beperkingen"; }
     QCString trVersion()
     { return "Versie"; }
     QCString trDate()
@@ -466,10 +454,6 @@ class TranslatorDutch : public Translator
 // new since 0.49-991106
 //////////////////////////////////////////////////////////////////////////
 
-    QCString trSources()
-    {
-      return "Broncode";
-    }
     QCString trDefinedAtLineInSourceFile()
     {
       return "De definitie bevindt zich op regel @0 in de file @1.";
@@ -765,11 +749,6 @@ class TranslatorDutch : public Translator
 // new since 1.2.4
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used for Java interfaces in the summary section of Java packages */
-    QCString trInterfaces()
-    {
-      return "Interfaces";
-    }
     /*! Used for Java classes in the summary section of Java packages */
     QCString trClasses()
     {
@@ -795,11 +774,6 @@ class TranslatorDutch : public Translator
     {
       return "Packages";
     }
-    /*! Used as a chapter title for Latex & RTF output */
-    QCString trPackageDocumentation()
-    {
-      return "Package Documentatie";
-    }
     /*! Text shown before a multi-line define */
     QCString trDefineValue()
     {
@@ -936,17 +910,6 @@ class TranslatorDutch : public Translator
       return result; 
     }
    
-    /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
-     *  of the category.
-     */
-    virtual QCString trField(bool first_capital, bool singular)
-    { 
-      QCString result((first_capital ? "Veld" : "veld"));
-      if (!singular)  result+="en";
-      return result; 
-    }
-
     /*! This is used for translation of the word that will possibly
      *  be followed by a single name or by a list of names 
      *  of the category.

src/util.cpp

@@ -1537,8 +1537,12 @@ QCString removeRedundantWhiteSpace(const QCString &s)
   {
 nextChar:
     char c=s.at(i);
-    if (csp<6 && c==constScope[csp]) csp++; else csp=0;
-    if (vsp<8 && c==virtualScope[vsp]) vsp++; else vsp=0;
+    if ((csp==0 && (i==0 || !isId(constScope[i-1])) && csp<6) && 
+        c==constScope[csp]
+       ) csp++; else csp=0;
+    if ((vsp==0 && (i==0 || !isId(virtualScope[i-1])) && vsp<8) && 
+        c==virtualScope[vsp]
+       ) vsp++; else vsp=0;
     if (c=='"') // quoted string
     {
       i++;

winbuild/Doxygen.vcproj

@@ -16,8 +16,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory="..\bin\Debug"
+			IntermediateDirectory="..\objects\Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="qtools.lib libpng.lib zlib.lib ws2_32.lib"
-				OutputFile=".\Debug/Doxygen.exe"
+				OutputFile="..\bin\Debug\doxygen.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="Debug"
@@ -110,8 +110,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory="..\bin"
+			IntermediateDirectory="..\objects"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -169,7 +169,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/LTCG"
 				AdditionalDependencies="qtools.lib libpng.lib zlib.lib "
-				OutputFile=".\Release/Doxygen.exe"
+				OutputFile="..\bin\doxygen.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="Release"

winbuild/Doxytag.vcproj

@@ -15,8 +15,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory="..\bin\Debug"
+			IntermediateDirectory="..\objects\Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -70,7 +70,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="qtools.lib ws2_32.lib"
-				OutputFile=".\Debug/Doxytag.exe"
+				OutputFile="..\bin\Debug\doxytag.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="Debug"
@@ -108,8 +108,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory="..\bin"
+			IntermediateDirectory="..\objects"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -163,7 +163,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="qtools.lib "
-				OutputFile=".\Release/Doxytag.exe"
+				OutputFile="..\bin\doxytag.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="Release"

winbuild/Doxywizard.vcproj

@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="..\bin\Debug"
+			IntermediateDirectory="$(ConfigurationName)\Doxywizard"
 			ConfigurationType="1"
 			CharacterSet="1"
 			>
@@ -66,6 +66,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				OutputFile="..\bin\Debug\doxywizard.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -98,7 +99,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			OutputDirectory="..\bin"
 			IntermediateDirectory="$(ConfigurationName)\Doxywizard"
 			ConfigurationType="1"
 			CharacterSet="1"
@@ -145,8 +146,9 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="$(QTDIR)\lib\qt-mt336.lib $(QTDIR)\lib\qtmain.lib"
+				OutputFile="..\bin\doxywizard.exe"
 				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="false"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"

winbuild/libpng.vcproj

@@ -15,8 +15,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory="..\lib"
+			IntermediateDirectory="..\objects"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -90,8 +90,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory="..\lib\Debug"
+			IntermediateDirectory="..\objects\Debug"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"

winbuild/qtools.vcproj

@@ -15,8 +15,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory="..\lib"
+			IntermediateDirectory="..\objects"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -92,8 +92,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory="..\lib\Debug"
+			IntermediateDirectory="..\objects\Debug"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"

winbuild/zlib.vcproj

@@ -15,8 +15,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory="..\lib\Debug"
+			IntermediateDirectory="..\objects\Debug"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -91,8 +91,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory="..\lib"
+			IntermediateDirectory="..\objects"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"