This patch contains changes regarding the build system so that the *nix and Windows systems use the same information (consistency). Some use names routine names have been changed (from .l files with -P option) to reflect the file name that generated the routines, this makes it easier to create a general procedure.

A number of include / header files are files are generated from different file types (html, xml, js), due some limitations of the windows build system the generated file names had to be changed (the extension in the windows build system is only available including the '.' so e.g. the file jquery_fx.js generates now jquery_fx.js.h instead of jquery_fx_js.h)
In the windows version the creation of .cpp files from .l files has been adjusted to correct for the YY_BUF_SIZE problems.
Furthermore on windows (and also used on *nix) some commends have been replaced with python scripts so that on windows only python is need (besides flex and and bison). On *nix also perl is required for the generation using tmake.

Below a short description of the changes will be given and grouped.

Changed files
=============
- .gitignore
added some directories and file

- Doxyfile
corrected for changed file names

- Makefile.in
added realclean and some other changes (ignore error) and the moment when the Makefile is deleted (as last file).
Added entries for doxyapp and doxmlparser

Added realclean for the following files (consistency):
======================================================
- Makefile.win_make.in
- Makefile.win_nmake.in
- addon/doxmlparser/examples/metrics/Makefile.in
- addon/doxmlparser/src/Makefile.in
- addon/doxmlparser/test/Makefile.in
- addon/doxyapp/Makefile.in
- addon/doxysearch/Makefile.in
- libmd5/Makefile.in
- qtools/Makefile.in

- addon/doxyapp/doxyapp.pro.in
removed double occurence of -L../../lib

- addon/doxysearch/doxysearch.pro.in
no visible change just spacing?

- addon/doxywizard/Makefile.in
added realclean
corrected call to qmake (to get it from the right place, it is not necessarily in the path)
made some macros known in the called process

- addon/doxywizard/configdoc.cpp
automatically generated, can be removed

- addon/doxywizard/doxywizard.pro.in
corrected dependencies
corrected call to python (to get it from the right place, it is not necessarily in the path)
new items to generate version.cpp and config_doxyw.cpp

- configure
added configuration definition possibility for python
added possibility to build doxmlparser
automatically generate the lang_cfg.h file based on the available languages (translator_??.h) and not on a fixed list. This step still has to be added to the windows build process.

- doc/Makefile.in
corrected call to python (to get it from the right place, it is not necessarily in the path)

- doc/config.doc
small correction

- doc/install.doc
added python as a requirement
changed CVS to GitHub

- doc/language.doc
automatically generated file, based on other changes.

- doc/language.tpl
made XX and xx more consistent
changed description of the procedure based on changes already made configure.

- src/Makefile.in
adjusted used file names in distclean
Solved PERL usage consistent with LEX / YACC (with %%PERL%%)
automatically add translator_??>h to HEADERS
same spacing

Adjusted in the following file the names of some include files:
===============================================================
- src/cite.cpp
- src/docbookgen.cpp
- src/ftvhelp.cpp
- src/htmlgen.cpp
- src/layout.cpp
- src/searchindex.cpp
- src/xmlgen.cpp

Adjusted in the following files some routine names (..YY..) to be consistent with the file names:
=================================================================================================
- src/commentscan.l
- src/constexp.h
- src/constexp.l
- src/constexp.y
- src/fortrancode.l
- src/fortranscanner.l
- src/pyscanner.l
- src/pre.l
- src/scanner.l
- src/tclscanner.l
- src/vhdlparser.y
- src/vhdlscanner.l

- src/config.xml
small textual correction

- src/configoptions.cpp
generated output file, can be removed

- src/lang_cfg.h
Automatically generated file with selected languages (*nix). On windows a procedure has to be defined.

- src/libdoxycfg.t.in
corrected call to python (to get it from the right place, it is not necessarily in the path)

- src/libdoxygen.pro.in
adjusted include file names
removed translator_??.h files, they are added automatically
changed file name ce_lex.cpp -> constexp.cpp (generated file)

- src/libdoxygen.t.in
made LEX calls used the file name for the -P option
changed INCREASEBUF script to a python script
changed teh geneartion of some include file, now by means of a pythons script. Names of the generated include file had to be changed as well.
added possibility to generate version.cpp here as well.

Added HEADERS to dependency so non existing but later generated include files are recognized as well:
=====================================================================================================
- tmake/lib/unix/generic.t
- tmake/lib/win32-borland/generic.t
- tmake/lib/win32-g++/generic.t
- tmake/lib/win32-mingw/generic.t
- tmake/lib/win32-msvc/generic.t
- tmake/lib/win32-symantec/generic.t
- tmake/lib/win32-visage/generic.t
- tmake/lib/win32-watcom/generic.t

- winbuild/Doxygen.vcproj
made consistent wit *nix version.
Generating all possible files
removed unused /empty parts
setting for the Lex.rules and other rules files some default values

- winbuild/Doxywizard.vcproj
made consistent wit *nix version.
Generating all possible files
removed unused /empty parts
removed system dependent paths (C:\... etc) replaced then with external environment variables

- winbuild/Lex.rules
adjusted file to comply with new requirements, only user variable is -d. -i is set to read only (value can be changed  in doxygen.vcproj). Handling of other arguments is all default.
generation including increasebuffer possibility

- winbuild/doxyindexer.vcproj
corrected path

- winbuild/doxysearch.vcproj
removed system dependent paths (C:\... etc) replaced then with external environment variables

- winbuild/qtools.vcproj
corrected type, wrong used directory

The following files are automatically generated (with slightly other names like index.xsd.h etc.):
==================================================================================================
- src/index_xsd.h
- src/doxygen_bst.h
- src/dynsections_js.h
- src/extsearch_js.h
- src/footer_html.h
- src/header_html.h
- src/jquery_fx_js.h
- src/jquery_p1_js.h
- src/jquery_p2_js.h
- src/jquery_p3_js.h
- src/jquery_pt_js.h
- src/jquery_ui_js.h
- src/navtree_css.h
- src/navtree_js.h
- src/resize_js.h
- src/search_css.h
- src/search_functions_php.h
- src/search_js.h
- src/search_opensearch_php.h
- src/svgpan_js.h
the following files are generated with different names:
- src/bib2xhtml.h
becomes
- src/bib2xhtml.pl/h

- src/layout_default.h
becomes
- src/layout_default.xml.h

The file:
=========
- addon/doxywizard/config.l
is replaced by:
- addon/doxywizard/config_doxyw.l
so there are in the system not 2 different config.l files. Renamed some routines from configYY -> config_doxywYY...

New files:
==========
- src/increasebuffer.py
increase YY_BUF_SIZE and YY_READ_BUF_SIZE from 16k / 8k to 256k.

- src/settings.py
create settings.h file

- src/to_c_cmd.py
create include files from different files (html, xml, js) so they can be included in the code as defaults

- src/version.py
create version.cpp file based on the configure file

- winbuild/Config.rules
rules file to convert the config.xml file into configoptions.cpp (doxygen) or configdoc.cpp (doxywizard). Seen the differences 2 rules are created within this file.

- winbuild/Gen_head.rules
rules files to generate include files from different files using to_c_cmd.py

- winbuild/Settings.rules
rules file for generating the settings.h file. It is possible to select to use CLANG and SqlLite3

- winbuild/Version.rules
rules file to be able to start version.py

The files:
==========
- version.bat
- runbison.bat
- increasebuffer.pl
are not used anymore.

I've only added the files as indicated, I didn't remove the files from the repository.

32 files changed, 380 insertions, 612 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 2e78088..7d1d0d9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,60 +1,61 @@
 
 #
-# 
+#
 #
 # Copyright (C) 1997-2013 by Dimitri van Heesch.
-# 
+#
 # Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby 
-# granted. No representations are made about the suitability of this software 
+# documentation under the terms of the GNU General Public License is hereby
+# granted. No representations are made about the suitability of this software
 # for any purpose. It is provided "as is" without express or implied warranty.
 # See the GNU General Public License for more details.
-# 
+#
 # Documents produced by Doxygen are derivative works derived from the
 # input used in their production; they are not affected by this license.
-# 
+#
 
 all: Makefile.libdoxygen Makefile.libdoxycfg Makefile.doxygen Makefile
-	$(MAKE) -f Makefile.libdoxycfg PERL=$(PERL) $@
-	$(MAKE) -f Makefile.libdoxygen PERL=$(PERL) $@
-	$(MAKE) -f Makefile.doxygen    PERL=$(PERL) $@
+	$(MAKE) -f Makefile.libdoxycfg $@
+	$(MAKE) -f Makefile.libdoxygen $@
+	$(MAKE) -f Makefile.doxygen    $@
 
-Makefile.libdoxygen: libdoxygen.pro libdoxygen.t 
+Makefile.libdoxygen: libdoxygen.pro libdoxygen.t
 	$(ENV) $(PERL) "$(TMAKE)" libdoxygen.pro >Makefile.libdoxygen
+	echo 'HEADERS += ' `ls -1 translator_??.h`  >>Makefile.libdoxygen
 
-Makefile.libdoxycfg: libdoxycfg.pro libdoxycfg.t 
+Makefile.libdoxycfg: libdoxycfg.pro libdoxycfg.t
 	$(ENV) $(PERL) "$(TMAKE)" libdoxycfg.pro >Makefile.libdoxycfg
 
-Makefile.doxygen: doxygen.pro 
+Makefile.doxygen: doxygen.pro
 	$(ENV) $(PERL) "$(TMAKE)" doxygen.pro >Makefile.doxygen
 
-tmake: 
+tmake:
 	$(ENV) $(PERL) "$(TMAKE)" libdoxygen.pro >Makefile.libdoxygen
 	$(ENV) $(PERL) "$(TMAKE)" libdoxycfg.pro >Makefile.libdoxycfg
 	$(ENV) $(PERL) "$(TMAKE)" doxygen.pro >Makefile.doxygen
 
 # clean objects
-clean: Makefile.libdoxygen Makefile.libdoxycfg Makefile.doxygen 
-	$(MAKE) -f Makefile.libdoxygen clean 
-	$(MAKE) -f Makefile.libdoxycfg clean 
-	$(MAKE) -f Makefile.doxygen    clean 
+clean: Makefile.libdoxygen Makefile.libdoxycfg Makefile.doxygen
+	$(MAKE) -f Makefile.libdoxygen clean
+	$(MAKE) -f Makefile.libdoxycfg clean
+	$(MAKE) -f Makefile.doxygen    clean
 
 # also clean flex/bison generated files
 distclean: clean
-	-$(RM) scanner.cpp code.cpp config.cpp pre.cpp ce_lex.cpp \
-               ce_parse.cpp ce_parse.h tag.cpp commentscan.cpp \
+	-$(RM) scanner.cpp code.cpp config.cpp pre.cpp constexp.cpp \
+	       ce_parse.cpp ce_parse.h tag.cpp commentscan.cpp \
 	       declinfo.cpp defargs.cpp commentcnv.cpp doctokenizer.cpp \
 	       pycode.cpp pyscanner.cpp fortrancode.cpp fortranscanner.cpp \
 	       vhdlscanner.cpp vhdlcode.cpp tclscanner.cpp vhdlparser.h \
