diff --git a/Source/DoxygenTranslator/src/.deps/DoxygenEntity.Po b/Source/DoxygenTranslator/src/.deps/DoxygenEntity.Po
index 7d2d2e0db..7a6dbd296 100644
--- a/Source/DoxygenTranslator/src/.deps/DoxygenEntity.Po
+++ b/Source/DoxygenTranslator/src/.deps/DoxygenEntity.Po
@@ -1,36 +1,42 @@
 DoxygenTranslator/src/DoxygenEntity.o \
   DoxygenTranslator/src/DoxygenEntity.o:  \
  DoxygenTranslator/src/DoxygenEntity.cpp \
-  DoxygenTranslator/src/DoxygenEntity.h /usr/include/c++/4.2/cstdlib \
+  DoxygenTranslator/src/DoxygenEntity.h /usr/include/c++/4.2/string \
   /usr/include/c++/4.2/i486-linux-gnu/bits/c++config.h \
   /usr/include/c++/4.2/i486-linux-gnu/bits/os_defines.h \
   /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h \
   /usr/include/c++/4.2/i486-linux-gnu/bits/cpu_defines.h \
+  /usr/include/c++/4.2/bits/stringfwd.h \
+  /usr/include/c++/4.2/bits/char_traits.h /usr/include/c++/4.2/cstring \
   /usr/include/c++/4.2/cstddef \
   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \
+  /usr/include/string.h /usr/include/xlocale.h \
+  /usr/include/c++/4.2/bits/stl_algobase.h /usr/include/c++/4.2/climits \
+  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h \
+  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
+  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
+  /usr/include/bits/posix2_lim.h /usr/include/bits/xopen_lim.h \
+  /usr/include/bits/stdio_lim.h /usr/include/c++/4.2/cstdlib \
   /usr/include/stdlib.h /usr/include/bits/waitflags.h \
   /usr/include/bits/waitstatus.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/xlocale.h \
-  /usr/include/sys/types.h /usr/include/bits/types.h \
-  /usr/include/bits/typesizes.h /usr/include/time.h \
-  /usr/include/sys/select.h /usr/include/bits/select.h \
-  /usr/include/bits/sigset.h /usr/include/bits/time.h \
-  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
-  /usr/include/alloca.h /usr/include/c++/4.2/iostream \
-  /usr/include/c++/4.2/ostream /usr/include/c++/4.2/ios \
+  /usr/include/bits/endian.h /usr/include/sys/types.h \
+  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+  /usr/include/time.h /usr/include/sys/select.h \
+  /usr/include/bits/select.h /usr/include/bits/sigset.h \
+  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
+  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
   /usr/include/c++/4.2/iosfwd \
   /usr/include/c++/4.2/i486-linux-gnu/bits/c++locale.h \
-  /usr/include/c++/4.2/cstring /usr/include/string.h \
   /usr/include/c++/4.2/cstdio /usr/include/stdio.h /usr/include/libio.h \
   /usr/include/_G_config.h /usr/include/wchar.h \
   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/c++/4.2/clocale /usr/include/locale.h \
-  /usr/include/bits/locale.h /usr/include/langinfo.h \
-  /usr/include/nl_types.h /usr/include/iconv.h /usr/include/libintl.h \
-  /usr/include/c++/4.2/cstdarg \
+  /usr/include/bits/sys_errlist.h /usr/include/c++/4.2/clocale \
+  /usr/include/locale.h /usr/include/bits/locale.h \
+  /usr/include/langinfo.h /usr/include/nl_types.h /usr/include/iconv.h \
+  /usr/include/libintl.h /usr/include/c++/4.2/cstdarg \
   /usr/include/c++/4.2/i486-linux-gnu/bits/c++io.h \
   /usr/include/c++/4.2/i486-linux-gnu/bits/gthr.h \
   /usr/include/c++/4.2/i486-linux-gnu/bits/gthr-default.h \
@@ -39,18 +45,10 @@ DoxygenTranslator/src/DoxygenEntity.o \
   /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
   /usr/include/bits/confname.h /usr/include/getopt.h \
   /usr/include/c++/4.2/cctype /usr/include/ctype.h \
-  /usr/include/c++/4.2/bits/stringfwd.h \
   /usr/include/c++/4.2/bits/postypes.h /usr/include/c++/4.2/cwchar \
   /usr/include/c++/4.2/ctime /usr/include/bits/wchar.h \
   /usr/include/stdint.h /usr/include/c++/4.2/bits/functexcept.h \
-  /usr/include/c++/4.2/exception_defines.h /usr/include/c++/4.2/exception \
-  /usr/include/c++/4.2/bits/char_traits.h \
-  /usr/include/c++/4.2/bits/stl_algobase.h /usr/include/c++/4.2/climits \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h \
-  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
-  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
-  /usr/include/bits/posix2_lim.h /usr/include/bits/xopen_lim.h \
+  /usr/include/c++/4.2/exception_defines.h \
   /usr/include/c++/4.2/bits/stl_pair.h \
   /usr/include/c++/4.2/bits/cpp_type_traits.h \
   /usr/include/c++/4.2/ext/type_traits.h /usr/include/c++/4.2/utility \
@@ -59,25 +57,28 @@ DoxygenTranslator/src/DoxygenEntity.o \
   /usr/include/c++/4.2/bits/stl_iterator_base_funcs.h \
   /usr/include/c++/4.2/bits/concept_check.h \
   /usr/include/c++/4.2/bits/stl_iterator.h \
-  /usr/include/c++/4.2/debug/debug.h \
-  /usr/include/c++/4.2/bits/localefwd.h \
-  /usr/include/c++/4.2/bits/ios_base.h \
-  /usr/include/c++/4.2/ext/atomicity.h \
-  /usr/include/c++/4.2/i486-linux-gnu/bits/atomic_word.h \
-  /usr/include/c++/4.2/bits/locale_classes.h /usr/include/c++/4.2/string \
-  /usr/include/c++/4.2/memory /usr/include/c++/4.2/bits/allocator.h \
+  /usr/include/c++/4.2/debug/debug.h /usr/include/c++/4.2/memory \
+  /usr/include/c++/4.2/bits/allocator.h \
   /usr/include/c++/4.2/i486-linux-gnu/bits/c++allocator.h \
   /usr/include/c++/4.2/ext/new_allocator.h /usr/include/c++/4.2/new \
+  /usr/include/c++/4.2/exception \
   /usr/include/c++/4.2/bits/stl_construct.h \
   /usr/include/c++/4.2/bits/stl_uninitialized.h \
   /usr/include/c++/4.2/bits/stl_raw_storage_iter.h \
   /usr/include/c++/4.2/limits /usr/include/c++/4.2/bits/ostream_insert.h \
   /usr/include/c++/4.2/bits/stl_function.h \
-  /usr/include/c++/4.2/bits/basic_string.h /usr/include/c++/4.2/algorithm \
-  /usr/include/c++/4.2/bits/stl_algo.h \
+  /usr/include/c++/4.2/bits/basic_string.h \
+  /usr/include/c++/4.2/ext/atomicity.h \
+  /usr/include/c++/4.2/i486-linux-gnu/bits/atomic_word.h \
+  /usr/include/c++/4.2/algorithm /usr/include/c++/4.2/bits/stl_algo.h \
   /usr/include/c++/4.2/bits/stl_heap.h \
   /usr/include/c++/4.2/bits/stl_tempbuf.h \
-  /usr/include/c++/4.2/bits/basic_string.tcc \
+  /usr/include/c++/4.2/bits/basic_string.tcc /usr/include/c++/4.2/list \
+  /usr/include/c++/4.2/bits/stl_list.h /usr/include/c++/4.2/bits/list.tcc \
+  /usr/include/c++/4.2/iostream /usr/include/c++/4.2/ostream \
+  /usr/include/c++/4.2/ios /usr/include/c++/4.2/bits/localefwd.h \
+  /usr/include/c++/4.2/bits/ios_base.h \
+  /usr/include/c++/4.2/bits/locale_classes.h \
   /usr/include/c++/4.2/streambuf /usr/include/c++/4.2/bits/streambuf.tcc \
   /usr/include/c++/4.2/bits/basic_ios.h \
   /usr/include/c++/4.2/bits/streambuf_iterator.h \
@@ -92,12 +93,11 @@ DoxygenTranslator/src/DoxygenEntity.o \
   /usr/include/c++/4.2/bits/ostream.tcc /usr/include/c++/4.2/locale \
   /usr/include/c++/4.2/bits/locale_facets.tcc \
   /usr/include/c++/4.2/typeinfo /usr/include/c++/4.2/istream \
-  /usr/include/c++/4.2/bits/istream.tcc /usr/include/c++/4.2/list \
-  /usr/include/c++/4.2/bits/stl_list.h /usr/include/c++/4.2/bits/list.tcc
+  /usr/include/c++/4.2/bits/istream.tcc
 
 DoxygenTranslator/src/DoxygenEntity.h:
 
-/usr/include/c++/4.2/cstdlib:
+/usr/include/c++/4.2/string:
 
 /usr/include/c++/4.2/i486-linux-gnu/bits/c++config.h:
 
@@ -115,10 +115,44 @@ DoxygenTranslator/src/DoxygenEntity.h:
 
 /usr/include/c++/4.2/i486-linux-gnu/bits/cpu_defines.h:
 
+/usr/include/c++/4.2/bits/stringfwd.h:
+
+/usr/include/c++/4.2/bits/char_traits.h:
+
+/usr/include/c++/4.2/cstring:
+
 /usr/include/c++/4.2/cstddef:
 
 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h:
 
+/usr/include/string.h:
+
+/usr/include/xlocale.h:
+
+/usr/include/c++/4.2/bits/stl_algobase.h:
+
+/usr/include/c++/4.2/climits:
+
+/usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h:
+
+/usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h:
+
+/usr/include/limits.h:
+
+/usr/include/bits/posix1_lim.h:
+
+/usr/include/bits/local_lim.h:
+
+/usr/include/linux/limits.h:
+
+/usr/include/bits/posix2_lim.h:
+
+/usr/include/bits/xopen_lim.h:
+
+/usr/include/bits/stdio_lim.h:
+
+/usr/include/c++/4.2/cstdlib:
+
 /usr/include/stdlib.h:
 
 /usr/include/bits/waitflags.h:
@@ -129,8 +163,6 @@ DoxygenTranslator/src/DoxygenEntity.h:
 
 /usr/include/bits/endian.h:
 
-/usr/include/xlocale.h:
-
 /usr/include/sys/types.h:
 
 /usr/include/bits/types.h:
@@ -153,20 +185,10 @@ DoxygenTranslator/src/DoxygenEntity.h:
 
 /usr/include/alloca.h:
 
-/usr/include/c++/4.2/iostream:
-
-/usr/include/c++/4.2/ostream:
-
-/usr/include/c++/4.2/ios:
-
 /usr/include/c++/4.2/iosfwd:
 
 /usr/include/c++/4.2/i486-linux-gnu/bits/c++locale.h:
 
-/usr/include/c++/4.2/cstring:
-
-/usr/include/string.h:
-
 /usr/include/c++/4.2/cstdio:
 
 /usr/include/stdio.h:
@@ -179,8 +201,6 @@ DoxygenTranslator/src/DoxygenEntity.h:
 
 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h:
 
-/usr/include/bits/stdio_lim.h:
-
 /usr/include/bits/sys_errlist.h:
 
 /usr/include/c++/4.2/clocale:
@@ -229,8 +249,6 @@ DoxygenTranslator/src/DoxygenEntity.h:
 
 /usr/include/ctype.h:
 
-/usr/include/c++/4.2/bits/stringfwd.h:
-
 /usr/include/c++/4.2/bits/postypes.h:
 
 /usr/include/c++/4.2/cwchar:
@@ -245,30 +263,6 @@ DoxygenTranslator/src/DoxygenEntity.h:
 
 /usr/include/c++/4.2/exception_defines.h:
 
-/usr/include/c++/4.2/exception:
-
-/usr/include/c++/4.2/bits/char_traits.h:
-
-/usr/include/c++/4.2/bits/stl_algobase.h:
-
-/usr/include/c++/4.2/climits:
-
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h:
-
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/bits/posix1_lim.h:
-
-/usr/include/bits/local_lim.h:
-
-/usr/include/linux/limits.h:
-
-/usr/include/bits/posix2_lim.h:
-
-/usr/include/bits/xopen_lim.h:
-
 /usr/include/c++/4.2/bits/stl_pair.h:
 
 /usr/include/c++/4.2/bits/cpp_type_traits.h:
@@ -289,18 +283,6 @@ DoxygenTranslator/src/DoxygenEntity.h:
 
 /usr/include/c++/4.2/debug/debug.h:
 
-/usr/include/c++/4.2/bits/localefwd.h:
-
-/usr/include/c++/4.2/bits/ios_base.h:
-
-/usr/include/c++/4.2/ext/atomicity.h:
-
-/usr/include/c++/4.2/i486-linux-gnu/bits/atomic_word.h:
-
-/usr/include/c++/4.2/bits/locale_classes.h:
-
-/usr/include/c++/4.2/string:
-
 /usr/include/c++/4.2/memory:
 
 /usr/include/c++/4.2/bits/allocator.h:
@@ -311,6 +293,8 @@ DoxygenTranslator/src/DoxygenEntity.h:
 
 /usr/include/c++/4.2/new:
 
+/usr/include/c++/4.2/exception:
+
 /usr/include/c++/4.2/bits/stl_construct.h:
 
 /usr/include/c++/4.2/bits/stl_uninitialized.h:
@@ -325,6 +309,10 @@ DoxygenTranslator/src/DoxygenEntity.h:
 
 /usr/include/c++/4.2/bits/basic_string.h:
 
+/usr/include/c++/4.2/ext/atomicity.h:
+
+/usr/include/c++/4.2/i486-linux-gnu/bits/atomic_word.h:
+
 /usr/include/c++/4.2/algorithm:
 
 /usr/include/c++/4.2/bits/stl_algo.h:
@@ -335,6 +323,24 @@ DoxygenTranslator/src/DoxygenEntity.h:
 
 /usr/include/c++/4.2/bits/basic_string.tcc:
 
+/usr/include/c++/4.2/list:
+
+/usr/include/c++/4.2/bits/stl_list.h:
+
+/usr/include/c++/4.2/bits/list.tcc:
+
+/usr/include/c++/4.2/iostream:
+
+/usr/include/c++/4.2/ostream:
+
+/usr/include/c++/4.2/ios:
+
+/usr/include/c++/4.2/bits/localefwd.h:
+
+/usr/include/c++/4.2/bits/ios_base.h:
+
+/usr/include/c++/4.2/bits/locale_classes.h:
+
 /usr/include/c++/4.2/streambuf:
 
 /usr/include/c++/4.2/bits/streambuf.tcc:
@@ -372,9 +378,3 @@ DoxygenTranslator/src/DoxygenEntity.h:
 /usr/include/c++/4.2/istream:
 
 /usr/include/c++/4.2/bits/istream.tcc:
-
-/usr/include/c++/4.2/list:
-
-/usr/include/c++/4.2/bits/stl_list.h:
-
-/usr/include/c++/4.2/bits/list.tcc:
diff --git a/Source/DoxygenTranslator/src/.deps/DoxygenParser.Po b/Source/DoxygenTranslator/src/.deps/DoxygenParser.Po
index 3a023d6b9..8ec874c8c 100644
--- a/Source/DoxygenTranslator/src/.deps/DoxygenParser.Po
+++ b/Source/DoxygenTranslator/src/.deps/DoxygenParser.Po
@@ -1,36 +1,42 @@
 DoxygenTranslator/src/DoxygenParser.o \
   DoxygenTranslator/src/DoxygenParser.o:  \
  DoxygenTranslator/src/DoxygenParser.cpp \
-  DoxygenTranslator/src/DoxygenParser.h /usr/include/c++/4.2/cstdlib \
+  DoxygenTranslator/src/DoxygenParser.h /usr/include/c++/4.2/string \
   /usr/include/c++/4.2/i486-linux-gnu/bits/c++config.h \
   /usr/include/c++/4.2/i486-linux-gnu/bits/os_defines.h \
   /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h \
   /usr/include/c++/4.2/i486-linux-gnu/bits/cpu_defines.h \
+  /usr/include/c++/4.2/bits/stringfwd.h \
+  /usr/include/c++/4.2/bits/char_traits.h /usr/include/c++/4.2/cstring \
   /usr/include/c++/4.2/cstddef \
   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \
+  /usr/include/string.h /usr/include/xlocale.h \
+  /usr/include/c++/4.2/bits/stl_algobase.h /usr/include/c++/4.2/climits \
+  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h \
+  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
+  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
+  /usr/include/bits/posix2_lim.h /usr/include/bits/xopen_lim.h \
+  /usr/include/bits/stdio_lim.h /usr/include/c++/4.2/cstdlib \
   /usr/include/stdlib.h /usr/include/bits/waitflags.h \
   /usr/include/bits/waitstatus.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/xlocale.h \
-  /usr/include/sys/types.h /usr/include/bits/types.h \
-  /usr/include/bits/typesizes.h /usr/include/time.h \
-  /usr/include/sys/select.h /usr/include/bits/select.h \
-  /usr/include/bits/sigset.h /usr/include/bits/time.h \
-  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
-  /usr/include/alloca.h /usr/include/c++/4.2/iostream \
-  /usr/include/c++/4.2/ostream /usr/include/c++/4.2/ios \
+  /usr/include/bits/endian.h /usr/include/sys/types.h \
+  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+  /usr/include/time.h /usr/include/sys/select.h \
+  /usr/include/bits/select.h /usr/include/bits/sigset.h \
+  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
+  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
   /usr/include/c++/4.2/iosfwd \
   /usr/include/c++/4.2/i486-linux-gnu/bits/c++locale.h \
-  /usr/include/c++/4.2/cstring /usr/include/string.h \
   /usr/include/c++/4.2/cstdio /usr/include/stdio.h /usr/include/libio.h \
   /usr/include/_G_config.h /usr/include/wchar.h \
   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/c++/4.2/clocale /usr/include/locale.h \
-  /usr/include/bits/locale.h /usr/include/langinfo.h \
-  /usr/include/nl_types.h /usr/include/iconv.h /usr/include/libintl.h \
-  /usr/include/c++/4.2/cstdarg \
+  /usr/include/bits/sys_errlist.h /usr/include/c++/4.2/clocale \
+  /usr/include/locale.h /usr/include/bits/locale.h \
+  /usr/include/langinfo.h /usr/include/nl_types.h /usr/include/iconv.h \
+  /usr/include/libintl.h /usr/include/c++/4.2/cstdarg \
   /usr/include/c++/4.2/i486-linux-gnu/bits/c++io.h \
   /usr/include/c++/4.2/i486-linux-gnu/bits/gthr.h \
   /usr/include/c++/4.2/i486-linux-gnu/bits/gthr-default.h \
@@ -39,18 +45,10 @@ DoxygenTranslator/src/DoxygenParser.o \
   /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
   /usr/include/bits/confname.h /usr/include/getopt.h \
   /usr/include/c++/4.2/cctype /usr/include/ctype.h \
-  /usr/include/c++/4.2/bits/stringfwd.h \
   /usr/include/c++/4.2/bits/postypes.h /usr/include/c++/4.2/cwchar \
   /usr/include/c++/4.2/ctime /usr/include/bits/wchar.h \
   /usr/include/stdint.h /usr/include/c++/4.2/bits/functexcept.h \
-  /usr/include/c++/4.2/exception_defines.h /usr/include/c++/4.2/exception \
-  /usr/include/c++/4.2/bits/char_traits.h \
-  /usr/include/c++/4.2/bits/stl_algobase.h /usr/include/c++/4.2/climits \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h \
-  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
-  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
-  /usr/include/bits/posix2_lim.h /usr/include/bits/xopen_lim.h \
+  /usr/include/c++/4.2/exception_defines.h \
   /usr/include/c++/4.2/bits/stl_pair.h \
   /usr/include/c++/4.2/bits/cpp_type_traits.h \
   /usr/include/c++/4.2/ext/type_traits.h /usr/include/c++/4.2/utility \
@@ -59,25 +57,29 @@ DoxygenTranslator/src/DoxygenParser.o \
   /usr/include/c++/4.2/bits/stl_iterator_base_funcs.h \
   /usr/include/c++/4.2/bits/concept_check.h \
   /usr/include/c++/4.2/bits/stl_iterator.h \
-  /usr/include/c++/4.2/debug/debug.h \
-  /usr/include/c++/4.2/bits/localefwd.h \
-  /usr/include/c++/4.2/bits/ios_base.h \
-  /usr/include/c++/4.2/ext/atomicity.h \
-  /usr/include/c++/4.2/i486-linux-gnu/bits/atomic_word.h \
-  /usr/include/c++/4.2/bits/locale_classes.h /usr/include/c++/4.2/string \
-  /usr/include/c++/4.2/memory /usr/include/c++/4.2/bits/allocator.h \
+  /usr/include/c++/4.2/debug/debug.h /usr/include/c++/4.2/memory \
+  /usr/include/c++/4.2/bits/allocator.h \
   /usr/include/c++/4.2/i486-linux-gnu/bits/c++allocator.h \
   /usr/include/c++/4.2/ext/new_allocator.h /usr/include/c++/4.2/new \
+  /usr/include/c++/4.2/exception \
   /usr/include/c++/4.2/bits/stl_construct.h \
   /usr/include/c++/4.2/bits/stl_uninitialized.h \
   /usr/include/c++/4.2/bits/stl_raw_storage_iter.h \
   /usr/include/c++/4.2/limits /usr/include/c++/4.2/bits/ostream_insert.h \
   /usr/include/c++/4.2/bits/stl_function.h \
-  /usr/include/c++/4.2/bits/basic_string.h /usr/include/c++/4.2/algorithm \
-  /usr/include/c++/4.2/bits/stl_algo.h \
+  /usr/include/c++/4.2/bits/basic_string.h \
+  /usr/include/c++/4.2/ext/atomicity.h \
+  /usr/include/c++/4.2/i486-linux-gnu/bits/atomic_word.h \
+  /usr/include/c++/4.2/algorithm /usr/include/c++/4.2/bits/stl_algo.h \
   /usr/include/c++/4.2/bits/stl_heap.h \
   /usr/include/c++/4.2/bits/stl_tempbuf.h \
