Release-1.7.3-20110123

INSTALL

-DOXYGEN Version 1.7.3
+DOXYGEN Version 1.7.3-20110123
 
 Please read the installation section of the manual 
 (http://www.doxygen.org/install.html) for instructions.
 
 --------
-Dimitri van Heesch (03 January 2011)
+Dimitri van Heesch (23 January 2011)

README

-DOXYGEN Version 1.7.3
+DOXYGEN Version 1.7.3_20110123
 
 Please read INSTALL for compilation instructions.
 
@@ -26,4 +26,4 @@ forum.
 
 Enjoy,
 
-Dimitri van Heesch (dimitri@stack.nl) (03 January 2011)
+Dimitri van Heesch (dimitri@stack.nl) (23 January 2011)

addon/doxywizard/Makefile.in

 #
 # 
 #
-# Copyright (C) 1997-2008 by Dimitri van Heesch.
+# Copyright (C) 1997-2011 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 

addon/doxywizard/config.l

@@ -2,7 +2,7 @@
  *
  * $Id: config_templ.l,v 1.8 2001/01/01 10:15:16 root Exp $
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

addon/doxywizard/inputbool.cpp

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

addon/doxywizard/inputbool.h

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

addon/doxywizard/inputint.cpp

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

addon/doxywizard/inputint.h

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

addon/doxywizard/inputstring.cpp

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

addon/doxywizard/inputstring.h

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

addon/doxywizard/inputstrlist.cpp

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

addon/doxywizard/inputstrlist.h

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

addon/doxywizard/version.h

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

addon/doxywizard/wizard.h

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

configure

@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 1997-2008 by Dimitri van Heesch.
+# Copyright (C) 1997-2011 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 
@@ -20,7 +20,7 @@ doxygen_version_minor=7
 doxygen_version_revision=3
 
 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package.
-doxygen_version_mmn=NO
+doxygen_version_mmn=20110123
 
 bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
 

doc/Makefile.in

 #
 # 
 #
-# Copyright (C) 1997-2008 by Dimitri van Heesch.
+# Copyright (C) 1997-2011 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 

doc/Makefile.latex

 #
 # 
 #
-# Copyright (C) 1997-2006 by Dimitri van Heesch.
+# Copyright (C) 1997-2011 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 

doc/Makefile.win_make.in

 #
 # 
 #
-# Copyright (C) 1997-2008 by Dimitri van Heesch.
+# Copyright (C) 1997-2011 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 

doc/Makefile.win_nmake.in

 #
 # 
 #
-# Copyright (C) 1997-2008 by Dimitri van Heesch.
+# Copyright (C) 1997-2011 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 

doc/arch.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/autolink.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/commands.doc

@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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

doc/config.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 
@@ -214,6 +214,8 @@ followed by the descriptions of the tags grouped by category.
 \refitem cfg_perlmod_makevar_prefix PERLMOD_MAKEVAR_PREFIX
 \refitem cfg_perlmod_pretty PERLMOD_PRETTY
 \refitem cfg_predefined PREDEFINED
+\refitem cfg_project_brief PROJECT_BRIEF
+\refitem cfg_project_logo PROJECT_LOGO
 \refitem cfg_project_name PROJECT_NAME
 \refitem cfg_project_number PROJECT_NUMBER
 \refitem cfg_qch_file QCH_FILE
@@ -308,6 +310,19 @@ followed by the descriptions of the tags grouped by category.
  This could be handy for archiving the generated documentation or
  if some version control system is used.
 
+\anchor cfg_project_brief
+<dt>\c PROJECT_BRIEF <dd>
+ Using the \c PROJECT_BRIEF tag one can provide an optional one line description 
+ for a project that appears at the top of each page and should give viewer 
+ a quick idea about the purpose of the project. Keep the description short. 
+
+\anchor cfg_project_logo
+<dt>\c PROJECT_LOGO <dd>
+ With the \c PROJECT_LOGO tag one can specify an logo or icon that is 
+ included in the documentation. The maximum height of the logo should not 
+ exceed 55 pixels and the maximum width should not exceed 200 pixels. 
+ Doxygen will copy the logo to the output directory.
+
 \anchor cfg_output_directory
 <dt>\c OUTPUT_DIRECTORY <dd> 
  \addindex OUTPUT_DIRECTORY
@@ -1291,6 +1306,10 @@ AClass::ANamespace, ANamespace::*Test
             the project (see \c PROJECT_NAME)
  <dt><code>\$projectnumber</code><dd>will be replaced with the project number
             (see \c PROJECT_NUMBER)
+ <dt><code>\$projectbrief</code><dd>will be replaced with the project brief
+            description (see \c PROJECT_BRIEF)
+ <dt><code>\$projectlogo</code><dd>will be replaced with the project logo
+            (see \c PROJECT_LOGO)
  <dt><code>\$relpath\$</code><dd>
  If \c CREATE_SUBDIRS is enabled, the command <code>\$relpath\$</code> can be 
  used to produce a relative path to the root of the HTML output directory,
@@ -1299,6 +1318,19 @@ AClass::ANamespace, ANamespace::*Test
    
  See also section \ref doxygen_usage for information on how to generate
  the default header that doxygen normally uses.
+
+ @note When using a custom header you are responsible
+ for the proper inclusion of any scripts and style sheets that doxygen
+ needs, which is dependent on the configuration options used.
+ It is adviced to generate a default header using
+\verbatim
+doxygen -w html header.html footer.html stylesheet.css YourConfigFile
+\endverbatim
+ and then modify that header.
+
+ @note The header is subject to change so you typically
+ have to redo this when upgrading to a newer version of doxygen or when
+ changing the value of configuration settings such as \c GENERATE_TREEVIEW!
    
 \anchor cfg_html_footer
 <dt>\c HTML_FOOTER <dd>
@@ -2331,7 +2363,7 @@ The default size is 10pt.
 <dt>\c DOT_IMAGE_FORMAT <dd>
  \addindex DOT_IMAGE_FORMAT
  The \c DOT_IMAGE_FORMAT tag can be used to set the image format of the images
- generated by dot. Possible values are gif, jpg, and png.
+ generated by dot. Possible values are svg, png, jpg, or gif.
  If left blank png will be used.
 
 \anchor cfg_dot_path

doc/custcmd.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/customize.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/diagrams.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/docblocks.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/doxygen.1

@@ -41,6 +41,6 @@ doxygen \fB\-e\fR rtf extensionsFile
 If \fB\-s\fR is specified the comments in the config file will be omitted.
 If configName is omitted `Doxyfile' will be used as a default.
 .SH AUTHOR
-Doxygen version VERSION, Copyright Dimitri van Heesch 1997-2007
+Doxygen version VERSION, Copyright Dimitri van Heesch 1997-2011
 .SH SEE ALSO
 doxytag(1), doxywizard(1).

doc/doxygen.sty

 %
 % 
 %
-% Copyright (C) 1997-2009 by Dimitri van Heesch.
+% Copyright (C) 1997-2011 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 
@@ -25,8 +25,8 @@
         {\fancyplain{}{\bfseries\rightmark}}
 \rhead[\fancyplain{}{\bfseries\leftmark}]
         {\fancyplain{}{\bfseries\thepage}}
-\rfoot[\fancyplain{}{\bfseries\scriptsize User Manual for Doxygen $VERSION, written by Dimitri van Heesch \copyright 1997-2010}]{}
-\lfoot[]{\fancyplain{}{\bfseries\scriptsize User Manual for Doxygen $VERSION, written by Dimitri van Heesch \copyright 1997-2010}}
+\rfoot[\fancyplain{}{\bfseries\scriptsize User Manual for Doxygen $VERSION, written by Dimitri van Heesch \copyright 1997-2011}]{}
+\lfoot[]{\fancyplain{}{\bfseries\scriptsize User Manual for Doxygen $VERSION, written by Dimitri van Heesch \copyright 1997-2011}}
 \cfoot{}
 
 %---------- Internal commands used in this style file ----------------

doc/doxygen_manual.tex

 %
 % 
 %
-% Copyright (C) 1997-2007 by Dimitri van Heesch.
+% Copyright (C) 1997-2011 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 

doc/doxygen_usage.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 
@@ -54,7 +54,7 @@ to the new configuration file. Any new options will have their default value.
 Note that comments that you may have added in the original configuration file 
 will be lost.
 
-\anchor doxygen_finetune
+\section doxygen_finetune Fine-tuning the output
 If you want to fine-tune the way the output looks, doxygen allows you 
 generate default style sheet, header, and footer files that you can edit
 afterwards:
@@ -65,8 +65,12 @@ afterwards:
     sheet (see \ref cfg_html_stylesheet "HTML_STYLESHEET"), using the
     following command:
 \verbatim
-doxygen -w html header.html footer.html stylesheet.css
+doxygen -w html header.html footer.html stylesheet.css <config_file>
 \endverbatim
+  The config_file is optional. When omitted doxygen will search for 
+  a file named Doxyfile and process that. When this is also not found it
+  will used the default settings.
+
 <li>For LaTeX output, you can generate the first part of \c refman.tex 
     (see \ref cfg_latex_header "LATEX_HEADER") and the style sheet included
     by that header (normally <code>doxygen.sty</code>), using:
@@ -82,8 +86,12 @@ that config file as the third argument.
 doxygen -w rtf rtfstyle.cfg
 \endverbatim
 </ul>
+\warning When using a custom header you are responsible 
+  for the proper inclusion of any scripts and style sheets that doxygen 
+  needs, which is dependent on the configuration options and may changes
+  when upgrading to a new doxygen release.
 
-<b>Note:</b><br>
+\note
 <ul>
 <li> If you do not want documentation for each item inside the configuration
      file then you can use the optional \c -s option. This can use be

doc/doxytag_usage.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/doxywizard_usage.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/external.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/faq.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/features.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/formulas.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/grouping.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/htmlcmds.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 
@@ -23,9 +23,11 @@ of a HTML tag are passed on to the HTML output only
 (the HREF and NAME attributes for the A tag are the only exception).
 
 <ul>
-<li><tt>\<A HREF="..."\></tt> Starts a HTML hyper-link (HTML only). 
-<li><tt>\<A NAME="..."\></tt> Starts an named anchor (HTML only).
-<li><tt>\</A\></tt>    Ends a link or anchor (HTML only).
+<li><tt>\<A HREF="..."\></tt> Starts a hyperlink 
+                       (if supported by the output format). 
+<li><tt>\<A NAME="..."\></tt> Starts an named anchor 
+                       (if supported by the output format).
+<li><tt>\</A\></tt>    Ends a link or anchor 
 <li><tt>\<B\></tt>     Starts a piece of text displayed in a bold font.
 <li><tt>\</B\></tt>    Ends a <tt>\<B\></tt> section.
 <li><tt>\<BODY\></tt>  Does not generate any output.

doc/index.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 
@@ -116,7 +116,7 @@ The third part provides information for developers:
 \addindex license
 \addindex GPL
 
-Copyright © 1997-2010 by 
+Copyright © 1997-2011 by 
 <a href="mailto:dimitri@stack.nl">Dimitri van Heesch</a>.<p>
 
 Permission to use, copy, modify, and distribute this software and its

doc/install.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/installdox_usage.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/language.doc

 /******************************************************************************
  * Do not edit this file. It was generated by the translator.py script. 
  *
- * Copyright (C) 1997-2006 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 
@@ -23,7 +23,7 @@ text fragments, generated by doxygen, can be produced in languages other
 than English (the default). The output language is chosen through the
 configuration file (with default name and known as Doxyfile).
 
-Currently (version 1.7.2), 38 languages 
+Currently (version 1.7.3), 38 languages 
 are supported (sorted alphabetically):
 Afrikaans, Arabic, Brazilian Portuguese, Catalan, Chinese, Chinese
 Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto,

doc/language.tpl

@@ -5,7 +5,7 @@ change the language.doc, make the changes here and inside maintainers.txt.
 /******************************************************************************
  * %(editnote)s 
  *
- * Copyright (C) 1997-2006 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/output.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/preprocessing.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/searching.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2009 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/starting.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/translator_report.txt

-(1.7.2)
+(1.7.3)
 
 Doxygen supports the following 38 languages (sorted alphabetically):
 

doc/trouble.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

doc/xmlcmds.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/Makefile.in

@@ -2,7 +2,7 @@
 #
 # 
 #
-# Copyright (C) 1997-2010 by Dimitri van Heesch.
+# Copyright (C) 1997-2011 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 

src/bufstr.h

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/classdef.cpp

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 
@@ -1136,7 +1136,7 @@ void ClassDef::writeInheritanceGraph(OutputList &ol)
         // use the class name but with the template arguments as given
         // in the inheritance relation
         QCString displayName = insertTemplateSpecifierInScope(
-            cd->name(),bcd->templSpecifiers);
+            cd->displayName(),bcd->templSpecifiers);
 
         if (cd->isLinkable())
         {

src/classdef.h

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/classlist.cpp

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/classlist.h

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/cmdmapper.cpp

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/cmdmapper.h

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/code.h

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/code.l

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 
@@ -1717,7 +1717,7 @@ SCOPENAME "$"?(({ID}?{BN}*"::"{BN}*)*)((~{BN}*)?{ID})
 TEMPLIST "<"[^\"\}\{\(\)\/\n\>]*">"
 SCOPETNAME ((({ID}{TEMPLIST}?){BN}*"::"{BN}*)*)((~{BN}*)?{ID})
 SCOPEPREFIX ({ID}{TEMPLIST}?{BN}*"::"{BN}*)+
-KEYWORD_OBJC ("@public"|"@private"|"@protected"|"@class"|"@implementation"|"@interface"|"@end"|"@selector"|"@protocol"|"@optional"|"@required"|"@throw"|"@synthesize")
+KEYWORD_OBJC ("@public"|"@private"|"@protected"|"@class"|"@implementation"|"@interface"|"@end"|"@selector"|"@protocol"|"@optional"|"@required"|"@throw"|"@synthesize"|"@property")
 KEYWORD ("asm"|"__assume"|"auto"|"class"|"const"|"delete"|"enum"|"explicit"|"extern"|"false"|"friend"|"gcnew"|"gcroot"|"get"|"inline"|"internal"|"mutable"|"namespace"|"new"|"nullptr"|"override"|"operator"|"pin_ptr"|"private"|"protected"|"public"|"raise"|"register"|"remove"|"self"|"set"|"sizeof"|"static"|"struct"|"__super"|"template"|"generic"|"this"|"true"|"typedef"|"typeid"|"typename"|"union"|"using"|"virtual"|"volatile"|"abstract"|"final"|"import"|"synchronized"|"transient"|{KEYWORD_OBJC})
 FLOWKW  ("break"|"case"|"catch"|"continue"|"default"|"do"|"else"|"finally"|"for"|"foreach"|"for each"|"goto"|"if"|"return"|"switch"|"throw"|"throws"|"try"|"while"|"@try"|"@catch"|"@finally")
 TYPEKW  ("bool"|"char"|"double"|"float"|"int"|"long"|"object"|"short"|"signed"|"unsigned"|"void"|"wchar_t"|"size_t"|"boolean"|"id"|"SEL"|"string")

src/commentcnv.h

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/commentcnv.l

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/commentscan.h

 /******************************************************************************
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/commentscan.l

 /*****************************************************************************
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/config.h

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/config.l

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 
@@ -1186,6 +1186,18 @@ void Config::check()
     s=aliasList.next();
   }
 
+  // check if GENERATE_TREEVIEW and GENERATE_HTMLHELP are both enabled
+  if (Config_getBool("GENERATE_TREEVIEW") && Config_getBool("GENERATE_HTMLHELP"))
+  {
+    config_err("When enabling GENERATE_HTMLHELP the tree view (GENERATE_TREEVIEW) should be disabled. I'll do it for you.\n");
+    Config_getBool("GENERATE_TREEVIEW")=FALSE;
+  }
+  if (Config_getBool("SEARCHENGINE") && Config_getBool("GENERATE_HTMLHELP"))
+  {
+    config_err("When enabling GENERATE_HTMLHELP the search engine (SEARCHENGINE) should be disabled. I'll do it for you.\n");
+    Config_getBool("SEARCHENGINE")=FALSE;
+  }
+    
   // check dot image format
   QCString &dotImageFormat=Config_getEnum("DOT_IMAGE_FORMAT");
   dotImageFormat=dotImageFormat.stripWhiteSpace();

src/config.xml

@@ -16,8 +16,8 @@ This could be handy for archiving the generated documentation or
 if some version control system is used. 
 ' defval=''/>
     <option type='string' id='PROJECT_BRIEF' format='string' docs='
-Using the PROJECT_BRIEF tag one can provide an optional one line description
-for a project that appears at the top of each page and should give viewer
+Using the PROJECT_BRIEF tag one can provide an optional one line description 
+for a project that appears at the top of each page and should give viewer 
 a quick idea about the purpose of the project. Keep the description short. 
 ' defval=''/>
     <option type='string' id='PROJECT_LOGO' format='file' docs='
@@ -432,10 +432,10 @@ Note: This option applies only to the class list, not to the
 alphabetical list. 
 ' defval='0'/>
     <option type='bool' id='STRICT_PROTO_MATCHING' docs='
-If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to 
 do proper type resolution of all parameters of a function it will reject a 
-match between the prototype and the implementation of a member function even
-if there is only one candidate or it is obvious which candidate to choose
+match between the prototype and the implementation of a member function even 
+if there is only one candidate or it is obvious which candidate to choose 
 by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen 
 will still accept a match between prototype and implementation in such cases.
 ' defval='0'/>
@@ -782,7 +782,14 @@ doxygen will generate files with .html extension.
     <option type='string' id='HTML_HEADER' format='file' docs='
 The HTML_HEADER tag can be used to specify a personal HTML header for 
 each generated HTML page. If it is left blank doxygen will generate a 
-standard header. 
+standard header. Note that when using a custom header you are responsible 
+for the proper inclusion of any scripts and style sheets that doxygen 
+needs, which is dependent on the configuration options used. 
+It is adviced to generate a default header using "doxygen -w html 
+header.html footer.html stylesheet.css YourConfigFile" and then modify 
+that header. Note that the header is subject to change so you typically 
+have to redo this when upgrading to a newer version of doxygen or when
+changing the value of configuration settings such as GENERATE_TREEVIEW!
 ' defval='' depends='GENERATE_HTML'/>
     <option type='string' id='HTML_FOOTER' format='file' docs='
 The HTML_FOOTER tag can be used to specify a personal HTML footer for 
@@ -971,10 +978,10 @@ top of each HTML page. The value NO (the default) enables the index and
 the value YES disables it. 
 ' defval='0' depends='GENERATE_HTML'/>
     <option type='int' id='ENUM_VALUES_PER_LINE' docs='
-This tag can be used to set the number of enum values (range [0,1..20]) 
-that doxygen will group on one line in the generated HTML documentation. 
-Note that a value of 0 will completely suppress the enum values from
-appearing in the overview section.
+The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values 
+(range [0,1..20]) that doxygen will group on one line in the generated HTML 
+documentation. Note that a value of 0 will completely suppress the enum 
+values from appearing in the overview section.
 ' minval='0' maxval='20' defval='4' depends='GENERATE_HTML'/>
     <option type='bool' id='GENERATE_TREEVIEW' defval='0' docs='
 The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
@@ -1025,7 +1032,7 @@ When MathJax is enabled you need to specify the location relative to the
 HTML output directory using the MATHJAX_RELPATH option. The destination 
 directory should contain the MathJax.js script. For instance, if the mathjax 
 directory is located at the same level as the HTML output directory, then 
-MATHJAX_RELPATH should be ../mathjax. The default value points to the
+MATHJAX_RELPATH should be ../mathjax. The default value points to the 
 mathjax.org site, so you can quickly see the result without installing 
 MathJax, but it is strongly recommended to install a local copy of MathJax 
 before deployment.
@@ -1265,7 +1272,7 @@ PREDEFINED and EXPAND_AS_DEFINED tags.
 ' defval='0' depends='ENABLE_PREPROCESSING'/>
     <option type='bool' id='SEARCH_INCLUDES' docs='
 If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-in the INCLUDE_PATH (see below) will be search if a #include is found. 
+pointed to by INCLUDE_PATH will be searched when a #include is found. 
 ' defval='1' depends='ENABLE_PREPROCESSING'/>
     <option type='list' id='INCLUDE_PATH' format='dir' docs='
 The INCLUDE_PATH tag can be used to specify one or more directories that 
@@ -1294,7 +1301,7 @@ instead of the = operator.
 If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 this tag can be used to specify a list of macro names that should be expanded. 
 The macro definition that is found in the sources will be used. 
-Use the PREDEFINED tag if you want to use a different macro definition that
+Use the PREDEFINED tag if you want to use a different macro definition that 
 overrules the definition found in the source code. 
 ' depends='ENABLE_PREPROCESSING'>
     </option>
@@ -1458,7 +1465,7 @@ relations between the files in the directories.
 ' defval='1' depends='HAVE_DOT'/>
     <option type='enum' id='DOT_IMAGE_FORMAT' defval='png' docs='
 The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-generated by dot. Possible values are png, svg, gif or svg. 
+generated by dot. Possible values are svg, png, jpg, or gif. 
 If left blank png will be used. 
 ' depends='HAVE_DOT'>
       <value name='png'/>

src/configoptions.cpp

@@ -45,7 +45,9 @@ void addConfigOptions(Config *cfg)
   //----
   cs = cfg->addString(
                  "PROJECT_BRIEF",
-                 "Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short."
+                 "Using the PROJECT_BRIEF tag one can provide an optional one line description\n"
+                 "for a project that appears at the top of each page and should give viewer\n"
+                 "a quick idea about the purpose of the project. Keep the description short."
                 );
   //----
   cs = cfg->addString(
@@ -616,8 +618,11 @@ void addConfigOptions(Config *cfg)
   //----
   cb = cfg->addBool(
                  "STRICT_PROTO_MATCHING",
-                 "If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper type resolution of all parameters of a function it will reject a\n"
-                 "match between the prototype and the implementation of a member function even if there is only one candidate or it is obvious which candidate to choose by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen\n"
+                 "If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to\n"
+                 "do proper type resolution of all parameters of a function it will reject a\n"
+                 "match between the prototype and the implementation of a member function even\n"
+                 "if there is only one candidate or it is obvious which candidate to choose\n"
+                 "by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen\n"
                  "will still accept a match between prototype and implementation in such cases.",
                  FALSE
                 );
@@ -1114,7 +1119,13 @@ void addConfigOptions(Config *cfg)
                  "HTML_HEADER",
                  "The HTML_HEADER tag can be used to specify a personal HTML header for\n"
                  "each generated HTML page. If it is left blank doxygen will generate a\n"
-                 "standard header."
+                 "standard header. Note that when using a custom header you are responsible\n"
+                 "for the proper inclusion of any scripts and style sheets that doxygen\n"
+                 "needs, which is dependent on the configuration options used.\n"
+                 "It is adviced to generate a default header using \"doxygen -w html\n"
+                 "header.html footer.html stylesheet.css YourConfigFile\" and then modify\n"
+                 "that header. Note that the header is subject to change so you typically\n"
+                 "have to redo this when upgrading to a newer version of doxygen or when changing the value of configuration settings such as GENERATE_TREEVIEW!"
                 );
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_HTML");
@@ -1426,9 +1437,10 @@ void addConfigOptions(Config *cfg)
   //----
   ci = cfg->addInt(
                  "ENUM_VALUES_PER_LINE",
-                 "This tag can be used to set the number of enum values (range [0,1..20])\n"
-                 "that doxygen will group on one line in the generated HTML documentation.\n"
-                 "Note that a value of 0 will completely suppress the enum values from appearing in the overview section.",
+                 "The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values\n"
+                 "(range [0,1..20]) that doxygen will group on one line in the generated HTML\n"
+                 "documentation. Note that a value of 0 will completely suppress the enum\n"
+                 "values from appearing in the overview section.",
                  0,20,4
                 );
   ci->addDependency("GENERATE_HTML");
@@ -1510,7 +1522,8 @@ void addConfigOptions(Config *cfg)
                  "HTML output directory using the MATHJAX_RELPATH option. The destination\n"
                  "directory should contain the MathJax.js script. For instance, if the mathjax\n"
                  "directory is located at the same level as the HTML output directory, then\n"
-                 "MATHJAX_RELPATH should be ../mathjax. The default value points to the mathjax.org site, so you can quickly see the result without installing\n"
+                 "MATHJAX_RELPATH should be ../mathjax. The default value points to the\n"
+                 "mathjax.org site, so you can quickly see the result without installing\n"
                  "MathJax, but it is strongly recommended to install a local copy of MathJax\n"
                  "before deployment."
                 );
@@ -1914,7 +1927,7 @@ void addConfigOptions(Config *cfg)
   cb = cfg->addBool(
                  "SEARCH_INCLUDES",
                  "If the SEARCH_INCLUDES tag is set to YES (the default) the includes files\n"
-                 "in the INCLUDE_PATH (see below) will be search if a #include is found.",
+                 "pointed to by INCLUDE_PATH will be searched when a #include is found.",
                  TRUE
                 );
   cb->addDependency("ENABLE_PREPROCESSING");
@@ -1954,7 +1967,8 @@ void addConfigOptions(Config *cfg)
                  "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 that overrules the definition found in the source code."
+                 "Use the PREDEFINED tag if you want to use a different macro definition that\n"
+                 "overrules the definition found in the source code."
                 );
   cl->addDependency("ENABLE_PREPROCESSING");
   //----
@@ -2213,7 +2227,7 @@ void addConfigOptions(Config *cfg)
   ce = cfg->addEnum(
                  "DOT_IMAGE_FORMAT",
                  "The DOT_IMAGE_FORMAT tag can be used to set the image format of the images\n"
-                 "generated by dot. Possible values are png, svg, gif or svg.\n"
+                 "generated by dot. Possible values are svg, png, jpg, or gif.\n"
                  "If left blank png will be used.",
                  "png"
                 );

src/configoptions.h

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/constexp.h

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/constexp.l

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/constexp.y

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/cppvalue.cpp

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/cppvalue.h

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/debug.cpp

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/debug.h

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/declinfo.h

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/declinfo.l

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/defargs.h

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/defargs.l

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/defgen.cpp

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/defgen.h

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/define.cpp

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/define.h

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/definition.cpp

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/definition.h

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/diagram.cpp

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/diagram.h

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/dirdef.h

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/docparser.cpp

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 
@@ -2546,6 +2546,10 @@ void DocDotFile::parse()
 
   bool ambig;
   FileDef *fd = findFileDef(Doxygen::dotFileNameDict,m_name,ambig);
+  if (fd==0 && m_name.right(4)!=".dot") // try with .dot extension as well
+  {
+    fd = findFileDef(Doxygen::dotFileNameDict,m_name+".dot",ambig);
+  }
   if (fd)
   {
     m_file = fd->absFilePath();
@@ -2626,6 +2630,10 @@ void DocMscFile::parse()
 
   bool ambig;
   FileDef *fd = findFileDef(Doxygen::mscFileNameDict,m_name,ambig);
+  if (fd==0 && m_name.right(4)!=".msc") // try with .msc extension as well
+  {
+    fd = findFileDef(Doxygen::mscFileNameDict,m_name+".msc",ambig);
+  }
   if (fd)
   {
     m_file = fd->absFilePath();
@@ -2639,7 +2647,7 @@ void DocMscFile::parse()
   }
   else
   {
-    warn_doc_error(g_fileName,doctokenizerYYlineno,"warning: included dot file %s is not found "
+    warn_doc_error(g_fileName,doctokenizerYYlineno,"warning: included msc file %s is not found "
            "in any of the paths specified via MSCFILE_DIRS!",qPrint(m_name));
   }
 

src/docparser.h

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/docsets.cpp

 /******************************************************************************
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/docsets.h

 /******************************************************************************
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/doctokenizer.h

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/doctokenizer.l

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/docvisitor.h

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 

src/dot.cpp

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 
@@ -3526,10 +3526,10 @@ void writeDotGraphFromFile(const char *inFile,const char *outDir,
  *  \param context the scope in which this graph is found (for resolving links)
  */
 void writeDotImageMapFromFile(FTextStream &t,
-                            const QCString& inFile, const QCString& outDir,
-                            const QCString &relPath, const QCString &context)
+                            const QCString &inFile, const QCString &outDir,
+                            const QCString &relPath, const QCString &baseName,
+                            const QCString &context)
 {
-  QCString outFile = inFile + ".map";
 
   QDir d(outDir);
   if (!d.exists())
@@ -3537,17 +3537,19 @@ void writeDotImageMapFromFile(FTextStream &t,
     err("error: Output dir %s does not exist!\n",outDir.data()); exit(1);
   }
 
+  QCString mapName = baseName+".map";
+  QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgName = baseName+"."+imgExt;
+  QCString absOutFile = QCString(d.absPath())+"/"+mapName;
+
   DotRunner dotRun(inFile,d.absPath().data(),FALSE);
-  dotRun.addJob(MAP_CMD,outFile);
+  dotRun.addJob(MAP_CMD,absOutFile);
   dotRun.preventCleanUp();
   if (!dotRun.run())
   {
     return;
   }
 
-  QCString mapName = inFile+".map";
-  QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
-
   if (imgExt=="svg") // vector graphics
   {
     writeSVGFigureLink(t,relPath,inFile,inFile+".svg");
@@ -3557,16 +3559,15 @@ void writeDotImageMapFromFile(FTextStream &t,
   }
   else // bitmap graphics
   {
-    t << "<img src=\"" << relPath << inFile << "." 
-      << imgExt << "\" alt=\""
-      << inFile << "\" border=\"0\" usemap=\"#" << mapName << "\">" << endl
+    t << "<img src=\"" << relPath << imgName << "\" alt=\""
+      << imgName << "\" border=\"0\" usemap=\"#" << mapName << "\">" << endl
       << "<map name=\"" << mapName << "\" id=\"" << mapName << "\">";
 
-    convertMapFile(t, outFile, relPath ,TRUE, context);
+    convertMapFile(t, absOutFile, relPath ,TRUE, context);
 
     t << "</map>" << endl;
   }
-  d.remove(outFile);
+  d.remove(absOutFile);
 }
 
 //-------------------------------------------------------------

src/dot.h

@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 
@@ -442,7 +442,8 @@ void writeDotGraphFromFile(const char *inFile,const char *outDir,
                            const char *outFile,GraphOutputFormat format);
 void writeDotImageMapFromFile(FTextStream &t,
                               const QCString& inFile, const QCString& outDir,
-                              const QCString& relPath,const QCString& context);
+                              const QCString& relPath,const QCString& baseName,
+                              const QCString& context);
 
 void writeDotDirDepGraph(FTextStream &t,DirDef *dd);
 

src/doxygen.cpp

 /******************************************************************************
  *
- * Copyright (C) 1997-2010 by Dimitri van Heesch.
+ * Copyright (C) 1997-2011 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 
@@ -9134,7 +9134,7 @@ void dumpConfigAsXML()
 
 static void usage(const char *name)
 {
-  msg("Doxygen version %s\nCopyright Dimitri van Heesch 1997-2010\n\n",versionString);
+  msg("Doxygen version %s\nCopyright Dimitri van Heesch 1997-2011\n\n",versionString);
   msg("You can use doxygen in a number of ways:\n\n");
   msg("1) Use doxygen to generate a template configuration file:\n");
   msg("    %s [-s] -g [configName]\n\n",name);
@@ -9393,9 +9393,10 @@ void readConfiguration(int argc, char **argv)
         }
         else if (stricmp(formatName,"html")==0)
         {
-          if (optind+4<argc)
+          if (optind+4<argc || QFileInfo("Doxyfile").exists())
           {
-            if (!Config::instance()->parse(argv[optind+4]))
+            QCString df = optind+4<argc ? argv[optind+4] : QCString("Doxyfile");
+            if (!Config::instance()->parse(df))
             {
               err("error opening or reading configuration file %s!\n",argv[optind+4]);
               cleanUpDoxygen();
@@ -9403,6 +9404,10 @@ void readConfiguration(int argc, char **argv)
             }
             Config::instance()->substituteEnvironmentVars();
             Config::instance()->convertStrToVal();
+            // avoid bootstrapping issues when the config file already
+            // refers to the files that we are supposed to parse.
+            Config_getString("HTML_HEADER")="";
+            Config_getString("HTML_FOOTER")="";
             Config::instance()->check();
           }
           else
@@ -9451,6 +9456,7 @@ void readConfiguration(int argc, char **argv)
             }
             Config::instance()->substituteEnvironmentVars();
             Config::instance()->convertStrToVal();
+            Config_getString("LATEX_HEADER")="";
             Config::instance()->check();
           }
           else // use default config