Release-1.5.4-20080101

Doxyfile

-# Doxyfile 1.5.2
+# Doxyfile 1.5.4
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -28,10 +28,13 @@ TAB_SIZE               = 8
 ALIASES                = 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 OPTIMIZE_OUTPUT_JAVA   = NO
+OPTIMIZE_FOR_FORTRAN   = NO
 BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
+SIP_SUPPORT            = NO
 DISTRIBUTE_GROUP_DOC   = NO
 SUBGROUPING            = YES
+TYPEDEF_HIDES_STRUCT   = NO
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -40,6 +43,7 @@ EXTRACT_PRIVATE        = NO
 EXTRACT_STATIC         = YES
 EXTRACT_LOCAL_CLASSES  = YES
 EXTRACT_LOCAL_METHODS  = NO
+EXTRACT_ANON_NSPACES   = NO
 HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -69,7 +73,7 @@ WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
-WARN_FORMAT            = "$file:$line: $text"
+WARN_FORMAT            = "$file:$line: $text "
 WARN_LOGFILE           = 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
@@ -100,7 +104,9 @@ EXCLUDE                = src/code.cpp \
                          src/config.cpp \
                          src/pyscanner.cpp \
                          src/fortranscanner.cpp \
-                         src/fortrancode.cpp
+                         src/fortrancode.cpp \
+                         src/vhdlscanner.cpp \
+                         src/vhdlcode.cpp
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = 
 EXCLUDE_SYMBOLS        = 
@@ -139,6 +145,9 @@ HTML_FOOTER            =
 HTML_STYLESHEET        = 
 HTML_ALIGN_MEMBERS     = YES
 GENERATE_HTMLHELP      = NO
+GENERATE_DOCSET        = YES
+DOCSET_FEEDNAME        = "Doxygen docs"
+DOCSET_BUNDLE_ID       = org.doxygen.Doxygen
 HTML_DYNAMIC_SECTIONS  = YES
 CHM_FILE               = 
 HHC_LOCATION           = 

INSTALL

-DOXYGEN Version 1.5.4
+DOXYGEN Version 1.5.4-20080101
 
 Please read the installation section of the manual 
 (http://www.doxygen.org/install.html) for instructions.
 
 --------
-Dimitri van Heesch (26 October 2007)
+Dimitri van Heesch (01 January 2008)

PLATFORMS

@@ -23,6 +23,7 @@ osf1-g++
 qnx-g++
 sco-g++
 solaris-cc
+solaris-cc-64
 solaris-g++
 sunos-g++
 ultrix-g++

README

-DOXYGEN Version 1.5.4
+DOXYGEN Version 1.5.4_20080101
 
 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) (26 October 2007)
+Dimitri van Heesch (dimitri@stack.nl) (01 January 2008)

addon/doxyapp/Makefile.in

 
-all clean depend: Makefile.doxyapp 
+all clean depend distclean: Makefile.doxyapp 
 	$(MAKE) -f Makefile.doxyapp $@
 
 distclean: clean

addon/doxywizard/Makefile.in

 #
-# $Id$
 # 
-# Copyright (C) 1997-2007 by Dimitri van Heesch.
+#
+# Copyright (C) 1997-2008 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/Makefile.win_nmake.in

 #
-# $Id$
 # 
-# Copyright (C) 1997-2007 by Dimitri van Heesch.
+#
+# Copyright (C) 1997-2008 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/doxywizard.pro.in

 #
-# $Id$
 # 
-# Copyright (C) 1997-2007 by Dimitri van Heesch.
+#
+# Copyright (C) 1997-2008 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/doxywizard.t

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

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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/expert.h

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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/qtbc.h

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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-2005 by Dimitri van Heesch.
+# Copyright (C) 1997-2008 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=5
 doxygen_version_revision=4
 
 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package.
-doxygen_version_mmn=NO
+doxygen_version_mmn=20080101
 
 bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
 
@@ -159,9 +159,6 @@ if test -z "$f_platform"; then
       if test "$f_insttool" = NO; then
         f_insttool=/usr/bin/install
       fi
-      if test -n "`ls /Developer/SDKs/MacOSX10.*u.sdk`"; then
-        f_platform=macosx-uni-c++
-      fi
       ;;
     FreeBSD:*)
       f_platform=freebsd-g++
@@ -516,6 +513,21 @@ if test "$f_platform" = "hpux-g++"; then
     TMAKE_CXXFLAGS += -D_LARGEFILE_SOURCE
 EOF
 fi
+if test "$f_platform" = "macosx-uni-c++"; then
+  if test -n "`ls /Developer/SDKs/MacOSX10.*.sdk`"; then
+    mac_sdk=MacOSX10.4u.sdk
+  fi
+  if test -n "`ls /Developer/SDKs/MacOSX10.5*.sdk`"; then
+    mac_sdk=MacOSX10.5.sdk
+  fi
+  if test -n $mac_sdk; then
+  cat >> .tmakeconfig <<EOF
+    TMAKE_CFLAGS   += -isysroot /Developer/SDKs/$mac_sdk
+    TMAKE_CXXFLAGS += -isysroot /Developer/SDKs/$mac_sdk
+    TMAKE_LFLAGS   += -Wl,-syslibroot,/Developer/SDKs/$mac_sdk
+EOF
+  fi
+fi
 if test "$f_wizard" = YES; then
   cat >> .tmakeconfig <<EOF
 TMAKE_MOC = $QTDIR/bin/moc
@@ -597,7 +609,7 @@ fi
 echo -n "  Generating src/lang_cfg.h..."
 echo $f_langs | $f_perl -e '@l=split(/,/,<STDIN>); 
         chomp @l; 