-	       vhdlparser.cpp \
+	       vhdlparser.cpp
 
 # clean also the generated files which are in SVN
 realclean: distclean
-	-$(RM) index_xsd.h compound_xsd.h layout_default.h \
-	       header_html.h footer_html.h search_functions_php.h search_opensearch_php.h \
-	       search_js.h search_css.h doxygen_css.h navtree_js.h navindex_js.h resize_js.h \
-	       jquery_fx_js.h jquery_p1_js.h jquery_p2_js.h \
-	       jquery_p3_js.h jquery_ui_js.h navtree_css.h svgpan_js.h dynsections_js.h \
-	       doxygen_bst.h bib2xhtml.h configoptions.cpp
+	-$(RM) index.xsd.h compound.xsd.h layout_default.xml.h \
+	       header.html.h footer.html.h search_functions.php.h search_opensearch.php.h \
+	       search.js.h search.css.h doxygen.css.h navtree.js.h resize.js.h \
+	       doxygen.sty.h jquery_fx.js.h jquery_p1.js.h jquery_p2.js.h \
+	       jquery_p3.js.h jquery_ui.js.h navtree.css.h svgpan.js.h dynsections.js.h \
+	       doxygen.bst.h bib2xhtml.pl.h configoptions.cpp jquery_pt.js.h extsearch.js.h
 
 FORCE:
diff --git a/src/bib2xhtml.h b/src/bib2xhtml.h
deleted file mode 100644
index 3615cee..0000000
--- a/src/bib2xhtml.h
+++ /dev/null
@@ -1,319 +0,0 @@
-"#\n"
-"# Below is a stripped down version of bib2xhtml used by doxygen.\n"
-"# For the full version see http://www.spinellis.gr/sw/textproc/bib2xhtml/\n"
-"#\n"
-"# Convert from bibtex to XHTML.\n"
-"#\n"
-"# (C) Copyright 1995, 1996 David Hull.\n"
-"# (David Hull / hull@cs.uiuc.edu / http://www.uiuc.edu/ph/www/dlhull)\n"
-"#\n"
-"# (C) Copyright 2002-2010 Diomidis Spinellis\n"
-"# http://www.spinellis.gr\n"
-"#\n"
-"# This program is free software.  You can redistribute it and/or modify\n"
-"# it under the terms of the GNU General Public License.  See the\n"
-"# files README and COPYING for details.\n"
-"#\n"
-"# This source code contains UTF-8 characters.  You might want to use\n"
-"# an appropriate editor, if you want to view/modify the LaTeX to Unicode\n"
-"# substitution commands.\n"
-"#\n"
-"\n"
-"use Getopt::Std;\n"
-"use open IO => ':crlf';\n"
-"$label_styles{'numbered'} = 	$LABEL_NUMBERED = 	2;\n"
-"$list_start[$LABEL_NUMBERED] = 'dl class=\"citelist\"';\n"
-"$list_end[$LABEL_NUMBERED] = \"/dl\";\n"
-"@tmpfiles = ();\n"
-"sub html_ent {\n"
-"	s/\\\\i\\b/i/g;\n"
-"	s/\\\\\\'(\\001\\d+)\\{([AEIOUaeiou])\\1\\}/&$2acute;/gs;\n"
-"	s/\\\\\\'([AEIOUaeiou])/&$1acute;/g;\n"
-"	s/\\\\\\`(\\001\\d+)\\{([AEIOUaeiou])\\1\\}/&$2grave;/gs;\n"
-"	s/\\\\\\`([AEIOUaeiou])/&$1grave;/g;\n"
-"	s/\\\\\\\"(\\001\\d+)\\{([AEIOUaeiouy])\\1\\}/&$2uml;/gs;\n"
-"	s/\\\\\\\"([AEIOUaeiouy])/&$1uml;/g;\n"
-"	s/\\\\\\~(\\001\\d+)\\{([ANOano])\\1\\}/&$2tilde;/gs;\n"
-"	s/\\\\\\~([ANOano])/&$1tilde;/g;\n"
-"	s/\\\\\\^(\\001\\d+)\\{([AEIOUaeiou])\\1\\}/&$2circ;/gs;\n"
-"	s/\\\\\\^([AEIOUaeiou])/&$1circ;/g;\n"
-"	s/\\\\c(\\001\\d+)\\{([Cc])\\1\\}/&$2cedil;/gs;\n"
-"	s/\\\\u(\\001\\d+)\\{(.)\\1\\}/$2/gs;\n"
-"	s/\\\\v(\\001\\d+)\\{(.)\\1\\}/$2/gs;\n"
-"	s/\\\\([lL])\\b/$1/g;\n"
-"	s/\\\\\\=(\\001\\d+)\\{(.)\\1\\}/$2/gs;\n"
-"	s/\\\\\\=(.)/$1/g;\n"
-"	s/\\\\\\.(\\001\\d+)\\{(.)\\1\\}/$2/gs;\n"
-"	s/\\\\\\.(.)/$1/g;\n"
-"	s/\\\\([Oo])\\b\\s*/&$1slash;/g;\n"
-"	s/\\\\AA\\b\\s*/Å/g;\n"
-"	s/\\\\aa\\b\\s*/å/g;\n"
-"	s/\\\\AE\\b\\s*/Æ/g;\n"
-"	s/\\\\ae\\b\\s*/æ/g;\n"
-"	s/\\\\ss\\b\\s*/ß/g;\n"
-"	s/\\\\S\\b\\s*/§/g;\n"
-"	s/\\\\P\\b\\s*/¶/g;\n"
-"	s/\\\\pounds\\b\\s*/£/g;\n"
-"	s/\\?\\`/¿/g;\n"
-"	s/\\!\\`/¡/g;\n"
-"	s/\\-\\-\\-/—/g;\n"
-"	s/([^\\!])\\-\\-([^\\>])/$1–$2/g;\n"
-"	s/\\\\([aA]lpha)\\b/&$1;/g;\n"
-"	s/\\\\([bB]eta)\\b/&$1;/g;\n"
-"	s/\\\\([gG]amma)\\b/&$1;/g;\n"
-"	s/\\\\([dD]elta)\\b/&$1;/g;\n"
-"	s/\\\\varepsilon\\b/ε/g;\n"
-"	s/\\\\([eE]psilon)\\b/&$1;/g;\n"
-"	s/\\\\([zZ]eta)\\b/&$1;/g;\n"
-"	s/\\\\([eE]ta)\\b/&$1;/g;\n"
-"	s/\\\\([tT]heta)\\b/&$1;/g;\n"
-"	s/\\\\vartheta\\b/θ/g;\n"
-"	s/\\\\([iI]ota)\\b/&$1;/g;\n"
-"	s/\\\\([kK]appa)\\b/&$1;/g;\n"
-"	s/\\\\([lL]ambda)\\b/&$1;/g;\n"
-"	s/\\\\([mM]u)\\b/&$1;/g;\n"
-"	s/\\\\([nN]u)\\b/&$1;/g;\n"
-"	s/\\\\([xX]i)\\b/&$1;/g;\n"
-"	s/\\\\([oO]micron)\\b/&$1;/g;\n"
-"	s/\\\\([pP]i)\\b/&$1;/g;\n"
-"	s/\\\\varpi\\b/π/g;\n"
-"	s/\\\\([rR]ho)\\b/&$1;/g;\n"
-"	s/\\\\varrho\\b/ρ/g;\n"
-"	s/\\\\([sS]igma)\\b/&$1;/g;\n"
-"	s/\\\\varsigma\\b/ς/g;\n"
-"	s/\\\\([tT]au)\\b/&$1;/g;\n"
-"	s/\\\\([uU]psilon)\\b/&$1;/g;\n"
-"	s/\\\\([pP]hi)\\b/&$1;/g;\n"
-"	s/\\\\varphi\\b/φ/g;\n"
-"	s/\\\\([cC]hi)\\b/&$1;/g;\n"
-"	s/\\\\([pP]si)\\b/&$1;/g;\n"
-"	s/\\\\([oO]mega)\\b/&$1;/g;\n"
-"	s/\\\\S\\b/§/g;\n"
-"	s/^\\\\circ\\b/°/g;\n"
-"	s/\\\\infty\\b/∞/g;\n"
-"	s/\\\\emptyset\\b/∅/g;\n"
-"	s/\\\\pm\\b/±/g;\n"
-"	s/\\\\times\\b/×/g;\n"
-"	s/\\\\cdot\\b/⋅/g;\n"
-"	s/\\\\partial\\b/∂/g;\n"
-"	s/\\\\nabla\\b/∇/g;\n"
-"	s/\\\\surd\\b/√/g;\n"
-"	s/\\\\perp\\b/⊥/g;\n"
-"	s/\\\\sum\\b/∑/g;\n"
-"	s/\\\\int\\b/∫/g;\n"
-"	s/\\\\prod\\b/∏/g;\n"
-"	s/\\\\sim\\b/∼/g;\n"
-"	s/\\\\approx\\b/≈/g;\n"
-"	s/\\\\ne\\b/≠/g;\n"
-"	s/\\\\equiv\\b/≡/g;\n"
-"	s/\\\\propto\\b/∝/g;\n"
-"	s/\\\\le\\b/≤/g;\n"
-"	s/\\\\ge\\b/≥/g;\n"
-"	s/\\\\leftarrow\\b/←/g;\n"
-"	s/\\\\rightarrow\\b/→/g;\n"
-"	s/\\\\in\\b/∈/g;\n"
-"	s/\\\\notin\\b/∉/g;\n"
-"	s/\\\\lceil\\b/⌈/g;\n"
-"	s/\\\\rceil\\b/⌉/g;\n"
-"	s/\\\\lfloor\\b/⌊/g;\n"
-"	s/\\\\rfloor\\b/⌋/g;\n"
-"}\n"
-"foreach (@ARGV) {\n"
-"  if (/\\.bib$/) {\n"
-"    $bibfile = $_;\n"
-"    $bibfile =~ s/\\.bib$//;\n"
-"    push(@bibfiles,$bibfile);\n"
-"  } else {\n"
-"    $htmlfile = $_;\n"
-"  }\n"
-"}\n"
-"exit(1) unless defined($htmlfile);\n"
-"$bibdatacmd=\"\\\\bibdata{\".join(',',@bibfiles).\"}\";\n"
-"$label_style = $LABEL_NUMBERED;\n"
-"$bstfile = \"doxygen\";\n"
-"umask(077);\n"
-"open(HTMLFILE,\">$htmlfile$$\");\n"
-"if (open(OHTMLFILE, \"$htmlfile\")) {\n"
-"    $mode = (stat OHTMLFILE)[2] & 0xfff;\n"
-"} else {\n"
-"  print \"Error opening $htmlfile\\n\";\n"
-"  exit(1);\n"
-"}\n"
-"$beginstring = \"<!-- BEGIN CITATIONS -->\";\n"
-"$endstring = \"<!-- END CITATIONS -->\";\n"
-"@citations = ();\n"
-"loop:\n"
-"while (<OHTMLFILE>) {\n"
-"  print HTMLFILE;\n"
-"  last loop if m/^$beginstring$/;\n"
-"}\n"
-"loop:\n"
-"while (<OHTMLFILE>) {\n"
-"  print HTMLFILE;\n"
-"  last loop if m/^$endstring$/;\n"
-"  push(@citations, $2) if m/^([^\\\\]*)?(.+\\})(.*)?$/;\n"
-"}\n"
-"push(@citations, $bibdatacmd);\n"
-"$auxfile = \"bib$$\";\n"
-"push(@tmpfiles, \"$auxfile.aux\");\n"
-"open(AUXFILE, \">$auxfile\" . \".aux\");\n"
-"print AUXFILE \"\\\\relax\\n\\\\bibstyle{$bstfile}\\n\";\n"
-"foreach $citation (@citations) {\n"
-"  print AUXFILE \"$citation\\n\";\n"
-"}\n"
-"close(AUXFILE);\n"
-"push(@tmpfiles, \"$auxfile.blg\");\n"
-"push(@tmpfiles, \"$auxfile.bbl\");\n"
-"`bibtex $auxfile 2>&1`;\n"
-"if ($?==-1)\n"
-"{\n"
-"  print \"bibtex command failed: $!\\n\";\n"
-"}\n"
-"$beginstring = \"<!-- BEGIN BIBLIOGRAPHY -->\";\n"
-"$endstring = \"<!-- END BIBLIOGRAPHY -->\";\n"
-"loop:\n"
-"while (<OHTMLFILE>) {\n"
-"  last loop if m/^$beginstring$/;\n"
-"  print HTMLFILE;\n"
-"}\n"
-"loop:\n"
-"while (<OHTMLFILE>) {\n"
-"  last loop if m/^$endstring$/;\n"
-"}\n"
-"print HTMLFILE \"$beginstring\\n\";\n"
-"$t = $auxfile . \".bbl\";\n"
-"$/ = \"\";\n"
-"open(BBLFILE, \"<$t\") || die \"error opening $t: $!\\n\";\n"
-"$nentry = 0;\n"
-"loop:\n"
-"while (<BBLFILE>) {\n"
-"    if (($nentry == 0) && (m/^#/)) {\n"
-"	if ((m/#\\s*label-style:\\s*(\\S+)/) && (! defined $label_style)) {\n"
-"	    $label_style = $label_styles{$1};\n"
-"	    if (! defined $label_style) {\n"
-"		print STDERR \"label style unknown: \\n\";\n"
-"		next loop;\n"
-"	    }\n"
-"	}\n"
-"	next loop;\n"
-"    }\n"
-"    $nentry++;\n"
-"    ($bcite, $blabel) = m+<dt><a name=\\\"([^\\\"]*)\\\">\\[([^\\]]*)\\]</a></dt><dd>+;\n"
-"    $blabel = \"$nentry\";\n"
-"    $bibcite{$bcite} = $blabel;\n"
-"}\n"
-"close(BBLFILE);\n"
-"$label_style = $LABEL_DEFAULT if (! defined $label_style);\n"
-"$list_start = $list_start[$label_style];\n"
-"$list_end = $list_end[$label_style];\n"
-"print HTMLFILE \"<$list_start>\\n\\n\";\n"
-"open(BBLFILE, \"<$t\") || die \"error opening $t: $!\\n\";\n"
-"$nentry = 0;\n"
-"loop:\n"
-"while (<BBLFILE>) {\n"
-"    next loop if (($nentry == 0) && (m/^#/));\n"
-"    $nentry++;\n"
-"    s/\\\\\\{/\\002/g;\n"
-"    s/\\\\\\}/\\003/g;\n"
-"    s/\\\\\\$/\\004/g;\n"
-"    {\n"
-"	local ($c, $l, $z) = (0, 0, ());\n"
-"	s/([\\{\\}])/join(\"\",\"\\001\",($1 eq \"\\{\" ? $z[$l++]=$c++ : $z[--$l]),$1)/ge;\n"
-"    }\n"
-"    s/\\%\\n//g;\n"
-"    s/(\\.(<\\/cite>|<\\/a>|\\')+)\\./$1/g;\n"
-"    s:(<dt><a name=\\\"[^\\\"]*\\\">\\[)[^\\]]*(\\]</a></dt><dd>):$1$nentry$2:;\n"
-"    while (m/(\\\\(cite(label)?)(\\001\\d+)\\{([^\\001]+)\\4\\})/) {\n"
-"	$old = $1;\n"
-"	$cmd = $2;\n"
-"	$doxref = defined($3);\n"
-"	$bcite = $5;\n"
-"	if (! defined $bibcite{$bcite}) {\n"
-"	    $blabel = \" [\" . $bcite . \"]\";\n"
-"	} elsif ($doxref) {\n"
-"	    $blabel = \" <a href=\\\"#$bcite\\\">[\" . $bibcite{$bcite} . \"]<\\/a>\";\n"
-"	} else {\n"
-"	    $blabel = \" [\" . $bibcite{$bcite} . \"]\";\n"
-"	}\n"
-"	$old =~ s/(\\W)/\\\\$1/g;\n"
-"	s/\\s*$old/$blabel/g;\n"
-"    }\n"
-"    s/In (<a href=\\\"[^\\\"]*\\\">)([^\\[]+) \\[(\\2)/In $1\\[$2/;\n"
-"    s/\\\\htmladdnormallink(foot)?(\\001\\d+)\\{([^\\001]+)\\2\\}(\\001\\d+)\\{([^\\001]+)\\4\\}/<a href=\"$5\">$3<\\/a>/gs;\n"
-"    s/\\&amp;/\\005/g;\n"
-"    s/\\\\?&/&amp;/g;\n"
-"    s/\\005/&amp;/g;\n"
-"    html_ent();\n"
-"    while (m/\\\\char([\\'\\\"]?[0-9a-fA-F]+)/) {\n"
-"	$o = $r = $1;\n"
-"	if ($r =~ s/^\\'//) {\n"
-"	    $r = oct($r);\n"
-"	} elsif ($r =~ s/^\\\"//) {\n"
-"	    $r = hex($r);\n"
-"	}\n"
-"	s/\\\\char$o\\s*/&#$r;/g;\n"
-"    }\n"
-"    s/{\\\\etalchar\\001(\\d+)\\{(.)}\\001\\1\\}/$2/g;\n"
-"    s/\\\\par\\b/<p \\/>/g;\n"
-"    s/\\\\url(\\001\\d+)\\{(.*)\\1\\}/<a href=\"$2\">$2<\\/a>/gs;\n"
-"    s/\\\\href(\\001\\d+)\\{(.*)\\1\\}(\\001\\d+)\\{([^\\001]*)\\3\\}/<a href=\"$2\">$4<\\/a>/gs;\n"
-"    s/\\\\href(\\001\\d+)\\{(.*)\\1\\}/<a href=\"$2\">$2<\\/a>/gs;\n"
-"    s/(\\001\\d+)\\{\\\\rm\\s+(.*)\\1\\}/$2/gs;\n"
-"    s/\\\\textrm(\\001\\d+)\\{(.*)\\1\\}/$2/gs;\n"
-"    s/(\\001\\d+)\\{\\\\em\\s+(.*)\\1\\}/<em>$2<\\/em>/gs;\n"
-"    s/(\\001\\d+)\\{\\\\it\\s+(.*)\\1\\}/<i>$2<\\/i>/gs;\n"
-"    s/(\\001\\d+)\\{\\\\bf\\s+(.*)\\1\\}/<b>$2<\\/b>/gs;\n"
-"    s/(\\001\\d+)\\{\\\\tt\\s+(.*)\\1\\}/<tt>$2<\\/tt>/gs;\n"
-"    s/\\\\emph(\\001\\d+)\\{(.*)\\1\\}/<em>$2<\\/em>/gs;\n"
-"    s/\\\\textit(\\001\\d+)\\{(.*)\\1\\}/<i>$2<\\/i>/gs;\n"
-"    s/\\\\textbf(\\001\\d+)\\{(.*)\\1\\}/<b>$2<\\/b>/gs;\n"
-"    s/\\\\texttt(\\001\\d+)\\{(.*)\\1\\}/<tt>$2<\\/tt>/gs;\n"
-"    s/\\\\mathrm(\\001\\d+)\\{(.*)\\1\\}/$2/gs;\n"
-"    s/\\\\mathnormal(\\001\\d+)\\{(.*)\\1\\}/$2/gs;\n"
-"    s/\\\\mathsf(\\001\\d+)\\{(.*)\\1\\}/$2/gs;\n"
-"    s/\\\\mathbf(\\001\\d+)\\{(.*)\\1\\}/<b>$2<\\/b>/gs;\n"
-"    s/\\\\mathcal(\\001\\d+)\\{(.*)\\1\\}/<i>$2<\\/i>/gs;\n"
-"    s/\\\\mathit(\\001\\d+)\\{(.*)\\1\\}/<i>$2<\\/i>/gs;\n"
-"    s/\\\\mathtt(\\001\\d+)\\{(.*)\\1\\}/<tt>$2<\\/tt>/gs;\n"
-"    s/\\\\bibxhtmlname(\\001\\d+)\\{(.*)\\1\\}/$2/ges;\n"
-"    sub domath {\n"
-"      local($t) = @_;\n"
-"      $t =~ s/\\^(\\001\\d+)\\{\\\\circ\\1\\}/\\&\\#176;/gs;\n"
-"      $t =~ s/\\^\\\\circ/\\&\\#176;/g;\n"
-"      $t =~ s/\\^(\\001\\d+)\\{(.*)\\1\\}/<sup>$2<\\/sup>/gs;\n"
-"      $t =~ s/\\^(\\w)/<sup>$1<\\/sup>/g;\n"
-"      $t =~ s/\\_(\\001\\d+)\\{(.*)\\1\\}/<sub>$2<\\/sub>/gs;\n"
-"      $t =~ s/\\_(\\w)/<sub>$1<\\/sub>/g;\n"
-"      $t;\n"
-"    }\n"
-"    s/(\\$([^\\$]+)\\$)/&domath($2)/ge;\n"
-"    s/(\\\\\\((([^\\\\]|\\\\[^\\(\\)])+)\\\\\\))/&domath($2)/ge;\n"
-"    s/\\\\mbox(\\001\\d+)\\{(.*)\\1\\}/$2/gs;\n"
-"    while (s/(\\<a href\\=\\\"[^\"]*?)\\~/$1\\005/g) { ; }\n"
-"    s/([^\\\\])~/$1&nbsp;/g;\n"
-"    s/\\\\\\,/&thinsp;/g;\n"
-"    s/\\\\ldots\\b/&hellip;/g;\n"
-"    s/\\\\dots\\b/&hellip;/g;\n"
-"    s/\\005/\\~/g;\n"
-"    s/\\\\ / /g;\n"
-"    s/\\\\textasciitilde\\b\\s*/~/g;\n"
-"    s/\\\\([\\#\\&\\%\\~\\_\\^\\|])/$1/g;\n"
-"    s/\\\\\\W//g;\n"
-"    s/\\001(\\d+)\\{\\\\[A-Za-z]+\\001(\\d+)\\{([^\\001]*)\\001\\2\\}\\001\\1\\}/$3/g;\n"
-"    s/\\\\([A-Za-z]+)/ $1 /g;\n"
-"    s+In <a href=\\\"[^\\\"]*\\\"></a>++;\n"
-"    s/\\001\\d+[\\{\\}]//gs;\n"
-"    tr/\\002\\003\\004/{}$/;\n"
-"    print HTMLFILE $_;\n"
-"}\n"
-"close(BBLFILE);\n"
-"print HTMLFILE \"<$list_end>\\n\\n$endstring\\n\";\n"
-"while (<OHTMLFILE>) {\n"
-"  print HTMLFILE;\n"
-"}\n"
-"close (OHTMLFILE);\n"
-"close(HTMLFILE);\n"
-"chmod($mode, \"$htmlfile$$\");\n"
-"rename(\"$htmlfile$$\", $htmlfile);\n"
-"unlink(@tmpfiles);\n"
-"exit(0);\n"
diff --git a/src/cite.cpp b/src/cite.cpp
index ca0fb1a..3e3eb43 100644
--- a/src/cite.cpp
+++ b/src/cite.cpp
@@ -26,11 +26,11 @@
 //--------------------------------------------------------------------------
 
 static const char *doxygen_bst =