-  /usr/include/c++/4.2/bits/basic_string.tcc \
+  /usr/include/c++/4.2/bits/basic_string.tcc /usr/include/c++/4.2/list \
+  /usr/include/c++/4.2/bits/stl_list.h /usr/include/c++/4.2/bits/list.tcc \
+  DoxygenTranslator/src/DoxygenEntity.h DoxygenTranslator/src/TokenList.h \
+  /usr/include/c++/4.2/iostream /usr/include/c++/4.2/ostream \
+  /usr/include/c++/4.2/ios /usr/include/c++/4.2/bits/localefwd.h \
+  /usr/include/c++/4.2/bits/ios_base.h \
+  /usr/include/c++/4.2/bits/locale_classes.h \
   /usr/include/c++/4.2/streambuf /usr/include/c++/4.2/bits/streambuf.tcc \
   /usr/include/c++/4.2/bits/basic_ios.h \
   /usr/include/c++/4.2/bits/streambuf_iterator.h \
@@ -92,16 +94,11 @@ DoxygenTranslator/src/DoxygenParser.o \
   /usr/include/c++/4.2/bits/ostream.tcc /usr/include/c++/4.2/locale \
   /usr/include/c++/4.2/bits/locale_facets.tcc \
   /usr/include/c++/4.2/typeinfo /usr/include/c++/4.2/istream \
-  /usr/include/c++/4.2/bits/istream.tcc /usr/include/c++/4.2/fstream \
-  /usr/include/c++/4.2/i486-linux-gnu/bits/basic_file.h \
-  /usr/include/c++/4.2/bits/fstream.tcc /usr/include/c++/4.2/list \
-  /usr/include/c++/4.2/bits/stl_list.h /usr/include/c++/4.2/bits/list.tcc \
-  DoxygenTranslator/src/DoxygenEntity.h DoxygenTranslator/src/TokenList.h \
-  DoxygenTranslator/src/Token.h DoxygenTranslator/src/JavaDocConverter.h
+  /usr/include/c++/4.2/bits/istream.tcc DoxygenTranslator/src/Token.h
 
 DoxygenTranslator/src/DoxygenParser.h:
 
-/usr/include/c++/4.2/cstdlib:
+/usr/include/c++/4.2/string:
 
 /usr/include/c++/4.2/i486-linux-gnu/bits/c++config.h:
 
@@ -119,10 +116,44 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/c++/4.2/i486-linux-gnu/bits/cpu_defines.h:
 
+/usr/include/c++/4.2/bits/stringfwd.h:
+
+/usr/include/c++/4.2/bits/char_traits.h:
+
+/usr/include/c++/4.2/cstring:
+
 /usr/include/c++/4.2/cstddef:
 
 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h:
 
+/usr/include/string.h:
+
+/usr/include/xlocale.h:
+
+/usr/include/c++/4.2/bits/stl_algobase.h:
+
+/usr/include/c++/4.2/climits:
+
+/usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h:
+
+/usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h:
+
+/usr/include/limits.h:
+
+/usr/include/bits/posix1_lim.h:
+
+/usr/include/bits/local_lim.h:
+
+/usr/include/linux/limits.h:
+
+/usr/include/bits/posix2_lim.h:
+
+/usr/include/bits/xopen_lim.h:
+
+/usr/include/bits/stdio_lim.h:
+
+/usr/include/c++/4.2/cstdlib:
+
 /usr/include/stdlib.h:
 
 /usr/include/bits/waitflags.h:
@@ -133,8 +164,6 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/bits/endian.h:
 
-/usr/include/xlocale.h:
-
 /usr/include/sys/types.h:
 
 /usr/include/bits/types.h:
@@ -157,20 +186,10 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/alloca.h:
 
-/usr/include/c++/4.2/iostream:
-
-/usr/include/c++/4.2/ostream:
-
-/usr/include/c++/4.2/ios:
-
 /usr/include/c++/4.2/iosfwd:
 
 /usr/include/c++/4.2/i486-linux-gnu/bits/c++locale.h:
 
-/usr/include/c++/4.2/cstring:
-
-/usr/include/string.h:
-
 /usr/include/c++/4.2/cstdio:
 
 /usr/include/stdio.h:
@@ -183,8 +202,6 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h:
 
-/usr/include/bits/stdio_lim.h:
-
 /usr/include/bits/sys_errlist.h:
 
 /usr/include/c++/4.2/clocale:
@@ -233,8 +250,6 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/ctype.h:
 
-/usr/include/c++/4.2/bits/stringfwd.h:
-
 /usr/include/c++/4.2/bits/postypes.h:
 
 /usr/include/c++/4.2/cwchar:
@@ -249,30 +264,6 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/c++/4.2/exception_defines.h:
 
-/usr/include/c++/4.2/exception:
-
-/usr/include/c++/4.2/bits/char_traits.h:
-
-/usr/include/c++/4.2/bits/stl_algobase.h:
-
-/usr/include/c++/4.2/climits:
-
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h:
-
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/bits/posix1_lim.h:
-
-/usr/include/bits/local_lim.h:
-
-/usr/include/linux/limits.h:
-
-/usr/include/bits/posix2_lim.h:
-
-/usr/include/bits/xopen_lim.h:
-
 /usr/include/c++/4.2/bits/stl_pair.h:
 
 /usr/include/c++/4.2/bits/cpp_type_traits.h:
@@ -293,18 +284,6 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/c++/4.2/debug/debug.h:
 
-/usr/include/c++/4.2/bits/localefwd.h:
-
-/usr/include/c++/4.2/bits/ios_base.h:
-
-/usr/include/c++/4.2/ext/atomicity.h:
-
-/usr/include/c++/4.2/i486-linux-gnu/bits/atomic_word.h:
-
-/usr/include/c++/4.2/bits/locale_classes.h:
-
-/usr/include/c++/4.2/string:
-
 /usr/include/c++/4.2/memory:
 
 /usr/include/c++/4.2/bits/allocator.h:
@@ -315,6 +294,8 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/c++/4.2/new:
 
+/usr/include/c++/4.2/exception:
+
 /usr/include/c++/4.2/bits/stl_construct.h:
 
 /usr/include/c++/4.2/bits/stl_uninitialized.h:
@@ -329,6 +310,10 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/c++/4.2/bits/basic_string.h:
 
+/usr/include/c++/4.2/ext/atomicity.h:
+
+/usr/include/c++/4.2/i486-linux-gnu/bits/atomic_word.h:
+
 /usr/include/c++/4.2/algorithm:
 
 /usr/include/c++/4.2/bits/stl_algo.h:
@@ -339,6 +324,28 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/c++/4.2/bits/basic_string.tcc:
 
+/usr/include/c++/4.2/list:
+
+/usr/include/c++/4.2/bits/stl_list.h:
+
+/usr/include/c++/4.2/bits/list.tcc:
+
+DoxygenTranslator/src/DoxygenEntity.h:
+
+DoxygenTranslator/src/TokenList.h:
+
+/usr/include/c++/4.2/iostream:
+
+/usr/include/c++/4.2/ostream:
+
+/usr/include/c++/4.2/ios:
+
+/usr/include/c++/4.2/bits/localefwd.h:
+
+/usr/include/c++/4.2/bits/ios_base.h:
+
+/usr/include/c++/4.2/bits/locale_classes.h:
+
 /usr/include/c++/4.2/streambuf:
 
 /usr/include/c++/4.2/bits/streambuf.tcc:
@@ -377,22 +384,4 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/c++/4.2/bits/istream.tcc:
 
-/usr/include/c++/4.2/fstream:
-
-/usr/include/c++/4.2/i486-linux-gnu/bits/basic_file.h:
-
-/usr/include/c++/4.2/bits/fstream.tcc:
-
-/usr/include/c++/4.2/list:
-
-/usr/include/c++/4.2/bits/stl_list.h:
-
-/usr/include/c++/4.2/bits/list.tcc:
-
-DoxygenTranslator/src/DoxygenEntity.h:
-
-DoxygenTranslator/src/TokenList.h:
-
 DoxygenTranslator/src/Token.h:
-
-DoxygenTranslator/src/JavaDocConverter.h:
diff --git a/Source/DoxygenTranslator/src/.deps/DoxygenTranslator.Po b/Source/DoxygenTranslator/src/.deps/DoxygenTranslator.Po
index d71e23830..4cec6c648 100644
--- a/Source/DoxygenTranslator/src/.deps/DoxygenTranslator.Po
+++ b/Source/DoxygenTranslator/src/.deps/DoxygenTranslator.Po
@@ -1,36 +1,42 @@
 DoxygenTranslator/src/DoxygenTranslator.o \
   DoxygenTranslator/src/DoxygenTranslator.o:  \
  DoxygenTranslator/src/DoxygenTranslator.cpp \
-  DoxygenTranslator/src/DoxygenParser.h /usr/include/c++/4.2/cstdlib \
+  DoxygenTranslator/src/DoxygenParser.h /usr/include/c++/4.2/string \
   /usr/include/c++/4.2/i486-linux-gnu/bits/c++config.h \
   /usr/include/c++/4.2/i486-linux-gnu/bits/os_defines.h \
   /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h \
   /usr/include/c++/4.2/i486-linux-gnu/bits/cpu_defines.h \
+  /usr/include/c++/4.2/bits/stringfwd.h \
+  /usr/include/c++/4.2/bits/char_traits.h /usr/include/c++/4.2/cstring \
   /usr/include/c++/4.2/cstddef \
   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \
+  /usr/include/string.h /usr/include/xlocale.h \
+  /usr/include/c++/4.2/bits/stl_algobase.h /usr/include/c++/4.2/climits \
+  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h \
+  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
+  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
+  /usr/include/bits/posix2_lim.h /usr/include/bits/xopen_lim.h \
+  /usr/include/bits/stdio_lim.h /usr/include/c++/4.2/cstdlib \
   /usr/include/stdlib.h /usr/include/bits/waitflags.h \
   /usr/include/bits/waitstatus.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/xlocale.h \
-  /usr/include/sys/types.h /usr/include/bits/types.h \
-  /usr/include/bits/typesizes.h /usr/include/time.h \
-  /usr/include/sys/select.h /usr/include/bits/select.h \
-  /usr/include/bits/sigset.h /usr/include/bits/time.h \
-  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
-  /usr/include/alloca.h /usr/include/c++/4.2/iostream \
-  /usr/include/c++/4.2/ostream /usr/include/c++/4.2/ios \
+  /usr/include/bits/endian.h /usr/include/sys/types.h \
+  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+  /usr/include/time.h /usr/include/sys/select.h \
+  /usr/include/bits/select.h /usr/include/bits/sigset.h \
+  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
+  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
   /usr/include/c++/4.2/iosfwd \
   /usr/include/c++/4.2/i486-linux-gnu/bits/c++locale.h \