-	@allowed=(split(/,/,"NL,SE,CZ,FR,ID,IT,DE,JP,JE,ES,FI,RU,HR,PL,PT,HU,KR,KE,RO,SI,CN,NO,BR,DK,SK,UA,GR,TW,SR,CA,LT,ZA,AR,FA"));
+	@allowed=(split(/,/,"NL,SE,CZ,FR,ID,IT,DE,JP,JE,ES,FI,RU,HR,PL,PT,HU,KR,KE,RO,SI,CN,NO,MK,BR,DK,SK,UA,GR,TW,SR,CA,LT,ZA,AR,FA"));
 	foreach my $elem (@l){ 
 	     $elem =~ tr/a-z/A-Z/;
 	     $r=0;

doc/Makefile.in

 #
 # 
 #
-# Copyright (C) 1997-2007 by Dimitri van Heesch.
+# Copyright (C) 1997-2008 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-2007 by Dimitri van Heesch.
+# Copyright (C) 1997-2008 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-2007 by Dimitri van Heesch.
+# Copyright (C) 1997-2008 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-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2008 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-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2008 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-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2008 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-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2008 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 
@@ -79,6 +79,8 @@ followed by the descriptions of the tags grouped by category.
 \refitem cfg_directory_graph DIRECTORY_GRAPH
 \refitem cfg_disable_index DISABLE_INDEX 
 \refitem cfg_distribute_group_doc DISTRIBUTE_GROUP_DOC
+\refitem cfg_docset_bundle_id DOCSET_BUNDLE_ID
+\refitem cfg_docset_feedname DOCSET_FEEDNAME
 \refitem cfg_dot_graph_max_nodes DOT_GRAPH_MAX_NODES
 \refitem cfg_dot_image_format DOT_IMAGE_FORMAT
 \refitem cfg_dot_multi_targets DOT_MULTI_TARGETS
@@ -114,6 +116,7 @@ followed by the descriptions of the tags grouped by category.
 \refitem cfg_generate_buglist GENERATE_BUGLIST
 \refitem cfg_generate_chi GENERATE_CHI
 \refitem cfg_generate_deprecatedlist GENERATE_DEPRECIATEDLIST
+\refitem cfg_generate_docset GENERATE_DOCSET
 \refitem cfg_generate_html GENERATE_HTML
 \refitem cfg_generate_htmlhelp GENERATE_HTMLHELP
 \refitem cfg_generate_latex GENERATE_LATEX
@@ -169,8 +172,10 @@ followed by the descriptions of the tags grouped by category.
 \refitem cfg_max_initializer_lines MAX_INITIALIZER_LINES
 \refitem cfg_mscgen_path MSCGEN_PATH
 \refitem cfg_multiline_cpp_is_brief MULTILINE_CPP_IS_BRIEF
+\refitem cfg_optimize_for_fortran OPTIMIZE_FOR_FORTRAN
 \refitem cfg_optimize_output_for_c OPTIMIZE_OUTPUT_FOR_C
 \refitem cfg_optimize_output_java OPTIMIZE_OUTPUT_JAVA
+\refitem cfg_optimize_output_vhdl OPTIMIZE_OUTPUT_VHDL
 \refitem cfg_output_directory OUTPUT_DIRECTORY
 \refitem cfg_output_language OUTPUT_LANGUAGE
 \refitem cfg_paper_type PAPER_TYPE
@@ -514,6 +519,18 @@ followed by the descriptions of the tags grouped by category.
  for that language. For instance, namespaces will be presented as packages, 
  qualified scopes will look different, etc. 
 
+\anchor cfg_optimize_for_fortran
+<dt>\c OPTIMIZE_FOR_FORTRAN <dd>
+ \addindex OPTIMIZE_FOR_FORTRAN
+Set the \c OPTIMIZE_FOR_FORTRAN tag to \c YES if your project consists of Fortran 
+sources. Doxygen will then generate output that is tailored for Fortran.
+
+\anchor cfg_optimize_output_vhdl
+<dt>\c OPTIMIZE_OUTPUT_VHDL <dd>
+ \addindex OPTIMIZE_OUTPUT_VHDL
+Set the \c OPTIMIZE_OUTPUT_VHDL tag to \c YES if your project consists of VHDL 
+sources. Doxygen will then generate output that is tailored for VHDL.
+
 \anchor cfg_subgrouping
 <dt>\c SUBGROUPING <dd>
  \addindex SUBGROUPING
@@ -1179,6 +1196,35 @@ FILE_VERSION_INFO = "cleartool desc -fmt \%Vn"
  and you can search for words in the documentation.
  The HTML workshop also contains a viewer for compressed HTML files.
 
+\anchor cfg_generate_docset
+<dt>\c GENERATE_DOCSET <dd>
+ \addindex GENERATE_DOCSET
+ If the \c GENERATE_DOCSET tag is set to \c YES, additional index files
+ will be generated that can be used as input for 
+ <a href="http://developer.apple.com/tools/xcode/">Apple's Xcode 3
+ integrated development environment</a>, introduced with OSX 10.5 (Leopard).
+ To create a documentation set, doxygen will generate a Makefile in the
+ HTML output directory. Running \c make will produce the docset in that
+ directory and running <code>make install</code> will install the docset in 
+ <code>~/Library/Developer/Shared/Documentation/DocSets</code> 
+ so that Xcode will find it at startup.
+
+
+\anchor cfg_docset_feedname 
+<dt>\c DOCSET_FEEDNAME <dd>
+ \addindex DOCSET_FEEDNAME
+ When \c GENERATE_DOCSET tag is set to \c YES, this tag determines the name of the
+ feed. A documentation feed provides an umbrella under which multiple
+ documentation sets from a single provider (such as a company or product suite) 
+ can be grouped.
+
+\anchor cfg_docset_bundle_id
+<dt>\c DOCSET_BUNDLE_ID <dd>
+ When \c GENERATE_DOCSET tag is set to \c YES, this tag specifies a string that
+ should uniquely identify the documentation set bundle. This should be a
+ reverse domain-name style string, e.g. <code>com.mycompany.MyDocSet</code>. 
+ Doxygen will append <code>.docset</code> to the name.
+
 \anchor cfg_html_dynamic_sections
 <dt>\c HTML_DYNAMIC_SECTIONS <dd>
  \addindex HTML_DYNAMIC_SECTIONS
@@ -1817,7 +1863,7 @@ TAGFILES = file1=loc1 "file2 = loc2" ... </pre>
  becomes larger than this value, doxygen will truncate the graph, which is 
  visualized by representing a node as a red box. Note that doxygen if the number
  of direct children of the root node in a graph is already larger than
- \c MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note
+ \c DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
  that the size of a graph can be further restricted by \c MAX_DOT_GRAPH_DEPTH.
 
 \anchor cfg_max_dot_graph_depth
@@ -1855,7 +1901,7 @@ TAGFILES = file1=loc1 "file2 = loc2" ... </pre>
 <dt>\c DOT_TRANSPARENT <dd>
  \addindex DOT_TRANSPARENT
  Set the \c DOT_TRANSPARENT tag to \c YES to generate images with a transparent 
- background. This is disabled by default, which results in a white background. 
+ background. This is enabled by default, which results in a transparent background. 
  Warning: Depending on the platform used, enabling this option may lead to badly
  anti-aliased labels on the edges of a graph (i.e. they become hard to read).
  

doc/custcmd.doc

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2008 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-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2008 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-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2008 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,9 +20,9 @@
 
 A special documentation block is a C or C++ style comment block with some 
 additional markings, so doxygen knows it is a piece of documentation that
-needs to end up in the generated documentation. For Python code there is
-a different comment convention, which can be found in section 
-\ref pythonblocks
+needs to end up in the generated documentation. For Python and VHDL
+code there are a different comment conventions, which can be found in section 
+\ref pythonblocks and \ref vhdlblocks respectively.
 
 For each code item there are two (or in some cases three) types of descriptions, 
 which together form the documentation: a \e brief description and \e detailed
@@ -414,4 +414,30 @@ Go to the <a href="lists.html">next</a> section or return to the
  <a href="index.html">index</a>.
 \endhtmlonly
 
+\section vhdlblocks Special documentation blocks in VHDL
+
+For VHDL a comment normally start with "--". Doxygen will extract comments
+starting with "--!". There are only two types of comment blocks in VHDL;
+a one line --! comment representing a brief description, and a multiline
+--! comment (where the --! prefix is repeated for each line) representing
+a detailed description.
+
+Comments are always located in front of the item that is being documented
+with one exception: for ports the comment can also be after the item
+and is then treated as a brief description for the port.
+
+Here is an example VHDL file with doxygen comments:
+
+\include  mux.vhdl
+ \htmlonly
+ Click <a href="$(DOXYGEN_DOCDIR)/examples/mux/html/index.html">here</a>
+ for the corresponding HTML documentation that is generated by doxygen.
+ \endhtmlonly
+
+To get proper looking output you need to set
+\ref cfg_optimize_output_vhdl "OPTIMIZE_OUTPUT_VHDL" to \c YES in the
+config file. This will also affect a number of other settings. When they
+were not already set correctly doxygen will produce a warning telling which
+settings where overruled.
+
 */

doc/doxygen_usage.doc

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

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

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

@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2008 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 
@@ -27,7 +27,7 @@ Version: $(VERSION)
 
 <h2>Introduction</h2>
 Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL 
-(Corba and Microsoft flavors) and to some extent PHP, C#, and D.
+(Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extend D.
 
 It can help you in three ways:
 <ol>
@@ -116,7 +116,7 @@ The third part provides information for developers:
 \addindex license
 \addindex GPL
 
-Copyright &copy; 1997-2007 by 
+Copyright &copy; 1997-2008 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-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2008 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-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2008 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

@@ -23,13 +23,14 @@ 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.5.3), 33 languages 
+Currently (version 1.5.4), 34 languages 
 are supported (sorted alphabetically):
 Afrikaans, Arabic, Brazilian Portuguese, Catalan, Chinese, Chinese
 Traditional, Croatian, Czech, Danish, Dutch, English, Finnish, French,
 German, Greek, Hungarian, Indonesian, Italian, Japanese (+En), Korean
-(+En), Lithuanian, Norwegian, Persian, Polish, Portuguese, Romanian,
-Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian..
+(+En), Lithuanian, Macedonian, Norwegian, Persian, Polish, Portuguese,
+Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and
+Ukrainian..
 
 The table of information related to the supported languages follows.
 It is sorted by language alphabetically.  The <b>Status</b> column
@@ -66,19 +67,19 @@ when the translator was updated.
     <td>Brazilian Portuguese</td>
     <td>Fabio "FJTC" Jun Takada Chino</td>
     <td>jun-chino at uol dot com dot br</td>
-    <td>up-to-date</td>
+    <td>1.5.4</td>
   </tr>
   <tr bgcolor="#ffffff">
     <td>Catalan</td>
     <td>Maximiliano Pin<br>Albert Mora</td>
     <td>mcpin at emtesistemas dot com<br>amora at iua dot upf dot es</td>
-    <td>up-to-date</td>
+    <td>1.5.4</td>
   </tr>
   <tr bgcolor="#ffffff">
     <td>Chinese</td>
     <td>Li Daobing<br>Wei Liu</td>
     <td>lidaobing at gmail dot com<br>liuwei at asiainfo dot com</td>
-    <td>up-to-date</td>
+    <td>1.5.4</td>
   </tr>
   <tr bgcolor="#ffffff">
     <td>Chinese Traditional</td>
@@ -102,7 +103,7 @@ when the translator was updated.
     <td>Danish</td>
     <td>Erik S&oslash;e S&oslash;rensen</td>
     <td>eriksoe+doxygen at daimi dot au dot dk</td>
-    <td>up-to-date</td>
+    <td>1.5.4</td>
   </tr>
   <tr bgcolor="#ffffff">
     <td>Dutch</td>
@@ -126,19 +127,19 @@ when the translator was updated.
     <td>French</td>
     <td>Xavier Outhier</td>
     <td>xouthier at yahoo dot fr</td>
-    <td>up-to-date</td>
+    <td>1.5.4</td>
   </tr>
   <tr bgcolor="#ffffff">
     <td>German</td>
     <td>Jens Seidel</td>
     <td>jensseidel at users dot sf dot net</td>
-    <td>up-to-date</td>
+    <td>1.5.4</td>
   </tr>
   <tr bgcolor="#ffffff">
     <td>Greek</td>
     <td>Paul Gessos</td>
     <td>nickreserved at yahoo dot com</td>
-    <td>up-to-date</td>
+    <td>1.5.4</td>
   </tr>
   <tr bgcolor="#ffffff">
     <td>Hungarian</td>
@@ -162,7 +163,7 @@ when the translator was updated.
     <td>Japanese</td>
     <td>Ryunosuke Satoh<br>Kenji Nagamatsu<br>Iwasa Kazmi</td>
     <td>sun594 at hotmail dot com<br>naga at joyful dot club dot ne dot jp<br>iwasa at cosmo-system dot jp</td>
-    <td>up-to-date</td>
+    <td>1.5.4</td>
   </tr>
   <tr bgcolor="#ffffff">
     <td>JapaneseEn</td>
@@ -188,6 +189,12 @@ when the translator was updated.
     <td>haden at homelan dot lt<br>mindaugasradzius at takas dot lt<br>aidasber at takas dot lt</td>
     <td>1.4.6</td>
   </tr>
+  <tr bgcolor="#ffffff">
+    <td>Macedonian</td>
+    <td>Slave Jovanovski</td>
+    <td>slavejovanovski at yahoo dot com</td>
+    <td>1.5.04</td>
+  </tr>
   <tr bgcolor="#ffffff">
     <td>Norwegian</td>
     <td>Lars Erik Jordet</td>
@@ -222,7 +229,7 @@ when the translator was updated.
     <td>Russian</td>
     <td>Alexandr Chelpanov</td>
     <td>cav at cryptopro dot ru</td>
-    <td>up-to-date</td>
+    <td>1.5.4</td>
   </tr>
   <tr bgcolor="#ffffff">
     <td>Serbian</td>
@@ -246,7 +253,7 @@ when the translator was updated.
     <td>Spanish</td>
     <td>Bartomeu<br>Francisco Oltra Thennet</td>
     <td>bartomeu at loteria3cornella dot com<br>foltra at puc dot cl</td>
-    <td>up-to-date</td>
+    <td>1.5.4</td>
   </tr>
   <tr bgcolor="#ffffff">
     <td>Swedish</td>
@@ -279,12 +286,12 @@ when the translator was updated.
   \hline
   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 \\
+  Brazilian Portuguese & Fabio "FJTC" Jun Takada Chino & {\tt\tiny jun-chino@uol.com.br} & 1.5.4 \\
   \hline
-  Catalan & Maximiliano Pin & {\tt\tiny mcpin@emtesistemas.com} & up-to-date \\
+  Catalan & Maximiliano Pin & {\tt\tiny mcpin@emtesistemas.com} & 1.5.4 \\
   ~ & Albert Mora & {\tt\tiny amora@iua.upf.es} & ~ \\
   \hline
-  Chinese & Li Daobing & {\tt\tiny lidaobing@gmail.com} & up-to-date \\
+  Chinese & Li Daobing & {\tt\tiny lidaobing@gmail.com} & 1.5.4 \\
   ~ & Wei Liu & {\tt\tiny liuwei@asiainfo.com} & ~ \\
   \hline
   Chinese Traditional & Daniel YC Lin & {\tt\tiny dlin@taifex.com.tw} & 1.4.6 \\
@@ -294,7 +301,7 @@ when the translator was updated.
   \hline
   Czech & Petr P\v{r}ikryl & {\tt\tiny prikrylp@skil.cz} & up-to-date \\
   \hline
-  Danish & Erik S\o{}e S\o{}rensen & {\tt\tiny eriksoe+doxygen@daimi.au.dk} & up-to-date \\
+  Danish & Erik S\o{}e S\o{}rensen & {\tt\tiny eriksoe+doxygen@daimi.au.dk} & 1.5.4 \\
   \hline
   Dutch & Dimitri van Heesch & {\tt\tiny dimitri@stack.nl} & up-to-date \\
   \hline
@@ -302,11 +309,11 @@ 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} & up-to-date \\
+  French & Xavier Outhier & {\tt\tiny xouthier@yahoo.fr} & 1.5.4 \\
   \hline