-#include "doxygen_bst.h"
+#include "doxygen.bst.h"
 ;
 
 static const char *bib2xhtml_pl =
-#include "bib2xhtml.h"
+#include "bib2xhtml.pl.h"
 ;
 
 //--------------------------------------------------------------------------
diff --git a/src/commentscan.l b/src/commentscan.l
index 51e431c..22d6444 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -2827,9 +2827,9 @@ bool parseCommentBlock(/* in */     ParserInterface *parser,
                "input=[\n%s]\n",fileName.data(),lineNr,comment.data()
               );
   
-  commentScanYYrestart( commentScanYYin );
+  commentscanYYrestart( commentscanYYin );
   BEGIN( Comment );
-  commentScanYYlex();
+  commentscanYYlex();
   setOutput( OutputDoc );
 
   if (YY_START==OverloadParam) // comment ended with \overload
@@ -3112,7 +3112,7 @@ static void handleGuard(const QCString &expr)
 #if !defined(YY_FLEX_SUBMINOR_VERSION) 
 //----------------------------------------------------------------------------
 extern "C" { // some bogus code to keep the compiler happy
-  void commentScanYYdummy() { yy_flex_realloc(0,0); } 
+  void commentscanYYdummy() { yy_flex_realloc(0,0); } 
 }
 #endif
 
diff --git a/src/config.xml b/src/config.xml
index 1174fab..996279c 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -911,7 +911,7 @@ Go to the <a href="commands.html">next</a> section or return to the
  If the \c SORT_BRIEF_DOCS tag is set to \c YES then doxygen will sort the
  brief descriptions of file, namespace and class members alphabetically
  by member name. If set to \c NO the members will appear in
- declaration order. Note the this will also influence the order of the
+ declaration order. Note that this will also influence the order of the
  classes in the class list.
 ]]>
       </docs>
diff --git a/src/configoptions.cpp b/src/configoptions.cpp
index d37163b..37ac26d 100644
--- a/src/configoptions.cpp
+++ b/src/configoptions.cpp
@@ -705,8 +705,8 @@ void addConfigOptions(Config *cfg)
              "SORT_BRIEF_DOCS",
               "If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief\n"
               "descriptions of file, namespace and class members alphabetically by member\n"
-              "name. If set to NO the members will appear in declaration order. Note the this\n"
-              "will also influence the order of the classes in the class list.\n"
+              "name. If set to NO the members will appear in declaration order. Note that\n"
+              "this will also influence the order of the classes in the class list.\n"
               "The default value is: NO.",
               FALSE
              );
diff --git a/src/constexp.h b/src/constexp.h
index 60e4722..1828b0b 100644
--- a/src/constexp.h
+++ b/src/constexp.h
@@ -22,9 +22,9 @@
 #include "cppvalue.h"
 #include <qcstring.h>
 
-extern bool parseCppExpression(const char *fileName,int line,const QCString &s);
-extern int cppExpYYparse();
-extern int cppExpYYdebug;
+extern bool parseconstexp(const char *fileName,int line,const QCString &s);
+extern int constexpYYparse();
+extern int constexpYYdebug;
 extern QCString g_strToken;
 extern CPPValue g_resultValue;
 extern QCString g_constExpFileName;
diff --git a/src/constexp.l b/src/constexp.l
index f72e99d..85ae7fd 100644
--- a/src/constexp.l
+++ b/src/constexp.l
@@ -103,19 +103,19 @@ CONSTSUFFIX ([uU][lL]?[lL]?)|([lL][lL]?[uU]?)
 
 %%
 
-bool parseCppExpression(const char *fileName,int lineNr,const QCString &s)
+bool parseconstexp(const char *fileName,int lineNr,const QCString &s)
 {
   //printf("Expression: `%s'\n",s.data());
   g_constExpFileName = fileName;
   g_constExpLineNr = lineNr;
   g_inputString = s;
   g_inputPosition = 0;
-  cppExpYYrestart( cppExpYYin );
-  cppExpYYparse();
+  constexpYYrestart( constexpYYin );
+  constexpYYparse();
   //printf("Result: %ld\n",(long)g_resultValue);
   return (long)g_resultValue!=0;
 }
 
 extern "C" {
-  int cppExpYYwrap() { return 1; }
+  int constexpYYwrap() { return 1; }
 }
diff --git a/src/constexp.y b/src/constexp.y
index f47e7c0..421e26e 100644
--- a/src/constexp.y
+++ b/src/constexp.y
@@ -31,14 +31,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-int cppExpYYerror(const char *s)
+int constexpYYerror(const char *s)
 {
   warn(g_constExpFileName,g_constExpLineNr,
        "preprocessing issue while doing constant expression evaluation: %s",s);
   return 0;
 }
 
-int cppExpYYlex();
+int constexpYYlex();
 
 %}
 
diff --git a/src/docbookgen.cpp b/src/docbookgen.cpp
index f869dfb..47d3b98 100644
--- a/src/docbookgen.cpp
+++ b/src/docbookgen.cpp
@@ -57,13 +57,13 @@
 //------------------
 
 static const char index_xsd[] =
-#include "index_xsd.h"
+#include "index.xsd.h"
 ;
 
 //------------------
 //
 static const char compound_xsd[] =
-#include "compound_xsd.h"
+#include "compound.xsd.h"
 ;
 
 //------------------
diff --git a/src/fortrancode.l b/src/fortrancode.l
index a0965d0..9ba4ba8 100644
--- a/src/fortrancode.l
+++ b/src/fortrancode.l
@@ -1156,9 +1156,9 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
   startCodeLine();
   g_parmName.resize(0);
   g_parmType.resize(0);
-  fcodeYYrestart( fcodeYYin );
+  fortrancodeYYrestart( fortrancodeYYin );
   BEGIN( Start );
-  fcodeYYlex();
+  fortrancodeYYlex();
   if (g_needsTermination)
   {
     endFontClass();
@@ -1179,13 +1179,13 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
 
 #if !defined(YY_FLEX_SUBMINOR_VERSION) 
 extern "C" { // some bogus code to keep the compiler happy
-  void fcodeYYdummy() { yy_flex_realloc(0,0); } 
+  void fortrancodeYYdummy() { yy_flex_realloc(0,0); } 
 }
 #elif YY_FLEX_SUBMINOR_VERSION<33
 #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
 #else
 extern "C" { // some bogus code to keep the compiler happy
-  void fcodeYYdummy() { yy_top_state(); } 
+  void fortrancodeYYdummy() { yy_top_state(); } 
 }
 #endif
 
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index 92cba53..c959fd3 100755
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -738,7 +738,7 @@ private                                 {
   				       }
 {ID}	                               {
                                        }  
-^{BS}"type"{BS_}"is"                    { }
+^{BS}"type"{BS_}"is"                   { }
 }
 <AttributeList>{
 {COMMA}					{}
@@ -2302,12 +2302,12 @@ static void parseMain(const char *fileName,const char *fileBuf,Entry *rt)
     current          = new Entry;
     current->lang    = SrcLangExt_Fortran; 
 
-    fscanYYrestart( fscanYYin );
+    fortranscannerYYrestart( fortranscannerYYin );
     {
       BEGIN( Start );
     }
 
-    fscanYYlex();
+    fortranscannerYYlex();
     groupLeaveFile(yyFileName,yyLineNr);
 
     endScope(current_root, TRUE); // TRUE - global root
@@ -2378,7 +2378,7 @@ void FortranLanguageScanner::parsePrototype(const char *text)
   pushBuffer(buffer);
   parsingPrototype = TRUE;
   BEGIN(Prototype);
-  fscanYYlex();
+  fortranscannerYYlex();
   parsingPrototype = FALSE;
   popBuffer();
 }
@@ -2411,7 +2411,7 @@ static void scanner_abort()
 #if !defined(YY_FLEX_SUBMINOR_VERSION) 
 //----------------------------------------------------------------------------
 extern "C" { // some bogus code to keep the compiler happy
-  void fscannerYYdummy() { yy_flex_realloc(0,0); } 
+  void fortranscannernerYYdummy() { yy_flex_realloc(0,0); } 
 }
 #endif
 
diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp
index 2e8acd9..11d3b1d 100644
--- a/src/ftvhelp.cpp
+++ b/src/ftvhelp.cpp
@@ -41,15 +41,15 @@
 
 
 static const char navtree_script[]=
-#include "navtree_js.h"
+#include "navtree.js.h"
 ;
 
 static const char resize_script[]=
-#include "resize_js.h"
+#include "resize.js.h"
 ;
 
 static const char navtree_css[]=
-#include "navtree_css.h"
+#include "navtree.css.h"
 ;
 
 static unsigned char blank_png[352] =
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 2987e6e..8aa89be 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -47,63 +47,63 @@
 #define DBG_HTML(x) 
 
 static const char defaultHtmlHeader[] =
-#include "header_html.h"
+#include "header.html.h"
 ;
 
 static const char defaultHtmlFooter[] =
-#include "footer_html.h"
+#include "footer.html.h"
 ;
 
 static const char defaultStyleSheet[] = 
-#include "doxygen_css.h"
+#include "doxygen.css.h"
 ;
 
 static const char search_functions_script[]=
-#include "search_functions_php.h"
+#include "search_functions.php.h"
 ;
 
 static const char search_opensearch_script[]=
-#include "search_opensearch_php.h"
+#include "search_opensearch.php.h"
 ;
 
 static const char search_styleSheet[] =
-#include "search_css.h"
+#include "search.css.h"
 ;
 
 static const char search_jquery_script1[]=
-#include "jquery_p1_js.h"
+#include "jquery_p1.js.h"
 ;
 
 static const char search_jquery_script2[]=
-#include "jquery_p2_js.h"
+#include "jquery_p2.js.h"
 ;
 
 static const char search_jquery_script3[]=
-#include "jquery_p3_js.h"
+#include "jquery_p3.js.h"
 ;
 
 static const char search_jquery_script4[]=