-  /usr/include/c++/4.2/cstring /usr/include/string.h \
   /usr/include/c++/4.2/cstdio /usr/include/stdio.h /usr/include/libio.h \
   /usr/include/_G_config.h /usr/include/wchar.h \
   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/c++/4.2/clocale /usr/include/locale.h \
-  /usr/include/bits/locale.h /usr/include/langinfo.h \
-  /usr/include/nl_types.h /usr/include/iconv.h /usr/include/libintl.h \
-  /usr/include/c++/4.2/cstdarg \
+  /usr/include/bits/sys_errlist.h /usr/include/c++/4.2/clocale \
+  /usr/include/locale.h /usr/include/bits/locale.h \
+  /usr/include/langinfo.h /usr/include/nl_types.h /usr/include/iconv.h \
+  /usr/include/libintl.h /usr/include/c++/4.2/cstdarg \
   /usr/include/c++/4.2/i486-linux-gnu/bits/c++io.h \
   /usr/include/c++/4.2/i486-linux-gnu/bits/gthr.h \
   /usr/include/c++/4.2/i486-linux-gnu/bits/gthr-default.h \
@@ -39,18 +45,10 @@ DoxygenTranslator/src/DoxygenTranslator.o \
   /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
   /usr/include/bits/confname.h /usr/include/getopt.h \
   /usr/include/c++/4.2/cctype /usr/include/ctype.h \
-  /usr/include/c++/4.2/bits/stringfwd.h \
   /usr/include/c++/4.2/bits/postypes.h /usr/include/c++/4.2/cwchar \
   /usr/include/c++/4.2/ctime /usr/include/bits/wchar.h \
   /usr/include/stdint.h /usr/include/c++/4.2/bits/functexcept.h \
-  /usr/include/c++/4.2/exception_defines.h /usr/include/c++/4.2/exception \
-  /usr/include/c++/4.2/bits/char_traits.h \
-  /usr/include/c++/4.2/bits/stl_algobase.h /usr/include/c++/4.2/climits \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h \
-  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
-  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
-  /usr/include/bits/posix2_lim.h /usr/include/bits/xopen_lim.h \
+  /usr/include/c++/4.2/exception_defines.h \
   /usr/include/c++/4.2/bits/stl_pair.h \
   /usr/include/c++/4.2/bits/cpp_type_traits.h \
   /usr/include/c++/4.2/ext/type_traits.h /usr/include/c++/4.2/utility \
@@ -59,25 +57,30 @@ DoxygenTranslator/src/DoxygenTranslator.o \
   /usr/include/c++/4.2/bits/stl_iterator_base_funcs.h \
   /usr/include/c++/4.2/bits/concept_check.h \
   /usr/include/c++/4.2/bits/stl_iterator.h \
-  /usr/include/c++/4.2/debug/debug.h \
-  /usr/include/c++/4.2/bits/localefwd.h \
-  /usr/include/c++/4.2/bits/ios_base.h \
-  /usr/include/c++/4.2/ext/atomicity.h \
-  /usr/include/c++/4.2/i486-linux-gnu/bits/atomic_word.h \
-  /usr/include/c++/4.2/bits/locale_classes.h /usr/include/c++/4.2/string \
-  /usr/include/c++/4.2/memory /usr/include/c++/4.2/bits/allocator.h \
+  /usr/include/c++/4.2/debug/debug.h /usr/include/c++/4.2/memory \
+  /usr/include/c++/4.2/bits/allocator.h \
   /usr/include/c++/4.2/i486-linux-gnu/bits/c++allocator.h \
   /usr/include/c++/4.2/ext/new_allocator.h /usr/include/c++/4.2/new \
+  /usr/include/c++/4.2/exception \
   /usr/include/c++/4.2/bits/stl_construct.h \
   /usr/include/c++/4.2/bits/stl_uninitialized.h \
   /usr/include/c++/4.2/bits/stl_raw_storage_iter.h \
   /usr/include/c++/4.2/limits /usr/include/c++/4.2/bits/ostream_insert.h \
   /usr/include/c++/4.2/bits/stl_function.h \
-  /usr/include/c++/4.2/bits/basic_string.h /usr/include/c++/4.2/algorithm \
-  /usr/include/c++/4.2/bits/stl_algo.h \
+  /usr/include/c++/4.2/bits/basic_string.h \
+  /usr/include/c++/4.2/ext/atomicity.h \
+  /usr/include/c++/4.2/i486-linux-gnu/bits/atomic_word.h \
+  /usr/include/c++/4.2/algorithm /usr/include/c++/4.2/bits/stl_algo.h \
   /usr/include/c++/4.2/bits/stl_heap.h \
   /usr/include/c++/4.2/bits/stl_tempbuf.h \
-  /usr/include/c++/4.2/bits/basic_string.tcc \
+  /usr/include/c++/4.2/bits/basic_string.tcc /usr/include/c++/4.2/list \
+  /usr/include/c++/4.2/bits/stl_list.h /usr/include/c++/4.2/bits/list.tcc \
+  DoxygenTranslator/src/DoxygenEntity.h \
+  DoxygenTranslator/src/DoxygenTranslator.h /usr/include/c++/4.2/iostream \
+  /usr/include/c++/4.2/ostream /usr/include/c++/4.2/ios \
+  /usr/include/c++/4.2/bits/localefwd.h \
+  /usr/include/c++/4.2/bits/ios_base.h \
+  /usr/include/c++/4.2/bits/locale_classes.h \
   /usr/include/c++/4.2/streambuf /usr/include/c++/4.2/bits/streambuf.tcc \
   /usr/include/c++/4.2/bits/basic_ios.h \
   /usr/include/c++/4.2/bits/streambuf_iterator.h \
@@ -94,15 +97,12 @@ DoxygenTranslator/src/DoxygenTranslator.o \
   /usr/include/c++/4.2/typeinfo /usr/include/c++/4.2/istream \
   /usr/include/c++/4.2/bits/istream.tcc /usr/include/c++/4.2/fstream \
   /usr/include/c++/4.2/i486-linux-gnu/bits/basic_file.h \
-  /usr/include/c++/4.2/bits/fstream.tcc /usr/include/c++/4.2/list \
-  /usr/include/c++/4.2/bits/stl_list.h /usr/include/c++/4.2/bits/list.tcc \
-  DoxygenTranslator/src/DoxygenEntity.h DoxygenTranslator/src/TokenList.h \
-  DoxygenTranslator/src/Token.h DoxygenTranslator/src/JavaDocConverter.h \
-  DoxygenTranslator/src/DoxygenTranslator.h
+  /usr/include/c++/4.2/bits/fstream.tcc DoxygenTranslator/src/TokenList.h \
+  DoxygenTranslator/src/Token.h DoxygenTranslator/src/JavaDocConverter.h
 
 DoxygenTranslator/src/DoxygenParser.h:
 
-/usr/include/c++/4.2/cstdlib:
+/usr/include/c++/4.2/string:
 
 /usr/include/c++/4.2/i486-linux-gnu/bits/c++config.h:
 
@@ -120,10 +120,44 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/c++/4.2/i486-linux-gnu/bits/cpu_defines.h:
 
+/usr/include/c++/4.2/bits/stringfwd.h:
+
+/usr/include/c++/4.2/bits/char_traits.h:
+
+/usr/include/c++/4.2/cstring:
+
 /usr/include/c++/4.2/cstddef:
 
 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h:
 
+/usr/include/string.h:
+
+/usr/include/xlocale.h:
+
+/usr/include/c++/4.2/bits/stl_algobase.h:
+
+/usr/include/c++/4.2/climits:
+
+/usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h:
+
+/usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h:
+
+/usr/include/limits.h:
+
+/usr/include/bits/posix1_lim.h:
+
+/usr/include/bits/local_lim.h:
+
+/usr/include/linux/limits.h:
+
+/usr/include/bits/posix2_lim.h:
+
+/usr/include/bits/xopen_lim.h:
+
+/usr/include/bits/stdio_lim.h:
+
+/usr/include/c++/4.2/cstdlib:
+
 /usr/include/stdlib.h:
 
 /usr/include/bits/waitflags.h:
@@ -134,8 +168,6 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/bits/endian.h:
 
-/usr/include/xlocale.h:
-
 /usr/include/sys/types.h:
 
 /usr/include/bits/types.h:
@@ -158,20 +190,10 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/alloca.h:
 
-/usr/include/c++/4.2/iostream:
-
-/usr/include/c++/4.2/ostream:
-
-/usr/include/c++/4.2/ios:
-
 /usr/include/c++/4.2/iosfwd:
 
 /usr/include/c++/4.2/i486-linux-gnu/bits/c++locale.h:
 
-/usr/include/c++/4.2/cstring:
-
-/usr/include/string.h:
-
 /usr/include/c++/4.2/cstdio:
 
 /usr/include/stdio.h:
@@ -184,8 +206,6 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h:
 
-/usr/include/bits/stdio_lim.h:
-
 /usr/include/bits/sys_errlist.h:
 
 /usr/include/c++/4.2/clocale:
@@ -234,8 +254,6 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/ctype.h:
 
-/usr/include/c++/4.2/bits/stringfwd.h:
-
 /usr/include/c++/4.2/bits/postypes.h:
 
 /usr/include/c++/4.2/cwchar:
@@ -250,30 +268,6 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/c++/4.2/exception_defines.h:
 
-/usr/include/c++/4.2/exception:
-
-/usr/include/c++/4.2/bits/char_traits.h:
-
-/usr/include/c++/4.2/bits/stl_algobase.h:
-
-/usr/include/c++/4.2/climits:
-
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h:
-
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/bits/posix1_lim.h:
-
-/usr/include/bits/local_lim.h:
-
-/usr/include/linux/limits.h:
-
-/usr/include/bits/posix2_lim.h:
-
-/usr/include/bits/xopen_lim.h:
-
 /usr/include/c++/4.2/bits/stl_pair.h:
 
 /usr/include/c++/4.2/bits/cpp_type_traits.h:
@@ -294,18 +288,6 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/c++/4.2/debug/debug.h:
 
-/usr/include/c++/4.2/bits/localefwd.h:
-
-/usr/include/c++/4.2/bits/ios_base.h:
-
-/usr/include/c++/4.2/ext/atomicity.h:
-
-/usr/include/c++/4.2/i486-linux-gnu/bits/atomic_word.h:
-
-/usr/include/c++/4.2/bits/locale_classes.h:
-
-/usr/include/c++/4.2/string:
-
 /usr/include/c++/4.2/memory:
 
 /usr/include/c++/4.2/bits/allocator.h:
@@ -316,6 +298,8 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/c++/4.2/new:
 
+/usr/include/c++/4.2/exception:
+
 /usr/include/c++/4.2/bits/stl_construct.h:
 
 /usr/include/c++/4.2/bits/stl_uninitialized.h:
@@ -330,6 +314,10 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/c++/4.2/bits/basic_string.h:
 
+/usr/include/c++/4.2/ext/atomicity.h:
+
+/usr/include/c++/4.2/i486-linux-gnu/bits/atomic_word.h:
+
 /usr/include/c++/4.2/algorithm:
 
 /usr/include/c++/4.2/bits/stl_algo.h:
@@ -340,6 +328,28 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/c++/4.2/bits/basic_string.tcc:
 
+/usr/include/c++/4.2/list:
+
+/usr/include/c++/4.2/bits/stl_list.h:
+
+/usr/include/c++/4.2/bits/list.tcc:
+
+DoxygenTranslator/src/DoxygenEntity.h:
+
+DoxygenTranslator/src/DoxygenTranslator.h:
+
+/usr/include/c++/4.2/iostream:
+
+/usr/include/c++/4.2/ostream:
+
+/usr/include/c++/4.2/ios:
+
+/usr/include/c++/4.2/bits/localefwd.h:
+
+/usr/include/c++/4.2/bits/ios_base.h:
+
+/usr/include/c++/4.2/bits/locale_classes.h:
+
 /usr/include/c++/4.2/streambuf:
 
 /usr/include/c++/4.2/bits/streambuf.tcc:
@@ -384,18 +394,8 @@ DoxygenTranslator/src/DoxygenParser.h:
 
 /usr/include/c++/4.2/bits/fstream.tcc:
 
-/usr/include/c++/4.2/list:
-
-/usr/include/c++/4.2/bits/stl_list.h:
-
-/usr/include/c++/4.2/bits/list.tcc:
-
-DoxygenTranslator/src/DoxygenEntity.h:
-
 DoxygenTranslator/src/TokenList.h:
 
 DoxygenTranslator/src/Token.h:
 
 DoxygenTranslator/src/JavaDocConverter.h:
-
-DoxygenTranslator/src/DoxygenTranslator.h:
diff --git a/Source/DoxygenTranslator/src/.deps/Token.Po b/Source/DoxygenTranslator/src/.deps/Token.Po
index 9a4bb90f5..dbfe541b1 100644
--- a/Source/DoxygenTranslator/src/.deps/Token.Po
+++ b/Source/DoxygenTranslator/src/.deps/Token.Po
@@ -72,27 +72,7 @@ DoxygenTranslator/src/Token.o DoxygenTranslator/src/Token.o:  \
   /usr/include/c++/4.2/algorithm /usr/include/c++/4.2/bits/stl_algo.h \
   /usr/include/c++/4.2/bits/stl_heap.h \
   /usr/include/c++/4.2/bits/stl_tempbuf.h \
-  /usr/include/c++/4.2/bits/basic_string.tcc \
-  /usr/include/c++/4.2/iostream /usr/include/c++/4.2/ostream \
-  /usr/include/c++/4.2/ios /usr/include/c++/4.2/bits/localefwd.h \
-  /usr/include/c++/4.2/bits/ios_base.h \
-  /usr/include/c++/4.2/bits/locale_classes.h \
-  /usr/include/c++/4.2/streambuf /usr/include/c++/4.2/bits/streambuf.tcc \
-  /usr/include/c++/4.2/bits/basic_ios.h \
-  /usr/include/c++/4.2/bits/streambuf_iterator.h \
-  /usr/include/c++/4.2/bits/locale_facets.h /usr/include/c++/4.2/cwctype \
-  /usr/include/wctype.h \
-  /usr/include/c++/4.2/i486-linux-gnu/bits/ctype_base.h \
-  /usr/include/c++/4.2/i486-linux-gnu/bits/ctype_inline.h \
-  /usr/include/c++/4.2/bits/codecvt.h \
-  /usr/include/c++/4.2/i486-linux-gnu/bits/time_members.h \
-  /usr/include/c++/4.2/i486-linux-gnu/bits/messages_members.h \
-  /usr/include/c++/4.2/bits/basic_ios.tcc \
-  /usr/include/c++/4.2/bits/ostream.tcc /usr/include/c++/4.2/locale \
-  /usr/include/c++/4.2/bits/locale_facets.tcc \
-  /usr/include/c++/4.2/typeinfo /usr/include/c++/4.2/istream \
-  /usr/include/c++/4.2/bits/istream.tcc /usr/include/c++/4.2/list \
-  /usr/include/c++/4.2/bits/stl_list.h /usr/include/c++/4.2/bits/list.tcc
+  /usr/include/c++/4.2/bits/basic_string.tcc
 
 DoxygenTranslator/src/Token.h:
 
@@ -321,59 +301,3 @@ DoxygenTranslator/src/Token.h:
 /usr/include/c++/4.2/bits/stl_tempbuf.h:
 
 /usr/include/c++/4.2/bits/basic_string.tcc:
-
-/usr/include/c++/4.2/iostream:
-
-/usr/include/c++/4.2/ostream:
-
-/usr/include/c++/4.2/ios:
-
-/usr/include/c++/4.2/bits/localefwd.h:
-
-/usr/include/c++/4.2/bits/ios_base.h:
-
-/usr/include/c++/4.2/bits/locale_classes.h:
-
-/usr/include/c++/4.2/streambuf:
-
-/usr/include/c++/4.2/bits/streambuf.tcc:
-
-/usr/include/c++/4.2/bits/basic_ios.h:
-
-/usr/include/c++/4.2/bits/streambuf_iterator.h:
-
-/usr/include/c++/4.2/bits/locale_facets.h:
-
-/usr/include/c++/4.2/cwctype:
-
-/usr/include/wctype.h:
-
-/usr/include/c++/4.2/i486-linux-gnu/bits/ctype_base.h:
-
-/usr/include/c++/4.2/i486-linux-gnu/bits/ctype_inline.h:
-
-/usr/include/c++/4.2/bits/codecvt.h:
-
-/usr/include/c++/4.2/i486-linux-gnu/bits/time_members.h:
-
-/usr/include/c++/4.2/i486-linux-gnu/bits/messages_members.h:
-
-/usr/include/c++/4.2/bits/basic_ios.tcc:
-
-/usr/include/c++/4.2/bits/ostream.tcc:
-
-/usr/include/c++/4.2/locale:
-
-/usr/include/c++/4.2/bits/locale_facets.tcc:
-
-/usr/include/c++/4.2/typeinfo:
-
-/usr/include/c++/4.2/istream:
-
-/usr/include/c++/4.2/bits/istream.tcc:
-
-/usr/include/c++/4.2/list:
-
-/usr/include/c++/4.2/bits/stl_list.h:
-
-/usr/include/c++/4.2/bits/list.tcc:
diff --git a/Source/DoxygenTranslator/src/DoxygenEntity.cpp b/Source/DoxygenTranslator/src/DoxygenEntity.cpp
index 6b8755592..a2faf67db 100644
--- a/Source/DoxygenTranslator/src/DoxygenEntity.cpp
+++ b/Source/DoxygenTranslator/src/DoxygenEntity.cpp
@@ -1,6 +1,6 @@
 #include "DoxygenEntity.h"
 #include <string>
-
+#include <iostream>
 /* Little data class for Doxygen Commands */
 
 
diff --git a/Source/DoxygenTranslator/src/DoxygenEntity.h b/Source/DoxygenTranslator/src/DoxygenEntity.h
index 0605b1cc9..4313bfb2a 100644
--- a/Source/DoxygenTranslator/src/DoxygenEntity.h
+++ b/Source/DoxygenTranslator/src/DoxygenEntity.h
@@ -1,8 +1,7 @@
 #ifndef DOXYGENENTITY_H_
 #define DOXYGENENTITY_H_
 
-#include <cstdlib>
-#include <iostream>
+
 #include <string>
 #include <list>
 
diff --git a/Source/DoxygenTranslator/src/DoxygenParser.cpp b/Source/DoxygenTranslator/src/DoxygenParser.cpp
index 226c60720..920b7c794 100644
--- a/Source/DoxygenTranslator/src/DoxygenParser.cpp
+++ b/Source/DoxygenTranslator/src/DoxygenParser.cpp
@@ -1,13 +1,5 @@
 #include "DoxygenParser.h"
-
-#include <cstdlib>
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <list>
-#include "DoxygenEntity.h"
 #include "TokenList.h"
-#include "JavaDocConverter.h"
 #define SIMPLECOMMAND 1
 #define IGNOREDSIMPLECOMMAND 2
 #define COMMANDWORD 3
@@ -29,12 +21,6 @@
 #define  COMMAND  104
 using namespace std;
 