-  German & Jens Seidel & {\tt\tiny jensseidel@users.sf.net} & up-to-date \\
+  German & Jens Seidel & {\tt\tiny jensseidel@users.sf.net} & 1.5.4 \\
   \hline
-  Greek & Paul Gessos & {\tt\tiny nickreserved@yahoo.com} & up-to-date \\
+  Greek & Paul Gessos & {\tt\tiny nickreserved@yahoo.com} & 1.5.4 \\
   \hline
   Hungarian & \'{A}kos Kiss & {\tt\tiny akiss@users.sourceforge.net} & 1.4.6 \\
   ~ & F\"{o}ldv\'{a}ri Gy\"{o}rgy & {\tt\tiny foldvari lost@cyberspace} & ~ \\
@@ -316,7 +323,7 @@ when the translator was updated.
   Italian & Alessandro Falappa & {\tt\tiny alessandro@falappa.net} & up-to-date \\
   ~ & Ahmed Aldo Faisal & {\tt\tiny aaf23@cam.ac.uk} & ~ \\
   \hline
-  Japanese & Ryunosuke Satoh & {\tt\tiny sun594@hotmail.com} & up-to-date \\
+  Japanese & Ryunosuke Satoh & {\tt\tiny sun594@hotmail.com} & 1.5.4 \\
   ~ & Kenji Nagamatsu & {\tt\tiny naga@joyful.club.ne.jp} & ~ \\
   ~ & Iwasa Kazmi & {\tt\tiny iwasa@cosmo-system.jp} & ~ \\
   \hline