-#include "jquery_ui_js.h"
+#include "jquery_ui.js.h"
 ;
 
 static const char search_jquery_script5[]=
-#include "jquery_fx_js.h"
+#include "jquery_fx.js.h"
 ;
 
 static const char search_jquery_script6[]=
-#include "jquery_pt_js.h"
+#include "jquery_pt.js.h"
 ;
 
 static const char svgpan_script[]=
-#include "svgpan_js.h"
+#include "svgpan.js.h"
 ;
 
 static const char dynsections_script[]=
-#include "dynsections_js.h"
+#include "dynsections.js.h"
 ;
 
 static const char extsearch_script[]=
-#include "extsearch_js.h"
+#include "extsearch.js.h"
 ;
 
 static QCString g_header;
diff --git a/src/increasebuffer.py b/src/increasebuffer.py
new file mode 100755
index 0000000..e2b2d0c
--- /dev/null
+++ b/src/increasebuffer.py
@@ -0,0 +1,7 @@
+# Since the internal token buffer of a generated flex file is hardcoded
+# to 16K, this script is used to increase the buffer size of a flex
+# generated scanner to 256K.
+import sys
+sys.stdout.write(sys.stdin.read().
+    replace('YY_BUF_SIZE 16384','YY_BUF_SIZE 262144').
+    replace('YY_READ_BUF_SIZE 8192','YY_READ_BUF_SIZE 262144'))
diff --git a/src/lang_cfg.h b/src/lang_cfg.h
index 72305af..769696c 100644
--- a/src/lang_cfg.h
+++ b/src/lang_cfg.h
@@ -1,40 +1,42 @@
-#define LANG_NL
-#define LANG_SV
+#define LANG_AM
+#define LANG_AR
+#define LANG_BR
+#define LANG_CA
+#define LANG_CN
 #define LANG_CZ
-#define LANG_FR
-#define LANG_ID
-#define LANG_IT
 #define LANG_DE
-#define LANG_JP
-#define LANG_JE
+#define LANG_DK
+#define LANG_EN
+#define LANG_EO
 #define LANG_ES
+#define LANG_FA
 #define LANG_FI
-#define LANG_RU
+#define LANG_FR
+#define LANG_GR
 #define LANG_HR
-#define LANG_PL
-#define LANG_PT
 #define LANG_HU
-#define LANG_KR
+#define LANG_ID
+#define LANG_IT
+#define LANG_JE
+#define LANG_JP
 #define LANG_KE
+#define LANG_KR
+#define LANG_LT
+#define LANG_LV
+#define LANG_MK
+#define LANG_NL
+#define LANG_NO
+#define LANG_PL
+#define LANG_PT
 #define LANG_RO
+#define LANG_RU
+#define LANG_SC
 #define LANG_SI
-#define LANG_CN
-#define LANG_NO
-#define LANG_MK
-#define LANG_BR
-#define LANG_DK
 #define LANG_SK
-#define LANG_UA
-#define LANG_GR
-#define LANG_TW
 #define LANG_SR
-#define LANG_CA
-#define LANG_LT
-#define LANG_ZA
-#define LANG_AR
-#define LANG_FA
-#define LANG_SC
-#define LANG_VI
+#define LANG_SV
 #define LANG_TR
-#define LANG_EO
-#define LANG_AM
+#define LANG_TW
+#define LANG_UA
+#define LANG_VI
+#define LANG_ZA
diff --git a/src/layout.cpp b/src/layout.cpp
index 010c850..bc00745 100644
--- a/src/layout.cpp
+++ b/src/layout.cpp
@@ -33,7 +33,7 @@
 #include <qtextstream.h>
 
 static const char layout_default[] =
-#include "layout_default.h"
+#include "layout_default.xml.h"
 ;
 
 #define ADD_OPTION(langId,text) "|"+QCString().setNum(langId)+"="+text
diff --git a/src/libdoxycfg.t.in b/src/libdoxycfg.t.in
index 270d090..3a2ce0a 100644
--- a/src/libdoxycfg.t.in
+++ b/src/libdoxycfg.t.in
@@ -18,6 +18,7 @@
 
 LEX     =   %%FLEX%%
 YACC    =   %%BISON%%