-//////////////////////////////////////////
-/*Set these to pick what internal functions
-to test. */
-
-//int testCommandParsingFunctions = 1;// not implemented
-
 
 DoxygenParser::DoxygenParser()
 {
@@ -44,7 +30,8 @@ DoxygenParser::~DoxygenParser()
 {
 }
 
-int noisy = 0; // set this to 1 for extra chatter from the parsing stage.
+//////////////////////////////////////////
+int noisy = 1; // set this to 1 for extra chatter from the parsing stage.
 int addCommand(string currCommand, TokenList &tokList,  list <DoxygenEntity> &aNewList);
 list <DoxygenEntity> parse(list<Token>::iterator endParsingIndex, TokenList &tokList);
 
@@ -101,32 +88,25 @@ string commandUniques[] = {"xrefitem", "arg", "ingroup", "par", "headerfile", "o
 		"subpage", "dotfile", "image", "addtogroup", "li"};
 
 
-/* Changes a string to all lower case*/
-string StringToLower(string stringToConvert)
-
-{
-
-   for(unsigned int i=0;i<stringToConvert.length();i++)
-   {
-   stringToConvert[i] = tolower(stringToConvert[i]);
-   }
-   return stringToConvert;//return the converted string
+/* Changes a string to all lower case */
+string StringToLower(string stringToConvert){
+   for(unsigned int i=0;i<stringToConvert.length();i++){
+	   stringToConvert[i] = tolower(stringToConvert[i]);
+	   }
+   return stringToConvert; //return the converted string
 }
 
 /* finds out if a command exists (is a possible command)
  * from the string array commandArray
  * returns -1 if no match is found */
 int findCommand(string smallString){
-
 	smallString = StringToLower(smallString);
 	int a;
 	for (int i = 0; i < sizeof(commandArray)/sizeof(*commandArray); i++){
 		if( (a = smallString.compare(commandArray[i])) == 0){
 			return 101 + i;
+			}
 		}
-
-
-	}
 	return -1;
 }
 
@@ -136,7 +116,6 @@ int findCommand(string smallString){
  */
 int isSectionIndicator(string smallString){
 	smallString = StringToLower(smallString);
-
 	for (int i = 0; i < sizeof( sectionIndicators)/sizeof(* sectionIndicators); i++){
 		if( smallString.compare( sectionIndicators[i]) == 0){
 			return 1;
@@ -145,29 +124,24 @@ int isSectionIndicator(string smallString){
 	return 0;
 }
 
-/* prints the parse tree
- *
- */
+/* prints the parse tree */
 void printTree( list <DoxygenEntity> &rootList){
-
-		list<DoxygenEntity>::iterator p = rootList.begin();
-		while (p != rootList.end()){
-			(*p).printEntity(0);
-			p++;
+	list<DoxygenEntity>::iterator p = rootList.begin();
+	while (p != rootList.end()){
+		(*p).printEntity(0);
+		p++;
 		}
-
-}
+	}
 
 /* Determines how a command should be handled (what group it belongs to
  * for parsing rules
  */
-
 int commandBelongs(string theCommand){
-	 string smallString = StringToLower(theCommand );
+	 string smallString = StringToLower(theCommand);
 	 //cout << " Looking for command " << theCommand << endl;
 	 int i = 0;
 	 for ( i = 0; i < sizeof(simpleCommands)/sizeof(*simpleCommands); i++){
-	 	if(smallString.compare(simpleCommands[i]) == 0){return SIMPLECOMMAND ;}
+	 	if(smallString.compare(simpleCommands[i]) == 0){return SIMPLECOMMAND;}
 	 	}
 	 for ( i = 0; i < sizeof(ignoredSimpleCommands)/sizeof(*ignoredSimpleCommands); i++){
 	 	if(smallString.compare(ignoredSimpleCommands[i]) == 0){return IGNOREDSIMPLECOMMAND;}
@@ -187,7 +161,6 @@ int commandBelongs(string theCommand){
 	 for ( i = 0; i <  sizeof(commandParagraph)/sizeof(*commandParagraph); i++){
 	 	if(smallString.compare( commandParagraph[i]) == 0){return COMMANDPARAGRAPH;}
 	 	} 
-	 /* IgnoreCommandParagraph */
 	 for ( i = 0; i < sizeof(ignoreCommandParagraphs)/sizeof(*ignoreCommandParagraphs); i++){
 	 	if(smallString.compare( ignoreCommandParagraphs[i]) == 0){return IGNORECOMMANDPARAGRAPH;}
 	 	} 
@@ -211,16 +184,14 @@ int commandBelongs(string theCommand){
 	 	} 
 	 for ( i = 0; i < sizeof(commandUniques)/sizeof(*commandUniques); i++){
 	 	if(smallString.compare( commandUniques[i]) == 0){return COMMANDUNIQUE;}
-	 	} 
-
-	 	return 0;
-	 
+	 	}
+	 	return 0; 
 }
+
 /* Returns the next word ON THE CURRENT LINE ONLY
  * if a new line is encountered, returns a blank string.
  * Updates the index it is given if success.
  */
-
 string getNextWord(TokenList &tokList){
 	 Token nextToken = tokList.peek();
 	 if (nextToken.tokenType == PLAINSTRING ){
@@ -234,17 +205,17 @@ string getNextWord(TokenList &tokList){
  * an iterator.
  */
 list<Token>::iterator getOneLine(TokenList &tokList){
-	 list<Token>::iterator endOfParagraph = tokList.iteratorCopy();
-	 while(endOfParagraph != tokList.end()){
-		 if ((* endOfParagraph).tokenType == END_LINE){
-			 return endOfParagraph;
+	 list<Token>::iterator endOfLine = tokList.iteratorCopy();
+	 while(endOfLine!= tokList.end()){
+		 if ((* endOfLine).tokenType == END_LINE){
+			 endOfLine++;
+			 return endOfLine;
+			 }
+		 endOfLine++;
 		 }
-		 endOfParagraph++;
-	 }
+	 cout << "REACHED END" << endl;
 	return tokList.end();
-}
-
-
+	}
 
 /* Returns a properly formatted string
 * up til ANY command or end of paragraph is encountered.
@@ -256,12 +227,11 @@ string getStringTilCommand(TokenList &tokList){
 		 Token currentToken = tokList.next();
 		 if(currentToken.tokenType == PLAINSTRING) {
 			 description = description + currentToken.tokenString + " ";
-		 }
+			 }
 		 else if (tokList.peek().tokenType == END_LINE) break;
-	 }
-	 
+		 }
 	return description;
-}
+	}
 
 /* Returns a properly formatted string
 * up til the command specified is encountered
@@ -274,69 +244,67 @@ string getStringTilEndCommand(string theCommand, TokenList &tokList){
 	 while(tokList.peek().tokenString.compare(theCommand) != 0 ){
 		 Token currentToken = tokList.next();
 		 description = description + currentToken.tokenString + " ";
-
-	 }
-	 
+		 }
 	return description;
-}
+	}
 
 /* Returns the end of a Paragraph as an iterator-
 * Paragraph is defined in Doxygen to be a paragraph of text
 * seperate by either a structural command or a blank line
 */
-
 list<Token>::iterator getEndOfParagraph(TokenList &tokList){
 	 list<Token>::iterator endOfParagraph = tokList.iteratorCopy();
 	 while(endOfParagraph != tokList.end()){
-		if ((* endOfParagraph).tokenType == COMMAND){
-			 if(isSectionIndicator((* endOfParagraph).tokenString)) return endOfParagraph;
-			 else endOfParagraph++;
-		 }
-		else if((* endOfParagraph).tokenType == PLAINSTRING) {
-			 endOfParagraph++;
-		 }
-		 else if ((* endOfParagraph).tokenType == END_LINE){
+		if ((* endOfParagraph).tokenType == END_LINE){
 			 endOfParagraph++;
 			 if ((* endOfParagraph).tokenType == END_LINE){
 				 endOfParagraph++;
+				 cout << "ENCOUNTERED END OF PARA" << endl;
 				 return endOfParagraph;
+				 }
 			 }
-		 }
-
+		else if ((* endOfParagraph).tokenType == COMMAND){
+			 if(isSectionIndicator((* endOfParagraph).tokenString)) return endOfParagraph;
+			 else endOfParagraph++;
+			 }
+		else if((* endOfParagraph).tokenType == PLAINSTRING) {
+			 endOfParagraph++;
+			 }
+		else return tokList.end();
+		}
+	 return tokList.end();
 	 }
-	 
-	return tokList.end();
-
-}
 
 /* Returns the end of a section, defined as the first blank line OR first encounter of the same 
 * command. Example of this behaviour is \arg
+* if no end is encountered, returns the last token of the list.
 */
-
 list<Token>::iterator getEndOfSection(string theCommand, TokenList &tokList){
 	 list<Token>::iterator endOfParagraph = tokList.iteratorCopy();
 	 while(endOfParagraph != tokList.end()){
 		if ((* endOfParagraph).tokenType == COMMAND){
 			 if(theCommand.compare((*endOfParagraph).tokenString) == 0) return endOfParagraph;
 			 else endOfParagraph++;
-		 }
+			 }
 		else if((* endOfParagraph).tokenType == PLAINSTRING) {
 			 endOfParagraph++;
-		 }
+			 }
 		 else if ((* endOfParagraph).tokenType == END_LINE){
 			 endOfParagraph++;
 			 if ((* endOfParagraph).tokenType == END_LINE){
 				 endOfParagraph++;
 				 return endOfParagraph;
+				 }
 			 }
-		 }
-
+		}
+	 return tokList.end();
 	 }
-}
+
 /* This method is for returning the end of a specific form of doxygen command
  * that begins with a \command and ends in \endcommand
  * such as \code and \endcode. The proper usage is
  * progressTilEndCommand("endcode", tokenList);
+ * If the end is never encountered, it returns the end of the list.
  */
 list<Token>::iterator getEndCommand(string theCommand, TokenList &tokList){
 	list<Token>::iterator endOfCommand = tokList.iteratorCopy();
@@ -354,11 +322,11 @@ list<Token>::iterator getEndCommand(string theCommand, TokenList &tokList){
 
 /* A specialty method for commands such as \arg that end at the end of a paragraph OR when another \arg is encountered
  */
-
+//TODO getTilAnyCommand
 list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
 	list<Token>::iterator anIterator;
 	return anIterator;
-}
+	}
 
 
 
@@ -369,21 +337,19 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
  *  \n \\ \@ \& \$ \# \< \> \%
  */
  int addSimpleCommand(string theCommand, list <DoxygenEntity> &doxyList){
-	 
 		if (noisy) cout << "Parsing " << theCommand << endl;
 		doxyList.push_back(DoxygenEntity(theCommand));
 		return 1;
-}
+		}
  
  /* NOT INCLUDED Simple Commands
   * Format: @command
   * Plain commands, such as newline etc, they contain no other data
   */
  int ignoreSimpleCommand(string theCommand, list <DoxygenEntity> &doxyList){
-	 
 		if (noisy) cout << "Not Adding " << theCommand << endl;
 		return 1;
-}
+		}
  
  /* CommandWord
   * Format: @command <word>
@@ -397,10 +363,11 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
 	if (!name.empty()){ 
 		doxyList.push_back(DoxygenEntity(theCommand, name));
 		return 1;
-	}
+		}
 	else cout << "No word followed " << theCommand <<  " command. Not added" << endl;
 	return 0;
-}
+	}
+ 
  /* NOT INCLUDED CommandWord
   * Format: @command <word>
   * Commands with a single WORD after then such as @b
@@ -411,10 +378,10 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
 	string name = getNextWord(tokList);
 	if (!name.empty()){ 
 		return 1;
-	}
+		}
 	else cout << "WARNING: No word followed " << theCommand <<  " command." << endl;
 	return 0;
-}
+	}
  
  /* CommandLine
   * Format: @command (line)
@@ -424,12 +391,11 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
  int addCommandLine(string theCommand, TokenList &tokList, list <DoxygenEntity> &doxyList){
 	if (noisy) cout << "Parsing " << theCommand << endl;
 	list<Token>::iterator endOfLine = getOneLine(tokList);
-		list <DoxygenEntity> aNewList;
-		aNewList =  parse(endOfLine, tokList);
-		doxyList.push_back( DoxygenEntity(theCommand, aNewList));
-		return 1;
-
-}
+	list <DoxygenEntity> aNewList;
+	aNewList =  parse(endOfLine, tokList);
+	doxyList.push_back( DoxygenEntity(theCommand, aNewList));
+	return 1;
+	}
  
  /* NOT INCLUDED CommandLine
   * Format: @command (line)
@@ -452,14 +418,12 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
  int addCommandParagraph(string theCommand, TokenList &tokList, list <DoxygenEntity> &doxyList){
 	if (noisy) cout << "Parsing " << theCommand << endl;
 	list<Token>::iterator endOfParagraph = getEndOfParagraph(tokList);
-	//if(!restOfParagraph.empty()){
 	list <DoxygenEntity> aNewList;
 	aNewList =  parse(endOfParagraph, tokList);
 	doxyList.push_back( DoxygenEntity(theCommand, aNewList));
 	return 1;
-	//	}
-	//else cout << "No line followed " << theCommand <<  " command. Not added" << endl;
-}
+	}
+ 
  /* CommandParagraph
   * Format: @command {paragraph}
   * Commands with a single LINE after then such as @var
@@ -469,9 +433,9 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
 	if (noisy) cout << "Not Adding " << theCommand << endl;
 	list<Token>::iterator endOfParagraph = getEndOfParagraph(tokList);
 	tokList.setIterator(endOfParagraph);
-	//else cout << "WARNING: No line followed " << theCommand <<  " command." << endl;
 	return 1;
 }
+ 
  /* Command EndCommand
   * Format: @command and ends at @endcommand
   * Commands that take in a block of text such as @code
@@ -479,13 +443,12 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
   * "verbatim", "xmlonly", "cond", "if", "ifnot", "link"
   * Returns 1 if success, 0 if the endcommand is never encountered.
   */
- 
  int addCommandEndCommand(string theCommand, TokenList &tokList, list <DoxygenEntity> &doxyList){
 	  if (noisy) cout << "Not Adding " << theCommand << endl;
 	  string description = getStringTilEndCommand( "end" + theCommand, tokList);
 	  doxyList.push_back(DoxygenEntity(theCommand, description));
 	  return 1;
- }
+	  }
  
  /* CommandWordParagraph
   * Format: @command <word> {paragraph}
@@ -499,14 +462,14 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
 		cout << "No word followed " << theCommand <<  " command. Not added" << endl;
 		return 0;
 		}
-	  list<Token>::iterator endOfParagraph = getEndOfParagraph(tokList);
-	    //if(!restOfParagraph.empty()){
-		list <DoxygenEntity> aNewList;
-		aNewList =  parse(endOfParagraph, tokList);
-		aNewList.push_front(DoxygenEntity("plainstring", name));
-		doxyList.push_back(DoxygenEntity(theCommand, aNewList));
-	return 0;
- }
+	list<Token>::iterator endOfParagraph = getEndOfParagraph(tokList);
+	list <DoxygenEntity> aNewList;
+	aNewList =  parse(endOfParagraph, tokList);
+	aNewList.push_front(DoxygenEntity("plainstring", name));
+	doxyList.push_back(DoxygenEntity(theCommand, aNewList));
+	return 1;
+	}
+ 
  /* CommandWordLine
   * Format: @command <word> (line)
   * Commands such as param
@@ -549,7 +512,7 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
 	if (!headername.empty()) aNewList.push_back(DoxygenEntity("plainstring", headername));
 	doxyList.push_back(DoxygenEntity(theCommand, aNewList));
 	return 1;
- }
+	}
  
  /* Command Optional Word
   * Format: @command [<word>]
@@ -564,13 +527,17 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
  }
 
  /* Commands that should not be encountered (such as PHP only)
+  * goes til the end of line then returns
   */
  int addCommandErrorThrow(string theCommand, TokenList &tokList, list <DoxygenEntity> &doxyList){
 	  cout << "Encountered :" << theCommand << endl;
 	  cout << "This command should not have been encountered. Behaviour past this may be unpredictable " << endl;
+	  list<Token>::iterator endOfLine = getOneLine(tokList);
+	  tokList.setIterator(endOfLine);
+	  return 0;
  }
 
-
+/* Adds the unique commands- different process for each unique command */
  int addCommandUnique(string theCommand, TokenList &tokList, list <DoxygenEntity> &doxyList){
 	  list <DoxygenEntity> aNewList;
 	  if (theCommand.compare("arg") == 0 || theCommand.compare("li") == 0){
@@ -578,8 +545,7 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
 			list <DoxygenEntity> aNewList;
 			aNewList =  parse(endOfSection, tokList);
 			doxyList.push_back( DoxygenEntity(theCommand, aNewList));
-	  }
-	  
+			}
 	  // \xrefitem <key> "(heading)" "(list title)" {text}
 	  else if (theCommand.compare("xrefitem") == 0){
 		  //TODO Implement xrefitem
@@ -587,7 +553,7 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
 			list<Token>::iterator endOfParagraph = getEndOfParagraph(tokList);
 			tokList.setIterator(endOfParagraph);
 		  return 1;
-	  }
+		  }
 	  // \ingroup (<groupname> [<groupname> <groupname>])
 	  else if (theCommand.compare("ingroup") == 0){
 		  string name = getNextWord(tokList);
@@ -598,7 +564,7 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
 		  if(!name.empty()) aNewList.push_back(DoxygenEntity("plainstring", name));
 		  doxyList.push_back(DoxygenEntity(theCommand, aNewList));
 		  return 1;
-	  }
+		  }
 	  // \par [(paragraph title)] { paragraph }
 	  else if (theCommand.compare("par") == 0){
 		  list<Token>::iterator endOfLine = getOneLine(tokList);
@@ -608,7 +574,7 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
 		  aNewList.splice(aNewList.end(), aNewList2);
 		  doxyList.push_back(DoxygenEntity(theCommand, aNewList));
 		  return 1; 
-	  }
+		  }
 	  // \headerfile <header-file> [<header-name>]
 	  else if (theCommand.compare("headerfile") == 0){
 		  list <DoxygenEntity> aNewList;
@@ -618,17 +584,18 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
 		  if(!name.empty()) aNewList.push_back(DoxygenEntity("plainstring", name));
 		  doxyList.push_back(DoxygenEntity(theCommand, aNewList));
 		  return 1;
-	  }
+		  }
 	  // \overload [(function declaration)]
 	  else if (theCommand.compare("overload") == 0){
 		  list<Token>::iterator endOfLine = getOneLine(tokList);
 		  if (endOfLine != tokList.current()){
-		  list <DoxygenEntity> aNewList;
-		  aNewList =  parse(endOfLine, tokList);
-		  doxyList.push_back(DoxygenEntity(theCommand, aNewList));
-		  }
+		    list <DoxygenEntity> aNewList;
+		    aNewList =  parse(endOfLine, tokList);
+		    doxyList.push_back(DoxygenEntity(theCommand, aNewList));
+		    }
 		  else doxyList.push_back(DoxygenEntity(theCommand));