@@ -332,6 +339,8 @@ when the translator was updated.
   ~ & Mindaugas Radzius & {\tt\tiny mindaugasradzius@takas.lt} & ~ \\
   ~ & Aidas Berukstis & {\tt\tiny aidasber@takas.lt} & ~ \\
   \hline
+  Macedonian & Slave Jovanovski & {\tt\tiny slavejovanovski@yahoo.com} & 1.5.04 \\
+  \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 \\
@@ -343,7 +352,7 @@ when the translator was updated.
   \hline
   Romanian & Alexandru Iosup & {\tt\tiny aiosup@yahoo.com} & 1.4.1 \\
   \hline
-  Russian & Alexandr Chelpanov & {\tt\tiny cav@cryptopro.ru} & up-to-date \\
+  Russian & Alexandr Chelpanov & {\tt\tiny cav@cryptopro.ru} & 1.5.4 \\
   \hline
   Serbian & Dejan Milosavljevic & {\tt\tiny dmilos@email.com} & 1.4.1 \\
   \hline
@@ -351,7 +360,7 @@ when the translator was updated.
   \hline
   Slovene & Matja\v{z} Ostrover\v{s}nik & {\tt\tiny matjaz.ostroversnik@ostri.org} & 1.4.6 \\
   \hline
-  Spanish & Bartomeu & {\tt\tiny bartomeu@loteria3cornella.com} & up-to-date \\
+  Spanish & Bartomeu & {\tt\tiny bartomeu@loteria3cornella.com} & 1.5.4 \\
   ~ & Francisco Oltra Thennet & {\tt\tiny foltra@puc.cl} & ~ \\
   \hline
   Swedish & Mikael Hallin & {\tt\tiny mikaelhallin@yahoo.se} & 1.4.6 \\

doc/maintainers.txt

@@ -86,6 +86,9 @@ Aidas Berukstis: aidasber@takas.lt
 TranslatorNorwegian
 Lars Erik Jordet: lejordet@gmail.com
 
+TranslatorMacedonian
+Slave Jovanovski: slavejovanovski@yahoo.com
+
 TranslatorPersian
 Ali Nadalizadeh: nadalisoft@yahoo.com
 
@@ -121,4 +124,3 @@ Mikael Hallin: mikaelhallin@yahoo.se
 TranslatorUkrainian
 Olexij Tkatchenko: olexij.tkatchenko@parcs.de
 
-

doc/output.doc

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

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

examples/Makefile.in

@@ -23,13 +23,14 @@ all: class/html/index.html \
      diagrams/html/index.html \
      memgrp/html/index.html \
      docstring/html/index.html \
-     pyexample/html/index.html
+     pyexample/html/index.html \
+     mux/html/index.html
 
 clean:
 	rm -rf  class define enum file func page relates author \
                 par overload example include qtstyle jdstyle structcmd \
 		autolink tag restypedef afterdoc template tag group diagrams \
-		memgrp docstring pyexample
+		memgrp docstring pyexample mux
 
 class/html/index.html: class.h class.cfg
 	$(DOXYGEN)/bin/doxygen class.cfg
@@ -102,6 +103,9 @@ memgrp/html/index.html: memgrp.cpp memgrp.cfg
 pyexample/html/index.html: pyexample.py pyexample.cfg
 	$(DOXYGEN)/bin/doxygen pyexample.cfg
 
+mux/html/index.html: mux.vhdl mux.cfg
+	$(DOXYGEN)/bin/doxygen mux.cfg
+
 docstring/html/index.html: docstring.py docstring.cfg
 	$(DOXYGEN)/bin/doxygen docstring.cfg
 

examples/Makefile.win.in

@@ -24,14 +24,15 @@ all: class/html/index.html \
      diagrams/html/index.html \
      memgrp/html/index.html \
      docstring/html/index.html \
-     pyexample/html/index.html
+     pyexample/html/index.html \
+     mux/html/index.html
 
 clean:
-	deltree /y class define enum file pyexample docstring
-	deltree /y func page relates author
-	deltree /y par overload example include qtstyle 
-	deltree /y jdstyle structcmd autolink resdefine 
-	deltree /y restypedef afterdoc template tag group diagrams memgrp
+	del /s/y class define enum file pyexample docstring
+	del /s/y func page relates author
+	del /s/y par overload example include qtstyle 
+	del /s/y jdstyle structcmd autolink resdefine mux
+	del /s/y restypedef afterdoc template tag group diagrams memgrp
 
 class/html/index.html: class.h class.cfg
 	$(DOXYDIR)\doxygen class.cfg
@@ -102,6 +103,9 @@ memgrp/html/index.html: memgrp.cpp memgrp.cfg
 pyexample/html/index.html: pyexample.py pyexample.cfg
 	$(DOXYDIR)\doxygen pyexample.cfg
 
+mux/html/index.html: mux.vhdl mux.cfg
+	$(DOXYDIR)\doxygen mux.cfg
+
 docstring/html/index.html: docstring.py docstring.cfg
 	$(DOXYDIR)\doxygen docstring.cfg
 	

examples/mux.cfg

+PROJECT_NAME         = Mux
+OUTPUT_DIRECTORY     = mux
+GENERATE_LATEX       = NO
+GENERATE_MAN         = NO
+GENERATE_RTF         = NO
+CASE_SENSE_NAMES     = NO
+INPUT                = mux.vhdl
+OPTIMIZE_OUTPUT_VHDL = YES
+QUIET                = YES
+INHERIT_DOCS         = YES
+EXTRACT_PRIVATE      = YES
+HIDE_SCOPE_NAMES     = YES
+INHERIT_DOCS         = NO