+PYTHON  =   %%PYTHON%%
 
 #${
 sub GenerateDep {
@@ -48,5 +49,5 @@ sub GenerateDep {
 	$(LEX) -PconfigYY -t config.l >config.cpp 
 
 configoptions.cpp: config.xml configgen.py
-	python configgen.py -cpp config.xml >configoptions.cpp
+	$(PYTHON) configgen.py -cpp config.xml >configoptions.cpp
 
diff --git a/src/libdoxygen.pro.in b/src/libdoxygen.pro.in
index c4e79da..4879d07 100644
--- a/src/libdoxygen.pro.in
+++ b/src/libdoxygen.pro.in
@@ -17,6 +17,7 @@
 TEMPLATE     =	libdoxygen.t
 CONFIG       =	console warn_on staticlib $extraopts
 HEADERS      =	arguments.h \
+                bib2xhtml.pl.h \
                 bufstr.h \
 		cite.h \
 		clangparser.h \
@@ -26,7 +27,7 @@ HEADERS      =	arguments.h \
                 code.h \
 		commentcnv.h \
 		commentscan.h \
-                compound_xsd.h \
+                compound.xsd.h \
 		condparser.h \
                 config.h \
 		constexp.h \
@@ -45,20 +46,20 @@ HEADERS      =	arguments.h \
                 docvisitor.h \
 		dot.h \
 		doxygen.h \
-		doxygen_bst.h \
-		doxygen_css.h \
-		doxygen_sty.h \
+		doxygen.bst.h \
+		doxygen.css.h \
+		doxygen.sty.h \
 		eclipsehelp.h \
 		entry.h \
 		example.h \
 		filedef.h \
 		filename.h \
-		footer_html.h \
+		footer.html.h \
 		formula.h \
 		ftextstream.h \
 		ftvhelp.h \
 		groupdef.h \
-		header_html.h \
+		header.html.h \
 		htags.h \
 		htmlattrib.h \
                 htmldocvisitor.h \
@@ -66,20 +67,20 @@ HEADERS      =	arguments.h \
 		htmlhelp.h \
 		image.h \
 		index.h \
-                index_xsd.h \
-		jquery_p1_js.h \
-		jquery_p2_js.h \
-		jquery_p3_js.h \
-		jquery_ui_js.h \
-		jquery_fx_js.h \
-		jquery_pt_js.h \
-		svgpan_js.h \
-		dynsections_js.h \
+                index.xsd.h \
+		jquery_p1.js.h \
+		jquery_p2.js.h \
+		jquery_p3.js.h \
+		jquery_ui.js.h \
+		jquery_fx.js.h \
+		jquery_pt.js.h \
+		svgpan.js.h \
+		dynsections.js.h \
 		language.h \
                 latexdocvisitor.h \
 		latexgen.h \
                 layout.h \
-                layout_default.h \
+                layout_default.xml.h \
 		logos.h \
 		mandocvisitor.h \
 		mangen.h \
@@ -93,8 +94,8 @@ HEADERS      =	arguments.h \
 		message.h \
                 msc.h \
 		namespacedef.h \
-		navtree_css.h \
-		navtree_js.h \
+		navtree.css.h \
+		navtree.js.h \
                 objcache.h \
 		outputgen.h \
 		outputlist.h \
@@ -111,17 +112,17 @@ HEADERS      =	arguments.h \
 		qhp.h \
 		qhpxmlwriter.h \
 		reflist.h \
-		resize_js.h \
+		resize.js.h \
                 rtfdocvisitor.h \
 		rtfgen.h \
 		rtfstyle.h \
 		scanner.h \
 		searchindex.h \
-		search_css.h \
-		search_js.h \
-		extsearch_js.h \
-		search_functions_php.h \
-		search_opensearch_php.h \
+		search.css.h \
+		search.js.h \
+		extsearch.js.h \
+		search_functions.php.h \
+		search_opensearch.php.h \
 		section.h \
 		sortdict.h \
                 store.h \
@@ -131,41 +132,6 @@ HEADERS      =	arguments.h \
 		tooltip.h \
 		translator.h \
 		translator_adapter.h \
-		translator_am.h \
-		translator_br.h \
-		translator_ca.h \
-		translator_cn.h \
-		translator_cz.h \
-		translator_de.h \
-		translator_dk.h \
-		translator_en.h \
-		translator_es.h \
-		translator_fi.h \
-		translator_fr.h \
-		translator_gr.h \
-		translator_hr.h \
-		translator_hu.h \
-		translator_id.h \
-		translator_it.h \
-		translator_je.h \
-		translator_jp.h \
-		translator_ke.h \
-		translator_kr.h \
-		translator_nl.h \
-		translator_no.h \
-		translator_mk.h \
-		translator_pl.h \
-		translator_pt.h \
-		translator_ro.h \
-		translator_ru.h \
-		translator_se.h \
-		translator_si.h \
-		translator_sk.h \
-		translator_sr.h \
-		translator_tw.h \
-		translator_ua.h \
-		translator_vi.h \
-		translator_za.h \
 		types.h \
 		unistd.h \
 		util.h \
@@ -179,7 +145,7 @@ HEADERS      =	arguments.h \
                 docbookgen.h
 
 SOURCES      =	arguments.cpp \
-                ce_lex.cpp \
+                constexp.cpp \
                 ce_parse.cpp \
 		cite.cpp \
 		clangparser.cpp \
diff --git a/src/libdoxygen.t.in b/src/libdoxygen.t.in
index 959fd69..d16c8e9 100644
--- a/src/libdoxygen.t.in
+++ b/src/libdoxygen.t.in
@@ -18,7 +18,9 @@
 
 LEX        = %%FLEX%%
 YACC       = %%BISON%%
-INCBUFSIZE = $(PERL) increasebuffer.pl
+PYTHON     = %%PYTHON%%
+PERL       = %%PERL%%
+INCBUFSIZE = $(PYTHON) increasebuffer.py
 
 #${
 sub GenerateDep {
@@ -46,150 +48,161 @@ sub GenerateDep {
 ####################
 
 #$ GenerateDep("scanner.cpp","scanner.l");
-	$(LEX) -PscanYY -t scanner.l | $(INCBUFSIZE) >scanner.cpp
+	$(LEX) -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
 
 #$ GenerateDep("code.cpp","code.l");
-	$(LEX) -PcodeYY -t code.l | $(INCBUFSIZE) >code.cpp
+	$(LEX) -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
 
 #$ GenerateDep("pyscanner.cpp","pyscanner.l");
-	$(LEX) -PpyscanYY -t pyscanner.l | $(INCBUFSIZE) >pyscanner.cpp
+	$(LEX) -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
 
 #$ GenerateDep("pycode.cpp","pycode.l");
-	$(LEX) -PpycodeYY -t pycode.l | $(INCBUFSIZE) >pycode.cpp
+	$(LEX) -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
 
 #$ GenerateDep("fortranscanner.cpp","fortranscanner.l");
-	$(LEX) -i -PfscanYY -t fortranscanner.l | $(INCBUFSIZE) >fortranscanner.cpp
+	$(LEX) -i -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
 
 #$ GenerateDep("fortrancode.cpp","fortrancode.l");
-	$(LEX) -i -PfcodeYY -t fortrancode.l | $(INCBUFSIZE) >fortrancode.cpp
+	$(LEX) -i -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
 
 #$ GenerateDep("vhdlcode.cpp","vhdlcode.l");
-	$(LEX) -i -PvhdlcodeYY -t vhdlcode.l | $(INCBUFSIZE) >vhdlcode.cpp
+	$(LEX) -i -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
 
 #$ GenerateDep("tclscanner.cpp","tclscanner.l");
-	$(LEX) -i -PtclscanYY -t tclscanner.l | $(INCBUFSIZE) >tclscanner.cpp
+	$(LEX) -i -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
 
 #$ GenerateDep("pre.cpp","pre.l");
-	$(LEX) -PpreYY -t pre.l | $(INCBUFSIZE) >pre.cpp 
+	$(LEX) -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
 
 #$ GenerateDep("declinfo.cpp","declinfo.l");
-	$(LEX) -PdeclinfoYY -t declinfo.l | $(INCBUFSIZE) >declinfo.cpp
+	$(LEX) -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
 
 #$ GenerateDep("defargs.cpp","defargs.l");
-	$(LEX) -PdefargsYY -t defargs.l | $(INCBUFSIZE) >defargs.cpp
+	$(LEX) -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
 
 #$ GenerateDep("doctokenizer.cpp","doctokenizer.l");
-	$(LEX) -PdoctokenizerYY -t doctokenizer.l | $(INCBUFSIZE) >doctokenizer.cpp
+	$(LEX) -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
 
 #$ GenerateDep("commentcnv.cpp","commentcnv.l");
-	$(LEX) -PcommentcnvYY -t commentcnv.l | $(INCBUFSIZE) >commentcnv.cpp
+	$(LEX) -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
 
 #$ GenerateDep("commentscan.cpp","commentscan.l");
-	$(LEX) -PcommentScanYY -t commentscan.l | $(INCBUFSIZE) >commentscan.cpp
+	$(LEX) -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
 
-#$ GenerateDep("ce_lex.cpp","constexp.l","ce_parse.h");
-	$(LEX) -PcppExpYY -t constexp.l | $(INCBUFSIZE) >ce_lex.cpp 
+#$ GenerateDep("constexp.cpp","constexp.l","ce_parse.h");
+	$(LEX) -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
 
 #$ GenerateDep("ce_parse.cpp","constexp.y");
-	$(YACC) -l -p cppExpYY constexp.y -o ce_parse.cpp 
+	$(YACC) -l -p constexpYY constexp.y -o ce_parse.cpp 
 
 #$ GenerateDep("ce_parse.h","constexp.y");
-	$(YACC) -l -d -p cppExpYY constexp.y -o ce_parse.c 
+	$(YACC) -l -d -p ce_parsexpYY constexp.y -o ce_parse.c 
 	-rm ce_parse.c
 
 #$ GenerateDep("vhdlscanner.cpp","vhdlscanner.l","vhdlparser.h");
-	$(LEX) -i -PvhdlScanYY -t vhdlscanner.l | $(INCBUFSIZE) >vhdlscanner.cpp
+	$(LEX) -i -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
 
 #$ GenerateDep("vhdlparser.cpp","vhdlparser.y");
-	$(YACC) -l -p vhdlScanYY vhdlparser.y -o vhdlparser.cpp 	
+	$(YACC) -l -p vhdlscannerYY vhdlparser.y -o vhdlparser.cpp 	
 
 #$ GenerateDep("vhdlparser.h","vhdlparser.y");
-	$(YACC) -l -d -p vhdlScanYY vhdlparser.y -o vhdlparser.c 
+	$(YACC) -l -d -p vhdlscannerYY vhdlparser.y -o vhdlparser.c 
 	-rm vhdlparser.c	
 	
-#$ GenerateDep("layout.cpp","layout_default.h");
+#$ GenerateDep("layout.cpp","layout_default.xml.h");
 
-TO_C_CMD=sed -e "s/\\\\/\\\\\\\\/g" -e "s/\"/\\\\\"/g" -e "s/^/\"/g" -e "s/$$/\\\\n\"/g"
+TO_C_CMD=$(PYTHON) to_c_cmd.py < $< > $@
 
-index_xsd.h: index.xsd
-	cat index.xsd | $(TO_C_CMD) >index_xsd.h 
+cite.cpp: doxygen.bst.h bib2xhtml.pl.h
 
-compound_xsd.h: compound.xsd
-	cat compound.xsd | $(TO_C_CMD) >compound_xsd.h 
+ftvhelp.cpp: navtree.js.h resize.js.h navtree.css.h
 
-layout_default.h: layout_default.xml
-	cat layout_default.xml | $(TO_C_CMD) >layout_default.h 
+htmlgen.cpp: header.html.h footer.html.h doxygen.css.h search_functions.php.h \
+             search_opensearch.php.h search.css.h jquery_p1.js.h jquery_p2.js.h \
+	     jquery_p3.js.h jquery_ui.js.h jquery_fx.js.h jquery_pt.js.h \
+	     svgpan.js.h dynsections.js.h extsearch.js.h
 
-header_html.h: header.html
-	cat header.html | $(TO_C_CMD) >header_html.h
+layout.cpp: layout_default.xml.h
 
-footer_html.h: footer.html
-	cat footer.html | $(TO_C_CMD) >footer_html.h
+xmlgen.cpp: index.xsd.h compound.xsd.h
 
-search_functions_php.h: search_functions.php
-	cat search_functions.php | $(TO_C_CMD) >search_functions_php.h 
+searchindex.cpp: search.js.h
 
-search_opensearch_php.h: search_opensearch.php
-	cat search_opensearch.php | $(TO_C_CMD) >search_opensearch_php.h 
+index.xsd.h: index.xsd
+	$(TO_C_CMD)
 
-search_js.h: search.js
-	cat search.js | $(TO_C_CMD) >search_js.h 
+compound.xsd.h: compound.xsd
+	$(TO_C_CMD)
 
-search_css.h: search.css
-	cat search.css | $(TO_C_CMD) >search_css.h 
+layout_default.xml.h: layout_default.xml
+	$(TO_C_CMD)
 
-extsearch_js.h: extsearch.js
-	cat extsearch.js | $(TO_C_CMD) >extsearch_js.h 
+header.html.h: header.html
+	$(TO_C_CMD)
 
-doxygen_css.h: doxygen.css
-	cat doxygen.css | $(TO_C_CMD) >doxygen_css.h 
+footer.html.h: footer.html
+	$(TO_C_CMD)
 
-doxygen_sty.h: doxygen.sty
-	cat doxygen.sty | $(TO_C_CMD) >doxygen_sty.h 
+search_functions.php.h: search_functions.php
+	$(TO_C_CMD)
 
-navtree_js.h: navtree.js
-	cat navtree.js | $(TO_C_CMD) >navtree_js.h
+search_opensearch.php.h: search_opensearch.php
+	$(TO_C_CMD)
 
-navindex_js.h: navindex.js
-	cat navindex.js | $(TO_C_CMD) >navindex_js.h
+search.js.h: search.js
+	$(TO_C_CMD)
 
-resize_js.h: resize.js
-	cat resize.js | $(TO_C_CMD) >resize_js.h
+search.css.h: search.css
+	$(TO_C_CMD)
 
-jquery_p1_js.h: jquery_p1.js
-	cat jquery_p1.js | $(TO_C_CMD) >jquery_p1_js.h
+extsearch.js.h: extsearch.js
+	$(TO_C_CMD)
 
-jquery_p2_js.h: jquery_p2.js
-	cat jquery_p2.js | $(TO_C_CMD) >jquery_p2_js.h
+doxygen.css.h: doxygen.css
+	$(TO_C_CMD)
 
-jquery_p3_js.h: jquery_p3.js
-	cat jquery_p3.js | $(TO_C_CMD) >jquery_p3_js.h
+doxygen.sty.h: doxygen.sty
+	$(TO_C_CMD)
 
-jquery_p4_js.h: jquery_p4.js
-	cat jquery_p4.js | $(TO_C_CMD) >jquery_p4_js.h
 
-jquery_ui_js.h: jquery_ui.js
-	cat jquery_ui.js | $(TO_C_CMD) >jquery_ui_js.h
+navtree.js.h: navtree.js
+	$(TO_C_CMD)
 
-jquery_fx_js.h: jquery_fx.js
-	cat jquery_fx.js | $(TO_C_CMD) >jquery_fx_js.h
+resize.js.h: resize.js
+	$(TO_C_CMD)
 
-jquery_pt_js.h: jquery_pt.js
-	cat jquery_pt.js | $(TO_C_CMD) >jquery_pt_js.h
+jquery_p1.js.h: jquery_p1.js
+	$(TO_C_CMD)
 
-navtree_css.h: navtree.css
-	cat navtree.css | $(TO_C_CMD) >navtree_css.h
+jquery_p2.js.h: jquery_p2.js
+	$(TO_C_CMD)
 
-svgpan_js.h: svgpan.js
-	cat svgpan.js | $(TO_C_CMD) >svgpan_js.h
+jquery_p3.js.h: jquery_p3.js
+	$(TO_C_CMD)
 
-dynsections_js.h: dynsections.js
-	cat dynsections.js | $(TO_C_CMD) >dynsections_js.h
+jquery_ui.js.h: jquery_ui.js
+	$(TO_C_CMD)
 
-doxygen_bst.h: doxygen.bst
-	cat doxygen.bst | $(TO_C_CMD) >doxygen_bst.h
+jquery_fx.js.h: jquery_fx.js
+	$(TO_C_CMD)
 
-bib2xhtml.h: bib2xhtml.pl
-	cat bib2xhtml.pl | $(TO_C_CMD) >bib2xhtml.h
+jquery_pt.js.h: jquery_pt.js
+	$(TO_C_CMD)
 
+navtree.css.h: navtree.css
+	$(TO_C_CMD)
 
+svgpan.js.h: svgpan.js
+	$(TO_C_CMD)
+
+dynsections.js.h: dynsections.js
+	$(TO_C_CMD)
+
+doxygen.bst.h: doxygen.bst
+	$(TO_C_CMD)
+
+bib2xhtml.pl.h: bib2xhtml.pl
+	$(TO_C_CMD)
+
+version.cpp: ../configure
+	$(PYTHON) version.py
diff --git a/src/pre.l b/src/pre.l
index 2b217b3..822eb65 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -1337,7 +1337,7 @@ bool computeExpression(const QCString &expr)
   e = removeIdsAndMarkers(e);
   if (e.isEmpty()) return FALSE;
   //printf("parsing `%s'\n",e.data());
-  return parseCppExpression(g_yyFileName,g_yyLineNr,e);
+  return parseconstexp(g_yyFileName,g_yyLineNr,e);
 }
 
 /*! expands the macro definition in \a name
diff --git a/src/pyscanner.l b/src/pyscanner.l
index b156097..c113b58 100644
--- a/src/pyscanner.l
+++ b/src/pyscanner.l
@@ -1510,7 +1510,7 @@ static void parseCompounds(Entry *rt)
       // init scanner state
       inputString = ce->program;
       inputPosition = 0;
-      pyscanYYrestart( pyscanYYin ) ;
+      pyscannerYYrestart( pyscannerYYin ) ;
       if (ce->section&Entry::COMPOUND_MASK)
       {
         current_root = ce ;
@@ -1531,7 +1531,7 @@ static void parseCompounds(Entry *rt)
 
       groupEnterCompound(yyFileName,yyLineNr,ce->name);
       
-      pyscanYYlex() ;
+      pyscannerYYlex() ;
       g_lexInit=TRUE;
       delete current; current=0;
       ce->program.resize(0);
@@ -1600,9 +1600,9 @@ static void parseMain(const char *fileName,const char *fileBuf,Entry *rt)
     
     current->reset();
     initEntry();
-    pyscanYYrestart( pyscanYYin );
+    pyscannerYYrestart( pyscannerYYin );
     BEGIN( Search );
-    pyscanYYlex();
+    pyscannerYYlex();
     g_lexInit=TRUE;
 
     groupLeaveFile(yyFileName,yyLineNr);
@@ -1637,18 +1637,18 @@ static void parsePrototype(const QCString &text)
   
   // save scanner state
   orgState = YY_CURRENT_BUFFER;
-  yy_switch_to_buffer(yy_create_buffer(pyscanYYin, YY_BUF_SIZE));
+  yy_switch_to_buffer(yy_create_buffer(pyscannerYYin, YY_BUF_SIZE));
   orgInputString = inputString; 
   orgInputPosition = inputPosition;
 
   // set new string
   inputString = text;
   inputPosition = 0;
-  pyscanYYrestart( pyscanYYin );
+  pyscannerYYrestart( pyscannerYYin );
 
   BEGIN( FunctionDec );
 
-  pyscanYYlex();
+  pyscannerYYlex();
   g_lexInit=TRUE;
 
   current->name = current->name.stripWhiteSpace();
@@ -1672,7 +1672,7 @@ void pyscanFreeScanner()
 #if defined(YY_FLEX_SUBMINOR_VERSION) 
   if (g_lexInit)
   {
-    pyscanYYlex_destroy();
+    pyscannerYYlex_destroy();
   }
 #endif
 }
diff --git a/src/scanner.l b/src/scanner.l
index 2e76c51..5a1f306 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -6630,7 +6630,7 @@ static void parseCompounds(Entry *rt)
       g_column=0;
       inputString = ce->program;
       inputPosition = 0;
-      scanYYrestart( scanYYin ) ;
+      scannerYYrestart( scannerYYin ) ;
       if (ce->section==Entry::ENUM_SEC || (ce->spec&Entry::Enum))
 	BEGIN( FindFields ) ;
       else
@@ -6700,7 +6700,7 @@ static void parseCompounds(Entry *rt)
       //memberGroupInside.resize(0);
       groupEnterCompound(yyFileName,yyLineNr,ce->name);
       
-      scanYYlex() ;
+      scannerYYlex() ;
       g_lexInit=TRUE;
       //forceEndGroup();
 
@@ -6777,7 +6777,7 @@ static void parseMain(const char *fileName,
     }
     current->reset();
     initEntry();
-    scanYYrestart( scanYYin );
+    scannerYYrestart( scannerYYin );
     if ( insidePHP )
     {
       BEGIN( FindMembersPHP );
@@ -6787,7 +6787,7 @@ static void parseMain(const char *fileName,
       BEGIN( FindMembers );
     }
 
-    scanYYlex();
+    scannerYYlex();
     g_lexInit=TRUE;
 
     if (YY_START==Comment)
@@ -6841,7 +6841,7 @@ static void parsePrototype(const QCString &text)
   
   // save scanner state
   orgState = YY_CURRENT_BUFFER;
-  yy_switch_to_buffer(yy_create_buffer(scanYYin, YY_BUF_SIZE));
+  yy_switch_to_buffer(yy_create_buffer(scannerYYin, YY_BUF_SIZE));
   orgInputString = inputString; 
   orgInputPosition = inputPosition;
 
@@ -6849,9 +6849,9 @@ static void parsePrototype(const QCString &text)
   inputString = text;
   inputPosition = 0;
   g_column = 0;
-  scanYYrestart( scanYYin );
+  scannerYYrestart( scannerYYin );
   BEGIN(Prototype);
-  scanYYlex();
+  scannerYYlex();
   g_lexInit=TRUE;
 
   current->name = current->name.stripWhiteSpace();
@@ -6873,7 +6873,7 @@ void scanFreeScanner()
 #if defined(YY_FLEX_SUBMINOR_VERSION)
   if (g_lexInit)
   {
-    scanYYlex_destroy();
+    scannerYYlex_destroy();
   }
 #endif
 }
diff --git a/src/searchindex.cpp b/src/searchindex.cpp
index d2f49ad..f023e4d 100644
--- a/src/searchindex.cpp
+++ b/src/searchindex.cpp
@@ -584,7 +584,7 @@ void SearchIndexExternal::write(const char *fileName)
 #include "message.h"
 
 static const char search_script[]=
-#include "search_js.h"
+#include "search.js.h"
 ;
 
 #define SEARCH_INDEX_ALL         0
diff --git a/src/settings.py b/src/settings.py
new file mode 100755
index 0000000..af24e7b
--- /dev/null
+++ b/src/settings.py
@@ -0,0 +1,28 @@
+# 
+
+import sys
+
+f_sqlite3 = sys.argv[1]
+f_libclang = sys.argv[2]
+
+f1 = open('../src/settings.h','w')
+f1.write("#ifndef SETTINGS_H\n")
+f1.write("#define SETTINGS_H\n")
+f1.write("\n")
+if (f_sqlite3 != "NO"):
+  f1.write("#define USE_SQLITE3  1\n")
+else:
+  f1.write("#define USE_SQLITE3  0\n")
+
+if (f_libclang != "NO"):
+  f1.write("#define USE_LIBCLANG 1\n")
+else:
+  f1.write("#define USE_LIBCLANG 0\n")
+
+f1.write("\n")
+f1.write("#define IS_SUPPORTED(x) \\\n")
+f1.write("  ((USE_SQLITE3  && strcmp(\"USE_SQLITE3\",(x))==0)  || \\\n")
+f1.write("   (USE_LIBCLANG && strcmp(\"USE_LIBCLANG\",(x))==0) || \\\n")
+f1.write("  0)\n")
+f1.write("\n")
+f1.write("#endif\n")
diff --git a/src/tclscanner.l b/src/tclscanner.l
index 7f160e6..5bbb396 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -2503,7 +2503,7 @@ static void tcl_parse(const QCString ns, const QCString cls)
   tcl.ns.insert("::",myEntry);
   tcl.entry_current = tcl_entry_new();
 
-  tclscanYYrestart( tclscanYYin );
+  tclscannerYYrestart( tclscannerYYin );
   BEGIN( TOP );
   yylineno=1;
   myScan = new tcl_scan;
@@ -2518,7 +2518,7 @@ static void tcl_parse(const QCString ns, const QCString cls)
   tcl.entry_inside = tcl.entry_file;
   myScan->entry_scan = tcl.entry_inside;
   tcl.scan.insert(0,myScan);
-  tclscanYYlex();
+  tclscannerYYlex();
   tcl.scan.clear();
   tcl.ns.clear();
   tcl.cl.clear();
diff --git a/src/to_c_cmd.py b/src/to_c_cmd.py
new file mode 100755
index 0000000..52785f1
--- /dev/null
+++ b/src/to_c_cmd.py
@@ -0,0 +1,8 @@
+# place " at begin of each line
+# escape existing '\' and '"'
+# remove \n at the end of the line (sometimes the last line does not have a \n
+#   so we cannot do a replacement with some other text)
+# place an escaped \n and " at the end of each line
+import sys
+for line in sys.stdin:
+    sys.stdout.write('"' + line.replace('\\','\\\\').replace('"','\\"').replace('\n','') + '\\n"\n')
diff --git a/src/translator_lv.h b/src/translator_lv.h
index 4460946..054310c 100644
--- a/src/translator_lv.h
+++ b/src/translator_lv.h
@@ -48,7 +48,7 @@
  *  Last Doxygen version covered   : 1.8.2
  */
 
-class TranslatorLatvian : public Translator
+class TranslatorLatvian : public TranslatorAdapter_1_8_4
 {
   public:
 
@@ -602,6 +602,7 @@ class TranslatorLatvian : public Translator
         case ClassDef::Protocol:   result+=" protokola"; break;
         case ClassDef::Category:   result+=" kategorijas"; break;
         case ClassDef::Exception:  result+=" izņēmuma"; break;
+        default: break;
       }
       if (isTemplate) result+=" veidnes";
       result+=" apraksts";
@@ -760,6 +761,7 @@ class TranslatorLatvian : public Translator
         case ClassDef::Protocol:   result+=" protokola"; break;
         case ClassDef::Category:   result+="s kategorijas"; break;
         case ClassDef::Exception:  result+=" izņēmuma"; break;
+        default: break;
       }
       result+=" dokumentācijas tika ģenerēta no šāda fail";
       if (single) result+="a:"; else result+="iem:";
@@ -1636,6 +1638,7 @@ class TranslatorLatvian : public Translator
         case ClassDef::Protocol:   result+=" protokola"; break;
         case ClassDef::Category:   result+=" kategorijas"; break;
         case ClassDef::Exception:  result+=" izņēmuma"; break;
+        default: break;
       }
       if (isTemplate) result+=" sagataves";
       result+=" atsauce";
@@ -1704,6 +1707,7 @@ class TranslatorLatvian : public Translator
         case ClassDef::Protocol:   result+="im protokolam"; break;
         case ClassDef::Category:   result+="ai kategorijai"; break;
         case ClassDef::Exception:  result+="im izņēmumam"; break;
+        default: break;
       }
       result+=" tika ģenerēta no fail";
       if (single) result+="a:"; else result+="iem:";