-	  }
+		  return 1;
+		  }
 	  // \weakgroup <name> [(title)]
 	  else if (theCommand.compare("weakgroup") == 0){
 		    if (noisy) cout << "Parsing " << theCommand << endl;
@@ -641,35 +608,35 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
 			list<Token>::iterator endOfLine = getOneLine(tokList);
 			if (endOfLine != tokList.current()) {
 				aNewList =  parse(endOfLine, tokList);
-			}
+				}
 			aNewList.push_front(DoxygenEntity("plainstring", name));
 			doxyList.push_back(DoxygenEntity(theCommand, aNewList));
-	  }
+			}
 	  // \ref <name> ["(text)"]
 	  else if (theCommand.compare("ref") == 0){
 		  //TODO Implement ref
 			if (noisy) cout << "Not Adding " << theCommand << endl;
 			list<Token>::iterator endOfParagraph = getEndOfParagraph(tokList);
 			tokList.setIterator(endOfParagraph);
-	  }
+			}
 	  // \subpage <name> ["(text)"]
 	  else if (theCommand.compare("subpage") == 0){
 		  //TODO implement subpage
 			if (noisy) cout << "Not Adding " << theCommand << endl;
 			list<Token>::iterator endOfParagraph = getEndOfParagraph(tokList);
 			tokList.setIterator(endOfParagraph);
-	  }
+			}
 	  // \dotfile <file> ["caption"]
 	  else if (theCommand.compare("dotfile") == 0){
 		  //TODO implement dotfile
 			if (noisy) cout << "Not Adding " << theCommand << endl;
 			list<Token>::iterator endOfParagraph = getEndOfParagraph(tokList);
 			tokList.setIterator(endOfParagraph);
-	  }
+			}
 	  // \image <format> <file> ["caption"] [<sizeindication>=<size>]
 	  else if (theCommand.compare("image") == 0){
 		  //todo implement image
-	  } 
+		  } 
 	  // \addtogroup <name> [(title)]
 	  else if (theCommand.compare("addtogroup") == 0){
 		    if (noisy) cout << "Parsing " << theCommand << endl;
@@ -682,12 +649,12 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
 			list<Token>::iterator endOfLine = getOneLine(tokList);
 			if (endOfLine != tokList.current()) {
 				aNewList =  parse(endOfLine, tokList);
-			}
+				}
 			aNewList.push_front(DoxygenEntity("plainstring", name));
 			doxyList.push_back(DoxygenEntity(theCommand, aNewList));
+			}
+	  return 0;
 	  }