examples/mux.vhdl

+-------------------------------------------------------
+--! @file
+--! @brief 2:1 Mux using with-select
+-------------------------------------------------------
+
+--! Use standard library
+library ieee;
+--! Use logic elements
+    use ieee.std_logic_1164.all;
+
+--! Mux entity brief description
+
+--! Detailed description of this 
+--! mux design element.
+entity mux_using_with is
+    port (
+        din_0   : in  std_logic; --! Mux first input
+        din_1   : in  std_logic; --! Mux Second input
+        sel     : in  std_logic; --! Select input
+        mux_out : out std_logic  --! Mux output
+    );
+end entity;
+
+--! @brief Architure definition of the MUX
+--! @details More details about this mux element.
+architecture behavior of mux_using_with is
+begin
+    with (sel) select
+    mux_out <= din_0 when '0',
+               din_1 when others;
+end architecture;
+

packages/rpm/doxygen-nodoxywizard.spec.in

@@ -17,7 +17,6 @@ BuildRoot: %{buildroot}
 BuildPrereq: libstdc++-devel >= 2.96, /usr/bin/perl, /usr/bin/latex, /usr/bin/dvips
 Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv, libstdc++ >= 2.96
 Provides: doxygen = %{mmn}
-#Obsoletes: doxygen-20050927
 
 %description
 Doxygen can generate an online class browser (in HTML) and/or a
@@ -26,30 +25,17 @@ documentation is extracted directly from the sources. Doxygen can
 also be configured to extract the code structure from undocumented
 source files.
 
-%package manual
-Group: Documentation
-Summary: Documentation for doxygen.
-Provides: doxygenmanual = %{mmn}
-#Obsoletes: 
-
-%description manual
-This contains the manpages for doxygen.  The information can also be
-found at http://www.doxygen.org/.
-
 %prep
 %setup -q -n %{name}-%{version}_%{revision}
 ./configure --prefix $RPM_BUILD_ROOT/usr
 
 %build
 make %{?_smp_mflags}
-make pdf %{?_smp_mflags}
+make %{?_smp_mflags} pdf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 make install
-mkdir -p $RPM_BUILD_ROOT/usr/share/doxygen
-cp -f ./latex/*.pdf $RPM_BUILD_ROOT/usr/share/doxygen
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,17 +43,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 
-%doc README LICENSE LANGUAGE.HOWTO examples
+%doc README LICENSE LANGUAGE.HOWTO examples ./latex/*.pdf
+%doc /usr/man/man1/doxygen.1.gz
+%doc /usr/man/man1/doxytag.1.gz
 
 %{_bindir}/doxygen
 %{_bindir}/doxytag
 
-%files manual
-%defattr(-,root,root)
-/usr/share/doxygen/*.pdf
-%doc /usr/man/man1/doxy*
-
 %changelog
+* Sun Nov 18 2007 Kevin McBride <kevin@planetsaphire.com> 1.5.4
+- consolidated manual package in lieu of --excludedocs flag for rpm --install
+
 * Fri Oct 21 2005 Kevin McBride <kevin@planetsaphire.com> 1.4.5
 - made .spec file compatible with tmake
 

packages/rpm/doxygen.spec

 %define version 1.5.4
-%define revision 1
-%define mmn 1
+%define revision 20080101
+%define mmn 20080101
 %define name doxygen
 
 %define contentdir /var/www
@@ -20,7 +20,6 @@ BuildRoot: %{buildroot}
 BuildPrereq: libstdc++-devel >= 2.96, /usr/bin/perl, /usr/bin/latex, /usr/bin/dvips
 Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv, libstdc++ >= 2.96
 Provides: doxygen = %{mmn}
-#Obsoletes: doxygen-20050927
 
 %description
 Doxygen can generate an online class browser (in HTML) and/or a
@@ -29,48 +28,17 @@ documentation is extracted directly from the sources. Doxygen can
 also be configured to extract the code structure from undocumented
 source files.
 
-%package doxywizard
-Group: Development/Libraries
-Summary: GUI Interface for doxygen.
-Requires: doxygen = %{mmn}
-Requires: qt >= 3.3
-Provides: doxywizard = %{mmn}
-# Obsoletes:
-
-%description doxywizard
-Doxygen can generate an online class browser (in HTML) and/or a
-reference manual (in LaTeX) from a set of documented source files. The
-documentation is extracted directly from the sources. Doxygen can
-also be configured to extract the code structure from undocumented
-source files.
-
-This is the GUI interface for doxygen.  It requires qt and X11 to
-install.
-
-%package manual
-Group: Documentation
-Summary: Documentation for doxygen.
-Provides: doxygenmanual = %{mmn}
-#Obsoletes: 
-
-%description manual
-This contains the manpages for doxygen.  The information can also be
-found at http://www.doxygen.org/.
-
 %prep
 %setup -q -n %{name}-%{version}_%{revision}
-./configure --with-doxywizard --prefix $RPM_BUILD_ROOT/usr
+./configure --prefix $RPM_BUILD_ROOT/usr
 
 %build
 make %{?_smp_mflags}
-make pdf %{?_smp_mflags}
+make %{?_smp_mflags} pdf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 make install
-mkdir -p $RPM_BUILD_ROOT/usr/share/doxygen
-cp -f ./latex/*.pdf $RPM_BUILD_ROOT/usr/share/doxygen
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -78,21 +46,20 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 
-%doc README LICENSE LANGUAGE.HOWTO examples
+%doc README LICENSE LANGUAGE.HOWTO examples ./latex/*.pdf
+%doc /usr/man/man1/doxygen.1.gz
+%doc /usr/man/man1/doxytag.1.gz
 
 %{_bindir}/doxygen
 %{_bindir}/doxytag
 
-%files doxywizard
-%defattr(-,root,root)
-%{_bindir}/doxywizard
+%changelog
+* Sun Nov 18 2007 Kevin McBride <kevin@planetsaphire.com> 1.5.4
+- consolidated manual package in lieu of --excludedocs flag for rpm --install
 
-%files manual
-%defattr(-,root,root)
-/usr/share/doxygen/*.pdf
-%doc /usr/man/man1/doxy*
+* Fri Oct 21 2005 Kevin McBride <kevin@planetsaphire.com> 1.4.5
+- made .spec file compatible with tmake
 
-%changelog
 * Mon Oct 10 2005 Kevin McBride <kevin@planetsaphire.com> 1.4.5
 - fixed versioning bugs.
 

packages/rpm/doxygen.spec.in

@@ -17,7 +17,6 @@ BuildRoot: %{buildroot}
 BuildPrereq: libstdc++-devel >= 2.96, /usr/bin/perl, /usr/bin/latex, /usr/bin/dvips
 Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv, libstdc++ >= 2.96
 Provides: doxygen = %{mmn}
-#Obsoletes: doxygen-20050927
 
 %description
 Doxygen can generate an online class browser (in HTML) and/or a
@@ -44,30 +43,17 @@ source files.
 This is the GUI interface for doxygen.  It requires qt and X11 to
 install.
 
-%package manual
-Group: Documentation
-Summary: Documentation for doxygen.
-Provides: doxygenmanual = %{mmn}
-#Obsoletes: 
-
-%description manual
-This contains the manpages for doxygen.  The information can also be
-found at http://www.doxygen.org/.
-
 %prep
 %setup -q -n %{name}-%{version}_%{revision}
 ./configure --with-doxywizard --prefix $RPM_BUILD_ROOT/usr
 
 %build
 make %{?_smp_mflags}
-make pdf %{?_smp_mflags}
+make %{?_smp_mflags} pdf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 make install
-mkdir -p $RPM_BUILD_ROOT/usr/share/doxygen
-cp -f ./latex/*.pdf $RPM_BUILD_ROOT/usr/share/doxygen
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,7 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 
-%doc README LICENSE LANGUAGE.HOWTO examples
+%doc README LICENSE LANGUAGE.HOWTO examples ./latex/*.pdf
+%doc /usr/man/man1/doxygen.1.gz
+%doc /usr/man/man1/doxytag.1.gz
 
 %{_bindir}/doxygen
 %{_bindir}/doxytag
@@ -83,13 +71,12 @@ rm -rf $RPM_BUILD_ROOT
 %files doxywizard
 %defattr(-,root,root)
 %{_bindir}/doxywizard
-
-%files manual
-%defattr(-,root,root)
-/usr/share/doxygen/*.pdf
-%doc /usr/man/man1/doxy*
+%doc /usr/man/man1/doxywizard.1.gz
 
 %changelog
+* Sun Nov 18 2007 Kevin McBride <kevin@planetsaphire.com> 1.5.4
+- consolidated manual package in lieu of --excludedocs flag for rpm --install
+
 * Mon Oct 10 2005 Kevin McBride <kevin@planetsaphire.com> 1.4.5
 - fixed versioning bugs.
 

qtools/qfile_unix.cpp

@@ -40,7 +40,7 @@
 #include "qfile.h"
 #include "qfiledefs_p.h"
 
-#if defined(_OS_MAC_) || defined(_OS_MSDOS_) || defined(_OS_WIN32_) || defined(_OS_OS2_) || defined(_OS_CYGWIN_)
+#if (defined(_OS_MAC_) && (!defined(_OS_UNIX_))) || defined(_OS_MSDOS_) || defined(_OS_WIN32_) || defined(_OS_OS2_) || defined(_OS_CYGWIN_)
 # define HAS_TEXT_FILEMODE			// has translate/text filemode
 #endif
 #if defined(O_NONBLOCK)

qtools/qfiledefs_p.h

@@ -49,14 +49,17 @@
 // or even be removed.
 //
 //
-
-
 #if defined(_CC_MWERKS_)
 # include <stdlib.h>
 # include <stat.h>
 #elif !defined(_OS_MAC_) 
 # include <sys/types.h>
 # include <sys/stat.h>
+#elif defined(_OS_MAC_) \
+  && (MAC_OS_X_VERSION_MAX_ALLOWED==MAC_OS_X_VERSION_10_5)
+# include <sys/types.h>
+# include <sys/stat.h>
+# define _OS_UNIX_
 #endif
 #include <fcntl.h>
 #include <errno.h>
@@ -243,7 +246,7 @@
 # define R_OK	4
 #endif
 
-#if defined(_OS_MAC_)
+#if defined(_OS_MAC_) && !defined(_OS_UNIX_)
 # define F_OK	0
 # define X_OK	1
 # define W_OK	2

qtools/qglobal.h

@@ -70,8 +70,25 @@
 //   UNIX	- Any UNIX bsd/sysv system
 //
 
-#if defined(macintosh)
+#if defined(__APPLE__) || defined(macintosh)
 #define _OS_MAC_
+#  ifdef MAC_OS_X_VERSION_MIN_REQUIRED
+#    undef MAC_OS_X_VERSION_MIN_REQUIRED
+#  endif
+#  define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_3
+#  include <AvailabilityMacros.h>
+#  if !defined(MAC_OS_X_VERSION_10_3)
+#     define MAC_OS_X_VERSION_10_3 MAC_OS_X_VERSION_10_2 + 1
+#  endif
+#  if !defined(MAC_OS_X_VERSION_10_4)
+#       define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1
+#  endif
+#  if !defined(MAC_OS_X_VERSION_10_5)
+#       define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1
+#  endif
+#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)
+#    error "This version of Mac OS X is unsupported"
+#  endif
 #elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__)
 #define _OS_MSDOS_
 #elif defined(OS2) || defined(_OS2) || defined(__OS2__)

qtools/qxml.cpp

@@ -4772,7 +4772,7 @@ bool QXmlSimpleReader::parseChoiceSeq()
 {
     const signed char Init             = 0;
     const signed char Ws1              = 1; // eat whitespace
-    const signed char CS               = 2; // choice or set
+    const signed char CS_              = 2; // choice or set
     const signed char Ws2              = 3; // eat whitespace
     const signed char More             = 4; // more cp to read
     const signed char Name             = 5; // read name
@@ -4792,11 +4792,11 @@ bool QXmlSimpleReader::parseChoiceSeq()
     static signed char table[6][9] = {
      /*  InpWs   InpOp  InpCp  InpQm  InpAst  InpPlus  InpPipe  InpComm  InpUnknown */
 	{ -1,     Ws1,   -1,    -1,    -1,     -1,      -1,      -1,      Name  }, // Init