diff --git a/src/version.py b/src/version.py
new file mode 100755
index 0000000..c53303d
--- /dev/null
+++ b/src/version.py
@@ -0,0 +1,57 @@
+# 
+
+# script to read the version information from `../configure`
+# relevant lines are starting with:
+#   `doxygen_version_major`
+#   `doxygen_version_minor`
+#   `doxygen_version_revision`
+#   `doxygen_version_mmn`
+# the collected information is written to: `../VERSION` and `../src/version.cpp`
+#
+import sys
+#
+# set 'default' values
+#
+major = 0
+minor = 0
+revision = 0
+mnt = 'NO'
+#
+# open input file
+#  read file and get relevant information
+# close
+#
+f = open('../configure', 'r')
+for line in f:
+    # check if line can match (saves 3 comparisons)
+    if (line.startswith('doxygen_version')):
+        if (line.startswith('doxygen_version_major')):
+            major = line.replace('doxygen_version_major=','')
+        elif (line.startswith('doxygen_version_minor')):
+            minor = line.replace('doxygen_version_minor=','')
+        elif (line.startswith('doxygen_version_revision')):
+            revision = line.replace('doxygen_version_revision=','')
+        elif (line.startswith('doxygen_version_mmn')):
+            mnt = line.replace('doxygen_version_mmn=','')
+f.close()
+
+# strip superfluous '\n`
+major = major.replace('\n','')
+minor = minor.replace('\n','')
+revision = revision.replace('\n','')
+mnt = mnt.replace('\n','')
+#
+# open output files
+# write relevant infomation
+# close files
+#
+f1 = open('../VERSION','w')
+f2 = open('../src/version.cpp','w')
+if (mnt == 'NO'):
+    f1.write(major + '.' + minor + '.' + revision)
+    f2.write('char versionString[]="' + major + '.' + minor + '.' + revision + '";')
+else:
+    f1.write(major + '.' + minor + '.' + revision + '-' + mnt)
+    f2.write('char versionString[]="' + major + '.' + minor + '.' + revision + '-' + mnt + '";')
+f1.close()
+f2.close()
diff --git a/src/vhdlparser.y b/src/vhdlparser.y
index 4e53193..4e4e675 100644
--- a/src/vhdlparser.y
+++ b/src/vhdlparser.y
@@ -121,8 +121,8 @@ static int parse_sec=0;
 
 //---------------------------- functions --------------------------------------------------------------------------------
 
