Imported Upstream version 1.8.10upstream/1.8.10

706 files changed, 7875 insertions, 27877 deletions

diff --git a/.gitignore b/.gitignore
index d97dc2e..3e575a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,69 +7,11 @@
 *.orig
 
 *.pro
-/.makeconfig
-/.tmakeconfig
-/VERSION
-/src/libdoxycfg.t
-/src/libdoxygen.t
 /packages/rpm/doxygen.spec
-/libmd5/Makefile
-/libmd5/Makefile.libmd5
-/qtools/Makefile
-/qtools/Makefile.qtools
-/vhdlparser/Makefile
-/vhdlparser/Makefile.vhdlparser
-/src/Makefile.doxygen
-/src/Makefile.libdoxycfg
-/src/Makefile.libdoxygen
-/addon/doxysearch/Makefile
-/addon/doxysearch/Makefile.doxyindexer
-/addon/doxysearch/Makefile.doxysearch
-/addon/doxmlparser/examples/metrics/Makefile
-/addon/doxmlparser/examples/metrics/Makefile.metrics
-/addon/doxmlparser/src/Makefile
-/addon/doxmlparser/src/Makefile.doxmlparser
-/addon/doxmlparser/test/Makefile
-/addon/doxyapp/Makefile
-/addon/doxyapp/Makefile.doxyapp
-/addon/doxywizard/Makefile
-/addon/doxywizard/Makefile.doxywizard
-/addon/doxmlparser/objects
-/addon/doxmlparser/lib
-/addon/doxmlparser/test/Makefile.xmlparse
-/addon/doxmlparser/test/xmlparse.exe
-/addon/doxmlparser/examples/metrics/obj
-/addon/doxmlparser/examples/metrics/metrics.exe
 *.idb
 *.pdb
-/examples/Makefile
-/Makefile
-
-/bin
-/lib
-/generated_src
-/objects
-/moc
-/rcc
-
-/src/Makefile
-
-/doc/Makefile
-/doc/translator_report.txt
-/doc/config.doc
-/doc/language.doc
 
 /doxygen_docs
 /doxygen.tag
 
-/examples/*/html
-/html
-/latex
-/rtf
-/xml
-/man
-/docbook
-/perlmod
-!/templates/html
-!/templates/latex
 
diff --git a/.travis.yml b/.travis.yml
index 1206c68..b6976ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,13 @@ compiler:
   - gcc
 before_install:
     - sudo apt-get update -qq
-    - sudo apt-get install -qq  texlive texlive-extra-utils libxml2-utils perl
+    - sudo apt-get install -qq  texlive texlive-extra-utils texlive-latex-extra libxml2-utils
+    - wget -qO- http://www.cmake.org/files/v3.1/cmake-3.1.0-Linux-x86_64.tar.gz | tar xvz
+
 script:
-    - ./configure --with-doxywizard
+    - mkdir build
+    - cd build
+    - ../cmake-3.1.0-Linux-x86_64/bin/cmake -G "Unix Makefiles" -Dbuild_doc=ON -Dbuild_wizard=ON ..
     - make
     - make docs
-    - make test
+    - make tests
diff --git a/BUILD.txt b/BUILD.txt
new file mode 100644
index 0000000..ad3424b
--- /dev/null
+++ b/BUILD.txt
@@ -0,0 +1,53 @@
+Doxygen uses cmake (http://www.cmake.org/) to build executables for various platforms.
+It's required at least cmake version 3.0.
+
+The first step is to create a build directory where the output should be stored.
+Doxygen can be fully build outside of the source tree.
+
+The second step is to invoke cmake from within the build directory with the desired generator.
+
+For Linux/Unix systems do the following
+
+  mkdir build
+  cd build
+  cmake -G "Unix Makefiles" path/to/root/of/doxygen/source/tree
+  make
+
+This also works for MacOSX, but if XCode is installed you can also generate an XCode project file
+
+  cmake -G XCode path/to/root/of/doxygen/source/tree
+
+For Windows one can generate a Visual Studio project using
+
+  cmake -G "Visual Studio 12 2013" path\to\root\of\doxygen\source\tree
+
+(this is for Visual Studio 12, there are typically also generators for other versions of
+Visual Studio or other compiler environments like MinGW)
+
+Doxygen's cmake configuration provides a number of options:
+- build_wizard    Build the GUI frontend for doxygen.
+- build_app       Example showing how to embed doxygen in an application.
+- build_xmlparser Example showing how to parse doxygen's XML output.
+- build_search    Build external search tools (doxysearch and doxyindexer).
+- build_doc       Build user manual.
+- use_sqlite3     Add support for sqlite3 output [experimental].
+- use_libclang    Add support for libclang parsing.
+- win_static      Link with /MT in stead of /MD on windows.
+- english_only    Only compile in support for the English language.
+
+An option can be turned on, by adding -D<option>=ON as a command line option, this can be
+done when generating the initial build files, but also afterwards, i.e. to enable building
+of the documentation after an initial cmake -G run, do
+
+  cmake -Dbuild_doc=ON path/to/root/of/doxygen/source/tree
+
+To turn the option off use
+
+  cmake -Dbuild_doc=OFF path/to/root/of/doxygen/source/tree
+
+To see the current value is of the various options, you can run
+
+  cmake -L path/to/root/of/doxygen/source/tree
+
+The build target for building the documentation is 'docs' and the build target for
+the regression tests is 'tests'
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..b0def45
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,138 @@
+# vim:ts=4:sw=4:expandtab:autoindent:
+#
+# Copyright (C) 1997-2015 by Dimitri van Heesch.
+#
+# Permission to use, copy, modify, and distribute this software and its
+# documentation under the terms of the GNU General Public License is hereby
+# granted. No representations are made about the suitability of this software
+# for any purpose. It is provided "as is" without express or implied warranty.
+# See the GNU General Public License for more details.
+#
+# Documents produced by Doxygen are derivative works derived from the
+# input used in their production; they are not affected by this license.
+
+cmake_minimum_required(VERSION 2.8.12)
+project(doxygen)
+
+option(build_wizard    "Build the GUI frontend for doxygen." OFF)
+option(build_app       "Example showing how to embed doxygen in an application." OFF)
+option(build_xmlparser "Example showing how to parse doxygen's XML output." OFF)
+option(build_search    "Build external search tools (doxysearch and doxyindexer)" OFF)
+option(build_doc       "Build user manual" OFF)
+option(use_sqlite3     "Add support for sqlite3 output [experimental]." OFF)
+option(use_libclang    "Add support for libclang parsing." OFF)
+option(win_static      "Link with /MT in stead of /MD on windows" OFF)
+option(english_only    "Only compile in support for the English language" OFF)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+set(SOURCE "${CMAKE_SOURCE_DIR}")
+include(version)
+
+set(sqlite3  "0" CACHE INTERNAL "used in settings.h")
+set(clang    "0" CACHE INTERNAL "used in settings.h")
+if (use_sqlite3)
+	set(sqlite3  "1" CACHE INTERNAL "used in settings.h")
+endif()
+if (use_libclang)
+	set(clang    "1" CACHE INTERNAL "used in settings.h")
+        find_package(LibClang REQUIRED)
+endif()
+
+if (${CMAKE_SYSTEM} MATCHES "Darwin")
+    set(CMAKE_CXX_FLAGS "-Wno-deprecated-register -mmacosx-version-min=10.5 ${CMAKE_CXX_FLAGS}")
+    find_library(CORESERVICES_LIB CoreServices)
+    set(EXTRA_LIBS ${CORESERVICES_LIB})
+endif()
+
+if (WIN32)
+    set(ICONV_DIR "${CMAKE_SOURCE_DIR}/winbuild")
+    set(CMAKE_REQUIRED_DEFINITIONS "-DLIBICONV_STATIC")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # needed for language.cpp on 64bit
+    add_definitions(-DLIBICONV_STATIC -D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+find_program(DOT NAMES dot)
+find_package(PythonInterp REQUIRED)
+find_package(FLEX REQUIRED)
+find_package(BISON REQUIRED)
+find_package(Threads)
+
+if (sqlite3)
+    find_package(SQLite3 REQUIRED)
+endif()
+
+find_package(Iconv REQUIRED)
+include_directories(${ICONV_INCLUDE_DIR})
+
+
+#set(DOXYDOCS ${CMAKE_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs")
+set(DOC_INSTALL_DIR "share/doc/packages/doxygen" CACHE STRING "Relative path where to install the documentation")
+set(EXAMPLE_DIR ${CMAKE_SOURCE_DIR}/examples)
+set(DOXYDOCS ${PROJECT_BINARY_DIR}/doc)
+set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS})
+set(GENERATED_SRC "${CMAKE_BINARY_DIR}/generated_src" CACHE INTERNAL "Stores generated files")
+set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set(CUSTOM_INCLUDE_DIR "" CACHE FILEPATH "Extra include path")
+set(CUSTOM_LINK_DIR "" CACHE FILEPATH "Extra library path")
+
+# place binaries for all build types in the same directory, so we know where to find it
+# when running tests or generating docs
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${EXECUTABLE_OUTPUT_PATH})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${EXECUTABLE_OUTPUT_PATH})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${EXECUTABLE_OUTPUT_PATH})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${EXECUTABLE_OUTPUT_PATH})
+
+# gather lang codes for translation
+file(GLOB lang_files RELATIVE "${CMAKE_SOURCE_DIR}/src" "${CMAKE_SOURCE_DIR}/src/translator_??.h")
+set(lcodes "")
+foreach (_lang ${lang_files})
+  string(REGEX REPLACE "translator_(.*).h" "\\1" _lang_code ${_lang})
+  string(TOUPPER ${_lang_code} lang_code)
+  list(APPEND lcodes "${lang_code}")
+endforeach()
+if (english_only) # user only wants English
+  set(lcodes "ENONLY")
+endif()
+set(LANG_CODES ${lcodes} CACHE STRING "List of language codes for which translations should be compiled in")
+
+if (${CUSTOM_INCLUDE_DIR})
+   include_directories(${CUSTOM_INCLUDE_DIR})
+endif()
+
+if (${CUSTOM_LINK_DIR})
+   link_directories(${CUSTOM_LINK_DIR})
+endif()
+
+if (win_static)
+    set(CompilerFlags
+        CMAKE_CXX_FLAGS
+        CMAKE_CXX_FLAGS_DEBUG
+        CMAKE_CXX_FLAGS_RELEASE
+        CMAKE_CXX_FLAGS_MINSIZEREL
+        CMAKE_CXX_FLAGS_RELWITHDEBINFO
+        CMAKE_C_FLAGS
+        CMAKE_C_FLAGS_DEBUG
+        CMAKE_C_FLAGS_RELEASE
+        CMAKE_C_FLAGS_MINSIZEREL
+        CMAKE_C_FLAGS_RELWITHDEBINFO)
+    foreach(CompilerFlag ${CompilerFlags})
+      string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
+    endforeach()
+endif()
+
+
+add_subdirectory(libmd5)
+add_subdirectory(qtools)
+add_subdirectory(vhdlparser)
+add_subdirectory(src)
+add_subdirectory(examples)
+add_subdirectory(doc)
+
+add_subdirectory(addon/doxmlparser)
+add_subdirectory(addon/doxyapp)
+add_subdirectory(addon/doxysearch)
+add_subdirectory(addon/doxywizard)
+
+enable_testing()
+add_subdirectory(testing)
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index af7a76f..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,161 +0,0 @@
-
-DESTDIR = 
-
-doxywizard:
-	cd addon/doxywizard ; $(MAKE) 
-
-doxysearch:
-	cd addon/doxysearch ; $(MAKE) 
-
-doxmlparser:
-	cd addon/doxmlparser/src ; $(MAKE)
-	cd addon/doxmlparser/test ; $(MAKE)
-	cd addon/doxmlparser/examples/metrics ; $(MAKE)
-
-doxyapp:
-	cd addon/doxyapp ; $(MAKE) clean
-
-clean: FORCE
-	- cd examples ; $(MAKE) clean
-	- cd doc ; $(MAKE) clean
-	- cd qtools ; $(MAKE) clean
-	- cd src ; $(MAKE) clean
-	- cd libmd5 ; $(MAKE) clean
-	- cd vhdlparser ; $(MAKE) clean
-	-cd addon/doxywizard ; $(MAKE) clean
-	-cd addon/doxysearch ; $(MAKE) clean
-	-cd addon/doxyapp ; $(MAKE) clean
-	-cd addon/doxmlparser/src ; $(MAKE) clean
-	-cd addon/doxmlparser/test ; $(MAKE) clean
-	-cd addon/doxmlparser/examples/metrics ; $(MAKE) clean
-	-rm -f bin/doxy*
-	-rm -f objects/*/*.o
-
-distclean: clean
-	-cd src ; $(MAKE) distclean
-	-cd libmd5 ; $(MAKE) distclean
-	-cd vhdlparser ; $(MAKE) distclean
-	-cd qtools ; $(MAKE) distclean
-	-cd addon/doxywizard ; $(MAKE) distclean
-	-cd addon/doxysearch ; $(MAKE) distclean
-	-cd addon/doxyapp ; $(MAKE) distclean
-	-cd addon/doxmlparser/src ; $(MAKE) distclean
-	-cd addon/doxmlparser/test ; $(MAKE) distclean
-	-cd addon/doxmlparser/examples/metrics ; $(MAKE) distclean
-	-rm -rf lib
-	-rm -rf bin
-	-rm -rf objects
-	-rm -rf html
-	-rm -rf latex
-	-rm -rf man
-	-rm -rf docbook
-	-rm -rf perlmod
-	-rm -rf rtf
-	-rm -rf xml
-	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen 
-	-rm -f src/Makefile.libdoxycfg src/libdoxycfg.t src/libdoxygen.t
-	-rm -f libmd5/Makefile.libmd5
-	-rm -f vhdlparser/Makefile.vhdlparser
-	-rm -f .makeconfig .tmakeconfig
-	-rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro vhdlparser/vhdlparser.pro
-	-rm -rf generated_src
-	-rm -f addon/doxywizard/doxywizard.pro
-	-rm -f VERSION
-	-rm -f packages/rpm/doxygen.spec
-	-rm -r addon/doxywizard/Makefile
-	-rm -f addon/doxysearch/Makefile
-	-rm -f addon/doxyapp/Makefile
-	-rm -f addon/doxmlparser/src/Makefile
-	-rm -f addon/doxmlparser/test/Makefile
-	-rm -f addon/doxmlparser/examples/metrics/Makefile
-	-rm -f qtools/Makefile src/Makefile examples/Makefile doc/Makefile 
-	-rm -f Makefile
-
-DATE=$(shell date "+%B %Y")
-
-MAN1DIR = man/man1
-
-install: doxywizard_install doxysearch_install
-	$(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin
-	$(INSTTOOL) -m 755 bin/doxygen        $(DESTDIR)$(INSTALL)/bin
-	$(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR)
-	cat doc/doxygen.1    | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxygen.1 
-	$(INSTTOOL) -m 644 doxygen.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxygen.1
-	rm doxygen.1
-
-install_docs: 
-	$(INSTTOOL) -d $(DESTDIR)$(DOCDIR)
-	$(MAKE) -C examples
-	$(MAKE) -C doc 
-	$(MAKE) -C latex 
-	$(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DESTDIR)$(DOCDIR)
-	cp -r examples $(DESTDIR)$(DOCDIR)
-	cp -r html $(DESTDIR)$(DOCDIR)
-
-docs: FORCE
-	cd examples ; $(MAKE)
-	cd doc ; $(MAKE)
-
-pdf: docs
-	cd latex ; $(MAKE)
-
-DISTFILES =  Doxyfile vhdlparser libmd5 addon tmake doc examples bin lib objects testing \
-             qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \
-             Makefile.win_make.in INSTALL LANGUAGE.HOWTO LICENSE PLATFORMS \
-             VERSION README.md packages winbuild jquery templates
-
-archive: clean
-	tar zcvf dx`date +%y%m%d`.tgz $(DISTFILES)
-
-DISTDIR = doxygen-`echo $(VERSION) | tr - _`
-
-dist: clean
-	rm -rf $(DISTDIR)
-	mkdir $(DISTDIR)
-	cp -a $(DISTFILES) $(DISTDIR)
-	find $(DISTDIR) \( -name ".svn" \) -print0 | xargs -0 rm -rf
-	tar zcvf $(DISTDIR).src.tar.gz $(DISTDIR)
-	rm -rf $(DISTDIR)
-
-DISTDIR = doxygen-`echo $(VERSION) | tr - _`
-rpm: dist
-	gzip -df $(DISTDIR).src.tar.gz
-	mkdir $(DISTDIR)
-	mkdir $(DISTDIR)/packages
-	mkdir $(DISTDIR)/packages/rpm
-	cp packages/rpm/doxygen.spec $(DISTDIR)/packages/rpm
-	rm -rf $(DISTDIR)
-	gzip -9v $(DISTDIR).src.tar
-	rpmbuild -ta %%WITHDOXYWIZARD%% $(DISTDIR).src.tar.gz
-
-rpmsrc: dist
-	gzip -df $(DISTDIR).src.tar.gz
-	mkdir $(DISTDIR)
-	mkdir $(DISTDIR)/packages
-	mkdir $(DISTDIR)/packages/rpm
-	cp packages/rpm/doxygen.spec $(DISTDIR)/packages/rpm
-	tar -rvf $(DISTDIR).src.tar $(DISTDIR)/packages/rpm/doxygen.spec
-	rm -rf $(DISTDIR)
-	gzip -9v $(DISTDIR).src.tar
-	rpmbuild -ts %%WITHDOXYWIZARD%% $(DISTDIR).src.tar.gz
-
-rpmbinary: dist
-	gzip -df $(DISTDIR).src.tar.gz
-	mkdir $(DISTDIR)
-	mkdir $(DISTDIR)/packages
-	mkdir $(DISTDIR)/packages/rpm
-	cp packages/rpm/doxygen.spec $(DISTDIR)/packages/rpm
-	tar -rvf $(DISTDIR).src.tar $(DISTDIR)/packages/rpm/doxygen.spec
-	rm -rf $(DISTDIR)
-	gzip -9v $(DISTDIR).src.tar
-	rpmbuild -tb %%WITHDOXYWIZARD%% $(DISTDIR).src.tar.gz
-
-
-ctags:
-	ctags -R -f tags src addon/doxywizard qtools
-
-test: FORCE
-	make -C testing
-
-FORCE:
-
diff --git a/Makefile.win_make.in b/Makefile.win_make.in
deleted file mode 100644
index 1218979..0000000
--- a/Makefile.win_make.in
+++ /dev/null
@@ -1,34 +0,0 @@
-all: src\version.cpp
-	set TMAKEPATH=$(TMAKEPATH) & cd qtools & $(MAKE)
-	set TMAKEPATH=$(TMAKEPATH) & cd libmd5 & $(MAKE)
-	set TMAKEPATH=$(TMAKEPATH) & cd src & $(MAKE)
-
-clean:
-	cd examples & $(MAKE) clean
-	cd doc & $(MAKE) clean
-	cd src & $(MAKE) clean
-	-del bin\doxy*.*
-	-del objects\*.o
-
-distclean: clean
-	-del src\Makefile.libdoxygen \
-	     src\Makefile.doxygen \
-	     src\Makefile.libdoxycfg \
-	     src\libdoxycfg.t src\libdoxygen.t
-	-del Makefile src\Makefile examples\Makefile doc\Makefile
-	-del src\libdoxygen.pro src\doxygen.pro src\libdoxycfg.pro
-	-del src\version.cpp
-
-realclean: distclean
-
-docs:
-	set TMAKEPATH=$(TMAKEPATH) & cd examples & $(MAKE)
-	set TMAKEPATH=$(TMAKEPATH) & cd doc & $(MAKE)
-
-ps: docs
-	cd latex & $(MAKE)
-
-src\version.cpp: Makefile
-	echo char versionString[]="""$(VERSION)"""; > src\version.cpp
-
-FORCE:
diff --git a/Makefile.win_nmake.in b/Makefile.win_nmake.in
deleted file mode 100644
index 069bb53..0000000
--- a/Makefile.win_nmake.in
+++ /dev/null
@@ -1,51 +0,0 @@
-all: src\version.cpp
-	set TMAKEPATH=$(TMAKEPATH)
-	cd qtools
-	$(MAKE)
-	cd ..
-	cd libmd5
-	$(MAKE)
-	cd ..
-	cd src 
-	$(MAKE)
-
-clean: FORCE
-	cd examples
-	$(MAKE) clean
-	cd ..
-	cd doc
-	$(MAKE) clean
-	cd ..
-	cd src
-	$(MAKE) clean
-	cd ..
-	-del bin\doxy*.*
-	-del objects\*.o
-
-distclean: clean
-	-del src\Makefile.libdoxygen \
-	     src\Makefile.doxygen \
-	     src\Makefile.libdoxycfg \
-	     src\libdoxycfg.t src\libdoxygen.t
-	-del Makefile src\Makefile examples\Makefile doc\Makefile
-	-del src\libdoxygen.pro src\doxygen.pro src\libdoxycfg.pro
-	-del src\version.cpp
-
-realclean: distclean
-
-docs: FORCE
-	cd examples 
-	$(MAKE)
-	cd ..
-	cd doc
-	$(MAKE)
-	cd ..
-
-ps: docs
-	cd latex
-	$(MAKE)
-
-src\version.cpp: Makefile
-	echo char versionString[]="$(VERSION)"; > src\version.cpp
-
-FORCE:
diff --git a/PLATFORMS b/PLATFORMS
deleted file mode 100644
index 22a8d8c..0000000
--- a/PLATFORMS
+++ /dev/null
@@ -1,32 +0,0 @@
-aix-g++
-aix-xlc
-beos-g++
-dgux-g++
-freebsd-g++
-gnu-g++
-hpux-acc
-hpux-cc
-hpux-g++
-irix-64
-irix-dcc
-irix-g++
-irix-n32
-linux-g++
-linux-64
-macosx-c++
-macosx-uni-c++
-m68k-atari-mint-g++
-netbsd-g++
-openbsd-g++
-osf1-cxx
-osf1-g++
-qnx-g++
-sco-g++
-solaris-cc
-solaris-cc-64
-solaris-g++
-sunos-g++
-ultrix-g++
-unixware-g++
-win32-g++
-win32-mingw
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..d9a03a9
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+1.8.10
diff --git a/addon/doxmlparser/CMakeLists.txt b/addon/doxmlparser/CMakeLists.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/addon/doxmlparser/CMakeLists.txt
diff --git a/addon/doxmlparser/src/Makefile.in b/addon/doxmlparser/src/Makefile.in
deleted file mode 100644
index 47d20c2..0000000
--- a/addon/doxmlparser/src/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-all clean depend: Makefile.doxmlparser 
-	$(MAKE) -f Makefile.doxmlparser $@
-
-distclean: clean
-	$(RM) -rf Makefile.doxmlparser doxmlparser.pro Makefile obj
-
-realclean: distclean
-
-tmake:
-	$(ENV) $(PERL) $(TMAKE) doxmlparser.pro >Makefile.doxmlparser
-
-Makefile.doxmlparser: doxmlparser.pro
-	$(ENV) $(PERL) $(TMAKE) doxmlparser.pro >Makefile.doxmlparser
-
-install:
diff --git a/addon/doxmlparser/src/basehandler.h b/addon/doxmlparser/src/basehandler.h
index 31fbf24..5715dda 100644
--- a/addon/doxmlparser/src/basehandler.h
+++ b/addon/doxmlparser/src/basehandler.h
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/baseiterator.h b/addon/doxmlparser/src/baseiterator.h
index 2ee9c2f..3325f54 100644
--- a/addon/doxmlparser/src/baseiterator.h
+++ b/addon/doxmlparser/src/baseiterator.h
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/compoundhandler.cpp b/addon/doxmlparser/src/compoundhandler.cpp
index 87b0440..3e729e9 100644
--- a/addon/doxmlparser/src/compoundhandler.cpp
+++ b/addon/doxmlparser/src/compoundhandler.cpp
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/compoundhandler.h b/addon/doxmlparser/src/compoundhandler.h
index c7e5ac0..f669133 100644
--- a/addon/doxmlparser/src/compoundhandler.h
+++ b/addon/doxmlparser/src/compoundhandler.h
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/dochandler.cpp b/addon/doxmlparser/src/dochandler.cpp
index df71e6a..4e25813 100644
--- a/addon/doxmlparser/src/dochandler.cpp
+++ b/addon/doxmlparser/src/dochandler.cpp
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/dochandler.h b/addon/doxmlparser/src/dochandler.h
index 6bc2bd9..4340dbd 100644
--- a/addon/doxmlparser/src/dochandler.h
+++ b/addon/doxmlparser/src/dochandler.h
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/doxmlintf.h b/addon/doxmlparser/src/doxmlintf.h
index ba863d4..22cecdb 100644
--- a/addon/doxmlparser/src/doxmlintf.h
+++ b/addon/doxmlparser/src/doxmlintf.h
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/doxmlparser.pro.in b/addon/doxmlparser/src/doxmlparser.pro.in
deleted file mode 100644
index 2bbf326..0000000
--- a/addon/doxmlparser/src/doxmlparser.pro.in
+++ /dev/null
@@ -1,27 +0,0 @@
-TEMPLATE     =	lib.t
-CONFIG       =	console staticlib warn_on $extraopts
-HEADERS      =	basehandler.h mainhandler.h \
-                compoundhandler.h sectionhandler.h \
-                memberhandler.h paramhandler.h \
-                dochandler.h linkedtexthandler.h \
-                debug.h graphhandler.h stringimpl.h \
-                loamhandler.h
-SOURCES      =	mainhandler.cpp \
-                compoundhandler.cpp sectionhandler.cpp \
-                memberhandler.cpp paramhandler.cpp \
-                dochandler.cpp linkedtexthandler.cpp \
-                basehandler.cpp debug.cpp graphhandler.cpp \
-                loamhandler.cpp
-unix:LIBS                  += -L../../../lib -lqtools 
-win32:INCLUDEPATH          += .
-win32-mingw:LIBS           += -L../../../lib -lqtools 
-win32-msvc:LIBS            += qtools.lib shell32.lib 
-win32-msvc:TMAKE_LFLAGS    += /LIBPATH:....\\..\lib
-win32-borland:LIBS         += qtools.lib doxycfg.lib shell32.lib
-win32-borland:TMAKE_LFLAGS += -L..\..\..\lib
-win32:TMAKE_CXXFLAGS       += -DQT_NODLL
-DESTDIR                     = ../../../lib
-OBJECTS_DIR                 = ../../../objects/doxmlparser
-TARGET                      = doxmlparser
-INCLUDEPATH                += ../../../qtools ../include
-
diff --git a/addon/doxmlparser/src/graphhandler.h b/addon/doxmlparser/src/graphhandler.h
index 090c62a..783b9f2 100644
--- a/addon/doxmlparser/src/graphhandler.h
+++ b/addon/doxmlparser/src/graphhandler.h
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/linkedtexthandler.cpp b/addon/doxmlparser/src/linkedtexthandler.cpp
index fe45133..1164688 100644
--- a/addon/doxmlparser/src/linkedtexthandler.cpp
+++ b/addon/doxmlparser/src/linkedtexthandler.cpp
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/linkedtexthandler.h b/addon/doxmlparser/src/linkedtexthandler.h
index cebdeb0..816726e 100644
--- a/addon/doxmlparser/src/linkedtexthandler.h
+++ b/addon/doxmlparser/src/linkedtexthandler.h
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/loamhandler.h b/addon/doxmlparser/src/loamhandler.h
index a113aa9..48a9952 100644
--- a/addon/doxmlparser/src/loamhandler.h
+++ b/addon/doxmlparser/src/loamhandler.h
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/mainhandler.cpp b/addon/doxmlparser/src/mainhandler.cpp
index 48c77fa..93525f0 100644
--- a/addon/doxmlparser/src/mainhandler.cpp
+++ b/addon/doxmlparser/src/mainhandler.cpp
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/mainhandler.h b/addon/doxmlparser/src/mainhandler.h
index 270f417..21e9b0a 100644
--- a/addon/doxmlparser/src/mainhandler.h
+++ b/addon/doxmlparser/src/mainhandler.h
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/memberhandler.cpp b/addon/doxmlparser/src/memberhandler.cpp
index ea55333..7a3f228 100644
--- a/addon/doxmlparser/src/memberhandler.cpp
+++ b/addon/doxmlparser/src/memberhandler.cpp
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/memberhandler.h b/addon/doxmlparser/src/memberhandler.h
index a84cc79..7438172 100644
--- a/addon/doxmlparser/src/memberhandler.h
+++ b/addon/doxmlparser/src/memberhandler.h
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/paramhandler.cpp b/addon/doxmlparser/src/paramhandler.cpp
index e6d3db1..831d5e4 100644
--- a/addon/doxmlparser/src/paramhandler.cpp
+++ b/addon/doxmlparser/src/paramhandler.cpp
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/paramhandler.h b/addon/doxmlparser/src/paramhandler.h
index 7ecf711..3f0f09b 100644
--- a/addon/doxmlparser/src/paramhandler.h
+++ b/addon/doxmlparser/src/paramhandler.h
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/sectionhandler.cpp b/addon/doxmlparser/src/sectionhandler.cpp
index bb43925..1137901 100644
--- a/addon/doxmlparser/src/sectionhandler.cpp
+++ b/addon/doxmlparser/src/sectionhandler.cpp
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxmlparser/src/sectionhandler.h b/addon/doxmlparser/src/sectionhandler.h
index 2730307..a212e62 100644
--- a/addon/doxmlparser/src/sectionhandler.h
+++ b/addon/doxmlparser/src/sectionhandler.h
@@ -3,7 +3,7 @@
  * $Id$
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
new file mode 100644
index 0000000..a039762
--- /dev/null
+++ b/addon/doxyapp/CMakeLists.txt
@@ -0,0 +1,28 @@
+if (build_app)
+
+find_package(Iconv)
+
+include_directories(
+	${CMAKE_SOURCE_DIR}/src
+	${CMAKE_SOURCE_DIR}/qtools
+	${ICONV_INCLUDE_DIR}
+)
+
+add_executable(doxyapp
+doxyapp.cpp
+)
+target_link_libraries(doxyapp
+_doxygen
+qtools
+md5
+doxycfg
+vhdlparser
+${ICONV_LIBRARIES}
+${CMAKE_THREAD_LIBS_INIT}
+${SQLITE3_LIBRARIES}
+${EXTRA_LIBS}
+)
+
+install(TARGETS doxyapp DESTINATION bin)
+
+endif()
diff --git a/addon/doxyapp/Makefile.in b/addon/doxyapp/Makefile.in
deleted file mode 100644
index d0629d9..0000000
--- a/addon/doxyapp/Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-
-all clean depend distclean: Makefile.doxyapp 
-	$(MAKE) -f Makefile.doxyapp $@
-
-distclean: clean
-	$(RM) -rf Makefile doxyapp.pro Makefile.doxyapp
-
-realclean: distclean
-
-tmake:
-	$(ENV) $(PERL) "$(TMAKE)" doxyapp.pro >Makefile.doxyapp
-
-strip:
-	strip doxyapp
-
-Makefile.doxyapp: doxyapp.pro
-	$(ENV) $(PERL) "$(TMAKE)" doxyapp.pro >Makefile.doxyapp
-
-install:
diff --git a/addon/doxyapp/doxyapp.cpp b/addon/doxyapp/doxyapp.cpp
index e73d12a..6564981 100644
--- a/addon/doxyapp/doxyapp.cpp
+++ b/addon/doxyapp/doxyapp.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -26,7 +26,8 @@
  */
 
 #include <stdlib.h>
-#include <unistd.h>
+#include <qfile.h>
+#include <qdir.h>
 #include "doxygen.h"
 #include "outputgen.h"
 #include "parserintf.h"
@@ -308,10 +309,10 @@ int main(int argc,char **argv)
   }
 
   // remove temporary files
-  if (!Doxygen::objDBFileName.isEmpty()) unlink(Doxygen::objDBFileName);
-  if (!Doxygen::entryDBFileName.isEmpty()) unlink(Doxygen::entryDBFileName);
+  if (!Doxygen::objDBFileName.isEmpty()) QFile::remove(Doxygen::objDBFileName);
+  if (!Doxygen::entryDBFileName.isEmpty()) QFile::remove(Doxygen::entryDBFileName);
   // clean up after us
-  rmdir("/tmp/doxygen");
+  QDir().rmdir("/tmp/doxygen");
 
   while (1)
   {
diff --git a/addon/doxyapp/doxyapp.pro.in b/addon/doxyapp/doxyapp.pro.in
deleted file mode 100644
index 7a8c5ee..0000000
--- a/addon/doxyapp/doxyapp.pro.in
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE     =	app.t
-CONFIG       =	console warn_on debug
-HEADERS      =	
-SOURCES      =	doxyapp.cpp
-LIBS          += -L../../lib -ldoxygen -lqtools -lmd5 -ldoxycfg -lpthread -liconv
-DESTDIR        = 
-OBJECTS_DIR    = ../../objects/doxyapp
-TARGET         = ../../bin/doxyapp
-INCLUDEPATH   += ../../qtools ../../src
-DEPENDPATH    += ../../src
-TARGETDEPS     = ../../lib/libdoxygen.a
-
diff --git a/addon/doxypysql/search.py b/addon/doxypysql/search.py
index d0c88c0..c185138 100755
--- a/addon/doxypysql/search.py
+++ b/addon/doxypysql/search.py
@@ -14,6 +14,7 @@ import sys
 import os
 import getopt
 import json
+import re
 
 class MemberType:
   Define="0"
@@ -28,6 +29,7 @@ class MemberType:
   DCOP="9"
   Property="10"
   Event="11"
+  File="12"
 
 class RequestType:
   References="9901"
@@ -38,252 +40,253 @@ class RequestType:
   BaseClasses="9906"
   SubClasses="9907"
 
-g_conn=None
+g_use_regexp=False
 ###############################################################################
 
-def escapeLike(val):
-    return 'LIKE "%' + val.replace("\\", "\\\\").replace("_", "\\_") \
-        .replace("%", "\\%") + '%" ESCAPE "\\"'
+# case-insensitive sqlite regexp function
+def re_fn(expr, item):
+    reg = re.compile(expr, re.I)
+    return reg.search(item) is not None
 
-def matchName(name):
-    if type(name) is str:
-        return "name "+escapeLike(name)
-    else:
-        return 'id=%d' %name
-
-def fileName(id_file):
-    if g_conn.execute("SELECT COUNT(*) FROM files WHERE id=?",[id_file]).fetchone()[0] > 1:
-        print "non-uniq fileid"
-
-    for r in g_conn.execute("SELECT * FROM files WHERE id=?",[id_file]).fetchall():
-            return r['name']
+def openDb(dbname):
+    if dbname == None:
+        dbname = "doxygen_sqlite3.db"
 
-    return ""
+    if not os.path.isfile(dbname):
+        raise BaseException("No such file %s" % dbname )
 
-def fileId(name):
-    if g_conn.execute("SELECT COUNT(*) FROM files WHERE name=?",[name]).fetchone()[0] > 1:
-        print "non-uniq file name"
+    conn = sqlite3.connect(dbname)
+    conn.execute('PRAGMA temp_store = MEMORY;')
+    conn.row_factory = sqlite3.Row
+    conn.create_function("REGEXP", 2, re_fn)
+    return conn
+###############################################################################
+class Finder:
+    def __init__(self,cn,name,row_type=str):
+        self.cn=cn
+        self.name=name
+        self.row_type=row_type
+
+    def match(self,row):
+        if self.row_type is int:
+            return " id=?"
+        else:
+            if g_use_regexp == True:
+                return " REGEXP (?,%s)" %row
+            else:
+                return " %s=?" %row
 
-    for r in g_conn.execute("SELECT * FROM files WHERE name=?",[name]).fetchall():
-            return r['id']
+    def fileName(self,id_file):
+        if self.cn.execute("SELECT COUNT(*) FROM files WHERE rowid=?",[id_file]).fetchone()[0] > 1:
+            print >>sys.stderr,"WARNING: non-uniq fileid [%s]. Considering only the first match." % id_file
 
-    return -1
+        for r in self.cn.execute("SELECT * FROM files WHERE rowid=?",[id_file]).fetchall():
+                return r['name']
 
-###############################################################################
+        return ""
 
-def findReferences(name):
-    o=[]
+    def fileId(self,name):
+        if self.cn.execute("SELECT COUNT(*) FROM files WHERE"+self.match("name"),[name]).fetchone()[0] > 1:
+            print >>sys.stderr,"WARNING: non-uniq file name [%s]. Considering only the first match." % name
 
-    cur = g_conn.cursor()
-    cur.execute("SELECT refid FROM memberdef WHERE name=?",[name])
-    refids = cur.fetchall()
+        for r in self.cn.execute("SELECT rowid FROM files WHERE"+self.match("name"),[name]).fetchall():
+                return r[0]
 
-    if len(refids) == 0:
+        return -1
+###############################################################################
+    def references(self):
+        o=[]
+        cur = self.cn.cursor()
+        cur.execute("SELECT refid FROM memberdef WHERE"+self.match("name"),[self.name])
+        refids = cur.fetchall()
+
+        if len(refids) == 0:
+            return o
+
+        refid = refids[0]['refid']
+        cur = self.cn.cursor()
+        #TODO:SELECT rowid from refids where refid=refid
+        for info in cur.execute("SELECT * FROM xrefs WHERE refid_dst LIKE '%"+refid+"%'"):
+            item={}
+            cur = self.cn.cursor()
+            for i2 in cur.execute("SELECT * FROM memberdef WHERE refid=?",[info['src']]):
+                item['name']=i2['name']
+                item['src']=info['src']
+                item['file']=self.fileName(info['id_file'])
+                item['line']=info['line']
+
+            o.append(item)
         return o
-
-    refid = refids[0]['refid']
-    cur = g_conn.cursor()
-    for info in cur.execute("SELECT * FROM xrefs WHERE dst LIKE '%"+refid+"%'"):
-        item={}
-        cur = g_conn.cursor()
-        for i2 in cur.execute("SELECT * FROM memberdef WHERE refid=?",[info['src']]):
-            item['name']=i2['name']
-            item['src']=info['src']
-            item['file']=fileName(info['id_file'])
-            item['line']=info['line']
-
-        o.append(item)
-    return o
-
-
-def findFunction(name):
-    o=[]
-    for r in g_conn.execute('SELECT * FROM memberdef WHERE '+matchName(name)+' AND kind=?',[MemberType.Function]).fetchall():
-        item={}
-        item['name'] = r['name']
-        item['definition'] = r['definition']
-        item['argsstring'] = r['argsstring']
-        item['file'] = fileName(r['id_file'])
-        item['line'] = r['line']
-        item['detaileddescription'] = r['detaileddescription']
-        o.append(item)
-    return o
-
-
-def findMacro(name):
-    o=[]
-    for r in g_conn.execute('SELECT * FROM memberdef WHERE '+matchName(name)+' AND kind=?',[MemberType.Define]).fetchall():
-        item={}
-        item['name'] = r['name']
-        if r['argsstring']:
+###############################################################################
+    def function(self):
+        o=[]
+        c=self.cn.execute('SELECT * FROM memberdef WHERE'+self.match("name")+' AND kind=?',[self.name,MemberType.Function])
+        for r in c.fetchall():
+            item={}
+            item['name'] = r['name']
+            item['definition'] = r['definition']
             item['argsstring'] = r['argsstring']
-        item['definition'] = r['initializer']
-        item['file'] = fileName(r['id_file'])
-        item['line'] = r['line']
-        o.append(item)
-    return o
-
-
-def findTypedef(name):
-    o=[]
-    for r in g_conn.execute('SELECT * FROM memberdef WHERE '+matchName(name)+' AND kind=?',[MemberType.Typedef]).fetchall():
-        item={}
-        item['name'] = r['name']
-        item['definition'] = r['definition']
-        item['file'] = fileName(r['id_file'])
-        item['line'] = r['line']
-        o.append(item)
-    return o
-
-
-def findVariable(name):
-    o=[]
-    for r in g_conn.execute('SELECT * FROM memberdef WHERE '+matchName(name)+' AND kind=?',[MemberType.Variable]).fetchall():
-        item={}
-        item['name'] = r['name']
-        item['definition'] = r['definition']
-        item['file'] = fileName(r['id_file'])
-        item['line'] = r['line']
-        o.append(item)
-    return o
-
-def findParams(name):
-    o=[]
-    for r in g_conn.execute('SELECT id FROM memberdef WHERE '+matchName(name)).fetchall():
-        #a=("SELECT * FROM params where id=(SELECT id_param FROM memberdef_params where id_memberdef=?",[id_memberdef])
-        item={}
-        item['id'] = r['id']
-        o.append(item)
-    return o
-
-
-def findStruct(name):
-    o=[]
-    for r in g_conn.execute('SELECT * FROM compounddef WHERE '+matchName(name)).fetchall():
-        item={}
-        item['name'] = r['name']
-        o.append(item)
-    return o
-
-def findIncluders(name):
-    o=[]
-    fid = fileId(name)
-    for r in g_conn.execute('SELECT * FROM includes WHERE id_dst=?',[fid]).fetchall():
-        item={}
-        item['name'] = fileName(r['id_src'])
-        o.append(item)
-    return o
-
-def findIncludees(name):
-    o=[]
-    fid = fileId(name)
-    for r in g_conn.execute('SELECT * FROM includes WHERE id_src=?',[fid]).fetchall():
-        item={}
-        item['name'] = r['dst']
-        o.append(item)
-    return o
-
-
-def findMembers(name):
-    o=[]
-    for r in g_conn.execute('SELECT * FROM memberdef WHERE scope LIKE "%'+name+'%";').fetchall():
-        item={}
-        item['name'] = r['name']
-        item['definition'] = r['definition']
-        item['argsstring'] = r['argsstring']
-        item['file'] = fileName(r['id_file'])
-        item['line'] = r['line']
-        item['documentation'] = r['documentation']
-        o.append(item)
-    return o
-
-
-def findBaseClasses(name):
-    o=[]
-    for r in g_conn.execute('SELECT base FROM basecompoundref WHERE derived=?',[name]).fetchall():
-        item={}
-        item['name'] = r['base']
-        o.append(item)
-    return o
-
-
-def findSubClasses(name):
-    o=[]
-    for r in g_conn.execute('SELECT derived FROM basecompoundref WHERE base=?',[name]).fetchall():
-        item={}
-        item['name'] = r['derived']
-        o.append(item)
-    return o
-
-
+            item['file'] = self.fileName(r['id_file'])
+            item['line'] = r['line']
+            item['detaileddescription'] = r['detaileddescription']
+            o.append(item)
+        return o
 ###############################################################################
+    def file(self):
+        o=[]
+        for r in self.cn.execute("SELECT rowid,* FROM files WHERE"+self.match("name"),[self.name]).fetchall():
+            item={}
+            item['name'] = r['name']
+            item['id'] =   r['rowid']
+            o.append(item)
+        return o
 
-def usage():
-  print """Usage: search.py [Options]
-Options:
-    -h, --help
-    -d <D>    Use database <D> for queries
-    -r <F>    Search for references to <F>
-    -f <F>    Search for definition of function <F>
-    -m <M>    Search for definition of macro <M>
-    -t <T>    Search for definition of type <T>
-    -v <V>    Search for definition of variable <V>
-    -I <I>    Get the includers of <I>
-    -i <I>    Get the includees of <I>
-    -M <C>    Get all members of class <C>
-    -B <C>    Get the base classes of class <C>
-    -S <C>    Get the sub classes of class <C>
-"""
-
-def openDb(dbname):
-    global g_conn
-
-    if dbname == None:
-        dbname = "doxygen_sqlite3.db"
-
-    if not os.path.isfile(dbname):
-        raise BaseException("No such file %s" % dbname )
-
-    g_conn = sqlite3.connect(dbname)
-    g_conn.execute('PRAGMA temp_store = MEMORY;')
-    g_conn.row_factory = sqlite3.Row
-
 ###############################################################################
-def process(kind,o):
+    def macro(self):
+        o=[]
+        c=self.cn.execute('SELECT * FROM memberdef WHERE'+self.match("name")+' AND kind=?',[self.name,MemberType.Define])
+        for r in c.fetchall():
+            item={}
+            item['name'] = r['name']
+            if r['argsstring']:
+                item['argsstring'] = r['argsstring']
+            item['definition'] = r['initializer']
+            item['file'] = self.fileName(r['id_file'])
+            item['line'] = r['line']
+            o.append(item)
+        return o
+###############################################################################
+    def typedef(self):
+        o=[]
+        c=self.cn.execute('SELECT * FROM memberdef WHERE'+self.match("name")+' AND kind=?',[self.name,MemberType.Typedef])
+        for r in c.fetchall():
+            item={}
+            item['name'] = r['name']
+            item['definition'] = r['definition']
+            item['file'] = self.fileName(r['id_file'])
+            item['line'] = r['line']
+            o.append(item)
+        return o
+###############################################################################
+    def variable(self):
+        o=[]
+        c=self.cn.execute('SELECT * FROM memberdef WHERE'+self.match("name")+' AND kind=?',[self.name,MemberType.Variable])
+        for r in c.fetchall():
+            item={}
+            item['name'] = r['name']
+            item['definition'] = r['definition']
+            item['file'] = self.fileName(r['id_file'])
+            item['line'] = r['line']
+            o.append(item)
+        return o
+###############################################################################
+    def params(self):
+        o=[]
+        c=self.cn.execute('SELECT id FROM memberdef WHERE'+self.match("name"),[self.name])
+        for r in c.fetchall():
+            #a=("SELECT * FROM params where id=(SELECT id_param FROM memberdef_params where id_memberdef=?",[id_memberdef])
+            item={}
+            item['id'] = r['id']
+            o.append(item)
+        return o
+###############################################################################
+    def struct(self):
+        o=[]
+        c=self.cn.execute('SELECT * FROM compounddef WHERE'+self.match("name"),[self.name])
+        for r in c.fetchall():
+            item={}
+            item['name'] = r['name']
+            o.append(item)
+        return o
+###############################################################################
+    def includers(self):
+        o=[]
+        fid = self.fileId(self.name)
+        c=self.cn.execute('SELECT * FROM includes WHERE id_dst=?',[fid])
+        for r in c.fetchall():
+            item={}
+            item['name'] = self.fileName(r['id_src'])
+            o.append(item)
+        return o
+###############################################################################
+    def includees(self):
+        o=[]
+        fid = self.fileId(self.name)
+        c=self.cn.execute('SELECT * FROM includes WHERE id_src=?',[fid])
+        for r in c.fetchall():
+            item={}
+            item['name'] = self.fileName(r['id_dst'])
+            o.append(item)
+        return o
+###############################################################################
+    def members(self):
+        o=[]
+        c=self.cn.execute('SELECT * FROM memberdef WHERE'+self.match("scope"),[self.name])
+        for r in c.fetchall():
+            item={}
+            item['name'] = r['name']
+            item['definition'] = r['definition']
+            item['argsstring'] = r['argsstring']
+            item['file'] = self.fileName(r['id_file'])
+            item['line'] = r['line']
+            #item['documentation'] = r['documentation']
+            o.append(item)
+        return o
+###############################################################################
+    def baseClasses(self):
+        o=[]
+        c=self.cn.execute('SELECT base FROM basecompoundref WHERE'+self.match("derived"),[self.name])
+        for r in c.fetchall():
+            item={}
+            item['name'] = r['base']
+            o.append(item)
+        return o
+###############################################################################
+    def subClasses(self):
+        o=[]
+        c=self.cn.execute('SELECT derived FROM basecompoundref WHERE'+self.match("base"),[self.name])
+        for r in c.fetchall():
+            item={}
+            item['name'] = r['derived']
+            o.append(item)
+        return o
+###############################################################################
+def process(f,kind):
     request_processors = {
-        MemberType.Function: findFunction,
-        MemberType.Define:   findMacro,
-        MemberType.Variable: findVariable,
-        MemberType.Typedef:  findTypedef,
-        RequestType.References: findReferences,
-        RequestType.Struct: findStruct,
-        RequestType.Includers: findIncluders,
-        RequestType.Includees: findIncludees,
-        RequestType.Members: findMembers,
-        RequestType.BaseClasses: findBaseClasses,
-        RequestType.SubClasses: findSubClasses
+        MemberType.Function: f.function,
+        MemberType.File: f.file,
+        MemberType.Define:   f.macro,
+        MemberType.Variable: f.variable,
+        MemberType.Typedef:  f.typedef,
+        RequestType.References: f.references,
+        RequestType.Struct: f.struct,
+        RequestType.Includers: f.includers,
+        RequestType.Includees: f.includees,
+        RequestType.Members: f.members,
+        RequestType.BaseClasses: f.baseClasses,
+        RequestType.SubClasses: f.subClasses
     }
-    return request_processors[kind](o)
-
-
-def processHref(ref):
+    return request_processors[kind]()
+###############################################################################
+def processHref(cn,ref):
     j={}
 
     # is it in memberdef ?
     table="memberdef"
-    if ( g_conn.execute("SELECT count(*) from %s WHERE refid='%s'" % (table,ref) ).fetchone()[0] > 0 ):
-        for r in g_conn.execute("SELECT kind,id FROM %s WHERE refid='%s'" % (table,ref) ).fetchall():
-            j=process(str(r['kind']),int(r['id']))
+    if ( cn.execute("SELECT count(*) from %s WHERE refid=?"%table,[ref] ).fetchone()[0] > 0 ):
+        for r in cn.execute("SELECT kind,id FROM %s WHERE refid='%s'" % (table,ref) ).fetchall():
+            f=Finder(cn,r['id'],int)
+            j=process(f,str(r['kind']))
 
     # is it in compounddef ?
     table="compounddef"
-    if ( g_conn.execute("SELECT count(*) from %s WHERE refid='%s'" % (table,ref)).fetchone()[0] > 0 ):
-        for r in g_conn.execute("SELECT id FROM %s WHERE refid='%s'" % (table,ref) ).fetchall():
-            j=process(RequestType.Struct,int(r['id']))
+    if ( cn.execute("SELECT count(*) from %s WHERE refid=?"%table,[ref]).fetchone()[0] > 0 ):
+        for r in cn.execute("SELECT id FROM %s WHERE refid=?"%table,[ref] ).fetchall():
+            f=Finder(cn,r['id'],int)
+            j=process(f,RequestType.Struct)
 
     return j
-
-
+###############################################################################
 def serveCgi():
     import cgi
 
@@ -298,16 +301,33 @@ def serveCgi():
         print '{"result": null, "error": "no refid given"}'
         sys.exit(0)
 
-    openDb('doxygen_sqlite3.db')
+    cn=openDb('doxygen_sqlite3.db')
 
-    j = processHref(ref)
+    j = processHref(cn,ref)
 
     print json.dumps({"result":j,"error":None})
-
-
+###############################################################################
+def usage():
+  print >>sys.stderr,"""Usage: search.py [Options]
+Options:
+    -h, --help
+    -d <D>    Use database <D> for queries.
+    -f <F>    Search for definition of function <F>.
+    -m <M>    Search for definition of macro <M>.
+    -r <F>    Search for references to function <F>.
+    -t <T>    Search for definition of type <T>.
+    -v <V>    Search for definition of variable <V>.
+    -I <I>    What files are including <I>.
+    -i <i>    What files are included by <i>.
+    -B <C>    Get the base classes of class <C>.
+    -M <C>    Get all members of class <C>.
+    -S <C>    Get the sub classes of class <C>.
+    -R        Consider the search <term> to be a regex.
+"""
+###############################################################################
 def serveCli(argv):
     try:
-        opts, args = getopt.getopt(argv, "hr:I:i:d:f:m:t:v:H:M:B:S:",["help"])
+        opts, args = getopt.getopt(argv, "hr:RI:i:d:f:m:t:v:H:M:B:S:F:",["help"])
     except getopt.GetoptError:
         usage()
         sys.exit(1)
@@ -315,6 +335,7 @@ def serveCli(argv):
     ref=None
     dbname=None
     j={}
+    global g_use_regexp
 
     for a, o in opts:
         if a in ('-h', '--help'):
@@ -325,6 +346,9 @@ def serveCli(argv):
             continue
         elif a in ('-r'):
             kind=RequestType.References
+        elif a in ('-R'):
+            g_use_regexp=True
+            continue
         elif a in ('-I'):
             kind=RequestType.Includers
         elif a in ('-i'):
@@ -337,6 +361,8 @@ def serveCli(argv):
             kind=RequestType.SubClasses
         elif a in ('-f'):
             kind=MemberType.Function
+        elif a in ('-F'):
+            kind=MemberType.File
         elif a in ('-m'):
             kind=MemberType.Define
         elif a in ('-t'):
@@ -346,12 +372,13 @@ def serveCli(argv):
         elif a in ('-H'):
             ref = o
 
-        openDb(dbname)
+        cn=openDb(dbname)
+        f=Finder(cn,o)
         if ref != None:
-          j=processHref(ref)
+          j=processHref(cn,ref)
         else:
-          j=process(kind,o)
-        print json.dumps(j)
+          j=process(f,kind)
+        print json.dumps(j,indent=4)
 
 
 def main(argv):
diff --git a/addon/doxysearch/CMakeLists.txt b/addon/doxysearch/CMakeLists.txt
new file mode 100644
index 0000000..33e01c1
--- /dev/null
+++ b/addon/doxysearch/CMakeLists.txt
@@ -0,0 +1,36 @@
+if (build_search)
+
+find_package(Xapian REQUIRED)
+find_package(ZLIB REQUIRED)
+
+if (WIN32)
+  set(WIN_EXTRA_LIBS "uuid.lib rpcrt4.lib ws2_32.lib")
+endif()
+
+include_directories(
+	${CMAKE_SOURCE_DIR}/qtools
+	${XAPIAN_INCLUDE_DIR}
+        ${ZLIB_INCLUDE_DIRS}
+)
+add_executable(doxyindexer
+               doxyindexer.cpp
+)
+target_link_libraries(doxyindexer
+                      ${XAPIAN_LIBRARIES}
+                      ${ZLIB_LIBRARIES}
+		      ${WIN_EXTRA_LIBS}
+                      qtools
+)
+
+add_executable(doxysearch.cgi
+               doxysearch.cpp
+)
+target_link_libraries(doxysearch.cgi
+                      ${XAPIAN_LIBRARIES}
+                      ${ZLIB_LIBRARIES}
+		      ${WIN_EXTRA_LIBS}
+)
+
+install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin)
+
+endif()
diff --git a/addon/doxysearch/Makefile.in b/addon/doxysearch/Makefile.in
deleted file mode 100644
index 7daafee..0000000
--- a/addon/doxysearch/Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
-
-all clean depend: Makefile.doxysearch Makefile.doxyindexer
-	$(MAKE) -f Makefile.doxysearch $@
-	$(MAKE) -f Makefile.doxyindexer $@
-
-distclean: clean
-	$(RM) -rf Makefile doxysearch.pro Makefile.doxysearch
-	$(RM) -rf Makefile doxyindexer.pro Makefile.doxyindexer
-
-tmake:
-	$(ENV) $(PERL) "$(TMAKE)" doxysearch.pro >Makefile.doxysearch
-	$(ENV) $(PERL) "$(TMAKE)" doxyindexer.pro >Makefile.doxyindexer
-
-strip:
-	strip doxysearch
-
-Makefile.doxysearch: doxysearch.pro
-	$(ENV) $(PERL) "$(TMAKE)" doxysearch.pro >Makefile.doxysearch
-
-Makefile.doxyindexer: doxyindexer.pro
-	$(ENV) $(PERL) "$(TMAKE)" doxyindexer.pro >Makefile.doxyindexer
-
-install:
-	$(INSTTOOL) -d $(INSTALL)/bin	
-	$(INSTTOOL) -m 755 ../../bin/doxysearch.cgi $(INSTALL)/bin	
-	$(INSTTOOL) -m 755 ../../bin/doxyindexer $(INSTALL)/bin	
-	$(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
-	cat ../../doc/doxyindexer.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxyindexer.1
-	$(INSTTOOL) -m 644 doxyindexer.1 $(INSTALL)/$(MAN1DIR)/doxyindexer.1
-	rm doxyindexer.1
-	cat ../../doc/doxysearch.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxysearch.1
-	$(INSTTOOL) -m 644 doxysearch.1 $(INSTALL)/$(MAN1DIR)/doxysearch.1
-	rm doxysearch.1
-
diff --git a/addon/doxysearch/doxyindexer.cpp b/addon/doxysearch/doxyindexer.cpp
index e1006be..12d3e9a 100644
--- a/addon/doxysearch/doxyindexer.cpp
+++ b/addon/doxysearch/doxyindexer.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxysearch/doxyindexer.pro.in b/addon/doxysearch/doxyindexer.pro.in
deleted file mode 100644
index c84a2ac..0000000
--- a/addon/doxysearch/doxyindexer.pro.in
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE     =	app.t
-CONFIG       =	console warn_on static release
-HEADERS      =	
-SOURCES      =	doxyindexer.cpp
-LIBS        += -L../../lib -lxapian -lqtools
-DESTDIR      = 
-OBJECTS_DIR  = ../../objects/doxyindexer
-TARGET       = ../../bin/doxyindexer
-INCLUDEPATH += ../../qtools
-DEPENDPATH  += 
-TARGETDEPS   = 
-
diff --git a/addon/doxysearch/doxysearch.cpp b/addon/doxysearch/doxysearch.cpp
index f6946ef..1c4effd 100644
--- a/addon/doxysearch/doxysearch.cpp
+++ b/addon/doxysearch/doxysearch.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxysearch/doxysearch.pro.in b/addon/doxysearch/doxysearch.pro.in
deleted file mode 100644
index 702f5a4..0000000
--- a/addon/doxysearch/doxysearch.pro.in
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE     =	app.t
-CONFIG       =	console warn_on debug cgi
-HEADERS      =	
-SOURCES      =	doxysearch.cpp
-LIBS        += -lxapian
-DESTDIR      = 
-OBJECTS_DIR  = ../../objects/doxysearch
-TARGET       = ../../bin/doxysearch.cgi
-INCLUDEPATH += 
-DEPENDPATH  += 
-TARGETDEPS   = 
-
diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
new file mode 100644
index 0000000..055aac3
--- /dev/null
+++ b/addon/doxywizard/CMakeLists.txt
@@ -0,0 +1,80 @@
+if (build_wizard)
+
+include_directories(
+	.
+	${CMAKE_SOURCE_DIR}/src
+	${CMAKE_SOURCE_DIR}/qtools
+	${GENERATED_SRC}
+)
+
+set(GENERATED_SRC_WIZARD ${GENERATED_SRC}/doxywizard)
+file(MAKE_DIRECTORY ${GENERATED_SRC_WIZARD})
+
+add_definitions(-DQT_ARCH_X86_64 -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DUNICODE)
+set(QT_USE_QTXML TRUE)
+find_package(Qt4 REQUIRED)
+include(${QT_USE_FILE})
+
+# generate settings.h
+file(GENERATE OUTPUT ${GENERATED_SRC_WIZARD}/settings.h
+CONTENT "#ifndef SETTINGS_H
+#define SETTINGS_H
+#define USE_SQLITE3 ${sqlite3}
+#define USE_LIBCLANG ${clang}
+#define IS_SUPPORTED(x) \\
+  ((USE_SQLITE3  && strcmp(\"USE_SQLITE3\",(x))==0)  || \\
+   (USE_LIBCLANG && strcmp(\"USE_LIBCLANG\",(x))==0) || \\
+  0)
+#endif" )
+set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERATED 1)
+
+# generate version.cpp
+file(GENERATE OUTPUT ${GENERATED_SRC_WIZARD}/version.cpp
+    CONTENT "char versionString[]=\"${VERSION}\";"
+)
+set_source_files_properties(${GENERATED_SRC_WIZARD}/version.cpp PROPERTIES GENERATED 1)
+
+# generate configdoc.cpp
+add_custom_command(
+COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -wiz ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp
+OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp
+)
+set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GENERATED 1)
+
+FLEX_TARGET(config_doxyw config_doxyw.l ${GENERATED_SRC_WIZARD}/config_doxyw.cpp COMPILE_FLAGS "-Pconfig_doxywYY")
+
+QT4_WRAP_CPP(doxywizard_MOC
+doxywizard.h
+expert.h
+helplabel.h
+inputint.h
+inputbool.h
+inputstring.h
+inputstrlist.h
+wizard.h
+)
+
+QT4_ADD_RESOURCES(doxywizard_RESOURCES_RCC doxywizard.qrc)
+
+add_executable(doxywizard
+doxywizard.cpp
+expert.cpp
+wizard.cpp
+inputbool.cpp
+inputstring.cpp
+inputint.cpp
+inputstrlist.cpp
+${GENERATED_SRC_WIZARD}/settings.h
+${GENERATED_SRC_WIZARD}/version.cpp
+${GENERATED_SRC_WIZARD}/config_doxyw.cpp
+${GENERATED_SRC_WIZARD}/configdoc.cpp
+${doxywizard_MOC}
+${doxywizard_RESOURCES_RCC}
+)
+target_link_libraries(doxywizard
+${QT_LIBRARIES}
+)
+
+install(TARGETS doxywizard DESTINATION bin)
+
+endif()
diff --git a/addon/doxywizard/Makefile.in b/addon/doxywizard/Makefile.in
deleted file mode 100644
index 9b14174..0000000
--- a/addon/doxywizard/Makefile.in
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# 
-#
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
-# 
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby 
-# granted. No representations are made about the suitability of this software 
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-# 
-
-QMAKE=$(QTDIR)/bin/qmake $(MKSPECS)
-INCBUFSIZE=$(PYTHON) ../../src/increasebuffer.py
-
-all: Makefile.doxywizard  
-	$(MAKE) -f Makefile.doxywizard LEX=$(LEX) PYTHON=$(PYTHON) INCBUFSIZE="$(INCBUFSIZE)"
-
-Makefile.doxywizard: doxywizard.pro
-	$(QMAKE) doxywizard.pro -o Makefile.doxywizard
-
-qmake: 
-	$(QMAKE) doxywizard.pro -o Makefile.doxywizard
-
-clean: Makefile.doxywizard 
-	$(MAKE) -f Makefile.doxywizard clean 
-
-distclean: Makefile.doxywizard
-	$(MAKE) -f Makefile.doxywizard distclean 
-	$(RM) Makefile.doxywizard
-
-install:
-	$(INSTTOOL) -d $(INSTALL)/bin	
-	$(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin	
-	$(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
-	cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1
-	$(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1
-	rm doxywizard.1
-
-FORCE:
diff --git a/addon/doxywizard/config.l b/addon/doxywizard/config.l
deleted file mode 100644
index f11bc46..0000000
--- a/addon/doxywizard/config.l
+++ /dev/null
@@ -1,555 +0,0 @@
-/******************************************************************************
- *
- * $Id: config_templ.l,v 1.8 2001/01/01 10:15:16 root Exp $
- *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby 
- * granted. No representations are made about the suitability of this software 
- * for any purpose. It is provided "as is" without express or implied warranty.
- * See the GNU General Public License for more details.
- *
- */
-
-%{
-
-/*
- *	includes
- */
-#include "config.h"
-#include "input.h"
-#include <QtCore>
-
-#define MAX_INCLUDE_DEPTH 10
-
-
-/* -----------------------------------------------------------------
- *
- *	static variables
- */
-
-struct ConfigFileState
-{
-  int lineNr;
-  FILE *file;
-  YY_BUFFER_STATE oldState;
-  YY_BUFFER_STATE newState;
-  QString fileName;
-};  
-
-static const QHash<QString,Input*>   *g_options;
-static FILE                          *g_file;
-static QString                        g_yyFileName;
-static QString                        g_includeName;
-static QVariant                       g_includePathList;
-static QStack<ConfigFileState*>       g_includeStack;  
-static int                            g_includeDepth;
-static QVariant                      *g_arg;
-static Input                         *g_curOption=0;
-static QString                        g_elemStr;
-static QTextCodec                    *g_codec     = QTextCodec::codecForName("UTF-8");
-static QString                        g_codecName = QString::fromAscii("UTF-8");
-static int                            g_lastState;
-static QByteArray                     g_tmpString;
-
-/* -----------------------------------------------------------------
- */
-#undef	YY_INPUT
-#define	YY_INPUT(buf,result,max_size) result=yyread(buf,max_size);
-
-static int yyread(char *buf,int maxSize)
-{
-    // no file included
-    if (g_includeStack.isEmpty()) 
-    {
-      return fread(buf,1,maxSize,g_file);
-    } 
-    else 
-    {
-      return fread(buf,1,maxSize,g_includeStack.top()->file);
-    }
-}
-
-void config_err(const char *fmt, ...)
-{
-  va_list args;
-  va_start(args, fmt);
-  vfprintf(stderr, fmt, args);
-  va_end(args); 
-}
-void config_warn(const char *fmt, ...)
-{
-  va_list args;
-  va_start(args, fmt);
-  vfprintf(stderr, fmt, args);
-  va_end(args);
-}
-
-static void substEnvVarsInStrList(QStringList &sl);
-static void substEnvVarsInString(QString &s);
-
-static void checkEncoding()
-{
-  Input *option = g_options->value(QString::fromAscii("DOXYFILE_ENCODING"));
-  if (option && option->value().toString()!=g_codecName)
-  {
-    QTextCodec *newCodec = QTextCodec::codecForName(option->value().toString().toAscii());
-    if (newCodec)
-    {
-      g_codec = newCodec;
-      g_codecName = option->value().toString();
-    }
-  }
-}
-
-static FILE *tryPath(const QString &path,const QString &fileName)
-{
-  QString absName=!path.isEmpty() ? path+QString::fromAscii("/")+fileName : fileName;
-  QFileInfo fi(absName);
-  if (fi.exists() && fi.isFile())
-  {
-    FILE *f = fopen(absName.toLocal8Bit(),"r");
-    if (f==NULL)
-      config_err("Error: could not open file %s for reading\n",absName.toLatin1().data());
-    else 
-      return f;
-  }
-  return NULL;
-}
-
-static FILE *findFile(const QString &fileName)
-{
-  if (QFileInfo(fileName).isAbsolute()) // absolute path
-  {
-    return tryPath(QString(), fileName);
-  }
-
-  // relative path, try with include paths in the list
-  QStringList sl = g_includePathList.toStringList();
-  substEnvVarsInStrList(sl);
-  foreach (QString s, sl) 
-  {
-    FILE *f = tryPath(s,fileName);
-    if (f) return f;
-  }
-  // try cwd if g_includePathList fails
-  return tryPath(QString::fromAscii("."),fileName);
-}
-
-static void readIncludeFile(const QString &incName)
-{
-  if (g_includeDepth==MAX_INCLUDE_DEPTH) 
-  {
-    config_err("Error: maximum include depth (%d) reached, %s is not included. Aborting...\n",
-	MAX_INCLUDE_DEPTH,qPrintable(incName));
-    exit(1);
-  } 
-
-  QString inc = incName;
-  substEnvVarsInString(inc);
-  inc = inc.trimmed();
-  uint incLen = inc.length();
-  if (inc.at(0)==QChar::fromAscii('"') && 
-      inc.at(incLen-1)==QChar::fromAscii('"')) // strip quotes
-  {
-    inc=inc.mid(1,incLen-2);
-  }
-
-  FILE *f = findFile(inc);
-  if (f) // see if the include file can be found
-  {
-    // For debugging
-#if SHOW_INCLUDES
-    for (i=0;i<includeStack.count();i++) msg("  ");
-    msg("@INCLUDE = %s: parsing...\n",inc.toLatin1().data());
-#endif
-
-    // store the state of the old file 
-    ConfigFileState *fs=new ConfigFileState;
-    fs->oldState=YY_CURRENT_BUFFER;
-    fs->fileName=g_yyFileName;
-    fs->file=f;
-    // push the state on the stack
-    g_includeStack.push(fs);
-    // set the scanner to the include file
-    yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE));
-    fs->newState=YY_CURRENT_BUFFER;
-    g_yyFileName=inc;
-    g_includeDepth++;
-  } 
-  else
-  {
-    config_err("Error: @INCLUDE = %s: not found!\n",inc.toLatin1().data());
-    exit(1);
-  }
-}
-
-
-%}
-
-%option nounput
-%option noyywrap
-%option yylineno
-
-%x      Start
-%x	SkipComment
-%x      SkipInvalid
-%x      GetString
-%x      GetStrList
-%x      GetQuotedString
-%x      GetEnvVar
-%x      Include
-
-%%
-
-<*>\0x0d
-<Start,GetString,GetStrList,SkipInvalid>"#"	 { BEGIN(SkipComment); }
-<Start>[a-z_A-Z][a-z_A-Z0-9]*[ \t]*"="	 { QString cmd = g_codec->toUnicode(yytext);
-                                           cmd=cmd.left(cmd.length()-1).trimmed(); 
-					   g_curOption = g_options->value(cmd);
-					   if (g_curOption==0) // oops not known
-					   {
-					     config_err("Warning: ignoring unsupported tag `%s' at line %d, file %s\n",
-						 qPrintable(cmd),yylineno,qPrintable(g_yyFileName)); 
-					     BEGIN(SkipInvalid);
-					   }
-					   else // known tag
-					   {
-					     //option->setEncoding(encoding);
-					     g_arg = &g_curOption->value();
-					     switch(g_curOption->kind())
-					     {
-					       case Input::StrList:
-						 g_elemStr = QString();
-						 *g_arg = QStringList();
-					         BEGIN(GetStrList);
-					         break;
-					       case Input::String:
-					         BEGIN(GetString);
-					         break;
-					       case Input::Int:
-					         BEGIN(GetString);
-					         break;
-					       case Input::Bool:
-					         BEGIN(GetString);
-						 break;
-					       case Input::Obsolete:
-					         config_err("Warning: Tag `%s' at line %d of file %s has become obsolete.\n"
-						            "To avoid this warning please update your configuration "
-							    "file using \"doxygen -u\"\n", qPrintable(cmd),
-							    yylineno,qPrintable(g_yyFileName)); 
-					         BEGIN(SkipInvalid);
-						 break;
-					     }
-					   }
-					}
-<Start>[a-z_A-Z][a-z_A-Z0-9]*[ \t]*"+="	{ QString cmd=g_codec->toUnicode(yytext);
-                                          cmd=cmd.left(cmd.length()-2).trimmed(); 
-					  g_curOption = g_options->value(cmd);
-					  if (g_curOption==0) // oops not known
-					  {
-					    config_err("Warning: ignoring unsupported tag `%s' at line %d, file %s\n",
-						yytext,yylineno,qPrintable(g_yyFileName)); 
-					    BEGIN(SkipInvalid);
-					  }
-					  else // known tag
-					  {
-					    switch(g_curOption->kind())
-					    {
-					      case Input::StrList:
-						g_arg = &g_curOption->value();
-						g_elemStr=QString();
-					        BEGIN(GetStrList);
-					        break;
-					      case Input::String:
-					      case Input::Int:
-					      case Input::Bool:
-					        config_err("Warning: operator += not supported for `%s'. Ignoring line at line %d, file %s\n",
-						    yytext,yylineno,qPrintable(g_yyFileName)); 
-					        BEGIN(SkipInvalid);
-						break;
-					      case Input::Obsolete:
-					         config_err("Warning: Tag `%s' at line %d of file %s has become obsolete.\n"
-						            "To avoid this warning please update your configuration "
-							    "file using \"doxygen -u\"\n", 
-							    qPrintable(cmd),yylineno,qPrintable(g_yyFileName)); 
-					         BEGIN(SkipInvalid);
-						 break;
-					     }
-					   }
-					}
-<Start>"@INCLUDE_PATH"[ \t]*"=" 	{ BEGIN(GetStrList); g_arg=&g_includePathList; *g_arg = QStringList(); g_elemStr=QString(); }
-  /* include a config file */
-<Start>"@INCLUDE"[ \t]*"="     		{ BEGIN(Include);}
-<Include>([^ \"\t\r\n]+)|("\""[^\n\"]+"\"") { 
-  					  readIncludeFile(g_codec->toUnicode(yytext)); 
-  					  BEGIN(Start);
-					}
-<<EOF>>					{
-                                          //printf("End of include file\n");
-					  //printf("Include stack depth=%d\n",g_includeStack.count());
-                                          if (g_includeStack.isEmpty())
-					  {
-					    //printf("Terminating scanner!\n");
-					    yyterminate();
-					  }
-					  else
-					  {
-					    ConfigFileState *fs = g_includeStack.pop();
-					    fclose(fs->file);
-					    YY_BUFFER_STATE oldBuf = YY_CURRENT_BUFFER;
-					    yy_switch_to_buffer( fs->oldState );
-					    yy_delete_buffer( oldBuf );
-					    g_yyFileName=fs->fileName;
-					    delete fs; 
-                                            g_includeDepth--;
-					  }
-  					}
-
-<Start>[a-z_A-Z0-9]+			{ config_err("Warning: ignoring unknown tag `%s' at line %d, file %s\n",yytext,yylineno,qPrintable(g_yyFileName)); }
-<GetString,SkipInvalid>\n	        { BEGIN(Start); }
-<GetStrList>\n				{ 
-					  if (!g_elemStr.isEmpty())
-					  {
-					    //printf("elemStr1=`%s'\n",elemStr.toLatin1().data());
-					    *g_arg = QVariant(g_arg->toStringList() << g_elemStr);
-					  }
-					  BEGIN(Start); 
-					}
-<GetStrList>[ \t]+			{
-  				          if (!g_elemStr.isEmpty())
-					  {
-					    //printf("elemStr2=`%s'\n",elemStr.toLatin1().data());
-  					    *g_arg = QVariant(g_arg->toStringList() << g_elemStr);
-					  }
-					  g_elemStr = QString();
-  					}
-<GetString>[^ \"\t\r\n]+		{ 
-                                          *g_arg = QVariant(g_codec->toUnicode(yytext)); 
-                                          checkEncoding();
-                                        }
-<GetString,GetStrList,SkipInvalid>"\""	{ g_lastState=YY_START;
-  					  BEGIN(GetQuotedString); 
-                                          g_tmpString="";
-					}
-<GetQuotedString>"\""|"\n" 		{ 
-                                          // we add a bogus space to signal that the string was quoted. This space will be stripped later on.
-                                          g_tmpString+=" ";
-  					  //printf("Quoted String = `%s'\n",tmpString.toLatin1().data());
-  					  if (g_lastState==GetString)
-					  {
-					    *g_arg = g_codec->toUnicode(g_tmpString);
-                                            checkEncoding();
-					  }
-					  else
-					  {
-					    g_elemStr+=g_codec->toUnicode(g_tmpString);
-					  }
-					  if (*yytext=='\n')
-					  {
-					    config_err("Warning: Missing end quote (\") on line %d, file %s\n",yylineno,
-                                                qPrintable(g_yyFileName));
-					  }
-					  BEGIN(g_lastState);
-  					}
-<GetQuotedString>"\\\""			{
-  					  g_tmpString+='"';
-  					}
-<GetQuotedString>.			{ g_tmpString+=*yytext; }
-<GetStrList>[^ \#\"\t\r\n]+		{
-  					  g_elemStr+=g_codec->toUnicode(yytext);
-  					}
-<SkipComment>\n				{ BEGIN(Start); }
-<SkipComment>\\[ \r\t]*\n		{ BEGIN(Start); }
-<*>\\[ \r\t]*\n				{ }
-<*>\n
-<*>.					
-
-%%
-
-/*@ ----------------------------------------------------------------------------
- */
-
-static void substEnvVarsInString(QString &s)
-{
-  static QRegExp re(QString::fromAscii("\\$\\([a-z_A-Z0-9]+\\)"));
-  if (s.isEmpty()) return;
-  int p=0;
-  int i,l;
-  //printf("substEnvVarInString(%s) start\n",s.toLatin1().data());
-  while ((i=re.indexIn(s,p))!=-1)
-  {
-    l = re.matchedLength();
-    //printf("Found environment var s.mid(%d,%d)=`%s'\n",i+2,l-3,s.mid(i+2,l-3).toLatin1().data());
-    QString env=g_codec->toUnicode(getenv(s.mid(i+2,l-3).toLatin1()));
-    substEnvVarsInString(env); // recursively expand variables if needed.
-    s = s.left(i)+env+s.right(s.length()-i-l);
-    p=i+env.length(); // next time start at the end of the expanded string
-  }
-  s=s.trimmed(); // to strip the bogus space that was added when an argument
-                         // has quotes
-  //printf("substEnvVarInString(%s) end\n",s.toLatin1().data());
-}
-
-static void substEnvVarsInStrList(QStringList &sl)
-{
-  QStringList out;
-
-  foreach (QString result, sl)
-  {
-    // an argument with quotes will have an extra space at the end, so wasQuoted will be TRUE.
-    bool wasQuoted = (result.indexOf(QChar::fromAscii(' '))!=-1) || 
-                     (result.indexOf(QChar::fromAscii('\t'))!=-1);
-    // here we strip the quote again
-    substEnvVarsInString(result);
-
-    //printf("Result %s was quoted=%d\n",result.toLatin1().data(),wasQuoted);
-
-    if (!wasQuoted) /* as a result of the expansion, a single string
-		       may have expanded into a list, which we'll
-		       add to sl. If the original string already
-		       contained multiple elements no further 
-		       splitting is done to allow quoted items with spaces! */
-    {
-      int l=result.length();
-      int i,p=0;
-      // skip spaces
-      // search for a "word"
-      for (i=0;i<l;i++)
-      {
-	QChar c=0;
-	// skip until start of new word
-	while (i<l && ((c=result.at(i))==QChar::fromAscii(' ') || c==QChar::fromAscii('\t'))) i++; 
-	p=i; // p marks the start index of the word
-	// skip until end of a word
-	while (i<l && ((c=result.at(i))!=QChar::fromAscii(' ') && 
-	              c!=QChar::fromAscii('\t') && 
-		      c!=QChar::fromAscii('"'))) i++;
-	if (i<l) // not at the end of the string
-	{
-	  if (c==QChar::fromAscii('"')) // word within quotes
-	  {
-	    p=i+1;
-	    for (i++;i<l;i++)
-	    {
-	      c=result.at(i);
-	      if (c==QChar::fromAscii('"')) // end quote
-	      {
-                out += result.mid(p,i-p);
-		p=i+1;
-		break; 
-	      }
-	      else if (c==QChar::fromAscii('\\')) // skip escaped stuff
-	      {
-		i++;
-	      }
-	    }
-	  }
-	  else if (c==QChar::fromAscii(' ') || c==QChar::fromAscii('\t')) // separator
-	  {
-            out += result.mid(p,i-p);
-	    p=i+1;
-	  }
-	}
-      }
-      if (p!=l) // add the leftover as a string
-      {
-        out += result.right(l-p);
-      }
-    }
-    else // just goto the next element in the list
-    {
-      out += result;
-    }
-  }
-  sl = out;
-}
-
-//--------------------------------------------------------------------------
-
-bool parseConfig(
-      const QString &fileName,
-      const QHash<QString,Input *> &options
-    )
-{
-  QHashIterator<QString, Input*> i(options);
-  g_file = fopen(fileName.toLocal8Bit(),"r");
-  if (g_file==NULL) return false;
-
-  // reset all values
-  i.toFront();
-  while (i.hasNext()) 
-  {
-    i.next();
-    if (i.value())
-    {
-      i.value()->reset();
-    }
-  }
-
-  // parse config file
-  g_options       = &options;
-  g_yyFileName    = fileName;
-  g_includeStack.clear();
-  g_includeDepth  = 0;
-  configrestart( configin );
-  BEGIN( Start );
-  configlex();
-
-  // update the values in the UI
-  i.toFront();
-  while (i.hasNext()) 
-  {
-    i.next();
-    if (i.value())
-    {
-      //printf("Updating: %s\n",qPrintable(i.key()));
-      i.value()->update();
-    }
-    else
-    {
-      printf("Invalid option: %s\n",qPrintable(i.key()));
-    }
-  } 
-  fclose(g_file);
-  return true;
-}
-
-void writeStringValue(QTextStream &t,QTextCodec *codec,const QString &s)
-{
-  QChar c;
-  bool needsEscaping=FALSE;
-  // convert the string back to it original encoding
-  //QByteArray se = codec->fromUnicode(s);
-  t.setCodec(codec);
-  const QChar *p=s.data();
-  if (!s.isEmpty() && !p->isNull())
-  {
-    while (!(c=*p++).isNull() && !needsEscaping) 
-    {
-      needsEscaping = (c==QChar::fromAscii(' ')  || 
-	               c==QChar::fromAscii('\n') || 
-		       c==QChar::fromAscii('\t') || 
-		       c==QChar::fromAscii('"'));
-    }
-    if (needsEscaping)
-    { 
-      t << "\"";
-      p=s.data();
-      while (!p->isNull())
-      {
-	if (*p   ==QChar::fromAscii(' ') && 
-	   *(p+1)==QChar::fromAscii('\0')) break; // skip inserted space at the end
-	if (*p   ==QChar::fromAscii('"')) t << "\\"; // escape quotes
-	t << *p++;
-      }
-      t << "\"";
-    }
-    else
-    {
-      t << s;
-    }
-  }
-}
-
diff --git a/addon/doxywizard/config_doxyw.l b/addon/doxywizard/config_doxyw.l
index 400330f..829f807 100644
--- a/addon/doxywizard/config_doxyw.l
+++ b/addon/doxywizard/config_doxyw.l
@@ -2,7 +2,7 @@
  *
  * $Id: config_templ.l,v 1.8 2001/01/01 10:15:16 root Exp $
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -12,6 +12,7 @@
  *
  */
 
+%option never-interactive
 %{
 
 /*
@@ -21,6 +22,8 @@
 #include "input.h"
 #include <QtCore>
 
+#define YY_NO_UNISTD_H 1
+
 #define MAX_INCLUDE_DEPTH 10
 
 
@@ -71,18 +74,25 @@ static int yyread(char *buf,int maxSize)
     }
 }
 
+static QString warning_str = QString::fromAscii("warning: ");
+static QString error_str = QString::fromAscii("error: ");
+
 void config_err(const char *fmt, ...)
 {
+  QString msg = error_str;
+  msg.append(QString::fromAscii(fmt));
   va_list args;
   va_start(args, fmt);
-  vfprintf(stderr, fmt, args);
-  va_end(args); 
+  vfprintf(stderr, qPrintable(msg), args);
+  va_end(args);
 }
 void config_warn(const char *fmt, ...)
 {
+  QString msg = warning_str;
+  msg.append(QString::fromAscii(fmt));
   va_list args;
   va_start(args, fmt);
-  vfprintf(stderr, fmt, args);
+  vfprintf(stderr, qPrintable(msg), args);
   va_end(args);
 }
 
@@ -111,7 +121,7 @@ static FILE *tryPath(const QString &path,const QString &fileName)
   {
     FILE *f = fopen(absName.toLocal8Bit(),"r");
     if (f==NULL)
-      config_err("Error: could not open file %s for reading\n",absName.toLatin1().data());
+      config_err("could not open file %s for reading\n",qPrintable(absName));
     else 
       return f;
   }
@@ -141,7 +151,7 @@ static void readIncludeFile(const QString &incName)
 {
   if (g_includeDepth==MAX_INCLUDE_DEPTH) 
   {
-    config_err("Error: maximum include depth (%d) reached, %s is not included. Aborting...\n",
+    config_err("maximum include depth (%d) reached, %s is not included. Aborting...\n",
 	MAX_INCLUDE_DEPTH,qPrintable(incName));
     exit(1);
   } 
@@ -162,7 +172,7 @@ static void readIncludeFile(const QString &incName)
     // For debugging
 #if SHOW_INCLUDES
     for (i=0;i<includeStack.count();i++) msg("  ");
-    msg("@INCLUDE = %s: parsing...\n",inc.toLatin1().data());
+    msg("@INCLUDE = %s: parsing...\n",qPrintable(inc));
 #endif
 
     // store the state of the old file 
@@ -180,7 +190,7 @@ static void readIncludeFile(const QString &incName)
   } 
   else
   {
-    config_err("Error: @INCLUDE = %s: not found!\n",inc.toLatin1().data());
+    config_err("@INCLUDE = %s: not found!\n",qPrintable(inc));
     exit(1);
   }
 }
@@ -210,7 +220,7 @@ static void readIncludeFile(const QString &incName)
 					   g_curOption = g_options->value(cmd);
 					   if (g_curOption==0) // oops not known
 					   {
-					     config_err("Warning: ignoring unsupported tag `%s' at line %d, file %s\n",
+					     config_warn("ignoring unsupported tag `%s' at line %d, file %s\n",
 						 qPrintable(cmd),yylineno,qPrintable(g_yyFileName)); 
 					     BEGIN(SkipInvalid);
 					   }
@@ -235,7 +245,7 @@ static void readIncludeFile(const QString &incName)
 					         BEGIN(GetString);
 						 break;
 					       case Input::Obsolete:
-					         config_err("Warning: Tag `%s' at line %d of file %s has become obsolete.\n"
+					         config_warn("Tag `%s' at line %d of file %s has become obsolete.\n"
 						            "To avoid this warning please update your configuration "
 							    "file using \"doxygen -u\"\n", qPrintable(cmd),
 							    yylineno,qPrintable(g_yyFileName)); 
@@ -249,7 +259,7 @@ static void readIncludeFile(const QString &incName)
 					  g_curOption = g_options->value(cmd);
 					  if (g_curOption==0) // oops not known
 					  {
-					    config_err("Warning: ignoring unsupported tag `%s' at line %d, file %s\n",
+					    config_warn("ignoring unsupported tag `%s' at line %d, file %s\n",
 						yytext,yylineno,qPrintable(g_yyFileName)); 
 					    BEGIN(SkipInvalid);
 					  }
@@ -265,12 +275,12 @@ static void readIncludeFile(const QString &incName)
 					      case Input::String:
 					      case Input::Int:
 					      case Input::Bool:
-					        config_err("Warning: operator += not supported for `%s'. Ignoring line at line %d, file %s\n",
+					        config_warn("operator += not supported for `%s'. Ignoring line at line %d, file %s\n",
 						    yytext,yylineno,qPrintable(g_yyFileName)); 
 					        BEGIN(SkipInvalid);
 						break;
 					      case Input::Obsolete:
-					         config_err("Warning: Tag `%s' at line %d of file %s has become obsolete.\n"
+					         config_warn("Tag `%s' at line %d of file %s has become obsolete.\n"
 						            "To avoid this warning please update your configuration "
 							    "file using \"doxygen -u\"\n", 
 							    qPrintable(cmd),yylineno,qPrintable(g_yyFileName)); 
@@ -307,12 +317,12 @@ static void readIncludeFile(const QString &incName)
 					  }
   					}
 
-<Start>[a-z_A-Z0-9]+			{ config_err("Warning: ignoring unknown tag `%s' at line %d, file %s\n",yytext,yylineno,qPrintable(g_yyFileName)); }
+<Start>[a-z_A-Z0-9]+			{ config_warn("ignoring unknown tag `%s' at line %d, file %s\n",yytext,yylineno,qPrintable(g_yyFileName)); }
 <GetString,SkipInvalid>\n	        { BEGIN(Start); }
 <GetStrList>\n				{ 
 					  if (!g_elemStr.isEmpty())
 					  {
-					    //printf("elemStr1=`%s'\n",elemStr.toLatin1().data());
+					    //printf("elemStr1=`%s'\n",qPrintable(elemStr));
 					    *g_arg = QVariant(g_arg->toStringList() << g_elemStr);
 					  }
 					  BEGIN(Start); 
@@ -320,7 +330,7 @@ static void readIncludeFile(const QString &incName)
 <GetStrList>[ \t]+			{
   				          if (!g_elemStr.isEmpty())
 					  {
-					    //printf("elemStr2=`%s'\n",elemStr.toLatin1().data());
+					    //printf("elemStr2=`%s'\n",qPrintable(elemStr));
   					    *g_arg = QVariant(g_arg->toStringList() << g_elemStr);
 					  }
 					  g_elemStr = QString();
@@ -336,7 +346,7 @@ static void readIncludeFile(const QString &incName)
 <GetQuotedString>"\""|"\n" 		{ 
                                           // we add a bogus space to signal that the string was quoted. This space will be stripped later on.
                                           g_tmpString+=" ";
-  					  //printf("Quoted String = `%s'\n",tmpString.toLatin1().data());
+  					  //printf("Quoted String = `%s'\n",qPrintable(tmpString));
   					  if (g_lastState==GetString)
 					  {
 					    *g_arg = g_codec->toUnicode(g_tmpString);
@@ -348,7 +358,7 @@ static void readIncludeFile(const QString &incName)
 					  }
 					  if (*yytext=='\n')
 					  {
-					    config_err("Warning: Missing end quote (\") on line %d, file %s\n",yylineno,
+					    config_warn("Missing end quote (\") on line %d, file %s\n",yylineno,
                                                 qPrintable(g_yyFileName));
 					  }
 					  BEGIN(g_lastState);
@@ -377,11 +387,11 @@ static void substEnvVarsInString(QString &s)
   if (s.isEmpty()) return;
   int p=0;
   int i,l;
-  //printf("substEnvVarInString(%s) start\n",s.toLatin1().data());
+  //printf("substEnvVarInString(%s) start\n",qPrintable(s));
   while ((i=re.indexIn(s,p))!=-1)
   {
     l = re.matchedLength();
-    //printf("Found environment var s.mid(%d,%d)=`%s'\n",i+2,l-3,s.mid(i+2,l-3).toLatin1().data());
+    //printf("Found environment var s.mid(%d,%d)=`%s'\n",i+2,l-3,qPrintable(s.mid(i+2,l-3)));
     QString env=g_codec->toUnicode(getenv(s.mid(i+2,l-3).toLatin1()));
     substEnvVarsInString(env); // recursively expand variables if needed.
     s = s.left(i)+env+s.right(s.length()-i-l);
@@ -389,7 +399,7 @@ static void substEnvVarsInString(QString &s)
   }
   s=s.trimmed(); // to strip the bogus space that was added when an argument
                          // has quotes
-  //printf("substEnvVarInString(%s) end\n",s.toLatin1().data());
+  //printf("substEnvVarInString(%s) end\n",qPrintable(s));
 }
 
 static void substEnvVarsInStrList(QStringList &sl)
@@ -404,7 +414,7 @@ static void substEnvVarsInStrList(QStringList &sl)
     // here we strip the quote again
     substEnvVarsInString(result);
 
-    //printf("Result %s was quoted=%d\n",result.toLatin1().data(),wasQuoted);
+    //printf("Result %s was quoted=%d\n",qPrintable(result),wasQuoted);
 
     if (!wasQuoted) /* as a result of the expansion, a single string
 		       may have expanded into a list, which we'll
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp
index d0728ae..4c577cd 100644
--- a/addon/doxywizard/doxywizard.cpp
+++ b/addon/doxywizard/doxywizard.cpp
@@ -193,7 +193,7 @@ void MainWindow::about()
   t << QString::fromAscii("<qt><center>A tool to configure and run doxygen version ")+
        QString::fromAscii(versionString)+
        QString::fromAscii(" on your source files.</center><p><br>"
-       "<center>Written by<br> Dimitri van Heesch<br>&copy; 2000-2014</center><p>"
+       "<center>Written by<br> Dimitri van Heesch<br>&copy; 2000-2015</center><p>"
        "</qt>");
   QMessageBox::about(this,tr("Doxygen GUI"),msg);
 }
diff --git a/addon/doxywizard/doxywizard.pro.in b/addon/doxywizard/doxywizard.pro.in
deleted file mode 100644
index 1ad36a9..0000000
--- a/addon/doxywizard/doxywizard.pro.in
+++ /dev/null
@@ -1,40 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) zo okt 19 12:50:02 2008
-######################################################################
-
-TEMPLATE     = app
-DESTDIR      = ../../bin
-TARGET       = 
-DEPENDPATH  += .
-INCLUDEPATH += . ../../generated_src/doxywizard
-QT          += xml
-CONFIG      += $extraopts
-OBJECTS_DIR  = ../../objects/doxywizard
-MOC_DIR      = ../../moc/doxywizard
-RCC_DIR      = ../../rcc/doxywizard
-DEFINES     += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
-
-macx-g++ {
-  CONFIG += x86 x86_64
-}
-
-# Input
-HEADERS     += doxywizard.h version.h expert.h config.h helplabel.h \
-               inputbool.h inputstring.h inputint.h inputstrlist.h wizard.h docintf.h
-SOURCES     += doxywizard.cpp expert.cpp wizard.cpp \
-               inputbool.cpp inputstring.cpp inputint.cpp inputstrlist.cpp 
-RESOURCES   += doxywizard.qrc
-win32:RC_FILE += doxywizard.rc
-
-config.target = ../../generated_src/doxywizard/config_doxyw.cpp
-config.commands = $(LEX) -Pconfig_doxywYY -t ../../addon/doxywizard/config_doxyw.l | $(PYTHON) ../../src/increasebuffer.py >../../generated_src/doxywizard/$*.cpp
-config.depends = ../../addon/doxywizard/config_doxyw.l  ../../src/increasebuffer.py
-configdoc.target = ../../generated_src/doxywizard/configdoc.cpp
-configdoc.commands = $(PYTHON) ../../src/configgen.py -wiz ../../src/config.xml > ../../generated_src/doxywizard/configdoc.cpp
-configdoc.depends = ../../src/config.xml ../../src/configgen.py
-version.target = ../../generated_src/doxywizard/version.cpp
-version.commands = cd ../../src;$(PYTHON) version.py
-version.depends = ../../configure
-QMAKE_EXTRA_TARGETS += configdoc config version
-GENERATED_SOURCES += $$configdoc.target $$config.target $$version.target
-
diff --git a/addon/doxywizard/inputbool.cpp b/addon/doxywizard/inputbool.cpp
index be99b0a..ec2035a 100644
--- a/addon/doxywizard/inputbool.cpp
+++ b/addon/doxywizard/inputbool.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxywizard/inputbool.h b/addon/doxywizard/inputbool.h
index 03bb76e..5a90477 100644
--- a/addon/doxywizard/inputbool.h
+++ b/addon/doxywizard/inputbool.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxywizard/inputint.cpp b/addon/doxywizard/inputint.cpp
index e0c426c..8fa46e8 100644
--- a/addon/doxywizard/inputint.cpp
+++ b/addon/doxywizard/inputint.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxywizard/inputint.h b/addon/doxywizard/inputint.h
index 6662865..457c942 100644
--- a/addon/doxywizard/inputint.h
+++ b/addon/doxywizard/inputint.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxywizard/inputstring.cpp b/addon/doxywizard/inputstring.cpp
index 48ede55..75de0b5 100644
--- a/addon/doxywizard/inputstring.cpp
+++ b/addon/doxywizard/inputstring.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxywizard/inputstring.h b/addon/doxywizard/inputstring.h
index 90ea87d..dba31f6 100644
--- a/addon/doxywizard/inputstring.h
+++ b/addon/doxywizard/inputstring.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxywizard/inputstrlist.cpp b/addon/doxywizard/inputstrlist.cpp
index 0a0f01f..777af6a 100644
--- a/addon/doxywizard/inputstrlist.cpp
+++ b/addon/doxywizard/inputstrlist.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxywizard/inputstrlist.h b/addon/doxywizard/inputstrlist.h
index 0d7efe7..53f3bcc 100644
--- a/addon/doxywizard/inputstrlist.h
+++ b/addon/doxywizard/inputstrlist.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxywizard/version.h b/addon/doxywizard/version.h
index b31fe4f..16bf9df 100644
--- a/addon/doxywizard/version.h
+++ b/addon/doxywizard/version.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/addon/doxywizard/wizard.h b/addon/doxywizard/wizard.h
index 4d5eb9d..11a42be 100644
--- a/addon/doxywizard/wizard.h
+++ b/addon/doxywizard/wizard.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
new file mode 100644
index 0000000..d96e3c0
--- /dev/null
+++ b/cmake/FindIconv.cmake
@@ -0,0 +1,126 @@
+# vim:ts=4:sw=4:expandtab:autoindent:
+#
+# The MIT License
+#
+# Copyright (c) 2008, 2009 Flusspferd contributors (see "CONTRIBUTORS" or
+#                                      http://flusspferd.org/contributors.txt)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+Include(CheckFunctionExists)
+include(CheckCXXSourceCompiles)
+
+if(ICONV_INCLUDE_DIR)
+  set(ICONV_FIND_QUIETLY TRUE)
+endif()
+
+find_path(ICONV_INCLUDE_DIR iconv.h
+    HINTS
+    ${CMAKE_PREFIX_PATH}
+    ${ICONV_DIR}
+    $ENV{ICONV_DIR}
+    PATH_SUFFIXES include
+)
+
+if(NOT ICONV_INCLUDE_DIR STREQUAL "ICONV_INCLUDE_DIR-NOTFOUND")
+    set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
+    check_function_exists(iconv_open ICONV_IN_GLIBC)
+endif()
+
+if(NOT ICONV_IN_GLIBC)
+    if (CMAKE_CL_64)
+        find_library(ICONV_LIBRARY
+            NAMES iconv64
+            HINTS
+            ${CMAKE_PREFIX_PATH}
+            ${ICONV_DIR}
+            $ENV{ICONV_DIR}
+            PATH_SUFFIXES lib64 lib
+            )
+    else()
+        find_library(ICONV_LIBRARY
+            NAMES iconv
+            HINTS
+            ${CMAKE_PREFIX_PATH}
+            ${ICONV_DIR}
+            $ENV{ICONV_DIR}
+            PATH_SUFFIXES lib64 lib
+            )
+    endif()
+    set(ICONV_TEST ${ICONV_LIBRARY})
+else()
+    set(ICONV_TEST "In glibc")
+endif()
+
+set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
+set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
+check_cxx_source_compiles(
+    "#include <iconv.h>
+     int main() {
+        iconv(iconv_t(-1), 0, 0, 0, 0);
+     }"
+    ICONV_COMPILES)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(ICONV DEFAULT_MSG ICONV_TEST ICONV_INCLUDE_DIR ICONV_COMPILES)
+
+if(ICONV_FOUND)
+  set(ICONV_LIBRARIES ${ICONV_LIBRARY})
+else(ICONV_FOUND)
+  set(ICONV_LIBRARIES)
+endif(ICONV_FOUND)
+
+if(ICONV_FOUND)
+    set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
+    set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
+
+    if (NOT DEFINED ICONV_ACCEPTS_NONCONST_INPUT)
+        # Display a useful message first time we come through here
+        message(STATUS "One (and only one) of the ICONV_ACCEPTS_... tests must pass")
+    endif()
+    check_cxx_source_compiles(
+        "#include <iconv.h>
+         int main() {
+            char *p = 0;
+            iconv(iconv_t(-1), &p, 0, 0, 0);
+         }"
+        ICONV_ACCEPTS_NONCONST_INPUT)
+
+    check_cxx_source_compiles(
+        "#include <iconv.h>
+         int main() {
+            char const *p = 0;
+            iconv(iconv_t(-1), &p, 0, 0, 0);
+         }"
+        ICONV_ACCEPTS_CONST_INPUT)
+
+    if (ICONV_LIBRARY)
+        list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
+        list(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
+    endif()
+endif()
+
+if(NOT ICONV_ACCEPTS_CONST_INPUT AND NOT ICONV_ACCEPTS_NONCONST_INPUT)
+  MESSAGE(FATAL_ERROR "Unable to determine iconv() signature")
+elseif(ICONV_ACCEPTS_CONST_INPUT AND ICONV_ACCEPTS_NONCONST_INPUT)
+  MESSAGE(FATAL_ERROR "Unable to determine iconv() signature - both test cases passed!")
+endif()
+
+mark_as_advanced(ICONV_LIBRARY ICONV_INCLUDE_DIR)
diff --git a/cmake/FindLibClang.cmake b/cmake/FindLibClang.cmake
new file mode 100644
index 0000000..2835b1f
--- /dev/null
+++ b/cmake/FindLibClang.cmake
@@ -0,0 +1,51 @@
+if (NOT CLANG_ROOT)
+  set(CLANG_ROOT $ENV{CLANG_ROOT})
+endif ()
+
+if (NOT LLVM_CONFIG)
+  set(LLVM_CONFIG $ENV{LLVM_CONFIG})
+  if (NOT LLVM_CONFIG)
+    set(llvm_config_names llvm-config)
+    foreach(minor RANGE 9 1)
+      list(APPEND llvm_config_names "llvm-config3${minor}" "llvm-config-3.${minor}" "llvm-config-mp-3.${minor}")
+    endforeach ()
+    find_program(LLVM_CONFIG NAMES ${llvm_config_names})
+  endif ()
+endif ()
+
+if (LLVM_CONFIG)
+  message(STATUS "llvm-config found at: ${LLVM_CONFIG}")
+else ()
+  message(FATAL_ERROR "Could NOT find llvm-config executable.")
+endif ()
+
+if (NOT EXISTS ${CLANG_INCLUDEDIR})
+  execute_process(COMMAND ${LLVM_CONFIG} --includedir OUTPUT_VARIABLE CLANG_INCLUDEDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+  if (NOT EXISTS ${CLANG_INCLUDEDIR})
+    message(FATAL_ERROR "Could NOT find clang includedir. You can fix this by setting CLANG_INCLUDEDIR in your shell or as a cmake variable.")
+  endif ()
+endif ()
+
+if (NOT EXISTS ${CLANG_LIBDIR})
+  execute_process(COMMAND ${LLVM_CONFIG} --libdir OUTPUT_VARIABLE CLANG_LIBDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+  if (NOT EXISTS ${CLANG_LIBDIR})
+    message(FATAL_ERROR "Could NOT find clang libdir. You can fix this by setting CLANG_LIBDIR in your shell or as a cmake variable.")
+  endif ()
+endif ()
+
+if (NOT CLANG_LIBS)
+  find_library(CLANG_LIB_HACK_CMAKECACHE_DOT_TEXT_BULLSHIT NAMES clang libclang ${CLANG_ROOT}/lib ${CLANG_LIBDIR} NO_DEFAULT_PATH)
+  if (NOT EXISTS ${CLANG_CLANG_LIB_HACK_CMAKECACHE_DOT_TEXT_BULLSHIT})
+    find_library(CLANG_LIBS NAMES clang libclang)
+    if (NOT EXISTS ${CLANG_LIBS})
+      set (CLANG_LIBS "-L${CLANG_LIBDIR}" "-lclang" "-Wl,-rpath,${CLANG_LIBDIR}")
+    endif ()
+  else ()
+    set(CLANG_LIBS "${CLANG_LIB_HACK_CMAKECACHE_DOT_TEXT_BULLSHIT}")
+  endif ()
+endif ()
+
+execute_process(COMMAND ${LLVM_CONFIG} --version OUTPUT_VARIABLE CLANG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+message("-- Using Clang ${CLANG_VERSION} from ${CLANG_LIBDIR} with LIBS ${CLANG_LIBS} and CXXFLAGS ${CLANG_CXXFLAGS}")
+
+
diff --git a/cmake/FindSQLite3.cmake b/cmake/FindSQLite3.cmake
new file mode 100644
index 0000000..77b8eb4
--- /dev/null
+++ b/cmake/FindSQLite3.cmake
@@ -0,0 +1,86 @@
+# - Try to find Sqlite3
+# Once done this will define
+#
+#  SQLITE3_FOUND - system has Sqlite3
+#  SQLITE3_INCLUDE_DIRS - the Sqlite3 include directory
+#  SQLITE3_LIBRARIES - Link these to use Sqlite3
+#  SQLITE3_DEFINITIONS - Compiler switches required for using Sqlite3
+#
+#  Copyright (c) 2008 Andreas Schneider <mail@cynapses.org>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS)
+  # in cache already
+  set(SQLITE3_FOUND TRUE)
+else (SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS)
+  # use pkg-config to get the directories and then use these values
+  # in the FIND_PATH() and FIND_LIBRARY() calls
+  if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    include(UsePkgConfig)
+    pkgconfig(sqlite3 _SQLITE3_INCLUDEDIR _SQLITE3_LIBDIR _SQLITE3_LDFLAGS _SQLITE3_CFLAGS)
+  else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    find_package(PkgConfig)
+    if (PKG_CONFIG_FOUND)
+      pkg_check_modules(_SQLITE3 sqlite3)
+    endif (PKG_CONFIG_FOUND)
+  endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+  find_path(SQLITE3_INCLUDE_DIR
+    NAMES
+      sqlite3.h
+    PATHS
+      ${_SQLITE3_INCLUDEDIR}
+      /usr/include
+      /usr/local/include
+      /opt/local/include
+      /sw/include
+  )
+
+  find_library(SQLITE3_LIBRARY
+    NAMES
+      sqlite3
+    PATHS
+      ${_SQLITE3_LIBDIR}
+      /usr/lib
+      /usr/local/lib
+      /opt/local/lib
+      /sw/lib
+  )
+
+  if (SQLITE3_LIBRARY)
+    set(SQLITE3_FOUND TRUE)
+  endif (SQLITE3_LIBRARY)
+
+  set(SQLITE3_INCLUDE_DIRS
+    ${SQLITE3_INCLUDE_DIR}
+  )
+
+  if (SQLITE3_FOUND)
+    set(SQLITE3_LIBRARIES
+      ${SQLITE3_LIBRARIES}
+      ${SQLITE3_LIBRARY}
+    )
+  endif (SQLITE3_FOUND)
+
+  if (SQLITE3_INCLUDE_DIRS AND SQLITE3_LIBRARIES)
+     set(SQLITE3_FOUND TRUE)
+  endif (SQLITE3_INCLUDE_DIRS AND SQLITE3_LIBRARIES)
+
+  if (SQLITE3_FOUND)
+    if (NOT Sqlite3_FIND_QUIETLY)
+      message(STATUS "Found Sqlite3: ${SQLITE3_LIBRARIES}")
+    endif (NOT Sqlite3_FIND_QUIETLY)
+  else (SQLITE3_FOUND)
+    if (Sqlite3_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find Sqlite3")
+    endif (Sqlite3_FIND_REQUIRED)
+  endif (SQLITE3_FOUND)
+
+  # show the SQLITE3_INCLUDE_DIRS and SQLITE3_LIBRARIES variables only in the advanced view
+  mark_as_advanced(SQLITE3_INCLUDE_DIRS SQLITE3_LIBRARIES)
+
+endif (SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS)
diff --git a/cmake/FindXapian.cmake b/cmake/FindXapian.cmake
new file mode 100644
index 0000000..6109d7f
--- /dev/null
+++ b/cmake/FindXapian.cmake
@@ -0,0 +1,42 @@
+# Find Xapian search engine library
+#
+#  XAPIAN_FOUND - system has Xapian
+#  XAPIAN_INCLUDE_DIR - the Xapian include directory
+#  XAPIAN_LIBRARIES - the libraries needed to use Xapian
+#
+# Copyright © 2010 Harald Sitter <apachelogger@ubuntu.com>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES)
+    # Already in cache, be silent
+    set(Xapian_FIND_QUIETLY TRUE)
+endif(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES)
+
+FIND_PATH(XAPIAN_INCLUDE_DIR xapian/version.h)
+
+FIND_LIBRARY(XAPIAN_LIBRARIES NAMES xapian)
+
+IF(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES)
+   SET(XAPIAN_FOUND TRUE)
+ELSE(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES)
+   SET(XAPIAN_FOUND FALSE)
+ENDIF(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES)
+
+IF(XAPIAN_FOUND)
+   IF(NOT Xapian_FIND_QUIETLY)
+      MESSAGE(STATUS "Found Xapian: ${XAPIAN_LIBRARIES}")
+   ENDIF(NOT Xapian_FIND_QUIETLY)
+ELSE(XAPIAN_FOUND)
+   IF(Xapian_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find Xapian")
+   ENDIF(Xapian_FIND_REQUIRED)
+   IF(NOT Xapian_FIND_QUIETLY)
+      MESSAGE(STATUS "Could not find Xapian")
+   ENDIF(NOT Xapian_FIND_QUIETLY)
+ENDIF(XAPIAN_FOUND)
+
+# show the XAPIAN_INCLUDE_DIR and XAPIAN_LIBRARIES variables only in the advanced view
+MARK_AS_ADVANCED(XAPIAN_INCLUDE_DIR XAPIAN_LIBRARIES)
+
diff --git a/cmake/lang_cfg.cmake b/cmake/lang_cfg.cmake
new file mode 100644
index 0000000..c57d3ed
--- /dev/null
+++ b/cmake/lang_cfg.cmake
@@ -0,0 +1,11 @@
+if(${CMAKE_ARGC} GREATER 1)
+	if ("${CMAKE_ARGV3}" STREQUAL "ENONLY")
+		message("#define ENGLISH_ONLY")
+	else()
+		math(EXPR UPTO ${CMAKE_ARGC}-1)
+		foreach(i RANGE 3 ${UPTO})
+			message("#define LANG_${CMAKE_ARGV${i}}")
+		endforeach()
+	endif()
+endif()
+
diff --git a/cmake/run_translator.cmake b/cmake/run_translator.cmake
new file mode 100644
index 0000000..618bb82
--- /dev/null
+++ b/cmake/run_translator.cmake
@@ -0,0 +1,5 @@
+include(${SOURCE}/cmake/version.cmake)
+find_program(PYTHON NAMES python)
+execute_process(
+    COMMAND ${PYTHON} ${CMAKE_SOURCE_DIR}/translator.py
+)
diff --git a/cmake/version.cmake b/cmake/version.cmake
new file mode 100644
index 0000000..48de7b2
--- /dev/null
+++ b/cmake/version.cmake
@@ -0,0 +1,2 @@
+file (STRINGS "${SOURCE}/VERSION" VERSION)
+set(ENV{VERSION} "${VERSION}")
diff --git a/configure b/configure
deleted file mode 100755
index d83cee1..0000000
--- a/configure
+++ /dev/null
@@ -1,993 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-#
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
-# 
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby 
-# granted. No representations are made about the suitability of this software 
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-# 
-# Documents produced by Doxygen are derivative works derived from the
-# input used in their production; they are not affected by this license.
-# 
-# shell script to configure doxygen
-
-doxygen_version_major=1
-doxygen_version_minor=8
-doxygen_version_revision=8
-
-#NOTE: Setting version_mmn to "NO" will omit mmn info from the package.
-doxygen_version_mmn=NO
-
-bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
-
-f_debug=NO
-f_shared=YES
-f_make=NO
-f_dot=NO
-f_perl=NO
-f_python=NO
-f_plf_auto=NO
-f_prefix=/usr/local
-f_insttool=NO
-f_english=NO
-f_wizard=NO
-f_app=NO
-f_doxmlparser=NO
-f_thread=NO
-f_flex=NO
-f_bison=NO
-f_search=NO
-f_sqlite3=NO
-f_sqlite3static=NO
-f_sqlite3_path=NO
-f_libclang=NO
-f_libclangstatic=NO
-
-#
-# first setup the list with availabe languages, so we cannot forget any
-# list will be in case as specified (f_langs) and in uppercase (f_ulangs) as used in the internal perl script
-#
-f_langs=`ls -1 src/translator_??.h | sed -e 's%src/translator_%%g' | sed -e 's/\.h//' | tr '\012' ','`
-
-while test -n "$1";  do
-  case $1 in
-    --prefix=*)
-       f_prefix=`echo $1 | sed 's/^--prefix=//'`
-       ;;
-    --prefix | -prefix)
-       shift; f_prefix=$1
-       ;;
-    --docdir=*)
-       f_docdir=`echo $1 | sed 's/^--docdir=//'`
-       ;;
-    --docdir | -docdir)
-       shift; f_docdir=$1
-       ;;
-    --shared | -shared)
-       f_shared=YES
-       ;;
-    --static | -static)
-       f_shared=NO
-       ;;
-    --release | -release)
-       f_debug=NO
-       ;;
-    --debug | -debug)
-       f_debug=YES
-       ;;
-    --english-only | -english-only)
-       f_english=YES
-       ;;
-    --enable-langs=*)
-       f_langs=`echo $1 | sed 's/^--enable-langs=//'`
-       ;;
-    --enable-langs | -enable-langs)
-       shift; f_langs=$1
-       ;;
-    --platform=*)
-       f_platform=`echo $1 | sed 's/^--platform=//'`
-       ;;
-    --platform | -platform)
-       shift; f_platform=$1
-       ;;
-    --make=*)
-       f_make=`echo $1 | sed 's/^--make=//'`
-       ;;
-    --make | -make)
-       shift; f_make=$1
-       ;;
-    --dot=*)
-       f_dot=`echo $1 | sed 's/^--dot=//'`
-       ;;
-    --dot | -dot)
-       shift; f_dot=$1
-       ;;
-    --python=*)
-       f_python=`echo $1 | sed 's/^--python=//'`
-       ;;
-    --python | -python)
-       shift; f_python=$1
-       ;;
-    --perl=*)
-       f_perl=`echo $1 | sed 's/^--perl=//'`
-       ;;
-    --perl | -perl)
-       shift; f_perl=$1
-       ;;
-    --flex=*)
-       f_flex=`echo $1 | sed 's/^--flex=//'`
-       ;;
-    --flex | -flex)
-       shift; f_flex=$1
-       ;;
-    --bison=*)
-       f_bison=`echo $1 | sed 's/^--bison=//'`
-       ;;
-    --bison | -bison)
-       shift; f_bison=$1
-       ;;
-    --install=*)
-       f_insttool=`echo $1 | sed 's/^--install=//'`
-       ;;
-    --install | -install)
-       shift; f_insttool=$1
-       ;;
-    --with-doxywizard | -with-doxywizard)
-       f_wizard=YES
-       ;;
-    --with-doxyapp | -with-doxyapp)
-       f_app=YES
-       ;;
-    --with-doxmlparser | -with-doxmlparser)
-       f_doxmlparser=YES
-       ;;
-    --with-doxysearch | -with-doxysearch)
-       f_search=YES
-       ;;
-    --with-sqlite3 | -with-sqlite3)
-       f_sqlite3=YES
-       ;;
-    --with-sqlite3-static | -with-sqlite3-static)
-       f_sqlite3=YES
-       f_sqlite3static=YES
-       ;;
-    --sqlite3-path=*)
-       f_sqlite3_path=`echo $1 | sed 's/^--sqlite3-path=//'`
-       ;;
-    --sqlite3-path | -sqlite3-path)
-       shift; f_sqlite3_path=$1
-       ;;
-    --with-libclang | -with-libclang)
-       f_libclang=YES
-       ;;
-    --with-libclang-static | -with-libclang-static)
-       f_libclang=YES
-       f_libclangstatic=YES
-       ;;
-    -h | -help | --help)
-       f_help=y
-       ;;
-    *)
-       echo $1: unknown argument
-       f_help=y
-       f_error=y
-       ;;
-  esac
-  shift
-done
-
-if test "$f_help" = y; then
-  cat <<EOF
-Usage: $0 [--help] [--shared] [--static] [--release] [--debug] [--python name]
-          [--perl name] [--flex name] [--bison name] [--make name] 
-          [--dot name] [--platform target] [--prefix dir] [--docdir dir] 
-          [--install name] [--english-only] [--enable-langs list] 
-          [--with-sqlite3] [--with-sqlite3-static] [--sqlite3-path]
-          [--with-libclang] [--with-libclang-static]
-          [--with-doxywizard] [--with-doxysearch] [--with-doxyapp]
-          [--with-doxxmlparser]
-
-Options: 
-
-  --help                Print this help
-  --shared | --static   Build using shared or static linking
-		        [default: shared]
-  --release | --debug   Build for release or debug 
-		        [default: release]
-  --python name         Use \`name' as the name of the python interpreter 
-		        [default: autodetect]
-  --perl name           Use \`name' as the name of the perl interpreter 
-		        [default: autodetect]
-  --flex name           Use \`name' as the name of the GNU lexical scanner 
-		        [default: autodetect]
-  --bison name          Use \`name' as the name of the GNU compiler generator 
-		        [default: autodetect]
-  --make name           Use \`name' as the name of the GNU make tool
-		        [default: autodetect]
-  --dot name            Use \`name' as the name of the dot tool that
-                        is part of the Graphviz package.
-                        [default: autodetect]
-  --platform target     Do not detect platform but use \`target' instead.
-                        See PLATFORMS for a list of possibilities
-  --prefix dir          Installation prefix directory (doxygen will be
-                        put in PREFIX/bin/doxygen)
-                        [default: $f_prefix]
-  --docdir dir          Documentation is installed in DOCDIR/
-                        [default: PREFIX/share/doc/packages/doxygen]
-  --install name        Use \`name' as the name of the GNU install tool
-                        [default: autodetect]
-  --english-only        Include support for English only.
-  --enable-langs list 	Include support for output languages listed in list.
-  			[default: $f_langs]
-  --with-sqlite3        Add support for sqlite3 output [experimental]
-  --with-libclang       Add support for libclang parsing
-  --with-doxywizard     Build the GUI frontend for doxygen. This
-                        requires Qt version 4.
-  --with-doxysearch     Build external search tools (doxysearch and doxyindexer)
-                        requires Xapian library version 1.2
-  --with-doxyapp        Example showing how to embed doxygen in an application.
-  --with-doxmlparser    Example showing how to parse doxygen's XML output.
-
-EOF
-  test "$f_error" = y && exit 1
-  exit 0;
-fi
-
-u_release=`(uname -r) 2>/dev/null` || u_release=unknown
-u_system=`(uname -s) 2>/dev/null` || u_system=unknown
-
-if test -z "$f_platform"; then
-  f_platforms="`cat PLATFORMS`"
-  
-  case "$u_system:$u_release" in
-    AIX*)
-      f_platform=aix-xlc
-      ;;
-    BeOS*)
-      f_platform=beos-g++
-      ;;
-    dgux:*)
-      f_platform=dgux-g++
-      ;;
-    Darwin:*)
-      f_platform=macosx-c++
-      if test "$f_insttool" = NO; then
-        f_insttool=/usr/bin/install
-      fi
-      ;;
-    FreeBSD:*)
-      f_platform=freebsd-g++
-      if test "$f_insttool" = NO; then
-        f_insttool=/usr/bin/install
-      fi
-      ;;
-    NetBSD:*)
-      f_platform=netbsd-g++
-      if test "$f_insttool" = NO; then
-        f_insttool=/usr/bin/install
-      fi
-      ;;
-    HP-UX:*)
-      f_platform=hpux-g++
-      if test "$f_insttool" = NO; then
-        f_insttool=/usr/bin/install
-      fi
-      ;;
-    IRIX64:*)
-      f_platform=irix-64
-      ;;
-    IRIX:*)
-      f_platform=irix-n32
-      ;;
-    Linux:*|GNU:*|GNU/*:*)
-      f_platform=linux-g++
-      ;;
-    NetBSD:*)
-      f_platform=netbsd-g++
-      ;;
-    OpenBSD:*)
-      f_platform=openbsd-g++
-      ;;
-    OSF1:*)
-      f_platform=osf1-g++
-      ;;
-    QNX:*)
-      f_platform=qnx-g++
-      ;;
-    *:3.2)
-      f_platform=sco-g++
-      ;;
-    SunOS:4*)
-      f_platform=sunos-g++
-      ;;
-    SunOS:5*)
-      f_platform=solaris-g++
-      if test "$f_insttool" = NO; then
-        f_insttool=/usr/bin/install
-      fi
-      ;;
-    ULTRIX:*)
-      f_platform=ultrix-g++
-      ;;
-    UNIX_SV:4.2*)
-      f_platform=unixware-g++
-      ;;
-    Cygwin:*|CYGWIN*)
-      f_platform=win32-g++
-      ;;
-    MINGW32_NT*)
-      f_platform=win32-mingw
-      ;;
-    *MiNT:*)
-      f_platform=m68k-atari-mint-g++
-      ;;
-    *)
-    echo
-    echo "Your platform was not recognised by this configure script"
-    echo "Please use the -platform option to specify one of platforms"
-    echo "in this list:"
-    echo
-    for p in $f_platforms
-    do
-      echo "    $0 $* -platform $p"
-    done
-    echo
-    exit 2
-  esac 
-  echo "  Autodetected platform $f_platform... "
-  f_plf_auto=YES
-fi
-
-if test -z "$f_docdir"; then
-  f_docdir='$(INSTALL)/share/doc/packages/doxygen'
-fi
-
-if test "$f_plf_auto" = NO; then
-  printf "  Checking for platform $f_platform... "
-  if test '!' -d tmake/lib/$f_platform; then
-    echo "not supported!" 
-    echo
-    exit 2
-  fi
-  echo "supported"
-fi
-
-#- check for qt --------------------------------------------------------------
- 
-if test "$f_wizard" = YES; then
-  if test -z "$QTDIR"; then
-    echo "  QTDIR environment variable not set!"
-    printf "  Checking for Qt..."
-    for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
-      if test -x "$d/bin/qmake"; then
-        QTDIR=$d
-        break 2
-      fi
-    done
-  else
-    if test -e "$QTDIR/bin/qmake"; then
-      printf "  Detected Qt via the QTDIR environment variable..."
-    else
-      printf "ERROR Detected Qt via the QTDIR environment variable..."
-      echo ", but $QTDIR/bin/qmake does not exist."
-      echo "      Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists."
-      exit 2
-    fi
-  fi
-  if test -z "$QTDIR"; then
-    echo "QTDIR not set and Qt not found at standard locations!"
-    echo
-    echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists."
-    echo "check the Qt installation instructions!"
-    exit 2
-  fi
-  echo using $QTDIR
-fi
-
-#- check for xapian -----------------------------------------------------------
-
-if test "$f_search" = YES; then
-  if test -z "$XAPIAN"; then
-    printf "  Checking for Xapian..."
-    for d in /usr /usr/local /opt/local; do
-      if test -e "$d/include/xapian.h"; then
-        XAPIAN=$d
-        break 2
-      fi
-    done
-  else
-    if test -e "$XAPIAN/include/xapian.h"; then
-      printf "  Detected Xapian via the XAPIAN environment variable..."
-    else
-      printf "ERROR Detected Xapian via the XAPIAN environment variable..."
-      echo ", but $XAPIAN/include/xapian.h does not exist."
-      echo "      Set the XAPIAN environment variable such that \$XAPIAN/include/xapian.h exists."
-      exit 2
-    fi
-  fi
-  if test -z "$XAPIAN"; then
-    echo "XAPIAN not set and xapian.h not found at standard locations!"
-    exit 2;
-  fi
-  echo using $XAPIAN
-fi
-   
-# - check for make ------------------------------------------------------------
-
-printf "  Checking for GNU make tool... "
-if test "$f_make" = NO; then
-  make_names="gmake make"
-  make_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
-  make_prog=NO
-  for i in $make_names; do
-    for j in $make_dirs; do
-      if test -x "$j/$i"; then
-        if test -n "`$j/$i --version 2>/dev/null | grep GNU`"; then
-          make_prog="$j/$i"
-          break 2
-        fi
-      fi
-    done
-  done
-  f_make="$make_prog" 
-fi
-
-if test "$f_make" = NO; then
-  echo "not found!";
-  echo
-  exit 2
-fi
-echo "using $f_make"
-
-# - check for install ------------------------------------------------------------
-
-printf "  Checking for GNU install tool... "
-if test "$f_insttool" = NO; then
-  install_names="ginstall install"
-  install_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin /usr/ucb"
-  install_prog=NO
-  install_found=NO
-  for i in $install_names; do
-    for j in $install_dirs; do
-      if test -x "$j/$i"; then
-        if test -n "`$j/$i --version 2>/dev/null | grep utils`"; then
-          install_found=YES
-          install_prog="$j/$i"
-          break 2
-        fi
-      fi
-    done
-  done
-  f_insttool="$install_prog" 
-fi
-
-if test "$f_insttool" = NO; then
-  if test "$install_found" = YES; then
-    echo;
-  else
-    echo "not found!";
-    echo
-  fi
-  echo "GNU version of install is required: this is part of the fileutils/coreutils package: "
-  echo "see http://www.gnu.org/software/fileutils/fileutils.html"
-  echo
-  exit 2
-fi
-echo "using $f_insttool";
-
-
-# - check for dot ------------------------------------------------------------
-
-printf "  Checking for dot (part of GraphViz)... "
-if test "$f_dot" = NO; then
-  dot_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
-  dot_prog=NO
-  for j in $dot_dirs; do
-    if test -x "$j/dot"; then
-      dot_prog="$j/dot"
-      break 2
-    fi
-  done
-  f_dot="$dot_prog" 
-fi
-
-if test "$f_dot" = NO; then
-  echo "not found!";
-else
-  echo "using $f_dot"
-fi
-
-# - check for sqlite3 ---------------------------------------------------------
-
-if test "$f_sqlite3" = YES; then
-  printf "  Checking for sqlite3 ... "
-  if test "$f_sqlite3_path" = NO; then
-    sqlite3_hdr_dir="/usr/include /usr/local/include /opt/local/include"
-    sqlite3_lib_dir="/usr/lib /usr/local/lib /opt/local/lib /usr/lib/x86_64-linux-gnu /usr/lib64"
-  else
-    sqlite3_hdr_dir="$f_sqlite3_path/include"
-    sqlite3_lib_dir="$f_sqlite3_path/lib"
-  fi
-  if test "$f_sqlite3static" = NO; then
-    sqlite3_lib_name="libsqlite3.so libsqlite3.dylib libsqlite3.a libsqlite3.dll.a"
-  else
-    sqlite3_lib_name="libsqlite3.a"
-  fi
-  sqlite3_hdr=NO
-  sqlite3_lib=NO
-  sqlite3_link=
-  for j in $sqlite3_hdr_dir; do
-    if test -f "$j/sqlite3.h"; then
-      sqlite3_hdr="$j/sqlite3.h"
-      break
-    fi
-  done
-  for i in $sqlite3_lib_dir; do
-    if test "$sqlite3_lib" = NO; then
-      for j in $sqlite3_lib_name; do
-        if test -e "$i/$j"; then
-          if test "$f_sqlite3static" = NO; then
-            sqlite3_lib="$i/$j"
-            sqlite3_link="-L$i -lsqlite3"
-          else
-            sqlite3_lib="$i/$j"
-            sqlite3_link="$i/$j -ldl"
-          fi
-          break
-        fi
-      done
-    fi
-  done
-  if test "$sqlite3_hdr" = NO -o "$sqlite3_lib" = NO; then
-    echo "not found!";
-    exit 1
-  else
-    echo "using header $sqlite3_hdr and library $sqlite3_lib...";
-  fi
-fi
-
-# - check for libclang ---------------------------------------------------------
-
-if test "$f_libclang" = YES; then
-  printf "  Checking for libclang ... "
-  if llvm-config --version > /dev/null 2>&1; then
-    libclang_hdr_dir=`llvm-config --includedir`
-    libclang_lib_dir=`llvm-config --libdir`
-  else
-    libclang_hdr_dir="/usr/include /usr/local/include /opt/local/include"
-    libclang_lib_dir="/usr/lib /usr/local/lib /opt/local/lib /usr/lib64/llvm /usr/lib/llvm"
-  fi
-  if test "$f_libclangstatic" = NO; then
-    libclang_lib_name="libclang.so libclang.dylib libclang.a libclang.dll.a"
-  else
-    libclang_lib_name="libclang.a"
-  fi
-  libclang_hdr=NO
-  libclang_lib=NO
-  libclang_link=
-  for j in $libclang_hdr_dir; do
-    if test -f "$j/clang-c/Index.h"; then
-      libclang_hdr="$j/clang-c/Index.h"
-      break
-    fi
-  done
-  for i in $libclang_lib_dir; do
-    if test "$libclang_lib" = NO; then
-      for j in $libclang_lib_name; do
-        if test -f "$i/$j"; then
-          libclang_lib="$i/$j"
-          if test "$f_libclangstatic" = NO; then
-            libclang_link="-L $i -lclang"
-          else
-            libclang_link="$i/libclang.a $i/libclangFrontend.a $i/libclangSerialization.a $i/libclangParse.a $i/libclangSema.a $i/libclangAnalysis.a $i/libclangStaticAnalyzerCore.a $i/libclangAST.a $i/libclangBasic.a $i/libclangDriver.a $i/libclangEdit.a $i/libclangLex.a $i/libclangRewriteCore.a $i/libLLVMBitReader.a $i/libLLVMMC.a $i/libLLVMMCParser.a $i/libLLVMSupport.a -ldl -lpthread"
-          fi
-          break
-        fi
-      done
-    fi
-  done
-  if test "$libclang_hdr" = NO -o "$libclang_lib" = NO; then
-    echo "not found!";
-  else
-    echo "using header $libclang_hdr and library $libclang_lib...";
-  fi
-fi
-
-# - check for python ----------------------------------------------------------
-
-python_version=0
-printf "  Checking for python... "
-if test "$f_python" = NO; then
-  python_names="python3 python2 python"
-  python_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
-  python_prog=NO
-  python_found=NO
-  for i in $python_names; do
-    for j in $python_dirs; do
-      if test -x "$j/$i"; then
-        python_found=YES
-        if test `$j/$i -c "import sys; print(sys.version_info[0])"` = 3; then
-          python_prog="$j/$i";
-          python_version=`$j/$i -c "import platform; print(platform.python_version())"`;
-          break 2
-        elif test `$j/$i -c "import sys; print(sys.version_info[0])"` = 2; then
-          if test `$j/$i -c "import sys; print(sys.version_info[1])"` -ge 6; then
-            python_prog="$j/$i";
-            python_version=`$j/$i -c "import platform; print(platform.python_version())"`;
-            break 2
-          fi
-        fi
-      fi
-    done
-  done
-  f_python="$python_prog"
-fi
-
-if test "$f_python" = NO; then
-  if test "$python_found" = YES; then
-    echo "version should be python 2.6 or higher."
-  else
-    echo "not found!";
-  fi
-  echo
-  exit 2
-fi
-echo "using $f_python (version $python_version)";
-
-# - check for perl ------------------------------------------------------------
-
-printf "  Checking for perl... "
-if test "$f_perl" = NO; then
-  perl_names="perl perl5"
-  perl_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
-  perl_prog=NO
-  perl_found=NO
-  for i in $perl_names; do
-    for j in $perl_dirs; do
-      if test -x "$j/$i"; then
-        perl_found=YES
-        if $j/$i -e 'require 5.000;' 2>/dev/null ; then
-          perl_prog="$j/$i"
-          break 2
-        fi
-      fi
-    done
-  done
-  f_perl="$perl_prog" 
-fi
-
-if test "$f_perl" = NO; then
-  if test "$perl_found" = YES; then
-    echo "version is too old (5.000 or higher is required)."
-  else
-    echo "not found!";
-  fi
-  echo
-  exit 2
-fi
-echo "using $f_perl";
-
-# - check for flex ------------------------------------------------------------
-
-printf "  Checking for flex... "
-if test "$f_flex" = NO; then
-  flex_dirs="$bin_dirs /usr/bin /usr/local/bin /bin"
-  flex_prog=NO
-  flex_found=NO
-  for j in $flex_dirs; do
-    if test -x "$j/flex"; then
-      flex_found=YES
-      flex_prog="$j/flex"
-      break
-    fi
-  done
-  f_flex="$flex_prog" 
-fi
-
-if test "$f_flex" = NO; then
-  echo "not found!";
-  exit 2
-else
-  echo "using $f_flex"
-fi
-
-# - check for bison ------------------------------------------------------------
-
-printf "  Checking for bison... "
-if test "$f_bison" = NO; then
-  bison_dirs="$bin_dirs /usr/bin /usr/local/bin /bin"
-  bison_prog=NO
-  bison_found=NO
-  for j in $bison_dirs; do
-    if test -x "$j/bison"; then
-      bison_found=YES
-      bison_prog="$j/bison"
-      break
-    fi
-  done
-  f_bison="$bison_prog" 
-fi
-
-if test "$f_bison" = NO; then
-  echo "not found!";
-  exit 2
-else
-  echo "using $f_bison"
-fi
-
-# -----------------------------------------------------------------------------
-
-if test '!' -d "generated_src/doxygen"; then
-  mkdir -p generated_src/doxygen
-fi
-if test "$f_wizard" = YES; then
-  if test '!' -d "generated_src/doxywizard"; then
-    mkdir -p generated_src/doxywizard
-  fi
-fi
-
-#
-# Make VERSION file
-#
-test -f "VERSION" && chmod u+w VERSION
-test -f "generated_src/doxygen/version.cpp" && chmod u+w generated_src/doxygen/version.cpp
-echo "  Generating generated_src/doxygen/version.cpp and VERSION..."
-cd src
-$f_python version.py ../generated_src/doxygen
-cd ..
-if test "$f_wizard" = YES; then
-  test -f "VERSION" && chmod u+w VERSION
-  test -f "generated_src/doxywizard/version.cpp" && chmod u+w generated_src/doxywizard/version.cpp
-  echo "  Generating generated_src/doxywizard/version.cpp and VERSION..."
-  cd src
-  $f_python version.py ../generated_src/doxywizard
-  cd ..
-
-fi
-
-test -f .makeconfig && rm .makeconfig
-test -f .tmakeconfig && rm .tmakeconfig
-
-configPWD=`pwd`
-
-cat > .makeconfig <<EOF
-DOXYGEN   = $configPWD
-TMAKEPATH = $configPWD/tmake/lib/$f_platform
-ENV       = env TMAKEPATH="\$(TMAKEPATH)"
-TMAKE     = $configPWD/tmake/bin/tmake
-MAKE      = $f_make
-PYTHON    = $f_python
-PERL      = $f_perl
-LEX       = $f_flex
-RM        = rm -f
-CP        = cp
-VERSION   = `cat VERSION`
-INSTALL   = $f_prefix
-INSTTOOL  = $f_insttool
-DOXYDOCS  = ..
-DOCDIR    = $f_docdir
-QTDIR     = $QTDIR
-EOF
-
-if test "$f_dot" != NO; then
-  cat >> .makeconfig <<EOF
-HAVE_DOT  = $f_dot
-EOF
-fi
-
-
-if test "$f_platform" = "m68k-atari-mint-g++"; then
-  cat >> .makeconfig <<EOF
-TMAKE += -unix
-EOF
-fi
-
-if test "$f_platform" = "macosx-c++"; then
-  cat >> .makeconfig <<EOF
-MKSPECS   = -spec macx-g++
-EOF
-fi
-if test "$f_platform" = "macosx-uni-c++"; then
-  cat >> .makeconfig <<EOF
-MKSPECS   = -spec macx-g++
-EOF
-fi
-
-# Make doxygen.spec...
-#
-echo "  Created doxygen.spec file, for rpm generation."
-
-echo "%define version $doxygen_version_major.$doxygen_version_minor.$doxygen_version_revision" > spec.tmp
-if test "$doxygen_version_mmn" = NO; then
-  echo "%define revision 1" >> spec.tmp
-  echo "%define mmn 1"      >> spec.tmp
-else
-  echo "%define revision $doxygen_version_mmn" >> spec.tmp
-  echo "%define mmn $doxygen_version_mmn"      >> spec.tmp
-fi
-
-mkdir -p packages
-mkdir -p packages/rpm
-
-cat spec.tmp ./packages/rpm/doxygen.spec.in > ./packages/rpm/doxygen.spec
-
-rm -f spec.tmp
-
-
-# make .tmakeconfig
-#
-touch .tmakeconfig
-if test "$f_shared" = NO; then
-  if test "$f_platform" = "osf1-cxx" -o "$f_platform" = "irix-n32"; then
-  cat >> .tmakeconfig <<EOF
-    TMAKE_LFLAGS += -non_shared
-EOF
-  elif test "$f_platform" = "solaris-cc"; then
-  cat >> .tmakeconfig <<EOF
-    TMAKE_LFLAGS += -Bstatic
-EOF
-  elif test "$f_platform" = "hpux-cc"; then
-  cat >> .tmakeconfig <<EOF
-    TMAKE_LFLAGS += -noshared
-EOF
-  else
-  cat >> .tmakeconfig <<EOF
-    TMAKE_LFLAGS += -static
-EOF
-  fi
-fi
-if test "$f_platform" = "hpux-g++" -o "$f_platform" = "linux-g++"; then
-  cat >> .tmakeconfig <<EOF
-    TMAKE_CXXFLAGS += -D_LARGEFILE_SOURCE
-EOF
-fi
-if test "$f_platform" = "macosx-uni-c++"; then
-  if test -n "`ls /Developer/SDKs/MacOSX10.*.sdk 2>/dev/null`"; then
-    mac_sdk=MacOSX10.4u.sdk
-  fi
-  if test -n "`ls /Developer/SDKs/MacOSX10.5*.sdk 2>/dev/null`"; 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
-EOF
-fi
-
-if test "$f_search" = YES; then
-  cat >> .tmakeconfig <<EOF
-LIBS += -L$XAPIAN/lib
-INCLUDEPATH += $XAPIAN/include
-EOF
-fi
-
-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in vhdlparser/Makefile.in"
-
-for i in $f_inmakefiles ; do
-     SRC=$i
-     DST=`echo $i|sed 's%\(.*\).in$%\1%'`
-     TIME=`date`
-     cat > $DST <<EOF
-#
-# This file was generated from `basename $i` on $TIME
-#
-
-EOF
-     cat .makeconfig >> $DST
-     if test $i = Makefile.in; then
-       echo "" >> $DST
-       EXTRADEPS=
-       if test $f_wizard = YES; then
-         EXTRADEPS=doxywizard
-       fi
-#       if test $f_search = YES; then
-#         EXTRADEPS="$EXTRADEPS doxysearch"
-#       fi
-       echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST
-       echo "	\$(MAKE) -C qtools" >> $DST
-       echo "	\$(MAKE) -C libmd5" >> $DST
-       echo "	\$(MAKE) -C vhdlparser" >> $DST
-       echo "	\$(MAKE) -C src" >> $DST
-
-       if test $f_wizard = YES; then
-         echo "	\$(MAKE) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard" >> $DST
-       fi
-       if test $f_search = YES; then
-         echo "	\$(MAKE) -C addon/doxysearch" >> $DST
-       fi
-       if test $f_app = YES; then
-         echo "	\$(MAKE) -C addon/doxyapp" >> $DST
-       fi
-       if test $f_doxmlparser = YES; then
-         echo "	\$(MAKE) -C addon/doxmlparser/src" >> $DST
-         echo "	\$(MAKE) -C addon/doxmlparser/test" >> $DST
-         echo "	\$(MAKE) -C addon/doxmlparser/examples/metrics" >> $DST
-       fi
-       echo "" >> $DST
-       echo "doxywizard_install:" >> $DST
-       if test $f_wizard = YES; then
-         echo "	\$(MAKE) INSTALL=\$(DESTDIR)\$(INSTALL) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard install" >> $DST
-       fi
-       echo "doxysearch_install:" >> $DST
-       if test $f_search = YES; then
-         echo "	\$(MAKE) INSTALL=\$(DESTDIR)\$(INSTALL) MAN1DIR=\$(MAN1DIR) -C addon/doxysearch install" >> $DST
-       fi
-       echo "" >> $DST
-     fi
-     if test $f_wizard = YES; then
-       sed -e "s/%%WITHDOXYWIZARD%% /--with doxywizard /g" $SRC >> $DST
-     else
-       sed -e "s/%%WITHDOXYWIZARD%% //g" $SRC >> $DST
-     fi
-     echo "  Created $DST from $SRC..."
-done
-
-cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxycfg.t
-cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxygen.t
-
-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in vhdlparser/vhdlparser.pro.in"
-
-for i in $f_inprofiles ; do
-     SRC=$i
-     DST=`echo $i|sed 's%\(.*\).in$%\1%'`
-     TIME=`date`
-     cat > $DST <<EOF
-#
-# This file was generated from `basename $i` on $TIME
-#
-
-EOF
-     if test "$f_debug" = NO; then
-       realopts="release"
-     else
-       realopts="debug"
-     fi
-     #if test "$f_thread" = YES; then
-     #  realopts="$realopts thread"
-     #fi
-     cat $SRC .tmakeconfig | sed -e "s/\$extraopts/$realopts/g" -e "s;%%SQLITE3_INC%%;$sqlite3_hdr_dir;g" -e "s;%%SQLITE3_LIBS%%;$sqlite3_link;g" -e "s;%%LIBCLANG_INC%%;$libclang_hdr_dir;g" -e "s;%%LIBCLANG_LIBS%%;$libclang_link;g" >> $DST
-     echo "  Created $DST from $SRC..."
-done
-
-# - generating generated_src/doxygen/doxygen/lang_cfg.h 
-# use consistent method on Linux and Windows
-
-if test -f "generated_src/doxygen/lang_cfg.h"; then
-    chmod u+w generated_src/doxygen/lang_cfg.h   # make sure file can be overwritten
-fi
-echo "  Generating generated_src/doxygen/lang_cfg.h..."
-if test "$f_english" = YES; then
-   $f_python src/lang_cfg.py ENONLY > generated_src/doxygen/lang_cfg.h
-else
-   f_ulangs=`echo $f_langs | tr '[a-z]' '[A-Z]' | tr ',' ' '`
-   $f_python src/lang_cfg.py $f_ulangs > generated_src/doxygen/lang_cfg.h
-fi
-
-if test -f "generated_src/doxygen/settings.h"; then
-    chmod u+w generated_src/doxygen/settings.h
-fi
-echo "  Generating generated_src/doxygen/settings.h..."
-$f_python src/settings.py $f_sqlite3 $f_libclang generated_src/doxygen
-
-if test "$f_wizard" = YES; then
-  if test -f "generated_src/doxywizard/settings.h"; then
-      chmod u+w generated_src/doxywizard/settings.h
-  fi
-  echo "  Generating generated_src/doxywizard/settings.h..."
-  $f_python src/settings.py $f_sqlite3 $f_libclang generated_src/doxywizard
-fi
-
-cd ..
-echo "  Finished"
diff --git a/configure.bin b/configure.bin
deleted file mode 100755
index dbc21c6..0000000
--- a/configure.bin
+++ /dev/null
@@ -1,118 +0,0 @@
-#! /bin/sh
-#
-# $Id: configure,v 1.1 1999/07/19 17:00:15 root Exp $
-#
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
-# 
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby 
-# granted. No representations are made about the suitability of this software 
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-# 
-# Documents produced by Doxygen are derivative works derived from the
-# input used in their production; they are not affected by this license.
-# 
-# shell script to configure doxygen (use for binary releases)
-
-f_prefix=/usr/local
-f_insttool=NO
-
-while test -n "$1"; do
-  case $1 in
-    --prefix)
-       shift; f_prefix=$1
-       ;;
-    --install)
-       shift; f_insttool=$1
-       ;;
-    -h | -help | --help)
-       f_help=y
-       ;;
-    *)
-       echo $1: unknown argument
-       f_help=y
-       f_error=y
-       ;;
-  esac
-  shift
-done
-
-if test "$f_help" = y; then
-  cat <<EOF
-Usage: $0 [--help] [--prefix dir] [--install name]
-
-Options: 
-
-  --help                Print this help
-
-  --prefix dir          Installation prefix directory
-                        [default: /usr/local]
-  
-  --install name        Use \`name' as the name of the GNU install tool
-                        [default: install]
-
-EOF
-  test "$f_error" = y && exit 1
-  exit 0;
-fi
-
-# - check for install ------------------------------------------------------------
-
-echo -n "  Checking for GNU install tool... "
-if test "$f_insttool" = NO; then
-  install_names="ginstall install"
-  install_dirs="/usr/bin /usr/local/bin /bin /sbin $bin_dirs"
-  install_prog=NO
-  install_found=NO
-  for i in $install_names; do
-    for j in $install_dirs; do
-      if test -x "$j/$i"; then
-        if test -n "`$j/$i --version 2>/dev/null | grep utils`"; then
-          install_found=YES
-          install_prog="$j/$i"
-          break 2
-        fi
-      fi
-    done
-  done
-  f_insttool="$install_prog" 
-fi
-
-if test "$f_insttool" = NO; then
-  if test "$install_found" = YES; then
-    echo "GNU version of install is required!"
-  else
-    echo "not found!";
-  fi
-  echo
-  exit 2
-fi
-echo "using $f_insttool";
-
-# ----------------------------------------------------------
-
-
-cat > .makeconfig <<EOF
-RM        = rm -f
-VERSION   = `cat VERSION`
-INSTALL   = $f_prefix
-INSTTOOL  = $f_insttool
-DOXYDOCS  = ..
-
-export TMAKEPATH
-EOF
-
-for i in Makefile.in ; do
-     SRC=$i
-     DST=`echo $i|sed 's%\(.*\).in$%\1%'`
-     TIME=`date`
-     cat > $DST <<EOF
-#
-# This file was generated from `basename $i` on $TIME
-#
-
-EOF
-     cat .makeconfig $SRC >> $DST
-     echo "  Created $DST from $SRC..."
-done
diff --git a/doc/.gitignore b/doc/.gitignore
index a464770..d1d1371 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1 +1,2 @@
-mailto.txt
\ No newline at end of file
+*.bak
+mailto.txt
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 0000000..af557d8
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,104 @@
+if (build_doc)
+
+find_program(EPSTOPDF NAMES epstopdf )
+find_program(SED NAMES sed )
+find_program(MAKE NAMES make gmake nmake )
+
+file(GLOB DOC_FILES "*")
+file(GLOB LANG_FILES "${CMAKE_SOURCE_DIR}/src/translator_??.h")
+
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/man)
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/src)
+file(COPY ${CMAKE_SOURCE_DIR}/src/translator.h DESTINATION ${PROJECT_BINARY_DIR}/src)
+file(COPY ${CMAKE_SOURCE_DIR}/src/translator_adapter.h DESTINATION ${PROJECT_BINARY_DIR}/src)
+file(COPY ${LANG_FILES} DESTINATION ${PROJECT_BINARY_DIR}/src)
+file(COPY ${CMAKE_SOURCE_DIR}/VERSION DESTINATION ${PROJECT_BINARY_DIR})
+
+# copy all doc files
+add_custom_target(copy_docs)
+foreach(doc_file ${DOC_FILES})
+  add_custom_command(TARGET copy_docs PRE_BUILD
+                     COMMAND ${CMAKE_COMMAND} -E
+                         copy ${doc_file} ${DOXYDOCS})
+endforeach()
+
+add_custom_target(docs
+	COMMENT "Generating documentation in ${DOXYDOCS}"
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen
+	COMMAND ${CMAKE_COMMAND} -E remove_directory ../latex/refman.tex
+	COMMAND ${CMAKE_COMMAND} -E copy doxygen_logo.gif ../html
+	COMMAND ${CMAKE_COMMAND} -E copy doxygen_logo_low.gif ../html
+	COMMAND ${CMAKE_COMMAND} -E copy Makefile.latex ../latex/Makefile
+	COMMAND ${SED} -e "s/\$VERSION/${VERSION}/g" doxygen_manual.tex > ../latex/doxygen_manual.tex
+	COMMAND ${SED} -e "s/\$VERSION/${VERSION}/g" doxygen.sty > ../latex/doxygen.sty
+	COMMAND ${EPSTOPDF} doxygen_logo.eps --outfile=../latex/doxygen_logo.pdf
+        COMMAND ${MAKE} -C ../latex > latex_out.txt
+	DEPENDS doxygen copy_docs ${PROJECT_BINARY_DIR}/doc/language.doc config.doc examples
+                "${PROJECT_BINARY_DIR}/man/doxygen.1"
+                "${PROJECT_BINARY_DIR}/man/doxywizard.1"
+                "${PROJECT_BINARY_DIR}/man/doxysearch.1"
+                "${PROJECT_BINARY_DIR}/man/doxyindexer.1"
+	WORKING_DIRECTORY ${DOXYDOCS}
+	VERBATIM
+	)
+
+# language.doc
+add_custom_command(
+        COMMAND ${CMAKE_COMMAND} "-DSOURCE=${CMAKE_SOURCE_DIR}" -P ${CMAKE_SOURCE_DIR}/cmake/run_translator.cmake
+	DEPENDS ${DOXYDOCS}/translator.py
+	DEPENDS maintainers.txt language.tpl translator.py
+	OUTPUT ${PROJECT_BINARY_DIR}/doc/language.doc
+	WORKING_DIRECTORY ${DOXYDOCS}
+)
+set_source_files_properties(${DOXYDOCS}/language.doc PROPERTIES GENERATED 1)
+
+# config.doc
+add_custom_command(
+	COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -doc ${CMAKE_SOURCE_DIR}/src/config.xml > config.doc
+	DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py
+	OUTPUT config.doc
+	WORKING_DIRECTORY ${DOXYDOCS}
+)
+set_source_files_properties(${DOXYDOCS}/config.doc PROPERTIES GENERATED 1)
+
+string(TIMESTAMP TODAY "%d-%m-%Y")
+
+add_custom_command(
+	COMMAND ${SED} -e "s/DATE/${TODAY}/g" -e "s/VERSION/${VERSION}/g" doxygen.1 > "${PROJECT_BINARY_DIR}/man/doxygen.1"
+        OUTPUT "${PROJECT_BINARY_DIR}/man/doxygen.1"
+)
+
+add_custom_command(
+	COMMAND ${SED} -e "s/DATE/${TODAY}/g" -e "s/VERSION/${VERSION}/g" doxywizard.1 > "${PROJECT_BINARY_DIR}/man/doxywizard.1"
+        OUTPUT "${PROJECT_BINARY_DIR}/man/doxywizard.1"
+)
+
+add_custom_command(
+	COMMAND ${SED} -e "s/DATE/${TODAY}/g" -e "s/VERSION/${VERSION}/g" doxysearch.1 > "${PROJECT_BINARY_DIR}/man/doxysearch.1"
+        OUTPUT "${PROJECT_BINARY_DIR}/man/doxysearch.1"
+)
+
+add_custom_command(
+	COMMAND ${SED} -e "s/DATE/${TODAY}/g" -e "s/VERSION/${VERSION}/g" doxyindexer.1 > "${PROJECT_BINARY_DIR}/man/doxyindexer.1"
+        OUTPUT "${PROJECT_BINARY_DIR}/man/doxyindexer.1"
+)
+
+install(FILES
+        "${PROJECT_BINARY_DIR}/man/doxygen.1"
+        "${PROJECT_BINARY_DIR}/man/doxywizard.1"
+        "${PROJECT_BINARY_DIR}/man/doxysearch.1"
+        "${PROJECT_BINARY_DIR}/man/doxyindexer.1"
+        DESTINATION man/man1
+)
+
+install(FILES
+        "${PROJECT_BINARY_DIR}/latex/doxygen_manual.pdf"
+        DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
+)
+
+install(DIRECTORY
+        "${PROJECT_BINARY_DIR}/html"
+        DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
+)
+
+endif()
diff --git a/doc/Doxyfile b/doc/Doxyfile
index c57bbe9..ab97227 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -53,3 +53,4 @@ STRIP_CODE_COMMENTS = NO
 HTML_STYLESHEET   = doxygen_manual.css
 ALIASES           = LaTeX="\f$\mbox{\LaTeX}\f$"
 ALIASES          += TeX="\f$\mbox{\TeX}\f$"
+LATEX_BATCHMODE   = YES
diff --git a/doc/Makefile.in b/doc/Makefile.in
deleted file mode 100644
index f0c3a03..0000000
--- a/doc/Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 
-#
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby 
-# granted. No representations are made about the suitability of this software 
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-#
-# Documents produced by Doxygen are derivative works derived from the
-# input used in their production; they are not affected by this license.
-
-all: language config.doc FORCE
-	DOXYGEN_DOCDIR=$(DOXYDOCS); \
-	export DOXYGEN_DOCDIR; \
-        VERSION=$(VERSION) ; \
-	export VERSION; \
-	"$(DOXYGEN)/bin/doxygen"
-	@rm -f ../latex/refman.tex
-	@cp doxygen_logo*.gif ../html
-	@cp Makefile.latex ../latex/Makefile
-	@sed -e "s/\$$VERSION/$(VERSION)/g" doxygen_manual.tex >../latex/doxygen_manual.tex
-	@sed -e "s/\$$VERSION/$(VERSION)/g" doxygen.sty >../latex/doxygen.sty 
-	@epstopdf doxygen_logo.eps --outfile=../latex/doxygen_logo.pdf
-
-clean: 
-	rm -rf ../html ../latex *.bak 
-
-language: language.doc 
-
-language.doc: $(wildcard ../src/translator*.h) maintainers.txt language.tpl translator.py
-	$(PYTHON) translator.py
-
-config.doc:  ../src/config.xml ../src/configgen.py
-	$(PYTHON) ../src/configgen.py -doc ../src/config.xml > config.doc
-
-FORCE:
diff --git a/doc/Makefile.latex b/doc/Makefile.latex
index 803b75d..d4b48ff 100644
--- a/doc/Makefile.latex
+++ b/doc/Makefile.latex
@@ -1,7 +1,7 @@
 #
 # 
 #
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
+# Copyright (C) 1997-2015 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 
diff --git a/doc/Makefile.win_make.in b/doc/Makefile.win_make.in
deleted file mode 100644
index 1d22dbf..0000000
--- a/doc/Makefile.win_make.in
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# 
-#
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby 
-# granted. No representations are made about the suitability of this software 
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-#
-# Documents produced by Doxygen are derivative works derived from the
-# input used in their production; they are not affected by this license.
-
-all: language config.doc FORCE
-	@xcopy /s /q /i ..\examples ..\html\examples
-	set DOXYGEN_DOCDIR=. & \
-	set VERSION=$(VERSION) & \
-	$(DOXYGEN)\bin\doxygen
-	@del ..\latex\refman.tex
-	@copy doxygen_logo*.gif ..\html
-	@copy Makefile.latex ..\latex\Makefile
-	@sed -e "s/\$$VERSION/$(VERSION)/g" doxygen_manual.tex >..\latex\doxygen_manual.tex
-	@sed -e "s/\$$VERSION/$(VERSION)/g" doxygen.sty >..\latex\doxygen.sty 
-	@epstopdf doxygen_logo.eps --outfile=..\latex\doxygen_logo.pdf
-
-clean: 
-	del /s /q ..\html ..\latex
-	del translator_report.txt *.bak
-
-language: language.doc
-
-language.doc: maintainers.txt language.tpl translator.py
-	set DOXYGEN_DOCDIR=. & set VERSION=$(VERSION) & python translator.py
-
-config.doc:  ..\src\config.xml ..\src\configgen.py
-	python ..\src\configgen.py -doc ..\src\config.xml > config.doc
-
-
-FORCE:
diff --git a/doc/Makefile.win_nmake.in b/doc/Makefile.win_nmake.in
deleted file mode 100644
index 99ac2f1..0000000
--- a/doc/Makefile.win_nmake.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# 
-#
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby 
-# granted. No representations are made about the suitability of this software 
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-#
-# Documents produced by Doxygen are derivative works derived from the
-# input used in their production; they are not affected by this license.
-
-all: language config.doc FORCE
-	@xcopy /s /q /i ..\examples ..\html\examples
-	set DOXYGEN_DOCDIR=.
-	set VERSION=$(VERSION)
-	$(DOXYGEN)\bin\doxygen
-	@del ..\latex\refman.tex
-	@copy doxygen_logo*.gif ..\html
-	@copy Makefile.latex ..\latex\Makefile
-	@sed -e "s/\$$VERSION/$(VERSION)/g" doxygen_manual.tex >..\latex\doxygen_manual.tex
-	@sed -e "s/\$$VERSION/$(VERSION)/g" doxygen.sty >..\latex\doxygen.sty 
-	@epstopdf doxygen_logo.eps --outfile=..\latex\doxygen_logo.pdf
-
-clean: 
-	del /s /q ..\html ..\latex
-	del translator_report.txt *.bak
-
-language: language.doc 
-
-language.doc: maintainers.txt language.tpl translator.py
-	set DOXYGEN_DOCDIR=.
-	set VERSION=$(VERSION)
-	python translator.py
-
-config.doc:  ../src/config.xml ../src/configgen.py
-	python ../src/configgen.py -doc ../src/config.xml > config.doc
-
-FORCE:
diff --git a/doc/arch.doc b/doc/arch.doc
index fc80659..95cb270 100644
--- a/doc/arch.doc
+++ b/doc/arch.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/doc/autolink.doc b/doc/autolink.doc
index b872f7d..9e0d35a 100644
--- a/doc/autolink.doc
+++ b/doc/autolink.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -112,7 +112,7 @@
   \par Example:
   \verbinclude autolink.cpp
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/autolink/html/index.html">here</a> 
+  Click <a href="examples/autolink/html/index.html">here</a> 
   for the corresponding HTML documentation that is generated by Doxygen.
   \endhtmlonly
 
@@ -128,7 +128,7 @@ typedef struct StructName TypeName
   \par Example:
   \verbinclude restypedef.cpp
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/restypedef/html/restypedef_8cpp.html">here</a> 
+  Click <a href="examples/restypedef/html/restypedef_8cpp.html">here</a> 
   for the corresponding HTML documentation that is generated by Doxygen.
   \endhtmlonly
 
diff --git a/doc/changelog.doc b/doc/changelog.doc
index 4810633..a2c540a 100644
--- a/doc/changelog.doc
+++ b/doc/changelog.doc
@@ -2,6 +2,181 @@
 \tableofcontents
 \section log_1_8 1.8 Series
 
+\subsection log_1_8_10 Release 1.8.10
+\htmlonly
+<b>(release date 27-06-2015)</b>
+<a name="1.8.10"></a>
+<ul>
+<li>change the build system to use cmake [<a href="http://github.com/doxygen/doxygen/commit/2e099b1950eee2c3a0d5d8ae4b25575caeb938b1">view</a>],
+[<a href="http://github.com/doxygen/doxygen/commit/ba9bb02abf6f6922a83beb2092e7bc270e6f25c1">view</a>],
+[<a href="http://github.com/doxygen/doxygen/commit/635d8cf30e702bdf83fe5c96452f8f863d57bdee">view</a>],
+[<a href="http://github.com/doxygen/doxygen/commit/51ee91560a9cbaac41cec536dcdeb3e4c32f139a">view</a>],
+[<a href="http://github.com/doxygen/doxygen/commit/e775357ae71ecbf02dc93913a923567f31b03681">view</a>],
+[<a href="http://github.com/doxygen/doxygen/commit/a0cd6a8e0c19a82e9662f96734c7ba21726794d0">view</a>],
+[<a href="http://github.com/doxygen/doxygen/commit/0dc4eda500e803a65a10445719c97d7e523897da">view</a>],
+[<a href="http://github.com/doxygen/doxygen/commit/22c0d75d45354979392db5db4e3195570c394e44">view</a>]</li>
+<li>Add support for basic XML syntax highlighting. [<a href="http://github.com/doxygen/doxygen/commit/a418518921ba7a99c7221ba7f40d2e791cb207c4">view</a>]</li>
+<li>Added documentation for ``` style fenced code block and more robust parsing [<a href="http://github.com/doxygen/doxygen/commit/39ba42c3b21d08ec606eee18ee8b64c67ec6a42a">view</a>]</li>
+<li>Added function arguments to the LaTeX toc [<a href="http://github.com/doxygen/doxygen/commit/f5e70723391bacc2d68c19d367ab414e70f786b4">view</a>]</li>
+<li>Added missing files and build instructions [<a href="http://github.com/doxygen/doxygen/commit/39228176c052fd293382dc9bc9b4b69b2a6af277">view</a>]</li>
+<li>Added missing libraries for building doxysearch on Windows [<a href="http://github.com/doxygen/doxygen/commit/84d94779e76681b63cdcbc362bbe0341cd39064d">view</a>]</li>
+<li>Added support for language codes [<a href="http://github.com/doxygen/doxygen/commit/eae07d978b524c787daeab911ca087b47a964577">view</a>]</li>
+<li>Added type constraint relations for Java generics to dot graphs and XML output [<a href="http://github.com/doxygen/doxygen/commit/080a465b1321ff93c05ce398cd18a577e0ebae4b">view</a>]</li>
+<li>Adding commands \hidecallgraph and \hidecallergraph [<a href="http://github.com/doxygen/doxygen/commit/073e9482a516c24a3d045da049941bfd432f3354">view</a>]</li>
+<li>Adjust test script for longer version number [<a href="http://github.com/doxygen/doxygen/commit/c7622971ee485279e8da7634207340ce18b69aaa">view</a>]</li>
+<li>Adjusted version in configure script [<a href="http://github.com/doxygen/doxygen/commit/cbd3fa183815191ac5f172a2bac62991642c0b5e">view</a>]</li>
+<li>Alignment of project name [<a href="http://github.com/doxygen/doxygen/commit/e7b356d2cb9320a363ac024d39b468e98b223b90">view</a>]</li>
+<li>Allow selection of specific translators to compile in at build time [<a href="http://github.com/doxygen/doxygen/commit/faef77a87cecd703e3629a35d2e22efb07e682a0">view</a>]</li>
+<li>Based on the report of Peter D. Barnes in the doxygen forum (http://doxygen.10944.n7.nabble.com/doxygen-1-8-9-1-upgrade-errors-td6990.html) [<a href="http://github.com/doxygen/doxygen/commit/9771b807cd776b37f6538dec085442218a5b6a09">view</a>]</li>
+<li>Better error message in case of IDL inconsistency [<a href="http://github.com/doxygen/doxygen/commit/a7eef85a89d8772b7ab97a4ba378cc7e78c988cc">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=659590">659590</a> - EXTRA_PACKAGES can&#39;t handle package options [<a href="http://github.com/doxygen/doxygen/commit/1c47dd436358ffc7bc76901cddc559b2d8ce233d">view</a>],
+[<a href="http://github.com/doxygen/doxygen/commit/ad53cbab6474e11692f2ca1018a821d042df28e6">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=739680">739680</a> - Using HTML entities in PROJECT_NAME [<a href="http://github.com/doxygen/doxygen/commit/8e44571521391403e8d85f893acb926e021e926b">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=742095">742095</a> - Missing documentation after nested C++11 unified initializer [<a href="http://github.com/doxygen/doxygen/commit/c1789f2e5d8421d6028c836ab66afecacff284ef">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=742151">742151</a> - Bogus warning: citelist: Unexpected new line character [<a href="http://github.com/doxygen/doxygen/commit/5c321cbb6359bc1bb875729c08beba2edc084500">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=742230">742230</a> - @todo paragraphs incorrectly placed in rtf output [<a href="http://github.com/doxygen/doxygen/commit/600d5859d7bcb94b08ef656fd427914766ae9afe">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=742235">742235</a> - Bogus message with addtogroup [<a href="http://github.com/doxygen/doxygen/commit/b75af9180ae53f7c7abb94ccf906333169247785">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=742408">742408</a> - Configuring doxyfile to only output docbook produces erroneous warning [<a href="http://github.com/doxygen/doxygen/commit/05fcf8decc25bd2f1a2e7867ee8e5d9da1f08933">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=742427">742427</a> - latex compilation: \backmatter incompatible with COMPACT_LATEX=YES [<a href="http://github.com/doxygen/doxygen/commit/c9067c5bb9a1868e0963dc210cf3b7152c4aa79a">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=742445">742445</a> - Wrong icons in TOC of CHM help [<a href="http://github.com/doxygen/doxygen/commit/8c97e0cd63bcf942ee5b43c9471055a4ea27551c">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=742899">742899</a> - &lt;CAPTION&gt; inside &lt;TABLE&gt; no longer works for LaTex output [<a href="http://github.com/doxygen/doxygen/commit/0599f92d06ff433446f34136ffe2f3d65d6bd109">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=743604">743604</a> - Duplicate anchors from tagfiles [<a href="http://github.com/doxygen/doxygen/commit/1f21c23c57c91ba6901c0de38bb236f7246e88c9">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=743605">743605</a> - Tagfile anchors not generated for enumeration values [<a href="http://github.com/doxygen/doxygen/commit/1d4f37cb13a75ca8bdc49be3558438104e7eef19">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=743675">743675</a> - Non-ascii characters are not emphasised [<a href="http://github.com/doxygen/doxygen/commit/8f67d4f63efd45b0d38502bdf68987d7fc1e92e9">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=744762">744762</a> - Using TAGFILES prevents symbol extraction [<a href="http://github.com/doxygen/doxygen/commit/a735498be5a572236755cc3da65bf4774cbac25c">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=745439">745439</a> - PATCH: please consider making doxygen output byte for byte identical between individual runs by default [<a href="http://github.com/doxygen/doxygen/commit/3f2e8a3067712b025623e4420e6eb161febfd42b">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=745481">745481</a> - Doxygen generates bad &quot;More...&quot; file links for functions within a namespace [<a href="http://github.com/doxygen/doxygen/commit/ea202be55d68af33917658e3fec169da3a7fa7a8">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=745870">745870</a> - [PATCH] QT4&#39;s qmake is titled differently on Fedora 21 [<a href="http://github.com/doxygen/doxygen/commit/3bd3ad9f8f4d010e42f0ba8eeab229f44b1ecb1c">view</a>],
+[<a href="http://github.com/doxygen/doxygen/commit/a883f65ab94973d4c7948623186159f978517851">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=746226">746226</a> - last enum member not documented [<a href="http://github.com/doxygen/doxygen/commit/50a329c056a2676608f30321a3207ff17ab20abb">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=746417">746417</a> - Nested list in C# XML comments closes outer list prematurely [<a href="http://github.com/doxygen/doxygen/commit/2c679e7d39144dadef2e9fd25772f0e41586e18b">view</a>],
+[<a href="http://github.com/doxygen/doxygen/commit/7a0522fafde300f36c3d5264f46c1f70cf35b7b9">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=746614">746614</a> - Bogus warning regarding nested comments [<a href="http://github.com/doxygen/doxygen/commit/e4c0036962d8fa0ea9c1e38dbdb5e91168201f22">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=746619">746619</a> - Bogus warnings in case of anonymous namespace and @todo [<a href="http://github.com/doxygen/doxygen/commit/298ab30b2a2aa0936f4683c9366afd44c00adc60">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=746734">746734</a> - Don&#39;t warn about missing documentation for deleted functions. [<a href="http://github.com/doxygen/doxygen/commit/796d6585be58d1c9112422a919f49d1998dc672c">view</a>],
+[<a href="http://github.com/doxygen/doxygen/commit/ac576bd974ac27bc1f395e8ae6c77b19f800b6db">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=747111">747111</a> - Table of content incorrect with escaped symbols [<a href="http://github.com/doxygen/doxygen/commit/5cdf62661c88b5f0c135337da4d6e58581aad037">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=747780">747780</a> - man output should escape minus signs [<a href="http://github.com/doxygen/doxygen/commit/3608a668b3892eaa4f7b2e4b29b833ede24ceee7">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=748208">748208</a> - Bug #313527 regression - Enum in bitfield is not parsed properly. [<a href="http://github.com/doxygen/doxygen/commit/528bb8054ca362843630ec261ca6e6990a206081">view</a>],
+[<a href="http://github.com/doxygen/doxygen/commit/7b2d77abb73288bdd48ca04720fd6779e0bf94c2">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=750016">750016</a> - FILE_PATTERNS ignores arbitrary extensions [<a href="http://github.com/doxygen/doxygen/commit/52cb086da66533332962f2bf9cb35772e980c092">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=751455">751455</a> - class scoped enum documentation appearing at group level instead of class level [<a href="http://github.com/doxygen/doxygen/commit/e4a9d06d7871f24dd6e37ecac6addae729e6d721">view</a>]</li>
+<li>Build fixes for windows build [<a href="http://github.com/doxygen/doxygen/commit/5446770855a8286092abdd91d9069cb3191c209d">view</a>]</li>
+<li>Bump copyright year [<a href="http://github.com/doxygen/doxygen/commit/e11b48785323017bf1d81e91e8133d7f3ba1f243">view</a>]</li>
+<li>Bump version in configure script [<a href="http://github.com/doxygen/doxygen/commit/97342f92e111d7aa3e423a128379a6018820ce6c">view</a>]</li>
+<li>Cleanup &amp; adapt travis config [<a href="http://github.com/doxygen/doxygen/commit/5f67c67323bff27751ba07c417ba99180fa0d762">view</a>]</li>
+<li>Consistency in handling HTML and LaTeX in respect to header and footer [<a href="http://github.com/doxygen/doxygen/commit/be5cc75ffc2e0a95ecbf0ce8d918b070c276d3e5">view</a>]</li>
+<li>Correct string buffer sizes for RTF output, such that the string is always correctly sized. [<a href="http://github.com/doxygen/doxygen/commit/bc8e705cf90cecdff8a247264c249ffed1d2af4a">view</a>]</li>
+<li>Crash in case of non generic interface in Fortran [<a href="http://github.com/doxygen/doxygen/commit/7d3a2abf0137c5257eeb0a8e0f76381b79f1e7bb">view</a>]</li>
+<li>Documentation HTML Header, Footer, and Stylesheet changes [<a href="http://github.com/doxygen/doxygen/commit/1dded5c92a13f9db60fc630cbe5f2cc5ad9bede0">view</a>], [<a href="http://github.com/doxygen/doxygen/commit/478207365d7f09f0e676a76f654502c084806e4e">view</a>]</li>
+<li>Documenting RESULT variable of Fortran FUNCTION [<a href="http://github.com/doxygen/doxygen/commit/21f9e87db8085fb1b5e0a9a9a25dee159b3fd324">view</a>], [<a href="http://github.com/doxygen/doxygen/commit/4d52beec3760244d959ab4d5528aea1acba505e7">view</a>]</li>
+<li>Doxygen LaTeX / PDF links point to page 1 [<a href="http://github.com/doxygen/doxygen/commit/e34913dcbe0bee2c3e21d6e21b2bcc6970003a5c">view</a>]</li>
+<li>Enable relative paths referenced source files [<a href="http://github.com/doxygen/doxygen/commit/ed178335e8c123b58c4fee24766bceae0fc80aa2">view</a>]</li>
+<li>Escape &quot;@&quot; in names as it is not allowed in XML / Docbook names (comming from anon namespaces) [<a href="http://github.com/doxygen/doxygen/commit/65c35c435ae93d5f39c3ddec93008b2f544544ca">view</a>]</li>
+<li>Fix for bug 746673. [<a href="http://github.com/doxygen/doxygen/commit/effbbcc72295f5843377ddce2794bcf6e7000322">view</a>]</li>
+<li>Fix for building diagram example conditionally [<a href="http://github.com/doxygen/doxygen/commit/f415b624a6cf6b9e577ec6131a23cb4a0e830aaf">view</a>]</li>
+<li>Fix for issue 744670 [<a href="http://github.com/doxygen/doxygen/commit/0d684381ac40574f6a948c56eb2da0445c3ee3bf">view</a>]</li>
+<li>Fix for issue 744671 [<a href="http://github.com/doxygen/doxygen/commit/192f9e8bf78e10c9d97e08264b1c76c8aa4edf2b">view</a>]</li>
+<li>Fix for rendering the template parameters of members of variadic template classes. [<a href="http://github.com/doxygen/doxygen/commit/32093bcca82c7d3a4df4670f52340033e9f16b62">view</a>]</li>
+<li>Fix missing brief documentation for overload and specialization functions [<a href="http://github.com/doxygen/doxygen/commit/c604aef8a6465f38f8f04276194a66a4e044dc84">view</a>]</li>
+<li>Fix nesting of XML tag &quot;literallayout&quot; for docbook output of enums. [<a href="http://github.com/doxygen/doxygen/commit/3abac31c525e6cf6898a1e8deb5c73f2a2ff5a8a">view</a>]</li>
+<li>Fix parsing of ODL-style properties [<a href="http://github.com/doxygen/doxygen/commit/6a8bef8852eb22558b3559ebe96d9e06e6cadfa7">view</a>]</li>
+<li>Fix potential null pointer dereference in src/classdef.cpp [<a href="http://github.com/doxygen/doxygen/commit/5743848928ffaeccaaef24dac051aaa9acf2c4b7">view</a>]</li>
+<li>Fix potential null pointer dereference in src/context.cpp [<a href="http://github.com/doxygen/doxygen/commit/2690774f87b9fcb12b35153de82cde22248b3949">view</a>]</li>
+<li>Fixed a couple of cases where sharing string data could lead to corruption [<a href="http://github.com/doxygen/doxygen/commit/312bef563a5be72f6423377247db1b80044bf711">view</a>]</li>
+<li>Fixed code reachability bug found by coverity in translator_fi.h [<a href="http://github.com/doxygen/doxygen/commit/80d09775da9a99a3bc58704ffd055547c6b03043">view</a>]</li>
+<li>Fixed compilation issue on Windows [<a href="http://github.com/doxygen/doxygen/commit/d75455eef7c91f11c2b9061d9a086ce93c4231b2">view</a>]</li>
+<li>Fixed issue accessing uninitialized buffer under certain conditions. [<a href="http://github.com/doxygen/doxygen/commit/49f6c63aba4d77cd14fa205bee4bf427cefdaa44">view</a>]</li>
+<li>Fixed potential crash while generating dot graphs [<a href="http://github.com/doxygen/doxygen/commit/50f82c94b9bf1ff982f9ddd8b9a88fb91d9e0bec">view</a>]</li>
+<li>Fixed potential string buffer issue for dot graphs [<a href="http://github.com/doxygen/doxygen/commit/6b24aba8fce772d9e46e3174a655281eeb44ad84">view</a>]</li>
+<li>Fixed regression due to buffer resizing while generating RTF. [<a href="http://github.com/doxygen/doxygen/commit/a1f2872ef098cfcc526002b9c9d533da6f2775b5">view</a>]</li>
+<li>Fixed regression in argument processing [<a href="http://github.com/doxygen/doxygen/commit/ae8f618d140b4368045d286a682df3f6de7b2960">view</a>]</li>
+<li>Fixed type in printdocvisitor.h [<a href="http://github.com/doxygen/doxygen/commit/c9465bd210d8250a5439f22bf564c187cd45e968">view</a>]</li>
+<li>Fixed typos in comments. [<a href="http://github.com/doxygen/doxygen/commit/b82320a6f57519443c46e5e3044fef97b1f8f618">view</a>]</li>
+<li>Fixes for showing type constraint relations [<a href="http://github.com/doxygen/doxygen/commit/95375152974fa7e0e4d4cec7007d942dd5e9615e">view</a>]</li>
+<li>Fortran FUNCTION source code [<a href="http://github.com/doxygen/doxygen/commit/25a90990662449808c5ba58c243a7835d13ba750">view</a>], [<a href="http://github.com/doxygen/doxygen/commit/e7a6a682137a82dbdf847b1879f320ece4f3642f">view</a>]</li>
+<li>Fortran: code color GOTO as flow keyword. [<a href="http://github.com/doxygen/doxygen/commit/8090675790ad9265bcffdf07ab4d48fc8c037276">view</a>]</li>
+<li>Fortran: fixed format position 73 and further is comment [<a href="http://github.com/doxygen/doxygen/commit/557ad21ce28d093044101eb8bee2c4df1621da7a">view</a>], [<a href="http://github.com/doxygen/doxygen/commit/eb92c064b33bf9f303233210b9693215b0fb7f9d">view</a>]</li>
+<li>Fortran: warning message about not documented module member [<a href="http://github.com/doxygen/doxygen/commit/dcdd35ce2a0cda024525298a9a20d6c746539e6d">view</a>]</li>
+<li>Guarded debug prints against printing a NULL pointer. [<a href="http://github.com/doxygen/doxygen/commit/0831c71c05c9204839e187759f13303e64783730">view</a>]</li>
+<li>HTML entity &amp;deg; gives problems in LaTeX [<a href="http://github.com/doxygen/doxygen/commit/072383ed1c6fcfff7a7619d92ce3a8cb0b91fff9">view</a>]</li>
+<li>Help message regarding layout file [<a href="http://github.com/doxygen/doxygen/commit/7569f42d95332a5948e9d35e94e88d56d11634a9">view</a>],[<a href="http://github.com/doxygen/doxygen/commit/ad0e5fe14dce093e3b00ca677849cacbc2d657b7">view</a>]</li>
+<li>Internal debug option -d lex is not described [<a href="http://github.com/doxygen/doxygen/commit/00a91ae9fabe7783260c7c3fcdfec5b1ead49350">view</a>], [<a href="http://github.com/doxygen/doxygen/commit/ebe3e8ec4a09edbb8a5b2dde88b6c479b03c0be9">view</a>]</li>
+<li>Internal doxygen docs gives: warning: Unsupported xml/html tag &lt;...&gt; found [<a href="http://github.com/doxygen/doxygen/commit/e366acaf0c27ce43ec80a70c0667c27cd5ef9d29">view</a>]</li>
+<li>Missing cross reference link [<a href="http://github.com/doxygen/doxygen/commit/213e680537303959f29b2424d40d74ecf66cb3f6">view</a>]</li>
+<li>Patch fixing a typo in Pull Request 307 [<a href="http://github.com/doxygen/doxygen/commit/6913c67ff1f9f20a71333f78cacd87a9e0c7756f">view</a>], [<a href="http://github.com/doxygen/doxygen/commit/eac0fd660bffe62ae29a190308bf21b21d49647b">view</a>]</li>
+<li>Prevent example.tag from being regenerated [<a href="http://github.com/doxygen/doxygen/commit/d49604f814ceb22f81571d8ca99540e62cfa979a">view</a>]</li>
+<li>Problem running tests under Windows [<a href="http://github.com/doxygen/doxygen/commit/9bd54df7ba7dd15783f5a9180c85a7137dcdbc08">view</a>]</li>
+<li>Remove the new line after @startuml in generated pu file [<a href="http://github.com/doxygen/doxygen/commit/edf8dbbbc17e65e2eb97b5c9b4763a04969017fe">view</a>]</li>
+<li>Remove unreachable code [<a href="http://github.com/doxygen/doxygen/commit/d3e7b06f3a82780083e27bb83360ed9496df9f8d">view</a>]</li>
+<li>Remove unused local and static global variables [<a href="http://github.com/doxygen/doxygen/commit/d03e4c2ae1864c6f27a4341449ce97133aeb6847">view</a>]</li>
+<li>Remove wrong &lt;/File&gt; [<a href="http://github.com/doxygen/doxygen/commit/e8cef724a1f40896f9c6294d6f410e240b6365ee">view</a>], [<a href="http://github.com/doxygen/doxygen/commit/efd55ae1787f8f7ec35761849dc7cfd3175f8b33">view</a>]</li>
+<li>Removed OS version check for MACOSX (was not used anywhere) [<a href="http://github.com/doxygen/doxygen/commit/1e3e9f03e746d4ac46c9c7b1b80e7e3100ee42f0">view</a>]</li>
+<li>Removed dbus XML parser, various refinements [<a href="http://github.com/doxygen/doxygen/commit/551012f2647c53d8532d638361011d003d5b81f3">view</a>], [<a href="http://github.com/doxygen/doxygen/commit/bf4aee305879406d9057864ab7f8938e01ca8bd0">view</a>]</li>
+<li>Removed old build files, added install targets and other options [<a href="http://github.com/doxygen/doxygen/commit/7bcf8e9a379ec0599160e5562f07b93f8fb9557a">view</a>]</li>
+<li>Repair Doxygen generate invalid styleSheetFile and extensionsFile of RTF [<a href="http://github.com/doxygen/doxygen/commit/0d208bc1c9a32718a93eb9911220ba72ad27fb9a">view</a>]</li>
+<li>Replace to_c_cmd by resource compiler [<a href="http://github.com/doxygen/doxygen/commit/2e39e5c7c1427ac6b24c64b7ef01be8d5a20092b">view</a>]</li>
+<li>Restore deleted file [<a href="http://github.com/doxygen/doxygen/commit/dfe93f9fde39167eae2aeeab929641a9c56cc916">view</a>]</li>
+<li>Showing grey/gray in documentation [<a href="http://github.com/doxygen/doxygen/commit/320ebb35dd4a615a7a692d71de4587be9ce8b99b">view</a>]</li>
+<li>Suggestion to use stripPrefix has been implemented for RESULT. For consistency also implemented for arguments. [<a href="http://github.com/doxygen/doxygen/commit/610bdb67c4db775debf26d85091383938d946f3d">view</a>], [<a href="http://github.com/doxygen/doxygen/commit/6720a714461b9454c7cdbae7ceff7eb735feeb3b">view</a>]</li>
+<li>Support diff that returns &quot;No differences encountered&quot; when comparing test results [<a href="http://github.com/doxygen/doxygen/commit/4716f426332d02eb6841c509658b8a709cce9318">view</a>]</li>
+<li>Support generating index-color PNG files [<a href="http://github.com/doxygen/doxygen/commit/a09ffed2f603699955c18c19e0d3e782fb61d93f">view</a>]</li>
+<li>Switched back to version 6.2 of JavaCC for VHDL parser generation. [<a href="http://github.com/doxygen/doxygen/commit/088896f27f460b6ac03c2d64df148e3617c1e519">view</a>]</li>
+<li>Tcl: fix for extra line breaks in source browser introduced by commit 312bef5 [<a href="http://github.com/doxygen/doxygen/commit/3cc116ba2250e6946773ec22c6c7c6557773d28e">view</a>]</li>
+<li>TranslatorSwedish updated [<a href="http://github.com/doxygen/doxygen/commit/eaa19e3a439a4652023b47b0cf47c7303484ef5d">view</a>]</li>
+<li>Update of search from &quot;endless search to &#39;Character search: criterion. [<a href="http://github.com/doxygen/doxygen/commit/a0820f29e60be1555b5b0c92a975bf334b6f5258">view</a>]</li>
+<li>Update translator_cn.h [<a href="http://github.com/doxygen/doxygen/commit/a88d3549373990bfac09f936748577fc5c59d240">view</a>]</li>
+<li>Updated changelog for 1.8.9.1 [<a href="http://github.com/doxygen/doxygen/commit/f8671a4520350fe38f986fdd199c2344452e7a01">view</a>]</li>
+<li>Updated installation section of the manual [<a href="http://github.com/doxygen/doxygen/commit/db6a3ab2761a328e74fdccf243ff148af7623062">view</a>]</li>
+<li>Various VHDL related fixes [<a href="http://github.com/doxygen/doxygen/commit/34b00c442308efe169cc89fad62588fdce1d84e8">view</a>],
+[<a href="http://github.com/doxygen/doxygen/commit/3eed7a5c5b330736b508c722c9614c774a678ef1">view</a>],
+[<a href="http://github.com/doxygen/doxygen/commit/530647f76a7660a406d102269dc041b00b0e3d4e">view</a>]</li>
+<li>Various minor changes [<a href="http://github.com/doxygen/doxygen/commit/f63d9ed958d2c06717434e1a90e6417cf2d60f6b">view</a>]</li>
+<li>Warning message multiple mainpages [<a href="http://github.com/doxygen/doxygen/commit/17fdd71a0f7a02e8b72eaf86d67bc142210a7059">view</a>]</li>
+<li>Warnings without filename [<a href="http://github.com/doxygen/doxygen/commit/da3faf6b93fd3eb4e751d2c0cbd4ed9ceae7922b">view</a>]</li>
+<li>add support for github flavored fenced code blocks [<a href="http://github.com/doxygen/doxygen/commit/288ea42fc27389160c20912003a7972e21195265">view</a>]</li>
+<li>added HHC.exe own output to the debug output when extcmd flag enabled [<a href="http://github.com/doxygen/doxygen/commit/4438e24b478de1fd97ccc81a3a9f7651124e1c63">view</a>]</li>
+<li>doc/translator.py -- minor updates [<a href="http://github.com/doxygen/doxygen/commit/1ccc93fd699b34b7a89acecf9e59a526a5972bb8">view</a>]</li>
+<li>drop #include &lt;unistd.h&gt; [<a href="http://github.com/doxygen/doxygen/commit/1dd0cf03f5bf173fa4ac3bb8279d12fff1b98eb7">view</a>]</li>
+<li>fix *.l for three backticks [<a href="http://github.com/doxygen/doxygen/commit/bb93db0d60fd4cd123dfc886ecd20167068db6ba">view</a>]</li>
+<li>fix enum brief description in RTF output [<a href="http://github.com/doxygen/doxygen/commit/87429a2609b822d2b08ec17fb2a20464a5043c9e">view</a>]</li>
+<li>fix for CHM TOC &quot;Classes&quot; entry to point to annotated file [<a href="http://github.com/doxygen/doxygen/commit/700a9ac3c177fdef25b9b00ed6bb5e0ea963d236">view</a>]</li>
+<li>fix for src/translator_tw.h by Gary Lee (translation cleaned) [<a href="http://github.com/doxygen/doxygen/commit/d101790db5e64a64f4db0e46391bbb1b0dadc8b1">view</a>]</li>
+<li>increase the size of l when result is modified [<a href="http://github.com/doxygen/doxygen/commit/dd0d738683029f80a42b6673e0b1b1228bebfce3">view</a>]</li>
+<li>move layout_default.xml to templates/html/ [<a href="http://github.com/doxygen/doxygen/commit/45ebb6ff4846255ad7209e3bec7cd4fe0544ffd5">view</a>]</li>
+<li>runtests.pl: mmn version has dash as separator [<a href="http://github.com/doxygen/doxygen/commit/f5efa2f383fe89b53bd8fc27b2116e8636417ebf">view</a>]</li>
+<li>specify that doxygen searches files in INPUT tag [<a href="http://github.com/doxygen/doxygen/commit/0971dc7771be1b386a204c3d11515f7d0f5af427">view</a>]</li>
+<li>sqlite3: add regexp searches to search.py [<a href="http://github.com/doxygen/doxygen/commit/13dd6d635e7ba2beb26a0d2ee8542ac63d1c7973">view</a>]</li>
+<li>sqlite3: add schema comments [<a href="http://github.com/doxygen/doxygen/commit/ef5d48d93f5565ebca9aae4ba9d6633c32719ecc">view</a>]</li>
+<li>sqlite3: fix constness [<a href="http://github.com/doxygen/doxygen/commit/90d89d8a2a2be931742c7291cd70e4a980035ae1">view</a>]</li>
+<li>version.py pass configure file path as parameter [<a href="http://github.com/doxygen/doxygen/commit/75e8f4c80ab5c06a33eaaf7ec587ee35ed9c1b1a">view</a>]</li>
+<li>xml: use STRIP_FROM_PATH on @file attributes. [<a href="http://github.com/doxygen/doxygen/commit/29ae707794042a97412eaa137fa7b30f2367294d">view</a>], [<a href="http://github.com/doxygen/doxygen/commit/5a0379944f8bdf883fdb25e94e0cdb1e5d2f4366">view</a>]</li>
+</ul>
+\endhtmlonly
+
+\subsection log_1_8_9_1 Release 1.8.9.1
+\htmlonly
+<b>(release date 04-01-2015)</b>
+<a name="1.8.9.1"></a>
+<ul>
+<li>Fixed a couple of cases where sharing string data could lead to corruption [<a href="http://github.com/doxygen/doxygen/commit/312bef563a5be72f6423377247db1b80044bf711">view</a>]</li>
+<li>Various VHDL related fixes [<a href="http://github.com/doxygen/doxygen/commit/34b00c442308efe169cc89fad62588fdce1d84e8">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=742151">742151</a> - Bogus warning: citelist: Unexpected new line character [<a href="http://github.com/doxygen/doxygen/commit/5c321cbb6359bc1bb875729c08beba2edc084500">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=742230">742230</a> - @todo paragraphs incorrectly placed in rtf output [<a href="http://github.com/doxygen/doxygen/commit/600d5859d7bcb94b08ef656fd427914766ae9afe">view</a>]</li>
+<li>Bug <a href="https://bugzilla.gnome.org/show_bug.cgi?id=742235">742235</a> - Bogus message with addtogroup [<a href="http://github.com/doxygen/doxygen/commit/b75af9180ae53f7c7abb94ccf906333169247785">view</a>]</li>
+<li>Documentation HTML Header, Footer, and Stylesheet changes [<a href="http://github.com/doxygen/doxygen/commit/478207365d7f09f0e676a76f654502c084806e4e">view</a>]</li>
+<li>Documenting RESULT variable of Fortran FUNCTION [<a href="http://github.com/doxygen/doxygen/commit/4d52beec3760244d959ab4d5528aea1acba505e7">view</a>]</li>
+<li>Fix potential null pointer dereference in src/context.cpp [<a href="http://github.com/doxygen/doxygen/commit/2690774f87b9fcb12b35153de82cde22248b3949">view</a>]</li>
+<li>Fixed compilation issue on Windows [<a href="http://github.com/doxygen/doxygen/commit/d75455eef7c91f11c2b9061d9a086ce93c4231b2">view</a>]</li>
+<li>Fortran FUNCTION source code [<a href="http://github.com/doxygen/doxygen/commit/25a90990662449808c5ba58c243a7835d13ba750">view</a>]</li>
+<li>Fortran: code color GOTO as flow keyword. [<a href="http://github.com/doxygen/doxygen/commit/8090675790ad9265bcffdf07ab4d48fc8c037276">view</a>]</li>
+<li>Help message regarding layout file [<a href="http://github.com/doxygen/doxygen/commit/7569f42d95332a5948e9d35e94e88d56d11634a9">view</a>]</li>
+<li>Remove unused local and static global variables [<a href="http://github.com/doxygen/doxygen/commit/d03e4c2ae1864c6f27a4341449ce97133aeb6847">view</a>]</li>
+<li>Suggestion to use stripPrefix has been implemented for RESULT. For consistency also implemented for arguments. [<a href="http://github.com/doxygen/doxygen/commit/6720a714461b9454c7cdbae7ceff7eb735feeb3b">view</a>]</li>
+<li>Switched back to version 6.2 of JavaCC for VHDL parser generation. [<a href="http://github.com/doxygen/doxygen/commit/088896f27f460b6ac03c2d64df148e3617c1e519">view</a>]</li>
+</ul>
+\endhtmlonly
+
 \subsection log_1_8_9 Release 1.8.9
 \htmlonly
 <b>(release date 25-12-2014)</b>
diff --git a/doc/commands.doc b/doc/commands.doc
index 12fe9a6..f2150d1 100644
--- a/doc/commands.doc
+++ b/doc/commands.doc
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -49,8 +49,8 @@ documentation:
 \refitem cmdbrief \\brief
 \refitem cmdbug \\bug
 \refitem cmdc \\c
-\refitem cmdcallgraph \\callgraph
 \refitem cmdcallergraph \\callergraph
+\refitem cmdcallgraph \\callgraph
 \refitem cmdcategory \\category
 \refitem cmdcite \\cite
 \refitem cmdclass \\class
@@ -104,6 +104,8 @@ documentation:
 \refitem cmdfile \\file
 \refitem cmdfn \\fn
 \refitem cmdheaderfile \\headerfile
+\refitem cmdhidecallergraph \\hidecallergraph
+\refitem cmdhidecallgraph \\hidecallgraph
 \refitem cmdhideinitializer \\hideinitializer
 \refitem cmdhtmlinclude \\htmlinclude
 \refitem cmdhtmlonly \\htmlonly
@@ -273,7 +275,26 @@ Structural indicators
   \note The completeness (and correctness) of the call graph depends on the
   doxygen code parser which is not perfect.
 
-  \sa section \ref cmdcallergraph "\\callergraph".
+  \sa section \ref cmdcallergraph "\\callergraph",
+      section \ref cmdhidecallgraph "\\hidecallgraph",
+      section \ref cmdhidecallergraph "\\hidecallergraph" and
+      option \ref cfg_call_graph "CALL_GRAPH"
+
+<hr>
+\section cmdhidecallgraph \\hidecallgraph
+
+  \addindex \\hidecallgraph
+  When this command is put in a comment block of a function or method
+  and then doxygen will not generate a call graph for that function. The
+  call graph will not be generated regardless of the value of
+  \ref cfg_call_graph "CALL_GRAPH".
+  \note The completeness (and correctness) of the call graph depends on the
+  doxygen code parser which is not perfect.
+
+  \sa section \ref cmdcallergraph "\\callergraph",
+      section \ref cmdcallgraph "\\callgraph",
+      section \ref cmdhidecallergraph "\\hidecallergraph" and
+      option \ref cfg_call_graph "CALL_GRAPH"
 
 <hr>
 \section cmdcallergraph \\callergraph
@@ -287,7 +308,26 @@ Structural indicators
   \note The completeness (and correctness) of the caller graph depends on the
   doxygen code parser which is not perfect.
 
-  \sa section \ref cmdcallgraph "\\callgraph".
+  \sa section \ref cmdcallgraph "\\callgraph",
+      section \ref cmdhidecallgraph "\\hidecallgraph",
+      section \ref cmdhidecallergraph "\\hidecallergraph" and
+      option \ref cfg_caller_graph "CALLER_GRAPH"
+
+<hr>
+\section cmdhidecallergraph \\hidecallergraph
+
+  \addindex \\hidecallergraph
+  When this command is put in a comment block of a function or method
+  and then doxygen will not generate a caller graph for that function. The
+  caller graph will not be generated regardless of the value of
+  \ref cfg_caller_graph "CALLER_GRAPH".
+  \note The completeness (and correctness) of the caller graph depends on the
+  doxygen code parser which is not perfect.
+
+  \sa section \ref cmdcallergraph "\\callergraph",
+      section \ref cmdcallgraph "\\callgraph",
+      section \ref cmdhidecallgraph "\\hidecallgraph" and
+      option \ref cfg_caller_graph "CALLER_GRAPH"
 
 <hr>
 \section cmdcategory \\category <name> [<header-file>] [<header-name>]
@@ -320,7 +360,7 @@ Structural indicators
   \par Example:
   \verbinclude class.h
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/class/html/index.html">here</a>
+  Click <a href="examples/class/html/index.html">here</a>
   for the corresponding HTML documentation that is generated by doxygen.
   \endhtmlonly
 
@@ -334,7 +374,7 @@ Structural indicators
   \par Example:
   \verbinclude define.h
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/define/html/define_8h.html">here</a>
+  Click <a href="examples/define/html/define_8h.html">here</a>
   for the corresponding HTML documentation that is generated by doxygen.
   \endhtmlonly
 
@@ -382,7 +422,7 @@ Structural indicators
   \par Example:
   \verbinclude enum.h
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/enum/html/class_test.html">here</a>
+  Click <a href="examples/enum/html/class_test.html">here</a>
   for the corresponding HTML documentation that is generated by doxygen.
   \endhtmlonly
 
@@ -413,7 +453,7 @@ Structural indicators
   Where the example file \c example_test.cpp looks as follows:
   \verbinclude example_test.cpp
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/example/html/examples.html">here</a>
+  Click <a href="examples/example/html/examples.html">here</a>
   for the corresponding HTML documentation that is generated by doxygen.
   \endhtmlonly
 
@@ -439,7 +479,7 @@ Structural indicators
   The file \c manual.c in the example directory shows how to use this command.
 
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/manual/html/index.html">here</a>
+  Click <a href="examples/manual/html/index.html">here</a>
   for the corresponding HTML documentation that is generated by doxygen.
   \endhtmlonly
 
@@ -463,7 +503,7 @@ Structural indicators
   \par Example:
   \verbinclude file.h
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/file/html/file_8h.html">here</a>
+  Click <a href="examples/file/html/file_8h.html">here</a>
   for the corresponding HTML documentation that is generated by doxygen.
   \endhtmlonly
 
@@ -497,7 +537,7 @@ Structural indicators
   \par Example:
   \verbinclude func.h
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/func/html/class_test.html">here</a>
+  Click <a href="examples/func/html/class_test.html">here</a>
   for the corresponding HTML documentation that is generated by doxygen.
   \endhtmlonly
 
@@ -579,7 +619,7 @@ Structural indicators
   The file \c manual.c in the example directory shows how to use this command.
 
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/manual/html/index.html">here</a>
+  Click <a href="examples/manual/html/index.html">here</a>
   for the corresponding HTML documentation that is generated by doxygen.
   \endhtmlonly
 
@@ -679,7 +719,7 @@ Structural indicators
   The file \c manual.c in the example directory shows how to use this command.
 
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/manual/html/index.html">here</a>
+  Click <a href="examples/manual/html/index.html">here</a>
   for the corresponding HTML documentation that is generated by doxygen.
   \endhtmlonly
 
@@ -747,7 +787,7 @@ Structural indicators
   \par Example:
   \verbinclude examples/overload.cpp
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/overload/html/class_test.html">here</a>
+  Click <a href="examples/overload/html/class_test.html">here</a>
   for the corresponding HTML documentation that is generated by doxygen.
   \endhtmlonly
 
@@ -771,7 +811,7 @@ Structural indicators
   \par Example:
   \verbinclude page.doc
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/page/html/pages.html">here</a>
+  Click <a href="examples/page/html/pages.html">here</a>
   for the corresponding HTML documentation that is generated by doxygen.
   \endhtmlonly
 
@@ -927,7 +967,7 @@ Structural indicators
   \par Example:
   \verbinclude relates.cpp
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/relates/html/class_string.html">here</a>
+  Click <a href="examples/relates/html/class_string.html">here</a>
   for the corresponding HTML documentation that is generated by doxygen.
   \endhtmlonly
 
@@ -1078,7 +1118,7 @@ Section indicators
   \par Example:
   \verbinclude author.cpp
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/author/html/class_some_nice_class.html">here</a>
+  Click <a href="examples/author/html/class_some_nice_class.html">here</a>
   for the corresponding HTML documentation that is generated by doxygen.
   \endhtmlonly
 
@@ -1421,7 +1461,7 @@ ALIASES  = "english=\if english" \
   \par Example:
   \verbinclude par.cpp
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/par/html/class_test.html">here</a>
+  Click <a href="examples/par/html/class_test.html">here</a>
   for the corresponding HTML documentation that is generated by doxygen.
   \endhtmlonly
 
@@ -2027,7 +2067,7 @@ Commands for displaying examples
   Where the example file \c example_test.cpp looks as follows:
   \verbinclude example_test.cpp
   \htmlonly
-  Click <a href="$(DOXYGEN_DOCDIR)/examples/include/html/example.html">here</a>
+  Click <a href="examples/include/html/example.html">here</a>
   for the corresponding HTML documentation that is generated by doxygen.
   \endhtmlonly
 
@@ -3190,7 +3230,7 @@ class Receiver
 
   \addindex \\\.
   This command writes a dot (`.`) to the output. This can be useful to 
-  prevent ending a brief description when JAVADOC_AUTOBRIEF is enabled
+  prevent ending a brief description when \ref cfg_javadoc_autobrief "JAVADOC_AUTOBRIEF" is enabled
   or to prevent starting a numbered list when the dot follows a number at
   the start of a line.
 
diff --git a/doc/custcmd.doc b/doc/custcmd.doc
index db41f95..8ac2a65 100644
--- a/doc/custcmd.doc
+++ b/doc/custcmd.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/doc/customize.doc b/doc/customize.doc
index 46b1d8b..f98ce0b 100644
--- a/doc/customize.doc
+++ b/doc/customize.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -117,9 +117,9 @@ This will create 3 files:
 You should edit these files and then reference them from the config file.
 - \ref cfg_html_header "HTML_HEADER" = \c header.html
 - \ref cfg_html_footer "HTML_FOOTER" = \c footer.html
-- \ref cfg_html_stylesheet "HTML_STYLESHEET" = \c customdoxygen.css <b>&larr;obsolete</b>
+- \ref cfg_html_extra_stylesheet "HTML_EXTRA_STYLESHEET" = \c my_customdoxygen.css
 
-\note it is not longer recommended to use HTML_STYLESHEET this way,
+\note it is not longer recommended to use \ref cfg_html_stylesheet "HTML_STYLESHEET",
 as it make it difficult to upgrade to a newer version of doxygen. Use
 \ref cfg_html_extra_stylesheet "HTML_EXTRA_STYLESHEET" instead.
 
diff --git a/doc/dbusxml.doc b/doc/dbusxml.doc
deleted file mode 100644
index e487126..0000000
--- a/doc/dbusxml.doc
+++ /dev/null
@@ -1,149 +0,0 @@
-/*! \page dbusxml DBus XML output format
-
-\addindex dbusxml
-
-<p>Doxygen can generate documentation for DBus XML files.  This way
-DBus interfaces can be annotated with doxygen style comments, and
-without writing custom XML parsers.  Doxygen extracts its text from
-all XML comments starting with '*' or '!'.  An additional '<' can be
-used to assign the documentation string to the previous entity instead
-of the one following the comment.
-
-Note that before the parsing of DBus XML file works one has to
-assign the .xml extension to the DBus XML parser using the
-following configuration option:
-
-\verbatim
-EXTENSION_MAPPING = xml=dbusxml
-\endverbatim
-
-\section dbusxml_supported Supported XML elements and attributes
-
-<p>The following DBus XML elemets can be annotated:
-
-<ul>
-<li><b>interface</b>
-
-<li><b>method</b> or <b>signal</b>
-
-<li><b>arg</b>
-
-<li><b>property</b>
-
-</ul>
-
-Additional elements are supported. These are available once
-the xmlns "http://psiamp.org/dtd/doxygen_dbusxml.dtd" is
-available.
-
-<ul>
-<li><b>namespace</b>: This can be used to group other more of the
-additional elemets.  This element requires a <b>name</b> attribute.
-
-<li><b>enum</b> is used to define enums.  <b>value</b> element is
-    then used to define the individual values in the enum.  This element
-    requires the <b>name</b> and <b>type</b> attributes.  A
-    optional <b>named-type</b> attribute is allowed, referrencing typed
-    previously defined by one of the additional elements.  A enum name
-    can be used anywhere a type is required using the <b>named-type</b>
-    attribute.
-
-<li><b>flagset</b> is used to define sets of flags. Required and
-    optional attributes are identical to the ones used by <b>enum</b>.
-    While <b>enum</b>s assume the values to be consecutive, while
-    a <b>flagset</b> is values suitable for flags.  A flagset name
-    can be used anywhere a type is required using the <b>named-type</b>
-    attribute.
-
-<li><b>struct</b> is used to define structures. A <b>name</b>
-    attribute is required.
-
-<li><b>member</b> is used to define members of <b>structs</b>.  It
-    is valid inside <b>struct</b> elements. This
-    element requires <b>name</b> and <b>type</b> attributes.  In
-    addition to (or even instead of) the <b>type</b> attribute a
-    <b>named-type</b> attribute may be used to reference types defined
-    by <b>enum</b>, <b>flagset</b> or <b>struct</b>.
-
-\section dbusxml_example Example
-
-<pre>
-<?xml version="1.0" ?>
-<!-- Comment -->
-<!--*< File comment -->
-<node name="/SomeNode" xmlns:dx="http://psiamp.org/dtd/doxygen_dbusxml.dtd">
-  <!--* test struct outside a namespace and interface -->
-  <dx:struct name="StructOutsideNamespace">
-    <!--* member 1 -->
-    <dx:member name="member1" type="s"/>
-    <!--* complex member 1 -->
-    <dx:member name="complexMember1" type="(ssu)"/>
-  </dx:struct>
-
-  <!--* Test flag set -->
-  <dx:flagset name="flagset">
-    <!--* Flag 1 of flagset. -->
-    <dx:value name="FLAG1"/>
-  </dx:flagset>
-
-  <!--* namespace comment -->
-  <dx:namespace name="SomeNamespace">
-    <!--* struct inside a namespace -->
-    <dx:struct name="StructInNamespace">
-       <!--* member 2 -->
-       <dx:member name="member2" type="s"/>
-    </dx:struct>
-  </dx:namespace>
-  <!--* Documentation on the interface -->
-  <interface name="nl.stack.doxygen.test.interface">
-    <!--* Test Enum documentation -->
-    <dx:enum name="TestEnum">
-      <!--* key 1 with value 13 -->
-      <dx:value name="KEY1" value="13"/>
-      <!--* key 2 without a value -->
-      <dx:value name="KEY2"/>
-    </dx:enum>
-
-    <!--* struct inside a interface -->
-    <dx:struct name="StructInInterface">
-      <!--* member 3 -->
-      <dx:member name="member3" type="s"/>
-      <!--* Struct in a struct -->
-      <dx:struct name="StructInAStruct">
-        <!--* member4 -->
-        <dx:member name="member4" type="s"/>
-      </dx:struct>
-      <!--* struct member -->
-      <dx:member name="structMembor" type="(s)" named-type="StructInAStruct"/>
-    </dx:struct>
-    <!--* Document method
-
-          Some extended documentation for the method.
-
-          @param[in] input blah.
-          @param[out] output blub
-     -->
-    <method name="method">
-      <arg direction="in" name="input" type="(s(s))" named-type="::nl::stack::doxygen::test::interface::StructInInterface"/>
-      <arg direction="out" type="v" name="output"/>
-    </method>
-
-    <signal name="signal">
-      <!--*< Documentation for signal.
-
-             @param parameter some parameter.
-        -->
-      <arg name="parameter" type="s"/>
-    </signal>
-
-    <!--* property documentation -->
-    <property name="property" type="s" access="readwrite"/>
-
-    <!--* property documentation read-only -->
-    <property name="propertyRead" type="s" access="read"/>
-    <!--* property documentation write-only -->
-    <property name="propertyWrite" type="s" access="write"/>
-  </interface>
-</node>
-</pre>
-*/
diff --git a/doc/diagrams.doc b/doc/diagrams.doc
index bafb21d..c87337b 100644
--- a/doc/diagrams.doc
+++ b/doc/diagrams.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -52,10 +52,14 @@
       </ul>
   <li>if \ref cfg_call_graph "CALL_GRAPH" is set to YES, a 
       graphical call graph is drawn for each function showing the 
-      functions that the function directly or indirectly calls.
+      functions that the function directly or indirectly calls
+      (see also section \ref cmdcallgraph "\\callgraph" and
+       section \ref cmdhidecallgraph "\\hidecallgraph").
   <li>if \ref cfg_caller_graph "CALLER_GRAPH" is set to YES, a 
       graphical caller graph is drawn for each function showing the 
-      functions that the function is directly or indirectly called by.
+      functions that the function is directly or indirectly called by
+      (see also section \ref cmdcallergraph "\\callergraph" and
+       section \ref cmdhidecallergraph "\\hidecallergraph").
   </ul>
 
   Using a \ref customize "layout file" you can determine which of the
@@ -134,7 +138,7 @@ that doxygen can generate:
 \verbinclude diagrams_e.h
 
 \htmlonly
-Click <a href="$(DOXYGEN_DOCDIR)/examples/diagrams/html/index.html">here</a>
+Click <a href="examples/diagrams/html/index.html">here</a>
 for the corresponding HTML documentation that is generated by doxygen<br/>
 (<code>EXTRACT_ALL</code> = <code>YES</code> is used here).
 \endhtmlonly
diff --git a/doc/docblocks.doc b/doc/docblocks.doc
index 333e5d2..f073de5 100644
--- a/doc/docblocks.doc
+++ b/doc/docblocks.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -259,7 +259,7 @@ located in front of the block instead of after the block.
 Here is an example of the use of these comment blocks:
 \include afterdoc.h
  \htmlonly
- Click <a href="$(DOXYGEN_DOCDIR)/examples/afterdoc/html/class_test.html">here</a>
+ Click <a href="examples/afterdoc/html/class_test.html">here</a>
  for the corresponding HTML documentation that is generated by doxygen.
  \endhtmlonly
 
@@ -275,7 +275,7 @@ Here is an example of the use of these comment blocks:
 Here is an example of a documented piece of C++ code using the Qt style:
 \include qtstyle.cpp
  \htmlonly
- Click <a href="$(DOXYGEN_DOCDIR)/examples/qtstyle/html/class_test.html">here</a>
+ Click <a href="examples/qtstyle/html/class_test.html">here</a>
  for the corresponding HTML documentation that is generated by doxygen.
  \endhtmlonly
 
@@ -305,7 +305,7 @@ Here is the same piece of code as shown above, this time documented using the
 JavaDoc style and \ref cfg_javadoc_autobrief "JAVADOC_AUTOBRIEF" set to YES:
 \include jdstyle.cpp
  \htmlonly
- Click <a href="$(DOXYGEN_DOCDIR)/examples/jdstyle/html/class_test.html">here</a>
+ Click <a href="examples/jdstyle/html/class_test.html">here</a>
  for the corresponding HTML documentation that is generated by doxygen.
  \endhtmlonly
 
@@ -381,7 +381,7 @@ Here is an example of a C header named \c structcmd.h that is documented
 using structural commands:
 \include structcmd.h
  \htmlonly
- Click <a href="$(DOXYGEN_DOCDIR)/examples/structcmd/html/structcmd_8h.html">here</a>
+ Click <a href="examples/structcmd/html/structcmd_8h.html">here</a>
  for the corresponding HTML documentation that is generated by doxygen.
  \endhtmlonly
 
@@ -421,7 +421,7 @@ and assume they have to be represented in a preformatted way.
 
 \include docstring.py
  \htmlonly
- Click <a href="$(DOXYGEN_DOCDIR)/examples/docstring/html/index.html">here</a>
+ Click <a href="examples/docstring/html/index.html">here</a>
  for the corresponding HTML documentation that is generated by doxygen.
  \endhtmlonly
 
@@ -437,7 +437,7 @@ Here is the same example again but now using doxygen style comments:
 
 \include pyexample.py
  \htmlonly
- Click <a href="$(DOXYGEN_DOCDIR)/examples/pyexample/html/index.html">here</a>
+ Click <a href="examples/pyexample/html/index.html">here</a>
  for the corresponding HTML documentation that is generated by doxygen.
  \endhtmlonly
 
@@ -462,7 +462,7 @@ 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>
+ Click <a href="examples/mux/html/index.html">here</a>
  for the corresponding HTML documentation that is generated by doxygen.
  \endhtmlonly
 
@@ -571,7 +571,7 @@ Following is an example using doxygen style comments:
 
 \include tclexample.tcl
  \htmlonly
- Click <a href="$(DOXYGEN_DOCDIR)/examples/tclexample/html/index.html">here</a>
+ Click <a href="examples/tclexample/html/index.html">here</a>
  for the corresponding HTML documentation that is generated by doxygen.
  \endhtmlonly
 
diff --git a/doc/doxygen.1 b/doc/doxygen.1
index f3a7abc..6861c22 100644
--- a/doc/doxygen.1
+++ b/doc/doxygen.1
@@ -45,6 +45,6 @@ doxygen \fB\-e\fR rtf extensionsFile
 If \fB\-s\fR is specified the comments in the config file will be omitted.
 If configName is omitted `Doxyfile' will be used as a default.
 .SH AUTHOR
-Doxygen version VERSION, Copyright Dimitri van Heesch 1997-2014
+Doxygen version VERSION, Copyright Dimitri van Heesch 1997-2015
 .SH SEE ALSO
 doxywizard(1).
diff --git a/doc/doxygen_manual.tex b/doc/doxygen_manual.tex
index 4bac9a9..c97c5f0 100644
--- a/doc/doxygen_manual.tex
+++ b/doc/doxygen_manual.tex
@@ -1,7 +1,7 @@
 %
 % 
 %
-% Copyright (C) 1997-2014 by Dimitri van Heesch.
+% Copyright (C) 1997-2015 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 
diff --git a/doc/doxygen_usage.doc b/doc/doxygen_usage.doc
index d84432e..bcb14e8 100644
--- a/doc/doxygen_usage.doc
+++ b/doc/doxygen_usage.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/doc/doxywizard_usage.doc b/doc/doxywizard_usage.doc
index bec143c..310c358 100644
--- a/doc/doxywizard_usage.doc
+++ b/doc/doxywizard_usage.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/doc/external.doc b/doc/external.doc
index be7d764..c3ec811 100644
--- a/doc/external.doc
+++ b/doc/external.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/doc/extsearch.doc b/doc/extsearch.doc
index e07edd7..6429766 100644
--- a/doc/extsearch.doc
+++ b/doc/extsearch.doc
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/doc/faq.doc b/doc/faq.doc
index 356c42b..bd327a1 100644
--- a/doc/faq.doc
+++ b/doc/faq.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -63,7 +63,7 @@ PREDEFINED             = MY_MACRO()=
       manual for more information.
   </ol> 
 
-\section faq_extract_allWhen I set EXTRACT_ALL to NO none of my functions are shown in the documentation.
+\section faq_extract_all When I set EXTRACT_ALL to NO none of my functions are shown in the documentation.
 
 In order for global functions, variables, enums, typedefs, and defines 
 to be documented you should document the file in which these commands are
@@ -77,6 +77,19 @@ block containing the \ref cmddefgroup "\\defgroup" command.
 For member functions or functions that are part of a namespace you should
 document either the class or namespace.
  
+\section faq_ext_mapping My file with a custom extension is not parsed (properly) (anymore).
+
+Doxygen only parses files that are specified as input (via the \ref cfg_input "INPUT" tag)
+and that match a specified extension (mentioned in \ref cfg_file_patterns "FILE_PATTERNS")
+The list of files is then reduced by excluding files listed as \ref cfg_exclude "EXCLUDE" or 
+files that match the patterns set by \ref cfg_exclude_patterns "EXCLUDE_PATTERNS".
+
+In the past doxygen parsed all files with an unknown extension as C files which could lead to
+undesired results. Since version 1.8.8, doxygen requires that you specify a mapping that tells
+for a certain file extension, which parser to use. 
+This mapping is specified using the \ref cfg_extension_mapping "EXTENSION_MAPPING" tag.
+If no mapping is specified the file's contents will be ignored.
+
 \section faq_code How can I make doxygen ignore some code fragment?
 
 The new and easiest way is to add one comment block 
diff --git a/doc/features.doc b/doc/features.doc
index bd548c2..dd75a9d 100644
--- a/doc/features.doc
+++ b/doc/features.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/doc/formulas.doc b/doc/formulas.doc
index 1a6208e..937ff86 100644
--- a/doc/formulas.doc
+++ b/doc/formulas.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/doc/grouping.doc b/doc/grouping.doc
index 4397b76..2e11e7e 100644
--- a/doc/grouping.doc
+++ b/doc/grouping.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/doc/htmlcmds.doc b/doc/htmlcmds.doc
index d041f1e..b8324f8 100644
--- a/doc/htmlcmds.doc
+++ b/doc/htmlcmds.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/doc/index.doc b/doc/index.doc
index 0cb1e59..8b0d403 100644
--- a/doc/index.doc
+++ b/doc/index.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -118,7 +118,7 @@ The third part provides information for developers:
 \addindex license
 \addindex GPL
 
-Copyright &copy; 1997-2014 by 
+Copyright &copy; 1997-2015 by 
 <a href="mailto:dimitri@stack.nl">Dimitri van Heesch</a>.<p>
 
 Permission to use, copy, modify, and distribute this software and its
diff --git a/doc/install.doc b/doc/install.doc
index 9648ade..295154f 100644
--- a/doc/install.doc
+++ b/doc/install.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -35,11 +35,10 @@ following to build the executable:
     \addindex libiconv
     \addindex make
     \addindex strip
+    \addindex python
 <li>In order to generate a \c Makefile for your platform, you need 
-    <a href="http://www.perl.com/">perl</a>
-    \addindex perl
-<li>The configure script assume the availability of standard UNIX tools such 
-    as <code>sed, date, find, uname, mv, cp, cat, echo, tr, cd</code> and \c rm.
+    <a href="http://www.cmake.org/">cmake</a> version 2.8.12 or later.
+    \addindex cmake
 </ul>
 
 To take full advantage of doxygen's features the following additional
@@ -49,7 +48,7 @@ tools should be installed.
 <li>Qt Software's GUI toolkit 
     <a href="http://qt-project.org/">Qt</A>
     \addindex Qt
-    version 4.3 or higher (but currently, Qt 5.x is not supported).
+    version 4.3 or higher (but currently, Qt 5.x is not yet supported).
     This is needed to build the GUI front-end doxywizard. 
 <li>A \LaTeX distribution: for instance
     <a href="http://www.tug.org/interest.html#free">TeX Live</a>
@@ -61,11 +60,10 @@ tools should be installed.
     If you compile graphviz yourself, make sure you do include
     freetype support (which requires the freetype library and header files), 
     otherwise the graphs will not render proper text labels.
-<li>For formulas or if you do not wish to use `pdflatex, the ghostscript interpreter
-    is needed. You can find it at 
+<li>For formulas in the HTML output (when MathJax is not used)
+    or in case you do not wish to use `pdflatex,
+    the ghostscript interpreter is needed. You can find it at 
     <a href="http://www.ghostscript.com/">www.ghostscript.com</a>.
-<li>In order to generate doxygen's own documentation, Python is needed, you
-    can find it  at <a href="http://www.python.org">www.python.org</a>.
 </ul>
 
 Compilation is now done by performing the following steps:
@@ -76,62 +74,46 @@ Compilation is now done by performing the following steps:
         gunzip doxygen-$VERSION.src.tar.gz    # uncompress the archive
         tar xf doxygen-$VERSION.src.tar       # unpack it
 
-<li>Run the configure script:
- 
-        sh ./configure
+<li>Create a build directory (for instance inside the source tree)
 
-    The script tries to determine the platform you use, the make tool 
-    (which \e must be GNU make) and the perl 
-    interpreter. It will report what it finds. 
+        cd doxygen-$VERSION
+        mkdir build
 
-    To override the auto detected platform and compiler you can run
-    configure as follows:
+<li>Run cmake with the makefile generator
 
-        configure --platform platform-type
+        cmake -G "Unix Makefiles" ..
 
-    See the <code>PLATFORMS</code> file for a list of possible platform
-    options.
+    <code>cmake</code> tries to determine the platform you use, and will look
+    for the requires tools. It will report if something is missing.
 
-    If you have Qt-4.3 or higher installed and want to build the GUI 
-    front-end, you should run the configure script with 
-    the `--with-doxywizard` option:
+    If you have Qt-4.3 or higher installed and want to build the GUI
+    front-end, you should enable it as follows:
 
-        configure --with-doxywizard
+        cmake -Dbuild_wizard=YES
 
     For an overview of other configuration options use
 
-        configure --help
+        cmake -L
 
 <li>Compile the program by running make:
 
         make
 
-    The program should compile without problems and the binaries 
-    (<code>doxygen</code> and optionally <code>doxywizard</code>) 
-    should be available in the bin directory of the distribution.
+    The program should compile without problems and the binaries
+    (<code>doxygen</code> and optionally <code>doxywizard</code>)
+    should be available in the bin directory within the build directory.
 
 <li>Optional: Generate the user manual.
     
+        cmake -Dbuild_doc=YES
         make docs
 
-    To let doxygen generate the HTML documentation.
+    To let doxygen generate the HTML and PDF documentation.
     
-    The HTML directory of the distribution will now contain the html 
-    documentation (just point a HTML browser to the file 
-    <code>index.html</code> in the 
-    html directory). You will need the <code>python</code> interpreter 
-    for this.
+    The HTML directory within the build directory will now contain the html
+    documentation (just point a HTML browser to the file
+    <code>index.html</code> in the html directory).
     
-<li>Optional: Generate a PDF version of the manual
-    (you will need <code>pdflatex</code>, <code>makeindex</code>, and
-     <code>egrep</code> for this).
-
-        make pdf
-
-    The PDF manual <code>doxygen_manual.pdf</code> will be located 
-    in the latex directory of the distribution. Just 
-    view and print it via the acrobat reader. 
-
 </ol>
 
 \section install_bin_unix    Installing the binaries on UNIX
@@ -164,107 +146,15 @@ the wrong directory!
 If you have a RPM or DEP package, then please follow the 
 standard installation procedure that is required for these packages. 
 
-\section unix_problems Known compilation problems for UNIX
-
-<b>Qt problems</b>
-
-The Qt include files and libraries are not a subdirectory of the
-directory pointed to by <code>QTDIR</code> on some systems
-(for instance on Red Hat 6.0 includes are in <code>/usr/include/qt</code> and
-libs are in <code>/usr/lib</code>).
-  
-The solution: go to the root of the doxygen distribution and do:
-
-    mkdir qt
-    cd qt
-    ln -s your-qt-include-dir-here include
-    ln -s your-qt-lib-dir-here lib
-    ln -s your-qt-bin-dir-here bin
-    export QTDIR=$PWD
-
-If you have a <code>csh</code>-like shell you should use <code>setenv QTDIR \$PWD</code>
-instead of the <code>export</code> command above.
-  
-Now install doxygen as described above.  
-
-<b>Bison problems</b>
-
-Versions 1.31 to 1.34 of \c bison contain a "bug" that results in a 
-compiler errors like this:
-
-<code>ce_parse.cpp:348: member `class CPPValue yyalloc::yyvs' with </code>
-constructor not allowed in union
-
-This problem has been solved in version 1.35 (versions before 1.31 
-will also work).
-
-<b>Sun compiler problems</b>
-
-It appears that doxygen doesn't work properly if it is compiled 
-with Sun's C++ WorkShop Compiler. I cannot verify this myself as I do 
-not have access to a Solaris machine with this compiler. With GNU compiler
-it does work and installing Sun patch 111679-13 has also been reported 
-as a way to fix the problem.
-
-when configuring with `--static` I got:
-
-\verbatim
-Undefined                       first referenced
- symbol                             in file
-dlclose                             /usr/lib/libc.a(nss_deffinder.o)
-dlsym                               /usr/lib/libc.a(nss_deffinder.o)
-dlopen                              /usr/lib/libc.a(nss_deffinder.o)
-\endverbatim
-
-Manually adding `-Bdynamic` after the target rule in 
-`Makefile.doxygen` will fix this:
-
-    $(TARGET): $(OBJECTS) $(OBJMOC) 
-            $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) -Bdynamic
-
-<b>GCC compiler problems</b>
-
-Older versions of the GNU compiler have problems with constant strings
-containing characters with character codes larger than 127. Therefore 
-the compiler will fail to compile some of the `translator_xx.h` files. 
-A workaround, if you are planning to use the English translation only, 
-is to configure doxygen with the `--english-only` option.  
-
-On some platforms (such as OpenBSD) using some versions of gcc with
--O2 can lead to eating all memory during the compilation of files 
-such as config.cpp. As a workaround use `--debug` as a configure option 
-or omit the `-O2` for the particular files in the Makefile.
-
-Gcc versions before 2.95 may produce broken binaries due to bugs in 
-these compilers. 
-
-<b>Dot problems</b>
-
-Due to a change in the way image maps are generated, older versions
-of doxygen (\<=1.2.17) will not work correctly with newer versions of
-graphviz (\>=1.8.8). The effect of this incompatibility is that
-generated graphs in HTML are not properly clickable. For doxygen 1.3
-it is recommended to use at least graphviz 1.8.10 or higher.
-For doxygen 1.4.7 or higher it is recommended to 
-use GraphViz 2.8 or higher to avoid font issues.
+\section install_src_windows Compiling from source on Windows
 
-<b>Red Hat 9.0 problems</b>
+From version 1.8.10 onwards, build files need to be generated by cmake.
+cmake can be downloaded from http://www.cmake.org/download/
 
-If you get the following error after running make
-\verbatim
-tmake error: qtools.pro:70: Syntax error
-\endverbatim
-then first type
-\verbatim
-export LANG=
-\endverbatim
-before running make.
-
-\section install_src_windows Compiling from source on Windows
+At the moment only the express version of Visual Studio 2013 is tested,
+but other version might also work.
 
-From version 1.7.0 onwards, build files are provided for Visual Studio 2008.
-Also the free (as in beer) "Express" version of Developer Studio can be used to 
-compile doxygen. Alternatively, you can compile doxygen 
+Alternatively, you can compile doxygen 
 \ref install_src_unix "the UNIX way" using 
 <a href="http://en.wikipedia.org/wiki/Cygwin">Cygwin</a>
 or <a href="http://www.mingw.org/">MinGW</a>.
@@ -273,13 +163,11 @@ The next step is to install modern versions of \c bison and \c flex
 (see http://sourceforge.net/projects/winflexbison. After installation and adding them to
 your `path` rename `win_flex.exe` to `flex.exe` and `win_bison.exe` to `bison.exe`)
 Furthermore you have to install \c python (version 2.6 or higher, see http://www.python.org).
-These packages are needed during the
-compilation process if you use a GitHub snapshot of doxygen (the official source releases 
-come with pre-generated sources).
+These packages are needed during the compilation process.
 
 Download doxygen's source tarball and put it somewhere (e.g. use <code>c:\\tools</code>)
 
-Now start a new command shell and type
+Now start a visual studio native command shell (for either x86 or x64) and type
 \verbatim
 cd c:\tools
 tar zxvf doxygen-x.y.z.src.tar.gz
@@ -288,12 +176,14 @@ to unpack the sources (you can obtain \c tar from e.g. http://gnuwin32.sourcefor
 Alternatively you can use an unpack program, like 7-Zip (see http://www.7-zip.org)
 or use the build in unpack feature of modern Windows systems).
 
-Now your environment is setup to build \c doxygen.
+Now your environment is setup to generate the required project files for \c doxygen.
 
-Inside the \c doxygen-x.y.z directory you will find a \c winbuild directory 
-containing a \c Doxygen.sln file. Open this file in Visual Studio. 
-You can now build the Release or Debug flavor of Doxygen by right-clicking
-the project in the solutions explorer, and selecting Build.
+cd into the \c doxygen-x.y.z directory, create and cd to a build directory
+\verbatim
+mkdir build
+cd build
+cmake -G "Visual Studio 12 2013"
+\endverbatim
 
 Note that compiling Doxywizard currently requires Qt version 4
 (see http://qt-project.org/).
@@ -301,149 +191,6 @@ Note that compiling Doxywizard currently requires Qt version 4
 Also read the next section for additional tools you may need to install to run
 doxygen with certain features enabled.
 
-<!--
-
-Currently, I have only compiled doxygen for Windows using Microsoft's 
-Visual C++ (). For other compilers you may need to edit the 
-perl script in <code>wintools/make.pl</code> a bit. 
-Let me know what you had to change if you got Doxygen working with another 
-compiler. If you have Visual Studio you can also use the .dsw file found in
-the <code>wintools</code> directory. Note that this file is not maintained
-by me, so it might be outdated a little.
-
-If you have Visual C++ 6.0, and the source distribution, you can easily
-build doxygen using the project files in the \c wintools directory. If
-you want to build the CVS sources, or want to build from the command line,
-or with another compiler, you have to follow the steps below.
-
-Thomas Baust reported that if you have Visual Studio.NET (2003) then 
-you should be aware that there is a problem with the _popen() and _pclose() 
-implementation, which currently leaks handles, so if you build doxygen with 
-it and use the INPUT_FILTER, you will run to risk of crashing Windows! 
-The problem is reported to and confirmed by Microsoft so maybe it will 
-fixed in the next service pack.
-
-Since Windows comes without all the nice tools that UNIX users are
-used to, you'll need to install a number of these tools before you can compile 
-doxygen for Windows from the command-line.
-
-Here is what is required:
-<ul>
-<li>An unzip/untar tool like WinZip to unpack the tar source distribution. 
-    This can be found at http://www.winzip.com/  
-
-    The good, tested, and free alternative is the <code>tar</code> utility
-    supplied with <a href="http://sourceware.cygnus.com/cygwin/">cygwin
-    tools</a>. Anyway, the Cygwin's \c flex, \c bison, and \c sed are also
-    recommended below.
-
-<li>Microsoft Visual C++ (I only tested with version 6.0).
-    Use the <code>vcvars32.bat</code> batch file to set the environment 
-    variables (if you did not select to do this automatically during 
-    installation). 
-
-    Borland C++ or MINGW (see http://www.mingw.org/) are also supported. 
-
-<li>Perl 5.0 or higher for Windows. This can be downloaded from:
-    http://www.ActiveState.com/Products/ActivePerl/
-
-<li>The GNU tools \c flex, \c bison, and \c sed.
-    To get these working on Windows you should install the 
-    <a href="http://sources.redhat.com/cygwin/">cygwin tools</a>
-    
-    Alternatively, you can also choose to 
-    download only a <a href="http://www.doxygen.org/dl/cygwin_tools.zip">small subset</a> 
-    of the cygwin tools that I put together just to compile doxygen.
-
-    As a third alternative one could use the GNUWin32 tools that can be
-    found at http://gnuwin32.sourceforge.net/ 
-    
-    Make sure the <code>BISON_SIMPLE</code> environment variable points to the
-    location where the files <code>bison.simple</code> and 
-    is located. For instance if these file is in
-    <code>c:\\tools\\cygwin\\usr\\share</code> then BISON_SIMPLE should 
-    be set to <code>c:/tools/cygwin/usr/share/bison.simple</code>
-
-    Also make sure the tools are available from a dos box, by adding 
-    the directory they are in to the search path.
-    
-    For those of you who are very new to cygwin (if you are going to
-    install it from scratch), you should notice that there is an
-    archive file <code>bootstrap.zip</code> which also contains the
-    <code>tar</code> utility (<code>tar.exe</code>), <code>gzip</code>
-    utilities, and the <code>cygwin1.dll</code> core. This also means
-    that you have the <code>tar</code> in hands from the start. It
-    can be used to unpack the tar source distribution instead of
-    using WinZip -- as mentioned at the beginning of this list of
-    steps.
-
-<li>From Doxygen-1.2.2-20001015 onwards, the distribution includes the part
-    of Qt that is needed for to compile doxygen.
-    The Windows specific part were also created.
-    As a result doxygen (without the wizard) can be compiled on systems 
-    without X11 or (the commercial version of) Qt.
-
-<li>If you used WinZip to extract the tar archive it will (apparently) not 
-    create empty folders, so you have to add the folders
-    <code>objects</code> and <code>bin</code> manually in the root of the 
-    distribution before compiling.
-
-</ul>
-
-
-Compilation is now done by performing the following steps:
-
-<ol>
-<li>Open a dos box.
-    Make sure all tools (i.e. <code>nmake</code>, <code>latex</code>, 
-    <code>gswin32</code>, <code>dvips</code>, <code>sed</code>, 
-    <code>flex</code>, <code>bison</code>, <code>cl</code>,
-    <code>rm</code>, and <code>perl</code>), are accessible from
-    the command-line (add them to the PATH environment variable if
-    needed).
-
-    Notice: The use of \LaTeX is optional and only needed for compilation
-    of the documentation into PostScript or PDF. 
-    It is \e not needed for compiling the doxygen's binaries. 
-    
-<li>Go to the doxygen root dir and type:
-
-\verbatim
-    make.bat msvc
-\endverbatim
-
-    This should build the executable
-    <code>doxygen.exe</code> using Microsoft's Visual C++ compiler
-    (The compiler should not produce any serious warnings or errors).
-
-    You can use also the <code>bcc</code> argument to build
-    executables using the Borland C++ compiler, or
-    <code>mingw</code> argument to compile using GNU gcc.
-
-<li>To build the examples, go to the <code>examples</code> subdirectory
-    and type:
-
-\verbatim
-    nmake
-\endverbatim
-
-<li>To generate the doxygen documentation, go to the <code>doc</code> 
-    subdirectory and type:
-
-\verbatim
-    nmake
-\endverbatim
-
-    The generated HTML docs are located in the <code>..\\html</code>
-    subdirectory.
-
-    The sources for \LaTeX documentation are located in the <code>..\\latex</code>
-    subdirectory. From those sources, the DVI, PostScript, and PDF
-    documentation can be generated. 
-</ol>
-
--->
-
 \section install_bin_windows Installing the binaries on Windows
 
 Doxygen comes as a self-installing archive, so installation is extremely simple.
@@ -481,85 +228,6 @@ latex.exe, pdflatex.exe, and gswin32c.exe are present in the search path of a
 command box. Follow <a href="http://www.computerhope.com/issues/ch000549.htm">these</a>
 instructions if you are unsure and run the commands from a command box to verify it works.
 
-<!--
-There is no fancy installation procedure at the moment (if anyone can
-add it in a location independent way please let me know).
-
-To install doxygen, just copy the binaries from the <code>bin</code> directory
-to a location somewhere in the path. Alternatively, you can include 
-the <code>bin</code> directory of the distribution to the path.
-
-There are a couple of tools you may want to install to use all of doxygen's
-features:
-
-<ul>
-<li>To generate \LaTeX documentation or formulas in HTML you need the tools:
-    <code>latex</code>, <code>dvips</code> and <code>gswin32</code>. 
-    To get these working under Windows
-    install the fpTeX distribution. You can find more info at:
-    http://www.fptex.org/ and download it from CTAN or one of its mirrors.
-    In the Netherlands for example this would be: 
-    ftp://ftp.easynet.nl/mirror/CTAN/systems/win32/fptex/
-
-    Make sure the tools are available from a dos box, by adding the 
-    directory they are in to the search path.
-
-    For your information, \LaTeX is a freely available set of so
-    called macros and styles on the top of the famous \TeX program
-    (by famous Donald Knuth) and the accompanied utilities (all
-    available for free). It is used for high quality
-    typesetting. The result -- in the form of so called
-    <code>DVI</code> (DeVice Independent) file -- can be printed or
-    displayed on various devices preserving exactly the same look up
-    to the capability of the device. The <code>dvips</code> allows you
-    to convert the <code>dvi</code> to the high quality PostScript
-    (i.e. PostScript that can be processed by utilities like 
-    <code>psnup</code>, <code>psbook</code>, <code>psselect</code>,
-    and others). The derived version of \TeX (the pdfTeX) can be used
-    to produce PDF output instead of DVI, or the PDF can be produced
-    from PostScript using the utility <code>ps2pdf</code>.
-
-    If you want to use MikTeX then you need to select at least the 
-    medium size installation. For really old versions of MikTex or minimal 
-    installations, you may need to download the fancyhdr package separately. 
-    You can find it in the 
-    <a href="ftp://ftp.tex.ac.uk/tex-archive/macros/latex/contrib/supported/fancyhdr/">
-    contrib/supported</a> directory of the tex archives.
-
-<li>If you want to generate compressed HTML help 
-    (see \ref cfg_generate_htmlhelp "GENERATE_HTMLHELP") in the 
-    config file, then you need the Microsoft HTML help workshop. 
-    You can download it from 
-    <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/htmlhelp/html/vsconHH1Start.asp">Microsoft</a>.
-
-<li>If you want to produce Qt Compressed Help files (see \ref 
-    cfg_qhelgenerator_loc "QHG_LOCATION") in the config file,
-    then you need qhelpgenerator which is part of Qt. 
-    You can download Qt from
-    <a href="http://qt-project.org/downloads">Qt Software Downloads</a>.
-
-<li><a href="http://www.graphviz.org/">
-    the Graph visualization toolkit version 1.8.10</a><br>
-    Needed for the include dependency graphs, the graphical inheritance graphs,
-    and the collaboration graphs.
-</ul>
-
--->
-
-\section build_tools Tools used to develop doxygen
-
-Doxygen was developed and tested under Linux &amp; MacOSX using the following 
-open-source tools:
-<ul>
-<li>GCC version 4.6.3 (Linux) and 4.2.1 (MacOSX)
-<li>GNU flex version 2.5.35 
-<li>GNU bison version 2.5 (Linux) and 2.3 (MacOSX)
-<li>GNU make version 3.81
-<li>Perl version 5.12
-<li>Python version 2.7 and 3.4
-<li>TeX Live 2009 (or later)
-</ul>
-
 \htmlonly
 Go to the <a href="starting.html">next</a> section or return to the
  <a href="index.html">index</a>.
diff --git a/doc/language.tpl b/doc/language.tpl
index 78e3e97..01d906b 100644
--- a/doc/language.tpl
+++ b/doc/language.tpl
@@ -5,7 +5,7 @@ change the language.doc, make the changes here and inside maintainers.txt.
 /******************************************************************************
  * %(editnote)s
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
diff --git a/doc/markdown.doc b/doc/markdown.doc
index e97b29e..87af3d8 100644
--- a/doc/markdown.doc
+++ b/doc/markdown.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -390,6 +390,12 @@ int func(int a,int b) { return a*b; }
 
 The curly braces and dot are optional by the way.
 
+Another way to denote fenced code blocks is to use 3 or more backticks (```):
+
+    ```
+    also a fenced code block
+    ```
+
 \subsection md_header_id Header Id Attributes
 
 Standard Markdown has no support for labeling headers, which
diff --git a/doc/output.doc b/doc/output.doc
index 2cb81bd..3a24a60 100644
--- a/doc/output.doc
+++ b/doc/output.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/doc/preprocessing.doc b/doc/preprocessing.doc
index 0ba9b12..d62bbb3 100644
--- a/doc/preprocessing.doc
+++ b/doc/preprocessing.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/doc/searching.doc b/doc/searching.doc
index 25dcc3a..dcf858f 100644
--- a/doc/searching.doc
+++ b/doc/searching.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/doc/starting.doc b/doc/starting.doc
index a465d3f..081ef8b 100644
--- a/doc/starting.doc
+++ b/doc/starting.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/doc/translator.py b/doc/translator.py
index 19277be..69e7de8 100644
--- a/doc/translator.py
+++ b/doc/translator.py
@@ -1796,7 +1796,9 @@ class TrManager:
         # document template.

         tplDic = {}

 

-        s = 'Do not edit this file. It was generated by the %s script. * Instead edit %s and %s' % (self.script_name, self.languageTplFileName, self.maintainersFileName)

+        s = ('Do not edit this file. It was generated by the %s script.\n' +\

+             ' * Edit the %s and %s files instead.') % (

+             self.script_name, self.languageTplFileName, self.maintainersFileName)

         tplDic['editnote'] = s

 

         tplDic['doxVersion'] = self.doxVersion

@@ -1987,17 +1989,14 @@ if __name__ == '__main__':
 

     # The Python 2.6+ or 3.3+ is required.

     major, minor, patch = (int(e) for e in platform.python_version_tuple())

-    print(major, minor, patch)

     if (major == 2 and minor < 6) or (major == 3 and minor < 0):

         print('Python 2.6+ or Python 3.0+ are required for the script')

         sys.exit(1)

 

-    # The translator manager builds the transl objects, parses the related

+    # The translator manager builds the Transl objects, parses the related

     # sources, and keeps them in memory.

     trMan = TrManager()

 

-    # Generate the language.doc.

+    # Process the Transl objects and generate the output files.

     trMan.generateLanguageDoc()

-

-    # Generate the translator report.

     trMan.generateTranslatorReport()

diff --git a/doc/trouble.doc b/doc/trouble.doc
index d36e330..47ef623 100644
--- a/doc/trouble.doc
+++ b/doc/trouble.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -18,8 +18,6 @@
 
 \section knowproblems Known Problems
 <ul>
-<li>If you have problems building doxygen from sources, please 
-    read \ref unix_problems "this section" first.
 <li>Doxygen is <em>not</em> a real compiler, it is only a lexical scanner.
     This means that it can and will not detect errors in your source code.
 <li>Doxygen has a build in preprocessor, but this works slightly different than
diff --git a/doc/xmlcmds.doc b/doc/xmlcmds.doc
index 0e8aa64..501bf91 100644
--- a/doc/xmlcmds.doc
+++ b/doc/xmlcmds.doc
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644
index 0000000..d689eda
--- /dev/null
+++ b/examples/CMakeLists.txt
@@ -0,0 +1,222 @@
+if (build_doc)
+
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/examples)
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/html/examples)
+file(GLOB EXAMPLE_FILES "*")
+
+if (DOT)
+  set(DIAGRAM_EXAMPLE ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html)
+endif()
+
+# copy all example files
+add_custom_target(copy_examples)
+foreach(example_file ${EXAMPLE_FILES})
+  add_custom_command(TARGET copy_examples PRE_BUILD
+                     COMMAND ${CMAKE_COMMAND} -E
+                         copy ${example_file} ${PROJECT_BINARY_DIR}/examples)
+endforeach()
+
+add_custom_target(examples
+	DEPENDS doxygen copy_examples
+                ${PROJECT_BINARY_DIR}/html/examples/class/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/define/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/enum/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/file/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/func/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/page/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/relates/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/author/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/par/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/overload/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/example/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/include/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/qtstyle/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/jdstyle/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/structcmd/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/autolink/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/restypedef/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/afterdoc/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/template/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/tag/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/group/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/memgrp/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/docstring/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/pyexample/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/tclexample/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/mux/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/manual/html/index.html
+                ${DIAGRAM_EXAMPLE}
+	WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/examples
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen class.cfg
+	DEPENDS doxygen class.h class.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/class/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen define.cfg
+	DEPENDS doxygen define.h define.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/define/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen enum.cfg
+	DEPENDS doxygen enum.h enum.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/enum/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen file.cfg
+	DEPENDS doxygen file.h file.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/file/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen func.cfg
+	DEPENDS doxygen func.h func.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/func/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen page.cfg
+	DEPENDS doxygen page.doc page.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/page/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen relates.cfg
+	DEPENDS doxygen relates.cpp relates.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/relates/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen author.cfg
+	DEPENDS doxygen author.cpp author.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/author/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen par.cfg
+	DEPENDS doxygen par.cpp par.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/par/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen overload.cfg
+	DEPENDS doxygen overload.cpp overload.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/overload/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen example.cfg
+	DEPENDS doxygen example.cpp example_test.cpp example.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/example/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen include.cfg
+	DEPENDS doxygen include.cpp example_test.cpp include.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/include/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen qtstyle.cfg
+	DEPENDS doxygen qtstyle.cpp qtstyle.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/qtstyle/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen jdstyle.cfg
+	DEPENDS doxygen jdstyle.cpp jdstyle.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/jdstyle/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen structcmd.cfg
+	DEPENDS doxygen structcmd.h structcmd.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/structcmd/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen autolink.cfg
+	DEPENDS doxygen autolink.cpp autolink.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/autolink/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen tag.cfg
+	DEPENDS doxygen tag.cpp tag.cfg ${PROJECT_BINARY_DIR}/html/examples/example/html/index.html
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/tag/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen restypedef.cfg
+	DEPENDS doxygen restypedef.cpp restypedef.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/restypedef/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen afterdoc.cfg
+	DEPENDS doxygen afterdoc.h afterdoc.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/afterdoc/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen templ.cfg
+	DEPENDS doxygen templ.cpp templ.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/template/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen group.cfg
+	DEPENDS doxygen group.cpp group.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/group/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen memgrp.cfg
+	DEPENDS doxygen memgrp.cpp memgrp.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/memgrp/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen pyexample.cfg
+	DEPENDS doxygen pyexample.py pyexample.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/pyexample/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen tclexample.cfg
+	DEPENDS doxygen tclexample.tcl tclexample.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/tclexample/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen mux.cfg
+	DEPENDS doxygen mux.vhdl mux.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/mux/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen manual.cfg
+	DEPENDS doxygen manual.c manual.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/manual/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen docstring.cfg
+	DEPENDS doxygen docstring.py docstring.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/docstring/html/index.html
+)
+
+if (DOT)
+  add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen diagrams.cfg
+	DEPENDS doxygen diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html
+  )
+endif(DOT)
+
+endif()
diff --git a/examples/Makefile.in b/examples/Makefile.in
deleted file mode 100644
index b9c9f20..0000000
--- a/examples/Makefile.in
+++ /dev/null
@@ -1,129 +0,0 @@
-DOXYGEN_BIN="$(DOXYGEN)/bin/doxygen"
-
-all: class/html/index.html \
-     define/html/index.html \
-     enum/html/index.html \
-     file/html/index.html \
-     func/html/index.html \
-     page/html/index.html \
-     relates/html/index.html \
-     author/html/index.html \
-     par/html/index.html \
-     overload/html/index.html \
-     example/html/index.html \
-     include/html/index.html \
-     qtstyle/html/index.html \
-     jdstyle/html/index.html \
-     structcmd/html/index.html \
-     autolink/html/index.html \
-     restypedef/html/index.html \
-     afterdoc/html/index.html \
-     template/html/index.html \
-     tag/html/index.html \
-     group/html/index.html \
-     diagrams/html/index.html \
-     memgrp/html/index.html \
-     docstring/html/index.html \
-     pyexample/html/index.html \
-     tclexample/html/index.html \
-     mux/html/index.html \
-     manual/html/index.html
-
-# Disabled since it is broken :-(
-#     dbusxml/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 mux manual dbusxml tclexample
-
-class/html/index.html: class.h class.cfg
-	$(DOXYGEN_BIN) class.cfg
-
-define/html/index.html: define.h define.cfg
-	$(DOXYGEN_BIN) define.cfg
-
-enum/html/index.html: enum.h enum.cfg
-	$(DOXYGEN_BIN) enum.cfg
-
-file/html/index.html: file.h file.cfg
-	$(DOXYGEN_BIN) file.cfg
-
-func/html/index.html: func.h func.cfg
-	$(DOXYGEN_BIN) func.cfg
-
-page/html/index.html: page.doc page.cfg
-	$(DOXYGEN_BIN) page.cfg
-
-relates/html/index.html: relates.cpp relates.cfg
-	$(DOXYGEN_BIN) relates.cfg
-
-author/html/index.html: author.cpp author.cfg
-	$(DOXYGEN_BIN) author.cfg
-
-par/html/index.html: par.cpp par.cfg
-	$(DOXYGEN_BIN) par.cfg
-
-overload/html/index.html: overload.cpp overload.cfg
-	$(DOXYGEN_BIN) overload.cfg
-
-example/html/index.html: example.cpp example_test.cpp example.cfg
-	$(DOXYGEN_BIN) example.cfg
-
-include/html/index.html: include.cpp example_test.cpp include.cfg
-	$(DOXYGEN_BIN) include.cfg
-
-qtstyle/html/index.html: qtstyle.cpp qtstyle.cfg
-	$(DOXYGEN_BIN) qtstyle.cfg
-
-jdstyle/html/index.html: jdstyle.cpp jdstyle.cfg
-	$(DOXYGEN_BIN) jdstyle.cfg
-
-structcmd/html/index.html: structcmd.h structcmd.cfg
-	$(DOXYGEN_BIN) structcmd.cfg
-
-autolink/html/index.html: autolink.cpp autolink.cfg
-	$(DOXYGEN_BIN) autolink.cfg
-
-tag/html/index.html: tag.cpp tag.cfg example/html/index.html
-	$(DOXYGEN_BIN) tag.cfg
-
-restypedef/html/index.html: restypedef.cpp restypedef.cfg
-	$(DOXYGEN_BIN) restypedef.cfg
-
-afterdoc/html/index.html: afterdoc.h afterdoc.cfg
-	$(DOXYGEN_BIN) afterdoc.cfg
-
-template/html/index.html: templ.cpp templ.cfg
-	$(DOXYGEN_BIN) templ.cfg
-
-group/html/index.html: group.cpp group.cfg
-	$(DOXYGEN_BIN) group.cfg
-
-memgrp/html/index.html: memgrp.cpp memgrp.cfg
-	$(DOXYGEN_BIN) memgrp.cfg
-
-pyexample/html/index.html: pyexample.py pyexample.cfg
-	$(DOXYGEN_BIN) pyexample.cfg
-
-tclexample/html/index.html: tclexample.tcl tclexample.cfg
-	$(DOXYGEN_BIN) tclexample.cfg
-
-mux/html/index.html: mux.vhdl mux.cfg
-	$(DOXYGEN_BIN) mux.cfg
-
-manual/html/index.html: manual.c manual.cfg
-	$(DOXYGEN_BIN) manual.cfg
-
-docstring/html/index.html: docstring.py docstring.cfg
-	$(DOXYGEN_BIN) docstring.cfg
-
-#dbusxml/html/index.html: dbusxml.xml dbusxml.cfg
-#	$(DOXYGEN_BIN) dbusxml.cfg
-
-diagrams/html/index.html: diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg
-ifneq ($(HAVE_DOT),)
-	$(DOXYGEN_BIN) diagrams.cfg
-endif
-
diff --git a/examples/Makefile.win.in b/examples/Makefile.win.in
deleted file mode 100644
index 914c5ed..0000000
--- a/examples/Makefile.win.in
+++ /dev/null
@@ -1,122 +0,0 @@
-DOXYDIR = ..\bin
-
-all: class/html/index.html \
-     define/html/index.html \
-     enum/html/index.html \
-     file/html/index.html \
-     func/html/index.html \
-     page/html/index.html \
-     relates/html/index.html \
-     author/html/index.html \
-     par/html/index.html \
-     overload/html/index.html \
-     example/html/index.html \
-     include/html/index.html \
-     qtstyle/html/index.html \
-     jdstyle/html/index.html \
-     structcmd/html/index.html \
-     autolink/html/index.html \
-     restypedef/html/index.html \
-     afterdoc/html/index.html \
-     template/html/index.html \
-     tag/html/index.html \
-     group/html/index.html \
-     diagrams/html/index.html \
-     memgrp/html/index.html \
-     docstring/html/index.html \
-     pyexample/html/index.html \
-     tclexample/html/index.html \
-     mux/html/index.html \
-     manual/html/index.html
-
-clean:
-	del /s/y class define enum file pyexample tclexample docstring
-	del /s/y func page relates author
-	del /s/y par overload example include qtstyle 
-	del /s/y jdstyle structcmd autolink resdefine mux manual
-	del /s/y restypedef afterdoc template tag group diagrams memgrp
-
-class/html/index.html: class.h class.cfg
-	$(DOXYDIR)\doxygen class.cfg
-
-define/html/index.html: define.h define.cfg
-	$(DOXYDIR)\doxygen define.cfg
-
-enum/html/index.html: enum.h enum.cfg
-	$(DOXYDIR)\doxygen enum.cfg
-
-file/html/index.html: file.h file.cfg
-	$(DOXYDIR)\doxygen file.cfg
-
-func/html/index.html: func.h func.cfg
-	$(DOXYDIR)\doxygen func.cfg
-
-page/html/index.html: page.doc page.cfg
-	$(DOXYDIR)\doxygen page.cfg
-
-relates/html/index.html: relates.cpp relates.cfg
-	$(DOXYDIR)\doxygen relates.cfg
-
-author/html/index.html: author.cpp author.cfg
-	$(DOXYDIR)\doxygen author.cfg
-
-par/html/index.html: par.cpp par.cfg
-	$(DOXYDIR)\doxygen par.cfg
-
-overload/html/index.html: overload.cpp overload.cfg
-	$(DOXYDIR)\doxygen overload.cfg
-
-example/html/index.html: example.cpp example_test.cpp example.cfg 
-	$(DOXYDIR)\doxygen example.cfg
-
-include/html/index.html: include.cpp example_test.cpp include.cfg 
-	$(DOXYDIR)\doxygen include.cfg
-
-qtstyle/html/index.html: qtstyle.cpp qtstyle.cfg 
-	$(DOXYDIR)\doxygen qtstyle.cfg
-
-jdstyle/html/index.html: jdstyle.cpp jdstyle.cfg 
-	$(DOXYDIR)\doxygen jdstyle.cfg
-
-structcmd/html/index.html: structcmd.h structcmd.cfg 
-	$(DOXYDIR)\doxygen structcmd.cfg
-
-autolink/html/index.html: autolink.cpp autolink.cfg 
-	$(DOXYDIR)\doxygen autolink.cfg
-
-tag/html/index.html: tag.cpp tag.cfg 
-	$(DOXYDIR)\doxygen tag.cfg
-
-restypedef/html/index.html: restypedef.cpp restypedef.cfg 
-	$(DOXYDIR)\doxygen restypedef.cfg
-
-afterdoc/html/index.html: afterdoc.h afterdoc.cfg
-	$(DOXYDIR)\doxygen afterdoc.cfg
-
-template/html/index.html: templ.cpp templ.cfg
-	$(DOXYDIR)\doxygen templ.cfg
-
-group/html/index.html: group.cpp group.cfg
-	$(DOXYDIR)\doxygen group.cfg
-
-memgrp/html/index.html: memgrp.cpp memgrp.cfg
-	$(DOXYDIR)\doxygen memgrp.cfg
-
-pyexample/html/index.html: pyexample.py pyexample.cfg
-	$(DOXYDIR)\doxygen pyexample.cfg
-
-tclexample/html/index.html: tclexample.tcl tclexample.cfg
-	$(DOXYDIR)\doxygen tclexample.cfg
-
-mux/html/index.html: mux.vhdl mux.cfg
-	$(DOXYDIR)\doxygen mux.cfg
-
-manual/html/index.html: manual.c manual.cfg
-	$(DOXYDIR)\doxygen manual.cfg
-
-docstring/html/index.html: docstring.py docstring.cfg
-	$(DOXYDIR)\doxygen docstring.cfg
-	
-diagrams/html/index.html: diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg
-	$(DOXYDIR)\doxygen diagrams.cfg
-
diff --git a/examples/afterdoc.cfg b/examples/afterdoc.cfg
index fcdbcae..37bb12d 100644
--- a/examples/afterdoc.cfg
+++ b/examples/afterdoc.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME      = "AfterDocs"
-OUTPUT_DIRECTORY  = afterdoc
+OUTPUT_DIRECTORY  = ../html/examples/afterdoc
 GENERATE_LATEX    = NO
 GENERATE_MAN      = NO
 GENERATE_RTF      = NO
diff --git a/examples/author.cfg b/examples/author.cfg
index 8bb04f7..c7b942c 100644
--- a/examples/author.cfg
+++ b/examples/author.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Author Command"
-OUTPUT_DIRECTORY = author
+OUTPUT_DIRECTORY = ../html/examples/author
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/autolink.cfg b/examples/autolink.cfg
index 406d52c..287b37d 100644
--- a/examples/autolink.cfg
+++ b/examples/autolink.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Automatic link generation"
-OUTPUT_DIRECTORY = autolink
+OUTPUT_DIRECTORY = ../html/examples/autolink
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/class.cfg b/examples/class.cfg
index f2c4796..579cc75 100644
--- a/examples/class.cfg
+++ b/examples/class.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Class Command"
-OUTPUT_DIRECTORY = class
+OUTPUT_DIRECTORY = ../html/examples/class
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/class.h b/examples/class.h
index e5a9121..b40b186 100644
--- a/examples/class.h
+++ b/examples/class.h
@@ -7,5 +7,5 @@ class Test
 /*! \class Test class.h "inc/class.h"
  *  \brief This is a test class.
  *
- * Some details about the Test class
+ * Some details about the Test class.
  */
diff --git a/examples/dbusxml.cfg b/examples/dbusxml.cfg
index 23b9dea..7b70772 100644
--- a/examples/dbusxml.cfg
+++ b/examples/dbusxml.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME      = "DBusXMLDocs"
-OUTPUT_DIRECTORY  = dbusxml
+OUTPUT_DIRECTORY  = ../html/examples/dbusxml
 GENERATE_LATEX    = NO
 GENERATE_MAN      = NO
 GENERATE_RTF      = NO
diff --git a/examples/define.cfg b/examples/define.cfg
index 547591e..8a12da8 100644
--- a/examples/define.cfg
+++ b/examples/define.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Define Command"
-OUTPUT_DIRECTORY = define
+OUTPUT_DIRECTORY = ../html/examples/define
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/diagrams.cfg b/examples/diagrams.cfg
index 9bc5551..5301786 100644
--- a/examples/diagrams.cfg
+++ b/examples/diagrams.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME       = "Diagrams"
-OUTPUT_DIRECTORY   = diagrams
+OUTPUT_DIRECTORY   = ../html/examples/diagrams
 HAVE_DOT           = YES
 EXTRACT_ALL        = YES
 GENERATE_LATEX     = NO
diff --git a/examples/docstring.cfg b/examples/docstring.cfg
index 2a5cd9a..bd65500 100644
--- a/examples/docstring.cfg
+++ b/examples/docstring.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Python"
-OUTPUT_DIRECTORY = docstring
+OUTPUT_DIRECTORY = ../html/examples/docstring
 EXTRACT_ALL      = YES
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
diff --git a/examples/enum.cfg b/examples/enum.cfg
index ed83670..7732be8 100644
--- a/examples/enum.cfg
+++ b/examples/enum.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Enum Command"
-OUTPUT_DIRECTORY = enum
+OUTPUT_DIRECTORY = ../html/examples/enum
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/example.cfg b/examples/example.cfg
index 4c5c869..f57e4ba 100644
--- a/examples/example.cfg
+++ b/examples/example.cfg
@@ -1,6 +1,6 @@
 PROJECT_NAME      = "Example Command"
-OUTPUT_DIRECTORY  = example
-GENERATE_TAGFILE  = example.tag
+OUTPUT_DIRECTORY  = ../html/examples/example
+#GENERATE_TAGFILE  = example.tag
 GENERATE_LATEX    = NO
 GENERATE_MAN      = NO
 GENERATE_RTF      = NO
diff --git a/examples/file.cfg b/examples/file.cfg
index e54b1c7..e622c1e 100644
--- a/examples/file.cfg
+++ b/examples/file.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "File Command"
-OUTPUT_DIRECTORY = file
+OUTPUT_DIRECTORY = ../html/examples/file
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/func.cfg b/examples/func.cfg
index 32c3190..4929f66 100644
--- a/examples/func.cfg
+++ b/examples/func.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Fn Command"
-OUTPUT_DIRECTORY = func
+OUTPUT_DIRECTORY = ../html/examples/func
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/group.cfg b/examples/group.cfg
index 98cc27e..7882713 100644
--- a/examples/group.cfg
+++ b/examples/group.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Grouping"
-OUTPUT_DIRECTORY = group
+OUTPUT_DIRECTORY = ../html/examples/group
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/include.cfg b/examples/include.cfg
index 8516b32..4ecdf8f 100644
--- a/examples/include.cfg
+++ b/examples/include.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Include Command"
-OUTPUT_DIRECTORY = include
+OUTPUT_DIRECTORY = ../html/examples/include
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/jdstyle.cfg b/examples/jdstyle.cfg
index 02bf18c..15eccee 100644
--- a/examples/jdstyle.cfg
+++ b/examples/jdstyle.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME      = "JavaDoc Style"
-OUTPUT_DIRECTORY  = jdstyle
+OUTPUT_DIRECTORY  = ../html/examples/jdstyle
 GENERATE_LATEX    = NO
 GENERATE_MAN      = NO
 GENERATE_RTF      = NO
diff --git a/examples/manual.cfg b/examples/manual.cfg
index 9359842..75d1fc5 100644
--- a/examples/manual.cfg
+++ b/examples/manual.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME           = "Manual inheritance and membership"
-OUTPUT_DIRECTORY       = manual
+OUTPUT_DIRECTORY       = ../html/examples/manual
 GENERATE_LATEX         = NO
 GENERATE_MAN           = NO
 GENERATE_RTF           = NO
diff --git a/examples/memgrp.cfg b/examples/memgrp.cfg
index a69c33c..dea742c 100644
--- a/examples/memgrp.cfg
+++ b/examples/memgrp.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME         = "Member Grouping"
-OUTPUT_DIRECTORY     = memgrp
+OUTPUT_DIRECTORY     = ../html/examples/memgrp
 GENERATE_LATEX       = NO
 GENERATE_MAN         = NO
 GENERATE_RTF         = NO
diff --git a/examples/mux.cfg b/examples/mux.cfg
index ccb0f05..11aa7ca 100644
--- a/examples/mux.cfg
+++ b/examples/mux.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME         = Mux
-OUTPUT_DIRECTORY     = mux
+OUTPUT_DIRECTORY     = ../html/examples/mux
 GENERATE_LATEX       = NO
 GENERATE_MAN         = NO
 GENERATE_RTF         = NO
diff --git a/examples/overload.cfg b/examples/overload.cfg
index d29cb9c..9677065 100644
--- a/examples/overload.cfg
+++ b/examples/overload.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Overloaded Command"
-OUTPUT_DIRECTORY = overload
+OUTPUT_DIRECTORY = ../html/examples/overload
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/page.cfg b/examples/page.cfg
index cd1ff84..980cb17 100644
--- a/examples/page.cfg
+++ b/examples/page.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Page Command"
-OUTPUT_DIRECTORY = page
+OUTPUT_DIRECTORY = ../html/examples/page
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/par.cfg b/examples/par.cfg
index de6caa9..5be0e03 100644
--- a/examples/par.cfg
+++ b/examples/par.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Par Command"
-OUTPUT_DIRECTORY = par
+OUTPUT_DIRECTORY = ../html/examples/par
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/pyexample.cfg b/examples/pyexample.cfg
index 27db0f7..9b44984 100644
--- a/examples/pyexample.cfg
+++ b/examples/pyexample.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Python"
-OUTPUT_DIRECTORY = pyexample
+OUTPUT_DIRECTORY = ../html/examples/pyexample
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/qtstyle.cfg b/examples/qtstyle.cfg
index 0a930be..beae9e4 100644
--- a/examples/qtstyle.cfg
+++ b/examples/qtstyle.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Qt Style"
-OUTPUT_DIRECTORY = qtstyle
+OUTPUT_DIRECTORY = ../html/examples/qtstyle
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/relates.cfg b/examples/relates.cfg
index 4e1d90b..9155a7e 100644
--- a/examples/relates.cfg
+++ b/examples/relates.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Relates Command"
-OUTPUT_DIRECTORY = relates
+OUTPUT_DIRECTORY = ../html/examples/relates
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/restypedef.cfg b/examples/restypedef.cfg
index c55926e..6282a64 100644
--- a/examples/restypedef.cfg
+++ b/examples/restypedef.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Resolving Typedefs"
-OUTPUT_DIRECTORY = restypedef
+OUTPUT_DIRECTORY = ../html/examples/restypedef
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/structcmd.cfg b/examples/structcmd.cfg
index f956ad4..d60cfcf 100644
--- a/examples/structcmd.cfg
+++ b/examples/structcmd.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Structural commands"
-OUTPUT_DIRECTORY = structcmd
+OUTPUT_DIRECTORY = ../html/examples/structcmd
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/tag.cfg b/examples/tag.cfg
index 3627281..97d7d2f 100644
--- a/examples/tag.cfg
+++ b/examples/tag.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Tag Files"
-OUTPUT_DIRECTORY = tag
+OUTPUT_DIRECTORY = ../html/examples/tag
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/tclexample.cfg b/examples/tclexample.cfg
index bde5cc4..e51f4fc 100644
--- a/examples/tclexample.cfg
+++ b/examples/tclexample.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME       = "Tcl"
-OUTPUT_DIRECTORY   = tclexample
+OUTPUT_DIRECTORY   = ../html/examples/tclexample
 GENERATE_LATEX     = NO
 GENERATE_MAN       = NO
 GENERATE_RTF       = NO
diff --git a/examples/templ.cfg b/examples/templ.cfg
index c8d9514..eb59559 100644
--- a/examples/templ.cfg
+++ b/examples/templ.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Template Test"
-OUTPUT_DIRECTORY = template
+OUTPUT_DIRECTORY = ../html/examples/template
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/jquery/jquery.ui-1.8.18.core.js b/jquery/jquery.ui-1.8.18.core.js
index 98b4f9b..e6f1212 100644
--- a/jquery/jquery.ui-1.8.18.core.js
+++ b/jquery/jquery.ui-1.8.18.core.js
@@ -226,7 +226,7 @@ $(function() {
 		div = body.appendChild( div = document.createElement( "div" ) );
 
 	// access offsetHeight before setting the style to prevent a layout bug
-	// in IE 9 which causes the elemnt to continue to take up space even
+	// in IE 9 which causes the element to continue to take up space even
 	// after it is removed from the DOM (#8026)
 	div.offsetHeight;
 
diff --git a/libmd5/CMakeLists.txt b/libmd5/CMakeLists.txt
new file mode 100644
index 0000000..4d98d01
--- /dev/null
+++ b/libmd5/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(md5
+md5.c
+)
diff --git a/qtools/CMakeLists.txt b/qtools/CMakeLists.txt
new file mode 100644
index 0000000..96c0f27
--- /dev/null
+++ b/qtools/CMakeLists.txt
@@ -0,0 +1,57 @@
+include_directories(.)
+
+list(APPEND qtools_src
+qbuffer.cpp
+qcollection.cpp
+qcstring.cpp
+qdatastream.cpp
+qdatetime.cpp
+qdir.cpp
+qfile.cpp
+qfileinfo.cpp
+qgarray.cpp
+qgcache.cpp
+qgdict.cpp
+qglist.cpp
+qglobal.cpp
+qgstring.cpp
+qgvector.cpp
+qiodevice.cpp
+qregexp.cpp
+qstring.cpp
+qtextstream.cpp
+qtextcodec.cpp
+qstringlist.cpp
+qxml.cpp
+qmap.cpp
+qthread.cpp
+qmutex.cpp
+qutfcodec.cpp
+)
+
+if (UNIX)
+list(APPEND qtools_src
+qfile_unix.cpp
+qdir_unix.cpp
+qfileinfo_unix.cpp
+qthread_unix.cpp
+qmutex_unix.cpp
+qwaitcondition_unix.cpp
+)
+endif()
+
+if (WIN32)
+list(APPEND qtools_src
+qfile_win32.cpp
+qdir_win32.cpp
+qfileinfo_win32.cpp
+qthread_win32.cpp
+qmutex_win32.cpp
+qwaitcondition_win32.cpp
+
+)
+endif()
+
+add_library(qtools
+${qtools_src}
+)
diff --git a/qtools/Doxyfile b/qtools/Doxyfile
index 644eee5..41f2ad9 100644
--- a/qtools/Doxyfile
+++ b/qtools/Doxyfile
@@ -196,7 +196,7 @@ EXTRA_SEARCH_MAPPINGS  =
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
-GENERATE_LATEX         = NO
+GENERATE_LATEX         = YES
 LATEX_OUTPUT           =
 LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
diff --git a/qtools/qcstring.cpp b/qtools/qcstring.cpp
index 49bf842..45ccef9 100644
--- a/qtools/qcstring.cpp
+++ b/qtools/qcstring.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2004 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -31,7 +31,7 @@ QCString &QCString::sprintf( const char *format, ... )
   const int minlen=256;
   int l = length();
   if (l<minlen) { resize(minlen); l=minlen; }
-  int n=vsnprintf( data(), l, format, ap);
+  int n=vsnprintf( rawData(), l, format, ap);
   if (n<0) n=l;
   resize(n+1);
   va_end( ap );
@@ -62,7 +62,7 @@ int QCString::find( const char *str, int index, bool cs ) const
   if (index<0 || index>=l) return -1; // index outside string
   if (!str)  return -1;               // no string to search for
   if (!*str) return index;           // empty string matching at index
-  register char *pos;
+  register const char *pos;
   if (cs) // case sensitive
   {
     pos = strstr(data()+index,str);
@@ -132,7 +132,7 @@ int QCString::findRev( const char *str, int index, bool cs) const
   else if (index>len) return -1; // bad index
   else if (index+slen>len) index=len-slen; // str would be too long
   if (index<0) return -1; // no match possible
-  register char *pos = data()+index;
+  register const char *pos = data()+index;
   if (cs) // case sensitive
   {
     for (int i=index; i>=0; i--) if (qstrncmp(pos--,str,slen)==0) return i;
@@ -204,9 +204,7 @@ bool QCString::stripPrefix(const char *prefix)
   int len = qstrlen(prefix);
   if (qstrncmp(prefix,data(),len)==0)
   {
-    int newlen = length()-len+1;
-    qmemmove(data(),data()+len,newlen);
-    resize(newlen);
+    m_rep=mid(len,length()-len).m_rep; // need to make a deep copy
     return TRUE;
   }
   return FALSE;
@@ -225,7 +223,7 @@ QCString QCString::left( uint len )  const
   else
   {
     QCString s( len+1 );
-    memcpy( s.data(), data(), len);
+    memcpy( s.rawData(), data(), len);
     return s;
   }
 }
@@ -255,9 +253,9 @@ QCString QCString::mid( uint index, uint len) const
   }
   else
   {
-    register char *p = data()+index;
+    register const char *p = data()+index;
     QCString s(len+1);
-    qstrncpy( s.data(), p, len+1 );
+    qstrncpy( s.rawData(), p, len+1 );
     return s;
   }
 }
@@ -266,7 +264,7 @@ QCString QCString::lower() const
 {
   if (length()==0) return QCString();
   QCString s(data());
-  register char *pos = s.data();
+  register char *pos = s.rawData();
   if (pos)
   {
     while (*pos)
@@ -282,7 +280,7 @@ QCString QCString::upper() const
 {
   if (length()==0) return QCString();
   QCString s(data());
-  register char *pos = s.data();
+  register char *pos = s.rawData();
   if (pos)
   {
     while (*pos)
@@ -299,13 +297,13 @@ QCString QCString::stripWhiteSpace() const
   if ( isEmpty() )                            // nothing to do
     return *this;
 
-  register char *s = data();
+  register const char *cs = data();
   int reslen = length();
-  if ( !isspace((uchar)s[0]) && !isspace((uchar)s[reslen-1]) )
+  if ( !isspace((uchar)cs[0]) && !isspace((uchar)cs[reslen-1]) )
     return *this;                             // returns a copy
 
-  QCString result(s);
-  s = result.data();
+  QCString result(cs);
+  register char *s = result.rawData();
   int start = 0;
   int end = reslen - 1;
   while ( isspace((uchar) s[start]) )                 // skip white space from start
@@ -317,7 +315,7 @@ QCString QCString::stripWhiteSpace() const
   while ( end && isspace((uchar) s[end]) )            // skip white space from end
     end--;
   end -= start - 1;
-  qmemmove( result.data(), &s[start], end );
+  qmemmove( s, &s[start], end );
   result.resize( end + 1 );
   return result;
 }
@@ -328,8 +326,8 @@ QCString QCString::simplifyWhiteSpace() const
     return *this;
 
   QCString result( length()+1 );
-  char *from  = data();
-  char *to    = result.data();
+  const char *from  = data();
+  char *to    = result.rawData();
   char *first = to;
   while ( TRUE )
   {
@@ -363,14 +361,14 @@ QCString &QCString::insert( uint index, const char *s )
   if ((int)index>=olen)
   {
     resize(nlen+index-olen+1);
-    memset(data()+olen, ' ', index-olen);
-    memcpy(data()+index,s, len+1);
+    memset(rawData()+olen, ' ', index-olen);
+    memcpy(rawData()+index,s, len+1);
   }
   else
   {
     resize(nlen+1);
-    qmemmove(data()+index+len,data()+index,olen-index+1);
-    memcpy(data()+index,s,len);
+    qmemmove(rawData()+index+len,data()+index,olen-index+1);
+    memcpy(rawData()+index,s,len);
   }
   return *this;
 }
@@ -402,8 +400,10 @@ QCString &QCString::remove( uint index, uint len )
   }
   else if ( len != 0 )
   {
-    qmemmove( data()+index, data()+index+len, olen-index-len+1 );
+    QCString tmp(olen-index-len+1);
+    qmemmove( tmp.rawData(), data()+index+len, olen-index-len+1 );
     resize( olen-len+1 );
+    memcpy( rawData()+index,tmp.data(),tmp.length() );
   }
   return *this;
 }
@@ -635,7 +635,7 @@ QDataStream &operator>>( QDataStream &s, QCString &str )
 	len = 0;
     }
     if ( len > 0 )				// not null array
-	s.readRawBytes( str.data(), (uint)len );
+	s.readRawBytes( str.rawData(), (uint)len );
     return s;
 }
 
diff --git a/qtools/qcstring.h b/qtools/qcstring.h
index bc3a091..d8ce074 100644
--- a/qtools/qcstring.h
+++ b/qtools/qcstring.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 1997-2004 by Dimitri van Heesch.
+** Copyright (C) 1997-2015 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
@@ -204,11 +204,20 @@ public:
     }
 
     /** Returns a pointer to the contents of the string in the form of a 0-terminated C string */
-    char *data() const
+    const char *data() const
     {
       return m_rep.data();
     }
 
+    /** Returns a writable pointer to the data.
+     *  @warning if the string is shared it will modifying the string directly and
+     *  this will overwrite all copies as well!
+     */
+    char *rawData() const
+    {
+      return m_rep.rawData();
+    }
+
     /** Resizes the string to hold \a newlen characters
      *  (this value should include the 0-terminator). If the string is enlarged the contents will
      *  be left unmodified.
@@ -242,7 +251,7 @@ public:
     {
       if (length()==0) return QCString();
       QCString cs(length()+1);
-      memcpy(cs.data(),data(),length());
+      memcpy(cs.rawData(),data(),length());
       return cs;
     }
 
@@ -299,7 +308,7 @@ public:
       int len1 = length();
       int len2 = (int)strlen(str);
       resize(len1+len2+1);
-      memcpy(data()+len1,str,len2);
+      memcpy(rawData()+len1,str,len2);
       return *this;
     }
 
@@ -308,7 +317,7 @@ public:
     {
       int len = length();
       resize(len+2);
-      data()[len]=c;
+      rawData()[len]=c;
       return *this;
     }
 
@@ -568,9 +577,21 @@ public:
         }
         uint length() const
         {
-          return u.s.isShort ? u.s.len : u.l.d->len;
+          uint l = u.s.isShort ? u.s.len : u.l.d->len;
+          return l;
         }
-        char *data() const
+        const char *data() const
+        {
+          if (u.s.isShort)
+          {
+            return u.s.len==0 ? 0 : u.s.str;
+          }
+          else
+          {
+            return u.l.d->len==0 ? 0 : u.l.d->toStr();
+          }
+        }
+        char *rawData() const
         {
           if (u.s.isShort)
           {
@@ -578,6 +599,7 @@ public:
           }
           else
           {
+            //assert(u.l.d->refCount==0); // string may not be shared when accessed raw
             return u.l.d->len==0 ? 0 : u.l.d->toStr();
           }
         }
@@ -645,24 +667,20 @@ public:
         bool fill( char c, int len )
         {
           if (len<0) len=length();
-          if (len!=(int)length())
+          if (!u.s.isShort) // detach from shared string
+          {
+            resize(len+1);
+          }
+          else if (len!=(int)length())
           {
             if (len>0)
             {
               resize(len+1);
             }
-            else
-            {
-              if (!u.s.isShort)
-              {
-                u.l.d->dispose();
-              }
-              initEmpty();
-            }
           }
           if (len>0)
           {
-            memset(data(),c,len);
+            memset(rawData(),c,len);
           }
           return TRUE;
         }
diff --git a/qtools/qfeatures.h b/qtools/qfeatures.h
index d6c2882..1042ce6 100644
--- a/qtools/qfeatures.h
+++ b/qtools/qfeatures.h
@@ -378,7 +378,7 @@
 */
 //#define QT_NO_QWS_DEPTH_1
 /*!
-    4-bit greyscale
+    4-bit grayscale
 */
 //#define QT_NO_QWS_DEPTH_4
 /*!
diff --git a/qtools/qglobal.h b/qtools/qglobal.h
index aa11f01..c3f7594 100644
--- a/qtools/qglobal.h
+++ b/qtools/qglobal.h
@@ -76,34 +76,6 @@
 #    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 + 10
-#  endif
-#  if !defined(MAC_OS_X_VERSION_10_4)
-#       define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 10
-#  endif
-#  if !defined(MAC_OS_X_VERSION_10_5)
-#       define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 10
-#  endif
-#  if !defined(MAC_OS_X_VERSION_10_6)
-#       define MAC_OS_X_VERSION_10_6 MAC_OS_X_VERSION_10_5 + 10
-#  endif
-#  if !defined(MAC_OS_X_VERSION_10_7)
-#       define MAC_OS_X_VERSION_10_7 MAC_OS_X_VERSION_10_6 + 10
-#  endif
-#  if !defined(MAC_OS_X_VERSION_10_8)
-#       define MAC_OS_X_VERSION_10_8 MAC_OS_X_VERSION_10_7 + 10
-#  endif
-#  if !defined(MAC_OS_X_VERSION_10_9)
-#       define MAC_OS_X_VERSION_10_9 MAC_OS_X_VERSION_10_8 + 10
-#  endif
-#  if !defined(MAC_OS_X_VERSION_10_10)
-#       define MAC_OS_X_VERSION_10_10 MAC_OS_X_VERSION_10_9 + 10
-#  endif
-#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_10)
-#    warning "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__)
diff --git a/qtools/qstring.cpp b/qtools/qstring.cpp
index 3673c20..f51c0d4 100644
--- a/qtools/qstring.cpp
+++ b/qtools/qstring.cpp
@@ -11963,7 +11963,7 @@ QChar* QString::asciiToUnicode( const QByteArray& ba, uint* len )
     int l = 0;
     while ( l < (int)ba.size() && ba[l] )
 	l++;
-    char* str = ba.data();
+    const char* str = ba.data();
     QChar *uc = new QChar[ l ];	  // Can't use macro, since function is public
     QChar *result = uc;
     if ( len )
@@ -11982,7 +11982,7 @@ static QChar* internalAsciiToUnicode( const QByteArray& ba, uint* len )
     int l = 0;
     while ( l < (int)ba.size() && ba[l] )
 	l++;
-    char* str = ba.data();
+    const char* str = ba.data();
     QChar *uc = QT_ALLOC_QCHAR_VEC( l );
     QChar *result = uc;
     if ( len )
@@ -15257,7 +15257,7 @@ QCString qt_winQString2MB( const QString& s, int uclen )
     QCString mb(bufSize);
     int len;
     while ( !(len=WideCharToMultiByte(CP_ACP, 0, (const WCHAR*)s.unicode(), uclen,
-		mb.data(), bufSize-1, 0, &used_def)) )
+		mb.rawData(), bufSize-1, 0, &used_def)) )
     {
 	int r = GetLastError();
 	if ( r == ERROR_INSUFFICIENT_BUFFER ) {
diff --git a/qtools/qtextcodec.cpp b/qtools/qtextcodec.cpp
index 168445f..bd874bb 100644
--- a/qtools/qtextcodec.cpp
+++ b/qtools/qtextcodec.cpp
@@ -1192,7 +1192,7 @@ public:
             lenInOut = uc.length();
         int rlen = lenInOut*max_bytes_per_char;
         QCString rstr(rlen);
-        char* cursor = rstr.data();
+        char* cursor = rstr.rawData();
         char* s=0;
         int l = lenInOut;
         int lout = 0;
@@ -1881,7 +1881,7 @@ QCString QSimpleTextCodec::fromUnicode(const QString& uc, int& len ) const
     int i = len;
     int u;
     const QChar* ucp = uc.unicode();
-    char* rp = r.data();
+    char* rp = r.rawData();
     char* rmp = reverseMap->data();
     int rmsize = (int) reverseMap->size();
     while( i-- )
diff --git a/qtools/qtextstream.cpp b/qtools/qtextstream.cpp
index bae072d..4ebf59e 100644
--- a/qtools/qtextstream.cpp
+++ b/qtools/qtextstream.cpp
@@ -1443,17 +1443,17 @@ QTextStream &QTextStream::operator>>( QCString &str )
 	if ( i >= buflen-1 ) {
 	    if ( !dynbuf )  {			// create dynamic buffer
 		dynbuf = new QCString(buflen*2);
-		memcpy( dynbuf->data(), s, i );	// copy old data
+		memcpy( dynbuf->rawData(), s, i );	// copy old data
 	    } else if ( i >= (int)dynbuf->size()-1 ) {
 		dynbuf->resize( dynbuf->size()*2 );
 	    }
-	    s = dynbuf->data();
+	    s = dynbuf->rawData();
 	}
 	s[i++] = c;
 	c = ts_getc();
     }
     str.resize( i+1 );
-    memcpy( str.data(), s, i );
+    memcpy( str.rawData(), s, i );
     delete dynbuf;
     return *this;
 }
diff --git a/qtools/qutfcodec.cpp b/qtools/qutfcodec.cpp
index c7094ad..a37e37f 100644
--- a/qtools/qutfcodec.cpp
+++ b/qtools/qutfcodec.cpp
@@ -203,14 +203,14 @@ public:
 	if ( headerdone ) {
 	    len_in_out = uc.length()*(int)sizeof(QChar);
 	    QCString d(len_in_out);
-	    memcpy(d.data(),uc.unicode(),len_in_out);
+	    memcpy(d.rawData(),uc.unicode(),len_in_out);
 	    return d;
 	} else {
 	    headerdone = TRUE;
 	    len_in_out = (1+uc.length())*(int)sizeof(QChar);
 	    QCString d(len_in_out);
-	    memcpy(d.data(),&QChar::byteOrderMark,sizeof(QChar));
-	    memcpy(d.data()+sizeof(QChar),uc.unicode(),uc.length()*sizeof(QChar));
+	    memcpy(d.rawData(),&QChar::byteOrderMark,sizeof(QChar));
+	    memcpy(d.rawData()+sizeof(QChar),uc.unicode(),uc.length()*sizeof(QChar));
 	    return d;
 	}
     }
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..155bf77
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,242 @@
+# vim:ts=4:sw=4:expandtab:autoindent:
+
+include_directories(
+    ${CMAKE_SOURCE_DIR}/qtools
+    ${CMAKE_SOURCE_DIR}/libmd5
+    ${CMAKE_SOURCE_DIR}/vhdlparser/
+    ${CMAKE_SOURCE_DIR}/src
+    ${CLANG_INCLUDEDIR}
+    ${GENERATED_SRC}
+)
+
+
+file(MAKE_DIRECTORY ${GENERATED_SRC})
+file(GLOB LANGUAGE_FILES "${CMAKE_SOURCE_DIR}/src/translator_??.h")
+
+# instead of increasebuffer.py
+add_definitions(-DYY_BUF_SIZE=262144 -DYY_READ_BUF_SIZE=262144)
+
+# generate settings.h
+file(GENERATE OUTPUT ${GENERATED_SRC}/settings.h
+CONTENT "#ifndef SETTINGS_H
+#define SETTINGS_H
+#define USE_SQLITE3 ${sqlite3}
+#define USE_LIBCLANG ${clang}
+#define IS_SUPPORTED(x) \\
+  ((USE_SQLITE3  && strcmp(\"USE_SQLITE3\",(x))==0)  || \\
+   (USE_LIBCLANG && strcmp(\"USE_LIBCLANG\",(x))==0) || \\
+  0)
+#endif" )
+set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1)
+
+
+# generate version.cpp
+file(GENERATE OUTPUT ${GENERATED_SRC}/version.cpp
+    CONTENT "char versionString[]=\"${VERSION}\";"
+)
+set_source_files_properties(${GENERATED_SRC}/version.cpp PROPERTIES GENERATED 1)
+
+
+# configoptions.cpp
+add_custom_command(
+    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -cpp ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configoptions.cpp
+    DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py
+    OUTPUT ${GENERATED_SRC}/configoptions.cpp
+)
+set_source_files_properties(${GENERATED_SRC}/configoptions.cpp PROPERTIES GENERATED 1)
+
+
+# ce_parse.h
+add_custom_command(
+    COMMAND ${BISON_EXECUTABLE} -l -d -p ce_parsexpYY ${CMAKE_SOURCE_DIR}/src/constexp.y -o ce_parse.c
+    DEPENDS ${CMAKE_SOURCE_DIR}/src/constexp.y
+    OUTPUT ${GENERATED_SRC}/ce_parse.h
+    WORKING_DIRECTORY ${GENERATED_SRC}
+)
+set_source_files_properties(${GENERATED_SRC}/ce_parse.h PROPERTIES GENERATED 1)
+
+# lang_cfg.h
+add_custom_command(
+    COMMENT  "Generating ${GENERATED_SRC}/lang_cfg.h"
+    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/lang_cfg.cmake ${LANG_CODES} 2> ${GENERATED_SRC}/lang_cfg.h
+    DEPENDS ${LANGUAGE_FILES}
+    OUTPUT ${GENERATED_SRC}/lang_cfg.h
+)
+set_source_files_properties(${GENERATED_SRC}/lang_cfg.h PROPERTIES GENERATED 1)
+
+# all resource files
+file(GLOB RESOURCES ${CMAKE_SOURCE_DIR}/templates/*/*)
+
+# resources.cpp
+add_custom_command(
+    COMMENT  "Generating ${GENERATED_SRC}/resources.cpp"
+    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/res2cc_cmd.py ${CMAKE_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp
+    DEPENDS ${RESOURCES}
+    OUTPUT ${GENERATED_SRC}/resources.cpp
+)
+set_source_files_properties(${GENERATED_SRC}/resources.cpp PROPERTIES GENERATED 1)
+
+# layout_default.xml
+add_custom_command(
+    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/to_c_cmd.py < ${CMAKE_SOURCE_DIR}/src/layout_default.xml > ${GENERATED_SRC}/layout_default.xml.h
+    DEPENDS ${CMAKE_SOURCE_DIR}/src/layout_default.xml
+    OUTPUT  ${GENERATED_SRC}/layout_default.xml.h
+)
+set_source_files_properties(${GENERATED_SRC}/layout_default.xml.h PROPERTIES GENERATED 1)
+
+# Targets for flex/bison   generated files
+FLEX_TARGET(scanner        scanner.l        ${GENERATED_SRC}/scanner.cpp        COMPILE_FLAGS "-PscannerYY")
+FLEX_TARGET(code           code.l           ${GENERATED_SRC}/code.cpp           COMPILE_FLAGS "-PcodeYY")
+FLEX_TARGET(pyscanner      pyscanner.l      ${GENERATED_SRC}/pyscanner.cpp      COMPILE_FLAGS "-PpyscannerYY")
+FLEX_TARGET(pycode         pycode.l         ${GENERATED_SRC}/pycode.cpp         COMPILE_FLAGS "-PpycodeYY")
+FLEX_TARGET(fortranscanner fortranscanner.l ${GENERATED_SRC}/fortranscanner.cpp COMPILE_FLAGS "-PfortranscannerYY -i")
+FLEX_TARGET(fortrancode    fortrancode.l    ${GENERATED_SRC}/fortrancode.cpp    COMPILE_FLAGS "-PfortrancodeYY -i")
+FLEX_TARGET(vhdlcode       vhdlcode.l       ${GENERATED_SRC}/vhdlcode.cpp       COMPILE_FLAGS "-PvhdlcodeYY -i")
+FLEX_TARGET(tclscanner     tclscanner.l     ${GENERATED_SRC}/tclscanner.cpp     COMPILE_FLAGS "-PtclscannerYY -i")
+FLEX_TARGET(pre            pre.l            ${GENERATED_SRC}/pre.cpp            COMPILE_FLAGS "-PpreYY")
+FLEX_TARGET(declinfo       declinfo.l       ${GENERATED_SRC}/declinfo.cpp       COMPILE_FLAGS "-PdeclinfoYY")
+FLEX_TARGET(defargs        defargs.l        ${GENERATED_SRC}/defargs.cpp        COMPILE_FLAGS "-PdefargsYY")
+FLEX_TARGET(doctokenizer   doctokenizer.l   ${GENERATED_SRC}/doctokenizer.cpp   COMPILE_FLAGS "-PdoctokenizerYY")
+FLEX_TARGET(commentcnv     commentcnv.l     ${GENERATED_SRC}/commentcnv.cpp     COMPILE_FLAGS "-PcommentcnvYY")
+FLEX_TARGET(commentscan    commentscan.l    ${GENERATED_SRC}/commentscan.cpp    COMPILE_FLAGS "-PcommentscanYY")
+FLEX_TARGET(constexp       constexp.l       ${GENERATED_SRC}/constexp.cpp       COMPILE_FLAGS "-PconstexpYY")
+FLEX_TARGET(xmlcode        xmlcode.l        ${GENERATED_SRC}/xmlcode.cpp        COMPILE_FLAGS "-PxmlcodeYY")
+FLEX_TARGET(config         config.l         ${GENERATED_SRC}/config.cpp         COMPILE_FLAGS "-PconfigYY")
+
+BISON_TARGET(vhdlparser    vhdlparser.y     ${GENERATED_SRC}/vhdlparser.cpp     COMPILE_FLAGS "-l -p vhdlscannerYY")
+BISON_TARGET(constexp      constexp.y       ${GENERATED_SRC}/ce_parse.cpp       COMPILE_FLAGS "-l -p constexpYY")
+
+add_library(doxycfg
+    ${GENERATED_SRC}/lang_cfg.h
+    ${GENERATED_SRC}/config.cpp
+    ${GENERATED_SRC}/configoptions.cpp
+    portable.cpp
+    portable_c.c
+)
+
+add_library(_doxygen
+    # custom generated files
+    ${GENERATED_SRC}/lang_cfg.h
+    ${GENERATED_SRC}/settings.h
+    ${GENERATED_SRC}/layout_default.xml.h
+    ${GENERATED_SRC}/version.cpp
+    ${GENERATED_SRC}/ce_parse.h
+    ${GENERATED_SRC}/resources.cpp
+    # generated by flex/bison
+    ${GENERATED_SRC}/scanner.cpp
+    ${GENERATED_SRC}/code.cpp
+    ${GENERATED_SRC}/pyscanner.cpp
+    ${GENERATED_SRC}/pycode.cpp
+    ${GENERATED_SRC}/fortranscanner.cpp
+    ${GENERATED_SRC}/fortrancode.cpp
+    ${GENERATED_SRC}/vhdlcode.cpp
+    ${GENERATED_SRC}/tclscanner.cpp
+    ${GENERATED_SRC}/pre.cpp
+    ${GENERATED_SRC}/declinfo.cpp
+    ${GENERATED_SRC}/defargs.cpp
+    ${GENERATED_SRC}/doctokenizer.cpp
+    ${GENERATED_SRC}/commentcnv.cpp
+    ${GENERATED_SRC}/commentscan.cpp
+    ${GENERATED_SRC}/constexp.cpp
+    ${GENERATED_SRC}/xmlcode.cpp
+    #
+    ${GENERATED_SRC}/ce_parse.cpp
+    #
+    plantuml.cpp
+    arguments.cpp
+    cite.cpp
+    clangparser.cpp
+    fileparser.cpp
+    classdef.cpp
+    classlist.cpp
+    cmdmapper.cpp
+    condparser.cpp
+    context.cpp
+    cppvalue.cpp
+    debug.cpp
+    defgen.cpp
+    define.cpp
+    definition.cpp
+    diagram.cpp
+    dirdef.cpp
+    docparser.cpp
+    docsets.cpp
+    dot.cpp
+    doxygen.cpp
+    eclipsehelp.cpp
+    entry.cpp
+    filedef.cpp
+    filename.cpp
+    formula.cpp
+    ftextstream.cpp
+    ftvhelp.cpp
+    groupdef.cpp
+    htags.cpp
+    htmldocvisitor.cpp
+    htmlentity.cpp
+    resourcemgr.cpp
+    htmlgen.cpp
+    htmlhelp.cpp
+    image.cpp
+    index.cpp
+    language.cpp
+    latexdocvisitor.cpp
+    latexgen.cpp
+    layout.cpp
+    lodepng.cpp
+    logos.cpp
+    mandocvisitor.cpp
+    mangen.cpp
+    sqlite3gen.cpp
+    markdown.cpp
+    marshal.cpp
+    memberdef.cpp
+    membergroup.cpp
+    memberlist.cpp
+    membername.cpp
+    message.cpp
+    msc.cpp
+    dia.cpp
+    namespacedef.cpp
+    objcache.cpp
+    outputgen.cpp
+    outputlist.cpp
+    pagedef.cpp
+    perlmodgen.cpp
+    qhp.cpp
+    qhpxmlwriter.cpp
+    reflist.cpp
+    rtfdocvisitor.cpp
+    rtfgen.cpp
+    rtfstyle.cpp
+    searchindex.cpp
+    store.cpp
+    tagreader.cpp
+    template.cpp
+    textdocvisitor.cpp
+    tooltip.cpp
+    util.cpp
+    vhdldocgen.cpp
+    vhdljjparser.cpp
+    xmldocvisitor.cpp
+    xmlgen.cpp
+    docbookvisitor.cpp
+    docbookgen.cpp
+)
+
+add_executable(doxygen main.cpp)
+target_link_libraries(doxygen
+    _doxygen
+    doxycfg
+    qtools
+    md5
+    vhdlparser
+    ${SQLITE3_LIBRARIES}
+    ${ICONV_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${EXTRA_LIBS}
+    ${CLANG_LIBS}
+)
+
+install(TARGETS doxygen DESTINATION bin)
+
diff --git a/src/Makefile.in b/src/Makefile.in
deleted file mode 100644
index ffe7c16..0000000
--- a/src/Makefile.in
+++ /dev/null
@@ -1,53 +0,0 @@
-
-#
-#
-#
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby
-# granted. No representations are made about the suitability of this software
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-#
-# Documents produced by Doxygen are derivative works derived from the
-# input used in their production; they are not affected by this license.
-#
-
-GENERATED_SRC = ../generated_src/doxygen
-
-all: Makefile.libdoxygen Makefile.libdoxycfg Makefile.doxygen Makefile
-	$(MAKE) -f Makefile.libdoxycfg $@
-	$(MAKE) -f Makefile.libdoxygen $@
-	$(MAKE) -f Makefile.doxygen    $@
-
-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
-	$(ENV) $(PERL) "$(TMAKE)" libdoxycfg.pro >Makefile.libdoxycfg
-
-Makefile.doxygen: doxygen.pro
-	$(ENV) $(PERL) "$(TMAKE)" doxygen.pro >Makefile.doxygen
-
-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
-
-# also clean flex/bison generated files
-distclean: clean
-	-cd $(GENERATED_SRC) && $(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
-
-FORCE:
diff --git a/src/arguments.cpp b/src/arguments.cpp
index 2acf855..095aa96 100644
--- a/src/arguments.cpp
+++ b/src/arguments.cpp
@@ -32,6 +32,7 @@ ArgumentList *ArgumentList::deepCopy() const
   argList->volatileSpecifier  = volatileSpecifier;
   argList->pureSpecifier      = pureSpecifier;
   argList->trailingReturnType = trailingReturnType;
+  argList->isDeleted          = isDeleted;
 
   return argList;
 }
@@ -54,12 +55,14 @@ ArgumentList *ArgumentList::unmarshal(StorageIntf *s)
     a->array   = unmarshalQCString(s);
     a->defval  = unmarshalQCString(s);
     a->docs    = unmarshalQCString(s);
+    a->typeConstraint = unmarshalQCString(s);
     result->append(a);
   }
   result->constSpecifier     = unmarshalBool(s);
   result->volatileSpecifier  = unmarshalBool(s);
   result->pureSpecifier      = unmarshalBool(s);
   result->trailingReturnType = unmarshalQCString(s);
+  result->isDeleted          = unmarshalBool(s);
   return result;
 }
 
@@ -85,12 +88,14 @@ void ArgumentList::marshal(StorageIntf *s,ArgumentList *argList)
         marshalQCString(s,a->array);    
         marshalQCString(s,a->defval);    
         marshalQCString(s,a->docs);    
+        marshalQCString(s,a->typeConstraint);
       }
     }
     marshalBool(s,argList->constSpecifier);
     marshalBool(s,argList->volatileSpecifier);
     marshalBool(s,argList->pureSpecifier);
     marshalQCString(s,argList->trailingReturnType);
+    marshalBool(s,argList->isDeleted);
   }
 }
 
diff --git a/src/arguments.h b/src/arguments.h
index ed09869..555b573 100644
--- a/src/arguments.h
+++ b/src/arguments.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -30,37 +30,39 @@ struct Argument
   /*! Construct a new argument. */
   Argument() {}
   /*! Copy an argument (does a deep copy of all strings). */
-  Argument(const Argument &a) 
-  { 
-    attrib=a.attrib.copy();
-    type=a.type.copy(); 
-    name=a.name.copy(); 
-    defval=a.defval.copy(); 
-    docs=a.docs.copy();
-    array=a.array.copy();
+  Argument(const Argument &a)
+  {
+    attrib=a.attrib;
+    type=a.type;
+    name=a.name;
+    array=a.array;
+    defval=a.defval;
+    docs=a.docs;
+    typeConstraint=a.typeConstraint;
   }
   /*! Assignment of an argument (does a deep copy of all strings). */
   Argument &operator=(const Argument &a)
   {
     if (this!=&a)
     {
-      attrib=a.attrib.copy();
-      type=a.type.copy(); 
-      name=a.name.copy(); 
-      defval=a.defval.copy(); 
-      docs=a.docs.copy();
-      array=a.array.copy();
+      attrib=a.attrib;
+      type=a.type;
+      name=a.name;
+      array=a.array;
+      defval=a.defval;
+      docs=a.docs;
+      typeConstraint=a.typeConstraint;
     }
     return *this;
   }
   /*! return TRUE if this argument is documentation and the argument has a
    *  non empty name.
    */
-  bool hasDocumentation() const 
-  { 
-    return !name.isEmpty() && !docs.isEmpty(); 
+  bool hasDocumentation() const
+  {
+    return !name.isEmpty() && !docs.isEmpty();
   }
-  
+
   QCString attrib;   /*!< Argument's attribute (IDL only) */
   QCString type;     /*!< Argument's type */
   QCString canType;  /*!< Cached value of canonical type (after type resolution). Empty initially. */
@@ -68,6 +70,7 @@ struct Argument
   QCString array;    /*!< Argument's array specifier (may be empty) */
   QCString defval;   /*!< Argument's default value (may be empty) */
   QCString docs;     /*!< Argument's documentation (may be empty) */
+  QCString typeConstraint;  /*!< Used for Java generics: \<T extends C\> */
 };
 
 /*! \brief This class represents an function or template argument list. 
@@ -83,7 +86,8 @@ class ArgumentList : public QList<Argument>
     ArgumentList() : QList<Argument>(), 
                      constSpecifier(FALSE),
                      volatileSpecifier(FALSE),
-                     pureSpecifier(FALSE)
+                     pureSpecifier(FALSE),
+                     isDeleted(FALSE)
                      { setAutoDelete(TRUE); }
     /*! Destroys the argument list */
    ~ArgumentList() {}
@@ -99,7 +103,8 @@ class ArgumentList : public QList<Argument>
     bool pureSpecifier;
     /*! C++11 style Trailing return type? */
     QCString trailingReturnType;
-    /*! C++11 defaulted method */
+    /*! method with =delete */
+    bool isDeleted;
 
     static ArgumentList *unmarshal(StorageIntf *s);
     static void marshal(StorageIntf *s,ArgumentList *argList);
diff --git a/src/bufstr.h b/src/bufstr.h
index 7fb7d40..331def2 100644
--- a/src/bufstr.h
+++ b/src/bufstr.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/cite.cpp b/src/cite.cpp
index f0d7d66..2ea6300 100644
--- a/src/cite.cpp
+++ b/src/cite.cpp
@@ -63,7 +63,6 @@ void CiteDict::writeLatexBibliography(FTextStream &t)
   t << "\\bibliographystyle{" << style << "}\n"
        "\\bibliography{";
   QStrList &citeDataList = Config_getList("CITE_BIB_FILES");
-  QCString latexOutputDir = Config_getString("LATEX_OUTPUT")+"/";
   int i = 0;
   const char *bibdata = citeDataList.first();
   while (bibdata)
@@ -211,7 +210,7 @@ void CiteDict::generatePage() const
   QCString doc;
   QFileInfo fi(citeListFile);
   QCString input(fi.size()+1);
-  f.readBlock(input.data(),fi.size());
+  f.readBlock(input.rawData(),fi.size());
   f.close();
   input.at(fi.size())='\0';
   int p=0,s;
diff --git a/src/classdef.cpp b/src/classdef.cpp
index 5c42f57..95428d6 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -118,6 +118,8 @@ class ClassDefImpl
     UsesClassDict *usedByImplClassDict;
     UsesClassDict *usesIntfClassDict;
 
+    ConstraintClassDict *constraintClassDict;
+
     /*! Template instances that exists of this class, the key in the
      *  dictionary is the template argument list.
      */
@@ -216,6 +218,7 @@ void ClassDefImpl::init(const char *defFileName, const char *name,
   usesImplClassDict=0;
   usedByImplClassDict=0;
   usesIntfClassDict=0;
+  constraintClassDict=0;
   memberGroupSDict = 0;
   innerClasses = 0;
   subGrouping=Config_getBool("SUBGROUPING");
@@ -267,6 +270,7 @@ ClassDefImpl::~ClassDefImpl()
   delete usesImplClassDict;
   delete usedByImplClassDict;
   delete usesIntfClassDict;
+  delete constraintClassDict;
   delete incInfo;
   delete memberGroupSDict;
   delete innerClasses;
@@ -2526,20 +2530,67 @@ bool ClassDef::hasExamples() const
   return result;
 }
 
+void ClassDef::addTypeConstraint(const QCString &typeConstraint,const QCString &type)
+{
+  //printf("addTypeContraint(%s,%s)\n",type.data(),typeConstraint.data());
+  static bool hideUndocRelation = Config_getBool("HIDE_UNDOC_RELATIONS");
+  if (typeConstraint.isEmpty() || type.isEmpty()) return;
+  ClassDef *cd = getResolvedClass(this,getFileDef(),typeConstraint);
+  if (cd==0 && !hideUndocRelation)
+  {
+    cd = new ClassDef(getDefFileName(),getDefLine(),getDefColumn(),typeConstraint,ClassDef::Class);
+    cd->setUsedOnly(TRUE);
+    cd->setLanguage(getLanguage());
+    Doxygen::hiddenClasses->append(typeConstraint,cd);
+    //printf("Adding undocumented constraint '%s' to class %s on type %s\n",
+    //       typeConstraint.data(),name().data(),type.data());
+  }
+  if (cd)
+  {
+    if (m_impl->constraintClassDict==0)
+    {
+      m_impl->constraintClassDict = new ConstraintClassDict(17);
+      m_impl->constraintClassDict->setAutoDelete(TRUE);
+    }
+    ConstraintClassDef *ccd=m_impl->constraintClassDict->find(typeConstraint);
+    if (ccd==0)
+    {
+      ccd = new ConstraintClassDef(cd);
+      m_impl->constraintClassDict->insert(typeConstraint,ccd);
+    }
+    ccd->addAccessor(type);
+    //printf("Adding constraint '%s' to class %s on type %s\n",
+    //       typeConstraint.data(),name().data(),type.data());
+  }
+}
 
-void ClassDef::setTemplateArguments(ArgumentList *al)
+// Java Type Constrains: A<T extends C & I>
+void ClassDef::addTypeConstraints()
 {
-  if (al==0) return;
-  if (!m_impl->tempArgs) delete m_impl->tempArgs; // delete old list if needed
-  m_impl->tempArgs=new ArgumentList;
-  ArgumentListIterator ali(*al);
-  Argument *a;
-  for (;(a=ali.current());++ali)
+  if (m_impl->tempArgs)
   {
-    m_impl->tempArgs->append(new Argument(*a));
+    ArgumentListIterator ali(*m_impl->tempArgs);
+    Argument *a;
+    for (;(a=ali.current());++ali)
+    {
+      if (!a->typeConstraint.isEmpty())
+      {
+        QCString typeConstraint;
+        int i=0,p=0;
+        while ((i=a->typeConstraint.find('&',p))!=-1) // typeConstraint="A &I" for C<T extends A & I>
+        {
+          typeConstraint = a->typeConstraint.mid(p,i-p).stripWhiteSpace();
+          addTypeConstraint(typeConstraint,a->type);
+          p=i+1;
+        }
+        typeConstraint = a->typeConstraint.right(a->typeConstraint.length()-p).stripWhiteSpace();
+        addTypeConstraint(typeConstraint,a->type);
+      }
+    }
   }
 }
 
+// C# Type Constraints: D<T> where T : C, I
 void ClassDef::setTypeConstraints(ArgumentList *al)
 {
   if (al==0) return;
@@ -2553,6 +2604,20 @@ void ClassDef::setTypeConstraints(ArgumentList *al)
   }
 }
 
+void ClassDef::setTemplateArguments(ArgumentList *al)
+{
+  if (al==0) return;
+  if (!m_impl->tempArgs) delete m_impl->tempArgs; // delete old list if needed
+  //printf("setting template args '%s' for '%s'\n",tempArgListToString(al,getLanguage()).data(),name().data());
+  m_impl->tempArgs=new ArgumentList;
+  ArgumentListIterator ali(*al);
+  Argument *a;
+  for (;(a=ali.current());++ali)
+  {
+    m_impl->tempArgs->append(new Argument(*a));
+  }
+}
+
 /*! Returns \c TRUE iff this class or a class inheriting from this class
  *  is \e not defined in an external tag file.
  */
@@ -3123,18 +3188,19 @@ void ClassDef::mergeCategory(ClassDef *category)
           Protection prot = mi->prot;
           //if (makePrivate) prot = Private;
           MemberDef *newMd = mi->memberDef->deepCopy();
-          //printf("Copying member %s\n",mi->memberDef->name().data());
-          newMd->moveTo(this);
-
-          MemberInfo *newMi=new MemberInfo(newMd,prot,mi->virt,mi->inherited);
-          newMi->scopePath=mi->scopePath;
-          newMi->ambigClass=mi->ambigClass;
-          newMi->ambiguityResolutionScope=mi->ambiguityResolutionScope;
-          newMni->append(newMi);
-
-          // also add the newly created member to the global members list
           if (newMd)
           {
+            //printf("Copying member %s\n",mi->memberDef->name().data());
+            newMd->moveTo(this);
+
+            MemberInfo *newMi=new MemberInfo(newMd,prot,mi->virt,mi->inherited);
+            newMi->scopePath=mi->scopePath;
+            newMi->ambigClass=mi->ambigClass;
+            newMi->ambiguityResolutionScope=mi->ambiguityResolutionScope;
+            newMni->append(newMi);
+
+            // also add the newly created member to the global members list
+
             MemberName *mn;
             QCString name = newMd->name();
             if ((mn=Doxygen::memberNameSDict->find(name)))
@@ -3147,17 +3213,17 @@ void ClassDef::mergeCategory(ClassDef *category)
               mn->append(newMd);
               Doxygen::memberNameSDict->append(name,mn);
             }
+          
+            newMd->setCategory(category);
+            newMd->setCategoryRelation(mi->memberDef);
+            mi->memberDef->setCategoryRelation(newMd);
+            if (makePrivate || isExtension)
+            {
+             newMd->makeImplementationDetail();
+            }
+            internalInsertMember(newMd,prot,FALSE);
           }
-
-          newMd->setCategory(category);
-          newMd->setCategoryRelation(mi->memberDef);
-          mi->memberDef->setCategoryRelation(newMd);
-          if (makePrivate || isExtension)
-          {
-            newMd->makeImplementationDetail();
-          }
-          internalInsertMember(newMd,prot,FALSE);
-        }
+		}
 
         // add it to the dictionary
         dstMnd->append(newMni->memberName(),newMni);
@@ -3648,7 +3714,7 @@ ClassDef *ClassDef::insertTemplateInstance(const QCString &fileName,
   ClassDef *templateClass=m_impl->templateInstances->find(templSpec);
   if (templateClass==0)
   {
-    Debug::print(Debug::Classes,0,"      New template instance class `%s'`%s'\n",name().data(),templSpec.data());
+    Debug::print(Debug::Classes,0,"      New template instance class `%s'`%s'\n",qPrint(name()),qPrint(templSpec));
     QCString tcname = removeRedundantWhiteSpace(localName()+templSpec);
     templateClass = new ClassDef(
         fileName,startLine,startColumn,tcname,ClassDef::Class);
@@ -4031,7 +4097,6 @@ int ClassDef::countMemberDeclarations(MemberListType lt,ClassDef *inheritedFrom,
     static bool inlineInheritedMembers = Config_getBool("INLINE_INHERITED_MEMB");
     if (!inlineInheritedMembers) // show inherited members as separate lists
     {
-      QPtrDict<void> visited(17);
       count+=countInheritedDecMembers(lt,inheritedFrom,invert,showAlways,visitedClasses);
     }
   }
@@ -4405,6 +4470,11 @@ UsesClassDict *ClassDef::usedInterfaceClasses() const
   return m_impl->usesIntfClassDict;
 }
 
+ConstraintClassDict *ClassDef::templateTypeConstraints() const
+{
+  return m_impl->constraintClassDict;
+}
+
 bool ClassDef::isTemplateArgument() const
 {
   return m_impl->isTemplArg;
diff --git a/src/classdef.h b/src/classdef.h
index 0729d20..6cdd491 100644
--- a/src/classdef.h
+++ b/src/classdef.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -24,6 +24,7 @@
 
 #include "definition.h"
 
+struct Argument;
 class MemberDef;
 class MemberList;
 class MemberDict;
@@ -38,6 +39,7 @@ class MemberDef;
 class ExampleSDict;
 class MemberNameInfoSDict;
 class UsesClassDict;
+class ConstraintClassDict;
 class MemberGroupSDict;
 class QTextStream;
 class PackageDef;
@@ -229,6 +231,8 @@ class ClassDef : public Definition
 
     UsesClassDict *usedInterfaceClasses() const;
 
+    ConstraintClassDict *templateTypeConstraints() const;
+
     bool isTemplateArgument() const;
 
     /** Returns the definition of a nested compound if
@@ -371,6 +375,7 @@ class ClassDef : public Definition
     void findSectionsInDocumentation();
     void addMembersToMemberGroup();
     void addListReferences();
+    void addTypeConstraints();
     void computeAnchors();
     void mergeMembers();
     void sortMemberLists();
@@ -441,12 +446,13 @@ class ClassDef : public Definition
     void getTitleForMemberListType(MemberListType type,
                QCString &title,QCString &subtitle);
     QCString includeStatement() const;
+    void addTypeConstraint(const QCString &typeConstraint,const QCString &type);
 
-    
     ClassDefImpl *m_impl;
-
 };
 
+//------------------------------------------------------------------------
+
 /** Class that contains information about a usage relation. 
  */
 struct UsesClassDef
@@ -500,6 +506,8 @@ class UsesClassDictIterator : public QDictIterator<UsesClassDef>
    ~UsesClassDictIterator() {}
 };
 
+//------------------------------------------------------------------------
+
 /** Class that contains information about an inheritance relation. 
  */
 struct BaseClassDef
@@ -558,4 +566,56 @@ class BaseClassListIterator : public QListIterator<BaseClassDef>
       QListIterator<BaseClassDef>(bcl) {}
 };
 
+//------------------------------------------------------------------------
+
+
+/** Class that contains information about a type constraint relations.
+ */
+struct ConstraintClassDef
+{
+  ConstraintClassDef(ClassDef *cd) : classDef(cd)
+  {
+    accessors = new QDict<void>(17);
+  }
+ ~ConstraintClassDef()
+  {
+    delete accessors;
+  }
+  void addAccessor(const char *s)
+  {
+    if (accessors->find(s)==0)
+    {
+      accessors->insert(s,(void *)666);
+    }
+  }
+  /** Class definition that this relation uses. */
+  ClassDef *classDef;
+
+  /** Dictionary of member types names that form the edge labels of the
+   *  constraint relation.
+   */
+  QDict<void> *accessors;
+};
+
+/** Dictionary of constraint relations.
+ */
+class ConstraintClassDict : public QDict<ConstraintClassDef>
+{
+  public:
+    ConstraintClassDict(int size) : QDict<ConstraintClassDef>(size) {}
+   ~ConstraintClassDict() {}
+};
+
+/** Iterator class to iterate over a dictionary of constraint relations.
+ */
+class ConstraintClassDictIterator : public QDictIterator<ConstraintClassDef>
+{
+  public:
+    ConstraintClassDictIterator(const QDict<ConstraintClassDef> &d)
+      : QDictIterator<ConstraintClassDef>(d) {}
+   ~ConstraintClassDictIterator() {}
+};
+
+//------------------------------------------------------------------------
+
 #endif
diff --git a/src/classlist.cpp b/src/classlist.cpp
index 6615a99..81b7d26 100644
--- a/src/classlist.cpp
+++ b/src/classlist.cpp
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
diff --git a/src/classlist.h b/src/classlist.h
index 3f15b3e..2ae7de8 100644
--- a/src/classlist.h
+++ b/src/classlist.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/cmdmapper.cpp b/src/cmdmapper.cpp
index eeb7f78..5c38b5a 100644
--- a/src/cmdmapper.cpp
+++ b/src/cmdmapper.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/cmdmapper.h b/src/cmdmapper.h
index fd33b10..5a59f39 100644
--- a/src/cmdmapper.h
+++ b/src/cmdmapper.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/code.h b/src/code.h
index 72a906c..1b4c0ac 100644
--- a/src/code.h
+++ b/src/code.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/code.l b/src/code.l
index d96067e..c906144 100644
--- a/src/code.l
+++ b/src/code.l
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -14,7 +14,7 @@
  * input used in their production; they are not affected by this license.
  *
  */
-
+%option never-interactive
 %{
 
 /*
@@ -46,7 +46,7 @@
 //#define DBG_CTX(x) fprintf x
 #define DBG_CTX(x) do { } while(0)
 
-#define YY_NEVER_INTERACTIVE 1
+#define YY_NO_UNISTD_H 1
 
 #define CLASSBLOCK (int *)4
 #define SCOPEBLOCK (int *)8
@@ -1236,7 +1236,6 @@ static void generateMemberLink(CodeOutputInterface &ol,const QCString &varName,
       {
 	int vi;
 	QCString vn=varName;
-	QCString scope;
 	if ((vi=vn.findRev("::"))!=-1 || (vi=vn.findRev('.'))!=-1)  // explicit scope A::b(), probably static member
 	{
 	  ClassDef *jcd = getClass(vn.left(vi));
diff --git a/src/commentcnv.h b/src/commentcnv.h
index 6255a73..a45d29c 100644
--- a/src/commentcnv.h
+++ b/src/commentcnv.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/commentcnv.l b/src/commentcnv.l
index 64e18be..8823b68 100644
--- a/src/commentcnv.l
+++ b/src/commentcnv.l
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -14,11 +14,9 @@
  * input used in their production; they are not affected by this license.
  *
  */
-
+%option never-interactive
 %{
 
-#define YY_NEVER_INTERACTIVE 1
-
   
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,6 +37,7 @@
 #include <assert.h>
 
 #define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
 
 #define ADDCHAR(c)    g_outBuf->addChar(c)
 #define ADDARRAY(a,s) g_outBuf->addArray(a,s)
@@ -1028,6 +1027,7 @@ void convertCppComments(BufStr *inBuf,BufStr *outBuf,const char *fileName)
         "Nesting level %d %s",g_nestingCount+1,tmp.data()); // add one for "normal" expected end of comment
   }
   g_commentStack.clear();
+  g_nestingCount = 0;
   if (Debug::isFlagSet(Debug::CommentCnv))
   {
     g_outBuf->at(g_outBuf->curPos())='\0';
diff --git a/src/commentscan.h b/src/commentscan.h
index ce28ea2..e202f0a 100644
--- a/src/commentscan.h
+++ b/src/commentscan.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/commentscan.l b/src/commentscan.l
index 702a616..3546277 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -12,7 +12,8 @@
  * input used in their production; they are not affected by this license.
  *
  */
-  
+
+%option never-interactive
 %{
 
 /*
@@ -26,7 +27,6 @@
 #include <qarray.h>
 #include <qstack.h>
 #include <qregexp.h>
-#include <unistd.h>
 #include <qfile.h>
   
 #include "scanner.h"
@@ -49,6 +49,7 @@
 #include "formula.h"
 
 #define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
 
 // forward declarations
 static bool handleBrief(const QCString &);
@@ -101,7 +102,9 @@ static bool handleNoSubGrouping(const QCString &);
 static bool handleShowInitializer(const QCString &);
 static bool handleHideInitializer(const QCString &);
 static bool handleCallgraph(const QCString &);
+static bool handleHideCallgraph(const QCString &);
 static bool handleCallergraph(const QCString &);
+static bool handleHideCallergraph(const QCString &);
 static bool handleInternal(const QCString &);
 static bool handleLineBr(const QCString &);
 static bool handleStatic(const QCString &);
@@ -204,7 +207,9 @@ static DocCmdMap docCmdMap[] =
   { "showinitializer", &handleShowInitializer,  FALSE },
   { "hideinitializer", &handleHideInitializer,  FALSE },
   { "callgraph",       &handleCallgraph,        FALSE },
+  { "hidecallgraph",   &handleHideCallgraph,    FALSE },
   { "callergraph",     &handleCallergraph,      FALSE },
+  { "hidecallergraph", &handleHideCallergraph,  FALSE },
   { "internal",        &handleInternal,         TRUE  },
   { "_linebr",         &handleLineBr,           FALSE },
   { "static",          &handleStatic,           FALSE },
@@ -2689,12 +2694,24 @@ static bool handleCallgraph(const QCString &)
   return FALSE;
 }
 
+static bool handleHideCallgraph(const QCString &)
+{
+  current->callGraph = FALSE; // OFF
+  return FALSE;
+}
+
 static bool handleCallergraph(const QCString &)
 {
   current->callerGraph = TRUE; // ON
   return FALSE;
 }
 
+static bool handleHideCallergraph(const QCString &)
+{
+  current->callerGraph = FALSE; // OFF
+  return FALSE;
+}
+
 static bool handleInternal(const QCString &)
 {
   if (!Config_getBool("INTERNAL_DOCS"))
@@ -2899,7 +2916,7 @@ bool parseCommentBlock(/* in */     ParserInterface *parser,
   }
 
   Debug::print(Debug::CommentScan,0,"-----------\nCommentScanner: %s:%d\n"
-               "input=[\n%s]\n",fileName.data(),lineNr,comment.data()
+               "input=[\n%s]\n",qPrint(fileName),lineNr,qPrint(comment)
               );
   
   commentscanYYrestart( commentscanYYin );
@@ -2946,9 +2963,9 @@ bool parseCommentBlock(/* in */     ParserInterface *parser,
 
   Debug::print(Debug::CommentScan,0,
                "brief=[line=%d\n%s]\ndocs=[line=%d\n%s]\ninbody=[line=%d\n%s]\n===========\n",
-	       current->briefLine,current->brief.data(),
-               current->docLine,current->doc.data(),
-               current->inbodyLine,current->inbodyDocs.data()
+	       current->briefLine,qPrint(current->brief),
+               current->docLine,qPrint(current->doc),
+               current->inbodyLine,qPrint(current->inbodyDocs)
               );
   
   checkFormula();
@@ -3098,7 +3115,7 @@ void closeGroup(Entry *e,const char *fileName,int,bool foundInline)
     g_memberGroupId=DOX_NOGROUP;
     g_memberGroupRelates.resize(0);
     g_memberGroupDocs.resize(0);
-    e->mGrpId=DOX_NOGROUP;
+    if (!foundInline) e->mGrpId=DOX_NOGROUP;
     //printf("new group id=%d\n",g_memberGroupId);
   }
   else if (!g_autoGroupStack.isEmpty()) // end of auto group
diff --git a/src/condparser.cpp b/src/condparser.cpp
index 67da1e3..b3bea3a 100644
--- a/src/condparser.cpp
+++ b/src/condparser.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/condparser.h b/src/condparser.h
index 7c65411..09a4f74 100644
--- a/src/condparser.h
+++ b/src/condparser.h
@@ -2,7 +2,7 @@
 #define CONDPARSER_H
 
 /**
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/config.h b/src/config.h
index 981f6fe..344e007 100644
--- a/src/config.h
+++ b/src/config.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -69,7 +69,7 @@ class ConfigOption
     QCString dependsOn() const { return m_dependency; }
     void addDependency(const char *dep) { m_dependency = dep; }
     void setEncoding(const QCString &e) { m_encoding = e; }
-    void setUserComment(const QCString &u) { m_userComment = u; }
+    void setUserComment(const QCString &u) { m_userComment += u; }
 
   protected:
     virtual void writeTemplate(FTextStream &t,bool sl,bool upd) = 0;
@@ -507,12 +507,27 @@ class Config
      */
     void create();
 
+    /*! Append user start comment
+     */
+    void appendStartComment(const QCString &u)
+    {
+      m_startComment += u;
+    }
     /*! Append user comment
      */
     void appendUserComment(const QCString &u)
     {
       m_userComment += u;
     }
+    /*! Take the user start comment and reset it internally
+     *  \returns user start comment
+     */
+    QCString takeStartComment()
+    {
+      QCString result=m_startComment;
+      m_startComment.resize(0);
+      return result.replace(QRegExp("\r"),"");
+    }
     /*! Take the user comment and reset it internally
      *  \returns user comment
      */
@@ -552,6 +567,7 @@ class Config
     QList<ConfigOption> *m_disabled;
     QDict<ConfigOption> *m_dict;
     static Config *m_instance;
+    QCString m_startComment;
     QCString m_userComment;
     bool m_initialized;
     QCString m_header;
diff --git a/src/config.l b/src/config.l
index a237faf..1bbe320 100644
--- a/src/config.l
+++ b/src/config.l
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -9,7 +9,7 @@
  * See the GNU General Public License for more details.
  *
  */
-
+%option never-interactive
 %{
 
 /*
@@ -45,6 +45,7 @@
 #undef Config_getBool
 
 #define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
 
 // use in-class definitions
 #define Config_getString(val)  getString(__FILE__,__LINE__,val)
@@ -53,18 +54,21 @@
 #define Config_getEnum(val)    getEnum(__FILE__,__LINE__,val)
 #define Config_getBool(val)    getBool(__FILE__,__LINE__,val)
   
+static const char *warning_str = "warning: ";
+static const char *error_str = "error: ";
+
 void config_err(const char *fmt, ...)
 {
   va_list args;
   va_start(args, fmt);
-  vfprintf(stderr, fmt, args);
+  vfprintf(stderr, (QCString(error_str) + fmt).data(), args);
   va_end(args); 
 }
 void config_warn(const char *fmt, ...)
 {
   va_list args;
   va_start(args, fmt);
-  vfprintf(stderr, fmt, args);
+  vfprintf(stderr, (QCString(warning_str) + fmt).data(), args);
   va_end(args);
 }
 
@@ -85,7 +89,7 @@ static QCString convertToComment(const QCString &s, const QCString &u)
   if (!s.isEmpty())
   {
     QCString tmp=s.stripWhiteSpace();
-    char *p=tmp.data();
+    const char *p=tmp.data();
     char c;
     result+="#";
     if (*p && *p!='\n')
@@ -181,7 +185,7 @@ void ConfigInt::convertStrToVal()
     int val = m_valueString.toInt(&ok);
     if (!ok || val<m_minVal || val>m_maxVal)
     {
-      config_warn("Warning: argument `%s' for option %s is not a valid number in the range [%d..%d]!\n"
+      config_warn("argument `%s' for option %s is not a valid number in the range [%d..%d]!\n"
                 "Using the default: %d!\n",m_valueString.data(),m_name.data(),m_minVal,m_maxVal,m_value);
     }
     else
@@ -206,7 +210,7 @@ void ConfigBool::convertStrToVal()
     }
     else
     {
-      config_warn("Warning: argument `%s' for option %s is not a valid boolean value\n"
+      config_warn("argument `%s' for option %s is not a valid boolean value\n"
                 "Using the default: %s!\n",m_valueString.data(),m_name.data(),m_value?"YES":"NO");
     }
   }
@@ -431,19 +435,11 @@ static bool             *b=0;
 static QStrList         *l=0;
 static int               lastState;
 static QCString          elemStr;
-static QCString          includeName;
 static QStrList          includePathList;
 static QStack<ConfigFileState> includeStack;  
 static int               includeDepth;
 static bool              config_upd = FALSE;
 
-static QCString     tabSizeString;
-static QCString     maxInitLinesString;
-static QCString     colsInAlphaIndexString;
-static QCString     enumValuesPerLineString;
-static QCString     treeViewWidthString;
-static QCString     maxDotGraphWidthString;
-static QCString     maxDotGraphHeightString;
 static QCString     encoding;
 
 static Config      *config;
@@ -495,8 +491,8 @@ static QCString configStringRecode(
   }
   size_t iLeft=(size_t)inputSize;
   size_t oLeft=(size_t)outputSize;
-  char *inputPtr  = str.data();
-  char *outputPtr = output.data();
+  char *inputPtr  = str.rawData();
+  char *outputPtr = output.rawData();
   if (!portable_iconv(cd, &inputPtr, &iLeft, &outputPtr, &oLeft))
   {
     outputSize-=(int)oLeft;
@@ -527,7 +523,7 @@ static FILE *tryPath(const char *path,const char *fileName)
   if (fi.exists() && fi.isFile())
   {
     FILE *f=portable_fopen(absName,"r");
-    if (!f) config_err("Error: could not open file %s for reading\n",absName.data());
+    if (!f) config_err("could not open file %s for reading\n",absName.data());
     return f;
   }
   return 0;
@@ -561,7 +557,7 @@ static FILE *findFile(const char *fileName)
 static void readIncludeFile(const char *incName)
 {
   if (includeDepth==MAX_INCLUDE_DEPTH) {
-    config_err("Error: maximum include depth (%d) reached, %s is not included. Aborting...\n",
+    config_err("maximum include depth (%d) reached, %s is not included. Aborting...\n",
 	MAX_INCLUDE_DEPTH,incName);
     exit(1);
   } 
@@ -601,7 +597,7 @@ static void readIncludeFile(const char *incName)
   } 
   else
   {
-    config_err("Error: @INCLUDE = %s: not found!\n",inc.data());
+    config_err("@INCLUDE = %s: not found!\n",inc.data());
     exit(1);
   }
 }
@@ -609,9 +605,9 @@ static void readIncludeFile(const char *incName)
 
 %}
 
-%option nounput
 %option noyywrap
 
+%x      PreStart
 %x      Start
 %x	SkipComment
 %x      SkipInvalid
@@ -625,6 +621,11 @@ static void readIncludeFile(const char *incName)
 %%
 
 <*>\0x0d
+<PreStart>"##".*"\n" { config->appendStartComment(yytext);}
+<PreStart>. {
+              BEGIN(Start);
+              unput(*yytext);
+            }
 <Start,GetString,GetStrList,GetBool,SkipInvalid>"##".*"\n" { config->appendUserComment(yytext);}
 <Start,GetString,GetStrList,GetBool,SkipInvalid>"#"	   { BEGIN(SkipComment); }
 <Start>[a-z_A-Z][a-z_A-Z0-9]*[ \t]*"="	 { QCString cmd=yytext;
@@ -632,7 +633,7 @@ static void readIncludeFile(const char *incName)
 					   ConfigOption *option = config->get(cmd);
 					   if (option==0) // oops not known
 					   {
-					     config_err("Warning: ignoring unsupported tag `%s' at line %d, file %s\n",
+					     config_warn("ignoring unsupported tag `%s' at line %d, file %s\n",
 						 yytext,yyLineNr,yyFileName.data()); 
 					     BEGIN(SkipInvalid);
 					   }
@@ -675,12 +676,12 @@ static void readIncludeFile(const char *incName)
 					       case ConfigOption::O_Obsolete:
                                                  if (config_upd)
                                                  {
-					           config_err("Warning: Tag `%s' at line %d of file `%s' has become obsolete.\n"
+					           config_warn("Tag `%s' at line %d of file `%s' has become obsolete.\n"
 						              "         This tag has been removed.\n", cmd.data(),yyLineNr,yyFileName.data());
                                                  }
                                                  else
                                                  {
-					           config_err("Warning: Tag `%s' at line %d of file `%s' has become obsolete.\n"
+					           config_warn("Tag `%s' at line %d of file `%s' has become obsolete.\n"
 						              "         To avoid this warning please remove this line from your configuration "
 							      "file or upgrade it using \"doxygen -u\"\n", cmd.data(),yyLineNr,yyFileName.data()); 
                                                  }
@@ -689,12 +690,12 @@ static void readIncludeFile(const char *incName)
 					       case ConfigOption::O_Disabled:
                                                  if (config_upd)
                                                  {
-					           config_err("Warning: Tag `%s' at line %d of file `%s' belongs to an option that was not enabled at compile time.\n"
+					           config_warn("Tag `%s' at line %d of file `%s' belongs to an option that was not enabled at compile time.\n"
 						              "         This tag has been removed.\n", cmd.data(),yyLineNr,yyFileName.data());
                                                  }
                                                  else
                                                  {
-					           config_err("Warning: Tag `%s' at line %d of file `%s' belongs to an option that was not enabled at compile time.\n"
+					           config_warn("Tag `%s' at line %d of file `%s' belongs to an option that was not enabled at compile time.\n"
 						              "         To avoid this warning please remove this line from your configuration "
 							    "file or upgrade it using \"doxygen -u\", or recompile doxygen with this feature enabled.\n", cmd.data(),yyLineNr,yyFileName.data()); 
                                                  }
@@ -708,7 +709,7 @@ static void readIncludeFile(const char *incName)
 					  ConfigOption *option = config->get(cmd);
 					  if (option==0) // oops not known
 					  {
-					    config_err("Warning: ignoring unsupported tag `%s' at line %d, file %s\n",
+					    config_warn("ignoring unsupported tag `%s' at line %d, file %s\n",
 						yytext,yyLineNr,yyFileName.data()); 
 					    BEGIN(SkipInvalid);
 					  }
@@ -730,18 +731,18 @@ static void readIncludeFile(const char *incName)
 					      case ConfigOption::O_String:
 					      case ConfigOption::O_Int:
 					      case ConfigOption::O_Bool:
-					        config_err("Warning: operator += not supported for `%s'. Ignoring line at line %d, file %s\n",
+					        config_warn("operator += not supported for `%s'. Ignoring line at line %d, file %s\n",
 						    yytext,yyLineNr,yyFileName.data()); 
 					        BEGIN(SkipInvalid);
 						break;
 					       case ConfigOption::O_Obsolete:
-					         config_err("Warning: Tag `%s' at line %d of file %s has become obsolete.\n"
+					         config_warn("Tag `%s' at line %d of file %s has become obsolete.\n"
 						            "To avoid this warning please update your configuration "
 							    "file using \"doxygen -u\"\n", cmd.data(),yyLineNr,yyFileName.data()); 
 					         BEGIN(SkipInvalid);
 						 break;
 					       case ConfigOption::O_Disabled:
-					         config_err("Warning: Tag `%s' at line %d of file %s belongs to an option that was not enabled at compile time.\n"
+					         config_warn("Tag `%s' at line %d of file %s belongs to an option that was not enabled at compile time.\n"
 						            "To avoid this warning please remove this line from your configuration "
 							    "file, upgrade it using \"doxygen -u\", or recompile doxygen with this feature enabled.\n", cmd.data(),yyLineNr,yyFileName.data()); 
 					         BEGIN(SkipInvalid);
@@ -778,7 +779,7 @@ static void readIncludeFile(const char *incName)
 					  }
   					}
 
-<Start>[a-z_A-Z0-9]+			{ config_err("Warning: ignoring unknown tag `%s' at line %d, file %s\n",yytext,yyLineNr,yyFileName.data()); }
+<Start>[a-z_A-Z0-9]+			{ config_warn("ignoring unknown tag `%s' at line %d, file %s\n",yytext,yyLineNr,yyFileName.data()); }
 <GetString,GetBool,SkipInvalid>\n	{ yyLineNr++; BEGIN(Start); }
 <GetStrList>\n				{ 
   					  yyLineNr++; 
@@ -819,7 +820,7 @@ static void readIncludeFile(const char *incName)
 					  }
 					  if (*yytext=='\n')
 					  {
-					    config_err("Warning: Missing end quote (\") on line %d, file %s\n",yyLineNr,yyFileName.data());
+					    config_warn("Missing end quote (\") on line %d, file %s\n",yyLineNr,yyFileName.data());
 					    yyLineNr++;
 					  }
 					  BEGIN(lastState);
@@ -838,7 +839,7 @@ static void readIncludeFile(const char *incName)
 					  else 
 					  {
 					    *b=FALSE; 
-					    config_warn("Warning: Invalid value `%s' for "
+					    config_warn("Invalid value `%s' for "
 						 "boolean tag in line %d, file %s; use YES or NO\n",
 						 bs.data(),yyLineNr,yyFileName.data());
 					  }
@@ -859,6 +860,11 @@ static void readIncludeFile(const char *incName)
 
 void Config::writeTemplate(FTextStream &t,bool sl,bool upd)
 {
+  /* print first lines of user comment that were at the beginning of the file, might have special meaning for editors */
+  if (m_startComment)
+  {
+    t << takeStartComment() << endl; 
+  }
   t << "# Doxyfile " << versionString << endl << endl;
   if (!sl)
   {
@@ -1070,7 +1076,7 @@ void Config::checkFileName(const char *optionName)
   if ((val=="yes" || val=="true"  || val=="1" || val=="all") ||
       (val=="no"  || val=="false" || val=="0" || val=="none")) 
   {
-    config_err("Error: file name expected for option %s, got %s instead. Ignoring...\n",optionName,s.data());
+    config_err("file name expected for option %s, got %s instead. Ignoring...\n",optionName,s.data());
     s=""; // note tihe use of &s above: this will change the option value!
   }
 }
@@ -1091,15 +1097,15 @@ void Config::check()
   {
     if (warnFormat.find("$file")==-1)
     {
-      config_err("Warning: warning format does not contain a $file tag!\n");
+      config_warn("warning format does not contain a $file tag!\n");
     }
     if (warnFormat.find("$line")==-1)
     {
-      config_err("Warning: warning format does not contain a $line tag!\n");
+      config_warn("warning format does not contain a $line tag!\n");
     }
     if (warnFormat.find("$text")==-1)
     {
-      config_err("Warning: warning format foes not contain a $text tag!\n");
+      config_warn("warning format foes not contain a $text tag!\n");
     }
   }
 
@@ -1120,7 +1126,7 @@ void Config::check()
   if (paperType!="a4" && paperType!="a4wide" && paperType!="letter" && 
       paperType!="legal" && paperType!="executive")
   {
-    config_err("Error: Unknown page type specified\n");
+    config_err("Unknown page type specified\n");
   }
   
   QCString &outputLanguage=Config_getEnum("OUTPUT_LANGUAGE");
@@ -1160,7 +1166,7 @@ void Config::check()
     QFileInfo fi(headerFile);
     if (!fi.exists())
     {
-      config_err("Error: tag HTML_HEADER: header file `%s' "
+      config_err("tag HTML_HEADER: header file `%s' "
 	  "does not exist\n",headerFile.data());
       exit(1);
     }
@@ -1172,11 +1178,12 @@ void Config::check()
     QFileInfo fi(footerFile);
     if (!fi.exists())
     {
-      config_err("Error: tag HTML_FOOTER: footer file `%s' "
+      config_err("tag HTML_FOOTER: footer file `%s' "
 	  "does not exist\n",footerFile.data());
       exit(1);
     }
   }
+
   // Test to see if MathJax code file is valid
   if (Config_getBool("USE_MATHJAX"))
   {
@@ -1186,12 +1193,13 @@ void Config::check()
       QFileInfo fi(MathJaxCodefile);
       if (!fi.exists())
       {
-        config_err("Error: tag MATHJAX_CODEFILE file `%s' "
+        config_err("tag MATHJAX_CODEFILE file `%s' "
 	    "does not exist\n",MathJaxCodefile.data());
         exit(1);
       }
     }
   }
+
   // Test to see if LaTeX header is valid
   QCString &latexHeaderFile = Config_getString("LATEX_HEADER");
   if (!latexHeaderFile.isEmpty())
@@ -1199,18 +1207,31 @@ void Config::check()
     QFileInfo fi(latexHeaderFile);
     if (!fi.exists())
     {
-      config_err("Error: tag LATEX_HEADER: header file `%s' "
+      config_err("tag LATEX_HEADER: header file `%s' "
 	  "does not exist\n",latexHeaderFile.data());
       exit(1);
     }
   }
+  // Test to see if LaTeX footer is valid
+  QCString &latexFooterFile = Config_getString("LATEX_FOOTER");
+  if (!latexFooterFile.isEmpty())
+  {
+    QFileInfo fi(latexFooterFile);
+    if (!fi.exists())
+    {
+      config_err("tag LATEX_FOOTER: footer file `%s' "
+	  "does not exist\n",latexFooterFile.data());
+      exit(1);
+    }
+  }
+
   // check include path
   QStrList &includePath = Config_getList("INCLUDE_PATH");
   char *s=includePath.first();
   while (s)
   {
     QFileInfo fi(s);
-    if (!fi.exists()) config_err("Warning: tag INCLUDE_PATH: include path `%s' "
+    if (!fi.exists()) config_warn("tag INCLUDE_PATH: include path `%s' "
 	                  "does not exist\n",s);
     s=includePath.next();
   }
@@ -1226,7 +1247,7 @@ void Config::check()
     alias=alias.stripWhiteSpace();
     if (alias.find(re1)!=0 && alias.find(re2)!=0)
     {
-      config_err("Error: Illegal alias format `%s'. Use \"name=value\" or \"name(n)=value\", where n is the number of arguments\n",
+      config_err("Illegal alias format `%s'. Use \"name=value\" or \"name(n)=value\", where n is the number of arguments\n",
 	  alias.data());
     }
     s=aliasList.next();
@@ -1235,19 +1256,19 @@ void Config::check()
   // check if GENERATE_TREEVIEW and GENERATE_HTMLHELP are both enabled
   if (Config_getBool("GENERATE_TREEVIEW") && Config_getBool("GENERATE_HTMLHELP"))
   {
-    config_err("Error: When enabling GENERATE_HTMLHELP the tree view (GENERATE_TREEVIEW) should be disabled. I'll do it for you.\n");
+    config_err("When enabling GENERATE_HTMLHELP the tree view (GENERATE_TREEVIEW) should be disabled. I'll do it for you.\n");
     Config_getBool("GENERATE_TREEVIEW")=FALSE;
   }
   if (Config_getBool("SEARCHENGINE") && Config_getBool("GENERATE_HTMLHELP"))
   {
-    config_err("Error: When enabling GENERATE_HTMLHELP the search engine (SEARCHENGINE) should be disabled. I'll do it for you.\n");
+    config_err("When enabling GENERATE_HTMLHELP the search engine (SEARCHENGINE) should be disabled. I'll do it for you.\n");
     Config_getBool("SEARCHENGINE")=FALSE;
   }
 
   // check if SEPARATE_MEMBER_PAGES and INLINE_GROUPED_CLASSES are both enabled
   if (Config_getBool("SEPARATE_MEMBER_PAGES") && Config_getBool("INLINE_GROUPED_CLASSES"))
   {
-    config_err("Error: When enabling INLINE_GROUPED_CLASSES the SEPARATE_MEMBER_PAGES option should be disabled. I'll do it for you.\n");
+    config_err("When enabling INLINE_GROUPED_CLASSES the SEPARATE_MEMBER_PAGES option should be disabled. I'll do it for you.\n");
     Config_getBool("SEPARATE_MEMBER_PAGES")=FALSE;
   }
     
@@ -1267,7 +1288,7 @@ void Config::check()
   QCString &dotFontName=Config_getString("DOT_FONTNAME");
   if (dotFontName=="FreeSans" || dotFontName=="FreeSans.ttf")
   {
-    config_err("Warning: doxygen no longer ships with the FreeSans font.\n"
+    config_warn("doxygen no longer ships with the FreeSans font.\n"
                "You may want to clear or change DOT_FONTNAME.\n"
                "Otherwise you run the risk that the wrong font is being used for dot generated graphs.\n");
   }
@@ -1287,7 +1308,7 @@ void Config::check()
       QFileInfo dp(dotPath+"/dot"+portable_commandExtension());
       if (!dp.exists() || !dp.isFile())
       {
-	config_err("Warning: the dot tool could not be found at %s\n",dotPath.data());
+	config_warn("the dot tool could not be found at %s\n",dotPath.data());
 	dotPath="";
       }
       else
@@ -1312,7 +1333,7 @@ void Config::check()
     QFileInfo dp(mscgenPath+"/mscgen"+portable_commandExtension());
     if (!dp.exists() || !dp.isFile())
     {
-      config_err("Warning: the mscgen tool could not be found at %s\n",mscgenPath.data());
+      config_warn("the mscgen tool could not be found at %s\n",mscgenPath.data());
       mscgenPath="";
     }
     else
@@ -1367,7 +1388,7 @@ void Config::check()
     QFileInfo dp(diaPath+"/dia"+portable_commandExtension());
     if (!dp.exists() || !dp.isFile())
     {
-      config_err("Warning: dia could not be found at %s\n",diaPath.data());
+      config_warn("dia could not be found at %s\n",diaPath.data());
       diaPath="";
     }
     else
@@ -1399,7 +1420,7 @@ void Config::check()
       QFileInfo fi(s);
       if (!fi.exists())
       {
-	config_err("Warning: tag INPUT: input source `%s' does not exist\n",s);
+	config_warn("tag INPUT: input source `%s' does not exist\n",s);
       }
       s=inputSources.next();
     }
@@ -1486,18 +1507,19 @@ void Config::check()
       !Config_getBool("GENERATE_XML")     &&
       !Config_getBool("GENERATE_PERLMOD") &&
       !Config_getBool("GENERATE_RTF")     &&
+      !Config_getBool("GENERATE_DOCBOOK") &&
       !Config_getBool("GENERATE_AUTOGEN_DEF") &&
       Config_getString("GENERATE_TAGFILE").isEmpty()
      )
   {
-    config_err("Warning: No output formats selected! Set at least one of the main GENERATE_* options to YES.\n");
+    config_warn("No output formats selected! Set at least one of the main GENERATE_* options to YES.\n");
   }
 
   // check HTMLHELP creation requirements
   if (!Config_getBool("GENERATE_HTML") && 
       Config_getBool("GENERATE_HTMLHELP"))
   {
-    config_err("Warning: GENERATE_HTMLHELP=YES requires GENERATE_HTML=YES.\n");
+    config_warn("GENERATE_HTMLHELP=YES requires GENERATE_HTML=YES.\n");
   }
 
   // check QHP creation requirements
@@ -1505,13 +1527,13 @@ void Config::check()
   {
     if (Config_getString("QHP_NAMESPACE").isEmpty())
     {
-      config_err("Error: GENERATE_QHP=YES requires QHP_NAMESPACE to be set. Using 'org.doxygen.doc' as default!.\n");
+      config_err("GENERATE_QHP=YES requires QHP_NAMESPACE to be set. Using 'org.doxygen.doc' as default!.\n");
       Config_getString("QHP_NAMESPACE")="org.doxygen.doc";
     }
 
     if (Config_getString("QHP_VIRTUAL_FOLDER").isEmpty())
     {
-      config_err("Error: GENERATE_QHP=YES requires QHP_VIRTUAL_FOLDER to be set. Using 'doc' as default!\n");
+      config_err("GENERATE_QHP=YES requires QHP_VIRTUAL_FOLDER to be set. Using 'doc' as default!\n");
       Config_getString("QHP_VIRTUAL_FOLDER")="doc";
     }
   }
@@ -1562,7 +1584,7 @@ void Config::check()
   if (!mathJaxFormat.isEmpty() && mathJaxFormat!="HTML-CSS" &&
        mathJaxFormat!="NativeMML" && mathJaxFormat!="SVG")
   {
-    config_err("Error: Unsupported value for MATHJAX_FORMAT: Should be one of HTML-CSS, NativeMML, or SVG\n");
+    config_err("Unsupported value for MATHJAX_FORMAT: Should be one of HTML-CSS, NativeMML, or SVG\n");
     Config_getEnum("MATHJAX_FORMAT")="HTML-CSS";
   }
 
@@ -1608,7 +1630,7 @@ void Config::check()
     if (!b6) s6="  EXTRACT_PACKAGE        = YES (was NO)\n"; else s6="";
 
 
-    config_err("Warning: enabling OPTIMIZE_OUTPUT_VHDL assumes the following settings:\n"
+    config_warn("enabling OPTIMIZE_OUTPUT_VHDL assumes the following settings:\n"
 	       "%s%s%s%s%s%s",s1,s2,s3,s4,s5,s6
 	      );
 
@@ -1665,7 +1687,7 @@ void Config::init()
       ConfigOption * opt = Config::instance()->get(depName);
       if (opt==0)
       {
-        config_err("Warning: Config option '%s' has invalid depends relation on unknown option '%s'\n",
+        config_warn("Config option '%s' has invalid depends relation on unknown option '%s'\n",
             option->name().data(),depName.data());
         exit(1);
       }
@@ -1695,7 +1717,7 @@ static QCString configFileToString(const char *name)
       QCString contents(bSize);
       int totalSize=0;
       int size;
-      while ((size=f.readBlock(contents.data()+totalSize,bSize))==bSize)
+      while ((size=f.readBlock(contents.rawData()+totalSize,bSize))==bSize)
       {
         totalSize+=bSize;
         contents.resize(totalSize+bSize); 
@@ -1712,7 +1734,7 @@ static QCString configFileToString(const char *name)
     QFileInfo fi(name);
     if (!fi.exists() || !fi.isFile())
     {
-      config_err("Error: file `%s' not found\n",name);
+      config_err("file `%s' not found\n",name);
       return "";
     }
     f.setName(name);
@@ -1721,7 +1743,7 @@ static QCString configFileToString(const char *name)
     {
       int fsize=f.size();
       QCString contents(fsize+2);
-      f.readBlock(contents.data(),fsize);
+      f.readBlock(contents.rawData(),fsize);
       f.close();
       if (fsize==0 || contents[fsize-1]=='\n') 
 	contents[fsize]='\0';
@@ -1733,7 +1755,7 @@ static QCString configFileToString(const char *name)
   }
   if (!fileOpened)  
   {
-    config_err("Error: cannot open file `%s' for reading\n",name);
+    config_err("cannot open file `%s' for reading\n",name);
   }
   return "";
 }
@@ -1749,7 +1771,7 @@ bool Config::parseString(const char *fn,const char *str,bool update)
   includeStack.clear();
   includeDepth  = 0;
   configYYrestart( configYYin );
-  BEGIN( Start );
+  BEGIN( PreStart );
   config_upd = update;
   configYYlex();
   config_upd = FALSE;
diff --git a/src/config.xml b/src/config.xml
index 994190d..acbee8e 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -6,7 +6,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -29,7 +29,9 @@ parsed by \c doxygen. The file may contain tabs and newlines for
 formatting purposes. The statements in the file are case-sensitive.
 Comments may be placed anywhere within the file (except within quotes).
 Comments beginning with two hash characters (\c \#\#) are kept when updating
-the configuration file and are placed in front of the TAG are in front of.
+the configuration file and are placed in front of the TAG they are in front of.
+Comments beginning with two hash characters (\c \#\#) at the beginning of the
+configuration file are also kept and placed at the beginning of the file.
 Comments beginning with two hash characters (\c \#\#) at the end of the
 configuration file are also kept and placed at the end of the file.
 Comments begin with the hash character (\c \#) and ends at the end of the line.
@@ -677,6 +679,15 @@ Go to the <a href="commands.html">next</a> section or return to the
 ]]>
       </docs>
     </option>
+    <option type='bool' id='GROUP_NESTED_COMPOUNDS' defval='0'>
+      <docs>
+<![CDATA[
+ If one adds a struct or class to a group and this option is enabled, then also
+ any nested class or struct is added to the same group. By default this option
+ is disabled and one has to add nested compounds explicitly via \ref cmdingroup "\\ingroup".
+]]>
+      </docs>
+    </option>
     <option type='bool' id='SUBGROUPING' defval='1'>
       <docs>
 <![CDATA[
@@ -1241,7 +1252,9 @@ FILE_VERSION_INFO = "cleartool desc -fmt \%Vn"
  The \c INPUT tag is used to specify the files and/or directories that contain 
  documented source files. You may enter file names like 
  \c myfile.cpp or directories like \c /usr/src/myproject. 
- Separate the files or directories with spaces.
+ Separate the files or directories with spaces. See also
+ \ref cfg_file_patterns "FILE_PATTERNS"  and
+ \ref cfg_extension_mapping "EXTENSION_MAPPING"
 
  \note If this tag is empty the current directory is searched.
 ]]>
@@ -1265,7 +1278,11 @@ FILE_VERSION_INFO = "cleartool desc -fmt \%Vn"
  If the value of the \ref cfg_input "INPUT" tag contains directories, you can use the 
  \c FILE_PATTERNS tag to specify one or more wildcard patterns 
  (like `*.cpp` and `*.h`) to filter out the source-files 
- in the directories. If left blank the following patterns are tested:
+ in the directories.<br>
+ Note that for custom extensions or not directly supported extensions you also
+ need to set \ref cfg_extension_mapping "EXTENSION_MAPPING" for the extension
+ otherwise the files are not read by doxygen.<br>
+ If left blank the following patterns are tested:
 ]]>
       </docs>
       <value name='*.c'/>
@@ -1887,13 +1904,13 @@ hr.footer {
 ]]>
       </docs>
     </option>
-    <option type='bool' id='HTML_TIMESTAMP' defval='1' depends='GENERATE_HTML'>
+    <option type='bool' id='HTML_TIMESTAMP' defval='0' depends='GENERATE_HTML'>
       <docs>
 <![CDATA[
  If the \c HTML_TIMESTAMP tag is set to \c YES then the footer of 
  each generated HTML page will contain the date and time when the page 
- was generated. Setting this to \c NO can help when comparing the output of 
- multiple runs.
+ was generated. Setting this to \c YES can help to show when doxygen was last run 
+ and thus if the documentation is up to date.
 ]]>
       </docs>
     </option>
@@ -2490,10 +2507,19 @@ EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
       <docs>
 <![CDATA[
  The \c EXTRA_PACKAGES tag can be used to specify one or more \f$\mbox{\LaTeX}\f$ 
- package names that should be included in the \f$\mbox{\LaTeX}\f$ output.
- To get the times font for instance you can specify 
+ package names that should be included in the \f$\mbox{\LaTeX}\f$ output. The package
+ can be specified just by its name or with the correct syntax as to be used with the
+ \f$\mbox{\LaTeX}\f$ `\usepackage` command.
+
+ To get the `times` font for instance you can specify :
+\verbatim
+  EXTRA_PACKAGES=times
+or 
+  EXTRA_PACKAGES={times}
+\endverbatim
+ To use the option `intlimits` with the `amsmath` package you can specify:
 \verbatim
-EXTRA_PACKAGES=times
+   EXTRA_PACKAGES=[intlimits]{amsmath}
 \endverbatim
  If left blank no extra packages will be included.
 ]]>
@@ -3232,7 +3258,9 @@ to be found in the default search path.
  generate a call dependency graph for every global function or class method. 
  <br>Note that enabling this option will significantly increase the time of a run.
  So in most cases it will be better to enable call graphs for selected 
- functions only using the \ref cmdcallgraph "\\callgraph" command.
+ functions only using the \ref cmdcallgraph "\\callgraph" command. 
+ Disabling a call graph can be accomplished by means of the command 
+ \ref cmdhidecallgraph "\\hidecallgraph".
 ]]>
       </docs>
     </option>
@@ -3243,7 +3271,9 @@ to be found in the default search path.
  generate a caller dependency graph for every global function or class method. 
  <br>Note that enabling this option will significantly increase the time of a run.
  So in most cases it will be better to enable caller graphs for selected 
- functions only using the \ref cmdcallergraph "\\callergraph" command.
+ functions only using the \ref cmdcallergraph "\\callergraph" command. 
+ Disabling a caller graph can be accomplished by means of the command 
+ \ref cmdhidecallergraph "\\hidecallergraph".
 ]]>
       </docs>
     </option>
@@ -3269,7 +3299,9 @@ to be found in the default search path.
       <docs>
 <![CDATA[
  The \c DOT_IMAGE_FORMAT tag can be used to set the image format of the images
- generated by \c dot.
+ generated by \c dot. For an explanation of the image formats see the section output formats
+ in the documentation of the \c dot tool
+ (<a href="http://www.graphviz.org/">Graphviz</a>).
  \note If you choose \c svg you need to set 
  \ref cfg_html_file_extension "HTML_FILE_EXTENSION" to \c xhtml in order to make the SVG files
  visible in IE 9+ (other browsers do not have this requirement).
@@ -3279,6 +3311,14 @@ to be found in the default search path.
       <value name='jpg'/>
       <value name='gif'/>
       <value name='svg'/>
+      <value name='png:gd'/>
+      <value name='png:gd:gd'/>
+      <value name='png:cairo'/>
+      <value name='png:cairo:gd'/>
+      <value name='png:cairo:cairo'/>
+      <value name='png:cairo:gdiplus'/>
+      <value name='png:gdiplus'/>
+      <value name='png:gdiplus:gdiplus'/>
     </option>
     <option type='bool' id='INTERACTIVE_SVG' defval='0' depends='HAVE_DOT'>
       <docs>
diff --git a/src/configgen.py b/src/configgen.py
index 7115dba..1647fa2 100755
--- a/src/configgen.py
+++ b/src/configgen.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # python script to generate configoptions.cpp and config.doc from config.xml
 #
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
+# Copyright (C) 1997-2015 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
diff --git a/src/configoptions.h b/src/configoptions.h
index be8ecf6..3979f7a 100644
--- a/src/configoptions.h
+++ b/src/configoptions.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/constexp.h b/src/constexp.h
index 27ca039..d84e94e 100644
--- a/src/constexp.h
+++ b/src/constexp.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/constexp.l b/src/constexp.l
index bb4f842..e3ff3f1 100644
--- a/src/constexp.l
+++ b/src/constexp.l
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -15,7 +15,7 @@
  * input used in their production; they are not affected by this license.
  *
  */
-
+%option never-interactive
 %{
 
 #include "constexp.h"  
@@ -23,8 +23,8 @@
 #include "ce_parse.h" // generated header file
 #include "message.h"
 
-#define YY_NEVER_INTERACTIVE 1
 #define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
   
 QCString    g_strToken;  
 CPPValue    g_resultValue;
diff --git a/src/constexp.y b/src/constexp.y
index 1475c1c..c63fa5e 100644
--- a/src/constexp.y
+++ b/src/constexp.y
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/context.cpp b/src/context.cpp
index ae5d5bc..f76c49b 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -4056,8 +4056,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
     TemplateVariant hasCallGraph() const
     {
       static bool haveDot = Config_getBool("HAVE_DOT");
-      static bool callGraph = Config_getBool("CALL_GRAPH");
-      if ((callGraph || m_memberDef->hasCallGraph()) && haveDot &&
+      if (m_memberDef->hasCallGraph() && haveDot &&
           (m_memberDef->isFunction() || m_memberDef->isSlot() || m_memberDef->isSignal()))
       {
         DotCallGraph *cg = getCallGraph();
@@ -4096,8 +4095,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
     TemplateVariant hasCallerGraph() const
     {
       static bool haveDot = Config_getBool("HAVE_DOT");
-      static bool callerGraph = Config_getBool("CALLER_GRAPH");
-      if ((callerGraph || m_memberDef->hasCallerGraph()) && haveDot &&
+      if (m_memberDef->hasCallerGraph() && haveDot &&
           (m_memberDef->isFunction() || m_memberDef->isSlot() || m_memberDef->isSignal()))
       {
         DotCallGraph *cg = getCallerGraph();
@@ -5244,7 +5242,7 @@ class NestingNodeContext::Private : public PropertyMapper
     void addClasses(bool inherit, bool hideSuper)
     {
       ClassDef *cd = m_def->definitionType()==Definition::TypeClass ? (ClassDef*)m_def : 0;
-      if (inherit)
+      if (cd && inherit)
       {
         bool hasChildren = !cd->visited && !hideSuper && classHasVisibleChildren(cd);
         if (hasChildren)
diff --git a/src/context.h b/src/context.h
index 6b5b810..cb20313 100644
--- a/src/context.h
+++ b/src/context.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
diff --git a/src/cppvalue.cpp b/src/cppvalue.cpp
index a99ec56..176931d 100644
--- a/src/cppvalue.cpp
+++ b/src/cppvalue.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/cppvalue.h b/src/cppvalue.h
index 67c5433..59dd594 100644
--- a/src/cppvalue.h
+++ b/src/cppvalue.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/dbusxmlscanner.cpp b/src/dbusxmlscanner.cpp
deleted file mode 100644
index aa3cc47..0000000
--- a/src/dbusxmlscanner.cpp
+++ /dev/null
@@ -1,881 +0,0 @@
-/******************************************************************************
- *
- *
- *
- * Copyright (C) 2009 by Tobias Hunger <tobias@aquazul.com>
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby
- * granted. No representations are made about the suitability of this software
- * for any purpose. It is provided "as is" without express or implied warranty.
- * See the GNU General Public License for more details.
- *
- * Documents produced by Doxygen are derivative works derived from the
- * input used in their production; they are not affected by this license.
- *
- */
-
-#include "dbusxmlscanner.h"
-
-#include "commentscan.h"
-#include "entry.h"
-
-#include <qfile.h>
-#include <qxml.h>
-#include <qstring.h>
-
-#include "message.h"
-#include "util.h"
-#include "arguments.h"
-
-// -----------------------------------------------------------------------
-// Convenience defines:
-// -----------------------------------------------------------------------
-
-#define CONDITION(cond, msg) \
-    do {\
-        if (cond)\
-        {\
-            if (m_errorString.isEmpty()) { m_errorString = msg; }\
-            return false;\
-        }\
-    }\
-    while (0)
-
-#define DOC_ERROR(msg) \
-    warn_doc_error(m_fileName.data(), lineNumber(), msg.data())
-
-#define COND_DOC_ERROR(cond, msg) \
-    do {\
-        if (cond)\
-        {\
-             DOC_ERROR(msg);\
-             return true;\
-        }\
-    }\
-    while (0)
-
-#define DBUS(name) isDBusElement(namespaceURI, localName, qName, name)
-#define EXTENSION(name) isExtensionElement(namespaceURI, localName, qName, name)
-
-// -----------------------------------------------------------------------
-// DBusXMLHandler class
-// -----------------------------------------------------------------------
-
-const QString EXTENSION_URI("http://psiamp.org/dtd/doxygen_dbusxml.dtd");
-
-/** DBus implementation of the generic QXmlDefaultHandler. */
-class DBusXMLHandler : public QXmlDefaultHandler
-{
-public:
-    DBusXMLHandler(ParserInterface * parser,
-                   QXmlSimpleReader * reader,
-                   const char * file_name,
-                   Entry * root) :
-        m_parser(parser),
-        m_locator(reader),
-        m_currentEntry(0),
-        m_currentInterface(0),
-        m_currentMethod(0),
-        m_currentArgument(0),
-        m_currentProperty(0),
-        m_currentEnum(0),
-        m_fileName(file_name),
-        m_currentComment(0)
-    {
-        setDocumentLocator(&m_locator);
-
-        m_scopeCount = 0;
-
-        // Set up stack cleanup:
-        m_structStack.setAutoDelete(TRUE);
-        m_elementStack.setAutoDelete(TRUE);
-        m_scopeStack.setAutoDelete(TRUE);
-
-        openScopes(root);
-    }
-
-    ~DBusXMLHandler()
-    { closeScopes(); }
-
-    QString errorString()
-    { return m_errorString; }
-
-    bool startElement(const QString &namespaceURI,
-                      const QString &localName,
-                      const QString &qName,
-                      const QXmlAttributes &attributes)
-    {
-        // add to elements stack:
-        m_elementStack.append(new ElementData(qName.utf8()));
-
-        // First we need a node.
-        if (DBUS("node"))
-        {
-            CONDITION(!m_currentNode.isEmpty(), "Node inside a node.");
-
-            const int idx(indexOf(attributes, "name"));
-            COND_DOC_ERROR(idx < 0, QCString("Anonymous node found."));
-
-            m_currentNode = attributes.value(idx).utf8();
-            // A node is actually of little interest, so do nothing here.
-            return true;
-        }
-
-        // Then we need an interface.
-        if (DBUS("interface"))
-        {
-            // We need a nodeName for interfaces:
-            CONDITION(m_currentNode.isEmpty(), "Interface without a node.");
-            CONDITION(m_currentInterface, "Interface within another interface.");
-
-            const int idx(indexOf(attributes, "name"));
-            COND_DOC_ERROR(idx < 0, QString("Interface without a name found."));
-
-            // A interface is roughly equivalent to a class:
-            m_currentInterface = createEntry();
-
-            m_currentInterface->section = Entry::CLASS_SEC;
-            m_currentInterface->spec |= Entry::Interface;
-            m_currentInterface->type = "Interface";
-            m_currentInterface->name = substitute(attributes.value(idx).utf8(), ".", "::");
-
-            openScopes(m_currentInterface);
-
-            return true;
-        }
-
-        if (DBUS("method") || DBUS("signal"))
-        {
-            // We need a interfaceName for methods and signals:
-            CONDITION(!m_currentInterface, "Method or signal found outside a interface.");
-            CONDITION(m_currentMethod, "Method or signal found inside another method or signal.");
-            CONDITION(m_currentProperty, "Methor or signal found inside a property.");
-            CONDITION(!m_structStack.isEmpty(), "Method or signal found inside a struct.");
-            CONDITION(m_currentEnum, "Methor or signal found inside a enum.");
-
-            const int idx(indexOf(attributes, "name"));
-            COND_DOC_ERROR(idx < 0, QString("Method or signal without a name found."));
-
-            m_currentMethod = createEntry();
-
-            m_currentMethod->section = Entry::FUNCTION_SEC;
-            m_currentMethod->name = attributes.value(idx).utf8();
-            m_currentMethod->mtype = Method;
-            m_currentMethod->type = "void";
-
-            if (DBUS("signal"))
-            { m_currentMethod->mtype = Signal; }
-        }
-
-        if (DBUS("arg"))
-        {
-            // We need a method for arguments:
-            CONDITION(!m_currentMethod, "Argument found outside a method or signal.");
-            CONDITION(m_currentArgument, "Argument found inside another argument.");
-
-            const int name_idx(indexOf(attributes, "name"));
-            COND_DOC_ERROR(name_idx < 0, QString("Argument without a name found."));
-            COND_DOC_ERROR(!hasType(attributes), QString("Argument without a type found."));
-
-            const int direction_idx(indexOf(attributes, "direction"));
-
-            if ((m_currentMethod->mtype == Signal &&
-                 direction_idx >= 0 &&
-                 attributes.value(direction_idx) != "in") ||
-                (m_currentMethod->mtype == Method &&
-                 direction_idx >= 0 &&
-                 attributes.value(direction_idx) != "in" &&
-                 attributes.value(direction_idx) != "out"))
-            {
-                m_errorString = "Invalid direction found.";
-                return false;
-            }
-
-            m_currentArgument = new Argument;
-            m_currentArgument->type = getType(attributes).utf8();
-            m_currentArgument->name = attributes.value(name_idx).utf8();
-            if (direction_idx >= 0)
-            { m_currentArgument->attrib = attributes.value(direction_idx).utf8(); }
-            else
-            {
-                if (m_currentMethod->mtype == Signal)
-                { m_currentArgument->attrib = "in"; }
-                else
-                { m_currentArgument->attrib = "out"; }
-            }
-        }
-
-        if (DBUS("property"))
-        {
-            CONDITION(m_currentMethod, "Property found inside a method or signal.");
-            CONDITION(!m_currentInterface, "Property found outside an interface.");
-            CONDITION(m_currentProperty, "Property found inside another property.");
-            CONDITION(!m_structStack.isEmpty(), "Property found inside a struct.");
-            CONDITION(m_currentEnum, "Property found inside a enum.");
-
-            const int name_idx(indexOf(attributes, "name"));
-            COND_DOC_ERROR(name_idx < 0, QString("Anonymous property found."));
-            COND_DOC_ERROR(!hasType(attributes), QString("Property without a type found."));
-
-            const int access_idx(indexOf(attributes, "access"));
-            COND_DOC_ERROR(access_idx < 0, QString("Property without a access attribute found."));
-            COND_DOC_ERROR(attributes.value(access_idx) != "read" &&
-                           attributes.value(access_idx) != "write" &&
-                           attributes.value(access_idx) != "readwrite",
-                           QString("Property with invalid access attribute \"%1\" found.").
-                           arg(attributes.value(access_idx)));
-
-            m_currentProperty = createEntry();
-
-            m_currentProperty->section = Entry::FUNCTION_SEC;
-
-            if (attributes.value(access_idx) == "read" ||
-                attributes.value(access_idx) == "readwrite")
-            { m_currentProperty->spec |= Entry::Readable; }
-
-            if (attributes.value(access_idx) == "write" ||
-                attributes.value(access_idx) == "readwrite")
-            { m_currentProperty->spec |= Entry::Writable; }
-
-            m_currentProperty->name = attributes.value(name_idx).utf8();
-            m_currentProperty->mtype = Property;
-            m_currentProperty->type = getType(attributes).utf8();
-        }
-
-        if (EXTENSION("namespace"))
-        {
-            CONDITION(m_currentNode.isEmpty(), "Namespace found outside a node.");
-            CONDITION(m_currentInterface, "Namespace found inside an interface.");
-
-            const int idx(indexOf(attributes, "name"));
-            COND_DOC_ERROR(idx < 0, QString("Anonymous namespace found."));
-
-            m_namespaceStack.append(openNamespace(attributes.value(idx)));
-            openScopes(m_namespaceStack.getLast());
-        }
-
-        if (EXTENSION("struct"))
-        {
-            CONDITION(m_currentMethod, "Struct found inside a method or signal.");
-            CONDITION(m_currentProperty, "Struct found inside a property.");
-            CONDITION(m_currentEnum, "Struct found inside an enum.");
-
-            const int idx(indexOf(attributes, "name"));
-            COND_DOC_ERROR(idx < 0, QString("Anonymous struct found."));
-
-            Entry * current_struct = createEntry();
-            current_struct->section = Entry::CLASS_SEC;
-            current_struct->spec = Entry::Struct;
-            current_struct->name = attributes.value(idx).utf8();
-
-            openScopes(current_struct);
-
-            current_struct->type = current_struct->name + " struct";
-
-            m_structStack.append(new StructData(current_struct));
-        }
-
-        if (EXTENSION("member"))
-        {
-            CONDITION(m_structStack.isEmpty(), "Member found outside of struct.");
-
-            const int name_idx(indexOf(attributes, "name"));
-            COND_DOC_ERROR(name_idx < 0, QString("Anonymous member found."));
-            COND_DOC_ERROR(!hasType(attributes), QString("Member without a type found."));
-
-            createEntry();
-
-            m_currentEntry->section = Entry::VARIABLE_SEC;
-            m_currentEntry->name = attributes.value(name_idx).utf8();
-            m_currentEntry->type = getType(attributes).utf8();
-
-            QString type(getDBusType(m_currentEntry->type));
-            m_structStack.getLast()->type.append(type.utf8());
-        }
-
-        if (EXTENSION("enum") || EXTENSION("flagset"))
-        {
-            CONDITION(m_currentMethod, "Enum found inside a method or signal.");
-            CONDITION(m_currentProperty, "Enum found inside a property.");
-
-            const int name_idx(indexOf(attributes, "name"));
-            COND_DOC_ERROR(name_idx < 0, QString("Anonymous enum found."));
-
-            const int type_idx(indexOf(attributes, "type"));
-            QString type = "u";
-            if (type_idx >= 0)
-            { type = attributes.value(type_idx); }
-            if (type != "y" && type != "q" && type != "u" && type != "t")
-            { DOC_ERROR(QString("Invalid enum type \"%1\" found.").arg(type)); }
-
-            m_currentEnum = createEntry();
-            m_currentEnum->section = Entry::ENUM_SEC;
-            m_currentEnum->name = attributes.value(name_idx).utf8();
-
-            openScopes(m_currentEnum);
-
-            m_currentEnum->type = m_currentEntry->name + " enum";
-
-            addNamedType(type.utf8());
-        }
-
-        if (EXTENSION("value"))
-        {
-            CONDITION(!m_currentEnum, "Value found outside an enum.");
-
-            const int name_idx(indexOf(attributes, "name"));
-            COND_DOC_ERROR(name_idx < 0, QString("Anonymous value found."));
-
-            const int value_idx(indexOf(attributes, "value"));
-
-            createEntry();
-
-            m_currentEntry->section = Entry::VARIABLE_SEC;
-            m_currentEntry->name = attributes.value(name_idx).utf8();
-            m_currentEntry->type = m_currentEnum->name; // "@"; // enum marker!
-            if (value_idx >= 0)
-            { m_currentEntry->initializer = attributes.value(value_idx).utf8(); }
-        }
-
-        return true;
-    }
-
-    bool endElement(const QString &namespaceURI,
-                    const QString &localName,
-                    const QString &qName)
-    {
-        // Clean up elements stack:
-        // Since we made sure to get the elements in the proper order when
-        // adding we do not need to do so again here.
-        COND_DOC_ERROR(m_elementStack.getLast()->element != qName.utf8(),
-                       QString("Malformed XML: Unexpected closing element found.").
-                       arg(m_elementStack.getLast()->element).utf8());
-        m_elementStack.removeLast();
-
-        // Interface:
-        if (DBUS("interface"))
-        {
-            CONDITION(!m_currentInterface, "end of interface found without start.");
-            m_currentInterface->endBodyLine = lineNumber();
-            closeScopes();
-            m_currentInterface = 0;
-        }
-
-        if (DBUS("method") || DBUS("signal"))
-        {
-            CONDITION(!m_currentMethod, "end of method found without start.");
-            CONDITION(!m_currentInterface, "end of method found outside interface.");
-            m_currentMethod->endBodyLine = lineNumber();
-            m_currentInterface->addSubEntry(m_currentMethod);
-            m_currentMethod = 0;
-        }
-
-        if (DBUS("property"))
-        {
-            CONDITION(!m_currentProperty, "end of property found without start.");
-            CONDITION(!m_currentInterface, "end of property found outside interface.");
-            m_currentProperty->endBodyLine = lineNumber();
-            m_currentInterface->addSubEntry(m_currentProperty);
-            m_currentProperty = 0;
-        }
-
-        if (DBUS("arg"))
-        {
-            CONDITION(!m_currentMethod, "end of arg found outside method.");
-            m_currentMethod->argList->append(m_currentArgument);
-            m_currentArgument = 0;
-        }
-
-        if (EXTENSION("namespace"))
-        {
-            Entry * current = m_namespaceStack.getLast();
-            CONDITION(!current, "end of namespace without start.");
-            m_namespaceStack.removeLast();
-
-            current->endBodyLine = lineNumber();
-            closeScopes();
-        }
-
-        if (EXTENSION("struct"))
-        {
-            StructData * data = m_structStack.getLast();
-            CONDITION(!data, "end of struct without start.");
-
-            data->entry->endBodyLine = lineNumber();
-
-            QString current_type;
-            current_type.append(QString("("));
-            current_type.append(data->type);
-            current_type.append(QString(")"));
-
-            addNamedType(current_type.utf8());
-
-            closeScopes();
-
-            m_structStack.removeLast();
-        }
-
-        if (EXTENSION("member"))
-        {
-           StructData * data = m_structStack.getLast();
-           CONDITION(!data, "end of member outside struct.");
-           data->entry->addSubEntry(m_currentEntry);
-        }
-
-        if (EXTENSION("enum") || EXTENSION("flagset"))
-        {
-            CONDITION(!m_currentEnum, "end of enum without start.");
-            m_currentEnum->endBodyLine = lineNumber();
-            closeScopes();
-
-            m_currentEnum = 0;
-        }
-
-        if (EXTENSION("value") && m_currentEnum)
-        {
-            CONDITION(!m_currentEntry, "end of value without start");
-            m_currentEntry->endBodyLine = lineNumber();
-
-            m_currentEnum->addSubEntry(m_currentEntry);
-        }
-
-        return true;
-    }
-
-    bool characters(const QString & /*chars*/)
-    { return true; }
-
-    bool comment(const QString & comment_)
-    {
-        if (m_currentComment)
-        { handleComment(); }
-
-        m_currentComment = new CommentData(m_fileName, lineNumber(), comment_.utf8());
-
-        if (m_currentComment->shouldIgnore)
-        {
-            delete m_currentComment;
-            m_currentComment = 0;
-            return true;
-        }
-
-        if (m_currentComment->associateWithPrevious)
-        { handleComment(); }
-
-        return true;
-    }
-
-    void handleComment()
-    {
-        if (m_currentComment == 0 || m_currentEntry == 0)
-        { return; }
-
-        QCString text(m_currentComment->text);
-
-        m_currentEntry->docFile = m_currentComment->fileName;
-        m_currentEntry->docLine = m_currentComment->line;
-
-        int position(0);
-        bool needs_entry(false);
-        bool brief(false);
-        Protection prot(Public);
-        int lineNr = lineNumber();
-
-        while (parseCommentBlock(m_parser,
-                                 m_currentEntry,
-                                 text, m_fileName.data(), 
-                                 lineNr,
-                                 brief, m_currentComment->isJavaStyle,
-                                 false,
-                                 prot,
-                                 position,
-                                 needs_entry))
-        {
-            if (needs_entry) { createEntry(); }
-        }
-        if (needs_entry) { createEntry(); }
-
-        delete m_currentComment;
-        m_currentComment = 0;
-    }
-
-    QXmlLocator * locator()
-    { return &m_locator; }
-
-    int lineNumber()
-    { return m_locator.lineNumber(); }
-
-    void setSection()
-    {
-        Entry * current = createEntry();
-        current->reset();
-
-        current->name    = m_fileName;
-        current->section = Entry::SOURCE_SEC;
-
-        // Open/Close the scope to do the bookkeeping:
-        openScopes(current);
-        closeScopes();
-    }
-
-private:
-    bool isDBusElement(const QString & namespaceURI,
-                       const QString & localName,
-                       const QString & qName,
-                       const QString & element)
-    {
-        return (namespaceURI.isEmpty() && localName == element && qName == element) ||
-               (namespaceURI.isEmpty() && localName.isEmpty() && qName == element);
-    }
-
-    bool isExtensionElement(const QString & namespaceURI,
-                            const QString & localName,
-                            const QString & qName,
-                            const QString & element)
-    {
-        (void)qName;
-
-        return namespaceURI == EXTENSION_URI && localName == element;
-    }
-
-    bool hasType(const QXmlAttributes & attributes)
-    {
-        const int type_idx(indexOf(attributes, "type"));
-        const int named_type_idx(indexOf(attributes, "named-type"));
-
-        return named_type_idx >= 0 || type_idx >= 0;
-    }
-
-    QString getType(const QXmlAttributes & attributes)
-    {
-        const int type_idx(indexOf(attributes, "type"));
-        const int named_type_idx(indexOf(attributes, "named-type"));
-
-        QCString type;
-
-        if (named_type_idx >= 0)
-        {
-            type = attributes.value(named_type_idx).utf8();
-            if (type.left(2)!="::")
-            { type = getCurrentScope(attributes.value(named_type_idx).utf8()); }
-            else
-            { type = type.mid(2); }
-            if (m_namedTypeMap.contains(type))
-            {
-                if (type_idx >= 0)
-                {
-                    const QCString dbus_type(attributes.value(type_idx).utf8());
-                    if (dbus_type != m_namedTypeMap[type])
-                    {
-                        DOC_ERROR(QString("Type \"%1\" does not match up with "
-                                          "previous definition of named type \"%2\" (which was \"%3\".").
-                                          arg(dbus_type).
-                                          arg(type).
-                                          arg(m_namedTypeMap[type]));
-                    }
-                }
-                return type;
-            }
-
-            DOC_ERROR(QString("Undefined named type \"%1\" used.").arg(type));
-        }
-
-        if (type_idx >= 0)
-        {
-            type = attributes.value(type_idx).utf8();
-
-            QRegExp reg_exp(QCString("(a?[ybnqiuxdtsogv]|a[{]sv[}])"));
-            if (reg_exp.match(type.data()))
-            { return type; }
-
-            DOC_ERROR(QString("Unnamed complex D-Bus type \"%1\" found.").arg(type));
-        }
-
-        return QString();
-    }
-
-    QString getDBusType(const QCString & type)
-    {
-        QCString scoped_type = type;
-        if (!scoped_type.contains("::"))
-        { scoped_type = getCurrentScope(type); }
-
-        if (m_namedTypeMap.contains(scoped_type))
-        { return m_namedTypeMap[scoped_type]; }
-        else
-        { return type; }
-    }
-
-    void addNamedType(const QCString &type)
-    {
-        QCString scoped_name(getCurrentScope());
-
-        if (m_namedTypeMap.contains(scoped_name))
-        {
-            DOC_ERROR(QString("Named type \"%1\" is already defined.").arg(scoped_name));
-            return;
-        }
-
-        m_namedTypeMap.insert(scoped_name, type);
-    }
-
-    QCString getCurrentScope(const QCString & type = QCString())
-    {
-        QCString scoped_name;
-        if (!m_scopeStack.isEmpty())
-        {
-            scoped_name = m_scopeStack.getLast()->scope->name;
-            scoped_name.append("::");
-        }
-        if (!type.isEmpty())
-        { scoped_name.append(type); }
-        else
-        { scoped_name = scoped_name.left(scoped_name.length() - 2); }
-
-        return scoped_name;
-    }
-
-    int indexOf(const QXmlAttributes & attributes, const QString & name,
-                 const QString & type = "CDATA", const bool mandatory = true)
-    {
-        const int idx(attributes.index(name));
-        if (idx < 0 || idx > attributes.length()) { return -1; }
-        if (attributes.type(idx) != type) { return -1; }
-        if (mandatory && attributes.value(idx).isEmpty()) { return -1; }
-
-        return idx;
-    }
-
-    Entry * createEntry()
-    {
-        Entry * entry = new Entry();
-
-        entry->protection = Public ;
-        entry->virt       = Normal;
-        entry->stat       = false;
-        entry->lang       = SrcLangExt_XML;
-        entry->spec       = 0;
-
-        entry->fileName  = m_fileName;
-        entry->startLine = lineNumber();
-        entry->bodyLine = lineNumber();
-
-        entry->callGraph = false;
-        entry->callerGraph = false;
-
-        initGroupInfo(entry);
-
-        m_currentEntry = entry;
-
-        handleComment();
-
-        return entry;
-    }
-
-    void openScopes(Entry * object)
-    {
-        int cur_scope_separator_pos = 0;
-        int last_scope_separator_pos = 0;
-        while (0 <= (cur_scope_separator_pos = object->name.find("::", last_scope_separator_pos)))
-        {
-            QString scope = object->name.mid(last_scope_separator_pos,
-                                             cur_scope_separator_pos - last_scope_separator_pos);
-            last_scope_separator_pos = cur_scope_separator_pos + 2;
-
-            Entry * current_namespace = openNamespace(scope);
-
-            if (!m_scopeStack.isEmpty())
-            { m_scopeStack.getLast()->scope->addSubEntry(current_namespace); }
-
-            m_scopeStack.append(new ScopeData(current_namespace, m_scopeCount));
-        }
-
-        QCString scoped_name(getCurrentScope());
-        if (!scoped_name.isEmpty())
-        { scoped_name.append("::"); }
-        scoped_name.append(object->name.mid(last_scope_separator_pos));
-
-        object->name = scoped_name;
-
-        if (!m_scopeStack.isEmpty())
-        { m_scopeStack.getLast()->scope->addSubEntry(object); }
-        m_scopeStack.append(new ScopeData(object, m_scopeCount));
-
-        ++m_scopeCount;
-    }
-
-    Entry * openNamespace(const QString & name)
-    {
-        Entry * current_namespace = createEntry();
-        QCString scoped_name(getCurrentScope());
-        if (!scoped_name.isEmpty())
-        { scoped_name.append("::"); }
-        scoped_name.append(name.utf8());
-        current_namespace->name = scoped_name;
-        current_namespace->section = Entry::NAMESPACE_SEC;
-        current_namespace->type = "namespace" ;
-
-        return current_namespace;
-    }
-
-    void closeScopes()
-    {
-        const int current_scope_count(m_scopeStack.getLast()->count);
-
-        // Do not close the root scope.
-        if (current_scope_count == 0)
-        { return; }
-
-        while (current_scope_count == m_scopeStack.getLast()->count)
-        { m_scopeStack.removeLast(); }
-    }
-
-    ParserInterface * m_parser;
-
-    QXmlLocator m_locator;
-    QCString m_currentNode; // Nodes can not be nested, no entry necessary.
-
-    struct ElementData
-    {
-        ElementData(const QCString & e) :
-            element(e)
-        { }
-        ~ElementData() { }
-
-        QCString element; //*< The element name
-        QCString text; //*< The actual xml code.
-    };
-    QList<ElementData> m_elementStack;
-
-    Entry * m_currentEntry; // The currently open entry.
-
-    Entry * m_currentInterface; // Interfaces can not be nested.
-    Entry * m_currentMethod; // Methods can not be nested.
-    Argument * m_currentArgument; // Arguments can not be nested.
-    Entry * m_currentProperty; // Properties can not be nested.
-    Entry * m_currentEnum; // Enums can not be nested.
-    QList<Entry> m_namespaceStack;
-
-    struct StructData
-    {
-        StructData(Entry * e) : entry(e) { }
-        ~StructData() { }
-
-        QCString type;
-        Entry * entry;
-    };
-    QList<StructData> m_structStack; // Structs can be nested.
-
-    struct ScopeData
-    {
-        ScopeData(Entry * s, int c) :
-            scope(s),
-            count(c)
-        { }
-        ~ScopeData() { }
-
-        Entry * scope;
-        int count;
-    };
-    QList<ScopeData> m_scopeStack; // Scopes are nested.
-
-    QCString m_fileName;
-
-    struct CommentData
-    {
-        CommentData(const QCString & f, const int l, const QCString & t) :
-            isJavaStyle(false),
-            isQtStyle(false),
-            line(l),
-            fileName(f)
-        {
-            isJavaStyle = t.length()>0 && t.at(0)=='*';
-            isQtStyle = t.length()>0 && t.at(0)=='!';
-            shouldIgnore = (!isJavaStyle && !isQtStyle);
-            associateWithPrevious = (t.length()>1 && t.at(1)=='<');
-            if (associateWithPrevious)
-            { text = t.mid(2); }
-            else
-            { text = t.mid(1); }
-        }
-        ~CommentData() { }
-
-        QCString text;
-        bool isJavaStyle;
-        bool isQtStyle;
-        bool shouldIgnore;
-        bool associateWithPrevious;
-        int line;
-        QCString fileName;
-    };
-    CommentData * m_currentComment;
-
-    int m_scopeCount; //*< unique scope id.
-
-    QString m_errorString;
-
-    QMap<QCString, QCString> m_namedTypeMap;
-};
-
-// -----------------------------------------------------------------------
-// DBusXMLScanner
-// -----------------------------------------------------------------------
-
-DBusXMLScanner::DBusXMLScanner()
-{ }
-
-DBusXMLScanner::~DBusXMLScanner()
-{ }
-
-void DBusXMLScanner::parseInput(const char * fileName,
-                                const char * /* fileBuf */,
-                                Entry *root,
-                                bool /*sameTranslationUnit*/,
-                                QStrList & /*filesInSameTranslationUnit*/)
-{
-    QFile inputFile(fileName);
-
-    QXmlInputSource inputSource(inputFile);
-    QXmlSimpleReader reader;
-
-    DBusXMLHandler handler(this, &reader, fileName, root);
-    reader.setContentHandler(&handler);
-    reader.setErrorHandler(&handler);
-    reader.setLexicalHandler(&handler);
-
-    groupEnterFile(fileName, 1);
-    handler.setSection();
-    reader.parse(inputSource);
-
-    if (!handler.errorString().isEmpty())
-    { err("DBus XML Parser: Error at line %d: %s\n", 
-        handler.locator()->lineNumber(),handler.errorString().utf8().data()); }
-
-    groupLeaveFile(fileName, 1);
-}
-
-bool DBusXMLScanner::needsPreprocessing(const QCString & /* extension */)
-{ return (false); }
-
-void DBusXMLScanner::parseCode(CodeOutputInterface & /* codeOutIntf */,
-                               const char * /* scopeName */,
-                               const QCString & /* input */,
-                               SrcLangExt /* lang */,
-                               bool /* isExampleBlock */,
-                               const char * /* exampleName */,
-                               FileDef * /* fileDef */,
-                               int /* startLine */,
-                               int /* endLine */,
-                               bool /* inlineFragment */,
-                               MemberDef * /* memberDef */,
-                               bool /*showLineNumbers*/,
-                               Definition * /* searchCtx */,
-                               bool /*collectXRefs*/ )
-{ }
-
-void DBusXMLScanner::resetCodeParserState()
-{ }
-
-void DBusXMLScanner::parsePrototype(const char * /* text */)
-{ }
diff --git a/src/debug.cpp b/src/debug.cpp
index e27ce11..c81a1af 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/debug.h b/src/debug.h
index e17c03c..8a28c7a 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/declinfo.h b/src/declinfo.h
index 5f11a1c..d226c7d 100644
--- a/src/declinfo.h
+++ b/src/declinfo.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/declinfo.l b/src/declinfo.l
index f238be3..0f24d9e 100644
--- a/src/declinfo.l
+++ b/src/declinfo.l
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -14,7 +14,7 @@
  * input used in their production; they are not affected by this license.
  *
  */
-
+%option never-interactive
 %{
 
 /*
@@ -30,6 +30,7 @@
 #include "message.h"
 
 #define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
   
 /* -----------------------------------------------------------------
  *
@@ -45,7 +46,6 @@ static QCString      funcTempList;
 static QCString      type;
 static QCString      name;
 static QCString      args;
-static QCString      tmpType;
 static int          sharpCount;
 static bool         classTempListFound;
 static bool         funcTempListFound;
diff --git a/src/defargs.h b/src/defargs.h
index 6ebfe1d..34a19a2 100644
--- a/src/defargs.h
+++ b/src/defargs.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/defargs.l b/src/defargs.l
index 164c100..9032d8e 100644
--- a/src/defargs.l
+++ b/src/defargs.l
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -39,7 +39,7 @@
  *        type, and the matchArgumentList in util.cpp is be used to
  *        further determine the correct separation.
  */
-
+%option never-interactive
 %{
 
 /*
@@ -57,8 +57,8 @@
 #include "arguments.h"
 #include "message.h"
   
-#define YY_NEVER_INTERACTIVE 1
 #define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
   
 /* -----------------------------------------------------------------
  *	state variables
@@ -73,6 +73,7 @@ static QCString		g_curArgName;
 static QCString		g_curArgDocs;
 static QCString		g_curArgAttrib;
 static QCString		g_curArgArray;
+static QCString         g_curTypeConstraint;
 static QCString		g_extraTypeChars;
 static int              g_argRoundCount;
 static int              g_argSharpCount;
@@ -80,6 +81,7 @@ static int              g_argCurlyCount;
 static int              g_readArgContext;
 static int              g_lastDocContext;
 static int              g_lastDocChar;
+static int              g_lastExtendsContext;
 static QCString         g_delimiter;
 
 /* -----------------------------------------------------------------
@@ -120,6 +122,7 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 %x	FuncQual
 %x	ReadDocBlock
 %x	ReadDocLine
+%x      ReadTypeConstraint
 %x      TrailingReturn
 
 
@@ -332,8 +335,9 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					      int i=l-1;
 					      while (i>=0 && (isspace((uchar)g_curArgTypeName.at(i)) || g_curArgTypeName.at(i)=='.')) i--;
 					      while (i>=0 && (isId(g_curArgTypeName.at(i)) || g_curArgTypeName.at(i)=='$')) i--;
-					      Argument *a = new Argument; 
-					      a->attrib = g_curArgAttrib.copy();
+					      Argument *a = new Argument;
+					      a->attrib  = g_curArgAttrib.copy();
+                                              a->typeConstraint = g_curTypeConstraint.stripWhiteSpace();
 					      //printf("a->type=%s a->name=%s i=%d l=%d\n",
 					      //        a->type.data(),a->name.data(),i,l);
 					      a->array.resize(0);
@@ -370,14 +374,14 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 						    a->type.mid(sv)=="union"     ||
 						    a->type.mid(sv)=="class"     ||
 						    a->type.mid(sv)=="typename"  ||
-						    a->type=="const"             ||
+						    a->type=="const"               ||
 						    a->type=="volatile"
 						   )
 						{ 
 						  a->type = a->type + " " + a->name;
 						  a->name.resize(0);
 						}
-						//printf(" --> a->type='%s'\n",a->type.data());
+						//printf(" --> a->type='%s' a->name='%s'\n",a->type.data(),a->name.data());
 					      }
 					      else // assume only the type was specified, try to determine name later 
 					      {
@@ -413,6 +417,7 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					    g_curArgDefValue.resize(0);
 					    g_curArgArray.resize(0);
 					    g_curArgDocs.resize(0);
+                                            g_curTypeConstraint.resize(0);
 					    if (*yytext==')')
 					    {
 					      BEGIN(FuncQual);
@@ -424,6 +429,11 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					    }
 					  }
   					}
+<ReadFuncArgType,ReadFuncArgPtr>"extends" {
+                                          g_curTypeConstraint.resize(0);
+                                          g_lastExtendsContext=YY_START;
+                                          BEGIN(ReadTypeConstraint);
+                                        }
 <ReadFuncArgType,ReadFuncArgPtr>"$"?{ID} { 
   					  QCString name=yytext; //resolveDefines(yytext);
 					  if (YY_START==ReadFuncArgType && g_curArgArray=="[]") // Java style array
@@ -451,13 +461,23 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 <CopyArgRound,CopyArgRound2,CopyArgSharp,CopyArgCurly>.  {
 					  *g_copyArgValue += *yytext;
 					}
-<FuncQual>"const"		       	{ 
+<ReadTypeConstraint>[,)>]               {
+                                          unput(*yytext);
+                                          BEGIN(g_lastExtendsContext);
+                                        }
+<ReadTypeConstraint>.                   {
+                                          g_curTypeConstraint+=yytext;
+                                        }
+<ReadTypeConstraint>\n                  {
+                                          g_curTypeConstraint+=' ';
+                                        }
+<FuncQual>"const"		       	{
 					  g_argList->constSpecifier=TRUE;
 					}
-<FuncQual>"volatile"		    	{ 
+<FuncQual>"volatile"		    	{
 					  g_argList->volatileSpecifier=TRUE;
 					}
-<FuncQual,TrailingReturn>"="{B}*"0"  	{ 
+<FuncQual,TrailingReturn>"="{B}*"0"  	{
 					  g_argList->pureSpecifier=TRUE;
                                           BEGIN(FuncQual);
 					}
@@ -534,6 +554,7 @@ void stringToArgumentList(const char *argsString,ArgumentList* al,QCString *extr
   g_curArgDocs.resize(0);
   g_curArgAttrib.resize(0);
   g_curArgArray.resize(0);
+  g_curTypeConstraint.resize(0);
   g_extraTypeChars.resize(0);
   g_argRoundCount = 0;
   g_argSharpCount = 0;
diff --git a/src/defgen.cpp b/src/defgen.cpp
index 358cd24..90ae0a2 100644
--- a/src/defgen.cpp
+++ b/src/defgen.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/defgen.h b/src/defgen.h
index 696fb5c..a56c823 100644
--- a/src/defgen.h
+++ b/src/defgen.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/define.cpp b/src/define.cpp
index 2f4e43a..121f5cb 100644
--- a/src/define.cpp
+++ b/src/define.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/define.h b/src/define.h
index 7971cc4..cc1e390 100644
--- a/src/define.h
+++ b/src/define.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/definition.cpp b/src/definition.cpp
index 6cb26de..457c6ea 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -495,7 +495,11 @@ void Definition::addSectionsToIndex()
       }
       QCString title = si->title;
       if (title.isEmpty()) title = si->label;
-      Doxygen::indexList->addContentsItem(TRUE,title,
+      // determine if there is a next level inside this item
+      ++li;
+      bool isDir = ((li.current()) ? (int)(li.current()->type > nextLevel):FALSE);
+      --li;
+      Doxygen::indexList->addContentsItem(isDir,title,
                                          getReference(),
                                          getOutputFileBase(),
                                          si->label,
@@ -543,7 +547,7 @@ bool Definition::_docsAlreadyAdded(const QCString &doc,QCString &sigList)
   // double whitespaces...
   QCString docStr = doc.simplifyWhiteSpace();
   MD5Buffer((const unsigned char *)docStr.data(),docStr.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.data(),33);
+  MD5SigToString(md5_sig,sigStr.rawData(),33);
   //printf("%s:_docsAlreadyAdded doc='%s' sig='%s' docSigs='%s'\n",
   //    name().data(),doc.data(),sigStr.data(),sigList.data());
   if (sigList.find(sigStr)==-1) // new docs, add signature to prevent re-adding it
@@ -737,7 +741,7 @@ bool readCodeFragment(const char *fileName,
   else // use filter
   {
     QCString cmd=filter+" \""+fileName+"\"";
-    Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",cmd.data());
+    Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",qPrint(cmd));
     f = portable_popen(cmd,"r");
   }
   bool found = lang==SrcLangExt_VHDL   || 
@@ -864,7 +868,7 @@ bool readCodeFragment(const char *fileName,
     {
       portable_pclose(f); 
       Debug::print(Debug::FilterOutput, 0, "Filter output\n");
-      Debug::print(Debug::FilterOutput,0,"-------------\n%s\n-------------\n",result.data());
+      Debug::print(Debug::FilterOutput,0,"-------------\n%s\n-------------\n",qPrint(result));
     }
     else 
     {
@@ -893,6 +897,7 @@ QCString Definition::getSourceAnchor() const
 {
   const int maxAnchorStrLen = 20;
   char anchorStr[maxAnchorStrLen];
+  anchorStr[0]='\0';
   if (m_impl->body && m_impl->body->startLine!=-1)
   {
     if (Htags::useHtags)
@@ -1662,7 +1667,8 @@ void Definition::writeToc(OutputList &ol)
       }
       cs[0]='0'+nextLevel;
       if (inLi[nextLevel]) ol.writeString("</li>\n");
-      ol.writeString("<li class=\"level"+QCString(cs)+"\"><a href=\"#"+si->label+"\">"+(si->title.isEmpty()?si->label:si->title)+"</a>");
+      QCString titleDoc = convertToHtml(si->title);
+      ol.writeString("<li class=\"level"+QCString(cs)+"\"><a href=\"#"+si->label+"\">"+(si->title.isEmpty()?si->label:titleDoc)+"</a>");
       inLi[nextLevel]=TRUE;
       level = nextLevel;
     }
diff --git a/src/definition.h b/src/definition.h
index b1f118d..5905a55 100644
--- a/src/definition.h
+++ b/src/definition.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/dia.cpp b/src/dia.cpp
index 955171c..347acba 100644
--- a/src/dia.cpp
+++ b/src/dia.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/dia.h b/src/dia.h
index ca10332..93d7b04 100644
--- a/src/dia.h
+++ b/src/dia.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/diagram.cpp b/src/diagram.cpp
index cc16b50..994c1a4 100644
--- a/src/diagram.cpp
+++ b/src/diagram.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/diagram.h b/src/diagram.h
index 6ce83f3..2922657 100644
--- a/src/diagram.h
+++ b/src/diagram.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/dirdef.cpp b/src/dirdef.cpp
index d4af3f0..067daa0 100644
--- a/src/dirdef.cpp
+++ b/src/dirdef.cpp
@@ -80,16 +80,15 @@ void DirDef::addFile(FileDef *fd)
 
 static QCString encodeDirName(const QCString &anchor)
 {
-  QCString result;
-
   // convert to md5 hash
   uchar md5_sig[16];
   QCString sigStr(33);
   MD5Buffer((const unsigned char *)anchor.data(),anchor.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.data(),33);
+  MD5SigToString(md5_sig,sigStr.rawData(),33);
   return sigStr;
 
   // old algorithm
+//  QCString result;
 
 //  int l = anchor.length(),i;
 //  for (i=0;i<l;i++)
diff --git a/src/dirdef.h b/src/dirdef.h
index 9a8a5ad..1a87f5b 100644
--- a/src/dirdef.h
+++ b/src/dirdef.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/docbookgen.cpp b/src/docbookgen.cpp
index edcafdb..ac00e1f 100644
--- a/src/docbookgen.cpp
+++ b/src/docbookgen.cpp
@@ -2,7 +2,7 @@
 *
 * 
 *
-* Copyright (C) 1997-2014 by Dimitri van Heesch.
+* Copyright (C) 1997-2015 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
@@ -483,13 +483,13 @@ static void generateDocbookForMember(MemberDef *md,FTextStream &t,Definition *de
           cnt++;
         }
         t << endl << "}";
-        t << "</literallayout>" << endl;
-        if (md->briefDescription())
-        {
-            t << "<para><emphasis>";
-            writeDocbookString(t,md->briefDescription());
-            t << "</emphasis></para>" << endl;
-        }
+      }
+      t << "</literallayout>" << endl;
+      if (md->briefDescription())
+      {
+          t << "<para><emphasis>";
+          writeDocbookString(t,md->briefDescription());
+          t << "</emphasis></para>" << endl;
       }
     }
     else if (md->memberType()==MemberType_Define) 
@@ -589,11 +589,9 @@ static void generateDocbookForMember(MemberDef *md,FTextStream &t,Definition *de
       t << "_1" << md->anchor() << "\">" << convertToXML(md->name()) << "</link>";
       t << " (" << endl;
       ArgumentList *declAl = md->declArgumentList();
-      ArgumentList *defAl = md->argumentList();
       if (declAl && declAl->count()>0)
       {
         ArgumentListIterator declAli(*declAl);
-        ArgumentListIterator defAli(*defAl);
         Argument *a;
         int cnt=0;
         for (declAli.toFirst();(a=declAli.current());++declAli)
@@ -812,7 +810,7 @@ static void generateDocbookForMember(MemberDef *md,FTextStream &t,Definition *de
   }
 }
 
-static void generateDocbookSection(Definition *d,FTextStream &t,MemberList *ml,const char *kind,
+static void generateDocbookSection(Definition *d,FTextStream &t,MemberList *ml,const char *,
     bool detailed=0, const char *header=0,const char *documentation=0)
 {
   if (ml==0) return;
@@ -820,7 +818,6 @@ static void generateDocbookSection(Definition *d,FTextStream &t,MemberList *ml,c
   MemberDef *md;
   int count=0;
   int doc_count=0;
-  QCString compkind = kind;
   QCString title, desctitle;
 
   for (mli.toFirst();(md=mli.current());++mli) 
diff --git a/src/docbookgen.h b/src/docbookgen.h
index 0431cf2..866d056 100644
--- a/src/docbookgen.h
+++ b/src/docbookgen.h
@@ -2,7 +2,7 @@
 *
 * 
 *
-* Copyright (C) 1997-2014 by Dimitri van Heesch.
+* Copyright (C) 1997-2015 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
diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp
index 90262e3..70e9c53 100644
--- a/src/docbookvisitor.cpp
+++ b/src/docbookvisitor.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1326,7 +1326,6 @@ void DocbookDocVisitor::writeDotFile(const QCString &baseName, DocVerbatim *s)
     shortName=shortName.right(shortName.length()-i-1);
   }
   QCString outDir = Config_getString("DOCBOOK_OUTPUT");
-  QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
   writeDotGraphFromFile(baseName+".dot",outDir,shortName,GOF_BITMAP);
   visitPreStart(m_t, s->hasCaption(), baseName + ".dot", s->width(),s->height());
   visitCaption(this, s->children());
@@ -1351,7 +1350,7 @@ void DocbookDocVisitor::startDotFile(const QCString &fileName,
   }
   baseName.prepend("dot_");
   QCString outDir = Config_getString("DOCBOOK_OUTPUT");
-  QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgExt = getDotImageExtension();
   writeDotGraphFromFile(fileName,outDir,baseName,GOF_BITMAP);
   m_t << "<para>" << endl;
   visitPreStart(m_t, hasCaption, baseName + "." + imgExt,  width,  height);
diff --git a/src/docbookvisitor.h b/src/docbookvisitor.h
index 3796d8a..6c7976c 100644
--- a/src/docbookvisitor.h
+++ b/src/docbookvisitor.h
@@ -2,7 +2,7 @@
 *
 * 
 *
-* Copyright (C) 1997-2014 by Dimitri van Heesch.
+* Copyright (C) 1997-2015 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
diff --git a/src/docparser.cpp b/src/docparser.cpp
index 9a120dc..f4261ac 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -236,7 +236,8 @@ static void docParserPopContext(bool keepParamInfo=FALSE)
 // replaces &gt; with < and &gt; with > within string s
 static void unescapeCRef(QCString &s)
 {
-  char *p = s.data();
+  QCString tmp(s);
+  char *p = tmp.rawData();
   if (p)
   {
     char c;
@@ -247,8 +248,9 @@ static void unescapeCRef(QCString &s)
     }
   }
 
-  s=substitute(s,"&lt;","<");
-  s=substitute(s,"&gt;",">");
+  tmp=substitute(tmp,"&lt;","<");
+  tmp=substitute(tmp,"&gt;",">");
+  s = tmp;
 }
 
 //---------------------------------------------------------------------------
@@ -517,8 +519,8 @@ static void checkUndocumentedParams()
         }
         else
         {
-           warn_doc_error(g_memberDef->docFile(),
-                          g_memberDef->docLine(),
+           warn_doc_error(g_memberDef->getDefFileName(),
+                          g_memberDef->getDefLine(),
                           substitute(errMsg,"%","%%"));
         }
       }
@@ -844,7 +846,6 @@ static int handleStyleArgument(DocNode *parent,QList<DocNode> &children,
                                const QCString &cmdName)
 {
   DBG(("handleStyleArgument(%s)\n",qPrint(cmdName)));
-  QCString tokenName = g_token->name;
   int tok=doctokenizerYYlex();
   if (tok!=TK_WHITESPACE)
   {
@@ -1178,7 +1179,6 @@ static void handleParameterType(DocNode *parent,QList<DocNode> &children,const Q
 {
   QCString name = g_token->name;
   int p=0,i;
-  QCString type;
   while ((i=paramTypes.find('|',p))!=-1)
   {
     g_token->name = paramTypes.mid(p,i-p);
@@ -1743,6 +1743,15 @@ static int internalValidatingParseDoc(DocNode *parent,QList<DocNode> &children,
 
 static void readTextFileByName(const QCString &file,QCString &text)
 {
+  if (portable_isAbsolutePath(file.data()))
+  {
+    QFileInfo fi(file);
+    if (fi.exists())
+    {
+      text = fileToString(file,Config_getBool("FILTER_SOURCE_FILES"));
+      return;
+    }
+  }
   QStrList &examplePathList = Config_getList("EXAMPLE_PATH");
   char *s=examplePathList.first();
   while (s)
@@ -2137,7 +2146,6 @@ DocXRefItem::DocXRefItem(DocNode *parent,int id,const char *key) :
 
 bool DocXRefItem::parse()
 {
-  QCString listName;
   RefList *refList = Doxygen::xrefLists->find(m_key); 
   if (refList && 
       (
@@ -2571,7 +2579,6 @@ DocCite::DocCite(DocNode *parent,const QCString &target,const QCString &) //cont
 {
   static uint numBibFiles = Config_getList("CITE_BIB_FILES").count();
   m_parent = parent;
-  QCString anchor;
   //printf("DocCite::DocCite(target=%s)\n",target.data());
   ASSERT(!target.isEmpty());
   m_relPath = g_relPath;
@@ -3657,7 +3664,8 @@ int DocHtmlTable::parseXml()
   DBG(("DocHtmlTable::parseXml() end\n"));
   DocNode *n=g_nodeStack.pop();
   ASSERT(n==this);
-  return retval==RetVal_EndTable ? RetVal_OK : retval;
+  tagId=Mappers::htmlTagMapper->map(g_token->name);
+  return tagId==XML_LIST && g_token->endTag ? RetVal_OK : retval;
 }
 
 /** Helper class to compute the grid for an HTML style table */
@@ -6230,9 +6238,9 @@ int DocPara::handleHtmlEndTag(const QCString &tagName)
     case XML_REMARKS:
     case XML_PARA:
     case XML_VALUE:
-    case XML_LIST:
     case XML_EXAMPLE:
     case XML_PARAM:
+    case XML_LIST:
     case XML_TYPEPARAM:
     case XML_RETURNS:
     case XML_SEE:
@@ -6939,7 +6947,7 @@ static QCString extractCopyDocId(const char *data, uint &j, uint len)
   }
   e=j;
   QCString id(e-s+1);
-  if (e>s) memcpy(id.data(),data+s,e-s);
+  if (e>s) memcpy(id.rawData(),data+s,e-s);
   id.at(e-s)='\0';
   //printf("extractCopyDocId='%s' input='%s'\n",id.data(),&data[s]);
   return id;
diff --git a/src/docparser.h b/src/docparser.h
index e8ef754..1abb687 100644
--- a/src/docparser.h
+++ b/src/docparser.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/docsets.cpp b/src/docsets.cpp
index 52d24bb..cde317d 100644
--- a/src/docsets.cpp
+++ b/src/docsets.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/docsets.h b/src/docsets.h
index eac5bfc..548ba75 100644
--- a/src/docsets.h
+++ b/src/docsets.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/doctokenizer.h b/src/doctokenizer.h
index ead8da1..eb39906 100644
--- a/src/doctokenizer.h
+++ b/src/doctokenizer.h
@@ -3,7 +3,7 @@
  * $Id: $
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index d018450..31d583c 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -3,7 +3,7 @@
  * $Id: $
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -16,7 +16,7 @@
  *
  */
 
-
+%option never-interactive
 %{
 
 #include <ctype.h>
@@ -37,8 +37,8 @@
 #include "doxygen.h"
 #include "portable.h"
 
-#define YY_NEVER_INTERACTIVE 1
 #define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
   
 //--------------------------------------------------------------------------
 
@@ -1035,7 +1035,7 @@ REFWORD   {LABELID}|{REFWORD2}|{REFWORD3}|{REFWORD4}
 <St_IntRef>{BLANK}+"\"" {
                          BEGIN(St_Ref2);
                        }
-<St_SetScope>{SCOPEMASK}{BLANK} {
+<St_SetScope>({SCOPEMASK}|{ANONNS}){BLANK} {
                          g_token->name = yytext;
                          g_token->name = g_token->name.stripWhiteSpace();
 			 return TK_WORD;
@@ -1150,8 +1150,8 @@ REFWORD   {LABELID}|{REFWORD2}|{REFWORD3}|{REFWORD4}
 <St_Comment>"-->"      { /* end of html comment */
                          BEGIN(g_commentState); 
                        }
-<St_Comment>[^-\n]+       /* inside html comment */
-<St_Comment>.             /* inside html comment */
+<St_Comment>[^-]+      /* inside html comment */
+<St_Comment>.          /* inside html comment */
 
      /* State for skipping title (all chars until the end of the line) */
 
diff --git a/src/docvisitor.h b/src/docvisitor.h
index a444b47..18fb743 100644
--- a/src/docvisitor.h
+++ b/src/docvisitor.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/dot.cpp b/src/dot.cpp
index f9b4302..705aa27 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -156,8 +156,6 @@ static const char svgZoomFooter[] =
 
 //--------------------------------------------------------------------
 
-static const int maxCmdLine = 40960;
-
 /*! mapping from protection levels to color names */
 static const char *normalEdgeColorMap[] =
 {
@@ -166,7 +164,8 @@ static const char *normalEdgeColorMap[] =
   "firebrick4",    // Private
   "darkorchid3",   // "use" relation
   "grey75",        // Undocumented
-  "orange"         // template relation
+  "orange",        // template relation
+  "orange"         // type constraint
 };
 
 static const char *normalArrowStyleMap[] =
@@ -192,7 +191,8 @@ static const char *umlEdgeColorMap[] =
   "firebrick4",    // Private
   "grey25",        // "use" relation
   "grey75",        // Undocumented
-  "orange"         // template relation
+  "orange",        // template relation
+  "orange"         // type constraint
 };
 
 static const char *umlArrowStyleMap[] =
@@ -383,12 +383,15 @@ static bool convertMapFile(FTextStream &t,const char *mapName,
   while (!f.atEnd()) // foreach line
   {
     QCString buf(maxLineLen);
-    int numBytes = f.readLine(buf.data(),maxLineLen);
-    buf[numBytes-1]='\0';
-
-    if (buf.left(5)=="<area")
+    int numBytes = f.readLine(buf.rawData(),maxLineLen);
+    if (numBytes>0)
     {
-      t << replaceRef(buf,relPath,urlOnly,context);
+      buf.resize(numBytes+1);
+
+      if (buf.left(5)=="<area")
+      {
+        t << replaceRef(buf,relPath,urlOnly,context);
+      }
     }
   }
   return TRUE;
@@ -658,7 +661,8 @@ static bool writeSVGFigureLink(FTextStream &out,const QCString &relPath,
 // support the PNG format, we need to check the result.
 static void checkDotResult(const QCString &imgName)
 {
-  if (Config_getEnum("DOT_IMAGE_FORMAT")=="png")
+  QCString imgExt = getDotImageExtension();
+  if (imgExt=="png")
   {
     FILE *f = portable_fopen(imgName,"rb");
     if (f)
@@ -733,7 +737,7 @@ static bool checkAndUpdateMd5Signature(const QCString &baseName,
   {
     // read checksum
     QCString md5stored(33);
-    int bytesRead=f.readBlock(md5stored.data(),32);
+    int bytesRead=f.readBlock(md5stored.rawData(),32);
     md5stored[32]='\0';
     // compare checksum
     if (bytesRead==32 && md5==md5stored)
@@ -812,7 +816,11 @@ void DotRunner::addPostProcessing(const char *cmd,const char *args)
 bool DotRunner::run()
 {
   int exitCode=0;
-  QCString dotExe   = Config_getString("DOT_PATH")+"dot";
+  // we need to use data here to make a copy of the string, as Config_getString can be called by
+  // multiple threads simulaneously and the reference counting is not thread safe.
+  QCString dotExe   = Config_getString("DOT_PATH").data();
+  dotExe+="dot";
+
   bool multiTargets = Config_getBool("DOT_MULTI_TARGETS");
   QCString dotArgs;
   QListIterator<QCString> li(m_jobs);
@@ -988,11 +996,12 @@ bool DotFilePatcher::run()
   while (!fi.atEnd()) // foreach line
   {
     QCString line(maxLineLen);
-    int numBytes = fi.readLine(line.data(),maxLineLen);
+    int numBytes = fi.readLine(line.rawData(),maxLineLen);
     if (numBytes<=0)
     {
       break;
     }
+    line.resize(numBytes+1);
 
     //printf("line=[%s]\n",line.stripWhiteSpace().data());
     int i;
@@ -1135,11 +1144,12 @@ bool DotFilePatcher::run()
     while (!fi.atEnd()) // foreach line
     {
       QCString line(maxLineLen);
-      int numBytes = fi.readLine(line.data(),maxLineLen);
+      int numBytes = fi.readLine(line.rawData(),maxLineLen);
       if (numBytes<=0)
       {
         break;
       }
+      line.resize(numBytes+1);
       Map *map = m_maps.at(0); // there is only one 'map' for a SVG file
       t << replaceRef(line,map->relPath,map->urlOnly,map->context,"_top");
     }
@@ -1964,8 +1974,8 @@ void DotNode::writeXML(FTextStream &t,bool isClassGraph)
   if (!m_url.isEmpty())
   {
     QCString url(m_url);
-    char *refPtr = url.data();
-    char *urlPtr = strchr(url.data(),'$');
+    const char *refPtr = url.data();
+    char *urlPtr = strchr(url.rawData(),'$');
     if (urlPtr)
     {
       *urlPtr++='\0';
@@ -1996,6 +2006,7 @@ void DotNode::writeXML(FTextStream &t,bool isClassGraph)
           case EdgeInfo::Red:     t << "private-inheritance"; break;
           case EdgeInfo::Purple:  t << "usage"; break;
           case EdgeInfo::Orange:  t << "template-instance"; break;
+          case EdgeInfo::Orange2: t << "type-constraint"; break;
           case EdgeInfo::Grey:    ASSERT(0); break;
         }
       }
@@ -2032,8 +2043,8 @@ void DotNode::writeDocbook(FTextStream &t,bool isClassGraph)
   if (!m_url.isEmpty())
   {
     QCString url(m_url);
-    char *refPtr = url.data();
-    char *urlPtr = strchr(url.data(),'$');
+    const char *refPtr = url.data();
+    char *urlPtr = strchr(url.rawData(),'$');
     if (urlPtr)
     {
       *urlPtr++='\0';
@@ -2064,6 +2075,7 @@ void DotNode::writeDocbook(FTextStream &t,bool isClassGraph)
           case EdgeInfo::Red:     t << "private-inheritance"; break;
           case EdgeInfo::Purple:  t << "usage"; break;
           case EdgeInfo::Orange:  t << "template-instance"; break;
+          case EdgeInfo::Orange2: t << "type-constraint"; break;
           case EdgeInfo::Grey:    ASSERT(0); break;
         }
       }
@@ -2105,8 +2117,8 @@ void DotNode::writeDEF(FTextStream &t)
   if (!m_url.isEmpty())
   {
     QCString url(m_url);
-    char *refPtr = url.data();
-    char *urlPtr = strchr(url.data(),'$');
+    const char *refPtr = url.data();
+    char *urlPtr = strchr(url.rawData(),'$');
     if (urlPtr)
     {
       *urlPtr++='\0';
@@ -2141,6 +2153,7 @@ void DotNode::writeDEF(FTextStream &t)
         case EdgeInfo::Red:     t << "private-inheritance"; break;
         case EdgeInfo::Purple:  t << "usage"; break;
         case EdgeInfo::Orange:  t << "template-instance"; break;
+        case EdgeInfo::Orange2: t << "type-constraint"; break;
         case EdgeInfo::Grey:    ASSERT(0); break;
       }
       t << ';' << endl;
@@ -2266,7 +2279,8 @@ void DotGfxHierarchyTable::createGraph(DotNode *n,FTextStream &out,
 {
   QDir d(path);
   QCString baseName;
-  QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgExt = getDotImageExtension();
+  QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT");
   baseName.sprintf("inherit_graph_%d",id);
   QCString imgName = baseName+"."+ imgExt;
   QCString mapName = baseName+".map";
@@ -2300,7 +2314,7 @@ void DotGfxHierarchyTable::createGraph(DotNode *n,FTextStream &out,
   uchar md5_sig[16];
   QCString sigStr(33);
   MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.data(),33);
+  MD5SigToString(md5_sig,sigStr.rawData(),33);
   bool regenerate=FALSE;
   if (checkAndUpdateMd5Signature(absBaseName,sigStr) || 
       !checkDeliverables(absImgName,absMapName))
@@ -2316,7 +2330,7 @@ void DotGfxHierarchyTable::createGraph(DotNode *n,FTextStream &out,
     resetReNumbering();
 
     DotRunner *dotRun = new DotRunner(dotName,d.absPath().data(),TRUE,absImgName);
-    dotRun->addJob(imgExt,absImgName);
+    dotRun->addJob(imgFmt,absImgName);
     dotRun->addJob(MAP_CMD,absMapName);
     DotManager::instance()->addRun(dotRun);
   }
@@ -2584,7 +2598,7 @@ void DotClassGraph::addClass(ClassDef *cd,DotNode *n,int prot,
 {
   if (Config_getBool("HIDE_UNDOC_CLASSES") && !cd->isLinkable()) return;
 
-  int edgeStyle = (label || prot==EdgeInfo::Orange) ? EdgeInfo::Dashed : EdgeInfo::Solid;
+  int edgeStyle = (label || prot==EdgeInfo::Orange || prot==EdgeInfo::Orange2) ? EdgeInfo::Dashed : EdgeInfo::Solid;
   QCString className;
   if (usedName) // name is a typedef
   {
@@ -2790,6 +2804,7 @@ bool DotClassGraph::determineVisibleNodes(DotNode *rootNode,
 
 void DotClassGraph::buildGraph(ClassDef *cd,DotNode *n,bool base,int distance)
 {
+  static bool templateRelations = Config_getBool("TEMPLATE_RELATIONS");
   //printf("DocClassGraph::buildGraph(%s,distance=%d,base=%d)\n",
   //    cd->name().data(),distance,base);
   // ---- Add inheritance relations
@@ -2849,10 +2864,43 @@ void DotClassGraph::buildGraph(ClassDef *cd,DotNode *n,bool base,int distance)
       }
     }
   }
+  if (templateRelations && base)
+  {
+    ConstraintClassDict *dict = cd->templateTypeConstraints();
+    if (dict)
+    {
+      ConstraintClassDictIterator ccdi(*dict);
+      ConstraintClassDef *ccd;
+      for (;(ccd=ccdi.current());++ccdi)
+      {
+        QCString label;
+        QDictIterator<void> dvi(*ccd->accessors);
+        const char *s;
+        bool first=TRUE;
+        int count=0;
+        int maxLabels=10;
+        for (;(s=dvi.currentKey()) && count<maxLabels;++dvi,++count)
+        {
+          if (first)
+          {
+            label=s;
+            first=FALSE;
+          }
+          else
+          {
+            label+=QCString("\n")+s;
+          }
+        }
+        if (count==maxLabels) label+="\n...";
+        //printf("addClass: %s templSpec=%s\n",ucd->classDef->name().data(),ucd->templSpecifiers.data());
+        addClass(ccd->classDef,n,EdgeInfo::Orange2,label,0,
+            0,TRUE,distance);
+      }
+    }
+  }
 
   // ---- Add template instantiation relations
 
-  static bool templateRelations = Config_getBool("TEMPLATE_RELATIONS");
   if (templateRelations)
   {
     if (base) // template relations for base classes
@@ -3028,7 +3076,7 @@ QCString computeMd5Signature(DotNode *root,
   uchar md5_sig[16];
   QCString sigStr(33);
   MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.data(),33);
+  MD5SigToString(md5_sig,sigStr.rawData(),33);
   if (reNumber)
   {
     resetReNumbering();
@@ -3121,7 +3169,8 @@ QCString DotClassGraph::writeGraph(FTextStream &out,
   baseName = convertNameToFile(diskName());
 
   // derive target file names from baseName
-  QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgExt = getDotImageExtension();
+  QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT");
   QCString absBaseName = d.absPath().utf8()+"/"+baseName;
   QCString absDotName  = absBaseName+".dot";
   QCString absMapName  = absBaseName+".map";
@@ -3147,11 +3196,9 @@ QCString DotClassGraph::writeGraph(FTextStream &out,
     regenerate=TRUE;
     if (graphFormat==GOF_BITMAP) // run dot to create a bitmap image
     {
-      QCString dotArgs(maxCmdLine);
-
       DotRunner *dotRun = new DotRunner(absDotName,
                               d.absPath().data(),TRUE,absImgName);
-      dotRun->addJob(imgExt,absImgName);
+      dotRun->addJob(imgFmt,absImgName);
       if (generateImageMap) dotRun->addJob(MAP_CMD,absMapName);
       DotManager::instance()->addRun(dotRun);
 
@@ -3479,7 +3526,8 @@ QCString DotInclDepGraph::writeGraph(FTextStream &out,
   QCString mapName=escapeCharsInString(m_startNode->m_label,FALSE);
   if (m_inverse) mapName+="dep";
 
-  QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgExt = getDotImageExtension();
+  QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT");
   QCString absBaseName = d.absPath().utf8()+"/"+baseName;
   QCString absDotName  = absBaseName+".dot";
   QCString absMapName  = absBaseName+".map";
@@ -3506,9 +3554,8 @@ QCString DotInclDepGraph::writeGraph(FTextStream &out,
     if (graphFormat==GOF_BITMAP)
     {
       // run dot to create a bitmap image
-      QCString dotArgs(maxCmdLine);
       DotRunner *dotRun = new DotRunner(absDotName,d.absPath().data(),TRUE,absImgName);
-      dotRun->addJob(imgExt,absImgName);
+      dotRun->addJob(imgFmt,absImgName);
       if (generateImageMap) dotRun->addJob(MAP_CMD,absMapName);
       DotManager::instance()->addRun(dotRun);
     }
@@ -3792,7 +3839,8 @@ QCString DotCallGraph::writeGraph(FTextStream &out, GraphOutputFormat graphForma
   QCString baseName = m_diskName + (m_inverse ? "_icgraph" : "_cgraph");
   QCString mapName  = baseName;
 
-  QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgExt = getDotImageExtension();
+  QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT");
   QCString absBaseName = d.absPath().utf8()+"/"+baseName;
   QCString absDotName  = absBaseName+".dot";
   QCString absMapName  = absBaseName+".map";
@@ -3819,9 +3867,8 @@ QCString DotCallGraph::writeGraph(FTextStream &out, GraphOutputFormat graphForma
     if (graphFormat==GOF_BITMAP)
     {
       // run dot to create a bitmap image
-      QCString dotArgs(maxCmdLine);
       DotRunner *dotRun = new DotRunner(absDotName,d.absPath().data(),TRUE,absImgName);
-      dotRun->addJob(imgExt,absImgName);
+      dotRun->addJob(imgFmt,absImgName);
       if (generateImageMap) dotRun->addJob(MAP_CMD,absMapName);
       DotManager::instance()->addRun(dotRun);
 
@@ -3947,7 +3994,8 @@ QCString DotDirDeps::writeGraph(FTextStream &out,
   QCString baseName=m_dir->getOutputFileBase()+"_dep";
   QCString mapName=escapeCharsInString(baseName,FALSE);
 
-  QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgExt = getDotImageExtension();
+  QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT");
   QCString absBaseName = d.absPath().utf8()+"/"+baseName;
   QCString absDotName  = absBaseName+".dot";
   QCString absMapName  = absBaseName+".map";
@@ -3962,7 +4010,7 @@ QCString DotDirDeps::writeGraph(FTextStream &out,
   uchar md5_sig[16];
   QCString sigStr(33);
   MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.data(),33);
+  MD5SigToString(md5_sig,sigStr.rawData(),33);
   bool regenerate=FALSE;
   if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
       !checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
@@ -3984,9 +4032,8 @@ QCString DotDirDeps::writeGraph(FTextStream &out,
     if (graphFormat==GOF_BITMAP)
     {
       // run dot to create a bitmap image
-      QCString dotArgs(maxCmdLine);
       DotRunner *dotRun = new DotRunner(absDotName,d.absPath().data(),TRUE,absImgName);
-      dotRun->addJob(imgExt,absImgName);
+      dotRun->addJob(imgFmt,absImgName);
       if (generateImageMap) dotRun->addJob(MAP_CMD,absMapName);
       DotManager::instance()->addRun(dotRun);
     }
@@ -4108,10 +4155,11 @@ void generateGraphLegend(const char *path)
   uchar md5_sig[16];
   QCString sigStr(33);
   MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.data(),33);
+  MD5SigToString(md5_sig,sigStr.rawData(),33);
   QCString absBaseName = (QCString)path+"/graph_legend";
   QCString absDotName  = absBaseName+".dot";
-  QCString imgExt      = Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgExt = getDotImageExtension();
+  QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT");
   QCString imgName     = "graph_legend."+imgExt;
   QCString absImgName  = absBaseName+"."+imgExt;
   if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
@@ -4131,7 +4179,7 @@ void generateGraphLegend(const char *path)
     // run dot to generate the a bitmap image from the graph
 
     DotRunner *dotRun = new DotRunner(absDotName,d.absPath().data(),TRUE,absImgName);
-    dotRun->addJob(imgExt,absImgName);
+    dotRun->addJob(imgFmt,absImgName);
     DotManager::instance()->addRun(dotRun);
   }
   else
@@ -4159,14 +4207,15 @@ void writeDotGraphFromFile(const char *inFile,const char *outDir,
     err("Output dir %s does not exist!\n",outDir); exit(1);
   }
 
-  QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgExt = getDotImageExtension();
+  QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT");
   QCString imgName = (QCString)outFile+"."+imgExt;
   QCString absImgName = d.absPath().utf8()+"/"+imgName;
   QCString absOutFile = d.absPath().utf8()+"/"+outFile;
 
   DotRunner dotRun(inFile,d.absPath().data(),FALSE,absImgName);
   if (format==GOF_BITMAP)
-    dotRun.addJob(imgExt,absImgName);
+    dotRun.addJob(imgFmt,absImgName);
   else // format==GOF_EPS
   {
     if (Config_getBool("USE_PDFLATEX"))
@@ -4214,7 +4263,8 @@ void writeDotImageMapFromFile(FTextStream &t,
   }
 
   QCString mapName = baseName+".map";
-  QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgExt = getDotImageExtension();
+  QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT");
   QCString imgName = baseName+"."+imgExt;
   QCString absOutFile = d.absPath().utf8()+"/"+mapName;
 
@@ -4508,11 +4558,11 @@ QCString DotGroupCollaboration::writeGraph( FTextStream &t,
   uchar md5_sig[16];
   QCString sigStr(33);
   MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.data(),33);
-  QCString imgExt      = Config_getEnum("DOT_IMAGE_FORMAT");
+  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  QCString imgExt = getDotImageExtension();
+  QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT");
   QCString baseName    = m_diskName;
   QCString imgName     = baseName+"."+imgExt;
-  QCString mapName     = baseName+".map";
   QCString absPath     = d.absPath().data();
   QCString absBaseName = absPath+"/"+baseName;
   QCString absDotName  = absBaseName+".dot";
@@ -4539,10 +4589,8 @@ QCString DotGroupCollaboration::writeGraph( FTextStream &t,
 
     if (graphFormat==GOF_BITMAP) // run dot to create a bitmap image
     {
-      QCString dotArgs(maxCmdLine);
-
       DotRunner *dotRun = new DotRunner(absDotName,d.absPath().data(),FALSE);
-      dotRun->addJob(imgExt,absImgName);
+      dotRun->addJob(imgFmt,absImgName);
       if (writeImageMap) dotRun->addJob(MAP_CMD,absMapName);
       DotManager::instance()->addRun(dotRun);
 
diff --git a/src/dot.h b/src/dot.h
index 41a416e..3de7d79 100644
--- a/src/dot.h
+++ b/src/dot.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -45,7 +45,7 @@ enum EmbeddedOutputFormat { EOF_Html, EOF_LaTeX, EOF_Rtf, EOF_DocBook };
 /** Attributes of an edge of a dot graph */
 struct EdgeInfo
 {
-  enum Colors { Blue=0, Green=1, Red=2, Purple=3, Grey=4, Orange=5 };
+  enum Colors { Blue=0, Green=1, Red=2, Purple=3, Grey=4, Orange=5, Orange2=6 };
   enum Styles { Solid=0, Dashed=1 };
   EdgeInfo() : m_color(0), m_style(0), m_labColor(0) {}
  ~EdgeInfo() {}
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index e127b8e..647b5c8 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <qtextcodec.h>
-#include <unistd.h>
 #include <errno.h>
 #include <qptrdict.h>
 #include <qtextstream.h>
@@ -72,7 +71,7 @@
 #include "htags.h"
 #include "pyscanner.h"
 #include "fortranscanner.h"
-#include "dbusxmlscanner.h"
+#include "xmlscanner.h"
 #include "tclscanner.h"
 #include "code.h"
 #include "objcache.h"
@@ -1265,12 +1264,12 @@ static void addClassToContext(EntryNav *rootNav)
   ClassDef *cd = getClass(qualifiedName);
 
   Debug::print(Debug::Classes,0, "  Found class with name %s (qualifiedName=%s -> cd=%p)\n",
-      cd ? cd->name().data() : root->name.data(), qualifiedName.data(),cd);
+      cd ? qPrint(cd->name()) : qPrint(root->name), qPrint(qualifiedName),cd);
 
   if (cd)
   {
     fullName=cd->name();
-    Debug::print(Debug::Classes,0,"  Existing class %s!\n",cd->name().data());
+    Debug::print(Debug::Classes,0,"  Existing class %s!\n",qPrint(cd->name()));
     //if (cd->templateArguments()==0)
     //{
     //  //printf("existing ClassDef tempArgList=%p specScope=%s\n",root->tArgList,root->scopeSpec.data());
@@ -1341,7 +1340,7 @@ static void addClassToContext(EntryNav *rootNav)
     cd=new ClassDef(tagInfo?tagName:root->fileName,root->startLine,root->startColumn,
         fullName,sec,tagName,refFileName,TRUE,root->spec&Entry::Enum);
     Debug::print(Debug::Classes,0,"  New class `%s' (sec=0x%08x)! #tArgLists=%d tagInfo=%p\n",
-        fullName.data(),sec,root->tArgLists ? (int)root->tArgLists->count() : -1, tagInfo);
+        qPrint(fullName),sec,root->tArgLists ? (int)root->tArgLists->count() : -1, tagInfo);
     cd->setDocumentation(root->doc,root->docFile,root->docLine); // copy docs to definition
     cd->setBriefDescription(root->brief,root->briefFile,root->briefLine);
     cd->setLanguage(root->lang);    
@@ -1353,7 +1352,7 @@ static void addClassToContext(EntryNav *rootNav)
     //printf("new ClassDef %s tempArgList=%p specScope=%s\n",fullName.data(),root->tArgList,root->scopeSpec.data());    
 
     //printf("class %s template args=%s\n",fullName.data(),     
-    //    tArgList ? tempArgListToString(tArgList).data() : "<none>");          
+    //    tArgList ? tempArgListToString(tArgList,root->lang).data() : "<none>");          
     cd->setTemplateArguments(tArgList);         
     cd->setProtection(root->protection);        
     cd->setIsStatic(root->stat);        
@@ -1746,6 +1745,13 @@ static void buildNamespaceList(EntryNav *rootNav)
         {
           nd->setLanguage(root->lang);
         }
+        if (rootNav->tagInfo()==0) // if we found the namespace in a tag file
+                                   // and also in a project file, then remove
+                                   // the tag file reference
+        {
+          nd->setReference("");
+          nd->setFileName(fullName);
+        }
 
         // file definition containing the namespace nd
         FileDef *fd=rootNav->fileDef();
@@ -2056,7 +2062,7 @@ static void findUsingDeclarations(EntryNav *rootNav)
       if (usingCd==0) // definition not in the input => add an artificial class
       {
         Debug::print(Debug::Classes,0,"  New using class `%s' (sec=0x%08x)! #tArgLists=%d\n",
-             name.data(),root->section,root->tArgLists ? (int)root->tArgLists->count() : -1);
+             qPrint(name),root->section,root->tArgLists ? (int)root->tArgLists->count() : -1);
         usingCd = new ClassDef(
                      "<using>",1,1,
                      name,
@@ -2068,7 +2074,7 @@ static void findUsingDeclarations(EntryNav *rootNav)
       else
       {
         Debug::print(Debug::Classes,0,"  Found used class %s in scope=%s\n",
-            usingCd->name().data(),nd?nd->name().data():fd->name().data());
+            qPrint(usingCd->name()),nd?qPrint(nd->name()):qPrint(fd->name()));
       }
 
       if (nd)
@@ -2249,13 +2255,13 @@ static MemberDef *addVariableToClass(
   Debug::print(Debug::Variables,0,
       "  class variable:\n"
       "    `%s' `%s'::`%s' `%s' prot=`%d ann=%d init=`%s'\n",
-      root->type.data(),
-      qualScope.data(), 
-      name.data(),
-      root->args.data(),
+      qPrint(root->type),
+      qPrint(qualScope), 
+      qPrint(name),
+      qPrint(root->args),
       root->protection,
       fromAnnScope,
-      root->initializer.data()
+      qPrint(root->initializer)
               );
 
   QCString def;
@@ -2416,10 +2422,10 @@ static MemberDef *addVariableToFile(
   Debug::print(Debug::Variables,0,
       "  global variable:\n"
       "    type=`%s' scope=`%s' name=`%s' args=`%s' prot=`%d mtype=%d lang=%d\n",
-      root->type.data(),
-      scope.data(), 
-      name.data(),
-      root->args.data(),
+      qPrint(root->type),
+      qPrint(scope),
+      qPrint(name),
+      qPrint(root->args),
       root->protection,
       mtype,
       root->lang
@@ -2458,7 +2464,6 @@ static MemberDef *addVariableToFile(
 
   // see if the function is inside a namespace
   NamespaceDef *nd = 0;
-  QCString nscope;
   if (!scope.isEmpty())
   {
     if (scope.find('@')!=-1) return 0; // anonymous scope!
@@ -2562,7 +2567,7 @@ static MemberDef *addVariableToFile(
         {
 
           Debug::print(Debug::Variables,0,
-              "    variable already found: scope=%s\n",md->getOuterScope()->name().data());
+              "    variable already found: scope=%s\n",qPrint(md->getOuterScope()->name()));
           addMemberDocs(rootNav,md,def,0,FALSE);
           md->setRefItems(root->sli);
           return md;
@@ -2578,7 +2583,7 @@ static MemberDef *addVariableToFile(
   }
 
   Debug::print(Debug::Variables,0,
-    "    new variable, nd=%s!\n",nd?nd->name().data():"<global>");
+    "    new variable, nd=%s!\n",nd?qPrint(nd->name()):"<global>");
   // new global variable, enum value or typedef
   MemberDef *md=new MemberDef(
       fileName,root->startLine,root->startColumn,
@@ -2805,12 +2810,12 @@ static void addVariable(EntryNav *rootNav,int isFuncPtr=-1)
     Debug::print(Debug::Variables,0,
                   "VARIABLE_SEC: \n"
                   "  type=`%s' name=`%s' args=`%s' bodyLine=`%d' mGrpId=%d relates=%s\n",
-                   root->type.data(),
-                   root->name.data(),
-                   root->args.data(),
+                   qPrint(root->type),
+                   qPrint(root->name),
+                   qPrint(root->args),
                    root->bodyLine,
                    root->mGrpId,
-                   root->relates.data()
+                   qPrint(root->relates)
                 );
     //printf("root->parent->name=%s\n",root->parent->name.data());
 
@@ -3121,10 +3126,10 @@ static void addInterfaceOrServiceToServiceOrSingleton(
       "  Interface Member:\n"
       "    `%s' `%s' proto=%d\n"
       "    def=`%s'\n",
-      root->type.data(),
-      rname.data(),
+      qPrint(root->type),
+      qPrint(rname),
       root->proto,
-      def.data()
+      qPrint(def)
               );
 
   // add member to the global list of all members
@@ -3167,20 +3172,20 @@ static void buildInterfaceAndServiceList(EntryNav *const rootNav)
     Debug::print(Debug::Functions,0,
                  "EXPORTED_INTERFACE_SEC:\n"
                  "  `%s' `%s'::`%s' `%s' relates=`%s' relatesType=`%d' file=`%s' line=`%d' bodyLine=`%d' #tArgLists=%d mGrpId=%d spec=%lld proto=%d docFile=%s\n",
-                 root->type.data(),
-                 rootNav->parent()->name().data(),
-                 root->name.data(),
-                 root->args.data(),
-                 root->relates.data(),
+                 qPrint(root->type),
+                 qPrint(rootNav->parent()->name()),
+                 qPrint(root->name),
+                 qPrint(root->args),
+                 qPrint(root->relates),
                  root->relatesType,
-                 root->fileName.data(),
+                 qPrint(root->fileName),
                  root->startLine,
                  root->bodyLine,
                  root->tArgLists ? (int)root->tArgLists->count() : -1,
                  root->mGrpId,
                  root->spec,
                  root->proto,
-                 root->docFile.data()
+                 qPrint(root->docFile)
                 );
 
     QCString const rname = removeRedundantWhiteSpace(root->name);
@@ -3373,12 +3378,12 @@ static void addMethodToClass(EntryNav *rootNav,ClassDef *cd,
       "  Func Member:\n"
       "    `%s' `%s'::`%s' `%s' proto=%d\n"
       "    def=`%s'\n",
-      root->type.data(),
-      qualScope.data(),
-      rname.data(),
-      root->args.data(),
+      qPrint(root->type),
+      qPrint(qualScope),
+      qPrint(rname),
+      qPrint(root->args),
       root->proto,
-      def.data()
+      qPrint(def)
               );
 
   // add member to the global list of all members
@@ -3416,20 +3421,20 @@ static void buildFunctionList(EntryNav *rootNav)
     Debug::print(Debug::Functions,0,
                  "FUNCTION_SEC:\n"
                  "  `%s' `%s'::`%s' `%s' relates=`%s' relatesType=`%d' file=`%s' line=`%d' bodyLine=`%d' #tArgLists=%d mGrpId=%d spec=%lld proto=%d docFile=%s\n",
-                 root->type.data(),
-                 rootNav->parent()->name().data(),
-                 root->name.data(),
-                 root->args.data(),
-                 root->relates.data(),
+                 qPrint(root->type),
+                 qPrint(rootNav->parent()->name()),
+                 qPrint(root->name),
+                 qPrint(root->args),
+                 qPrint(root->relates),
                  root->relatesType,
-                 root->fileName.data(),
+                 qPrint(root->fileName),
                  root->startLine,
                  root->bodyLine,
                  root->tArgLists ? (int)root->tArgLists->count() : -1,
                  root->mGrpId,
                  root->spec,
                  root->proto,
-                 root->docFile.data()
+                 qPrint(root->docFile)
                 );
 
     bool isFriend=root->type.find("friend ")!=-1;
@@ -3499,7 +3504,7 @@ static void buildFunctionList(EntryNav *rootNav)
          )
       {
         Debug::print(Debug::Functions,0,"  --> member %s of class %s!\n",
-            rname.data(),cd->name().data());
+            qPrint(rname),qPrint(cd->name()));
         addMethodToClass(rootNav,cd,rname,isFriend);
       }
       else if (!((rootNav->parent()->section() & Entry::COMPOUND_MASK) 
@@ -3520,7 +3525,7 @@ static void buildFunctionList(EntryNav *rootNav)
         MemberDef *md=0;
         if ((mn=Doxygen::functionNameSDict->find(rname)))
         {
-          Debug::print(Debug::Functions,0,"  --> function %s already found!\n",rname.data());
+          Debug::print(Debug::Functions,0,"  --> function %s already found!\n",qPrint(rname));
           MemberNameIterator mni(*mn);
           for (mni.toFirst();(!found && (md=mni.current()));++mni)
           {
@@ -3663,7 +3668,7 @@ static void buildFunctionList(EntryNav *rootNav)
         }
         if (!found) /* global function is unique with respect to the file */
         {
-          Debug::print(Debug::Functions,0,"  --> new function %s found!\n",rname.data());
+          Debug::print(Debug::Functions,0,"  --> new function %s found!\n",qPrint(rname));
           //printf("New function type=`%s' name=`%s' args=`%s' bodyLine=%d\n",
           //       root->type.data(),rname.data(),root->args.data(),root->bodyLine);
 
@@ -3744,12 +3749,12 @@ static void buildFunctionList(EntryNav *rootNav)
                      "  Global Function:\n"
                      "    `%s' `%s'::`%s' `%s' proto=%d\n"
                      "    def=`%s'\n",
-                     root->type.data(),
-                     rootNav->parent()->name().data(),
-                     rname.data(),
-                     root->args.data(),
+                     qPrint(root->type),
+                     qPrint(rootNav->parent()->name()),
+                     qPrint(rname),
+                     qPrint(root->args),
                      root->proto,
-                     def.data()
+                     qPrint(def)
                     );
           md->setDefinition(def);
           md->enableCallGraph(root->callGraph);
@@ -3812,7 +3817,7 @@ static void buildFunctionList(EntryNav *rootNav)
       }
       else
       {
-          Debug::print(Debug::Functions,0,"  --> %s not processed!\n",rname.data());
+          Debug::print(Debug::Functions,0,"  --> %s not processed!\n",qPrint(rname));
       }
     }
     else if (rname.isEmpty())
@@ -4251,7 +4256,7 @@ static void findUsedClassesForClass(EntryNav *rootNav,
                 if (arg->name==usedName) // type is a template argument
                 {
                   found=TRUE;
-                  Debug::print(Debug::Classes,0,"    New used class `%s'\n", usedName.data());
+                  Debug::print(Debug::Classes,0,"    New used class `%s'\n", qPrint(usedName));
 
                   ClassDef *usedCd = Doxygen::hiddenClasses->find(usedName);
                   if (usedCd==0)
@@ -4268,7 +4273,7 @@ static void findUsedClassesForClass(EntryNav *rootNav,
                     Doxygen::hiddenClasses->append(usedName,usedCd);
                   }
                   if (isArtificial) usedCd->setArtificial(TRUE);
-                  Debug::print(Debug::Classes,0,"      Adding used class `%s' (1)\n", usedCd->name().data());
+                  Debug::print(Debug::Classes,0,"      Adding used class `%s' (1)\n", qPrint(usedCd->name()));
                   instanceCd->addUsedClass(usedCd,md->name(),md->protection());
                   usedCd->addUsedByClass(instanceCd,md->name(),md->protection());
                 }
@@ -4284,7 +4289,7 @@ static void findUsedClassesForClass(EntryNav *rootNav,
               if (usedCd) 
               {
                 found=TRUE;
-                Debug::print(Debug::Classes,0,"    Adding used class `%s' (2)\n", usedCd->name().data());
+                Debug::print(Debug::Classes,0,"    Adding used class `%s' (2)\n", qPrint(usedCd->name()));
                 instanceCd->addUsedClass(usedCd,md->name(),md->protection()); // class exists 
                 usedCd->addUsedByClass(instanceCd,md->name(),md->protection());
               }
@@ -4304,7 +4309,7 @@ static void findUsedClassesForClass(EntryNav *rootNav,
               {
                 type+=md->argsString();
               }
-              Debug::print(Debug::Classes,0,"  New undocumented used class `%s'\n", type.data());
+              Debug::print(Debug::Classes,0,"  New undocumented used class `%s'\n", qPrint(type));
               usedCd = new ClassDef(
                   masterCd->getDefFileName(),masterCd->getDefLine(),
                   masterCd->getDefColumn(),
@@ -4316,7 +4321,7 @@ static void findUsedClassesForClass(EntryNav *rootNav,
             if (usedCd)
             {
               if (isArtificial) usedCd->setArtificial(TRUE);
-              Debug::print(Debug::Classes,0,"    Adding used class `%s' (3)\n", usedCd->name().data());
+              Debug::print(Debug::Classes,0,"    Adding used class `%s' (3)\n", qPrint(usedCd->name()));
               instanceCd->addUsedClass(usedCd,md->name(),md->protection()); 
               usedCd->addUsedByClass(instanceCd,md->name(),md->protection());
             }
@@ -4402,7 +4407,7 @@ static bool findTemplateInstanceRelation(Entry *root,
             bool isArtificial)
 {
   Debug::print(Debug::Classes,0,"    derived from template %s with parameters %s\n",
-         templateClass->name().data(),templSpec.data());
+         qPrint(templateClass->name()),qPrint(templSpec));
   //printf("findTemplateInstanceRelation(base=%s templSpec=%s templateNames=",
   //    templateClass->name().data(),templSpec.data());
   //if (templateNames)
@@ -4429,7 +4434,7 @@ static bool findTemplateInstanceRelation(Entry *root,
 
   if (freshInstance)
   {
-    Debug::print(Debug::Classes,0,"      found fresh instance '%s'!\n",instanceClass->name().data());
+    Debug::print(Debug::Classes,0,"      found fresh instance '%s'!\n",qPrint(instanceClass->name()));
     Doxygen::classSDict->append(instanceClass->name(),instanceClass);
     instanceClass->setTemplateBaseClassNames(templateNames);
 
@@ -4449,7 +4454,7 @@ static bool findTemplateInstanceRelation(Entry *root,
       }
 
       Debug::print(Debug::Classes,0,"        template root found %s templSpec=%s!\n",
-          templateRoot->name.data(),templSpec.data());
+          qPrint(templateRoot->name),qPrint(templSpec));
       ArgumentList *templArgs = new ArgumentList;
       stringToArgumentList(templSpec,templArgs);
       findBaseClassesForClass(templateRootNav,context,templateClass,instanceClass,
@@ -4659,11 +4664,11 @@ static bool findClassRelation(
       {
         Debug::print(
             Debug::Classes,0,"    class relation %s inherited/used by %s found (%s and %s) templSpec='%s'\n",
-            baseClassName.data(),
-            rootNav->name().data(),
+            qPrint(baseClassName),
+            qPrint(rootNav->name()),
             (bi->prot==Private)?"private":((bi->prot==Protected)?"protected":"public"),
             (bi->virt==Normal)?"normal":"virtual",
-            templSpec.data()
+            qPrint(templSpec)
            );
 
         int i=baseClassName.find('<');
@@ -4769,7 +4774,7 @@ static bool findClassRelation(
         //printf("3. found=%d\n",found);
         if (found)
         {
-          Debug::print(Debug::Classes,0,"    Documented base class `%s' templSpec=%s\n",biName.data(),templSpec.isEmpty()?"":templSpec.data());
+          Debug::print(Debug::Classes,0,"    Documented base class `%s' templSpec=%s\n",qPrint(biName),qPrint(templSpec));
           // add base class to this class
 
           // if templSpec is not empty then we should "instantiate"
@@ -4825,7 +4830,7 @@ static bool findClassRelation(
         {
           Debug::print(Debug::Classes,0,
                        "    New undocumented base class `%s' baseClassName=%s templSpec=%s isArtificial=%d\n",
-                       biName.data(),baseClassName.data(),templSpec.data(),isArtificial
+                       qPrint(biName),qPrint(baseClassName),qPrint(templSpec),isArtificial
                       );
           baseClass=0;
           if (isATemplateArgument)
@@ -4884,7 +4889,7 @@ static bool findClassRelation(
         }
         else
         {
-          Debug::print(Debug::Classes,0,"    Base class `%s' not found\n",biName.data());
+          Debug::print(Debug::Classes,0,"    Base class `%s' not found\n",qPrint(biName));
         }
       }
       else
@@ -4993,7 +4998,7 @@ static void findInheritedTemplateInstances()
   {
     ClassDef *cd;
     QCString bName = extractClassName(rootNav);
-    Debug::print(Debug::Classes,0,"  Inheritance: Class %s : \n",bName.data());
+    Debug::print(Debug::Classes,0,"  Inheritance: Class %s : \n",qPrint(bName));
     if ((cd=getClass(bName)))
     {
       rootNav->loadEntry(g_storage);
@@ -5014,11 +5019,12 @@ static void findUsedTemplateInstances()
   {
     ClassDef *cd;
     QCString bName = extractClassName(rootNav);
-    Debug::print(Debug::Classes,0,"  Usage: Class %s : \n",bName.data());
+    Debug::print(Debug::Classes,0,"  Usage: Class %s : \n",qPrint(bName));
     if ((cd=getClass(bName)))
     {
       rootNav->loadEntry(g_storage);
       findUsedClassesForClass(rootNav,cd,cd,cd,TRUE);
+      cd->addTypeConstraints();
       rootNav->releaseEntry();
     }
   }
@@ -5037,7 +5043,7 @@ static void computeClassRelations()
     rootNav->loadEntry(g_storage);
     Entry *root = rootNav->entry();
     QCString bName = extractClassName(rootNav);
-    Debug::print(Debug::Classes,0,"  Relations: Class %s : \n",bName.data());
+    Debug::print(Debug::Classes,0,"  Relations: Class %s : \n",qPrint(bName));
     if ((cd=getClass(bName)))
     {
       findBaseClassesForClass(rootNav,cd,cd,cd,DocumentedOnly,FALSE);
@@ -5079,12 +5085,12 @@ static void computeTemplateClassRelations()
     QDict<ClassDef> *templInstances = 0;
     if (cd && (templInstances=cd->getTemplateInstances()))
     {
-      Debug::print(Debug::Classes,0,"  Template class %s : \n",cd->name().data());
+      Debug::print(Debug::Classes,0,"  Template class %s : \n",qPrint(cd->name()));
       QDictIterator<ClassDef> tdi(*templInstances);
       ClassDef *tcd;
       for (tdi.toFirst();(tcd=tdi.current());++tdi) // for each template instance
       {
-        Debug::print(Debug::Classes,0,"    Template instance %s : \n",tcd->name().data());
+        Debug::print(Debug::Classes,0,"    Template instance %s : \n",qPrint(tcd->name()));
         QCString templSpec = tdi.currentKey();
         ArgumentList *templArgs = new ArgumentList;
         stringToArgumentList(templSpec,templArgs);
@@ -5453,7 +5459,7 @@ static bool findGlobalMember(EntryNav *rootNav,
   Entry *root = rootNav->entry();
   Debug::print(Debug::FindMembers,0,
        "2. findGlobalMember(namespace=%s,type=%s,name=%s,tempArg=%s,decl=%s)\n",
-          namespaceName.data(),type,name,tempArg,decl);
+          qPrint(namespaceName),qPrint(type),qPrint(name),qPrint(tempArg),qPrint(decl));
   QCString n=name;
   if (n.isEmpty()) return FALSE;
   if (n.find("::")!=-1) return FALSE; // skip undefined class members
@@ -5492,8 +5498,7 @@ static bool findGlobalMember(EntryNav *rootNav,
          )     
       {
         Debug::print(Debug::FindMembers,0,"4. Try to add member `%s' to scope `%s'\n",
-            md->name().data(),namespaceName.data());
-        QCString nsName = nd ? nd->name().data() : "";
+            qPrint(md->name()),qPrint(namespaceName));
 
         NamespaceDef *rnd = 0;
         if (!namespaceName.isEmpty()) rnd = Doxygen::namespaceSDict->find(namespaceName);
@@ -5773,7 +5778,7 @@ static void findMember(EntryNav *rootNav,
                "findMember(root=%p,funcDecl=`%s',related=`%s',overload=%d,"
                "isFunc=%d mGrpId=%d tArgList=%p (#=%d) "
                "spec=%lld lang=%x\n",
-               root,funcDecl.data(),root->relates.data(),overloaded,isFunc,root->mGrpId,
+               root,qPrint(funcDecl),qPrint(root->relates),overloaded,isFunc,root->mGrpId,
                root->tArgLists,root->tArgLists ? root->tArgLists->count() : 0,
                root->spec,root->lang
               );
@@ -6061,9 +6066,9 @@ static void findMember(EntryNav *rootNav,
            "  isMemberOf=%d\n"
            "  isFriend=%d\n"
            "  isFunc=%d\n\n",
-           namespaceName.data(),className.data(),
-           funcType.data(),funcSpec.data(),funcName.data(),funcArgs.data(),funcTempList.data(),
-           funcDecl.data(),root->relates.data(),exceptions.data(),isRelated,isMemberOf,isFriend,
+           qPrint(namespaceName),qPrint(className),
+           qPrint(funcType),qPrint(funcSpec),qPrint(funcName),qPrint(funcArgs),qPrint(funcTempList),
+           qPrint(funcDecl),qPrint(root->relates),qPrint(exceptions),isRelated,isMemberOf,isFriend,
            isFunc
           );
 
@@ -6103,9 +6108,9 @@ static void findMember(EntryNav *rootNav,
             Debug::print(Debug::FindMembers,0,
                 "3. member definition found, "
                 "scope needed=`%s' scope=`%s' args=`%s' fileName=%s\n",
-                scopeName.data(),cd ? cd->name().data() : "<none>",
-                md->argsString(),
-                root->fileName.data());
+                qPrint(scopeName),cd ? qPrint(cd->name()) : "<none>",
+                qPrint(md->argsString()),
+                qPrint(root->fileName));
             //printf("Member %s (member scopeName=%s) (this scopeName=%s) classTempList=%s\n",md->name().data(),cd->name().data(),scopeName.data(),classTempList.data());
             FileDef *fd=rootNav->fileDef();
             NamespaceDef *nd=0;
@@ -6172,8 +6177,8 @@ static void findMember(EntryNav *rootNav,
 
               Debug::print(Debug::FindMembers,0,
                   "5. matching `%s'<=>`%s' className=%s namespaceName=%s\n",
-                  argListToString(argList,TRUE).data(),argListToString(root->argList,TRUE).data(),
-                  className.data(),namespaceName.data()
+                  qPrint(argListToString(argList,TRUE)),qPrint(argListToString(root->argList,TRUE)),
+                  qPrint(className),qPrint(namespaceName)
                   );
 
               bool matching=
@@ -6198,7 +6203,7 @@ static void findMember(EntryNav *rootNav,
                                     className+"::",""); // see bug700693 & bug732594
                 Debug::print(Debug::FindMembers,0,
                    "5b. Comparing return types '%s'<->'%s' #args %d<->%d\n",
-                    md->typeString(),funcType.data(),
+                    qPrint(md->typeString()),qPrint(funcType),
                     md->templateArguments()->count(),root->tArgLists->getLast()->count());
                 if (md->templateArguments()->count()!=root->tArgLists->getLast()->count() ||
                     qstrcmp(memType,funcType))
@@ -6299,7 +6304,7 @@ static void findMember(EntryNav *rootNav,
                     umd = emd = cmd;
                     Debug::print(Debug::FindMembers,0,
                      "7. new candidate className=%s scope=%s args=%s exact match\n",
-                         className.data(),ccd->name().data(),md->argsString());
+                         qPrint(className),qPrint(ccd->name()),qPrint(md->argsString()));
                   }
                   else // arguments do not match, but member name and scope do -> remember
                   {
@@ -6307,7 +6312,7 @@ static void findMember(EntryNav *rootNav,
                     umd = cmd;
                     Debug::print(Debug::FindMembers,0,
                      "7. new candidate className=%s scope=%s args=%s no match\n",
-                         className.data(),ccd->name().data(),md->argsString());
+                         qPrint(className),qPrint(ccd->name()),qPrint(md->argsString()));
                   }
                   candidates++;
                 }
@@ -6428,6 +6433,7 @@ static void findMember(EntryNav *rootNav,
           md->enableCallGraph(root->callGraph);
           md->enableCallerGraph(root->callerGraph);
           md->setDocumentation(root->doc,root->docFile,root->docLine);
+          md->setBriefDescription(root->brief,root->briefFile,root->briefLine);
           md->setInbodyDocumentation(root->inbodyDocs,root->inbodyFile,root->inbodyLine);
           md->setDocsForDefinition(!root->proto);
           md->setPrototype(root->proto);
@@ -6495,6 +6501,7 @@ static void findMember(EntryNav *rootNav,
           doc+="<p>";
           doc+=root->doc;
           md->setDocumentation(doc,root->docFile,root->docLine);
+          md->setBriefDescription(root->brief,root->briefFile,root->briefLine);
           md->setInbodyDocumentation(root->inbodyDocs,root->inbodyFile,root->inbodyLine);
           md->setDocsForDefinition(!root->proto);
           md->setPrototype(root->proto);
@@ -6526,7 +6533,7 @@ static void findMember(EntryNav *rootNav,
     else if (isRelated && !root->relates.isEmpty())
     {
       Debug::print(Debug::FindMembers,0,"2. related function\n"
-              "  scopeName=%s className=%s\n",scopeName.data(),className.data());
+              "  scopeName=%s className=%s\n",qPrint(scopeName),qPrint(className));
       if (className.isEmpty()) className=root->relates;
       ClassDef *cd;
       //printf("scopeName=`%s' className=`%s'\n",scopeName.data(),className.data());
@@ -6751,7 +6758,7 @@ localObjCMethod:
       if (Config_getBool("EXTRACT_LOCAL_METHODS") && (cd=getClass(scopeName)))
       {
         Debug::print(Debug::FindMembers,0,"4. Local objective C method %s\n"
-              "  scopeName=%s className=%s\n",root->name.data(),scopeName.data(),className.data());
+              "  scopeName=%s className=%s\n",qPrint(root->name),qPrint(scopeName),qPrint(className));
         //printf("Local objective C method `%s' of class `%s' found\n",root->name.data(),cd->name().data());
         MemberDef *md=new MemberDef(
             root->fileName,root->startLine,root->startColumn,
@@ -6833,7 +6840,7 @@ static void filterMemberDocumentation(EntryNav *rootNav)
   int i=-1,l;
   Debug::print(Debug::FindMembers,0,
       "findMemberDocumentation(): root->type=`%s' root->inside=`%s' root->name=`%s' root->args=`%s' section=%x root->spec=%lld root->mGrpId=%d\n",
-      root->type.data(),root->inside.data(),root->name.data(),root->args.data(),root->section,root->spec,root->mGrpId
+      qPrint(root->type),qPrint(root->inside),qPrint(root->name),qPrint(root->args),root->section,root->spec,root->mGrpId
       );
   //printf("rootNav->parent()->name()=%s\n",rootNav->parent()->name().data());
   bool isFunc=TRUE;
@@ -8727,9 +8734,8 @@ static void findMainPage(EntryNav *rootNav)
     {
       Entry *root = rootNav->entry();
       warn(root->fileName,root->startLine,
-          "found more than one \\mainpage comment block! Skipping this "
-          "block."
-          );
+           "found more than one \\mainpage comment block! (first occurrence: %s, line %d), Skipping current block!",
+           Doxygen::mainPage->docFile().data(),Doxygen::mainPage->docLine());
     }
 
     rootNav->releaseEntry();
@@ -9949,7 +9955,7 @@ static void devUsage()
 
 static void usage(const char *name)
 {
-  msg("Doxygen version %s\nCopyright Dimitri van Heesch 1997-2014\n\n",versionString);
+  msg("Doxygen version %s\nCopyright Dimitri van Heesch 1997-2015\n\n",versionString);
   msg("You can use doxygen in a number of ways:\n\n");
   msg("1) Use doxygen to generate a template configuration file:\n");
   msg("    %s [-s] -g [configName]\n\n",name);
@@ -9962,7 +9968,7 @@ static void usage(const char *name)
   msg("    If - is used for configName doxygen will read from standard input.\n\n");
   msg("4) Use doxygen to generate a template file controlling the layout of the\n");
   msg("   generated documentation:\n");
-  msg("    %s -l layoutFileName.xml\n\n",name);
+  msg("    %s -l [layoutFileName.xml]\n\n",name);
   msg("5) Use doxygen to generate a template style sheet file for RTF, HTML or Latex.\n");
   msg("    RTF:        %s -w rtf styleSheetFile\n",name);
   msg("    HTML:       %s -w html headerFile footerFile styleSheetFile [configFile]\n",name);
@@ -10010,7 +10016,7 @@ void initDoxygen()
   Doxygen::parserManager->registerParser("fortranfree",  new FortranLanguageScannerFree);
   Doxygen::parserManager->registerParser("fortranfixed", new FortranLanguageScannerFixed);
   Doxygen::parserManager->registerParser("vhdl",         new VHDLLanguageScanner);
-  Doxygen::parserManager->registerParser("dbusxml",      new DBusXMLScanner);
+  Doxygen::parserManager->registerParser("xml",          new XMLScanner);
   Doxygen::parserManager->registerParser("tcl",          new TclLanguageScanner);
   Doxygen::parserManager->registerParser("md",           new MarkdownFileParser);
 
@@ -10323,16 +10329,19 @@ void readConfiguration(int argc, char **argv)
         }
         else if (qstricmp(formatName,"latex")==0)
         {
-          if (optind+4<argc) // use config file to get settings
+          if (optind+4<argc || QFileInfo("Doxyfile").exists())
           {
-            if (!Config::instance()->parse(argv[optind+4]))
+            QCString df = optind+4<argc ? argv[optind+4] : QCString("Doxyfile");
+            if (!Config::instance()->parse(df))
             {
               err("error opening or reading configuration file %s!\n",argv[optind+4]);
+              cleanUpDoxygen();
               exit(1);
             }
             Config::instance()->substituteEnvironmentVars();
             Config::instance()->convertStrToVal();
             Config_getString("LATEX_HEADER")="";
+            Config_getString("LATEX_FOOTER")="";
             Config::instance()->check();
           }
           else // use default config
@@ -10638,7 +10647,7 @@ static void writeTagFile()
     FileDef *fd;
     for (fni.toFirst();(fd=fni.current());++fni)
     {
-      fd->writeTagFile(tagFile);
+      if (fd->isLinkableInProject()) fd->writeTagFile(tagFile);
     }
   }
   // for each class
@@ -10646,28 +10655,28 @@ static void writeTagFile()
   ClassDef *cd;
   for ( ; (cd=cli.current()) ; ++cli )
   {
-    cd->writeTagFile(tagFile);
+    if (cd->isLinkableInProject()) cd->writeTagFile(tagFile);
   }
   // for each namespace
   NamespaceSDict::Iterator nli(*Doxygen::namespaceSDict);
   NamespaceDef *nd;
   for ( ; (nd=nli.current()) ; ++nli )
   {
-    nd->writeTagFile(tagFile);
+    if (nd->isLinkableInProject()) nd->writeTagFile(tagFile);
   }
   // for each group
   GroupSDict::Iterator gli(*Doxygen::groupSDict);
   GroupDef *gd;
   for (gli.toFirst();(gd=gli.current());++gli)
   {
-    gd->writeTagFile(tagFile);
+    if (gd->isLinkableInProject()) gd->writeTagFile(tagFile);
   }
   // for each page
   PageSDict::Iterator pdi(*Doxygen::pageSDict);
   PageDef *pd=0;
   for (pdi.toFirst();(pd=pdi.current());++pdi)
   {
-    pd->writeTagFile(tagFile);
+    if (pd->isLinkableInProject()) pd->writeTagFile(tagFile);
   }
   if (Doxygen::mainPage) Doxygen::mainPage->writeTagFile(tagFile);
 
@@ -10854,7 +10863,7 @@ void searchInputFiles()
    *             Determine Input Files                                      *
    **************************************************************************/
 
-  g_s.begin("Searching for files to process...\n");
+  g_s.begin("Searching INPUT for files to process...\n");
   QDict<void> *killDict = new QDict<void>(10007);
   QStrList &inputList=Config_getList("INPUT");
   g_inputFiles.setAutoDelete(TRUE);
@@ -11393,6 +11402,9 @@ void generateOutput()
    *            Initialize output generators                                *
    **************************************************************************/
 
+  /// add extra languages for which we can only produce syntax highlighted code
+  addCodeOnlyMappings();
+
   //// dump all symbols
   if (g_dumpSymbolMap)
   {
@@ -11671,7 +11683,7 @@ void generateOutput()
     QString oldDir = QDir::currentDirPath();
     QDir::setCurrent(Config_getString("HTML_OUTPUT"));
     portable_sysTimerStart();
-    if (portable_system(Config_getString("HHC_LOCATION"), "index.hhp", FALSE))
+	if (portable_system(Config_getString("HHC_LOCATION"), "index.hhp", Debug::isFlagSet(Debug::ExtCmd)))
     {
       err("failed to run html help compiler on index.hhp\n");
     }
diff --git a/src/doxygen.h b/src/doxygen.h
index aa9b745..0d38d5b 100644
--- a/src/doxygen.h
+++ b/src/doxygen.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/doxygen.md b/src/doxygen.md
index 9a9d726..ccb47b9 100644
--- a/src/doxygen.md
+++ b/src/doxygen.md
@@ -168,6 +168,10 @@ easy ways to get debug information.
     command is specified)
   - validate<br>
     Currently not used
+  - lex<br>
+    Provide output of the `lex` files used. When a lexer is started and when a lexer
+    ends the name of the `lex` file is given so it is possible to see in which lexer the
+    problem occurs. This makes it easier to select the file to be compiled in `lex` debug mode.
 
 Producing output
 ----------------
diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in
deleted file mode 100644
index 4f05a35..0000000
--- a/src/doxygen.pro.in
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# 
-#
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby 
-# granted. No representations are made about the suitability of this software 
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-#
-# Documents produced by Doxygen are derivative works derived from the
-# input used in their production; they are not affected by this license.
-#
-# TMake project file for doxygen
-
-TEMPLATE     =	app.t
-CONFIG       =	console warn_on $extraopts
-HEADERS      =	doxygen.h 
-SOURCES      =	main.cpp 
-unix:LIBS                  += -L../lib -ldoxygen -lvhdlparser -ldoxycfg -lqtools -lmd5 -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
-win32:INCLUDEPATH          += .
-win32-mingw:LIBS           += -L../lib -ldoxygen -ldoxycfg -lvhdlparser -lqtools -lmd5 -lpthread -llibiconv -lole32 %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
-win32-msvc:LIBS            += qtools.lib md5.lib doxygen.lib doxycfg.lib vhdlparser.lib shell32.lib iconv.lib
-win32-msvc:TMAKE_LFLAGS    += /LIBPATH:..\lib
-win32-borland:LIBS         += qtools.lib md5.lib doxygen.lib doxycfg.lib vhdlparser.lib shell32.lib iconv.lib
-win32-borland:TMAKE_LFLAGS += -L..\lib -L$(BCB)\lib\psdk
-win32:TMAKE_CXXFLAGS       += -DQT_NODLL
-win32-g++:LIBS             = -L../lib -ldoxygen -ldoxycfg -lvhdlparser -lqtools -lmd5 -liconv -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%% -Wl,--as-needed -lole32
-win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
-DEPENDPATH                 += ../generated_src/doxygen
-INCLUDEPATH                += ../qtools ../libmd5 . ../vhdlparser
-DESTDIR                    =  ../bin
-TARGET                     =  doxygen
-unix:TARGETDEPS            =  ../lib/libdoxygen.a ../lib/libdoxycfg.a
-win32:TARGETDEPS           =  ..\lib\doxygen.lib ..\lib\doxycfg.lib
-win32-g++:TARGETDEPS       =  ../lib/libdoxygen.a ../lib/libdoxycfg.a
-win32-mingw:TARGETDEPS     =  ../lib/libdoxygen.a ../lib/libdoxycfg.a
-OBJECTS_DIR                =  ../objects/doxygen
-
diff --git a/src/eclipsehelp.cpp b/src/eclipsehelp.cpp
index 6680aeb..db5ed4f 100644
--- a/src/eclipsehelp.cpp
+++ b/src/eclipsehelp.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/eclipsehelp.h b/src/eclipsehelp.h
index f0ab78e..a7cde1e 100644
--- a/src/eclipsehelp.h
+++ b/src/eclipsehelp.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/entry.cpp b/src/entry.cpp
index b5928b3..bf45f87 100644
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -24,7 +24,7 @@
 #include "doxygen.h"
 #include "filestorage.h"
 #include "arguments.h"
-
+#include "config.h"
 //------------------------------------------------------------------
 
 #define HEADER ('D'<<24)+('O'<<16)+('X'<<8)+'!'
@@ -216,6 +216,8 @@ void Entry::addSubEntry(Entry *current)
 
 void Entry::reset()
 {
+  static bool entryCallGraph   = Config_getBool("CALL_GRAPH");
+  static bool entryCallerGraph = Config_getBool("CALLER_GRAPH");
   //printf("Entry::reset()\n");
   name.resize(0);
   type.resize(0);
@@ -245,8 +247,8 @@ void Entry::reset()
   bodyLine = -1;
   endBodyLine = -1;
   mGrpId = -1;
-  callGraph = FALSE;
-  callerGraph = FALSE;
+  callGraph   = entryCallGraph;
+  callerGraph = entryCallerGraph;
   section = EMPTY_SEC;
   mtype   = Method;
   virt    = Normal;
diff --git a/src/entry.h b/src/entry.h
index c92038f..f1b81ef 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/example.h b/src/example.h
index 7c86554..cf30827 100644
--- a/src/example.h
+++ b/src/example.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/filedef.cpp b/src/filedef.cpp
index dd97c1c..d6e49a2 100644
--- a/src/filedef.cpp
+++ b/src/filedef.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -1296,7 +1296,6 @@ void FileDef::addIncludedUsingDirectives()
   visited=TRUE;
   //printf("( FileDef::addIncludedUsingDirectives for file %s\n",name().data());
 
-  NamespaceList nl;
   if (m_includeList) // file contains #includes
   {
     {
@@ -1542,7 +1541,6 @@ static Directory *findDirNode(Directory *root,const QCString &name)
 
 static void mergeFileDef(Directory *root,FileDef *fd)
 {
-  QCString rootPath = root->name();
   QCString filePath = fd->absFilePath();
   //printf("merging %s\n",filePath.data());
   Directory *dirNode = findDirNode(root,filePath);
@@ -1743,7 +1741,7 @@ void FileDef::acquireFileVersion()
   {
     msg("Version of %s : ",m_filePath.data());
     QCString cmd = vercmd+" \""+m_filePath+"\"";
-    Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",cmd.data());
+    Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",qPrint(cmd));
     FILE *f=portable_popen(cmd,"r");
     if (!f)
     {
diff --git a/src/filedef.h b/src/filedef.h
index 33eae35..17a5e60 100644
--- a/src/filedef.h
+++ b/src/filedef.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/filename.cpp b/src/filename.cpp
index 8719f3c..aa51249 100644
--- a/src/filename.cpp
+++ b/src/filename.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/filename.h b/src/filename.h
index ac7b164..fbee0e1 100644
--- a/src/filename.h
+++ b/src/filename.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/fileparser.cpp b/src/fileparser.cpp
index 1d78e1e..b54b243 100644
--- a/src/fileparser.cpp
+++ b/src/fileparser.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
diff --git a/src/fileparser.h b/src/fileparser.h
index f9a7c7b..4568a39 100644
--- a/src/fileparser.h
+++ b/src/fileparser.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/filestorage.h b/src/filestorage.h
index 0d72923..5c2a92d 100644
--- a/src/filestorage.h
+++ b/src/filestorage.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/formula.cpp b/src/formula.cpp
index 9e835e1..ad37782 100644
--- a/src/formula.cpp
+++ b/src/formula.cpp
@@ -1,7 +1,7 @@
 /******************************************************************************
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -15,8 +15,6 @@
  */
 
 #include <stdlib.h>
-#include <unistd.h>
-
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
diff --git a/src/formula.h b/src/formula.h
index 47f7d4b..422030c 100644
--- a/src/formula.h
+++ b/src/formula.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/fortrancode.h b/src/fortrancode.h
index b64ede7..c110852 100644
--- a/src/fortrancode.h
+++ b/src/fortrancode.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -34,4 +34,5 @@ void parseFortranCode(CodeOutputInterface &,const char *,const QCString &,
 void resetFortranCodeParserState();
 void codeFreeScanner();
 
+const int fixedCommentAfter = 72;
 #endif
diff --git a/src/fortrancode.l b/src/fortrancode.l
index 51934cd..af1a82e 100644
--- a/src/fortrancode.l
+++ b/src/fortrancode.l
@@ -23,7 +23,7 @@
        - links to interface functions 
        - references to variables
 **/
-
+%option never-interactive
 %{
 
 /*
@@ -50,14 +50,15 @@
 #include "filedef.h"
 #include "namespacedef.h"
 #include "tooltip.h"
+#include "fortrancode.h"
 
 // Toggle for some debugging info
 //#define DBG_CTX(x) fprintf x
 #define DBG_CTX(x) do { } while(0)
 
-#define YY_NEVER_INTERACTIVE 1
 #define YY_NO_TOP_STATE 1
 #define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
 
 /*
  * For fixed formatted code position 6 is of importance (continuation character).
@@ -211,9 +212,14 @@ static void endFontClass()
 
 static void startFontClass(const char *s)
 {
-  endFontClass();
-  g_code->startFontClass(s);
-  g_currentFontClass=s;
+  // if font class is already set don't stop and start it.
+  // strcmp does not like null pointers as input.
+  if (!g_currentFontClass || !s || strcmp(g_currentFontClass,s))
+  {
+    endFontClass();
+    g_code->startFontClass(s);
+    g_currentFontClass=s;
+  }
 }
 
 static void setCurrentDoc(const QCString &anchor)
@@ -724,7 +730,7 @@ ATTR_SPEC (IMPLICIT|ALLOCATABLE|DIMENSION{ARGS}|EXTERNAL|{INTENT_SPEC}|INTRINSIC
 ACCESS_SPEC (PROTECTED|PRIVATE|PUBLIC)
 /* Assume that attribute statements are almost the same as attributes. */
 ATTR_STMT {ATTR_SPEC}|DIMENSION
-FLOW      (DO|SELECT|CASE|SELECT{BS}(CASE|TYPE)|WHERE|IF|THEN|ELSE|WHILE|FORALL|ELSEWHERE|ELSEIF|RETURN|CONTINUE|EXIT)
+FLOW      (DO|SELECT|CASE|SELECT{BS}(CASE|TYPE)|WHERE|IF|THEN|ELSE|WHILE|FORALL|ELSEWHERE|ELSEIF|RETURN|CONTINUE|EXIT|GO{BS}TO)
 COMMANDS  (FORMAT|CONTAINS|MODULE{BS_}PROCEDURE|WRITE|READ|ALLOCATE|ALLOCATED|ASSOCIATED|PRESENT|DEALLOCATE|NULLIFY|SIZE|INQUIRE|OPEN|CLOSE|FLUSH|DATA|COMMON)
 IGNORE    (CALL)
 PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|IMPURE|PURE|ELEMENTAL)?
@@ -1179,11 +1185,22 @@ PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
             }
                                           YY_FTN_RESET
   					}
-<*>^{BS}"type"{BS}"="                     { g_code->codify(yytext); }
+<*>^{BS}"type"{BS}"="                   { g_code->codify(yytext); }
 
-<*>.					{ 
-  					  g_code->codify(yytext);
-					}
+<*>.                                    { 
+                                          if (g_isFixedForm && yy_my_start > fixedCommentAfter)
+                                          {
+                                            //yy_push_state(YY_START);
+                                            //BEGIN(DocBlock);
+                                            //docBlock=yytext;
+                                            startFontClass("comment");
+                                            codifyLines(yytext);
+                                          }
+                                          else
+                                          {
+                                            g_code->codify(yytext);
+                                          }
+                                        }
 <*>{LOG_OPER}                           { // Fortran logical comparison keywords
                                           g_code->codify(yytext);
                                         }
diff --git a/src/fortranscanner.h b/src/fortranscanner.h
index 92a8669..bc8071b 100644
--- a/src/fortranscanner.h
+++ b/src/fortranscanner.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index 4875606..cbe13fd 100644
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -37,7 +37,7 @@
  *
  * - Must track yyLineNr when using REJECT, unput() or similar commands.
  */
-
+%option never-interactive
 %{
 
 #include <stdio.h> 
@@ -48,7 +48,6 @@
 #include <qarray.h>
 #include <qstack.h>
 #include <qregexp.h>
-#include <unistd.h> 
 #include <qfile.h>
 #include <qmap.h>
   
@@ -69,10 +68,10 @@
 //#define DBG_CTX(x) fprintf x
 #define DBG_CTX(x) do { } while(0)
 
-#define YY_NEVER_INTERACTIVE 1
 #define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
 
-enum ScanVar { V_IGNORE, V_VARIABLE, V_PARAMETER};
+enum ScanVar { V_IGNORE, V_VARIABLE, V_PARAMETER, V_RESULT};
 enum InterfaceType { IF_NONE, IF_SPECIFIC, IF_GENERIC, IF_ABSTRACT };
 
 // {{{ ----- Helper structs -----
@@ -165,7 +164,6 @@ static ScanVar          v_type       = V_IGNORE; // type of parsed variable
 static QList<Entry>     moduleProcedures; // list of all interfaces which contain unresolved 
                                           // module procedures
 static QCString         docBlock;
-static QCString         docBlockName;
 static bool             docBlockInBody = FALSE;
 static bool             docBlockJavaStyle;
 
@@ -202,6 +200,7 @@ static int yyread(char *buf,int max_size);
 static void startCommentBlock(bool);
 static void handleCommentBlock(const QCString &doc,bool brief);
 static void subrHandleCommentBlock(const QCString &doc,bool brief);
+static void subrHandleCommentBlockResult(const QCString &doc,bool brief);
 static void addCurrentEntry(int case_insens);
 static void addModule(const char *name, bool isModule=FALSE);
 static void addSubprogram(const char *text);
@@ -485,7 +484,7 @@ SCOPENAME ({ID}{BS}"::"{BS})*
 
 <InterfaceBody>^{BS}end{BS}interface({BS_}{ID})? {
                                           // end scope only if GENERIC interface
-                                          last_entry->parent()->endBodyLine = yyLineNr - 1;
+                                          if (ifType == IF_GENERIC)last_entry->parent()->endBodyLine = yyLineNr - 1;
                                           if (ifType == IF_GENERIC && !endScope(current_root))
                                             yyterminate();
 
@@ -844,6 +843,7 @@ private                                 {
 						QCString rght;
 						if (strt != -1)
 						{
+                                                  v_type = V_RESULT;
 						  lft = "";
 						  rght = "";
 						  if (strt != 0) lft = current_root->type.left(strt).stripWhiteSpace();
@@ -864,6 +864,10 @@ private                                 {
 						  }
 						  if (current_root->type.length() > 0) current_root->type += " ";
 						  current_root->type += "function";
+					          if (!docBlock.isNull()) 
+					          {
+  					            subrHandleCommentBlockResult(docBlock,TRUE);
+					          }
 						}
 						else
 						{
@@ -982,6 +986,8 @@ private                                 {
                                          result=result.stripWhiteSpace();
                                          addSubprogram(result);
                                          BEGIN(Subprog);
+				         current->bodyLine = yyLineNr + lineCountPrepass + 1; // we have to be at the line after the definition and we have to take continuation lines into account.
+				         current->startLine = yyLineNr;
                                        }
 
 <Start,ModuleBody,SubprogBody,InterfaceBody,ModuleBodyContains,SubprogBodyContains>^{BS}({PREFIX}{BS_})?{SUBPROG}{BS_} {
@@ -1105,6 +1111,10 @@ private                                 {
 					  {
 					    subrHandleCommentBlock(docBlock,TRUE);
                                           }
+					  else if (v_type == V_RESULT) 
+					  {
+					    subrHandleCommentBlockResult(docBlock,TRUE);
+                                          }
 					  yy_pop_state();
 					  docBlock.resize(0);
                                         }
@@ -1400,11 +1410,15 @@ static const char* prepassFixedForm(const char* contents)
   int prevLineLength=0;
   int prevLineAmpOrExclIndex=-1;
   bool emptyLabel=TRUE;
+  bool commented=FALSE;
+  bool inSingle=FALSE;
+  bool inDouble=FALSE;
+  bool inBackslash=FALSE;
   int newContentsSize = strlen(contents)+3; // \000, \n (when necessary) and one spare character (to avoid reallocation)
   char* newContents = (char*)malloc(newContentsSize);
 
   for(int i=0, j=0;;i++,j++) {
-    if(j>=newContentsSize-1) { // check for one spare character, which may be eventually used below (by &)
+    if(j>=newContentsSize-3) { // check for spare characters, which may be eventually used below (by & and '! ')
       newContents = (char*)realloc(newContents, newContentsSize+1000);
       newContentsSize = newContentsSize+1000;
     }
@@ -1417,9 +1431,11 @@ static const char* prepassFixedForm(const char* contents)
         prevLineAmpOrExclIndex=getAmpOrExclAtTheEnd(&contents[i-prevLineLength+1], prevLineLength);
         column=0;
 	emptyLabel=TRUE;
+        commented=FALSE;
         newContents[j]=c;
         break;
       case ' ':
+      case '\t':
         newContents[j]=c;
         break;
       case '\000':
@@ -1433,21 +1449,58 @@ static const char* prepassFixedForm(const char* contents)
           newContents[newContentsSize + 1] = '\000';
         }
         return newContents;
+      case '"':
+      case '\'':
+      case '\\':
+        if ((column <= fixedCommentAfter) && (column!=6) && !commented)
+	{
+          // we have some special cases in respect to strings and exscaped string characters
+	  newContents[j]=c;
+          if (c == '\\')
+          {
+            inBackslash = !inBackslash;
+            break;
+          }
+          else if (c == '\'')
+          {
+            if (!inDouble) inSingle = !inSingle;
+            break;
+          }
+          else if (c == '"')
+          {
+            if (!inSingle) inDouble = !inDouble;
+            break;
+          }
+        }
+        inBackslash = FALSE;
+        // fallthrough
       case 'C':
       case 'c':
       case '*':
-        if (column!=6)
+      case '!':
+        if ((column <= fixedCommentAfter) && (column!=6))
 	{
 	  emptyLabel=FALSE;
 	  if(column==1)
+          {
 	    newContents[j]='!';
+            commented = TRUE;
+          }
+	  else if ((c == '!') && !inDouble && !inSingle)
+          {
+	    newContents[j]=c;
+            commented = TRUE;
+          }
 	  else
+          {
 	    newContents[j]=c;
+          }
 	  break;
 	}
+        // fallthrough
       default:
         if(column==6 && emptyLabel) { // continuation
-          if (c != '0') { // 0 not allowed as continuatioin character, see f95 standard paragraph 3.3.2.3
+          if (c != '0') { // 0 not allowed as continuation character, see f95 standard paragraph 3.3.2.3
             newContents[j]=' ';
 
             if(prevLineAmpOrExclIndex==-1) { // add & just before end of previous line
@@ -1460,6 +1513,15 @@ static const char* prepassFixedForm(const char* contents)
 	  } else {
 	    newContents[j]=c; // , just handle like space
           }
+	} else if ((column > fixedCommentAfter) && !commented) {
+          // first non commented non blank character after position fixedCommentAfter
+          if (c != '!') {
+            // I'm not a possible start of doxygen comment
+	    newContents[j++]='!';
+	    newContents[j++]=' '; // so that '<' and '>' as first character are not converted to doxygen comment
+          }
+	  newContents[j]=c;
+          commented = TRUE;
 	} else {
 	  newContents[j]=c;
 	  emptyLabel=FALSE;
@@ -2222,14 +2284,10 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief)
   current->inbodyDocs = "";
 
   // strip \\param or @param, so we can do some extra checking. We will add it later on again.
-  if (loc_doc.find("\\param") == 0)
-  {
-    loc_doc = loc_doc.right(loc_doc.length()-strlen("\\param")).stripWhiteSpace();
-  }
-  else if (loc_doc.find("@param") == 0)
-  {
-    loc_doc = loc_doc.right(loc_doc.length()-strlen("@param")).stripWhiteSpace();
-  }
+  if (!loc_doc.stripPrefix("\\param") &&
+      !loc_doc.stripPrefix("@param")
+     ) (void)loc_doc; // Do nothing work has been done by stripPrefix; (void)loc_doc: to overcome 'empty controlled statement' warning
+  loc_doc.stripWhiteSpace();
 
   // direction as defined with the declaration of the parameter
   int dir1 = modifiers[current_root][argName.lower()].direction;
@@ -2242,6 +2300,7 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief)
     {
       // strip direction
       loc_doc = loc_doc.right(loc_doc.length()-strlen(directionParam[SymbolModifiers::IN]));
+      loc_doc.stripWhiteSpace();
       // in case of emty documentation or (now) just name, consider it as no documemntation
       if (loc_doc.isEmpty() || (loc_doc.lower() == argName.lower()))
       {
@@ -2268,6 +2327,7 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief)
         (directionParam[dir1] == directionParam[SymbolModifiers::OUT]))
     {
       loc_doc = loc_doc.right(loc_doc.length()-strlen(directionParam[SymbolModifiers::OUT]));
+      loc_doc.stripWhiteSpace();
       if (loc_doc.isEmpty() || (loc_doc.lower() == argName.lower()))
       {
         current=tmp_entry;
@@ -2291,6 +2351,7 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief)
         (directionParam[dir1] == directionParam[SymbolModifiers::INOUT]))
     {
       loc_doc = loc_doc.right(loc_doc.length()-strlen(directionParam[SymbolModifiers::INOUT]));
+      loc_doc.stripWhiteSpace();
       if (loc_doc.isEmpty() || (loc_doc.lower() == argName.lower()))
       {
         current=tmp_entry;
@@ -2322,6 +2383,37 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief)
   // reset current back to the part inside the routine
   current=tmp_entry;
 }
+//----------------------------------------------------------------------------
+/// Handle result description as defined after the declaration of the parameter
+static void subrHandleCommentBlockResult(const QCString &doc,bool brief)
+{
+  QCString loc_doc;
+  loc_doc = doc.stripWhiteSpace();
+
+  Entry *tmp_entry = current; 
+  current = subrCurrent.getFirst(); // temporarily switch to the entry of the subroutine / function
+
+  // Still in the specification section so no inbodyDocs yet, but parameter documentation
+  current->inbodyDocs = "";
+
+  // strip \\returns or @returns. We will add it later on again.
+  if (!loc_doc.stripPrefix("\\returns") &&
+      !loc_doc.stripPrefix("\\return") &&
+      !loc_doc.stripPrefix("@returns") &&
+      !loc_doc.stripPrefix("@return")
+     ) (void)loc_doc; // Do nothing work has been done by stripPrefix; (void)loc_doc: to overcome 'empty controlled statement' warning
+  loc_doc.stripWhiteSpace();
+
+  if (loc_doc.isEmpty() || (loc_doc.lower() == argName.lower()))
+  {
+    current=tmp_entry;
+    return;
+  }
+  handleCommentBlock(QCString("\n\n@returns ") + loc_doc,brief);
+
+  // reset current back to the part inside the routine
+  current=tmp_entry;
+}
 
 //----------------------------------------------------------------------------
 #if 0
diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp
index f45d956..e2774a9 100644
--- a/src/ftvhelp.cpp
+++ b/src/ftvhelp.cpp
@@ -1,7 +1,7 @@
 /******************************************************************************
  * ftvhelp.cpp,v 1.0 2000/09/06 16:09:00
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/ftvhelp.h b/src/ftvhelp.h
index bddb2f0..bacf9a5 100644
--- a/src/ftvhelp.h
+++ b/src/ftvhelp.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/groupdef.cpp b/src/groupdef.cpp
index 5c08048..2d7674d 100644
--- a/src/groupdef.cpp
+++ b/src/groupdef.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -508,29 +508,21 @@ void GroupDef::removeMember(MemberDef *md)
   }
 }
 
-bool GroupDef::containsGroup(const GroupDef *def)
+bool GroupDef::findGroup(const GroupDef *def) const
 {
   if (this==def)
   {
     return TRUE;
   }
-  else if (groupList->find(def)>=0)
+  else if (groupList)
   {
-    return TRUE;
-  }
-  else // look for subgroups as well
-  {
-    GroupList *groups = partOfGroups();
-    if (groups)
+    GroupListIterator it(*groupList);
+    GroupDef *gd;
+    for (;(gd=it.current());++it)
     {
-      GroupListIterator it(*groups);
-      GroupDef *gd;
-      for (;(gd=it.current());++it)
+      if (gd->findGroup(def))
       {
-        if (gd->containsGroup(def))
-        {
-          return TRUE;
-        }
+        return TRUE;
       }
     }
   }
@@ -1377,12 +1369,12 @@ void addGroupToGroups(Entry *root,GroupDef *subGroup)
         warn(root->fileName,root->startLine,"Refusing to add group %s to itself",
             gd->name().data());
       }
-      else if (gd->containsGroup(subGroup))
+      else if (subGroup->findGroup(gd))
       {
         warn(root->fileName,root->startLine,"Refusing to add group %s to group %s, since the latter is already a "
                                             "subgroup of the former\n", subGroup->name().data(),gd->name().data());
       }
-      else
+      else if (!gd->findGroup(subGroup))
       {
         gd->addGroup(subGroup);
         subGroup->makePartOfGroup(gd);
diff --git a/src/groupdef.h b/src/groupdef.h
index a21311b..be4475f 100644
--- a/src/groupdef.h
+++ b/src/groupdef.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -64,7 +64,7 @@ class GroupDef : public Definition
     void addDir(const DirDef *dd);
     bool insertMember(MemberDef *def,bool docOnly=FALSE);
     void removeMember(MemberDef *md);
-    bool containsGroup(const GroupDef *def);    // true if def is already a subgroup
+    bool findGroup(const GroupDef *def) const; // true if def is a subgroup of this group
     void writeDocumentation(OutputList &ol);
     void writeMemberPages(OutputList &ol);
     void writeQuickMemberLinks(OutputList &ol,MemberDef *currentMd) const;
diff --git a/src/htags.cpp b/src/htags.cpp
index 1e18ae1..c910eb6 100644
--- a/src/htags.cpp
+++ b/src/htags.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -105,7 +105,6 @@ bool Htags::execute(const QCString &htmldir)
 bool Htags::loadFilemap(const QCString &htmlDir)
 {
   QCString fileMapName = htmlDir+"/HTML/FILEMAP";
-  QCString fileMap;
   QFileInfo fi(fileMapName);
   /*
    * Construct FILEMAP dictionary using QDict.
@@ -126,8 +125,10 @@ bool Htags::loadFilemap(const QCString &htmlDir)
     line.at(maxlen)='\0';
     if (f.open(IO_ReadOnly))
     {
-      while (f.readLine(line.data(),maxlen)>0)
+      int len;
+      while ((len=f.readLine(line.rawData(),maxlen))>0)
       {
+        line.resize(len+1);
         //printf("Read line: %s",line.data());
         int sep = line.find('\t');
         if (sep!=-1)
diff --git a/src/htags.h b/src/htags.h
index 5173b2b..5725e7d 100644
--- a/src/htags.h
+++ b/src/htags.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/htmlattrib.h b/src/htmlattrib.h
index e7fd204..66d5325 100644
--- a/src/htmlattrib.h
+++ b/src/htmlattrib.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index cd6b635..99d6fdd 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -1063,7 +1063,6 @@ void HtmlDocVisitor::visitPost(DocPara *p)
     }
   }
 
-  QCString context;
   // if the last element of a paragraph is something that should be outside of
   // the paragraph (<ul>,<dl>,<table>) then that will already have ended the 
   // paragraph and we don't need to do it here
@@ -2002,7 +2001,7 @@ void HtmlDocVisitor::writeMscFile(const QCString &fileName,
   }
   baseName.prepend("msc_");
   QCString outDir = Config_getString("HTML_OUTPUT");
-  QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgExt = getDotImageExtension();
   MscOutputFormat mscFormat = MSC_BITMAP;
   if ("svg" == imgExt)
     mscFormat = MSC_SVG;
@@ -2046,7 +2045,7 @@ void HtmlDocVisitor::writePlantUMLFile(const QCString &fileName,
     baseName=baseName.left(i);
   }
   static QCString outDir = Config_getString("HTML_OUTPUT");
-  static QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgExt = getDotImageExtension();
   if (imgExt=="svg")
   {
     generatePlantUMLOutput(fileName,outDir,PUML_SVG);
diff --git a/src/htmldocvisitor.h b/src/htmldocvisitor.h
index 00ae09e..2ff9f75 100644
--- a/src/htmldocvisitor.h
+++ b/src/htmldocvisitor.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/htmlentity.cpp b/src/htmlentity.cpp
index 9327526..c4c601f 100644
--- a/src/htmlentity.cpp
+++ b/src/htmlentity.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -59,7 +59,7 @@ static struct htmlEntityInfo
   { SYM(shy),      "\xc2\xad",     "&shy;",      "<shy/>",               "&#173;",        "{$\\-$}",                NULL,     "\\-",         { NULL,         DocSymbol::Perl_unknown }},
   { SYM(reg),      "\xc2\xae",     "&reg;",      "<registered/>",        "&#174;",        "\\textregistered{}",     "(R)",    "\\'AE",       { "registered", DocSymbol::Perl_symbol  }},
   { SYM(macr),     "\xc2\xaf",     "&macr;",     "<macr/>",              "&#175;",        "\\={}",                  NULL,     "\\'AF",       { NULL,         DocSymbol::Perl_unknown }},
-  { SYM(deg),      "\xc2\xb0",     "&deg;",      "<deg/>",               "&#176;",        "\\textdegree",           NULL,     "\\'B0",       { "deg",        DocSymbol::Perl_symbol  }},
+  { SYM(deg),      "\xc2\xb0",     "&deg;",      "<deg/>",               "&#176;",        "\\textdegree{}",         NULL,     "\\'B0",       { "deg",        DocSymbol::Perl_symbol  }},
   { SYM(plusmn),   "\xc2\xb1",     "&plusmn;",   "<plusmn/>",            "&#177;",        "{$\\pm$}",               NULL,     "\\'B1",       { "+/-",        DocSymbol::Perl_string  }},
   { SYM(sup2),     "\xc2\xb2",     "&sup2;",     "<sup2/>",              "&#178;",        "\\texttwosuperior{}",    NULL,     "\\'B2",       { NULL,         DocSymbol::Perl_unknown }},
   { SYM(sup3),     "\xc2\xb3",     "&sup3;",     "<sup3/>",              "&#179;",        "\\textthreesuperior{}",  NULL,     "\\'B3",       { NULL,         DocSymbol::Perl_unknown }},
diff --git a/src/htmlentity.h b/src/htmlentity.h
index d3b268c..7e54066 100644
--- a/src/htmlentity.h
+++ b/src/htmlentity.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 3bb6792..a2dd473 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -125,7 +125,7 @@ QCString clearBlock(const char *s,const char *begin,const char *end)
 
   QCString result(resLen+1);
   char *r;
-  for (r=result.data(), p=s; (q=strstr(p,begin))!=0; p=q+endLen)
+  for (r=result.rawData(), p=s; (q=strstr(p,begin))!=0; p=q+endLen)
   {
     int l = (int)(q-p);
     memcpy(r,p,l);
@@ -186,7 +186,7 @@ static QCString getSearchBox(bool serverSide, QCString relPath, bool highlightSe
 static QCString removeEmptyLines(const QCString &s)
 {
   BufStr out(s.length()+1);
-  char *p=s.data();
+  const char *p=s.data();
   if (p)
   {
     char c;
@@ -194,7 +194,7 @@ static QCString removeEmptyLines(const QCString &s)
     {
       if (c=='\n')
       {
-        char *e = p;
+        const char *e = p;
         while (*e==' ' || *e=='\t') e++;
         if (*e=='\n') 
         {
diff --git a/src/htmlgen.h b/src/htmlgen.h
index 7b63a6b..924d04f 100644
--- a/src/htmlgen.h
+++ b/src/htmlgen.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
index 2629ab3..a283338 100644
--- a/src/htmlhelp.cpp
+++ b/src/htmlhelp.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -599,8 +599,8 @@ QCString HtmlHelp::recode(const QCString &s)
   QCString output(oSize);
   size_t iLeft     = iSize;
   size_t oLeft     = oSize;
-  char *iPtr       = s.data();
-  char *oPtr       = output.data();
+  char *iPtr       = s.rawData();
+  char *oPtr       = output.rawData();
   if (!portable_iconv(m_fromUtf8,&iPtr,&iLeft,&oPtr,&oLeft))
   {
     oSize -= (int)oLeft;
diff --git a/src/htmlhelp.h b/src/htmlhelp.h
index 574cec9..8191d03 100644
--- a/src/htmlhelp.h
+++ b/src/htmlhelp.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/image.cpp b/src/image.cpp
index 3283754..adec5b3 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/image.h b/src/image.h
index ad11a64..35e6ae3 100644
--- a/src/image.h
+++ b/src/image.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/index.cpp b/src/index.cpp
index bc0b48e..e7ba8e7 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -1601,7 +1601,6 @@ static void writeAnnotatedClassList(OutputList &ol)
     }
     if (cd->isLinkableInProject() && cd->templateMaster()==0)
     {
-      QCString type=cd->compoundTypeString();
       ol.startIndexKey();
       if (cd->getLanguage()==SrcLangExt_VHDL)
       {
@@ -2144,13 +2143,13 @@ static void writeNamespaceLinkForMember(OutputList &ol,MemberDef *md,const char
                              QCString &prevNamespaceName)
 {
   NamespaceDef *nd=md->getNamespaceDef();
-  if (nd && prevNamespaceName!=nd->name())
+  if (nd && prevNamespaceName!=nd->displayName())
   {
     ol.docify(separator);
     ol.writeObjectLink(md->getReference(),md->getOutputFileBase(),md->anchor(),
-        nd->name());
+        nd->displayName());
     ol.writeString("\n");
-    prevNamespaceName = nd->name();
+    prevNamespaceName = nd->displayName();
   }
 }
 
@@ -3115,7 +3114,7 @@ static void writePages(PageDef *pd,FTVHelp *ftv)
 
     if (ftv)
     {
-      //printf("*** adding %s\n",pageTitle.data());
+      //printf("*** adding %s hasSubPages=%d hasSections=%d\n",pageTitle.data(),hasSubPages,hasSections);
       ftv->addContentsItem(
           hasSubPages,pageTitle,
           pd->getReference(),pd->getOutputFileBase(),
@@ -3124,7 +3123,7 @@ static void writePages(PageDef *pd,FTVHelp *ftv)
     if (addToIndex && pd!=Doxygen::mainPage)
     {
       Doxygen::indexList->addContentsItem(
-          hasSubPages,pageTitle,
+          hasSubPages || hasSections,pageTitle,
           pd->getReference(),pd->getOutputFileBase(),
           0,hasSubPages,TRUE);
     }
@@ -3267,7 +3266,8 @@ void writeGraphInfo(OutputList &ol)
   QCString legendDocs = theTranslator->trLegendDocs();
   int s = legendDocs.find("<center>");
   int e = legendDocs.find("</center>");
-  if (Config_getEnum("DOT_IMAGE_FORMAT")=="svg" && s!=-1 && e!=-1)
+  QCString imgExt = getDotImageExtension();
+  if (imgExt=="svg" && s!=-1 && e!=-1)
   {
     legendDocs = legendDocs.left(s+8) + "[!-- SVG 0 --]\n" + legendDocs.mid(e); 
     //printf("legendDocs=%s\n",legendDocs.data());
@@ -4140,7 +4140,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
         case LayoutNavEntry::Classes: 
           if (annotatedClasses>0 && addToIndex)
           {
-            Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,0,0); 
+            Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,"annotated",0); 
             Doxygen::indexList->incContentsDepth();
             needsClosing=TRUE;
           }
diff --git a/src/index.h b/src/index.h
index 6805655..150d23f 100644
--- a/src/index.h
+++ b/src/index.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/lang_cfg.py b/src/lang_cfg.py
deleted file mode 100755
index efed05f..0000000
--- a/src/lang_cfg.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import sys
-
-if (len(sys.argv) > 1):
-    if (sys.argv[1] == "ENONLY"):
-        print("#define ENGLISH_ONLY")
-    else:
-        for x in range(1, len(sys.argv)):
-            print("#define LANG_%s"%(sys.argv[x]))
diff --git a/src/language.cpp b/src/language.cpp
index 3b57de1..7457676 100644
--- a/src/language.cpp
+++ b/src/language.cpp
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
diff --git a/src/language.h b/src/language.h
index 4780ab3..7c8eef9 100644
--- a/src/language.h
+++ b/src/language.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp
index 4cba261..37c2130 100644
--- a/src/latexdocvisitor.cpp
+++ b/src/latexdocvisitor.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -932,7 +932,7 @@ void LatexDocVisitor::visitPost(DocHtmlTable *t)
 void LatexDocVisitor::visitPre(DocHtmlCaption *c)
 {
   if (m_hide) return;
-  m_t << "\\end{" << getTableName(c->parent()) << "}\n\\centering\n\\caption{";
+  m_t << "\\end{" << getTableName(c->parent()->parent()) << "}\n\\centering\n\\caption{";
 }
 
 void LatexDocVisitor::visitPost(DocHtmlCaption *) 
@@ -1578,22 +1578,11 @@ void LatexDocVisitor::startLink(const QCString &ref,const QCString &file,const Q
 {
   if (ref.isEmpty() && Config_getBool("PDF_HYPERLINKS")) // internal PDF link 
   {
-    if (ref.isEmpty()) {
-      m_t << "\\hyperlink{";
-      if (!file.isEmpty()) m_t << stripPath(file);
-      if (!file.isEmpty() && !anchor.isEmpty()) m_t << "_";
-      if (!anchor.isEmpty()) m_t << anchor;
-      m_t << "}{";
-    }
-    else
-    {
-      QCString *dest;
-      m_t << "\\href{";
-      if ((dest=Doxygen::tagDestinationDict[ref])) m_t << *dest << "/";
-      if (!file.isEmpty()) m_t << file << Doxygen::htmlFileExtension;
-      if (!anchor.isEmpty()) m_t << "#" << anchor;
-      m_t << "}{";
-    }
+    m_t << "\\hyperlink{";
+    if (!file.isEmpty()) m_t << stripPath(file);
+    if (!file.isEmpty() && !anchor.isEmpty()) m_t << "_";
+    if (!anchor.isEmpty()) m_t << anchor;
+    m_t << "}{";
   }
   else if (ref.isEmpty()) // internal non-PDF link
   {
diff --git a/src/latexdocvisitor.h b/src/latexdocvisitor.h
index 0391dcd..d3aeaea 100644
--- a/src/latexdocvisitor.h
+++ b/src/latexdocvisitor.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index d4d8fae..042dd7c 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -421,7 +421,10 @@ static void writeDefaultHeaderPart1(FTextStream &t)
     const char *pkgName=extraPackages.first();
     while (pkgName)
     {
-      t << "\\usepackage{" << pkgName << "}\n";
+      if ((pkgName[0] == '[') || (pkgName[0] == '{'))
+        t << "\\usepackage" << pkgName << "\n";
+      else
+        t << "\\usepackage{" << pkgName << "}\n";
       pkgName=extraPackages.next();
     }
     t << "\n";
@@ -535,14 +538,18 @@ static void writeDefaultFooter(FTextStream &t)
   Doxygen::citeDict->writeLatexBibliography(t);
 
   // Index
+  t << "% Index\n";
   QCString unit;
   if (Config_getBool("COMPACT_LATEX"))
+  {
     unit = "section";
+  }
   else
+  {
     unit = "chapter";
-  t << "% Index\n"
-       "\\backmatter\n"
-       "\\newpage\n"
+    t << "\\backmatter\n";
+  }
+  t << "\\newpage\n"
        "\\phantomsection\n"
        "\\clearemptydoublepage\n"
        "\\addcontentsline{toc}{" << unit << "}{" << theTranslator->trRTFGeneralIndex() << "}\n"
@@ -1437,18 +1444,18 @@ void LatexGenerator::endDoxyAnchor(const char *fName,const char *anchor)
 void LatexGenerator::writeAnchor(const char *fName,const char *name)
 { 
   //printf("LatexGenerator::writeAnchor(%s,%s)\n",fName,name);
-  t << "\\label{" << name << "}" << endl; 
+  t << "\\label{" << stripPath(name) << "}" << endl; 
   static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS");
   static bool usePDFLatex   = Config_getBool("USE_PDFLATEX");
   if (usePDFLatex && pdfHyperlinks)
   {
     if (fName)
     {
-      t << "\\hypertarget{" << stripPath(fName) << "_" << name << "}{}" << endl;
+      t << "\\hypertarget{" << stripPath(fName) << "_" << stripPath(name) << "}{}" << endl;
     }
     else
     {
-      t << "\\hypertarget{" << name << "}{}" << endl;
+      t << "\\hypertarget{" << stripPath(name) << "}{}" << endl;
     }
   }
 }
diff --git a/src/latexgen.h b/src/latexgen.h
index 60c649a..ee67803 100644
--- a/src/latexgen.h
+++ b/src/latexgen.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/layout.cpp b/src/layout.cpp
index c364886..75cb6b3 100644
--- a/src/layout.cpp
+++ b/src/layout.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/layout.h b/src/layout.h
index d50bc7c..0b9ad9e 100644
--- a/src/layout.h
+++ b/src/layout.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/libdoxycfg.pro.in b/src/libdoxycfg.pro.in
deleted file mode 100644
index ab7c36c..0000000
--- a/src/libdoxycfg.pro.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 
-#
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby 
-# granted. No representations are made about the suitability of this software 
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-#
-# Documents produced by Doxygen are derivative works derived from the
-# input used in their production; they are not affected by this license.
-#
-# TMake project file for doxygen
-
-TEMPLATE     =	libdoxycfg.t
-CONFIG       =	console warn_on staticlib $extraopts
-HEADERS      =  config.h configoptions.h portable.h
-SOURCES      =	../generated_src/doxygen/config.cpp ../generated_src/doxygen/configoptions.cpp portable.cpp portable_c.c
-win32:TMAKE_CXXFLAGS       += -DQT_NODLL
-win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
-DEPENDPATH                 += ../generated_src/doxygen
-INCLUDEPATH                += ../generated_src/doxygen . ../qtools
-DESTDIR                    =  ../lib
-TARGET                     =  doxycfg
-OBJECTS_DIR                =  ../objects/doxygen
diff --git a/src/libdoxycfg.t.in b/src/libdoxycfg.t.in
deleted file mode 100644
index 89833f6..0000000
--- a/src/libdoxycfg.t.in
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# 
-#
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby 
-# granted. No representations are made about the suitability of this software 
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-#
-# Documents produced by Doxygen are derivative works derived from the
-# input used in their production; they are not affected by this license.
-#!
-#! doxygen.t: This is a custom template for building Doxygen
-#!
-#$ IncludeTemplate("lib.t");
-
-LEX     =   %%FLEX%%
-YACC    =   %%BISON%%
-PYTHON  =   %%PYTHON%%
-
-#${
-sub GenerateDep {
-    my($obj,$src,$dep) = @_;
-    my(@objv,$srcv,$i,$s,$o,$d,$c);
-    @objv = split(/\s+/,$obj);
-    @srcv = split(/\s+/,$src);
-    for $i ( 0..$#objv ) {
-        $s = $srcv[$i];
-        $o = $objv[$i];
-        next if $s eq "";
-        $text .= $o . ": " . $s;
-	$text .= " ${linebreak}\n\t\t" . $dep if $dep ne "";
-        if ( $moc_output{$s} ne "" ) {
-            $text .= " ${linebreak}\n\t\t" . $moc_output{$s};
-        }
-        $d = &make_depend($s);
-        $text .= " ${linebreak}\n\t\t" . $d if $d ne "";
-	$text .= "\n";
-    }
-    chop $text;
-}
-#$} 
-
-####################
-
-#$ GenerateDep("../generated_src/doxygen/config.cpp","config.l");
-	$(LEX) -PconfigYY -t config.l >../generated_src/doxygen/config.cpp 
-
-../generated_src/doxygen/configoptions.cpp: config.xml configgen.py
-	$(PYTHON) configgen.py -cpp config.xml >../generated_src/doxygen/configoptions.cpp
-
diff --git a/src/libdoxygen.pro.in b/src/libdoxygen.pro.in
deleted file mode 100644
index 39df3cd..0000000
--- a/src/libdoxygen.pro.in
+++ /dev/null
@@ -1,242 +0,0 @@
-#
-# 
-#
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby 
-# granted. No representations are made about the suitability of this software 
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-#
-# Documents produced by Doxygen are derivative works derived from the
-# input used in their production; they are not affected by this license.
-#
-# TMake project file for doxygen
-
-TEMPLATE     =	libdoxygen.t
-CONFIG       =	console warn_on staticlib $extraopts
-HEADERS      =	arguments.h \
-                bufstr.h \
-		cite.h \
-		clangparser.h \
-                classdef.h \
-                classlist.h \
-                cmdmapper.h \
-                code.h \
-		commentcnv.h \
-		commentscan.h \
-		condparser.h \
-                config.h \
-		context.h \
-		constexp.h \
-		cppvalue.h \
-		debug.h \
-                declinfo.h \
-                defargs.h \
-                defgen.h \
-                define.h \
-                definition.h \
-                diagram.h \
-                dirdef.h \
-                docparser.h \
-		docsets.h \
-                doctokenizer.h \
-                docvisitor.h \
-		dot.h \
-		doxygen.h \
-		eclipsehelp.h \
-		entry.h \
-		example.h \
-		filedef.h \
-		filename.h \
-		fileparser.h \
-		formula.h \
-		ftextstream.h \
-		ftvhelp.h \
-		groupdef.h \
-		htags.h \
-		htmlattrib.h \
-                htmldocvisitor.h \
-		htmlgen.h \
-		htmlhelp.h \
-		htmlentity.h \
-		image.h \
-		index.h \
-		language.h \
-                latexdocvisitor.h \
-		latexgen.h \
-                layout.h \
-		logos.h \
-		mandocvisitor.h \
-		mangen.h \
-		sqlite3gen.h \
-		markdown.h \
-                marshal.h \
-		memberdef.h \
-		membergroup.h \
-		memberlist.h \
-		membername.h \
-		message.h \
-                msc.h \
-                dia.h \
-		namespacedef.h \
-                objcache.h \
-		outputgen.h \
-		outputlist.h \
-		pagedef.h \
-		perlmodgen.h \
-		lodepng.h \
-		plantuml.h \
-		pre.h \
-                printdocvisitor.h \
-                pycode.h \
-                pyscanner.h \
-                fortrancode.h \
-                fortranscanner.h \
-                dbusxmlscanner.h \
-		qhp.h \
-		qhpxmlwriter.h \
-		reflist.h \
-		resourcemgr.h \
-                rtfdocvisitor.h \
-		rtfgen.h \
-		rtfstyle.h \
-		scanner.h \
-		searchindex.h \
-		section.h \
-		sortdict.h \
-                store.h \
-		tagreader.h \
-		tclscanner.h \
-		template.h \
-                textdocvisitor.h \
-		tooltip.h \
-		translator.h \
-		translator_adapter.h \
-		util.h \
-		version.h \
-		vhdlcode.h \
-		vhdldocgen.h \
-		xmldocvisitor.h \
-                xmlgen.h \
-                docbookvisitor.h \
-                docbookgen.h \
-		vhdljjparser.h 
-		
-
-SOURCES      =	arguments.cpp \
-		cite.cpp \
-		clangparser.cpp \
-		classdef.cpp \
-		classlist.cpp \
-                cmdmapper.cpp \
-		condparser.cpp \
-		context.cpp \
-		cppvalue.cpp \
-                dbusxmlscanner.cpp \
-		debug.cpp \
-                defgen.cpp \
-		define.cpp \
-		definition.cpp \
-		diagram.cpp \
-                dirdef.cpp \
-                docparser.cpp \
-		docsets.cpp \
-		dot.cpp \
-		doxygen.cpp \
-		eclipsehelp.cpp \
-		entry.cpp \
-		filedef.cpp \
-		filename.cpp \
-		fileparser.cpp \
-		formula.cpp \
-		ftextstream.cpp \
-		ftvhelp.cpp \
-		groupdef.cpp \
-		htags.cpp \
-                htmldocvisitor.cpp \
-		htmlgen.cpp \
-		htmlhelp.cpp \
-		htmlentity.cpp \
-		image.cpp \
-		index.cpp \
-		language.cpp \
-                latexdocvisitor.cpp \
-		latexgen.cpp \
-                layout.cpp \
-		lodepng.cpp \
-		logos.cpp \
-		plantuml.cpp \
-		mandocvisitor.cpp \
-		mangen.cpp \
-		sqlite3gen.cpp \
-		markdown.cpp \
-                marshal.cpp \
-		memberdef.cpp \
-		membergroup.cpp \
-		memberlist.cpp \
-		membername.cpp \
-		message.cpp \
-                msc.cpp \
-                dia.cpp \
-		namespacedef.cpp \
-                objcache.cpp \
-		outputgen.cpp \
-		outputlist.cpp \
-		pagedef.cpp \
-		perlmodgen.cpp \
-		qhp.cpp \
-		qhpxmlwriter.cpp \
-		reflist.cpp \
-		resourcemgr.cpp \
-                rtfdocvisitor.cpp \
-		rtfgen.cpp \
-		rtfstyle.cpp \
-		searchindex.cpp \
-                store.cpp \
-		tagreader.cpp \
-		template.cpp \
-                textdocvisitor.cpp \
-                tooltip.cpp \
-		util.cpp \
-		vhdldocgen.cpp \
-		xmldocvisitor.cpp \
-                xmlgen.cpp \
-                docbookvisitor.cpp \
-                docbookgen.cpp \
-                vhdljjparser.cpp \
-	        ../generated_src/doxygen/ce_parse.cpp \
-                ../generated_src/doxygen/constexp.cpp \
-		../generated_src/doxygen/vhdlcode.cpp \
-		../generated_src/doxygen/code.cpp \
-		../generated_src/doxygen/commentcnv.cpp \
-		../generated_src/doxygen/commentscan.cpp \
-		../generated_src/doxygen/declinfo.cpp \
-		../generated_src/doxygen/defargs.cpp \
-                ../generated_src/doxygen/doctokenizer.cpp \
-		../generated_src/doxygen/pre.cpp \
-		../generated_src/doxygen/pycode.cpp \
-		../generated_src/doxygen/pyscanner.cpp \
-		../generated_src/doxygen/scanner.cpp \
-                ../generated_src/doxygen/tclscanner.cpp \
-		../generated_src/doxygen/fortrancode.cpp \
-		../generated_src/doxygen/fortranscanner.cpp \
-		../generated_src/doxygen/version.cpp \
-		../generated_src/doxygen/resources.cpp 
-		
-		
-
-win32:TMAKE_CXXFLAGS       += -DQT_NODLL
-win32-msvc:TMAKE_CXXFLAGS  += -Zm200
-win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions
-linux-g++:TMAKE_CXXFLAGS   += -fno-exceptions
-INCLUDEPATH                += ../generated_src/doxygen ../src ../qtools ../libmd5 ../vhdlparser
-INCLUDEPATH                += %%SQLITE3_INC%%
-INCLUDEPATH                += %%LIBCLANG_INC%%
-DEPENDPATH                 += ../generated_src/doxygen ../qtools ../libmd5 ../vhdlparser
-win32:INCLUDEPATH          += .
-DESTDIR                    =  ../lib
-TARGET                     =  doxygen
-OBJECTS_DIR                =  ../objects/doxygen
-
diff --git a/src/libdoxygen.t.in b/src/libdoxygen.t.in
deleted file mode 100644
index 1d242d0..0000000
--- a/src/libdoxygen.t.in
+++ /dev/null
@@ -1,126 +0,0 @@
-#
-# 
-#
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby 
-# granted. No representations are made about the suitability of this software 
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-#
-# Documents produced by Doxygen are derivative works derived from the
-# input used in their production; they are not affected by this license.
-#!
-#! doxygen.t: This is a custom template for building Doxygen
-#!
-#$ IncludeTemplate("lib.t");
-
-LEX        = %%FLEX%%
-YACC       = %%BISON%%
-PYTHON     = %%PYTHON%%
-PERL       = %%PERL%%
-INCBUFSIZE = $(PYTHON) increasebuffer.py
-GENERATED_SRC = ../generated_src/doxygen
-GENERATED_OBJ = ../objects/doxygen
-
-#${
-sub GenerateDep {
-    my($obj,$src,@deps) = @_;
-    my(@objv,$srcv,$i,$s,$o,$d,$c);
-    @objv = split(/\s+/,$obj);
-    @srcv = split(/\s+/,$src);
-    for $i ( 0..$#objv ) {
-        $s = $srcv[$i];
-        $o = $objv[$i];
-        next if $s eq "";
-        $text .= $o . ": " . $s;
-        foreach my $dep (@deps) {
-	  $text .= " ${linebreak}\n\t\t" . $dep if $dep ne "";
-        }
-        if ( $moc_output{$s} ne "" ) {
-            $text .= " ${linebreak}\n\t\t" . $moc_output{$s};
-        }
-        $d = &make_depend($s);
-        $text .= " ${linebreak}\n\t\t" . $d if $d ne "";
-	$text .= "\n";
-    }
-    chop $text;
-}
-sub GenerateLex {
-    my($name,$caseOpt) = @_;
-    $text = "\t\$(LEX) ";
-    if ($caseOpt) {
-        $text .= "-i ";
-    }
-    $text .= "-P".$name."YY -t ".$name.".l | \$(INCBUFSIZE) > \$(GENERATED_SRC)/".$name.".cpp";
-}
-#$} 
-
-####################
-
-#$ GenerateDep("\$(GENERATED_SRC)/scanner.cpp","scanner.l");
-#$ GenerateLex("scanner",0);
-
-#$ GenerateDep("\$(GENERATED_SRC)/code.cpp","code.l");
-#$ GenerateLex("code",0);
-
-#$ GenerateDep("\$(GENERATED_SRC)/pyscanner.cpp","pyscanner.l");
-#$ GenerateLex("pyscanner",0);
-
-#$ GenerateDep("\$(GENERATED_SRC)/pycode.cpp","pycode.l");
-#$ GenerateLex("pycode",0);
-
-#$ GenerateDep("\$(GENERATED_SRC)/fortranscanner.cpp","fortranscanner.l");
-#$ GenerateLex("fortranscanner",1);
-
-#$ GenerateDep("\$(GENERATED_SRC)/fortrancode.cpp","fortrancode.l");
-#$ GenerateLex("fortrancode",1);
-
-#$ GenerateDep("\$(GENERATED_SRC)/vhdlcode.cpp","vhdlcode.l");
-#$ GenerateLex("vhdlcode",1);
-
-#$ GenerateDep("\$(GENERATED_SRC)/tclscanner.cpp","tclscanner.l");
-#$ GenerateLex("tclscanner",1);
-
-#$ GenerateDep("\$(GENERATED_SRC)/pre.cpp","pre.l");
-#$ GenerateLex("pre",0);
-
-#$ GenerateDep("\$(GENERATED_SRC)/declinfo.cpp","declinfo.l");
-#$ GenerateLex("declinfo",0);
-
-#$ GenerateDep("\$(GENERATED_SRC)/defargs.cpp","defargs.l");
-#$ GenerateLex("defargs",0);
-
-#$ GenerateDep("\$(GENERATED_SRC)/doctokenizer.cpp","doctokenizer.l");
-#$ GenerateLex("doctokenizer",0);
-
-#$ GenerateDep("\$(GENERATED_SRC)/commentcnv.cpp","commentcnv.l");
-#$ GenerateLex("commentcnv",0);
-
-#$ GenerateDep("\$(GENERATED_SRC)/commentscan.cpp","commentscan.l");
-#$ GenerateLex("commentscan",0);
-
-#$ GenerateDep("\$(GENERATED_SRC)/constexp.cpp","constexp.l","\$(GENERATED_SRC)/ce_parse.h");
-#$ GenerateLex("constexp",0);
-
-#$ GenerateDep("\$(GENERATED_SRC)/ce_parse.cpp","constexp.y");
-	$(YACC) -l -p constexpYY constexp.y -o \$(GENERATED_SRC)/ce_parse.cpp 
-
-#$ GenerateDep("\$(GENERATED_SRC)/ce_parse.h","constexp.y");
-	$(YACC) -l -d -p ce_parsexpYY constexp.y -o \$(GENERATED_SRC)/ce_parse.c 
-	-rm $(GENERATED_SRC)/ce_parse.c
-
-#$ GenerateDep("layout.cpp","\$(GENERATED_SRC)/layout_default.xml.h");
-
-$(GENERATED_SRC)/version.cpp: ../configure
-	$(PYTHON) version.py $(GENERATED_SRC)
-
-TO_C_CMD=$(PYTHON) to_c_cmd.py < $< > $@
-
-$(GENERATED_SRC)/layout_default.xml.h: layout_default.xml
-	$(TO_C_CMD)
-
-../generated_src/doxygen/resources.cpp: res2cc_cmd.py $(wildcard ../templates/html/*) $(wildcard ../templates/xml) $(wildcard ../templates/latex)
-	$(PYTHON) res2cc_cmd.py ../templates ../generated_src/doxygen/resources.cpp
-
diff --git a/src/logos.cpp b/src/logos.cpp
index 9a9e5db..e9e0905 100644
--- a/src/logos.cpp
+++ b/src/logos.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/logos.h b/src/logos.h
index 083d772..95a8a39 100644
--- a/src/logos.h
+++ b/src/logos.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/main.cpp b/src/main.cpp
index b64f700..cfd38ce 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/mandocvisitor.cpp b/src/mandocvisitor.cpp
index 1fe5409..0cc3959 100644
--- a/src/mandocvisitor.cpp
+++ b/src/mandocvisitor.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/mandocvisitor.h b/src/mandocvisitor.h
index a5906d0..d248c87 100644
--- a/src/mandocvisitor.h
+++ b/src/mandocvisitor.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/mangen.cpp b/src/mangen.cpp
index dc02ccf..a88ac26 100644
--- a/src/mangen.cpp
+++ b/src/mangen.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -107,7 +107,6 @@ ManGenerator::~ManGenerator()
 
 void ManGenerator::init()
 {
-  QCString ext = getExtension();
   QCString &manOutput = Config_getString("MAN_OUTPUT");
   
   QDir d(manOutput);
@@ -307,6 +306,7 @@ void ManGenerator::docify(const char *str)
     {
       switch(c)
       {
+        case '-':  t << "\\-"; break; // see  bug747780
         case '.':  t << "\\&."; break; // see  bug652277
         case '\\': t << "\\\\"; col++; break;
         case '\n': t << "\n"; col=0; break;
diff --git a/src/mangen.h b/src/mangen.h
index 98ef959..93111cf 100644
--- a/src/mangen.h
+++ b/src/mangen.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/markdown.cpp b/src/markdown.cpp
index fdf1b0f..02d1416 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -56,7 +56,8 @@
 #define isIdChar(i) \
   ((data[i]>='a' && data[i]<='z') || \
    (data[i]>='A' && data[i]<='Z') || \
-   (data[i]>='0' && data[i]<='9'))   \
+   (data[i]>='0' && data[i]<='9') || \
+   (((unsigned char)data[i])>=0x80)) // unicode characters
 
 // is character at position i in data allowed before an emphasis section
 #define isOpenEmphChar(i) \
@@ -132,7 +133,7 @@ static void convertStringFragment(QCString &result,const char *data,int size)
 {
   if (size<0) size=0;
   result.resize(size+1);
-  memcpy(result.data(),data,size);
+  memcpy(result.rawData(),data,size);
   result.at(size)='\0';
 }
 
@@ -810,7 +811,6 @@ static int processLink(GrowBuf &out,const char *data,int,int size)
   {
     return 0;
   }
-  static QRegExp re("^[@\\]ref ");
   if (isToc) // special case for [TOC]
   {
     if (g_current) g_current->stat=TRUE;
@@ -1366,7 +1366,9 @@ static bool isFencedCodeBlock(const char *data,int size,int refIndent,
   int startTildes=0;
   while (i<size && data[i]==' ') indent++,i++;
   if (indent>=refIndent+4) return FALSE; // part of code block
-  while (i<size && data[i]=='~') startTildes++,i++;
+  char tildaChar='~';
+  if (i<size && data[i]=='`') tildaChar='`';
+  while (i<size && data[i]==tildaChar) startTildes++,i++;
   if (startTildes<3) return FALSE; // not enough tildes
   if (i<size && data[i]=='{') i++; // skip over optional {
   int startLang=i;
@@ -1376,11 +1378,11 @@ static bool isFencedCodeBlock(const char *data,int size,int refIndent,
   start=i;
   while (i<size)
   {
-    if (data[i]=='~')
+    if (data[i]==tildaChar)
     {
       end=i-1;
       int endTildes=0;
-      while (i<size && data[i]=='~') endTildes++,i++; 
+      while (i<size && data[i]==tildaChar) endTildes++,i++;
       while (i<size && data[i]==' ') i++;
       if (i==size || data[i]=='\n') 
       {
@@ -2316,7 +2318,7 @@ QCString processMarkdown(const QCString &fileName,const int lineNr,Entry *e,cons
   // finally process the inline markup (links, emphasis and code spans)
   processInline(out,s,s.length());
   out.addChar(0);
-  Debug::print(Debug::Markdown,0,"======== Markdown =========\n---- input ------- \n%s\n---- output -----\n%s\n---------\n",input.data(),out.get());
+  Debug::print(Debug::Markdown,0,"======== Markdown =========\n---- input ------- \n%s\n---- output -----\n%s\n---------\n",qPrint(input),qPrint(out.get()));
   return out.get();
 }
 
diff --git a/src/markdown.h b/src/markdown.h
index 5e35259..e2e3a74 100644
--- a/src/markdown.h
+++ b/src/markdown.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/marshal.cpp b/src/marshal.cpp
index 04f426d..af14978 100644
--- a/src/marshal.cpp
+++ b/src/marshal.cpp
@@ -456,7 +456,7 @@ QCString unmarshalQCString(StorageIntf *s)
   result.at(len)='\0';
   if (len>0)
   {
-    s->read(result.data(),len);
+    s->read(result.rawData(),len);
   }
   //printf("unmarshalQCString: result=%s\n",result.data());
   return result;
diff --git a/src/marshal.h b/src/marshal.h
index 0c61276..206ab04 100644
--- a/src/marshal.h
+++ b/src/marshal.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 72f3e3c..7f93b51 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1808,7 +1808,10 @@ void MemberDef::writeDeclaration(OutputList &ol,
         ol.disableAllBut(OutputGenerator::Html);
         //ol.endEmphasis();
         ol.docify(" ");
-        if (separateMemberPages || (m_impl->group!=0 && gd==0)) // forward link to the page or group
+        if (separateMemberPages ||
+            (m_impl->group!=0 && gd==0) ||
+            (m_impl->nspace!=0 && nd==0)
+           ) // forward link to the page or group or namespace
         {
           ol.startTextLink(getOutputFileBase(),anchor());
         }
@@ -2043,7 +2046,7 @@ void MemberDef::getLabels(QStrList &sl,Definition *container) const
 void MemberDef::_writeCallGraph(OutputList &ol)
 {
   // write call graph
-  if ((m_impl->hasCallGraph || Config_getBool("CALL_GRAPH"))
+  if (m_impl->hasCallGraph
       && (isFunction() || isSlot() || isSignal()) && Config_getBool("HAVE_DOT")
      )
   {
@@ -2068,7 +2071,7 @@ void MemberDef::_writeCallGraph(OutputList &ol)
 
 void MemberDef::_writeCallerGraph(OutputList &ol)
 {
-  if ((m_impl->hasCallerGraph || Config_getBool("CALLER_GRAPH"))
+  if (m_impl->hasCallerGraph
       && (isFunction() || isSlot() || isSignal()) && Config_getBool("HAVE_DOT")
      )
   {
@@ -2553,7 +2556,6 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
 
   QCString cname   = container->name();
   QCString cfname  = getOutputFileBase();
-  QCString cfiname = container->getOutputFileBase();
 
   // get member name
   QCString doxyName=name();
@@ -2589,6 +2591,10 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
       ldef=ldef.mid(2);
     }
   }
+  else if (isFunction())
+  {
+    title+=argsString();
+  }
   int i=0,l;
   static QRegExp r("@[0-9]+");
 
@@ -2989,13 +2995,13 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
   {
     if (!hasDocumentedParams())
     {
-      warn_doc_error(docFile(),docLine(),
+      warn_doc_error(getDefFileName(),getDefLine(),
           "parameters of member %s are not (all) documented",
           qPrint(qualifiedName()));
     }
     if (!hasDocumentedReturnType() && isFunction() && hasDocumentation())
     {
-      warn_doc_error(docFile(),docLine(),
+      warn_doc_error(getDefFileName(),getDefLine(),
           "return type of member %s is not documented",
           qPrint(qualifiedName()));
     }
@@ -3204,7 +3210,13 @@ void MemberDef::warnIfUndocumented()
   if (cd)
     t="class", d=cd;
   else if (nd)
-    t="namespace", d=nd;
+  {
+    d=nd;
+    if (d->getLanguage() == SrcLangExt_Fortran)
+      t="module";
+    else
+      t="namespace";
+  }
   else if (gd)
     t="group", d=gd;
   else
@@ -3219,10 +3231,10 @@ void MemberDef::warnIfUndocumented()
       !isFriendClass() &&
       name().find('@')==-1 && d && d->name().find('@')==-1 &&
       protectionLevelVisible(m_impl->prot) &&
-      !isReference()
+      !isReference() && !isDeleted()
      )
   {
-    warn_undoc(getDefFileName(),getDefLine(),"Member %s%s (%s) of %s %s is not documented.",
+    warn_undoc(d->getDefFileName(),d->getDefLine(),"Member %s%s (%s) of %s %s is not documented.",
          qPrint(name()),qPrint(argsString()),qPrint(memberTypeName()),t,qPrint(d->name()));
   }
 }
@@ -3246,11 +3258,16 @@ bool MemberDef::isDocumentedFriendClass() const
          (fcd=getClass(baseName)) && fcd->isLinkable());
 }
 
+bool MemberDef::isDeleted() const
+{
+  return m_impl->defArgList && m_impl->defArgList->isDeleted;
+}
+
 bool MemberDef::hasDocumentation() const
 {
   return Definition::hasDocumentation() ||
          (m_impl->mtype==MemberType_Enumeration && m_impl->docEnumValues) ||  // has enum values
-         (m_impl->defArgList!=0 && m_impl->defArgList->hasDocumentation()); // has doc arguments
+         (m_impl->defArgList!=0 && m_impl->defArgList->hasDocumentation());   // has doc arguments
 }
 
 #if 0
@@ -3331,7 +3348,7 @@ void MemberDef::setAnchor()
   QCString sigStr(33);
   MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);
   //printf("memAnchor=%s\n",memAnchor.data());
-  MD5SigToString(md5_sig,sigStr.data(),33);
+  MD5SigToString(md5_sig,sigStr.rawData(),33);
   m_impl->anc = "a"+sigStr;
 }
 
diff --git a/src/memberdef.h b/src/memberdef.h
index b68149f..f60fb54 100644
--- a/src/memberdef.h
+++ b/src/memberdef.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -188,6 +188,7 @@ class MemberDef : public Definition
     bool isLinkable() const;
     bool hasDocumentation() const;  // overrides hasDocumentation in definition.h
     //bool hasUserDocumentation() const; // overrides hasUserDocumentation
+    bool isDeleted() const;
     bool isBriefSectionVisible() const;
     bool isDetailedSectionVisible(bool inGroup,bool inFile) const;
     bool isDetailedSectionLinkable() const;
diff --git a/src/membergroup.cpp b/src/membergroup.cpp
index aa0a36e..4bf7721 100644
--- a/src/membergroup.cpp
+++ b/src/membergroup.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -312,7 +312,7 @@ QCString MemberGroup::anchor() const
   QCString locHeader = grpHeader;
   if (locHeader.isEmpty()) locHeader="[NOHEADER]";
   MD5Buffer((const unsigned char *)locHeader.data(),locHeader.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.data(),33);
+  MD5SigToString(md5_sig,sigStr.rawData(),33);
   return "amgrp"+sigStr;
 }
 
diff --git a/src/membergroup.h b/src/membergroup.h
index daf8ccb..fa5520e 100644
--- a/src/membergroup.h
+++ b/src/membergroup.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/memberlist.cpp b/src/memberlist.cpp
index 95726a0..64fe44a 100644
--- a/src/memberlist.cpp
+++ b/src/memberlist.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -409,7 +409,6 @@ void MemberList::writePlainDeclarations(OutputList &ol,
               {
                 ol.endDoxyAnchor(md->getOutputFileBase(),md->anchor());
               }
-              ol.endMemberItem();
               if (!md->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC"))
               {
                 DocRoot *rootNode = validatingParseDoc(
@@ -437,6 +436,7 @@ void MemberList::writePlainDeclarations(OutputList &ol,
                 delete rootNode;
               }
               ol.endMemberDeclaration(md->anchor(),inheritId);
+              ol.endMemberItem();
             }
             md->warnIfUndocumented();
             break;
@@ -968,6 +968,15 @@ void MemberList::writeTagFile(FTextStream &tagFile)
     if (md->getLanguage()!=SrcLangExt_VHDL)
     {
       md->writeTagFile(tagFile);
+      if (md->memberType()==MemberType_Enumeration && md->enumFieldList() && !md->isStrong())
+      {
+        MemberListIterator vmli(*md->enumFieldList());
+        MemberDef *vmd;
+        for ( ; (vmd=vmli.current()) ; ++vmli)
+        {
+          vmd->writeTagFile(tagFile);
+        }
+      }
     }
     else
     {
diff --git a/src/memberlist.h b/src/memberlist.h
index 4cccadc..c293d22 100644
--- a/src/memberlist.h
+++ b/src/memberlist.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/membername.cpp b/src/membername.cpp
index a2f7296..a5248c3 100644
--- a/src/membername.cpp
+++ b/src/membername.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/membername.h b/src/membername.h
index 7a2fdc5..143dca1 100644
--- a/src/membername.h
+++ b/src/membername.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/message.cpp b/src/message.cpp
index 4156720..8f89c11 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -151,7 +151,7 @@ static void format_warn(const char *file,int line,const char *text)
 
 static void do_warn(const char *tag, const char *file, int line, const char *prefix, const char *fmt, va_list args)
 {
-  if (!Config_getBool(tag)) return; // warning type disabled
+  if (tag && !Config_getBool(tag)) return; // warning type disabled
   const int bufSize = 40960;
   char text[bufSize];
   int l=0;
@@ -216,6 +216,14 @@ void err(const char *fmt, ...)
   va_end(args); 
 }
 
+extern void err_full(const char *file,int line,const char *fmt, ...)
+{
+  va_list args;
+  va_start(args, fmt);
+  do_warn(NULL, file, line, error_str, fmt, args);
+  va_end(args); 
+}
+
 void printlex(int dbg, bool enter, const char *lexName, const char *fileName)
 {
   const char *enter_txt = "entering";
@@ -230,15 +238,15 @@ void printlex(int dbg, bool enter, const char *lexName, const char *fileName)
   if (dbg)
   {
     if (fileName)
-      fprintf(stderr,"--%s lexical analyzer: %s (for: %s)\n",enter_txt, lexName, fileName);
+      fprintf(stderr,"--%s lexical analyzer: %s (for: %s)\n",enter_txt, qPrint(lexName), qPrint(fileName));
     else
-      fprintf(stderr,"--%s lexical analyzer: %s\n",enter_txt, lexName);
+      fprintf(stderr,"--%s lexical analyzer: %s\n",enter_txt, qPrint(lexName));
   }
   else
   {
     if (fileName)
-      Debug::print(Debug::Lex,0,"%s lexical analyzer: %s (for: %s)\n",enter_txt_uc, lexName, fileName);
+      Debug::print(Debug::Lex,0,"%s lexical analyzer: %s (for: %s)\n",enter_txt_uc, qPrint(lexName), qPrint(fileName));
     else
-      Debug::print(Debug::Lex,0,"%s lexical analyzer: %s\n",enter_txt_uc, lexName);
+      Debug::print(Debug::Lex,0,"%s lexical analyzer: %s\n",enter_txt_uc, qPrint(lexName));
   }
 }
diff --git a/src/message.h b/src/message.h
index 481e8bf..3b1a294 100644
--- a/src/message.h
+++ b/src/message.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -29,6 +29,7 @@ extern void warn_undoc(const char *file,int line,const char *fmt, ...);
 extern void warn_doc_error(const char *file,int line,const char *fmt, ...);
 extern void warn_uncond(const char *fmt, ...);
 extern void err(const char *fmt, ...);
+extern void err_full(const char *file,int line,const char *fmt, ...);
 void initWarningFormat();
 
 extern void printlex(int dbg, bool enter, const char *lexName, const char *fileName);
diff --git a/src/msc.cpp b/src/msc.cpp
index f9e919c..7f3c641 100644
--- a/src/msc.cpp
+++ b/src/msc.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -169,7 +169,6 @@ QCString getMscImageMapFromFile(const QCString& inFile, const QCString& outDir,
   QCString mscExe = Config_getString("MSCGEN_PATH")+"mscgen"+portable_commandExtension();
   QCString mscArgs = "-T ismap -i \"";
   mscArgs+=inFile;
-  QFileInfo fi(inFile);
   mscArgs+="\" -o \"";
   mscArgs+=outFile + "\"";
 
@@ -201,7 +200,6 @@ void writeMscImageMapFromFile(FTextStream &t,const QCString &inFile,
  			    )
 {
   QCString mapName = baseName+".map";
-  QCString mapFile = inFile+".map";
   t << "<img src=\"" << relPath << baseName << ".";
   switch (format)
   {
diff --git a/src/msc.h b/src/msc.h
index 5d71ebd..58fada5 100644
--- a/src/msc.h
+++ b/src/msc.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp
index f7c8123..a2341c7 100644
--- a/src/namespacedef.cpp
+++ b/src/namespacedef.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -46,8 +46,7 @@ NamespaceDef::NamespaceDef(const char *df,int dl,int dc,
   }
   else
   {
-    fileName="namespace";
-    fileName+=name;
+    setFileName(name);
   }
   classSDict = new ClassSDict(17);
   namespaceSDict = new NamespaceSDict(17);
@@ -89,6 +88,12 @@ NamespaceDef::~NamespaceDef()
   delete m_allMembersDict;
 }
 
+void NamespaceDef::setFileName(const QCString &fn)
+{
+  fileName="namespace";
+  fileName+=fn;
+}
+
 void NamespaceDef::distributeMemberGroupDocumentation()
 {
   MemberGroupSDict::Iterator mgli(*memberGroupSDict);
@@ -1136,7 +1141,7 @@ QCString NamespaceDef::title() const
 {
   SrcLangExt lang = getLanguage();
   QCString pageTitle;
-  if (lang==SrcLangExt_Java || lang==SrcLangExt_CSharp)
+  if (lang==SrcLangExt_Java)
   {
     pageTitle = theTranslator->trPackage(displayName());
   }
@@ -1160,10 +1165,14 @@ QCString NamespaceDef::title() const
 QCString NamespaceDef::compoundTypeString() const
 {
   SrcLangExt lang = getLanguage();
-  if (lang==SrcLangExt_Java || lang==SrcLangExt_CSharp)
+  if (lang==SrcLangExt_Java)
   {
     return "package";
   }
+  else if(lang==SrcLangExt_CSharp)
+  {
+	return "namespace";
+  }
   else if (lang==SrcLangExt_Fortran)
   {
     return "module";
@@ -1184,7 +1193,7 @@ QCString NamespaceDef::compoundTypeString() const
     }
     else
     {
-      err("Internal inconsistency: namespace in IDL not module, library or constant group\n");
+      err_full(getDefFileName(),getDefLine(),"Internal inconsistency: namespace in IDL not module, library or constant group");
     }
   }
   return "";
diff --git a/src/namespacedef.h b/src/namespacedef.h
index 800f639..9b734eb 100644
--- a/src/namespacedef.h
+++ b/src/namespacedef.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -83,6 +83,7 @@ class NamespaceDef : public Definition
     virtual Definition *findInnerCompound(const char *name);
     void addInnerCompound(Definition *d);
     void addListReferences();
+    void setFileName(const QCString &fn);
 
     bool subGrouping() const { return m_subGrouping; }
     
diff --git a/src/objcache.cpp b/src/objcache.cpp
index a59c67b..a5180d6 100644
--- a/src/objcache.cpp
+++ b/src/objcache.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/objcache.h b/src/objcache.h
index 6e6e95d..224b34b 100644
--- a/src/objcache.h
+++ b/src/objcache.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/outputgen.cpp b/src/outputgen.cpp
index ee9bc48..31f682e 100644
--- a/src/outputgen.cpp
+++ b/src/outputgen.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/outputgen.h b/src/outputgen.h
index aaf1ba7..c3099df 100644
--- a/src/outputgen.h
+++ b/src/outputgen.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/outputlist.cpp b/src/outputlist.cpp
index 754ee7c..79330d8 100644
--- a/src/outputlist.cpp
+++ b/src/outputlist.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/outputlist.h b/src/outputlist.h
index f578d64..4abb100 100644
--- a/src/outputlist.h
+++ b/src/outputlist.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/pagedef.cpp b/src/pagedef.cpp
index 919a2d7..18a8205 100644
--- a/src/pagedef.cpp
+++ b/src/pagedef.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/pagedef.h b/src/pagedef.h
index 694d081..c3e54a3 100644
--- a/src/pagedef.h
+++ b/src/pagedef.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/parserintf.h b/src/parserintf.h
index 989fdcf..cc95ea4 100644
--- a/src/parserintf.h
+++ b/src/parserintf.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp
index c636cdf..6f9eb64 100644
--- a/src/perlmodgen.cpp
+++ b/src/perlmodgen.cpp
@@ -3,7 +3,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 by Dimitri van Heesch.
  * Authors: Dimitri van Heesch, Miguel Lobo.
  *
  * Permission to use, copy, modify, and distribute this software and its
@@ -1371,7 +1371,6 @@ void PerlModDocVisitor::visitPost(DocParBlock *)
 
 static void addTemplateArgumentList(ArgumentList *al,PerlModOutput &output,const char *)
 {
-  QCString indentStr;
   if (!al)
     return;
   output.openList("template_parameters");
diff --git a/src/perlmodgen.h b/src/perlmodgen.h
index f908959..92bb791 100644
--- a/src/perlmodgen.h
+++ b/src/perlmodgen.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/plantuml.cpp b/src/plantuml.cpp
index 87e70e1..e3a85e4 100644
--- a/src/plantuml.cpp
+++ b/src/plantuml.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -43,7 +43,7 @@ QCString writePlantUMLSource(const QCString &outDir,const QCString &fileName,con
   {
     err("Could not open file %s for writing\n",baseName.data());
   }
-  QCString text = "@startuml\n";
+  QCString text = "@startuml";
   text+=content;
   text+="@enduml\n";
   file.writeBlock( text, text.length() );
diff --git a/src/plantuml.h b/src/plantuml.h
index 27626d1..54ab8a2 100644
--- a/src/plantuml.h
+++ b/src/plantuml.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/portable.cpp b/src/portable.cpp
index 7f6be6e..5886793 100644
--- a/src/portable.cpp
+++ b/src/portable.cpp
@@ -45,7 +45,7 @@ int portable_system(const char *command,const char *args,bool commandHasConsole)
   fullCmd += " ";
   fullCmd += args;
 #ifndef NODEBUG
-  Debug::print(Debug::ExtCmd,0,"Executing external command `%s`\n",fullCmd.data());
+  Debug::print(Debug::ExtCmd,0,"Executing external command `%s`\n",qPrint(fullCmd));
 #endif
 
 #if !defined(_WIN32) || defined(__CYGWIN__)
@@ -194,7 +194,10 @@ uint portable_pid()
   return pid;
 }
 
-static char **last_environ;
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#else
+  static char **last_environ;
+#endif
 
 void portable_setenv(const char *name,const char *value)
 {
diff --git a/src/pre.h b/src/pre.h
index b624be5..190673f 100644
--- a/src/pre.h
+++ b/src/pre.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/pre.l b/src/pre.l
index 9e88b0d..86f9ebb 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -14,7 +14,7 @@
  * input used in their production; they are not affected by this license.
  *
  */
-
+%option never-interactive
 %{
 
 /*
@@ -54,12 +54,12 @@
 #include "memberdef.h"
 #include "membername.h"
 
+#define YY_NO_UNISTD_H 1
+
 // Toggle for some debugging info
 //#define DBG_CTX(x) fprintf x
 #define DBG_CTX(x) do { } while(0)
 
-#define YY_NEVER_INTERACTIVE 1
-
 struct CondCtx
 {
   CondCtx(int line,QCString id,bool b) 
@@ -1618,11 +1618,11 @@ static void readIncludeFile(const QCString &inc)
       {
 	if (alreadyIncluded)
 	{
-          Debug::print(Debug::Preprocessor,0,"#include %s: already included! skipping...\n",incFileName.data());
+          Debug::print(Debug::Preprocessor,0,"#include %s: already included! skipping...\n",qPrint(incFileName));
 	}
 	else
 	{
-          Debug::print(Debug::Preprocessor,0,"#include %s: not found! skipping...\n",incFileName.data());
+          Debug::print(Debug::Preprocessor,0,"#include %s: not found! skipping...\n",qPrint(incFileName));
 	}
         //printf("error: include file %s not found\n",yytext);
       }
@@ -2452,7 +2452,20 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
 <SkipCComment>[\\@][\\@]("f{"|"f$"|"f[") {
   					  outputArray(yytext,(int)yyleng);
   					}
-<SkipCComment>"~~~"[~]*                 {
+<SkipCComment>^({B}*"*"+)?{B}{0,3}"~~~"[~]*   {
+                                          static bool markdownSupport = Config_getBool("MARKDOWN_SUPPORT");
+                                          if (!markdownSupport)
+                                          {
+                                            REJECT;
+                                          }
+                                          else
+                                          {
+  					    outputArray(yytext,(int)yyleng);
+                                            g_fenceSize=yyleng;
+                                            BEGIN(SkipVerbatim);
+                                          }
+                                        }
+<SkipCComment>^({B}*"*"+)?{B}{0,3}"```"[`]*            {
                                           static bool markdownSupport = Config_getBool("MARKDOWN_SUPPORT");
                                           if (!markdownSupport)
                                           {
@@ -2599,7 +2612,14 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
 					    BEGIN(SkipCComment);
 					  }
   					}
-<SkipVerbatim>"~~~"[~]*                 {
+<SkipVerbatim>^({B}*"*"+)?{B}{0,3}"~~~"[~]*                 {
+  					  outputArray(yytext,(int)yyleng);
+                                          if (g_fenceSize==yyleng)
+                                          {
+                                            BEGIN(SkipCComment);
+                                          }
+                                        }
+<SkipVerbatim>^({B}*"*"+)?{B}{0,3}"```"[`]*                 {
   					  outputArray(yytext,(int)yyleng);
                                           if (g_fenceSize==yyleng)
                                           {
@@ -2609,7 +2629,7 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
 <SkipVerbatim>"*/"|"/*"			{
   					  outputArray(yytext,(int)yyleng);
   					}
-<SkipCComment,SkipVerbatim>[^*\\@\x06~\n\/]+ {
+<SkipCComment,SkipVerbatim>[^*\\@\x06~`\n\/]+ {
   					  outputArray(yytext,(int)yyleng);
   					}
 <SkipCComment,SkipVerbatim>\n		{ 
@@ -3179,7 +3199,7 @@ void preprocessFile(const char *fileName,BufStr &input,BufStr &output)
       Define *def;
       for (di.toFirst();(def=di.current());++di)
       {
-        Debug::print(Debug::Preprocessor,0,"%s ",def->name.data());
+        Debug::print(Debug::Preprocessor,0,"%s ",qPrint(def->name));
       }
       Debug::print(Debug::Preprocessor,0,"\n---------\n");
     }
diff --git a/src/printdocvisitor.h b/src/printdocvisitor.h
index 43b6bde..95e7e47 100644
--- a/src/printdocvisitor.h
+++ b/src/printdocvisitor.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -189,7 +189,7 @@ class PrintDocVisitor : public DocVisitor
     void visit(DocFormula *f)
     {
       indent_leaf();
-      printf("<formula name=%s test=%s/>",f->name().data(),f->text().data());
+      printf("<formula name=%s text=%s/>",f->name().data(),f->text().data());
     }
     void visit(DocIndexEntry *i)
     {
diff --git a/src/pycode.h b/src/pycode.h
index 9b0dacb..9817c39 100644
--- a/src/pycode.h
+++ b/src/pycode.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/pycode.l b/src/pycode.l
index 585b587..3c41a69 100644
--- a/src/pycode.l
+++ b/src/pycode.l
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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,7 +21,7 @@
  *  taught by Peter H. Froehlich <phf@acm.org>.
  */
 
-
+%option never-interactive
 %{
 
 #include <stdio.h>
@@ -48,8 +48,8 @@
 //#define DBG_CTX(x) fprintf x
 #define DBG_CTX(x) do { } while(0)
 
-#define YY_NEVER_INTERACTIVE 1
 #define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
 
 static ClassSDict    g_codeClassSDict(17);
 static QCString      g_curClassName;
@@ -79,7 +79,6 @@ static int           g_paramParens;
 
 static bool          g_exampleBlock;
 static QCString      g_exampleName;
-static QCString      g_exampleFile;
 
 static QCString      g_type;
 static QCString      g_name;
diff --git a/src/pyscanner.h b/src/pyscanner.h
index e4e974f..affa7ca 100644
--- a/src/pyscanner.h
+++ b/src/pyscanner.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/pyscanner.l b/src/pyscanner.l
index 1ac7b7a..8332a36 100644
--- a/src/pyscanner.l
+++ b/src/pyscanner.l
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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,7 +21,7 @@
  *  taught by Peter H. Froehlich <phf@acm.org>.
  */
 
-
+%option never-interactive
 %{
 
 /*
@@ -35,7 +35,6 @@
 #include <qarray.h>
 #include <qstack.h>
 #include <qregexp.h>
-#include <unistd.h>
 #include <qfile.h>
 #include <qfileinfo.h>
   
@@ -55,8 +54,8 @@
 //#define DBG_CTX(x) fprintf x
 #define DBG_CTX(x) do { } while(0)
 
-#define YY_NEVER_INTERACTIVE 1
 #define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
 
 /* -----------------------------------------------------------------
  *
@@ -83,7 +82,6 @@ static Specifier 	virt;
 
 static int              docBlockContext;
 static QCString         docBlock;
-static QCString         docBlockName;
 static bool             docBlockInBody;
 static bool             docBlockJavaStyle;
 static bool             docBrief;
@@ -97,7 +95,6 @@ static int              g_indent = 0;
 static int              g_curIndent = 0;
 
 static QDict<QCString>  g_packageNameCache(257);
-static QCString         g_packageScope;
 
 static char             g_atomStart;
 static char             g_atomEnd;
@@ -931,7 +928,6 @@ STARTDOCSYMS      "##"
     "="		        { // default value
                           // TODO: this rule is too simple, need to be able to
                           // match things like =")" as well!
-      			  QCString defVal=&yytext[1];
 			  g_defVal.resize(0);
 			  g_braceCount=0;
 			  BEGIN(FunctionParamDefVal);
diff --git a/src/qtbc.h b/src/qtbc.h
index c9ff3ca..e21eff4 100644
--- a/src/qtbc.h
+++ b/src/qtbc.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/reflist.cpp b/src/reflist.cpp
index 3cc7694..8b41caa 100644
--- a/src/reflist.cpp
+++ b/src/reflist.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/reflist.h b/src/reflist.h
index 5b647ea..0d40e80 100644
--- a/src/reflist.h
+++ b/src/reflist.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/res2cc_cmd.py b/src/res2cc_cmd.py
index 772ac84..7e0322d 100755
--- a/src/res2cc_cmd.py
+++ b/src/res2cc_cmd.py
@@ -3,7 +3,7 @@
 # offers an initResources() function, which registers the resources with the resource
 # manager (class ResourceMgr)
 #
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
+# Copyright (C) 1997-2015 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
diff --git a/src/resourcemgr.cpp b/src/resourcemgr.cpp
index a15a702..80bd2ad 100644
--- a/src/resourcemgr.cpp
+++ b/src/resourcemgr.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -132,7 +132,7 @@ bool ResourceMgr::copyResourceAs(const char *name,const char *targetDir,const ch
           if (f.open(IO_WriteOnly))
           {
             QCString buf(res->size+1);
-            memcpy(buf.data(),res->data,res->size);
+            memcpy(buf.rawData(),res->data,res->size);
             FTextStream t(&f);
             buf = replaceColorMarkers(buf);
             if (qstrcmp(name,"navtree.css")==0)
@@ -172,7 +172,7 @@ QCString ResourceMgr::getAsString(const char *name) const
   if (res)
   {
     QCString result(res->size+1);
-    memcpy(result.data(),res->data,res->size);
+    memcpy(result.rawData(),res->data,res->size);
     return result;
   }
   else
diff --git a/src/resourcemgr.h b/src/resourcemgr.h
index 6347e70..220202c 100644
--- a/src/resourcemgr.h
+++ b/src/resourcemgr.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp
index a11e42f..2ea35cc 100644
--- a/src/rtfdocvisitor.cpp
+++ b/src/rtfdocvisitor.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -1414,6 +1414,11 @@ void RTFDocVisitor::visitPre(DocXRefItem *x)
   if (x->title().isEmpty()) return;
   bool anonymousEnum = x->file()=="@";
   DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocXRefItem)}\n");
+  if (!m_lastIsPara)
+  {
+    m_t << "\\par" << endl;
+    m_lastIsPara=TRUE;
+  }
   m_t << "{"; // start param list
   //m_t << "{\\b "; // start bold
   m_t << "{" << rtf_Style["Heading5"]->reference << endl;
@@ -1671,7 +1676,8 @@ void RTFDocVisitor::writeDotFile(const QCString &fileName)
   m_t << "{" << endl;
   m_t << rtf_Style_Reset;
   m_t << "\\pard \\qc {\\field\\flddirty {\\*\\fldinst INCLUDEPICTURE \"";
-  m_t << baseName << "." << Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgExt = getDotImageExtension();
+  m_t << baseName << "." << imgExt;
   m_t << "\" \\\\d \\\\*MERGEFORMAT}{\\fldrslt IMAGE}}\\par" << endl;
   m_t << "}" << endl;
   m_lastIsPara=TRUE;
diff --git a/src/rtfdocvisitor.h b/src/rtfdocvisitor.h
index c50802d..0e759c1 100644
--- a/src/rtfdocvisitor.h
+++ b/src/rtfdocvisitor.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index 354469b..7baaa3c 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Parker Waechter & Dimitri van Heesch.
+ * Copyright (C) 1997-2015 by Parker Waechter & Dimitri van Heesch.
  *
  * Style sheet additions by Alexander Bartolich
  *
@@ -95,7 +95,7 @@ RTFGenerator::~RTFGenerator()
 
 void RTFGenerator::writeStyleSheetFile(QFile &file)
 {
-  QTextStream t(&file);
+  FTextStream t(&file);
   t << "# Generated by doxygen " << versionString << "\n\n";
   t << "# This file describes styles used for generating RTF output.\n";
   t << "# All text after a hash (#) is considered a comment and will be ignored.\n";
@@ -112,7 +112,7 @@ void RTFGenerator::writeStyleSheetFile(QFile &file)
 
 void RTFGenerator::writeExtensionsFile(QFile &file)
 {
-  QTextStream t(&file);
+  FTextStream t(&file);
   t << "# Generated by doxygen " << versionString << "\n\n";
   t << "# This file describes extensions used for generating RTF output.\n";
   t << "# All text after a hash (#) is considered a comment and will be ignored.\n";
@@ -2362,19 +2362,24 @@ static bool preProcessFile(QDir &d,QCString &infName, FTextStream &t, bool bIncl
   // this is EXTREEEEEEEMLY brittle.  It works on OUR rtf
   // files because the first line before the body
   // ALWAYS contains "{\comment begin body}"
+  int len;
   do
   {
-    if (f.readLine(lineBuf.data(),maxLineLength)==-1)
+    lineBuf.resize(maxLineLength);
+    if ((len=f.readLine(lineBuf.rawData(),maxLineLength))==-1)
     {
       err("read error in %s before end of RTF header!\n",infName.data());
       return FALSE;
     }
+    lineBuf.resize(len+1);
     if (bIncludeHeader) encodeForOutput(t,lineBuf.data());
   } while (lineBuf.find("\\comment begin body")==-1);
 
 
-  while (f.readLine(lineBuf.data(),maxLineLength)!=-1)
+  lineBuf.resize(maxLineLength);
+  while ((len=f.readLine(lineBuf.rawData(),maxLineLength))!=-1)
   {
+    lineBuf.resize(len+1);
     int pos;
     if ((pos=lineBuf.find("INCLUDETEXT"))!=-1)
     {
@@ -2406,6 +2411,7 @@ static bool preProcessFile(QDir &d,QCString &infName, FTextStream &t, bool bIncl
         encodeForOutput(t,lineBuf);
       }
     }
+    lineBuf.resize(maxLineLength);
   }
   f.close();
   // remove temporary file
@@ -2429,7 +2435,8 @@ void RTFGenerator::endDotGraph(const DotClassGraph &g)
   t << "{" << endl;
   t << rtf_Style_Reset << endl;
   t << "\\par\\pard \\qc {\\field\\flddirty {\\*\\fldinst INCLUDEPICTURE \"";
-  t << fn << "." << Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgExt = getDotImageExtension();
+  t << fn << "." << imgExt;
   t << "\" \\\\d \\\\*MERGEFORMAT}{\\fldrslt IMAGE}}\\par" << endl;
   t << "}" << endl;
   newParagraph();
@@ -2452,7 +2459,8 @@ void RTFGenerator::endInclDepGraph(const DotInclDepGraph &g)
   t << "{" << endl;
   t << rtf_Style_Reset << endl;
   t << "\\par\\pard \\qc {\\field\\flddirty {\\*\\fldinst INCLUDEPICTURE \"";
-  t << fn << "." << Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgExt = getDotImageExtension();
+  t << fn << "." << imgExt;
   t << "\" \\\\d \\\\*MERGEFORMAT}{\\fldrslt IMAGE}}\\par" << endl;
   t << "}" << endl;
   DBG_RTF(t << "{\\comment (endInclDepGraph)}"    << endl)
@@ -2482,7 +2490,8 @@ void RTFGenerator::endCallGraph(const DotCallGraph &g)
   t << "{" << endl;
   t << rtf_Style_Reset << endl;
   t << "\\par\\pard \\qc {\\field\\flddirty {\\*\\fldinst INCLUDEPICTURE \"";
-  t << fn << "." << Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgExt = getDotImageExtension();
+  t << fn << "." << imgExt;
   t << "\" \\\\d \\\\*MERGEFORMAT}{\\fldrslt IMAGE}}\\par" << endl;
   t << "}" << endl;
   DBG_RTF(t << "{\\comment (endCallGraph)}"    << endl)
@@ -2504,7 +2513,8 @@ void RTFGenerator::endDirDepGraph(const DotDirDeps &g)
   t << "{" << endl;
   t << rtf_Style_Reset << endl;
   t << "\\par\\pard \\qc {\\field\\flddirty {\\*\\fldinst INCLUDEPICTURE \"";
-  t << fn << "." << Config_getEnum("DOT_IMAGE_FORMAT");
+  QCString imgExt = getDotImageExtension();
+  t << fn << "." << imgExt;
   t << "\" \\\\d \\\\*MERGEFORMAT}{\\fldrslt IMAGE}}\\par" << endl;
   t << "}" << endl;
   DBG_RTF(t << "{\\comment (endDirDepGraph)}"    << endl)
diff --git a/src/rtfgen.h b/src/rtfgen.h
index 2617ee6..f0f1f6e 100644
--- a/src/rtfgen.h
+++ b/src/rtfgen.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Parker Waechter & Dimitri van Heesch.
+ * Copyright (C) 1997-2015 by Parker Waechter & 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 
diff --git a/src/rtfstyle.cpp b/src/rtfstyle.cpp
index f44951a..1ea8868 100644
--- a/src/rtfstyle.cpp
+++ b/src/rtfstyle.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/rtfstyle.h b/src/rtfstyle.h
index ae7e456..60f671f 100644
--- a/src/rtfstyle.h
+++ b/src/rtfstyle.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/scanner.h b/src/scanner.h
index 8c8c3d9..ac574e2 100644
--- a/src/scanner.h
+++ b/src/scanner.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/scanner.l b/src/scanner.l
index d012b93..328dc3f 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -14,7 +14,7 @@
  * input used in their production; they are not affected by this license.
  *
  */
-  
+%option never-interactive
 %{
 
 /*
@@ -28,7 +28,6 @@
 #include <qarray.h>
 #include <qstack.h>
 #include <qregexp.h>
-#include <unistd.h>
 #include <qfile.h>
   
 #include "scanner.h"
@@ -45,8 +44,8 @@
 
 #include "clangparser.h"
 
-#define YY_NEVER_INTERACTIVE 1
 #define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
 
 /* -----------------------------------------------------------------
  *
@@ -83,7 +82,6 @@ static int		roundCount   = 0 ;
 static int		curlyCount   = 0 ;
 static int		squareCount  = 0 ;
 static int              padCount     = 0 ;
-static QCString         slString;
 static Entry*		current_root = 0 ;
 static Entry*		global_root  = 0 ;
 static Entry*		current      = 0 ;
@@ -114,7 +112,6 @@ static QCString         aliasName;
 static QCString         baseName;
 static QCString*        specName;
 static QCString         formulaText;
-static QCString         formulaEnd;
 static bool             useOverrideCommands = FALSE;
 
 static SrcLangExt       language;
@@ -162,13 +159,7 @@ static bool             needsSemi;
 
 //static int              depthIf;
 static int  	        initBracketCount;
-static QCString         memberGroupRelates;
-static QCString         memberGroupInside;
-static QCString         xrefItemKey;
-static QCString         xrefItemTitle;
-static QCString         xrefListTitle;
 
-static QCString         g_skipBlockName;
 static QCString         oldStyleArgType;
 static QCString         docBackup;
 static QCString         briefBackup;
@@ -182,6 +173,7 @@ static char             docBlockTerm;
 
 static QCString         idlAttr;
 static QCString         idlProp;
+static bool             odlProp;
 
 static bool             g_lexInit = FALSE;
 static bool             externC;
@@ -675,6 +667,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 %x      SkipString
 %x      SkipPHPString
 %x	SkipInits
+%x	SkipC11Inits
 %x	SkipCPP
 %x	SkipCPPBlock
 %x	SkipComment
@@ -1824,7 +1817,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <FindMembers>{B}*{TYPEDEFPREFIX}{IDLATTR}?"enum"({BN}+("class"|"struct"))?{BN}+ { // for IDL: typedef [something] enum
                                           QCString text=yytext;
 					  isTypedef    = text.find("typedef")!=-1;
-                                          bool isStrongEnum = text.find("struct")!=-1 || text.find("class")!=-1;
+                                          bool isStrongEnum = text.find("struct")!=-1 || text.find("class")!=-1 || insideCS;
 					  if (insideJava)
 					  {
 					    current->section = Entry::CLASS_SEC;
@@ -2811,7 +2804,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <FindMembers,FindFields,ReadInitializer>"//"([!/]?){B}*{CMD}"}".*|"/*"([!*]?){B}*{CMD}"}"[^*]*"*/"	{
-  					  closeGroup(current,yyFileName,yyLineNr);
+                                          bool insideEnum = YY_START==FindFields || (YY_START==ReadInitializer && lastInitializerContext==FindFields); // see bug746226
+  					  closeGroup(current,yyFileName,yyLineNr,insideEnum);
   					}
 <FindMembers>"="			{ // in PHP code this could also be due to "<?="
   					  current->bodyLine = yyLineNr;
@@ -3398,6 +3392,15 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    idlAttr.resize(0);
 					    idlProp.resize(0);
 					    current->mtype = mtype;
+
+					    if (Config_getBool("IDL_PROPERTY_SUPPORT") &&
+					         current->mtype == Property)
+					    { // we are inside the properties section of a dispinterface
+					      odlProp = true;
+					      current->spec |= Entry::Gettable;
+					      current->spec |= Entry::Settable;
+					    }
+
 					    BEGIN( IDLAttribute );
 					  }
                                           else if (insideCS &&
@@ -3452,7 +3455,14 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                            current->spec |= Entry::Optional;
                          }
 <IDLAttribute>"readonly" { // on UNO IDL attribute or property
-					  current->spec |= Entry::Readonly;
+					  if (Config_getBool("IDL_PROPERTY_SUPPORT") && odlProp)
+					  {
+					    current->spec ^= Entry::Settable;
+					  }
+					  else
+					  {
+					    current->spec |= Entry::Readonly;
+					  }
 					}
 <IDLAttribute>"bound" { // on UNO IDL attribute or property
 					  current->spec |= Entry::Bound;
@@ -3479,6 +3489,11 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					}
 <IDLPropName>{BN}*{ID}{BN}*		{
 					  // return type (probably HRESULT) - skip it
+
+					  if (odlProp)
+					  { // property type
+					    idlProp = yytext;
+					  }
 					}
 <IDLPropName>{ID}{BN}*"("		{
   					  current->name = yytext;
@@ -3487,6 +3502,22 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->startColumn = yyColNr;
 					  BEGIN( IDLProp );
 					}
+<IDLPropName>{BN}*"("{BN}*{ID}{BN}*")"{BN}*	{
+					   if (odlProp)
+					   {
+					     idlProp += yytext;
+					   }
+					}
+<IDLPropName>{ID}{BN}*/";"		{
+					   if (odlProp)
+					   {
+					     current->name = yytext;
+					     idlProp = idlProp.stripWhiteSpace();
+					     odlProp = false;
+
+					     BEGIN( IDLProp );
+					   }
+					}
 <IDLProp>{BN}*"["[^\]]*"]"{BN}*		{  // attribute of a parameter
 					   idlAttr = yytext;
 					   idlAttr=idlAttr.stripWhiteSpace();
@@ -3562,6 +3593,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  sharpCount++;	
 					}
 <Sharp>{BN}+				{
+                                          current->type += ' ';
   					  lineCount();
 					}
 <Sharp>.				{ current->type += *yytext ; }
@@ -4630,6 +4662,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           lineCount();
                                           current->args += " = delete";
 					  current->spec |= Entry::Delete;
+					  current->argList->isDeleted=TRUE;
                                           BEGIN(FuncQual);
                                         }
 <FuncQual,TrailingReturn>{BN}*"="{BN}*"default"{BN}*     { // C++11 explicitly defaulted constructor/assignment operator
@@ -4977,8 +5010,18 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                         }
 <SkipInits>{ID}{BN}*"{"                 { // C++11 style initializer (see bug 688647)
                                           lineCount();
+                                          curlyCount=1;
+                                          BEGIN(SkipC11Inits);
+                                        }
+<SkipC11Inits>"{"                       {
                                           ++curlyCount;
                                         }
+<SkipC11Inits>"}"                       {
+  					  if ( --curlyCount<=0 )
+                                          {
+                                            BEGIN(SkipInits);
+                                          }
+                                        }
 <SkipInits>"{"				{ // C++11 style initializer
   					  unput('{');
 					  BEGIN( Function );
@@ -5082,7 +5125,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   				          //addToBody(yytext);
   					  BEGIN( SkipCurlyCpp );
 					}
-<SkipCurly,SkipInits>\n			{
+<SkipCurly,SkipC11Inits,SkipInits>\n	{
                                           lineCount();
   				          //addToBody(yytext);
   					}
@@ -5111,22 +5154,22 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   				          //addToBody(yytext);
                                           lineCount();
 					}
-<SkipInits,SkipCurly,SkipCurlyCpp>"/*"	{
+<SkipInits,SkipC11Inits,SkipCurly,SkipCurlyCpp>"/*"	{
   				          //addToBody(yytext);
   					  lastCContext = YY_START;
 					  BEGIN(SkipComment);
   					}
-<SkipInits,SkipCurly,SkipCurlyCpp>"//"  {
+<SkipInits,SkipC11Inits,SkipCurly,SkipCurlyCpp>"//"  {
   				          //addToBody(yytext);
   					  lastCContext = YY_START;
 					  BEGIN(SkipCxxComment);
   					}
-<SkipInits>"("                          {
+<SkipInits,SkipC11Inits>"("             {
                                           roundCount=0;
                                           lastSkipRoundContext=YY_START;
                                           BEGIN(SkipRound);
                                         }
-<SkipInits>\"				{
+<SkipInits,SkipC11Inits>\"	        {
   					  lastStringContext=YY_START;
   				          BEGIN( SkipString ); 
 					}
@@ -5161,7 +5204,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    BEGIN(SkipPHPString);
 					  }
 					}
-<SkipInits,SkipCurly,SkipCurlyCpp>.	{ }
+<SkipInits,SkipC11Inits,SkipCurly,SkipCurlyCpp>.	{ }
 <SkipString,SkipPHPString>\\.		{ }
 <SkipString>\"				{ 
   					  BEGIN( lastStringContext ); 
@@ -5591,7 +5634,13 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  BEGIN( ClassVar );
 					}
 <ClassVar>":"				{ 
-					  if (current->section==Entry::ENUM_SEC) // enum E:2, see bug 313527, 
+                                          if (current->section==Entry::VARIABLE_SEC) // enum A B:2, see bug 748208
+                                          {
+                                            current->bitfields+=":";
+                                            current->args.resize(0);
+                                            BEGIN(BitFields);
+                                          }
+                                          else if (current->section==Entry::ENUM_SEC) // enum E:2, see bug 313527, 
                                                                                  // or C++11 style enum: 'E : unsigned int {...}'
 					  {
 					    current->args.resize(0);
@@ -5950,7 +5999,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					}
 <Comment>.				{ current->program += *yytext ; }
 
-<FindMembers,FindFields,MemberSpec,FuncQual,SkipCurly,Operator,ClassVar,SkipInits,Bases,OldStyleArgs>("//"{B}*)?"/*!" { 
+<FindMembers,FindFields,MemberSpec,FuncQual,SkipCurly,Operator,ClassVar,SkipInits,SkipC11Inits,Bases,OldStyleArgs>("//"{B}*)?"/*!" { 
   					  //printf("Start doc block at %d\n",yyLineNr);
 					  removeSlashes=(yytext[1]=='/');
 					  tmpDocType=-1;
@@ -6222,13 +6271,20 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           g_nestedComment=FALSE;
   					  BEGIN(DocCopyBlock);
   					}
-<DocBlock>"~~~"[~]*                     {
+<DocBlock>^({B}*"*"+)?{B}{0,3}"~~~"[~]*                {
                                           docBlock+=yytext;
                                           docBlockName="~~~";
                                           g_fencedSize=yyleng;
                                           g_nestedComment=FALSE;
                                           BEGIN(DocCopyBlock);
                                         }
+<DocBlock>^({B}*"*"+)?{B}{0,3}"```"[`]*                {
+                                          docBlock+=yytext;
+                                          docBlockName="```";
+                                          g_fencedSize=yyleng;
+                                          g_nestedComment=FALSE;
+                                          BEGIN(DocCopyBlock);
+                                        }
 <DocBlock>{B}*"<code>"                  {
   					  if (insideCS)
 					  {
@@ -6340,7 +6396,14 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    REJECT;
 					  }
   					}
-<DocCopyBlock>"~~~"[~]*                 {
+<DocCopyBlock>^({B}*"*"+)?{B}{0,3}"~~~"[~]* {
+                                          docBlock+=yytext;
+                                          if (g_fencedSize==yyleng)
+                                          {
+                                            BEGIN(DocBlock);
+                                          }
+                                        }
+<DocCopyBlock>^({B}*"*"+)?{B}{0,3}"```"[`]*                 {
                                           docBlock+=yytext;
                                           if (g_fencedSize==yyleng)
                                           {
@@ -6685,7 +6748,8 @@ static void parseCompounds(Entry *rt)
       initEntry();
 
       // deep copy group list from parent (see bug 727732)
-      if (rt->groups)
+      static bool autoGroupNested = Config_getBool("GROUP_NESTED_COMPOUNDS");
+      if (rt->groups && ce->section!=Entry::ENUM_SEC && !(ce->spec&Entry::Enum))
       {
         QListIterator<Grouping> gli(*rt->groups);
         Grouping *g;
diff --git a/src/searchindex.cpp b/src/searchindex.cpp
index 22727fe..ee545bf 100644
--- a/src/searchindex.cpp
+++ b/src/searchindex.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -310,7 +310,6 @@ void SearchIndex::write(const char *fileName)
   padding = size - padding;
 
   //int statsOffset = size;
-  QDictIterator<IndexWord> wdi(m_words);
   //IndexWord *iw;
   int *wordStatOffsets = new int[m_words.count()];
   
@@ -1077,7 +1076,6 @@ void writeJavascriptSearchIndex()
         for (li.toFirst();(dl=li.current());++li)
         {
           Definition *d = dl->getFirst();
-          QCString id = d->localName();
 
           if (!firstEntry)
           {
diff --git a/src/searchindex.h b/src/searchindex.h
index 17d39a2..b9f45c6 100644
--- a/src/searchindex.h
+++ b/src/searchindex.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/section.h b/src/section.h
index a1f859e..51668a2 100644
--- a/src/section.h
+++ b/src/section.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/sortdict.h b/src/sortdict.h
index f79a335..f4d23f2 100644
--- a/src/sortdict.h
+++ b/src/sortdict.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp
index 42a0307..ba72b55 100644
--- a/src/sqlite3gen.cpp
+++ b/src/sqlite3gen.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -47,134 +47,154 @@
 
 const char * schema_queries[][2] = {
   { "includes",
-    "CREATE TABLE IF NOT EXISTS includes ("
-      "rowid INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "
-      "local INTEGER NOT NULL,"
-      "id_src INTEGER NOT NULL,"
-      "id_dst INTEGER NOT NULL);"
-    "CREATE UNIQUE INDEX idx_includes ON includes "
-      "(local, id_src, id_dst);"
+    "CREATE TABLE IF NOT EXISTS includes (\n"
+      "\t-- #include relations.\n"
+      "\trowid        INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\n"
+      "\tlocal        INTEGER NOT NULL,\n"
+      "\tid_src       INTEGER NOT NULL,  -- File id of the includer.\n"
+      "\tid_dst       INTEGER NOT NULL   -- File id of the includee.\n"
+      ");\n"
+    "CREATE UNIQUE INDEX idx_includes ON includes\n"
+      "\t(local, id_src, id_dst);"
   },
   { "innerclass",
-    "CREATE TABLE IF NOT EXISTS innerclass ("
-      "rowid INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "
-      "refid TEXT NOT NULL,"
-      "prot INTEGER NOT NULL,"
-      "name TEXT NOT NULL)"
+    "CREATE TABLE IF NOT EXISTS innerclass (\n"
+      "\trowid        INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\n"
+      "\trefid        TEXT NOT NULL,\n"
+      "\tprot         INTEGER NOT NULL,\n"
+      "\tname         TEXT NOT NULL\n"
+      ");"
   },
   { "files",
-    "CREATE TABLE IF NOT EXISTS files ("
-      "name TEXT PRIMARY KEY NOT NULL);"
+    "CREATE TABLE IF NOT EXISTS files (\n"
+      "\t-- Names of source files and includes.\n"
+      "\tname         TEXT PRIMARY KEY NOT NULL\n"
+      ");"
   },
   { "refids",
-    "CREATE TABLE IF NOT EXISTS refids ("
-      "refid TEXT PRIMARY KEY NOT NULL);"
+    "CREATE TABLE IF NOT EXISTS refids (\n"
+      "\trefid        TEXT PRIMARY KEY NOT NULL\n"
+      ");"
   },
   { "xrefs",
-    "CREATE TABLE IF NOT EXISTS xrefs ("
-      "rowid INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,"
-      "refid_src INTEGER NOT NULL, "
-      "refid_dst INTEGER NOT NULL, "
-      "id_file INTEGER NOT NULL, "
-      "line INTEGER NOT NULL, "
-      "column INTEGER NOT NULL);"
-    "CREATE UNIQUE INDEX idx_xrefs ON xrefs "
-      "(refid_src, refid_dst, id_file, line, column);"
+    "CREATE TABLE IF NOT EXISTS xrefs (\n"
+      "\t-- Cross reference relation.\n"
+      "\trowid        INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\n"
+      "\trefid_src    INTEGER NOT NULL, -- referrer id.\n"
+      "\trefid_dst    INTEGER NOT NULL, -- referee id.\n"
+      "\tid_file      INTEGER NOT NULL, -- file where the reference is happening.\n"
+      "\tline         INTEGER NOT NULL, -- line where the reference is happening.\n"
+      "\tcolumn       INTEGER NOT NULL  -- column where the reference is happening.\n"
+      ");\n"
+    "CREATE UNIQUE INDEX idx_xrefs ON xrefs\n"
+      "\t(refid_src, refid_dst, id_file, line, column);"
   },
   { "memberdef",
-    "CREATE TABLE IF NOT EXISTS memberdef ("
-      "rowid INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "
-      "id_file INTEGER NOT NULL,"
-      "line INTEGER NOT NULL,"
-      "column INTEGER NOT NULL,"
-      "refid TEXT NOT NULL,"
-      "name TEXT NOT NULL,"
-      "definition TEXT,"
-      "type TEXT,"
-      "argsstring TEXT,"
-      "scope TEXT,"
-      "initializer TEXT,"
-      "prot INTEGER,"
-      "const INTEGER,"
-      "virt INTEGER,"
-      "static INTEGER NOT NULL,"
-      "explicit INTEGER,"
-      "inline INTEGER,"
-      "final INTEGER,"
-      "sealed INTEGER,"
-      "new INTEGER,"
-      "optional INTEGER,"
-      "required INTEGER,"
-      "mutable INTEGER,"
-      "initonly INTEGER,"
-      "readable INTEGER,"
-      "writable INTEGER,"
-      "gettable INTEGER,"
-      "settable INTEGER,"
-      "accessor INTEGER,"
-      "addable INTEGER,"
-      "removable INTEGER,"
-      "raisable INTEGER,"
-      "kind INTEGER,"
-      "id_bodyfile INTEGER,"
-      "bodystart INTEGER,"
-      "bodyend INTEGER,"
-      "detaileddescription TEXT,"
-      "briefdescription TEXT,"
-      "inbodydescription TEXT"
-      ")"
+    "CREATE TABLE IF NOT EXISTS memberdef (\n"
+      "\t-- All processed identifiers.\n"
+      "\trowid        INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\n"
+      "\tid_file      INTEGER NOT NULL,  -- file where this identifier is located\n"
+      "\tline         INTEGER NOT NULL,  -- line where this identifier is located\n"
+      "\tcolumn       INTEGER NOT NULL,  -- column where this identifier is located\n"
+      "\trefid        TEXT NOT NULL,     -- see the refids table\n"
+      "\tname         TEXT NOT NULL,\n"
+      "\tdefinition   TEXT,\n"
+      "\ttype         TEXT,\n"
+      "\targsstring   TEXT,\n"
+      "\tscope        TEXT,\n"
+      "\tinitializer  TEXT,\n"
+      "\tprot         INTEGER DEFAULT 0, -- 0:public 1:protected 2:private 3:package\n"
+      "\tconst        INTEGER DEFAULT 0, -- 0:non-constant 1:constant\n"
+      "\tvirt         INTEGER DEFAULT 0, -- 0:non-virtual 1:virtual 2:pure-virtual\n"
+      "\tstatic       INTEGER DEFAULT 0, -- 0:non-static 1:static\n"
+      "\texplicit     INTEGER DEFAULT 0,\n"
+      "\tinline       INTEGER DEFAULT 0,\n"
+      "\tfinal        INTEGER DEFAULT 0,\n"
+      "\tsealed       INTEGER DEFAULT 0,\n"
+      "\tnew          INTEGER DEFAULT 0,\n"
+      "\toptional     INTEGER DEFAULT 0,\n"
+      "\trequired     INTEGER DEFAULT 0,\n"
+      "\tmutable      INTEGER DEFAULT 0,\n"
+      "\tinitonly     INTEGER DEFAULT 0,\n"
+      "\treadable     INTEGER DEFAULT 0,\n"
+      "\twritable     INTEGER DEFAULT 0,\n"
+      "\tgettable     INTEGER DEFAULT 0,\n"
+      "\tsettable     INTEGER DEFAULT 0,\n"
+      "\taccessor     INTEGER DEFAULT 0,\n"
+      "\taddable      INTEGER DEFAULT 0,\n"
+      "\tremovable    INTEGER DEFAULT 0,\n"
+      "\traisable     INTEGER DEFAULT 0,\n"
+      /// @todo make a `kind' table
+      "\tkind         INTEGER DEFAULT 0, -- 0:define 1:function 2:variable 3:typedef 4:enum 5:enumvalue 6:signal 7:slot 8:friend 9:DCOP 10:property 11:event\n"
+      "\tid_bodyfile  INTEGER DEFAULT 0, -- file of definition\n"
+      "\tbodystart    INTEGER DEFAULT 0, -- starting line of definition\n"
+      "\tbodyend      INTEGER DEFAULT 0, -- ending line of definition\n"
+      /// @todo make a `detaileddescription' table
+      "\tdetaileddescription  TEXT,\n"
+      "\tbriefdescription     TEXT,\n"
+      "\tinbodydescription    TEXTi\n"
+      ");"
   },
   { "compounddef",
-    "CREATE TABLE IF NOT EXISTS compounddef ("
-      "rowid INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,"
-      "name TEXT NOT NULL,"
-      "kind TEXT NOT NULL,"
-      "prot INTEGER NOT NULL,"
-      "refid TEXT NOT NULL,"
-      "id_file INTEGER NOT NULL,"
-      "line INTEGER NOT NULL,"
-      "column INTEGER NOT NULL)"
+    "CREATE TABLE IF NOT EXISTS compounddef (\n"
+      "\t-- class/struct definitions.\n"
+      "\trowid        INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\n"
+      "\tname         TEXT NOT NULL,\n"
+      "\tkind         TEXT NOT NULL,\n"
+      "\trefid        TEXT NOT NULL,\n"
+      "\tprot         INTEGER NOT NULL,\n"
+      "\tid_file      INTEGER NOT NULL,\n"
+      "\tline         INTEGER NOT NULL,\n"
+      "\tcolumn       INTEGER NOT NULL\n"
+      ");"
   },
   { "basecompoundref",
-    "CREATE TABLE IF NOT EXISTS basecompoundref ("
-      "rowid INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "
-      "base TEXT NOT NULL,"
-      "derived TEXT NOT NULL,"
-      "refid TEXT NOT NULL,"
-      "prot INTEGER NOT NULL,"
-      "virt INTEGER NOT NULL)"
+    "CREATE TABLE IF NOT EXISTS basecompoundref (\n"
+      "\trowid        INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\n"
+      "\tbase         TEXT NOT NULL,\n"
+      "\tderived      TEXT NOT NULL,\n"
+      "\trefid        TEXT NOT NULL,\n"
+      "\tprot         INTEGER NOT NULL,\n"
+      "\tvirt         INTEGER NOT NULL\n"
+      ");"
   },
   { "derivedcompoundref",
-    "CREATE TABLE IF NOT EXISTS derivedcompoundref ("
-      "rowid INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "
-      "base TEXT NOT NULL,"
-      "derived TEXT NOT NULL,"
-      "refid TEXT NOT NULL,"
-      "prot INTEGER NOT NULL,"
-      "virt INTEGER NOT NULL)"
+    "CREATE TABLE IF NOT EXISTS derivedcompoundref (\n"
+      "\trowid        INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\n"
+      "\tbase         TEXT NOT NULL,\n"
+      "\tderived      TEXT NOT NULL,\n"
+      "\trefid        TEXT NOT NULL,\n"
+      "\tprot         INTEGER NOT NULL,\n"
+      "\tvirt         INTEGER NOT NULL\n"
+      ");"
   },
   { "params",
-    "CREATE TABLE IF NOT EXISTS params ("
-      "rowid INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,"
-      "attributes TEXT,"
-      "type TEXT,"
-      "declname TEXT,"
-      "defnname TEXT,"
-      "array TEXT,"
-      "defval TEXT,"
-      "briefdescription TEXT)"
+    "CREATE TABLE IF NOT EXISTS params (\n"
+      "\t-- All processed parameters.\n"
+      "\trowid        INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\n"
+      "\tattributes   TEXT,\n"
+      "\ttype         TEXT,\n"
+      "\tdeclname     TEXT,\n"
+      "\tdefnname     TEXT,\n"
+      "\tarray        TEXT,\n"
+      "\tdefval       TEXT,\n"
+      "\tbriefdescription TEXT\n"
+      ");"
   },
   { "memberdef_params",
-    "CREATE TABLE IF NOT EXISTS memberdef_params ("
-      "rowid INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,"
-      "id_memberdef INTEGER NOT NULL,"
-      "id_param INTEGER NOT NULL)"
+    "CREATE TABLE IF NOT EXISTS memberdef_params (\n"
+      "\t-- Junction table for memberdef parameters.\n"
+      "\trowid        INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\n"
+      "\tid_memberdef INTEGER NOT NULL,\n"
+      "\tid_param     INTEGER NOT NULL\n"
+      ");"
   },
   { "innernamespaces",
-    "CREATE TABLE IF NOT EXISTS innernamespaces ("
-      "rowid INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,"
-      "refid TEXT NOT NULL,"
-      "name TEXT NOT NULL)"
+    "CREATE TABLE IF NOT EXISTS innernamespaces (\n"
+      "\trowid        INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\n"
+      "\trefid        TEXT NOT NULL,\n"
+      "\tname         TEXT NOT NULL\n"
+      ");"
   }
 };
 
@@ -407,7 +427,7 @@ static void insertMemberReference(sqlite3 *db, MemberDef *src, MemberDef *dst, c
       int rv = sscanf(floc,"%[^:]:%d:%d",file,&line,&column);
       if (rv!=3)
       {
-        msg("unable to read file loc from[%s]\n",floc);
+        msg("unable to read file:line:col location from string [%s]\n",floc);
         return;
       }
     }
@@ -740,10 +760,11 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def)
     default:
       break;
   }
+
   if (isFunc)
   {
     ArgumentList *al = md->argumentList();
-    if (al!=0 && al->constSpecifier)
+    if (al!=0)
     {
       bindIntParameter(memberdef_insert,":const",al->constSpecifier);
     }
@@ -754,7 +775,7 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def)
     bindIntParameter(memberdef_insert,":new",md->isNew());
     bindIntParameter(memberdef_insert,":optional",md->isOptional());
     bindIntParameter(memberdef_insert,":required",md->isRequired());
-    
+
     bindIntParameter(memberdef_insert,":virt",md->virtualness());
   }
   // place in the arguments and linkify the arguments
@@ -1027,9 +1048,16 @@ static void generateSqlite3ForClass(sqlite3 *db, ClassDef *cd)
     BaseClassDef *bcd;
     for (bcli.toFirst();(bcd=bcli.current());++bcli)
     {
-      bindTextParameter(derivedcompoundref_insert,":base",cd->displayName());
-      bindTextParameter(derivedcompoundref_insert,":dervied",bcd->classDef->displayName());
-      bindTextParameter(derivedcompoundref_insert,":refid",bcd->classDef->getOutputFileBase());
+      bindTextParameter(derivedcompoundref_insert,":base",cd->displayName(),FALSE);
+      if (!bcd->templSpecifiers.isEmpty())
+      {
+        bindTextParameter(derivedcompoundref_insert,":derived",insertTemplateSpecifierInScope(bcd->classDef->name(),bcd->templSpecifiers),FALSE);
+      }
+      else
+      {
+        bindTextParameter(derivedcompoundref_insert,":derived",bcd->classDef->displayName(),FALSE);
+      }
+      bindTextParameter(derivedcompoundref_insert,":refid",bcd->classDef->getOutputFileBase(),FALSE);
       bindIntParameter(derivedcompoundref_insert,":prot",bcd->prot);
       bindIntParameter(derivedcompoundref_insert,":virt",bcd->virt);
       step(db,derivedcompoundref_insert);
diff --git a/src/sqlite3gen.h b/src/sqlite3gen.h
index 59664dd..6396d3a 100644
--- a/src/sqlite3gen.h
+++ b/src/sqlite3gen.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
diff --git a/src/store.cpp b/src/store.cpp
index 8d9a0cd..c09dcfb 100644
--- a/src/store.cpp
+++ b/src/store.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/store.h b/src/store.h
index 597ea63..39917df 100644
--- a/src/store.h
+++ b/src/store.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index be0472a..290399a 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/tagreader.h b/src/tagreader.h
index 1b5f7e3..6ea2d81 100644
--- a/src/tagreader.h
+++ b/src/tagreader.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/tclscanner.h b/src/tclscanner.h
index baa8e84..aa1673c 100644
--- a/src/tclscanner.h
+++ b/src/tclscanner.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 by Dimitri van Heesch.
  * Copyright (C) 2010-2011 by Rene Zaumseil
  *
  * Permission to use, copy, modify, and distribute this software and its
diff --git a/src/tclscanner.l b/src/tclscanner.l
index f162637..5e249a6 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -14,12 +14,12 @@
  * input used in their production; they are not affected by this license.
  *
  */ 
+%option never-interactive
 %{
 #include <stdio.h> 
 #include <stdlib.h>
 #include <assert.h>
 #include <ctype.h>
-#include <unistd.h> 
 
 #include <qstring.h>
 #include <qstringlist.h>
@@ -51,8 +51,8 @@
 #include "namespacedef.h"
 #include "filedef.h"
 
-#define YY_NEVER_INTERACTIVE 1
 #define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
 
 #define MAX_INCLUDE_DEPTH 10
 
@@ -657,7 +657,7 @@ static void tcl_font_end()
 }
 
 //! Codify 'str' with special font class 's'.
-static void tcl_codify(const char *s,char *str)
+static void tcl_codify(const char *s,const char *str)
 {
   if (!tcl.code || !str) return;
   if (s && qstrcmp(s,"NULL")!=0)
@@ -666,7 +666,9 @@ static void tcl_codify(const char *s,char *str)
     tcl.code->startFontClass(s);
     tcl.code_font=s;
   }
-  char *p=str,*sp=p;
+  char *tmp = (char *) malloc(strlen(str)+1);
+  strcpy(tmp, str);
+  char *p=tmp,*sp=p;
   char c;
   bool done=FALSE;
   while (!done)
@@ -676,7 +678,10 @@ static void tcl_codify(const char *s,char *str)
     if (c=='\n')
     {
       tcl.code_line++;
-      *(p-1)='\0';
+      *(p-1)='\0'; // Dimitri: is this really needed?
+                   // wtschueller: As far as I can see: yes.
+                   // Deletes that \n that would produce ugly source listings otherwise.
+                   // However, there may exist more sophisticated solutions.
       tcl.code->codify(sp);
       if (tcl.code_font)
       {
@@ -699,6 +704,7 @@ static void tcl_codify(const char *s,char *str)
       done=TRUE;
     }
   }
+  free(tmp);
   tcl_font_end();
 }
 
@@ -719,7 +725,6 @@ static void tcl_codify(const char *s,const QString &str)
   if (tcl.code==NULL) return;
   tcl_codify(s,str.utf8());
 }
-#endif
 
 //! Codify 'str' with special font class 's'.
 static void tcl_codify(const char *s,const QCString &str)
@@ -727,6 +732,7 @@ static void tcl_codify(const char *s,const QCString &str)
   if (!tcl.code) return;
   tcl_codify(s,str.data());
 }
+#endif
 
 static void tcl_codify_cmd(const char *s,int i)
 {
@@ -1123,7 +1129,6 @@ D
 static tcl_scan *tcl_scan_start(char type, QString content, QCString ns, Entry *entry_cl, Entry *entry_fn)
 {
   tcl_scan *myScan=tcl.scan.at(0);
-  QCString myName;
 tcl_inf("line=%d type=%d '%s'\n",tcl.line_body0,type,content.ascii());
 
   myScan->line1=yylineno;
@@ -2298,7 +2303,7 @@ D
 static void tcl_command_ITCL_CLASS()
 {
 D
-  QCString myNs, myName, myStr;
+  QCString myNs, myName;
   Entry *myEntryCl;
   tcl_scan *myScan = tcl.scan.at(0);
 
@@ -2327,7 +2332,7 @@ D
 static void tcl_command_OO_CLASS()
 {
 D
-  QCString myNs, myName, myStr;
+  QCString myNs, myName;
   //Entry *myEntryNs;
   Entry *myEntryCl;
   tcl_scan *myScan = tcl.scan.at(0);
diff --git a/src/template.cpp b/src/template.cpp
index 9fa03aa..4250f08 100644
--- a/src/template.cpp
+++ b/src/template.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -2998,7 +2998,6 @@ class TemplateNodeRange : public TemplateNodeCreator<TemplateNodeRange>
           {
             c->push();
             //int index = m_reversed ? list.count() : 0;
-            TemplateVariant v;
             const TemplateVariant *parentLoop = c->getRef("forloop");
             uint index = 0;
             int i = m_down ? e : s;
@@ -4395,7 +4394,7 @@ TemplateLexer::TemplateLexer(const TemplateEngine *engine,const QCString &fileNa
   m_engine(engine), m_fileName(fileName)
 {
   m_data.resize(size+1);
-  memcpy(m_data.data(),data,size);
+  memcpy(m_data.rawData(),data,size);
   m_data[size]=0;
 }
 
@@ -4602,7 +4601,7 @@ void TemplateLexer::addToken(QList<TemplateToken> &tokens,
   {
     int len = endPos-startPos+1;
     QCString text(len);
-    qstrncpy(text.data(),data+startPos,len);
+    qstrncpy(text.rawData(),data+startPos,len);
     if (type!=TemplateToken::Text) text = text.stripWhiteSpace();
     tokens.append(new TemplateToken(type,text,line));
   }
diff --git a/src/template.h b/src/template.h
index ef9792c..c6c918c 100644
--- a/src/template.h
+++ b/src/template.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
diff --git a/src/textdocvisitor.cpp b/src/textdocvisitor.cpp
index 6f3151f..8c8ecad 100644
--- a/src/textdocvisitor.cpp
+++ b/src/textdocvisitor.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/textdocvisitor.h b/src/textdocvisitor.h
index b17065d..1bbc357 100644
--- a/src/textdocvisitor.h
+++ b/src/textdocvisitor.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/tooltip.cpp b/src/tooltip.cpp
index 8085bff..957c661 100644
--- a/src/tooltip.cpp
+++ b/src/tooltip.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -59,7 +59,7 @@ void TooltipManager::clearTooltips()
 static QCString escapeId(const char *s)
 {
   QCString res=s;
-  char *p=res.data();
+  char *p=res.rawData();
   while (*p)
   {
     if (!isId(*p)) *p='_';
diff --git a/src/tooltip.h b/src/tooltip.h
index ea8948d..34a578a 100644
--- a/src/tooltip.h
+++ b/src/tooltip.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/translator.h b/src/translator.h
index 32eaf09..7092174 100644
--- a/src/translator.h
+++ b/src/translator.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
diff --git a/src/translator_am.h b/src/translator_am.h
index 9eaba0e..b50aec2 100644
--- a/src/translator_am.h
+++ b/src/translator_am.h
@@ -2,7 +2,7 @@
  *

  *

  *

- * Copyright (C) 1997-2014 by Dimitri van Heesch.

+ * Copyright (C) 1997-2015 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

@@ -994,7 +994,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
         "};\n"

         "\\endcode\n"

         "Սրանով կստանանք հետևյալ գրաֆը."

-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"

+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"

         "<p>\n"

         "Այս գրաֆի ուղղանկյունները ունեն հետևյալ իմաստը.\n"

         "<ul>\n"

diff --git a/src/translator_ar.h b/src/translator_ar.h
index 5d37b69..5daaa4c 100644
--- a/src/translator_ar.h
+++ b/src/translator_ar.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1044,14 +1044,14 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
         "\\endcode\n"
         "If the \\c MAX_DOT_GRAPH_HEIGHT tag in the configuration file "
         "is set to 240 this will result in the following graph:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "The boxes in the above graph have the following meaning:\n"
         "<ul>\n"
         "<li>%A filled black box represents the struct or class for which the "
         "graph is generated.\n"
         "<li>%A box with a black border denotes a documented struct or class.\n"
-        "<li>%A box with a grey border denotes an undocumented struct or class.\n"
+        "<li>%A box with a gray border denotes an undocumented struct or class.\n"
         "<li>%A box with a red border denotes a documented struct or class for"
         "which not all inheritance/containment relations are shown. %A graph is "
         "truncated if it does not fit within the specified boundaries.\n"
diff --git a/src/translator_br.h b/src/translator_br.h
index b7bd604..6a7966f 100644
--- a/src/translator_br.h
+++ b/src/translator_br.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright (C) 1997-2013 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1007,7 +1007,7 @@ class TranslatorBrazilian : public Translator
         "};\n"
         "\\endcode\n"
         "Isto irá gerar o seguinte gráfo:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "As caixas no grafo acima tem as seguintes interpretações:\n"
         "<ul>\n"
diff --git a/src/translator_ca.h b/src/translator_ca.h
index 5c3e595..d4aca52 100644
--- a/src/translator_ca.h
+++ b/src/translator_ca.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1019,7 +1019,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
         "};\n"
         "\\endcode\n"
         "Resultarà el gràfic següent:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "Les caixes del gràfic superior tenen aquesta interpretació:\n"
         "<ul>\n"
diff --git a/src/translator_cn.h b/src/translator_cn.h
index fc01ce0..26160d4 100644
--- a/src/translator_cn.h
+++ b/src/translator_cn.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -24,7 +24,7 @@
 */
 #define CN_SPC " "
 
-class TranslatorChinese : public TranslatorAdapter_1_8_2
+class TranslatorChinese : public Translator
 {
   public:
     /*! Used for identification of the language. The identification
@@ -910,7 +910,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
         "};\n"
         "\\endcode\n"
         "结果将会生成以下图:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n"
         "<p>\n"
         "上图中的矩形有如下意义:\n"
         "</p>\n"
@@ -1794,6 +1794,121 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     { return "额外继承的成员函数"; }
 
 //////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.8.2
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a tooltip for the toggle button that appears in the
+     *  navigation tree in the HTML output when GENERATE_TREEVIEW is
+     *  enabled. This tooltip explains the meaning of the button.
+     */
+    virtual QCString trPanelSynchronisationTooltip(bool enable)
+    {
+      QCString opt = enable ? "开启" : "关闭";
+      return "点击"CN_SPC+opt+CN_SPC"面板同步";
+    }
+
+    /*! Used in a method of an Objective-C class that is declared in a
+     *  a category. Note that the @1 marker is required and is replaced
+     *  by a link.
+     */
+    virtual QCString trProvidedByCategory()
+    {
+      return "由 category @1 提供.";
+    }
+
+    /*! Used in a method of an Objective-C category that extends a class.
+     *  Note that the @1 marker is required and is replaced by a link to
+     *  the class method.
+     */
+    virtual QCString trExtendsClass()
+    {
+      return "扩展类 @1.";
+    }
+
+    /*! Used as the header of a list of class methods in Objective-C.
+     *  These are similar to static public member functions in C++.
+     */
+    virtual QCString trClassMethods()
+    {
+      return "类方法";
+    }
+
+    /*! Used as the header of a list of instance methods in Objective-C.
+     *  These are similar to public member functions in C++.
+     */
+    virtual QCString trInstanceMethods()
+    {
+      return "构造函数";
+    }
+
+    /*! Used as the header of the member functions of an Objective-C class.
+     */
+    virtual QCString trMethodDocumentation()
+    {
+      return "函数文档";
+    }
+
+    /*! Used as the title of the design overview picture created for the
+     *  VHDL output.
+     */
+    virtual QCString trDesignOverview()
+    {
+      return "设计概要";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.8.4
+//////////////////////////////////////////////////////////////////////////
+
+    /** old style UNO IDL services: implemented interfaces */
+    virtual QCString trInterfaces()
+    { return "导出的接口"; }
+
+    /** old style UNO IDL services: inherited services */
+    virtual QCString trServices()
+    { return "包含的服务"; }
+
+    /** UNO IDL constant groups */
+    virtual QCString trConstantGroups()
+    { return "常量组"; }
+
+    /** UNO IDL constant groups */
+    virtual QCString trConstantGroupReference(const char *namespaceName)
+    {
+      QCString result=namespaceName;
+      result+= CN_SPC"常量组参考";
+      return result;
+    }
+    /** UNO IDL service page title */
+    virtual QCString trServiceReference(const char *sName)
+    {
+      QCString result=(QCString)sName;
+      result+= CN_SPC"服务参考";
+      return result;
+    }
+    /** UNO IDL singleton page title */
+    virtual QCString trSingletonReference(const char *sName)
+    {
+      QCString result=(QCString)sName;
+      result+= CN_SPC"单例参考";
+      return result;
+    }
+    /** UNO IDL service page */
+    virtual QCString trServiceGeneratedFromFiles(bool single)
+    {
+      // single is true implies a single file
+      return "该服务的文档由下列文件生成:";
+    }
+    /** UNO IDL singleton page */
+    virtual QCString trSingletonGeneratedFromFiles(bool single)
+    {
+      // single is true implies a single file
+      return "该单例的文档由下列文件生成:";
+    }
+
+//////////////////////////////////////////////////////////////////////////
 };
 
 #endif
diff --git a/src/translator_cz.h b/src/translator_cz.h
index b83eb92..2ddc029 100644
--- a/src/translator_cz.h
+++ b/src/translator_cz.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1070,7 +1070,7 @@ class TranslatorCzech : public Translator
         "};\n"
         "\\endcode\n"
         "K výše uvedenému bude vygenerován následující graf:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "Bloky (tj. uzly) v uvedeném grafu mají následující význam:\n"
         "<ul>\n"
diff --git a/src/translator_de.h b/src/translator_de.h
index d936bf1..f2ca676 100644
--- a/src/translator_de.h
+++ b/src/translator_de.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1116,7 +1116,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
         "};\n"
         "\\endcode\n"
         "Dies liefert den folgenden Graphen:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n"
         "<p>\n"
         "Die Rechtecke in obigem Graphen bedeuten:\n"
         "</p>\n"
diff --git a/src/translator_dk.h b/src/translator_dk.h
index 74b07f4..9ea5b28 100644
--- a/src/translator_dk.h
+++ b/src/translator_dk.h
@@ -3,7 +3,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -993,7 +993,7 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0
         "\\endcode\n"
         "Hvis \\c MAX_DOT_GRAPH_HEIGHT i konfigurationsfilen "
         "er sat til 240, vil dette resultere i følgende graf:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "De forskellige slags kasser i ovenstående graf har følgende "
 		"betydninger:\n"
diff --git a/src/translator_en.h b/src/translator_en.h
index 5937ed3..ba89726 100644
--- a/src/translator_en.h
+++ b/src/translator_en.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1014,7 +1014,7 @@ class TranslatorEnglish : public Translator
         "};\n"
         "\\endcode\n"
         "This will result in the following graph:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n"
         "<p>\n"
         "The boxes in the above graph have the following meaning:\n"
         "</p>\n"
@@ -1022,7 +1022,7 @@ class TranslatorEnglish : public Translator
         "<li>%A filled gray box represents the struct or class for which the "
         "graph is generated.</li>\n"
         "<li>%A box with a black border denotes a documented struct or class.</li>\n"
-        "<li>%A box with a grey border denotes an undocumented struct or class.</li>\n"
+        "<li>%A box with a gray border denotes an undocumented struct or class.</li>\n"
         "<li>%A box with a red border denotes a documented struct or class for"
         "which not all inheritance/containment relations are shown. %A graph is "
         "truncated if it does not fit within the specified boundaries.</li>\n"
diff --git a/src/translator_eo.h b/src/translator_eo.h
index e1513cb..65f7e82 100644
--- a/src/translator_eo.h
+++ b/src/translator_eo.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1017,7 +1017,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4
         "};\n"
         "\\endcode\n"
         "Tio ĉi liveros la sekvan diagramon:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "La skatoloj de la supra diagramo havas la sekvajn signifojn:\n"
         "<ul>\n"
diff --git a/src/translator_es.h b/src/translator_es.h
index ba6e823..97d1d26 100644
--- a/src/translator_es.h
+++ b/src/translator_es.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1045,7 +1045,7 @@ class TranslatorSpanish : public Translator
         "};\n"
         "\\endcode\n"
         "Dará como resultado el siguiente gráfico:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n"
         "<p>\n"
         "Las cajas en el gráfico arriba tienen el siguiente significado:\n"
         "</p>\n"
diff --git a/src/translator_fa.h b/src/translator_fa.h
index 7b6f9d7..7effafe 100644
--- a/src/translator_fa.h
+++ b/src/translator_fa.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1015,14 +1015,14 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
         "\\endcode\n"
         "If the \\c MAX_DOT_GRAPH_HEIGHT tag in the configuration file "
         "is set to 240 this will result in the following graph:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "The boxes in the above graph have the following meaning:\n"
         "<ul>\n"
         "<li>%A filled black box represents the struct or class for which the "
         "graph is generated.\n"
         "<li>%A box with a black border denotes a documented struct or class.\n"
-        "<li>%A box with a grey border denotes an undocumented struct or class.\n"
+        "<li>%A box with a gray border denotes an undocumented struct or class.\n"
         "<li>%A box with a red border denotes a documented struct or class for"
         "which not all inheritance/containment relations are shown. %A graph is "
         "truncated if it does not fit within the specified boundaries.\n"
diff --git a/src/translator_fi.h b/src/translator_fi.h
index eeeb9a5..8343cdd 100644
--- a/src/translator_fi.h
+++ b/src/translator_fi.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1101,7 +1101,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
         "{\n"
         "  private:\n"
         "    Kaytetty *m_kaytettyLuokka;\n"
-        "}\n";
+        "}\n"
         // "class Inherited : public PublicBase,\n"
         // "                  protected ProtectedBase,\n"
         // "                  private PrivateBase,\n"
@@ -1114,7 +1114,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
         "\\endcode\n"
         "Tuloksena on seuraavanlainen kaavio:"
         //"This will result in the following graph:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "Ylläolevassa kaaviossa laatikoilla on seuraavat merkitykset\n:"
         // "The boxes in the above graph have the following meaning:\n"
diff --git a/src/translator_fr.h b/src/translator_fr.h
index 2c548c2..e1fb5e6 100644
--- a/src/translator_fr.h
+++ b/src/translator_fr.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1077,7 +1077,7 @@ class TranslatorFrench : public Translator
             "};\n"
             "\\endcode\n"
             "Cela aboutira au graphe suivant :"
-            "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n"
+            "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n"
             "<p>\n"
             "Les rectangles du graphe ci-dessus ont la signification suivante :\n"
             "<ul>\n"
@@ -2057,4 +2057,4 @@ class TranslatorFrench : public Translator
 
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/translator_gr.h b/src/translator_gr.h
index fa7a682..e264deb 100644
--- a/src/translator_gr.h
+++ b/src/translator_gr.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -987,7 +987,7 @@ class TranslatorGreek : public TranslatorAdapter_1_8_4
         "};\n"
         "\\endcode\n"
         "Αυτό οδηγεί στο επόμενο διάγραμμα:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n"
         "<p>\n"
         "Τα κουτιά στο παραπάνω διάγραμμα έχουν την ακόλουθη σημασία:\n"
         "</p>\n"
diff --git a/src/translator_hr.h b/src/translator_hr.h
index 98a746a..cfefa32 100644
--- a/src/translator_hr.h
+++ b/src/translator_hr.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -753,7 +753,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
         "};\n"
         "\\endcode\n"
         "To će rezultirati grafikonom:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "Pravokutnici imaju slijedeće značenje:\n"
         "<ul>\n"
diff --git a/src/translator_hu.h b/src/translator_hu.h
index 610af8e..4bf3f71 100644
--- a/src/translator_hu.h
+++ b/src/translator_hu.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -997,7 +997,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6
         "\\endcode\n"
         "Ha a konfigurációs fájl \\c MAX_DOT_GRAPH_HEIGHT elemének értékét "
         "240-re állítjuk, az eredmény a következő ábra lesz:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "Az ábrán levő dobozok jelentése:\n"
         "<ul>\n"
diff --git a/src/translator_id.h b/src/translator_id.h
index 5647bc0..c5c58fa 100644
--- a/src/translator_id.h
+++ b/src/translator_id.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1001,7 +1001,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
         "\\endcode\n"
         "Apabila tag \\c MAX_DOT_GRAPH_HEIGHT di file konfigurasi "
         "diset ke 240 kode di atas akan menghasilkan bagan berikut:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "Kotak-kotak pada bagan di atas mempunyai arti sebagai berikut:\n"
         "<ul>\n"
diff --git a/src/translator_it.h b/src/translator_it.h
index 59799a3..c52aa50 100644
--- a/src/translator_it.h
+++ b/src/translator_it.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1028,7 +1028,7 @@ class TranslatorItalian : public TranslatorAdapter_1_8_2
         "};\n"
         "\\endcode\n"
         "Verrà prodotto il grafo seguente:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n"
         "<p>\n"
         "I riquadri nel grafo qui sopra hanno il seguente significato:\n"
         "</p>\n"
diff --git a/src/translator_je.h b/src/translator_je.h
index 4dbcb4e..835a516 100644
--- a/src/translator_je.h
+++ b/src/translator_je.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
diff --git a/src/translator_jp.h b/src/translator_jp.h
index ae3605a..66f1ac6 100644
--- a/src/translator_jp.h
+++ b/src/translator_jp.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1037,7 +1037,7 @@ class TranslatorJapanese : public Translator
         "\\c MAX_DOT_GRAPH_" /* わざわざちょん切っているのは doc/translator.py の検出回避のため */
         "HEIGHT タグに 200 を与えた設定ファイル"
         "を使うと、次のようなグラフとなります。"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "グラフ内の矩形は構造体やクラスを表しています。色の意味は次の通りです。\n"
         "<ul>\n"
diff --git a/src/translator_ke.h b/src/translator_ke.h
index 56a70b3..525cf84 100644
--- a/src/translator_ke.h
+++ b/src/translator_ke.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
diff --git a/src/translator_kr.h b/src/translator_kr.h
index 18337a5..7d669a5 100644
--- a/src/translator_kr.h
+++ b/src/translator_kr.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1035,7 +1035,7 @@ class TranslatorKorean : public Translator
         "};\n"
         "\\endcode\n"
         "다음과 같은 그래프가 출력될 것입니다. :"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "위 그래프의 박스들은 다음과 같은 의미를 가집니다. :\n"
         "<ul>\n"
diff --git a/src/translator_lt.h b/src/translator_lt.h
index 174170e..faf4197 100644
--- a/src/translator_lt.h
+++ b/src/translator_lt.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1006,14 +1006,14 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6
         "\\endcode\n"
         "If the \\c MAX_DOT_GRAPH_HEIGHT tag in the configuration file "
         "is set to 240 this will result in the following graph:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "The boxes in the above graph have the following meaning:\n"
         "<ul>\n"
         "<li>%A filled black box represents the struct or class for which the "
         "graph is generated.\n"
         "<li>%A box with a black border denotes a documented struct or class.\n"
-        "<li>%A box with a grey border denotes an undocumented struct or class.\n"
+        "<li>%A box with a gray border denotes an undocumented struct or class.\n"
         "<li>%A box with a red border denotes a documented struct or class for"
         "which not all inheritance/containment relations are shown. %A graph is "
         "truncated if it does not fit within the specified boundaries.\n"
diff --git a/src/translator_lv.h b/src/translator_lv.h
index 135cd11..20b2a38 100644
--- a/src/translator_lv.h
+++ b/src/translator_lv.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1020,7 +1020,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4
         "};\n"
         "\\endcode\n"
         "This will result in the following graph:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n"
         "<p>\n"
         "The boxes in the above graph have the following meaning:\n"
         "</p>\n"
@@ -1028,7 +1028,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4
         "<li>%A filled gray box represents the struct or class for which the "
         "graph is generated.</li>\n"
         "<li>%A box with a black border denotes a documented struct or class.</li>\n"
-        "<li>%A box with a grey border denotes an undocumented struct or class.</li>\n"
+        "<li>%A box with a gray border denotes an undocumented struct or class.</li>\n"
         "<li>%A box with a red border denotes a documented struct or class for"
         "which not all inheritance/containment relations are shown. %A graph is "
         "truncated if it does not fit within the specified boundaries.</li>\n"
diff --git a/src/translator_mk.h b/src/translator_mk.h
index 510561e..d963dfc 100644
--- a/src/translator_mk.h
+++ b/src/translator_mk.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1003,7 +1003,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
         "\\endcode\n"
         "Ако вредноста на \\c MAX_DOT_GRAPH_HEIGHT во конфигурациската датотека "
         "е 240 тогаш примерот ќе го создаде следниов дијаграм:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "Правоаголниците во дијаграмот погоре го имаат следново значење:\n"
         "<ul>\n"
diff --git a/src/translator_nl.h b/src/translator_nl.h
index 2ffacb6..ab811a5 100644
--- a/src/translator_nl.h
+++ b/src/translator_nl.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -656,7 +656,7 @@ class TranslatorDutch : public Translator
         "};\n"
         "\\endcode\n"
         "Dit voorbeeld zal resulteren in de volgende graaf:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "De rechthoeken in the bovenstaande graaf hebben de volgende betekenis:\n"
         "<ul>\n"
diff --git a/src/translator_no.h b/src/translator_no.h
index 2662e47..40d3287 100644
--- a/src/translator_no.h
+++ b/src/translator_no.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1048,7 +1048,7 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6
         "\\endcode\n"
         "Hvis \\c MAX_DOT_GRAPH_HEIGHT er satt til 200 i "
         "konfigurasjonsfila vil dette resultere i følgende graf:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "Boksene i grafen over betyr følgende:\n"
         "<ul>\n"
diff --git a/src/translator_pl.h b/src/translator_pl.h
index 6f2e14c..f1bec57 100644
--- a/src/translator_pl.h
+++ b/src/translator_pl.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1012,7 +1012,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
         "};\n"
         "\\endcode\n"
         "Rezultat na następującym wykresie:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n"
         "<p>\n"
         "Prostokąty w powyższym wykresie mają następujące znaczenie:\n"
         "</p>\n"
diff --git a/src/translator_pt.h b/src/translator_pt.h
index 13422f6..5edfdf6 100644
--- a/src/translator_pt.h
+++ b/src/translator_pt.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright (C) 1997-2013 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1016,7 +1016,7 @@ class TranslatorPortuguese : public Translator
         "};\n"
         "\\endcode\n"
         "Isto irá gerar o seguinte gráfo:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "As caixas no grafo anterior têm as seguintes interpretações:\n"
         "<ul>\n"
diff --git a/src/translator_ro.h b/src/translator_ro.h
index ea0988d..394e570 100644
--- a/src/translator_ro.h
+++ b/src/translator_ro.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1031,7 +1031,7 @@ class TranslatorRomanian : public Translator
         "\\endcode\n"
         "Dacă tagul \\c MAX_DOT_GRAPH_HEIGHT din fişierul de configurare "
         "este setat la 200, acesta este graful rezultat:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "Căsuţele din partea de sus au următoarea semnificaţie:\n"
         "<ul>\n"
diff --git a/src/translator_ru.h b/src/translator_ru.h
index c06d911..c06027c 100644
--- a/src/translator_ru.h
+++ b/src/translator_ru.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1004,7 +1004,7 @@ class TranslatorRussian : public Translator
         "\\endcode\n"
         "Если \\c MAX_DOT_GRAPH_HEIGHT в конфигурационном файле "
         "установлен в 240, получится следующий граф:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "Прямоугольники в этом графе имеют следующее значение:\n"
         "<ul>\n"
diff --git a/src/translator_sc.h b/src/translator_sc.h
index 84e8756..388af8c 100644
--- a/src/translator_sc.h
+++ b/src/translator_sc.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1033,7 +1033,7 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0
         "\\endcode\n"
         "Ако је \\c MAX_DOT_GRAPH_HEIGHT таг у конфигурационој датотеци "
         "подешен на 240, то ће резултовати на следећи начин:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "Правоугаоници имају следеће значење:\n"
         "<ul>\n"
diff --git a/src/translator_si.h b/src/translator_si.h
index 33bc27a..97a1931 100644
--- a/src/translator_si.h
+++ b/src/translator_si.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -684,14 +684,14 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
         "\\endcode\n"
         "If the \\c MAX_DOT_GRAPH_HEIGHT tag in the configuration file "
         "is set to 200 this will result in the following graph:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "The boxes in the above graph have the following meaning:\n"
         "<ul>\n"
         "<li>%A filled black box represents the struct or class for which the "
         "graph is generated.\n"
         "<li>%A box with a black border denotes a documented struct or class.\n"
-        "<li>%A box with a grey border denotes an undocumented struct or class.\n"
+        "<li>%A box with a gray border denotes an undocumented struct or class.\n"
         "<li>%A box with a red border denotes a documented struct or class for\n"
         "which not all inheritance/containment relations are shown. %A graph is "
         "truncated if it does not fit within the specified boundaries."
diff --git a/src/translator_sk.h b/src/translator_sk.h
index 0fc826b..875e92c 100644
--- a/src/translator_sk.h
+++ b/src/translator_sk.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1004,7 +1004,7 @@ class TranslatorSlovak : public Translator
         "};\n"
         "\\endcode\n"
         "K vyššie uvedenému bude vygenerovaný nasledujúci graf:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "Bloky (tj. uzly) v uvedenom grafe majú nasledujúci význam:\n"
         "<ul>\n"
diff --git a/src/translator_sr.h b/src/translator_sr.h
index 09b6534..05e8018 100644
--- a/src/translator_sr.h
+++ b/src/translator_sr.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1001,7 +1001,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
         "\\endcode\n"
         "Ako je \\c MAX_DOT_GRAPH_HEIGHT tag u konfiguracionoj datoteci "
         "postavljen na \\c 200 graf izvođenja će izgledati ovako:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "Graf će biti odsečen ako ne stane unutar zadatih granica.\n"
         "<p>\n"
         "Pravougaonici imaju sledeća značenja:\n"
diff --git a/src/translator_sv.h b/src/translator_sv.h
index f4d0a35..68b8a1b 100644
--- a/src/translator_sv.h
+++ b/src/translator_sv.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 @@ Problem!
    Deprecated: nån hygglig svensk översättning???
 
    Skicka gärna synpunkter.
+2015/01/09
+* Uppdaterat den till senaste versionen 1.8.9.1
 */
 
 #ifndef TRANSLATOR_SE_H
@@ -491,8 +493,8 @@ class TranslatorSwedish : public Translator
         case ClassDef::Struct: result+=" strukt"; break;
         case ClassDef::Union:  result+=" union"; break;
         case ClassDef::Interface:  result+=" gränssnitt"; break;
-        case ClassDef::Protocol:   result+=" protocol"; break; // translate me!
-        case ClassDef::Category:   result+=" category"; break; // translate me!
+        case ClassDef::Protocol:   result+=" protokoll"; break;
+        case ClassDef::Category:   result+=" kategori"; break;
         case ClassDef::Exception:  result+=" undantag"; break;
         default: break;
       }
@@ -633,8 +635,8 @@ class TranslatorSwedish : public Translator
         case ClassDef::Struct:     result+="denna strukt "; break;
         case ClassDef::Union:      result+="denna union "; break;
         case ClassDef::Interface:  result+="detta gränssnitt "; break;
-        case ClassDef::Protocol:   result+="protocol"; break; // translate me!
-        case ClassDef::Category:   result+="category"; break; // translate me!
+        case ClassDef::Protocol:   result+="detta protokoll"; break;
+        case ClassDef::Category:   result+="denna kategori"; break;
         case ClassDef::Exception:  result+="detta undantag "; break;
         default: break;
       }
@@ -877,9 +879,9 @@ class TranslatorSwedish : public Translator
         "genererar.<p>\n"
         "Tag följande exempel:\n"
         "\\code\n"
-	"/*! Osynlig klass på grund av stympning */\n"
+	"/*! Osynlig klass på grund av trunkering */\n"
         "class Invisible { };\n\n"
-	"/*! Stympad klass, ärvningsrelationen är dold */\n"
+	"/*! Trunkerad klass, ärvningsrelationen är dold */\n"
         "class Truncated : public Invisible { };\n\n"
 	"/* Klass utan doxygen-kommentarer */\n"
         "class Undocumented { };\n\n"
@@ -904,34 +906,33 @@ class TranslatorSwedish : public Translator
         "    Used *m_usedClass;\n"
         "};\n"
         "\\endcode\n"
-	"Om \\c MAX_DOT_GRAPH_HEIGHT är satt till 240 i konfigurationsfilen, "
-	"kommer följande graf att generas:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+	"Detta resulterar i att följande graf genereras:"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n"
         "<p>\n"
 	"Rektanglarna i den ovanstående grafen har följande betydelser:\n"
         "<ul>\n"
-	"<li>%En fylld svart rektangel representerar den strukt eller klass "
-	"som har genererat grafen.\n"
-	"<li>%En rektangel med svart kant symboliserar en dokumenterad "
-	"strukt eller klass.\n"
-	"<li>%En rektangel med grå kant symboliserar en odokumenterad strukt "
-	"eller klass.\n"
+	"<li>%En fylld grå rektangel representerar den strukt eller klass "
+	"som har genererat grafen.</li>\n"
+	"<li>%En rektangel med svart kant symboliserar en dokumenterad strukt eller klass.</li>\n"
+	"<li>%En rektangel med grå kant symboliserar en odokumenterad strukt eller klass.</li>\n"
 	"<li>%En klass med röd kant symboliserar en strukt eller klass där "
-	"alla dess relationer inte visas. %En graf stympas om den inte får "
-	"plats inom de givna gränserna.\n"
+	"alla dess relationer inte visas. %En graf trunkeras om den inte får "
+	"plats inom de givna gränserna.</li>\n"
         "</ul>\n"
+        "<p>\n"
 	"Pilarna har följande betydelser:\n"
+        "</p>\n"
         "<ul>\n"
 	"<li>%En mörkblå pil används för att visualisera en publik arvrelation "
-	"mellan två klasser.\n"
-	"<li>%En mörkgrön pil används för en skyddad arvsrelation.\n"
-	"<li>%En mörkröd pil används för en privat arvsrelation.\n"
+	"mellan två klasser.</li>\n"
+	"<li>%En mörkgrön pil används för en skyddad arvsrelation.</li>\n"
+	"<li>%En mörkröd pil används för en privat arvsrelation.\n</li>"
 	"<li>%En sträckad lila pil används om en klass är innesluten eller "
 	"använd av en annan klass. Vid pilen står namnet på den eller de "
-	"variabler som klassen pilen pekar på kommer åt.\n"
+	"variabler som klassen pilen pekar på kommer åt.</li>\n"
 	"<li>%En sträckad gul pil symboliserar förhållandet mellan en "
 	"template-instans och template-klassen, som den instantierades från.\n"
-	"Vid pilen står instansens template-parametrar.\n"
+	"Vid pilen står instansens template-parametrar.</li>\n"
         "</ul>\n";
     }
 
@@ -1719,7 +1720,7 @@ class TranslatorSwedish : public Translator
 
     /*! Used in dot graph when UML_LOOK is enabled and there are many fields */
     virtual QCString trAndMore(const QCString &number)
-    { return "och "+number+" mera..."; }
+    { return "och "+number+" flera..."; }
 
     /*! Used file list for a Java enum */
     virtual QCString trEnumGeneratedFromFiles(bool single)
diff --git a/src/translator_tr.h b/src/translator_tr.h
index 56b4a19..26ae08f 100644
--- a/src/translator_tr.h
+++ b/src/translator_tr.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1016,7 +1016,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
         "};\n"
         "\\endcode\n"
         "Bu kod aşağıdaki şemayı oluşturur:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "Yukarıdaki şemadaki kutular aşağıda açıklanmıştır:\n"
         "<ul>\n"
diff --git a/src/translator_tw.h b/src/translator_tw.h
index 9da3365..e61ab5c 100644
--- a/src/translator_tw.h
+++ b/src/translator_tw.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -749,7 +749,8 @@ class TranslatorChinesetraditional : public Translator
     /*! This is put at the bottom of a class documentation page and is
      *  followed by a list of files that were used to generate the page.
      */
-    virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType,bool)
+    virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType,
+        bool single)
     { // here s is one of " Class", " Struct" or " Union"
       // single is true implies a single file
       QCString result=(QCString)"此";
@@ -765,7 +766,7 @@ class TranslatorChinesetraditional : public Translator
         default: break;
       }
       result+=" 文件是由下列檔案中產生";
-      result+=":";
+      if (single) result+=":"; else result+=":";
       return result;
     }
 
@@ -993,7 +994,7 @@ class TranslatorChinesetraditional : public Translator
         ".<p>\n"
         "請看下面範例:\n"
         "\\code\n"
-        "/*! 因為截斷的不可見類別 */\n"
+        "/*! 因為截斷而造成的不可見類別 */\n"
         "class Invisible { };\n\n"
         "/*! 截斷的類別, 繼承關係被隱藏 */\n"
         "class Truncated : public Invisible { };\n\n"
@@ -1020,32 +1021,32 @@ class TranslatorChinesetraditional : public Translator
         "    Used *m_usedClass;\n"
         "};\n"
         "\\endcode\n"
-        "若在組態檔中的 \\c MAX_DOT_GRAPH_HEIGHT tag "
-        "設為 240，將會產生下列的圖示:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "這個例子會產生下列的圖示:"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n"
         "<p>\n"
         "上圖中的各區塊意義如下:\n"
+        "</p>\n"
         "<ul>\n"
         "<li>%A 填滿黑色的區塊代表產生這個圖示的類別或結構 "
         ".\n"
-        "<li>%A 黑邊的區塊代表文件化過的結構或類別.\n"
-        "<li>%A 灰邊的區塊代表未經文件化的結構或是類別.\n"
+        "<li>%A 黑邊的區塊代表文件化過的結構或類別.</li>\n"
+        "<li>%A 灰邊的區塊代表未經文件化的結構或是類別.</li>\n"
         "<li>%A 紅邊的區塊代表文件化的結構或是類別，"
         "這些結構或類別的繼承或包含關係不會全部顯示. %A 圖示 "
-        "若無法塞入指定的邊界中將會被截斷.\n"
+        "若無法塞入指定的邊界中將會被截斷.</li>\n"
         "</ul>\n"
+        "<p>\n"
         "箭頭具有下面的意義:\n"
+        "</p>\n"
         "<ul>\n"
         "<li>%A 深藍色箭頭用來代表兩個類別間的公開繼承 "
         "關係.\n"
-        "<li>%A 深綠色箭頭代表保護繼承.\n"
-        "<li>%A 深紅色箭頭代表私有繼承.\n"
+        "<li>%A 深綠色箭頭代表保護繼承。</li>\n"
+        "<li>%A 深紅色箭頭代表私有繼承。</li>\n"
         "<li>%A 紫色箭頭用來表示類別被另一個包含或是使用."
-        "箭頭上標示著可存取該類別或是結構的對應變數"
-        ".\n"
+        "箭頭上標示著可存取該類別或是結構的對應變數。</li>\n"
         "<li>%A 黃色箭頭代表樣版實體與樣版類別之間的關係。"
-        "箭頭上標記著樣版實體上的參數"
-        ".\n"
+        "箭頭上標記著樣版實體上的參數。</li>\n"
         "</ul>\n";
     }
     /*! text for the link to the legend page */
@@ -1947,21 +1948,21 @@ class TranslatorChinesetraditional : public Translator
       return result;
     }
     /** UNO IDL service page */
-    virtual QCString trServiceGeneratedFromFiles(bool)
+    virtual QCString trServiceGeneratedFromFiles(bool single)
     {
       // single is true implies a single file
       QCString result=(QCString)"本服務的文件由以下的檔案"
                                 "所產生";
-      result+=":";
+      if (single) result+=":"; else result+=":";
       return result;
     }
     /** UNO IDL singleton page */
-    virtual QCString trSingletonGeneratedFromFiles(bool)
+    virtual QCString trSingletonGeneratedFromFiles(bool single)
     {
       // single is true implies a single file
       QCString result=(QCString)"本singleton的文件由下面的檔案"
                                 "所產生";
-      result+=":";
+      if (single) result+=":"; else result+=":";
       return result;
     }
 
diff --git a/src/translator_ua.h b/src/translator_ua.h
index 45efd6e..871acd1 100644
--- a/src/translator_ua.h
+++ b/src/translator_ua.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -993,7 +993,7 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4
         "};\n"
         "\\endcode\n"
         "Таким чином, отримуємо наступний граф:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "Прямокутники в цьому графі мають наступний зміст:\n"
         "<ul>\n"
diff --git a/src/translator_vi.h b/src/translator_vi.h
index dd0a8f1..b2bbdd7 100644
--- a/src/translator_vi.h
+++ b/src/translator_vi.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1021,7 +1021,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
         "};\n"
         "\\endcode\n"
         "Kết quả trong biểu đồ sau đây:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "Các hộp trong biểu đồ trên có ý nghĩa như sau:\n"
         "<ul>\n"
diff --git a/src/translator_za.h b/src/translator_za.h
index f47052e..ca94e7a 100644
--- a/src/translator_za.h
+++ b/src/translator_za.h
@@ -2,7 +2,7 @@
  *
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -1002,7 +1002,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
         "\\endcode\n"
         "As die \\c MAX_DOT_GRAPH_HEIGHT merker in die konfigurasie leër "
         "aan 240 gelyk gestel is, word die volgende diagram geproduseer:"
-        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
         "<p>\n"
         "Die reghoeke in die diagram het die volgende betekenis:\n"
         "<ul>\n"
diff --git a/src/types.h b/src/types.h
index 688d664..f6c704c 100644
--- a/src/types.h
+++ b/src/types.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/util.cpp b/src/util.cpp
index 000de53..3ee7ae5 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -1448,7 +1448,7 @@ static ClassDef *getResolvedClassRec(Definition *scope,
   // below is a more efficient coding of
   // QCString key=scope->name()+"+"+name+"+"+explicitScopePart;
   QCString key(scopeNameLen+nameLen+explicitPartLen+fileScopeLen+1);
-  char *p=key.data();
+  char *p=key.rawData();
   qstrcpy(p,scope->name()); *(p+scopeNameLen-1)='+';
   p+=scopeNameLen;
   qstrcpy(p,name); *(p+nameLen-1)='+';
@@ -1724,7 +1724,7 @@ nextChar:
       growBuf.addChar(' ');
     }
     else if (i>0 && c=='>' && // current char is a >
-        (isId(s.at(i-1)) || isspace((uchar)s.at(i-1)) || s.at(i-1)=='*' || s.at(i-1)=='&') && // prev char is an id char or space
+        (isId(s.at(i-1)) || isspace((uchar)s.at(i-1)) || s.at(i-1)=='*' || s.at(i-1)=='&' || s.at(i-1)=='.') && // prev char is an id char or space
         (i<8 || !findOperator(s,i)) // string in front is not "operator"
         )
     {
@@ -1741,9 +1741,11 @@ nextChar:
     }
     else if (i>0 &&
          (
-          (s.at(i-1)==')' && isId(c))
+          (s.at(i-1)==')' && isId(c)) // ")id" -> ") id"
           ||
-          (c=='\''  && s.at(i-1)==' ')
+          (c=='\''  && s.at(i-1)==' ')  // "'id" -> "' id"
+          ||
+          (i>1 && s.at(i-2)==' ' && s.at(i-1)==' ') // "  id" -> " id"
          )
         )
     {
@@ -2223,12 +2225,21 @@ QCString tempArgListToString(ArgumentList *al,SrcLangExt lang)
       if (i>0)
       {
         result+=a->type.right(a->type.length()-i-1);
+        if (a->type.find("...")!=-1)
+        {
+          result+="...";
+        }
       }
       else // nothing found -> take whole name
       {
         result+=a->type;
       }
     }
+    if (!a->typeConstraint.isEmpty() && lang==SrcLangExt_Java)
+    {
+      result+=" extends "; // TODO: now Java specific, C# has where...
+      result+=a->typeConstraint;
+    }
     ++ali;
     a=ali.current();
     if (a) result+=", ";
@@ -2379,8 +2390,8 @@ QCString transcodeCharacterStringToUTF8(const QCString &input)
   {
     size_t iLeft=inputSize;
     size_t oLeft=outputSize;
-    char *inputPtr = input.data();
-    char *outputPtr = output.data();
+    char *inputPtr = input.rawData();
+    char *outputPtr = output.rawData();
     if (!portable_iconv(cd, &inputPtr, &iLeft, &outputPtr, &oLeft))
     {
       outputSize-=(int)oLeft;
@@ -2418,12 +2429,12 @@ QCString fileToString(const char *name,bool filter,bool isSourceCode)
       QCString contents(bSize);
       int totalSize=0;
       int size;
-      while ((size=f.readBlock(contents.data()+totalSize,bSize))==bSize)
+      while ((size=f.readBlock(contents.rawData()+totalSize,bSize))==bSize)
       {
         totalSize+=bSize;
-        contents.resize(totalSize+bSize); 
+        contents.resize(totalSize+bSize);
       }
-      totalSize = filterCRLF(contents.data(),totalSize+size)+2;
+      totalSize = filterCRLF(contents.rawData(),totalSize+size)+2;
       contents.resize(totalSize);
       contents.at(totalSize-2)='\n'; // to help the scanner
       contents.at(totalSize-1)='\0';
@@ -3317,7 +3328,7 @@ static QCString getCanonicalTypeForIdentifier(
 {
   if (count>10) return word; // oops recursion
 
-  QCString symName,scope,result,templSpec,tmpName;
+  QCString symName,result,templSpec,tmpName;
   //DefinitionList *defList=0;
   if (tSpec && !tSpec->isEmpty()) 
     templSpec = stripDeclKeywords(getCanonicalTemplateSpec(d,fs,*tSpec));
@@ -4111,8 +4122,6 @@ bool getDefs(const QCString &scName,
 
       if (!args) break;
 
-      QCString className = mmd->getClassDef()->name();
-
       ArgumentList *mmdAl = mmd->argumentList();
       if (matchArguments2(mmd->getOuterScope(),mmd->getFileDef(),mmdAl,
             Doxygen::globalScope,mmd->getFileDef(),argList,
@@ -5060,7 +5069,7 @@ QCString substitute(const QCString &s,const QCString &src,const QCString &dst)
   }
   QCString result(resLen+1);
   char *r;
-  for (r=result.data(), p=s; (q=strstr(p,src))!=0; p=q+srcLen)
+  for (r=result.rawData(), p=s; (q=strstr(p,src))!=0; p=q+srcLen)
   {
     int l = (int)(q-p);
     memcpy(r,p,l);
@@ -5231,6 +5240,7 @@ QCString escapeCharsInString(const char *name,bool allowDots,bool allowUnderscor
       case '=': growBuf.addStr("_0A"); break;
       case '$': growBuf.addStr("_0B"); break;
       case '\\': growBuf.addStr("_0C"); break;
+      case '@': growBuf.addStr("_0D"); break;
       default: 
                 if (c<0)
                 {
@@ -5340,7 +5350,7 @@ QCString convertNameToFile(const char *name,bool allowDots,bool allowUnderscore)
       uchar md5_sig[16];
       QCString sigStr(33);
       MD5Buffer((const unsigned char *)result.data(),resultLen,md5_sig);
-      MD5SigToString(md5_sig,sigStr.data(),33);
+      MD5SigToString(md5_sig,sigStr.rawData(),33);
       result=result.left(128-32)+sigStr; 
     }
   }
@@ -6454,6 +6464,8 @@ void filterLatexString(FTextStream &t,const char *str,
   //printf("filterLatexString(%s)\n",str);
   //if (strlen(str)<2) stackTrace();
   const unsigned char *p=(const unsigned char *)str;
+  const unsigned char *q;
+  int cnt;
   unsigned char c;
   unsigned char pc='\0';
   while (*p)
@@ -6480,7 +6492,35 @@ void filterLatexString(FTextStream &t,const char *str,
         case '$':  t << "\\$";           break;
         case '%':  t << "\\%";           break;
         case '^':  t << "$^\\wedge$";    break;
-        case '&':  t << "\\&";           break;
+        case '&':  // possibility to have a special symbol
+                   q = p;
+                   cnt = 2; // we have to count & and ; as well
+                   while ((*q >= 'a' && *q <= 'z') || (*q >= 'A' && *q <= 'Z') || (*q >= '0' && *q <= '9'))
+                   {
+                     cnt++;
+                     q++;
+                   }
+                   if (*q == ';')
+                   {
+                      --p; // we need & as well
+                      DocSymbol::SymType res = HtmlEntityMapper::instance()->name2sym(QCString((char *)p).left(cnt));
+                      if (res == DocSymbol::Sym_Unknown)
+                      {
+                        p++;
+                        t << "\\&";
+                      }
+                      else
+                      {
+                        t << HtmlEntityMapper::instance()->latex(res);
+                        q++;
+                        p = q;
+                      }
+                   }
+                   else
+                   {
+                     t << "\\&";
+                   }
+                   break;
         case '*':  t << "$\\ast$";       break;
         case '_':  if (!insideTabbing) t << "\\+";  
                    t << "\\_"; 
@@ -6550,7 +6590,7 @@ QCString rtfFormatBmkStr(const char *name)
     g_tagDict.insert( key, tag );
 
     // This is the increment part
-    char* nxtTag = g_nextTag.data() + g_nextTag.length() - 1;
+    char* nxtTag = g_nextTag.rawData() + g_nextTag.length() - 1;
     for ( unsigned int i = 0; i < g_nextTag.length(); ++i, --nxtTag )
     {
       if ( ( ++(*nxtTag) ) > 'Z' )
@@ -6742,7 +6782,7 @@ g_lang2extMap[] =
   { "fortranfree", "fortranfree",   SrcLangExt_Fortran  },
   { "fortranfixed", "fortranfixed", SrcLangExt_Fortran  },
   { "vhdl",        "vhdl",          SrcLangExt_VHDL     },
-  { "dbusxml",     "dbusxml",       SrcLangExt_XML      },
+  { "xml",         "xml",           SrcLangExt_XML      },
   { "tcl",         "tcl",           SrcLangExt_Tcl      },
   { "md",          "md",            SrcLangExt_Markdown },
   { 0,             0,              (SrcLangExt)0        }
@@ -6836,8 +6876,11 @@ void initDefaultExtensionMapping()
   updateLanguageMapping(".qsf",      "vhdl");
   updateLanguageMapping(".md",       "md");
   updateLanguageMapping(".markdown", "md");
+}
 
-  //updateLanguageMapping(".xml",   "dbusxml");
+void addCodeOnlyMappings()
+{
+  updateLanguageMapping(".xml",   "xml");
 }
 
 SrcLangExt getLanguageFromFileName(const QCString fileName)
@@ -7482,7 +7525,7 @@ bool readInputFile(const char *fileName,BufStr &inBuf,bool filter,bool isSourceC
   else
   {
     QCString cmd=filterName+" \""+fileName+"\"";
-    Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",cmd.data());
+    Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",qPrint(cmd));
     FILE *f=portable_popen(cmd,"r");
     if (!f)
     {
@@ -7500,7 +7543,7 @@ bool readInputFile(const char *fileName,BufStr &inBuf,bool filter,bool isSourceC
     portable_pclose(f);
     inBuf.at(inBuf.curPos()) ='\0';
     Debug::print(Debug::FilterOutput, 0, "Filter output\n");
-    Debug::print(Debug::FilterOutput,0,"-------------\n%s\n-------------\n",inBuf.data());
+    Debug::print(Debug::FilterOutput,0,"-------------\n%s\n-------------\n",qPrint(inBuf));
   }
 
   int start=0;
@@ -7648,8 +7691,12 @@ QCString externalRef(const QCString &relPath,const QCString &ref,bool href)
       if (!relPath.isEmpty() && l>0 && result.at(0)=='.')
       { // relative path -> prepend relPath.
         result.prepend(relPath);
+        l+=relPath.length();
+      }
+      if (!href){
+        result.prepend("doxygen=\""+ref+":");
+        l+=10+ref.length();
       }
-      if (!href) result.prepend("doxygen=\""+ref+":");
       if (l>0 && result.at(l-1)!='/') result+='/';
       if (!href) result.append("\" ");
     }
@@ -7968,12 +8015,10 @@ void addDocCrossReference(MemberDef *src,MemberDef *dst)
 {
   static bool referencedByRelation = Config_getBool("REFERENCED_BY_RELATION");
   static bool referencesRelation   = Config_getBool("REFERENCES_RELATION");
-  static bool callerGraph          = Config_getBool("CALLER_GRAPH");
-  static bool callGraph            = Config_getBool("CALL_GRAPH");
 
   //printf("--> addDocCrossReference src=%s,dst=%s\n",src->name().data(),dst->name().data());
   if (dst->isTypedef() || dst->isEnumerate()) return; // don't add types
-  if ((referencedByRelation || callerGraph || dst->hasCallerGraph()) && 
+  if ((referencedByRelation || dst->hasCallerGraph()) && 
       src->showInCallGraph()
      )
   {
@@ -7989,7 +8034,7 @@ void addDocCrossReference(MemberDef *src,MemberDef *dst)
       mdDecl->addSourceReferencedBy(src);
     }
   }
-  if ((referencesRelation || callGraph || src->hasCallGraph()) && 
+  if ((referencesRelation || src->hasCallGraph()) && 
       src->showInCallGraph()
      )
   {
@@ -8339,3 +8384,9 @@ bool mainPageHasTitle()
   return TRUE;
 }
 
+QCString getDotImageExtension(void)
+{
+  QCString imgExt      = Config_getEnum("DOT_IMAGE_FORMAT");
+  imgExt = imgExt.replace( QRegExp(":.*"), "" );
+  return imgExt;
+}
diff --git a/src/util.h b/src/util.h
index 937b222..43d8752 100644
--- a/src/util.h
+++ b/src/util.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -376,6 +376,7 @@ QCString stripLeadingAndTrailingEmptyLines(const QCString &s,int &docLine);
 bool updateLanguageMapping(const QCString &extension,const QCString &parser);
 SrcLangExt getLanguageFromFileName(const QCString fileName);
 void initDefaultExtensionMapping();
+void addCodeOnlyMappings();
 
 MemberDef *getMemberFromSymbol(Definition *scope,FileDef *fileScope, 
                                 const char *n);
@@ -443,6 +444,8 @@ bool protectionLevelVisible(Protection prot);
 
 QCString stripIndentation(const QCString &s);
 
+QCString getDotImageExtension(void);
+
 bool fileVisibleInIndex(FileDef *fd,bool &genSourceFile);
 
 void addDocCrossReference(MemberDef *src,MemberDef *dst);
diff --git a/src/version.h b/src/version.h
index b31fe4f..16bf9df 100644
--- a/src/version.h
+++ b/src/version.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/version.py b/src/version.py
index 003cf95..a99ede3 100755
--- a/src/version.py
+++ b/src/version.py
@@ -17,12 +17,15 @@ major = 0
 minor = 0
 revision = 0
 mnt = 'NO'
+configure = '../configure'
+if len(sys.argv) > 2:
+    configure = sys.argv[2]
 #
 # open input file
 #  read file and get relevant information
 # close
 #
-f = open('../configure', 'r')
+f = open(configure, 'r')
 for line in f:
     # check if line can match (saves 3 comparisons)
     if (line.startswith('doxygen_version')):
diff --git a/src/vhdlcode.l b/src/vhdlcode.l
index fa199d1..369ae48 100644
--- a/src/vhdlcode.l
+++ b/src/vhdlcode.l
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -17,7 +17,7 @@
  * written by M. Kreis
  * supports VHDL-87/93/2008
  ******************************************************************************/
-
+%option never-interactive
 %{
 
 /*
@@ -44,8 +44,8 @@
 #include "filedef.h"
 #include "tooltip.h"
 
-#define YY_NEVER_INTERACTIVE 1
 #define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
   
 // Toggle for some debugging info
 //#define DBG_CTX(x) fprintf x
@@ -68,7 +68,6 @@ static bool       g_startCode = FALSE;
 static QCString   g_PrevString;
 static QCString   g_CurrClass;
 static QDict<QCString>g_vhdlKeyDict;   
-static QCString   g_tempClass;
 static QCString   g_tempComp;
 static QCString   g_PortMapComp;
 static MemberDef *g_vhdlMember;
@@ -77,7 +76,6 @@ static QCString   g_FuncProto;
 //-----------------------------------------------------------
   
 static CodeOutputInterface * g_code;
-static QCString      g_curClassName;
 static QCString      g_parmType;
 static QCString      g_parmName;
 static const char *  g_inputString;     //!< the code fragment as text
@@ -90,9 +88,6 @@ static Definition   *g_searchCtx;
 static QCString      g_exampleName;
 static QCString      g_exampleFile;
 
-static QCString      g_type;
-static QCString      g_name;
-static QCString      g_args;
 static QCString      g_classScope;
    
 static QCString      g_CurrScope;
@@ -620,7 +615,7 @@ static void appStringLower(QCString& qcs,const char* text)
 static QCString g_temp;
 
 /* writes and links a port map statement */
-static void codifyMapLines(char *text)
+static void codifyMapLines(const char *text)
 {
   if (text==0) return;
   g_temp.resize(0);       
@@ -628,7 +623,7 @@ static void codifyMapLines(char *text)
   int wordCounter=0;
   QCString ctemp;
   //printf("codifyLines(%d,\"%s\")\n",g_yyLineNr,text);
-  char *p=text; //,*sp=p;
+  const char *p=text; //,*sp=p;
   char c;
   bool done=FALSE;
   while (!done)
@@ -1055,7 +1050,6 @@ XILINX      "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI
 
 
 <ClassesName>{FUNCNAME} {
-                         QDict<QCString> mem;
                          appStringLower(g_PrevString,vhdlcodeYYtext);
                          g_CurrClass.resize(0);
                          g_CurrClass.append(vhdlcodeYYtext);
diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp
index 3f7cd1d..029d0bd 100644
--- a/src/vhdldocgen.cpp
+++ b/src/vhdldocgen.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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
@@ -70,7 +70,6 @@ static QDict<QCString> g_vhdlKeyDict0(17,FALSE);
 static QDict<QCString> g_vhdlKeyDict1(17,FALSE);
 static QDict<QCString> g_vhdlKeyDict2(17,FALSE);
 static QDict<QCString> g_vhdlKeyDict3(17,FALSE);
-static QDict<QCString> g_xilinxUcfDict(17,FALSE);
 
 static void initUCF(Entry* root,const char* type,QCString &  qcs,int line,QCString & fileName,QCString & brief);
 static void writeUCFLink(const MemberDef* mdef,OutputList &ol);
@@ -170,7 +169,6 @@ static void createSVG()
     QCString dir="-o \""+ov+"/vhdl_design_overview.html\"";
     ov+="/vhdl_design.dot";
 
-    QRegExp ep("[\\s]");
     QCString vlargs="-Tsvg \""+ov+"\" "+dir ;
 
     if (portable_system("dot",vlargs)!=0)
@@ -200,7 +198,6 @@ void VhdlDocGen::writeOverview()
   QCString ov =Config_getString("HTML_OUTPUT");
   QCString fileName=ov+"/vhdl_design.dot";
   QFile f(fileName);
-  QStringList qli;
   FTextStream  t(&f);
 
   if (!f.open(IO_WriteOnly))
@@ -502,7 +499,6 @@ static QList<MemberDef>* getPorts(ClassDef *cd)
 
 static void writeTable(QList<MemberDef>* port,FTextStream & t)
 {
-  QCString space(" ");
   MemberDef *md;
   uint len=port->count();
 
@@ -712,7 +708,6 @@ ClassDef *VhdlDocGen::getClass(const char *name)
 ClassDef* VhdlDocGen::getPackageName(const QCString & name)
 {
   ClassDef* cd=0;
-  QStringList ql=QStringList::split(".",name,FALSE);
   cd=getClass(name);
 
   return cd;
@@ -800,12 +795,9 @@ MemberDef* VhdlDocGen::findMember(const QCString& className, const QCString& mem
     if (!packages.contains(ecd)) VhdlDocGen::findAllPackages(ecd);
   }
 
-  uint len=packages.count();
-  for (uint j=0;j<len;j++)
-  {
-    for (QMap<ClassDef*,QList<ClassDef> >::Iterator cList=packages.begin();cList != packages.end();cList++)
-    {
-      if (cList.key()==0) continue;
+ QMap<ClassDef*,QList<ClassDef> >::Iterator cList=packages.find(ecd);
+      if (cList.key()!=0)
+	  {
       QList<ClassDef> mlist=cList.data();
       for (uint j=0;j<mlist.count();j++)
       {
@@ -814,8 +806,7 @@ MemberDef* VhdlDocGen::findMember(const QCString& className, const QCString& mem
         mdef=VhdlDocGen::findMemberDef(mlist.at(j),memName,MemberListType_pubMethods);
         if (mdef) return mdef;
       }
-    }
-  }
+	  }
   return 0;
 
 }//findMember
@@ -1127,7 +1118,6 @@ ClassDef* VhdlDocGen::findArchitecture(const ClassDef *cd)
 void VhdlDocGen::writeVhdlLink(const ClassDef* ccd ,OutputList& ol,QCString& type,QCString& nn,QCString& behav)
 {
   if (ccd==0)  return;
-  QCString temp=ccd->getOutputFileBase();
   ol.startBold();
   ol.docify(type.data());
   ol.endBold();
@@ -1185,7 +1175,6 @@ void VhdlDocGen::parseFuncProto(const char* text,QList<Argument>& qlist,
 
   if ((end-index)>0)
   {
-    QCString tt=s1.mid(index,(end-index+1));
     temp=s1.mid(index+1,(end-index-1));
     //getFuncParams(qlist,temp);
   }
@@ -1820,8 +1809,6 @@ static void setGlobalType(MemberList *ml)
   MemberListIterator mmli(*ml);
   for ( ; (mdd=mmli.current()); ++mmli )
   {
-    QCString l=mdd->typeString();
-
     if (qstrcmp(mdd->argsString(),"package")==0)
     {
  	mdd->setMemberSpecifiers(VhdlDocGen::INSTANTIATION);
@@ -1982,11 +1969,8 @@ void VhdlDocGen::writeVHDLDeclaration(MemberDef* mdef,OutputList &ol,
     ClassDef *cd,NamespaceDef *nd,FileDef *fd,GroupDef *gd,
     bool /*inGroup*/)
 {
-  static QRegExp reg("[%]");
-
   Definition *d=0;
 
-
   ASSERT(cd!=0 || nd!=0 || fd!=0 || gd!=0 ||
       mdef->getMemberSpecifiers()==VhdlDocGen::LIBRARY ||
       mdef->getMemberSpecifiers()==VhdlDocGen::USE
@@ -2228,6 +2212,19 @@ void VhdlDocGen::writeVHDLDeclaration(MemberDef* mdef,OutputList &ol,
       ol.insertMemberAlign();
       VhdlDocGen::formatString(ltype,ol,mdef);
       break;
+    case VhdlDocGen::RECORD:
+    case VhdlDocGen::UNITS:
+      writeLink(mdef,ol);
+      ol.docify(" ");
+      ol.startBold();
+      if (ltype.isEmpty()) {
+          ol.docify(" ");
+      }
+      ol.insertMemberAlign();
+      if (!ltype.isEmpty())
+        VhdlDocGen::formatString(ltype,ol,mdef);
+      ol.endBold();
+      break;
     case VhdlDocGen::TYPE:
       bRec=largs.stripPrefix("record") ;
       bUnit=largs.stripPrefix("units") ;
@@ -2661,7 +2658,6 @@ void VhdlDocGen::parseUCF(const char*  input,  Entry* entity,QCString fileName,b
 {
   QCString ucFile(input);
   int lineNo=0;
-  QCString newLine="\n";
   QCString comment("#!");
   QCString brief;
 
@@ -2717,7 +2713,6 @@ void VhdlDocGen::parseUCF(const char*  input,  Entry* entity,QCString fileName,b
 static void initUCF(Entry* root,const char*  type,QCString &  qcs,int line,QCString & fileName,QCString & brief)
 {
   if (qcs.isEmpty())return;
-  QRegExp sp("\\s");
   QRegExp reg("[\\s=]");
   QCString n;
   // bool bo=(qstricmp(type,qcs.data())==0);
@@ -2810,7 +2805,8 @@ bool VhdlDocGen::findConstraintFile(LayoutNavEntry *lne)
   QCString file;
   QCString co("Constraints");
 
-  if (Config_getBool("HAVE_DOT") && Config_getEnum("DOT_IMAGE_FORMAT")=="svg")
+  QCString imgExt = getDotImageExtension();
+  if (Config_getBool("HAVE_DOT") && imgExt=="svg")
   {
     QCString ov = theTranslator->trDesignOverview();
     QCString ofile("vhdl_design_overview");
@@ -2840,7 +2836,6 @@ QCString  VhdlDocGen::parseForConfig(QCString & entity,QCString & arch)
 {
   int index;
   QCString label;
-  QCString ent("entity");
   if (!entity.contains(":")) return "";
 
   QRegExp exp("[:()\\s]");
@@ -2930,7 +2925,7 @@ void assignBinding(VhdlConfNode * conf)
   QListIterator<Entry> eli(instList);
   Entry *cur=0;
   ClassDef *archClass=0,*entClass=0;
-  QCString archName,entityName;
+  QCString archName;
   QCString arcBind,entBind;
 
   bool others,all;
@@ -2995,7 +2990,7 @@ void assignBinding(VhdlConfNode * conf)
   {
     if (cur->exception.lower()==label || conf->isInlineConf)
     {
-      QCString sign,archy;
+      QCString archy;
 
       if (all || others)
       {
@@ -3997,7 +3992,6 @@ void FlowChart::writeShape(FTextStream &t,const FlowChart* fl)
   }
 
   t<<getNodeName(fl->id).data();
-  QCString q=getNodeType(fl->type);
 
 #ifdef DEBUGFLOW
   QCString qq(getNodeName(fl->id).data());
@@ -4053,7 +4047,6 @@ void FlowChart::writeShape(FTextStream &t,const FlowChart* fl)
   {
     if (fl->text.isEmpty()) return;
     bool var=(fl->type & FlowChart::VARIABLE_NO);
-    QCString repl("<BR ALIGN=\"LEFT\"/>");
     QCString q=fl->text;
 
     if (exit)
diff --git a/src/vhdldocgen.h b/src/vhdldocgen.h
index 7f87ce5..2d1ecf1 100644
--- a/src/vhdldocgen.h
+++ b/src/vhdldocgen.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2013 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp
index 7b0c112..ea43341 100644
--- a/src/vhdljjparser.cpp
+++ b/src/vhdljjparser.cpp
@@ -40,7 +40,7 @@ static int              yyLineNr      = 1;
 static int*             lineParse;
 static int              iDocLine      = -1;
 static QCString         inputString;
-static Entry            gBlock;
+static Entry*           gBlock        = 0;
 static Entry*           previous      = 0;
 //-------------------------------------------------------
 
@@ -102,38 +102,40 @@ Entry* getVhdlCompound()
 void startCodeBlock(int index)
 {
   int ll=strComment.length();
+  if (!gBlock) gBlock = new Entry;
   iCodeLen=inputString.findRev(strComment.data())+ll;
   // fprintf(stderr,"\n startin code..%d %d %d\n",iCodeLen,num_chars,ll);
-  gBlock.reset();
+  gBlock->reset();
   int len=strComment.length();
   QCString name=strComment.right(len-index);//
   name=VhdlDocGen::getIndexWord(name.data(),1);
   if (!name)
-    gBlock.name="misc"+ VhdlDocGen::getRecordNumber();
+    gBlock->name="misc"+ VhdlDocGen::getRecordNumber();
   else
-    gBlock.name=name;
+    gBlock->name=name;
 
-  gBlock.startLine=yyLineNr;
-  gBlock.bodyLine=yyLineNr;
+  gBlock->startLine=yyLineNr;
+  gBlock->bodyLine=yyLineNr;
 
   strComment=strComment.left(index);
   VhdlDocGen::prepareComment(strComment);
-  gBlock.brief+=strComment;
+  gBlock->brief+=strComment;
 }
 
 void makeInlineDoc(int endCode)
 {
   int len=endCode-iCodeLen;
+  if (!gBlock) gBlock = new Entry;
   QCString par=inputString.mid(iCodeLen,len);
   //fprintf(stderr,"\n inline code: \n<%s>",par.data());
-  gBlock.doc=par;
-  gBlock.inbodyDocs=par;
-  gBlock.section=Entry::VARIABLE_SEC;
-  gBlock.spec=VhdlDocGen::MISCELLANEOUS;
-  gBlock.fileName = yyFileName;
-  gBlock.endBodyLine=yyLineNr-1;
-  gBlock.lang=SrcLangExt_VHDL;
-  Entry *temp=new Entry(gBlock);
+  gBlock->doc=par;
+  gBlock->inbodyDocs=par;
+  gBlock->section=Entry::VARIABLE_SEC;
+  gBlock->spec=VhdlDocGen::MISCELLANEOUS;
+  gBlock->fileName = yyFileName;
+  gBlock->endBodyLine=yyLineNr-1;
+  gBlock->lang=SrcLangExt_VHDL;
+  Entry *temp=new Entry(*gBlock);
   Entry* compound=getVhdlCompound();
 
   if (compound)
@@ -146,7 +148,7 @@ void makeInlineDoc(int endCode)
     VhdlParser::current_root->addSubEntry(temp);
   }
   strComment.resize(0);
-  gBlock.reset();
+  gBlock->reset();
 }// makeInlineDoc
 
 
@@ -396,7 +398,7 @@ void VHDLLanguageScanner::parsePrototype(const char *text)
   varr=TRUE;
 }
 
-void VhdlParser::addCompInst(char *n, char* instName, char* comp,int iLine)
+void VhdlParser::addCompInst(const char *n, const char* instName, const char* comp,int iLine)
 {
   current->spec=VhdlDocGen::INSTANTIATION;
   current->section=Entry::VARIABLE_SEC;
@@ -437,7 +439,6 @@ void VhdlParser::addCompInst(char *n, char* instName, char* comp,int iLine)
 void VhdlParser::addVhdlType(const char *n,int startLine,int section,
     uint64 spec,const char* args,const char* type,Protection prot)
 {
-  static QRegExp reg("[\\s]");
   QCString name(n);
   if (isFuncProcProced() || VhdlDocGen::getFlowMember())  return;
 
@@ -540,7 +541,6 @@ void VhdlParser::pushLabel( QCString &label,QCString & val)
 
  QCString  VhdlParser::popLabel(QCString & q)
 {
-  QCString u=q;
   int i=q.findRev("|");
   if (i<0) return "";
   q = q.left(i);
@@ -550,8 +550,7 @@ void VhdlParser::pushLabel( QCString &label,QCString & val)
 void VhdlParser::addConfigureNode(const char* a,const char*b, bool,bool isLeaf,bool inlineConf)
 {
   VhdlConfNode* co=0;
-  QCString ent,arch,lab;
-  QCString l=genLabels;
+  QCString ent;
   ent=a;
 
   if (b)
@@ -606,7 +605,6 @@ void VhdlParser::addProto(const char *s1,const char *s2,const char *s3,
     const char *s4,const char *s5,const char *s6)
 {
   (void)s5; // avoid unused warning
-  static QRegExp reg("[\\s]");
   QCString name=s2;
   QStringList ql=QStringList::split(",",name,FALSE);
 
diff --git a/src/xmlcode.h b/src/xmlcode.h
new file mode 100644
index 0000000..5a9c78c
--- /dev/null
+++ b/src/xmlcode.h
@@ -0,0 +1,37 @@
+/******************************************************************************
+ *
+ * 
+ *
+ * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
+ *
+ */
+
+
+#ifndef XMLCODE_H
+#define XMLCODE_H
+
+#include "types.h"
+
+class CodeOutputInterface;
+class FileDef;
+class MemberDef;
+class QCString;
+class Definition;
+
+extern void parseXmlCode(CodeOutputInterface &,const char *,const QCString &,
+             bool ,const char *,FileDef *fd,
+	     int startLine,int endLine,bool inlineFragment,
+             MemberDef *memberDef,bool showLineNumbers,Definition *searchCtx,
+             bool collectXRefs);
+extern void resetXmlCodeParserState();
+
+#endif
diff --git a/src/xmlcode.l b/src/xmlcode.l
new file mode 100644
index 0000000..15b5d7e
--- /dev/null
+++ b/src/xmlcode.l
@@ -0,0 +1,413 @@
+/******************************************************************************
+ *
+ * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
+ *
+ */
+/******************************************************************************
+ * Parser for syntax hightlighting and references for XML
+ * written by Weston Thayer
+ ******************************************************************************/
+
+%option never-interactive
+%{
+
+#include <stdio.h>
+
+#include "xmlcode.h"
+
+#include "entry.h"
+#include "doxygen.h"
+#include "outputlist.h"
+#include "util.h"
+#include "membername.h"
+#include "searchindex.h"
+#include "config.h"
+#include "filedef.h"
+#include "tooltip.h"
+
+#define YY_NEVER_INTERACTIVE 1
+#define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
+
+static CodeOutputInterface * g_code;
+static QCString      g_curClassName;
+static QCString      g_parmType;
+static QCString      g_parmName;
+static const char *  g_inputString;     //!< the code fragment as text
+static int           g_inputPosition;   //!< read offset during parsing 
+static int           g_inputLines;      //!< number of line in the code fragment
+static int           g_yyLineNr;        //!< current line number
+static bool          g_needsTermination;
+static Definition   *g_searchCtx;
+
+static QCString      g_exampleName;
+static QCString      g_exampleFile;
+
+static QCString      g_type;
+static QCString      g_name;
+static QCString      g_args;
+static QCString      g_classScope;
+   
+static QCString      g_CurrScope;
+   
+static FileDef *     g_sourceFileDef;
+static Definition *  g_currentDefinition;
+static MemberDef *   g_currentMemberDef;
+static bool          g_includeCodeFragment;
+static const char *  g_currentFontClass;
+
+static void codify(const char* text) 
+{ 
+  g_code->codify(text);
+}
+
+static void setCurrentDoc(const QCString &anchor)
+{
+  if (Doxygen::searchIndex)
+  {
+    if (g_searchCtx)
+    {
+      Doxygen::searchIndex->setCurrentDoc(g_searchCtx,g_searchCtx->anchor(),FALSE);
+    }
+    else
+    {
+      Doxygen::searchIndex->setCurrentDoc(g_sourceFileDef,anchor,TRUE);
+    }
+  }
+}
+
+/*! start a new line of code, inserting a line number if g_sourceFileDef
+ * is TRUE. If a definition starts at the current line, then the line
+ * number is linked to the documentation of that definition.
+ */
+static void startCodeLine()
+{
+  if (g_sourceFileDef)
+  {   
+    Definition *d   = g_sourceFileDef->getSourceDefinition(g_yyLineNr);
+    
+    if (!g_includeCodeFragment && d && d->isLinkableInProject())
+    {
+      g_currentDefinition = d;
+      g_currentMemberDef = g_sourceFileDef->getSourceMember(g_yyLineNr);
+      //g_insideBody = FALSE;
+      g_classScope = d->name().copy();
+      QCString lineAnchor;
+      lineAnchor.sprintf("l%05d",g_yyLineNr);
+      if (g_currentMemberDef)
+      {
+        g_code->writeLineNumber(g_currentMemberDef->getReference(),
+                            g_currentMemberDef->getOutputFileBase(),
+                            g_currentMemberDef->anchor(),g_yyLineNr);
+        setCurrentDoc(lineAnchor);
+      }
+      else
+      {
+        g_code->writeLineNumber(d->getReference(),
+                            d->getOutputFileBase(),
+                            0,g_yyLineNr);
+        setCurrentDoc(lineAnchor);
+      }
+    }
+    else
+    {
+      g_code->writeLineNumber(0,0,0,g_yyLineNr);
+    }
+  }
+  
+  g_code->startCodeLine(g_sourceFileDef);
+  
+  if (g_currentFontClass)
+  {
+    g_code->startFontClass(g_currentFontClass);
+  }
+}
+
+static void endFontClass()
+{
+  if (g_currentFontClass)
+  {
+    g_code->endFontClass();
+    g_currentFontClass=0;
+  }
+}
+
+static void endCodeLine()
+{
+  endFontClass();
+  g_code->endCodeLine();
+}
+
+static void nextCodeLine()
+{
+  const char *fc = g_currentFontClass;
+  endCodeLine();
+  if (g_yyLineNr<g_inputLines) 
+  {
+    g_currentFontClass = fc;
+    startCodeLine();
+  }
+}
+
+static void codifyLines(char *text)
+{
+  char *p=text,*sp=p;
+  char c;
+  bool done=FALSE;
+  
+  while (!done)
+  {
+    sp=p;
+    
+    while ((c=*p++) && c!='\n') { }
+    
+    if (c=='\n')
+    {
+      g_yyLineNr++;
+      *(p-1)='\0';
+      g_code->codify(sp);
+      nextCodeLine();
+    }
+    else
+    {
+      g_code->codify(sp);
+      done=TRUE;
+    }
+  }
+}
+
+static void startFontClass(const char *s)
+{
+  endFontClass();
+  g_code->startFontClass(s);
+  g_currentFontClass=s;
+}
+
+/*! counts the number of lines in the input */
+static int countLines()
+{
+  const char *p=g_inputString;
+  char c;
+  int count=1;
+  while ((c=*p)) 
+  { 
+    p++ ; 
+    if (c=='\n') count++;  
+  }
+  if (p>g_inputString && *(p-1)!='\n') 
+  { // last line does not end with a \n, so we add an extra
+    // line and explicitly terminate the line after parsing.
+    count++, 
+    g_needsTermination=TRUE; 
+  } 
+  return count;
+}
+
+#undef YY_INPUT
+#define YY_INPUT(buf,result,max_size) result=yyread(buf,max_size);
+
+static int yyread(char *buf,int max_size)
+{
+  int c=0;
+  while( c < max_size && g_inputString[g_inputPosition] )
+  {
+    *buf = g_inputString[g_inputPosition++] ;
+    c++; buf++;
+  }
+  return c;
+}
+
+%}
+
+nl          (\r\n|\r|\n)
+ws          [ \t]+
+open        "<"
+close       ">"
+namestart   [A-Za-z\200-\377_]
+namechar    [:A-Za-z\200-\377_0-9.-]
+esc         "&#"[0-9]+";"|"&#x"[0-9a-fA-F]+";"
+name        {namestart}{namechar}*
+comment     {open}"!--"([^-]|"-"[^-])*"--"{close}
+data        "random string"
+string      \"([^"&]|{esc})*\"|\'([^'&]|{esc})*\'
+ 
+%option noyywrap
+%option nounput
+
+%%
+
+<INITIAL>{ws}       {
+                        codifyLines(yytext);
+                    }
+<INITIAL>"/"        {
+                        endFontClass();
+                        codify(yytext);
+                    }
+<INITIAL>"="        {
+                        endFontClass();
+                        codify(yytext);
+                    }
+<INITIAL>{close}    {
+                        endFontClass();
+                        codify(yytext);
+                    }
+<INITIAL>{name}     {
+                        startFontClass("keyword");
+                        codify(yytext);
+                        endFontClass();
+                    }
+<INITIAL>{string}   {
+                        startFontClass("stringliteral");
+                        codifyLines(yytext);
+                        endFontClass();
+                    }
+                    
+{open}{ws}?{name}   {
+                        // Write the < in a different color
+                        char openBracket[] = { yytext[0], '\0' };
+                        codify(openBracket);
+                        
+                        // Then write the rest
+                        yytext++;
+                        startFontClass("keywordtype");
+                        codify(yytext);
+                        endFontClass();
+                        
+                        BEGIN(INITIAL);
+                    }
+{open}{ws}?"/"{name} {
+                        // Write the "</" in a different color
+                        char closeBracket[] = { yytext[0], yytext[1], '\0' };
+                        endFontClass();
+                        codify(closeBracket);
+                        
+                        // Then write the rest
+                        yytext++; // skip the '<'
+                        yytext++; // skip the '/'
+                        startFontClass("keywordtype");
+                        codify(yytext);
+                        endFontClass();
+
+                        BEGIN(INITIAL);
+                    }
+{comment}           {
+                        // Strip off the extra '!'
+                        // yytext++; // <
+                        // *yytext = '<'; // replace '!' with '<'
+
+                        startFontClass("comment");
+                        codifyLines(yytext);
+                        endFontClass();
+                    }
+{nl}                {
+                        codifyLines(yytext);
+                    }
+
+.                   {
+                        //printf("!ERROR(%c)\n", *yytext);
+                        codifyLines(yytext);
+                    }
+
+%%
+
+void parseXmlCode(
+    CodeOutputInterface &od,
+    const char * /*className*/,
+    const QCString &s,
+    bool /*exBlock*/,
+    const char *exName,
+    FileDef *fd,
+    int startLine,
+    int endLine,
+    bool /*inlineFragment*/,
+    MemberDef *,
+    bool,Definition *searchCtx,
+    bool /*collectXRefs*/
+    ) 
+{  
+  if (s.isEmpty()) return;
+  
+  TooltipManager::instance()->clearTooltips();
+  
+  g_code = &od;
+  g_inputString   = s;
+  g_inputPosition = 0;
+  g_currentFontClass = 0;
+  g_needsTermination = FALSE;
+  g_searchCtx=searchCtx;
+  
+  if (endLine!=-1)
+    g_inputLines  = endLine+1;
+  else
+    g_inputLines  = countLines();
+  
+  if (startLine!=-1)
+    g_yyLineNr    = startLine;
+  else
+    g_yyLineNr    = 1;
+  
+  g_exampleName   = exName;
+  g_sourceFileDef = fd;
+
+  bool cleanupSourceDef = FALSE;
+  
+  if (fd==0)
+  {
+    // create a dummy filedef for the example
+    g_sourceFileDef = new FileDef("",(exName?exName:"generated"));
+    cleanupSourceDef = TRUE;
+  }
+  
+  if (g_sourceFileDef) 
+  {
+    setCurrentDoc("l00001");
+  }
+
+  // Starts line 1 on the output  
+  startCodeLine();
+
+  xmlcodeYYrestart( xmlcodeYYin );
+
+  xmlcodeYYlex();
+
+  if (g_needsTermination)
+  {
+    endCodeLine();
+  }
+  if (fd)
+  {
+    TooltipManager::instance()->writeTooltips(*g_code);
+  }
+  if (cleanupSourceDef)
+  {
+    // delete the temporary file definition used for this example
+    delete g_sourceFileDef;
+    g_sourceFileDef=0;
+  }
+  
+  return;
+}
+
+void resetXmlCodeParserState() 
+{
+  g_currentDefinition = 0;
+  g_currentMemberDef = 0;
+}
+
+#if !defined(YY_FLEX_SUBMINOR_VERSION) 
+extern "C" { // some bogus code to keep the compiler happy
+  void xmlcodeYYdummy() { 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. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
+#endif
+
diff --git a/src/xmldocvisitor.cpp b/src/xmldocvisitor.cpp
index 65711ab..27f7274 100644
--- a/src/xmldocvisitor.cpp
+++ b/src/xmldocvisitor.cpp
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -44,8 +44,6 @@ static void visitPreStart(FTextStream &t, const char *cmd, const bool doCaption,
                           const QCString &name, bool writeType, DocImage::Type type, const QCString &width, 
                           const QCString &height)
 {
-  QCString tmpStr;
-
   t << "<" << cmd;
   if (writeType)
   {
diff --git a/src/xmldocvisitor.h b/src/xmldocvisitor.h
index 3e2236c..c65688f 100644
--- a/src/xmldocvisitor.h
+++ b/src/xmldocvisitor.h
@@ -3,7 +3,7 @@
  * 
  *
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
index 8e1d02f..467ebe4 100644
--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
@@ -394,6 +394,12 @@ static void writeTemplateArgumentList(ArgumentList *al,
         linkifyText(TextGeneratorXMLImpl(t),scope,fileScope,0,a->defval);
         t << "</defval>" << endl;
       }
+      if (!a->typeConstraint.isEmpty())
+      {
+        t << indentStr << "    <typeconstraint>";
+        linkifyText(TextGeneratorXMLImpl(t),scope,fileScope,0,a->typeConstraint);
+        t << "</typeconstraint>" << endl;
+      }
       t << indentStr << "  </param>" << endl;
     }
     t << indentStr << "</templateparamlist>" << endl;
@@ -972,7 +978,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
   if (md->getDefLine()!=-1)
   {
     t << "        <location file=\"" 
-      << md->getDefFileName() << "\" line=\"" 
+      << stripFromPath(md->getDefFileName()) << "\" line=\"" 
       << md->getDefLine() << "\"" << " column=\"" 
       << md->getDefColumn() << "\"" ;
     if (md->getStartBodyLine()!=-1)
@@ -980,7 +986,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
       FileDef *bodyDef = md->getBodyDef();
       if (bodyDef)
       {
-        t << " bodyfile=\"" << bodyDef->absFilePath() << "\"";
+        t << " bodyfile=\"" << stripFromPath(bodyDef->absFilePath()) << "\"";
       }
       t << " bodystart=\"" << md->getStartBodyLine() << "\" bodyend=\"" 
         << md->getEndBodyLine() << "\"";
@@ -1398,7 +1404,7 @@ static void generateXMLForClass(ClassDef *cd,FTextStream &ti)
     t << "    </collaborationgraph>" << endl;
   }
   t << "    <location file=\"" 
-    << cd->getDefFileName() << "\" line=\"" 
+    << stripFromPath(cd->getDefFileName()) << "\" line=\"" 
     << cd->getDefLine() << "\"" << " column=\"" 
     << cd->getDefColumn() << "\"" ;
     if (cd->getStartBodyLine()!=-1)
@@ -1406,7 +1412,7 @@ static void generateXMLForClass(ClassDef *cd,FTextStream &ti)
       FileDef *bodyDef = cd->getBodyDef();
       if (bodyDef)
       {
-        t << " bodyfile=\"" << bodyDef->absFilePath() << "\"";
+        t << " bodyfile=\"" << stripFromPath(bodyDef->absFilePath()) << "\"";
       }
       t << " bodystart=\"" << cd->getStartBodyLine() << "\" bodyend=\"" 
         << cd->getEndBodyLine() << "\"";
@@ -1486,7 +1492,7 @@ static void generateXMLForNamespace(NamespaceDef *nd,FTextStream &ti)
   writeXMLDocBlock(t,nd->docFile(),nd->docLine(),nd,0,nd->documentation());
   t << "    </detaileddescription>" << endl;
   t << "    <location file=\""
-    << nd->getDefFileName() << "\" line=\""
+    << stripFromPath(nd->getDefFileName()) << "\" line=\""
     << nd->getDefLine() << "\"" << " column=\""
     << nd->getDefColumn() << "\"/>" << endl ;
   t << "  </compounddef>" << endl;
@@ -1628,7 +1634,7 @@ static void generateXMLForFile(FileDef *fd,FTextStream &ti)
     writeXMLCodeBlock(t,fd);
     t << "    </programlisting>" << endl;
   }
-  t << "    <location file=\"" << fd->getDefFileName() << "\"/>" << endl;
+  t << "    <location file=\"" << stripFromPath(fd->getDefFileName()) << "\"/>" << endl;
   t << "  </compounddef>" << endl;
   t << "</doxygen>" << endl;
 
@@ -1742,7 +1748,7 @@ static void generateXMLForDir(DirDef *dd,FTextStream &ti)
   t << "    <detaileddescription>" << endl;
   writeXMLDocBlock(t,dd->docFile(),dd->docLine(),dd,0,dd->documentation());
   t << "    </detaileddescription>" << endl;
-  t << "    <location file=\"" << dd->name() << "\"/>" << endl; 
+  t << "    <location file=\"" << stripFromPath(dd->name()) << "\"/>" << endl; 
   t << "  </compounddef>" << endl;
   t << "</doxygen>" << endl;
 
@@ -1865,7 +1871,7 @@ void generateXML()
     if (len>0)
     {
       QCString s(len+1);
-      qstrncpy(s.data(),startLine,len);
+      qstrncpy(s.rawData(),startLine,len);
       s[len]='\0';
       if (s.find("<!-- Automatically insert here the HTML entities -->")!=-1)
       {
diff --git a/src/xmlgen.h b/src/xmlgen.h
index 9c9ae17..0447591 100644
--- a/src/xmlgen.h
+++ b/src/xmlgen.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 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 
diff --git a/src/dbusxmlscanner.h b/src/xmlscanner.h
index e1504e9..6053b96 100644
--- a/src/dbusxmlscanner.h
+++ b/src/xmlscanner.h
@@ -1,12 +1,10 @@
 /******************************************************************************
  *
- *
- *
- * Copyright (C) 2009 by Tobias Hunger <tobias@aquazul.com>
+ * Copyright (C) 1997-2015 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.
  *
@@ -15,34 +13,28 @@
  *
  */
 
-#ifndef SCANNER_DBUSXML_H
-#define SCANNER_DBUSXML_H
+#ifndef XMLSCANNER_H
+#define XMLSCANNER_H
 
 #include "parserintf.h"
+#include "xmlcode.h"
 
-/** D-Bus XML parser.
- *
- *  This is the D-Bus XML parser for doxygen.
+/** XML scanner. Only support syntax highlighting of code at the moment.
  */
-class DBusXMLScanner : public ParserInterface
+class XMLScanner : public ParserInterface
 {
 public:
-    DBusXMLScanner();
-    virtual ~DBusXMLScanner();
+    XMLScanner() {}
+    virtual ~XMLScanner() {}
     void startTranslationUnit(const char *) {}
     void finishTranslationUnit() {}
-    void parseInput(const char *fileName,
-                    const char *fileBuf,
-                    Entry *root,
-                    bool sameTranslationUnit,
-                    QStrList &filesInSameTranslationUnit);
-
-    bool needsPreprocessing(const QCString &extension);
+    void parseInput(const char *, const char *, Entry *, bool , QStrList &) {}
+    bool needsPreprocessing(const QCString &) { return FALSE; }
 
     void parseCode(CodeOutputInterface &codeOutIntf,
                    const char *scopeName,
                    const QCString &input,
-                   SrcLangExt lang,
+                   SrcLangExt,
                    bool isExampleBlock,
                    const char *exampleName=0,
                    FileDef *fileDef=0,
@@ -53,11 +45,19 @@ public:
                    bool showLineNumbers=TRUE,
                    Definition *searchCtx=0,
                    bool collectXRefs=TRUE
-                  );
+                  )
+    {
+      parseXmlCode(codeOutIntf,scopeName,input,isExampleBlock,exampleName,
+                    fileDef,startLine,endLine,inlineFragment,memberDef,
+                    showLineNumbers,searchCtx,collectXRefs);
+    }
 
-    void resetCodeParserState();
+    void resetCodeParserState()
+    {
+      resetXmlCodeParserState();
+    }
 
-    void parsePrototype(const char *text);
+    void parsePrototype(const char *) {}
 
 private:
 };
diff --git a/templates/html/doxygen.css b/templates/html/doxygen.css
index 1d9002f..e41b0d7 100644
--- a/templates/html/doxygen.css
+++ b/templates/html/doxygen.css
@@ -1108,6 +1108,11 @@ dl.section dd {
 	border: 0px none;
 }
  
+#projectalign
+{
+        vertical-align: middle;
+}
+
 #projectname
 {
 	font: 300% Tahoma, Arial,sans-serif;
diff --git a/templates/html/header.html b/templates/html/header.html
index 70305df..9f95d66 100644
--- a/templates/html/header.html
+++ b/templates/html/header.html
@@ -27,7 +27,7 @@ $extrastylesheet
   <td id="projectlogo"><img alt="Logo" src="$relpath^$projectlogo"/></td>
   <!--END PROJECT_LOGO-->
   <!--BEGIN PROJECT_NAME-->
-  <td style="padding-left: 0.5em;">
+  <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">$projectname
    <!--BEGIN PROJECT_NUMBER-->&#160;<span id="projectnumber">$projectnumber</span><!--END PROJECT_NUMBER-->
    </div>
diff --git a/templates/xml/compound.xsd b/templates/xml/compound.xsd
index 50e532e..c960c7b 100644
--- a/templates/xml/compound.xsd
+++ b/templates/xml/compound.xsd
@@ -220,6 +220,7 @@
       <xsd:element name="defname" minOccurs="0" />
       <xsd:element name="array" minOccurs="0" />
       <xsd:element name="defval" type="linkedTextType" minOccurs="0" />
+      <xsd:element name="typeconstraint" type="linkedTextType" minOccurs="0" />
       <xsd:element name="briefdescription" type="descriptionType" minOccurs="0" />
     </xsd:sequence>
   </xsd:complexType>
@@ -649,6 +650,7 @@
       <xsd:enumeration value="public-inheritance" />
       <xsd:enumeration value="protected-inheritance" />
       <xsd:enumeration value="private-inheritance" />
+      <xsd:enumeration value="type-constraint" />
     </xsd:restriction>
   </xsd:simpleType>
 
diff --git a/testing/009/class_bug.xml b/testing/009/class_bug.xml
index dc1ff06..5a770bb 100644
--- a/testing/009/class_bug.xml
+++ b/testing/009/class_bug.xml
@@ -32,7 +32,7 @@
         </xrefsect>
       </para>
     </detaileddescription>
-    <location file="009_bug.cpp" bodystart="15" bodyend="26"/>
+    <location file="009_bug.cpp" line="16" column="1" bodyfile="009_bug.cpp" bodystart="15" bodyend="26"/>
     <listofallmembers>
       <member refid="class_bug_1a1f720954dd97cd1203e80501a6eae74c" prot="public" virt="non-virtual">
         <scope>Bug</scope>
diff --git a/testing/009/class_deprecated.xml b/testing/009/class_deprecated.xml
index 53a6273..5d44aaf 100644
--- a/testing/009/class_deprecated.xml
+++ b/testing/009/class_deprecated.xml
@@ -30,7 +30,7 @@
         </xrefsect>
       </para>
     </detaileddescription>
-    <location file="009_bug.cpp" bodystart="29" bodyend="36"/>
+    <location file="009_bug.cpp" line="30" column="1" bodyfile="009_bug.cpp" bodystart="29" bodyend="36"/>
     <listofallmembers>
       <member refid="class_deprecated_1a1d5f6803e72c625727e7083d1722dbf9" prot="public" virt="non-virtual">
         <scope>Deprecated</scope>
diff --git a/testing/009/class_reminder.xml b/testing/009/class_reminder.xml
index c4f639e..379b3e7 100644
--- a/testing/009/class_reminder.xml
+++ b/testing/009/class_reminder.xml
@@ -37,7 +37,7 @@
         </xrefsect>
       </para>
     </detaileddescription>
-    <location file="009_bug.cpp" bodystart="55" bodyend="60"/>
+    <location file="009_bug.cpp" line="56" column="1" bodyfile="009_bug.cpp" bodystart="55" bodyend="60"/>
     <listofallmembers>
       <member refid="class_reminder_1a173b5218bb11287b0e86a550d9f0728d" prot="public" virt="non-virtual">
         <scope>Reminder</scope>
diff --git a/testing/009/class_test.xml b/testing/009/class_test.xml
index b9f7f9f..9f1b126 100644
--- a/testing/009/class_test.xml
+++ b/testing/009/class_test.xml
@@ -37,7 +37,7 @@
         </xrefsect>
       </para>
     </detaileddescription>
-    <location file="009_bug.cpp" bodystart="47" bodyend="52"/>
+    <location file="009_bug.cpp" line="48" column="1" bodyfile="009_bug.cpp" bodystart="47" bodyend="52"/>
     <listofallmembers>
       <member refid="class_test_1a9fc54b716f326514a4c5f434137f4fc0" prot="public" virt="non-virtual">
         <scope>Test</scope>
diff --git a/testing/009/class_todo.xml b/testing/009/class_todo.xml
index c98fdac..8657d60 100644
--- a/testing/009/class_todo.xml
+++ b/testing/009/class_todo.xml
@@ -37,7 +37,7 @@
         </xrefsect>
       </para>
     </detaileddescription>
-    <location file="009_bug.cpp" bodystart="39" bodyend="44"/>
+    <location file="009_bug.cpp" line="40" column="1" bodyfile="009_bug.cpp" bodystart="39" bodyend="44"/>
     <listofallmembers>
       <member refid="class_todo_1a9e70ec9176ac4c1b20e011b4daddc9d8" prot="public" virt="non-virtual">
         <scope>Todo</scope>
diff --git a/testing/011/category_integer_07_arithmetic_08.xml b/testing/011/category_integer_07_arithmetic_08.xml
index 73308db..78a8c0e 100644
--- a/testing/011/category_integer_07_arithmetic_08.xml
+++ b/testing/011/category_integer_07_arithmetic_08.xml
@@ -33,7 +33,7 @@
         <briefdescription>
         </briefdescription>
         <detaileddescription>
-          <para>substract operation </para>
+          <para>subtract operation </para>
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
@@ -45,7 +45,7 @@
     <detaileddescription>
       <para>A category </para>
     </detaileddescription>
-    <location file="011_category.m" bodystart="17" bodyend="-1"/>
+    <location file="011_category.m" line="17" column="1" bodyfile="011_category.m" bodystart="17" bodyend="-1"/>
     <listofallmembers>
       <member refid="category_integer_07_arithmetic_08_1a12f411c5872ba3bafb8ea7dd1826cf2a" prot="public" virt="virtual">
         <scope>Integer(Arithmetic)</scope>
diff --git a/testing/011/interface_integer.xml b/testing/011/interface_integer.xml
index e922dda..429c6a0 100644
--- a/testing/011/interface_integer.xml
+++ b/testing/011/interface_integer.xml
@@ -16,7 +16,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="011_category.m" bodystart="8" bodyend="-1"/>
+        <location file="011_category.m" line="8" column="1" bodyfile="011_category.m" bodystart="8" bodyend="-1"/>
       </memberdef>
     </sectiondef>
     <sectiondef kind="public-func">
@@ -80,7 +80,7 @@
         </childnode>
       </node>
     </collaborationgraph>
-    <location file="011_category.m" bodystart="6" bodyend="-1"/>
+    <location file="011_category.m" line="6" column="1" bodyfile="011_category.m" bodystart="6" bodyend="-1"/>
     <listofallmembers>
       <member refid="interface_integer_1a35e89216966d8179a1b77f14b8211fda" prot="protected" virt="non-virtual">
         <scope>Integer</scope>
diff --git a/testing/011_category.m b/testing/011_category.m
index 8cb4d3a..f57c1d1 100644
--- a/testing/011_category.m
+++ b/testing/011_category.m
@@ -17,7 +17,7 @@
 @interface Integer (Arithmetic)
 /** add operation */
 - (id) add: (Integer *) addend;
-/** substract operation */
+/** subtract operation */
 - (id) sub: (Integer *) subtrahend;
 @end
 
diff --git a/testing/012_cite.dox b/testing/012_cite.dox
index 9bcb2c5..94be5e7 100644
--- a/testing/012_cite.dox
+++ b/testing/012_cite.dox
@@ -1,7 +1,7 @@
 // objective: test the \cite command
 // check: indexpage.xml
 // check: citelist.xml
-// config: CITE_BIB_FILES = sample.bib
+// config: CITE_BIB_FILES = $INPUTDIR/sample.bib
 /** \mainpage
  *  See \cite knuth79 for more info.
  */
diff --git a/testing/013/class_t1.xml b/testing/013/class_t1.xml
index e0dc3a2..ba91621 100644
--- a/testing/013/class_t1.xml
+++ b/testing/013/class_t1.xml
@@ -8,7 +8,7 @@
     <detaileddescription>
       <para>A class </para>
     </detaileddescription>
-    <location file="013_class.h" bodystart="10" bodyend="12"/>
+    <location file="013_class.h" line="11" column="1" bodyfile="013_class.h" bodystart="10" bodyend="12"/>
     <listofallmembers>
     </listofallmembers>
   </compounddef>
diff --git a/testing/013/class_t2.xml b/testing/013/class_t2.xml
index ca534e6..9df47e2 100644
--- a/testing/013/class_t2.xml
+++ b/testing/013/class_t2.xml
@@ -8,7 +8,7 @@
     <detaileddescription>
       <para>class <ref refid="class_t2" kindref="compound">T2</ref> </para>
     </detaileddescription>
-    <location file="013_class.h" bodystart="14" bodyend="16"/>
+    <location file="013_class.h" line="15" column="1" bodyfile="013_class.h" bodystart="14" bodyend="16"/>
     <listofallmembers>
     </listofallmembers>
   </compounddef>
diff --git a/testing/013/class_t3.xml b/testing/013/class_t3.xml
index 2fba932..dc0cd3f 100644
--- a/testing/013/class_t3.xml
+++ b/testing/013/class_t3.xml
@@ -8,7 +8,7 @@
     <detaileddescription>
       <para>class <ref refid="class_t3" kindref="compound">T3</ref> </para>
     </detaileddescription>
-    <location file="013_class.h" bodystart="18" bodyend="20"/>
+    <location file="013_class.h" line="19" column="1" bodyfile="013_class.h" bodystart="18" bodyend="20"/>
     <listofallmembers>
     </listofallmembers>
   </compounddef>
diff --git a/testing/013/class_t4.xml b/testing/013/class_t4.xml
index 907049f..52955d2 100644
--- a/testing/013/class_t4.xml
+++ b/testing/013/class_t4.xml
@@ -8,7 +8,7 @@
     <detaileddescription>
       <para>class <ref refid="class_t4" kindref="compound">T4</ref> </para>
     </detaileddescription>
-    <location file="013_class.h" bodystart="22" bodyend="24"/>
+    <location file="013_class.h" line="23" column="1" bodyfile="013_class.h" bodystart="22" bodyend="24"/>
     <listofallmembers>
     </listofallmembers>
   </compounddef>
diff --git a/testing/015/015__cond_8c.xml b/testing/015/015__cond_8c.xml
index fb3a06c..43cf335 100644
--- a/testing/015/015__cond_8c.xml
+++ b/testing/015/015__cond_8c.xml
@@ -14,7 +14,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="015_cond.c" bodystart="20" bodyend="22"/>
+        <location file="015_cond.c" line="20" column="1" bodyfile="015_cond.c" bodystart="20" bodyend="22"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/018/018__def_8c.xml b/testing/018/018__def_8c.xml
index 0b30670..8518666 100644
--- a/testing/018/018__def_8c.xml
+++ b/testing/018/018__def_8c.xml
@@ -40,7 +40,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="018_def.c" bodystart="13" bodyend="13"/>
+        <location file="018_def.c" line="13" column="1" bodyfile="018_def.c" bodystart="13" bodyend="13"/>
       </memberdef>
     </sectiondef>
     <sectiondef kind="typedef">
@@ -56,7 +56,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="018_def.c" bodystart="12" bodyend="-1"/>
+        <location file="018_def.c" line="12" column="1" bodyfile="018_def.c" bodystart="12" bodyend="-1"/>
       </memberdef>
     </sectiondef>
     <sectiondef kind="var">
@@ -73,7 +73,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="018_def.c" bodystart="9" bodyend="-1"/>
+        <location file="018_def.c" line="9" column="1" bodyfile="018_def.c" bodystart="9" bodyend="-1"/>
       </memberdef>
     </sectiondef>
     <sectiondef kind="func">
@@ -92,7 +92,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="018_def.c" bodystart="10" bodyend="10"/>
+        <location file="018_def.c" line="10" column="1" bodyfile="018_def.c" bodystart="10" bodyend="10"/>
       </memberdef>
       <memberdef kind="function" id="018__def_8c_1a2652ccbfb85efa2df3c70ba6c4628f8d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>void</type>
@@ -112,7 +112,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="018_def.c" bodystart="11" bodyend="11"/>
+        <location file="018_def.c" line="11" column="1" bodyfile="018_def.c" bodystart="11" bodyend="11"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/021_dontinclude.cpp b/testing/021_dontinclude.cpp
index 107991a..eeb95c5 100644
--- a/testing/021_dontinclude.cpp
+++ b/testing/021_dontinclude.cpp
@@ -1,6 +1,5 @@
 // objective: test the \dontinclude, \skip, \until, \skipline, \line commands
 // check: indexpage.xml
-// config: EXAMPLE_PATH = .
 /*! A test class. */
 
 class Test
diff --git a/testing/022_dot.cpp b/testing/022_dot.cpp
index 2db7c38..74d3f7a 100644
--- a/testing/022_dot.cpp
+++ b/testing/022_dot.cpp
@@ -1,7 +1,7 @@
 // objective: test the \dot and \enddot commands
 // check: indexpage.xml
 // config: HAVE_DOT = YES
-// config: DOTFILE_DIRS = .
+// config: DOTFILE_DIRS = $INPUTDIR
 
 /*! class B */
 class B {};
diff --git a/testing/025/class_test.xml b/testing/025/class_test.xml
index f0c7abd..c19341a 100644
--- a/testing/025/class_test.xml
+++ b/testing/025/class_test.xml
@@ -16,7 +16,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="025_example.cpp" bodystart="20" bodyend="20"/>
+        <location file="025_example.cpp" line="17" column="1" bodyfile="025_example.cpp" bodystart="20" bodyend="20"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
@@ -25,7 +25,7 @@
     <detaileddescription>
       <para>More details about this class. </para>
     </detaileddescription>
-    <location file="025_example.cpp" bodystart="10" bodyend="18"/>
+    <location file="025_example.cpp" line="11" column="1" bodyfile="025_example.cpp" bodystart="10" bodyend="18"/>
     <listofallmembers>
       <member refid="class_test_1a47b775f65718978f1ffcd96376f8ecfa" prot="public" virt="non-virtual">
         <scope>Test</scope>
diff --git a/testing/025_example.cpp b/testing/025_example.cpp
index 39736f8..817a47f 100644
--- a/testing/025_example.cpp
+++ b/testing/025_example.cpp
@@ -1,7 +1,7 @@
 // objective: test the \example command
 // check: example_test_8cpp-example.xml
 // check: class_test.xml
-// config: EXAMPLE_PATH = .
+
 
 /** \brief A Test class.
  *
diff --git a/testing/026/class_test.xml b/testing/026/class_test.xml
index a332757..582d509 100644
--- a/testing/026/class_test.xml
+++ b/testing/026/class_test.xml
@@ -41,7 +41,7 @@
       <para>A <ref refid="class_test" kindref="compound">Test</ref> class. More details about this class. <parameterlist kind="templateparam"><parameteritem><parameternamelist><parametername>T</parametername></parameternamelist><parameterdescription><para>A template parameter. </para></parameterdescription></parameteritem></parameterlist>
 </para>
     </detaileddescription>
-    <location file="026_exception.cpp" bodystart="8" bodyend="20"/>
+    <location file="026_exception.cpp" line="9" column="1" bodyfile="026_exception.cpp" bodystart="8" bodyend="20"/>
     <listofallmembers>
       <member refid="class_test_1abf9d5fbdaa4c23d0a513ee9746060779" prot="public" virt="non-virtual">
         <scope>Test</scope>
diff --git a/testing/027/struct_car.xml b/testing/027/struct_car.xml
index c73ad34..9027597 100644
--- a/testing/027/struct_car.xml
+++ b/testing/027/struct_car.xml
@@ -18,7 +18,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="027_extends.c" bodystart="69" bodyend="-1"/>
+        <location file="027_extends.c" line="69" column="1" bodyfile="027_extends.c" bodystart="69" bodyend="-1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
@@ -68,7 +68,7 @@
         </childnode>
       </node>
     </collaborationgraph>
-    <location file="027_extends.c" bodystart="67" bodyend="70"/>
+    <location file="027_extends.c" line="68" column="1" bodyfile="027_extends.c" bodystart="67" bodyend="70"/>
     <listofallmembers>
       <member refid="struct_car_1ab8ff28306286da5a8b14fa9bdccaafaa" prot="protected" virt="non-virtual">
         <scope>Car</scope>
diff --git a/testing/027/struct_object.xml b/testing/027/struct_object.xml
index 4047446..e14caa5 100644
--- a/testing/027/struct_object.xml
+++ b/testing/027/struct_object.xml
@@ -16,7 +16,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="027_extends.c" bodystart="21" bodyend="-1"/>
+        <location file="027_extends.c" line="21" column="1" bodyfile="027_extends.c" bodystart="21" bodyend="-1"/>
       </memberdef>
     </sectiondef>
     <sectiondef kind="public-func">
@@ -86,7 +86,7 @@
         </childnode>
       </node>
     </inheritancegraph>
-    <location file="027_extends.c" bodystart="19" bodyend="22"/>
+    <location file="027_extends.c" line="20" column="1" bodyfile="027_extends.c" bodystart="19" bodyend="22"/>
     <listofallmembers>
       <member refid="struct_object_1a71225073d06a793b9a6ea9263ed37b12" prot="public" virt="non-virtual">
         <scope>Object</scope>
diff --git a/testing/027/struct_truck.xml b/testing/027/struct_truck.xml
index 14ebde2..c5009d4 100644
--- a/testing/027/struct_truck.xml
+++ b/testing/027/struct_truck.xml
@@ -18,7 +18,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="027_extends.c" bodystart="79" bodyend="-1"/>
+        <location file="027_extends.c" line="79" column="1" bodyfile="027_extends.c" bodystart="79" bodyend="-1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
@@ -68,7 +68,7 @@
         <link refid="struct_object"/>
       </node>
     </collaborationgraph>
-    <location file="027_extends.c" bodystart="77" bodyend="80"/>
+    <location file="027_extends.c" line="78" column="1" bodyfile="027_extends.c" bodystart="77" bodyend="80"/>
     <listofallmembers>
       <member refid="struct_truck_1ad0ac321609dda1a6c552488b05ec7ac8" prot="protected" virt="non-virtual">
         <scope>Truck</scope>
diff --git a/testing/027/struct_vehicle.xml b/testing/027/struct_vehicle.xml
index bf480e8..acf10a0 100644
--- a/testing/027/struct_vehicle.xml
+++ b/testing/027/struct_vehicle.xml
@@ -20,7 +20,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="027_extends.c" bodystart="45" bodyend="-1"/>
+        <location file="027_extends.c" line="45" column="1" bodyfile="027_extends.c" bodystart="45" bodyend="-1"/>
       </memberdef>
     </sectiondef>
     <sectiondef kind="public-func">
@@ -105,7 +105,7 @@
         <link refid="struct_object"/>
       </node>
     </collaborationgraph>
-    <location file="027_extends.c" bodystart="43" bodyend="46"/>
+    <location file="027_extends.c" line="44" column="1" bodyfile="027_extends.c" bodystart="43" bodyend="46"/>
     <listofallmembers>
       <member refid="struct_vehicle_1ad7970f528d429f6fc1725173e93a77c2" prot="protected" virt="non-virtual">
         <scope>Vehicle</scope>
diff --git a/testing/029/029__hideinit_8c.xml b/testing/029/029__hideinit_8c.xml
index f5db794..4caf092 100644
--- a/testing/029/029__hideinit_8c.xml
+++ b/testing/029/029__hideinit_8c.xml
@@ -16,7 +16,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="029_hideinit.c" bodystart="7" bodyend="-1"/>
+        <location file="029_hideinit.c" line="7" column="1" bodyfile="029_hideinit.c" bodystart="7" bodyend="-1"/>
       </memberdef>
       <memberdef kind="variable" id="029__hideinit_8c_1ac0da06d47d79ad4b9fb1c0eaf1118c3f" prot="public" static="no" mutable="no">
         <type>int</type>
@@ -30,7 +30,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="029_hideinit.c" bodystart="12" bodyend="-1"/>
+        <location file="029_hideinit.c" line="12" column="1" bodyfile="029_hideinit.c" bodystart="12" bodyend="-1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/030_htmlinclude.dox b/testing/030_htmlinclude.dox
index a3716e6..a8e8af6 100644
--- a/testing/030_htmlinclude.dox
+++ b/testing/030_htmlinclude.dox
@@ -1,6 +1,5 @@
 // objective: test the \htmlinclude command
 // check: indexpage.xml
-// config: EXAMPLE_PATH = .
 /** \mainpage
  * Some text.
  * \htmlinclude sample.html
diff --git a/testing/031_image.dox b/testing/031_image.dox
index 96ba43b..f437086 100644
--- a/testing/031_image.dox
+++ b/testing/031_image.dox
@@ -1,6 +1,6 @@
 // objective: test the \image command
 // check: indexpage.xml
-// config: IMAGE_PATH = .
+// config: IMAGE_PATH = $INPUTDIR
 /** \mainpage
  * Some text.
  * \image html sample.png
diff --git a/testing/032_include.cpp b/testing/032_include.cpp
index 8aae8e9..2eddc57 100644
--- a/testing/032_include.cpp
+++ b/testing/032_include.cpp
@@ -1,6 +1,5 @@
 // objective: test the \include and \includelineno commands
 // check: indexpage.xml
-// config: EXAMPLE_PATH = .
 
 /** \mainpage 
  *  Some text.
diff --git a/testing/035/035__invariant_8c.xml b/testing/035/035__invariant_8c.xml
index f1a924d..b3d74bc 100644
--- a/testing/035/035__invariant_8c.xml
+++ b/testing/035/035__invariant_8c.xml
@@ -33,7 +33,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="035_invariant.c" bodystart="10" bodyend="15"/>
+        <location file="035_invariant.c" line="10" column="1" bodyfile="035_invariant.c" bodystart="10" bodyend="15"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/037/class_receiver.xml b/testing/037/class_receiver.xml
index 5c4fde6..edb688a 100644
--- a/testing/037/class_receiver.xml
+++ b/testing/037/class_receiver.xml
@@ -32,7 +32,7 @@
 </msc>
  </para>
     </detaileddescription>
-    <location file="037_msc.cpp" bodystart="28" bodyend="33"/>
+    <location file="037_msc.cpp" line="29" column="1" bodyfile="037_msc.cpp" bodystart="28" bodyend="33"/>
     <listofallmembers>
       <member refid="class_receiver_1a162099741e0324e6254c9bc570566e40" prot="public" virt="non-virtual">
         <scope>Receiver</scope>
diff --git a/testing/037/class_sender.xml b/testing/037/class_sender.xml
index e58ab88..0f1996d 100644
--- a/testing/037/class_sender.xml
+++ b/testing/037/class_sender.xml
@@ -32,7 +32,7 @@
 </msc>
  </para>
     </detaileddescription>
-    <location file="037_msc.cpp" bodystart="13" bodyend="18"/>
+    <location file="037_msc.cpp" line="14" column="1" bodyfile="037_msc.cpp" bodystart="13" bodyend="18"/>
     <listofallmembers>
       <member refid="class_sender_1a8ad2c6f9baa4e798868fe4a4d45f8fda" prot="public" virt="non-virtual">
         <scope>Sender</scope>
diff --git a/testing/039/class_test.xml b/testing/039/class_test.xml
index 244e88d..2a4796a 100644
--- a/testing/039/class_test.xml
+++ b/testing/039/class_test.xml
@@ -55,7 +55,7 @@
     <detaileddescription>
       <para>More details about this class. </para>
     </detaileddescription>
-    <location file="039_name.cpp" bodystart="8" bodyend="24"/>
+    <location file="039_name.cpp" line="9" column="1" bodyfile="039_name.cpp" bodystart="8" bodyend="24"/>
     <listofallmembers>
       <member refid="class_test_1a78e37a450a276b60a5a2fa4a46c86f2e" prot="public" virt="non-virtual">
         <scope>Test</scope>
diff --git a/testing/041/class_test.xml b/testing/041/class_test.xml
index 7068026..57dbe37 100644
--- a/testing/041/class_test.xml
+++ b/testing/041/class_test.xml
@@ -31,7 +31,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="041_overload.cpp" bodystart="12" bodyend="12"/>
+        <location file="041_overload.cpp" line="7" column="1" bodyfile="041_overload.cpp" bodystart="12" bodyend="12"/>
       </memberdef>
       <memberdef kind="function" id="class_test_1ae87a6e26707e684c0d2d07bb3d4a9d7f" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>void</type>
@@ -49,7 +49,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="041_overload.cpp" bodystart="13" bodyend="13"/>
+        <location file="041_overload.cpp" line="8" column="1" bodyfile="041_overload.cpp" bodystart="13" bodyend="13"/>
       </memberdef>
       <memberdef kind="function" id="class_test_1a62a76eed05fa84633d1e460aeeaf875d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>void</type>
@@ -72,7 +72,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="041_overload.cpp" bodystart="18" bodyend="18"/>
+        <location file="041_overload.cpp" line="9" column="1" bodyfile="041_overload.cpp" bodystart="18" bodyend="18"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
@@ -81,7 +81,7 @@
     <detaileddescription>
       <para>More text. </para>
     </detaileddescription>
-    <location file="041_overload.cpp" bodystart="4" bodyend="10"/>
+    <location file="041_overload.cpp" line="5" column="1" bodyfile="041_overload.cpp" bodystart="4" bodyend="10"/>
     <listofallmembers>
       <member refid="class_test_1a8e7b46ceaf7bd2ab94114b390b3288ca" prot="public" virt="non-virtual">
         <scope>Test</scope>
diff --git a/testing/044/struct_s.xml b/testing/044/struct_s.xml
index 2aa62c2..aefd50d 100644
--- a/testing/044/struct_s.xml
+++ b/testing/044/struct_s.xml
@@ -16,7 +16,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="044_section.h" bodystart="10" bodyend="-1"/>
+        <location file="044_section.h" line="10" column="1" bodyfile="044_section.h" bodystart="10" bodyend="-1"/>
       </memberdef>
       <memberdef kind="variable" id="struct_s_1a413054db7785010db38c16322c8583cc" prot="public" static="no" mutable="no">
         <type>int</type>
@@ -30,7 +30,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="044_section.h" bodystart="12" bodyend="-1"/>
+        <location file="044_section.h" line="12" column="1" bodyfile="044_section.h" bodystart="12" bodyend="-1"/>
       </memberdef>
     </sectiondef>
     <sectiondef kind="protected-attrib">
@@ -46,7 +46,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="044_section.h" bodystart="17" bodyend="-1"/>
+        <location file="044_section.h" line="17" column="1" bodyfile="044_section.h" bodystart="17" bodyend="-1"/>
       </memberdef>
       <memberdef kind="variable" id="struct_s_1a0c535a6122f4ae509a336e3a67f927a4" prot="protected" static="no" mutable="no">
         <type>int</type>
@@ -60,7 +60,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="044_section.h" bodystart="19" bodyend="-1"/>
+        <location file="044_section.h" line="19" column="1" bodyfile="044_section.h" bodystart="19" bodyend="-1"/>
       </memberdef>
     </sectiondef>
     <sectiondef kind="private-attrib">
@@ -76,7 +76,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="044_section.h" bodystart="24" bodyend="-1"/>
+        <location file="044_section.h" line="24" column="1" bodyfile="044_section.h" bodystart="24" bodyend="-1"/>
       </memberdef>
       <memberdef kind="variable" id="struct_s_1a4b26822a09bcd6b946702e99280826ff" prot="private" static="no" mutable="no">
         <type>int</type>
@@ -90,7 +90,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="044_section.h" bodystart="26" bodyend="-1"/>
+        <location file="044_section.h" line="26" column="1" bodyfile="044_section.h" bodystart="26" bodyend="-1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
@@ -98,7 +98,7 @@
     <detaileddescription>
       <para>A struct </para>
     </detaileddescription>
-    <location file="044_section.h" bodystart="5" bodyend="27"/>
+    <location file="044_section.h" line="6" column="1" bodyfile="044_section.h" bodystart="5" bodyend="27"/>
     <listofallmembers>
       <member refid="struct_s_1ab754fee7e3500035f644d0ac528cbfc3" prot="private" virt="non-virtual">
         <scope>S</scope>
diff --git a/testing/046/class_test.xml b/testing/046/class_test.xml
index 62712d4..9a1bd9c 100644
--- a/testing/046/class_test.xml
+++ b/testing/046/class_test.xml
@@ -61,7 +61,7 @@
       <para>A test class <simplesect kind="see"><para><ref refid="class_test_1a1683da699dc049d74101488d143c8e98" kindref="member">Test::method()</ref></para></simplesect>
 </para>
     </detaileddescription>
-    <location file="046_related.cpp" bodystart="10" bodyend="15"/>
+    <location file="046_related.cpp" line="11" column="1" bodyfile="046_related.cpp" bodystart="10" bodyend="15"/>
     <listofallmembers>
       <member refid="class_test_1a1283d836e0611ff772c1b06a31ecbbfe" prot="public" virt="non-virtual">
         <scope>Test</scope>
diff --git a/testing/048/048__showinit_8c.xml b/testing/048/048__showinit_8c.xml
index 34b2c1c..4cc5717 100644
--- a/testing/048/048__showinit_8c.xml
+++ b/testing/048/048__showinit_8c.xml
@@ -15,7 +15,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="048_showinit.c" bodystart="8" bodyend="-1"/>
+        <location file="048_showinit.c" line="8" column="1" bodyfile="048_showinit.c" bodystart="8" bodyend="-1"/>
       </memberdef>
       <memberdef kind="variable" id="048__showinit_8c_1ac0da06d47d79ad4b9fb1c0eaf1118c3f" prot="public" static="no" mutable="no">
         <type>int</type>
@@ -30,7 +30,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="048_showinit.c" bodystart="13" bodyend="-1"/>
+        <location file="048_showinit.c" line="13" column="1" bodyfile="048_showinit.c" bodystart="13" bodyend="-1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/049/indexpage.xml b/testing/049/indexpage.xml
index 0f3a63b..a6c9b97 100644
--- a/testing/049/indexpage.xml
+++ b/testing/049/indexpage.xml
@@ -4,7 +4,7 @@
     <compoundname>index</compoundname>
     <title>My Project</title>
     <detaileddescription>
-      <para>A bubble sort algoritm First get the inputs <programlisting><codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal">(i=0<sp/>;<sp/>i&lt;n<sp/>;<sp/>i++)</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>printf(</highlight><highlight class="stringliteral">"<sp/>Array[%d]<sp/>=<sp/>"</highlight><highlight class="normal">,i);</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>scanf(</highlight><highlight class="stringliteral">"%d"</highlight><highlight class="normal">,&amp;arr[i]);</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>}</highlight></codeline></programlisting>Then do the bubbling <programlisting><codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal">(i=0<sp/>;<sp/>i&lt;n<sp/>;<sp/>i++)</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal">(j=0<sp/>;<sp/>j&lt;n-i-1<sp/>;<sp/>j++)</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">if</highlight><highlight class="normal">(arr[j]&gt;arr[j+1])<sp/></highlight><highlight class="comment">//Swapping<sp/>Condition<sp/>is<sp/>Checked</highlight><highlight class="normal"/></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>temp=arr[j];</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>arr[j]=arr[j+1];</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>arr[j+1]=temp;</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/>}</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>}</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>}</highlight></codeline></programlisting>Then write the result <programlisting><codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal">(i=0<sp/>;<sp/>i&lt;n<sp/>;<sp/>i++)</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>printf(</highlight><highlight class="stringliteral">"<sp/>%4d"</highlight><highlight class="normal">,arr[i]);</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>}</highlight></codeline></programlisting></para>
+      <para>A bubble sort algorithm First get the inputs <programlisting><codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal">(i=0<sp/>;<sp/>i&lt;n<sp/>;<sp/>i++)</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>printf(</highlight><highlight class="stringliteral">"<sp/>Array[%d]<sp/>=<sp/>"</highlight><highlight class="normal">,i);</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>scanf(</highlight><highlight class="stringliteral">"%d"</highlight><highlight class="normal">,&amp;arr[i]);</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>}</highlight></codeline></programlisting>Then do the bubbling <programlisting><codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal">(i=0<sp/>;<sp/>i&lt;n<sp/>;<sp/>i++)</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal">(j=0<sp/>;<sp/>j&lt;n-i-1<sp/>;<sp/>j++)</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">if</highlight><highlight class="normal">(arr[j]&gt;arr[j+1])<sp/></highlight><highlight class="comment">//Swapping<sp/>Condition<sp/>is<sp/>Checked</highlight><highlight class="normal"/></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>temp=arr[j];</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>arr[j]=arr[j+1];</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>arr[j+1]=temp;</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/>}</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>}</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>}</highlight></codeline></programlisting>Then write the result <programlisting><codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal">(i=0<sp/>;<sp/>i&lt;n<sp/>;<sp/>i++)</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>printf(</highlight><highlight class="stringliteral">"<sp/>%4d"</highlight><highlight class="normal">,arr[i]);</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>}</highlight></codeline></programlisting></para>
     </detaileddescription>
   </compounddef>
 </doxygen>
diff --git a/testing/049_snippet.cpp b/testing/049_snippet.cpp
index 2749a62..9c5f18b 100644
--- a/testing/049_snippet.cpp
+++ b/testing/049_snippet.cpp
@@ -1,9 +1,8 @@
 // objective: test the \snippet command
 // check: indexpage.xml
-// config: EXAMPLE_PATH = .
 
 /** \mainpage
- *  A bubble sort algoritm
+ *  A bubble sort algorithm
  *  First get the inputs
  *  \snippet snippet_test.cpp input
  *  Then do the bubbling
diff --git a/testing/050_verbatim.dox b/testing/050_verbatim.dox
index 0ff315f..40c75a5 100644
--- a/testing/050_verbatim.dox
+++ b/testing/050_verbatim.dox
@@ -1,6 +1,5 @@
 // objective: test \verbatim and \verbinclude commands
 // check: indexpage.xml
-// config: EXAMPLE_PATH = .
 /** 
 \mainpage 
 Some normal text.
diff --git a/testing/056_latexinclude.dox b/testing/056_latexinclude.dox
index 6a8052a..021b2f7 100644
--- a/testing/056_latexinclude.dox
+++ b/testing/056_latexinclude.dox
@@ -1,6 +1,5 @@
 // objective: test the \latexinclude command
 // check: indexpage.xml
-// config: EXAMPLE_PATH = .
 /** \mainpage
  * Some text.
  * \latexinclude sample.tex
diff --git a/testing/057/057__caller__graphs_8tcl.xml b/testing/057/057__caller__graphs_8tcl.xml
index c3dfb78..1046e30 100644
--- a/testing/057/057__caller__graphs_8tcl.xml
+++ b/testing/057/057__caller__graphs_8tcl.xml
@@ -24,7 +24,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="59" bodyend="61"/>
+        <location file="057_caller_graphs.tcl" line="59" column="1" bodyfile="057_caller_graphs.tcl" bodystart="59" bodyend="61"/>
       </memberdef>
       <memberdef kind="function" id="057__caller__graphs_8tcl_1ae4e1c2bb3adfdfbb71f52de84a8285b0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type/>
@@ -37,7 +37,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="65" bodyend="67"/>
+        <location file="057_caller_graphs.tcl" line="65" column="1" bodyfile="057_caller_graphs.tcl" bodystart="65" bodyend="67"/>
         <referencedby refid="namespace1_1a9722420639306872cea2593b83028a45" compoundref="057__caller__graphs_8tcl" startline="85" endline="88">1::test3</referencedby>
       </memberdef>
       <memberdef kind="function" id="057__caller__graphs_8tcl_1a3f808a00e1b937978455d707851ab33a" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -51,7 +51,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="102" bodyend="105"/>
+        <location file="057_caller_graphs.tcl" line="102" column="1" bodyfile="057_caller_graphs.tcl" bodystart="102" bodyend="105"/>
         <references refid="namespace2_1a2839d9dea7f0d08f48958c3fc0cd00d3" compoundref="057__caller__graphs_8tcl" startline="106" endline="114">2::next</references>
       </memberdef>
       <memberdef kind="function" id="057__caller__graphs_8tcl_1a12acb916374f925e7b7ba302a1ca4efb" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -65,7 +65,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="136" bodyend="140"/>
+        <location file="057_caller_graphs.tcl" line="136" column="1" bodyfile="057_caller_graphs.tcl" bodystart="136" bodyend="140"/>
         <references refid="__057__caller__graphs_8tcl_1a7c3c8acee94bf61ba9e911dafe35adac" compoundref="__057__caller__graphs_8tcl" startline="1" endline="4">inFileB</references>
       </memberdef>
       <memberdef kind="function" id="057__caller__graphs_8tcl_1a7482c00c17357cf4846b0c1bd715979c" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -79,7 +79,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="141" bodyend="144"/>
+        <location file="057_caller_graphs.tcl" line="141" column="1" bodyfile="057_caller_graphs.tcl" bodystart="141" bodyend="144"/>
         <referencedby refid="__057__caller__graphs_8tcl_1a7c3c8acee94bf61ba9e911dafe35adac" compoundref="__057__caller__graphs_8tcl" startline="1" endline="4">inFileB</referencedby>
       </memberdef>
     </sectiondef>
diff --git a/testing/057/__057__caller__graphs_8tcl.xml b/testing/057/__057__caller__graphs_8tcl.xml
index 48ab815..a71e7b5 100644
--- a/testing/057/__057__caller__graphs_8tcl.xml
+++ b/testing/057/__057__caller__graphs_8tcl.xml
@@ -14,7 +14,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="_057_caller_graphs.tcl" bodystart="1" bodyend="4"/>
+        <location file="_057_caller_graphs.tcl" line="1" column="1" bodyfile="_057_caller_graphs.tcl" bodystart="1" bodyend="4"/>
         <references refid="057__caller__graphs_8tcl_1a7482c00c17357cf4846b0c1bd715979c" compoundref="057__caller__graphs_8tcl" startline="141" endline="144">inFileA</references>
         <referencedby refid="057__caller__graphs_8tcl_1a12acb916374f925e7b7ba302a1ca4efb" compoundref="057__caller__graphs_8tcl" startline="136" endline="140">master</referencedby>
       </memberdef>
diff --git a/testing/057/namespace1.xml b/testing/057/namespace1.xml
index 6a40cc4..33d073d 100644
--- a/testing/057/namespace1.xml
+++ b/testing/057/namespace1.xml
@@ -15,7 +15,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="62" bodyend="64"/>
+        <location file="057_caller_graphs.tcl" line="62" column="1" bodyfile="057_caller_graphs.tcl" bodystart="62" bodyend="64"/>
         <referencedby refid="namespace1_1a4a8285288ee1994ac886e2039777339e" compoundref="057__caller__graphs_8tcl" startline="77" endline="80">test1</referencedby>
         <referencedby refid="namespace1_1a11615154d3c207ed4106dd0bcb0639e8" compoundref="057__caller__graphs_8tcl" startline="93" endline="96">test5</referencedby>
       </memberdef>
@@ -30,7 +30,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="68" bodyend="70"/>
+        <location file="057_caller_graphs.tcl" line="68" column="1" bodyfile="057_caller_graphs.tcl" bodystart="68" bodyend="70"/>
         <referencedby refid="namespace1_1ae1e88bb7ddd332348d7e29ac4a211b00" compoundref="057__caller__graphs_8tcl" startline="81" endline="84">test2</referencedby>
       </memberdef>
       <memberdef kind="function" id="namespace1_1a4a8285288ee1994ac886e2039777339e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -44,7 +44,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="77" bodyend="80"/>
+        <location file="057_caller_graphs.tcl" line="77" column="1" bodyfile="057_caller_graphs.tcl" bodystart="77" bodyend="80"/>
         <references refid="namespace1_1a5024a7bc323958c7230615f2fcaeaef8" compoundref="057__caller__graphs_8tcl" startline="62" endline="64">baz</references>
       </memberdef>
       <memberdef kind="function" id="namespace1_1ae1e88bb7ddd332348d7e29ac4a211b00" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -58,7 +58,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="81" bodyend="84"/>
+        <location file="057_caller_graphs.tcl" line="81" column="1" bodyfile="057_caller_graphs.tcl" bodystart="81" bodyend="84"/>
         <references refid="namespace1_1ad58c8f16ad5f12178c71ca988865bb58" compoundref="057__caller__graphs_8tcl" startline="68" endline="70">bar</references>
       </memberdef>
       <memberdef kind="function" id="namespace1_1a9722420639306872cea2593b83028a45" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -72,7 +72,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="85" bodyend="88"/>
+        <location file="057_caller_graphs.tcl" line="85" column="1" bodyfile="057_caller_graphs.tcl" bodystart="85" bodyend="88"/>
         <references refid="057__caller__graphs_8tcl_1ae4e1c2bb3adfdfbb71f52de84a8285b0" compoundref="057__caller__graphs_8tcl" startline="65" endline="67">bar</references>
       </memberdef>
       <memberdef kind="function" id="namespace1_1addc9b30656419de5e2651e27a013db29" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -86,7 +86,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="89" bodyend="92"/>
+        <location file="057_caller_graphs.tcl" line="89" column="1" bodyfile="057_caller_graphs.tcl" bodystart="89" bodyend="92"/>
         <references refid="namespace1_1_11_1acebecc4cb718010d00c3c150158b75ab" compoundref="057__caller__graphs_8tcl" startline="71" endline="73">1::1::bar</references>
       </memberdef>
       <memberdef kind="function" id="namespace1_1a11615154d3c207ed4106dd0bcb0639e8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -100,7 +100,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="93" bodyend="96"/>
+        <location file="057_caller_graphs.tcl" line="93" column="1" bodyfile="057_caller_graphs.tcl" bodystart="93" bodyend="96"/>
         <references refid="namespace1_1a5024a7bc323958c7230615f2fcaeaef8" compoundref="057__caller__graphs_8tcl" startline="62" endline="64">baz</references>
       </memberdef>
     </sectiondef>
diff --git a/testing/057/namespace1_1_11.xml b/testing/057/namespace1_1_11.xml
index 8ff3ce9..e13e261 100644
--- a/testing/057/namespace1_1_11.xml
+++ b/testing/057/namespace1_1_11.xml
@@ -15,7 +15,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="71" bodyend="73"/>
+        <location file="057_caller_graphs.tcl" line="71" column="1" bodyfile="057_caller_graphs.tcl" bodystart="71" bodyend="73"/>
         <referencedby refid="namespace1_1addc9b30656419de5e2651e27a013db29" compoundref="057__caller__graphs_8tcl" startline="89" endline="92">1::test4</referencedby>
       </memberdef>
     </sectiondef>
diff --git a/testing/057/namespace1_1_11_1_11.xml b/testing/057/namespace1_1_11_1_11.xml
index f7f9716..55b7838 100644
--- a/testing/057/namespace1_1_11_1_11.xml
+++ b/testing/057/namespace1_1_11_1_11.xml
@@ -14,7 +14,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="74" bodyend="76"/>
+        <location file="057_caller_graphs.tcl" line="74" column="1" bodyfile="057_caller_graphs.tcl" bodystart="74" bodyend="76"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/057/namespace2.xml b/testing/057/namespace2.xml
index 0ce04a8..a8a9bc6 100644
--- a/testing/057/namespace2.xml
+++ b/testing/057/namespace2.xml
@@ -15,7 +15,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="106" bodyend="114"/>
+        <location file="057_caller_graphs.tcl" line="106" column="1" bodyfile="057_caller_graphs.tcl" bodystart="106" bodyend="114"/>
         <references refid="namespace2_1_12_1aceefa876cf364f44da1f523d3f7b0649" compoundref="057__caller__graphs_8tcl" startline="115" endline="118">2::2::next</references>
         <referencedby refid="057__caller__graphs_8tcl_1a3f808a00e1b937978455d707851ab33a" compoundref="057__caller__graphs_8tcl" startline="102" endline="105">next</referencedby>
         <referencedby refid="namespace2_1_12_1_12_1_12_1_12_1ac07f64c62783fd8b44317389b4a711f8" compoundref="057__caller__graphs_8tcl" startline="127" endline="130">2::2::2::2::2::next</referencedby>
diff --git a/testing/057/namespace2_1_12.xml b/testing/057/namespace2_1_12.xml
index af86ebe..a188f00 100644
--- a/testing/057/namespace2_1_12.xml
+++ b/testing/057/namespace2_1_12.xml
@@ -15,7 +15,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="115" bodyend="118"/>
+        <location file="057_caller_graphs.tcl" line="115" column="1" bodyfile="057_caller_graphs.tcl" bodystart="115" bodyend="118"/>
         <references refid="namespace2_1_12_1_12_1a85524e2015e377d433cd8384335c11d6" compoundref="057__caller__graphs_8tcl" startline="119" endline="122">2::2::2::next</references>
         <referencedby refid="namespace2_1a2839d9dea7f0d08f48958c3fc0cd00d3" compoundref="057__caller__graphs_8tcl" startline="106" endline="114">2::next</referencedby>
       </memberdef>
diff --git a/testing/057/namespace2_1_12_1_12.xml b/testing/057/namespace2_1_12_1_12.xml
index 0a6d7fa..e83b3fd 100644
--- a/testing/057/namespace2_1_12_1_12.xml
+++ b/testing/057/namespace2_1_12_1_12.xml
@@ -15,7 +15,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="119" bodyend="122"/>
+        <location file="057_caller_graphs.tcl" line="119" column="1" bodyfile="057_caller_graphs.tcl" bodystart="119" bodyend="122"/>
         <references refid="namespace2_1_12_1_12_1_12_1a3ea6e2ce66f4a9c30009852e4c7da2fe" compoundref="057__caller__graphs_8tcl" startline="123" endline="126">2::2::2::2::next</references>
         <referencedby refid="namespace2_1_12_1aceefa876cf364f44da1f523d3f7b0649" compoundref="057__caller__graphs_8tcl" startline="115" endline="118">2::2::next</referencedby>
       </memberdef>
diff --git a/testing/057/namespace2_1_12_1_12_1_12.xml b/testing/057/namespace2_1_12_1_12_1_12.xml
index 461d61e..83c2a73 100644
--- a/testing/057/namespace2_1_12_1_12_1_12.xml
+++ b/testing/057/namespace2_1_12_1_12_1_12.xml
@@ -15,7 +15,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="123" bodyend="126"/>
+        <location file="057_caller_graphs.tcl" line="123" column="1" bodyfile="057_caller_graphs.tcl" bodystart="123" bodyend="126"/>
         <references refid="namespace2_1_12_1_12_1_12_1_12_1ac07f64c62783fd8b44317389b4a711f8" compoundref="057__caller__graphs_8tcl" startline="127" endline="130">2::2::2::2::2::next</references>
         <referencedby refid="namespace2_1_12_1_12_1a85524e2015e377d433cd8384335c11d6" compoundref="057__caller__graphs_8tcl" startline="119" endline="122">2::2::2::next</referencedby>
       </memberdef>
diff --git a/testing/057/namespace2_1_12_1_12_1_12_1_12.xml b/testing/057/namespace2_1_12_1_12_1_12_1_12.xml
index 3981ff0..9222625 100644
--- a/testing/057/namespace2_1_12_1_12_1_12_1_12.xml
+++ b/testing/057/namespace2_1_12_1_12_1_12_1_12.xml
@@ -14,7 +14,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="127" bodyend="130"/>
+        <location file="057_caller_graphs.tcl" line="127" column="1" bodyfile="057_caller_graphs.tcl" bodystart="127" bodyend="130"/>
         <references refid="namespace2_1a2839d9dea7f0d08f48958c3fc0cd00d3" compoundref="057__caller__graphs_8tcl" startline="106" endline="114">2::next</references>
         <referencedby refid="namespace2_1_12_1_12_1_12_1a3ea6e2ce66f4a9c30009852e4c7da2fe" compoundref="057__caller__graphs_8tcl" startline="123" endline="126">2::2::2::2::next</referencedby>
       </memberdef>
diff --git a/testing/057/namespacebar.xml b/testing/057/namespacebar.xml
index 85cde41..e16966e 100644
--- a/testing/057/namespacebar.xml
+++ b/testing/057/namespacebar.xml
@@ -14,7 +14,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="29" bodyend="35"/>
+        <location file="057_caller_graphs.tcl" line="29" column="1" bodyfile="057_caller_graphs.tcl" bodystart="29" bodyend="35"/>
         <references refid="namespacebar_1a3426cd3a2eebcffa0dc333bcf5e2fe5e" compoundref="057__caller__graphs_8tcl" startline="36" endline="39">baz</references>
         <referencedby refid="namespacefoo_1a265acdcaea6da32c3bbd9afb5d0e32a4" compoundref="057__caller__graphs_8tcl" startline="44" endline="48">foo::master</referencedby>
       </memberdef>
@@ -29,7 +29,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="36" bodyend="39"/>
+        <location file="057_caller_graphs.tcl" line="36" column="1" bodyfile="057_caller_graphs.tcl" bodystart="36" bodyend="39"/>
         <references refid="namespacebar_1a88879545dee287d377e638b87cdf6dd7" compoundref="057__caller__graphs_8tcl" startline="40" endline="42">bazbaz</references>
         <referencedby refid="namespacebar_1aa1678a9adb588c0b91b118de7cc38ddb" compoundref="057__caller__graphs_8tcl" startline="29" endline="35">slave</referencedby>
       </memberdef>
@@ -44,7 +44,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="40" bodyend="42"/>
+        <location file="057_caller_graphs.tcl" line="40" column="1" bodyfile="057_caller_graphs.tcl" bodystart="40" bodyend="42"/>
         <referencedby refid="namespacebar_1a3426cd3a2eebcffa0dc333bcf5e2fe5e" compoundref="057__caller__graphs_8tcl" startline="36" endline="39">baz</referencedby>
       </memberdef>
     </sectiondef>
diff --git a/testing/057/namespacefoo.xml b/testing/057/namespacefoo.xml
index 0d81332..8d0ac75 100644
--- a/testing/057/namespacefoo.xml
+++ b/testing/057/namespacefoo.xml
@@ -14,7 +14,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="057_caller_graphs.tcl" bodystart="44" bodyend="48"/>
+        <location file="057_caller_graphs.tcl" line="44" column="1" bodyfile="057_caller_graphs.tcl" bodystart="44" bodyend="48"/>
         <references refid="namespacebar_1aa1678a9adb588c0b91b118de7cc38ddb" compoundref="057__caller__graphs_8tcl" startline="29" endline="35">bar::slave</references>
       </memberdef>
     </sectiondef>
diff --git a/testing/057_caller_graphs.tcl b/testing/057_caller_graphs.tcl
index f6e0e77..464d8aa 100644
--- a/testing/057_caller_graphs.tcl
+++ b/testing/057_caller_graphs.tcl
@@ -15,7 +15,7 @@
 #// config: INLINE_SOURCES = no
 #// config: REFERENCED_BY_RELATION = yes
 #// config: REFERENCES_RELATION = yes
-#// config: INPUT = 057_caller_graphs.tcl _057_caller_graphs.tcl
+#// config: INPUT = $INPUTDIR/057_caller_graphs.tcl $INPUTDIR/_057_caller_graphs.tcl
 # config: HAVE_DOT = yes
 # config: CALLER_GRAPH = yes
 # config: CALL_GRAPH = yes
diff --git a/testing/058/058__bracket__recursion_8tcl.xml b/testing/058/058__bracket__recursion_8tcl.xml
index dcb60e4..0381b83 100644
--- a/testing/058/058__bracket__recursion_8tcl.xml
+++ b/testing/058/058__bracket__recursion_8tcl.xml
@@ -15,7 +15,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="10" bodyend="13"/>
+        <location file="058_bracket_recursion.tcl" line="10" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="10" bodyend="13"/>
         <referencedby refid="058__bracket__recursion_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" compoundref="058__bracket__recursion_8tcl" startline="22" endline="25">a</referencedby>
         <referencedby refid="058__bracket__recursion_8tcl_1a68bdb74c144118d936931c46f75d4b3e" compoundref="058__bracket__recursion_8tcl" startline="28" endline="32">b</referencedby>
         <referencedby refid="058__bracket__recursion_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" compoundref="058__bracket__recursion_8tcl" startline="33" endline="37">c</referencedby>
@@ -51,7 +51,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="16" bodyend="19"/>
+        <location file="058_bracket_recursion.tcl" line="16" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="16" bodyend="19"/>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type/>
@@ -64,7 +64,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="22" bodyend="25"/>
+        <location file="058_bracket_recursion.tcl" line="22" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="22" bodyend="25"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1a68bdb74c144118d936931c46f75d4b3e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -78,7 +78,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="28" bodyend="32"/>
+        <location file="058_bracket_recursion.tcl" line="28" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="28" bodyend="32"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -92,7 +92,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="33" bodyend="37"/>
+        <location file="058_bracket_recursion.tcl" line="33" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="33" bodyend="37"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1af43f4b1f0064a33b2d662af9f06d3a00" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -106,7 +106,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="38" bodyend="42"/>
+        <location file="058_bracket_recursion.tcl" line="38" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="38" bodyend="42"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1aff65a51a703804e0ad1adbcfd76c86f8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -120,7 +120,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="43" bodyend="46"/>
+        <location file="058_bracket_recursion.tcl" line="43" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="43" bodyend="46"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1af6830d2c644b45088ea8f1f74a46b778" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -134,7 +134,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="47" bodyend="50"/>
+        <location file="058_bracket_recursion.tcl" line="47" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="47" bodyend="50"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1af08b4b5bfa9edf0b0a7dee1c2b2c29e0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -148,7 +148,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="51" bodyend="55"/>
+        <location file="058_bracket_recursion.tcl" line="51" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="51" bodyend="55"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1af96fd0966e32a310a0778d2e5c357700" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -162,7 +162,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="56" bodyend="59"/>
+        <location file="058_bracket_recursion.tcl" line="56" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="56" bodyend="59"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1a8c90afd4641b25be86bd09983c3cbee0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -176,7 +176,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="64" bodyend="68"/>
+        <location file="058_bracket_recursion.tcl" line="64" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="64" bodyend="68"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1a2aaa92757686acea102cba3475f0c13b" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -190,7 +190,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="69" bodyend="73"/>
+        <location file="058_bracket_recursion.tcl" line="69" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="69" bodyend="73"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1a20363f854eb4098a446733d63d34dbc1" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -204,7 +204,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="74" bodyend="77"/>
+        <location file="058_bracket_recursion.tcl" line="74" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="74" bodyend="77"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1aff56f84b49947b84b2a304f51cf8e678" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -218,7 +218,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="78" bodyend="81"/>
+        <location file="058_bracket_recursion.tcl" line="78" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="78" bodyend="81"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1a78d127e8bda64d4471ac811ad512fbd9" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -232,7 +232,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="82" bodyend="85"/>
+        <location file="058_bracket_recursion.tcl" line="82" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="82" bodyend="85"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1acdde3cd86eb2421ce8dbb2e85227d368" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -246,7 +246,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="86" bodyend="89"/>
+        <location file="058_bracket_recursion.tcl" line="86" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="86" bodyend="89"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1a495e7a4ede0831107e9d435080a7c268" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -260,7 +260,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="90" bodyend="94"/>
+        <location file="058_bracket_recursion.tcl" line="90" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="90" bodyend="94"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1a8a57650834f5708d404e9c386b2edf87" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -274,7 +274,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="98" bodyend="101"/>
+        <location file="058_bracket_recursion.tcl" line="98" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="98" bodyend="101"/>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1a15229b450f26d8fa1c10bea4f3279f4d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type/>
@@ -287,7 +287,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="102" bodyend="107"/>
+        <location file="058_bracket_recursion.tcl" line="102" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="102" bodyend="107"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1ab678a0a9a7e94bce5b17141f40220d88" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -301,7 +301,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="108" bodyend="114"/>
+        <location file="058_bracket_recursion.tcl" line="108" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="108" bodyend="114"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1a0a0bd3dc69dd06934c4e6362155e0ace" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -315,7 +315,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="115" bodyend="120"/>
+        <location file="058_bracket_recursion.tcl" line="115" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="115" bodyend="120"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1a011c73f2dbb87635a3b4206c72355f6e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -329,7 +329,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="121" bodyend="126"/>
+        <location file="058_bracket_recursion.tcl" line="121" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="121" bodyend="126"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1a69e959f6901827e4d8271aeaa5fba0fc" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -343,7 +343,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="128" bodyend="131"/>
+        <location file="058_bracket_recursion.tcl" line="128" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="128" bodyend="131"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1a2fb1c5cf58867b5bbc9a1b145a86f3a0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -357,7 +357,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="137" bodyend="142"/>
+        <location file="058_bracket_recursion.tcl" line="137" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="137" bodyend="142"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="058__bracket__recursion_8tcl_1a25ed1bcb423b0b7200f485fc5ff71c8e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -371,7 +371,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="058_bracket_recursion.tcl" bodystart="143" bodyend="148"/>
+        <location file="058_bracket_recursion.tcl" line="143" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="143" bodyend="148"/>
         <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
     </sectiondef>
diff --git a/testing/059/059__command__catch_8tcl.xml b/testing/059/059__command__catch_8tcl.xml
index a12a366..b5e5c96 100644
--- a/testing/059/059__command__catch_8tcl.xml
+++ b/testing/059/059__command__catch_8tcl.xml
@@ -15,7 +15,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="059_command_catch.tcl" bodystart="10" bodyend="13"/>
+        <location file="059_command_catch.tcl" line="10" column="1" bodyfile="059_command_catch.tcl" bodystart="10" bodyend="13"/>
         <referencedby refid="059__command__catch_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" compoundref="059__command__catch_8tcl" startline="22" endline="25">a</referencedby>
         <referencedby refid="059__command__catch_8tcl_1a68bdb74c144118d936931c46f75d4b3e" compoundref="059__command__catch_8tcl" startline="29" endline="32">b</referencedby>
         <referencedby refid="059__command__catch_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" compoundref="059__command__catch_8tcl" startline="33" endline="36">c</referencedby>
@@ -39,7 +39,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="059_command_catch.tcl" bodystart="16" bodyend="19"/>
+        <location file="059_command_catch.tcl" line="16" column="1" bodyfile="059_command_catch.tcl" bodystart="16" bodyend="19"/>
       </memberdef>
       <memberdef kind="function" id="059__command__catch_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type/>
@@ -52,7 +52,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="059_command_catch.tcl" bodystart="22" bodyend="25"/>
+        <location file="059_command_catch.tcl" line="22" column="1" bodyfile="059_command_catch.tcl" bodystart="22" bodyend="25"/>
         <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="059__command__catch_8tcl_1a68bdb74c144118d936931c46f75d4b3e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -66,7 +66,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="059_command_catch.tcl" bodystart="29" bodyend="32"/>
+        <location file="059_command_catch.tcl" line="29" column="1" bodyfile="059_command_catch.tcl" bodystart="29" bodyend="32"/>
         <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="059__command__catch_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -80,7 +80,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="059_command_catch.tcl" bodystart="33" bodyend="36"/>
+        <location file="059_command_catch.tcl" line="33" column="1" bodyfile="059_command_catch.tcl" bodystart="33" bodyend="36"/>
         <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="059__command__catch_8tcl_1af43f4b1f0064a33b2d662af9f06d3a00" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -94,7 +94,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="059_command_catch.tcl" bodystart="37" bodyend="40"/>
+        <location file="059_command_catch.tcl" line="37" column="1" bodyfile="059_command_catch.tcl" bodystart="37" bodyend="40"/>
         <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="059__command__catch_8tcl_1aff65a51a703804e0ad1adbcfd76c86f8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -108,7 +108,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="059_command_catch.tcl" bodystart="41" bodyend="44"/>
+        <location file="059_command_catch.tcl" line="41" column="1" bodyfile="059_command_catch.tcl" bodystart="41" bodyend="44"/>
         <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="059__command__catch_8tcl_1af6830d2c644b45088ea8f1f74a46b778" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -122,7 +122,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="059_command_catch.tcl" bodystart="45" bodyend="48"/>
+        <location file="059_command_catch.tcl" line="45" column="1" bodyfile="059_command_catch.tcl" bodystart="45" bodyend="48"/>
         <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="059__command__catch_8tcl_1af08b4b5bfa9edf0b0a7dee1c2b2c29e0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -136,7 +136,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="059_command_catch.tcl" bodystart="49" bodyend="54"/>
+        <location file="059_command_catch.tcl" line="49" column="1" bodyfile="059_command_catch.tcl" bodystart="49" bodyend="54"/>
         <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="059__command__catch_8tcl_1af96fd0966e32a310a0778d2e5c357700" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -150,7 +150,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="059_command_catch.tcl" bodystart="56" bodyend="59"/>
+        <location file="059_command_catch.tcl" line="56" column="1" bodyfile="059_command_catch.tcl" bodystart="56" bodyend="59"/>
         <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="059__command__catch_8tcl_1a8c90afd4641b25be86bd09983c3cbee0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -164,7 +164,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="059_command_catch.tcl" bodystart="60" bodyend="63"/>
+        <location file="059_command_catch.tcl" line="60" column="1" bodyfile="059_command_catch.tcl" bodystart="60" bodyend="63"/>
         <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="059__command__catch_8tcl_1a2aaa92757686acea102cba3475f0c13b" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -178,7 +178,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="059_command_catch.tcl" bodystart="75" bodyend="78"/>
+        <location file="059_command_catch.tcl" line="75" column="1" bodyfile="059_command_catch.tcl" bodystart="75" bodyend="78"/>
         <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
     </sectiondef>
diff --git a/testing/060/060__command__switch_8tcl.xml b/testing/060/060__command__switch_8tcl.xml
index f1792f4..2def3fc 100644
--- a/testing/060/060__command__switch_8tcl.xml
+++ b/testing/060/060__command__switch_8tcl.xml
@@ -15,7 +15,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="10" bodyend="13"/>
+        <location file="060_command_switch.tcl" line="10" column="1" bodyfile="060_command_switch.tcl" bodystart="10" bodyend="13"/>
         <referencedby refid="060__command__switch_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" compoundref="060__command__switch_8tcl" startline="22" endline="25">a</referencedby>
         <referencedby refid="060__command__switch_8tcl_1a68bdb74c144118d936931c46f75d4b3e" compoundref="060__command__switch_8tcl" startline="29" endline="36">b</referencedby>
         <referencedby refid="060__command__switch_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" compoundref="060__command__switch_8tcl" startline="37" endline="43">c</referencedby>
@@ -48,7 +48,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="16" bodyend="19"/>
+        <location file="060_command_switch.tcl" line="16" column="1" bodyfile="060_command_switch.tcl" bodystart="16" bodyend="19"/>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type/>
@@ -61,7 +61,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="22" bodyend="25"/>
+        <location file="060_command_switch.tcl" line="22" column="1" bodyfile="060_command_switch.tcl" bodystart="22" bodyend="25"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1a68bdb74c144118d936931c46f75d4b3e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -75,7 +75,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="29" bodyend="36"/>
+        <location file="060_command_switch.tcl" line="29" column="1" bodyfile="060_command_switch.tcl" bodystart="29" bodyend="36"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -89,7 +89,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="37" bodyend="43"/>
+        <location file="060_command_switch.tcl" line="37" column="1" bodyfile="060_command_switch.tcl" bodystart="37" bodyend="43"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1af43f4b1f0064a33b2d662af9f06d3a00" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -103,7 +103,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="44" bodyend="50"/>
+        <location file="060_command_switch.tcl" line="44" column="1" bodyfile="060_command_switch.tcl" bodystart="44" bodyend="50"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1aff65a51a703804e0ad1adbcfd76c86f8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -117,7 +117,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="51" bodyend="57"/>
+        <location file="060_command_switch.tcl" line="51" column="1" bodyfile="060_command_switch.tcl" bodystart="51" bodyend="57"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1af6830d2c644b45088ea8f1f74a46b778" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -131,7 +131,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="58" bodyend="65"/>
+        <location file="060_command_switch.tcl" line="58" column="1" bodyfile="060_command_switch.tcl" bodystart="58" bodyend="65"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1af08b4b5bfa9edf0b0a7dee1c2b2c29e0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -145,7 +145,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="66" bodyend="73"/>
+        <location file="060_command_switch.tcl" line="66" column="1" bodyfile="060_command_switch.tcl" bodystart="66" bodyend="73"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1af96fd0966e32a310a0778d2e5c357700" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -159,7 +159,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="74" bodyend="81"/>
+        <location file="060_command_switch.tcl" line="74" column="1" bodyfile="060_command_switch.tcl" bodystart="74" bodyend="81"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1a8c90afd4641b25be86bd09983c3cbee0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -173,7 +173,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="83" bodyend="94"/>
+        <location file="060_command_switch.tcl" line="83" column="1" bodyfile="060_command_switch.tcl" bodystart="83" bodyend="94"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1a2aaa92757686acea102cba3475f0c13b" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -187,7 +187,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="95" bodyend="106"/>
+        <location file="060_command_switch.tcl" line="95" column="1" bodyfile="060_command_switch.tcl" bodystart="95" bodyend="106"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1a20363f854eb4098a446733d63d34dbc1" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -201,7 +201,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="107" bodyend="118"/>
+        <location file="060_command_switch.tcl" line="107" column="1" bodyfile="060_command_switch.tcl" bodystart="107" bodyend="118"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1aff56f84b49947b84b2a304f51cf8e678" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -215,7 +215,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="119" bodyend="129"/>
+        <location file="060_command_switch.tcl" line="119" column="1" bodyfile="060_command_switch.tcl" bodystart="119" bodyend="129"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1a78d127e8bda64d4471ac811ad512fbd9" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -229,7 +229,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="130" bodyend="141"/>
+        <location file="060_command_switch.tcl" line="130" column="1" bodyfile="060_command_switch.tcl" bodystart="130" bodyend="141"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1acdde3cd86eb2421ce8dbb2e85227d368" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -243,7 +243,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="142" bodyend="153"/>
+        <location file="060_command_switch.tcl" line="142" column="1" bodyfile="060_command_switch.tcl" bodystart="142" bodyend="153"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1a495e7a4ede0831107e9d435080a7c268" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -257,7 +257,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="154" bodyend="165"/>
+        <location file="060_command_switch.tcl" line="154" column="1" bodyfile="060_command_switch.tcl" bodystart="154" bodyend="165"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1a15229b450f26d8fa1c10bea4f3279f4d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -271,7 +271,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="166" bodyend="175"/>
+        <location file="060_command_switch.tcl" line="166" column="1" bodyfile="060_command_switch.tcl" bodystart="166" bodyend="175"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1ab678a0a9a7e94bce5b17141f40220d88" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -285,7 +285,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="176" bodyend="185"/>
+        <location file="060_command_switch.tcl" line="176" column="1" bodyfile="060_command_switch.tcl" bodystart="176" bodyend="185"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1a0a0bd3dc69dd06934c4e6362155e0ace" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -299,7 +299,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="186" bodyend="195"/>
+        <location file="060_command_switch.tcl" line="186" column="1" bodyfile="060_command_switch.tcl" bodystart="186" bodyend="195"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
       <memberdef kind="function" id="060__command__switch_8tcl_1a011c73f2dbb87635a3b4206c72355f6e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -313,7 +313,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="060_command_switch.tcl" bodystart="196" bodyend="205"/>
+        <location file="060_command_switch.tcl" line="196" column="1" bodyfile="060_command_switch.tcl" bodystart="196" bodyend="205"/>
         <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
       </memberdef>
     </sectiondef>
diff --git a/testing/061/class_test.xml b/testing/061/class_test.xml
index b233e9c..47e70ac 100644
--- a/testing/061/class_test.xml
+++ b/testing/061/class_test.xml
@@ -15,7 +15,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="061_bug_705503.tcl" bodystart="12" bodyend="12"/>
+        <location file="061_bug_705503.tcl" line="12" column="1" bodyfile="061_bug_705503.tcl" bodystart="12" bodyend="12"/>
       </memberdef>
       <memberdef kind="function" id="class_test_1ac7148d2852b30d157e078fe0fe58a350" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type/>
@@ -29,7 +29,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="061_bug_705503.tcl" bodystart="16" bodyend="16"/>
+        <location file="061_bug_705503.tcl" line="16" column="1" bodyfile="061_bug_705503.tcl" bodystart="16" bodyend="16"/>
       </memberdef>
       <memberdef kind="function" id="class_test_1abdf3375950ec49e29f4bae947b7e3f26" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type/>
@@ -43,7 +43,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="061_bug_705503.tcl" bodystart="19" bodyend="19"/>
+        <location file="061_bug_705503.tcl" line="19" column="1" bodyfile="061_bug_705503.tcl" bodystart="19" bodyend="19"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
@@ -51,7 +51,7 @@
     </briefdescription>
     <detaileddescription>
     </detaileddescription>
-    <location file="061_bug_705503.tcl" bodystart="10" bodyend="13"/>
+    <location file="061_bug_705503.tcl" line="10" column="1" bodyfile="061_bug_705503.tcl" bodystart="10" bodyend="13"/>
     <listofallmembers>
       <member refid="class_test_1ac7148d2852b30d157e078fe0fe58a350" prot="public" virt="non-virtual">
         <scope>Test</scope>
diff --git a/testing/062/namespacen1.xml b/testing/062/namespacen1.xml
index a31fc29..408ef87 100644
--- a/testing/062/namespacen1.xml
+++ b/testing/062/namespacen1.xml
@@ -15,7 +15,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="062_namespace_resolution.tcl" bodystart="12" bodyend="16"/>
+        <location file="062_namespace_resolution.tcl" line="12" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="12" bodyend="16"/>
         <references refid="namespacen1_1a0bff29f718fa43e49b7ca79985afb5fa" compoundref="062__namespace__resolution_8tcl" startline="17" endline="20">p2</references>
       </memberdef>
       <memberdef kind="function" id="namespacen1_1a0bff29f718fa43e49b7ca79985afb5fa" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -29,7 +29,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="062_namespace_resolution.tcl" bodystart="17" bodyend="20"/>
+        <location file="062_namespace_resolution.tcl" line="17" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="17" bodyend="20"/>
         <referencedby refid="namespacen1_1a9f23d7a7f141915457e8e26023d70cb4" compoundref="062__namespace__resolution_8tcl" startline="12" endline="16">p1</referencedby>
       </memberdef>
     </sectiondef>
diff --git a/testing/062/namespacen2.xml b/testing/062/namespacen2.xml
index 29c4d80..f545576 100644
--- a/testing/062/namespacen2.xml
+++ b/testing/062/namespacen2.xml
@@ -15,7 +15,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="062_namespace_resolution.tcl" bodystart="31" bodyend="35"/>
+        <location file="062_namespace_resolution.tcl" line="31" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="31" bodyend="35"/>
         <references refid="namespacen2_1a49fadfbefa795204a3c566ec76ff632f" compoundref="062__namespace__resolution_8tcl" startline="36" endline="39">p2</references>
       </memberdef>
       <memberdef kind="function" id="namespacen2_1a49fadfbefa795204a3c566ec76ff632f" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -29,7 +29,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="062_namespace_resolution.tcl" bodystart="36" bodyend="39"/>
+        <location file="062_namespace_resolution.tcl" line="36" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="36" bodyend="39"/>
         <referencedby refid="namespacen2_1a74950c0185232e374220a0707b4903c6" compoundref="062__namespace__resolution_8tcl" startline="31" endline="35">p1</referencedby>
       </memberdef>
     </sectiondef>
diff --git a/testing/062/namespacen3.xml b/testing/062/namespacen3.xml
index bfc1364..f8c2fb5 100644
--- a/testing/062/namespacen3.xml
+++ b/testing/062/namespacen3.xml
@@ -15,7 +15,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="062_namespace_resolution.tcl" bodystart="47" bodyend="51"/>
+        <location file="062_namespace_resolution.tcl" line="47" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="47" bodyend="51"/>
         <references refid="namespacen3_1a14e9fe1b27a6d36db9ace2eef4509979" compoundref="062__namespace__resolution_8tcl" startline="52" endline="55">p2</references>
       </memberdef>
       <memberdef kind="function" id="namespacen3_1a14e9fe1b27a6d36db9ace2eef4509979" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
@@ -29,7 +29,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="062_namespace_resolution.tcl" bodystart="52" bodyend="55"/>
+        <location file="062_namespace_resolution.tcl" line="52" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="52" bodyend="55"/>
         <referencedby refid="namespacen3_1ae7e87e49507bd56dad087cffecd35b29" compoundref="062__namespace__resolution_8tcl" startline="47" endline="51">p1</referencedby>
       </memberdef>
     </sectiondef>
diff --git a/testing/063/namespaceoo_1_1_helpers.xml b/testing/063/namespaceoo_1_1_helpers.xml
index 40b4830..e9083dc 100644
--- a/testing/063/namespaceoo_1_1_helpers.xml
+++ b/testing/063/namespaceoo_1_1_helpers.xml
@@ -15,7 +15,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="063_bug_729092.tcl" bodystart="34" bodyend="43"/>
+        <location file="063_bug_729092.tcl" line="34" column="1" bodyfile="063_bug_729092.tcl" bodystart="34" bodyend="43"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/063/namespaceoo_1_1define.xml b/testing/063/namespaceoo_1_1define.xml
index 214b705..69c05d0 100644
--- a/testing/063/namespaceoo_1_1define.xml
+++ b/testing/063/namespaceoo_1_1define.xml
@@ -15,7 +15,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="063_bug_729092.tcl" bodystart="18" bodyend="27"/>
+        <location file="063_bug_729092.tcl" line="18" column="1" bodyfile="063_bug_729092.tcl" bodystart="18" bodyend="27"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/064/struct_foo.xml b/testing/064/struct_foo.xml
index 3765625..d2bed81 100644
--- a/testing/064/struct_foo.xml
+++ b/testing/064/struct_foo.xml
@@ -97,7 +97,7 @@
         </itemizedlist>
       </para>
     </detaileddescription>
-    <location file="064_castoperator.cpp" bodystart="20" bodyend="25"/>
+    <location file="064_castoperator.cpp" line="20" column="1" bodyfile="064_castoperator.cpp" bodystart="20" bodyend="25"/>
     <listofallmembers>
       <member refid="struct_foo_1aab9774d892b6cd4a0fbebd034b4c1fad" prot="public" virt="non-virtual">
         <scope>Foo</scope>
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
new file mode 100644
index 0000000..21df5ab
--- /dev/null
+++ b/testing/CMakeLists.txt
@@ -0,0 +1,9 @@
+find_program(XMLLINT NAMES xmllint)
+find_program(DIFF NAMES diff)
+
+add_custom_target(tests
+	COMMENT "Running doxygen tests..."
+        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --all --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
+	DEPENDS doxygen
+)
+
diff --git a/testing/Makefile b/testing/Makefile
deleted file mode 100644
index f40107f..0000000
--- a/testing/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-tests: 
-	@perl runtests.pl --doxygen ../bin/doxygen
-
diff --git a/testing/README b/testing/README.txt
index 993ff48..ee3de59 100644
--- a/testing/README
+++ b/testing/README.txt
@@ -1,18 +1,18 @@
 Doxygen regession test suite
 ============================
 
-This directory contains a set of regression tests. Each test consists of a 
-file starting with a 3 digit number and a corresponding directory whose name 
-has the same 3 digit number. The directory contains one or more reference 
-files that are compared against the XML output produced by doxygen. If the 
-result is the same, there is no regression and the test passes. If there is a 
+This directory contains a set of regression tests. Each test consists of a
+file starting with a 3 digit number and a corresponding directory whose name
+has the same 3 digit number. The directory contains one or more reference
+files that are compared against the XML output produced by doxygen. If the
+result is the same, there is no regression and the test passes. If there is a
 difference the test fails and the difference (in diff -u format) will be shown.
 
-The runtest.pl script responsible for running the tests takes a number of 
+The runtest.py script responsible for running the tests takes a number of
 optional parameters:
--id n:        run test with number n only (the option may be specified 
+-id n:        run test with number n only (the option may be specified
               multiple times) default is to run all tests.
--updateref:   update the reference files. Should be used in combination 
+-updateref:   update the reference files. Should be used in combination
               with -id to update the reference file(s) for the given test.
 -all:         can be used in combination with -updateref to update the
               reference files for all tests.
@@ -20,29 +20,29 @@ optional parameters:
 -xmllint exe: run the specified xmllint executable.
 
 The runtest.pl has the following dependenies on 3rd party tools:
-- perl    to run the script
+- python  to run the script
 - xmllint to normalize the XML output
 - diff    to show the differences in case a test fails
- 
+
 Each test file can have a number of special comment lines that are extracted by
 the runtest.pl script and take the form:
-// <identifier>: 'argument' 
+// <identifier>: 'argument'
 Where <identifier> can be one of:
 - objective: 'argument' provides the objective for the test (i.e. its purpose)
-- check:     'argument' names a file that is generated by doxygen, which should 
+- check:     'argument' names a file that is generated by doxygen, which should
              be compared against the reference.
 - config:    'argument' is a line that is added to the default Doxyfile used to
              run doxygen on the test file.
 
 Example to run all tests:
-    perl runtest.pl
+    python runtest.py
 
 Example to run a test
-    perl runtest.pl -id 10
+    python runtest.py -id 10
 
 Example to update the reference files for a test
-    perl runtest.pl -updateref -id 10
+    python runtest.py -updateref -id 10
 
-There is also a Makefile, which can be used to run all tests by simply
-invoking make.
+There is also a CMakeLists.txt, which can be used from the build directory
+to run all tests by simply invoking 'make tests'.
 
diff --git a/testing/runtests.pl b/testing/runtests.pl
deleted file mode 100755
index 6b705aa..0000000
--- a/testing/runtests.pl
+++ /dev/null
@@ -1,252 +0,0 @@
-#!/usr/bin/perl
-
-# perl script to execute doxygen's regression test suite.
-#
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby 
-# granted. No representations are made about the suitability of this software 
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-#
-# Documents produced by Doxygen are derivative works derived from the
-# input used in their production; they are not affected by this license.
-
-use strict;
-use warnings;
-
-use Getopt::Long;
-use Test::More;
-use File::Path qw(make_path remove_tree);
-use File::Copy qw(copy);
-
-my $Test = Test::Builder->new;
-my $opt_doxygen_exe = 'doxygen';
-my $opt_xmllint_exe = 'xmllint';
-my $opt_updateref = '';
-my @opt_test_ids;
-my $opt_all = '';
-
-GetOptions( 'updateref'  => \$opt_updateref,
-            'doxygen=s'  => \$opt_doxygen_exe,
-            'xmllint=s'  => \$opt_xmllint_exe,
-            'id=i'       => \@opt_test_ids,
-            'all'        => \$opt_all
-          );
-
-sub read_two_files {
-  my $first   = shift;
-  my $second  = shift;
-  my $filter  = shift;
-  my $success = 1;
-  my @errors;
-
-  unless (open FIRST, "$first") {
-    $success = 0;
-    push @errors, "$first absent";
-  }
-  unless (open SECOND, "$second") {
-    $success = 0;
-    push @errors, "$second absent";
-  }
-  return ($success, @errors) unless $success;
-
-  my $first_lines  = join "",<FIRST>;
-  my $second_lines = join "",<SECOND>;
-  
-  close FIRST;
-  close SECOND;
-
-  return ($success, $first_lines, $second_lines);
-}
-
-sub compare_ok {
-  my $got_file      = shift;
-  my $expected_file = shift;
-  my $name          = shift;
-  my @read_result   = read_two_files($got_file, $expected_file);
-  my $files_exist   = shift @read_result;
-
-  if ($files_exist) {
-    my ($got, $expected) = @read_result;
-    my $diff = `diff -u $got_file $expected_file`;
-    my $failed = length $diff;
-    return ($failed,"Difference between generated output and reference:\n$diff");
-  }
-  else {
-    return (1,join "\n", @read_result);
-  }
-}
-
-sub chop_volatile {
-  my $line = shift;
-  $line =~ s/version="\d\.\d.\d+"/version=""/g; # strip version
-  $line =~ s/file=".*\/(.*)"/file="$1"/g; # strip location
-  return $line;
-}
-
-sub get_config {
-  my $file = shift;
-  my %config;
-  open F,"<$file";
-  while (<F>) {
-    if (/\/\/\s*(\S+):\s*(.*)$/) {
-      my $key = $1;
-      my $val = $2;
-      chomp $val;
-      $config{$key} = [] unless defined $config{$key};
-      push @{$config{$key}},$val;
-    }
-  }
-  return %config;
-}
-
-sub perform_test {
-  my $test_file = shift;
-  my %config = get_config($test_file);
-  my $test_name = "[$test_file]: $config{'objective'}[0]";
-  my $test_id = $test_file;
-  $test_id =~ s/^(\d+).*$/$1/;
-  my $test_out = "test_output_${test_id}";
-
-  if (scalar($config{'check'})==0) {
-    $Test->ok(0, $test_name);
-    $Test->diag("Test doesn't specify any files to check");
-    return;
-  }
-
-  # prepare test environment
-  remove_tree("$test_out");
-  make_path("$test_out");
-  copy("Doxyfile","$test_out");
-  open(F,">>$test_out/Doxyfile");
-  print F "INPUT = $test_file\n";
-  print F "XML_OUTPUT = $test_out/out\n";
-  foreach my $cfg (@{$config{'config'}}) {
-    print F "$cfg\n";
-  }
-  close(F);
-
-  # run doxygen
-  if (system("$opt_doxygen_exe $test_out/Doxyfile")!=0) {
-    $Test->ok(0, $test_name);
-    $Test->diag("Failed to run doxygen");
-    return;
-  } 
-
-  # look for files to check against the reference
-  foreach my $fn (@{$config{'check'}}) {
-    if (!-f "$test_out/out/$fn") {
-      $Test->ok(0, $test_name);
-      $Test->diag("Non-existing file $test_out/out/$fn after 'check:' statement");
-      return;
-    }
-    # run xmllint on the output file
-    my @lines = `$opt_xmllint_exe --format --noblanks --nowarning $test_out/out/$fn`;
-    if (scalar(@lines)>0 && open(F,">$test_out/$fn")) {
-      foreach my $line (@lines) {
-        print F chop_volatile($line);
-      }
-      close(F);
-    } else {
-      $Test->ok(0, $test_name);
-      $Test->diag("Failed to run xmllint on the doxygen output file $test_out/out/$fn");
-    }
-    my ($failed,$msg) = compare_ok("$test_out/$fn","$test_id/$fn",$test_name);
-    if ($failed) {
-      $Test->ok(0, $test_name);
-      $Test->diag($msg);
-      return;
-    }
-  }
-
-  # test passed
-  remove_tree("$test_out");
-  $Test->ok(1, $test_name);
-}
-
-sub update_test {
-  my $test_file = shift;
-  my %config = get_config($test_file);
-  my $test_name = "[$test_file]: $config{'objective'}[0]";
-  my $test_id = $test_file;
-  $test_id =~ s/^(\d+).*$/$1/;
-  my $test_out = $test_id;
-
-  # prepare reference environment
-  remove_tree("$test_out");
-  make_path("$test_out");
-  copy("Doxyfile","$test_out");
-  open(F,">>$test_out/Doxyfile");
-  print F "INPUT = $test_file\n";
-  print F "XML_OUTPUT = $test_out/out\n";
-  foreach my $cfg (@{$config{'config'}}) {
-    print F "$cfg\n";
-  }
-  close(F);
-
-  print "Updating reference for $test_name\n";
-
-  # run doxygen
-  if (system("$opt_doxygen_exe $test_out/Doxyfile")!=0) {
-    print("Error: failed to run doxygen");
-    return;
-  } 
-  my $err=0;
-
-  # look for files to prepare as reference
-  foreach my $fn (@{$config{'check'}}) {
-    if (!-f "$test_out/out/$fn") {
-      printf("Error: Non-existing file $test_out/out/$fn after 'check:' statement\n");
-      $err=1;
-    }
-    # run xmllint on the output file
-    if (!$err) {
-      my @lines = `$opt_xmllint_exe --format --noblanks --nowarning $test_out/out/$fn`;
-      if (scalar(@lines)>0 && open(F,">$test_out/$fn")) {
-        foreach my $line (@lines) {
-          print F chop_volatile($line);
-        }
-        close(F);
-      } else {
-        printf("Error: Failed to run xmllint on the doxygen output file $test_out/out/$fn\n");
-        $err=1;
-      }
-    }
-  }
-
-  if (!$err) {
-    # clean-up
-    remove_tree("$test_out/out");
-    unlink("$test_out/Doxyfile");
-  }
-}
-
-# get the tests
-my @tests;
-if (scalar(@opt_test_ids)==0 && $opt_updateref && !$opt_all) {
-  printf("Error: updateref option requires -id to update a test or -all to update all\n");
-  exit(1);
-}
-if (scalar(@opt_test_ids)>0) {
-  foreach my $t (@opt_test_ids) {
-    push @tests, glob("${t}_* 0${t}_* 00${t}_*");
-  }
-} else {
-  @tests = glob('[0-9][0-9][0-9]_*');
-}
-
-if ($opt_updateref) {
-  # update reference
-  foreach my $test (@tests) {
-    update_test($test);
-  }
-} else {
-  # run tests
-  plan tests => scalar(@tests);
-  foreach my $test (@tests) {
-    perform_test($test);
-  }
-}
-
diff --git a/testing/runtests.py b/testing/runtests.py
new file mode 100644
index 0000000..149d457
--- /dev/null
+++ b/testing/runtests.py
@@ -0,0 +1,205 @@
+#!/usr/bin/python
+
+from __future__ import print_function
+import argparse, glob, itertools, re, shutil, os, sys
+
+config_reg = re.compile('.*\/\/\s*(?P<name>\S+):\s*(?P<value>.*)$')
+
+class Tester:
+	def __init__(self,args,test):
+		self.args      = args
+		self.test      = test
+		self.update    = args.updateref
+		self.config    = self.get_config()
+		self.test_name = '[%s]: %s' % (self.test,self.config['objective'][0])
+		self.test_id   = self.test.split('_')[0]
+		if self.update:
+			self.test_out = self.args.inputdir+'/'+self.test_id
+		else:
+			self.test_out = self.args.outputdir+'/test_output_'+self.test_id
+		self.prepare_test()
+
+	def compare_ok(self,got_file,expected_file,name):
+		if not os.path.isfile(got_file):
+			return (True,'%s absent' % got_file)
+		elif not os.path.isfile(expected_file):
+			return (True,'%s absent' % expected_file)
+		else:
+			diff = os.popen('diff -b -w -u %s %s' % (got_file,expected_file)).read()
+			if diff and not diff.startswith("No differences"):
+				return (True,'Difference between generated output and reference:\n%s' % diff)
+		return (False,'')
+
+	def get_config(self):
+		config = {}
+		with open(self.args.inputdir+'/'+self.test,'r') as f:
+			for line in f.readlines():
+				m = config_reg.match(line)
+				if m:
+					key   = m.group('name')
+					value = m.group('value')
+					if (key=='config'):
+						value = value.replace('$INPUTDIR',self.args.inputdir)
+					#print('key=%s value=%s' % (key,value))
+					if key in config:
+						config[key].append(value)
+					else:
+						config[key] = [value]
+		return config
+
+	def prepare_test(self):
+		# prepare test environment
+		shutil.rmtree(self.test_out,ignore_errors=True)
+		os.mkdir(self.test_out)
+		shutil.copy(self.args.inputdir+'/Doxyfile',self.test_out)
+		with open(self.test_out+'/Doxyfile','a') as f:
+			print('INPUT=%s/%s' % (self.args.inputdir,self.test), file=f)
+			print('STRIP_FROM_PATH=%s' % self.args.inputdir, file=f)
+			print('XML_OUTPUT=%s/out' % self.test_out, file=f)
+			print('EXAMPLE_PATH=%s' % self.args.inputdir, file=f)
+			if 'config' in self.config:
+				for option in self.config['config']:
+					print(option, file=f)
+
+		if 'check' not in self.config or not self.config['check']:
+			print('Test doesn\'t specify any files to check')
+			sys.exit(1)
+
+		# run doxygen
+		if (sys.platform == 'win32'):
+			redir=' > nul:'             
+		else:
+			redir=' 2> /dev/null'             
+		if os.system('%s %s/Doxyfile %s' % (self.args.doxygen,self.test_out, redir))!=0:
+			print('Error: failed to run %s on %s/Doxyfile' % (self.args.doxygen,self.test_out));
+			sys.exit(1)
+
+	# update the reference data for this test
+	def update_test(self,testmgr):
+		print('Updating reference for %s' % self.test_name)
+
+		if 'check' in self.config:
+			for check in self.config['check']:
+				check_file='%s/out/%s' % (self.test_out,check)
+				# check if the file we need to check is actually generated
+				if not os.path.isfile(check_file):
+					print('Non-existing file %s after \'check:\' statement' % check_file)
+					return
+				# convert output to canonical form
+				data = os.popen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file)).read()
+				if data:
+					# strip version
+					data = re.sub(r'xsd" version="[0-9.-]+"','xsd" version=""',data).rstrip('\n')
+				else:
+					print('Failed to run %s on the doxygen output file %s' % (self.args.xmllint,self.test_out))
+					return
+				out_file='%s/%s' % (self.test_out,check)
+				with open(out_file,'w') as f:
+					print(data,file=f)
+		shutil.rmtree(self.test_out+'/out',ignore_errors=True)
+		os.remove(self.test_out+'/Doxyfile')
+
+	# check the relevant files of a doxygen run with the reference material
+	def perform_test(self,testmgr):
+		# look for files to check against the reference
+		if 'check' in self.config:
+			for check in self.config['check']:
+				check_file='%s/out/%s' % (self.test_out,check)
+				# check if the file we need to check is actually generated
+				if not os.path.isfile(check_file):
+					testmgr.ok(False,self.test_name,msg='Non-existing file %s after \'check:\' statement' % check_file)
+					return
+				# convert output to canonical form
+				data = os.popen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file)).read()
+				if data:
+					# strip version
+					data = re.sub(r'xsd" version="[0-9.-]+"','xsd" version=""',data).rstrip('\n')
+				else:
+					testmgr.ok(False,self.test_name,msg='Failed to run %s on the doxygen output file %s' % (self.args.xmllint,self.test_out))
+					return
+				out_file='%s/%s' % (self.test_out,check)
+				with open(out_file,'w') as f:
+					print(data,file=f)
+				ref_file='%s/%s/%s' % (self.args.inputdir,self.test_id,check)
+				(failed,msg) = self.compare_ok(out_file,ref_file,self.test_name)
+				if failed:
+					testmgr.ok(False,self.test_name,msg)
+					return
+		shutil.rmtree(self.test_out,ignore_errors=True)
+		testmgr.ok(True,self.test_name)
+
+	def run(self,testmgr):
+		if self.update:
+			self.update_test(testmgr)
+		else:
+			self.perform_test(testmgr)
+
+class TestManager:
+	def __init__(self,args,tests):
+		self.args  = args
+		self.tests = tests
+		self.num_tests = len(tests)
+		self.count=1
+		self.passed=0
+		print('1..%d' % self.num_tests)
+
+	def ok(self,result,test_name,msg='Ok'):
+		if result:
+			print('ok %s - %s' % (self.count,test_name))
+			self.passed = self.passed + 1
+		else:
+			print('not ok %s - %s' % (self.count,test_name))
+			print('-------------------------------------')
+			print(msg)
+			print('-------------------------------------')
+		self.count = self.count + 1
+
+	def result(self):
+		if self.passed==self.num_tests:
+			print('All tests passed!')
+		else:
+			print('%d out of %s tests failed' % (self.num_tests-self.passed,self.num_tests))
+		return 0 if self.passed==self.num_tests else 1
+
+	def perform_tests(self):
+		for test in self.tests:
+			tester = Tester(self.args,test)
+			tester.run(self)
+		return 0 if self.args.updateref else self.result()
+
+def main():
+	# argument handling
+	parser = argparse.ArgumentParser(description='run doxygen tests')
+	parser.add_argument('--updateref',help='update the reference data for a test',action="store_true")
+	parser.add_argument('--doxygen',nargs='?',default='doxygen',help='path/name of the doxygen executable')
+	parser.add_argument('--xmllint',nargs='?',default='xmllint',help='path/name of the xmllint executable')
+	parser.add_argument('--id',nargs='+',dest='ids',action='append',type=int,help='id of the test to perform')
+	parser.add_argument('--all',help='perform all tests',action="store_true")
+	parser.add_argument('--inputdir',nargs='?',default='.',help='input directory containing the tests')
+	parser.add_argument('--outputdir',nargs='?',default='.',help='output directory to write the doxygen output to')
+	args = parser.parse_args()
+
+    # sanity check
+	if (not args.updateref is None) and (args.ids is None) and (args.all is None):
+		parser.error('--updateref requires either --id or --all')
+
+	starting_directory = os.getcwd()
+	os.chdir(args.inputdir)
+    # find the tests to run
+	if args.ids: # test ids are given by user
+		tests = []
+		for id in list(itertools.chain.from_iterable(args.ids)):
+			tests.append(glob.glob('%s_*'%id))
+			tests.append(glob.glob('0%s_*'%id))
+			tests.append(glob.glob('00%s_*'%id))
+		tests = list(itertools.chain.from_iterable(tests))
+	else: # find all tests
+		tests = glob.glob('[0-9][0-9][0-9]_*')
+	os.chdir(starting_directory)
+
+	# create test manager to run the tests
+	testManager = TestManager(args,tests)
+	sys.exit(testManager.perform_tests())
+
+if __name__ == '__main__':
+	main()
diff --git a/tmake/CHANGES b/tmake/CHANGES
deleted file mode 100644
index ce686e9..0000000
--- a/tmake/CHANGES
+++ /dev/null
@@ -1,49 +0,0 @@
-		     Changes from version 1.2 to 1.3
-
-* Improved Qt 2.0 support.
-
-* INCLUDEPATH can have directories containing whitespace (use semicolon)
-  as separator.
-
-* Many, many code fixes and doc improvements.
-
-
-		     Changes from version 1.1 to 1.2
-
-* tmake is no longer restricted to C++ only.  You can now use both C++
-  and C files in your project.  Thanks to Ulrich Ring for valuable feed-
-  back and comments.
-
-* Added support for building DLL libraries under Windows.
-  NOTE: Qt 1.42 and later now uses qtmain.lib in addition to qt.lib
-  when your application uses the Qt DLL.  Add "DEFINES = QT_DLL" to
-  your project file to use the Qt DLL.
-
-* New dist target added in the app and lib templates.
-  Run "make dist" to pack all files in your project using tar/gzip or zip.
-  Thanks to Kalle Dalheimer for this patch.
-
-* Fixed bad command line interpretation bug in tmake.exe and progen.exe.
-
-* Added support for Borland C++ builder 3.
-
-* Initial support for QNX/g++ and the IBM Visual Age compiler on Win32.
-  Thanks to Igor Kovalenko and Joost Kraaijeveld.
-
-* Many fixes in tmake.conf for several Unix configurations.
-
-
-		     Changes from version 1.0 to 1.1
-
-* Provides tmake.exe and progen.exe for Windows users without perl.
-
-* Added many new Unix templates.
-
-* Added subdirs.t templates.
-
-* Added system-dependent project settings
-  (e.g. solaris-cc:TMAKE_CFLAGS = -pts)
-
-* Many bug fixes and improvements for existing templates.
-
-* Improved documentation.
diff --git a/tmake/LICENSE b/tmake/LICENSE
deleted file mode 100644
index 7262d5a..0000000
--- a/tmake/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
-		       License Statement for tmake
-
-Copyright (C) 1996-1999 by Troll Tech AS.  All rights reserved.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided
-that the this copyright notice appears in all copies.
-No representations are made about the suitability of this software for any
-purpose. It is provided "as is" without express or implied warranty.
diff --git a/tmake/README b/tmake/README
deleted file mode 100644
index b049d32..0000000
--- a/tmake/README
+++ /dev/null
@@ -1,10 +0,0 @@
-			    tmake version 1.3
-
-tmake is an easy-to-use tool for creating and maintaining makefiles across
-many platforms and compilers. For information about installing and using
-tmake, see:
-
-  doc/tmake.html      -- User's Guide
-  doc/tmake_ref.html  -- Reference Manual
-
-Download the latest version from: <ftp://ftp.troll.no/freebies/tmake>
diff --git a/tmake/bin/progen b/tmake/bin/progen
deleted file mode 100755
index 5be6411..0000000
--- a/tmake/bin/progen
+++ /dev/null
@@ -1,249 +0,0 @@
-#!/usr/bin/perl
-############################################################################
-# 
-#
-# Generates a tmake project file.
-#
-# Copyright (C) 1996-1998 by Troll Tech AS.  All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose and without fee is hereby granted, provided
-# that this copyright notice appears in all copies.
-# No representations are made about the suitability of this software for any
-# purpose. It is provided "as is" without express or implied warranty.
-#
-############################################################################
-
-# Default project settings
-$project{"TEMPLATE"} = "app";
-$project{"CONFIG"}   = "qt warn_on release";
-
-@project_extra = ();
-
-while ( @ARGV ) {			# parse command line args
-    $_ = shift @ARGV;
-    if ( s/^-// ) {
-	if ( /^o(.*)/ ) {
-	    $outfile = ($1 eq "") ? shift @ARGV : $1;
-	    ($outfile eq "-") && ($outfile = "");
-	} elsif ( /^n(.*)/ ) {
-	    $project{"TARGET"} = ($1 eq "") ? shift @ARGV : $1;
-	} elsif ( /^t(.*)/ ) {
-	    $project{"TEMPLATE"} = ($1 eq "") ? shift @ARGV : $1;
-	    $project{"TEMPLATE"} =~ s/\.t$//i;
-	} elsif ( /lower/ ) {
-	    $tolower = 1;
-	} else {
-	    &progen_usage;
-	}
-    } elsif ( /^\s*(?:[\w\-]+:)?\w+\s*[\+\-\*\/]?=/ ) {	# project override
-	push( @project_extra, $_ );
-    } else {
-	push (@files, $_ );
-    }
-}
-
-$outfile eq "" || open(STDOUT,">" . $outfile) ||
-    &progen_error("Can't create \"$outfile\"");
-
-if ( ! @files ) {
-    @files = &find_files(".",".*",1);
-}
-
-if ( $tolower ) {
-    foreach $f ( @files ) {
-	$f =~ tr/A-Z/a-z/;
-    }
-}
-
-@hdr = sort grep(/\.(h|hh|hpp|hxx)$/i,@files);
-@src = sort grep(/\.(c|cpp|cc|cxx)$/i && ! /moc_/i,@files);
-
-# Remove source files that are included by other source files
-foreach $f ( @src ) {
-    $srcdict{$f} = 1;
-}
-foreach $f ( @src ) {
-    if ( open(F,"< $f") ) {
-	while ( <F> ) {
-	    if ( /^\s*#\s*include\s+\"([^\"]*)\"/ ) {
-		$srcdict{$1} = 0;
-	    }
-	}
-    }
-}
-foreach $f( @src ) {
-    $srcdict{$f} && (push(@src2,$f));
-}
-@src = @src2;
-
-$project{"HEADERS"} = join(" ",sort @hdr);
-$project{"SOURCES"} = join(" ",sort @src);
-
-foreach $p ( @project_extra ) {
-    if ( $p =~ /^\s*((?:[\w\-]+:)?\w+)\s*([\+\-\*\/])?=\s*(.*)/ ) {
-	if ( $project{$1} ne "" ) {
-	    Project($p);
-	}
-    }
-}
-
-$project{"HEADERS"} =~ s/\s+/ \\\n\t\t  /g;
-$project{"SOURCES"} =~ s/\s+/ \\\n\t\t  /g;
-
-print "TEMPLATE\t= " . $project{"TEMPLATE"} . "\n";
-print "CONFIG\t\t= " . $project{"CONFIG"} . "\n";
-print "HEADERS\t\t= " . $project{"HEADERS"} . "\n";
-print "SOURCES\t\t= " . $project{"SOURCES"} . "\n";
-if ( $project{"TARGET"} ne "" ) {
-    print "TARGET\t\t= " . $project{"TARGET"} . "\n";
-}
-
-foreach ( @project_extra ) {
-    if ( /^\s*((?:[\w\-]+:)?\w+)\s*([\+\-\*\/])?=\s*(.*)/ ) {
-	if ( $project{$1} eq "" ) {
-	    $t = $1;
-	    if ( length($t) < 8 ) {
-		$t .= "\t\t";
-	    } elsif ( length($t) < 16 ) {
-		$t .= "\t";
-	    } else {
-		$t .= " ";
-	    }
-	    print "$t$2= $3\n";
-	}
-    }
-}
-
-exit 0;
-
-
-#
-# progen_usage()
-#
-# Prints a message about program usage and exits
-#
-
-sub progen_usage {
-    print STDERR "Usage:\n    progen [options] [files]\n";
-    print STDERR "Options:\n";
-    print STDERR "    -lower   Lower-case letters filenames (useful for non-Unix)\n";
-    print STDERR "    -n name  Specify a project name (= TARGET)\n";
-    print STDERR "    -o file  Write output to \"file\"\n";
-    print STDERR "    -t file  Specify a template file other than qtapp\n";
-    exit 1;
-}
-
-
-#
-# progen_error(msg)
-#
-# Prints the message and exits
-#
-
-sub progen_error {
-    my($msg) = @_;
-    print STDERR "progen error: " . $msg . "\n";
-    exit 1;
-}
-
-
-#
-# Finds files.
-#
-# Examples:
-#   find_files("/usr","\.cpp$",1)   - finds .cpp files in /usr and below
-#   find_files("/tmp","^#",0)	    - finds #* files in /tmp
-#
-
-sub find_files {
-    my($dir,$match,$descend) = @_;
-    my($file,$p,@files);
-    local(*D);
-    $dir =~ s=\\=/=g;
-    ($dir eq "") && ($dir = ".");
-    if ( opendir(D,$dir) ) {
-	if ( $dir eq "." ) {
-	    $dir = "";
-	} else {
-	    ($dir =~ /\/$/) || ($dir .= "/");
-	}
-	foreach $file ( readdir(D) ) {
-	    next if ( $file  =~ /^\.\.?$/ );
-	    $p = $dir . $file;
-	    ($file =~ /$match/i) && (push @files, $p);
-	    if ( $descend && -d $p && ! -l $p ) {
-		push @files, &find_files($p,$match,$descend);
-	    }
-	}
-	closedir(D);
-    }
-    return @files;
-}
-
-
-#
-# strip_project_val(tag)
-#
-# Strips white space from project value strings.
-#
-
-sub strip_project_val {
-    my($v) = @_;
-    $v =~ s/^\s+//;				# trim white space
-    $v =~ s/\s+$//;
-    return $v;
-}
-
-
-#
-# Project(strings)
-#
-# This is a powerful function for setting or reading project variables.
-# Returns the resulting project variables (joined with space between).
-#
-# This is a slightly modified version of the Project function in tmake.
-
-sub Project {
-    my @settings = @_;
-    my($r,$t,$s,$v,$p,$c);
-    $r = "";
-    foreach ( @settings ) {
-	$v = $_;
-	if ( $v =~ s/^\s*((?:[\w\-]+:)?\w+)\s*(\+=|\*=|\-=|\/=|=)\s*// ) {
-	    $t = $1;
-	    $s = $2;
-	    $v = strip_project_val($v);
-	    $p = $project{$t};
-	    if ( $s eq "=" ) {			# set variable
-		$p = $v;
-	    } elsif ( $s eq "+=" ) {		# append
-		if ( $p eq "" ) {
-		    $p = $v;
-		} else {
-		    $p .= " " . $v;
-		}
-	    } elsif ( $s eq "*=" ) {		# append if not contained
-		if ( !($p =~ /(?:^|\s)\Q$v\E(?:\s|$)/) ) {
-		    if ( $p eq "" ) {
-			$p = $v;
-		    } else {
-			$p .= " " . $v;
-		    }
-		}
-	    } elsif ( $s eq "-=" ) {		# subtract
-		$p =~ s/$v//g;
-	    } elsif ( $s eq "/=" ) {		# sed
-		$cmd = '$p =~ ' . $v;
-		eval $cmd;
-	    }
-	    $project{$t} = strip_project_val($p);
-	} else {
-	    $p = strip_project_val($project{$v});
-	}
-	if ( $p ne "" ) {
-	    $r = ($r eq "") ? $p : ($r . " " . $p);
-	}
-    }
-    return $r;
-}
diff --git a/tmake/bin/tmake b/tmake/bin/tmake
deleted file mode 100755
index 9158d7a..0000000
--- a/tmake/bin/tmake
+++ /dev/null
@@ -1,1262 +0,0 @@
-#!/usr/bin/perl
-############################################################################
-# 
-#
-# Creates a Makefile from a template and a project file.
-#
-# Copyright (C) 1996-1998 by Troll Tech AS.  All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose and without fee is hereby granted, provided
-# that this copyright notice appears in all copies.
-# No representations are made about the suitability of this software for any
-# purpose. It is provided "as is" without express or implied warranty.
-#
-#
-# Some important, global variables in tmake:
-#   cpp_ext	C++ extension added to moc output (.cpp)
-#   obj_ext	Object file extension (.o on Unix, .obj otherwise)
-#   moc_aware	Will scan for files containing Qt signals/slots
-#   moc_pre	Moc prefix for generated moc file: x.h -> moc_x.cpp
-#   moc_ext	Moc extension for generated moc file: x.cpp -> x.moc
-#   moc_cmd	The moc command in your makefile, $(MOC)
-#   linebreak	Line break character (\)
-#   dir_sep	Directory separator (/ on Unix, \ on Windows)
-#   is_unix	Autodetected. If not Unix, assume Windows (Win32).
-#
-# If you need to customize any of these settings, do it before
-# calling StdInit() in the template file.
-#
-############################################################################
-
-$TMAKE_VERSION = "1.3";
-
-if ($] < 5.0) {
-    &tmake_error("This program requires perl version 5 or newer");
-}
-
-$cpp_ext	= "cpp";
-$moc_aware	= 0;
-$moc_pre	= "moc_";
-$moc_ext	= "moc";
-$moc_cmd	= '$(MOC)';
-$linebreak	= "\\";
-$really_unix	= &check_unix();
-$is_unix	= $really_unix;
-$dir_sep	= $is_unix ? "/" : "\\";
-$obj_ext	= $is_unix ? "o" : "obj";
-$depend_path	= "";
-$nodepend	= 0;
-$output_count	= 0;
-$notrim_whitespace = 0;
-$read_tmakeconf	= 0;
-		
-$template_name	= "";
-$project_name	= "";
-$outfile	= "";
-%project	= ();
-$eval_quit	= 0;
-
-$project{"TMAKEPATH"} = $ENV{"TMAKEPATH"} . ";" . $ENV{"HOME"} . "/.tmake/";
-
-while ( @ARGV ) {				# parse command line args
-    $_ = shift @ARGV;
-    if ( s/^-// ) {
-	if ( /^e(.*)/ ) {
-	    if ( ! $read_tmakeconf ) {
-		$read_tmakeconf = 1;
-		&ScanProject( &find_template("tmake.conf") );
-	    }
-	    $text = "";
-	    eval(  ($1 eq "") ? shift @ARGV : $1 );
-	    die $@ if $@;
-	    print $text . "\n" if ($text ne "");
-	    $eval_quit = 1;
-	} elsif ( /^t(.*)/ ) {
-	    $template_name = ($1 eq "") ? shift @ARGV : $1;
-	} elsif ( /^o(.*)/ ) {
-	    $outfile = ($1 eq "") ? shift @ARGV : $1;
-	    ($outfile eq "-") && ($outfile = "");
-	    if ( $outfile ne "" ) {
-		open(STDOUT,">" . fix_path($outfile)) ||
-		  &tmake_error("Can't create \"$outfile\"");
-	    }
-	} elsif ( /^p(.*)/ ) {
-	    #
-	    # The -p option is obsolete and will be removed in the next	    
-	    # tmake release.
-	    #
-	    &tmake_warning( "-p option obsolete, instead use \"tmake file1.pro file2.pro ...\"");
-	    my($pf) = ($1 eq "") ? shift @ARGV : $1;
-	    if ( ! $read_tmakeconf ) {
-		$read_tmakeconf = 1;
-		&ScanProject( &find_template("tmake.conf") );
-	    }
-	    if ( ! ($pf =~ /\.pro$/i) && -f fix_path($pf . ".pro") ) {
-		$pf .= ".pro";
-	    }	
-	    if ( $project_name eq "" ) {
-		$project_name = $pf;
-		$project{"PROJECT"} = $project_name;
-		$project{"PROJECT"} =~ s/\.pro$//i;
-		$project{"TARGET"} = $project{"PROJECT"};
-	    }
-	    if ( !&ScanProject($pf) ) {
-		&tmake_error("Can't open project file \"$pf\"");
-	    }
-	} elsif ( /^unix$/ ) {
-	    $is_unix = 1;
-	    $dir_sep = "/";
-	    $obj_ext = "o";
-	} elsif ( /^win32$/ ) {
-	    $is_unix = 0;
-	    $dir_sep = "\\";
-	    $obj_ext = "obj";
-	} elsif ( /^nodepend$/ ) {
-	    $nodepend = 1;			# don't generate dependencies
-	} elsif ( /^v$/ ) {
-	    $verbose = 1;
-	} else {
-	    &tmake_usage();
-	}
-    } elsif ( /^\s*((?:[^:\s]*?:)?)(\w+)\s*(\+=|\*=|\-=|\/=|=)/ ) {
-	if ( ! $read_tmakeconf && ! (/^\s*TMAKEPATH/) ) {
-	    $read_tmakeconf = 1;
-	    &ScanProject( &find_template("tmake.conf") );
-	}
-	Project( $_ );				# manual project setting
-    } else {
-	my($pf) = $_;
-	if ( ! $read_tmakeconf ) {
-	    $read_tmakeconf = 1;
-	    &ScanProject( &find_template("tmake.conf") );
-	}
-	if ( ! ($pf =~ /\.pro$/i) && -f fix_path($pf . ".pro") ) {
-	    $pf .= ".pro";
-	}	
-	if ( $project_name eq "" ) {
-	    $project_name = $pf;
-	    $project{"PROJECT"} = $project_name;
-	    $project{"PROJECT"} =~ s/\.pro$//i;
-	    $project{"TARGET"} = $project{"PROJECT"};
-	}
-	if ( !&ScanProject($pf) ) {
-	    &tmake_error("Can't open project file \"$pf\"");
-	}
-    }
-}
-
-&tmake_verb("Version $TMAKE_VERSION (runtime environment: " .
-	    ($really_unix ? "Unix" : "Win32") . ")\n" );
-
-if ( $eval_quit ) {
-    &tmake_verb("Done!");
-    exit 0;
-}
-($project_name eq "") && &tmake_usage();
-
-if ( $template_name eq "" ) {
-    $template_name = $project{"TEMPLATE"} ?
-	    $project{"TEMPLATE"} : "default.t";
-}
-$template_name = &find_template($template_name);
-&IncludeTemplate($template_name);
-&tmake_verb("Done!");
-exit 0;						# finished!
-
-
-
-##############################################################################
-# Subroutines from here
-##############################################################################
-
-#
-# tmake_usage()
-#
-# Prints a message about program usage and exits
-#
-
-sub tmake_usage {
-    print STDERR "Usage:\n    tmake [options] project-files\n";
-    print STDERR "Options:\n";
-    print STDERR "    -e expr    Evaluate expression, ignore template file\n";
-    print STDERR "    -nodepend  Don't generate dependency information\n";
-    print STDERR "    -o file    Write output to file\n";
-    print STDERR "    -t file    Specify a template file\n";
-    print STDERR "    -unix      Create output for Unix (auto detects)\n";
-    print STDERR "    -v         Verbose/debug mode\n";
-    print STDERR "    -win32     Create output for Win32 (auto detects)\n";
-    exit 1;
-}
-
-
-#
-# tmake_error(msg)
-#
-# Prints the message and exits
-#
-
-sub tmake_error {
-    my($msg) = @_;
-    print STDERR "tmake error: " . $msg . "\n";
-    exit 1;
-}
-
-
-#
-# tmake_warning(msg)
-#
-# Prints the warning message
-#
-
-sub tmake_warning {
-    my($msg) = @_;
-    print STDERR "tmake warning: " . $msg . "\n";
-}
-
-
-#
-# tmake_verb()
-#
-# Prints a verbose message
-#
-
-sub tmake_verb {
-    my($msg) = @_;
-    $verbose && print STDERR "tmake: " . $msg . "\n";
-}
-
-
-#
-# check_unix()
-#
-# Returns 1 if this is a Unix, 0 otherwise.
-#
-
-sub check_unix {
-    my($r);
-    $r = 0;
-    if ( -f "/bin/uname" ) {
-	$r = 1;
-	(-f "\\bin\\uname") && ($r = 0);
-    }
-    if ( -f "/usr/bin/uname" ) {
-	$r = 1;
-	(-f "\\usr\\bin\\uname") && ($r = 0);
-    }
-    return $r;
-}
-
-
-#
-# find_template(filename)
-#
-# Looks for the template file.
-#   1.	search the current directory
-#   2.	search the directories in TMAKEPATH
-#   3.	search in $HOME/.tmake
-#
-
-sub find_template {
-    my($filename) = @_;
-    my($tb,$d,$p,@dirs);
-    if ( !defined($template_base) || ($template_base eq "") ) {
-	$tb = "";
-    } else {
-	$tb = $template_base . ";";
-    }
-    $d = $tb . $project{"TMAKEPATH"};
-    @dirs = ("");
-    push @dirs, &split_path( $d );
-    $filename .= ".t" unless ($filename =~ /\.\w+$/);
-    for $d ( @dirs ) {
-	$p = $d . $filename;
-	if ( -f fix_path($p) ) {
-	    if ( $filename eq "tmake.conf" ) {
-		$tmake_platform = $d;
-		$tmake_platform =~ s-.*[/\\]([^/\\]*)[/\\]-$1-;
-		&tmake_verb("Detected platform $tmake_platform");
-	    }
-	    return $p;
-	}
-	return ($d . $filename) if ( -f fix_path($d . $filename) );
-    }
-    &tmake_error("Template file " . $filename . " not found");
-}
-
-
-##############################################################################
-# User functions
-##############################################################################
-
-#
-# StdInit()
-#
-# Standard initialization
-#
-
-sub StdInit {
-    my($p);
-    return if $stdinit_done;
-    $stdinit_done = 1;
-    if ( defined($project{"OBJECTS_DIR"}) ) {
-	$project{"OBJECTS_DIR"} = FixPath($project{"OBJECTS_DIR"});
-	&mkdirp($project{"OBJECTS_DIR"},0777);
-    }
-    if ( defined($project{"MOC_DIR"}) ) {
-	$project{"MOC_DIR"} = FixPath($project{"MOC_DIR"});
-	&mkdirp($project{"MOC_DIR"},0777);
-    }
-    if ( defined($project{"DESTDIR"}) ) {
-	$project{"DESTDIR"} = FixPath($project{"DESTDIR"});
-	&mkdirp($project{"DESTDIR"},0777);
-    }
-    $project{"OBJECTS"} = &Objects($project{"SOURCES"});
-    if ( $moc_aware ) {
-	$project{"_HDRMOC"} = &list_moc($project{"HEADERS"},$moc_pre,$cpp_ext);
-	$project{"_SRCMOC"} = &list_moc($project{"SOURCES"},"",$moc_ext);
-	$project{"OBJMOC"}  = &Objects($project{"_HDRMOC"});
-	$p = $project{"_HDRMOC"} . " " . $project{"_SRCMOC"};
-	$p =~ s/(^\s+|\s+$)//g;
-	$project{"SRCMOC"} = $p;
-    }
-    &AddIncludePath("");
-}
-
-
-sub FixPath {
-    my($p) = @_;
-    if ( !defined($p) || ($p eq "") || ($p eq ".") ) {
-	$p = "";
-    } else {
-	$p .= $dir_sep;
-	$p =~ s-[\\/]+-${dir_sep}-g;
-    }
-    return $p;
-}
-
-
-#
-# Config(name)
-#
-# Returns true if the project variable CONFIG contains the
-# configuration name.
-#
-
-sub Config {
-    my($name) = @_;
-    return $project{"CONFIG"} =~ /\b\Q$name\E\b/;
-}
-
-
-#
-# DisableOutput()
-#
-# Disables tmake output.  Must be restored by calling a corresponding
-# EnableOutput().
-#
-
-sub DisableOutput {
-    $output_count++;
-}
-
-
-#
-# EnableOutput()
-#
-# Enables tmake output again after DisableOutput() has been called.
-#
-
-sub EnableOutput {
-    $output_count--;
-}
-
-
-#
-# Now() - sets $text
-#
-# Sets $text to the current date and time.
-#
-
-sub Now {
-    my($sec,$min,$hour,$mday,$mon,$year);
-    ($sec,$min,$hour,$mday,$mon,$year) = localtime(time());
-    $text = sprintf("%02d:%02d, %4d/%02d/%02d",
-		    $hour, $min, 1900+$year, 1+$mon, $mday);
-}
-
-
-#
-# expand_project_var(var)
-#
-# Internal function for Project().
-# Expands a project value string.
-#
-
-sub expand_project_var {
-    my($v) = @_;
-    my($c);
-    return "" if !defined($v);
-    $c = 0;
-    while ( $c < 100 ) {			# expand $$
-	if ( $v =~ s/(\$\$\w+)/\035/ ) {
-	    $_ = $1;
-	    s/\$\$//g;
-	    if ( !defined($project{$_}) ) {
-		$v =~ s/\035//g;
-	    } else {
-		$v =~ s/\035/$project{$_}/g;
-	    }
-	    $c++;
-	} else {
-	    $c = 100;
-	}
-    }
-    return $v;
-}
-
-
-#
-# Project(strings)
-#
-# This is a powerful function for setting or reading project variables.
-# Returns the resulting project variables (joined with space between).
-#
-# Get a project variable:
-#   $s = Project("TEMPLATE");	    -> $s = "TEMPLATE"
-#
-# Set a project variable:
-#   Project("TEMPLATE = lib");	    -> TEMPLATE = lib
-#   Project("CONFIG =";)	    -> CONFIG empty
-#
-# Append to a project variable:
-#   Project("CONFIG = qt");	    -> CONFIG = qt
-#   Project("CONFIG += debug");	    -> CONFIG = qt debug
-#
-# Append to a project variable if it does not contain the value already:
-#   Project("CONFIG = qt release"); -> CONFIG = qt release
-#   Project("CONFIG *= qt");	    -> CONFIG = qt release
-#   Project("CONFIG *= opengl");    -> CONFIG = qt release opengl
-#
-# Subtract from a project variable:
-#   Project("THINGS = abc xyz");    -> THINGS = abc xyz
-#   Project("THINGS -= abc");	    -> THINGS = xyz
-#
-# Search/replace on a project variable:
-#   Project("CONFIG = tq opengl");  -> CONFIG = tq opengl
-#   Project("CONFIG /= s/tq/qt/");  -> CONFIG = qt opengl
-#
-# The operations can be performed on several project variables at a time.
-#
-#   Project("TEMPLATE = app", "CONFIG *= opengl", "THINGS += klm");
-#
-
-sub Project {
-    my @settings = @_;
-    my($r,$if_var,$t,$s,$v,$p,$c);
-    $r = "";
-    foreach ( @settings ) {
-	$v = $_;
-        if ( $v =~ s/^\s*([^:\r\n]+:)?(\w+)\s*(\+=|\*=|\-=|\/=|=)// ) {
-	    $if_var = $1;
-	    if ( $if_var ne "" ) {		
-		chop $if_var;
-		if ( $if_var eq "unix" ) {
-		    return "" if !$is_unix;
-		} elsif ( $if_var eq "win32" ) {
-		    return "" if $is_unix;
-		} elsif ( ($if_var ne $tmake_platform) && !Config($if_var) ) {
-		    return "";
-		}
-	    }
-	    $t = $2;
-	    $s = $3;
-	    if ( ! $notrim_whitespace ) {	
-		$v =~ s/^\s+//;			# trim white space
-		$v =~ s/\s+$//;
-	    }
-	    $v = expand_project_var($v);
-	    $p = $project{$t};
-	    if ( $s ne "=" && $v eq "" ) {
-		# nothing to append, subtract or sed
-	    } elsif ( $s eq "=" ) {		# set variable
-		$p = $v;
-	    } elsif ( $s eq "+=" ) {		# append
-		if ( $p eq "" ) {
-		    $p = $v;
-		} else {
-		    $p .= " " . $v;
-		}
-	    } elsif ( $s eq "*=" ) {		# append if not contained
-		if ( !($p =~ /(?:^|\s)\Q$v\E(?:\s|$)/) ) {
-		    if ( $p eq "" ) {
-			$p = $v;
-		    } else {
-			$p .= " " . $v;
-		    }
-		}
-	    } elsif ( $s eq "-=" ) {		# subtract
-		$p =~ s/$v//g;
-	    } elsif ( $s eq "/=" ) {		# sed
-		$cmd = '$p =~ ' . $v;
-		eval $cmd;
-	    }
-	    $project{$t} = expand_project_var($p);
-	} else {
-	    $p = expand_project_var($project{$v});
-	}
-	if ( $p ne "" ) {
-	    $r = ($r eq "") ? $p : ($r . " " . $p);
-	}
-    }
-    return $r;
-}
-
-
-#
-# Substitute(string)
-#
-# This function substitutes project variables in a text.
-#
-# Example:
-#   Substitute('The project name is "$$PROJECT"')
-#
-
-sub Substitute {
-    my($subst) = @_;
-    $text = expand_project_var($subst);
-    return $text;
-}
-
-
-#
-# ScanProject(file)
-#
-# Scans a project file. Inserts project variables into the global
-# associative project array.
-#
-
-sub ScanProject {
-    my($file) = @_;
-    my($var,$val,@v,$more,$line,$endmark);
-
-    $var = "";
-    $line = 0;
-    open(TMP,fix_path($file)) || return 0;
-
-    &tmake_verb("Reading the project file $file");
-    while ( <TMP> ) {
-	$line++;
-	s/\#.*//;				# strip comment
-	s/^\s+//;				# strip white space
-	s/\s+$//;
-        if ( /^(([^:\r\n]+:)?\w+\s*(\+|\-|\*|\/)?=)/ ) {
-	    $var = $1;				# var also contains the ".="
-	    s/^.*?=\s*//;
-	    if ( /^\<\<(.*)$/ ) {
-		$endmark = $1;		
-		$val = "";
-		while ( <TMP> ) {
-		    $line++;
-		    if ( /^\Q$endmark\E$/ ) {
-			$endmark = "";
-			last;
-		    }
-		    $val .= $_;
-		}
-		if ( $endmark ne "" ) {
-		    tmake_error("$file:$line: End marker $endmark not found");
-		}
-		chop $val if ( $val ne "" );
-		$notrim_whitespace++;
-		Project( $var . $val );
-		$notrim_whitespace--;
-		$var = "";
-		$_ = "";
-	    }
-	}
-	if ( $var ne "" ) {
-	    $more = ( $_ =~ s/\s*\\\s*$// );	# more if \ at end of line
-	    push( @v, split( /\s+/, $_ ) );
-	    if ( ! $more ) {
-		$val = join(" ",@v);
-		Project( $var . $val );
-		$var = "";
-		@v = ();
-	    }
-	} elsif ( $_ ne "" ) {
-	    tmake_error("$file:$line: Syntax error");
-	}
-    }
-    close(TMP);
-    &tmake_verb("Done reading the project file $file");
-    return 1;
-}
-
-
-#
-# IncludeTemplate(template_name)
-#
-# Includes and processes a template file.
-#
-# Below, we read the template file and executes any perl code found.
-# Perl code comes after "#$". The variable $text contains the text
-# to replace the perl code that was executed.
-# Template comments begin with "#!".
-#
-
-sub IncludeTemplate {
-    my($t_name) = @_;
-    my($cmd,$cmd_block,$cmd_end,$is_cmd_block,$saveline,$spaceonly);
-    local($text);
-    local(*T);
-
-    $t_name = &find_template($t_name);
-    if ( $tmake_template_dict{$t_name} ) {
-	&tmake_error("Cyclic template inclusion for $t_name");
-    } else {
-	$tmake_template_dict{$t_name} = 1;
-    }
-    $template_base = $t_name;
-    $template_base =~ s-(.*[/\\]).*-$1-;
-    &tmake_verb("Reading the template $t_name");
-    open(T,fix_path($t_name)) ||
-	&tmake_error("Can't open template file \"$t_name\"");
-
-    while ( <T> ) {
-	if ( /\#\!/ ) {				# tmake comment
-	    s/\s*\#\!.*//;
-	    next if /^$/;
-	}
-	if ( /\#\$(\{)?\s*(.*)\n/ ) {		# code
-	    $cmd = $2;
-	    $is_cmd_block = defined($1) && ($1 eq "{");
-	    s/\#\$.*\n//;
-	    if ( $is_cmd_block ) {		# code block #${ ...
-		$saveline = $_;
-		$cmd_block = $cmd;
-		$cmd_end = 0;
-		while ( <T> ) {
-		    $cmd = $_;
-		    $cmd =~ s/\s*\#\!.*//;	# tmake comment
-		    if ( $cmd =~ /^\s*\#\$\}/ ) {
-			$_ = "";
-			$cmd_end = 1;
-			last;
-		    }
-		    $cmd =~ s/^\s*\#(\$)?\s*//;
-		    $cmd_block .= $cmd;
-		}
-		$cmd_end || &tmake_error('#$} expected but not found');
-		$cmd = $cmd_block;
-		$_ = $saveline;
-	    }
-	    $spaceonly = /^\s*$/;
-	    $saveline = $_;
-	    &tmake_verb("Evaluate: $cmd");
-	    $text = "";
-	    eval $cmd;
-	    die $@ if $@;
-	    next if $spaceonly && ($text =~ /^\s*$/);
-	    print $saveline . $text . "\n" if  $output_count <= 0;
-	} else {				# something else
-	    print if $output_count <= 0;
-	}
-    }
-    close( T );
-}
-
-
-#
-# Expand(var) - appends to $text
-#
-# Expands a list of $project{} variables with a space character between them.
-#
-
-sub Expand {
-    my @vars = @_;
-    my($t);
-    $t = Project(@vars);
-    if ( $text eq "" ) {
-	$text = $t;
-    } elsif ( $t ne "" ) {
-	$text .= " " . $t;
-    }
-    return $text;
-}
-
-
-#
-# ExpandGlue(var,prepend,glue,append) - appends to $text
-#
-# Expands a $project{} variable, splits on whitespace
-# and joins with $glue. $prepend is put at the start
-# of the string and $append is put at the end of the
-# string. The resulting string becomes "" if the project
-# var is empty or not defined.
-#
-# Example:
-#
-#   The project file defines:
-#	SOURCES = a b c
-#
-#   ExpandGlue("SOURCES","<","-",">")
-#
-#   The result:
-#	$text = "<a-b-c>"
-#
-
-sub ExpandGlue {
-    my($var,$prepend,$glue,$append) = @_;
-    my($t,$v);
-    $v = Project($var);
-    if ( $v eq "" ) {
-	$t = "";
-    } else {
-	$t = $prepend . join($glue,split(/\s+/,$v)) . $append;
-    }
-    if ( $text eq "" ) {
-	$text = $t;
-    } elsif ( $t ne "" ) {
-	$text .= " " . $t;
-    }
-    return $text;
-}
-
-
-#
-# ExpandList(var) - sets $text.
-#
-# Suitable for expanding HEADERS = ... etc. in a Makefile
-#
-
-sub ExpandList {
-    my($var) = @_;
-    return ExpandGlue($var,""," ${linebreak}\n\t\t","");
-}
-
-
-#
-# ExpandPath(var,prepend,glue,append) - appends to $text
-#
-# Expands a $project{} variable, splits on either ';' or
-# whitespace and joins with $glue. $prepend is put at the
-# start of the string and $append is put at the end of the
-# string. The resulting string becomes "" if the project
-# variable is empty or not defined.
-#
-# If the variable contains at least one semicolon or tmake
-# is running on Windows, the resulting items are put in
-# double-quotes.
-#
-# Example:
-#
-#   The project file defines:
-#	INCLUDEPATH = "C:\qt\include;c:\program files\msdev\include
-#
-#   ExpandGlue("INCLUDEPATH","-I","-I","")
-#
-#   The result:
-#	$text = -I"c:\qt\include" -I"c:\program files\msdev\include"
-#
-
-sub ExpandPath {
-    my($var,$prepend,$glue,$append) = @_;
-    my($t,$v);
-    my($s);
-    $v = Project($var);
-    if ( $v eq "" ) {
-	$t = "";
-    } else {
-	if ( $v =~ /;/ || !$is_unix ) {
-	    $prepend .= '"';
-	    $glue = '"' . $glue . '"';
-	    $append = '"' . $append;
-	}
-
-	if ( $v =~ /;/ ) {    
-	    $t = $prepend . join($glue,split(/;+/,$v)) . $append;
-	} else {
-	    $t = $prepend . join($glue,split(/\s+/,$v)) . $append;
-	}
-    }
-    if ( $text eq "" ) {
-	$text = $t;
-    } elsif ( $t ne "" ) {
-	$text .= " " . $t;
-    }
-    return $text;
-}
-
-
-#
-# TmakeSelf()
-#
-# Generates makefile rule to regenerate the makefile using tmake.
-#
-
-sub TmakeSelf {
-    my $a = "tmake $project_name";
-    if ( $nodepend ) {
-	$a .= " -nodepend";
-    }
-    if ( $outfile ) {
-	$text = "tmake: $outfile\n\n$outfile: $project_name\n\t";
-	$a .= " -o $outfile";
-    } else {
-	$text = "tmake:\n\t";
-    }
-    $text .= $a
-}
-
-
-#
-# Objects(files)
-#
-# Replaces any extension with .o ($obj_ext).
-#
-
-sub Objects {
-    local($_) = @_;
-    my(@a);
-    @a = split(/\s+/,$_);
-    foreach ( @a ) {
-	s-\.\w+$-.${obj_ext}-;
-	if ( defined($project{"OBJECTS_DIR"}) ) {
-	    s-^.*[\\/]--;
-	    $_ = $project{"OBJECTS_DIR"} . $_;
-	}
-    }
-    return join(" ",@a);
-}
-
-
-#
-# list_moc(files,prefix,extension)
-#
-# Scans all files and selects all files that contain Q_OBJECT.
-# Insert a prefix before the filename and replaces the filename extention.
-#
-
-sub list_moc {
-    my($files,$pre,$ext) = @_;
-    my(@v,@m,@lines,$contents,$n,$f,$t);
-    @v = split(/\s+/,$files);
-    undef $/;
-    foreach $f ( @v ) {
-	if ( open(TMP,fix_path($f)) ) {
-	    $contents = <TMP>;
-	    close(TMP);
-	    $n = 0;
-	    @lines = split(/\n/,$contents);
-	    grep( /tmake\s+ignore\s+Q_OBJECT/ && $n--, @lines );
-	    $contents =~ s-/\*.*?\*/--gs; # strip C/C++ comments
-	    $contents =~ s-//.*\n--g;
-	    @lines = split(/\n/,$contents);
-	    grep( /(^|\W)Q_OBJECT(\W|$)/ && $n++, @lines );
-	    if ( $n > 0 ) {
-		$t = $f;
-		$t =~ s-^(.*[/\\])?([^/\\]*?)\.(\w+)$-$1${pre}$2.${ext}-;
-		if ( defined($project{"MOC_DIR"}) ) {
-		    $t =~ s-^.*[\\/]--;
-		    $t = $project{"MOC_DIR"} . $t;
-		}
-		$moc_output{$f} = $t;
-		$moc_input{$t}	= $f;
-		push(@m,$t);
-	    }
-	    $contents = "";
-	}
-    }
-    $/ = "\n";
-    return join(" ",@m);
-}
-
-
-#
-# BuildObj(objects,sources)
-#
-# Builds the object files.
-#
-
-sub BuildObj {
-    my($obj,$src) = @_;
-    my(@objv,$srcv,$i,$s,$o,$d,$c,$comp,$cimp);
-    @objv = split(/\s+/,$obj);
-    @srcv = split(/\s+/,$src);
-    for $i ( 0..$#objv ) {
-	$s = $srcv[$i];
-	$o = $objv[$i];
-	next if $s eq "";
-	$text .= $o . ": " . $s;
-	if ( defined($moc_output{$s}) && ($moc_output{$s} ne "") ) {
-	    $text .= " ${linebreak}\n\t\t" . $moc_output{$s};
-	}
-	$d = &make_depend($s);
-	$text .= " ${linebreak}\n\t\t" . $d if $d ne "";
-	if ( ($s =~ /\.c$/) ) {
-	    $comp = "TMAKE_RUN_CC";
-	    $cimp = "TMAKE_RUN_CC_IMP";
-	} else {
-	    $comp = "TMAKE_RUN_CXX";
-	    $cimp = "TMAKE_RUN_CXX_IMP";
-	}
-	if ( defined($project{"OBJECTS_DIR"}) ||
-	     !defined($project{$cimp}) ) {
-	    $c = $project{$comp};
-	    $c =~ s/\$src/$s/;
-	    $c =~ s/\$obj/$o/;
-	    $text .= "\n\t$c";
-	}
-	$text .= "\n\n";
-    }
-    chop $text;
-}
-
-
-#
-# BuildMocObj(objects,sources)
-#
-# Builds the moc object files.
-#
-
-sub BuildMocObj {
-    my($obj,$src) = @_;
-    my(@objv,$srcv,$i,$s,$o,$hdr,$d);
-    @objv = split(/\s+/,$obj);
-    @srcv = split(/\s+/,$src);
-    for $i ( 0..$#objv ) {
-	$s = $srcv[$i];
-	$o = $objv[$i];
-	$hdr = $moc_input{$srcv[$i]};
-	$text .= $o . ": " . $s . " ${linebreak}\n\t\t" . $hdr;
-	$d = &make_depend($hdr);
-	$text .= " ${linebreak}\n\t\t" . $d if $d ne "";
-	if ( defined($project{"OBJECTS_DIR"}) || defined($project{"MOC_DIR"})||
-	     !defined($project{"TMAKE_RUN_CXX_IMP"}) ) {
-	    $c = $project{"TMAKE_RUN_CXX"};
-	    $c =~ s/\$src/$s/;
-	    $c =~ s/\$obj/$o/;
-	    $text .= "\n\t$c";
-	}
-	$text .= "\n\n";
-    }
-    chop $text;
-}
-
-
-#
-# BuildMocSrc(files)
-#
-# Builds the moc source files from headers and sources.
-#
-
-sub BuildMocSrc {
-    my($f) = @_;
-    my(@v,$m,$o);
-    @v = split(/\s+/,$f);
-    foreach $m ( @v ) {
-	$o = $moc_output{$m};
-	if ( defined($o) && ($o ne "") ) {
-	    $text .= "$o: $m\n\t$moc_cmd $m -o $o\n\n";
-	}
-    }
-    chop $text;
-}
-
-
-#
-# AddIncludePath(path)
-#
-# Adds path to the current include path, $project{"INCLUDEPATH"}.
-#
-
-sub AddIncludePath {
-    my($path) = @_;
-    my($p);
-    if ( $project{"INCPATH"} &&
-	 ($project{"INCPATH"} =~ /(?:^|\s)\Q$path\E(?:\s|$)/) ) {
-	return;
-    }
-    $project{"INCLUDEPATH"} = "" if !defined($project{"INCLUDEPATH"});
-    if ( !defined($project{"INCPATH_SEP"}) ) {
-	if ( $project{"INCLUDEPATH"} =~ /;/ ) {
-	    $project{"INCPATH_SEP"} = ";";
-	} else {
-	    $project{"INCPATH_SEP"} = " ";
-	}
-    }
-    $p = $project{"INCLUDEPATH"};
-    $p = ($p && $path) ? ($p . ";" . $path) : ($p . $path);
-    $project{"INCLUDEPATH"} = $p;
-    $p = join($project{"INCPATH_SEP"},&split_path($p));
-    $p =~ s=[\\/]($project{"INCPATH_SEP"}|$)=$project{"INCPATH_SEP"}=g;
-    $project{"INCPATH"} = $p;
-}
-
-
-#
-# FindHighestLibVersion(dir,name)
-#
-# Returns the newest library version. Scans all the files in the specifies
-# directory and returns the highest version number.
-#
-# Used on Windows only.
-#
-# Example:
-#    FindHighestLibVersion("c:\qt\lib","qt") returns "200" if
-#    the c:\qt\lib directory contains qt141.lib and qt200.lib.
-#
-
-sub FindHighestLibVersion {
-    my($dir,$name) = @_;
-    my(@files,$f,$v,$highest);
-    $highest = "";
-    @files = find_files($dir,"${name}.*\.lib");
-    for $f ( @files ) {
-	if ( $f =~ /(\d+)\.lib/i ) {
-	    $v = $1;
-	    if ( $highest eq "" || $v > $highest ) {
-		$highest = $v;
-	    }
-	}
-    }
-    return $highest;
-}
-
-
-#
-# Finds files.
-#
-# Examples:
-#   find_files("/usr","\.cpp$",1)   - finds .cpp files in /usr and below
-#   find_files("/tmp","^#",0)	    - finds #* files in /tmp
-#
-
-sub find_files {
-    my($dir,$match,$descend) = @_;
-    my($file,$p,@files);
-    local(*D);
-    $dir =~ s=\\=/=g;
-    ($dir eq "") && ($dir = ".");
-    if ( opendir(D,fix_path($dir)) ) {
-	if ( $dir eq "." ) {
-	    $dir = "";
-	} else {
-	    ($dir =~ /\/$/) || ($dir .= "/");
-	}
-	foreach $file ( readdir(D) ) {
-	    next if ( $file  =~ /^\.\.?$/ );
-	    $p = $dir . $file;
-	    if ( $is_unix ) {
-		($file =~ /$match/) && (push @files, $p);
-	    } else {
-		($file =~ /$match/i) && (push @files, $p);
-	    }
-	    if ( $descend && -d $p && ! -l $p ) {
-		push @files, &find_files($p,$match,$descend);
-	    }
-	}
-	closedir(D);
-    }
-    return @files;
-}
-
-
-#
-# make_depend(file)
-#
-# Returns a list of included files.
-# Uses the global $depend_path variable.
-#
-
-sub make_depend {
-    my($file) = @_;
-    my($i,$count);
-    if ( $nodepend ) {
-	return "";
-    }
-    if ( ! $depend_path_fixed ) {
-	$depend_path_fixed = 1;
-	if ( defined($project{"DEPENDPATH"}) ) {
-	    $depend_path = $project{"DEPENDPATH"};
-	} else {
-	    $depend_path = "";
-	}
-	$count = 0;
-	while ( $count < 100 ) {
-	    if ( $depend_path =~ s/(\$[\{\(]?\w+[\}\)]?)/035/ ) {
-		$_ = $1;
-		s/[\$\{\}\(\)]//g;
-		$depend_path =~ s/035/$ENV{$_}/g;
-	    } else {
-		$count = 100;
-	    }
-	}
-	@dep_path = &split_path($depend_path);
-    }
-    @cur_dep_path = @dep_path;
-    if ( $file =~ /(.*[\/\\])/ ) {
-	$dep_curdir = $1;
-	push @cur_dep_path, $dep_curdir;
-    } else {
-	$dep_curdir = "";
-    }
-    $dep_file = $file;
-    &canonical_dep($file);
-    %dep_dict = ();
-    $i = &build_dep($file);
-    chop $i;
-    $i =~ s=/=$dir_sep=g unless $is_unix;
-    $i =~ s=([a-zA-Z]):/=//$1/=g if (defined($gnuwin32) && $gnuwin32);
-    return join(" ${linebreak}\n\t\t",split(/ /,$i) );
-}
-
-#
-# build_dep() - Internal for make_depend()
-#
-
-sub build_dep {
-    my($file) = @_;
-    my(@i,$a,$n);
-    $a = "";
-    return $a if !(defined $depend_dict{$file});
-    @i = split(/ /,$depend_dict{$file});
-    for $n ( @i ) {
-	if ( !defined($dep_dict{$n}) && defined($full_path{$n}) ) {
-	    $dep_dict{$n} = 1;
-	    $a .= $full_path{$n} . " " . &build_dep($n);
-	}
-    }
-    return $a;
-}
-
-#
-# canonical_dep(file) - Internal for make_depend()
-#
-# Reads the file and all included files recursively.
-# %depend_dict associates a file name to a list of included files.
-#
-
-sub canonical_dep {
-    my($file) = @_;
-    my(@inc,$i);
-    @inc = &scan_dep($file);
-    if ( @inc ) {
-	$depend_dict{$file} = join(" ",@inc);
-	for $i ( @inc ) {
-	    &canonical_dep($i) if !defined($depend_dict{$i});
-	}
-    }
-}
-
-#
-# scan_dep(file) - Internal for make_depend()
-#
-# Returns an array of included files.
-#
-
-sub scan_dep {
-    my($file) = @_;
-    my($dir,$path,$found,@allincs,@includes,%incs);
-    $path = $file;
-    @includes = ();
-    return @includes if $file =~ /\.$moc_ext$/; # avoid .moc files
-    if ( ! (-f fix_path($path)) ) {
-	$found = 0;
-	for $dir ( @cur_dep_path ) {
-	    $path = $dir . $file;
-	    last if ( $found = (-f fix_path($path)) );
-	}
-	return @includes if ! $found;
-    }
-    undef $/;
-    if ( open(TMP,fix_path($path)) ) {
-	$full_path{$file} = $path;
-	$_ = <TMP>;
-	s-/\*.*?\*/--gs;			# strip C/C++ comments
-	s-//.*\n-\n-g;
-	@allincs = split(/\n/,$_);
-	@allincs = grep(/^\s*#\s*include/,@allincs);
-	foreach ( @allincs ) {			# all #include lines
-	    next if !(/^\s*#\s*include\s+[<"]([^>"]*)[>"]/) || defined($incs{$1});
-	    push(@includes,$1);
-	    $incs{$1} = "1";
-	}
-	close(TMP);
-    }
-    $/ = "\n";
-    return @includes;
-}
-
-
-#
-# split_path(path)
-#
-# Splits a path containing : (Unix) or ; (MSDOS, NT etc.) separators.
-# Returns an array.
-#
-
-sub split_path {
-    my($p) = @_;
-    my($s,@d);
-    @d = ();
-    return @d if !defined($p) || $p eq "";
-    $p =~ s=:=;=g if $is_unix;
-    $p =~ s=[/\\]+=/=g;
-    if ( !($p =~ /;/) ) {
-	$p =~ s/\s+/;/g;
-    }
-    $p =~ s/\s*;\s*/;/g;
-    while( $p =~ /(?:(?:[^\"\;][^\;]*;*)|(?:\"[^\"]*\";*))/g ) {
-	$s = $&;
-	$s =~ s=\"==g;
-	$s =~ s=[\s\;]+$==g;
-	$s =~ s=([^/:])$=$1/=g;
-	$s =~ s=/=$dir_sep=g unless $is_unix;
-	push @d, $s;
-    }
-    return @d;
-}
-
-
-#
-# fix_path(path)
-#
-# Converts all '\' to '/' if this really seems to be a Unix box.
-#
-
-sub fix_path {
-    my($p) = @_;
-    if ( $really_unix ) {
-	$p =~ s-\\-/-g;
-    } else {
-	$p =~ s-/-\\-g;
-    }
-    return $p;
-}
-
-
-#
-# mkdirp(filename,mode) - Internal for StdInit()
-#
-# Creates the directory specified by $filename, with permissions
-# specified by mode (as modified by umask). Recursively calls
-# mkdir, similar to 'mkdir -p'.
-#
-
-sub mkdirp {
-    my($filename,$mode) = @_;
-    if ( $filename =~ /\$\(\w+\)/ ) {  # ignore "$(something)"
-	return 0;
-    }
-    $filename =~ s-[\\:/]+-/-g;
-    if ( -d $filename ) {
-	return 1;
-    }
-    $filename =~ m-^((.*)/)?(.*)-;
-    if ( defined($2) && ! mkdirp($2,$mode) ) {
-	return 0;
-    }
-    return mkdir($filename,$mode);
-}
diff --git a/tmake/doc/m-linux-gcc.html b/tmake/doc/m-linux-gcc.html
deleted file mode 100644
index 300ef35..0000000
--- a/tmake/doc/m-linux-gcc.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!doctype HTML public "-//W3C//DTD HTML 3.2//EN">
-<html><head><title>
-Generated Makefile for Linux / GNU g++
-</title></head><body bgcolor="#ffffff">
-<h2 align=center>Generated Makefile for Linux / GNU gcc</h2>
-
-<pre>
-#############################################################################
-# Makefile for building hello
-# Generated by tmake at 10:11, 1998/07/07
-#     Project: hello
-#    Template: app
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	g++
-CFLAGS	=	-Wall -W -O2 -fno-strength-reduce
-INCPATH	=	-I$(QTDIR)/include
-LINK	=	g++
-LFLAGS	=	
-LIBS	=	-L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11
-MOC	=	moc
-
-####### Files
-
-HEADERS =	hello.h
-SOURCES =	hello.cpp \
-		main.cpp
-OBJECTS =	hello.o \
-		main.o
-SRCMOC	=	moc_hello.cpp
-OBJMOC	=	moc_hello.o
-TARGET	=	hello
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: $(TARGET)
-
-$(TARGET): $(OBJECTS) $(OBJMOC) 
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-
-moc: $(SRCMOC)
-
-tmake:
-	tmake hello.pro
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(TARGET)
-	-rm -f *~ core
-
-####### Compile
-
-hello.o: hello.cpp \
-		hello.h
-
-main.o: main.cpp \
-		hello.h
-
-moc_hello.o: moc_hello.cpp \
-		hello.h
-
-moc_hello.cpp: hello.h
-	$(MOC) hello.h -o moc_hello.cpp
-</pre>
-</body></html>
diff --git a/tmake/doc/m-win32-msvc.html b/tmake/doc/m-win32-msvc.html
deleted file mode 100644
index 24097cc..0000000
--- a/tmake/doc/m-win32-msvc.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!doctype HTML public "-//W3C//DTD HTML 3.2//EN">
-<html><head><title>
-Generated Makefile for  Win32 / Microsoft Visual C++
-</title></head><body bgcolor="#ffffff">
-<h2 align=center>Generated Makefile for Win32 / Microsoft Visual C++</h2>
-
-<pre>
-#############################################################################
-# Makefile for building hello
-# Generated by tmake at 20:40, 1998/02/27
-#     Project: hello
-#    Template: app
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	cl
-CFLAGS	=	-nologo -W3 -O2
-INCPATH	=	-I"$(QTDIR)\include"
-LINK	=	link
-LFLAGS	=	/NOLOGO /SUBSYSTEM:windows
-LIBS	=	$(QTDIR)\lib\qt.lib user32.lib gdi32.lib comdlg32.lib wsock32.lib
-MOC	=	moc
-
-####### Files
-
-HEADERS =	hello.h
-SOURCES =	hello.cpp \
-		main.cpp
-OBJECTS =	hello.obj \
-		main.obj
-SRCMOC	=	moc_hello.cpp
-OBJMOC	=	moc_hello.obj
-TARGET	=	hello.exe
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .c
-
-.cpp.obj:
-	$(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
-
-.cxx.obj:
-	$(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
-
-.cc.obj:
-	$(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
-
-.c.obj:
-	$(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
-
-####### Build rules
-
-all: $(TARGET)
-
-$(TARGET): $(OBJECTS) $(OBJMOC) 
-	$(LINK) $(LFLAGS) /OUT:$(TARGET) @<<
-	    $(OBJECTS) $(OBJMOC) $(LIBS)
-<<
-
-moc: $(SRCMOC)
-
-tmake: Makefile
-
-Makefile: hello.pro
-	tmake hello.pro -o Makefile
-
-clean:
-	-del hello.obj
-	-del main.obj
-	-del moc_hello.cpp
-	-del moc_hello.obj
-	-del $(TARGET)
-
-####### Compile
-
-hello.obj: hello.cpp \
-		hello.h
-
-main.obj: main.cpp \
-		hello.h
-
-moc_hello.obj: moc_hello.cpp \
-		hello.h
-
-moc_hello.cpp: hello.h
-	$(MOC) hello.h -o moc_hello.cpp
-</pre>
-</body></html>
diff --git a/tmake/doc/tmake.html b/tmake/doc/tmake.html
deleted file mode 100644
index 1b14809..0000000
--- a/tmake/doc/tmake.html
+++ /dev/null
@@ -1,727 +0,0 @@
-<!doctype HTML public "-//W3C//DTD HTML 3.2//EN">
-<html><head><title>
-User's Guide - tmake
-</title></head><body bgcolor="#ffffff">
-<p><h1 align=center>User's Guide - tmake</h1>
-
-
-<hr>
-<h2>Introduction</h2>
-
-tmake is an easy-to-use tool from Troll Tech to create and maintain
-makefiles for software projects.  It can be a painful task to manage
-makefiles manually, especially if you develop for more than one platform
-or use more than one compiler.  tmake automates and streamlines this
-process and lets you spend your valuable time on writing code, not
-makefiles.
-
-<p>
-Our main motivation for developing tmake was that we spent far too much
-time maintaining makefiles for <a href="http://www.troll.no/qt">Qt</a>,
-our cross-platform GUI toolkit. Qt supports around 15 flavors of Unix,
-Microsoft Windows, and around 15 different C++ compilers.  We looked at
-GNU autoconf, but it was Unix-specific and not flexible enough in our
-opinion. Our makefile system also had to deal with Qt <a
-href="http://www.troll.no/qt/metaobjects.html">meta object compiler</a>
-(moc) issues. The moc program extracts meta information from C++ files and
-generates a C++ file with data tables etc.  It takes extra work to add
-makefile rules for the moc and wanted to automate this task.
-
-<p>
-tmake is written in Perl and requires that you have installed perl version
-5 or newer. Basic use of tmake requires no perl knowledge, but if you know
-perl you can extend tmake and write your own makefile templates.
-
-<p>
-<b>Windows users:</b> The tmake distribution for Win32 includes tmake.exe
-(built by the perl2exe utility) and you do not need to download and
-install perl unless you want to modify the tmake source code or run other
-perl scripts.  You can download perl for Win32 (Windows NT and 95) from <a
-href="http://www.activestate.com">www.activestate.com</a>
-
-<p>
-tmake is free software and you may use, copy, modify and distribute tmake
-and its documentation for any purpose and without any fee.  See the
-LICENSE file for details.
-
-<p>
-Feedback is highly appreciated. Contact the author, Haavard Nord <a
-href="mailto:hanord@troll.no">(hanord@troll.no)</a>, if you have ideas,
-patches etc. for tmake.
-
-<hr>
-<h2>Installation</h2>
-
-<ol>
-<li>Make sure you have perl version 5 or later installed (optional
-for Windows users).
-<li>Unpack the tmake tar.gz archive for Unix or the tmake .zip file for Windows.
-<li>Set the TMAKEPATH environment variable to the directories
-containing the template files (see below).
-<li>Add the tmake/bin directory to your PATH.
-</ol>
-
-Here are some examples:<p>
-<strong>Unix Bourne shell:</strong><pre>
-    TMAKEPATH=/local/tmake/lib/linux-g++
-    PATH=$PATH:/local/tmake/bin
-    export TMAKEPATH PATH
-</pre>
-
-<strong>Unix C shell:</strong><pre>
-    setenv TMAKEPATH /local/tmake/lib/linux-g++
-    setenv PATH $PATH:/local/tmake/bin
-</pre>
-
-<strong>Microsoft Windows:</strong><pre>
-    set TMAKEPATH=c:\tmake\lib\win32-msvc
-    set PATH=%PATH%;c:\tmake\bin
-</pre>
-
-<p>
-The template directory name has the form <em>platform</em>-<em>compiler</em>
-and contains a platform configuration file (tmake.conf) and tmake template
-files.
-
-<p>
-Supported platforms: AIX, Data General, FreeBSD, HPUX, SGI Irix, Linux,
-NetBSD, OpenBSD, OSF1/DEC, SCO, Solaris, SunOS, Ultrix, Unixware and
-Win32.
-
-<p>
-You can find your platform-compiler combination in the <tt>tmake/lib</tt>.
-
-<p>
-<b>Unix users:</b> tmake requires that perl is in /usr/bin. If your
-version of perl is elsewehere, either change the first line of tmake or
-make a small shell script which invokes tmake with the correct perl.
-
-
-<hr>
-<h2>Getting Started</h2>
-
-Let's assume you have a small Qt application consisting of one C++ header
-file and two source files.
-
-First you need to create a tmake project file, e.g. hello.pro:<pre>
-  HEADERS   =  hello.h
-  SOURCES   =  hello.cpp main.cpp
-  TARGET    =  hello
-</pre>
-
-Then run tmake to create a Makefile:<pre>
-  tmake hello.pro -o Makefile
-</pre>
-And finally:<pre>
-  make
-</pre>
-This builds the hello program. Remember to set the <code>TMAKEPATH</code>
-environment variable before you run tmake.
-<p>
-See <a href="m-linux-gcc.html">Makefile for Linux/g++</a>.<br>
-See <a href="m-win32-msvc.html">Makefile for Win32/msvc</a>
-(Microsoft Visual C++).<br>
-
-
-<hr>
-<h2>Makefile Templates</h2>
-
-The tmake distribution includes three makefile templates and one
-configuration file for each platform/compiler combination.  The
-<code>TMAKEPATH</code> environment variable tells tmake where to find
-these files:
-<p>
-<table border="0">
-    <tr>
-        <td>&nbsp;</td>
-        <td>app.t</td>
-        <td>&nbsp;</td>
-        <td>Creates a makefile for building applications.</td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <td>lib.t</td>
-        <td>&nbsp;</td>
-        <td>Creates a makefile for building libraries.</td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <td>subdirs.t</td>
-        <td>&nbsp;</td>
-        <td>Creates a makefile for building targets in subdirectories.</td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <td>tmake.conf</td>
-        <td>&nbsp;</td>
-        <td>This configuration file contains compiler options and lists
-	    tools and libraries.
-    </tr>
-</table>
-
-
-<p>
-The hello.pro project file above does not have a <code>TEMPLATE</code> or
-a <code>CONFIG</code> variable.  The default template is <tt>app</tt> (the .t
-extension is optional) and the default configuration is <tt>qt warn_on
-release</tt>.
-
-This project file produces exactly the same result as the hello.pro
-above:<pre>
-  TEMPLATE =  app
-  CONFIG   =  qt warn_on release
-  HEADERS  =  hello.h
-  SOURCES  =  hello.cpp main.cpp
-  TARGET   =  hello
-</pre>
-
-
-
-<h4>Makefile Configuration</h4>
-
-<p>
-The <code>CONFIG</code> variable is recognized by both the app.t and lib.t
-templates and specifies what compiler options to use and which extra
-libraries to link in.
-
-These options control the compilation flags:
-<p>
-<table border="0">
-  <tr>
-    <td>&nbsp;</td>
-    <td>release</td>
-    <td>&nbsp;</td>
-    <td>Compile with optimization enabled, ignored if
-    "debug" is specified.</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>debug</td>
-    <td>&nbsp;</td>
-    <td>Compile with debug options enabled.</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>warn_on</td>
-    <td>&nbsp;</td>
-    <td>The compiler should emit more warnings than normally, ignored if
-     "warn_off" is specified.</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>warn_off</td>
-    <td>&nbsp;</td>
-    <td>The compiler should emit no warnings or as few as possible.</td>
-  </tr>
-</table>
-
-<p>
-These options defines the application/library type:
-<p>
-<table border="0">
-  <tr>
-    <td>&nbsp;</td>
-    <td>qt</td>
-    <td>&nbsp;</td>
-    <td>The target is a Qt application/library and requires Qt header
-     files/library.</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>opengl</td>
-    <td>&nbsp;</td>
-    <td>The target requires the OpenGL (or Mesa) headers/libraries.</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>x11</td>
-    <td>&nbsp;</td>
-    <td>The target is a X11 application or library.</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>windows</td>
-    <td>&nbsp;</td>
-    <td>The target is a Win32 window application (app.t only).</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>console</td>
-    <td>&nbsp;</td>
-    <td>The target is a Win32 console application (app.t only).</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>dll</td>
-    <td>&nbsp;</td>
-    <td>The target is a shared object/DLL.</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>staticlib</td>
-    <td>&nbsp;</td>
-    <td>The target is a static library (lib.t only).</td>
-  </tr>
-</table>
-
-<p>
-As an example, if the hello application uses both Qt and OpenGL and you
-want to compile it for debugging, your <code>CONFIG</code> line should
-read:<pre>
-  CONFIG = qt opengl debug
-</pre>
-
-<p>
-The most common tmake options and project variables are described here.
-See the tmake <a href="tmake_ref.html">reference manual</a> for
-details.<p>
-
-
-
-<h4>The Application Template</h4>
-
-The application template, app.t, lets you compile and link executable
-programs or shared objects (DLLs).
-
-This template recognizes several variabless.
-<p>
-<table border="0">
-    <tr>
-        <td>&nbsp;</td>
-        <td>HEADERS</td>
-        <td>&nbsp;</td>
-        <td>Header files.</td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <td>SOURCES</td>
-        <td>&nbsp;</td>
-        <td>Source files.</td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <td>TARGET</td>
-        <td>&nbsp;</td>
-        <td>Name of executable (adds .exe if on Windows).</td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <td>DESTDIR</td>
-        <td>&nbsp;</td>
-        <td>Where to put the target.</td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <td>DEFINES</td>
-        <td>&nbsp;</td>
-        <td>Tell compiler to define C preprocessor macros (-D option).</td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <td>INCLUDEPATH</td>
-        <td>&nbsp;</td>
-        <td>Sets the include file search path for the compiler (-I
-        option).
-	</td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <td>DEPENDPATH</td>
-        <td>&nbsp;</td>
-        <td>Sets the dependency search path for tmake.</td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <td>DEF_FILE</td>
-        <td>&nbsp;</td>
-        <td>Win32 only: Link with a .def file.</td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <td>RC_FILE</td>
-        <td>&nbsp;</td>
-        <td>Win32 only: Use a .rc file (compile to temporary .res).
-	</td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <td>RES_FILE</td>
-        <td>&nbsp;</td>
-        <td>Win32 only: Link with a .res file.
-	</td>
-    </tr>
-</table>
-
-<p>
-
-
-<h4>The Library Template</h4>
-
-The library template, lib.t, lets you compile and create static or shared
-libraries.
-
-<p>
-The lib.t template supports the same project variables as app.t, but also
-<code>VERSION</code>.  <code>VERSION</code> is the version number of the
-target library, e.g. 1.40.  The version is important for shared libraries.
-
-
-
-<h4>The Subdirs Template</h4>
-
-The subdirs template, subdirs.t, lets you invoke make in subdirectories.
-
-<p>The <code>SUBDIRS</code> variable contains the name of all subdirectories to
-be processed.
-
-
-<h4>Special Templates for Microsoft Visual C++</h4>
-
-If you have Microsoft Visual C++ 5.0, you can use two special templates to
-generate a MSVC++ IDE project (.dsp file).  After you have generated
-e.g. hello.dsp, choose "File"->"Open Workspace" and select the hello.dsp
-file.  Visual C++ will then create a workspace (.dsw file) for you.<p>
-<table border="0">
-    <tr>
-        <td>&nbsp;</td>
-        <td>vcapp.t</td>
-        <td>&nbsp;</td>
-        <td>Creates an application project file (Microsoft Visual C++ 5.0
-	only).</td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <td>vclib.t</td>
-        <td>&nbsp;</td>
-        <td>Creates a library project file (Microsoft Visual C++ 5.0
-	only).</td>
-    </tr>
-</table>
-
-<p>
-Run tmake to create a hello.dsp file (use -t to override the default
-template):<pre>
-  tmake -t vcapp -o hello.dsp hello.pro
-</pre>
-
-
-<hr>
-<h2>Project File Syntax</h2>
-
-The tmake project file has a very simple syntax.  You may set
-project variables, append to project variables, remove from
-project variable and substitute project variables.
-
-To set a project variable:<pre>
-    HEADERS = gui.h xml.h url.h
-</pre>
-
-If you cannot fit everything on one line, use '\' to split it up:<pre>
-    HEADERS = gui.h \
-	      xml.h \
-	      url.h
-</pre>
-
-<p>
-Project variables contains lists of items (such as header files,
-compiler options etc.) and use whitespace to separate the items.
-This means that tmake cannot deal with items containing whitespace.
-The INCLUDEPATH variable is an exception. If INCLUDEPATH contains
-one or more semicolons (;), tmake uses the semicolon to separate
-the include directories, hence you can have include directories
-containing whitespace (this is quite common on Windows).
-
-<p>
-Here is an example:<pre>
-    INCLUDEPATH = C:\Program Files\DBLib\Include;C:\qt\include
-</pre>
-
-<p>
-tmake supports <em>project variable expension</em>. Use $$ to expand
-any project variable:<pre>
-    ALLFILES = $$HEADERS $$SOURCES
-</pre>
-
-<p>
-Most often you assign some value to a project variable, but you can
-also add to, remove from or replace parts of a project variable.<pre>
-    A   = abc
-    X   = xyz
-    A  += def			# A = abc def
-    X  *= xyz			# X = xyz
-    B   = $$A			# B = abc def
-    B  -= abc			# B = def
-    X  /= s/y/Y/		# X = xYz
-</pre>
-The *= operation adds the value if the variable does not already contain it.
-The /= operation performs regular expression substitution.
-
-<p>
-You can also set variables from the command line when running the tmake
-program. For instance, if you want to generate a makefile with debug
-information:<pre>
-    tmake "CONFIG+=debug" hello.pro
-</pre>
-
-<p>
-Use the <tt>unix:</tt> or <tt>win32:</tt> (conditional) qualifier if you want a
-platform-specific variable:<pre>
-    SOURCES	   =   common.cpp   # common for all platforms
-    unix:SOURCES   +=  unix.cpp	    # additional sources for Unix
-    win32:SOURCES  +=  win32.cpp    # additional sources for Windows
-    unix:LIBS	   +=  -lm	    # on Unix we need the math lib
-</pre>
-If none of the platforms match, tmake looks for the variable in CONFIG
-variable:<pre>
-    debug:SOURCES  +=  dbgstuff.cpp # additional source for debugging
-</pre>
-
-Finally, you can set platform and compiler-dependent variables:<pre>
-    linux-g++:TMAKE_CFLAGS = -fno-rtti
-</pre>
-
-<p>
-You may define your own project variables to be used by custom templates.  A
-project variable is stored in <code>%project</code>, which is an associative
-Perl array.  Access it like this: <code>$project{"var"}</code> or via the
-function <code>Project("var")</code>. For example, after reading
-"hello.pro", <code>$project{"SOURCES"}</code> contains "hello.cpp
-main.cpp".<p>
-
-
-<hr>
-<h2><a name="usage"></a>Running tmake</h2>
-
-Usage:<pre>
-  tmake [options] <em>project files or project settings</em>
-</pre>
-Options:<pre>
-  -e expr    Evaluate the Perl expression.  Ignores the template file.
-  -nodepend  Don't generate dependency information.
-  -o <em>file</em>    Write output to <em>file</em> instead of stdout.
-  -t <em>file</em>    Specify a template <em>file</em>.
-  -unix      Force tmake into Unix mode.
-  -v         Verbose/debugging on.
-  -win32     Force tmake into Win32 mode.
-</pre>
-
-The -t option overrides any <code>TEMPLATE</code> variable in the project file.
-<p>
-The default project file extension is ".pro". The default template file
-extension is ".t".  If you do not specify these extension tmake will
-automatically add them for you.
-
-<p>
-Example of basic use:<pre>
-    tmake hello -o Makefile
-</pre>
-
-<p>
-Example of how to create a makefile with debugging information:<pre>
-    tmake "CONFIG+=debug" hello -o Makefile
-</pre>
-
-<p>
-Exmaple of how to specify a TMAKEPATH:<pre>
-    tmake "TMAKEPATH=/local/tmake/lib/hpux-g++" hello.pro -o Makefile
-</pre>
-
-Example of how to evaluate a perl expression (print names of headers
-and source files):<pre>
-    tmake hello -e 'Expand("HEADERS","SOURCES")'
-</pre>
-
-<hr>
-<h2><a name="progen"></a>The progen Utility</h2>
-
-The progen utility creates project files for you. It can be used like
-this:<pre>
-  progen -n hello -o hello.pro
-</pre>
-If no .cpp or .h files are specified on the command line, progen
-searches for .cpp and .h (except moc_*.cpp) in the current directory
-and below.
-<p>
-Usage:<pre>
-  progen [options] [<em>C/C++ header files and source files</em>]
-</pre>
-Options:<pre>
-  -lower   Lower-case letters in filenames (useful on Windows).
-  -n <em>name</em>  Specify a project name (<code>TARGET</code>).
-  -o <em>file</em>  Write output to <em>file</em> instead of stdout.
-  -t <em>file</em>  Specify a template <em>file</em>.
-</pre>
-
-
-<hr>
-<h2>Advanced Topics</h2>
-
-In most cases you will be happy with using tmake as described above, but
-sometimes you need to add special compiler options or even add new
-makefile rules. This chapter describes how to customize your makefiles.
-
-<h4>Conditional Project Settings</h4>
-
-If you need a special compiler option etc., you can add platform-dependent
-settings in your project file:<pre>  
-  solaris-cc:TMAKE_CC     = /opt/bin/CC_5.0
-  solaris-cc:TMAKE_CFLAGS = -pts
-  unix:TMAKE_LIBS         = -lXext
-  win32:INCLUDEPATH       = c:\myinclude
-  win32-borland:DEFINES   = NO_BOOL
-</pre>
-
-You can prefix a project variable with unix: or win32: to make it specific for
-either Unix or Windows. You can also prefix a variable with
-<em>platform-compiler</em> 
-
-<h4>Your Own Templates</h4>
-
-If you know Perl programming, there is virtually no limitation to what you
-can do with tmake.  First you need to know how tmake works.
-
-<h4>Template Processing</h4>
-
-When you run tmake, it first reads the <tt>tmake.conf</tt> file.
-This configuration file has the same syntax as the project file.
-
-tmake then reads the project file and sets the project variables it
-finds, e.g. <code>HEADERS</code>, <code>SOURCES</code> etc.
-
-All variables and values are stored in a global associative Perl hash
-array called <code>project</code>.  For example,
-<code>$project{"SOURCES"}</code> contains "hello.cpp main.cpp"
-after processing hello.pro.
-
-When both the <tt>tmake.conf</tt> and the project files have been
-read, tmake starts reading the template file line by line and
-executes any Perl code it finds in the template.
-
-<ul>
-<li>Anything after <code>#$</code> until newline is
-    evaluated as perl code. The perl code is substituted
-    with the contents of the <code>$text</code>
-    variable.
-<li>Block of perl code: <code>#${</code> until
-    <code>#$}</code>.
-<li>Comments; <code>#!</code> until newline is stripped.
-<li>Anything else is copied directly from the template to
-    the output.
-</ul>
-
-<p>
-Example:<pre>
-    #! This is a comment which will be removed.
-    This text will appear in the output.
-    #$ $text = "The header file(s) are: " . $project{"HEADERS"};
-    # This text also appears in the output.
-    #${
-       $a = 12;
-       $b = 13;
-       $text = $a * $b;
-    #$}
-    That's all.
-</pre>
-Output:<pre>
-    This text will appear in the output.
-    The header file(s) are: hello.h
-    # This text also appears in the output.
-    156
-    That's all.
-</pre>
-
-
-<h3>Using tmake With Lex and Yacc</h3>
-
-The standard tmake templates knows how to process C and C++ files, but
-sometimes you need to process additional files and link them into your
-project.  A typical example is to process lex and yacc files when you're
-building a parser.
-
-<p>
-Parser template:<pre>
-  #!
-  #! parser.t: This is a custom template for building a parser
-  #!
-  #$ IncludeTemplate("app.t");
-
-  ####### Lex/yacc programs and options
-
-  LEX	    =	flex
-  YACC    =	#$ $text = ($is_unix ? "yacc -d" : "byacc -d");
-
-  ####### Lex/yacc files
-
-  LEXIN   =	#$ Expand("LEXINPUT");
-  LEXOUT  =	lex.yy.c
-  YACCIN  =	#$ Expand("YACCINPUT");
-  YACCOUT =	y.tab.c
-  YACCHDR =	y.tab.h
-  PARSER  =	#$ Expand("PARSER");
-
-  ####### Process lex/yacc files
-
-  $(LEXOUT): $(LEXIN)
-          $(LEX) $(LEXIN)
-
-  $(PARSER): $(YACCIN) $(LEXOUT)
-          $(YACC) $(YACCIN)
-          #$ $text = ($is_unix ? "-rm -f " : "-del ") . '$(PARSER)';
-          #$ $text = ($is_unix ? "-mv " : "-ren ") . '$(YACCOUT) $(PARSER)'; 
-</pre>
-
-The parser template adds some extra rules to the application template
-in order to build the lex and yacc portions of the project.  This
-template is portable across Unix and Windows since it generates different
-commands depending on the <code>$is_unix</code> variable.
-
-<p>
-To learn more about the Expand() function and other Perl functions which
-tmake provides, consult the <a href="tmake_ref.html">reference manual</a>.
-
-<p>
-Example project file:<pre>
-  TEMPLATE  = parser.t
-  CONFIG    = console release
-  LEXINPUT  = lexer.l
-  YACCINPUT = grammar.y
-  PARSER    = parser.cpp
-  SOURCES   = $$PARSER    \
-              node.cpp    \
-              asmgen.cpp
-  TARGET    = parser
-</pre>
-
-Here we use macro expansion <code>$$PARSER</code> to avoid writing parser.cpp
-two places.
-
-
-<h3>Counting the Number of Code Lines</h3>
-
-tmake is generic since it is based on Perl. You can create your own
-templates for other purposes than producing makefiles.  Here is an example
-template that counts the number of code lines in our project.
-
-<p>
-Template wc.t:<pre>
-  #! Template that count number of C++ lines.
-  The number of C++ code lines for #$ $text=$project_name;
-  #${
-    $files = $project{"HEADERS"} . " " . $project{"SOURCES"};
-    $text = `wc -l $files`;
-  #$}
-</pre>
-Run it:<pre>
-  tmake -t wc hello
-</pre>
-Output:<pre>
-  The number of C++ code lines for hello.pro
-       25    hello.h
-       98    hello.cpp
-       38    main.cpp
-      161    total
-</pre>
-This will only work if the wc program is installed on your system.
-
-
-</body></html>
diff --git a/tmake/doc/tmake_ref.html b/tmake/doc/tmake_ref.html
deleted file mode 100644
index c9124c4..0000000
--- a/tmake/doc/tmake_ref.html
+++ /dev/null
@@ -1,463 +0,0 @@
-<!doctype HTML public "-//W3C//DTD HTML 3.2//EN">
-<html><head><title>
-Reference Manual - tmake
-</title></head><body bgcolor="#ffffff">
-<p><h1 align=center>Reference Manual - tmake</h1>
-
-<hr>
-<h2>Project Variable Reference</h2>
-
-<h4><a name="ALL_DEPS"></a>ALL_DEPS</h4>
-Specifies additional dependencies for the makefile target "all:".<p>
-
-
-<h4><a name="CLEAN_FILES"></a>CLEAN_FILES</h4>
-Specifies additional files to be removed for "make clean".<p>
-Example:<pre>
-  CLEAN_FILES = core *~
-</pre>
-
-
-<h4><a name="CONFIG"></a>CONFIG</h4>
-Sets the make configuration.  It tells the tmake templates what compiler
-options to use and which extra libraries to link in.<p>
-These options control the compilation flags:
-<p>
-<table border="0">
-  <tr>
-    <td>&nbsp;</td>
-    <td>release</td>
-    <td>&nbsp;</td>
-    <td>Compile with optimization enabled, ignored if
-    "debug" is specified.</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>debug</td>
-    <td>&nbsp;</td>
-    <td>Compile with debug options enabled.</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>warn_on</td>
-    <td>&nbsp;</td>
-    <td>The compiler should emit more warnings than normally, ignored if
-     "warn_off" is specified.</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>warn_off</td>
-    <td>&nbsp;</td>
-    <td>The compiler should emit no warnings or as few as possible.</td>
-  </tr>
-</table>
-
-<p>
-These options defines the application/library type:
-<p>
-<table border="0">
-  <tr>
-    <td>&nbsp;</td>
-    <td>qt</td>
-    <td>&nbsp;</td>
-    <td>The target is a Qt application/library and requires Qt header
-     files/library.</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>opengl</td>
-    <td>&nbsp;</td>
-    <td>The target requires the OpenGL (or Mesa) headers/libraries.</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>x11</td>
-    <td>&nbsp;</td>
-    <td>The target is a X11 application (app.t only).</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>windows</td>
-    <td>&nbsp;</td>
-    <td>The target is a Win32 window application (app.t only).</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>console</td>
-    <td>&nbsp;</td>
-    <td>The target is a Win32 console application (app.t only).</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>dll</td>
-    <td>&nbsp;</td>
-    <td>The target is a shared object/DLL (app.t only).</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>staticlib</td>
-    <td>&nbsp;</td>
-    <td>The target is a static library (lib.t only).</td>
-  </tr>
-</table>
-
-
-<h4><a name="DEFINES"></a>DEFINES</h4>
-Specifies C/C++ macros (-D compiler option). On Windows you need
-to let DEFINES contain "QT_DLL" if you are building a Qt program
-which should link with the Qt DLL.
-
-
-<h4><a name="DEF_FILE"></a>DEF_FILE</h4>
-Win32/app.t only: Specifies a .def file.
-
-
-<h4><a name="DESTDIR"></a>DESTDIR</h4>
-Specifies where to put the target file.
-Example:<pre>
-  DESTDIR = ../../lib
-</pre>
-You must create this directory before running make.
-
-
-<h4><a name="HEADERS"></a>HEADERS</h4>
-Defines the header files of the project.
-
-
-<h4><a name="INCPATH"></a>INCPATH</h4>
-This variable is generated from <code>INCLUDEPATH</code>. The ';' or ':'
-separators have been replaced by ' ' (single space). This makes it
-easier to split. qtapp.t and other templates expand
-<code>INCPATH</code> to set -I options for the C++ compiler.
-
-
-<h4><a name="INCLUDEPATH"></a>INCLUDEPATH</h4>
-This variable specifies the #include directories. It can be set in the
-project file, or by the <a href="#AddIncludePath">AddIncludePath()</a>
-function.<p>
-Example:<pre>
-  INCLUDEPATH = c:\msdev\include d:\stl\include
-</pre>
-Use ';' or space as the directory separator.
-
-
-<h4><a name="LIBS"></a>LIBS</h4>
-Defines additional libraries to be linked in when creating an application
-or a shared library.  You probably want to use a platform qualifier since
-libraries are specified differently on Unix and Win32.<p>
-Example:<pre>
-  unix:LIBS  = -lXext -lm
-  win32:LIBS = ole32.lib
-</pre>
-
-
-<h4><a name="MOC_DIR"></a>MOC_DIR</h4>
-Specifies where to put the temporary moc output files.  By default they
-are stored in the directory where the moc input files are.
-<p>
-Example:<pre>
-  MOC_DIR = tmp
-</pre>
-You must create this directory before running make.
-<p>
-See also: <a href="#OBJECTS_DIR">OBJECTS_DIR</a>.
-
-
-<h4><a name="OBJECTS"></a>OBJECTS</h4>
-This varialble is generated from <code>SOURCES</code> by the StdInit() function.
-The extension of each source file has been replaced by .o (Unix) or .obj
-(Win32).<p>
-Example:<pre>
-  SOURCES = a.x b.y
-</pre>
-Then <code>OBJECTS</code> become "a.o b.o" on Unix and "a.obj b.obj" on
-Win32.
-
-
-<h4><a name="OBJECTS_DIR"></a>OBJECTS_DIR</h4>
-Specifies where to put object files.  By default they are stored in
-the directory where the source files are.<p>
-Example:<pre>
-  OBJECTS_DIR = tmp
-</pre>
-You must create this directory before running make.
-<p>
-See also: <a href="#MOC_DIR">MOC_DIR</a>.
-
-
-<h4><a name="OBJMOC"></a>OBJMOC</h4>
-This variable is generated by the <a href="#StdInit">StdInit()</a> function if
-<code>$moc_aware</code> is true. <code>OBJMOC</code> contains the name of
-all intermediate moc object files.<p>
-Example:<pre>
-  HEADERS = demo.h
-  SOURCES = demo.cpp main.cpp
-</pre>
-If <tt>demo.h</tt> and <tt>main.cpp</tt> define classes that use signals
-and slots (i.e. the <code>Q_OBJECT</code> "keyword" is found in these two
-files), <code>OBJMOC</code> becomes:<pre>
-  OBJMOC  = moc_demo.obj
-</pre>
-See also: <a href="#SRCMOC">SRCMOC</a>.
-
-
-<h4><a name="PROJECT"></a>PROJECT</h4>
-This is the name of the project.  It defaults to the name of the project
-file, excluding the .pro extension.
-
-
-<h4><a name="RC_FILE"></a>RC_FILE</h4>
-Win32/app.t only: Specifies a .rc file.  Cannot be used with the RES_FILE
-variable.
-
-
-<h4><a name="RES_FILE"></a>RES_FILE</h4>
-Win32/app.t only: Specifies a .res file.  You can either specify a
-.rc file or one or more .res files.
-
-
-<h4><a name="SOURCES"></a>SOURCES</h4>
-Defines the source files of the project.
-
-
-<h4><a name="SRCMOC"></a>SRCMOC</h4>
-This variable is generated by the <a href="#StdInit">StdInit()</a> function if
-<code>CONFIG</code> contains "qt". <code>SRCMOC</code> contains the name of
-all intermediate moc files.<p>
-Example:<pre>
-  HEADERS = demo.h
-  SOURCES = demo.cpp main.cpp
-</pre>
-If <tt>demo.h</tt> and <tt>main.cpp</tt> define classes that use signals
-and slots (i.e. the <code>Q_OBJECT</code> "keyword" is found in these two
-files), <code>SRCMOC</code> becomes:<pre>
-  SRCMOC  = moc_demo.cpp main.moc
-</pre>
-See also: <a href="#OBJMOC">OBJMOC</a>.
-
-
-<h4><a name="TARGET"></a>TARGET</h4>
-Sets the makefile target, i.e. what program to build.
-
-
-<h4><a name="TEMPLATE"></a>TEMPLATE</h4>
-Sets the default template. This can be overridden by the tmake -t
-<a href="tmake.html#usage">option</a>.
-
-
-<h4><a name="TMAKE_CC"></a>TMAKE_CC</h4>
-Contains the name of the compiler.
-
-
-<h4><a name="TMAKE_CFLAGS"></a>TMAKE_CFLAGS</h4>
-Contains the default compiler flags.
-
-
-<h4><a name="TMAKE_FILEVARS"></a>TMAKE_FILEVARS</h4>
-Tells tmake which variables contain file names.  This is because tmake
-on Windows replace the directory separator / with \.
-
-
-<hr>
-<h2>Function Reference</h2>
-This section contains a brief description of some important
-tmake functions used by the templates.
-
-
-<h3><a name="AddIncludePath"></a>AddIncludePath(path)</h3>
-Adds <em>path</em> to the include path variable,
-<a href="#INCLUDEPATH">INCLUDEPATH</a>. The include path is used
-for two purposes:<ol>
-<li>Searching files when generating include dependencies.
-<li>Setting -I options for the C/C++ compiler.
-</ol>
-<p>
-Example:<pre>
-  #$ AddIncludePath('$QTDIR/include;/local/include');
-</pre>
-
-
-<h3>BuildMocObj(objects,sources)</h3>
-Creates build rules for moc source files. Generates
-include dependencies.<p>
-Example:<pre>
-  #$ BuildMocObj($project{"OBJMOC"},$project{"SRCMOC"});
-</pre>Output:<pre>
-  moc_hello.o: moc_hello.cpp \
-		hello.h \
-		...
-</pre>
-
-<h3>BuildMocSrc(files)</h3>
-Creates moc source files from C++ files containing classes that
-define signals and slots. For a header file <tt>x.h</tt>, the
-generated moc file is called <tt>moc_x.h</tt>. For a source file
-<tt>y.cpp</tt>, the generates moc file is called <tt>y.moc</tt> and
-should be #include'd by <tt>y.cpp</tt>.<p>
-Example:<pre>
-  #$ BuildMocSrc($project{"HEADERS"});
-  #$ BuildMocSrc($project{"SOURCES"});
-</pre>Output:<pre>
-  moc_hello.cpp: hello.h
-	$(MOC) hello.h -o moc_hello.cpp
-</pre>
-
-
-<h3>BuildObj(objects,sources)</h3>
-Creates build rules for source files. Generates
-include dependencies.<p>
-Example:<pre>
-  #$ BuildObj($project{"OBJECTS"},$project{"SOURCES"});
-</pre>Output:<pre>
-  hello.o: hello.cpp \
-		hello.h \
-		...
-
-  main.o: main.cpp \
-		hello.h \
-		...
-</pre>
-
-
-<h3>Config(string)</h3>
-Returns true if the <code>CONFIG</code> variable contains the given string.
-<p>Example:<pre>
-  #$ if ( Config("release") { }
-</pre>
-
-
-<h3>DisableOutput()</h3>
-Call this function to force tmake to generate no output until
-EnableOutput() is called.
-<p>Example:<pre>
-  #$ Config("debug") && DisableOutput();
-      Anything here is skipped if CONFIG contains "debug".
-  #$ Config("debug") && EnableOutput();
-</pre>
-
-
-<h3>EnableOutput()</h3>
-Enables tmake output after DisableOutput() was called.
-
-
-<h3>Expand(var)</h3>
-Expands a project variable. Equivalent to <code>$text = $project{$var}</code>.
-<p>Example:<pre>
-  VERSION = #$ Expand("VERSION");
-</pre>Output:<pre>
-  VERSION = 1.1
-</pre>
-
-<h3>ExpandGlue(var,prepend,glue,append)</h3>
-Expands a $project{} variable, splits on whitespace
-and joins with $glue. $prepend is put at the start
-of the string and $append is put at the end of the
-string. The resulting string ($text) becomes "" if
-the project variable is empty or not defined.<p>
-Example:<pre>
-  clear:
-          #$ ExpandGlue("OBJECTS","-del","\n\t-del ","");
-</pre>Output (Windows NT):<pre>
-  clear:
-          -del hello.obj
-          -del main.obj
-</pre>
-
-
-<h3>ExpandList(var)</h3>
-This function is suitable for expanding lists of files.
-Equivalent with <code>ExpandGlue($var,""," \\\n\t\t","")</code>.<p>
-Example:<pre>
-  OBJECTS = #$ ExpandList("OBJECTS");
-</pre>Output:<pre>
-  OBJECTS = hello.o \
-	    main.o
-</pre>
-
-
-<h3>ExpandPath(var,prepend,glue,append)</h3>
-Similar to ExpandGlue, except that it splits the items on a semicolon
-instead of space (if the variable contains at least one semicolon).
-
-
-<h3>IncludeTemplate(file)</h3>
-Includes a template file. The ".t" extension is optional.<p>
-Example:<pre>
-  #$ IncludeTemplate("mytemplate");
-</pre>
-
-
-<h3>Now()</h3>
-Sets $text to the current date and time.<p>
-Example:<pre>
-  # Generated at #$ Now()
-</pre>Output:<pre>
-  # Generated at 12:58, 1996/11/19
-</pre>
-
-
-<h3>Project(strings)</h3>
-This is a powerful function for setting and reading project
-variables.  Returns the resulting project variables (joined with space
-between).
-<p>Examples:<pre>
-# Get a project variable:
-    $s = Project("TEMPLATE");	    -> $s = "TEMPLATE"
-
-# Set a project variable:
-    Project("TEMPLATE = lib");	    -> TEMPLATE = lib
-    Project("CONFIG =";)	    -> CONFIG empty
-
-# Append to a project variable:
-    Project("CONFIG = qt");	    -> CONFIG = qt
-    Project("CONFIG += debug");	    -> CONFIG = qt debug
-
-# Append to a project variable if it does not contain the value already:
-    Project("CONFIG = qt release"); -> CONFIG = qt release
-    Project("CONFIG *= qt");	    -> CONFIG = qt release
-    Project("CONFIG *= opengl");    -> CONFIG = qt release opengl
-
-# Subtract from a project variable:
-    Project("THINGS = abc xyz");    -> THINGS = abc xyz
-    Project("THINGS -= abc");	    -> THINGS = xyz
-
-# Search/replace on a project variable:
-    Project("CONFIG = tq opengl");  -> CONFIG = tq opengl
-    Project("CONFIG /= s/tq/qt/");  -> CONFIG = qt opengl
-
-# The operations can be performed on several project variables at a time.
-
-    Project("TEMPLATE = app", "CONFIG *= opengl", "THINGS += klm");
-</pre>
-
-
-<h3><a name="ScanProject"></a>ScanProject(file)</h3>
-Scans a project file and stores the project variables and values in the
-global associative <code>%project</code> array.
-
-
-<h3><a name="StdInit"></a>StdInit()</h3>
-Standard initialization of tmake. StdInit() should be
-called from one of the first lines in the template.<p>
-
-This function creates some new project variables:<ul>
-<li><code><a href="#OBJECTS">OBJECTS</a></code>
-    - Object files corresponding to
-   <code><a href="#SOURCES">SOURCES</a></code>.
-<li><code><a href="#SRCMOC">SRCMOC</a></code> - moc source files.
-<li><code><a href="#OBJMOC">OBJMOC</a></code> - moc object files.
-</ul>
-
-The moc-related variables are created only if <code>CONFIG</code> contains "qt"
-
-
-<h3>Substitute(string)</h3>
-This function takes a string and substitutes any occurrence of $$var
-with the actual content of the variable.  Returns the substituted string.
-Also sets $text.
-<p>
-Important: Use single quotes around the string, otherwise perl will expand
-any $vars it finds.
-<p>Example:<pre>
-    Substitute('Project name: $$PROJECT, uses template $$TEMPLATE');
-</pre>
diff --git a/tmake/example/hello.cpp b/tmake/example/hello.cpp
deleted file mode 100644
index 4868c4d..0000000
--- a/tmake/example/hello.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
-** 
-**
-** Copyright (C) 1992-1998 Troll Tech AS.  All rights reserved.
-**
-** This file is part of an example program for Qt.  This example
-** program may be used, distributed and modified without limitation.
-**
-*****************************************************************************/
-
-#include "hello.h"
-#include <qpushbutton.h>
-#include <qtimer.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-
-
-/*
-  Constructs a Hello widget. Starts a 40 ms animation timer.
-*/
-
-Hello::Hello( const char *text, QWidget *parent, const char *name )
-    : QWidget(parent,name), t(text), b(0)
-{
-    QTimer *timer = new QTimer(this);
-    connect( timer, SIGNAL(timeout()), SLOT(animate()) );
-    timer->start( 40 );
-
-    resize( 200, 100 );
-}
-
-
-/*
-  This private slot is called each time the timer fires.
-*/
-
-void Hello::animate()
-{
-    b = (b + 1) & 15;
-    repaint( FALSE );
-}
-
-
-/*
-  Handles mouse button release events for the Hello widget.
-
-  We emit the clicked() signal when the mouse is released inside
-  the widget.
-*/
-
-void Hello::mouseReleaseEvent( QMouseEvent *e )
-{
-    if ( rect().contains( e->pos() ) )
-	emit clicked();
-}
-
-
-/*
-  Handles paint events for the Hello widget.
-
-  Flicker-free update. The text is first drawn in the pixmap and the
-  pixmap is then blt'ed to the screen.
-*/
-
-void Hello::paintEvent( QPaintEvent * )
-{
-    static int sin_tbl[16] = {
-	0, 38, 71, 92, 100, 92, 71, 38,	0, -38, -71, -92, -100, -92, -71, -38};
-
-    if ( t.isEmpty() )
-	return;
-
-    // 1: Compute some sizes, positions etc.
-    QFontMetrics fm = fontMetrics();
-    int w = fm.width(t) + 20;
-    int h = fm.height() * 2;
-    int pmx = width()/2 - w/2;
-    int pmy = height()/2 - h/2;
-
-    // 2: Create the pixmap and fill it with the widget's background
-    QPixmap pm( w, h );
-    pm.fill( this, pmx, pmy );
-
-    // 3: Paint the pixmap. Cool wave effect
-    QPainter p;
-    int x = 10;
-    int y = h/2 + fm.descent();
-    int i = 0;
-    p.begin( &pm );
-    p.setFont( font() );
-    while ( t[i] ) {
-	int i16 = (b+i) & 15;
-        p.setPen( QColor((15-i16)*16,255,255,QColor::Hsv) );
-	p.drawText( x, y-sin_tbl[i16]*h/800, &t[i], 1 );
-	x += fm.width( t[i] );
-	i++;
-    }
-    p.end();
-
-    // 4: Copy the pixmap to the Hello widget
-    bitBlt( this, pmx, pmy, &pm );
-}
diff --git a/tmake/example/hello.h b/tmake/example/hello.h
deleted file mode 100644
index 07fb8c5..0000000
--- a/tmake/example/hello.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/****************************************************************************
-** 
-**
-** Copyright (C) 1992-1998 Troll Tech AS.  All rights reserved.
-**
-** This file is part of an example program for Qt.  This example
-** program may be used, distributed and modified without limitation.
-**
-*****************************************************************************/
-
-#ifndef HELLO_H
-#define HELLO_H
-
-#include <qwidget.h>
-
-
-class Hello : public QWidget
-{
-    Q_OBJECT
-public:
-    Hello( const char *text, QWidget *parent=0, const char *name=0 );
-signals:
-    void clicked();
-protected:
-    void mouseReleaseEvent( QMouseEvent * );
-    void paintEvent( QPaintEvent * );
-private slots:
-    void animate();
-private:
-    QString t;
-    int     b;
-};
-
-#endif
diff --git a/tmake/example/hello.pro b/tmake/example/hello.pro
deleted file mode 100644
index a299923..0000000
--- a/tmake/example/hello.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS     =	hello.h
-SOURCES     =	hello.cpp main.cpp
-TARGET      =	hello
diff --git a/tmake/example/main.cpp b/tmake/example/main.cpp
deleted file mode 100644
index 4b55a58..0000000
--- a/tmake/example/main.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// File: main.cpp
-//
-// A small Qt example application written by Troll Tech.
-//
-// It displays a text in a window and quits when you click
-// the mouse in the window.
-//
-
-#include "hello.h"
-#include <qapp.h>
-
-
-/*
-  The program starts here. It parses the command line and build a message
-  string to be displayed by the Hello widget.
-*/
-
-int main( int argc, char **argv )
-{
-    QApplication a(argc,argv);
-    QString s;
-    for ( int i=1; i<argc; i++ ) {
-	s += argv[i];
-	if ( i<argc-1 )
-	    s += " ";
-    }
-    if ( s.isEmpty() )
-	s = "Hello, World";
-    Hello h( s );
-    h.setCaption( "Qt says hello" );
-    QObject::connect( &h, SIGNAL(clicked()), &a, SLOT(quit()) );
-    h.setFont( QFont("times",32,QFont::Bold) );		// default font
-    h.setBackgroundColor( white );			// default bg color
-    a.setMainWidget( &h );
-    h.show();
-    return a.exec();
-}
diff --git a/tmake/example/wc.t b/tmake/example/wc.t
deleted file mode 100644
index dc041b5..0000000
--- a/tmake/example/wc.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#! Template that count number of C++ lines
-The number of C++ code lines for #$ $text=$project_name;
-#${
-    $files = $project{"HEADERS"} . " " . $project{"SOURCES"};
-    $text = `wc -l $files`;
-#$}
diff --git a/tmake/lib/aix-g++/app.t b/tmake/lib/aix-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/aix-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/aix-g++/lib.t b/tmake/lib/aix-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/aix-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/aix-g++/subdirs.t b/tmake/lib/aix-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/aix-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/aix-g++/tmake.conf b/tmake/lib/aix-g++/tmake.conf
deleted file mode 100644
index 897d509..0000000
--- a/tmake/lib/aix-g++/tmake.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# 
-#
-# tmake configuration for aix-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	=
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	=
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	=
-TMAKE_LFLAGS_SONAME	=
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cqs
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/aix-xlc/app.t b/tmake/lib/aix-xlc/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/aix-xlc/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/aix-xlc/lib.t b/tmake/lib/aix-xlc/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/aix-xlc/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/aix-xlc/subdirs.t b/tmake/lib/aix-xlc/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/aix-xlc/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/aix-xlc/tmake.conf b/tmake/lib/aix-xlc/tmake.conf
deleted file mode 100644
index 4013923..0000000
--- a/tmake/lib/aix-xlc/tmake.conf
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# 
-#
-# tmake configuration for aix-xlc
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= xlc
-TMAKE_CFLAGS		= -qstrict 
-TMAKE_CFLAGS_WARN_ON	=
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	=
-TMAKE_CFLAGS_YACC	=
-
-TMAKE_CXX		= xlC
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	=
-TMAKE_LIBDIR_X11	=
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= xlC
-TMAKE_LINK_SHLIB	= ld
-TMAKE_LINK_SHLIB_CMD	= /usr/lpp/xlC/bin/makeC++SharedLib -p 0 \
-			    -o lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) \
-			    -lXext -lX11 $(OBJECTS) $(OBJMOC); \
-			  ar q lib$(TARGET).a lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
-			  ranlib lib$(TARGET).a; \
-			  mv lib$(TARGET).a $(DESTDIR)
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	=
-TMAKE_LFLAGS_SONAME	=
-
-TMAKE_LIBS		= -liconv
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lGL -lGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		= ranlib
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/beos-g++/app.t b/tmake/lib/beos-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/beos-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/beos-g++/lib.t b/tmake/lib/beos-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/beos-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/beos-g++/subdirs.t b/tmake/lib/beos-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/beos-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/beos-g++/tmake.conf b/tmake/lib/beos-g++/tmake.conf
deleted file mode 100644
index b6649c9..0000000
--- a/tmake/lib/beos-g++/tmake.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 
-#
-# tmake configuration for linux-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	=
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		= -Wl,-rpath=/lib:$(QTDIR)/lib
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-
-TMAKE_LIBS		=
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cqs
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/bsdi-g++/app.t b/tmake/lib/bsdi-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/bsdi-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/bsdi-g++/lib.t b/tmake/lib/bsdi-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/bsdi-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/bsdi-g++/subdirs.t b/tmake/lib/bsdi-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/bsdi-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/bsdi-g++/tmake.conf b/tmake/lib/bsdi-g++/tmake.conf
deleted file mode 100644
index 65f7316..0000000
--- a/tmake/lib/bsdi-g++/tmake.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# 
-#
-# tmake configuration for bsdi-shlicc++, bsdi 4.0
-#
-# shlicc/++ is a BSDI wrapper around cc/g++ that enables shared libs
-# (info/7367)
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= shlicc++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= shlicc++
-TMAKE_LINK_SHLIB	= shlicc++
-TMAKE_LFLAGS		= -Wl,-rpath=/lib:/usr/X11R6/lib:$(QTDIR)/lib
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cqs
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/dgux-g++/app.t b/tmake/lib/dgux-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/dgux-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/dgux-g++/lib.t b/tmake/lib/dgux-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/dgux-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/dgux-g++/subdirs.t b/tmake/lib/dgux-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/dgux-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/dgux-g++/tmake.conf b/tmake/lib/dgux-g++/tmake.conf
deleted file mode 100644
index f4132d1..0000000
--- a/tmake/lib/dgux-g++/tmake.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 
-#
-# tmake configuration for linux-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-# "Frithjof.Brestrich" <brest@infp.fzk.de> suggests -h not -soname
-TMAKE_LFLAGS_SONAME	= -Wl,-h,
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/freebsd-g++/app.t b/tmake/lib/freebsd-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/freebsd-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/freebsd-g++/lib.t b/tmake/lib/freebsd-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/freebsd-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/freebsd-g++/subdirs.t b/tmake/lib/freebsd-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/freebsd-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/freebsd-g++/tmake.conf b/tmake/lib/freebsd-g++/tmake.conf
deleted file mode 100644
index 0b3c497..0000000
--- a/tmake/lib/freebsd-g++/tmake.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# 
-#
-# tmake configuration for freebsd-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		= -pipe
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-
-# soname does not work on fbsd 2.x
-#TMAKE_LFLAGS_SONAME	= -Wl,-soname
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cqs
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/gnu-g++/app.t b/tmake/lib/gnu-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/gnu-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/gnu-g++/lib.t b/tmake/lib/gnu-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/gnu-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/gnu-g++/subdirs.t b/tmake/lib/gnu-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/gnu-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/gnu-g++/tmake.conf b/tmake/lib/gnu-g++/tmake.conf
deleted file mode 100644
index 635bc5c..0000000
--- a/tmake/lib/gnu-g++/tmake.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# 
-#
-# tmake configuration for linux-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		= -Wl,-rpath=/lib:/usr/X11R6/lib:$(QTDIR)/lib
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cqs
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/hpux-acc/app.t b/tmake/lib/hpux-acc/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/hpux-acc/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/hpux-acc/lib.t b/tmake/lib/hpux-acc/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/hpux-acc/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/hpux-acc/subdirs.t b/tmake/lib/hpux-acc/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/hpux-acc/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/hpux-acc/tmake.conf b/tmake/lib/hpux-acc/tmake.conf
deleted file mode 100644
index dbd0c8e..0000000
--- a/tmake/lib/hpux-acc/tmake.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# 
-#
-# tmake configuration for hpux-acc
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= aCC
-TMAKE_CFLAGS		= -w -D__STRICT_ANSI__ -DPNG_USE_LOCAL_ARRAYS
-TMAKE_CFLAGS_WARN_ON	=
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= +Z
-TMAKE_CFLAGS_YACC	=
-
-TMAKE_CXX		= aCC
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/include/X11R6
-TMAKE_LIBDIR_X11	= /usr/lib/X11R6
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	= /opt/graphics/OpenGL/lib
-
-TMAKE_LINK		= aCC
-TMAKE_LINK_SHLIB	= aCC
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -b
-TMAKE_LFLAGS_SONAME	=
-TMAKE_HPUX_SHLIB	= 1
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm -lICE -lSM
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl -lGL
-TMAKE_LIBS_OPENGL	= -lGL -lGLU -lXmu
-TMAKE_LIBS_YACC		= -ly
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/hpux-cc/app.t b/tmake/lib/hpux-cc/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/hpux-cc/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/hpux-cc/lib.t b/tmake/lib/hpux-cc/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/hpux-cc/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/hpux-cc/subdirs.t b/tmake/lib/hpux-cc/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/hpux-cc/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/hpux-cc/tmake.conf b/tmake/lib/hpux-cc/tmake.conf
deleted file mode 100644
index b5881ec..0000000
--- a/tmake/lib/hpux-cc/tmake.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 
-#
-# tmake configuration for hpux-cc
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= cc
-TMAKE_CFLAGS		= -w +a1 -DAportable
-TMAKE_CFLAGS_WARN_ON	=
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= +Z
-TMAKE_CFLAGS_YACC	=
-
-TMAKE_CXX		= CC
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/include/X11R6
-TMAKE_LIBDIR_X11	= /usr/lib/X11R6
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= CC
-TMAKE_LINK_SHLIB	= CC
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -b
-TMAKE_LFLAGS_SONAME	=
-TMAKE_HPUX_SHLIB	= 1
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lGL -lGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/hpux-g++/app.t b/tmake/lib/hpux-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/hpux-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/hpux-g++/lib.t b/tmake/lib/hpux-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/hpux-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/hpux-g++/subdirs.t b/tmake/lib/hpux-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/hpux-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/hpux-g++/tmake.conf b/tmake/lib/hpux-g++/tmake.conf
deleted file mode 100644
index fb39414..0000000
--- a/tmake/lib/hpux-g++/tmake.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# 
-#
-# tmake configuration for hpux-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O0
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/include/X11R6
-TMAKE_LIBDIR_X11	= /usr/lib/X11R6
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -fPIC -shared
-TMAKE_LFLAGS_SONAME	=
-TMAKE_HPUX_SHLIB	= 1
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	=
-TMAKE_LIBS_OPENGL	= -lGL -lGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/irix-64/app.t b/tmake/lib/irix-64/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/irix-64/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/irix-64/lib.t b/tmake/lib/irix-64/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/irix-64/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/irix-64/subdirs.t b/tmake/lib/irix-64/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/irix-64/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/irix-64/tmake.conf b/tmake/lib/irix-64/tmake.conf
deleted file mode 100644
index ac0e2fa..0000000
--- a/tmake/lib/irix-64/tmake.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# 
-#
-# tmake configuration for irix-64
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= cc
-TMAKE_CFLAGS		= -64 LANG:bool=ON -woff 1209,1233,1314,1355,1375,1506
-TMAKE_CFLAGS_WARN_ON	= -fullwarn
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2 -OPT:Olimit=3000
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	=
-TMAKE_CFLAGS_YACC	= -woff 1110,1174,3262
-
-TMAKE_CXX		= CC
-TMAKE_CXXFLAGS		= -64 LANG:bool=ON -woff 1209,1233,1314,1355,1375,1506
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	=
-TMAKE_LIBDIR_X11	=
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= CC
-TMAKE_LINK_SHLIB	= CC
-TMAKE_LFLAGS		= -64
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lGL -lGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		=
-
-TMAKE_CLEAN		= -r so_locations ii_files
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/irix-dcc/app.t b/tmake/lib/irix-dcc/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/irix-dcc/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/irix-dcc/lib.t b/tmake/lib/irix-dcc/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/irix-dcc/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/irix-dcc/subdirs.t b/tmake/lib/irix-dcc/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/irix-dcc/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/irix-dcc/tmake.conf b/tmake/lib/irix-dcc/tmake.conf
deleted file mode 100644
index 0fcbaa8..0000000
--- a/tmake/lib/irix-dcc/tmake.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# 
-#
-# tmake configuration for irix-dcc
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= DCC
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -fullwarn
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	=
-TMAKE_CFLAGS_YACC	=
-
-TMAKE_CXX		= DCC
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	=
-TMAKE_LIBDIR_X11	=
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= DCC
-TMAKE_LINK_SHLIB	= DCC
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lGL -lGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		=
-
-TMAKE_CLEAN		= so_locations
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/irix-g++/app.t b/tmake/lib/irix-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/irix-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/irix-g++/lib.t b/tmake/lib/irix-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/irix-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/irix-g++/subdirs.t b/tmake/lib/irix-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/irix-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/irix-g++/tmake.conf b/tmake/lib/irix-g++/tmake.conf
deleted file mode 100644
index 2192c71..0000000
--- a/tmake/lib/irix-g++/tmake.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# 
-#
-# tmake configuration for irix-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O0
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	=
-TMAKE_LIBDIR_X11	=
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lGL -lGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		= ranlib
-
-TMAKE_CLEAN		= so_locations
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/irix-n32/app.t b/tmake/lib/irix-n32/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/irix-n32/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/irix-n32/lib.t b/tmake/lib/irix-n32/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/irix-n32/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/irix-n32/subdirs.t b/tmake/lib/irix-n32/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/irix-n32/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/irix-n32/tmake.conf b/tmake/lib/irix-n32/tmake.conf
deleted file mode 100644
index 9d8bcb4..0000000
--- a/tmake/lib/irix-n32/tmake.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# 
-#
-# tmake configuration for irix-n32
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= cc
-TMAKE_CFLAGS		= -n32 -mips3 LANG:bool=ON -woff 1209,1233,1314,1355,1375,1506
-TMAKE_CFLAGS_WARN_ON	= -fullwarn
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2 
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	=
-TMAKE_CFLAGS_YACC	= -woff 1110,1174,3262
-
-TMAKE_CXX		= CC
-TMAKE_CXXFLAGS		= -n32 -mips3 LANG:bool=ON -woff 1209,1233,1314,1355,1375,1506
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	=
-TMAKE_LIBDIR_X11	=
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= CC
-TMAKE_LINK_SHLIB	= CC
-TMAKE_LFLAGS		= -n32
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl -lGL
-TMAKE_LIBS_OPENGL	= -lGL -lGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		=
-
-TMAKE_CLEAN		= -r so_locations ii_files
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/irix-o32/app.t b/tmake/lib/irix-o32/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/irix-o32/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/irix-o32/lib.t b/tmake/lib/irix-o32/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/irix-o32/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/irix-o32/subdirs.t b/tmake/lib/irix-o32/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/irix-o32/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/irix-o32/tmake.conf b/tmake/lib/irix-o32/tmake.conf
deleted file mode 100644
index 89b8728..0000000
--- a/tmake/lib/irix-o32/tmake.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# 
-#
-# tmake configuration for irix-o32
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= cc
-TMAKE_CFLAGS		= -32 LANG:bool=ON -woff 1209,1233,1314,1355,1375,1506
-TMAKE_CFLAGS_WARN_ON	= -fullwarn
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2 -OPT:Olimit=3000
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	=
-TMAKE_CFLAGS_YACC	= -woff 1110,1174,3262
-
-TMAKE_CXX		= CC
-TMAKE_CXXFLAGS		= -32 LANG:bool=ON -woff 1209,1233,1314,1355,1375,1506
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	=
-TMAKE_LIBDIR_X11	=
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= CC
-TMAKE_LINK_SHLIB	= CC
-TMAKE_LFLAGS		= -32
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lGL -lGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		=
-
-TMAKE_CLEAN		= -r so_locations ii_files
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/linux-64/app.t b/tmake/lib/linux-64/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/linux-64/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/linux-64/lib.t b/tmake/lib/linux-64/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/linux-64/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/linux-64/subdirs.t b/tmake/lib/linux-64/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/linux-64/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/linux-64/tmake.conf b/tmake/lib/linux-64/tmake.conf
deleted file mode 100644
index 334cb0f..0000000
--- a/tmake/lib/linux-64/tmake.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 
-#
-# tmake configuration for linux-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		= -pipe
-TMAKE_CFLAGS_WARN_ON	= -Wall -W 
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib64
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib64
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib64
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	= -g
-TMAKE_LFLAGS_SHLIB	= -shared
-TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_X11SM	= -lICE -lSM
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cqs
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/linux-g++/app.t b/tmake/lib/linux-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/linux-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/linux-g++/lib.t b/tmake/lib/linux-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/linux-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/linux-g++/subdirs.t b/tmake/lib/linux-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/linux-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/linux-g++/tmake.conf b/tmake/lib/linux-g++/tmake.conf
deleted file mode 100644
index e100bce..0000000
--- a/tmake/lib/linux-g++/tmake.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 
-#
-# tmake configuration for linux-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		= -pipe -fsigned-char
-TMAKE_CFLAGS_WARN_ON	= -Wall -W 
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O3
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	= -g
-TMAKE_LFLAGS_SHLIB	= -shared
-TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_X11SM	= -lICE -lSM
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cqs
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/m68k-atari-mint-g++/app.t b/tmake/lib/m68k-atari-mint-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/m68k-atari-mint-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/m68k-atari-mint-g++/lib.t b/tmake/lib/m68k-atari-mint-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/m68k-atari-mint-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/m68k-atari-mint-g++/subdirs.t b/tmake/lib/m68k-atari-mint-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/m68k-atari-mint-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/m68k-atari-mint-g++/tmake.conf b/tmake/lib/m68k-atari-mint-g++/tmake.conf
deleted file mode 100644
index 9e1b373..0000000
--- a/tmake/lib/m68k-atari-mint-g++/tmake.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 
-#
-# tmake configuration for linux-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		= 
-TMAKE_CFLAGS_WARN_ON	= -Wall -W 
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O0
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	= -g
-TMAKE_LFLAGS_SHLIB	= -shared
-TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_X11SM	= -lICE -lSM
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cqs
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/macosx-c++/app.t b/tmake/lib/macosx-c++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/macosx-c++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/macosx-c++/lib.t b/tmake/lib/macosx-c++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/macosx-c++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/macosx-c++/subdirs.t b/tmake/lib/macosx-c++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/macosx-c++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/macosx-c++/tmake.conf b/tmake/lib/macosx-c++/tmake.conf
deleted file mode 100644
index 377b06f..0000000
--- a/tmake/lib/macosx-c++/tmake.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 
-#
-# tmake configuration for macosx-c++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= cc
-TMAKE_CFLAGS		= -pipe 
-TMAKE_CFLAGS_WARN_ON	= -Wall -W -Wno-deprecated-declarations 
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O3
-TMAKE_CFLAGS_DEBUG	= -g -fstack-protector
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= c++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS -mmacosx-version-min=10.5 -DYY_TYPEDEF_YY_SIZE_T -Dyy_size_t=int
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= 
-TMAKE_LIBDIR_X11	= 
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= c++
-TMAKE_LINK_SHLIB	= c++
-TMAKE_LFLAGS		= -Wl,-search_paths_first
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-
-TMAKE_LFLAGS_SONAME	= -dynamiclib -install_name
-
-TMAKE_LIBS		= -liconv -framework CoreServices
-TMAKE_LIBS_X11		= 
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		= ranlib
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/macosx-intel-c++/app.t b/tmake/lib/macosx-intel-c++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/macosx-intel-c++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/macosx-intel-c++/lib.t b/tmake/lib/macosx-intel-c++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/macosx-intel-c++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/macosx-intel-c++/subdirs.t b/tmake/lib/macosx-intel-c++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/macosx-intel-c++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/macosx-intel-c++/tmake.conf b/tmake/lib/macosx-intel-c++/tmake.conf
deleted file mode 100644
index 33af519..0000000
--- a/tmake/lib/macosx-intel-c++/tmake.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 
-#
-# tmake configuration for macosx-c++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= cc
-TMAKE_CFLAGS		= -pipe -arch i386 -arch x86_64 
-TMAKE_CFLAGS_WARN_ON	= -Wall -W -Wno-deprecated-declarations 
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= c++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS -mmacosx-version-min=10.5 -DYY_TYPEDEF_YY_SIZE_T -Dyy_size_t=int
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= 
-TMAKE_LIBDIR_X11	= 
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= c++
-TMAKE_LINK_SHLIB	= c++
-TMAKE_LFLAGS		= -Wl,-search_paths_first -arch i386 -arch x86_64 
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-
-TMAKE_LFLAGS_SONAME	= -dynamiclib -install_name
-
-TMAKE_LIBS		= -liconv -framework CoreServices -mmacosx-version-min=10.5
-TMAKE_LIBS_X11		= 
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		= ranlib
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/macosx-uni-c++/app.t b/tmake/lib/macosx-uni-c++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/macosx-uni-c++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/macosx-uni-c++/lib.t b/tmake/lib/macosx-uni-c++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/macosx-uni-c++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/macosx-uni-c++/subdirs.t b/tmake/lib/macosx-uni-c++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/macosx-uni-c++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/macosx-uni-c++/tmake.conf b/tmake/lib/macosx-uni-c++/tmake.conf
deleted file mode 100644
index 9d7a4a8..0000000
--- a/tmake/lib/macosx-uni-c++/tmake.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 
-#
-# tmake configuration for macosx-c++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= cc
-TMAKE_CFLAGS		= -pipe -arch i386 -arch ppc 
-TMAKE_CFLAGS_WARN_ON	= -Wall -W -Wno-deprecated-declarations
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= c++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS -mmacosx-version-min=10.5 -DYY_TYPEDEF_YY_SIZE_T -Dyy_size_t=int
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= 
-TMAKE_LIBDIR_X11	= 
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= c++
-TMAKE_LINK_SHLIB	= c++
-TMAKE_LFLAGS		= -Wl,-search_paths_first -arch i386 -arch ppc 
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-
-TMAKE_LFLAGS_SONAME	= -dynamiclib -install_name
-
-TMAKE_LIBS		= -liconv -framework CoreServices -mmacosx-version-min=10.5
-TMAKE_LIBS_X11		= 
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		= ranlib
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/netbsd-g++/app.t b/tmake/lib/netbsd-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/netbsd-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/netbsd-g++/lib.t b/tmake/lib/netbsd-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/netbsd-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/netbsd-g++/subdirs.t b/tmake/lib/netbsd-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/netbsd-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/netbsd-g++/tmake.conf b/tmake/lib/netbsd-g++/tmake.conf
deleted file mode 100644
index cad7876..0000000
--- a/tmake/lib/netbsd-g++/tmake.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# 
-#
-# tmake configuration for netbsd-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= ld
-TMAKE_LINK_SHLIB_CMD	= $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) \
-			  `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | \
-			  tsort` $(LIBS)
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -Bshareable
-TMAKE_LFLAGS_SONAME	=
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cqs
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/openbsd-g++/app.t b/tmake/lib/openbsd-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/openbsd-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/openbsd-g++/lib.t b/tmake/lib/openbsd-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/openbsd-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/openbsd-g++/subdirs.t b/tmake/lib/openbsd-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/openbsd-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/openbsd-g++/tmake.conf b/tmake/lib/openbsd-g++/tmake.conf
deleted file mode 100644
index 89cdc9b..0000000
--- a/tmake/lib/openbsd-g++/tmake.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# 
-#
-# tmake configuration for netbsd-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= ld
-TMAKE_LINK_SHLIB_CMD	= $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) \
-			  `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | \
-			  tsort` $(LIBS)
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -Bshareable
-TMAKE_LFLAGS_SONAME	=
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar q
-TMAKE_RANLIB		= ranlib
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/osf1-cxx/app.t b/tmake/lib/osf1-cxx/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/osf1-cxx/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/osf1-cxx/lib.t b/tmake/lib/osf1-cxx/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/osf1-cxx/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/osf1-cxx/subdirs.t b/tmake/lib/osf1-cxx/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/osf1-cxx/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/osf1-cxx/tmake.conf b/tmake/lib/osf1-cxx/tmake.conf
deleted file mode 100644
index b3f9a5d..0000000
--- a/tmake/lib/osf1-cxx/tmake.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# 
-#
-# tmake configuration for osf1-cxx (a.k.a. DEC Unix)
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= cxx
-TMAKE_CFLAGS		= -x cc -w -D_POSIX_SOURCE -D_OSF_SOURCE -D_AES_SOURCE
-TMAKE_CFLAGS_WARN_ON	=
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	=
-TMAKE_CFLAGS_YACC	= -Olimit 1000
-
-TMAKE_CXX		= cxx
-TMAKE_CXXFLAGS		= -x cxx -w -D_POSIX_SOURCE -D_OSF_SOURCE -D_AES_SOURCE
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= cxx
-TMAKE_LINK_SHLIB	= cxx
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-TMAKE_LFLAGS_SONAME	= <<END
--soname 
-END
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cqs
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/osf1-g++/app.t b/tmake/lib/osf1-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/osf1-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/osf1-g++/lib.t b/tmake/lib/osf1-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/osf1-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/osf1-g++/subdirs.t b/tmake/lib/osf1-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/osf1-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/osf1-g++/tmake.conf b/tmake/lib/osf1-g++/tmake.conf
deleted file mode 100644
index e23713e..0000000
--- a/tmake/lib/osf1-g++/tmake.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# 
-#
-# tmake configuration for osf1-g++ (a.k.a. DEC Unix)
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		= -D_POSIX_SOURCE -D_OSF_SOURCE -D_AES_SOURCE
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cqs
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/qnx-g++/app.t b/tmake/lib/qnx-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/qnx-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/qnx-g++/lib.t b/tmake/lib/qnx-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/qnx-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/qnx-g++/subdirs.t b/tmake/lib/qnx-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/qnx-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/qnx-g++/tmake.conf b/tmake/lib/qnx-g++/tmake.conf
deleted file mode 100644
index 4846d68..0000000
--- a/tmake/lib/qnx-g++/tmake.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# 
-#
-# tmake configuration for qnx-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		= -pipe
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O -fno-inline -fno-pack-struct
-TMAKE_CFLAGS_DEBUG	= -g -fno-inline -fno-pack-struct
-TMAKE_CFLAGS_SHLIB	=
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	=
-TMAKE_LFLAGS_SONAME	=
-
-TMAKE_LIBS		= -lunix
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cqs
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/sco-g++/app.t b/tmake/lib/sco-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/sco-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/sco-g++/lib.t b/tmake/lib/sco-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/sco-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/sco-g++/subdirs.t b/tmake/lib/sco-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/sco-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/sco-g++/tmake.conf b/tmake/lib/sco-g++/tmake.conf
deleted file mode 100644
index c571f98..0000000
--- a/tmake/lib/sco-g++/tmake.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# 
-#
-# tmake configuration for sco-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	=
-TMAKE_LIBDIR_X11	=
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-TMAKE_LFLAGS_SONAME	=
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lsocket -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		= ranlib
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/solaris-cc-64/app.t b/tmake/lib/solaris-cc-64/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/solaris-cc-64/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/solaris-cc-64/lib.t b/tmake/lib/solaris-cc-64/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/solaris-cc-64/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/solaris-cc-64/subdirs.t b/tmake/lib/solaris-cc-64/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/solaris-cc-64/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/solaris-cc-64/tmake.conf b/tmake/lib/solaris-cc-64/tmake.conf
deleted file mode 100644
index 889fde7..0000000
--- a/tmake/lib/solaris-cc-64/tmake.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# 
-#
-# tmake configuration for solaris-cc
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= cc
-TMAKE_CFLAGS		= -xtarget=generic64
-TMAKE_CFLAGS_WARN_ON	=
-TMAKE_CFLAGS_WARN_OFF	= -w
-TMAKE_CFLAGS_RELEASE	= -O
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -KPIC
-TMAKE_CFLAGS_YACC	=
-
-TMAKE_CXX		= CC
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= -xO2
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= -PIC
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/openwin/include
-TMAKE_LIBDIR_X11	= /usr/openwin/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= CC
-# Jan Wortelboer <janw@wins.uva.nl> suggests avoiding $LD_LIBRARY_PATH:
-TMAKE_LINK_SHLIB	= CC -R$(QTDIR)/lib:/usr/openwin/lib
-TMAKE_LFLAGS		= -64 -xtarget=generic64
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -G -h $(TARGET1)
-TMAKE_LFLAGS_SONAME	=
-
-TMAKE_LIBS		= 
-TMAKE_LIBS_X11		= -lXext -lX11 -lm -lICE -lSM
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl -lGL
-TMAKE_LIBS_OPENGL	= -lGL -lGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= CC -xar -o
-TMAKE_RANLIB		=
-
-TMAKE_CLEAN		= -r Templates.DB
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/solaris-cc-gcc/app.t b/tmake/lib/solaris-cc-gcc/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/solaris-cc-gcc/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/solaris-cc-gcc/lib.t b/tmake/lib/solaris-cc-gcc/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/solaris-cc-gcc/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/solaris-cc-gcc/subdirs.t b/tmake/lib/solaris-cc-gcc/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/solaris-cc-gcc/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/solaris-cc-gcc/tmake.conf b/tmake/lib/solaris-cc-gcc/tmake.conf
deleted file mode 100644
index de013a0..0000000
--- a/tmake/lib/solaris-cc-gcc/tmake.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# 
-#
-# tmake configuration for solaris-cc-gcc
-# (Using SunPro CC for C++ code and gcc for C code.)
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= CC
-TMAKE_CXXFLAGS		=
-TMAKE_CXXFLAGS_WARN_ON	=
-TMAKE_CXXFLAGS_WARN_OFF	= -w
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= -PIC
-TMAKE_CXXFLAGS_YACC	=
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/openwin/include
-TMAKE_LIBDIR_X11	= /usr/openwin/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= CC
-# Jan Wortelboer <janw@wins.uva.nl> suggests avoiding $LD_LIBRARY_PATH:
-TMAKE_LINK_SHLIB	= CC -R$(QTDIR)/lib:/usr/openwin/lib
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -G -h $(TARGET1)
-TMAKE_LFLAGS_SONAME	=
-
-TMAKE_LIBS		= -lC
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lGL -lGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= CC -xar -o
-TMAKE_RANLIB		=
-
-TMAKE_CLEAN		= -r Templates.DB
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/solaris-cc/app.t b/tmake/lib/solaris-cc/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/solaris-cc/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/solaris-cc/lib.t b/tmake/lib/solaris-cc/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/solaris-cc/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/solaris-cc/subdirs.t b/tmake/lib/solaris-cc/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/solaris-cc/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/solaris-cc/tmake.conf b/tmake/lib/solaris-cc/tmake.conf
deleted file mode 100644
index 3dbe810..0000000
--- a/tmake/lib/solaris-cc/tmake.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# 
-#
-# tmake configuration for solaris-cc
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= cc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	=
-TMAKE_CFLAGS_WARN_OFF	= -w
-TMAKE_CFLAGS_RELEASE	= -O
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -KPIC
-TMAKE_CFLAGS_YACC	=
-
-TMAKE_CXX		= CC
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= -O2
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= -PIC
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/openwin/include
-TMAKE_LIBDIR_X11	= /usr/openwin/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= CC
-# Jan Wortelboer <janw@wins.uva.nl> suggests avoiding $LD_LIBRARY_PATH:
-TMAKE_LINK_SHLIB	= CC -R$(QTDIR)/lib:/usr/openwin/lib
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -G -h $(TARGET1)
-TMAKE_LFLAGS_SONAME	=
-
-TMAKE_LIBS		= 
-TMAKE_LIBS_X11		= -lXext -lX11 -lm -lICE -lSM
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl -lGL
-TMAKE_LIBS_OPENGL	= -lGL -lGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= CC -xar -o
-TMAKE_RANLIB		=
-
-TMAKE_CLEAN		= -r Templates.DB
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/solaris-g++/app.t b/tmake/lib/solaris-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/solaris-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/solaris-g++/lib.t b/tmake/lib/solaris-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/solaris-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/solaris-g++/subdirs.t b/tmake/lib/solaris-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/solaris-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/solaris-g++/tmake.conf b/tmake/lib/solaris-g++/tmake.conf
deleted file mode 100644
index a6817bf..0000000
--- a/tmake/lib/solaris-g++/tmake.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 
-#
-# tmake configuration for solaris-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/openwin/include
-TMAKE_LIBDIR_X11	= /usr/openwin/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHAPP	= -shared
-TMAKE_LFLAGS_SHLIB	= -shared -h $(TARGET1)
-TMAKE_LFLAGS_SONAME	=
-
-TMAKE_LIBS		= -liconv
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lGL -lGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/sunos-g++/app.t b/tmake/lib/sunos-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/sunos-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/sunos-g++/lib.t b/tmake/lib/sunos-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/sunos-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/sunos-g++/subdirs.t b/tmake/lib/sunos-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/sunos-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/sunos-g++/tmake.conf b/tmake/lib/sunos-g++/tmake.conf
deleted file mode 100644
index 52f9e2d..0000000
--- a/tmake/lib/sunos-g++/tmake.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# 
-#
-# tmake configuration for sunos-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/openwin/include
-TMAKE_LIBDIR_X11	= /usr/openwin/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -fPIC -shared
-TMAKE_LFLAGS_SONAME	=
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lGL -lGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		= ranlib
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/ultrix-g++/app.t b/tmake/lib/ultrix-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/ultrix-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/ultrix-g++/lib.t b/tmake/lib/ultrix-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/ultrix-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/ultrix-g++/subdirs.t b/tmake/lib/ultrix-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/ultrix-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/ultrix-g++/tmake.conf b/tmake/lib/ultrix-g++/tmake.conf
deleted file mode 100644
index 59813eb..0000000
--- a/tmake/lib/ultrix-g++/tmake.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# 
-#
-# tmake configuration for ultrix-g++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	=
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= g++
-#TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-#TMAKE_LFLAGS_SHLIB	= -shared
-#TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cqs
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/unix/app.t b/tmake/lib/unix/app.t
deleted file mode 100644
index f59c9f9..0000000
--- a/tmake/lib/unix/app.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for building Unix applications.
-#!
-#$ Project('TMAKE_APP_FLAG = 1');
-#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/unix/generic.t b/tmake/lib/unix/generic.t
deleted file mode 100644
index 2852b36..0000000
--- a/tmake/lib/unix/generic.t
+++ /dev/null
@@ -1,283 +0,0 @@
-#!
-#! This is a tmake template for building UNIX applications or libraries.
-#!
-#${
-    if ( Project("TMAKE_LIB_FLAG") && !Config("staticlib") ) {
-	Project('CONFIG *= dll');
-    } elsif ( Project("TMAKE_APP_FLAG") || Config("dll") ) {
-	Project('CONFIG -= staticlib');
-    }
-    if ( Config("warn_off") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_OFF');
-    } elsif ( Config("warn_on") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_ON');
-    }
-    if ( Config("debug") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_DEBUG');
-	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG');
-    } elsif ( Config("release") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_RELEASE');
-	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE');
-    }
-    if ( Config("qt") || Config("opengl") ) {
-	Project('CONFIG *= x11lib');
-	if ( Config("opengl") ) {
-	    Project('CONFIG *= x11inc');
-	}
-    }
-    if ( Config("x11") ) {
-	Project('CONFIG *= x11lib');
-	Project('CONFIG *= x11inc');
-    }
-    if ( Config("qt") ) {
-	Project('CONFIG *= moc');
-	AddIncludePath(Project("TMAKE_INCDIR_QT"));
-	if ( Config("release") ) {
-	    Project('DEFINES += NO_DEBUG');
-	}
-	if ( Config("opengl") ) {
-	    Project("TMAKE_LIBDIR_QT") &&
-		Project('TMAKE_LIBS *= -L$$TMAKE_LIBDIR_QT');
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL');
-	}
-	if ( !((Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG")) ) {
-	    Project("TMAKE_LIBDIR_QT") &&
-		Project('TMAKE_LIBS *= -L$$TMAKE_LIBDIR_QT');
-            if ( Config("thread") ) {
-	      Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_MT');
-            } else {
-	      Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT');
-            }
-	}
-    }
-    if ( Config("opengl") ) {
-	AddIncludePath(Project("TMAKE_INCDIR_OPENGL"));
-	Project("TMAKE_LIBDIR_OPENGL") &&
-	    Project('TMAKE_LIBS *= -L$$TMAKE_LIBDIR_OPENGL');
-	Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL');
-    }
-    if ( Config("x11inc") ) {
-	AddIncludePath(Project("TMAKE_INCDIR_X11"));
-    }
-    if ( Config("x11lib") ) {
-	Project("TMAKE_LIBDIR_X11") &&
-	    Project('TMAKE_LIBS *= -L$$TMAKE_LIBDIR_X11');
-	Project('TMAKE_LIBS *= $$TMAKE_LIBS_X11');
-    }
-    if ( Config("moc") ) {
-	$moc_aware = 1;
-    }
-    Project('TMAKE_LIBS = $$LIBS $$TMAKE_LIBS');
-    if ( !Project("TMAKE_RUN_CC") ) {
-	Project('TMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src');
-    }
-    if ( !Project("TMAKE_RUN_CC_IMP") ) {
-	Project('TMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<');
-    }
-    if ( !Project("TMAKE_RUN_CXX") ) {
-	Project('TMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src');
-    }
-    if ( !Project("TMAKE_RUN_CXX_IMP") ) {
-	Project('TMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<');
-    }
-    Project('TMAKE_FILETAGS = HEADERS SOURCES TARGET DESTDIR $$FILETAGS');
-    StdInit();
-    $project{"VERSION"} || ($project{"VERSION"} = "1.0");
-    $project{"VER_MAJ"} = $project{"VERSION"};
-    $project{"VER_MAJ"} =~ s/\.\d+$//;
-    $project{"VER_MIN"} = $project{"VERSION"};
-    $project{"VER_MIN"} =~ s/^\d+\.//;
-    Project('DESTDIR_TARGET = $(TARGET)');
-    if ( Project("TMAKE_APP_FLAG") ) {
-	if ( Config("dll") ) {
-	    Project('TARGET = $$TARGET.so');
-	    Project("TMAKE_LFLAGS_SHAPP") ||
-		($project{"TMAKE_LFLAGS_SHAPP"} = $project{"TMAKE_LFLAGS_SHLIB"});
-	    Project("TMAKE_LFLAGS_SONAME") &&
-		($project{"TMAKE_LFLAGS_SONAME"} .= $project{"TARGET"});
-	}
-	$project{"TARGET"} = $project{"DESTDIR"} . $project{"TARGET"};
-    } elsif ( Config("staticlib") ) {
-	$project{"TARGET"} = $project{"DESTDIR"} . "lib" .
-			     $project{"TARGET"} . ".a";
-	Project("TMAKE_AR_CMD") ||
-	    Project('TMAKE_AR_CMD = $(AR) $(TARGET) $(OBJECTS) $(OBJMOC)');
-    } else {
-	$project{"TARGETA"} = $project{"DESTDIR"} . "lib" .
-			      $project{"TARGET"} . ".a";
-	if ( Project("TMAKE_AR_CMD") ) {
-	    $project{"TMAKE_AR_CMD"} =~ s/\(TARGET\)/\(TARGETA\)/g;
-	} else {
-	    Project('TMAKE_AR_CMD = $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)');
-	}
-	if ( $project{"TMAKE_HPUX_SHLIB"} ) {
-	    $project{"TARGET_x.y"} = "lib" . $project{"TARGET"} . ".sl";
-	} else {
-	    $project{"TARGET_"} = "lib" . $project{"TARGET"} . ".so";
-	    $project{"TARGET_x"} = $project{"TARGET_"} . "." .
-				   $project{"VER_MAJ"};
-	    $project{"TARGET_x.y"} = $project{"TARGET_"} . "." .
-				     $project{"VERSION"};
-	    $project{"TMAKE_LN_SHLIB"} = "-ln -s";
-        }
-	$project{"TARGET"} = $project{"TARGET_x.y"};
-	if ( $project{"DESTDIR"} ) {
-	    $project{"DESTDIR_TARGET"} = $project{"DESTDIR"} .
-					 $project{"TARGET"};
-	}
-	Project("TMAKE_LFLAGS_SONAME") &&
-	    ($project{"TMAKE_LFLAGS_SONAME"} .= $project{"TARGET_x"});
-	$project{"TMAKE_LINK_SHLIB_CMD"} ||
-	    ($project{"TMAKE_LINK_SHLIB_CMD"} =
-	      '$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)');
-    }
-    if ( Config("dll") ) {
-	Project('TMAKE_CFLAGS *= $$TMAKE_CFLAGS_SHLIB' );
-	Project('TMAKE_CXXFLAGS *= $$TMAKE_CXXFLAGS_SHLIB' );
-	if ( Project("TMAKE_APP_FLAG") ) {
-	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_SHAPP');
-	} else {
-	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_SHLIB $$TMAKE_LFLAGS_SONAME');
-	}
-    }
-#$}
-#!
-# Makefile for building #$ Expand("TARGET")
-# Generated by tmake at #$ Now();
-#     Project: #$ Expand("PROJECT");
-#    Template: #$ Expand("TEMPLATE");
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	#$ Expand("TMAKE_CC");
-CXX	=	#$ Expand("TMAKE_CXX");
-CFLAGS	=	#$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
-CXXFLAGS=	#$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
-INCPATH	=	#$ ExpandPath("INCPATH","-I"," -I","");
-#$ Config("staticlib") && DisableOutput();
-LINK	=	#$ Expand("TMAKE_LINK");
-LFLAGS	=	#$ Expand("TMAKE_LFLAGS");
-LIBS	=	#$ Expand("TMAKE_LIBS");
-#$ Config("staticlib") && EnableOutput();
-#$ Project("TMAKE_LIB_FLAG") || DisableOutput();
-AR	=	#$ Expand("TMAKE_AR");
-RANLIB	=	#$ Expand("TMAKE_RANLIB");
-#$ Project("TMAKE_LIB_FLAG") || EnableOutput();
-MOC	=	#$ Expand("TMAKE_MOC");
-
-TAR	=	#$ Expand("TMAKE_TAR");
-GZIP	=	#$ Expand("TMAKE_GZIP");
-
-####### Files
-
-HEADERS =	#$ ExpandList("HEADERS");
-SOURCES =	#$ ExpandList("SOURCES");
-OBJECTS =	#$ ExpandList("OBJECTS");
-SRCMOC	=	#$ ExpandList("SRCMOC");
-OBJMOC	=	#$ ExpandList("OBJMOC");
-DIST	=	#$ ExpandList("DISTFILES");
-TARGET	=	#$ Expand("TARGET");
-#$ (Project("TMAKE_APP_FLAG") || Config("staticlib")) && DisableOutput();
-TARGETA	=	#$ Expand("TARGETA");
-TARGETD	=	#$ Expand("TARGET_x.y");
-TARGET0	=	#$ Expand("TARGET_");
-TARGET1	=	#$ Expand("TARGET_x");
-#$ (Project("TMAKE_APP_FLAG") || Config("staticlib")) && EnableOutput();
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	#$ Expand("TMAKE_RUN_CXX_IMP");
-
-.cxx.o:
-	#$ Expand("TMAKE_RUN_CXX_IMP");
-
-.cc.o:
-	#$ Expand("TMAKE_RUN_CXX_IMP");
-
-.C.o:
-	#$ Expand("TMAKE_RUN_CXX_IMP");
-
-.c.o:
-	#$ Expand("TMAKE_RUN_CC_IMP");
-
-####### Build rules
-
-#$ Project("TMAKE_APP_FLAG") || DisableOutput();
-all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)';
-
-$(TARGET): $(HEADERS) $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS");
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-#$ Project("TMAKE_APP_FLAG") || EnableOutput();
-#$ (Config("staticlib") || Project("TMAKE_APP_FLAG")) && DisableOutput();
-all: #$ ExpandGlue("ALL_DEPS",""," ",""); Expand("DESTDIR_TARGET");
-
-#$ Substitute('$$DESTDIR_TARGET: $(OBJECTS) $(OBJMOC) $$TARGETDEPS');
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1)
-	#$ Expand("TMAKE_LINK_SHLIB_CMD");
-	#$ ExpandGlue("TMAKE_LN_SHLIB",""," "," \$(TARGET) \$(TARGET0)");
-	#$ ExpandGlue("TMAKE_LN_SHLIB",""," "," \$(TARGET) \$(TARGET1)");
-	#${
-	    $d = Project("DESTDIR");
-	    if ( $d ) {
-		$d =~ s-([^/])$-$1/-;
-		if ( Project("TMAKE_HPUX_SHLIB") ) {
-		    $text =  "-rm -f $d\$(TARGET)\n\t" .
-			     "-mv \$(TARGET) $d";
-		} else {
-		    $text =  "-rm -f $d\$(TARGET)\n\t" .
-			     "-rm -f $d\$(TARGET0)\n\t" .
-			     "-rm -f $d\$(TARGET1)\n\t" .
-			     "-mv \$(TARGET) \$(TARGET0) \$(TARGET1) $d";
-		}
-	    }
-	#$}
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS");
-	-rm -f $(TARGETA)
-	#$ Expand("TMAKE_AR_CMD");
-	#$ ExpandGlue("TMAKE_RANLIB","",""," \$(TARGETA)");
-#$ (Config("staticlib") || Project("TMAKE_APP_FLAG")) && EnableOutput();
-#$ Config("staticlib") || DisableOutput();
-all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)';
-
-staticlib: $(TARGET)
-
-$(TARGET): $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS");
-	-rm -f $(TARGET)
-	#$ Expand("TMAKE_AR_CMD");
-	#$ ExpandGlue("TMAKE_RANLIB","",""," \$(TARGET)");
-#$ Config("staticlib") || EnableOutput();
-
-moc: $(SRCMOC)
-
-#$ TmakeSelf();
-
-dist:
-	#$ Substitute('$(TAR) $$PROJECT.tar $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)');
-	#$ Substitute('$(GZIP) $$PROJECT.tar');
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(TARGET)
-#$ (Config("staticlib") || Project("TMAKE_APP_FLAG")) && DisableOutput();
-	-rm -f $(TARGET0) $(TARGET1) $(TARGETA)
-#$ (Config("staticlib") || Project("TMAKE_APP_FLAG")) && EnableOutput();
-	#$ ExpandGlue("TMAKE_CLEAN","-rm -f "," ","");
-	-rm -f *~ core
-	#$ ExpandGlue("CLEAN_FILES","-rm -f "," ","");
-
-####### Compile
-
-#$ BuildObj(Project("OBJECTS"),Project("SOURCES"));
-#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC"));
-#$ BuildMocSrc(Project("HEADERS"));
-#$ BuildMocSrc(Project("SOURCES"));
diff --git a/tmake/lib/unix/lib.t b/tmake/lib/unix/lib.t
deleted file mode 100644
index dd24c63..0000000
--- a/tmake/lib/unix/lib.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for building Unix libraries.
-#!
-#$ Project('TMAKE_LIB_FLAG = 1');
-#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/unix/subdirs.t b/tmake/lib/unix/subdirs.t
deleted file mode 100644
index e2b58a7..0000000
--- a/tmake/lib/unix/subdirs.t
+++ /dev/null
@@ -1,38 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for creating a makefile that invokes make in
-#! sub directories - for Unix.
-#!
-#${
-    StdInit();
-    Project('MAKEFILE') || Project('MAKEFILE = Makefile');
-    Project('TMAKE') || Project('TMAKE = tmake');
-#$}
-#!
-# Makefile for building targets in sub directories.
-# Generated by tmake at #$ Now();
-#     Project: #$ Expand("PROJECT");
-#    Template: #$ Expand("TEMPLATE");
-#############################################################################
-
-MAKEFILE=	#$ Expand("MAKEFILE");
-TMAKE	=	#$ Expand("TMAKE");
-
-SUBDIRS	=	#$ ExpandList("SUBDIRS");
-
-all: $(SUBDIRS)
-
-$(SUBDIRS): FORCE
-	cd $@; $(MAKE)
-
-#$ TmakeSelf();
-
-tmake_all:
-#${
-	$text = "\t" . 'for i in $(SUBDIRS); do ( cd $$i ; $(TMAKE) $$i.pro -o $(MAKEFILE); grep "TEMPLATE.*subdirs" $$i.pro 2>/dev/null >/dev/null && $(MAKE) -f $(MAKEFILE) tmake ) ; done';
-#$}
-
-clean:
-	for i in $(SUBDIRS); do ( cd $$i ; $(MAKE) clean ) ; done
-
-FORCE:
diff --git a/tmake/lib/unixware-g++/app.t b/tmake/lib/unixware-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/unixware-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/unixware-g++/lib.t b/tmake/lib/unixware-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/unixware-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/unixware-g++/subdirs.t b/tmake/lib/unixware-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/unixware-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/unixware-g++/tmake.conf b/tmake/lib/unixware-g++/tmake.conf
deleted file mode 100644
index d4e063f..0000000
--- a/tmake/lib/unixware-g++/tmake.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# 
-#
-# tmake configuration for sco-g++
-#
-# incl. UnixWare 7
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		= -D_UNIXWARE
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	=
-TMAKE_LIBDIR_X11	= /usr/X/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-TMAKE_LFLAGS_SONAME	=
-
-TMAKE_LIBS		= -lc
-TMAKE_LIBS_X11		= -lXext -lX11 -lsocket -lnsl -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu -lXt
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/unixware7-cc/app.t b/tmake/lib/unixware7-cc/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/unixware7-cc/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/unixware7-cc/lib.t b/tmake/lib/unixware7-cc/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/unixware7-cc/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/unixware7-cc/subdirs.t b/tmake/lib/unixware7-cc/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/unixware7-cc/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/unixware7-cc/tmake.conf b/tmake/lib/unixware7-cc/tmake.conf
deleted file mode 100644
index 6e239dc..0000000
--- a/tmake/lib/unixware7-cc/tmake.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# 
-#
-# tmake configuration for sco-g++
-#
-# (UnixWare file, with different -D)
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= cc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O -T used
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -K PIC
-TMAKE_CFLAGS_YACC	=
-
-TMAKE_CXX		= CC
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	=
-TMAKE_LIBDIR_X11	= /usr/X/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= CC
-TMAKE_LINK_SHLIB	= CC
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -G
-TMAKE_LFLAGS_SONAME	=
-
-TMAKE_LIBS		=
-TMAKE_LIBS_X11		= -lXext -lX11 -lsocket -lnsl -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu -lXt
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/unixware7-g++/app.t b/tmake/lib/unixware7-g++/app.t
deleted file mode 100644
index 867725e..0000000
--- a/tmake/lib/unixware7-g++/app.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/unixware7-g++/lib.t b/tmake/lib/unixware7-g++/lib.t
deleted file mode 100644
index 2523b2f..0000000
--- a/tmake/lib/unixware7-g++/lib.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/unixware7-g++/subdirs.t b/tmake/lib/unixware7-g++/subdirs.t
deleted file mode 100644
index 5e888af..0000000
--- a/tmake/lib/unixware7-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Unix template
-#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/unixware7-g++/tmake.conf b/tmake/lib/unixware7-g++/tmake.conf
deleted file mode 100644
index 44f30a5..0000000
--- a/tmake/lib/unixware7-g++/tmake.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# 
-#
-# tmake configuration for sco-g++
-#
-# (UnixWare file, with different -D)
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		= -D_UNIXWARE7
-TMAKE_CFLAGS_WARN_ON	= -Wall -W
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_SHLIB	= -fPIC
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	=
-TMAKE_LIBDIR_X11	= /usr/X/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	=
-TMAKE_LIBDIR_OPENGL	=
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -shared
-TMAKE_LFLAGS_SONAME	=
-
-TMAKE_LIBS		= -lc
-TMAKE_LIBS_X11		= -lXext -lX11 -lsocket -lnsl -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_MT	= -lqt-mt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu -lXt
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cq
-TMAKE_RANLIB		=
-
-TMAKE_TAR		= tar -cf
-TMAKE_GZIP		= gzip -9f
diff --git a/tmake/lib/win32-borland/app.t b/tmake/lib/win32-borland/app.t
deleted file mode 100644
index fc4dc2c..0000000
--- a/tmake/lib/win32-borland/app.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for building Win32 applications.
-#!
-#$ Project('TMAKE_APP_FLAG = 1');
-#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/win32-borland/generic.t b/tmake/lib/win32-borland/generic.t
deleted file mode 100644
index aa7f53b..0000000
--- a/tmake/lib/win32-borland/generic.t
+++ /dev/null
@@ -1,237 +0,0 @@
-#!
-#! This is a tmake template for building Win32 applications or libraries.
-#!
-#${
-    if ( Config("qt") ) {
-	if ( !(Project("DEFINES") =~ /QT_NODLL/) &&
-	     ((Project("DEFINES") =~ /QT_(?:MAKE)?DLL/) ||
-	      ($ENV{"QT_DLL"} && !$ENV{"QT_NODLL"})) ) {
-	    Project('TMAKE_QT_DLL = 1');
-	    if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) {
-		Project('CONFIG += dll');
-	    }
-	}
-    }
-    if ( Config("dll") || Project("TMAKE_APP_FLAG") ) {
-	Project('CONFIG -= staticlib');
-	Project('TMAKE_APP_OR_DLL = 1');
-    } else {
-	Project('CONFIG += staticlib');
-    }
-    if ( Config("warn_off") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_OFF');
-    } elsif ( Config("warn_on") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_ON');
-    }
-    if ( Config("debug") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_DEBUG');
-	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG');
-    } elsif ( Config("release") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_RELEASE');
-	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE');
-    }
-    if ( Config("qt") || Config("opengl") ) {
-	Project('CONFIG += windows' );
-    }
-    if ( Config("qt") ) {
-	Project('CONFIG *= moc');
-	AddIncludePath(Project("TMAKE_INCDIR_QT"));
-	if ( Config("release") ) {
-	    Project('DEFINES += NO_DEBUG');
-	}
-	if ( Config("opengl") ) {
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL');
-	}
-	if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) {
-	    if ( Project("TMAKE_QT_DLL") ) {
-		Project('DEFINES -= QT_DLL');
-		Project('DEFINES *= QT_MAKEDLL');
-		Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_QT_DLL');
-	    }
-	} else {
-	    if ( Project("TMAKE_QT_DLL") ) {
-		Project('DEFINES *= QT_DLL');
-	    }
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT');
-	    if ( Project("TMAKE_QT_DLL") ) {
-		my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt");
-		Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/");
-		if ( !Config("dll") ) {
-		    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL');
-		}
-	    }
-	}
-    }
-    if ( Config("opengl") ) {
-	Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL');
-    }
-    if ( Config("dll") ) {
-	Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE_DLL');
-	Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS_DLL');
-	if ( Project("TMAKE_LIB_FLAG") ) {
-	    my $ver = Project("VERSION");
-	    $ver =~ s/\.//g;
-	    $project{"TARGET_EXT"} = "${ver}.dll";
-	} else {
-	    $project{"TARGET_EXT"} = ".dll";
-	}
-    } else {
-	Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE');
-	Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS');
-	if ( Project("TMAKE_APP_FLAG") ) {
-	    $project{"TARGET_EXT"} = ".exe";
-	} else {
-	    $project{"TARGET_EXT"} = ".lib";
-	}
-    }
-    if ( Config("windows") ) {
-	if ( Config("console") ) {
-	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
-	    Project('TMAKE_LIBS   *= $$TMAKE_LIBS_CONSOLE');
-	} else {
-	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_WINDOWS_ANY');
-	}
-	Project('TMAKE_LIBS   *= $$TMAKE_LIBS_WINDOWS');
-    } else {
-	Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
-	Project('TMAKE_LIBS   *= $$TMAKE_LIBS_CONSOLE');
-    }
-    if ( Config("moc") ) {
-	$moc_aware = 1;
-    }
-    Project('TMAKE_LIBS += $$LIBS');
-    Project('TMAKE_FILETAGS = HEADERS SOURCES DEF_FILE RC_FILE TARGET TMAKE_LIBS DESTDIR DLLDESTDIR $$FILETAGS');
-    foreach ( split(/\s/,Project("TMAKE_FILETAGS")) ) {
-	$project{$_} =~ s-[/\\]+-\\-g;
-    }
-    if ( Project("DEF_FILE") ) {
-	Project('TMAKE_LFLAGS *= /DEF:$$DEF_FILE');
-    }
-    if ( Project("RC_FILE") ) {
-	if ( Project("RES_FILE") ) {
-	    tmake_error("Both .rc and .res file specified.\n" .
-			"Please specify one of them, not both.");
-	}
-	$project{"RES_FILE"} = $project{"RC_FILE"};
-	$project{"RES_FILE"} =~ s/\.rc$/.res/i;
-	Project('TARGETDEPS += $$RES_FILE');
-    }
-    if ( Project("RES_FILE") ) {
-	Project('TMAKE_LIBS *= $$RES_FILE');
-    }
-    StdInit();
-    if ( Project("VERSION") ) {
-	$project{"VER_MAJ"} = $project{"VERSION"};
-	$project{"VER_MAJ"} =~ s/\.\d+$//;
-	$project{"VER_MIN"} = $project{"VERSION"};
-	$project{"VER_MIN"} =~ s/^\d+\.//;
-    }
-    Project('TMAKE_CLEAN += $$TARGET.tds');
-#$}
-#!
-# Makefile for building #$ Expand("TARGET")
-# Generated by tmake at #$ Now();
-#     Project: #$ Expand("PROJECT");
-#    Template: #$ Expand("TEMPLATE");
-#############################################################################
-
-!if !$d(BCB)
-BCB = $(MAKEDIR)\..
-!endif
-
-####### Compiler, tools and options
-
-CC	=	#$ Expand("TMAKE_CC");
-CXX	=	#$ Expand("TMAKE_CXX");
-CFLAGS	=	#$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
-CXXFLAGS=	#$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
-INCPATH	=	#$ ExpandPath("INCPATH",'-I',' -I','');
-#$ !Project("TMAKE_APP_OR_DLL") && DisableOutput();
-LINK	=	#$ Expand("TMAKE_LINK");
-LFLAGS	=	#$ Expand("TMAKE_LFLAGS");
-LIBS	=	#$ Expand("TMAKE_LIBS");
-#$ !Project("TMAKE_APP_OR_DLL") && EnableOutput();
-#$ Project("TMAKE_APP_OR_DLL") && DisableOutput();
-LIB	=	#$ Expand("TMAKE_LIB");
-#$ Project("TMAKE_APP_OR_DLL") && EnableOutput();
-MOC	=	#$ Expand("TMAKE_MOC");
-
-ZIP	=	#$ Expand("TMAKE_ZIP");
-
-####### Files
-
-HEADERS =	#$ ExpandList("HEADERS");
-SOURCES =	#$ ExpandList("SOURCES");
-OBJECTS =	#$ ExpandList("OBJECTS");
-SRCMOC	=	#$ ExpandList("SRCMOC");
-OBJMOC	=	#$ ExpandList("OBJMOC");
-DIST	=	#$ ExpandList("DISTFILES");
-TARGET	=	#$ ExpandGlue("TARGET",$project{"DESTDIR"},"",$project{"TARGET_EXT"});
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .c
-
-.cpp.obj:
-	#$ Expand("TMAKE_RUN_CXX_IMP");
-
-.cxx.obj:
-	#$ Expand("TMAKE_RUN_CXX_IMP");
-
-.cc.obj:
-	#$ Expand("TMAKE_RUN_CXX_IMP");
-
-.c.obj:
-	#$ Expand("TMAKE_RUN_CC_IMP");
-
-####### Build rules
-
-all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)';
-
-$(TARGET): $(HEADERS) $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS");
-#$ Project("TMAKE_APP_OR_DLL") || DisableOutput();
-	$(LINK) @&&|
-	    $(LFLAGS) $(OBJECTS) $(OBJMOC), $(TARGET),,$(LIBS)
-#$ Project("TMAKE_APP_OR_DLL") || EnableOutput();
-#$ Project("TMAKE_APP_OR_DLL") && DisableOutput();
-	-del $(TARGET)
-	$(LIB) $(TARGET) @&&|
-#${
-# $text = "+" . join(" \\\n+",split(/\s+/,$project{"OBJECTS"})) . " \\\n+"
-#             . join(" \\\n+",split(/\s+/,$project{"OBJMOC"}));
-#$}
-#$ Project("TMAKE_APP_OR_DLL") && EnableOutput();
-|
-#$ (Config("dll") && Project("DLLDESTDIR")) || DisableOutput();
-	-copy $(TARGET) #$ Expand("DLLDESTDIR");
-#$ (Config("dll") && Project("DLLDESTDIR")) || EnableOutput();
-#$ Project("RC_FILE") || DisableOutput();
-
-#$ Substitute("\$\$RES_FILE: \$\$RC_FILE\n\t\$\$TMAKE_RC \$\$RC_FILE");
-#$ Project("RC_FILE") || EnableOutput();
-
-moc: $(SRCMOC)
-
-#$ TmakeSelf();
-
-dist:
-	#$ Substitute('$(ZIP) $$PROJECT.zip $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)');
-
-clean:
-	#$ ExpandGlue("OBJECTS","-del ","\n\t-del ","");
-	#$ ExpandGlue("SRCMOC" ,"-del ","\n\t-del ","");
-	#$ ExpandGlue("OBJMOC" ,"-del ","\n\t-del ","");
-	-del $(TARGET)
-	#$ ExpandGlue("TMAKE_CLEAN","-del ","\n\t-del ","");
-	#$ ExpandGlue("CLEAN_FILES","-del ","\n\t-del ","");
-
-####### Compile
-
-#$ BuildObj(Project("OBJECTS"),Project("SOURCES"));
-#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC"));
-#$ BuildMocSrc(Project("HEADERS"));
-#$ BuildMocSrc(Project("SOURCES"));
diff --git a/tmake/lib/win32-borland/lib.t b/tmake/lib/win32-borland/lib.t
deleted file mode 100644
index d8ac6c7..0000000
--- a/tmake/lib/win32-borland/lib.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for building Win32 libraries.
-#!
-#$ Project('TMAKE_LIB_FLAG = 1');
-#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/win32-borland/subdirs.t b/tmake/lib/win32-borland/subdirs.t
deleted file mode 100644
index f08e41f..0000000
--- a/tmake/lib/win32-borland/subdirs.t
+++ /dev/null
@@ -1,3 +0,0 @@
-#! Use the common Win32 template
-#$ Project("TMAKE_NOFORCE = 1");
-#$ IncludeTemplate("../win32/subdirs.t");
diff --git a/tmake/lib/win32-borland/tmake.conf b/tmake/lib/win32-borland/tmake.conf
deleted file mode 100644
index bce6f1a..0000000
--- a/tmake/lib/win32-borland/tmake.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# 
-#
-# tmake configuration for Win32/Borland C++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= bcc32
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	= -w
-TMAKE_CFLAGS_WARN_OFF	= -w-
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -v
-TMAKE_CFLAGS_YACC	=
-
-TMAKE_CXX		= $$TMAKE_CC
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_INCDIR_QT		= $(QTDIR)\include
-
-TMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src
-TMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $<
-TMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$obj $src
-TMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $<
-
-TMAKE_LINK		= ilink32
-TMAKE_LFLAGS		= -L$(BCB)\lib -c -x -Gn
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	= -v
-TMAKE_LFLAGS_CONSOLE	= -ap -Tpe c0x32.obj
-TMAKE_LFLAGS_WINDOWS	= -aa -Tpe c0w32.obj
-TMAKE_LFLAGS_CONSOLE_DLL= -Gi -ap -Tpd c0d32.obj
-TMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj
-
-TMAKE_LIBS		= import32.lib cw32.lib
-TMAKE_LIBS_CONSOLE	=
-TMAKE_LIBS_WINDOWS	=
-TMAKE_LIBS_QT		= $(QTDIR)\lib\qt.lib
-TMAKE_LIBS_QT_DLL	= $(QTDIR)\lib\qtmain.lib
-TMAKE_LIBS_QT_OPENGL	= $(QTDIR)\lib\qgl.lib
-TMAKE_LIBS_OPENGL	=
-
-TMAKE_MOC		= moc
-
-TMAKE_LIB		= tlib /C /P256
-TMAKE_RC		= brc32
-
-TMAKE_ZIP		= zip -r -9
diff --git a/tmake/lib/win32-g++/app.t b/tmake/lib/win32-g++/app.t
deleted file mode 100644
index fc4dc2c..0000000
--- a/tmake/lib/win32-g++/app.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for building Win32 applications.
-#!
-#$ Project('TMAKE_APP_FLAG = 1');
-#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/win32-g++/generic.t b/tmake/lib/win32-g++/generic.t
deleted file mode 100644
index 33494a2..0000000
--- a/tmake/lib/win32-g++/generic.t
+++ /dev/null
@@ -1,243 +0,0 @@
-#!
-#! This is a tmake template for building Win32 applications or libraries.
-#!
-#${
-    if ( Config("qt") ) {
-	if ( !(Project("DEFINES") =~ /QT_NODLL/) &&
-	     ((Project("DEFINES") =~ /QT_(?:MAKE)?DLL/) ||
-	      ($ENV{"QT_DLL"} && !$ENV{"QT_NODLL"})) ) {
-	    Project('TMAKE_QT_DLL = 1');
-	    if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) {
-		Project('CONFIG += dll');
-	    }
-	}
-    }
-    if ( Config("dll") || Project("TMAKE_APP_FLAG") ) {
-	Project('CONFIG -= staticlib');
-	Project('TMAKE_APP_OR_DLL = 1');
-    } else {
-	Project('CONFIG += staticlib');
-    }
-    if ( Config("warn_off") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_OFF');
-    } elsif ( Config("warn_on") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_ON');
-    }
-    if ( Config("debug") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_DEBUG');
-	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG');
-    } elsif ( Config("release") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_RELEASE');
-	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE');
-    }
-    if ( Config("qt") || Config("opengl") ) {
-	Project('CONFIG += windows' );
-    }
-    if ( Config("qt") ) {
-	Project('CONFIG *= moc');
-	AddIncludePath(Project("TMAKE_INCDIR_QT"));
-	if ( Config("release") ) {
-	    Project('DEFINES += NO_DEBUG');
-	}
-	if ( Config("opengl") ) {
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL');
-	}
-	if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) {
-	    if ( Project("TMAKE_QT_DLL") ) {
-		Project('DEFINES -= QT_DLL');
-		Project('DEFINES *= QT_MAKEDLL');
-		Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_QT_DLL');
-	    }
-	} else {
-	    if ( Project("TMAKE_QT_DLL") ) {
-		Project('DEFINES *= QT_DLL');
-	    }
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT');
-	    if ( Project("TMAKE_QT_DLL") ) {
-		my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt");
-		Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/");
-		if ( !Config("dll") ) {
-		    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL');
-		}
-	    }
-	}
-    }
-    if ( Config("opengl") ) {
-	Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL');
-    }
-    if ( Config("dll") ) {
-	Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE_DLL');
-	Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS_DLL');
-	if ( Project("TMAKE_LIB_FLAG") ) {
-	    my $ver = Project("VERSION");
-	    $ver =~ s/\.//g;
-	    $project{"TARGET_EXT"} = "${ver}.dll";
-	} else {
-	    $project{"TARGET_EXT"} = ".dll";
-	}
-    } else {
-        if ( Config("cgi") ) {
-	    Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE');
-	    Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS');
-	    $project{"TARGET_EXT"} = "";
-        } else {
-	    if ( Project("TMAKE_APP_FLAG") ) {
-	        $project{"TARGET_EXT"} = ".exe";
-	    } else {
-	        $project{"TARGET_EXT"} = ".a";
-	    }
-        }
-    }
-    if ( Config("windows") ) {
-	if ( Config("console") ) {
-	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
-	    Project('TMAKE_LIBS   *= $$TMAKE_LIBS_CONSOLE');
-	} else {
-	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_WINDOWS_ANY');
-	}
-	Project('TMAKE_LIBS   *= $$TMAKE_LIBS_WINDOWS');
-    } else {
-	Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
-	Project('TMAKE_LIBS   *= $$TMAKE_LIBS_CONSOLE');
-    }
-    if ( Config("moc") ) {
-	$moc_aware = 1;
-    }
-    Project('TMAKE_LIBS += $$LIBS');
-    Project('TMAKE_FILETAGS = HEADERS SOURCES DEF_FILE RC_FILE TARGET TMAKE_LIBS DESTDIR DLLDESTDIR $$FILETAGS');
-    foreach ( split(/\s/,Project("TMAKE_FILETAGS")) ) {
-	$project{$_} =~ s-[/\\]+-/-g;
-    }
-    if ( Project("DEF_FILE") ) {
-	Project('TMAKE_LFLAGS *= $$DEF_FILE');
-    }
-    if ( Project("RC_FILE") ) {
-	if ( Project("RES_FILE") ) {
-	    tmake_error("Both .rc and .res file specified.\n" .
-			"Please specify one of them, not both.");
-	}
-	$project{"RES_FILE"} = $project{"RC_FILE"};
-	$project{"RES_FILE"} =~ s/\.rc$/.res/i;
-	Project('TARGETDEPS += $$RES_FILE');
-    }
-    if ( Project("RES_FILE") ) {
-	Project('TMAKE_LIBS *= $$RES_FILE');
-    }
-    $obj_ext  = "o";
-    $dir_sep  = "/";
-    $gnuwin32 = 1;
-    if ( Config("qt") ) {
-	$qtdir = $ENV{"QTDIR"};
-	$project{"INCPATH"} =~ s/\$\(QTDIR\)/$qtdir/;
-	$project{"INCPATH"} =~ s/\\/\//g;
-	$project{"TMAKE_LIBS"} =~ s/\$\(QTDIR\)/$qtdir/;
-	$project{"TMAKE_LIBS"} =~ s/\\/\//g;
-    }
-    StdInit();
-    if ( Project("VERSION") ) {
-	$project{"VER_MAJ"} = $project{"VERSION"};
-	$project{"VER_MAJ"} =~ s/\.\d+$//;
-	$project{"VER_MIN"} = $project{"VERSION"};
-	$project{"VER_MIN"} =~ s/^\d+\.//;
-    }    
-    if ( Config("staticlib") ) {
-	$project{"TARGET"} = "lib" . $project{"TARGET"}
-    }
-#$}
-#!
-# Makefile for building #$ Expand("TARGET")
-# Generated by tmake at #$ Now();
-#     Project: #$ Expand("PROJECT");
-#    Template: #$ Expand("TEMPLATE");
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	#$ Expand("TMAKE_CC");
-CXX	=	#$ Expand("TMAKE_CXX");
-CFLAGS	=	#$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
-CXXFLAGS=	#$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
-INCPATH	=	#$ ExpandPath("INCPATH",'-I',' -I','');
-#$ !Project("TMAKE_APP_OR_DLL") && DisableOutput();
-LINK	=	#$ Expand("TMAKE_LINK");
-LFLAGS	=	#$ Expand("TMAKE_LFLAGS");
-LIBS	=	#$ Expand("TMAKE_LIBS");
-#$ !Project("TMAKE_APP_OR_DLL") && EnableOutput();
-#$ Project("TMAKE_APP_OR_DLL") && DisableOutput();
-AR	=	#$ Expand("TMAKE_AR");
-RANLIB	=	#$ Expand("TMAKE_RANLIB");
-#$ Project("TMAKE_APP_OR_DLL") && EnableOutput();
-MOC	=	#$ Expand("TMAKE_MOC");
-
-ZIP	=	#$ Expand("TMAKE_ZIP");
-
-####### Files
-
-HEADERS =	#$ ExpandList("HEADERS");
-SOURCES =	#$ ExpandList("SOURCES");
-OBJECTS =	#$ ExpandList("OBJECTS");
-SRCMOC	=	#$ ExpandList("SRCMOC");
-OBJMOC	=	#$ ExpandList("OBJMOC");
-DIST	=	#$ ExpandList("DISTFILES");
-TARGET	=	#$ ExpandGlue("TARGET",$project{"DESTDIR"},"",$project{"TARGET_EXT"});
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .c
-
-.cpp.o:
-	#$ Expand("TMAKE_RUN_CXX_IMP");
-
-.cxx.o:
-	#$ Expand("TMAKE_RUN_CXX_IMP");
-
-.cc.o:
-	#$ Expand("TMAKE_RUN_CXX_IMP");
-
-.c.o:
-	#$ Expand("TMAKE_RUN_CC_IMP");
-
-####### Build rules
-
-all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)';
-
-$(TARGET): $(HEADERS) $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS");
-#$ Project("TMAKE_APP_OR_DLL") || DisableOutput();
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-#$ Project("TMAKE_APP_OR_DLL") || EnableOutput();
-#$ Project("TMAKE_APP_OR_DLL") && DisableOutput();
-	-rm -f $(TARGET)
-	$(AR) $(TARGET) $(OBJECTS) $(OBJMOC)
-	#$ ExpandGlue("TMAKE_RANLIB","",""," \$(TARGET)");
-#$ Project("TMAKE_APP_OR_DLL") && EnableOutput();
-#$ (Config("dll") && Project("DLLDESTDIR")) || DisableOutput();
-	-cp $(TARGET) #$ Expand("DLLDESTDIR");
-#$ (Config("dll") && Project("DLLDESTDIR")) || EnableOutput();
-#$ Project('RC_FILE') || DisableOutput();
-
-#$ Substitute("\$\$RES_FILE: \$\$RC_FILE\n\t\$\$TMAKE_RC \$\$RC_FILE");
-#$ Project('RC_FILE') || EnableOutput();
-
-moc: $(SRCMOC)
-
-#$ TmakeSelf();
-
-dist:
-	#$ Substitute('$(ZIP) $$PROJECT.zip $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)');
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(TARGET)
-	#$ ExpandGlue("TMAKE_CLEAN","-rm -f "," ","");
-	-rm -f *~ core
-	#$ ExpandGlue("CLEAN_FILES","-rm -f "," ","");
-
-####### Compile
-
-#$ BuildObj(Project("OBJECTS"),Project("SOURCES"));
-#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC"));
-#$ BuildMocSrc(Project("HEADERS"));
-#$ BuildMocSrc(Project("SOURCES"));
diff --git a/tmake/lib/win32-g++/lib.t b/tmake/lib/win32-g++/lib.t
deleted file mode 100644
index d8ac6c7..0000000
--- a/tmake/lib/win32-g++/lib.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for building Win32 libraries.
-#!
-#$ Project('TMAKE_LIB_FLAG = 1');
-#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/win32-g++/subdirs.t b/tmake/lib/win32-g++/subdirs.t
deleted file mode 100644
index 8b881ab..0000000
--- a/tmake/lib/win32-g++/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Win32 template
-#$ IncludeTemplate("../win32/subdirs.t");
diff --git a/tmake/lib/win32-g++/tmake.conf b/tmake/lib/win32-g++/tmake.conf
deleted file mode 100644
index d313a44..0000000
--- a/tmake/lib/win32-g++/tmake.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# 
-#
-# tmake configuration for Win32/g++ (Cygnus gnu-win32)
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	=
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-
-TMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
-TMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-TMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
-TMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-TMAKE_LINK		= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_CONSOLE	= -Wl,-subsystem,console
-TMAKE_LFLAGS_WINDOWS	= -Wl,-subsystem,windows
-TMAKE_LFLAGS_CONSOLE_DLL= -Wl,-subsystem,console
-TMAKE_LFLAGS_WINDOWS_DLL= -Wl,-subsystem,windows
-
-TMAKE_LIBS		=
-TMAKE_LIBS_CONSOLE	=
-TMAKE_LIBS_WINDOWS	= -luser32 -lgdi32 -lcomdlg32 -limm32 -lole32 -luuid -lwsock32
-TMAKE_LIBS_QT		= -L$(QTDIR)/lib -lqt
-TMAKE_LIBS_QT_DLL	= -lqtmain
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lopengl32
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cqs
-TMAKE_RANLIB		=
-
-TMAKE_ZIP		= zip -r -9
diff --git a/tmake/lib/win32-mingw/app.t b/tmake/lib/win32-mingw/app.t
deleted file mode 100644
index fc4dc2c..0000000
--- a/tmake/lib/win32-mingw/app.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for building Win32 applications.
-#!
-#$ Project('TMAKE_APP_FLAG = 1');
-#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/win32-mingw/generic.t b/tmake/lib/win32-mingw/generic.t
deleted file mode 100644
index 4988d59..0000000
--- a/tmake/lib/win32-mingw/generic.t
+++ /dev/null
@@ -1,239 +0,0 @@
-#!
-#! This is a tmake template for building Win32 applications or libraries.
-#!
-#${
-    if ( Config("qt") ) {
-	if ( !(Project("DEFINES") =~ /QT_NODLL/) &&
-	     ((Project("DEFINES") =~ /QT_(?:MAKE)?DLL/) ||
-	      ($ENV{"QT_DLL"} && !$ENV{"QT_NODLL"})) ) {
-	    Project('TMAKE_QT_DLL = 1');
-	    if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) {
-		Project('CONFIG += dll');
-	    }
-	}
-    }
-    if ( Config("dll") || Project("TMAKE_APP_FLAG") ) {
-	Project('CONFIG -= staticlib');
-	Project('TMAKE_APP_OR_DLL = 1');
-    } else {
-	Project('CONFIG += staticlib');
-    }
-    if ( Config("warn_off") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_OFF');
-    } elsif ( Config("warn_on") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_ON');
-    }
-    if ( Config("debug") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_DEBUG');
-	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG');
-    } elsif ( Config("release") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_RELEASE');
-	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE');
-    }
-    if ( Config("qt") || Config("opengl") ) {
-	Project('CONFIG += windows' );
-    }
-    if ( Config("qt") ) {
-	Project('CONFIG *= moc');
-	AddIncludePath(Project("TMAKE_INCDIR_QT"));
-	if ( Config("release") ) {
-	    Project('DEFINES += NO_DEBUG');
-	}
-	if ( Config("opengl") ) {
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL');
-	}
-	if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) {
-	    if ( Project("TMAKE_QT_DLL") ) {
-		Project('DEFINES -= QT_DLL');
-		Project('DEFINES *= QT_MAKEDLL');
-		Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_QT_DLL');
-	    }
-	} else {
-	    if ( Project("TMAKE_QT_DLL") ) {
-		Project('DEFINES *= QT_DLL');
-	    }
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT');
-	    if ( Project("TMAKE_QT_DLL") ) {
-		my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt");
-		Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/");
-		if ( !Config("dll") ) {
-		    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL');
-		}
-	    }
-	}
-    }
-    if ( Config("opengl") ) {
-	Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL');
-    }
-    if ( Config("dll") ) {
-	Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE_DLL');
-	Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS_DLL');
-	if ( Project("TMAKE_LIB_FLAG") ) {
-	    my $ver = Project("VERSION");
-	    $ver =~ s/\.//g;
-	    $project{"TARGET_EXT"} = "${ver}.dll";
-	} else {
-	    $project{"TARGET_EXT"} = ".dll";
-	}
-    } else {
-	Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE');
-	Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS');
-	if ( Project("TMAKE_APP_FLAG") ) {
-	    $project{"TARGET_EXT"} = ".exe";
-	} else {
-	    $project{"TARGET_EXT"} = ".a";
-	}
-    }
-    if ( Config("windows") ) {
-	if ( Config("console") ) {
-	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
-	    Project('TMAKE_LIBS   *= $$TMAKE_LIBS_CONSOLE');
-	} else {
-	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_WINDOWS_ANY');
-	}
-	Project('TMAKE_LIBS   *= $$TMAKE_LIBS_WINDOWS');
-    } else {
-	Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
-	Project('TMAKE_LIBS   *= $$TMAKE_LIBS_CONSOLE');
-    }
-    if ( Config("moc") ) {
-	$moc_aware = 1;
-    }
-    Project('TMAKE_LIBS += $$LIBS');
-    Project('TMAKE_FILETAGS = HEADERS SOURCES DEF_FILE RC_FILE TARGET TMAKE_LIBS DESTDIR DLLDESTDIR $$FILETAGS');
-    foreach ( split(/\s/,Project("TMAKE_FILETAGS")) ) {
-	$project{$_} =~ s-[/\\]+-/-g;
-    }
-    if ( Project("DEF_FILE") ) {
-	Project('TMAKE_LFLAGS *= $$DEF_FILE');
-    }
-    if ( Project("RC_FILE") ) {
-	if ( Project("RES_FILE") ) {
-	    tmake_error("Both .rc and .res file specified.\n" .
-			"Please specify one of them, not both.");
-	}
-	$project{"RES_FILE"} = $project{"RC_FILE"};
-	$project{"RES_FILE"} =~ s/\.rc$/.res/i;
-	Project('TARGETDEPS += $$RES_FILE');
-    }
-    if ( Project("RES_FILE") ) {
-	Project('TMAKE_LIBS *= $$RES_FILE');
-    }
-    $obj_ext  = "o";
-    $dir_sep  = "/";
-    $gnuwin32 = 1;
-    if ( Config("qt") ) {
-	$qtdir = $ENV{"QTDIR"};
-	$project{"INCPATH"} =~ s/\$\(QTDIR\)/$qtdir/;
-	$project{"INCPATH"} =~ s/\\/\//g;
-	$project{"TMAKE_LIBS"} =~ s/\$\(QTDIR\)/$qtdir/;
-	$project{"TMAKE_LIBS"} =~ s/\\/\//g;
-    }
-    StdInit();
-    if ( Project("VERSION") ) {
-	$project{"VER_MAJ"} = $project{"VERSION"};
-	$project{"VER_MAJ"} =~ s/\.\d+$//;
-	$project{"VER_MIN"} = $project{"VERSION"};
-	$project{"VER_MIN"} =~ s/^\d+\.//;
-    }    
-    if ( Config("staticlib") ) {
-	$project{"TARGET"} = "lib" . $project{"TARGET"};
-    }
-#$}
-#!
-# Makefile for building #$ Expand("TARGET")
-# Generated by tmake at #$ Now();
-#     Project: #$ Expand("PROJECT");
-#    Template: #$ Expand("TEMPLATE");
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	#$ Expand("TMAKE_CC");
-CXX	=	#$ Expand("TMAKE_CXX");
-CFLAGS	=	#$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
-CXXFLAGS=	#$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
-INCPATH	=	#$ ExpandPath("INCPATH",'-I',' -I','');
-#$ !Project("TMAKE_APP_OR_DLL") && DisableOutput();
-LINK	=	#$ Expand("TMAKE_LINK");
-LFLAGS	=	#$ Expand("TMAKE_LFLAGS");
-LIBS	=	#$ Expand("TMAKE_LIBS");
-#$ !Project("TMAKE_APP_OR_DLL") && EnableOutput();
-#$ Project("TMAKE_APP_OR_DLL") && DisableOutput();
-AR	=	#$ Expand("TMAKE_AR");
-RANLIB	=	#$ Expand("TMAKE_RANLIB");
-#$ Project("TMAKE_APP_OR_DLL") && EnableOutput();
-MOC	=	#$ Expand("TMAKE_MOC");
-
-ZIP	=	#$ Expand("TMAKE_ZIP");
-
-####### Files
-
-HEADERS =	#$ ExpandList("HEADERS");
-SOURCES =	#$ ExpandList("SOURCES");
-OBJECTS =	#$ ExpandList("OBJECTS");
-SRCMOC	=	#$ ExpandList("SRCMOC");
-OBJMOC	=	#$ ExpandList("OBJMOC");
-DIST	=	#$ ExpandList("DISTFILES");
-TARGET	=	#$ ExpandGlue("TARGET",$project{"DESTDIR"},"",$project{"TARGET_EXT"});
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .c
-
-.cpp.o:
-	#$ Expand("TMAKE_RUN_CXX_IMP");
-
-.cxx.o:
-	#$ Expand("TMAKE_RUN_CXX_IMP");
-
-.cc.o:
-	#$ Expand("TMAKE_RUN_CXX_IMP");
-
-.c.o:
-	#$ Expand("TMAKE_RUN_CC_IMP");
-
-####### Build rules
-
-all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)';
-
-$(TARGET): $(HEADERS) $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS");
-#$ Project("TMAKE_APP_OR_DLL") || DisableOutput();
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-#$ Project("TMAKE_APP_OR_DLL") || EnableOutput();
-#$ Project("TMAKE_APP_OR_DLL") && DisableOutput();
-	-rm -f $(TARGET)
-	$(AR) $(TARGET) $(OBJECTS) $(OBJMOC)
-	#$ ExpandGlue("TMAKE_RANLIB","",""," \$(TARGET)");
-#$ Project("TMAKE_APP_OR_DLL") && EnableOutput();
-#$ (Config("dll") && Project("DLLDESTDIR")) || DisableOutput();
-	-cp $(TARGET) #$ Expand("DLLDESTDIR");
-#$ (Config("dll") && Project("DLLDESTDIR")) || EnableOutput();
-#$ Project('RC_FILE') || DisableOutput();
-
-#$ Substitute("\$\$RES_FILE: \$\$RC_FILE\n\t\$\$TMAKE_RC \$\$RC_FILE");
-#$ Project('RC_FILE') || EnableOutput();
-
-moc: $(SRCMOC)
-
-#$ TmakeSelf();
-
-dist:
-	#$ Substitute('$(ZIP) $$PROJECT.zip $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)');
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(TARGET)
-	#$ ExpandGlue("TMAKE_CLEAN","-rm -f "," ","");
-	-rm -f *~ core
-	#$ ExpandGlue("CLEAN_FILES","-rm -f "," ","");
-
-####### Compile
-
-#$ BuildObj(Project("OBJECTS"),Project("SOURCES"));
-#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC"));
-#$ BuildMocSrc(Project("HEADERS"));
-#$ BuildMocSrc(Project("SOURCES"));
diff --git a/tmake/lib/win32-mingw/lib.t b/tmake/lib/win32-mingw/lib.t
deleted file mode 100644
index d8ac6c7..0000000
--- a/tmake/lib/win32-mingw/lib.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for building Win32 libraries.
-#!
-#$ Project('TMAKE_LIB_FLAG = 1');
-#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/win32-mingw/subdirs.t b/tmake/lib/win32-mingw/subdirs.t
deleted file mode 100644
index 8b881ab..0000000
--- a/tmake/lib/win32-mingw/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Win32 template
-#$ IncludeTemplate("../win32/subdirs.t");
diff --git a/tmake/lib/win32-mingw/tmake.conf b/tmake/lib/win32-mingw/tmake.conf
deleted file mode 100644
index c6d1918..0000000
--- a/tmake/lib/win32-mingw/tmake.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# 
-#
-# tmake configuration for Win32/mingw (MINGW gnu-win32)
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
-TMAKE_CFLAGS_WARN_ON	=
-TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2 -s
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-
-TMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
-TMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-TMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
-TMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-TMAKE_LINK		= g++
-TMAKE_LFLAGS		=
-TMAKE_LFLAGS_RELEASE	= -s
-TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_CONSOLE	= -Wl,-subsystem,console
-TMAKE_LFLAGS_WINDOWS	= -Wl,-subsystem,windows
-TMAKE_LFLAGS_CONSOLE_DLL= -Wl,-subsystem,console
-TMAKE_LFLAGS_WINDOWS_DLL= -Wl,-subsystem,windows
-
-TMAKE_LIBS		=
-TMAKE_LIBS_CONSOLE	=
-TMAKE_LIBS_WINDOWS	= -luser32 -lgdi32 -lcomdlg32 -limm32 -lole32 -luuid -lwsock32
-TMAKE_LIBS_QT		= -L$(QTDIR)/lib -lqt
-TMAKE_LIBS_QT_DLL	= -lqtmain
-TMAKE_LIBS_QT_OPENGL	= -lqgl
-TMAKE_LIBS_OPENGL	= -lopengl32
-
-TMAKE_MOC		= moc
-
-TMAKE_AR		= ar cqs
-TMAKE_RANLIB		=
-
-TMAKE_ZIP		= zip -r -9
diff --git a/tmake/lib/win32-msvc/app.t b/tmake/lib/win32-msvc/app.t
deleted file mode 100644
index fc4dc2c..0000000
--- a/tmake/lib/win32-msvc/app.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for building Win32 applications.
-#!
-#$ Project('TMAKE_APP_FLAG = 1');
-#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/win32-msvc/generic.t b/tmake/lib/win32-msvc/generic.t
deleted file mode 100644
index 3344236..0000000
--- a/tmake/lib/win32-msvc/generic.t
+++ /dev/null
@@ -1,229 +0,0 @@
-#!
-#! This is a tmake template for building Win32 applications or libraries.
-#!
-#${
-    if ( Config("qt") ) {
-	if ( !(Project("DEFINES") =~ /QT_NODLL/) &&
-	     ((Project("DEFINES") =~ /QT_(?:MAKE)?DLL/) ||
-	      ($ENV{"QT_DLL"} && !$ENV{"QT_NODLL"})) ) {
-	    Project('TMAKE_QT_DLL = 1');
-	    if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) {
-		Project('CONFIG += dll');
-	    }
-	}
-    }
-    if ( Config("dll") || Project("TMAKE_APP_FLAG") ) {
-	Project('CONFIG -= staticlib');
-	Project('TMAKE_APP_OR_DLL = 1');
-    } else {
-	Project('CONFIG += staticlib');
-    }
-    if ( Config("warn_off") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_OFF');
-    } elsif ( Config("warn_on") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_ON');
-    }
-    if ( Config("debug") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_DEBUG');
-	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG');
-    } elsif ( Config("release") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE');
-	Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_RELEASE');
-	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE');
-    }
-    if ( Config("qt") || Config("opengl") ) {
-	Project('CONFIG += windows' );
-    }
-    if ( Config("qt") ) {
-	Project('CONFIG *= moc');
-	AddIncludePath(Project("TMAKE_INCDIR_QT"));
-	if ( Config("release") ) {
-	    Project('DEFINES += NO_DEBUG');
-	}
-	if ( Config("opengl") ) {
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL');
-	}
-	if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) {
-	    if ( Project("TMAKE_QT_DLL") ) {
-		Project('DEFINES -= QT_DLL');
-		Project('DEFINES *= QT_MAKEDLL');
-		Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_QT_DLL');
-	    }
-	} else {
-	    if ( Project("TMAKE_QT_DLL") ) {
-		Project('DEFINES *= QT_DLL');
-	    }
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT');
-	    if ( Project("TMAKE_QT_DLL") ) {
-		my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt");
-		Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/");
-		if ( !Config("dll") ) {
-		    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL');
-		}
-	    }
-	}
-    }
-    if ( Config("opengl") ) {
-	Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL');
-    }
-    if ( Config("dll") ) {
-	Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE_DLL');
-	Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS_DLL');
-	if ( Project("TMAKE_LIB_FLAG") ) {
-	    my $ver = Project("VERSION");
-	    $ver =~ s/\.//g;
-	    $project{"TARGET_EXT"} = "${ver}.dll";
-	} else {
-	    $project{"TARGET_EXT"} = ".dll";
-	}
-    } else {
-	Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE');
-	Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS');
-	if ( Project("TMAKE_APP_FLAG") ) {
-	    $project{"TARGET_EXT"} = ".exe";
-	} else {
-	    $project{"TARGET_EXT"} = ".lib";
-	}
-    }
-    if ( Config("windows") ) {
-	if ( Config("console") ) {
-	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
-	    Project('TMAKE_LIBS   *= $$TMAKE_LIBS_CONSOLE');
-	} else {
-	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_WINDOWS_ANY');
-	}
-	Project('TMAKE_LIBS   *= $$TMAKE_LIBS_WINDOWS');
-    } else {
-	Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
-	Project('TMAKE_LIBS   *= $$TMAKE_LIBS_CONSOLE');
-    }
-    if ( Config("moc") ) {
-	$moc_aware = 1;
-    }
-    Project('TMAKE_LIBS += $$LIBS');
-    Project('TMAKE_FILETAGS = HEADERS SOURCES DEF_FILE RC_FILE TARGET TMAKE_LIBS DESTDIR DLLDESTDIR $$FILETAGS');
-    foreach ( split(/\s/,Project("TMAKE_FILETAGS")) ) {
-	$project{$_} =~ s-[/\\]+-\\-g;
-    }
-    if ( Project("DEF_FILE") ) {
-	Project('TMAKE_LFLAGS *= /DEF:$$DEF_FILE');
-    }
-    if ( Project("RC_FILE") ) {
-	if ( Project("RES_FILE") ) {
-	    tmake_error("Both .rc and .res file specified.\n" .
-			"Please specify one of them, not both.");
-	}
-	$project{"RES_FILE"} = $project{"RC_FILE"};
-	$project{"RES_FILE"} =~ s/\.rc$/.res/i;
-	Project('TARGETDEPS += $$RES_FILE');
-    }
-    if ( Project("RES_FILE") ) {
-	Project('TMAKE_LIBS *= $$RES_FILE');
-    }
-    StdInit();
-    if ( Project("VERSION") ) {
-	$project{"VER_MAJ"} = $project{"VERSION"};
-	$project{"VER_MAJ"} =~ s/\.\d+$//;
-	$project{"VER_MIN"} = $project{"VERSION"};
-	$project{"VER_MIN"} =~ s/^\d+\.//;
-    }
-    Project('debug:TMAKE_CLEAN += $$TARGET.pdb vc*.pdb $$TARGET.ilk');
-#$}
-#!
-# Makefile for building #$ Expand("TARGET")
-# Generated by tmake at #$ Now();
-#     Project: #$ Expand("PROJECT");
-#    Template: #$ Expand("TEMPLATE");
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	#$ Expand("TMAKE_CC");
-CXX	=	#$ Expand("TMAKE_CXX");
-CFLAGS	=	#$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
-CXXFLAGS=	#$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
-INCPATH	=	#$ ExpandPath("INCPATH",'-I',' -I','');
-#$ !Project("TMAKE_APP_OR_DLL") && DisableOutput();
-LINK	=	#$ Expand("TMAKE_LINK");
-LFLAGS	=	#$ Expand("TMAKE_LFLAGS");
-LIBS	=	#$ Expand("TMAKE_LIBS");
-#$ !Project("TMAKE_APP_OR_DLL") && EnableOutput();
-#$ Project("TMAKE_APP_OR_DLL") && DisableOutput();
-LIB	=	#$ Expand("TMAKE_LIB");
-#$ Project("TMAKE_APP_OR_DLL") && EnableOutput();
-MOC	=	#$ Expand("TMAKE_MOC");
-
-ZIP	=	#$ Expand("TMAKE_ZIP");
-
-####### Files
-
-HEADERS =	#$ ExpandList("HEADERS");
-SOURCES =	#$ ExpandList("SOURCES");
-OBJECTS =	#$ ExpandList("OBJECTS");
-SRCMOC	=	#$ ExpandList("SRCMOC");
-OBJMOC	=	#$ ExpandList("OBJMOC");
-DIST	=	#$ ExpandList("DISTFILES");
-TARGET	=	#$ ExpandGlue("TARGET",$project{"DESTDIR"},"",$project{"TARGET_EXT"});
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .c
-
-.cpp.obj:
-	#$ Expand("TMAKE_RUN_CXX_IMP");
-
-.cxx.obj:
-	#$ Expand("TMAKE_RUN_CXX_IMP");
-
-.cc.obj:
-	#$ Expand("TMAKE_RUN_CXX_IMP");
-
-.c.obj:
-	#$ Expand("TMAKE_RUN_CC_IMP");
-
-####### Build rules
-
-all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)';
-
-$(TARGET): $(HEADERS) $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS");
-#$ Project("TMAKE_APP_OR_DLL") || DisableOutput();
-	$(LINK) $(LFLAGS) /OUT:$(TARGET) @<<
-	    $(OBJECTS) $(OBJMOC) $(LIBS)
-#$ Project("TMAKE_APP_OR_DLL") || EnableOutput();
-#$ Project("TMAKE_APP_OR_DLL") && DisableOutput();
-	$(LIB) /OUT:$(TARGET) @<<
-	    $(OBJECTS) $(OBJMOC)
-#$ Project("TMAKE_APP_OR_DLL") && EnableOutput();
-<<
-#$ (Config("dll") && Project("DLLDESTDIR")) || DisableOutput();
-	-copy $(TARGET) #$ Expand("DLLDESTDIR");
-#$ (Config("dll") && Project("DLLDESTDIR")) || EnableOutput();
-#$ Project("RC_FILE") || DisableOutput();
-
-#$ Substitute("\$\$RES_FILE: \$\$RC_FILE\n\t\$\$TMAKE_RC \$\$RC_FILE");
-#$ Project("RC_FILE") || EnableOutput();
-
-moc: $(SRCMOC)
-
-#$ TmakeSelf();
-
-dist:
-	#$ Substitute('$(ZIP) $$PROJECT.zip $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)');
-
-clean:
-	#$ ExpandGlue("OBJECTS","-del ","\n\t-del ","");
-	#$ ExpandGlue("SRCMOC" ,"-del ","\n\t-del ","");
-	#$ ExpandGlue("OBJMOC" ,"-del ","\n\t-del ","");
-	-del $(TARGET)
-	#$ ExpandGlue("TMAKE_CLEAN","-del ","\n\t-del ","");
-	#$ ExpandGlue("CLEAN_FILES","-del ","\n\t-del ","");
-
-####### Compile
-
-#$ BuildObj(Project("OBJECTS"),Project("SOURCES"));
-#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC"));
-#$ BuildMocSrc(Project("HEADERS"));
-#$ BuildMocSrc(Project("SOURCES"));
diff --git a/tmake/lib/win32-msvc/lib.t b/tmake/lib/win32-msvc/lib.t
deleted file mode 100644
index d8ac6c7..0000000
--- a/tmake/lib/win32-msvc/lib.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for building Win32 libraries.
-#!
-#$ Project('TMAKE_LIB_FLAG = 1');
-#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/win32-msvc/subdirs.t b/tmake/lib/win32-msvc/subdirs.t
deleted file mode 100644
index 8b881ab..0000000
--- a/tmake/lib/win32-msvc/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Win32 template
-#$ IncludeTemplate("../win32/subdirs.t");
diff --git a/tmake/lib/win32-msvc/tmake.conf b/tmake/lib/win32-msvc/tmake.conf
deleted file mode 100644
index e3191a3..0000000
--- a/tmake/lib/win32-msvc/tmake.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# 
-#
-# tmake configuration for Win32/Microsoft C++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= cl
-TMAKE_CFLAGS		= -nologo
-TMAKE_CFLAGS_WARN_ON	= -W3
-TMAKE_CFLAGS_WARN_OFF	= -W0
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -Zi
-TMAKE_CFLAGS_MT		= -MT
-TMAKE_CFLAGS_MT_DBG	= -MTd
-TMAKE_CFLAGS_MT_DLL	= -MD
-TMAKE_CFLAGS_MT_DLLDBG	= -MDd
-TMAKE_CFLAGS_YACC	=
-
-TMAKE_CXX		= $$TMAKE_CC
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_MT	= $$TMAKE_CFLAGS_MT
-TMAKE_CXXFLAGS_MT_DBG	= $$TMAKE_CFLAGS_MT_DBG
-TMAKE_CXXFLAGS_MT_DLL	= $$TMAKE_CFLAGS_MT_DLL
-TMAKE_CXXFLAGS_MT_DLLDBG= $$TMAKE_CFLAGS_MT_DLLDBG
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_INCDIR_QT		= $(QTDIR)\include
-
-TMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
-TMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
-TMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src
-TMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
-
-TMAKE_LINK		= link
-TMAKE_LFLAGS		= /NOLOGO
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	= /DEBUG
-TMAKE_LFLAGS_CONSOLE	= /SUBSYSTEM:console
-TMAKE_LFLAGS_WINDOWS	= /SUBSYSTEM:windows
-TMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL
-TMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL
-TMAKE_LFLAGS_QT_DLL	= /BASE:0x39D00000
-
-TMAKE_LIBS		=
-TMAKE_LIBS_CONSOLE	=
-TMAKE_LIBS_WINDOWS	= user32.lib gdi32.lib comdlg32.lib imm32.lib ole32.lib uuid.lib wsock32.lib
-TMAKE_LIBS_QT		= $(QTDIR)\lib\qt.lib
-TMAKE_LIBS_QT_DLL	= $(QTDIR)\lib\qtmain.lib
-TMAKE_LIBS_QT_OPENGL	= $(QTDIR)\lib\qgl.lib
-TMAKE_LIBS_OPENGL	= opengl32.lib glu32.lib
-
-TMAKE_MOC		= moc
-
-TMAKE_LIB		= lib /NOLOGO
-TMAKE_RC		= rc
-
-TMAKE_ZIP		= zip -r -9
diff --git a/tmake/lib/win32-msvc/vcapp.t b/tmake/lib/win32-msvc/vcapp.t
deleted file mode 100644
index ac7ae23..0000000
--- a/tmake/lib/win32-msvc/vcapp.t
+++ /dev/null
@@ -1,244 +0,0 @@
-#!
-#! This TMAKE template - Microsoft Visual C++ 5.0 applications
-#!
-#${
-    if ( Config("qt") ) {
-	if ( !(Project("DEFINES") =~ /QT_NODLL/) &&
-	     ((Project("DEFINES") =~ /QT_(?:MAKE)?DLL/) ||
-	      ($ENV{"QT_DLL"} && !$ENV{"QT_NODLL"})) ) {
-	    Project('TMAKE_QT_DLL = 1');
-	    if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) {
-		Project('CONFIG += dll');
-	    }
-	}
-    }
-    if ( Config("qt") || Config("opengl") ) {
-	Project('CONFIG += windows');
-    }
-    if ( Config("qt") ) {
-	$moc_aware = 1;
-	AddIncludePath(Project('TMAKE_INCDIR_QT'));
-	if ( Config("opengl") ) {
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL');
-	}
-	if ( Project("TMAKE_QT_DLL") ) {
-	    Project('DEFINES *= QT_DLL');
-	}
-	Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT');
-	if ( Project("TMAKE_QT_DLL") ) {
-	    my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt");
-	    Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/");
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL');
-	}
-    }
-    if ( Config("opengl") ) {
-	Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL');
-    }
-    Project('TMAKE_LIBS += $$LIBS');
-
-    if ( Config("console") ) {
-	$project{"VC_PROJ_TYPE"} = 'Win32 (x86) Console Application';
-	$project{"VC_PROJ_CODE"} = '0x0103';
-	$vc_base_libs = 'kernel32.lib user32.lib gdi32.lib winspool.lib ' .
-			'comdlg32.lib advapi32.lib shell32.lib ole32.lib ' .
-			'oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ';
-	$vc_libs = $vc_base_libs;
-	$vc_link_release = '/nologo /subsystem:console /machine:I386';
-	$vc_link_debug   = '/nologo /subsystem:console /debug /machine:I386 /pdbtype:sept';
-	$vc_cpp_def_release = '/D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" ';
-	$vc_cpp_def_debug   = '/D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" ';
-    } else {
-	$project{"VC_PROJ_TYPE"} = 'Win32 (x86) Application';
-	$project{"VC_PROJ_CODE"} = '0x0101';
-	$vc_base_libs = 'kernel32.lib user32.lib gdi32.lib winspool.lib ' .
-			'comdlg32.lib advapi32.lib shell32.lib ole32.lib ' .
-			'oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ';
-	$vc_libs = $vc_base_libs . 'wsock32.lib ';
-	$vc_link_release = '/nologo /subsystem:windows /machine:I386';
-	$vc_link_debug   = '/nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept';
-	$vc_cpp_def_release = '/D "NDEBUG" /D "WIN32" /D "_WINDOWS" ';
-	$vc_cpp_def_debug   = '/D "_DEBUG" /D "WIN32" /D "_WINDOWS" ';
-    }
-    $project{"VC_BASE_LINK_RELEASE"} = $vc_base_libs . $vc_link_release;
-    $project{"VC_BASE_LINK_DEBUG"}   = $vc_base_libs . $vc_link_debug;
-    $tmake_libs = Project('TMAKE_LIBS') ? (Project('TMAKE_LIBS') . " ") : "";
-    $project{"VC_LINK_RELEASE"} = $vc_libs . $tmake_libs . $vc_link_release;
-    $project{"VC_LINK_DEBUG"}   = $vc_libs . $tmake_libs . $vc_link_debug;
-
-    $vc_cpp_opt_release = '/nologo /W3 /GX /O2 ';
-    $vc_cpp_opt_debug   = '/nologo /W3 /Gm /GX /Zi /Od ';
-    $vc_cpp_opt_common  = '/YX /FD /c';
-    $project{"VC_BASE_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_cpp_def_release . $vc_cpp_opt_common;
-    $project{"VC_BASE_CPP_DEBUG"}   = $vc_cpp_opt_debug   . $vc_cpp_def_debug   . $vc_cpp_opt_common;
-    ExpandPath("INCPATH",'/I ',' /I ','');
-    if ( $text ne "" ) { $vc_inc = $text . " ";  $text = ""; } else { $vc_inc = ""; }
-    ExpandGlue("DEFINES",'/D "','" /D "','"');
-    if ( $text ne "" ) { $vc_def = $text . " ";  $text = ""; } else { $vc_def = ""; }
-    $project{"VC_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_inc . $vc_cpp_def_release . $vc_def . $vc_cpp_opt_common;
-    $project{"VC_CPP_DEBUG"}   = $vc_cpp_opt_debug   . $vc_inc . $vc_cpp_def_debug   . $vc_def . $vc_cpp_opt_common;
-
-    $project{"MAKEFILE"}  = $project{"PROJECT"} . ".mak";
-    $project{"TARGETAPP"} = $project{"TARGET"}  . ".exe";
-    Project('TMAKE_FILETAGS = HEADERS SOURCES TARGET DESTDIR $$FILETAGS');
-    foreach ( split(/\s/,Project('TMAKE_FILETAGS')) ) {
-	$project{$_} =~ s-/-\\-g;
-    }
-    StdInit();
-    if ( defined($project{"DESTDIR"}) ) {
-	$project{"TARGETAPP"} = $project{"DESTDIR"} . "\\" . $project{"TARGETAPP"};
-	$project{"TARGETAPP"} =~ s/\\+/\\/g;
-    }
-    %all_files = ();
-    @files = split(/\s+/,$project{"HEADERS"});
-    foreach ( @files ) { $all_files{$_} = "h" };
-    @files = split(/\s+/,$project{"SOURCES"});
-    foreach ( @files ) { $all_files{$_} = "s" };
-    if ( $moc_aware ) {
-        @files = split(/\s+/,$project{"_HDRMOC"});
-	foreach ( @files ) { $all_files{$_} = "m"; }
-	@files = split(/\s+/,$project{"_SRCMOC"});
-	foreach ( @files ) { $all_files{$_} = "i"; }
-    }
-    %file_names = ();
-    foreach $f ( %all_files ) {
-	$n = $f;
-	$n =~ s/^.*\\//;
-	$file_names{$n} = $f;
-	$file_path{$n}  = ".\\" . $f;
-	$file_path2{$n} = (($f =~ /^\./) ? "" : ".\\") . $f;
-    }
-#$}
-# Microsoft Developer Studio Project File - #$ Substitute('Name="$$TARGET" - Package Owner=<4>');
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE #$ Substitute('"$$VC_PROJ_TYPE" $$VC_PROJ_CODE');
-
-CFG=#$ Substitute('$$TARGET - Win32 Debug');
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "#$ ExpandGlue('MAKEFILE','','','".');
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f #$ Substitute('"$$MAKEFILE" CFG="$$TARGET - Win32 Debug"');
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE #$ Substitute('"$$TARGET - Win32 Release" (based on "$$VC_PROJ_TYPE")');
-!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug" (based on "$$VC_PROJ_TYPE")');
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-#$ Config("windows") && ($text='MTL=midl.exe');
-RSC=rc.exe
-
-!IF  "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Release"');
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
-# PROP Target_Dir ""
-# ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE");
-# ADD CPP #$ Expand("VC_CPP_RELEASE");
-#$ Config("windows") || DisableOutput();
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-#$ Config("windows") || EnableOutput();
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_RELEASE");
-# ADD LINK32 #$ Expand("VC_LINK_RELEASE");
-
-!ELSEIF  "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Debug"');
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
-# PROP Target_Dir ""
-# ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG");
-# ADD CPP #$ Expand("VC_CPP_DEBUG");
-#$ Config("windows") || DisableOutput();
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-#$ Config("windows") || EnableOutput();
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_DEBUG");
-# ADD LINK32 #$ Expand("VC_LINK_DEBUG");
-
-!ENDIF 
-
-# Begin Target
-
-# Name #$Substitute('"$$TARGET - Win32 Release"');
-# Name #$Substitute('"$$TARGET - Win32 Debug"');
-#${
-    foreach $n ( sort keys %file_names ) {
-	$f  = $file_names{$n};
-	$p  = $file_path{$n};
-	$p2 = $file_path2{$n};
-	$t  = $all_files{$f};
-	if ( ($t eq "h") && $moc_output{$f} ) {
-	    my($build);
-	    $build = "\n\n# Begin Custom Build - Running moc...\nInputPath=" . $p2 . "\n\n"
-		   . '"' . $moc_output{$f} . '" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"'
-		   . "\n\tmoc $p2 -o " . $moc_output{$f} . "\n\n"
-		   . "# End Custom Build\n\n";
-	    $text .= ("# Begin Source File\n\nSOURCE=$p\n\n"
-		   . '!IF  "$(CFG)" == "' . $project{"TARGET"} . ' - Win32 Release"'
-		   . $build);
-	    $text .= ('!ELSEIF  "$(CFG)" == "' . $project{"TARGET"} . ' - Win32 Debug"'
-		   . $build
-		   . "!ENDIF \n\n# End Source File\n");
-	} elsif ( $t eq "i" ) {
-	    my($build,$dn);
-	    $build = "\n\n# Begin Custom Build - Running moc...\nInputPath=" . $p2 . "\n\n"
-		   . '"' . $f . '" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"'
-		   . "\n\tmoc ". $moc_input{$f} . " -o $f\n\n"
-		   . "# End Custom Build\n\n";
-	    $dn = $n;
-	    $dn =~ s/\..*//;
-	    $dn =~ tr/a-z/A-Z/;
-	    $text .= ("# Begin Source File\n\nSOURCE=$p\n"
-		   . "USERDEP__$dn=" . '"' . $moc_input{$f} . '"' . "\n\n"
-		   . '!IF  "$(CFG)" == "' . $project{"TARGET"} . ' - Win32 Release"'
-		   . $build);
-	    $text .= ('!ELSEIF  "$(CFG)" == "' . $project{"TARGET"} . ' - Win32 Debug"'
-		   . $build
-		   . "!ENDIF \n\n# End Source File\n");
-	} elsif ( $t eq "s" || $t eq "m" || $t eq "h" ) {
-	    $text .= "# Begin Source File\n\nSOURCE=$p\n# End Source File\n";
-	}
-    }
-    chop $text;
-#$}
-# End Target
-# End Project
diff --git a/tmake/lib/win32-msvc/vclib.t b/tmake/lib/win32-msvc/vclib.t
deleted file mode 100644
index 11cd1d7..0000000
--- a/tmake/lib/win32-msvc/vclib.t
+++ /dev/null
@@ -1,178 +0,0 @@
-#!
-#! This TMAKE template - Microsoft Visual C++ 5.0 libraries
-#!
-#${
-    if ( Config("qt") || Config("opengl") ) {
-	Project('CONFIG += windows');
-    }
-    if ( Config("qt") ) {
-	$moc_aware = 1;
-	AddIncludePath(Project('TMAKE_INCDIR_QT'));
-    }
-
-    $project{"VC_PROJ_TYPE"} = 'Win32 (x86) Static Library';
-    $project{"VC_PROJ_CODE"} = '0x0104';
-
-    $vc_cpp_def_release = '/D "NDEBUG" /D "WIN32" /D "_WINDOWS" ';
-    $vc_cpp_def_debug   = '/D "_DEBUG" /D "WIN32" /D "_WINDOWS" ';
-    $vc_cpp_opt_release = '/nologo /W3 /GX /O2 ';
-    $vc_cpp_opt_debug   = '/nologo /W3 /Gm /GX /Zi /Od ';
-    $vc_cpp_opt_common  = '/YX /FD /c';
-    $project{"VC_BASE_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_cpp_def_release . $vc_cpp_opt_common;
-    $project{"VC_BASE_CPP_DEBUG"}   = $vc_cpp_opt_debug   . $vc_cpp_def_debug   . $vc_cpp_opt_common;
-    ExpandPath("INCPATH",'/I ',' /I ','');
-    if ( $text ne "" ) { $vc_inc = $text . " ";  $text = ""; } else { $vc_inc = ""; }
-    ExpandGlue("DEFINES",'/D "','" /D "','"');
-    if ( $text ne "" ) { $vc_def = $text . " ";  $text = ""; } else { $vc_def = ""; }
-    $project{"VC_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_inc . $vc_cpp_def_release . $vc_def . $vc_cpp_opt_common;
-    $project{"VC_CPP_DEBUG"}   = $vc_cpp_opt_debug   . $vc_inc . $vc_cpp_def_debug   . $vc_def . $vc_cpp_opt_common;
-
-    $project{"MAKEFILE"}  = $project{"PROJECT"} . ".mak";
-    $project{"TARGETLIB"} = $project{"TARGET"}  . ".lib";
-    Project('TMAKE_FILETAGS = HEADERS SOURCES TARGET DESTDIR $$FILETAGS');
-    foreach ( split(/\s/,Project('TMAKE_FILETAGS')) ) {
-	$project{$_} =~ s-/-\\-g;
-    }
-    StdInit();
-    if ( defined($project{"DESTDIR"}) ) {
-	$project{"TARGETLIB"} = $project{"DESTDIR"} . "\\" . $project{"TARGETLIB"};
-	$project{"TARGETLIB"} =~ s/\\+/\\/g;
-    }
-    %all_files = ();
-    @files = split(/\s+/,$project{"HEADERS"});
-    foreach ( @files ) { $all_files{$_} = "h" };
-    @files = split(/\s+/,$project{"SOURCES"});
-    foreach ( @files ) { $all_files{$_} = "s" };
-    if ( $moc_aware ) {
-        @files = split(/\s+/,$project{"_HDRMOC"});
-	foreach ( @files ) { $all_files{$_} = "m"; }
-	@files = split(/\s+/,$project{"_SRCMOC"});
-	foreach ( @files ) { $all_files{$_} = "i"; }
-    }
-    %file_names = ();
-    foreach $f ( %all_files ) {
-	$n = $f;
-	$n =~ s/^.*\\//;
-	$file_names{$n} = $f;
-	$file_path{$n}  = ".\\" . $f;
-	$file_path2{$n} = (($f =~ /^\./) ? "" : ".\\") . $f;
-    }
-#$}
-# Microsoft Developer Studio Project File - #$ Substitute('Name="$$TARGET" - Package Owner=<4>');
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE #$ Substitute('"$$VC_PROJ_TYPE" $$VC_PROJ_CODE');
-
-CFG=#$ Substitute('$$TARGET - Win32 Debug');
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "#$ ExpandGlue('MAKEFILE','','','".');
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f #$ Substitute('"$$MAKEFILE" CFG="$$TARGET - Win32 Debug"');
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE #$ Substitute('"$$TARGET - Win32 Release" (based on "$$VC_PROJ_TYPE")');
-!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug" (based on "$$VC_PROJ_TYPE")');
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-
-!IF  "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Release"');
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE");
-# ADD CPP #$ Expand("VC_CPP_RELEASE");
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo #$ Project("TARGETLIB") && Substitute('/out:"$$TARGETLIB"');
-
-!ELSEIF  "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Debug"');
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG");
-# ADD CPP #$ Expand("VC_CPP_DEBUG");
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo #$ Project("TARGETLIB") && Substitute('/out:"$$TARGETLIB"');
-
-!ENDIF 
-
-# Begin Target
-
-# Name #$Substitute('"$$TARGET - Win32 Release"');
-# Name #$Substitute('"$$TARGET - Win32 Debug"');
-#${
-    foreach $n ( sort keys %file_names ) {
-	$f  = $file_names{$n};
-	$p  = $file_path{$n};
-	$p2 = $file_path2{$n};
-	$t  = $all_files{$f};
-	if ( ($t eq "h") && $moc_output{$f} ) {
-	    my($build);
-	    $build = "\n\n# Begin Custom Build - Running moc...\nInputPath=" . $p2 . "\n\n"
-		   . '"' . $moc_output{$f} . '" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"'
-		   . "\n\tmoc $p2 -o " . $moc_output{$f} . "\n\n"
-		   . "# End Custom Build\n\n";
-	    $text .= ("# Begin Source File\n\nSOURCE=$p\n\n"
-		   . '!IF  "$(CFG)" == "' . $project{"TARGET"} . ' - Win32 Release"'
-		   . $build);
-	    $text .= ('!ELSEIF  "$(CFG)" == "' . $project{"TARGET"} . ' - Win32 Debug"'
-		   . $build
-		   . "!ENDIF \n\n# End Source File\n");
-	} elsif ( $t eq "i" ) {
-	    my($build,$dn);
-	    $build = "\n\n# Begin Custom Build - Running moc...\nInputPath=" . $p2 . "\n\n"
-		   . '"' . $f . '" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"'
-		   . "\n\tmoc ". $moc_input{$f} . " -o $f\n\n"
-		   . "# End Custom Build\n\n";
-	    $dn = $n;
-	    $dn =~ s/\..*//;
-	    $dn =~ tr/a-z/A-Z/;
-	    $text .= ("# Begin Source File\n\nSOURCE=$p\n"
-		   . "USERDEP__$dn=" . '"' . $moc_input{$f} . '"' . "\n\n"
-		   . '!IF  "$(CFG)" == "' . $project{"TARGET"} . ' - Win32 Release"'
-		   . $build);
-	    $text .= ('!ELSEIF  "$(CFG)" == "' . $project{"TARGET"} . ' - Win32 Debug"'
-		   . $build
-		   . "!ENDIF \n\n# End Source File\n");
-	} elsif ( $t eq "s" || $t eq "m" || $t eq "h" ) {
-	    $text .= "# Begin Source File\n\nSOURCE=$p\n# End Source File\n";
-	}
-    }
-    chop $text;
-#$}
-# End Target
-# End Project
diff --git a/tmake/lib/win32-symantec/app.t b/tmake/lib/win32-symantec/app.t
deleted file mode 100644
index fc4dc2c..0000000
--- a/tmake/lib/win32-symantec/app.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for building Win32 applications.
-#!
-#$ Project('TMAKE_APP_FLAG = 1');
-#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/win32-symantec/generic.t b/tmake/lib/win32-symantec/generic.t
deleted file mode 100644
index ab39654..0000000
--- a/tmake/lib/win32-symantec/generic.t
+++ /dev/null
@@ -1,211 +0,0 @@
-#!
-#! This is a tmake template for building Win32 applications or libraries.
-#!
-#${
-    if ( Config("qt") ) {
-	if ( $ENV{"QT_DLL"} && !$ENV{"QT_NODLL"} ) {
-	    Project('TMAKE_QT_DLL = 1');
-	    if ( Project("TARGET") eq "qt" ) {
-		Project('CONFIG += dll');
-	    }
-	}
-    }
-    if ( Config("dll") || Project("TMAKE_APP_FLAG") ) {
-	Project('CONFIG -= staticlib');
-	Project('TMAKE_APP_OR_DLL = 1');
-    } else {
-	Project('CONFIG += staticlib');
-    }
-    if ( Config("warn_off") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF');
-    } elsif ( Config("warn_on") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON');
-    }
-    if ( Config("debug") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG');
-	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG');
-    } elsif ( Config("release") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE');
-	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE');
-    }
-    if ( Config("qt") || Config("opengl") ) {
-	Project('CONFIG += windows' );
-    }
-    if ( Config("qt") ) {
-	$moc_aware = 1;
-	AddIncludePath(Project('TMAKE_INCDIR_QT'));
-	if ( Config("opengl") ) {
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL');
-	}
-	if ( Project("TARGET") eq "qt" ) {
-	    if ( Project("TMAKE_QT_DLL") && !(Project("DEFINES") =~ /QT_NODLL/) ) {
-		Project('DEFINES *= QT_MAKEDLL');
-	    }
-	} else {
-	    if ( Project("TMAKE_QT_DLL") && !(Project("DEFINES") =~ /QT_NODLL/) ) {
-		Project('DEFINES *= QT_DLL');
-	    }
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT');
-	    if ( (Project("DEFINES") =~ /QT_DLL/) ) {
-		my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt");
-		Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/");
-		Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL');
-	    }
-	}
-    }
-    if ( Config("opengl") ) {
-	Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL');
-    }
-    if ( Config("dll") ) {
-	Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE_DLL');
-	Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS_DLL');
-	if ( Project("TMAKE_LIB_FLAG") ) {
-	    my $ver = Project("VERSION");
-	    $ver =~ s/\.//g;
-	    $project{"TARGET_EXT"} = "${ver}.dll";
-	} else {
-	    $project{"TARGET_EXT"} = ".dll";
-	}
-    } else {
-	Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE');
-	Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS');
-	if ( Project('TMAKE_APP_FLAG') ) {
-	    $project{"TARGET_EXT"} = ".exe";
-	} else {
-	    $project{"TARGET_EXT"} = ".lib";
-	}
-    }
-    if ( Config("windows") ) {
-	if ( Config("console") ) {
-	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
-	    Project('TMAKE_LIBS   *= $$TMAKE_LIBS_CONSOLE');
-	} else {
-	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_WINDOWS_ANY');
-	}
-	Project('TMAKE_LIBS   *= $$TMAKE_LIBS_WINDOWS');
-    } else {
-	Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
-	Project('TMAKE_LIBS   *= $$TMAKE_LIBS_CONSOLE');
-    }
-    Project('TMAKE_LIBS += $$LIBS');
-    Project('TMAKE_FILETAGS = HEADERS SOURCES DEF_FILE RC_FILE TARGET TMAKE_LIBS DESTDIR DLLDESTDIR $$FILETAGS');
-    foreach ( split(/\s/,Project('TMAKE_FILETAGS')) ) {
-	$project{$_} =~ s-[/\\]+-\\-g;
-    }
-    if ( Project('DEF_FILE') ) {
-	Project('TMAKE_LFLAGS *= /DEF:$$DEF_FILE');
-    }
-    if ( Project('RC_FILE') ) {
-	if ( Project('RES_FILE') ) {
-	    tmake_error("Both .rc and .res file specified.\n" .
-			"Please specify one of them, not both.");
-	}
-	$project{"RES_FILE"} = $project{"RC_FILE"};
-	$project{"RES_FILE"} =~ s/\.rc$/.res/i;
-	Project('TARGETDEPS += $$RES_FILE');
-    }
-    if ( Project('RES_FILE') ) {
-	Project('TMAKE_LIBS *= $$RES_FILE');
-    }
-    StdInit();
-    if ( Project("VERSION") ) {
-	$project{"VER_MAJ"} = $project{"VERSION"};
-	$project{"VER_MAJ"} =~ s/\.\d+$//;
-	$project{"VER_MIN"} = $project{"VERSION"};
-	$project{"VER_MIN"} =~ s/^\d+\.//;
-    }    
-#$}
-#!
-# Makefile for building #$ Expand("TARGET")
-# Generated by tmake at #$ Now();
-#     Project: #$ Expand("PROJECT");
-#    Template: #$ Expand("TEMPLATE");
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	#$ Expand("TMAKE_CC");
-CFLAGS	=	#$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
-INCPATH	=	#$ ExpandPath("INCPATH",'-I',' -I','');
-#$ !Project("TMAKE_APP_OR_DLL") && DisableOutput();
-LINK	=	#$ Expand("TMAKE_LINK");
-LFLAGS	=	#$ Expand("TMAKE_LFLAGS");
-LIBS	=	#$ Expand("TMAKE_LIBS");
-#$ !Project("TMAKE_APP_OR_DLL") && EnableOutput();
-#$ Project("TMAKE_APP_OR_DLL") && DisableOutput();
-LIB	=	#$ Expand("TMAKE_LIB");
-#$ Project("TMAKE_APP_OR_DLL") && EnableOutput();
-MOC	=	#$ Expand("TMAKE_MOC");
-
-ZIP	=	#$ Expand("TMAKE_ZIP");
-
-####### Files
-
-HEADERS =	#$ ExpandList("HEADERS");
-SOURCES =	#$ ExpandList("SOURCES");
-OBJECTS =	#$ ExpandList("OBJECTS");
-SRCMOC	=	#$ ExpandList("SRCMOC");
-OBJMOC	=	#$ ExpandList("OBJMOC");
-DIST	=	#$ ExpandList("DISTFILES");
-TARGET	=	#$ ExpandGlue("TARGET",$project{"DESTDIR"},"",$project{"TARGET_EXT"});
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .c
-
-.cpp.obj:
-	#$ Expand("TMAKE_COMPILE_IMP");
-
-.cxx.obj:
-	#$ Expand("TMAKE_COMPILE_IMP");
-
-.cc.obj:
-	#$ Expand("TMAKE_COMPILE_IMP");
-
-.c.obj:
-	#$ Expand("TMAKE_COMPILE_IMP");
-
-####### Build rules
-
-all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)';
-
-$(TARGET): $(HEADERS) $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS");
-#$ Project("TMAKE_APP_OR_DLL") || DisableOutput();
-	$(LINK) $(LFLAGS) $(OBJECTS) $(OBJMOC), $(TARGET),, $(LIBS)
-#$ Project("TMAKE_APP_OR_DLL") || EnableOutput();
-#$ Project("TMAKE_APP_OR_DLL") && DisableOutput();
-	-del $(TARGET)
-#${
-# $text = "\t\$(LIB) \$(TARGET) "
-#   . join(" \\\n+",split(/\s+/,$project{"OBJECTS"})) . " \\\n+"
-#   . join(" \\\n+",split(/\s+/,$project{"OBJMOC"})) . ",;";
-#$}
-#$ Project("TMAKE_APP_OR_DLL") && EnableOutput();
-#$ (Config("dll") && Project("DLLDESTDIR")) || DisableOutput();
-	-copy $(TARGET) #$ Expand("DLLDESTDIR");
-#$ (Config("dll") && Project("DLLDESTDIR")) || EnableOutput();
-#$ Project('RC_FILE') || DisableOutput();
-
-#$ Substitute("\$\$RES_FILE: \$\$RC_FILE\n\t\$\$TMAKE_RC \$\$RC_FILE");
-#$ Project('RC_FILE') || EnableOutput();
-
-moc: $(SRCMOC)
-
-#$ TmakeSelf();
-
-dist:
-	#$ Substitute('$(ZIP) $$PROJECT.zip $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)');
-
-clean:
-	#$ ExpandGlue("OBJECTS","-del ","\n\t-del ","");
-	#$ ExpandGlue("SRCMOC" ,"-del ","\n\t-del ","");
-	#$ ExpandGlue("OBJMOC" ,"-del ","\n\t-del ","");
-	-del $(TARGET)
-	#$ ExpandGlue("CLEAN_FILES","-del ","\n\t-del ","");
-
-####### Compile
-
-#$ BuildObj(Project("OBJECTS"),Project("SOURCES"));
-#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC"));
-#$ BuildMocSrc(Project("HEADERS"));
-#$ BuildMocSrc(Project("SOURCES"));
diff --git a/tmake/lib/win32-symantec/lib.t b/tmake/lib/win32-symantec/lib.t
deleted file mode 100644
index d8ac6c7..0000000
--- a/tmake/lib/win32-symantec/lib.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for building Win32 libraries.
-#!
-#$ Project('TMAKE_LIB_FLAG = 1');
-#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/win32-symantec/subdirs.t b/tmake/lib/win32-symantec/subdirs.t
deleted file mode 100644
index 8b881ab..0000000
--- a/tmake/lib/win32-symantec/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Win32 template
-#$ IncludeTemplate("../win32/subdirs.t");
diff --git a/tmake/lib/win32-symantec/tmake.conf b/tmake/lib/win32-symantec/tmake.conf
deleted file mode 100644
index 81f88c2..0000000
--- a/tmake/lib/win32-symantec/tmake.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# 
-#
-# tmake configuration for Win32/Symantec C++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= sc
-TMAKE_CFLAGS		= -mn -w2
-TMAKE_CFLAGS_WARN_ON	=
-TMAKE_CFLAGS_WARN_OFF	= -w
-TMAKE_CFLAGS_RELEASE	= -o
-TMAKE_CFLAGS_DEBUG	= -g
-TMAKE_CFLAGS_YACC	=
-
-TMAKE_CXX		= $$TMAKE_CC
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_INCDIR_QT		= $(QTDIR)\include
-
-TMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src
-TMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $<
-TMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$obj $src
-TMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $<
-
-TMAKE_LINK		= link
-TMAKE_LFLAGS		= /NOLOGO /NOI
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	= /DEBUG
-TMAKE_LFLAGS_CONSOLE	= /SUBSYSTEM:console
-TMAKE_LFLAGS_WINDOWS	= /SUBSYSTEM:windows
-TMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL
-TMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL
-
-TMAKE_LIBS		=
-TMAKE_LIBS_CONSOLE	=
-TMAKE_LIBS_WINDOWS	= user32.lib gdi32.lib comdlg32.lib imm32.lib ole32.lib uuid.lib wsock32.lib
-TMAKE_LIBS_QT		= $(QTDIR)\lib\qt.lib
-TMAKE_LIBS_QT_DLL	= $(QTDIR)\lib\qtmain.lib
-TMAKE_LIBS_QT_OPENGL	= $(QTDIR)\lib\qgl.lib
-TMAKE_LIBS_OPENGL	= opengl32.lib
-
-TMAKE_MOC		= moc
-
-TMAKE_LIB		= lib /C /N /NOI /P:32
-TMAKE_RC		= rc
-
-TMAKE_ZIP		= zip -r -9
diff --git a/tmake/lib/win32-visage/app.t b/tmake/lib/win32-visage/app.t
deleted file mode 100644
index fc4dc2c..0000000
--- a/tmake/lib/win32-visage/app.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for building Win32 applications.
-#!
-#$ Project('TMAKE_APP_FLAG = 1');
-#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/win32-visage/generic.t b/tmake/lib/win32-visage/generic.t
deleted file mode 100644
index b5b1fb6..0000000
--- a/tmake/lib/win32-visage/generic.t
+++ /dev/null
@@ -1,207 +0,0 @@
-#!
-#! This is a tmake template for building Win32 applications or libraries.
-#!
-#${
-    if ( Config("qt") ) {
-	if ( $ENV{"QT_DLL"} && !$ENV{"QT_NODLL"} ) {
-	    Project('TMAKE_QT_DLL = 1');
-	    if ( Project("TARGET") eq "qt" ) {
-		Project('CONFIG += dll');
-	    }
-	}
-    }
-    if ( Config("dll") || Project("TMAKE_APP_FLAG") ) {
-	Project('CONFIG -= staticlib');
-	Project('TMAKE_APP_OR_DLL = 1');
-    } else {
-	Project('CONFIG += staticlib');
-    }
-    if ( Config("warn_off") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF');
-    } elsif ( Config("warn_on") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON');
-    }
-    if ( Config("debug") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG');
-	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG');
-    } elsif ( Config("release") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE');
-	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE');
-    }
-    if ( Config("qt") || Config("opengl") ) {
-	Project('CONFIG += windows' );
-    }
-    if ( Config("qt") ) {
-	$moc_aware = 1;
-	AddIncludePath(Project('TMAKE_INCDIR_QT'));
-	if ( Config("opengl") ) {
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL');
-	}
-	if ( Project("TARGET") eq "qt" ) {
-	    if ( Project("TMAKE_QT_DLL") && !(Project("DEFINES") =~ /QT_NODLL/) ) {
-		Project('DEFINES *= QT_MAKEDLL');
-	    }
-	} else {
-	    if ( Project("TMAKE_QT_DLL") && !(Project("DEFINES") =~ /QT_NODLL/) ) {
-		Project('DEFINES *= QT_DLL');
-	    }
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT');
-	    if ( (Project("DEFINES") =~ /QT_DLL/) ) {
-		my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt");
-		Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/");
-		Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL');
-	    }
-	}
-    }
-    if ( Config("opengl") ) {
-	Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL');
-    }
-    if ( Config("dll") ) {
-	Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE_DLL');
-	Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS_DLL');
-	if ( Project("TMAKE_LIB_FLAG") ) {
-	    my $ver = Project("VERSION");
-	    $ver =~ s/\.//g;
-	    $project{"TARGET_EXT"} = "${ver}.dll";
-	} else {
-	    $project{"TARGET_EXT"} = ".dll";
-	}
-    } else {
-	Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE');
-	Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS');
-	if ( Project('TMAKE_APP_FLAG') ) {
-	    $project{"TARGET_EXT"} = ".exe";
-	} else {
-	    $project{"TARGET_EXT"} = ".lib";
-	}
-    }
-    if ( Config("windows") ) {
-	if ( Config("console") ) {
-	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
-	    Project('TMAKE_LIBS   *= $$TMAKE_LIBS_CONSOLE');
-	} else {
-	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_WINDOWS_ANY');
-	}
-	Project('TMAKE_LIBS   *= $$TMAKE_LIBS_WINDOWS');
-    } else {
-	Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
-	Project('TMAKE_LIBS   *= $$TMAKE_LIBS_CONSOLE');
-    }
-    Project('TMAKE_LIBS += $$LIBS');
-    Project('TMAKE_FILETAGS = HEADERS SOURCES DEF_FILE RC_FILE TARGET TMAKE_LIBS DESTDIR DLLDESTDIR $$FILETAGS');
-    foreach ( split(/\s/,Project('TMAKE_FILETAGS')) ) {
-	$project{$_} =~ s-[/\\]+-\\-g;
-    }
-    if ( Project('DEF_FILE') ) {
-	Project('TMAKE_LFLAGS *= /DEF:$$DEF_FILE');
-    }
-    if ( Project('RC_FILE') ) {
-	if ( Project('RES_FILE') ) {
-	    tmake_error("Both .rc and .res file specified.\n" .
-			"Please specify one of them, not both.");
-	}
-	$project{"RES_FILE"} = $project{"RC_FILE"};
-	$project{"RES_FILE"} =~ s/\.rc$/.res/i;
-	Project('TARGETDEPS += $$RES_FILE');
-    }
-    if ( Project('RES_FILE') ) {
-	Project('TMAKE_LIBS *= $$RES_FILE');
-    }
-    StdInit();
-    if ( Project("VERSION") ) {
-	$project{"VER_MAJ"} = $project{"VERSION"};
-	$project{"VER_MAJ"} =~ s/\.\d+$//;
-	$project{"VER_MIN"} = $project{"VERSION"};
-	$project{"VER_MIN"} =~ s/^\d+\.//;
-    }    
-#$}
-#!
-# Makefile for building #$ Expand("TARGET")
-# Generated by tmake at #$ Now();
-#     Project: #$ Expand("PROJECT");
-#    Template: #$ Expand("TEMPLATE");
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	#$ Expand("TMAKE_CC");
-CFLAGS	=	#$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
-INCPATH	=	#$ ExpandGlue("INCPATH",'-I',' -I','');
-#$ !Project("TMAKE_APP_OR_DLL") && DisableOutput();
-LINK	=	#$ Expand("TMAKE_LINK");
-LFLAGS	=	#$ Expand("TMAKE_LFLAGS");
-LIBS	=	#$ Expand("TMAKE_LIBS");
-#$ !Project("TMAKE_APP_OR_DLL") && EnableOutput();
-#$ Project("TMAKE_APP_OR_DLL") && DisableOutput();
-LIB	=	#$ Expand("TMAKE_LIB");
-#$ Project("TMAKE_APP_OR_DLL") && EnableOutput();
-MOC	=	#$ Expand("TMAKE_MOC");
-
-ZIP	=	#$ Expand("TMAKE_ZIP");
-
-####### Files
-
-HEADERS =	#$ ExpandList("HEADERS");
-SOURCES =	#$ ExpandList("SOURCES");
-OBJECTS =	#$ ExpandList("OBJECTS");
-SRCMOC	=	#$ ExpandList("SRCMOC");
-OBJMOC	=	#$ ExpandList("OBJMOC");
-DIST	=	#$ ExpandList("DISTFILES");
-TARGET	=	#$ ExpandGlue("TARGET",$project{"DESTDIR"},"",$project{"TARGET_EXT"});
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .c
-
-.cpp.obj:
-	#$ Expand("TMAKE_COMPILE_IMP");
-
-.cxx.obj:
-	#$ Expand("TMAKE_COMPILE_IMP");
-
-.cc.obj:
-	#$ Expand("TMAKE_COMPILE_IMP");
-
-.c.obj:
-	#$ Expand("TMAKE_COMPILE_IMP");
-
-####### Build rules
-
-all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)';
-
-$(TARGET): $(HEADERS) $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS");
-#$ Project("TMAKE_APP_OR_DLL") || DisableOutput();
-$(TARGET): $(OBJECTS) $(LIBS) #$ Expand("TARGETDEPS");
-	$(LINK) -B"$(LFLAGS)" $(OBJECTS) $(LIBS) -Fe$(TARGET)
-#$ Project("TMAKE_APP_OR_DLL") || EnableOutput();
-#$ Project("TMAKE_APP_OR_DLL") && DisableOutput();
-	$(LIB) /OUT:$(TARGET) $(OBJECTS) $(OBJMOC)
-#$ Project("TMAKE_APP_OR_DLL") && EnableOutput();
-#$ (Config("dll") && Project("DLLDESTDIR")) || DisableOutput();
-	-copy $(TARGET) #$ Expand("DLLDESTDIR");
-#$ (Config("dll") && Project("DLLDESTDIR")) || EnableOutput();
-#$ Project('RC_FILE') || DisableOutput();
-
-#$ Substitute("\$\$RES_FILE: \$\$RC_FILE\n\t\$\$TMAKE_RC \$\$RC_FILE");
-#$ Project('RC_FILE') || EnableOutput();
-
-moc: $(SRCMOC)
-
-#$ TmakeSelf();
-
-dist:
-	#$ Substitute('$(ZIP) $$PROJECT.zip $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)');
-
-clean:
-	#$ ExpandGlue("OBJECTS","-del ","\n\t-del ","");
-	#$ ExpandGlue("SRCMOC" ,"-del ","\n\t-del ","");
-	#$ ExpandGlue("OBJMOC" ,"-del ","\n\t-del ","");
-	-del $(TARGET)
-	#$ ExpandGlue("CLEAN_FILES","-del ","\n\t-del ","");
-
-####### Compile
-
-#$ BuildObj(Project("OBJECTS"),Project("SOURCES"));
-#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC"));
-#$ BuildMocSrc(Project("HEADERS"));
-#$ BuildMocSrc(Project("SOURCES"));
diff --git a/tmake/lib/win32-visage/lib.t b/tmake/lib/win32-visage/lib.t
deleted file mode 100644
index d8ac6c7..0000000
--- a/tmake/lib/win32-visage/lib.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for building Win32 libraries.
-#!
-#$ Project('TMAKE_LIB_FLAG = 1');
-#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/win32-visage/subdirs.t b/tmake/lib/win32-visage/subdirs.t
deleted file mode 100644
index 8b881ab..0000000
--- a/tmake/lib/win32-visage/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Win32 template
-#$ IncludeTemplate("../win32/subdirs.t");
diff --git a/tmake/lib/win32-visage/tmake.conf b/tmake/lib/win32-visage/tmake.conf
deleted file mode 100644
index 69d3a82..0000000
--- a/tmake/lib/win32-visage/tmake.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# 
-#
-# tmake configuration for Win32/IBM Visual Age
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= icc -C
-TMAKE_CFLAGS		= -Q -Ft -Gd -Gm+ -qrtti=all
-TMAKE_CFLAGS_WARN_ON	= -W3
-TMAKE_CFLAGS_WARN_OFF	= -W0
-TMAKE_CFLAGS_RELEASE	= -Gl+ -O -Oc+
-TMAKE_CFLAGS_DEBUG	= -Fb* -Ti -Tm
-TMAKE_CFLAGS_YACC	=
-
-TMAKE_CXX		= $$TMAKE_CC
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_INCDIR_QT		= $(QTDIR)\include
-
-TMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$obj" $src
-TMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$@" $<
-TMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$obj" $src
-TMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$@" $<
-
-TMAKE_LINK		= icc -Tdp $(CFLAGS)
-TMAKE_LFLAGS		= -nologo -code:RX -data:RW -def -noe
-TMAKE_LFLAGS_RELEASE	= -OPTF
-TMAKE_LFLAGS_DEBUG	= -de -br
-TMAKE_LFLAGS_CONSOLE	= -pmtype:vio
-TMAKE_LFLAGS_WINDOWS	= -pmtype:pm
-TMAKE_LFLAGS_CONSOLE_DLL= -DLL
-TMAKE_LFLAGS_WINDOWS_DLL= -DLL
-
-TMAKE_LIBS		=
-TMAKE_LIBS_CONSOLE	=
-TMAKE_LIBS_WINDOWS	= user32.lib gdi32.lib comdlg32.lib imm32.lib ole32.lib uuid.lib wsock32.lib
-TMAKE_LIBS_QT		= $(QTDIR)\lib\qt.lib
-TMAKE_LIBS_QT_DLL	= $(QTDIR)\lib\qtmain.lib
-TMAKE_LIBS_QT_OPENGL	= $(QTDIR)\lib\qgl.lib
-TMAKE_LIBS_OPENGL	= opengl32.lib glu32.lib
-
-TMAKE_MOC		= moc
-
-TMAKE_LIB		= ilib
-TMAKE_RC		= rc
-
-TMAKE_ZIP		= zip -r -9
diff --git a/tmake/lib/win32-watcom/app.t b/tmake/lib/win32-watcom/app.t
deleted file mode 100644
index fc4dc2c..0000000
--- a/tmake/lib/win32-watcom/app.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for building Win32 applications.
-#!
-#$ Project('TMAKE_APP_FLAG = 1');
-#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/win32-watcom/generic.t b/tmake/lib/win32-watcom/generic.t
deleted file mode 100644
index 883c794..0000000
--- a/tmake/lib/win32-watcom/generic.t
+++ /dev/null
@@ -1,201 +0,0 @@
-#!
-#! This is a tmake template for building Win32 applications or libraries.
-#!
-#${
-    if ( Config("qt") ) {
-	if ( $ENV{"QT_DLL"} && !$ENV{"QT_NODLL"} ) {
-	    Project('TMAKE_QT_DLL = 1');
-	    if ( Project("TARGET") eq "qt" ) {
-		Project('CONFIG += dll');
-	    }
-	}
-    }
-    if ( Config("dll") || Project("TMAKE_APP_FLAG") ) {
-	Project('CONFIG -= staticlib');
-	Project('TMAKE_APP_OR_DLL = 1');
-    } else {
-	Project('CONFIG += staticlib');
-    }
-    if ( Config("warn_off") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF');
-    } elsif ( Config("warn_on") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON');
-    }
-    if ( Config("debug") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG');
-	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG');
-    } elsif ( Config("release") ) {
-	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE');
-	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE');
-    }
-    if ( Config("qt") || Config("opengl") ) {
-	Project('CONFIG += windows' );
-    }
-    if ( Config("qt") ) {
-	$moc_aware = 1;
-	AddIncludePath(Project('TMAKE_INCDIR_QT'));
-	if ( Config("opengl") ) {
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL');
-	}
-	if ( Project("TARGET") eq "qt" ) {
-	    if ( Project("TMAKE_QT_DLL") && !(Project("DEFINES") =~ /QT_NODLL/) ) {
-		Project('DEFINES *= QT_MAKEDLL');
-	    }
-	} else {
-	    if ( Project("TMAKE_QT_DLL") && !(Project("DEFINES") =~ /QT_NODLL/) ) {
-		Project('DEFINES *= QT_DLL');
-	    }
-	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT');
-	    if ( (Project("DEFINES") =~ /QT_DLL/) ) {
-		my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt");
-		Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/");
-		Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL');
-	    }
-	}
-    }
-    if ( Config("opengl") ) {
-	Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL');
-    }
-    if ( Config("dll") ) {
-	Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE_DLL');
-	Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS_DLL');
-	if ( Project("TMAKE_LIB_FLAG") ) {
-	    my $ver = Project("VERSION");
-	    $ver =~ s/\.//g;
-	    $project{"TARGET_EXT"} = "${ver}.dll";
-	} else {
-	    $project{"TARGET_EXT"} = ".dll";
-	}
-    } else {
-	Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE');
-	Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS');
-	if ( Project('TMAKE_APP_FLAG') ) {
-	    $project{"TARGET_EXT"} = ".exe";
-	} else {
-	    $project{"TARGET_EXT"} = ".lib";
-	}
-    }
-    if ( Config("windows") ) {
-	if ( Config("console") ) {
-	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
-	    Project('TMAKE_LIBS   *= $$TMAKE_LIBS_CONSOLE');
-	} else {
-	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_WINDOWS_ANY');
-	}
-	Project('TMAKE_LIBS   *= $$TMAKE_LIBS_WINDOWS');
-    } else {
-	Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
-	Project('TMAKE_LIBS   *= $$TMAKE_LIBS_CONSOLE');
-    }
-    Project('TMAKE_LIBS += $$LIBS');
-    Project('TMAKE_FILETAGS = HEADERS SOURCES DEF_FILE RC_FILE TARGET TMAKE_LIBS DESTDIR DLLDESTDIR $$FILETAGS');
-    foreach ( split(/\s/,Project('TMAKE_FILETAGS')) ) {
-	$project{$_} =~ s-[/\\]+-\\-g;
-    }
-    if ( Project('DEF_FILE') ) {
-	Project('TMAKE_LFLAGS *= /DEF:$$DEF_FILE');
-    }
-    if ( Project('RC_FILE') ) {
-	if ( Project('RES_FILE') ) {
-	    tmake_error("Both .rc and .res file specified.\n" .
-			"Please specify one of them, not both.");
-	}
-	$project{"RES_FILE"} = $project{"RC_FILE"};
-	$project{"RES_FILE"} =~ s/\.rc$/.res/i;
-	Project('TARGETDEPS += $$RES_FILE');
-    }
-    if ( Project('RES_FILE') ) {
-	Project('TMAKE_LIBS *= $$RES_FILE');
-    }
-    $linebreak = '&';
-    StdInit();
-    if ( Project("VERSION") ) {
-	$project{"VER_MAJ"} = $project{"VERSION"};
-	$project{"VER_MAJ"} =~ s/\.\d+$//;
-	$project{"VER_MIN"} = $project{"VERSION"};
-	$project{"VER_MIN"} =~ s/^\d+\.//;
-    }    
-#$}
-#!
-# Makefile for building #$ Expand("TARGET")
-# Generated by tmake at #$ Now();
-#     Project: #$ Expand("PROJECT");
-#    Template: #$ Expand("TEMPLATE");
-#############################################################################
-
-####### Compiler, tools and options
-
-#$ Config("qt") || DisableOutput();
-QTDIR	=	#$ $text = $ENV{"QTDIR"};
-#$ Config("qt") || EnableOutput();
-CC	=	#$ Expand("TMAKE_CC");
-CFLAGS	=	#$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-d="," -d=","");
-INCPATH	=	#$ ExpandPath("INCPATH",'-i=',' -i=','');
-#$ !Project("TMAKE_APP_OR_DLL") && DisableOutput();
-LINK	=	#$ Expand("TMAKE_LINK");
-LFLAGS	=	#$ Expand("TMAKE_LFLAGS");
-LIBS	=	#$ Expand("TMAKE_LIBS");
-#$ !Project("TMAKE_APP_OR_DLL") && EnableOutput();
-#$ Project("TMAKE_APP_OR_DLL") && DisableOutput();
-LIB	=	#$ Expand("TMAKE_LIB");
-#$ Project("TMAKE_APP_OR_DLL") && EnableOutput();
-MOC	=	#$ Expand("TMAKE_MOC");
-
-ZIP	=	#$ Expand("TMAKE_ZIP");
-
-####### Files
-
-HEADERS =	#$ ExpandList("HEADERS");
-SOURCES =	#$ ExpandList("SOURCES");
-OBJECTS =	#$ ExpandList("OBJECTS");
-SRCMOC	=	#$ ExpandList("SRCMOC");
-OBJMOC	=	#$ ExpandList("OBJMOC");
-DIST	=	#$ ExpandList("DISTFILES");
-TARGET	=	#$ ExpandGlue("TARGET",$project{"DESTDIR"},"",$project{"TARGET_EXT"});
-TMPLIST =	#$ ExpandGlue("TARGET","","",".lst");
-####### Build rules
-
-all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)';
-
-$(TARGET): $(HEADERS) $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS");
-	@%create $(TMPLIST)
-#$ Project("TMAKE_APP_OR_DLL") || DisableOutput();
-	@%append $(TMPLIST) NAME #$ Expand("TARGET");
-	#$ ExpandGlue("OBJECTS",'@%append $(TMPLIST) FIL ',",","");
-	#$ ExpandGlue("OBJMOC" ,'@%append $(TMPLIST) FIL ',",","");
-	#$ ExpandGlue("TMAKE_LIBS" ,'@%append $(TMPLIST) LIBR ',",","");
-	$(LINK) $(LFLAGS) @$(TMPLIST)
-#$ Project("TMAKE_APP_OR_DLL") || EnableOutput();
-#$ Project("TMAKE_APP_OR_DLL") && DisableOutput();
-	@for %i in ( $(OBJECTS) $(OBJMOC) ) do @%append $(TMPLIST) +'%i'
-	$(LIB) $(TARGET) @$(TMPLIST)
-#$ Project("TMAKE_APP_OR_DLL") && EnableOutput();
-	del $(TMPLIST)
-#$ (Config("dll") && Project("DLLDESTDIR")) || DisableOutput();
-	-copy $(TARGET) #$ Expand("DLLDESTDIR");
-#$ (Config("dll") && Project("DLLDESTDIR")) || EnableOutput();
-#$ Project('RC_FILE') || DisableOutput();
-
-#$ Substitute("\$\$RES_FILE: \$\$RC_FILE\n\t\$\$TMAKE_RC \$\$RC_FILE");
-#$ Project('RC_FILE') || EnableOutput();
-
-moc: $(SRCMOC)
-
-#$ TmakeSelf();
-
-dist:
-	#$ Substitute('$(ZIP) $$PROJECT.zip $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)');
-
-clean:
-	#$ ExpandGlue("OBJECTS","-del ","\n\t-del ","");
-	#$ ExpandGlue("SRCMOC" ,"-del ","\n\t-del ","");
-	#$ ExpandGlue("OBJMOC" ,"-del ","\n\t-del ","");
-	-del $(TARGET)
-	#$ ExpandGlue("CLEAN_FILES","-del ","\n\t-del ","");
-
-####### Compile
-
-#$ BuildObj(Project("OBJECTS"),Project("SOURCES"));
-#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC"));
-#$ BuildMocSrc(Project("HEADERS"));
-#$ BuildMocSrc(Project("SOURCES"));
diff --git a/tmake/lib/win32-watcom/lib.t b/tmake/lib/win32-watcom/lib.t
deleted file mode 100644
index d8ac6c7..0000000
--- a/tmake/lib/win32-watcom/lib.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for building Win32 libraries.
-#!
-#$ Project('TMAKE_LIB_FLAG = 1');
-#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/win32-watcom/subdirs.t b/tmake/lib/win32-watcom/subdirs.t
deleted file mode 100644
index 8b881ab..0000000
--- a/tmake/lib/win32-watcom/subdirs.t
+++ /dev/null
@@ -1,2 +0,0 @@
-#! Use the common Win32 template
-#$ IncludeTemplate("../win32/subdirs.t");
diff --git a/tmake/lib/win32-watcom/tmake.conf b/tmake/lib/win32-watcom/tmake.conf
deleted file mode 100644
index 862e915..0000000
--- a/tmake/lib/win32-watcom/tmake.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# 
-#
-# tmake configuration for Win32/Watcom C++
-#
-
-TEMPLATE		= app
-CONFIG			= qt warn_on release
-
-TMAKE_CC		= wcl386
-TMAKE_CFLAGS		= -zq
-TMAKE_CFLAGS_WARN_ON	= -w2
-TMAKE_CFLAGS_WARN_OFF	= -w0
-TMAKE_CFLAGS_RELEASE	= -ox
-TMAKE_CFLAGS_DEBUG	= -d2
-TMAKE_CFLAGS_YACC	=
-
-TMAKE_CXX		= $$TMAKE_CC
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-
-TMAKE_INCDIR		=
-TMAKE_INCDIR_QT		= $(QTDIR)\include
-
-TMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -fo=$obj $src
-TMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -fo=$obj $src
-
-TMAKE_LINK		= wlink
-TMAKE_LFLAGS		= op quiet op c
-TMAKE_LFLAGS_RELEASE	=
-TMAKE_LFLAGS_DEBUG	= d all
-TMAKE_LFLAGS_CONSOLE	= sys nt
-TMAKE_LFLAGS_WINDOWS	= sys nt_win
-TMAKE_LFLAGS_CONSOLE_DLL= sys nt
-TMAKE_LFLAGS_WINDOWS_DLL= sys nt_win
-
-TMAKE_LIBS		=
-TMAKE_LIBS_CONSOLE	=
-TMAKE_LIBS_WINDOWS	=
-TMAKE_LIBS_QT		= %QTDIR%\lib\qt.lib
-TMAKE_LIBS_QT_DLL	= %QTDIR%\lib\qtmain.lib
-TMAKE_LIBS_QT_OPENGL	= %QTDIR%\lib\qgl.lib
-TMAKE_LIBS_OPENGL	= opengl32.lib
-
-TMAKE_MOC		= moc
-
-TMAKE_LIB		= wlib -b -c -n -q -p=512
-TMAKE_RC		= rc
-
-TMAKE_ZIP		= zip -r -9
diff --git a/tmake/lib/win32/subdirs.t b/tmake/lib/win32/subdirs.t
deleted file mode 100644
index 4c857fd..0000000
--- a/tmake/lib/win32/subdirs.t
+++ /dev/null
@@ -1,54 +0,0 @@
-#############################################################################
-#!
-#! This is a tmake template for creating a makefile that invokes make in
-#! sub directories - for Win32.
-#!
-#${
-    StdInit();
-    $m = "";
-    foreach ( split(/\s+/,$project{"SUBDIRS"}) ) {
-	$m = $m . "\tcd $_\n\tDOMAKE\n\t\@cd ..\n";
-    }
-    $project{"SUBMAKE"} = $m;
-    Project('MAKEFILE') || Project('MAKEFILE = Makefile');
-    Project('TMAKE') || Project('TMAKE = tmake');
-#$}
-#!
-# Makefile for building targets in sub directories.
-# Generated by tmake at #$ Now();
-#     Project: #$ Expand("PROJECT");
-#    Template: #$ Expand("TEMPLATE");
-#############################################################################
-
-MAKEFILE=	#$ Expand("MAKEFILE");
-TMAKE	=	#$ Expand("TMAKE");
-
-SUBDIRS =	#$ ExpandList("SUBDIRS");
-
-all: $(SUBDIRS)
-
-#${
-    foreach ( split(/\s+/,$project{"SUBDIRS"}) ) {
-	if ( Project("TMAKE_NOFORCE") ) {
-	    $text = $text . $_ . ":\n\t" .
-		"cd $_\n\t\$(MAKE\)\n\t\@cd ..\n\n";
-	} else {
-	    $text = $text . $_ . ": FORCE\n\t" .
-		"cd $_\n\t\$(MAKE\)\n\t\@cd ..\n\n";
-	}
-    }
-#$}
-#$ TmakeSelf();
-
-tmake_all:
-#${
-    foreach ( split(/\s+/,$project{"SUBDIRS"}) ) {
-	$text .= "\tcd $_\n\t\$(TMAKE\) $_.pro -o \$(MAKEFILE)\n\t\@cd ..\n";
-    }
-#$}
-
-clean:
-#$ $text = $project{"SUBMAKE"}; $text =~ s/DOMAKE/\$(MAKE\) clean/g;
-#$ Project("TMAKE_NOFORCE") && DisableOutput();
-FORCE:
-#$ Project("TMAKE_NOFORCE") && EnableOutput();
diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt
new file mode 100644
index 0000000..e1e4ab1
--- /dev/null
+++ b/vhdlparser/CMakeLists.txt
@@ -0,0 +1,10 @@
+include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools)
+add_library(vhdlparser
+CharStream.cc
+ParseException.cc
+Token.cc
+TokenMgrError.cc
+VhdlParser.cc
+VhdlParserTokenManager.cc
+VhdlParserIF.cpp
+)
diff --git a/vhdlparser/CharStream.h b/vhdlparser/CharStream.h
index f901e38..409439f 100644
--- a/vhdlparser/CharStream.h
+++ b/vhdlparser/CharStream.h
@@ -179,12 +179,12 @@ public:
   }
 
   CharStream(ReaderStream *input_stream, int startline,
-             int startcolumn, int buffersize) :
+             int startcolumn, int) :
     bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
     tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
     available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
     inputStream(NULL), deleteStream(false) {
-    ReInit(input_stream, startline, startcolumn, buffersize);
+    ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream, int startline, int startcolumn) :
diff --git a/vhdlparser/ErrorHandler.h b/vhdlparser/ErrorHandler.h
index f5e53e4..2170489 100644
--- a/vhdlparser/ErrorHandler.h
+++ b/vhdlparser/ErrorHandler.h
@@ -24,22 +24,22 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
       // expectedKind - token kind that the parser was trying to consume.
       // expectedToken - the image of the token - tokenImages[expectedKind].
       // actual - the actual token that the parser got instead.
-      virtual void handleUnexpectedToken(int /*expectedKind*/, JAVACC_STRING_TYPE expectedToken, Token *actual, VhdlParser * /*parser*/) {
+      virtual void handleUnexpectedToken(int, JAVACC_STRING_TYPE expectedToken, Token *actual, VhdlParser *) {
         error_count++;
         fprintf(stderr, "Expecting %s at: %d:%d but got %s\n", addUnicodeEscapes(expectedToken).c_str(), actual->beginLine, actual->beginColumn, addUnicodeEscapes(actual->image).c_str());
       }
       // Called when the parser cannot continue parsing.
       // last - the last token successfully parsed.
       // unexpected - the token at which the error occurs.
-      // production - the production in which this error occurs.
-      virtual void handleParseError(Token * /*last*/, Token *unexpected, JAVACC_SIMPLE_STRING production, VhdlParser * /*parser*/) {
+      // production - the production in which this error occurrs.
+      virtual void handleParseError(Token *, Token *unexpected, JAVACC_SIMPLE_STRING production, VhdlParser *) {
         error_count++;
         fprintf(stderr, "Encountered: %s at: %d:%d while parsing: %s\n", addUnicodeEscapes(unexpected->image).c_str(), unexpected->beginLine, unexpected->beginColumn, production.c_str());
       }
       virtual int getErrorCount() {
         return error_count;
       }
-      virtual void handleOtherError(JAVACC_STRING_TYPE message, VhdlParser * /*parser*/) {
+      virtual void handleOtherError(JAVACC_STRING_TYPE message, VhdlParser *) {
         fprintf(stderr, "Error: %s\n", (char*)message.c_str());
       }
       virtual ~ErrorHandler() {}
@@ -62,11 +62,11 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
        //    errorAfter  : prefix that was seen before this error occurred
        //    curchar     : the offending character
        //
-       virtual void lexicalError(bool EOFSeen, int /*lexState*/, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, VhdlParserTokenManager* /*token_manager*/) {
+       virtual void lexicalError(bool EOFSeen, int, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, VhdlParserTokenManager*) {
         // by default, we just print an error message and return.
         fprintf(stderr, "Lexical error at: %d:%d. Encountered: %c after: %s.\n", errorLine, errorColumn, curChar, (EOFSeen? "EOF" : (const char*)errorAfter.c_str()));
       }
-       virtual void lexicalError(JAVACC_STRING_TYPE errorMessage, VhdlParserTokenManager* /*token_manager*/) {
+       virtual void lexicalError(JAVACC_STRING_TYPE errorMessage, VhdlParserTokenManager*) {
         fprintf(stderr, "%s\n", (char*)errorMessage.c_str());
       }
       virtual ~TokenManagerErrorHandler() {}
diff --git a/vhdlparser/TokenManager.h b/vhdlparser/TokenManager.h
index 39353ba..68fbe2f 100644
--- a/vhdlparser/TokenManager.h
+++ b/vhdlparser/TokenManager.h
@@ -5,8 +5,6 @@
 #include "JavaCC.h"
 #include "Token.h"
 
-using namespace std;
-
 namespace vhdl {
 namespace parser {
 /**
@@ -18,11 +16,12 @@ namespace parser {
 class TokenManager {
 public:
   /** This gets the next token from the input stream.
-   *  A token of kind 0 (<EOF>) should be returned on EOF.
+   *  A token of kind 0 (\<EOF\>) should be returned on EOF.
    */
   virtual       ~TokenManager() { }
   virtual Token *getNextToken() = 0;
   virtual void   lexicalError() {
+  	fprintf(stderr,"Lexical error encountered.");
   }
 
 };
diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc
index 5c8b004..949f227 100644
--- a/vhdlparser/VhdlParser.cc
+++ b/vhdlparser/VhdlParser.cc
@@ -4,17 +4,17 @@
 namespace vhdl {
 namespace parser {
   unsigned int jj_la1_0[] = {
-0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x90404000,0x20080000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90004000,0x400000,0x0,0x90404000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20080000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x40000000,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x40020000,0x40020001,0x0,0x0,0x0,0x40000000,0xd0020000,0x0,0x0,0x800000,0x0,0x0,0x80004000,0x400000,0x0,0x0,0x80404000,0x0,0x0,0x0,0x0,0x8000,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x10000,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x10000000,0x0,0x50000000,0x8000,0x0,0x80000000,0x0,0x80000000,0x80000000,0x4000000,0x8000000,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x800,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x80004000,0x0,0x80004000,0x0,0x0,0x0,0x0,0x90004000,0x400000,0x0,0x0,0x90404000,0x0,0x0,0x0,0x40000000,0x0,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x20080000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x8000000,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x0,0x0,0x0,0x0,0x0,0x20080000,0x8000,0x0,0x0,0x41000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x2000,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90404000,0x20080000,0x20080000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x90404000,0x20080000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90004000,0x400000,0x0,0x90404000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20080000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x40000000,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x40020000,0x40020001,0x0,0x0,0x0,0x40000000,0xd0020000,0x0,0x0,0x800000,0x0,0x0,0x80004000,0x400000,0x0,0x0,0x80404000,0x0,0x0,0x0,0x0,0x8000,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x10000,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x10000000,0x0,0x50000000,0x8000,0x0,0x80000000,0x0,0x80000000,0x80000000,0x4000000,0x8000000,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x800,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x80004000,0x0,0x80004000,0x0,0x0,0x0,0x0,0x90004000,0x400000,0x0,0x0,0x90404000,0x0,0x0,0x0,0x40000000,0x0,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x20080000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x8000000,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x0,0x0,0x0,0x0,0x0,0x20080000,0x8000,0x0,0x0,0x41000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x2000,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90c04000,0x20080000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
   unsigned int jj_la1_1[] = {
-0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x125808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x0,0x0,0x1000,0x104800,0x1008,0x20000,0x125808,0x10000,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x1000,0x1000000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x20000,0x1000,0x0,0x4000000,0x4000000,0x0,0x400000,0x4000101,0x4000101,0x0,0x10,0x0,0x100,0x12024900,0x0,0x0,0x0,0x100,0x0,0x104800,0x8,0x20000,0x0,0x124808,0x0,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x81000,0x0,0x0,0x0,0x0,0x0,0x40,0x20,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x800,0x0,0x0,0x0,0x8a00000,0x0,0x0,0x1000,0x1,0x0,0x0,0x1000,0x0,0x0,0x8a00000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x40000,0x400000,0x0,0x0,0x104800,0x20000,0x124800,0x0,0x0,0x10000,0x10000,0x104800,0x8,0x20000,0x0,0x124808,0x0,0x0,0x0,0x100,0x0,0x0,0x104800,0x0,0x20000,0x124800,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x20081200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x104000,0x1000000,0x1104800,0x0,0x20000,0x1124800,0x4000,0x0,0x100000,0x100000,0x0,0x104000,0x20081200,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x1104800,0x0,0x20000,0x1124800,0x0,0x104000,0x104000,0x4000001,0x1,0x0,0x4000001,0x10000,0x10000,0x10000,0x0,0x0,0x125808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x20,0x0,0x200000,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x200000,0x0,0x0,0x0,0x200000,0x0,0x20,0x104000,0x100000,0x100000,0x0,0x1000000,0x0,0x0,0x104000,};
+0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x125808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x0,0x0,0x1000,0x104800,0x1008,0x20000,0x125808,0x10000,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x1000,0x1000000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x20000,0x1000,0x0,0x4000000,0x4000000,0x0,0x400000,0x4000101,0x4000101,0x0,0x10,0x0,0x100,0x12024900,0x0,0x0,0x0,0x100,0x0,0x104800,0x8,0x20000,0x0,0x124808,0x0,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x81000,0x0,0x0,0x0,0x0,0x0,0x40,0x20,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x800,0x0,0x0,0x0,0x8a00000,0x0,0x0,0x1000,0x1,0x0,0x0,0x1000,0x0,0x0,0x8a00000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x40000,0x400000,0x0,0x0,0x104800,0x20000,0x124800,0x0,0x0,0x10000,0x10000,0x104800,0x8,0x20000,0x0,0x124808,0x0,0x0,0x0,0x100,0x0,0x0,0x104800,0x0,0x20000,0x124800,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x20081200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x104000,0x1000000,0x1104800,0x0,0x20000,0x1124800,0x4000,0x0,0x100000,0x100000,0x0,0x104000,0x20081200,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x1104800,0x0,0x20000,0x1124800,0x0,0x104000,0x104000,0x4000001,0x1,0x0,0x4000001,0x10000,0x10000,0x10000,0x0,0x0,0x125808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x20,0x0,0x200000,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x200000,0x0,0x0,0x0,0x200000,0x0,0x20,0x104000,0x100000,0x100000,0x0,0x1000000,0x0,0x0,0x104000,};
   unsigned int jj_la1_2[] = {
-0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x110000,0x28000,0x0,0x20000000,0x0,0x0,0x0,0x200000,0x0,0x0,0x0,0x4000,0x0,0x0,0x110000,0x0,0x0,0x110000,0x0,0x4000,0x4000,0x0,0x0,0x0,0x0,0x28000,0x0,0x0,0x0,0x400,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x4000,0x400000,0x8000,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000000,0x1000,0x1000,0x0,0x0,0x0,0x100,0x11000,0x0,0x0,0x0,0x0,0x0,0x110000,0x0,0x0,0x1000,0x111000,0x0,0x0,0x4000,0x0,0x400,0x8000,0x28000,0x0,0x0,0x0,0x0,0x0,0x0,0x209,0x209,0x0,0x32,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x32,0x0,0x0,0x0,0x400,0x1000,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x1000,0x20,0x0,0x0,0x0,0x10,0x800,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000,0x0,0x110000,0x0,0x110000,0x1000,0x0,0x0,0x0,0x110000,0x0,0x0,0x1000,0x111000,0x0,0x0,0x2,0x0,0x1000,0x0,0x110000,0x0,0x0,0x110000,0x0,0x8000,0x0,0x0,0x0,0x8000,0x0,0x20000024,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x32,0x200000,0x1000,0x0,0x0,0x20,0xc0000000,0xc0000000,0x0,0x1000000,0x0,0x800000,0x0,0x800000,0x0,0x400,0x0,0x0,0x0,0x0,0x10000,0x0,0x110000,0x0,0x110000,0x0,0x0,0x110000,0x10000,0x0,0x100000,0x100000,0x0,0x110000,0x20000024,0x0,0x0,0x0,0x600000,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x32,0x0,0x0,0x110000,0x0,0x0,0x110000,0x0,0x110000,0x110000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x110000,0x28000,0x28000,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x800,0x32,0x0,0x0,0x0,0x0,0x1000000,0x0,0x800,0x0,0x0,0x0,0x800,0x0,0x0,0x110000,0x100000,0x100000,0x0,0x0,0x2000,0x0,0x138000,};
+0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x110000,0x28000,0x0,0x20000000,0x0,0x0,0x0,0x200000,0x0,0x0,0x0,0x4000,0x0,0x0,0x110000,0x0,0x0,0x110000,0x0,0x4000,0x4000,0x0,0x0,0x0,0x0,0x28000,0x0,0x0,0x0,0x400,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x4000,0x400000,0x8000,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000000,0x1000,0x1000,0x0,0x0,0x0,0x100,0x11000,0x0,0x0,0x0,0x0,0x0,0x110000,0x0,0x0,0x1000,0x111000,0x0,0x0,0x4000,0x0,0x400,0x8000,0x28000,0x0,0x0,0x0,0x0,0x0,0x0,0x209,0x209,0x0,0x32,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x32,0x0,0x0,0x0,0x400,0x1000,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x1000,0x20,0x0,0x0,0x0,0x10,0x800,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000,0x0,0x110000,0x0,0x110000,0x1000,0x0,0x0,0x0,0x110000,0x0,0x0,0x1000,0x111000,0x0,0x0,0x2,0x0,0x1000,0x0,0x110000,0x0,0x0,0x110000,0x0,0x8000,0x0,0x0,0x0,0x8000,0x0,0x20000024,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x32,0x200000,0x1000,0x0,0x0,0x20,0xc0000000,0xc0000000,0x0,0x1000000,0x0,0x800000,0x0,0x800000,0x0,0x400,0x0,0x0,0x0,0x0,0x10000,0x0,0x110000,0x0,0x110000,0x0,0x0,0x110000,0x10000,0x0,0x100000,0x100000,0x0,0x110000,0x20000024,0x0,0x0,0x0,0x600000,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x32,0x0,0x0,0x110000,0x0,0x0,0x110000,0x0,0x110000,0x110000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x110000,0x28000,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x800,0x32,0x0,0x0,0x0,0x0,0x1000000,0x0,0x800,0x0,0x0,0x0,0x800,0x0,0x0,0x110000,0x100000,0x100000,0x0,0x0,0x2000,0x0,0x138000,};
   unsigned int jj_la1_3[] = {
-0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x188830,0x8000000,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x80000,0x0,0x0,0x80000,0x0,0x108830,0x80000,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x2000000,0x0,0x0,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x2000000,0x0,0x0,0x80000,0x80000,0x0,0x0,0x80000,0x80000,0x0,0x4000,0x80000,0x80000,0x0,0x2000,0x0,0x0,0x128810,0x0,0x0,0x0,0x0,0x0,0x108830,0x80000,0x0,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x30000000,0x30000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x108030,0x0,0x100030,0x100030,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x108030,0x0,0x4000,0x0,0x0,0x188820,0x0,0x188820,0x0,0x0,0x0,0x0,0x108830,0x80000,0x0,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xd000001,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3c0,0x3c0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x0,0x0,0x0,0x0,0x0,0xd000001,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x8000000,0x20,0x0,0x0,0x0,0x40000,0x0,0x0,0x10000,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x80000,0x80000,0x80000,0x0,0x0,0x80000,0x0,0x0,0x0,0x2000000,0x0,0x188830,0x8000000,0x8000000,0x100010,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x2000000,0x0,0x0,0x8000000,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x188830,0x8000000,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x80000,0x0,0x0,0x80000,0x0,0x108830,0x80000,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x2000000,0x0,0x0,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x2000000,0x0,0x0,0x80000,0x80000,0x0,0x0,0x80000,0x80000,0x0,0x4000,0x80000,0x80000,0x0,0x2000,0x0,0x0,0x128810,0x0,0x0,0x0,0x0,0x0,0x108830,0x80000,0x0,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x30000000,0x30000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x108030,0x0,0x100030,0x100030,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x108030,0x0,0x4000,0x0,0x0,0x188820,0x0,0x188820,0x0,0x0,0x0,0x0,0x108830,0x80000,0x0,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xd000001,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3c0,0x3c0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x0,0x0,0x0,0x0,0x0,0xd000001,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x8000000,0x20,0x0,0x0,0x0,0x40000,0x0,0x0,0x10000,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x80000,0x80000,0x80000,0x0,0x0,0x80000,0x0,0x0,0x0,0x2000000,0x0,0x188830,0x8000000,0x100010,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x2000000,0x0,0x0,0x8000000,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
   unsigned int jj_la1_4[] = {
-0x0,0x0,0x60000,0x30,0x40,0x100,0x0,0x0,0x0,0x0,0x40000,0x0,0x40001,0x0,0x0,0x0,0x0,0x40,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x40001,0x0,0x0,0x0,0x0,0x10000000,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x20000,0x40,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x40000,0x40000,0x40000,0x40000,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x4,0x40001,0x0,0x0,0x40000,0x1,0x0,0x0,0x40000,0x40,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x40031,0x0,0x1,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x40000008,0x40000,0x40,0x1,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x1,0x0,0x0,0x0,0x40001,0x1,0x0,0x40000,0xfc00,0xfc00,0x0,0x0,0x0,0x40031,0x1,0x0,0x40,0x40,0x0,0x0,0x0,0x30,0x0,0x40001,0x0,0x80,0x0,0x40,0x40000,0x40,0x40000,0x0,0x30,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x40001,0x0,0x40001,0x0,0x1,0x0,0x40,0x40,0x40001,0x0,0x80,0x0,0x0,0x0,0x0,0x40,0x40031,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40001,0x40001,0x0,0xa0000000,0x20000000,0x0,0x1,0x40001,0x0,0x0,0x0,0x0,0x40031,0x0,0x8000000,0x40000,0x8000000,0x0,0x8000000,0x0,0x240,0x240,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x1,0x0,};
+0x0,0x0,0x60000,0x30,0x40,0x100,0x0,0x0,0x0,0x0,0x40000,0x0,0x40001,0x0,0x0,0x0,0x0,0x40,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x40001,0x0,0x0,0x0,0x0,0x10000000,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x20000,0x40,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x40000,0x40000,0x40000,0x40000,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x4,0x40001,0x0,0x0,0x40000,0x1,0x0,0x0,0x40000,0x40,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x40031,0x0,0x1,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x40000008,0x40000,0x40,0x1,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x1,0x0,0x0,0x0,0x40001,0x1,0x0,0x40000,0xfc00,0xfc00,0x0,0x0,0x0,0x40031,0x1,0x0,0x40,0x40,0x0,0x0,0x0,0x30,0x0,0x40001,0x0,0x80,0x0,0x40,0x40000,0x40,0x40000,0x0,0x30,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x40001,0x0,0x40001,0x0,0x1,0x0,0x40,0x40,0x40001,0x0,0x80,0x0,0x0,0x0,0x0,0x40,0x40031,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40001,0x0,0xa0000000,0x20000000,0x0,0x1,0x40001,0x0,0x0,0x0,0x0,0x40031,0x0,0x8000000,0x40000,0x8000000,0x0,0x8000000,0x0,0x240,0x240,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x1,0x0,};
   unsigned int jj_la1_5[] = {
-0x1420,0x0,0x1c0,0x0,0x0,0x0,0x2,0x3c0,0x0,0x0,0x1c0,0x4000000,0x40001c0,0x0,0x0,0x0,0x180,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x40001c0,0x180,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x4000000,0x4000000,0x2,0x0,0x0,0x3c0,0x3c0,0x1c0,0x1c0,0x3c0,0x380,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x817e0,0x0,0x0,0x1e0,0x0,0x180,0x0,0x3c0,0x0,0x180,0x0,0x180,0x0,0x0,0x180,0x0,0x817e0,0x0,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x180,0x0,0x180,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x180,0x180,0x0,0x180,0x1420,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x1c0,0x0,0x0,0x0,0x180,0x1c0,0x0,0x180,0x1c0,0x0,0x0,0x180,0x0,0x180,0x817e0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x1c0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x240,0x1c0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x817e0,0x0,0x180,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x180,0x4000000,0x40001c0,0x40001c0,0x0,0x1,0x0,0x1,0x0,0x1c0,0x0,0x0,0x0,0x0,0x817e0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x180,};
+0x1420,0x0,0x1c0,0x0,0x0,0x0,0x2,0x3c0,0x0,0x0,0x1c0,0x0,0x80001c0,0x0,0x0,0x0,0x180,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x80001c0,0x180,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x8000000,0x8000000,0x2,0x0,0x0,0x3c0,0x3c0,0x1c0,0x1c0,0x3c0,0x380,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x817e0,0x0,0x0,0x1e0,0x0,0x180,0x0,0x3c0,0x0,0x180,0x0,0x180,0x0,0x0,0x180,0x0,0x817e0,0x0,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x180,0x0,0x180,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x180,0x180,0x0,0x180,0x1420,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x1c0,0x0,0x0,0x0,0x180,0x1c0,0x0,0x180,0x1c0,0x0,0x0,0x180,0x0,0x180,0x817e0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x1c0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x240,0x1c0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x817e0,0x0,0x180,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x80001c0,0x0,0x1,0x0,0x1,0x0,0x1c0,0x0,0x0,0x0,0x0,0x817e0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x180,};
 
   /** Constructor with user supplied TokenManager. */
 
@@ -552,8 +552,7 @@ void VhdlParser::architecture_declarative_part() {if (!hasError) {
       case SUBTYPE_T:
       case TYPE_T:
       case USE_T:
-      case VARIABLE_T:
-      case VHDL2008TOOLDIR:{
+      case VARIABLE_T:{
         ;
         break;
         }
@@ -1253,13 +1252,6 @@ void VhdlParser::block_declarative_item() {
               
               break;
               }
-            case VHDL2008TOOLDIR:{if (!hasError) {
-              
-              jj_consume_token(VHDL2008TOOLDIR);
-              }
-              
-              break;
-              }
             default:
               jj_la1[27] = jj_gen;
               jj_consume_token(-1);
@@ -1293,8 +1285,7 @@ void VhdlParser::block_declarative_part() {if (!hasError) {
       case SUBTYPE_T:
       case TYPE_T:
       case USE_T:
-      case VARIABLE_T:
-      case VHDL2008TOOLDIR:{
+      case VARIABLE_T:{
         ;
         break;
         }
@@ -1682,7 +1673,7 @@ assert(false);
 QCString VhdlParser::choice() {QCString s;
     if (jj_2_10(2147483647)) {if (!hasError) {
       
-      s = simple_expression();
+      s = discrete_range();
       }
       if (!hasError) {
       
@@ -1691,7 +1682,7 @@ return s;
       
     } else if (jj_2_11(2147483647)) {if (!hasError) {
       
-      s = discrete_range();
+      s = simple_expression();
       }
       if (!hasError) {
       
@@ -2007,7 +1998,7 @@ return s;
       }
       if (!hasError) {
       
-return s;
+return s+"#";
       }
       
       break;
@@ -2969,7 +2960,9 @@ QCString VhdlParser::element_declaration() {QCString s,s1;if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-return s+":"+s1;
+addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,s1.data(),Public);
+  //addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public);
+  return s+":"+s1;
 assert(false);
   }
 
@@ -4420,7 +4413,7 @@ assert(false);
   }
 
 
-QCString VhdlParser::full_type_declaration() {QCString s,s1,s2;if (!hasError) {
+QCString VhdlParser::full_type_declaration() {Entry *tmpEntry;QCString s,s1,s2;if (!hasError) {
     
     jj_consume_token(TYPE_T);
     }
@@ -4434,6 +4427,11 @@ QCString VhdlParser::full_type_declaration() {QCString s,s1,s2;if (!hasError) {
     }
     if (!hasError) {
     
+tmpEntry=current;
+  addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,0,Public);
+    }
+    if (!hasError) {
+    
     try {if (!hasError) {
       
       s2 = type_definition();
@@ -4448,8 +4446,25 @@ error_skipto(SEMI_T);
     jj_consume_token(SEMI_T);
     }
     
-addVhdlType(s.data(),getLine(TYPE_T),Entry::VARIABLE_SEC,VhdlDocGen::TYPE,0,s2.data(),Public);
-          return "type "+s+" is "+s2+";";
+if (s2.contains("#")) {
+        VhdlDocGen::deleteAllChars(s2,'#');
+        tmpEntry->spec=VhdlDocGen::RECORD;
+        tmpEntry->type=s2.data();
+        //addVhdlType(s.data(),getLine(TYPE_T),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,s2.data(),Public);
+      }
+      else if (s2.contains("%")) {
+        VhdlDocGen::deleteAllChars(s2,'%');
+        tmpEntry->spec=VhdlDocGen::UNITS;
+        tmpEntry->type=s2.data();
+        //addVhdlType(s.data(),getLine(TYPE_T),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,s2.data(),s2.data(),Public);
+      }
+      else {
+        tmpEntry->spec=VhdlDocGen::TYPE;
+        tmpEntry->type=s2.data();
+        //addVhdlType(s.data(),getLine(TYPE_T),Entry::VARIABLE_SEC,VhdlDocGen::TYPE,0,s2.data(),Public);
+      }
+      tmpEntry=0;
+      return "type "+s+" is "+s2+";";
 assert(false);
   }
 
@@ -7180,6 +7195,10 @@ QCString VhdlParser::physical_type_definition() {QCString s,s1,s2;if (!hasError)
     }
     if (!hasError) {
     
+addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,0,Public);
+    }
+    if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case BASIC_IDENTIFIER:
@@ -7194,10 +7213,6 @@ QCString VhdlParser::physical_type_definition() {QCString s,s1,s2;if (!hasError)
       
       s1 = secondary_unit_declaration();
       }
-      if (!hasError) {
-      
-s2+=s1;s2+="#";
-      }
       
     }
     end_label_31: ;
@@ -7229,10 +7244,7 @@ s2+=s1;s2+="#";
     }
     }
     
-current->args=s2;
-               current->args.prepend("units");
-             current->spec=VhdlDocGen::UNITS;
-            return s2;
+return s+"%";
 assert(false);
   }
 
@@ -8361,7 +8373,7 @@ return s;
       }
       if (!hasError) {
       
-s+=" ";s+=s1;return s;
+return s+" "+s1+"%";
       }
       
       break;
@@ -8416,7 +8428,10 @@ QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;if (!hasError)
     jj_consume_token(SEMI_T);
     }
     
-return s+"="+s1;
+//printf("\n %s %s [%d]",s.data(),s1.data(),getLine());
+  addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,s1.data(),Public);
+
+  return s+"="+s1;
 assert(false);
   }
 
@@ -11497,35 +11512,33 @@ void VhdlParser::generate_statement_body() {if (!hasError) {
   }
 
 
-void VhdlParser::generate_statement_body1() {
-    if (jj_2_107(2147483647)) {if (!hasError) {
+void VhdlParser::generate_statement_body1() {if (!hasError) {
+    
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case ALIAS_T:
+    case ATTRIBUTE_T:
+    case BEGIN_T:
+    case COMPONENT_T:
+    case CONSTANT_T:
+    case DISCONNECT_T:
+    case FILE_T:
+    case FOR_T:
+    case FUNCTION_T:
+    case GROUP_T:
+    case IMPURE_T:
+    case PROCEDURE_T:
+    case PURE_T:
+    case SIGNAL_T:
+    case SHARED_T:
+    case SUBTYPE_T:
+    case TYPE_T:
+    case USE_T:
+    case VARIABLE_T:{if (!hasError) {
       
       while (!hasError) {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ALIAS_T:
-        case ATTRIBUTE_T:
-        case COMPONENT_T:
-        case CONSTANT_T:
-        case DISCONNECT_T:
-        case FILE_T:
-        case FOR_T:
-        case FUNCTION_T:
-        case GROUP_T:
-        case IMPURE_T:
-        case PROCEDURE_T:
-        case PURE_T:
-        case SIGNAL_T:
-        case SHARED_T:
-        case SUBTYPE_T:
-        case TYPE_T:
-        case USE_T:
-        case VARIABLE_T:
-        case VHDL2008TOOLDIR:{
+        if (jj_2_107(2147483647)) {
           ;
-          break;
-          }
-        default:
-          jj_la1[259] = jj_gen;
+        } else {
           goto end_label_51;
         }if (!hasError) {
         
@@ -11539,67 +11552,44 @@ void VhdlParser::generate_statement_body1() {
       
       jj_consume_token(BEGIN_T);
       }
-      if (!hasError) {
       
-      while (!hasError) {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ASSERT_T:
-        case CASE_T:
-        case POSTPONED_T:
-        case PROCESS_T:
-        case WITH_T:
-        case LPAREN_T:
-        case SLSL_T:
-        case STRINGLITERAL:
-        case BASIC_IDENTIFIER:
-        case EXTENDED_CHARACTER:
-        case VHDL2008TOOLDIR:{
-          ;
-          break;
-          }
-        default:
-          jj_la1[260] = jj_gen;
-          goto end_label_52;
-        }if (!hasError) {
-        
-        concurrent_statement();
-        }
-        
-      }
-      end_label_52: ;
+      break;
       }
-      
-    } else {if (!hasError) {
-      
-      while (!hasError) {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ASSERT_T:
-        case CASE_T:
-        case POSTPONED_T:
-        case PROCESS_T:
-        case WITH_T:
-        case LPAREN_T:
-        case SLSL_T:
-        case STRINGLITERAL:
-        case BASIC_IDENTIFIER:
-        case EXTENDED_CHARACTER:
-        case VHDL2008TOOLDIR:{
-          ;
-          break;
-          }
-        default:
-          jj_la1[261] = jj_gen;
-          goto end_label_53;
-        }if (!hasError) {
-        
-        concurrent_statement();
+    default:
+      jj_la1[259] = jj_gen;
+      ;
+    }
+    }
+    if (!hasError) {
+    
+    while (!hasError) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ASSERT_T:
+      case CASE_T:
+      case POSTPONED_T:
+      case PROCESS_T:
+      case WITH_T:
+      case LPAREN_T:
+      case SLSL_T:
+      case STRINGLITERAL:
+      case BASIC_IDENTIFIER:
+      case EXTENDED_CHARACTER:
+      case VHDL2008TOOLDIR:{
+        ;
+        break;
         }
-        
-      }
-      end_label_53: ;
+      default:
+        jj_la1[260] = jj_gen;
+        goto end_label_52;
+      }if (!hasError) {
+      
+      concurrent_statement();
       }
       
     }
+    end_label_52: ;
+    }
+    
   }
 
 
@@ -11671,7 +11661,7 @@ return t->image.data();
       break;
       }
     default:
-      jj_la1[262] = jj_gen;
+      jj_la1[261] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -11715,7 +11705,7 @@ return s;
       break;
       }
     default:
-      jj_la1[263] = jj_gen;
+      jj_la1[262] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -11759,7 +11749,7 @@ return "."+s;
         break;
         }
       default:
-        jj_la1[264] = jj_gen;
+        jj_la1[263] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -11814,11 +11804,11 @@ s+="^.";
         break;
         }
       default:
-        jj_la1[265] = jj_gen;
-        goto end_label_54;
+        jj_la1[264] = jj_gen;
+        goto end_label_53;
       }
     }
-    end_label_54: ;
+    end_label_53: ;
     }
     
 return s;
@@ -11849,7 +11839,7 @@ QCString VhdlParser::pathname_element() {QCString s,s1;if (!hasError) {
       break;
       }
     default:
-      jj_la1[266] = jj_gen;
+      jj_la1[265] = jj_gen;
       ;
     }
     }
@@ -11883,7 +11873,7 @@ s+=".";
       if (jj_2_110(2147483647)) {
         ;
       } else {
-        goto end_label_55;
+        goto end_label_54;
       }if (!hasError) {
       
       s1 = pathname_element();
@@ -11898,7 +11888,7 @@ s2+=s1;s2+=".";
       }
       
     }
-    end_label_55: ;
+    end_label_54: ;
     }
     
 return s+s2;
@@ -11940,7 +11930,7 @@ void VhdlParser::conditional_signal_assignment_wave() {
         break;
         }
       default:
-        jj_la1[267] = jj_gen;
+        jj_la1[266] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -11969,7 +11959,7 @@ void VhdlParser::conditional_waveform_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[268] = jj_gen;
+      jj_la1[267] = jj_gen;
       ;
     }
     }
@@ -11996,7 +11986,7 @@ void VhdlParser::conditional_waveform_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[269] = jj_gen;
+      jj_la1[268] = jj_gen;
       ;
     }
     }
@@ -12031,7 +12021,7 @@ void VhdlParser::else_wave_list() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[270] = jj_gen;
+      jj_la1[269] = jj_gen;
       ;
     }
     }
@@ -12063,7 +12053,7 @@ void VhdlParser::conditional_force_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[271] = jj_gen;
+      jj_la1[270] = jj_gen;
       ;
     }
     }
@@ -12105,7 +12095,7 @@ void VhdlParser::conditional_force_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[272] = jj_gen;
+      jj_la1[271] = jj_gen;
       ;
     }
     }
@@ -12133,7 +12123,7 @@ void VhdlParser::selected_signal_assignment_wave() {
         break;
         }
       default:
-        jj_la1[273] = jj_gen;
+        jj_la1[272] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -12164,7 +12154,7 @@ void VhdlParser::selected_variable_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[274] = jj_gen;
+      jj_la1[273] = jj_gen;
       ;
     }
     }
@@ -12203,7 +12193,7 @@ void VhdlParser::select_name() {
         break;
         }
       default:
-        jj_la1[275] = jj_gen;
+        jj_la1[274] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -12234,7 +12224,7 @@ void VhdlParser::selected_waveform_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[276] = jj_gen;
+      jj_la1[275] = jj_gen;
       ;
     }
     }
@@ -12259,7 +12249,7 @@ void VhdlParser::selected_waveform_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[277] = jj_gen;
+      jj_la1[276] = jj_gen;
       ;
     }
     }
@@ -12294,7 +12284,7 @@ void VhdlParser::selected_force_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[278] = jj_gen;
+      jj_la1[277] = jj_gen;
       ;
     }
     }
@@ -12322,7 +12312,7 @@ void VhdlParser::selected_force_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[279] = jj_gen;
+      jj_la1[278] = jj_gen;
       ;
     }
     }
@@ -12365,7 +12355,7 @@ void VhdlParser::sel_var_list() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[280] = jj_gen;
+      jj_la1[279] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -12378,7 +12368,7 @@ void VhdlParser::sel_var_list() {if (!hasError) {
       if (jj_2_114(2147483647)) {
         ;
       } else {
-        goto end_label_56;
+        goto end_label_55;
       }if (!hasError) {
       
       expression();
@@ -12409,14 +12399,14 @@ void VhdlParser::sel_var_list() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[281] = jj_gen;
+        jj_la1[280] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
       }
       
     }
-    end_label_56: ;
+    end_label_55: ;
     }
     
   }
@@ -12443,8 +12433,8 @@ void VhdlParser::sel_wave_list() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[282] = jj_gen;
-        goto end_label_57;
+        jj_la1[281] = jj_gen;
+        goto end_label_56;
       }if (!hasError) {
       
       jj_consume_token(COMMA_T);
@@ -12455,7 +12445,7 @@ void VhdlParser::sel_wave_list() {if (!hasError) {
       }
       
     }
-    end_label_57: ;
+    end_label_56: ;
     }
     if (!hasError) {
     
@@ -12482,7 +12472,7 @@ void VhdlParser::inout_stat() {
       break;
       }
     default:
-      jj_la1[283] = jj_gen;
+      jj_la1[282] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -12514,7 +12504,7 @@ void VhdlParser::else_stat() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[284] = jj_gen;
+        jj_la1[283] = jj_gen;
         ;
       }
       }
@@ -12525,11 +12515,11 @@ void VhdlParser::else_stat() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[285] = jj_gen;
-        goto end_label_58;
+        jj_la1[284] = jj_gen;
+        goto end_label_57;
       }
     }
-    end_label_58: ;
+    end_label_57: ;
     }
     
   }
@@ -12562,7 +12552,7 @@ return s;
       break;
       }
     default:
-      jj_la1[286] = jj_gen;
+      jj_la1[285] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -12610,14 +12600,14 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
         break;
         }
       default:
-        jj_la1[287] = jj_gen;
+        jj_la1[286] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
       break;
       }
     default:
-      jj_la1[288] = jj_gen;
+      jj_la1[287] = jj_gen;
       ;
     }
     }
@@ -12667,7 +12657,7 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
         break;
         }
       default:
-        jj_la1[289] = jj_gen;
+        jj_la1[288] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -12676,7 +12666,7 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
       break;
       }
     default:
-      jj_la1[290] = jj_gen;
+      jj_la1[289] = jj_gen;
       ;
     }
     }
@@ -12714,7 +12704,7 @@ QCString VhdlParser::param() {QCString s,s1;Token *tok=0;if (!hasError) {
       break;
       }
     default:
-      jj_la1[291] = jj_gen;
+      jj_la1[290] = jj_gen;
       ;
     }
     }
@@ -12741,7 +12731,7 @@ param_sec=PARAM_SEC;
       break;
       }
     default:
-      jj_la1[292] = jj_gen;
+      jj_la1[291] = jj_gen;
       ;
     }
     }
@@ -12779,7 +12769,7 @@ void VhdlParser::parseInline() {
       break;
       }
     default:
-      jj_la1[293] = jj_gen;
+      jj_la1[292] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -12815,7 +12805,7 @@ void VhdlParser::ReInit(TokenManager *tm){
     trace_enabled = false;
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 294; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 293; i++) jj_la1[i] = -1;
   }
 
 
diff --git a/vhdlparser/VhdlParser.h b/vhdlparser/VhdlParser.h
index 12631dd..1c4c73d 100644
--- a/vhdlparser/VhdlParser.h
+++ b/vhdlparser/VhdlParser.h
@@ -1490,109 +1490,41 @@ void parseInline();
  { jj_save(113, xla); }
   }
 
- inline bool jj_3R_258()
- {
-    if (jj_done) return true;
-    if (jj_3R_367()) return true;
-    return false;
-  }
-
- inline bool jj_3R_257()
- {
-    if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_123()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_257()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_258()) jj_scanpos = xsp;
-    if (jj_scan_token(LOOP_T)) return true;
-    if (jj_3R_259()) return true;
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(LOOP_T)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_625()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
- inline bool jj_3_45()
- {
-    if (jj_done) return true;
-    if (jj_3R_97()) return true;
-    return false;
-  }
-
- inline bool jj_3_44()
+ inline bool jj_3R_230()
  {
     if (jj_done) return true;
     if (jj_3R_96()) return true;
     return false;
   }
 
- inline bool jj_3R_233()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(NULL_T)) return true;
-    return false;
-  }
-
- inline bool jj_3_43()
+ inline bool jj_3R_229()
  {
     if (jj_done) return true;
     if (jj_3R_95()) return true;
     return false;
   }
 
- inline bool jj_3R_232()
- {
-    if (jj_done) return true;
-    if (jj_3R_356()) return true;
-    return false;
-  }
-
- inline bool jj_3R_231()
- {
-    if (jj_done) return true;
-    if (jj_3R_97()) return true;
-    return false;
-  }
-
- inline bool jj_3R_230()
- {
-    if (jj_done) return true;
-    if (jj_3R_96()) return true;
-    return false;
-  }
-
- inline bool jj_3R_229()
+ inline bool jj_3R_228()
  {
     if (jj_done) return true;
-    if (jj_3R_95()) return true;
+    if (jj_3R_94()) return true;
     return false;
   }
 
- inline bool jj_3R_107()
+ inline bool jj_3R_106()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_228()) {
+    jj_scanpos = xsp;
     if (jj_3R_229()) {
     jj_scanpos = xsp;
     if (jj_3R_230()) {
     jj_scanpos = xsp;
     if (jj_3R_231()) {
     jj_scanpos = xsp;
-    if (jj_3R_232()) {
-    jj_scanpos = xsp;
-    if (jj_3R_233()) return true;
+    if (jj_3R_232()) return true;
     }
     }
     }
@@ -1603,69 +1535,69 @@ void parseInline();
  inline bool jj_3_42()
  {
     if (jj_done) return true;
-    if (jj_3R_94()) return true;
+    if (jj_3R_93()) return true;
     return false;
   }
 
- inline bool jj_3R_140()
+ inline bool jj_3R_139()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_199()
+ inline bool jj_3R_198()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_444()
+ inline bool jj_3R_442()
  {
     if (jj_done) return true;
     if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_408()) return true;
+    if (jj_3R_407()) return true;
     return false;
   }
 
- inline bool jj_3R_367()
+ inline bool jj_3R_366()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_443()) {
+    if (jj_3R_441()) {
     jj_scanpos = xsp;
-    if (jj_3R_444()) return true;
+    if (jj_3R_442()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_443()
+ inline bool jj_3R_441()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHILE_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_79()) return true;
     return false;
   }
 
- inline bool jj_3R_198()
+ inline bool jj_3R_197()
  {
     if (jj_done) return true;
-    if (jj_3R_346()) return true;
+    if (jj_3R_345()) return true;
     return false;
   }
 
- inline bool jj_3R_400()
+ inline bool jj_3R_399()
  {
     if (jj_done) return true;
     if (jj_scan_token(SEMI_T)) return true;
-    if (jj_3R_399()) return true;
+    if (jj_3R_398()) return true;
     return false;
   }
 
- inline bool jj_3R_196()
+ inline bool jj_3R_195()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -1683,128 +1615,128 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_91()
+ inline bool jj_3R_90()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_196()) jj_scanpos = xsp;
-    if (jj_3R_197()) return true;
+    if (jj_3R_195()) jj_scanpos = xsp;
+    if (jj_3R_196()) return true;
     if (jj_scan_token(COLON_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_198()) jj_scanpos = xsp;
-    if (jj_3R_85()) return true;
+    if (jj_3R_197()) jj_scanpos = xsp;
+    if (jj_3R_84()) return true;
     xsp = jj_scanpos;
     if (jj_scan_token(27)) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_199()) jj_scanpos = xsp;
+    if (jj_3R_198()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_313()
+ inline bool jj_3R_312()
  {
     if (jj_done) return true;
-    if (jj_3R_399()) return true;
+    if (jj_3R_398()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_400()) { jj_scanpos = xsp; break; }
+      if (jj_3R_399()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_413()
+ inline bool jj_3R_411()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_92()
+ inline bool jj_3R_91()
  {
     if (jj_done) return true;
     if (jj_scan_token(FILE_T)) return true;
-    if (jj_3R_197()) return true;
+    if (jj_3R_196()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3R_399()
+ inline bool jj_3R_398()
  {
     if (jj_done) return true;
-    if (jj_3R_491()) return true;
+    if (jj_3R_489()) return true;
     return false;
   }
 
  inline bool jj_3_41()
  {
     if (jj_done) return true;
-    if (jj_3R_93()) return true;
+    if (jj_3R_92()) return true;
     return false;
   }
 
- inline bool jj_3R_552()
+ inline bool jj_3R_557()
  {
     if (jj_done) return true;
-    if (jj_3R_613()) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_612()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_551()
+ inline bool jj_3R_556()
  {
     if (jj_done) return true;
-    if (jj_3R_93()) return true;
+    if (jj_3R_92()) return true;
     return false;
   }
 
  inline bool jj_3_40()
  {
     if (jj_done) return true;
-    if (jj_3R_92()) return true;
+    if (jj_3R_91()) return true;
     return false;
   }
 
  inline bool jj_3_39()
  {
     if (jj_done) return true;
-    if (jj_3R_91()) return true;
+    if (jj_3R_90()) return true;
     return false;
   }
 
- inline bool jj_3R_550()
+ inline bool jj_3R_555()
  {
     if (jj_done) return true;
-    if (jj_3R_108()) return true;
+    if (jj_3R_107()) return true;
     return false;
   }
 
  inline bool jj_3_38()
  {
     if (jj_done) return true;
-    if (jj_3R_90()) return true;
+    if (jj_3R_89()) return true;
     return false;
   }
 
- inline bool jj_3R_491()
+ inline bool jj_3R_489()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_3_38()) {
     jj_scanpos = xsp;
-    if (jj_3R_550()) {
+    if (jj_3R_555()) {
     jj_scanpos = xsp;
     if (jj_3_39()) {
     jj_scanpos = xsp;
     if (jj_3_40()) {
     jj_scanpos = xsp;
-    if (jj_3R_551()) {
+    if (jj_3R_556()) {
     jj_scanpos = xsp;
-    if (jj_3R_552()) return true;
+    if (jj_3R_557()) return true;
     }
     }
     }
@@ -1813,93 +1745,93 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_181()
+ inline bool jj_3R_180()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
- inline bool jj_3R_621()
+ inline bool jj_3R_624()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_416()
+ inline bool jj_3R_414()
  {
     if (jj_done) return true;
     if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_415()
+ inline bool jj_3R_413()
  {
     if (jj_done) return true;
     if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_331()
+ inline bool jj_3R_330()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_414()) {
+    if (jj_3R_412()) {
     jj_scanpos = xsp;
-    if (jj_3R_415()) {
+    if (jj_3R_413()) {
     jj_scanpos = xsp;
-    if (jj_3R_416()) return true;
+    if (jj_3R_414()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_414()
+ inline bool jj_3R_412()
  {
     if (jj_done) return true;
-    if (jj_3R_197()) return true;
+    if (jj_3R_196()) return true;
     return false;
   }
 
- inline bool jj_3R_698()
+ inline bool jj_3R_695()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_328()
+ inline bool jj_3R_327()
  {
     if (jj_done) return true;
     if (jj_scan_token(CONFIGURATION_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_327()
+ inline bool jj_3R_326()
  {
     if (jj_done) return true;
     if (jj_scan_token(ENTITY_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_413()) jj_scanpos = xsp;
+    if (jj_3R_411()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_174()
+ inline bool jj_3R_173()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_326()) {
+    if (jj_3R_325()) {
     jj_scanpos = xsp;
-    if (jj_3R_327()) {
+    if (jj_3R_326()) {
     jj_scanpos = xsp;
-    if (jj_3R_328()) return true;
+    if (jj_3R_327()) return true;
     }
     }
     return false;
@@ -1908,242 +1840,229 @@ void parseInline();
  inline bool jj_3_37()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
- inline bool jj_3R_326()
+ inline bool jj_3R_325()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(28)) jj_scanpos = xsp;
-    if (jj_3R_70()) return true;
-    return false;
-  }
-
- inline bool jj_3R_155()
- {
-    if (jj_done) return true;
-    if (jj_3R_158()) return true;
-    if (jj_scan_token(RANGE_T)) return true;
-    if (jj_scan_token(BOX_T)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_427()
+ inline bool jj_3R_425()
  {
     if (jj_done) return true;
     if (jj_scan_token(IS_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_698()) {
+    if (jj_3R_695()) {
     jj_scanpos = xsp;
     if (jj_scan_token(145)) return true;
     }
     return false;
   }
 
- inline bool jj_3R_618()
+ inline bool jj_3R_154()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_157()) return true;
+    if (jj_scan_token(RANGE_T)) return true;
+    if (jj_scan_token(BOX_T)) return true;
     return false;
   }
 
- inline bool jj_3R_617()
+ inline bool jj_3R_621()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_565()
+ inline bool jj_3R_620()
+ {
+    if (jj_done) return true;
+    if (jj_3R_67()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_564()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_617()) {
+    if (jj_3R_620()) {
     jj_scanpos = xsp;
-    if (jj_3R_618()) return true;
+    if (jj_3R_621()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_83()
+ inline bool jj_3R_82()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_67()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_181()) { jj_scanpos = xsp; break; }
+      if (jj_3R_180()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_526()
+ inline bool jj_3R_531()
  {
     if (jj_done) return true;
     if (jj_scan_token(TYPE_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_620()
+ inline bool jj_3R_623()
  {
     if (jj_done) return true;
     if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_259()) return true;
+    if (jj_3R_258()) return true;
     return false;
   }
 
- inline bool jj_3R_619()
+ inline bool jj_3R_622()
  {
     if (jj_done) return true;
     if (jj_scan_token(ELSIF_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_79()) return true;
     if (jj_scan_token(THEN_T)) return true;
-    if (jj_3R_259()) return true;
+    if (jj_3R_258()) return true;
     return false;
   }
 
- inline bool jj_3R_345()
+ inline bool jj_3R_344()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_514()
+ inline bool jj_3R_519()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_313()) return true;
+    if (jj_3R_312()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_255()
+ inline bool jj_3R_254()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_121()
+ inline bool jj_3R_120()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_255()) jj_scanpos = xsp;
+    if (jj_3R_254()) jj_scanpos = xsp;
     if (jj_scan_token(IF_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_79()) return true;
     if (jj_scan_token(THEN_T)) return true;
-    if (jj_3R_259()) return true;
+    if (jj_3R_258()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_619()) { jj_scanpos = xsp; break; }
+      if (jj_3R_622()) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3R_620()) jj_scanpos = xsp;
+    if (jj_3R_623()) jj_scanpos = xsp;
     if (jj_scan_token(END_T)) return true;
     if (jj_scan_token(IF_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_621()) jj_scanpos = xsp;
+    if (jj_3R_624()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_197()
+ inline bool jj_3R_196()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_345()) { jj_scanpos = xsp; break; }
+      if (jj_3R_344()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_165()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(BASIC_IDENTIFIER)) return true;
-    return false;
-  }
-
  inline bool jj_3R_164()
  {
     if (jj_done) return true;
-    if (jj_scan_token(EXTENDED_CHARACTER)) return true;
+    if (jj_scan_token(BASIC_IDENTIFIER)) return true;
     return false;
   }
 
- inline bool jj_3R_70()
+ inline bool jj_3R_423()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_164()) {
-    jj_scanpos = xsp;
-    if (jj_3R_165()) return true;
-    }
+    if (jj_scan_token(77)) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_519()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_539()
+ inline bool jj_3R_163()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_538()) return true;
+    if (jj_scan_token(EXTENDED_CHARACTER)) return true;
     return false;
   }
 
- inline bool jj_3R_425()
+ inline bool jj_3R_69()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(77)) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_514()) jj_scanpos = xsp;
+    if (jj_3R_163()) {
+    jj_scanpos = xsp;
+    if (jj_3R_164()) return true;
+    }
     return false;
   }
 
  inline bool jj_3_114()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(WHEN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_66()
+ inline bool jj_3R_544()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GROUP_T)) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_475()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_543()) return true;
     return false;
   }
 
- inline bool jj_3R_386()
+ inline bool jj_3R_385()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_86()) return true;
+    if (jj_3R_85()) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(134)) {
@@ -2153,63 +2072,64 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_447()
+ inline bool jj_3R_65()
  {
     if (jj_done) return true;
-    if (jj_3R_523()) return true;
+    if (jj_scan_token(GROUP_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_473()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_383()
+ inline bool jj_3R_445()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GROUP_T)) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_476()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_528()) return true;
     return false;
   }
 
- inline bool jj_3R_524()
+ inline bool jj_3R_529()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_449()) return true;
+    if (jj_3R_447()) return true;
     return false;
   }
 
- inline bool jj_3R_540()
+ inline bool jj_3R_545()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_305()
+ inline bool jj_3R_382()
  {
     if (jj_done) return true;
-    if (jj_3R_384()) return true;
+    if (jj_scan_token(GROUP_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_474()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_476()
+ inline bool jj_3R_304()
  {
     if (jj_done) return true;
-    if (jj_3R_538()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_539()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_383()) return true;
     return false;
   }
 
- inline bool jj_3R_426()
+ inline bool jj_3R_424()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -2221,179 +2141,171 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_344()
+ inline bool jj_3R_343()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_426()) jj_scanpos = xsp;
+    if (jj_3R_424()) jj_scanpos = xsp;
     if (jj_scan_token(FUNCTION_T)) return true;
-    if (jj_3R_60()) return true;
-    if (jj_3R_425()) return true;
+    if (jj_3R_59()) return true;
+    if (jj_3R_423()) return true;
     if (jj_scan_token(RETURN_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_427()) jj_scanpos = xsp;
+    if (jj_3R_425()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_608()
+ inline bool jj_3R_474()
  {
     if (jj_done) return true;
-    if (jj_3R_352()) return true;
+    if (jj_3R_543()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_544()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
  inline bool jj_3R_607()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_351()) return true;
     return false;
   }
 
- inline bool jj_3R_538()
+ inline bool jj_3R_303()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_607()) {
-    jj_scanpos = xsp;
-    if (jj_3R_608()) return true;
-    }
+    if (jj_3R_58()) return true;
+    if (jj_3R_384()) return true;
     return false;
   }
 
- inline bool jj_3R_71()
+ inline bool jj_3R_606()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GENERIC_T)) return true;
-    if (jj_scan_token(MAP_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_166()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_304()
+ inline bool jj_3R_543()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
-    if (jj_3R_385()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_606()) {
+    jj_scanpos = xsp;
+    if (jj_3R_607()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_171()
+ inline bool jj_3R_342()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_scan_token(PROCEDURE_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_3R_423()) return true;
     return false;
   }
 
- inline bool jj_3R_343()
+ inline bool jj_3R_70()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PROCEDURE_T)) return true;
-    if (jj_3R_70()) return true;
-    if (jj_3R_425()) return true;
+    if (jj_scan_token(GENERIC_T)) return true;
+    if (jj_scan_token(MAP_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_165()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_195()
+ inline bool jj_3R_170()
  {
     if (jj_done) return true;
-    if (jj_3R_344()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_159()
+ inline bool jj_3R_194()
  {
     if (jj_done) return true;
-    if (jj_3R_313()) return true;
+    if (jj_3R_343()) return true;
     return false;
   }
 
- inline bool jj_3R_194()
+ inline bool jj_3R_193()
  {
     if (jj_done) return true;
-    if (jj_3R_343()) return true;
+    if (jj_3R_342()) return true;
     return false;
   }
 
- inline bool jj_3R_90()
+ inline bool jj_3R_89()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_194()) {
+    if (jj_3R_193()) {
     jj_scanpos = xsp;
-    if (jj_3R_195()) return true;
+    if (jj_3R_194()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_67()
+ inline bool jj_3R_158()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GENERIC_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_159()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_312()) return true;
     return false;
   }
 
- inline bool jj_3R_477()
+ inline bool jj_3R_475()
  {
     if (jj_done) return true;
     if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_540()) jj_scanpos = xsp;
+    if (jj_3R_545()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_385()
+ inline bool jj_3R_384()
  {
     if (jj_done) return true;
     Token * xsp;
-    if (jj_3R_477()) return true;
+    if (jj_3R_475()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_477()) { jj_scanpos = xsp; break; }
+      if (jj_3R_475()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_322()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(IF_T)) return true;
-    if (jj_3R_80()) return true;
-    return false;
-  }
-
- inline bool jj_3R_169()
+ inline bool jj_3R_66()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_321()) {
-    jj_scanpos = xsp;
-    if (jj_3R_322()) return true;
-    }
+    if (jj_scan_token(GENERIC_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_158()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
  inline bool jj_3R_321()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_408()) return true;
+    if (jj_scan_token(IF_T)) return true;
+    if (jj_3R_79()) return true;
     return false;
   }
 
- inline bool jj_3R_384()
+ inline bool jj_3R_383()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -2405,58 +2317,54 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_448()
+ inline bool jj_3R_446()
  {
     if (jj_done) return true;
-    if (jj_3R_405()) return true;
+    if (jj_3R_404()) return true;
     return false;
   }
 
- inline bool jj_3R_449()
+ inline bool jj_3R_168()
  {
     if (jj_done) return true;
-    if (jj_3R_446()) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_86()) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_524()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_320()) {
+    jj_scanpos = xsp;
+    if (jj_3R_321()) return true;
     }
-    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_464()
+ inline bool jj_3R_320()
  {
     if (jj_done) return true;
-    if (jj_3R_528()) return true;
+    if (jj_scan_token(FOR_T)) return true;
+    if (jj_3R_407()) return true;
     return false;
   }
 
- inline bool jj_3R_75()
+ inline bool jj_3R_447()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_169()) return true;
-    if (jj_scan_token(GENERATE_T)) return true;
-    if (jj_3R_170()) return true;
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(GENERATE_T)) return true;
+    if (jj_3R_444()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_85()) return true;
     Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_171()) jj_scanpos = xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_529()) { jj_scanpos = xsp; break; }
+    }
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_306()
+ inline bool jj_3R_305()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_86()) return true;
+    if (jj_3R_85()) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(134)) {
@@ -2465,125 +2373,122 @@ void parseInline();
     }
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_386()) { jj_scanpos = xsp; break; }
+      if (jj_3R_385()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_105()
+ inline bool jj_3R_74()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_226()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_168()) return true;
+    if (jj_scan_token(GENERATE_T)) return true;
+    if (jj_3R_169()) return true;
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(GENERATE_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_170()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_303()
+ inline bool jj_3R_302()
  {
     if (jj_done) return true;
-    if (jj_3R_384()) return true;
+    if (jj_3R_383()) return true;
     return false;
   }
 
  inline bool jj_3_110()
  {
     if (jj_done) return true;
-    if (jj_3R_143()) return true;
+    if (jj_3R_142()) return true;
     if (jj_scan_token(DOT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_145()
+ inline bool jj_3R_104()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WITH_T)) return true;
     if (jj_3R_59()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_225()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_144()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(WITH_T)) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(SELECT_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(155)) jj_scanpos = xsp;
-    if (jj_3R_115()) return true;
+    if (jj_3R_114()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     if (jj_scan_token(FORCE_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_305()) jj_scanpos = xsp;
-    if (jj_3R_306()) return true;
-    return false;
-  }
-
- inline bool jj_3R_157()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_312()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_304()) jj_scanpos = xsp;
+    if (jj_3R_305()) return true;
     return false;
   }
 
  inline bool jj_3_113()
  {
     if (jj_done) return true;
-    if (jj_3R_109()) return true;
+    if (jj_3R_108()) return true;
     return false;
   }
 
- inline bool jj_3R_369()
+ inline bool jj_3R_368()
  {
     if (jj_done) return true;
     if (jj_scan_token(WITH_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(SELECT_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(155)) jj_scanpos = xsp;
-    if (jj_3R_115()) return true;
+    if (jj_3R_114()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_448()) jj_scanpos = xsp;
-    if (jj_3R_449()) return true;
+    if (jj_3R_446()) jj_scanpos = xsp;
+    if (jj_3R_447()) return true;
     return false;
   }
 
- inline bool jj_3R_301()
+ inline bool jj_3R_300()
  {
     if (jj_done) return true;
-    if (jj_3R_143()) return true;
+    if (jj_3R_142()) return true;
     if (jj_scan_token(DOT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_689()
- {
-    if (jj_done) return true;
-    if (jj_3R_60()) return true;
-    return false;
-  }
-
- inline bool jj_3R_137()
+ inline bool jj_3R_686()
  {
     if (jj_done) return true;
-    if (jj_scan_token(TYPE_T)) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_577()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_575()
+ inline bool jj_3R_574()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_688()
+ inline bool jj_3R_685()
  {
     if (jj_done) return true;
-    if (jj_3R_109()) return true;
+    if (jj_3R_108()) return true;
     return false;
   }
 
@@ -2592,258 +2497,249 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_688()) {
+    if (jj_3R_685()) {
     jj_scanpos = xsp;
-    if (jj_3R_689()) return true;
+    if (jj_3R_686()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_64()
+ inline bool jj_3R_462()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_157()) jj_scanpos = xsp;
+    if (jj_3R_533()) return true;
     return false;
   }
 
  inline bool jj_3_112()
  {
     if (jj_done) return true;
-    if (jj_3R_145()) return true;
-    return false;
-  }
-
- inline bool jj_3R_570()
- {
-    if (jj_done) return true;
-    if (jj_3R_313()) return true;
+    if (jj_3R_144()) return true;
     return false;
   }
 
- inline bool jj_3R_521()
+ inline bool jj_3R_526()
  {
     if (jj_done) return true;
     if (jj_scan_token(WITH_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(SELECT_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(155)) jj_scanpos = xsp;
     if (jj_3R_662()) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_306()) return true;
+    if (jj_3R_305()) return true;
     return false;
   }
 
- inline bool jj_3R_445()
+ inline bool jj_3R_443()
  {
     if (jj_done) return true;
-    if (jj_3R_405()) return true;
+    if (jj_3R_404()) return true;
     return false;
   }
 
- inline bool jj_3R_398()
+ inline bool jj_3R_270()
  {
     if (jj_done) return true;
-    if (jj_scan_token(INTEGER)) return true;
+    if (jj_3R_368()) return true;
     return false;
   }
 
- inline bool jj_3R_312()
+ inline bool jj_3R_127()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_397()) {
+    if (jj_3R_269()) {
     jj_scanpos = xsp;
-    if (jj_3R_398()) return true;
+    if (jj_3R_270()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_397()
- {
-    if (jj_done) return true;
-    if (jj_3R_60()) return true;
-    return false;
-  }
-
- inline bool jj_3R_271()
- {
-    if (jj_done) return true;
-    if (jj_3R_369()) return true;
-    return false;
-  }
-
- inline bool jj_3R_128()
+ inline bool jj_3R_269()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_270()) {
-    jj_scanpos = xsp;
-    if (jj_3R_271()) return true;
-    }
+    if (jj_3R_144()) return true;
     return false;
   }
 
- inline bool jj_3R_270()
+ inline bool jj_3R_156()
  {
     if (jj_done) return true;
-    if (jj_3R_145()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_311()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_144()
+ inline bool jj_3R_143()
  {
     if (jj_done) return true;
-    if (jj_3R_115()) return true;
+    if (jj_3R_114()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     if (jj_scan_token(FORCE_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_303()) jj_scanpos = xsp;
-    if (jj_3R_59()) return true;
+    if (jj_3R_302()) jj_scanpos = xsp;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(WHEN_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_304()) jj_scanpos = xsp;
+    if (jj_3R_303()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_654()
+ inline bool jj_3R_136()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FILE_T)) return true;
-    if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_158()) return true;
+    if (jj_scan_token(TYPE_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_576()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_523()
+ inline bool jj_3R_528()
  {
     if (jj_done) return true;
     if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_575()) jj_scanpos = xsp;
+    if (jj_3R_574()) jj_scanpos = xsp;
     return false;
   }
 
  inline bool jj_3_111()
  {
     if (jj_done) return true;
-    if (jj_3R_144()) return true;
+    if (jj_3R_143()) return true;
     return false;
   }
 
- inline bool jj_3R_580()
+ inline bool jj_3R_323()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OPEN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_409()) return true;
     return false;
   }
 
- inline bool jj_3R_528()
+ inline bool jj_3R_63()
  {
     if (jj_done) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_580()) jj_scanpos = xsp;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_581()) return true;
+    if (jj_3R_156()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_368()
+ inline bool jj_3R_367()
  {
     if (jj_done) return true;
-    if (jj_3R_115()) return true;
+    if (jj_3R_114()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_445()) jj_scanpos = xsp;
-    if (jj_3R_446()) return true;
+    if (jj_3R_443()) jj_scanpos = xsp;
+    if (jj_3R_444()) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_447()) jj_scanpos = xsp;
+    if (jj_3R_445()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_269()
+ inline bool jj_3R_569()
  {
     if (jj_done) return true;
-    if (jj_3R_368()) return true;
+    if (jj_3R_312()) return true;
     return false;
   }
 
- inline bool jj_3R_581()
+ inline bool jj_3R_268()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_367()) return true;
     return false;
   }
 
- inline bool jj_3R_127()
+ inline bool jj_3R_397()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(INTEGER)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_311()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_268()) {
+    if (jj_3R_396()) {
     jj_scanpos = xsp;
-    if (jj_3R_269()) return true;
+    if (jj_3R_397()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_268()
+ inline bool jj_3R_396()
  {
     if (jj_done) return true;
-    if (jj_3R_144()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_450()
+ inline bool jj_3R_126()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DOUBLEMULT_T)) return true;
-    if (jj_3R_370()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_267()) {
+    jj_scanpos = xsp;
+    if (jj_3R_268()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_142()
+ inline bool jj_3R_267()
  {
     if (jj_done) return true;
     if (jj_3R_143()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_141()
+ {
+    if (jj_done) return true;
+    if (jj_3R_142()) return true;
     if (jj_scan_token(DOT_T)) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_301()) { jj_scanpos = xsp; break; }
+      if (jj_3R_300()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_549()
+ inline bool jj_3R_554()
  {
     if (jj_done) return true;
     if (jj_scan_token(AT_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_302()
+ inline bool jj_3R_301()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
@@ -2851,860 +2747,821 @@ void parseInline();
  inline bool jj_3_109()
  {
     if (jj_done) return true;
-    if (jj_3R_142()) return true;
+    if (jj_3R_141()) return true;
     return false;
   }
 
- inline bool jj_3R_376()
+ inline bool jj_3R_656()
  {
     if (jj_done) return true;
     if (jj_scan_token(FILE_T)) return true;
-    if (jj_3R_197()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_464()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_264()
- {
-    if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_scan_token(OF_T)) return true;
+    if (jj_3R_157()) return true;
     return false;
   }
 
- inline bool jj_3R_284()
+ inline bool jj_3R_579()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NOT_T)) return true;
-    if (jj_3R_370()) return true;
+    if (jj_scan_token(OPEN_T)) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_283()
+ inline bool jj_3R_611()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ABS_T)) return true;
-    if (jj_3R_370()) return true;
+    if (jj_3R_141()) return true;
     return false;
   }
 
- inline bool jj_3R_136()
+ inline bool jj_3R_533()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_282()) {
-    jj_scanpos = xsp;
-    if (jj_3R_283()) {
-    jj_scanpos = xsp;
-    if (jj_3R_284()) return true;
-    }
-    }
+    if (jj_3R_579()) jj_scanpos = xsp;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_580()) return true;
     return false;
   }
 
- inline bool jj_3R_282()
+ inline bool jj_3R_142()
  {
     if (jj_done) return true;
-    if (jj_3R_370()) return true;
+    if (jj_3R_69()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_450()) jj_scanpos = xsp;
+    if (jj_3R_301()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_612()
+ inline bool jj_3R_580()
  {
     if (jj_done) return true;
-    if (jj_3R_142()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_699()
+ inline bool jj_3R_639()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_97()) return true;
+    if (jj_scan_token(NEG_T)) return true;
+    if (jj_scan_token(DOT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_147()
+ inline bool jj_3R_610()
  {
     if (jj_done) return true;
-    if (jj_3R_309()) return true;
-    if (jj_3R_146()) return true;
+    Token * xsp;
+    if (jj_3R_639()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_639()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_143()
+ inline bool jj_3R_448()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_302()) jj_scanpos = xsp;
+    if (jj_scan_token(DOUBLEMULT_T)) return true;
+    if (jj_3R_369()) return true;
     return false;
   }
 
- inline bool jj_3R_394()
+ inline bool jj_3_108()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OR_T)) return true;
+    if (jj_scan_token(DOT_T)) return true;
+    if (jj_3R_141()) return true;
     return false;
   }
 
- inline bool jj_3R_393()
+ inline bool jj_3R_553()
  {
     if (jj_done) return true;
-    if (jj_scan_token(XOR_T)) return true;
+    if (jj_3R_610()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_611()) jj_scanpos = xsp;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_392()
+ inline bool jj_3R_375()
  {
     if (jj_done) return true;
-    if (jj_scan_token(XNOR_T)) return true;
+    if (jj_scan_token(FILE_T)) return true;
+    if (jj_3R_196()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_84()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_462()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_391()
+ inline bool jj_3R_263()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NOR_T)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_636()
+ inline bool jj_3R_609()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NEG_T)) return true;
     if (jj_scan_token(DOT_T)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_390()
+ inline bool jj_3R_283()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NAND_T)) return true;
+    if (jj_scan_token(NOT_T)) return true;
+    if (jj_3R_369()) return true;
     return false;
   }
 
- inline bool jj_3R_611()
+ inline bool jj_3R_282()
  {
     if (jj_done) return true;
-    Token * xsp;
-    if (jj_3R_636()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_636()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(ABS_T)) return true;
+    if (jj_3R_369()) return true;
     return false;
   }
 
- inline bool jj_3R_410()
+ inline bool jj_3R_608()
  {
     if (jj_done) return true;
-    if (jj_3R_498()) return true;
+    if (jj_scan_token(DOT_T)) return true;
+    if (jj_3R_141()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_309()
+ inline bool jj_3R_552()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_389()) {
-    jj_scanpos = xsp;
-    if (jj_3R_390()) {
-    jj_scanpos = xsp;
-    if (jj_3R_391()) {
-    jj_scanpos = xsp;
-    if (jj_3R_392()) {
+    if (jj_3R_608()) {
     jj_scanpos = xsp;
-    if (jj_3R_393()) {
-    jj_scanpos = xsp;
-    if (jj_3R_394()) return true;
-    }
-    }
-    }
+    if (jj_3R_609()) return true;
     }
-    }
-    return false;
-  }
-
- inline bool jj_3R_389()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(AND_T)) return true;
     return false;
   }
 
- inline bool jj_3_108()
+ inline bool jj_3R_135()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_142()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_281()) {
+    jj_scanpos = xsp;
+    if (jj_3R_282()) {
+    jj_scanpos = xsp;
+    if (jj_3R_283()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_548()
+ inline bool jj_3R_281()
  {
     if (jj_done) return true;
-    if (jj_3R_611()) return true;
+    if (jj_3R_369()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_612()) jj_scanpos = xsp;
-    if (jj_3R_70()) return true;
+    if (jj_3R_448()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_610()
+ inline bool jj_3R_488()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_554()) return true;
     return false;
   }
 
- inline bool jj_3R_59()
+ inline bool jj_3R_487()
  {
     if (jj_done) return true;
-    if (jj_3R_146()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_147()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_553()) return true;
     return false;
   }
 
- inline bool jj_3R_609()
+ inline bool jj_3R_696()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_142()) return true;
-    if (jj_3R_70()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_96()) return true;
     return false;
   }
 
- inline bool jj_3R_547()
+ inline bool jj_3R_395()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_609()) {
+    if (jj_3R_486()) {
     jj_scanpos = xsp;
-    if (jj_3R_610()) return true;
+    if (jj_3R_487()) {
+    jj_scanpos = xsp;
+    if (jj_3R_488()) return true;
+    }
     }
     return false;
   }
 
- inline bool jj_3R_490()
+ inline bool jj_3R_486()
  {
     if (jj_done) return true;
-    if (jj_3R_549()) return true;
+    if (jj_3R_552()) return true;
     return false;
   }
 
- inline bool jj_3R_489()
+ inline bool jj_3R_146()
  {
     if (jj_done) return true;
-    if (jj_3R_548()) return true;
+    if (jj_3R_308()) return true;
+    if (jj_3R_145()) return true;
     return false;
   }
 
- inline bool jj_3R_396()
+ inline bool jj_3R_393()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_488()) {
-    jj_scanpos = xsp;
-    if (jj_3R_489()) {
-    jj_scanpos = xsp;
-    if (jj_3R_490()) return true;
-    }
-    }
+    if (jj_scan_token(OR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_488()
+ inline bool jj_3_105()
  {
     if (jj_done) return true;
-    if (jj_3R_547()) return true;
+    if (jj_3R_138()) return true;
     return false;
   }
 
- inline bool jj_3_105()
+ inline bool jj_3R_392()
  {
     if (jj_done) return true;
-    if (jj_3R_139()) return true;
+    if (jj_scan_token(XOR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_265()
+ inline bool jj_3R_391()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_scan_token(XNOR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_263()
+ inline bool jj_3R_485()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_scan_token(VARIABLE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_487()
+ inline bool jj_3R_390()
  {
     if (jj_done) return true;
-    if (jj_scan_token(VARIABLE_T)) return true;
+    if (jj_scan_token(NOR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_125()
+ inline bool jj_3R_484()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_263()) jj_scanpos = xsp;
-    if (jj_scan_token(EXIT_T)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_264()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_265()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(SIGNAL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_486()
+ inline bool jj_3R_389()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SIGNAL_T)) return true;
+    if (jj_scan_token(NAND_T)) return true;
     return false;
   }
 
- inline bool jj_3R_395()
+ inline bool jj_3R_308()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_485()) {
+    if (jj_3R_388()) {
     jj_scanpos = xsp;
-    if (jj_3R_486()) {
+    if (jj_3R_389()) {
+    jj_scanpos = xsp;
+    if (jj_3R_390()) {
+    jj_scanpos = xsp;
+    if (jj_3R_391()) {
     jj_scanpos = xsp;
-    if (jj_3R_487()) return true;
+    if (jj_3R_392()) {
+    jj_scanpos = xsp;
+    if (jj_3R_393()) return true;
+    }
+    }
+    }
     }
     }
     return false;
   }
 
- inline bool jj_3R_485()
+ inline bool jj_3R_388()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONSTANT_T)) return true;
+    if (jj_scan_token(AND_T)) return true;
     return false;
   }
 
- inline bool jj_3R_690()
+ inline bool jj_3R_394()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_97()) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_699()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_483()) {
+    jj_scanpos = xsp;
+    if (jj_3R_484()) {
+    jj_scanpos = xsp;
+    if (jj_3R_485()) return true;
+    }
     }
-    if (jj_scan_token(RPAREN_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_275()
- {
-    if (jj_done) return true;
-    if (jj_3R_133()) return true;
     return false;
   }
 
- inline bool jj_3R_209()
+ inline bool jj_3R_483()
  {
     if (jj_done) return true;
-    if (jj_3R_352()) return true;
+    if (jj_scan_token(CONSTANT_T)) return true;
     return false;
   }
 
  inline bool jj_3_107()
  {
     if (jj_done) return true;
-    if (jj_3R_141()) return true;
-    if (jj_scan_token(BEGIN_T)) return true;
+    if (jj_3R_140()) return true;
     return false;
   }
 
- inline bool jj_3R_208()
+ inline bool jj_3R_274()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_132()) return true;
     return false;
   }
 
- inline bool jj_3R_97()
+ inline bool jj_3R_58()
  {
     if (jj_done) return true;
+    if (jj_3R_145()) return true;
     Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_208()) {
-    jj_scanpos = xsp;
-    if (jj_3R_209()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_146()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_311()
+ inline bool jj_3R_310()
  {
     if (jj_done) return true;
     if (jj_scan_token(SLSL_T)) return true;
+    if (jj_3R_394()) return true;
     if (jj_3R_395()) return true;
-    if (jj_3R_396()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     if (jj_scan_token(RSRS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_411()
+ inline bool jj_3R_408()
  {
     if (jj_done) return true;
-    if (jj_3R_498()) return true;
+    if (jj_3R_140()) return true;
     return false;
   }
 
- inline bool jj_3R_697()
+ inline bool jj_3R_322()
  {
     if (jj_done) return true;
-    if (jj_3R_352()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_408()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(BEGIN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_324()
+ inline bool jj_3R_169()
  {
     if (jj_done) return true;
     Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_322()) jj_scanpos = xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_411()) { jj_scanpos = xsp; break; }
+      if (jj_3R_323()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_409()
+ inline bool jj_3R_264()
  {
     if (jj_done) return true;
-    if (jj_3R_141()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_79()) return true;
     return false;
   }
 
- inline bool jj_3R_696()
+ inline bool jj_3R_262()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_683()
+ inline bool jj_3R_284()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_696()) {
-    jj_scanpos = xsp;
-    if (jj_3R_697()) return true;
-    }
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_170()
+ inline bool jj_3R_661()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_323()) {
-    jj_scanpos = xsp;
-    if (jj_3R_324()) return true;
-    }
+    if (jj_scan_token(BEGIN_T)) return true;
+    if (jj_3R_661()) return true;
     return false;
   }
 
- inline bool jj_3R_323()
+ inline bool jj_3R_124()
  {
     if (jj_done) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_409()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(BEGIN_T)) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_410()) { jj_scanpos = xsp; break; }
-    }
+    xsp = jj_scanpos;
+    if (jj_3R_262()) jj_scanpos = xsp;
+    if (jj_scan_token(EXIT_T)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_263()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_264()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3_36()
+ inline bool jj_3R_234()
  {
     if (jj_done) return true;
-    if (jj_3R_89()) return true;
+    if (jj_3R_132()) return true;
     return false;
   }
 
- inline bool jj_3R_285()
+ inline bool jj_3_106()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_139()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
  inline bool jj_3R_687()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BEGIN_T)) return true;
-    if (jj_3R_687()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_96()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_696()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3_35()
+ inline bool jj_3R_138()
  {
     if (jj_done) return true;
-    if (jj_3R_88()) return true;
+    if (jj_scan_token(END_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_284()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_235()
+ inline bool jj_3R_640()
  {
     if (jj_done) return true;
-    if (jj_3R_133()) return true;
+    if (jj_3R_132()) return true;
     return false;
   }
 
- inline bool jj_3_106()
+ inline bool jj_3R_208()
  {
     if (jj_done) return true;
-    if (jj_3R_140()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_351()) return true;
     return false;
   }
 
- inline bool jj_3R_139()
+ inline bool jj_3R_207()
  {
     if (jj_done) return true;
-    if (jj_scan_token(END_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_285()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_637()
+ inline bool jj_3R_96()
  {
     if (jj_done) return true;
-    if (jj_3R_133()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_207()) {
+    jj_scanpos = xsp;
+    if (jj_3R_208()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_661()
+ inline bool jj_3R_651()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_3_106()) jj_scanpos = xsp;
-    if (jj_3R_86()) return true;
+    if (jj_3R_85()) return true;
     if (jj_scan_token(ARROW_T)) return true;
-    if (jj_3R_687()) return true;
+    if (jj_3R_661()) return true;
     return false;
   }
 
- inline bool jj_3R_649()
+ inline bool jj_3R_618()
  {
     if (jj_done) return true;
     Token * xsp;
-    if (jj_3R_661()) return true;
+    if (jj_3R_651()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_661()) { jj_scanpos = xsp; break; }
+      if (jj_3R_651()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_471()
+ inline bool jj_3R_694()
  {
     if (jj_done) return true;
-    if (jj_3R_533()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_534()) return true;
+    if (jj_3R_351()) return true;
     return false;
   }
 
- inline bool jj_3R_684()
+ inline bool jj_3R_693()
  {
     if (jj_done) return true;
-    if (jj_3R_234()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_585()
+ inline bool jj_3R_683()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ALL_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_693()) {
+    jj_scanpos = xsp;
+    if (jj_3R_694()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_584()
+ inline bool jj_3R_560()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OTHER_T)) return true;
+    if (jj_scan_token(CASE_T)) return true;
+    if (jj_3R_58()) return true;
+    if (jj_scan_token(GENERATE_T)) return true;
+    if (jj_3R_618()) return true;
     return false;
   }
 
- inline bool jj_3R_615()
+ inline bool jj_3_36()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CASE_T)) return true;
-    if (jj_3R_59()) return true;
-    if (jj_scan_token(GENERATE_T)) return true;
-    if (jj_3R_649()) return true;
+    if (jj_3R_88()) return true;
     return false;
   }
 
- inline bool jj_3R_634()
+ inline bool jj_3_35()
  {
     if (jj_done) return true;
-    if (jj_3R_656()) return true;
+    if (jj_3R_87()) return true;
     return false;
   }
 
- inline bool jj_3R_583()
+ inline bool jj_3R_131()
  {
     if (jj_done) return true;
-    Token * xsp;
-    if (jj_3R_634()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_634()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(GENERIC_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_312()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_533()
+ inline bool jj_3R_132()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_583()) {
-    jj_scanpos = xsp;
-    if (jj_3R_584()) {
-    jj_scanpos = xsp;
-    if (jj_3R_585()) return true;
-    }
-    }
+    if (jj_scan_token(GENERIC_T)) return true;
+    if (jj_scan_token(MAP_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_165()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_656()
+ inline bool jj_3R_469()
  {
     if (jj_done) return true;
-    if (jj_3R_683()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_684()) jj_scanpos = xsp;
+    if (jj_3R_538()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_539()) return true;
     return false;
   }
 
- inline bool jj_3R_132()
+ inline bool jj_3R_684()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GENERIC_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_313()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_233()) return true;
     return false;
   }
 
- inline bool jj_3R_133()
+ inline bool jj_3R_584()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GENERIC_T)) return true;
-    if (jj_scan_token(MAP_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_166()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
- inline bool jj_3_32()
+ inline bool jj_3R_583()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
- inline bool jj_3_34()
+ inline bool jj_3R_637()
  {
     if (jj_done) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_658()) return true;
     return false;
   }
 
- inline bool jj_3_33()
+ inline bool jj_3R_582()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    Token * xsp;
+    if (jj_3R_637()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_637()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_537()
+ inline bool jj_3R_538()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_536()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_582()) {
+    jj_scanpos = xsp;
+    if (jj_3R_583()) {
+    jj_scanpos = xsp;
+    if (jj_3R_584()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_131()
+ inline bool jj_3R_130()
  {
     if (jj_done) return true;
     if (jj_scan_token(FUNCTION_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(IS_T)) return true;
     if (jj_scan_token(NEW_T)) return true;
-    if (jj_3R_60()) return true;
-    if (jj_3R_234()) return true;
+    if (jj_3R_59()) return true;
+    if (jj_3R_233()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_275()) jj_scanpos = xsp;
+    if (jj_3R_274()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_108()
+ inline bool jj_3R_658()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PACKAGE_T)) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_scan_token(NEW_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_683()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_637()) jj_scanpos = xsp;
+    if (jj_3R_684()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_87()
+ inline bool jj_3R_107()
  {
     if (jj_done) return true;
     if (jj_scan_token(PACKAGE_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(IS_T)) return true;
     if (jj_scan_token(NEW_T)) return true;
-    if (jj_3R_60()) return true;
-    if (jj_3R_234()) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_235()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_640()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_606()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(BOX_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_349()
+ inline bool jj_3R_86()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ENTITY_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_scan_token(PACKAGE_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_scan_token(NEW_T)) return true;
+    if (jj_3R_59()) return true;
+    if (jj_3R_233()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_234()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_682()
+ inline bool jj_3_32()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
- inline bool jj_3R_475()
+ inline bool jj_3_34()
  {
     if (jj_done) return true;
-    if (jj_3R_536()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_537()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_86()) return true;
     return false;
   }
 
- inline bool jj_3R_254()
+ inline bool jj_3_33()
  {
     if (jj_done) return true;
-    if (jj_3R_366()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_536()
+ inline bool jj_3R_542()
  {
     if (jj_done) return true;
-    if (jj_3R_534()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_606()) jj_scanpos = xsp;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_541()) return true;
     return false;
   }
 
- inline bool jj_3R_616()
+ inline bool jj_3R_682()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_602()
+ inline bool jj_3R_253()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FILE_T)) return true;
+    if (jj_3R_365()) return true;
     return false;
   }
 
- inline bool jj_3R_695()
+ inline bool jj_3R_692()
  {
     if (jj_done) return true;
-    if (jj_3R_705()) return true;
+    if (jj_3R_702()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_601()
+ inline bool jj_3R_605()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GROUP_T)) return true;
+    if (jj_scan_token(BOX_T)) return true;
     return false;
   }
 
@@ -3714,455 +3571,423 @@ void parseInline();
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_695()) { jj_scanpos = xsp; break; }
+      if (jj_3R_692()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_600()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(UNITS_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_599()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(LITERAL_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_598()
+ inline bool jj_3R_719()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LABEL_T)) return true;
+    if (jj_3R_381()) return true;
     return false;
   }
 
- inline bool jj_3R_722()
+ inline bool jj_3R_718()
  {
     if (jj_done) return true;
-    if (jj_3R_382()) return true;
+    if (jj_3R_378()) return true;
     return false;
   }
 
- inline bool jj_3R_597()
+ inline bool jj_3R_348()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMPONENT_T)) return true;
+    if (jj_scan_token(ENTITY_T)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_721()
+ inline bool jj_3R_717()
  {
     if (jj_done) return true;
-    if (jj_3R_379()) return true;
+    if (jj_3R_346()) return true;
     return false;
   }
 
- inline bool jj_3R_596()
+ inline bool jj_3R_702()
  {
     if (jj_done) return true;
-    if (jj_scan_token(VARIABLE_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_717()) {
+    jj_scanpos = xsp;
+    if (jj_3R_718()) {
+    jj_scanpos = xsp;
+    if (jj_3R_719()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_595()
+ inline bool jj_3R_473()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SIGNAL_T)) return true;
+    if (jj_3R_541()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_542()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_594()
+ inline bool jj_3R_680()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONSTANT_T)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_720()
+ inline bool jj_3R_252()
  {
     if (jj_done) return true;
-    if (jj_3R_347()) return true;
+    if (jj_3R_364()) return true;
     return false;
   }
 
- inline bool jj_3R_705()
+ inline bool jj_3R_657()
  {
     if (jj_done) return true;
+    if (jj_scan_token(PROTECTED_T)) return true;
+    if (jj_3R_681()) return true;
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(PROTECTED_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_720()) {
-    jj_scanpos = xsp;
-    if (jj_3R_721()) {
-    jj_scanpos = xsp;
-    if (jj_3R_722()) return true;
-    }
-    }
-    return false;
-  }
-
- inline bool jj_3R_593()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(SUBTYPE_T)) return true;
+    if (jj_3R_682()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_592()
+ inline bool jj_3R_541()
  {
     if (jj_done) return true;
-    if (jj_scan_token(TYPE_T)) return true;
+    if (jj_3R_539()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_605()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_591()
+ inline bool jj_3R_691()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PACKAGE_T)) return true;
+    if (jj_3R_701()) return true;
     return false;
   }
 
- inline bool jj_3R_590()
+ inline bool jj_3R_619()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FUNCTION_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_589()
+ inline bool jj_3R_601()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PROCEDURE_T)) return true;
+    if (jj_scan_token(FILE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_588()
+ inline bool jj_3_103()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONFIGURATION_T)) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
- inline bool jj_3R_587()
+ inline bool jj_3R_679()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ARCHITECTURE_T)) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_691()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_680()
+ inline bool jj_3R_600()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_scan_token(GROUP_T)) return true;
     return false;
   }
 
- inline bool jj_3R_586()
+ inline bool jj_3R_599()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ENTITY_T)) return true;
+    if (jj_scan_token(UNITS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_534()
+ inline bool jj_3R_598()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_586()) {
-    jj_scanpos = xsp;
-    if (jj_3R_587()) {
-    jj_scanpos = xsp;
-    if (jj_3R_588()) {
-    jj_scanpos = xsp;
-    if (jj_3R_589()) {
-    jj_scanpos = xsp;
-    if (jj_3R_590()) {
-    jj_scanpos = xsp;
-    if (jj_3R_591()) {
-    jj_scanpos = xsp;
-    if (jj_3R_592()) {
-    jj_scanpos = xsp;
-    if (jj_3R_593()) {
-    jj_scanpos = xsp;
-    if (jj_3R_594()) {
-    jj_scanpos = xsp;
-    if (jj_3R_595()) {
-    jj_scanpos = xsp;
-    if (jj_3R_596()) {
-    jj_scanpos = xsp;
-    if (jj_3R_597()) {
-    jj_scanpos = xsp;
-    if (jj_3R_598()) {
-    jj_scanpos = xsp;
-    if (jj_3R_599()) {
-    jj_scanpos = xsp;
-    if (jj_3R_600()) {
-    jj_scanpos = xsp;
-    if (jj_3R_601()) {
-    jj_scanpos = xsp;
-    if (jj_3R_602()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_scan_token(LITERAL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_253()
+ inline bool jj_3R_597()
  {
     if (jj_done) return true;
-    if (jj_3R_365()) return true;
+    if (jj_scan_token(LABEL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_655()
+ inline bool jj_3R_716()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PROTECTED_T)) return true;
-    if (jj_3R_681()) return true;
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(PROTECTED_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_682()) jj_scanpos = xsp;
+    if (jj_3R_382()) return true;
     return false;
   }
 
- inline bool jj_3R_564()
+ inline bool jj_3R_596()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OPEN_T)) return true;
+    if (jj_scan_token(COMPONENT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_563()
+ inline bool jj_3R_595()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONFIGURATION_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_scan_token(VARIABLE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_694()
+ inline bool jj_3R_594()
  {
     if (jj_done) return true;
-    if (jj_3R_704()) return true;
+    if (jj_scan_token(SIGNAL_T)) return true;
     return false;
   }
 
- inline bool jj_3_103()
+ inline bool jj_3_104()
  {
     if (jj_done) return true;
     if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_679()
+ inline bool jj_3R_715()
  {
     if (jj_done) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_694()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_381()) return true;
     return false;
   }
 
- inline bool jj_3R_562()
+ inline bool jj_3R_593()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ENTITY_T)) return true;
-    if (jj_3R_60()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_616()) jj_scanpos = xsp;
+    if (jj_scan_token(CONSTANT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_500()
+ inline bool jj_3R_714()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_562()) {
-    jj_scanpos = xsp;
-    if (jj_3R_563()) {
-    jj_scanpos = xsp;
-    if (jj_3R_564()) return true;
-    }
-    }
+    if (jj_3R_378()) return true;
     return false;
   }
 
- inline bool jj_3R_719()
+ inline bool jj_3R_592()
  {
     if (jj_done) return true;
-    if (jj_3R_383()) return true;
+    if (jj_scan_token(SUBTYPE_T)) return true;
     return false;
   }
 
- inline bool jj_3_31()
+ inline bool jj_3R_591()
  {
     if (jj_done) return true;
-    if (jj_3R_86()) return true;
-    if (jj_scan_token(ARROW_T)) return true;
+    if (jj_scan_token(TYPE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_707()
+ inline bool jj_3R_713()
  {
     if (jj_done) return true;
-    if (jj_3R_197()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
- inline bool jj_3_104()
+ inline bool jj_3R_590()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_scan_token(PACKAGE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_718()
+ inline bool jj_3R_589()
  {
     if (jj_done) return true;
-    if (jj_3R_382()) return true;
+    if (jj_scan_token(FUNCTION_T)) return true;
     return false;
   }
 
- inline bool jj_3R_717()
+ inline bool jj_3R_712()
  {
     if (jj_done) return true;
-    if (jj_3R_379()) return true;
+    if (jj_3R_376()) return true;
     return false;
   }
 
- inline bool jj_3R_716()
+ inline bool jj_3R_588()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_scan_token(PROCEDURE_T)) return true;
     return false;
   }
 
- inline bool jj_3_30()
+ inline bool jj_3R_711()
  {
     if (jj_done) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_375()) return true;
     return false;
   }
 
- inline bool jj_3R_715()
+ inline bool jj_3R_587()
  {
     if (jj_done) return true;
-    if (jj_3R_377()) return true;
+    if (jj_scan_token(CONFIGURATION_T)) return true;
     return false;
   }
 
- inline bool jj_3R_714()
+ inline bool jj_3R_710()
  {
     if (jj_done) return true;
-    if (jj_3R_376()) return true;
+    if (jj_3R_374()) return true;
     return false;
   }
 
- inline bool jj_3_29()
+ inline bool jj_3R_586()
  {
     if (jj_done) return true;
-    if (jj_3R_84()) return true;
+    if (jj_scan_token(ARCHITECTURE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_713()
+ inline bool jj_3R_709()
  {
     if (jj_done) return true;
-    if (jj_3R_375()) return true;
+    if (jj_3R_372()) return true;
     return false;
   }
 
- inline bool jj_3R_712()
+ inline bool jj_3R_708()
  {
     if (jj_done) return true;
-    if (jj_3R_373()) return true;
+    if (jj_3R_371()) return true;
     return false;
   }
 
- inline bool jj_3R_359()
+ inline bool jj_3R_707()
  {
     if (jj_done) return true;
-    if (jj_3R_86()) return true;
-    if (jj_scan_token(ARROW_T)) return true;
+    if (jj_3R_370()) return true;
     return false;
   }
 
- inline bool jj_3R_711()
+ inline bool jj_3R_585()
  {
     if (jj_done) return true;
-    if (jj_3R_372()) return true;
+    if (jj_scan_token(ENTITY_T)) return true;
     return false;
   }
 
- inline bool jj_3R_236()
+ inline bool jj_3R_539()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_359()) jj_scanpos = xsp;
-    if (jj_3R_59()) return true;
-    return false;
-  }
-
- inline bool jj_3R_710()
- {
-    if (jj_done) return true;
-    if (jj_3R_371()) return true;
+    if (jj_3R_585()) {
+    jj_scanpos = xsp;
+    if (jj_3R_586()) {
+    jj_scanpos = xsp;
+    if (jj_3R_587()) {
+    jj_scanpos = xsp;
+    if (jj_3R_588()) {
+    jj_scanpos = xsp;
+    if (jj_3R_589()) {
+    jj_scanpos = xsp;
+    if (jj_3R_590()) {
+    jj_scanpos = xsp;
+    if (jj_3R_591()) {
+    jj_scanpos = xsp;
+    if (jj_3R_592()) {
+    jj_scanpos = xsp;
+    if (jj_3R_593()) {
+    jj_scanpos = xsp;
+    if (jj_3R_594()) {
+    jj_scanpos = xsp;
+    if (jj_3R_595()) {
+    jj_scanpos = xsp;
+    if (jj_3R_596()) {
+    jj_scanpos = xsp;
+    if (jj_3R_597()) {
+    jj_scanpos = xsp;
+    if (jj_3R_598()) {
+    jj_scanpos = xsp;
+    if (jj_3R_599()) {
+    jj_scanpos = xsp;
+    if (jj_3R_600()) {
+    jj_scanpos = xsp;
+    if (jj_3R_601()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_709()
+ inline bool jj_3R_706()
  {
     if (jj_done) return true;
-    if (jj_3R_519()) return true;
+    if (jj_3R_524()) return true;
     return false;
   }
 
- inline bool jj_3R_163()
+ inline bool jj_3R_563()
  {
     if (jj_done) return true;
-    if (jj_3R_85()) return true;
+    if (jj_scan_token(OPEN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_708()
+ inline bool jj_3R_705()
  {
     if (jj_done) return true;
-    if (jj_3R_93()) return true;
+    if (jj_3R_92()) return true;
     return false;
   }
 
- inline bool jj_3R_704()
+ inline bool jj_3R_701()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_705()) {
+    jj_scanpos = xsp;
+    if (jj_3R_706()) {
+    jj_scanpos = xsp;
+    if (jj_3R_707()) {
+    jj_scanpos = xsp;
     if (jj_3R_708()) {
     jj_scanpos = xsp;
     if (jj_3R_709()) {
@@ -4179,15 +4004,9 @@ void parseInline();
     jj_scanpos = xsp;
     if (jj_3R_715()) {
     jj_scanpos = xsp;
-    if (jj_3R_716()) {
-    jj_scanpos = xsp;
-    if (jj_3R_717()) {
-    jj_scanpos = xsp;
-    if (jj_3R_718()) {
-    jj_scanpos = xsp;
     if (jj_3_104()) {
     jj_scanpos = xsp;
-    if (jj_3R_719()) return true;
+    if (jj_3R_716()) return true;
     }
     }
     }
@@ -4203,50 +4022,56 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_252()
+ inline bool jj_3R_562()
  {
     if (jj_done) return true;
-    if (jj_3R_364()) return true;
+    if (jj_scan_token(CONFIGURATION_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_162()
+ inline bool jj_3R_251()
  {
     if (jj_done) return true;
-    if (jj_3R_84()) return true;
+    if (jj_3R_363()) return true;
     return false;
   }
 
- inline bool jj_3R_69()
+ inline bool jj_3R_561()
  {
     if (jj_done) return true;
+    if (jj_scan_token(ENTITY_T)) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_162()) {
-    jj_scanpos = xsp;
-    if (jj_3R_163()) return true;
-    }
+    if (jj_3R_619()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_522()
+ inline bool jj_3R_505()
  {
     if (jj_done) return true;
-    if (jj_scan_token(AFTER_T)) return true;
-    if (jj_3R_59()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_561()) {
+    jj_scanpos = xsp;
+    if (jj_3R_562()) {
+    jj_scanpos = xsp;
+    if (jj_3R_563()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_472()
+ inline bool jj_3R_527()
  {
     if (jj_done) return true;
-    if (jj_3R_535()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_scan_token(AFTER_T)) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_138()
+ inline bool jj_3R_137()
  {
     if (jj_done) return true;
     if (jj_scan_token(PROTECTED_T)) return true;
@@ -4261,471 +4086,530 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_497()
+ inline bool jj_3R_495()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_446()) return true;
+    if (jj_3R_444()) return true;
     return false;
   }
 
- inline bool jj_3R_381()
+ inline bool jj_3_31()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DISCONNECT_T)) return true;
-    if (jj_3R_472()) return true;
-    if (jj_scan_token(AFTER_T)) return true;
-    if (jj_3R_59()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_85()) return true;
+    if (jj_scan_token(ARROW_T)) return true;
     return false;
   }
 
- inline bool jj_3R_460()
+ inline bool jj_3R_704()
  {
     if (jj_done) return true;
-    if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_196()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_84()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_239()
+ inline bool jj_3_30()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DOWNTO_T)) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3R_110()
+ inline bool jj_3_29()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_238()) {
-    jj_scanpos = xsp;
-    if (jj_3R_239()) return true;
-    }
+    if (jj_3R_83()) return true;
     return false;
   }
 
- inline bool jj_3R_238()
+ inline bool jj_3R_358()
  {
     if (jj_done) return true;
-    if (jj_scan_token(TO_T)) return true;
+    if (jj_3R_85()) return true;
+    if (jj_scan_token(ARROW_T)) return true;
     return false;
   }
 
- inline bool jj_3R_569()
+ inline bool jj_3R_444()
  {
     if (jj_done) return true;
-    if (jj_3R_310()) return true;
+    if (jj_3R_58()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_527()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_446()
+ inline bool jj_3R_235()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_522()) jj_scanpos = xsp;
+    if (jj_3R_358()) jj_scanpos = xsp;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_568()
+ inline bool jj_3R_160()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3R_515()
+ inline bool jj_3R_406()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_568()) {
-    jj_scanpos = xsp;
-    if (jj_3R_569()) return true;
-    }
+    if (jj_scan_token(UNAFFECTED_T)) return true;
     return false;
   }
 
- inline bool jj_3R_407()
+ inline bool jj_3R_159()
  {
     if (jj_done) return true;
-    if (jj_scan_token(UNAFFECTED_T)) return true;
+    if (jj_3R_83()) return true;
     return false;
   }
 
- inline bool jj_3R_318()
+ inline bool jj_3R_67()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_406()) {
+    if (jj_3R_159()) {
     jj_scanpos = xsp;
-    if (jj_3R_407()) return true;
+    if (jj_3R_160()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_406()
+ inline bool jj_3R_317()
  {
     if (jj_done) return true;
-    if (jj_3R_446()) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_497()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_405()) {
+    jj_scanpos = xsp;
+    if (jj_3R_406()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_553()
+ inline bool jj_3R_405()
  {
     if (jj_done) return true;
-    if (jj_scan_token(REJECT_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_444()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_495()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_251()
+ inline bool jj_3R_470()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_540()) return true;
     if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_496()
+ inline bool jj_3R_250()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_553()) jj_scanpos = xsp;
-    if (jj_scan_token(INERTIAL_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_118()
+ inline bool jj_3R_117()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_251()) jj_scanpos = xsp;
+    if (jj_3R_250()) jj_scanpos = xsp;
     if (jj_scan_token(WAIT_T)) return true;
     xsp = jj_scanpos;
+    if (jj_3R_251()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
     if (jj_3R_252()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_3R_253()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_254()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_405()
+ inline bool jj_3R_380()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_495()) {
-    jj_scanpos = xsp;
-    if (jj_3R_496()) return true;
-    }
+    if (jj_scan_token(DISCONNECT_T)) return true;
+    if (jj_3R_470()) return true;
+    if (jj_scan_token(AFTER_T)) return true;
+    if (jj_3R_58()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_495()
+ inline bool jj_3R_458()
  {
     if (jj_done) return true;
-    if (jj_scan_token(TRANSPORT_T)) return true;
+    if (jj_scan_token(VARASSIGN_T)) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3_28()
+ inline bool jj_3R_238()
  {
     if (jj_done) return true;
-    if (jj_3R_83()) return true;
+    if (jj_scan_token(DOWNTO_T)) return true;
     return false;
   }
 
- inline bool jj_3_27()
+ inline bool jj_3R_109()
  {
     if (jj_done) return true;
-    if (jj_3R_82()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_237()) {
+    jj_scanpos = xsp;
+    if (jj_3R_238()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_156()
+ inline bool jj_3R_237()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(TO_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_568()
+ {
+    if (jj_done) return true;
+    if (jj_3R_309()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_155()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_155()) return true;
+    if (jj_3R_154()) return true;
     return false;
   }
 
- inline bool jj_3R_277()
+ inline bool jj_3R_567()
  {
     if (jj_done) return true;
-    if (jj_3R_83()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_134()
+ inline bool jj_3R_520()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_276()) {
+    if (jj_3R_567()) {
     jj_scanpos = xsp;
-    if (jj_3R_277()) return true;
+    if (jj_3R_568()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_276()
+ inline bool jj_3R_558()
  {
     if (jj_done) return true;
-    if (jj_3R_82()) return true;
+    if (jj_scan_token(REJECT_T)) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_463()
+ inline bool jj_3R_461()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_375()
+ inline bool jj_3R_494()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_558()) jj_scanpos = xsp;
+    if (jj_scan_token(INERTIAL_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_374()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(101)) jj_scanpos = xsp;
     if (jj_scan_token(VARIABLE_T)) return true;
-    if (jj_3R_197()) return true;
+    if (jj_3R_196()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_463()) jj_scanpos = xsp;
+    if (jj_3R_461()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_474()
+ inline bool jj_3R_472()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_473()) return true;
+    if (jj_3R_471()) return true;
     return false;
   }
 
- inline bool jj_3R_706()
+ inline bool jj_3R_404()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ARRAY_T)) return true;
-    if (jj_3R_83()) return true;
-    if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_85()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_493()) {
+    jj_scanpos = xsp;
+    if (jj_3R_494()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_441()
+ inline bool jj_3R_493()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(TRANSPORT_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_439()
  {
     if (jj_done) return true;
-    if (jj_3R_521()) return true;
+    if (jj_3R_526()) return true;
+    return false;
+  }
+
+ inline bool jj_3_28()
+ {
+    if (jj_done) return true;
+    if (jj_3R_82()) return true;
     return false;
   }
 
  inline bool jj_3_102()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_362()
+ inline bool jj_3_27()
+ {
+    if (jj_done) return true;
+    if (jj_3R_81()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_361()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_440()) {
+    if (jj_3R_438()) {
     jj_scanpos = xsp;
-    if (jj_3R_441()) return true;
+    if (jj_3R_439()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_440()
+ inline bool jj_3R_438()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_3_102()) jj_scanpos = xsp;
-    if (jj_3R_115()) return true;
+    if (jj_3R_114()) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_373()
+ inline bool jj_3R_276()
+ {
+    if (jj_done) return true;
+    if (jj_3R_82()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_133()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONSTANT_T)) return true;
-    if (jj_3R_197()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_460()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_275()) {
+    jj_scanpos = xsp;
+    if (jj_3R_276()) return true;
+    }
     return false;
   }
 
- inline bool jj_3_26()
+ inline bool jj_3R_275()
  {
     if (jj_done) return true;
     if (jj_3R_81()) return true;
     return false;
   }
 
- inline bool jj_3R_380()
+ inline bool jj_3R_381()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_178()) return true;
-    if (jj_3R_332()) return true;
+    if (jj_scan_token(USE_T)) return true;
+    if (jj_3R_471()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_472()) { jj_scanpos = xsp; break; }
+    }
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_567()
+ inline bool jj_3R_703()
  {
     if (jj_done) return true;
-    if (jj_3R_333()) return true;
+    if (jj_scan_token(ARRAY_T)) return true;
+    if (jj_3R_82()) return true;
+    if (jj_scan_token(OF_T)) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3R_382()
+ inline bool jj_3R_62()
  {
     if (jj_done) return true;
-    if (jj_scan_token(USE_T)) return true;
-    if (jj_3R_473()) return true;
+    if (jj_scan_token(ARRAY_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_154()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_474()) { jj_scanpos = xsp; break; }
+      if (jj_3R_155()) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(OF_T)) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3R_566()
+ inline bool jj_3R_157()
  {
     if (jj_done) return true;
-    if (jj_3R_81()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_502()
+ inline bool jj_3R_636()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_566()) {
-    jj_scanpos = xsp;
-    if (jj_3R_567()) return true;
-    }
+    if (jj_3R_657()) return true;
     return false;
   }
 
- inline bool jj_3R_63()
+ inline bool jj_3R_372()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ARRAY_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_155()) return true;
+    if (jj_scan_token(CONSTANT_T)) return true;
+    if (jj_3R_196()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_84()) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_156()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RPAREN_T)) return true;
-    if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_85()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_458()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_158()
+ inline bool jj_3_101()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_137()) return true;
     return false;
   }
 
- inline bool jj_3R_633()
+ inline bool jj_3R_635()
  {
     if (jj_done) return true;
-    if (jj_3R_655()) return true;
+    if (jj_3R_656()) return true;
     return false;
   }
 
- inline bool jj_3_101()
+ inline bool jj_3R_634()
  {
     if (jj_done) return true;
-    if (jj_3R_138()) return true;
+    if (jj_3R_655()) return true;
     return false;
   }
 
- inline bool jj_3R_632()
+ inline bool jj_3_26()
  {
     if (jj_done) return true;
-    if (jj_3R_654()) return true;
+    if (jj_3R_80()) return true;
     return false;
   }
 
- inline bool jj_3R_631()
+ inline bool jj_3R_633()
  {
     if (jj_done) return true;
-    if (jj_3R_653()) return true;
+    if (jj_3R_654()) return true;
     return false;
   }
 
- inline bool jj_3R_630()
+ inline bool jj_3R_379()
  {
     if (jj_done) return true;
-    if (jj_3R_652()) return true;
+    if (jj_scan_token(FOR_T)) return true;
+    if (jj_3R_177()) return true;
+    if (jj_3R_331()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_629()
+ inline bool jj_3R_632()
  {
     if (jj_done) return true;
-    if (jj_3R_651()) return true;
+    if (jj_3R_653()) return true;
     return false;
   }
 
- inline bool jj_3R_577()
+ inline bool jj_3R_576()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_629()) {
+    if (jj_3R_632()) {
     jj_scanpos = xsp;
-    if (jj_3R_630()) {
+    if (jj_3R_633()) {
     jj_scanpos = xsp;
-    if (jj_3R_631()) {
+    if (jj_3R_634()) {
     jj_scanpos = xsp;
-    if (jj_3R_632()) {
+    if (jj_3R_635()) {
     jj_scanpos = xsp;
     if (jj_3_101()) {
     jj_scanpos = xsp;
-    if (jj_3R_633()) return true;
+    if (jj_3R_636()) return true;
     }
     }
     }
@@ -4734,136 +4618,102 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_25()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_80()) return true;
-    if (jj_scan_token(ELSE_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_350()
+ inline bool jj_3R_566()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONFIGURATION_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_332()) return true;
     return false;
   }
 
  inline bool jj_3_97()
  {
     if (jj_done) return true;
-    if (jj_3R_134()) return true;
+    if (jj_3R_133()) return true;
     return false;
   }
 
- inline bool jj_3R_459()
+ inline bool jj_3R_457()
  {
     if (jj_done) return true;
-    if (jj_3R_526()) return true;
+    if (jj_3R_531()) return true;
     return false;
   }
 
- inline bool jj_3_100()
+ inline bool jj_3R_565()
  {
     if (jj_done) return true;
-    if (jj_3R_137()) return true;
+    if (jj_3R_80()) return true;
     return false;
   }
 
- inline bool jj_3R_371()
+ inline bool jj_3R_507()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_100()) {
+    if (jj_3R_565()) {
     jj_scanpos = xsp;
-    if (jj_3R_459()) return true;
+    if (jj_3R_566()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_320()
+ inline bool jj_3_100()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_136()) return true;
     return false;
   }
 
- inline bool jj_3R_106()
+ inline bool jj_3R_370()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3_100()) {
+    jj_scanpos = xsp;
+    if (jj_3R_457()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_319()
+ inline bool jj_3R_105()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_80()) return true;
-    if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_318()) return true;
+    if (jj_3R_59()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_58()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
  inline bool jj_3_99()
  {
     if (jj_done) return true;
-    if (jj_3R_135()) return true;
-    if (jj_3R_136()) return true;
-    return false;
-  }
-
- inline bool jj_3R_185()
- {
-    if (jj_done) return true;
     if (jj_3R_134()) return true;
+    if (jj_3R_135()) return true;
     return false;
   }
 
- inline bool jj_3R_168()
+ inline bool jj_3R_184()
  {
     if (jj_done) return true;
-    if (jj_3R_318()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_319()) { jj_scanpos = xsp; break; }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_320()) jj_scanpos = xsp;
+    if (jj_3R_133()) return true;
     return false;
   }
 
- inline bool jj_3R_366()
+ inline bool jj_3R_365()
  {
     if (jj_done) return true;
     if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_72()
- {
-    if (jj_done) return true;
-    if (jj_3R_115()) return true;
-    if (jj_scan_token(LESSTHAN_T)) return true;
-    if (jj_3R_167()) return true;
-    if (jj_3R_168()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_130()
+ inline bool jj_3R_129()
  {
     if (jj_done) return true;
-    if (jj_3R_136()) return true;
+    if (jj_3R_135()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
@@ -4872,29 +4722,21 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_247()
- {
-    if (jj_done) return true;
-    if (jj_3R_109()) return true;
-    return false;
-  }
-
- inline bool jj_3R_365()
+ inline bool jj_3R_246()
  {
     if (jj_done) return true;
-    if (jj_scan_token(UNTIL_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_108()) return true;
     return false;
   }
 
- inline bool jj_3R_115()
+ inline bool jj_3R_114()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_246()) {
+    if (jj_3R_245()) {
     jj_scanpos = xsp;
-    if (jj_3R_247()) return true;
+    if (jj_3R_246()) return true;
     }
     return false;
   }
@@ -4902,32 +4744,35 @@ void parseInline();
  inline bool jj_3_98()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_246()
+ inline bool jj_3R_245()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3_96()
+ inline bool jj_3_25()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_79()) return true;
+    if (jj_scan_token(ELSE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_218()
+ inline bool jj_3R_349()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ALL_T)) return true;
+    if (jj_scan_token(CONFIGURATION_T)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_80()
+ inline bool jj_3_96()
  {
     if (jj_done) return true;
     if (jj_3R_59()) return true;
@@ -4937,690 +4782,680 @@ void parseInline();
  inline bool jj_3R_217()
  {
     if (jj_done) return true;
-    if (jj_3R_310()) return true;
+    if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
  inline bool jj_3R_216()
  {
     if (jj_done) return true;
-    if (jj_3R_352()) return true;
+    if (jj_3R_309()) return true;
     return false;
   }
 
- inline bool jj_3_24()
+ inline bool jj_3R_215()
  {
     if (jj_done) return true;
+    if (jj_3R_351()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_319()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(WHEN_T)) return true;
     if (jj_3R_79()) return true;
     return false;
   }
 
- inline bool jj_3R_215()
+ inline bool jj_3R_214()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_100()
+ inline bool jj_3R_99()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_214()) {
+    jj_scanpos = xsp;
     if (jj_3R_215()) {
     jj_scanpos = xsp;
     if (jj_3R_216()) {
     jj_scanpos = xsp;
-    if (jj_3R_217()) {
-    jj_scanpos = xsp;
-    if (jj_3R_218()) return true;
+    if (jj_3R_217()) return true;
     }
     }
     }
     return false;
   }
 
- inline bool jj_3_23()
- {
-    if (jj_done) return true;
-    if (jj_3R_78()) return true;
-    return false;
-  }
-
- inline bool jj_3R_184()
+ inline bool jj_3R_318()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_79()) return true;
+    if (jj_scan_token(ELSE_T)) return true;
+    if (jj_3R_317()) return true;
     return false;
   }
 
- inline bool jj_3_22()
+ inline bool jj_3R_183()
  {
     if (jj_done) return true;
-    if (jj_3R_77()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_85()
+ inline bool jj_3R_84()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_184()) jj_scanpos = xsp;
+    if (jj_3R_183()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_185()) jj_scanpos = xsp;
-    return false;
-  }
-
- inline bool jj_3R_76()
- {
-    if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_184()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3_21()
+ inline bool jj_3R_167()
  {
     if (jj_done) return true;
+    if (jj_3R_317()) return true;
     Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_318()) { jj_scanpos = xsp; break; }
+    }
     xsp = jj_scanpos;
-    if (jj_3R_76()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(79)) jj_scanpos = xsp;
-    if (jj_scan_token(ASSERT_T)) return true;
+    if (jj_3R_319()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_561()
- {
-    if (jj_done) return true;
-    if (jj_3R_79()) return true;
-    return false;
-  }
-
- inline bool jj_3R_560()
+ inline bool jj_3R_71()
  {
     if (jj_done) return true;
-    if (jj_3R_78()) return true;
+    if (jj_3R_114()) return true;
+    if (jj_scan_token(LESSTHAN_T)) return true;
+    if (jj_3R_166()) return true;
+    if (jj_3R_167()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3_20()
+ inline bool jj_3R_371()
  {
     if (jj_done) return true;
-    if (jj_3R_75()) return true;
+    if (jj_scan_token(SUBTYPE_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_84()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_559()
+ inline bool jj_3R_630()
  {
     if (jj_done) return true;
-    if (jj_3R_77()) return true;
+    if (jj_3R_112()) return true;
     return false;
   }
 
- inline bool jj_3R_74()
+ inline bool jj_3R_571()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_630()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_372()
+ inline bool jj_3R_364()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SUBTYPE_T)) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_85()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(UNTIL_T)) return true;
+    if (jj_3R_79()) return true;
     return false;
   }
 
- inline bool jj_3_19()
+ inline bool jj_3R_79()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_74()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(79)) jj_scanpos = xsp;
-    if (jj_scan_token(PROCESS_T)) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_627()
+ inline bool jj_3R_523()
  {
     if (jj_done) return true;
-    if (jj_3R_113()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_569()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_572()
+ inline bool jj_3_24()
  {
     if (jj_done) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_627()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_78()) return true;
     return false;
   }
 
- inline bool jj_3R_558()
+ inline bool jj_3R_521()
  {
     if (jj_done) return true;
-    if (jj_3R_88()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_312()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_73()
+ inline bool jj_3_95()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_132()) return true;
     return false;
   }
 
- inline bool jj_3_18()
+ inline bool jj_3_23()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_73()) jj_scanpos = xsp;
-    if (jj_scan_token(BLOCK_T)) return true;
+    if (jj_3R_77()) return true;
     return false;
   }
 
- inline bool jj_3R_557()
+ inline bool jj_3_94()
  {
     if (jj_done) return true;
-    if (jj_3R_615()) return true;
+    if (jj_3R_131()) return true;
     return false;
   }
 
- inline bool jj_3R_556()
+ inline bool jj_3_22()
  {
     if (jj_done) return true;
-    if (jj_3R_75()) return true;
+    if (jj_3R_76()) return true;
     return false;
   }
 
- inline bool jj_3R_555()
+ inline bool jj_3R_75()
  {
     if (jj_done) return true;
-    if (jj_3R_89()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_554()
+ inline bool jj_3_21()
  {
     if (jj_done) return true;
-    if (jj_3R_614()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_75()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(79)) jj_scanpos = xsp;
+    if (jj_scan_token(ASSERT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_498()
+ inline bool jj_3R_522()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_554()) {
-    jj_scanpos = xsp;
-    if (jj_3R_555()) {
-    jj_scanpos = xsp;
-    if (jj_3R_556()) {
-    jj_scanpos = xsp;
-    if (jj_3R_557()) {
-    jj_scanpos = xsp;
-    if (jj_3R_558()) {
-    jj_scanpos = xsp;
-    if (jj_3R_559()) {
-    jj_scanpos = xsp;
-    if (jj_3R_560()) {
-    jj_scanpos = xsp;
-    if (jj_3R_561()) {
+    if (jj_scan_token(84)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(186)) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_scan_token(52)) return true;
     }
     return false;
   }
 
- inline bool jj_3R_518()
+ inline bool jj_3R_503()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_570()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_78()) return true;
     return false;
   }
 
- inline bool jj_3_17()
+ inline bool jj_3R_432()
  {
     if (jj_done) return true;
-    if (jj_3R_72()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_522()) jj_scanpos = xsp;
+    if (jj_scan_token(FUNCTION_T)) return true;
+    if (jj_3R_520()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_523()) jj_scanpos = xsp;
+    if (jj_scan_token(RETURN_T)) return true;
+    if (jj_3R_157()) return true;
     return false;
   }
 
- inline bool jj_3_95()
+ inline bool jj_3R_502()
  {
     if (jj_done) return true;
-    if (jj_3R_133()) return true;
+    if (jj_3R_77()) return true;
     return false;
   }
 
- inline bool jj_3R_516()
+ inline bool jj_3_20()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_313()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
- inline bool jj_3_94()
+ inline bool jj_3R_73()
  {
     if (jj_done) return true;
-    if (jj_3R_132()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_173()
+ inline bool jj_3R_501()
  {
     if (jj_done) return true;
-    if (jj_3R_325()) return true;
+    if (jj_3R_76()) return true;
     return false;
   }
 
- inline bool jj_3R_517()
+ inline bool jj_3_19()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(84)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(52)) return true;
-    }
+    if (jj_3R_73()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(79)) jj_scanpos = xsp;
+    if (jj_scan_token(PROCESS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_172()
+ inline bool jj_3R_72()
  {
     if (jj_done) return true;
-    if (jj_3R_72()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3_16()
+ inline bool jj_3R_500()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_87()) return true;
     return false;
   }
 
- inline bool jj_3R_434()
+ inline bool jj_3_18()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_517()) jj_scanpos = xsp;
-    if (jj_scan_token(FUNCTION_T)) return true;
-    if (jj_3R_515()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_518()) jj_scanpos = xsp;
-    if (jj_scan_token(RETURN_T)) return true;
-    if (jj_3R_158()) return true;
+    if (jj_3R_72()) jj_scanpos = xsp;
+    if (jj_scan_token(BLOCK_T)) return true;
     return false;
   }
 
- inline bool jj_3R_77()
+ inline bool jj_3R_499()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3_16()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(79)) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_172()) {
-    jj_scanpos = xsp;
-    if (jj_3R_173()) return true;
-    }
+    if (jj_3R_560()) return true;
     return false;
   }
 
- inline bool jj_3_15()
+ inline bool jj_3R_498()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
- inline bool jj_3R_79()
+ inline bool jj_3R_346()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_15()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(79)) jj_scanpos = xsp;
-    if (jj_3R_177()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_431()) {
+    jj_scanpos = xsp;
+    if (jj_3R_432()) return true;
+    }
     return false;
   }
 
- inline bool jj_3_14()
+ inline bool jj_3R_431()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_scan_token(PROCEDURE_T)) return true;
+    if (jj_3R_520()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_521()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3_94()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3_95()) jj_scanpos = xsp;
+    if (jj_3R_423()) return true;
     return false;
   }
 
- inline bool jj_3_13()
+ inline bool jj_3R_497()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_88()) return true;
     return false;
   }
 
- inline bool jj_3R_88()
+ inline bool jj_3R_409()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_14()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(79)) jj_scanpos = xsp;
-    if (jj_3R_188()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_496()) {
+    jj_scanpos = xsp;
+    if (jj_3R_497()) {
+    jj_scanpos = xsp;
+    if (jj_3R_498()) {
+    jj_scanpos = xsp;
+    if (jj_3R_499()) {
+    jj_scanpos = xsp;
+    if (jj_3R_500()) {
+    jj_scanpos = xsp;
+    if (jj_3R_501()) {
+    jj_scanpos = xsp;
+    if (jj_3R_502()) {
+    jj_scanpos = xsp;
+    if (jj_3R_503()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(187)) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_678()
+ inline bool jj_3R_496()
  {
     if (jj_done) return true;
-    if (jj_3R_693()) return true;
+    if (jj_3R_559()) return true;
     return false;
   }
 
- inline bool jj_3R_470()
+ inline bool jj_3_17()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_71()) return true;
     return false;
   }
 
- inline bool jj_3R_347()
+ inline bool jj_3R_631()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_433()) {
+    if (jj_scan_token(46)) {
     jj_scanpos = xsp;
-    if (jj_3R_434()) return true;
+    if (jj_scan_token(80)) return true;
     }
     return false;
   }
 
- inline bool jj_3R_433()
+ inline bool jj_3R_629()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PROCEDURE_T)) return true;
-    if (jj_3R_515()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_516()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3_94()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3_95()) jj_scanpos = xsp;
-    if (jj_3R_425()) return true;
+    if (jj_3R_652()) return true;
     return false;
   }
 
- inline bool jj_3R_677()
+ inline bool jj_3R_570()
  {
     if (jj_done) return true;
-    if (jj_3R_692()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_629()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_652()
+ inline bool jj_3R_172()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_677()) {
-    jj_scanpos = xsp;
-    if (jj_3R_678()) return true;
-    }
+    if (jj_3R_324()) return true;
     return false;
   }
 
- inline bool jj_3R_176()
+ inline bool jj_3_92()
  {
     if (jj_done) return true;
-    if (jj_3R_329()) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
- inline bool jj_3R_175()
+ inline bool jj_3R_674()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_382()) return true;
     return false;
   }
 
- inline bool jj_3R_628()
+ inline bool jj_3R_171()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(46)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(80)) return true;
-    }
+    if (jj_3R_71()) return true;
     return false;
   }
 
- inline bool jj_3R_178()
+ inline bool jj_3_16()
  {
     if (jj_done) return true;
-    if (jj_3R_331()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3R_626()
+ inline bool jj_3R_76()
  {
     if (jj_done) return true;
-    if (jj_3R_650()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3_16()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(79)) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_171()) {
+    jj_scanpos = xsp;
+    if (jj_3R_172()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_571()
+ inline bool jj_3R_673()
  {
     if (jj_done) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_626()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_381()) return true;
     return false;
   }
 
- inline bool jj_3_92()
+ inline bool jj_3_15()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_674()
+ inline bool jj_3_93()
  {
     if (jj_done) return true;
-    if (jj_3R_383()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_673()
+ inline bool jj_3R_672()
  {
     if (jj_done) return true;
-    if (jj_3R_382()) return true;
+    if (jj_3R_378()) return true;
     return false;
   }
 
  inline bool jj_3R_78()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_174()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_175()) jj_scanpos = xsp;
+    if (jj_3_15()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_176()) jj_scanpos = xsp;
+    if (jj_scan_token(79)) jj_scanpos = xsp;
+    if (jj_3R_176()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3_93()
+ inline bool jj_3R_671()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
- inline bool jj_3R_672()
+ inline bool jj_3R_670()
  {
     if (jj_done) return true;
-    if (jj_3R_379()) return true;
+    if (jj_3R_376()) return true;
     return false;
   }
 
- inline bool jj_3R_671()
+ inline bool jj_3_14()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_670()
+ inline bool jj_3_13()
  {
     if (jj_done) return true;
-    if (jj_3R_377()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
  inline bool jj_3R_669()
  {
     if (jj_done) return true;
-    if (jj_3R_376()) return true;
+    if (jj_3R_375()) return true;
     return false;
   }
 
  inline bool jj_3R_668()
  {
     if (jj_done) return true;
-    if (jj_3R_375()) return true;
+    if (jj_3R_374()) return true;
     return false;
   }
 
- inline bool jj_3R_574()
+ inline bool jj_3R_573()
  {
     if (jj_done) return true;
-    if (jj_3R_515()) return true;
+    if (jj_3R_520()) return true;
     return false;
   }
 
  inline bool jj_3R_667()
  {
     if (jj_done) return true;
-    if (jj_3R_373()) return true;
+    if (jj_3R_372()) return true;
     return false;
   }
 
- inline bool jj_3R_469()
+ inline bool jj_3R_87()
  {
     if (jj_done) return true;
-    if (jj_3R_532()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3_14()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(79)) jj_scanpos = xsp;
+    if (jj_3R_187()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
  inline bool jj_3R_666()
  {
     if (jj_done) return true;
-    if (jj_3R_372()) return true;
+    if (jj_3R_371()) return true;
     return false;
   }
 
  inline bool jj_3R_665()
  {
     if (jj_done) return true;
-    if (jj_3R_519()) return true;
+    if (jj_3R_524()) return true;
     return false;
   }
 
- inline bool jj_3R_468()
+ inline bool jj_3R_678()
  {
     if (jj_done) return true;
-    if (jj_3R_67()) return true;
+    if (jj_3R_690()) return true;
     return false;
   }
 
- inline bool jj_3R_180()
+ inline bool jj_3R_468()
  {
     if (jj_done) return true;
-    if (jj_3R_333()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_179()
+ inline bool jj_3R_664()
  {
     if (jj_done) return true;
-    if (jj_3R_332()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_370()) return true;
     return false;
   }
 
- inline bool jj_3R_664()
+ inline bool jj_3R_677()
  {
     if (jj_done) return true;
-    if (jj_3R_371()) return true;
+    if (jj_3R_689()) return true;
     return false;
   }
 
- inline bool jj_3R_187()
+ inline bool jj_3R_654()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BAR_T)) return true;
-    if (jj_3R_186()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_677()) {
+    jj_scanpos = xsp;
+    if (jj_3R_678()) return true;
+    }
     return false;
   }
 
  inline bool jj_3R_663()
  {
     if (jj_done) return true;
-    if (jj_3R_93()) return true;
+    if (jj_3R_92()) return true;
     return false;
   }
 
- inline bool jj_3R_650()
+ inline bool jj_3R_652()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -5665,861 +5500,845 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_378()
+ inline bool jj_3R_175()
+ {
+    if (jj_done) return true;
+    if (jj_3R_328()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_174()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMPONENT_T)) return true;
     if (jj_3R_70()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(56)) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_468()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_469()) jj_scanpos = xsp;
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(COMPONENT_T)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_470()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_462()
+ inline bool jj_3R_460()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_81()
+ inline bool jj_3R_177()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_178()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_179()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_180()) jj_scanpos = xsp;
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(FOR_T)) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_330()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
  inline bool jj_3_91()
  {
     if (jj_done) return true;
-    if (jj_3R_131()) return true;
+    if (jj_3R_130()) return true;
     return false;
   }
 
- inline bool jj_3R_348()
+ inline bool jj_3R_347()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_435()) {
+    if (jj_3R_433()) {
     jj_scanpos = xsp;
     if (jj_scan_token(137)) return true;
     }
     return false;
   }
 
- inline bool jj_3R_435()
+ inline bool jj_3R_433()
  {
     if (jj_done) return true;
-    if (jj_3R_519()) return true;
+    if (jj_3R_524()) return true;
     return false;
   }
 
- inline bool jj_3_12()
+ inline bool jj_3R_200()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_346()) return true;
+    if (jj_3R_347()) return true;
     return false;
   }
 
- inline bool jj_3_11()
+ inline bool jj_3R_572()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_631()) return true;
     return false;
   }
 
- inline bool jj_3R_86()
+ inline bool jj_3R_199()
  {
     if (jj_done) return true;
-    if (jj_3R_186()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_187()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_130()) return true;
     return false;
   }
 
- inline bool jj_3R_201()
+ inline bool jj_3R_92()
  {
     if (jj_done) return true;
-    if (jj_3R_347()) return true;
-    if (jj_3R_348()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_199()) {
+    jj_scanpos = xsp;
+    if (jj_3R_200()) return true;
+    }
     return false;
   }
 
- inline bool jj_3_10()
+ inline bool jj_3_90()
  {
     if (jj_done) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_128()) return true;
+    if (jj_3R_129()) return true;
     return false;
   }
 
- inline bool jj_3R_337()
+ inline bool jj_3R_77()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OTHER_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_173()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_174()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_175()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_573()
+ inline bool jj_3R_467()
  {
     if (jj_done) return true;
-    if (jj_3R_628()) return true;
+    if (jj_3R_537()) return true;
     return false;
   }
 
- inline bool jj_3R_200()
+ inline bool jj_3R_459()
  {
     if (jj_done) return true;
-    if (jj_3R_131()) return true;
+    if (jj_3R_532()) return true;
     return false;
   }
 
- inline bool jj_3R_93()
+ inline bool jj_3R_466()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_200()) {
-    jj_scanpos = xsp;
-    if (jj_3R_201()) return true;
-    }
+    if (jj_3R_66()) return true;
     return false;
   }
 
- inline bool jj_3_90()
+ inline bool jj_3R_162()
  {
     if (jj_done) return true;
+    if (jj_3R_128()) return true;
     if (jj_3R_129()) return true;
-    if (jj_3R_130()) return true;
     return false;
   }
 
- inline bool jj_3R_336()
+ inline bool jj_3R_179()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_332()) return true;
     return false;
   }
 
- inline bool jj_3R_335()
+ inline bool jj_3R_178()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_331()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
  inline bool jj_3R_186()
  {
     if (jj_done) return true;
+    if (jj_scan_token(BAR_T)) return true;
+    if (jj_3R_185()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_377()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(COMPONENT_T)) return true;
+    if (jj_3R_69()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_334()) {
-    jj_scanpos = xsp;
-    if (jj_3R_335()) {
-    jj_scanpos = xsp;
-    if (jj_3R_336()) {
-    jj_scanpos = xsp;
-    if (jj_3R_337()) return true;
-    }
-    }
-    }
+    if (jj_scan_token(56)) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_466()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_467()) jj_scanpos = xsp;
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(COMPONENT_T)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_468()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_334()
+ inline bool jj_3R_80()
  {
     if (jj_done) return true;
-    if (jj_3R_68()) return true;
+    if (jj_scan_token(FOR_T)) return true;
+    if (jj_3R_177()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_178()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_179()) jj_scanpos = xsp;
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(FOR_T)) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_624()
+ inline bool jj_3R_524()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_570()) return true;
+    if (jj_scan_token(BEGIN_T)) return true;
+    if (jj_3R_571()) return true;
+    if (jj_scan_token(END_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_572()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_573()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_461()
+ inline bool jj_3_12()
  {
     if (jj_done) return true;
-    if (jj_3R_527()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_161()
+ inline bool jj_3_11()
  {
     if (jj_done) return true;
-    if (jj_3R_129()) return true;
-    if (jj_3R_130()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_352()
+ inline bool jj_3R_85()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CHARACTER_LITERAL)) return true;
+    if (jj_3R_185()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_186()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_644()
+ inline bool jj_3_10()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
- inline bool jj_3R_519()
+ inline bool jj_3R_336()
  {
     if (jj_done) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_571()) return true;
-    if (jj_scan_token(BEGIN_T)) return true;
-    if (jj_3R_572()) return true;
-    if (jj_scan_token(END_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_573()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_574()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_622()
+ inline bool jj_3R_355()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_86()) return true;
-    if (jj_scan_token(ARROW_T)) return true;
-    if (jj_3R_259()) return true;
+    if (jj_scan_token(STRINGLITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_648()
+ inline bool jj_3R_335()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_623()
+ inline bool jj_3R_334()
  {
     if (jj_done) return true;
-    if (jj_3R_622()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_685()
+ inline bool jj_3R_434()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_356()
+ inline bool jj_3R_627()
  {
     if (jj_done) return true;
-    if (jj_scan_token(STRINGLITERAL)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_436()
+ inline bool jj_3R_185()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_60()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_333()) {
+    jj_scanpos = xsp;
+    if (jj_3R_334()) {
+    jj_scanpos = xsp;
+    if (jj_3R_335()) {
+    jj_scanpos = xsp;
+    if (jj_3R_336()) return true;
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_160()
+ inline bool jj_3R_333()
  {
     if (jj_done) return true;
-    if (jj_3R_314()) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
- inline bool jj_3R_256()
+ inline bool jj_3R_161()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_313()) return true;
     return false;
   }
 
- inline bool jj_3R_68()
+ inline bool jj_3R_351()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_160()) jj_scanpos = xsp;
-    if (jj_3R_130()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_161()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(CHARACTER_LITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_122()
+ inline bool jj_3R_68()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_256()) jj_scanpos = xsp;
-    if (jj_scan_token(CASE_T)) return true;
-    if (jj_3R_59()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_622()) return true;
+    if (jj_3R_161()) jj_scanpos = xsp;
+    if (jj_3R_129()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_623()) { jj_scanpos = xsp; break; }
+      if (jj_3R_162()) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(CASE_T)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_624()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_660()
- {
-    if (jj_done) return true;
-    if (jj_3R_498()) return true;
-    return false;
-  }
-
- inline bool jj_3R_647()
+ inline bool jj_3R_613()
  {
     if (jj_done) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_660()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_58()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_358()
+ inline bool jj_3R_357()
  {
     if (jj_done) return true;
     if (jj_scan_token(RETURN_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_635()
+ inline bool jj_3R_638()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_357()
+ inline bool jj_3R_356()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_436()) { jj_scanpos = xsp; break; }
+      if (jj_3R_434()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_234()
+ inline bool jj_3R_233()
  {
     if (jj_done) return true;
     if (jj_scan_token(LBRACKET_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_357()) jj_scanpos = xsp;
+    if (jj_3R_356()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_358()) jj_scanpos = xsp;
+    if (jj_3R_357()) jj_scanpos = xsp;
     if (jj_scan_token(RBRACKET_T)) return true;
     return false;
   }
 
- inline bool jj_3R_686()
+ inline bool jj_3R_625()
  {
     if (jj_done) return true;
-    if (jj_3R_329()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_85()) return true;
+    if (jj_scan_token(ARROW_T)) return true;
+    if (jj_3R_258()) return true;
     return false;
   }
 
- inline bool jj_3R_605()
+ inline bool jj_3R_617()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ALL_T)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
  inline bool jj_3R_604()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OTHER_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_603()
- {
-    if (jj_done) return true;
-    if (jj_3R_60()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_635()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
- inline bool jj_3R_535()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_603()) {
-    jj_scanpos = xsp;
-    if (jj_3R_604()) {
-    jj_scanpos = xsp;
-    if (jj_3R_605()) return true;
-    }
-    }
+    if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_501()
+ inline bool jj_3R_626()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_565()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_625()) return true;
     return false;
   }
 
- inline bool jj_3R_579()
+ inline bool jj_3R_603()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BUS_T)) return true;
+    if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_614()
+ inline bool jj_3R_659()
  {
     if (jj_done) return true;
     if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_scan_token(BLOCK_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_644()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(56)) jj_scanpos = xsp;
-    if (jj_3R_645()) return true;
-    if (jj_3R_646()) return true;
-    if (jj_scan_token(BEGIN_T)) return true;
-    if (jj_3R_647()) return true;
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(BLOCK_T)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_648()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_578()
+ inline bool jj_3R_602()
  {
     if (jj_done) return true;
-    if (jj_scan_token(REGISTER_T)) return true;
+    if (jj_3R_59()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_638()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_527()
+ inline bool jj_3R_540()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_578()) {
+    if (jj_3R_602()) {
+    jj_scanpos = xsp;
+    if (jj_3R_603()) {
     jj_scanpos = xsp;
-    if (jj_3R_579()) return true;
+    if (jj_3R_604()) return true;
+    }
     }
     return false;
   }
 
- inline bool jj_3_9()
+ inline bool jj_3R_578()
  {
     if (jj_done) return true;
-    if (jj_3R_67()) return true;
+    if (jj_scan_token(BUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_420()
+ inline bool jj_3R_577()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_501()) jj_scanpos = xsp;
+    if (jj_scan_token(REGISTER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_658()
+ inline bool jj_3R_532()
  {
     if (jj_done) return true;
-    if (jj_3R_532()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_686()) jj_scanpos = xsp;
+    if (jj_3R_577()) {
+    jj_scanpos = xsp;
+    if (jj_3R_578()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_657()
+ inline bool jj_3R_255()
  {
     if (jj_done) return true;
-    if (jj_3R_67()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_685()) jj_scanpos = xsp;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_645()
+ inline bool jj_3R_121()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_657()) jj_scanpos = xsp;
+    if (jj_3R_255()) jj_scanpos = xsp;
+    if (jj_scan_token(CASE_T)) return true;
+    if (jj_3R_58()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_625()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_626()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(CASE_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_658()) jj_scanpos = xsp;
+    if (jj_3R_627()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_659()
+ inline bool jj_3R_650()
  {
     if (jj_done) return true;
-    if (jj_3R_141()) return true;
+    if (jj_3R_409()) return true;
     return false;
   }
 
- inline bool jj_3R_374()
+ inline bool jj_3R_373()
  {
     if (jj_done) return true;
     if (jj_scan_token(SIGNAL_T)) return true;
-    if (jj_3R_197()) return true;
+    if (jj_3R_196()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_461()) jj_scanpos = xsp;
+    if (jj_3R_459()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_462()) jj_scanpos = xsp;
+    if (jj_3R_460()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_646()
+ inline bool jj_3R_616()
  {
     if (jj_done) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_659()) { jj_scanpos = xsp; break; }
+      if (jj_3R_650()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_300()
+ inline bool jj_3_89()
  {
     if (jj_done) return true;
-    if (jj_3R_383()) return true;
+    if (jj_3R_127()) return true;
     return false;
   }
 
- inline bool jj_3_89()
+ inline bool jj_3R_660()
  {
     if (jj_done) return true;
-    if (jj_3R_128()) return true;
+    if (jj_3R_328()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3_7()
+ inline bool jj_3_88()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_126()) return true;
     return false;
   }
 
- inline bool jj_3_88()
+ inline bool jj_3R_525()
  {
     if (jj_done) return true;
-    if (jj_3R_127()) return true;
+    if (jj_3R_404()) return true;
     return false;
   }
 
- inline bool jj_3_8()
+ inline bool jj_3R_506()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_564()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_299()
+ inline bool jj_3_87()
  {
     if (jj_done) return true;
-    if (jj_3R_382()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_520()
+ inline bool jj_3R_437()
  {
     if (jj_done) return true;
-    if (jj_3R_405()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3_87()) jj_scanpos = xsp;
+    if (jj_3R_114()) return true;
+    if (jj_scan_token(LESSTHAN_T)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_525()) jj_scanpos = xsp;
+    if (jj_3R_317()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_298()
+ inline bool jj_3R_559()
  {
     if (jj_done) return true;
-    if (jj_3R_381()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_scan_token(BLOCK_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_613()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(56)) jj_scanpos = xsp;
+    if (jj_3R_614()) return true;
+    if (jj_3R_615()) return true;
+    if (jj_scan_token(BEGIN_T)) return true;
+    if (jj_3R_616()) return true;
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(BLOCK_T)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_617()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_297()
+ inline bool jj_3_9()
  {
     if (jj_done) return true;
-    if (jj_3R_380()) return true;
+    if (jj_3R_66()) return true;
     return false;
   }
 
- inline bool jj_3_87()
+ inline bool jj_3R_436()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_127()) return true;
     return false;
   }
 
- inline bool jj_3R_296()
+ inline bool jj_3R_386()
  {
     if (jj_done) return true;
-    if (jj_3R_379()) return true;
+    if (jj_3R_476()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_439()
+ inline bool jj_3R_418()
  {
     if (jj_done) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_87()) jj_scanpos = xsp;
-    if (jj_3R_115()) return true;
-    if (jj_scan_token(LESSTHAN_T)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_520()) jj_scanpos = xsp;
-    if (jj_3R_318()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_506()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_438()
+ inline bool jj_3R_360()
  {
     if (jj_done) return true;
-    if (jj_3R_128()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_435()) {
+    jj_scanpos = xsp;
+    if (jj_3R_436()) {
+    jj_scanpos = xsp;
+    if (jj_3R_437()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_294()
+ inline bool jj_3R_435()
  {
     if (jj_done) return true;
-    if (jj_3R_378()) return true;
+    if (jj_3R_126()) return true;
     return false;
   }
 
- inline bool jj_3R_295()
+ inline bool jj_3R_648()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_537()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_660()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_387()
+ inline bool jj_3R_401()
  {
     if (jj_done) return true;
-    if (jj_3R_478()) return true;
-    if (jj_3R_68()) return true;
+    if (jj_scan_token(MINUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_293()
+ inline bool jj_3R_647()
  {
     if (jj_done) return true;
-    if (jj_3R_377()) return true;
+    if (jj_3R_66()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_659()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_292()
+ inline bool jj_3R_614()
  {
     if (jj_done) return true;
-    if (jj_3R_376()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_647()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_648()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_361()
+ inline bool jj_3R_313()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_437()) {
-    jj_scanpos = xsp;
-    if (jj_3R_438()) {
+    if (jj_3R_400()) {
     jj_scanpos = xsp;
-    if (jj_3R_439()) return true;
-    }
+    if (jj_3R_401()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_437()
+ inline bool jj_3R_400()
  {
     if (jj_done) return true;
-    if (jj_3R_127()) return true;
+    if (jj_scan_token(PLUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_291()
+ inline bool jj_3R_649()
  {
     if (jj_done) return true;
-    if (jj_3R_375()) return true;
+    if (jj_3R_140()) return true;
     return false;
   }
 
- inline bool jj_3R_290()
+ inline bool jj_3R_615()
  {
     if (jj_done) return true;
-    if (jj_3R_374()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_649()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_289()
+ inline bool jj_3R_551()
  {
     if (jj_done) return true;
-    if (jj_3R_373()) return true;
+    if (jj_scan_token(ROR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_288()
+ inline bool jj_3R_550()
  {
     if (jj_done) return true;
-    if (jj_3R_372()) return true;
+    if (jj_scan_token(ROL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_287()
+ inline bool jj_3R_549()
  {
     if (jj_done) return true;
-    if (jj_3R_371()) return true;
+    if (jj_scan_token(SRA_T)) return true;
     return false;
   }
 
- inline bool jj_3R_422()
+ inline bool jj_3R_548()
  {
     if (jj_done) return true;
-    if (jj_3R_502()) return true;
+    if (jj_scan_token(SLA_T)) return true;
     return false;
   }
 
- inline bool jj_3R_402()
+ inline bool jj_3R_547()
  {
     if (jj_done) return true;
-    if (jj_scan_token(MINUS_T)) return true;
+    if (jj_scan_token(SRL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_421()
+ inline bool jj_3R_546()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(SLL_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_299()
  {
     if (jj_done) return true;
     if (jj_3R_382()) return true;
     return false;
   }
 
- inline bool jj_3R_141()
+ inline bool jj_3R_476()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_286()) {
-    jj_scanpos = xsp;
-    if (jj_3R_287()) {
-    jj_scanpos = xsp;
-    if (jj_3R_288()) {
-    jj_scanpos = xsp;
-    if (jj_3R_289()) {
-    jj_scanpos = xsp;
-    if (jj_3R_290()) {
-    jj_scanpos = xsp;
-    if (jj_3R_291()) {
-    jj_scanpos = xsp;
-    if (jj_3R_292()) {
-    jj_scanpos = xsp;
-    if (jj_3R_293()) {
+    if (jj_3R_546()) {
     jj_scanpos = xsp;
-    if (jj_3R_294()) {
-    jj_scanpos = xsp;
-    if (jj_3R_295()) {
-    jj_scanpos = xsp;
-    if (jj_3R_296()) {
-    jj_scanpos = xsp;
-    if (jj_3R_297()) {
-    jj_scanpos = xsp;
-    if (jj_3R_298()) {
+    if (jj_3R_547()) {
     jj_scanpos = xsp;
-    if (jj_3R_299()) {
+    if (jj_3R_548()) {
     jj_scanpos = xsp;
-    if (jj_3_8()) {
+    if (jj_3R_549()) {
     jj_scanpos = xsp;
-    if (jj_3R_300()) {
+    if (jj_3R_550()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(186)) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_3R_551()) return true;
     }
     }
     }
@@ -6528,212 +6347,168 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_286()
+ inline bool jj_3_7()
  {
     if (jj_done) return true;
-    if (jj_3R_93()) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
- inline bool jj_3R_314()
+ inline bool jj_3_8()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_401()) {
-    jj_scanpos = xsp;
-    if (jj_3R_402()) return true;
-    }
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_401()
+ inline bool jj_3R_298()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PLUS_T)) return true;
+    if (jj_3R_381()) return true;
     return false;
   }
 
- inline bool jj_3R_546()
+ inline bool jj_3R_297()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ROR_T)) return true;
+    if (jj_3R_380()) return true;
     return false;
   }
 
- inline bool jj_3R_545()
+ inline bool jj_3R_306()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ROL_T)) return true;
+    if (jj_3R_68()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_386()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_544()
+ inline bool jj_3R_296()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SRA_T)) return true;
+    if (jj_3R_379()) return true;
     return false;
   }
 
- inline bool jj_3R_543()
+ inline bool jj_3R_295()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SLA_T)) return true;
+    if (jj_3R_378()) return true;
     return false;
   }
 
- inline bool jj_3R_333()
+ inline bool jj_3R_244()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_420()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_421()) { jj_scanpos = xsp; break; }
-    }
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_422()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(FOR_T)) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_362()) return true;
     return false;
   }
 
- inline bool jj_3R_542()
+ inline bool jj_3_86()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SRL_T)) return true;
+    if (jj_3R_125()) return true;
     return false;
   }
 
- inline bool jj_3R_541()
+ inline bool jj_3R_293()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SLL_T)) return true;
+    if (jj_3R_377()) return true;
     return false;
   }
 
- inline bool jj_3R_478()
+ inline bool jj_3R_294()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_541()) {
-    jj_scanpos = xsp;
-    if (jj_3R_542()) {
-    jj_scanpos = xsp;
-    if (jj_3R_543()) {
-    jj_scanpos = xsp;
-    if (jj_3R_544()) {
-    jj_scanpos = xsp;
-    if (jj_3R_545()) {
-    jj_scanpos = xsp;
-    if (jj_3R_546()) return true;
-    }
-    }
-    }
-    }
-    }
+    if (jj_3R_64()) return true;
     return false;
   }
 
- inline bool jj_3R_307()
+ inline bool jj_3R_292()
  {
     if (jj_done) return true;
-    if (jj_3R_68()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_387()) jj_scanpos = xsp;
+    if (jj_3R_376()) return true;
     return false;
   }
 
- inline bool jj_3R_245()
+ inline bool jj_3R_291()
  {
     if (jj_done) return true;
-    if (jj_3R_363()) return true;
+    if (jj_3R_375()) return true;
     return false;
   }
 
- inline bool jj_3R_95()
+ inline bool jj_3_85()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BIT_STRING_LITERAL)) return true;
+    if (jj_3R_124()) return true;
     return false;
   }
 
- inline bool jj_3R_240()
+ inline bool jj_3R_290()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_374()) return true;
     return false;
   }
 
- inline bool jj_3_86()
+ inline bool jj_3R_289()
  {
     if (jj_done) return true;
-    if (jj_3R_126()) return true;
+    if (jj_3R_373()) return true;
     return false;
   }
 
- inline bool jj_3R_419()
+ inline bool jj_3R_288()
  {
     if (jj_done) return true;
-    if (jj_3R_329()) return true;
+    if (jj_3R_372()) return true;
     return false;
   }
 
- inline bool jj_3_85()
+ inline bool jj_3_84()
  {
     if (jj_done) return true;
-    if (jj_3R_125()) return true;
+    if (jj_3R_123()) return true;
     return false;
   }
 
- inline bool jj_3R_418()
+ inline bool jj_3R_287()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_371()) return true;
     return false;
   }
 
- inline bool jj_3R_417()
+ inline bool jj_3R_118()
  {
     if (jj_done) return true;
-    if (jj_scan_token(USE_T)) return true;
-    if (jj_3R_500()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3_84()
+ inline bool jj_3R_286()
  {
     if (jj_done) return true;
-    if (jj_3R_124()) return true;
+    if (jj_3R_370()) return true;
     return false;
   }
 
- inline bool jj_3R_332()
+ inline bool jj_3R_420()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_417()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_418()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_419()) jj_scanpos = xsp;
+    if (jj_3R_507()) return true;
     return false;
   }
 
- inline bool jj_3R_119()
+ inline bool jj_3R_419()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_381()) return true;
     return false;
   }
 
@@ -6742,8 +6517,8 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_119()) jj_scanpos = xsp;
-    if (jj_3R_115()) return true;
+    if (jj_3R_118()) jj_scanpos = xsp;
+    if (jj_3R_114()) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
     return false;
   }
@@ -6751,43 +6526,124 @@ void parseInline();
  inline bool jj_3_83()
  {
     if (jj_done) return true;
-    if (jj_3R_123()) return true;
+    if (jj_3R_122()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_140()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_285()) {
+    jj_scanpos = xsp;
+    if (jj_3R_286()) {
+    jj_scanpos = xsp;
+    if (jj_3R_287()) {
+    jj_scanpos = xsp;
+    if (jj_3R_288()) {
+    jj_scanpos = xsp;
+    if (jj_3R_289()) {
+    jj_scanpos = xsp;
+    if (jj_3R_290()) {
+    jj_scanpos = xsp;
+    if (jj_3R_291()) {
+    jj_scanpos = xsp;
+    if (jj_3R_292()) {
+    jj_scanpos = xsp;
+    if (jj_3R_293()) {
+    jj_scanpos = xsp;
+    if (jj_3R_294()) {
+    jj_scanpos = xsp;
+    if (jj_3R_295()) {
+    jj_scanpos = xsp;
+    if (jj_3R_296()) {
+    jj_scanpos = xsp;
+    if (jj_3R_297()) {
+    jj_scanpos = xsp;
+    if (jj_3R_298()) {
+    jj_scanpos = xsp;
+    if (jj_3_8()) {
+    jj_scanpos = xsp;
+    if (jj_3R_299()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+ inline bool jj_3R_285()
+ {
+    if (jj_done) return true;
+    if (jj_3R_92()) return true;
     return false;
   }
 
  inline bool jj_3_82()
  {
     if (jj_done) return true;
-    if (jj_3R_122()) return true;
+    if (jj_3R_121()) return true;
     return false;
   }
 
  inline bool jj_3_81()
  {
     if (jj_done) return true;
-    if (jj_3R_121()) return true;
+    if (jj_3R_120()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_332()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(FOR_T)) return true;
+    if (jj_3R_418()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_419()) { jj_scanpos = xsp; break; }
+    }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_420()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(FOR_T)) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
  inline bool jj_3_80()
  {
     if (jj_done) return true;
-    if (jj_3R_120()) return true;
+    if (jj_3R_119()) return true;
     return false;
   }
 
- inline bool jj_3R_114()
+ inline bool jj_3R_113()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_244()
+ inline bool jj_3R_243()
  {
     if (jj_done) return true;
-    if (jj_3R_362()) return true;
+    if (jj_3R_361()) return true;
     return false;
   }
 
@@ -6796,8 +6652,8 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_114()) jj_scanpos = xsp;
-    if (jj_3R_115()) return true;
+    if (jj_3R_113()) jj_scanpos = xsp;
+    if (jj_3R_114()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     return false;
   }
@@ -6805,40 +6661,63 @@ void parseInline();
  inline bool jj_3_78()
  {
     if (jj_done) return true;
-    if (jj_3R_118()) return true;
+    if (jj_3R_117()) return true;
     return false;
   }
 
  inline bool jj_3_77()
  {
     if (jj_done) return true;
-    if (jj_3R_117()) return true;
+    if (jj_3R_116()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_94()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(BIT_STRING_LITERAL)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_239()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_58()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
  inline bool jj_3_76()
  {
     if (jj_done) return true;
-    if (jj_3R_116()) return true;
+    if (jj_3R_115()) return true;
     return false;
   }
 
- inline bool jj_3R_499()
+ inline bool jj_3R_504()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_318()) return true;
+    if (jj_3R_317()) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_86()) return true;
+    if (jj_3R_85()) return true;
     return false;
   }
 
- inline bool jj_3R_113()
+ inline bool jj_3R_417()
+ {
+    if (jj_done) return true;
+    if (jj_3R_328()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_112()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_243()) {
+    if (jj_3R_242()) {
     jj_scanpos = xsp;
     if (jj_3_76()) {
     jj_scanpos = xsp;
@@ -6846,7 +6725,7 @@ void parseInline();
     jj_scanpos = xsp;
     if (jj_3_78()) {
     jj_scanpos = xsp;
-    if (jj_3R_244()) {
+    if (jj_3R_243()) {
     jj_scanpos = xsp;
     if (jj_3_80()) {
     jj_scanpos = xsp;
@@ -6862,7 +6741,7 @@ void parseInline();
     jj_scanpos = xsp;
     if (jj_3_86()) {
     jj_scanpos = xsp;
-    if (jj_3R_245()) return true;
+    if (jj_3R_244()) return true;
     }
     }
     }
@@ -6878,288 +6757,240 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_243()
+ inline bool jj_3R_242()
  {
     if (jj_done) return true;
-    if (jj_3R_361()) return true;
+    if (jj_3R_360()) return true;
     return false;
   }
 
- inline bool jj_3R_503()
+ inline bool jj_3R_416()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_339()
+ inline bool jj_3R_415()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SEVERITY_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_scan_token(USE_T)) return true;
+    if (jj_3R_505()) return true;
     return false;
   }
 
- inline bool jj_3_74()
+ inline bool jj_3R_508()
  {
     if (jj_done) return true;
-    if (jj_3R_113()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_259()
+ inline bool jj_3R_331()
  {
     if (jj_done) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_74()) { jj_scanpos = xsp; break; }
-    }
+    xsp = jj_scanpos;
+    if (jj_3R_415()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_416()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_417()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_267()
+ inline bool jj_3_74()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_112()) return true;
     return false;
   }
 
- inline bool jj_3R_423()
+ inline bool jj_3R_258()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_503()) { jj_scanpos = xsp; break; }
+      if (jj_3_74()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_379()
+ inline bool jj_3R_421()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ATTRIBUTE_T)) return true;
-    if (jj_3R_220()) return true;
-    if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_471()) return true;
-    if (jj_scan_token(IS_T)) return true;
     if (jj_3R_59()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_316()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_315()) return true;
-    return false;
-  }
-
- inline bool jj_3R_111()
- {
-    if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(APOSTROPHE_T)) return true;
-    if (jj_3R_60()) return true;
     Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_240()) jj_scanpos = xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_508()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3_73()
+ inline bool jj_3R_266()
  {
     if (jj_done) return true;
-    if (jj_3R_112()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_364()
+ inline bool jj_3R_363()
  {
     if (jj_done) return true;
     if (jj_scan_token(ON_T)) return true;
-    if (jj_3R_423()) return true;
-    return false;
-  }
-
- inline bool jj_3R_355()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(RANGE_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_220()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_354()) {
-    jj_scanpos = xsp;
-    if (jj_3R_355()) return true;
-    }
+    if (jj_3R_421()) return true;
     return false;
   }
 
- inline bool jj_3R_354()
+ inline bool jj_3_73()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_111()) return true;
     return false;
   }
 
- inline bool jj_3R_412()
+ inline bool jj_3R_410()
  {
     if (jj_done) return true;
-    if (jj_3R_318()) return true;
+    if (jj_3R_317()) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_86()) return true;
+    if (jj_3R_85()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_499()) { jj_scanpos = xsp; break; }
+      if (jj_3R_504()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_691()
+ inline bool jj_3R_324()
  {
     if (jj_done) return true;
-    if (jj_3R_112()) return true;
+    if (jj_scan_token(WITH_T)) return true;
+    if (jj_3R_58()) return true;
+    if (jj_scan_token(SELECT_T)) return true;
+    if (jj_3R_114()) return true;
+    if (jj_scan_token(LESSTHAN_T)) return true;
+    if (jj_3R_166()) return true;
+    if (jj_3R_410()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_325()
+ inline bool jj_3R_338()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WITH_T)) return true;
-    if (jj_3R_59()) return true;
-    if (jj_scan_token(SELECT_T)) return true;
-    if (jj_3R_115()) return true;
-    if (jj_scan_token(LESSTHAN_T)) return true;
-    if (jj_3R_167()) return true;
-    if (jj_3R_412()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(SEVERITY_T)) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3_6()
+ inline bool jj_3R_688()
  {
     if (jj_done) return true;
-    if (jj_3R_64()) return true;
-    if (jj_scan_token(ARROW_T)) return true;
+    if (jj_3R_111()) return true;
     return false;
   }
 
- inline bool jj_3R_65()
+ inline bool jj_3R_471()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ATTRIBUTE_T)) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_158()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(DOT_T)) return true;
+    if (jj_3R_99()) return true;
     return false;
   }
 
- inline bool jj_3R_338()
+ inline bool jj_3R_378()
  {
     if (jj_done) return true;
-    if (jj_scan_token(REPORT_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_scan_token(ATTRIBUTE_T)) return true;
+    if (jj_3R_219()) return true;
+    if (jj_scan_token(OF_T)) return true;
+    if (jj_3R_469()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_58()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_473()
+ inline bool jj_3R_315()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_100()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_314()) return true;
     return false;
   }
 
- inline bool jj_3R_166()
+ inline bool jj_3R_110()
  {
     if (jj_done) return true;
-    if (jj_3R_315()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(APOSTROPHE_T)) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_316()) { jj_scanpos = xsp; break; }
-    }
+    xsp = jj_scanpos;
+    if (jj_3R_239()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_360()
+ inline bool jj_3R_359()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(EQU_T)) return true;
-    if (jj_3R_103()) return true;
+    if (jj_3R_102()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_403()
+ inline bool jj_3R_354()
  {
     if (jj_done) return true;
-    if (jj_3R_64()) return true;
-    if (jj_scan_token(ARROW_T)) return true;
+    if (jj_scan_token(RANGE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_315()
+ inline bool jj_3R_219()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_403()) jj_scanpos = xsp;
-    if (jj_3R_404()) return true;
+    if (jj_3R_353()) {
+    jj_scanpos = xsp;
+    if (jj_3R_354()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_248()
+ inline bool jj_3R_353()
  {
     if (jj_done) return true;
-    if (jj_3R_140()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
  inline bool jj_3R_676()
  {
     if (jj_done) return true;
-    if (jj_3R_82()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_691()) jj_scanpos = xsp;
-    return false;
-  }
-
- inline bool jj_3R_116()
- {
-    if (jj_done) return true;
+    if (jj_3R_81()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_248()) jj_scanpos = xsp;
-    if (jj_3R_188()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_688()) jj_scanpos = xsp;
     return false;
   }
 
  inline bool jj_3R_675()
  {
     if (jj_done) return true;
-    if (jj_3R_690()) return true;
+    if (jj_3R_687()) return true;
     return false;
   }
 
- inline bool jj_3R_651()
+ inline bool jj_3R_653()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -7171,169 +7002,199 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_266()
+ inline bool jj_3_6()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_63()) return true;
+    if (jj_scan_token(ARROW_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_64()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(ATTRIBUTE_T)) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_157()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_188()
+ inline bool jj_3R_337()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ASSERT_T)) return true;
-    if (jj_3R_80()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_338()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_339()) jj_scanpos = xsp;
+    if (jj_scan_token(REPORT_T)) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_126()
+ inline bool jj_3R_265()
+ {
+    if (jj_done) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_125()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_266()) jj_scanpos = xsp;
+    if (jj_3R_265()) jj_scanpos = xsp;
     if (jj_scan_token(RETURN_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_267()) jj_scanpos = xsp;
+    if (jj_3R_266()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3_5()
+ inline bool jj_3R_249()
  {
     if (jj_done) return true;
-    if (jj_3R_63()) return true;
+    if (jj_scan_token(SEVERITY_T)) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_250()
+ inline bool jj_3R_165()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SEVERITY_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_314()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_315()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_701()
+ inline bool jj_3R_307()
  {
     if (jj_done) return true;
-    if (jj_3R_706()) return true;
+    if (jj_3R_387()) return true;
+    if (jj_3R_306()) return true;
     return false;
   }
 
- inline bool jj_3R_308()
+ inline bool jj_3R_402()
  {
     if (jj_done) return true;
-    if (jj_3R_388()) return true;
-    if (jj_3R_307()) return true;
+    if (jj_3R_63()) return true;
+    if (jj_scan_token(ARROW_T)) return true;
     return false;
   }
 
- inline bool jj_3R_700()
+ inline bool jj_3R_314()
  {
     if (jj_done) return true;
-    if (jj_3R_63()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_402()) jj_scanpos = xsp;
+    if (jj_3R_403()) return true;
     return false;
   }
 
- inline bool jj_3R_692()
+ inline bool jj_3R_248()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_700()) {
-    jj_scanpos = xsp;
-    if (jj_3R_701()) return true;
-    }
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_249()
+ inline bool jj_3R_247()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_139()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_117()
+ inline bool jj_3R_116()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_249()) jj_scanpos = xsp;
+    if (jj_3R_248()) jj_scanpos = xsp;
     if (jj_scan_token(REPORT_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_250()) jj_scanpos = xsp;
+    if (jj_3R_249()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_703()
+ inline bool jj_3R_700()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_484()
+ inline bool jj_3R_115()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_247()) jj_scanpos = xsp;
+    if (jj_3R_187()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_482()
  {
     if (jj_done) return true;
     if (jj_scan_token(NOTEQU_T)) return true;
     return false;
   }
 
- inline bool jj_3R_483()
+ inline bool jj_3R_481()
  {
     if (jj_done) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_482()
+ inline bool jj_3R_480()
  {
     if (jj_done) return true;
     if (jj_scan_token(GREATERTHAN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_481()
+ inline bool jj_3R_479()
  {
     if (jj_done) return true;
     if (jj_scan_token(EQU_T)) return true;
     return false;
   }
 
- inline bool jj_3R_480()
+ inline bool jj_3R_478()
  {
     if (jj_done) return true;
     if (jj_scan_token(GT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_388()
+ inline bool jj_3R_387()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_477()) {
+    jj_scanpos = xsp;
+    if (jj_3R_478()) {
+    jj_scanpos = xsp;
     if (jj_3R_479()) {
     jj_scanpos = xsp;
     if (jj_3R_480()) {
     jj_scanpos = xsp;
     if (jj_3R_481()) {
     jj_scanpos = xsp;
-    if (jj_3R_482()) {
-    jj_scanpos = xsp;
-    if (jj_3R_483()) {
-    jj_scanpos = xsp;
-    if (jj_3R_484()) return true;
+    if (jj_3R_482()) return true;
     }
     }
     }
@@ -7342,639 +7203,619 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_479()
+ inline bool jj_3R_477()
  {
     if (jj_done) return true;
     if (jj_scan_token(LT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_467()
+ inline bool jj_3R_187()
  {
     if (jj_done) return true;
-    if (jj_3R_234()) return true;
+    if (jj_scan_token(ASSERT_T)) return true;
+    if (jj_3R_79()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_337()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_338()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_146()
+ inline bool jj_3_5()
+ {
+    if (jj_done) return true;
+    if (jj_3R_62()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_145()
  {
     if (jj_done) return true;
-    if (jj_3R_307()) return true;
+    if (jj_3R_306()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_308()) jj_scanpos = xsp;
+    if (jj_3R_307()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_702()
+ inline bool jj_3R_699()
+ {
+    if (jj_done) return true;
+    if (jj_3R_704()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_698()
  {
     if (jj_done) return true;
-    if (jj_3R_707()) return true;
+    if (jj_3R_703()) return true;
     return false;
   }
 
- inline bool jj_3R_693()
+ inline bool jj_3R_690()
  {
     if (jj_done) return true;
     if (jj_scan_token(RECORD_T)) return true;
     Token * xsp;
-    if (jj_3R_702()) return true;
+    if (jj_3R_699()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_702()) { jj_scanpos = xsp; break; }
+      if (jj_3R_699()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(END_T)) return true;
     if (jj_scan_token(RECORD_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_703()) jj_scanpos = xsp;
+    if (jj_3R_700()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_237()
+ inline bool jj_3R_697()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_236()) return true;
+    if (jj_3R_62()) return true;
     return false;
   }
 
- inline bool jj_3_71()
+ inline bool jj_3R_689()
  {
     if (jj_done) return true;
-    if (jj_3R_68()) return true;
-    if (jj_3R_110()) return true;
-    if (jj_3R_68()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_697()) {
+    jj_scanpos = xsp;
+    if (jj_3R_698()) return true;
+    }
     return false;
   }
 
- inline bool jj_3_72()
+ inline bool jj_3_71()
  {
     if (jj_done) return true;
-    if (jj_3R_111()) return true;
+    if (jj_3R_68()) return true;
+    if (jj_3R_109()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_82()
+ inline bool jj_3_72()
  {
     if (jj_done) return true;
-    if (jj_scan_token(RANGE_T)) return true;
-    if (jj_3R_84()) return true;
+    if (jj_3R_110()) return true;
     return false;
   }
 
- inline bool jj_3R_576()
+ inline bool jj_3R_81()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NEW_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_scan_token(RANGE_T)) return true;
+    if (jj_3R_83()) return true;
     return false;
   }
 
  inline bool jj_3_70()
  {
     if (jj_done) return true;
-    if (jj_3R_109()) return true;
+    if (jj_3R_108()) return true;
     return false;
   }
 
- inline bool jj_3R_183()
+ inline bool jj_3R_182()
  {
     if (jj_done) return true;
-    if (jj_3R_111()) return true;
+    if (jj_3R_110()) return true;
     return false;
   }
 
- inline bool jj_3R_182()
+ inline bool jj_3R_181()
  {
     if (jj_done) return true;
     if (jj_3R_68()) return true;
-    if (jj_3R_110()) return true;
+    if (jj_3R_109()) return true;
     if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_84()
+ inline bool jj_3R_83()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_182()) {
+    if (jj_3R_181()) {
     jj_scanpos = xsp;
-    if (jj_3R_183()) return true;
+    if (jj_3R_182()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_525()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3_4()) {
-    jj_scanpos = xsp;
-    if (jj_3R_576()) return true;
-    }
-    return false;
-  }
-
- inline bool jj_3_4()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(NEW_T)) return true;
-    if (jj_3R_62()) return true;
-    return false;
-  }
-
- inline bool jj_3R_531()
+ inline bool jj_3R_465()
  {
     if (jj_done) return true;
-    if (jj_3R_310()) return true;
+    if (jj_3R_233()) return true;
     return false;
   }
 
- inline bool jj_3R_228()
+ inline bool jj_3R_227()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_530()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(CHARACTER_LITERAL)) return true;
-    return false;
-  }
-
- inline bool jj_3R_529()
+ inline bool jj_3R_226()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_108()) return true;
     return false;
   }
 
- inline bool jj_3R_465()
+ inline bool jj_3R_61()
  {
     if (jj_done) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(APOSTROPHE_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_529()) {
+    if (jj_3R_226()) {
     jj_scanpos = xsp;
-    if (jj_3R_530()) {
-    jj_scanpos = xsp;
-    if (jj_3R_531()) return true;
-    }
+    if (jj_3R_227()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_227()
+ inline bool jj_3R_236()
  {
     if (jj_done) return true;
-    if (jj_3R_109()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_235()) return true;
     return false;
   }
 
- inline bool jj_3R_62()
+ inline bool jj_3R_341()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(APOSTROPHE_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_227()) {
-    jj_scanpos = xsp;
-    if (jj_3R_228()) return true;
-    }
+    if (jj_3R_112()) return true;
     return false;
   }
 
- inline bool jj_3R_342()
+ inline bool jj_3R_191()
  {
     if (jj_done) return true;
-    if (jj_3R_113()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_341()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
  inline bool jj_3R_192()
  {
     if (jj_done) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_342()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_466()
+ inline bool jj_3R_575()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_scan_token(NEW_T)) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3R_193()
+ inline bool jj_3R_339()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_421()) return true;
     return false;
   }
 
- inline bool jj_3R_377()
+ inline bool jj_3R_530()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ALIAS_T)) return true;
-    if (jj_3R_465()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_466()) jj_scanpos = xsp;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_60()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_467()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3_4()) {
+    jj_scanpos = xsp;
+    if (jj_3R_575()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_340()
+ inline bool jj_3_4()
  {
     if (jj_done) return true;
-    if (jj_3R_423()) return true;
+    if (jj_scan_token(NEW_T)) return true;
+    if (jj_3R_61()) return true;
     return false;
   }
 
- inline bool jj_3R_109()
+ inline bool jj_3R_536()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_236()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_237()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_309()) return true;
     return false;
   }
 
- inline bool jj_3R_273()
+ inline bool jj_3R_535()
  {
     if (jj_done) return true;
-    if (jj_scan_token(MINUS_T)) return true;
+    if (jj_scan_token(CHARACTER_LITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_274()
+ inline bool jj_3R_534()
  {
     if (jj_done) return true;
-    if (jj_scan_token(AMPERSAND_T)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_129()
+ inline bool jj_3R_463()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_272()) {
+    if (jj_3R_534()) {
     jj_scanpos = xsp;
-    if (jj_3R_273()) {
+    if (jj_3R_535()) {
     jj_scanpos = xsp;
-    if (jj_3R_274()) return true;
+    if (jj_3R_536()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_272()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(PLUS_T)) return true;
-    return false;
-  }
-
- inline bool jj_3_3()
+ inline bool jj_3R_464()
  {
     if (jj_done) return true;
-    if (jj_3R_61()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3R_493()
+ inline bool jj_3R_376()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BOX_T)) return true;
+    if (jj_scan_token(ALIAS_T)) return true;
+    if (jj_3R_463()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_464()) jj_scanpos = xsp;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_59()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_465()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_494()
+ inline bool jj_3R_189()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_61()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_404()
- {
-    if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_492()) {
-    jj_scanpos = xsp;
-    if (jj_3R_493()) {
+    if (jj_scan_token(15)) {
     jj_scanpos = xsp;
-    if (jj_3R_494()) return true;
-    }
+    if (jj_3R_339()) return true;
     }
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_492()
+ inline bool jj_3R_108()
  {
     if (jj_done) return true;
-    if (jj_3R_61()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_235()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_236()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3_2()
+ inline bool jj_3R_272()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_scan_token(MINUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_226()
+ inline bool jj_3R_273()
  {
     if (jj_done) return true;
-    if (jj_3R_166()) return true;
+    if (jj_scan_token(AMPERSAND_T)) return true;
     return false;
   }
 
- inline bool jj_3R_190()
+ inline bool jj_3R_128()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(15)) {
+    if (jj_3R_271()) {
+    jj_scanpos = xsp;
+    if (jj_3R_272()) {
     jj_scanpos = xsp;
-    if (jj_3R_340()) return true;
+    if (jj_3R_273()) return true;
+    }
     }
-    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3_1()
+ inline bool jj_3R_271()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_scan_token(PLUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_154()
+ inline bool jj_3R_188()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_189()
+ inline bool jj_3_3()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3R_89()
+ inline bool jj_3R_88()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_189()) jj_scanpos = xsp;
+    if (jj_3R_188()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(79)) jj_scanpos = xsp;
     if (jj_scan_token(PROCESS_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_190()) jj_scanpos = xsp;
+    if (jj_3R_189()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(56)) jj_scanpos = xsp;
-    if (jj_3R_191()) return true;
+    if (jj_3R_190()) return true;
     if (jj_scan_token(BEGIN_T)) return true;
-    if (jj_3R_192()) return true;
+    if (jj_3R_191()) return true;
     if (jj_scan_token(END_T)) return true;
     xsp = jj_scanpos;
     if (jj_scan_token(79)) jj_scanpos = xsp;
     if (jj_scan_token(PROCESS_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_193()) jj_scanpos = xsp;
+    if (jj_3R_192()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_153()
+ inline bool jj_3R_340()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_422()) return true;
     return false;
   }
 
- inline bool jj_3R_341()
+ inline bool jj_3R_491()
  {
     if (jj_done) return true;
-    if (jj_3R_424()) return true;
+    if (jj_scan_token(BOX_T)) return true;
     return false;
   }
 
- inline bool jj_3R_152()
+ inline bool jj_3R_492()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OPEN_T)) return true;
+    if (jj_3R_59()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_60()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_61()
+ inline bool jj_3R_190()
  {
     if (jj_done) return true;
     Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_152()) {
-    jj_scanpos = xsp;
-    if (jj_3R_153()) {
-    jj_scanpos = xsp;
-    if (jj_3R_154()) return true;
-    }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_340()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_191()
+ inline bool jj_3R_518()
+ {
+    if (jj_done) return true;
+    if (jj_3R_382()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_403()
  {
     if (jj_done) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_341()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_490()) {
+    jj_scanpos = xsp;
+    if (jj_3R_491()) {
+    jj_scanpos = xsp;
+    if (jj_3R_492()) return true;
+    }
     }
     return false;
   }
 
- inline bool jj_3R_653()
+ inline bool jj_3R_490()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ACCESS_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3R_513()
+ inline bool jj_3_2()
  {
     if (jj_done) return true;
-    if (jj_3R_383()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_225()
+ inline bool jj_3_69()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BASED_LITERAL)) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3_69()
+ inline bool jj_3R_517()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_3R_381()) return true;
     return false;
   }
 
- inline bool jj_3R_512()
+ inline bool jj_3R_225()
  {
     if (jj_done) return true;
-    if (jj_3R_382()) return true;
+    if (jj_3R_165()) return true;
     return false;
   }
 
- inline bool jj_3R_224()
+ inline bool jj_3R_516()
  {
     if (jj_done) return true;
-    if (jj_scan_token(INTEGER)) return true;
+    if (jj_3R_378()) return true;
     return false;
   }
 
- inline bool jj_3R_511()
+ inline bool jj_3_1()
  {
     if (jj_done) return true;
-    if (jj_3R_379()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_223()
+ inline bool jj_3_68()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DECIMAL_LITERAL)) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
- inline bool jj_3R_104()
+ inline bool jj_3R_515()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_223()) {
-    jj_scanpos = xsp;
-    if (jj_3R_224()) {
-    jj_scanpos = xsp;
-    if (jj_3R_225()) return true;
-    }
-    }
+    if (jj_3R_376()) return true;
     return false;
   }
 
- inline bool jj_3_68()
+ inline bool jj_3R_514()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_375()) return true;
     return false;
   }
 
- inline bool jj_3R_510()
+ inline bool jj_3R_513()
  {
     if (jj_done) return true;
-    if (jj_3R_377()) return true;
+    if (jj_3R_374()) return true;
     return false;
   }
 
- inline bool jj_3R_509()
+ inline bool jj_3R_512()
  {
     if (jj_done) return true;
-    if (jj_3R_376()) return true;
+    if (jj_3R_372()) return true;
     return false;
   }
 
- inline bool jj_3R_508()
+ inline bool jj_3R_153()
  {
     if (jj_done) return true;
-    if (jj_3R_375()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_507()
+ inline bool jj_3R_511()
  {
     if (jj_done) return true;
-    if (jj_3R_373()) return true;
+    if (jj_3R_371()) return true;
     return false;
   }
 
- inline bool jj_3R_506()
+ inline bool jj_3R_510()
  {
     if (jj_done) return true;
-    if (jj_3R_372()) return true;
+    if (jj_3R_370()) return true;
     return false;
   }
 
- inline bool jj_3R_505()
+ inline bool jj_3R_152()
  {
     if (jj_done) return true;
-    if (jj_3R_371()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_424()
+ inline bool jj_3R_422()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_504()) {
+    if (jj_3R_509()) {
     jj_scanpos = xsp;
-    if (jj_3R_505()) {
+    if (jj_3R_510()) {
     jj_scanpos = xsp;
-    if (jj_3R_506()) {
+    if (jj_3R_511()) {
     jj_scanpos = xsp;
-    if (jj_3R_507()) {
+    if (jj_3R_512()) {
     jj_scanpos = xsp;
-    if (jj_3R_508()) {
+    if (jj_3R_513()) {
     jj_scanpos = xsp;
-    if (jj_3R_509()) {
+    if (jj_3R_514()) {
     jj_scanpos = xsp;
-    if (jj_3R_510()) {
+    if (jj_3R_515()) {
     jj_scanpos = xsp;
     if (jj_3_68()) {
     jj_scanpos = xsp;
-    if (jj_3R_511()) {
+    if (jj_3R_516()) {
     jj_scanpos = xsp;
-    if (jj_3R_512()) {
+    if (jj_3R_517()) {
     jj_scanpos = xsp;
     if (jj_3_69()) {
     jj_scanpos = xsp;
-    if (jj_3R_513()) return true;
+    if (jj_3R_518()) return true;
     }
     }
     }
@@ -7989,83 +7830,142 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_504()
+ inline bool jj_3R_509()
  {
     if (jj_done) return true;
-    if (jj_3R_93()) return true;
+    if (jj_3R_92()) return true;
     return false;
   }
 
- inline bool jj_3R_330()
+ inline bool jj_3R_329()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_226()) return true;
+    if (jj_3R_225()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
+ inline bool jj_3R_151()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(OPEN_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_60()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_151()) {
+    jj_scanpos = xsp;
+    if (jj_3R_152()) {
+    jj_scanpos = xsp;
+    if (jj_3R_153()) return true;
+    }
+    }
+    return false;
+  }
+
+ inline bool jj_3R_655()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(ACCESS_T)) return true;
+    if (jj_3R_84()) return true;
+    return false;
+  }
+
  inline bool jj_3_67()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_120()
+ inline bool jj_3R_119()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_3_67()) jj_scanpos = xsp;
-    if (jj_3R_177()) return true;
+    if (jj_3R_176()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_177()
+ inline bool jj_3R_224()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(BASED_LITERAL)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_223()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(INTEGER)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_222()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(DECIMAL_LITERAL)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_103()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_330()) jj_scanpos = xsp;
+    if (jj_3R_222()) {
+    jj_scanpos = xsp;
+    if (jj_3R_223()) {
+    jj_scanpos = xsp;
+    if (jj_3R_224()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3_65()
+ inline bool jj_3R_176()
  {
     if (jj_done) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_59()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_329()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_205()
+ inline bool jj_3_65()
  {
     if (jj_done) return true;
-    if (jj_3R_351()) return true;
+    if (jj_3R_86()) return true;
     return false;
   }
 
- inline bool jj_3_66()
+ inline bool jj_3R_204()
  {
     if (jj_done) return true;
-    if (jj_3R_108()) return true;
+    if (jj_3R_350()) return true;
     return false;
   }
 
- inline bool jj_3R_204()
+ inline bool jj_3_66()
  {
     if (jj_done) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_107()) return true;
     return false;
   }
 
  inline bool jj_3R_203()
  {
     if (jj_done) return true;
-    if (jj_3R_350()) return true;
+    if (jj_3R_86()) return true;
     return false;
   }
 
@@ -8076,20 +7976,27 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_94()
+ inline bool jj_3R_201()
+ {
+    if (jj_done) return true;
+    if (jj_3R_348()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_93()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_201()) {
+    jj_scanpos = xsp;
     if (jj_3R_202()) {
     jj_scanpos = xsp;
     if (jj_3R_203()) {
     jj_scanpos = xsp;
-    if (jj_3R_204()) {
-    jj_scanpos = xsp;
     if (jj_3_66()) {
     jj_scanpos = xsp;
-    if (jj_3R_205()) return true;
+    if (jj_3R_204()) return true;
     }
     }
     }
@@ -8100,49 +8007,49 @@ void parseInline();
  inline bool jj_3_64()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
  inline bool jj_3_63()
  {
     if (jj_done) return true;
-    if (jj_3R_107()) return true;
+    if (jj_3R_106()) return true;
     return false;
   }
 
- inline bool jj_3R_458()
+ inline bool jj_3R_456()
  {
     if (jj_done) return true;
-    if (jj_3R_109()) return true;
+    if (jj_3R_108()) return true;
     return false;
   }
 
  inline bool jj_3_62()
  {
     if (jj_done) return true;
-    if (jj_3R_106()) return true;
+    if (jj_3R_105()) return true;
     return false;
   }
 
- inline bool jj_3R_457()
+ inline bool jj_3R_455()
  {
     if (jj_done) return true;
-    if (jj_3R_525()) return true;
+    if (jj_3R_530()) return true;
     return false;
   }
 
  inline bool jj_3_61()
  {
     if (jj_done) return true;
-    if (jj_3R_62()) return true;
+    if (jj_3R_61()) return true;
     return false;
   }
 
- inline bool jj_3R_456()
+ inline bool jj_3R_454()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
@@ -8150,60 +8057,64 @@ void parseInline();
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_455()
+ inline bool jj_3R_453()
  {
     if (jj_done) return true;
-    if (jj_3R_107()) return true;
+    if (jj_3R_106()) return true;
     return false;
   }
 
  inline bool jj_3_59()
  {
     if (jj_done) return true;
-    if (jj_3R_105()) return true;
+    if (jj_3R_104()) return true;
     return false;
   }
 
- inline bool jj_3R_454()
+ inline bool jj_3R_241()
  {
     if (jj_done) return true;
-    if (jj_3R_106()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_242()
+ inline bool jj_3R_452()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_105()) return true;
     return false;
   }
 
- inline bool jj_3R_453()
+ inline bool jj_3R_451()
  {
     if (jj_done) return true;
-    if (jj_3R_62()) return true;
+    if (jj_3R_61()) return true;
     return false;
   }
 
- inline bool jj_3R_452()
+ inline bool jj_3R_450()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_370()
+ inline bool jj_3R_369()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_449()) {
+    jj_scanpos = xsp;
+    if (jj_3R_450()) {
+    jj_scanpos = xsp;
     if (jj_3R_451()) {
     jj_scanpos = xsp;
     if (jj_3R_452()) {
@@ -8214,11 +8125,7 @@ void parseInline();
     jj_scanpos = xsp;
     if (jj_3R_455()) {
     jj_scanpos = xsp;
-    if (jj_3R_456()) {
-    jj_scanpos = xsp;
-    if (jj_3R_457()) {
-    jj_scanpos = xsp;
-    if (jj_3R_458()) return true;
+    if (jj_3R_456()) return true;
     }
     }
     }
@@ -8229,183 +8136,183 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_451()
+ inline bool jj_3R_449()
  {
     if (jj_done) return true;
-    if (jj_3R_105()) return true;
+    if (jj_3R_104()) return true;
     return false;
   }
 
- inline bool jj_3R_329()
+ inline bool jj_3R_328()
  {
     if (jj_done) return true;
     if (jj_scan_token(PORT_T)) return true;
     if (jj_scan_token(MAP_T)) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_166()) return true;
+    if (jj_3R_165()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_582()
+ inline bool jj_3R_581()
  {
     if (jj_done) return true;
-    if (jj_3R_313()) return true;
+    if (jj_3R_312()) return true;
     return false;
   }
 
- inline bool jj_3R_532()
+ inline bool jj_3R_240()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PORT_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_582()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_359()) return true;
     return false;
   }
 
- inline bool jj_3R_241()
+ inline bool jj_3R_537()
  {
     if (jj_done) return true;
-    if (jj_3R_360()) return true;
+    if (jj_scan_token(PORT_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_581()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_112()
+ inline bool jj_3R_111()
  {
     if (jj_done) return true;
     if (jj_scan_token(UNITS_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_241()) { jj_scanpos = xsp; break; }
+      if (jj_3R_240()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(END_T)) return true;
     if (jj_scan_token(UNITS_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_242()) jj_scanpos = xsp;
+    if (jj_3R_241()) jj_scanpos = xsp;
     return false;
   }
 
  inline bool jj_3_58()
  {
     if (jj_done) return true;
-    if (jj_3R_104()) return true;
+    if (jj_3R_103()) return true;
     return false;
   }
 
- inline bool jj_3R_222()
+ inline bool jj_3R_221()
  {
     if (jj_done) return true;
-    if (jj_3R_104()) return true;
+    if (jj_3R_103()) return true;
     return false;
   }
 
- inline bool jj_3R_103()
+ inline bool jj_3R_102()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_222()) jj_scanpos = xsp;
-    if (jj_3R_60()) return true;
+    if (jj_3R_221()) jj_scanpos = xsp;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_408()
+ inline bool jj_3R_407()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(IN_T)) return true;
     if (jj_3R_69()) return true;
+    if (jj_scan_token(IN_T)) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
  inline bool jj_3_57()
  {
     if (jj_done) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_86()) return true;
     return false;
   }
 
  inline bool jj_3_55()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
  inline bool jj_3_56()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_351()
+ inline bool jj_3R_350()
  {
     if (jj_done) return true;
     if (jj_scan_token(PACKAGE_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
  inline bool jj_3_54()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_317()
+ inline bool jj_3R_316()
  {
     if (jj_done) return true;
-    if (jj_3R_405()) return true;
+    if (jj_3R_404()) return true;
     return false;
   }
 
- inline bool jj_3R_261()
+ inline bool jj_3R_260()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_167()
+ inline bool jj_3R_166()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(50)) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_317()) jj_scanpos = xsp;
+    if (jj_3R_316()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_310()
+ inline bool jj_3R_309()
  {
     if (jj_done) return true;
     if (jj_scan_token(STRINGLITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_643()
+ inline bool jj_3R_646()
  {
     if (jj_done) return true;
     if (jj_scan_token(TYPE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_642()
+ inline bool jj_3R_645()
  {
     if (jj_done) return true;
     if (jj_scan_token(FILE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_641()
+ inline bool jj_3R_644()
  {
     if (jj_done) return true;
     if (jj_scan_token(SHARED_T)) return true;
@@ -8416,47 +8323,47 @@ void parseInline();
  inline bool jj_3_53()
  {
     if (jj_done) return true;
-    if (jj_3R_103()) return true;
+    if (jj_3R_102()) return true;
     return false;
   }
 
- inline bool jj_3R_640()
+ inline bool jj_3R_643()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARIABLE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_639()
+ inline bool jj_3R_642()
  {
     if (jj_done) return true;
     if (jj_scan_token(SIGNAL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_638()
+ inline bool jj_3R_641()
  {
     if (jj_done) return true;
     if (jj_scan_token(CONSTANT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_613()
+ inline bool jj_3R_612()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_638()) {
+    if (jj_3R_641()) {
     jj_scanpos = xsp;
-    if (jj_3R_639()) {
+    if (jj_3R_642()) {
     jj_scanpos = xsp;
-    if (jj_3R_640()) {
+    if (jj_3R_643()) {
     jj_scanpos = xsp;
-    if (jj_3R_641()) {
+    if (jj_3R_644()) {
     jj_scanpos = xsp;
-    if (jj_3R_642()) {
+    if (jj_3R_645()) {
     jj_scanpos = xsp;
-    if (jj_3R_643()) return true;
+    if (jj_3R_646()) return true;
     }
     }
     }
@@ -8465,72 +8372,72 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_353()
+ inline bool jj_3R_352()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_207()
+ inline bool jj_3R_206()
  {
     if (jj_done) return true;
-    if (jj_3R_104()) return true;
+    if (jj_3R_103()) return true;
     return false;
   }
 
- inline bool jj_3R_206()
+ inline bool jj_3R_205()
  {
     if (jj_done) return true;
-    if (jj_3R_103()) return true;
+    if (jj_3R_102()) return true;
     return false;
   }
 
- inline bool jj_3R_96()
+ inline bool jj_3R_95()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_206()) {
+    if (jj_3R_205()) {
     jj_scanpos = xsp;
-    if (jj_3R_207()) return true;
+    if (jj_3R_206()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_442()
+ inline bool jj_3R_440()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_363()
+ inline bool jj_3R_362()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_442()) jj_scanpos = xsp;
+    if (jj_3R_440()) jj_scanpos = xsp;
     if (jj_scan_token(NULL_T)) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_102()
+ inline bool jj_3R_101()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_262()
+ inline bool jj_3R_261()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_79()) return true;
     return false;
   }
 
@@ -8541,42 +8448,42 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_260()
+ inline bool jj_3R_259()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_124()
+ inline bool jj_3R_123()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_260()) jj_scanpos = xsp;
+    if (jj_3R_259()) jj_scanpos = xsp;
     if (jj_scan_token(NEXT_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_261()) jj_scanpos = xsp;
+    if (jj_3R_260()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_262()) jj_scanpos = xsp;
+    if (jj_3R_261()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_221()
+ inline bool jj_3R_220()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_219()
+ inline bool jj_3R_218()
  {
     if (jj_done) return true;
-    if (jj_3R_234()) return true;
+    if (jj_3R_233()) return true;
     return false;
   }
 
@@ -8584,33 +8491,33 @@ void parseInline();
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_102()) { jj_scanpos = xsp; break; }
+      if (jj_3R_101()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_101()
+ inline bool jj_3R_100()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_219()) jj_scanpos = xsp;
+    if (jj_3R_218()) jj_scanpos = xsp;
     if (jj_scan_token(APOSTROPHE_T)) return true;
-    if (jj_3R_220()) return true;
+    if (jj_3R_219()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_221()) jj_scanpos = xsp;
+    if (jj_3R_220()) jj_scanpos = xsp;
     return false;
   }
 
  inline bool jj_3_47()
  {
     if (jj_done) return true;
-    if (jj_3R_99()) return true;
+    if (jj_3R_98()) return true;
     return false;
   }
 
@@ -8618,7 +8525,7 @@ void parseInline();
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_67()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
@@ -8626,19 +8533,19 @@ void parseInline();
  inline bool jj_3_49()
  {
     if (jj_done) return true;
-    if (jj_3R_101()) return true;
+    if (jj_3R_100()) return true;
     return false;
   }
 
- inline bool jj_3R_214()
+ inline bool jj_3R_213()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_353()) { jj_scanpos = xsp; break; }
+      if (jj_3R_352()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
@@ -8648,60 +8555,60 @@ void parseInline();
  {
     if (jj_done) return true;
     if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_100()) return true;
+    if (jj_3R_99()) return true;
     return false;
   }
 
- inline bool jj_3R_210()
+ inline bool jj_3R_209()
  {
     if (jj_done) return true;
-    if (jj_3R_99()) return true;
+    if (jj_3R_98()) return true;
     return false;
   }
 
- inline bool jj_3R_213()
+ inline bool jj_3R_212()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_67()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_150()
+ inline bool jj_3R_149()
  {
     if (jj_done) return true;
-    if (jj_3R_311()) return true;
+    if (jj_3R_310()) return true;
     return false;
   }
 
- inline bool jj_3R_212()
+ inline bool jj_3R_211()
  {
     if (jj_done) return true;
-    if (jj_3R_101()) return true;
+    if (jj_3R_100()) return true;
     return false;
   }
 
- inline bool jj_3R_211()
+ inline bool jj_3R_210()
  {
     if (jj_done) return true;
     if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_100()) return true;
+    if (jj_3R_99()) return true;
     return false;
   }
 
- inline bool jj_3R_99()
+ inline bool jj_3R_98()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_210()) {
+    jj_scanpos = xsp;
     if (jj_3R_211()) {
     jj_scanpos = xsp;
     if (jj_3R_212()) {
     jj_scanpos = xsp;
-    if (jj_3R_213()) {
-    jj_scanpos = xsp;
-    if (jj_3R_214()) return true;
+    if (jj_3R_213()) return true;
     }
     }
     }
@@ -8711,155 +8618,155 @@ void parseInline();
  inline bool jj_3_46()
  {
     if (jj_done) return true;
-    if (jj_3R_98()) return true;
+    if (jj_3R_97()) return true;
     return false;
   }
 
- inline bool jj_3R_98()
+ inline bool jj_3R_97()
  {
     if (jj_done) return true;
-    if (jj_3R_99()) return true;
+    if (jj_3R_98()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_210()) { jj_scanpos = xsp; break; }
+      if (jj_3R_209()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_149()
+ inline bool jj_3R_148()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_151()
+ inline bool jj_3R_150()
  {
     if (jj_done) return true;
-    if (jj_3R_98()) return true;
+    if (jj_3R_97()) return true;
     return false;
   }
 
- inline bool jj_3R_148()
+ inline bool jj_3R_147()
  {
     if (jj_done) return true;
-    if (jj_3R_310()) return true;
+    if (jj_3R_309()) return true;
     return false;
   }
 
- inline bool jj_3R_60()
+ inline bool jj_3R_59()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_148()) {
+    if (jj_3R_147()) {
     jj_scanpos = xsp;
-    if (jj_3R_149()) {
+    if (jj_3R_148()) {
     jj_scanpos = xsp;
-    if (jj_3R_150()) return true;
+    if (jj_3R_149()) return true;
     }
     }
     xsp = jj_scanpos;
-    if (jj_3R_151()) jj_scanpos = xsp;
+    if (jj_3R_150()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_281()
+ inline bool jj_3R_280()
  {
     if (jj_done) return true;
     if (jj_scan_token(REM_T)) return true;
     return false;
   }
 
- inline bool jj_3R_280()
+ inline bool jj_3R_279()
  {
     if (jj_done) return true;
     if (jj_scan_token(MOD_T)) return true;
     return false;
   }
 
- inline bool jj_3R_279()
+ inline bool jj_3R_278()
  {
     if (jj_done) return true;
     if (jj_scan_token(SLASH_T)) return true;
     return false;
   }
 
- inline bool jj_3R_135()
+ inline bool jj_3R_134()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_277()) {
+    jj_scanpos = xsp;
     if (jj_3R_278()) {
     jj_scanpos = xsp;
     if (jj_3R_279()) {
     jj_scanpos = xsp;
-    if (jj_3R_280()) {
-    jj_scanpos = xsp;
-    if (jj_3R_281()) return true;
+    if (jj_3R_280()) return true;
     }
     }
     }
     return false;
   }
 
- inline bool jj_3R_278()
+ inline bool jj_3R_277()
  {
     if (jj_done) return true;
     if (jj_scan_token(MULT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_625()
+ inline bool jj_3R_628()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_432()
+ inline bool jj_3R_430()
  {
     if (jj_done) return true;
     if (jj_scan_token(LINKAGE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_431()
+ inline bool jj_3R_429()
  {
     if (jj_done) return true;
     if (jj_scan_token(BUFFER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_430()
+ inline bool jj_3R_428()
  {
     if (jj_done) return true;
     if (jj_scan_token(INOUT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_429()
+ inline bool jj_3R_427()
  {
     if (jj_done) return true;
     if (jj_scan_token(OUT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_346()
+ inline bool jj_3R_345()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_428()) {
+    if (jj_3R_426()) {
     jj_scanpos = xsp;
-    if (jj_3R_429()) {
+    if (jj_3R_427()) {
     jj_scanpos = xsp;
-    if (jj_3R_430()) {
+    if (jj_3R_428()) {
     jj_scanpos = xsp;
-    if (jj_3R_431()) {
+    if (jj_3R_429()) {
     jj_scanpos = xsp;
-    if (jj_3R_432()) return true;
+    if (jj_3R_430()) return true;
     }
     }
     }
@@ -8867,13 +8774,81 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_428()
+ inline bool jj_3R_426()
  {
     if (jj_done) return true;
     if (jj_scan_token(IN_T)) return true;
     return false;
   }
 
+ inline bool jj_3R_257()
+ {
+    if (jj_done) return true;
+    if (jj_3R_366()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_256()
+ {
+    if (jj_done) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_122()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_256()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_257()) jj_scanpos = xsp;
+    if (jj_scan_token(LOOP_T)) return true;
+    if (jj_3R_258()) return true;
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(LOOP_T)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_628()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3_45()
+ {
+    if (jj_done) return true;
+    if (jj_3R_96()) return true;
+    return false;
+  }
+
+ inline bool jj_3_44()
+ {
+    if (jj_done) return true;
+    if (jj_3R_95()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_232()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(NULL_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3_43()
+ {
+    if (jj_done) return true;
+    if (jj_3R_94()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_231()
+ {
+    if (jj_done) return true;
+    if (jj_3R_355()) return true;
+    return false;
+  }
+
 
 public: 
   TokenManager *token_source;
@@ -8893,7 +8868,7 @@ private:
   bool          jj_lookingAhead;
   bool          jj_semLA;
   int           jj_gen;
-  int           jj_la1[295];
+  int           jj_la1[294];
   ErrorHandler *errorHandler;
   bool          errorHandlerCreated;
 protected: 
@@ -8976,7 +8951,7 @@ static void addProto(const char *s1,const char *s2,const char *s3,const char *s4
 static void addConfigureNode(const char* a,const char*b, bool,bool isLeaf,bool inlineConf);
 static void createFunction(const char *impure,uint64 spec,const char *fname);
 static void addVhdlType(const char *n,int startLine,int section, uint64 spec,const char* args,const char* type,Protection prot);
-static void addCompInst(char *n, char* instName, char* comp,int iLine);
+static void addCompInst(const char *n, const char* instName, const char* comp,int iLine);
 static void handleCommentBlock(const char* doc,bool brief);
 static void handleFlowComment(const char*);
 static void initEntry(Entry *e);
diff --git a/vhdlparser/VhdlParserConstants.h b/vhdlparser/VhdlParserConstants.h
index 0c2c0e5..73f2a43 100644
--- a/vhdlparser/VhdlParserConstants.h
+++ b/vhdlparser/VhdlParserConstants.h
@@ -375,7 +375,9 @@ const  int SPACE_CHARACTER = 184;
   /** RegularExpression Id. */
 const  int LOWER_CASE_LETTER = 185;
   /** RegularExpression Id. */
-const  int VHDL2008TOOLDIR = 186;
+const  int QUOTE = 186;
+  /** RegularExpression Id. */
+const  int VHDL2008TOOLDIR = 187;
 
   /** Lexical state. */
 const  int DEFAULT = 0;
@@ -754,6 +756,8 @@ const  int DEFAULT = 0;
   static JAVACC_CHAR_TYPE tokenImage_arr_185[] = 
 {0x22, 0x3c, 0x4c, 0x4f, 0x57, 0x45, 0x52, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_186[] = 
+{0x22, 0x3c, 0x51, 0x55, 0x4f, 0x54, 0x45, 0x3e, 0x22, 0};
+  static JAVACC_CHAR_TYPE tokenImage_arr_187[] = 
 {0x22, 0x3c, 0x56, 0x48, 0x44, 0x4c, 0x32, 0x30, 0x30, 0x38, 0x54, 0x4f, 0x4f, 0x4c, 0x44, 0x49, 0x52, 0x3e, 0x22, 0};
   static JAVACC_STRING_TYPE tokenImage[] = {
 tokenImage_arr_0, 
@@ -943,6 +947,7 @@ tokenImage_arr_183,
 tokenImage_arr_184, 
 tokenImage_arr_185, 
 tokenImage_arr_186, 
+tokenImage_arr_187, 
   };
 
 }
diff --git a/vhdlparser/VhdlParserTokenManager.cc b/vhdlparser/VhdlParserTokenManager.cc
index 9733acd..07364a4 100644
--- a/vhdlparser/VhdlParserTokenManager.cc
+++ b/vhdlparser/VhdlParserTokenManager.cc
@@ -13,10 +13,10 @@ static const unsigned long long jjbitVec3[] = {
    0x0ULL, 0x0ULL, 0xffffffff00000000ULL, 0xffffffffffffffffULL
 };
 static const int jjnextStates[] = {
-   53, 54, 55, 56, 57, 60, 64, 65, 66, 47, 48, 2, 36, 37, 0, 3, 
-   4, 5, 7, 12, 13, 15, 16, 32, 33, 35, 38, 39, 41, 55, 56, 57, 
-   60, 59, 58, 60, 64, 65, 66, 67, 68, 70, 9, 10, 23, 24, 27, 28, 
-   44, 46, 49, 51, 26, 29, 
+   54, 55, 56, 57, 58, 61, 65, 66, 67, 48, 49, 2, 37, 38, 0, 3, 
+   4, 5, 7, 12, 13, 15, 16, 24, 23, 25, 33, 34, 36, 39, 40, 42, 
+   56, 57, 58, 61, 60, 59, 61, 65, 66, 67, 68, 69, 71, 9, 10, 28, 
+   29, 45, 47, 50, 52, 27, 30, 
 };
 static JAVACC_CHAR_TYPE jjstrLiteralChars_0[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_1[] = {0};
@@ -235,6 +235,7 @@ static JAVACC_CHAR_TYPE jjstrLiteralChars_183[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_184[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_185[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_186[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_187[] = {0};
 static const JAVACC_STRING_TYPE jjstrLiteralImages[] = {
 jjstrLiteralChars_0, 
 jjstrLiteralChars_1, 
@@ -423,6 +424,7 @@ jjstrLiteralChars_183,
 jjstrLiteralChars_184, 
 jjstrLiteralChars_185, 
 jjstrLiteralChars_186, 
+jjstrLiteralChars_187, 
 };
 
 /** Lexer state names. */
@@ -432,7 +434,7 @@ static const JAVACC_STRING_TYPE lexStateNames[] = {
 lexStateNames_arr_0, 
 };
 static const unsigned long long jjtoToken[] = {
-   0xfffffffffffff801ULL, 0xffffffffffffffffULL, 0x4081fffffffffffULL, 
+   0xfffffffffffff801ULL, 0xffffffffffffffffULL, 0x8081fffffffffffULL, 
 };
 static const unsigned long long jjtoSkip[] = {
    0x7deULL, 0x0ULL, 0x0ULL, 
@@ -2681,7 +2683,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
    curChar = input_stream->readChar();
    curPos = 0;
    int startsAt = 0;
-   jjnewStateCnt = 75;
+   jjnewStateCnt = 76;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -2796,7 +2798,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                      jjstateSet[jjnewStateCnt++] = 18;
                   break;
                case 18:
-                  if ((0xfffffffb00000200ULL & l) != 0L)
+                  if ((0xffffffff00000200ULL & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 19;
                   break;
                case 19:
@@ -2812,216 +2814,216 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                   break;
                case 22:
                   if (curChar == 34)
-                     { jjCheckNAddTwoStates(23, 24); }
+                     { jjCheckNAdd(23); }
                   break;
                case 23:
                   if ((0x3ff000000000000ULL & l) != 0L)
-                     { jjCheckNAddTwoStates(23, 24); }
+                     { jjCheckNAddStates(23, 25); }
                   break;
-               case 24:
+               case 25:
                   if (curChar == 34 && kind > 179)
                      kind = 179;
                   break;
-               case 26:
+               case 27:
                   if (curChar == 34)
-                     { jjCheckNAddTwoStates(27, 28); }
+                     { jjCheckNAddTwoStates(28, 29); }
                   break;
-               case 27:
+               case 28:
                   if ((0xfffffffb00000200ULL & l) != 0L)
-                     { jjCheckNAddTwoStates(27, 28); }
+                     { jjCheckNAddTwoStates(28, 29); }
                   break;
-               case 28:
+               case 29:
                   if (curChar != 34)
                      break;
-                  if (kind > 186)
-                     kind = 186;
-                  { jjCheckNAddTwoStates(26, 29); }
+                  if (kind > 187)
+                     kind = 187;
+                  { jjCheckNAddTwoStates(27, 30); }
                   break;
-               case 29:
+               case 30:
                   if ((0xfffffffb00000200ULL & l) == 0L)
                      break;
-                  if (kind > 186)
-                     kind = 186;
-                  { jjCheckNAddTwoStates(26, 29); }
+                  if (kind > 187)
+                     kind = 187;
+                  { jjCheckNAddTwoStates(27, 30); }
                   break;
-               case 30:
+               case 31:
                   if (curChar == 45)
                      { jjCheckNAddStates(11, 13); }
                   break;
-               case 31:
+               case 32:
                   if (curChar != 35)
                      break;
                   if (kind > 7)
                      kind = 7;
-                  { jjCheckNAddStates(23, 25); }
+                  { jjCheckNAddStates(26, 28); }
                   break;
-               case 32:
+               case 33:
                   if ((0xffffffffffffdbffULL & l) == 0L)
                      break;
                   if (kind > 7)
                      kind = 7;
-                  { jjCheckNAddStates(23, 25); }
+                  { jjCheckNAddStates(26, 28); }
                   break;
-               case 33:
+               case 34:
                   if ((0x2400ULL & l) != 0L && kind > 7)
                      kind = 7;
                   break;
-               case 34:
+               case 35:
                   if (curChar == 10 && kind > 7)
                      kind = 7;
                   break;
-               case 35:
+               case 36:
                   if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 34;
+                     jjstateSet[jjnewStateCnt++] = 35;
                   break;
-               case 36:
+               case 37:
                   if (curChar == 45)
-                     jjstateSet[jjnewStateCnt++] = 31;
+                     jjstateSet[jjnewStateCnt++] = 32;
                   break;
-               case 37:
+               case 38:
                   if (curChar != 45)
                      break;
                   if (kind > 8)
                      kind = 8;
-                  { jjCheckNAddStates(26, 28); }
+                  { jjCheckNAddStates(29, 31); }
                   break;
-               case 38:
+               case 39:
                   if ((0xffffffffffffdbffULL & l) == 0L)
                      break;
                   if (kind > 8)
                      kind = 8;
-                  { jjCheckNAddStates(26, 28); }
+                  { jjCheckNAddStates(29, 31); }
                   break;
-               case 39:
+               case 40:
                   if ((0x2400ULL & l) != 0L && kind > 8)
                      kind = 8;
                   break;
-               case 40:
+               case 41:
                   if (curChar == 10 && kind > 8)
                      kind = 8;
                   break;
-               case 41:
+               case 42:
                   if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 40;
+                     jjstateSet[jjnewStateCnt++] = 41;
                   break;
-               case 42:
+               case 43:
                   if (curChar == 47)
                      { jjAddStates(9, 10); }
                   break;
-               case 43:
-                  if (curChar == 33)
-                     { jjCheckNAddTwoStates(44, 46); }
-                  break;
                case 44:
-                  { jjCheckNAddTwoStates(44, 46); }
+                  if (curChar == 33)
+                     { jjCheckNAddTwoStates(45, 47); }
                   break;
                case 45:
-                  if (curChar == 47 && kind > 9)
-                     kind = 9;
+                  { jjCheckNAddTwoStates(45, 47); }
                   break;
                case 46:
-                  if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 45;
+                  if (curChar == 47 && kind > 9)
+                     kind = 9;
                   break;
                case 47:
                   if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 43;
+                     jjstateSet[jjnewStateCnt++] = 46;
                   break;
                case 48:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(49, 51); }
+                     jjstateSet[jjnewStateCnt++] = 44;
                   break;
                case 49:
-                  { jjCheckNAddTwoStates(49, 51); }
+                  if (curChar == 42)
+                     { jjCheckNAddTwoStates(50, 52); }
                   break;
                case 50:
+                  { jjCheckNAddTwoStates(50, 52); }
+                  break;
+               case 51:
                   if (curChar == 47 && kind > 10)
                      kind = 10;
                   break;
-               case 51:
+               case 52:
                   if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 50;
+                     jjstateSet[jjnewStateCnt++] = 51;
                   break;
-               case 52:
+               case 53:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
                   if (kind > 165)
                      kind = 165;
                   { jjCheckNAddStates(0, 8); }
                   break;
-               case 54:
+               case 55:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
                   if (kind > 165)
                      kind = 165;
-                  { jjCheckNAddTwoStates(53, 54); }
+                  { jjCheckNAddTwoStates(54, 55); }
                   break;
-               case 56:
+               case 57:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
                   if (kind > 170)
                      kind = 170;
-                  { jjCheckNAddStates(29, 32); }
+                  { jjCheckNAddStates(32, 35); }
                   break;
-               case 57:
+               case 58:
                   if (curChar == 46)
-                     { jjCheckNAdd(58); }
+                     { jjCheckNAdd(59); }
                   break;
-               case 58:
+               case 59:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
                   if (kind > 170)
                      kind = 170;
-                  { jjCheckNAddStates(33, 35); }
+                  { jjCheckNAddStates(36, 38); }
                   break;
-               case 61:
+               case 62:
                   if ((0x280000000000ULL & l) != 0L)
-                     { jjCheckNAdd(62); }
+                     { jjCheckNAdd(63); }
                   break;
-               case 62:
+               case 63:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
                   if (kind > 170)
                      kind = 170;
-                  { jjCheckNAddTwoStates(63, 62); }
+                  { jjCheckNAddTwoStates(64, 63); }
                   break;
-               case 65:
+               case 66:
                   if ((0x3ff000000000000ULL & l) != 0L)
-                     { jjCheckNAddStates(36, 38); }
+                     { jjCheckNAddStates(39, 41); }
                   break;
-               case 66:
+               case 67:
                   if (curChar == 35)
-                     { jjCheckNAdd(67); }
+                     { jjCheckNAdd(68); }
                   break;
-               case 67:
+               case 68:
                   if ((0x3ff000000000000ULL & l) != 0L)
-                     { jjCheckNAddStates(39, 41); }
+                     { jjCheckNAddStates(42, 44); }
                   break;
-               case 68:
+               case 69:
                   if (curChar == 46)
-                     { jjCheckNAdd(69); }
+                     { jjCheckNAdd(70); }
                   break;
-               case 69:
+               case 70:
                   if ((0x3ff000000000000ULL & l) != 0L)
-                     { jjCheckNAddTwoStates(69, 70); }
+                     { jjCheckNAddTwoStates(70, 71); }
                   break;
-               case 70:
+               case 71:
                   if (curChar != 35)
                      break;
                   if (kind > 172)
                      kind = 172;
-                  jjstateSet[jjnewStateCnt++] = 71;
+                  jjstateSet[jjnewStateCnt++] = 72;
                   break;
-               case 72:
+               case 73:
                   if ((0x280000000000ULL & l) != 0L)
-                     { jjCheckNAdd(73); }
+                     { jjCheckNAdd(74); }
                   break;
-               case 73:
+               case 74:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
                   if (kind > 172)
                      kind = 172;
-                  { jjCheckNAddTwoStates(74, 73); }
+                  { jjCheckNAddTwoStates(75, 74); }
                   break;
                default : break;
             }
@@ -3043,7 +3045,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                      { jjCheckNAdd(20); }
                   }
                   else if (curChar == 96)
-                     { jjCheckNAddTwoStates(26, 29); }
+                     { jjCheckNAddTwoStates(27, 30); }
                   else if (curChar == 92)
                      { jjCheckNAddTwoStates(15, 16); }
                   if ((0x7fffffe07fffffeULL & l) != 0L)
@@ -3062,7 +3064,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                   break;
                case 9:
                   if ((0x7fffffffffffffffULL & l) != 0L)
-                     { jjAddStates(42, 43); }
+                     { jjAddStates(45, 46); }
                   break;
                case 12:
                   if (curChar == 95)
@@ -3104,78 +3106,82 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                   break;
                case 23:
                   if ((0x7fffffe07fffffeULL & l) != 0L)
-                     { jjAddStates(44, 45); }
+                     { jjCheckNAddStates(23, 25); }
                   break;
-               case 25:
+               case 24:
+                  if (curChar == 95)
+                     { jjCheckNAddTwoStates(24, 23); }
+                  break;
+               case 26:
                   if (curChar == 96)
-                     { jjCheckNAddTwoStates(26, 29); }
+                     { jjCheckNAddTwoStates(27, 30); }
                   break;
-               case 27:
+               case 28:
                   if ((0x7fffffffffffffffULL & l) != 0L)
-                     { jjAddStates(46, 47); }
+                     { jjAddStates(47, 48); }
                   break;
-               case 29:
+               case 30:
                   if ((0x7fffffffffffffffULL & l) == 0L)
                      break;
-                  if (kind > 186)
-                     kind = 186;
-                  { jjCheckNAddTwoStates(26, 29); }
+                  if (kind > 187)
+                     kind = 187;
+                  { jjCheckNAddTwoStates(27, 30); }
                   break;
-               case 32:
+               case 33:
                   if (kind > 7)
                      kind = 7;
-                  { jjAddStates(23, 25); }
+                  { jjAddStates(26, 28); }
                   break;
-               case 38:
+               case 39:
                   if (kind > 8)
                      kind = 8;
-                  { jjAddStates(26, 28); }
+                  { jjAddStates(29, 31); }
                   break;
-               case 44:
-                  { jjAddStates(48, 49); }
+               case 45:
+                  { jjAddStates(49, 50); }
                   break;
-               case 49:
-                  { jjAddStates(50, 51); }
+               case 50:
+                  { jjAddStates(51, 52); }
                   break;
-               case 53:
+               case 54:
                   if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 54;
+                     jjstateSet[jjnewStateCnt++] = 55;
                   break;
-               case 55:
+               case 56:
                   if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 56;
+                     jjstateSet[jjnewStateCnt++] = 57;
                   break;
-               case 59:
+               case 60:
                   if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 58;
+                     jjstateSet[jjnewStateCnt++] = 59;
                   break;
-               case 60:
+               case 61:
                   if ((0x2000000020ULL & l) != 0L)
-                     { jjCheckNAddTwoStates(61, 62); }
+                     { jjCheckNAddTwoStates(62, 63); }
                   break;
-               case 63:
+               case 64:
                   if (curChar == 95)
-                     { jjCheckNAdd(62); }
+                     { jjCheckNAdd(63); }
                   break;
-               case 64:
+               case 65:
                   if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 65;
+                     jjstateSet[jjnewStateCnt++] = 66;
                   break;
-               case 67:
+               case 68:
                   if ((0x7fffffe07fffffeULL & l) != 0L)
-                     { jjCheckNAddStates(39, 41); }
+                     { jjCheckNAddStates(42, 44); }
                   break;
-               case 69:
+               case 70:
                   if ((0x7fffffe07fffffeULL & l) != 0L)
-                     { jjCheckNAddTwoStates(69, 70); }
+                     { jjCheckNAddTwoStates(70, 71); }
                   break;
-               case 71:
+               case 72:
                   if ((0x2000000020ULL & l) != 0L)
-                     { jjCheckNAddTwoStates(72, 73); }
+                     { jjCheckNAddTwoStates(73, 74); }
                   break;
-               case 74:
+               case 75:
                   if (curChar == 95)
-                     { jjCheckNAdd(73); }
+                     { jjCheckNAdd(74); }
                   break;
                default : break;
             }
@@ -3201,7 +3207,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                   break;
                case 9:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(42, 43); }
+                     { jjAddStates(45, 46); }
                   break;
                case 15:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
@@ -3211,38 +3217,38 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
                      jjstateSet[jjnewStateCnt++] = 19;
                   break;
-               case 27:
+               case 28:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(46, 47); }
+                     { jjAddStates(47, 48); }
                   break;
-               case 29:
+               case 30:
                   if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
                      break;
-                  if (kind > 186)
-                     kind = 186;
-                  { jjAddStates(52, 53); }
+                  if (kind > 187)
+                     kind = 187;
+                  { jjAddStates(53, 54); }
                   break;
-               case 32:
+               case 33:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 7)
                      kind = 7;
-                  { jjAddStates(23, 25); }
+                  { jjAddStates(26, 28); }
                   break;
-               case 38:
+               case 39:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 8)
                      kind = 8;
-                  { jjAddStates(26, 28); }
+                  { jjAddStates(29, 31); }
                   break;
-               case 44:
+               case 45:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(48, 49); }
+                     { jjAddStates(49, 50); }
                   break;
-               case 49:
+               case 50:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(50, 51); }
+                     { jjAddStates(51, 52); }
                   break;
                default : if (i1 == 0 || l1 == 0 || i2 == 0 ||  l2 == 0) break; else break;
             }
@@ -3255,7 +3261,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt), (jjnewStateCnt = startsAt), (i == (startsAt = 75 - startsAt)))
+      if ((i = jjnewStateCnt), (jjnewStateCnt = startsAt), (i == (startsAt = 76 - startsAt)))
          break;
       if (input_stream->endOfInput()) { break; }
       curChar = input_stream->readChar();
@@ -3408,6 +3414,7 @@ void  VhdlParserTokenManager::SkipLexicalActions(Token *matchedToken){
        }
       case 6 : {
          image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+    {
     QCString doc(image.data());
     int count=doc.contains("--!");
     ::vhdl::parser::VhdlParser::setMultCommentLine();
@@ -3416,6 +3423,7 @@ void  VhdlParserTokenManager::SkipLexicalActions(Token *matchedToken){
       ::vhdl::parser::VhdlParser::oneLineComment(doc);
     else
       ::vhdl::parser::VhdlParser::handleCommentBlock(image.data(),FALSE); ;
+    }
          break;
        }
       case 7 : {
@@ -3430,10 +3438,12 @@ void  VhdlParserTokenManager::SkipLexicalActions(Token *matchedToken){
        }
       case 9 : {
          image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
-   QCString q(image.data());
-   q.stripPrefix("/*!");
-   q.resize(q.length()-2);
-  ::vhdl::parser::VhdlParser::handleCommentBlock(q.data(),TRUE);image.clear();
+   {
+     QCString q(image.data());
+     q.stripPrefix("/*!");
+     q.resize(q.length()-2);
+     ::vhdl::parser::VhdlParser::handleCommentBlock(q.data(),TRUE);image.clear();
+   }
          break;
        }
       case 10 : {
@@ -3564,6 +3574,12 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
                       ::vhdl::parser::VhdlParser::setLineParsed(UNITS_T);
          break;
        }
+      case 137 : {
+        image.append(jjstrLiteralImages[137]);
+        lengthOfMatch = jjstrLiteralImages[137].length();
+                  ::vhdl::parser::VhdlParser::setLineParsed(SEMI_T);
+         break;
+       }
       default :
          break;
    }
@@ -3585,7 +3601,7 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
   void VhdlParserTokenManager::ReInitRounds() {
     int i;
     jjround = 0x80000001;
-    for (i = 75; i-- > 0;)
+    for (i = 76; i-- > 0;)
       jjrounds[i] = 0x80000000;
   }
 
diff --git a/vhdlparser/VhdlParserTokenManager.h b/vhdlparser/VhdlParserTokenManager.h
index f24c8e3..d624373 100644
--- a/vhdlparser/VhdlParserTokenManager.h
+++ b/vhdlparser/VhdlParserTokenManager.h
@@ -121,8 +121,8 @@ void  TokenLexicalActions(Token *matchedToken);
   const JAVACC_SIMPLE_STRING jjKindsForBitVector(int i, unsigned long long vec);
   const JAVACC_SIMPLE_STRING jjKindsForStateVector(int lexState, int vec[], int start, int end);
   JAVACC_CHARSTREAM*        input_stream;
-  int                       jjrounds[75];
-  int                       jjstateSet[2 * 75];
+  int                       jjrounds[76];
+  int                       jjstateSet[2 * 76];
   JAVACC_STRING_TYPE        jjimage;
   JAVACC_STRING_TYPE        image;
   int                       jjimageLen;
diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj
index 0225183..7b56cef 100644
--- a/vhdlparser/vhdlparser.jj
+++ b/vhdlparser/vhdlparser.jj
@@ -18,7 +18,7 @@ options {
   TOKEN_MANAGER_INCLUDES="VhdlParser.h";
 
  //OUTPUT_DIRECTORY = ".";
-// DEBUG_PARSER=true;
+ //DEBUG_PARSER=true;
  //DEBUG_LOOKAHEAD=true;
 
   }
@@ -55,7 +55,7 @@ static void addProto(const char *s1,const char *s2,const char *s3,const char *s4
 static void addConfigureNode(const char* a,const char*b, bool,bool isLeaf,bool inlineConf);
 static void createFunction(const char *impure,uint64 spec,const char *fname);
 static void addVhdlType(const char *n,int startLine,int section, uint64 spec,const char* args,const char* type,Protection prot);
-static void addCompInst(char *n, char* instName, char* comp,int iLine);
+static void addCompInst(const char *n, const char* instName, const char* comp,int iLine);
 static void handleCommentBlock(const char* doc,bool brief);
 static void handleFlowComment(const char*);
 static void initEntry(Entry *e);
@@ -86,6 +86,7 @@ SKIP:
   <#DOXYGEN_VHDL_COMMENT: (" "|"\t")*"--!"(~["\n", "\r"])* ("\n" | "\r" | "\r\n")?>
   | <MULT_DOXYGEN_COMMENT: (<DOXYGEN_VHDL_COMMENT>)+ >
   {
+    {
     QCString doc(image.data());
     int count=doc.contains("--!");
     ::vhdl::parser::VhdlParser::setMultCommentLine();
@@ -94,6 +95,7 @@ SKIP:
       ::vhdl::parser::VhdlParser::oneLineComment(doc);
     else
       ::vhdl::parser::VhdlParser::handleCommentBlock(image.data(),FALSE); ;
+    }
 
   }
   |<VHDL_FLOWCHART_COMMENT: "--#" (~["\n", "\r"])* ("\n" | "\r" | "\r\n")?>  { ::vhdl::parser::VhdlParser::handleFlowComment(image.data());}
@@ -108,10 +110,12 @@ SKIP :
 {
   <MULT_DOXYGEN_VHDL_COMMENT_2008 : "/*!"  (~[])* "*/" >
   {
-   QCString q(image.data());
-   q.stripPrefix("/*!");
-   q.resize(q.length()-2);
-  ::vhdl::parser::VhdlParser::handleCommentBlock(q.data(),TRUE);image.clear();
+   {
+     QCString q(image.data());
+     q.stripPrefix("/*!");
+     q.resize(q.length()-2);
+     ::vhdl::parser::VhdlParser::handleCommentBlock(q.data(),TRUE);image.clear();
+   }
   }
   | <MULT_VHDL_2008_COMMENT : "/*"  (~[])* "*/" >  {::vhdl::parser::VhdlParser::lineCount(image.data());image.clear();}
 }
@@ -252,7 +256,7 @@ TOKEN :
 | < COMMA_T: "," >
 | < VARASSIGN_T: ":=" >
 | < COLON_T: ":" >
-| < SEMI_T: ";" >
+| < SEMI_T: ";" >{::vhdl::parser::VhdlParser::setLineParsed(SEMI_T);}
 | < LESSTHAN_T: "<=" >
 | < GREATERTHAN_T: ">=" >
 | < LT_T: "<" >
@@ -289,7 +293,7 @@ TOKEN:
  | <STRINGLITERAL: (( ["\""](<GRAPHIC_CHARACTER>)*) "\"")+ >
  | <BASIC_IDENTIFIER:  (<LETTER> ( (["_"])* <LETTER_OR_DIGIT> )*) >
  | <EXTENDED_CHARACTER: ( ["\\"](<GRAPHIC_CHARACTER>)*["\\"] ) >
- | <CHARACTER_LITERAL: (["'"]<GRAPHIC_CHARACTER>["'"]) >
+ | <CHARACTER_LITERAL: (["'"](<GRAPHIC_CHARACTER>|<QUOTE>)["'"]) >
  | <DECIMAL_LITERAL: (<INTEGER> (["."]<INTEGER>)? (<EXPONENT>)? ) >
  | <BASED_INTEGER: <LETTER_OR_DIGIT>( <LETTER_OR_DIGIT>)* >
  | <BASED_LITERAL: <INTEGER>["#"]<BASED_INTEGER>(["."] <BASED_INTEGER>)? ["#"] (<EXPONENT>)? >
@@ -299,13 +303,14 @@ TOKEN:
  | < #LETTER_OR_DIGIT: ( <LETTER> | <DIGIT> ) >
  | < #LETTER: (<UPPER_CASE_LETTER>|<LOWER_CASE_LETTER>) >
  | < #UPPER_CASE_LETTER: ["A"-"Z"]  >
- | <BIT_STRING_LITERAL : <BASE_SPECIFIER >["\""](<LETTER_OR_DIGIT>)* ["\""] >
+ | <BIT_STRING_LITERAL : <BASE_SPECIFIER >["\""](<LETTER_OR_DIGIT>((["_"])*<LETTER_OR_DIGIT>)*) ["\""] >
  | <#BASE_SPECIFIER:["B","O","X","b","o","x"]>
  | < #DIGIT: ["0"-"9"] >
  | < #SPECIAL_CHARACTER: ["#","&","'","(",")","*","+",",","-",".","/",":",";","<","=",">","_","|"] >
  | < #OTHER_SPECIAL_CHARACTER: ["%","!","$","@","?","[","\\","]","^","`","{","}","~","\u00A0"-"\u00FF"]>
  | < #SPACE_CHARACTER: [" ","\t"] >
  | < #LOWER_CASE_LETTER: ["a"-"z"] >
+ | < #QUOTE: ["\""] >
  | <VHDL2008TOOLDIR  : ["`"](<GRAPHIC_CHARACTER>|<STRINGLITERAL>)+ >
 
 }
@@ -577,7 +582,7 @@ attribute_declaration()
 LOOKAHEAD(3)
 group_template_declaration()
 | group_declaration()
-| <VHDL2008TOOLDIR>
+//| <VHDL2008TOOLDIR>
 }
 
 void block_declarative_part() : {}
@@ -651,12 +656,12 @@ QCString character_literal() :  {Token *tok=0;}
 
 QCString choice() : {QCString s;}
 {
-   LOOKAHEAD(simple_expression())
-  s=simple_expression(){ return s; }
-  |
   LOOKAHEAD(discrete_range())
   s=discrete_range(){ return s; }
   |
+   LOOKAHEAD(simple_expression())
+   s=simple_expression(){ return s; }
+  |
   LOOKAHEAD(identifier())
   s=identifier(){ return s; }
   | <OTHER_T> { return " others "; }
@@ -708,7 +713,7 @@ instantiation_list() <COLON_T> name()
 QCString composite_type_definition() :  { QCString s,s1;}
 {
  s=array_type_definition(){ return s; }
-| record_type_definition(){ return s; }
+| record_type_definition(){ return s+"#"; }
 }
 
 void concurrent_assertion_statement() :  {}
@@ -946,7 +951,13 @@ return s1;
 
 QCString element_declaration() :  {QCString s,s1;}
 {
-s=identifier_list() <COLON_T> s1=subtype_indication() <SEMI_T> {return s+":"+s1;}
+s=identifier_list() <COLON_T> s1=subtype_indication() <SEMI_T>
+{
+
+  addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,s1.data(),Public);
+  //addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public);
+  return s+":"+s1;
+}
 }
 
 
@@ -1186,16 +1197,37 @@ QCString formal_part() : {QCString s,s1;}
 s=name() [<LPAREN_T> formal_designator() <RPAREN_T> {s+"("+s1+")";}] {return s;}
 }
 
-QCString full_type_declaration() :  {QCString s,s1,s2;}
+QCString full_type_declaration() :  {Entry *tmpEntry;QCString s,s1,s2;}
 {
 <TYPE_T> s=identifier() <IS_T>
+{
+  tmpEntry=current;
+  addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,0,Public);
+}
  try{
      s2=type_definition()
        }catch(...){error_skipto(SEMI_T);}
      <SEMI_T>
      {
-       addVhdlType(s.data(),getLine(TYPE_T),Entry::VARIABLE_SEC,VhdlDocGen::TYPE,0,s2.data(),Public);
-          return "type "+s+" is "+s2+";";
+      if (s2.contains("#")) {
+        VhdlDocGen::deleteAllChars(s2,'#');
+        tmpEntry->spec=VhdlDocGen::RECORD;
+        tmpEntry->type=s2.data();
+        //addVhdlType(s.data(),getLine(TYPE_T),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,s2.data(),Public);
+      }
+      else if (s2.contains("%")) {
+        VhdlDocGen::deleteAllChars(s2,'%');
+        tmpEntry->spec=VhdlDocGen::UNITS;
+        tmpEntry->type=s2.data();
+        //addVhdlType(s.data(),getLine(TYPE_T),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,s2.data(),s2.data(),Public);
+      }
+      else {
+        tmpEntry->spec=VhdlDocGen::TYPE;
+        tmpEntry->type=s2.data();
+        //addVhdlType(s.data(),getLine(TYPE_T),Entry::VARIABLE_SEC,VhdlDocGen::TYPE,0,s2.data(),Public);
+      }
+      tmpEntry=0;
+      return "type "+s+" is "+s2+";";
      }
 }
 
@@ -1757,15 +1789,13 @@ QCString physical_literal() :  {QCString s,s1;}
 QCString physical_type_definition() : {QCString s,s1,s2;}
 {
         <UNITS_T>
-            s=identifier()<SEMI_T>
-            (s1=secondary_unit_declaration(){s2+=s1;s2+="#";})*
+            s=identifier()<SEMI_T> { addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,0,Public);}
+            (
+             s1=secondary_unit_declaration()
+            )*
             <END_T> <UNITS_T>  [name()]
-            {
-             current->args=s2;
-               current->args.prepend("units");
-             current->spec=VhdlDocGen::UNITS;
-            return s2;
-           }
+            { return s+"%";}
+
 }
 
 void port_clause() :  {}
@@ -1984,7 +2014,7 @@ QCString scalar_type_definition() : {QCString s,s1;}
 {
 
 s=enumeration_type_definition(){ return s;}
-| s=range_constraint() [LOOKAHEAD( physical_type_definition()) s1=physical_type_definition()] { s+=" ";s+=s1;return s;}
+| s=range_constraint() [LOOKAHEAD( physical_type_definition()) s1=physical_type_definition()] { return s+" "+s1+"%";}
 }
 
 void secondary_unit() :  {}
@@ -1995,7 +2025,12 @@ architecture_body()
 
 QCString secondary_unit_declaration() :  {QCString s,s1;}
 {
-s=identifier() <EQU_T> s1=physical_literal() <SEMI_T> { return s+"="+s1; }
+s=identifier() <EQU_T> s1=physical_literal() <SEMI_T>
+{
+  //printf("\n %s %s [%d]",s.data(),s1.data(),getLine());
+  addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,s1.data(),Public);
+
+  return s+"="+s1; }
 }
 
 QCString selected_name() : {QCString s,s1;}
@@ -2612,9 +2647,10 @@ void generate_statement_body() : {}
 
 void generate_statement_body1() : {}
 {
-   LOOKAHEAD(block_declarative_item()<BEGIN_T> )
-   (block_declarative_item() )*  <BEGIN_T> (concurrent_statement())*
-   | (concurrent_statement())*
+  //   [LOOKAHEAD(block_declarative_item()<BEGIN_T> )(block_declarative_item() )*  <BEGIN_T>] (concurrent_statement())*
+
+   [(LOOKAHEAD(block_declarative_item())block_declarative_item() )*  <BEGIN_T>] (concurrent_statement())*
+  // | (concurrent_statement())*
 }
 
 QCString external_name(): {QCString s,s1,s2;}
diff --git a/vhdlparser/vhdlstring.h b/vhdlparser/vhdlstring.h
index f15ef6c..fde6ce4 100644
--- a/vhdlparser/vhdlstring.h
+++ b/vhdlparser/vhdlstring.h
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+
 /** @brief Minimal string class with std::string like behaviour that fulfills the JavaCC
  *  string requirements.
  */
diff --git a/winbuild/.gitignore b/winbuild/.gitignore
index a073474..e69de29 100644
--- a/winbuild/.gitignore
+++ b/winbuild/.gitignore
@@ -1,7 +0,0 @@
-Debug/
-Debug64/
-Release/
-Release64/
-Doxygen.ncb
-Doxygen.suo
-*.user
\ No newline at end of file
diff --git a/winbuild/Config.rules b/winbuild/Config.rules
deleted file mode 100644
index 788497d..0000000
--- a/winbuild/Config.rules
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
-	Name="config"
-	Version="8.00"
-	>
-	<Rules>
-		<CustomBuildRule
-			Name="Config"
-			DisplayName="Config"
-			CommandLine="python &quot;$(ProjectDir)..\src\configgen.py&quot; -cpp [AllOptions] [AdditionalOptions] [inputs] &gt; $(IntDir)/$(InputName)options.cpp"
-			Outputs="$(IntDir)/$(InputName)options.cpp"
-			FileExtensions="*.xml"
-			AdditionalDependencies="$(ProjectDir)..\src\configgen.py"
-			ExecutionDescription="Executing configgen for doxygen..."
-			ShowOnlyRuleProperties="false"
-			>
-		</CustomBuildRule>
-		<CustomBuildRule
-			Name="Config_dw"
-			DisplayName="Config"
-			CommandLine="python &quot;$(ProjectDir)..\src\configgen.py&quot; -wiz [AllOptions] [AdditionalOptions] [inputs]  &gt; $(IntDir)/$(InputName)doc.cpp"
-			Outputs="$(IntDir)/$(InputName)doc.cpp"
-			FileExtensions="*.xml"
-			AdditionalDependencies="$(ProjectDir)..\src\configgen.py"
-			ExecutionDescription="Executing configgen for doxywizard ..."
-			ShowOnlyRuleProperties="false"
-			>
-		</CustomBuildRule>
-	</Rules>
-</VisualStudioToolFile>
diff --git a/winbuild/Doxygen.sln b/winbuild/Doxygen.sln
deleted file mode 100644
index 98e1c36..0000000
--- a/winbuild/Doxygen.sln
+++ /dev/null
@@ -1,71 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Doxygen", "Doxygen.vcproj", "{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B6BB4771-8A4E-4656-AC08-1EF8AC182F64} = {B6BB4771-8A4E-4656-AC08-1EF8AC182F64}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtools", "qtools.vcproj", "{B6BB4771-8A4E-4656-AC08-1EF8AC182F64}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doxywizard", "Doxywizard.vcproj", "{77C9C2D3-EA3F-3D59-8B4C-0ED852890172}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doxysearch", "doxysearch.vcproj", "{F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doxyindexer", "doxyindexer.vcproj", "{E543983A-D5BF-4865-B4A1-6D7EF2E1051C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B6BB4771-8A4E-4656-AC08-1EF8AC182F64} = {B6BB4771-8A4E-4656-AC08-1EF8AC182F64}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Debug|Win32.Build.0 = Debug|Win32
-		{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Debug|x64.ActiveCfg = Debug|x64
-		{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Debug|x64.Build.0 = Debug|x64
-		{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Release|Win32.ActiveCfg = Release|Win32
-		{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Release|Win32.Build.0 = Release|Win32
-		{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Release|x64.ActiveCfg = Release|x64
-		{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Release|x64.Build.0 = Release|x64
-		{B6BB4771-8A4E-4656-AC08-1EF8AC182F64}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B6BB4771-8A4E-4656-AC08-1EF8AC182F64}.Debug|Win32.Build.0 = Debug|Win32
-		{B6BB4771-8A4E-4656-AC08-1EF8AC182F64}.Debug|x64.ActiveCfg = Debug|x64
-		{B6BB4771-8A4E-4656-AC08-1EF8AC182F64}.Debug|x64.Build.0 = Debug|x64
-		{B6BB4771-8A4E-4656-AC08-1EF8AC182F64}.Release|Win32.ActiveCfg = Release|Win32
-		{B6BB4771-8A4E-4656-AC08-1EF8AC182F64}.Release|Win32.Build.0 = Release|Win32
-		{B6BB4771-8A4E-4656-AC08-1EF8AC182F64}.Release|x64.ActiveCfg = Release|x64
-		{B6BB4771-8A4E-4656-AC08-1EF8AC182F64}.Release|x64.Build.0 = Release|x64
-		{77C9C2D3-EA3F-3D59-8B4C-0ED852890172}.Debug|Win32.ActiveCfg = Debug|Win32
-		{77C9C2D3-EA3F-3D59-8B4C-0ED852890172}.Debug|Win32.Build.0 = Debug|Win32
-		{77C9C2D3-EA3F-3D59-8B4C-0ED852890172}.Debug|x64.ActiveCfg = Debug|x64
-		{77C9C2D3-EA3F-3D59-8B4C-0ED852890172}.Debug|x64.Build.0 = Debug|x64
-		{77C9C2D3-EA3F-3D59-8B4C-0ED852890172}.Release|Win32.ActiveCfg = Release|Win32
-		{77C9C2D3-EA3F-3D59-8B4C-0ED852890172}.Release|Win32.Build.0 = Release|Win32
-		{77C9C2D3-EA3F-3D59-8B4C-0ED852890172}.Release|x64.ActiveCfg = Release|x64
-		{77C9C2D3-EA3F-3D59-8B4C-0ED852890172}.Release|x64.Build.0 = Release|x64
-		{F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}.Debug|Win32.Build.0 = Debug|Win32
-		{F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}.Debug|x64.ActiveCfg = Debug|Win32
-		{F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}.Release|Win32.ActiveCfg = Release|Win32
-		{F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}.Release|Win32.Build.0 = Release|Win32
-		{F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}.Release|x64.ActiveCfg = Release|Win32
-		{F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}.Release|x64.Build.0 = Release|Win32
-		{E543983A-D5BF-4865-B4A1-6D7EF2E1051C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E543983A-D5BF-4865-B4A1-6D7EF2E1051C}.Debug|Win32.Build.0 = Debug|Win32
-		{E543983A-D5BF-4865-B4A1-6D7EF2E1051C}.Debug|x64.ActiveCfg = Debug|x64
-		{E543983A-D5BF-4865-B4A1-6D7EF2E1051C}.Debug|x64.Build.0 = Debug|x64
-		{E543983A-D5BF-4865-B4A1-6D7EF2E1051C}.Release|Win32.ActiveCfg = Release|Win32
-		{E543983A-D5BF-4865-B4A1-6D7EF2E1051C}.Release|Win32.Build.0 = Release|Win32
-		{E543983A-D5BF-4865-B4A1-6D7EF2E1051C}.Release|x64.ActiveCfg = Release|x64
-		{E543983A-D5BF-4865-B4A1-6D7EF2E1051C}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/winbuild/Doxygen.vcproj b/winbuild/Doxygen.vcproj
deleted file mode 100644
index 03764f2..0000000
--- a/winbuild/Doxygen.vcproj
+++ /dev/null
@@ -1,5008 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9,00"

-	Name="Doxygen"

-	ProjectGUID="{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}"

-	RootNamespace="Doxygen"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-		<ToolFile

-			RelativePath=".\Lex.rules"

-		/>

-		<ToolFile

-			RelativePath=".\Settings.rules"

-		/>

-		<ToolFile

-			RelativePath=".\Unistd.rules"

-		/>

-		<ToolFile

-			RelativePath=".\Version.rules"

-		/>

-		<ToolFile

-			RelativePath=".\Config.rules"

-		/>

-		<ToolFile

-			RelativePath=".\Gen_head.rules"

-		/>

-		<ToolFile

-			RelativePath=".\GenResources.rules"

-		/>

-		<ToolFile

-			RelativePath=".\Languages.rules"

-		/>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\bin\Debug"

-			IntermediateDirectory=".\Debug\doxygen"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="Config_dw"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="Config"

-			/>

-			<Tool

-				Name="Version"

-			/>

-			<Tool

-				Name="Settings"

-			/>

-			<Tool

-				Name="Unistd"

-			/>

-			<Tool

-				Name="Gen_head"

-			/>

-			<Tool

-				Name="GenResources"

-			/>

-			<Tool

-				Name="Languages"

-			/>

-			<Tool

-				Name="Lex"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Debug\doxygen\Doxygen.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalOptions="/Zm200 "

-				Optimization="0"

-				AdditionalIncludeDirectories="..\src,..\qtools,..\libpng,..\libmd5,..\vhdlparser,$(IntDir),."

-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG; _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;CHARSET_STATIC"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				PrecompiledHeaderFile=".\Debug\doxygen/Doxygen.pch"

-				AssemblerListingLocation=".\Debug\doxygen/"

-				ObjectFile=".\Debug\doxygen/"

-				ProgramDataBaseFileName=".\Debug\doxygen\$(TargetName).pdb"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qtools.lib ws2_32.lib iconv.lib shell32.lib"

-				OutputFile="..\bin\Debug\doxygen.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="Debug"

-				GenerateManifest="false"

-				IgnoreDefaultLibraryNames="libcmtd.lib libcpmtd.lib libcmt.lib"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug\doxygen\$(TargetName).pdb"

-				SubSystem="1"

-				LargeAddressAware="2"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Debug\doxygen/Doxygen.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\bin\Debug64"

-			IntermediateDirectory=".\Debug64\doxygen"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="Config_dw"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="Config"

-			/>

-			<Tool

-				Name="Version"

-			/>

-			<Tool

-				Name="Settings"

-			/>

-			<Tool

-				Name="Unistd"

-			/>

-			<Tool

-				Name="Gen_head"

-			/>

-			<Tool

-				Name="GenResources"

-			/>

-			<Tool

-				Name="Languages"

-			/>

-			<Tool

-				Name="Lex"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\Debug64\doxygen\Doxygen.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalOptions="/Zm200 /bigobj"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\src,..\qtools,..\libpng,..\libmd5,..\vhdlparser,$(IntDir),."

-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG; _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;CHARSET_STATIC"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				PrecompiledHeaderFile=".\Debug64\doxygen/Doxygen.pch"

-				AssemblerListingLocation=".\Debug64\doxygen/"

-				ObjectFile=".\Debug64\doxygen/"

-				ProgramDataBaseFileName=".\Debug64\doxygen\$(TargetName).pdb"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qtools.lib ws2_32.lib iconv64.lib shell32.lib"

-				OutputFile="..\bin\Debug64\doxygen.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="Debug64"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug64\doxygen\$(TargetName).pdb"

-				SubSystem="1"

-				LargeAddressAware="2"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Debug64\doxygen/Doxygen.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\bin\Release"

-			IntermediateDirectory=".\Release\doxygen"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="Config_dw"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="Config"

-			/>

-			<Tool

-				Name="Version"

-			/>

-			<Tool

-				Name="Settings"

-			/>

-			<Tool

-				Name="Unistd"

-			/>

-			<Tool

-				Name="Gen_head"

-			/>

-			<Tool

-				Name="GenResources"

-			/>

-			<Tool

-				Name="Languages"

-			/>

-			<Tool

-				Name="Lex"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Release\doxygen\Doxygen.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalOptions="/Zm200 "

-				Optimization="2"

-				InlineFunctionExpansion="2"

-				OmitFramePointers="true"

-				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="..\src,..\qtools,..\libpng,..\libmd5,..\vhdlparser,$(IntDir),."

-				PreprocessorDefinitions="WIN32;_CINDEX_LIB_;_CINDEX_LIB_;NDEBUG;_CONSOLE; _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;CHARSET_STATIC"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\Release\doxygen/Doxygen.pch"

-				AssemblerListingLocation=".\Release\doxygen/"

-				ObjectFile=".\Release\doxygen/"

-				ProgramDataBaseFileName=".\Release\doxygen\$(TargetName).pdb"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/LTCG"

-				AdditionalDependencies="qtools.lib iconv.lib shell32.lib"
-				OutputFile="..\bin\Release\doxygen.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="Release"

-				ProgramDatabaseFile=".\Release\doxygen\$(TargetName).pdb"

-				SubSystem="1"

-				LargeAddressAware="2"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Release\doxygen/Doxygen.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\bin\Release64"

-			IntermediateDirectory=".\Release64\doxygen"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="Config_dw"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="Config"

-			/>

-			<Tool

-				Name="Version"

-			/>

-			<Tool

-				Name="Settings"

-			/>

-			<Tool

-				Name="Unistd"

-			/>

-			<Tool

-				Name="Gen_head"

-			/>

-			<Tool

-				Name="GenResources"

-			/>

-			<Tool

-				Name="Languages"

-			/>

-			<Tool

-				Name="Lex"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\Release64\doxygen\Doxygen.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalOptions="/Zm200 "

-				Optimization="2"

-				InlineFunctionExpansion="2"

-				OmitFramePointers="true"

-				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="..\src,..\qtools,..\libpng,..\libmd5,..\vhdlparser,$(IntDir),."

-				PreprocessorDefinitions="WIN32;_CINDEX_LIB_;_CINDEX_LIB_;NDEBUG;_CONSOLE; _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;CHARSET_STATIC"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\Release64\doxygen/Doxygen.pch"

-				AssemblerListingLocation=".\Release64\doxygen/"

-				ObjectFile=".\Release64\doxygen/"

-				ProgramDataBaseFileName=".\Release64\doxygen\$(TargetName).pdb"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/LTCG"

-				AdditionalDependencies="qtools.lib iconv64.lib shell32.lib"
-				OutputFile="..\bin\Release64\doxygen.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="Release64"

-				ProgramDatabaseFile=".\Release64\doxygen\$(TargetName).pdb"

-				SubSystem="1"

-				LargeAddressAware="2"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Release64\doxygen/Doxygen.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-			>

-			<File

-				RelativePath="..\src\arguments.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\ce_parse.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\CharStream.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\src\cite.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\clangparser.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\classdef.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\classlist.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\cmdmapper.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\code.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\commentcnv.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\commentscan.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\condparser.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\config.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\configoptions.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\constexp.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\context.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\cppvalue.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\dbusxmlscanner.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\debug.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\declinfo.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\defargs.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\defgen.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\define.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\definition.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\dia.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\diagram.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\dirdef.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\docbookgen.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\docbookvisitor.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\docparser.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\docsets.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\doctokenizer.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\dot.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\doxygen.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\eclipsehelp.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\entry.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\filedef.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\filename.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\fileparser.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\formula.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\fortrancode.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\fortranscanner.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\ftextstream.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\ftvhelp.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\groupdef.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\htags.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\htmldocvisitor.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\htmlentity.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\htmlgen.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\htmlhelp.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\image.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\index.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\language.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\latexdocvisitor.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\latexgen.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\layout.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\lodepng.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\logos.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\main.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\mandocvisitor.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\mangen.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\markdown.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\marshal.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\libmd5\md5.c"

-				>

-			</File>

-			<File

-				RelativePath="..\src\memberdef.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\membergroup.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\memberlist.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\membername.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\message.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\msc.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\namespacedef.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\objcache.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\outputgen.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\outputlist.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\pagedef.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\ParseException.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\src\perlmodgen.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\plantuml.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\portable.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\portable_c.c"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\pre.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\pycode.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\pyscanner.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\qhp.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\qhpxmlwriter.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\reflist.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\resourcemgr.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\rtfdocvisitor.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\rtfgen.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\rtfstyle.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\scanner.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\searchindex.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\sqlite3gen.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\store.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\tagreader.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\tclscanner.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\template.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\textdocvisitor.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\textdocvisitor.h"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\Token.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\TokenMgrError.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\src\tooltip.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\util.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\version.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\vhdldocgen.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\vhdljjparser.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\VhdlParser.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\VhdlParserIF.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\VhdlParserTokenManager.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\src\xmldocvisitor.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\xmlgen.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Yacc Files"

-			Filter="y"

-			>

-			<File

-				RelativePath="..\src\constexp.y"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="Running bison on constexp.y"

-						CommandLine="bison -l -d -p ce_parseexpYY &quot;$(InputPath)&quot; -o $(IntDir)\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY &quot;$(InputPath)&quot; -o $(IntDir)\ce_parse.cpp&#x0D;&#x0A;del $(IntDir)\ce_parse.c&#x0D;&#x0A;"

-						Outputs="$(IntDir)\ce_parse.cpp"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="Running bison on constexp.y"

-						CommandLine="bison -l -d -p ce_parseexpYY &quot;$(InputPath)&quot; -o $(IntDir)\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY &quot;$(InputPath)&quot; -o $(IntDir)\ce_parse.cpp&#x0D;&#x0A;del $(IntDir)\ce_parse.c&#x0D;&#x0A;"

-						Outputs="$(IntDir)\ce_parse.cpp"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="Running bison on constexp.y"

-						CommandLine="bison -l -d -p ce_parseexpYY &quot;$(InputPath)&quot; -o $(IntDir)\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY &quot;$(InputPath)&quot; -o $(IntDir)\ce_parse.cpp&#x0D;&#x0A;del $(IntDir)\ce_parse.c&#x0D;&#x0A;"

-						Outputs="$(IntDir)\ce_parse.cpp"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="Running bison on constexp.y"

-						CommandLine="bison -l -d -p ce_parseexpYY &quot;$(InputPath)&quot; -o $(IntDir)\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY &quot;$(InputPath)&quot; -o $(IntDir)\ce_parse.cpp&#x0D;&#x0A;del $(IntDir)\ce_parse.c&#x0D;&#x0A;"

-						Outputs="$(IntDir)\ce_parse.cpp"

-					/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="Lex Files"

-			Filter="l"

-			>

-			<File

-				RelativePath="..\src\code.l"

-				>

-			</File>

-			<File

-				RelativePath="..\src\commentcnv.l"

-				>

-			</File>

-			<File

-				RelativePath="..\src\commentscan.l"

-				>

-			</File>

-			<File

-				RelativePath="..\src\config.l"

-				>

-			</File>

-			<File

-				RelativePath="..\src\constexp.l"

-				>

-			</File>

-			<File

-				RelativePath="..\src\declinfo.l"

-				>

-			</File>

-			<File

-				RelativePath="..\src\defargs.l"

-				>

-			</File>

-			<File

-				RelativePath="..\src\doctokenizer.l"

-				>

-			</File>

-			<File

-				RelativePath="..\src\fortrancode.l"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="Lex"

-						Case="true"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="Lex"

-						Case="true"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="Lex"

-						Case="true"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="Lex"

-						Case="true"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\fortranscanner.l"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="Lex"

-						Case="true"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="Lex"

-						Case="true"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="Lex"

-						Case="true"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="Lex"

-						Case="true"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\pre.l"

-				>

-			</File>

-			<File

-				RelativePath="..\src\pycode.l"

-				>

-			</File>

-			<File

-				RelativePath="..\src\pyscanner.l"

-				>

-			</File>

-			<File

-				RelativePath="..\src\scanner.l"

-				>

-			</File>

-			<File

-				RelativePath="..\src\tclscanner.l"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="Lex"

-						Case="true"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="Lex"

-						Case="true"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="Lex"

-						Case="true"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="Lex"

-						Case="true"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\vhdlcode.l"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="Lex"

-						Case="true"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="Lex"

-						Case="true"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="Lex"

-						Case="true"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="Lex"

-						Case="true"

-					/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="Python Files"

-			>

-			<File

-				RelativePath="..\src\lang_cfg.py"

-				>

-				<FileConfiguration
-					Name="Debug|win32"
-					>
-					<Tool
-						Name="Languages"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|win32"
-					>
-					<Tool
-						Name="Languages"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="Languages"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="Languages"
-					/>
-				</FileConfiguration>
-			</File>

-			<File

-				RelativePath="..\src\settings.py"

-				>

-				<FileConfiguration
-					Name="Debug|win32"
-					>
-					<Tool
-						Name="Settings"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|win32"
-					>
-					<Tool
-						Name="Settings"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="Settings"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="Settings"
-					/>
-				</FileConfiguration>
-			</File>

-			<File

-				RelativePath="unistd.py"

-				>

-				<FileConfiguration
-					Name="Debug|win32"
-					>
-					<Tool
-						Name="Unistd"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|win32"
-					>
-					<Tool
-						Name="Unistd"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="Unistd"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="Unistd"
-					/>
-				</FileConfiguration>
-			</File>

-			<File

-				RelativePath="..\src\version.py"

-				>

-				<FileConfiguration
-					Name="Debug|win32"
-					>
-					<Tool
-						Name="Version"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|win32"
-					>
-					<Tool
-						Name="Version"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="Version"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="Version"
-					/>
-				</FileConfiguration>
-			</File>

-		</Filter>

-		<Filter

-			Name="XML Files"

-			Filter="xml"

-			>

-			<File

-				RelativePath="..\src\config.xml"

-				>

-				<FileConfiguration

-					Name="Debug|win32"

-					>

-					<Tool

-						Name="Config"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|win32"

-					>

-					<Tool

-						Name="Config"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="Config"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="Config"

-					/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="Generating Resource Files"

-			>

-                        <File
-                                RelativePath="..\templates\html\arrowdown.luma"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\arrowright.luma"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\bc_s.luma"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\bdwn.luma"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\bib2xhtml.pl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\close.png"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\closed.luma"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\doc.luma"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\doxygen.bst"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\doxygen.css"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\doxygen.luma"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\dynsections.js"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\extsearch.js"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\folderclosed.luma"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\folderopen.luma"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\footer.html"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\header.html"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlallmembers.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlannotated.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlbase.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlclass.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlclasses.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlclmembers.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlclmembersindex.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmldeclcomp.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmldir.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmldirtree.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmldyncontents.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmldynheader.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlfile.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlfiles.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlflmembers.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlinclude.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlindexpages.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmljsnavindex.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmljsnavtree.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmllayout.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlmemberindex.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlmembersindex.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlmembertabs.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlmemdecl.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlmemdecls.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlmemdef.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlmeminherit.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlmemlist.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlmemsummary.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlmodule.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlmodules.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlnamespace.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlnamespaces.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlnavpath.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlnavtree.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlnsmembers.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlnsmembersindex.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlobjlink.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlpage.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlpages.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmlsource.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmltabs.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\htmltypeconstraints.tpl"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\jquery.js"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\mag.png"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\mag_sel.png"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\nav_f.lum"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\nav_g.png"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\nav_h.lum"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\navtree.css"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\navtree.js"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\open.luma"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\resize.js"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\search.css"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\search.js"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\search_functions.php"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\search_l.png"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\search_m.png"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\search_opensearch.php"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\search_r.png"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\splitbar.lum"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\svgpan.js"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\sync_off.luma"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\sync_on.luma"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\tab_a.lum"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\tab_b.lum"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\tab_h.lum"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\tab_s.lum"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\html\tabs.css"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\latex\doxygen.sty"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\xml\compound.xsd"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\templates\xml\index.xsd"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="GenResources"
-                                        />
-                                </FileConfiguration>
-                        </File>
-		</Filter>

-		<Filter

-			Name="Generating header Files"

-			>

-			<File

-				RelativePath="..\src\layout_default.xml"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="Gen_head"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="Gen_head"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="Gen_head"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="Gen_head"

-					/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl"

-			>

-			<File

-				RelativePath="..\src\arguments.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\bufstr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\ce_parse.h"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\CharStream.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\cite.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\clangparser.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\classdef.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\classlist.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\cmdmapper.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\code.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\commentcnv.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\commentscan.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\condparser.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\config.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\constexp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\context.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\cppvalue.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\dbusxmlscanner.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\debug.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\declinfo.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\defargs.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\defgen.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\define.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\definition.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\dia.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\diagram.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\dirdef.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\docbookgen.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\docbookvisitor.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\docparser.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\docsets.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\doctokenizer.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\docvisitor.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\dot.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\doxygen.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\eclipsehelp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\entry.h"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\ErrorHandler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\example.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\filedef.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\filename.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\fileparser.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\formula.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\fortrancode.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\fortranscanner.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\ftextstream.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\ftvhelp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\groupdef.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\htags.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\htmlattrib.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\htmldocvisitor.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\htmlentity.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\htmlgen.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\htmlhelp.h"

-				>

-			</File>

-			<File

-				RelativePath=".\iconv.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\image.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\index.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\instdox.h"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\JavaCC.h"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\lang_cfg.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\language.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\latexdocvisitor.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\latexgen.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\layout.h"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\layout_default_xml.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\lockingptr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\lodepng.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\logos.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\mandocvisitor.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\mangen.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\marshal.h"

-				>

-			</File>

-			<File

-				RelativePath="..\libmd5\md5.h"

-				>

-			</File>

-			<File

-				RelativePath="..\libmd5\md5_loc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\memberdef.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\membergroup.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\memberlist.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\membername.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\message.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\msc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\namespacedef.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\navtree_css.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\objcache.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\outputgen.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\outputlist.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\pagedef.h"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\ParseException.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\parserintf.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\perlmodgen.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\plantuml.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\portable.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\pre.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\printdocvisitor.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\pycode.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\pyscanner.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\qhp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\qhpxmlwriter.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\qtbc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\reflist.h"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\resources.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\resourcemgr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\rtfdocvisitor.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\rtfgen.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\rtfstyle.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\scanner.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\searchindex.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\section.h"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\settings.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\sortdict.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\store.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\tagreader.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\tclscanner.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\template.h"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\Token.h"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\TokenManager.h"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\TokenMgrError.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\tooltip.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_adapter.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_am.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_ar.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_br.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_ca.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_cn.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_cz.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_de.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_dk.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_en.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_eo.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_es.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_fa.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_fi.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_fr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_gr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_hr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_hu.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_id.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_it.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_je.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_jp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_ke.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_kr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_lt.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_lv.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_mk.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_nl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_no.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_pl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_pt.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_ro.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_ru.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_sc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_si.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_sk.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_sr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_sv.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_tr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_tw.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_ua.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_vi.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\translator_za.h"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\unistd.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\util.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\version.h"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\vhdlcode.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\src\vhdlcode.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\vhdldocgen.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\vhdljjparser.h"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\vhdlparser.h"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\VhdlParserConstants.h"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\VhdlParserErrorHandler.hpp"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\VhdlParserIF.h"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\VhdlParserTokenManager.h"

-				>

-			</File>

-			<File

-				RelativePath="..\vhdlparser\vhdlstring.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\xmldocvisitor.h"

-				>

-			</File>

-			<File

-				RelativePath="..\src\xmlgen.h"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/winbuild/Doxywizard.vcproj b/winbuild/Doxywizard.vcproj
deleted file mode 100755
index c424dc6..0000000
--- a/winbuild/Doxywizard.vcproj
+++ /dev/null
@@ -1,718 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9,00"

-	Name="doxywizard"

-	ProjectGUID="{77C9C2D3-EA3F-3D59-8B4C-0ED852890172}"

-	Keyword="Qt4VSv1.0"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-		<ToolFile

-			RelativePath=".\Lex.rules"

-		/>

-		<ToolFile

-			RelativePath=".\Version.rules"

-		/>

-		<ToolFile

-			RelativePath=".\Settings.rules"

-		/>

-		<ToolFile

-			RelativePath=".\Unistd.rules"

-		/>

-		<ToolFile

-			RelativePath=".\Config.rules"

-		/>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\bin\Debug"

-			IntermediateDirectory=".\Debug\doxywizard"

-			ConfigurationType="1"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="Version"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="Lex"

-			/>

-			<Tool

-				Name="Config"

-			/>

-			<Tool

-				Name="Config_dw"

-			/>

-			<Tool

-				Name="Settings"

-			/>

-			<Tool

-				Name="Unistd"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				WarningLevel="0"

-				DefaultCharType="0"

-				EnableErrorChecks="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalOptions="-Zm200 -w34100 -w34189 -Zm200 -w34100 -w34189 -w34100 -w34189"

-				Optimization="4"

-				AdditionalIncludeDirectories="$(IntDir);&quot;$(QT_DIR)\include\QtCore&quot;,&quot;$(QT_DIR)\include\QtCore&quot;,&quot;$(QT_DIR)\include\QtGui&quot;,&quot;$(QT_DIR)\include\QtGui&quot;,&quot;$(QT_DIR)\include\QtXml&quot;,&quot;$(QT_DIR)\include\QtXml&quot;,&quot;$(QT_DIR)\include&quot;,&quot;..\addon\doxywizard&quot;,&quot;$(QT_DIR)\include\ActiveQt&quot;,&quot;moc&quot;,&quot;..\addon\doxywizard&quot;,&quot;.&quot;,$(QT_DIR)\mkspecs\win32-msvc2008"

-				PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_NO_CAST_FROM_ASCII,QT_NO_CAST_TO_ASCII,QT_XML_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT"

-				GeneratePreprocessedFile="0"

-				ExceptionHandling="1"

-				RuntimeLibrary="1"

-				BufferSecurityCheck="false"

-				TreatWChar_tAsBuiltInType="false"

-				RuntimeTypeInfo="true"

-				AssemblerListingLocation="Debug\doxywizard\"

-				ObjectFile="Debug\doxywizard\"

-				ProgramDataBaseFileName=".\Debug\doxywizard\$(TargetName).pdb"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_NO_CAST_FROM_ASCII,QT_NO_CAST_TO_ASCII,QT_XML_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT,_DEBUG"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				IgnoreImportLibrary="true"

-				AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot; &quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"

-				AdditionalDependencies="$(QT_DIR)\lib\qtmaind.lib $(QT_DIR)\lib\QtXmld.lib $(QT_DIR)\lib\QtGuid.lib $(QT_DIR)\lib\QtCored.lib kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib winspool.lib msimg32.lib"

-				OutputFile="..\bin\Debug\doxywizard.exe"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QT_DIR)\lib"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug\doxywizard\$(TargetName).pdb"

-				SubSystem="2"

-				LargeAddressAware="2"

-				LinkTimeCodeGeneration="0"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\bin\Release"

-			IntermediateDirectory=".\Release\doxywizard"

-			ConfigurationType="1"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="Version"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="Lex"

-			/>

-			<Tool

-				Name="Config"

-			/>

-			<Tool

-				Name="Config_dw"

-			/>

-			<Tool

-				Name="Settings"

-			/>

-			<Tool

-				Name="Unistd"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				WarningLevel="0"

-				DefaultCharType="0"

-				EnableErrorChecks="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalOptions="-Zm200 -w34100 -w34189 -Zm200 -w34100 -w34189 -w34100 -w34189"

-				Optimization="2"

-				AdditionalIncludeDirectories="$(IntDir);&quot;$(QT_DIR)\include\QtCore&quot;,&quot;$(QT_DIR)\include\QtCore&quot;,&quot;$(QT_DIR)\include\QtGui&quot;,&quot;$(QT_DIR)\include\QtGui&quot;,&quot;$(QT_DIR)\include\QtXml&quot;,&quot;$(QT_DIR)\include\QtXml&quot;,&quot;$(QT_DIR)\include&quot;,&quot;..\addon\doxywizard&quot;,&quot;$(QT_DIR)\include\ActiveQt&quot;,&quot;moc&quot;,&quot;..\addon\doxywizard&quot;,&quot;.&quot;,$(QT_DIR)\mkspecs\win32-msvc2008"

-				PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_NO_CAST_FROM_ASCII,QT_NO_CAST_TO_ASCII,QT_NO_DEBUG,QT_XML_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT,NDEBUG"

-				GeneratePreprocessedFile="0"

-				ExceptionHandling="1"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				TreatWChar_tAsBuiltInType="false"

-				RuntimeTypeInfo="true"

-				AssemblerListingLocation="Release\doxywizard\"

-				ObjectFile="Release\doxywizard\"

-				ProgramDataBaseFileName=".\Release\doxywizard\$(TargetName).pdb"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_NO_CAST_FROM_ASCII,QT_NO_CAST_TO_ASCII,QT_NO_DEBUG,QT_XML_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				IgnoreImportLibrary="true"

-				AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot; &quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"

-				AdditionalDependencies="$(QT_DIR)\lib\qtmain.lib $(QT_DIR)\lib\QtXml.lib $(QT_DIR)\lib\QtGui.lib $(QT_DIR)\lib\QtCore.lib kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib winspool.lib msimg32.lib"

-				OutputFile="..\bin\Release\doxywizard.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QT_DIR)\lib"

-				IgnoreAllDefaultLibraries="false"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile=".\Release\doxywizard\$(TargetName).pdb"

-				SubSystem="2"

-				LargeAddressAware="2"

-				LinkTimeCodeGeneration="0"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\addon\doxywizard\doxywizard.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\addon\doxywizard\expert.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\addon\doxywizard\inputbool.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\addon\doxywizard\inputint.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\addon\doxywizard\inputstring.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\addon\doxywizard\inputstrlist.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\version.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\addon\doxywizard\wizard.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="..\addon\doxywizard\config.h"

-				>

-			</File>

-			<File

-				RelativePath="..\addon\doxywizard\doxywizard.h"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="MOC ..\addon\doxywizard\doxywizard.h"

-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\doxywizard.h -o $(IntDir)\moc\moc_doxywizard.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\doxywizard.h;$(QT_DIR)\bin\moc.exe"

-						Outputs="$(IntDir)\moc\moc_doxywizard.cpp"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="MOC ..\addon\doxywizard\doxywizard.h"

-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\doxywizard.h -o $(IntDir)\moc\moc_doxywizard.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\doxywizard.h;$(QT_DIR)\bin\moc.exe"

-						Outputs="$(IntDir)\moc\moc_doxywizard.cpp"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\addon\doxywizard\expert.h"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="MOC ..\addon\doxywizard\expert.h"

-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\expert.h -o $(IntDir)\moc\moc_expert.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\expert.h;$(QT_DIR)\bin\moc.exe"

-						Outputs="$(IntDir)\moc\moc_expert.cpp"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="MOC ..\addon\doxywizard\expert.h"

-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\expert.h -o $(IntDir)\moc\moc_expert.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\expert.h;$(QT_DIR)\bin\moc.exe"

-						Outputs="$(IntDir)\moc\moc_expert.cpp"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\addon\doxywizard\helplabel.h"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="MOC ..\addon\doxywizard\helplabel.h"

-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\helplabel.h -o $(IntDir)\moc\moc_helplabel.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\helplabel.h;$(QT_DIR)\bin\moc.exe"

-						Outputs="$(IntDir)\moc\moc_helplabel.cpp"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="MOC ..\addon\doxywizard\helplabel.h"

-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\helplabel.h -o $(IntDir)\moc\moc_helplabel.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\helplabel.h;$(QT_DIR)\bin\moc.exe"

-						Outputs="$(IntDir)\moc\moc_helplabel.cpp"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\addon\doxywizard\inputbool.h"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="MOC ..\addon\doxywizard\inputbool.h"

-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputbool.h -o $(IntDir)\moc\moc_inputbool.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\inputbool.h;$(QT_DIR)\bin\moc.exe"

-						Outputs="$(IntDir)\moc\moc_inputbool.cpp"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="MOC ..\addon\doxywizard\inputbool.h"

-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputbool.h -o $(IntDir)\moc\moc_inputbool.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\inputbool.h;$(QT_DIR)\bin\moc.exe"

-						Outputs="$(IntDir)\moc\moc_inputbool.cpp"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\addon\doxywizard\inputint.h"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="MOC ..\addon\doxywizard\inputint.h"

-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputint.h -o $(IntDir)\moc\moc_inputint.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\inputint.h;$(QT_DIR)\bin\moc.exe"

-						Outputs="$(IntDir)\moc\moc_inputint.cpp"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="MOC ..\addon\doxywizard\inputint.h"

-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputint.h -o $(IntDir)\moc\moc_inputint.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\inputint.h;$(QT_DIR)\bin\moc.exe"

-						Outputs="$(IntDir)\moc\moc_inputint.cpp"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\addon\doxywizard\inputstring.h"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="MOC ..\addon\doxywizard\inputstring.h"

-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputstring.h -o $(IntDir)\moc\moc_inputstring.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\inputstring.h;$(QT_DIR)\bin\moc.exe"

-						Outputs="$(IntDir)\moc\moc_inputstring.cpp"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="MOC ..\addon\doxywizard\inputstring.h"

-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputstring.h -o $(IntDir)\moc\moc_inputstring.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\inputstring.h;$(QT_DIR)\bin\moc.exe"

-						Outputs="$(IntDir)\moc\moc_inputstring.cpp"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\addon\doxywizard\inputstrlist.h"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="MOC ..\addon\doxywizard\inputstrlist.h"

-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputstrlist.h -o $(IntDir)\moc\moc_inputstrlist.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\inputstrlist.h;$(QT_DIR)\bin\moc.exe"

-						Outputs="$(IntDir)\moc\moc_inputstrlist.cpp"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="MOC ..\addon\doxywizard\inputstrlist.h"

-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputstrlist.h -o $(IntDir)\moc\moc_inputstrlist.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\inputstrlist.h;$(QT_DIR)\bin\moc.exe"

-						Outputs="$(IntDir)\moc\moc_inputstrlist.cpp"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\addon\doxywizard\wizard.h"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="MOC ..\addon\doxywizard\wizard.h"

-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\wizard.h -o $(IntDir)\moc\moc_wizard.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\wizard.h;$(QT_DIR)\bin\moc.exe"

-						Outputs="$(IntDir)\moc\moc_wizard.cpp"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="MOC ..\addon\doxywizard\wizard.h"

-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\wizard.h -o $(IntDir)\moc\moc_wizard.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\wizard.h;$(QT_DIR)\bin\moc.exe"

-						Outputs="$(IntDir)\moc\moc_wizard.cpp"

-					/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="Generated Files"

-			Filter="cpp;c;cxx;moc;h;def;odl;idl;res;"

-			UniqueIdentifier="{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}"

-			>

-			<File

-				RelativePath="$(IntDir)\config_doxyw.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\configdoc.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\moc\moc_doxywizard.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\moc\moc_expert.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\moc\moc_helplabel.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\moc\moc_inputbool.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\moc\moc_inputint.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\moc\moc_inputstring.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\moc\moc_inputstrlist.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\moc\moc_wizard.cpp"

-				>

-			</File>

-			<File

-				RelativePath="$(IntDir)\rcc\qrc_doxywizard.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Lex Files"

-			Filter="l"

-			UniqueIdentifier="{E12AE0D2-192F-4d59-BD23-7D3FA58D3183}"

-			ParseFiles="false"

-			>

-			<File

-				RelativePath="..\addon\doxywizard\config_doxyw.l"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Python Files"

-			Filter="py"

-			>

-			<File

-				RelativePath="..\src\settings.py"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="Settings"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="Settings"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="unistd.py"

-				>

-				<FileConfiguration

-					Name="Debug|win32"

-					>

-					<Tool

-						Name="Unistd"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|win32"

-					>

-					<Tool

-						Name="Unistd"

-					/>

-				</FileConfiguration>

-			</File>


-			<File

-				RelativePath="..\src\version.py"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="Version"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="Version"

-					/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="XML Files"

-			Filter="xml"

-			>

-			<File

-				RelativePath="..\src\config.xml"

-				>

-				<FileConfiguration

-					Name="Debug|win32"

-					>

-					<Tool

-						Name="Config_dw"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|win32"

-					>

-					<Tool

-						Name="Config_dw"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="Config_dw"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="Config_dw"

-					/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="qrc;*"

-			UniqueIdentifier="{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}"

-			ParseFiles="false"

-			>

-			<File

-				RelativePath="..\addon\doxywizard\doxywizard.qrc"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="RCC ..\addon\doxywizard\doxywizard.qrc"

-						CommandLine="$(QT_DIR)\bin\rcc.exe -name doxywizard ..\addon\doxywizard\doxywizard.qrc -o $(IntDir)\rcc\qrc_doxywizard.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\doxywizard.qrc;$(QT_DIR)\bin\rcc.exe"

-						Outputs="$(IntDir)\rcc\qrc_doxywizard.cpp"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						Description="RCC ..\addon\doxywizard\doxywizard.qrc"

-						CommandLine="$(QT_DIR)\bin\rcc.exe -name doxywizard ..\addon\doxywizard\doxywizard.qrc -o $(IntDir)\rcc\qrc_doxywizard.cpp&#x0D;&#x0A;"

-						AdditionalDependencies="..\addon\doxywizard\doxywizard.qrc;$(QT_DIR)\bin\rcc.exe"

-						Outputs="$(IntDir)\rcc\qrc_doxywizard.cpp"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\addon\doxywizard\doxywizard.rc"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/winbuild/GenResources.rules b/winbuild/GenResources.rules
deleted file mode 100644
index a496ea5..0000000
--- a/winbuild/GenResources.rules
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
-	Name="GenResources"
-	Version="8.00"
-	>
-	<Rules>
-		<CustomBuildRule
-			Name="GenResources"
-			DisplayName="GenResources"
-			CommandLine="python &quot;$(ProjectDir)..\src\res2cc_cmd.py&quot; &quot;$(ProjectDir)..\templates&quot; $(IntDir)\resources.cpp"
-			Outputs="$(IntDir)\resources.cpp"
-			FileExtensions=".*"
-			AdditionalDependencies="$(ProjectDir)..\src\res2cc_cmd.py"
-			ExecutionDescription="Executing res2cc_cmd on $(ProjectDir)..\templates ..."
-			ShowOnlyRuleProperties="false"
-			>
-		</CustomBuildRule>
-	</Rules>
-</VisualStudioToolFile>
diff --git a/winbuild/Gen_head.rules b/winbuild/Gen_head.rules
deleted file mode 100644
index c2e7550..0000000
--- a/winbuild/Gen_head.rules
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
-	Name="gen_head"
-	Version="8.00"
-	>
-	<Rules>
-		<CustomBuildRule
-			Name="Gen_head"
-			DisplayName="Gen_head"
-			CommandLine="python &quot;$(ProjectDir)..\src\to_c_cmd.py&quot; [AllOptions] [AdditionalOptions] [inputs] &lt; &quot;$(InputPath)&quot; &gt; $(IntDir)/$(InputName)$(InputExt).h"
-			Outputs="$(IntDir)/$(InputName)$(InputExt).h"
-			FileExtensions=".*"
-			AdditionalDependencies="$(ProjectDir)..\src\to_c_cmd.py"
-			ExecutionDescription="Executing to_c_cmd on $(InputPath) ..."
-			ShowOnlyRuleProperties="false"
-			>
-		</CustomBuildRule>
-	</Rules>
-</VisualStudioToolFile>
diff --git a/winbuild/Languages.rules b/winbuild/Languages.rules
deleted file mode 100755
index 8ff018a..0000000
--- a/winbuild/Languages.rules
+++ /dev/null
@@ -1,862 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
-        Name="languages"
-        Version="8.00"
-        >
-        <Rules>
-                <CustomBuildRule
-                        Name="Languages"
-                        DisplayName="Languages"
-                        CommandLine="python &quot;$(InputPath)&quot; [AllOptions] [AdditionalOptions] &gt; $(IntDir)/$(InputName).h"
-                        Outputs="$(IntDir)/$(InputName).h"
-                        FileExtensions="*.py"
-                        AdditionalDependencies=""
-                        ExecutionDescription="Executing languages ..."
-                        ShowOnlyRuleProperties="false"
-                        >
-                        <Properties>
-                               <EnumProperty
-                                       Name="EnglishOnlys"
-                                       DisplayName="Use English Only"
-                                       Description="Use English Only"
-                                       DefaultValue="0"
-                               >
-                                       <Values>
-                                               <EnumValue
-                                               Value="0"
-                                               Switch=""
-                                               DisplayName="Don't use English Only"
-                                               />
-                                               <EnumValue
-                                               Value="1"
-                                               Switch="ENONLY"
-                                               DisplayName="Use English Only"
-                                               />
-                                       </Values>
-                               </EnumProperty>
-
-                                   <EnumProperty
-                                           Name="armenian"
-                                           DisplayName="Use Armenian"
-                                           Description="Use Armenian"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Armenian"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="AM"
-                                                   DisplayName="Use Armenian"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="arabic"
-                                           DisplayName="Use Arabic"
-                                           Description="Use Arabic"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Arabic"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="AR"
-                                                   DisplayName="Use Arabic"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="brazilian"
-                                           DisplayName="Use Brazilian"
-                                           Description="Use Brazilian"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Brazilian"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="BR"
-                                                   DisplayName="Use Brazilian"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="catalan"
-                                           DisplayName="Use Catalan"
-                                           Description="Use Catalan"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Catalan"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="CA"
-                                                   DisplayName="Use Catalan"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="chinese"
-                                           DisplayName="Use Chinese"
-                                           Description="Use Chinese"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Chinese"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="CN"
-                                                   DisplayName="Use Chinese"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="czech"
-                                           DisplayName="Use Czech"
-                                           Description="Use Czech"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Czech"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="CZ"
-                                                   DisplayName="Use Czech"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="german"
-                                           DisplayName="Use German"
-                                           Description="Use German"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use German"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="DE"
-                                                   DisplayName="Use German"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="danish"
-                                           DisplayName="Use Danish"
-                                           Description="Use Danish"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Danish"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="DK"
-                                                   DisplayName="Use Danish"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="esperanto"
-                                           DisplayName="Use Esperanto"
-                                           Description="Use Esperanto"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Esperanto"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="EO"
-                                                   DisplayName="Use Esperanto"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="spanish"
-                                           DisplayName="Use Spanish"
-                                           Description="Use Spanish"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Spanish"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="ES"
-                                                   DisplayName="Use Spanish"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="persian"
-                                           DisplayName="Use Persian"
-                                           Description="Use Persian"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Persian"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="FA"
-                                                   DisplayName="Use Persian"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="finnish"
-                                           DisplayName="Use Finnish"
-                                           Description="Use Finnish"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Finnish"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="FI"
-                                                   DisplayName="Use Finnish"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="french"
-                                           DisplayName="Use French"
-                                           Description="Use French"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use French"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="FR"
-                                                   DisplayName="Use French"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="greek"
-                                           DisplayName="Use Greek"
-                                           Description="Use Greek"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Greek"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="GR"
-                                                   DisplayName="Use Greek"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="croatian"
-                                           DisplayName="Use Croatian"
-                                           Description="Use Croatian"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Croatian"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="HR"
-                                                   DisplayName="Use Croatian"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="hungarian"
-                                           DisplayName="Use Hungarian"
-                                           Description="Use Hungarian"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Hungarian"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="HU"
-                                                   DisplayName="Use Hungarian"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="indonesian"
-                                           DisplayName="Use Indonesian"
-                                           Description="Use Indonesian"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Indonesian"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="ID"
-                                                   DisplayName="Use Indonesian"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="italian"
-                                           DisplayName="Use Italian"
-                                           Description="Use Italian"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Italian"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="IT"
-                                                   DisplayName="Use Italian"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="japaneseen"
-                                           DisplayName="Use Japanese-En"
-                                           Description="Use Japanese-En"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Japanese-En"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="JE"
-                                                   DisplayName="Use Japanese-En"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="japanese"
-                                           DisplayName="Use Japanese"
-                                           Description="Use Japanese"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Japanese"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="JP"
-                                                   DisplayName="Use Japanese"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="koreanen"
-                                           DisplayName="Use Korean-En"
-                                           Description="Use Korean-En"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Korean-En"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="KE"
-                                                   DisplayName="Use Korean-En"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="korean"
-                                           DisplayName="Use Korean"
-                                           Description="Use Korean"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Korean"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="KR"
-                                                   DisplayName="Use Korean"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="lithuanian"
-                                           DisplayName="Use Lithuanian"
-                                           Description="Use Lithuanian"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Lithuanian"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="LT"
-                                                   DisplayName="Use Lithuanian"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="latvian"
-                                           DisplayName="Use Latvian"
-                                           Description="Use Latvian"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Latvian"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="LV"
-                                                   DisplayName="Use Latvian"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="macedonian"
-                                           DisplayName="Use Macedonian"
-                                           Description="Use Macedonian"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Macedonian"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="MK"
-                                                   DisplayName="Use Macedonian"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="dutch"
-                                           DisplayName="Use Dutch"
-                                           Description="Use Dutch"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Dutch"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="NL"
-                                                   DisplayName="Use Dutch"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="norwegian"
-                                           DisplayName="Use Norwegian"
-                                           Description="Use Norwegian"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Norwegian"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="NO"
-                                                   DisplayName="Use Norwegian"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="polish"
-                                           DisplayName="Use Polish"
-                                           Description="Use Polish"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Polish"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="PL"
-                                                   DisplayName="Use Polish"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="portuguese"
-                                           DisplayName="Use Portuguese"
-                                           Description="Use Portuguese"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Portuguese"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="PT"
-                                                   DisplayName="Use Portuguese"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="romanian"
-                                           DisplayName="Use Romanian"
-                                           Description="Use Romanian"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Romanian"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="RO"
-                                                   DisplayName="Use Romanian"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="russian"
-                                           DisplayName="Use Russian"
-                                           Description="Use Russian"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Russian"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="RU"
-                                                   DisplayName="Use Russian"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="serbiancyrillic"
-                                           DisplayName="Use Serbian-Cyrillic"
-                                           Description="Use Serbian-Cyrillic"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Serbian-Cyrillic"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="SC"
-                                                   DisplayName="Use Serbian-Cyrillic"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="slovene"
-                                           DisplayName="Use Slovene"
-                                           Description="Use Slovene"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Slovene"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="SI"
-                                                   DisplayName="Use Slovene"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="slovak"
-                                           DisplayName="Use Slovak"
-                                           Description="Use Slovak"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Slovak"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="SK"
-                                                   DisplayName="Use Slovak"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="serbian"
-                                           DisplayName="Use Serbian"
-                                           Description="Use Serbian"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Serbian"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="SR"
-                                                   DisplayName="Use Serbian"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="swedish"
-                                           DisplayName="Use Swedish"
-                                           Description="Use Swedish"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Swedish"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="SV"
-                                                   DisplayName="Use Swedish"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="turkish"
-                                           DisplayName="Use Turkish"
-                                           Description="Use Turkish"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Turkish"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="TR"
-                                                   DisplayName="Use Turkish"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="chinesetraditional"
-                                           DisplayName="Use Chinese-Traditional"
-                                           Description="Use Chinese-Traditional"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Chinese-Traditional"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="TW"
-                                                   DisplayName="Use Chinese-Traditional"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="ukrainian"
-                                           DisplayName="Use Ukrainian"
-                                           Description="Use Ukrainian"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Ukrainian"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="UA"
-                                                   DisplayName="Use Ukrainian"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="vietnamese"
-                                           DisplayName="Use Vietnamese"
-                                           Description="Use Vietnamese"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Vietnamese"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="VI"
-                                                   DisplayName="Use Vietnamese"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                                   <EnumProperty
-                                           Name="afrikaans"
-                                           DisplayName="Use Afrikaans"
-                                           Description="Use Afrikaans"
-                                           DefaultValue="1"
-                                   >
-                                           <Values>
-                                                   <EnumValue
-                                                   Value="0"
-                                                   Switch=""
-                                                   DisplayName="Don't use Afrikaans"
-                                                   />
-                                                   <EnumValue
-                                                   Value="1"
-                                                   Switch="ZA"
-                                                   DisplayName="Use Afrikaans"
-                                                   />
-                                           </Values>
-                                   </EnumProperty>
-        
-                        </Properties>
-                </CustomBuildRule>
-        </Rules>
-</VisualStudioToolFile>
-
diff --git a/winbuild/Lex.rules b/winbuild/Lex.rules
deleted file mode 100644
index 52df322..0000000
--- a/winbuild/Lex.rules
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
-	Name="flex"
-	Version="8.00"
-	>
-	<Rules>
-		<CustomBuildRule
-			Name="Lex"
-			DisplayName="Lex"
-			CommandLine="flex [AllOptions] -t -P$(InputName)YY [AdditionalOptions] [inputs] | python &quot;$(ProjectDir)..\src\increasebuffer.py&quot; &gt; $(IntDir)/$(InputName).cpp"
-			Outputs="$(IntDir)/$(InputName).cpp"
-			FileExtensions="*.l"
-			AdditionalDependencies="$(ProjectDir)..\src\increasebuffer.py"
-			ExecutionDescription="Executing Lex for $(InputPath) ..."
-			ShowOnlyRuleProperties="false"
-			>
-			<Properties>
-				<BooleanProperty
-					Name="Case"
-					DisplayName="Case insensitive"
-					Description="case insensitive"
-					Switch="-i"
-                                        IsReadOnly="true"
-				/>
-				<BooleanProperty
-					Name="Rules"
-					DisplayName="Write used lex rules"
-					Description="Write used lex rules"
-					Switch="-d"
-				/>
-			</Properties>
-		</CustomBuildRule>
-	</Rules>
-</VisualStudioToolFile>
diff --git a/winbuild/Settings.rules b/winbuild/Settings.rules
deleted file mode 100644
index 29e7266..0000000
--- a/winbuild/Settings.rules
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
-	Name="settings"
-	Version="8.00"
-	>
-	<Rules>
-		<CustomBuildRule
-			Name="Settings"
-			DisplayName="Settings"
-			CommandLine="python &quot;$(InputPath)&quot; [AllOptions] [AdditionalOptions] $(IntDir)"
-			Outputs="$(IntDir)/$(InputName).h"
-			FileExtensions="*.py"
-			AdditionalDependencies="$(ProjectDir)..\configure"
-			ExecutionDescription="Executing Settings ..."
-			ShowOnlyRuleProperties="false"
-			>
-			<Properties>
-				<EnumProperty
-					Name="SqlLite3"
-					DisplayName="Use SqlLite3"
-					Description="Use SqlLite3"
-					DefaultValue="0"
-				>
-					<Values>
-						<EnumValue
-						Value="0"
-						Switch="NO"
-						DisplayName="Don't use SqlLite3"
-						/>
-						<EnumValue
-						Value="1"
-						Switch="YES"
-						DisplayName="Use SqlLite3"
-						/>
-					</Values>
-				</EnumProperty>
-				<EnumProperty
-					Name="CLANG"
-					DisplayName="Use CLANG"
-					Description="Use CLANG"
-					DefaultValue="0"
-				>
-					<Values>
-						<EnumValue
-						Value="0"
-						Switch="NO"
-						DisplayName="Don't use CLANG"
-						/>
-						<EnumValue
-						Value="1"
-						Switch="YES"
-						DisplayName="Use CLANG"
-						/>
-					</Values>
-				</EnumProperty>
-			</Properties>
-		</CustomBuildRule>
-	</Rules>
-</VisualStudioToolFile>
diff --git a/winbuild/Unistd.rules b/winbuild/Unistd.rules
deleted file mode 100755
index bd25661..0000000
--- a/winbuild/Unistd.rules
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
-	Name="unistd"
-	Version="8.00"
-	>
-	<Rules>
-		<CustomBuildRule
-			Name="Unistd"
-			DisplayName="Unistd"
-			CommandLine="python &quot;$(InputPath)&quot; [AllOptions] [AdditionalOptions] $(IntDir)"
-			Outputs="$(IntDir)/$(InputName).h"
-			FileExtensions="*.py"
-			ExecutionDescription="Executing Unistd ..."
-			ShowOnlyRuleProperties="false"
-			>
-		</CustomBuildRule>
-	</Rules>
-</VisualStudioToolFile>
diff --git a/winbuild/Version.rules b/winbuild/Version.rules
deleted file mode 100644
index 3dfdf04..0000000
--- a/winbuild/Version.rules
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
-	Name="version"
-	Version="8.00"
-	>
-	<Rules>
-		<CustomBuildRule
-			Name="Version"
-			DisplayName="Version"
-			CommandLine="python &quot;$(InputPath)&quot; $(IntDir)"
-			Outputs="$(IntDir)\$(InputName).cpp"
-			FileExtensions="*.py"
-			AdditionalDependencies="$(ProjectDir)..\configure"
-			ExecutionDescription="Executing Version ..."
-			ShowOnlyRuleProperties="false"
-			>
-		</CustomBuildRule>
-	</Rules>
-</VisualStudioToolFile>
diff --git a/winbuild/doxyindexer.vcproj b/winbuild/doxyindexer.vcproj
deleted file mode 100644
index 499741f..0000000
--- a/winbuild/doxyindexer.vcproj
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9,00"

-	Name="doxyindexer"

-	ProjectGUID="{E543983A-D5BF-4865-B4A1-6D7EF2E1051C}"

-	RootNamespace="doxyindexer"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="196613"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\bin\Debug"

-			IntermediateDirectory=".\Debug\doxyindexer"

-			ConfigurationType="1"

-			CharacterSet="1"

-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(XAPIAN_DIR)\include&quot;,..\qtools"

-				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-				ProgramDatabaseFileName=".\Debug\doxyindexer\$(TargetName).pdb"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qtools.lib xapian.lib uuid.lib rpcrt4.lib ws2_32.lib"

-				OutputFile="..\bin\Debug\doxyindexer.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(XAPIAN_DIR)\Debug&quot;;Debug"

-				GenerateManifest="false"

-				IgnoreAllDefaultLibraries="false"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug\doxyindexer\$(TargetName).pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\bin\Debug64"

-			IntermediateDirectory=".\Debug64\doxyindexer"

-			ConfigurationType="1"

-			CharacterSet="1"

-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(XAPIAN_DIR)\include&quot;,..\qtools"

-				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-				ProgramDatabaseFileName=".\Debug64\doxyindexer\$(TargetName).pdb"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qtools.lib xapian.lib uuid.lib rpcrt4.lib ws2_32.lib"

-				OutputFile="..\bin\Debug64\doxyindexer.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="&quot;$(XAPIAN_DIR)\Debug64&quot;;Debug64"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug64\doxyindexer\$(TargetName).pdb"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\bin\Release"

-			IntermediateDirectory=".\Release\doxyindexer"

-			ConfigurationType="1"

-			CharacterSet="1"

-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="&quot;$(XAPIAN_DIR)\include&quot;,..\qtools"

-				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-				ProgramDatabaseFileName=".\Release\doxyindexer\$(TargetName).pdb"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qtools.lib xapian.lib uuid.lib rpcrt4.lib ws2_32.lib"

-				OutputFile="..\bin\Release\doxyindexer.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(XAPIAN_DIR)\Release&quot;;Release"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Release\doxyindexer\$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\bin\Release64"

-			IntermediateDirectory=".\Release64\doxyindexer"

-			ConfigurationType="1"

-			CharacterSet="1"

-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="&quot;$(XAPIAN_DIR)\include&quot;,..\qtools"

-				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-				ProgramDatabaseFileName=".\Release64\doxyindexer\$(TargetName).pdb"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qtools.lib xapian.lib uuid.lib rpcrt4.lib ws2_32.lib"

-				OutputFile="..\bin\Release64\doxyindexer.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(XAPIAN_DIR)\Release64&quot;;Release64"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Release64\doxyindexer\$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\addon\doxysearch\doxyindexer.cpp"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/winbuild/doxysearch.vcproj b/winbuild/doxysearch.vcproj
deleted file mode 100644
index a21168c..0000000
--- a/winbuild/doxysearch.vcproj
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9,00"

-	Name="doxysearch"

-	ProjectGUID="{F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}"

-	RootNamespace="doxysearch"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="196613"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\bin\Debug"

-			IntermediateDirectory=".\Debug\doxysearch"

-			ConfigurationType="1"

-			CharacterSet="1"

-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(XAPIAN_DIR)\include&quot;"

-				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-				ProgramDatabaseFileName=".\Debug\doxysearch\$(TargetName).pdb"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xapian.lib uuid.lib rpcrt4.lib ws2_32.lib"

-				OutputFile="..\bin\Debug\doxysearch.cgi"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(XAPIAN_DIR)\Debug&quot;"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug\doxysearch\$(TargetName).pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\bin\Debug64"

-			IntermediateDirectory=".\Debug64\doxysearch"

-			ConfigurationType="1"

-			CharacterSet="1"

-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(XAPIAN_DIR)\include&quot;"

-				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-				ProgramDatabaseFileName=".\Debug64\doxysearch\$(TargetName).pdb"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xapian.lib uuid.lib rpcrt4.lib ws2_32.lib"

-				OutputFile="..\bin\Debug64\doxysearch.cgi"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="&quot;$(XAPIAN_DIR)\Debug64&quot;"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug64\doxysearch\$(TargetName).pdb"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\bin\Release"

-			IntermediateDirectory=".\Release\doxysearch"

-			ConfigurationType="1"

-			CharacterSet="1"

-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="&quot;$(XAPIAN_DIR)\include&quot;"

-				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-				ProgramDatabaseFileName=".\Release\doxysearch\$(TargetName).pdb"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xapian.lib uuid.lib rpcrt4.lib ws2_32.lib"

-				OutputFile="..\bin\Release\doxysearch.cgi"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(XAPIAN_DIR)\Release&quot;"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Release\doxysearch\$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\bin\Release64"

-			IntermediateDirectory=".\Release64\doxysearch"

-			ConfigurationType="1"

-			CharacterSet="1"

-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="&quot;$(XAPIAN_DIR)\include&quot;"

-				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-				ProgramDatabaseFileName=".\Release64\doxysearch\$(TargetName).pdb"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xapian.lib uuid.lib rpcrt4.lib ws2_32.lib"

-				OutputFile="..\bin\Release64\doxysearch.cgi"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(XAPIAN_DIR)\Release64&quot;"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Release64\doxysearch\$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\addon\doxysearch\doxysearch.cpp"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/winbuild/iconv.vcproj b/winbuild/iconv.vcproj
deleted file mode 100644
index 1d50d39..0000000
--- a/winbuild/iconv.vcproj
+++ /dev/null
@@ -1,468 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="iconv"
-	ProjectGUID="{B6BB4771-8A4E-4656-AC08-1EF8AC182F69}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				OmitFramePointers="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="iconv/windows;iconv/include;iconv/libcharset/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SECURE_SCL=0;LIBCHARSET_STATIC;HAVE_STRING_H;"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/iconv.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\iconv.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/iconv.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\Release64"
-			IntermediateDirectory=".\Release64"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				OmitFramePointers="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="iconv/windows;iconv/include;iconv/libcharset/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SECURE_SCL=0;LIBCHARSET_STATIC;HAVE_STRING_H;"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release64/iconv.pch"
-				AssemblerListingLocation=".\Release64/"
-				ObjectFile=".\Release64/"
-				ProgramDataBaseFileName=".\Release64/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\iconv64.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release64/iconv.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="iconv\lib\iconv.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="iconv\libcharset\lib\localcharset.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="iconv"
-	ProjectGUID="{B6BB4771-8A4E-4656-AC08-1EF8AC182F69}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				OmitFramePointers="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="iconv/windows;iconv/include;iconv/libcharset/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SECURE_SCL=0;LIBCHARSET_STATIC;HAVE_STRING_H;"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/iconv.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\iconv.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/iconv.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\Release64"
-			IntermediateDirectory=".\Release64"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				OmitFramePointers="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="iconv/windows;iconv/include;iconv/libcharset/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SECURE_SCL=0;LIBCHARSET_STATIC;HAVE_STRING_H;"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release64/iconv.pch"
-				AssemblerListingLocation=".\Release64/"
-				ObjectFile=".\Release64/"
-				ProgramDataBaseFileName=".\Release64/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\iconv64.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release64/iconv.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="iconv\lib\iconv.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="iconv\libcharset\lib\localcharset.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/winbuild/moc.rules b/winbuild/moc.rules
deleted file mode 100644
index efe0f7f..0000000
--- a/winbuild/moc.rules
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
-	Name="Run Moc"
-	Version="8.00"
-	>
-	<Rules>
-		<CustomBuildRule
-			Name="moc"
-			DisplayName="Moc"
-			CommandLine="$(QTDIR)/bin/moc.exe &quot;$(InputPath)&quot; -o moc_$(InputName).cpp"
-			Outputs="moc_$(InputName).cpp"
-			AdditionalDependencies="$(QTDIR)/bin/moc.exe"
-			FileExtensions="*.h"
-			ExecutionDescription="Moc&apos;ing $(InputPath)"
-			>
-			<Properties>
-			</Properties>
-		</CustomBuildRule>
-	</Rules>
-</VisualStudioToolFile>
diff --git a/winbuild/pack_the_distribution_for_windows.py b/winbuild/pack_the_distribution_for_windows.py
deleted file mode 100644
index dc2c3d9..0000000
--- a/winbuild/pack_the_distribution_for_windows.py
+++ /dev/null
@@ -1,234 +0,0 @@
-#!python2

-

-from __future__ import print_function

-

-import os

-import re

-import shutil

-import subprocess

-import sys

-import textwrap

-

-

-def gitSHA_date_time():

-    cmd = 'git rev-parse --short HEAD'

-    p = subprocess.Popen(cmd, stdout=subprocess.PIPE)

-    output = p.communicate()[0]

-    output = output.decode('ASCII')

-    p.wait()

-    sha = output.strip()

-

-    cmd = 'git show -s --format="%ci" ' + sha

-    p = subprocess.Popen(cmd, stdout=subprocess.PIPE)

-    output = p.communicate()[0]

-    output = output.decode('ASCII')

-    p.wait()

-    date = output.strip()

-    lst = date.split()               # string like '2013-06-21 09:23:47 +0200'

-    dstamp = lst[0].replace('-', '') # '20130621' for the date

-    tstamp = lst[1].replace(':', '') # '092347' for the time

-

-    return sha, dstamp, tstamp

-

-

-def getDoxygenVersion():

-    # ... from the VERSION file.

-    sdir, fname = getThisScriptPathAndName()

-    version_fname = os.path.join(sdir, '..', 'VERSION')

-

-    with open(version_fname) as f:

-        lst = f.readlines()

-

-    doxver = lst[0].strip()

-

-    m = re.match(r'^(?P<ver>[0-9.]+)(-(?P<date>\d{8}))?', doxver)

-    assert m

-    ver = m.group('ver')

-    return ver

-

-

-def getThisScriptPathAndName():

-    script_fname = os.path.realpath(__file__)

-    sdir, fname = os.path.split(script_fname)

-    return sdir, fname

-

-

-def getEmptyDistribDir():

-    # Get this script full path, name, and the script subdir name

-    # (for checking the location).

-    sdir, fname = getThisScriptPathAndName()

-    subdir = os.path.basename(sdir)

-    assert subdir == 'winbuild'

-

-    # The distribution directory will be a subdirectory of the "../__put"

-    # (created if it does not exist, not the part of the git repo).

-    target_dir = os.path.normpath(os.path.join(sdir, '..', '__put'))

-    if not os.path.exists(target_dir):

-        os.mkdir(target_dir)

-    assert os.path.isdir(target_dir)

-

-    # The distribution subdir is composed out of 'Doxygen-', version stamp,

-    # timestamp, and commit id (partial SHA). Ignore the date from the VERSION

-    # file, take the commit date.

-    ver = getDoxygenVersion()

-    sha, dstamp, tstamp = gitSHA_date_time()

-    dist_subdir = 'Doxygen-' + ver + '-' + dstamp + tstamp

-    dist_dir = os.path.join(target_dir, dist_subdir)

-    print(dist_dir)

-    if os.path.isdir(dist_dir):

-        print("Removing the existing '{}'".format(dist_dir))

-        shutil.rmtree(dist_dir)

-    assert not os.path.exists(dist_dir)

-    print("Creating the new '{}'".format(dist_dir))

-    os.mkdir(dist_dir)

-    assert os.path.isdir(dist_dir)

-

-    return dist_dir

-

-

-def copyBinaries(dist_dir, subdir):

-    '''Copy the Windows binaries (doxygen.exe only) to the dist_dir directory.'''

-

-    # Source file should exist.

-    sdir, fname = getThisScriptPathAndName()

-    src = os.path.normpath(os.path.join(sdir, '..', 'bin', subdir, 'doxygen.exe'))

-    if os.path.isfile(src):

-        # Destination directory must not exist. It must be created first.

-        dst_dir = os.path.normpath(os.path.join(dist_dir, 'bin', subdir))

-        assert not os.path.isdir(dst_dir)

-        os.makedirs(dst_dir)

-

-        # Copy the file.

-        print("Copying '{}'".format(src))

-        shutil.copy2(src, dst_dir)

-    else:

-        print("The binary '" + src + "'")

-        print('was not found. It will not be present in the distribution.')

-

-

-def getBinariesZipBareName():

-    ver = getDoxygenVersion()

-    sha, dstamp, tstamp = gitSHA_date_time()

-    fname = 'doxygenw{}_{}.zip'.format(dstamp, ver.replace('.', '_'))

-    return fname

-

-

-def getTranslatorReportZipBareName():

-    ver = getDoxygenVersion()

-    sha, dstamp, tstamp = gitSHA_date_time()

-    fname = 'tr{}_{}.zip'.format(dstamp, ver.replace('.', '_'))

-    return fname

-

-

-def zipBinaries(distr_dir):

-    # Build the zip filename. It is to be located at the same level as distr_dir.

-    zip_bare_name = getBinariesZipBareName()

-    dst, distr_subdir = os.path.split(distr_dir)

-    zip_full_name = os.path.join(dst, zip_bare_name)

-

-    if os.path.isfile(zip_full_name):

-        print("Removing the existing '{}'".format(zip_full_name))

-        os.remove(zip_full_name)

-

-    # Change the working directory to destination directory and zip from

-    # there using the bare names so that the full path is not zipped inside.

-    wd = os.getcwd()

-    os.chdir(dst)

-    print("Zipping new '{}'".format(zip_full_name))

-    subprocess.call('zip -r {} {}'.format(zip_bare_name, distr_subdir), shell=True)

-    os.chdir(wd)  # back to the original working directory

-

-

-def buildAndZipTranslatorReport(distr_dir):

-    # Build the translator report zip filename. It is to be located at the same

-    # level as distr_dir.

-    zip_bare_name = getTranslatorReportZipBareName()

-    dst, subdir = os.path.split(distr_dir)

-    zip_full_name = os.path.join(dst, zip_bare_name)

-

-    if os.path.isfile(zip_full_name):

-        print("Removing the existing '{}'".format(zip_full_name))

-        os.remove(zip_full_name)

-    print("Zipping new '{}'".format(zip_full_name))

-

-    # Change the working directory to the doc one and generate

-    # the translator report.

-    sdir, fname = getThisScriptPathAndName()

-    docdir = os.path.join(sdir, '..', 'doc')

-    assert os.path.isdir(docdir)

-    wd = os.getcwd()

-    os.chdir(docdir)

-    subprocess.call('python translator.py', shell=True)

-

-    # Zip the generated translator_report.txt.

-    subprocess.call('zip -r {} {}'.format(zip_full_name,

-                                          'translator_report.txt'), shell=True)

-

-    os.chdir(wd)  # back to the original working directory

-

-

-def mailto():

-

-    # Information for the letter.

-    ver = getDoxygenVersion()

-    sha, dstamp, tstamp = gitSHA_date_time()

-    doxzipname = getBinariesZipBareName()

-    trzipname = getTranslatorReportZipBareName()

-

-    subject = 'Windows binaries available for {}-{} at SourceForge'.format(ver, dstamp)

-    subject = subject.replace(' ', '%20')

-

-    body = textwrap.dedent('''\

-        Hi,

-

-        If interested, you can download the doxygen binaries

-        compiled for MS Windows from

-

-          http://sourceforge.net/projects/doxygen/files/snapshots/doxygen-1.8-svn/windows

-

-        This is the place where you should find also the next

-        releases.  Name of the archive file is

-

-          {}

-

-        The related translator report can be found inside the directory

-

-          http://sourceforge.net/projects/doxygen/files/snapshots/doxygen-1.8-svn/translator_reports/

-

-        Name of the archive file is

-

-          {}

-

-        The binaries are NOT created automatically, so it may

-        happen that some newer sources were not compiled

-        because I am not present to do that or I forgot... ;)

-

-        Regards,

-            Petr

-

-        --

-        Petr Prikryl (prikryl at atlas dot cz)''').format(doxzipname, trzipname)

-    body = body.replace('\n', '%0d')

-

-    # Make the mailto URI and launch the mailer.

-    to_addr = 'doxygen-users@lists.sourceforge.net'

-    mailtoURI = 'mailto:%s?subject=%s&body=%s' % (to_addr, subject, body)

-    os.startfile(mailtoURI)

-

-

-if __name__ == '__main__':

-    # Create the empty directory for the distribution files.

-    dist_dir = getEmptyDistribDir()

-

-    # Copy the compiled binaries to the distribution directory and zip them.

-    copyBinaries(dist_dir, 'Debug')

-    copyBinaries(dist_dir, 'Debug64')

-    copyBinaries(dist_dir, 'Release')

-    copyBinaries(dist_dir, 'Release64')

-    zipBinaries(dist_dir)

-

-    # The translator report...

-    buildAndZipTranslatorReport(dist_dir)

-

-    # Launch the mailer with the generated message body.

-    mailto()
\ No newline at end of file
diff --git a/winbuild/qtools.vcproj b/winbuild/qtools.vcproj
deleted file mode 100644
index 6e94d3f..0000000
--- a/winbuild/qtools.vcproj
+++ /dev/null
@@ -1,1583 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="qtools"
-	ProjectGUID="{B6BB4771-8A4E-4656-AC08-1EF8AC182F64}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release\qtools"
-			IntermediateDirectory=".\Release\qtools"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				OmitFramePointers="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\qtools"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release\qtools/qtools.pch"
-				AssemblerListingLocation=".\Release\qtools/"
-				ObjectFile=".\Release\qtools/"
-				ProgramDatabaseFileName=".\Release\qtools\$(TargetName).pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\Release\qtools.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release\qtools/qtools.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\Release64\qtools"
-			IntermediateDirectory=".\Release64\qtools"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				OmitFramePointers="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\qtools"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release64\qtools/qtools.pch"
-				AssemblerListingLocation=".\Release64\qtools/"
-				ObjectFile=".\Release64\qtools/"
-				ProgramDatabaseFileName=".\Release64\qtools\$(TargetName).pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\Release64\qtools.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release64\qtools/qtools.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug\qtools"
-			IntermediateDirectory=".\Debug\qtools"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=""
-				Optimization="0"
-				AdditionalIncludeDirectories="..\qtools"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug\qtools/qtools.pch"
-				AssemblerListingLocation=".\Debug\qtools/"
-				ObjectFile=".\Debug\qtools/"
-				ProgramDatabaseFileName=".\Debug\qtools\$(TargetName).pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\Debug\qtools.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug\qtools/qtools.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\Debug64\qtools"
-			IntermediateDirectory=".\Debug64\qtools"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=""
-				Optimization="0"
-				AdditionalIncludeDirectories="..\qtools"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug64\qtools/qtools.pch"
-				AssemblerListingLocation=".\Debug64\qtools/"
-				ObjectFile=".\Debug64\qtools/"
-				ProgramDatabaseFileName=".\Debug64\qtools\$(TargetName).pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\Debug64\qtools.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug64\qtools/qtools.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\qtools\qbuffer.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qcollection.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qdatastream.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qdatetime.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qdir.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qdir_win32.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qfile.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qfile_win32.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qfileinfo.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qfileinfo_win32.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qgarray.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qgcache.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qgdict.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qglist.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qglobal.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qgstring.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qgvector.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qiodevice.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qmap.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qmutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qmutex_win32.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qregexp.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qstring.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qstringlist.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qtextcodec.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qtextstream.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qthread.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qthread_win32.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qutfcodec.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qwaitcondition_win32.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qxml.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\qtools\qcstring.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\qtools\qarray.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qasciidict.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qbuffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qcache.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qcollection.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qconfig.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qcstring.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qdatastream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qdatetime.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qdict.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qdir.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qfeatures.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qfile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qfiledefs_p.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qfileinfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qgarray.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qgcache.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qgdict.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qgeneric.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qglist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qglobal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qgstring.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qgvector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qintdict.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qiodevice.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qlist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qmap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qmodules.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qmutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qmutex_p.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qptrdict.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qqueue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qregexp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qshared.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qsortedlist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qstack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qstring.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qstringlist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qstrlist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qstrvec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qtextcodec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qtextstream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qthread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qthread_p.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qtl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qutfcodec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qvaluelist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qvaluestack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qvector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qwaitcondition.h"
-				>
-			</File>
-			<File
-				RelativePath="..\qtools\qxml.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/winbuild/unistd.py b/winbuild/unistd.py
deleted file mode 100644
index 93b9341..0000000
--- a/winbuild/unistd.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# 
-
-import sys
-import os
-
-f1 = open(os.path.join(sys.argv[1],'unistd.h'),'w')
-
-f1.write("#ifndef UNISTD_H\n")
-f1.write("#define UNISTD_H\n")
-f1.write("/* this is a dummy file, that is needed for compiling files that are\n")
-f1.write(" * generated with flex under Windows 95/NT.\n")
-f1.write(" */\n")
-f1.write("#if defined(_MSC_VER)\n")
-f1.write("  #include <io.h>\n")
-f1.write("#endif\n")
-f1.write("#endif\n")