-	{ -1,     CS,    -1,    -1,    -1,     -1,      -1,      -1,      CS    }, // Ws1
-	{ Ws2,    -1,    Done,  Ws2,   Ws2,    Ws2,     More,    More,    -1    }, // CS
+	{ -1,     CS_,   -1,    -1,    -1,     -1,      -1,      -1,      CS_    }, // Ws1
+	{ Ws2,    -1,    Done,  Ws2,   Ws2,    Ws2,     More,    More,    -1    }, // CS_
 	{ -1,     -1,    Done,  -1,    -1,     -1,      More,    More,    -1    }, // Ws2
 	{ -1,     Ws1,   -1,    -1,    -1,     -1,      -1,      -1,      Name  }, // More (same as Init)
-	{ Ws2,    -1,    Done,  Ws2,   Ws2,    Ws2,     More,    More,    -1    }  // Name (same as CS)
+	{ Ws2,    -1,    Done,  Ws2,   Ws2,    Ws2,     More,    More,    -1    }  // Name (same as CS_)
     };
     signed char state = Init;
     signed char input;
@@ -4837,7 +4837,7 @@ bool QXmlSimpleReader::parseChoiceSeq()
 	    case Ws1:
 		next_eat_ws();
 		break;
-	    case CS:
+	    case CS_:
 		parseOk = parseChoiceSeq();
 		break;
 	    case Ws2:
@@ -4855,7 +4855,7 @@ bool QXmlSimpleReader::parseChoiceSeq()
 	}
 	// no input is read after this
 	switch ( state ) {
-	    case CS:
+	    case CS_:
 		if ( !parseOk ) {
 		    d->error = XMLERR_ERRORPARSINGCHOICE;
 		    goto parseError;

src/Makefile.in

 
 #
-# $Id$
 # 
-# Copyright (C) 1997-2007 by Dimitri van Heesch.
+#
+# Copyright (C) 1997-2008 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 
@@ -48,6 +48,7 @@ distclean: clean
 	-$(RM) scanner.cpp code.cpp config.cpp pre.cpp ce_lex.cpp \
                ce_parse.cpp ce_parse.h doxytag.cpp tag.cpp commentscan.cpp \
 	       declinfo.cpp defargs.cpp commentcnv.cpp doctokenizer.cpp \
-	       pycode.cpp pyscanner.cpp fortrancode.cpp fortranscanner.cpp
+	       pycode.cpp pyscanner.cpp fortrancode.cpp fortranscanner.cpp \
+	       vhdlscanner.cpp vhdlcode.cpp
 
 FORCE:

src/bufstr.h

 /******************************************************************************
  *
- * $Id$
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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.h

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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 
@@ -111,11 +111,6 @@ class ClassDef : public Definition
     /*! Returns TRUE if this is a local class definition, see EXTRACT_LOCAL_CLASSES */
     bool isLocal() const;
 
-    /*! returns TRUE if this class was artificially introduced, for instance because
-     *  it is used to show a template instantiation relation. 
-     */
-    bool isArtificial() const;
-
     /*! returns the classes nested into this class */
     ClassSDict *getInnerClasses();
 
@@ -286,7 +281,6 @@ class ClassDef : public Definition
                                 const QCString &templSpec,bool &freshInstance);
     void addUsedClass(ClassDef *cd,const char *accessName);
     void addUsedByClass(ClassDef *cd,const char *accessName);
-    void setClassIsArtificial();
     void setIsStatic(bool b);
     void setIsObjectiveC(bool b);
     void setCompoundType(CompoundType t);
@@ -340,126 +334,6 @@ class ClassDef : public Definition
     
     ClassDefImpl *m_impl;
 
-#if 0
-    /*! file name that forms the base for the output file containing the
-     *  class documentation. For compatibility with Qt (e.g. links via tag 
-     *  files) this name cannot be derived from the class name directly.
-     */
-    QCString m_fileName;                   
-
-    /*! Include information about the header file should be included
-     *  in the documentation. 0 by default, set by setIncludeFile().
-     */
-    IncludeInfo *m_incInfo;                
-
-    /*! List of base class (or super-classes) from which this class derives
-     *  directly. 
-     */
-    BaseClassList *m_inherits;
-
-    /*! List of sub-classes that directly derive from this class 
-     */
-    BaseClassList *m_inheritedBy;
-
-    /*! Namespace this class is part of 
-     *  (this is the inner most namespace in case of nested namespaces)
-     */
-    NamespaceDef  *m_nspace;              
-
-    /*! File this class is defined in */
-    FileDef *m_fileDef;
-
-    /*! List of all members (including inherited members) */
-    MemberNameInfoSDict *m_allMemberNameInfoSDict;
-
-    /*! Template arguments of this class */
-    ArgumentList *m_tempArgs;
-
-    /*! Files that were used for generating the class documentation. */
-    QStrList m_files;
-
-    /*! Examples that use this class */
-    ExampleSDict *m_exampleSDict;
-
-    /*! Holds the kind of "class" this is. */
-    CompoundType m_compType;
-
-    /*! The protection level in which this class was found. 
-     *  Typically Public, but for nested classes this can also be Protected
-     *  or Private.
-     */ 
-    Protection m_prot;
-
-    /*! The inner classes contained in this class. Will be 0 if there are
-     *  no inner classes.
-     */
-    ClassSDict *m_innerClasses;
-
-    /* classes for the collaboration diagram */
-    UsesClassDict *m_usesImplClassDict;
-    UsesClassDict *m_usedByImplClassDict;
-    UsesClassDict *m_usesIntfClassDict;
-
-    /*! Template instances that exists of this class, the key in the
-     *  dictionary is the template argument list.
-     */ 
-    QDict<ClassDef> *m_templateInstances;
-
-    /*! Template instances that exists of this class, as defined by variables.
-     *  We do NOT want to document these individually. The key in the
-     *  dictionary is the template argument list.
-     */ 
-    QDict<ClassDef> *m_variableInstances;
-
-    QDict<int> *m_templBaseClassNames;
-
-    /*! The class this class is an instance of. */
-    ClassDef *m_templateMaster;
-
-    /*! class name with outer class scope, but without namespace scope. */
-    QCString m_className;
-
-    /*! If this class is a Objective-C category, then this points to the
-     *  class which is extended.
-     */
-    ClassDef *m_categoryOf;
-
-    QList<MemberList> m_memberLists;
-
-    /* user defined member groups */
-    MemberGroupSDict *memberGroupSDict;
-
-    /*! Indicated whether this class exists because it is used by
-     *  some other class only (TRUE) or if some class inherits from
-     *  it (FALSE). This is need to remove used-only classes from
-     *  the inheritance tree.
-     */
-    bool m_artificial;
-
-    /*! Is this an abstact class? */
-    bool m_isAbstract;
-
-    /*! Is the class part of an unnamed namespace? */
-    bool m_isStatic;
-
-    /*! Is the class part implemented in Objective C? */
-    bool m_isObjC;
-
-    /*! TRUE if classes members are merged with those of the base classes. */
-    bool m_membersMerged;
-
-    /*! TRUE if the class is defined in a source file rather than a header file. */
-    bool m_isLocal;
-
-    bool m_isTemplArg;
-
-    /*! Does this class group its user-grouped members
-     *  as a sub-section of the normal (public/protected/..) 
-     *  groups?
-     */
-    bool m_subGrouping; 
-#endif
-
 };
 
 /*! \brief Class that contains information about a usage relation. 

src/classlist.cpp

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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 
@@ -21,6 +21,7 @@
 #include "outputlist.h"
 #include "language.h"
 #include "doxygen.h"
+#include "vhdldocgen.h"
 
 ClassList::ClassList() : QList<ClassDef>()
 {
@@ -66,6 +67,8 @@ ClassListIterator::ClassListIterator(const ClassList &cllist) :
 void ClassSDict::writeDeclaration(OutputList &ol,const ClassDef::CompoundType *filter,
                                   const char *header,bool localNames)
 {
+  static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN");
+  static bool vhdlOpt    = Config_getBool("OPTIMIZE_OUTPUT_VHDL");
   if (count()>0)
   {
     ClassSDict::Iterator sdi(*this);
@@ -91,9 +94,14 @@ void ClassSDict::writeDeclaration(OutputList &ol,const ClassDef::CompoundType *f
             {
               ol.parseText(header);
             }
+            else if (vhdlOpt)
+            {
+              ol.parseText(VhdlDocGen::trVhdlType(VhdlDocGen::ARCHITECTURE,FALSE));
+            }
             else
             {
-              ol.parseText(theTranslator->trCompounds());
+              ol.parseText(fortranOpt ? theTranslator->trDataTypes() :
+                                        theTranslator->trCompounds());
             }
             ol.endMemberHeader();
             ol.startMemberList();
@@ -116,9 +124,13 @@ void ClassSDict::writeDeclaration(OutputList &ol,const ClassDef::CompoundType *f
           {
             cname = cd->displayName();
           }
+
+          if (!vhdlOpt) // for VHDL we swap the name and the type
+          {
             ol.writeString(tmp);
             ol.writeString(" ");
             ol.insertMemberAlign();
+          }
           if (isLink) 
           {
             ol.writeObjectLink(cd->getReference(),
@@ -133,6 +145,11 @@ void ClassSDict::writeDeclaration(OutputList &ol,const ClassDef::CompoundType *f
             ol.docify(cname);
             ol.endBold();
           }
+          if (vhdlOpt) // now write the type
+          {
+            ol.insertMemberAlign();
+            VhdlDocGen::writeClassType(cd,ol,cname);
+          }
           ol.endMemberItem();
           if (!cd->briefDescription().isEmpty())
           {

src/classlist.h

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2008 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-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2008 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 
@@ -1665,6 +1665,7 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
 %option noyywrap
 
 %x      SkipString
+%x      SkipStringS
 %x      SkipVerbString
 %x	SkipCPP
 %x	SkipComment
@@ -2334,10 +2335,20 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
 					  g_inForEachExpression = FALSE;
   					  BEGIN( SkipString );
   					}
+<FuncCall,Body,MemberCall,MemberCall2,SkipInits>\'	{
+					  startFontClass("stringliteral");
+  					  g_code->codify(yytext);
+  					  g_lastStringContext=YY_START;
+					  g_inForEachExpression = FALSE;
+  					  BEGIN( SkipStringS );
+  					}
 <SkipString>[^\"\\\r\n]*		{ 
   					  g_code->codify(yytext);
 					}
-<SkipString>"//"|"/*"			{
+<SkipStringS>[^\'\\\r\n]*		{
+  					  g_code->codify(yytext);
+  					}
+<SkipString,SkipStringS>"//"|"/*"	{
   					  g_code->codify(yytext);
   					}
 <SkipString>@?\"			{
@@ -2345,7 +2356,12 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
 					  endFontClass();
   					  BEGIN( g_lastStringContext );
   					}
-<SkipString>\\.				{
+<SkipStringS>\'				{
+  					  g_code->codify(yytext);
+					  endFontClass();
+  					  BEGIN( g_lastStringContext );
+  					}
+<SkipString,SkipStringS>\\.		{
   					  g_code->codify(yytext);
 					}
 <SkipVerbString>[^"\n]+			{

src/commentcnv.h

 /*****************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /*****************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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 
@@ -65,6 +65,8 @@ static QCString g_aliasString;
 static int      g_blockCount;
 static int      g_lastBlockContext;
 
+static SrcLangExt g_lang;
+
 static void replaceCommentMarker(const char *s,int len)
 {
   const char *p=s;
@@ -268,7 +270,7 @@ void replaceComment(int offset);
 
 %%
 
-<Scan>[^"'\/\n\\]*                 { /* eat anything that is not " / or \n */ 
+<Scan>[^"'\/\n\\#\\-]*             { /* eat anything that is not " / or \n */ 
                                      copyToOutput(yytext,yyleng); 
 				   }
 <Scan>"\""                         { /* start of a string */ 
@@ -312,6 +314,28 @@ void replaceComment(int offset);
                                      copyToOutput(yytext,yyleng); 
 				     BEGIN(CComment); 
                                    }