-
- }
  
 /* The actual "meat" of the doxygen parser. This is not yet fully implemented
  * with my current design- however the skeletal outline is contained in
@@ -697,13 +664,12 @@ list<Token>::iterator getTilAnyCommand(string theCommand, TokenList &tokList){
 
 int addCommand(string commandString, TokenList &tokList,list <DoxygenEntity> &doxyList){
 	 string theCommand = StringToLower(commandString);
-
 	 if (theCommand.compare("plainstring") == 0){
 	 		string nextPhrase = getStringTilCommand( tokList);
 	 		if (noisy) cout << "Parsing plain string :" << nextPhrase << endl;
 	 		doxyList.push_back(DoxygenEntity("plainstring", nextPhrase ));
 	 		return 1;
-	 }
+	 		}
 	 int commandNumber = commandBelongs(theCommand);
 	 if (commandNumber == SIMPLECOMMAND){
 	 	return addSimpleCommand(theCommand, doxyList);
@@ -751,8 +717,8 @@ int addCommand(string commandString, TokenList &tokList,list <DoxygenEntity> &do
 		return addCommandUnique(theCommand, tokList, doxyList);
 	 	}
 	 	
-	 	return 0;
-}
+	 return 0;
+	 }
 
 list<DoxygenEntity> parse(list<Token>::iterator endParsingIndex, TokenList &tokList){
 	list <DoxygenEntity> aNewList;
@@ -762,36 +728,64 @@ list<DoxygenEntity> parse(list<Token>::iterator endParsingIndex, TokenList &tokL
 		if(noisy) cout << "Parsing for phrase starting in:" << currToken.toString() << endl;
 		if(currToken.tokenType == END_LINE ){
 			tokList.next();
-		}
+			}
 		else if(currToken.tokenType == COMMAND){
 			currCommand = findCommand(currToken.tokenString);
-			tokList.next();
-			if (currCommand < 0 ){ if(noisy) cout << "BAD COMMAND: " << currToken.tokenString << endl;}
+			if (currCommand < 0 ){
+				if(noisy) cout << "Unidentified Command " << currToken.tokenString << endl;
+				tokList.next();
+				addCommand(string("plainstring"), tokList, aNewList);}
 				//cout << "Command: " << currWord << " " << currCommand << endl;
-
-			else addCommand(currToken.tokenString, tokList,  aNewList);
-		}
+			else { tokList.next();
+			  addCommand(currToken.tokenString, tokList,  aNewList);
+			  }
+			}
 		else if (currToken.tokenType == PLAINSTRING){
 			addCommand(string("plainstring"), tokList, aNewList);
+			}
+		else break;
 		}
-
-		
+	return aNewList;
 	}
 
+list<DoxygenEntity> parseRoot(list<Token>::iterator endParsingIndex, TokenList &tokList){
+	list <DoxygenEntity> aNewList;
+	int currCommand;
+	while (tokList.current() != endParsingIndex){ 
+		Token currToken = tokList.peek();
+		if(noisy) cout << "Parsing for phrase starting in:" << currToken.toString() << endl;
+		if(currToken.tokenType == END_LINE ){
+			tokList.next();
+			}
+		else if(currToken.tokenType == COMMAND){
+			currCommand = findCommand(currToken.tokenString);
+			if (currCommand < 0 ){ 
+				if(noisy) cout << "Unidentified Command " << currToken.tokenString << endl;
+				tokList.next();
+				addCommand(string("details"), tokList, aNewList);}
+				//cout << "Command: " << currWord << " " << currCommand << endl;
+			else { tokList.next();
+			  addCommand(currToken.tokenString, tokList,  aNewList);
+			  }
+			}
+		else if (currToken.tokenType == PLAINSTRING){
+			addCommand(string("details"), tokList, aNewList);
+			}
+		}
 	return aNewList;
-}
+	}
 
 list<DoxygenEntity> DoxygenParser::createTree(string doxygenBlob){
 	TokenList tokList = TokenList(doxygenBlob);
 	if(noisy) {
 		cout << "---TOKEN LIST---" << endl;
 		tokList.printList();
-	}
+		}
 	list <DoxygenEntity> rootList;
-	rootList = parse( tokList.end(), tokList);
+	rootList = parseRoot( tokList.end(), tokList);
 	if(noisy) {
 		cout << "PARSED LIST" << endl;
 		printTree(rootList);
-	}
+		}
 	return rootList;
 }
diff --git a/Source/DoxygenTranslator/src/DoxygenParser.h b/Source/DoxygenTranslator/src/DoxygenParser.h
index 776fcf123..638fdab72 100644
--- a/Source/DoxygenTranslator/src/DoxygenParser.h
+++ b/Source/DoxygenTranslator/src/DoxygenParser.h
@@ -1,13 +1,8 @@
 #ifndef DOXYGENPARSER_H_
 #define DOXYGENPARSER_H_
-#include <cstdlib>
-#include <iostream>
-#include <fstream>
 #include <string>
 #include <list>
 #include "DoxygenEntity.h"
-#include "TokenList.h"
-#include "JavaDocConverter.h"
 class DoxygenParser
 {
 public:
diff --git a/Source/DoxygenTranslator/src/DoxygenTranslator.cpp b/Source/DoxygenTranslator/src/DoxygenTranslator.cpp
index 191057ae7..a1789eb74 100644
--- a/Source/DoxygenTranslator/src/DoxygenTranslator.cpp
+++ b/Source/DoxygenTranslator/src/DoxygenTranslator.cpp
@@ -11,6 +11,7 @@
 #include "TokenList.h"
 #include "JavaDocConverter.h"
 
+
 DoxygenParser doxyParse;
 JavaDocConverter jDC;
 
@@ -27,7 +28,7 @@ DoxygenTranslator::~DoxygenTranslator(){
 char *DoxygenTranslator::convert(char* doxygenBlob, char* option){
 	
 	list <DoxygenEntity> rootList = doxyParse.createTree(string(doxygenBlob));
-	rootList = doxyParse.createTree(string(doxygenBlob));
+	
 	string returnedString;
 	if(strcmp(option, "JAVADOC") == 0){
 	    returnedString = jDC.convertToJavaDoc(rootList);
@@ -39,3 +40,32 @@ char *DoxygenTranslator::convert(char* doxygenBlob, char* option){
 	return nonConstString;
 }
 
+int testCommands(){
+	string exampleArray[] = {
+	"/**\n * \n * Random Line \n * \\@ \n * Random Line After */",
+	"/**\n * \n * Random Line Before \n * \\b bold \n * Random Line After */",
+	"/**\n * \n * Random Line \n * \\copydoc bold \n * Random Line After */",
+	"/**\n * \n * Random Line \n * \n * \\addindex An Entire Line\n * \\addindex An Entire Line\n * Random Line After */",
+	"/**\n * \n * Random Line \n * \n * \\return An Entire Paragraph \n * Including This Line \n * \n * Random Line After */",
+	"/**\n * \n * Random Line \n * \\return An Entire Paragraph \n * Including This Line \n * \\author Shouldn't be part of return */",
+	"/**\n * \n * Random Line \n * \\code this should continue \n * until here \\endcode \n * Random Line After */",
+	"/**\n * \n * Random Line \n * \\param singleword then the rest of \n *  the description \n * \n * Random Line After */",
+	"/**\n * \n * Random Line \n * \\page  singleword this should go til here \n * but not this */",
+	"/**\n * \n * Random Line \n * \\page  singleword this should go til here \n * but not this */",
+	"/**\n * \n * Random Line \n * \\category  singleword \n * but not this */",
+	"/**\n * \n * Random Line \n * \\category  singleword oneword \n * but not this */",
+	"/**\n * \n * Random Line \n * \\category  singleword oneword twoword \n * but not this */",
+	"/**\n * \n * Random Line \n * \\dir singleword \n * but not this */",
+	"/**\n * \n * Random Line \n * \\dir \n * but not this */",
+	"/**\n * \n * Random Line \n * \\fakecommand details \n * but not this */"
+	};
+	//string exampleArrayUniques = {};
+	DoxygenTranslator dT = DoxygenTranslator();
+	for (int i = 0; i < 16; i ++ ){
+		cout << "---ORIGINAL DOXYGEN--- " << endl << exampleArray[i] << endl;
+		char *nonConstString = (char *)malloc(exampleArray[i].length()+1);
+		strcpy(nonConstString, exampleArray[i].c_str());
+		dT.convert(nonConstString, "JAVADOC");
+	}
+	return 1;
+}
diff --git a/Source/DoxygenTranslator/src/JavaDocConverter.cpp b/Source/DoxygenTranslator/src/JavaDocConverter.cpp
index 91f52662f..c1606cc77 100644
--- a/Source/DoxygenTranslator/src/JavaDocConverter.cpp
+++ b/Source/DoxygenTranslator/src/JavaDocConverter.cpp
@@ -1,8 +1,5 @@
 #include "JavaDocConverter.h"
-#include <cstdlib>
 #include <iostream>
-#include <string>
-#include <list>
 #define APPROX_LINE_LENGTH 64//characters per line allowed
 #define TAB_SIZE 8//characters per line allowed
 int printSortedTree2 = 0;
@@ -20,6 +17,10 @@ JavaDocConverter::~JavaDocConverter()
  * such as brief descriptions are TAGGED as such
  */
 bool compare_DoxygenEntities(DoxygenEntity first, DoxygenEntity second){
+	if(first.typeOfEntity.compare("brief") == 0) return true;
+	if(second.typeOfEntity.compare("brief") == 0) return false;
+	if(first.typeOfEntity.compare("details") == 0) return true;
+	if(second.typeOfEntity.compare("details") == 0) return false;
 	if(first.typeOfEntity.compare("plainstring") == 0) return true;
 	if(second.typeOfEntity.compare("plainstring") == 0) return false;
 	if(first.typeOfEntity.compare("param") == 0){
@@ -54,11 +55,11 @@ bool compare_DoxygenEntities(DoxygenEntity first, DoxygenEntity second){
 		return false;
 	}
 	if(first.typeOfEntity.compare("author")== 0){
-		if(first.typeOfEntity.compare("author")== 0) return true;
-		if(first.typeOfEntity.compare("version")== 0)return true;
-		if(first.typeOfEntity.compare("see")== 0)return true;
-		if(first.typeOfEntity.compare("since")== 0)return true;
-		if(first.typeOfEntity.compare("deprecated")== 0)return true;
+		if(second.typeOfEntity.compare("author")== 0) return true;
+		if(second.typeOfEntity.compare("version")== 0)return true;
+		if(second.typeOfEntity.compare("see")== 0)return true;
+		if(second.typeOfEntity.compare("since")== 0)return true;
+		if(second.typeOfEntity.compare("deprecated")== 0)return true;
 		return false;
 	}
 	if(first.typeOfEntity.compare("version")== 0){
@@ -134,17 +135,11 @@ string javaDocFormat(DoxygenEntity &doxygenEntity){
 	if (doxygenEntity.typeOfEntity.compare("plainstring") == 0){
 			return doxygenEntity.data;
 	}
-	else if (doxygenEntity.typeOfEntity.compare("brief") == 0){
-			return doxygenEntity.data;
-	}
-	if (doxygenEntity.typeOfEntity.compare("detailed") == 0){
-			return doxygenEntity.data;
-	}
 	else if (doxygenEntity.typeOfEntity.compare("b") == 0){
-		return "<b>" + doxygenEntity.data + "</b>";
+		return "\b<b>" + doxygenEntity.data + "</b>";
 	}
 	else if (doxygenEntity.typeOfEntity.compare("c") == 0){
-		return "<tt>" + doxygenEntity.data + "</tt>";
+		return "\b<tt>" + doxygenEntity.data + "</tt>";
 	}
 	return "";
 }
@@ -165,7 +160,9 @@ string translateSubtree( DoxygenEntity &doxygenEntity){
 }
 
 string translateEntity(DoxygenEntity &doxyEntity){
-	if(doxyEntity.typeOfEntity.compare("plainstring")== 0 || doxyEntity.typeOfEntity.compare("deprecated")== 0 || doxyEntity.typeOfEntity.compare("brief")== 0)
+	if ((doxyEntity.typeOfEntity.compare("brief") == 0)||(doxyEntity.typeOfEntity.compare("details") == 0)){
+		return formatCommand(string(translateSubtree(doxyEntity)), 0) + "\n * ";}
+	else if(doxyEntity.typeOfEntity.compare("plainstring")== 0 || doxyEntity.typeOfEntity.compare("deprecated")== 0 || doxyEntity.typeOfEntity.compare("brief")== 0)
 		return formatCommand(doxyEntity.data, 0) + "\n * ";
 	else if(doxyEntity.typeOfEntity.compare("see") == 0){
 		return formatCommand(string("@" + doxyEntity.typeOfEntity + "\t\t" + translateSubtree(doxyEntity)), 2);
@@ -207,4 +204,4 @@ string JavaDocConverter:: convertToJavaDoc(list <DoxygenEntity> entityList){
 	cout << "\n---RESULT IN JAVADOC---" << endl;
 	cout << javaDocString;
 	return javaDocString;
-}
\ No newline at end of file
+}
diff --git a/Source/DoxygenTranslator/src/Token.cpp b/Source/DoxygenTranslator/src/Token.cpp
index e85799546..198b3e442 100644
--- a/Source/DoxygenTranslator/src/Token.cpp
+++ b/Source/DoxygenTranslator/src/Token.cpp
@@ -1,8 +1,4 @@
 #include "Token.h"
-#include <cstdlib>
-#include <iostream>
-#include <string>
-#include <list>
 using namespace std;
 
 
@@ -21,7 +17,7 @@ string Token::toString()
 		return "{END OF PARAGRAPH}";
 	}
 	if (tokenType == PLAINSTRING){
-		return tokenString;
+		return "{PLAINSTRING :" + tokenString + "}";
 	}
 	if (tokenType == COMMAND){
 		return "{COMMAND : " + tokenString+ "}";
diff --git a/Source/DoxygenTranslator/src/TokenList.cpp b/Source/DoxygenTranslator/src/TokenList.cpp
index eeec6da46..a05d2ceef 100644
--- a/Source/DoxygenTranslator/src/TokenList.cpp
+++ b/Source/DoxygenTranslator/src/TokenList.cpp
@@ -59,7 +59,7 @@ TokenList::TokenList(string doxygenString){
 			if(!isFluff) tokenList.push_back(Token(PLAINSTRING, currentWord));
 		}
 		
-		else tokenList.push_back(Token(PLAINSTRING, currentWord));
+		else if (!currentWord.empty())tokenList.push_back(Token(PLAINSTRING, currentWord));
 		currentIndex = nextIndex;
 	}
 	}