-int vhdlScanYYlex ();
-void vhdlScanYYerror (char const *);
+int vhdlscannerYYlex ();
+void vhdlscannerYYerror (char const *);
 
 static void addVhdlType(const QCString &name,int startLine,
                         int section,uint64 spec,
@@ -2266,9 +2266,9 @@ tool_directive: t_ToolDir
 
 %%
 extern FILE* yyout;
-extern YYSTYPE vhdlScanYYlval;
+extern YYSTYPE vhdlscannerYYlval;
 
-void vhdlScanYYerror(const char* /*str*/)
+void vhdlscannerYYerror(const char* /*str*/)
 {
   // fprintf(stderr,"\n<---error at line %d  : [ %s]   in file : %s ---->",s_str.yyLineNr,s_str.qstr.data(),s_str.fileName);
   //  exit(0);
@@ -2276,7 +2276,7 @@ void vhdlScanYYerror(const char* /*str*/)
 
 void vhdlParse()
 {
-  vhdlScanYYparse();
+  vhdlscannerYYparse();
 }
 
 struct VhdlContainer*  getVhdlCont()
diff --git a/src/vhdlscanner.l b/src/vhdlscanner.l
index 6244f5a..e24fd6c 100644
--- a/src/vhdlscanner.l
+++ b/src/vhdlscanner.l
@@ -112,7 +112,7 @@ static struct
 } str_doc;
 
 #define YY_NEVER_INTERACTIVE 1
-#define YY_USER_ACTION num_chars += (int)vhdlScanYYleng;
+#define YY_USER_ACTION num_chars += (int)vhdlscannerYYleng;
 
 #define MAX_KEYWORD_LEN 20
 
@@ -280,7 +280,7 @@ static int find_keyword(char *s)
 // update current line
 static void lineCount()
 {
-  for (const char* c=vhdlScanYYtext ; *c ; ++c )
+  for (const char* c=vhdlscannerYYtext ; *c ; ++c )
   {
     yyLineNr += (*c == '\n') ;
   }
@@ -344,10 +344,10 @@ static bool isConstraintFile(const QCString &fileName,const QCString &ext)
 //static void resetScanner(const char* s,MyParserVhdl* parse);
 
 #undef  YY_INPUT
-#define	YY_INPUT(buf,result,max_size) result=vhdlScanYYread(buf,max_size);
+#define	YY_INPUT(buf,result,max_size) result=vhdlscannerYYread(buf,max_size);
 
 
-static int vhdlScanYYread(char *buf,int max_size)
+static int vhdlscannerYYread(char *buf,int max_size)
 {
   int c=0;
   while ( c < max_size && inputVhdlString.at(inputPosition) )
@@ -437,14 +437,14 @@ BR                         [ \t\n\r]
 
 
 {letter}(_?{letter_or_digit})*|{extended_character} 	{
-          int itoken=find_keyword(vhdlScanYYtext);
+          int itoken=find_keyword(vhdlscannerYYtext);
         
-          //	fprintf(stderr,"\n <<<< search tok:  %s %d %d>>>\n",vhdlScanYYtext,itoken,yyLineNr);
+          //	fprintf(stderr,"\n <<<< search tok:  %s %d %d>>>\n",vhdlscannerYYtext,itoken,yyLineNr);
         
           // tokens in vhdlparser.hpp 258..412
 	  if (itoken>200  && itoken<500 && prevToken!=t_END)
 	  {
-	    //  	printf("\n <<<< insert tok:  %s %d %d>>>\n",vhdlScanYYtext,itoken,yyLineNr);
+	    //  	printf("\n <<<< insert tok:  %s %d %d>>>\n",vhdlscannerYYtext,itoken,yyLineNr);
 	    lineIndex[itoken]=yyLineNr;
 	  }
 	 
@@ -462,7 +462,7 @@ BR                         [ \t\n\r]
 	 
 	  prevToken=itoken;
         
-          yycont->qstr=vhdlScanYYtext;
+          yycont->qstr=vhdlscannerYYtext;
           yycont->yyLineNr=yyLineNr;
           if (itoken== -1)  
           {
@@ -476,13 +476,13 @@ BR                         [ \t\n\r]
         }
 
 ({decimal_literal})|({base}#{based_integer}(\.{based_integer})?#({exponent})?)|({base}:{based_integer}(\.{based_integer})?:({exponent})?) {
-          yycont->qstr=vhdlScanYYtext;
+          yycont->qstr=vhdlscannerYYtext;
           return ( t_ABSTRLIST );
         }
 
 '({graphic_character}|\"|\%)' 	{
-          QCString q(vhdlScanYYtext);	       
-          yycont->qstr=vhdlScanYYtext; 
+          QCString q(vhdlscannerYYtext);	       
+          yycont->qstr=vhdlscannerYYtext; 
         
           if (q=="'('") // std_logic'('1') ?
           {
@@ -502,19 +502,19 @@ BR                         [ \t\n\r]
         }
 
 (\"({graphic_character}|(\"\")|\%)*\")|(\%({graphic_character}|(\%\%)|\")*\%) {
-          yycont->qstr=vhdlScanYYtext;
+          yycont->qstr=vhdlscannerYYtext;
           yycont->iLine=yyLineNr;
 	  return ( t_STRING );
         } 
 
 {base_specifier}(\"{extended_digit}(_?{extended_digit})*\"|\%{extended_digit}(_?{extended_digit})*\%) 							{
-	  yycont->qstr=vhdlScanYYtext;
+	  yycont->qstr=vhdlscannerYYtext;
 	  yycont->iLine=yyLineNr;
 	  return ( t_DIGIT );
         }
 
 {vhdl2008tooldir} {
-	  yycont->qstr=vhdlScanYYtext;
+	  yycont->qstr=vhdlscannerYYtext;
 	  yycont->iLine=yyLineNr;
 	  return(t_ToolDir);
         }	
@@ -526,7 +526,7 @@ BR                         [ \t\n\r]
 
 <*>"--"[^\n]* {
           /* comment */
-	  QCString qcs(vhdlScanYYtext);
+	  QCString qcs(vhdlscannerYYtext);
 	  //  vhdl comment ?
 	  if (qcs.stripPrefix("--!"))
 	  {
@@ -545,7 +545,7 @@ BR                         [ \t\n\r]
 
 <*>{BR}*"--!"[^{}\n]*[^\n]*\n/{B}*"--!" { // multi line comment
   if (iDocLine==-1) iDocLine=yyLineNr;
-  QCString qc(vhdlScanYYtext);
+  QCString qc(vhdlscannerYYtext);
   int len=qc.contains('\n')+yyLineNr-1;
   if (YY_START!=Comment) // Start of the comment block
   {
@@ -555,7 +555,7 @@ BR                         [ \t\n\r]
   
    if(!checkMultiComment(qc,len))
   {
-    strComment+=vhdlScanYYtext;
+    strComment+=vhdlscannerYYtext;
   }
   lineCount();
   BEGIN(Comment);
@@ -563,7 +563,7 @@ BR                         [ \t\n\r]
 
 <Comment>^{B}*"--!"[^\n]* {
   if (iDocLine==-1) iDocLine=yyLineNr;
-  strComment+=vhdlScanYYtext;
+  strComment+=vhdlscannerYYtext;
   int index=strComment.find("\\code");
   if (index>0)
   {
@@ -591,14 +591,14 @@ BR                         [ \t\n\r]
             handleCommentBlock(strComment,FALSE);
           }
           strComment.resize(0);;
-          unput(*vhdlScanYYtext);
+          unput(*vhdlscannerYYtext);
           doxComment=FALSE;
           BEGIN(g_lastCommentContext);
         }
         
 <*>"--!"[^\n]* { // one line comment
           if (iDocLine==-1) iDocLine=yyLineNr;
-          QCString qcs(vhdlScanYYtext);
+          QCString qcs(vhdlscannerYYtext);
 
 	  bool isEndCode=qcs.contains("\\endcode");
 
@@ -630,7 +630,7 @@ BR                         [ \t\n\r]
        }
 
 <*>"/*" {
-	  strComment+=vhdlScanYYtext;
+	  strComment+=vhdlscannerYYtext;
 	  if (yy_hold_char=='!') // found  comment starting with "/*!"
   	  {
 	    doxComment=TRUE;
@@ -639,7 +639,7 @@ BR                         [ \t\n\r]
         }
 
 <Vhdl2008Comment>[^*]*[*]+    {
-    	  QCString tt(vhdlScanYYtext);
+    	  QCString tt(vhdlscannerYYtext);
 	  int len=tt.length();
 	  yyLineNr+=tt.contains('\n');
 
@@ -712,7 +712,7 @@ void vhdlscanFreeScanner()
 #if defined(YY_FLEX_SUBMINOR_VERSION)
   if (g_lexInit)
   {
-    vhdlScanYYlex_destroy();
+    vhdlscannerYYlex_destroy();
   }
 #endif
 }
@@ -735,7 +735,7 @@ void VHDLLanguageScanner::parsePrototype(const char *text)
 // do parsing
 //int VhdlParser::doLex()
 //{
-//  int token=vhdlScanYYlex();
+//  int token=vhdlscannerYYlex();
 //  //fprintf(stderr,"\ntoken: %d at line: %d",token,yyLineNr);
 //  return token;
 //}
@@ -775,7 +775,7 @@ void VHDLLanguageScanner::parseInput(const char *fileName,
   inputFile.setName(fileName);
   if (g_lexInit)
   {
-    vhdlScanYYrestart( vhdlScanYYin );
+    vhdlscannerYYrestart( vhdlscannerYYin );
   }
   g_lexInit=TRUE;
   g_thisParser=this;
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
index 9caa935..570901f 100644
--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
@@ -56,13 +56,13 @@
 //------------------
 
 static const char index_xsd[] =
-#include "index_xsd.h"
+#include "index.xsd.h"
 ;
 
 //------------------
 //
 static const char compound_xsd[] =
-#include "compound_xsd.h"
+#include "compound.xsd.h"
 ;
 
 //------------------