+<Scan>"##"		           {
+                                     if (g_lang!=SrcLangExt_Python)
+				     {
+				       REJECT;
+				     }
+				     else
+				     {
+                                       copyToOutput(yytext,yyleng); 
+				       BEGIN(CComment);
+				     }
+  				   }
+<Scan>"--!"		           {
+                                     if (g_lang!=SrcLangExt_VHDL)
+				     {
+				       REJECT;
+				     }
+				     else
+				     {
+                                       copyToOutput(yytext,yyleng); 
+				       BEGIN(CComment);
+				     }
+  				   }
 <CComment,ReadLine>[\\@]("dot"|"code"|"msc")/[^a-z_A-Z0-9] { /* start of a verbatim block */
                                      copyToOutput(yytext,yyleng); 
 				     g_lastCommentContext = YY_START;
@@ -414,6 +438,28 @@ void replaceComment(int offset);
                                      copyToOutput(yytext,yyleng); 
 				     BEGIN(Scan); 
                                    }
+<CComment>"\n"/[ \t]*[^#]	   { /* end of Python comment */
+                                     if (g_lang!=SrcLangExt_Python)
+				     {
+				       REJECT;
+				     }
+				     else
+				     {
+				       copyToOutput(yytext,yyleng);
+				       BEGIN(Scan);
+				     }
+  				   }
+<CComment>"\n"/[ \t]*[^\-]	   { /* end of VHDL comment */
+                                     if (g_lang!=SrcLangExt_VHDL)
+				     {
+				       REJECT;
+				     }
+				     else
+				     {
+				       copyToOutput(yytext,yyleng);
+				       BEGIN(Scan);
+				     }
+  				   }
 <CComment>.			   {
                                      copyToOutput(yytext,yyleng); 
   				   }
@@ -480,19 +526,27 @@ void replaceComment(int offset);
 				     if (YY_START==CComment && oldSkip && !g_skip) 
     			             {
 				       //printf("** Adding start of comment!\n");
+				       if (g_lang!=SrcLangExt_Python &&
+					   g_lang!=SrcLangExt_VHDL)
+				       {
  				         ADDCHAR('/');
      				         ADDCHAR('*');
 				       }
     				     }
+				    }
 <CondLine>[a-z_A-Z][a-z_A-Z0-9.\-]* {
   				     bool oldSkip=g_skip;
                                      startCondSection(yytext);
 				     if (g_condCtx==CComment && !oldSkip && g_skip) 
     			             {
 				       //printf("** Adding terminator for comment!\n");
+				       if (g_lang!=SrcLangExt_Python &&
+					   g_lang!=SrcLangExt_VHDL)
+				       {
  				         ADDCHAR('*');
      				         ADDCHAR('/');
 				       }
+    				     }
   				     BEGIN(g_condCtx);
   				   }
 <CondLine>[ \t]*
@@ -504,9 +558,13 @@ void replaceComment(int offset);
 				     if (g_condCtx==CComment && !oldSkip && g_skip) 
     			             {
 				       //printf("** Adding terminator for comment!\n");
+				       if (g_lang!=SrcLangExt_Python &&
+					   g_lang!=SrcLangExt_VHDL)
+				       {
  				         ADDCHAR('*');
      				         ADDCHAR('/');
 				       }
+    				     }
 				     if (*yytext=='\n') g_lineNr++;
 				     BEGIN(g_condCtx);
   				   }
@@ -587,6 +645,7 @@ void convertCppComments(BufStr *inBuf,BufStr *outBuf,const char *fileName)
   g_mlBrief = Config_getBool("MULTILINE_CPP_IS_BRIEF");
   g_skip     = FALSE;
   g_fileName = fileName;
+  g_lang = getLanguageFromFileName(fileName);
   g_lineNr   = 0;
   g_condStack.clear();
   g_condStack.setAutoDelete(TRUE);

src/commentscan.h

 /******************************************************************************
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2008 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-2007 by Dimitri van Heesch.
+ * Copyright (C) 1997-2008 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 
@@ -912,7 +912,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
 					  DocCmdMapper::Cmd *cmdPtr = DocCmdMapper::map(cmdName);
 					  if (cmdPtr) // special action is required
 					  {
-					    if (cmdPtr->endsBrief && !current->brief.stripWhiteSpace().isEmpty())
+					    if (cmdPtr->endsBrief)
 					    { 
 				              briefEndsAtDot=FALSE;
 					      // this command forces the end of brief description

src/constexp.h

 /******************************************************************************
  *
- * $Id$
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

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

src/cppvalue.cpp

 /******************************************************************************
  *
- * $Id$
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
  *
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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

 /******************************************************************************
  *
- * $Id$
  * 
- * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Copyright (C) 1997-2008 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