Release-1.2.15-20020430

43 files changed, 2357 insertions, 392 deletions

diff --git a/INSTALL b/INSTALL
index 2ac6d34..de1b0c3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
-DOXYGEN Version 1.2.15-20020421
+DOXYGEN Version 1.2.15-20020430
 
 Please read the installation section of the manual for instructions.
 
 --------
-Dimitri van Heesch (21 April 2002)
+Dimitri van Heesch (30 April 2002)
diff --git a/README b/README
index 5a9e2b0..6e0e6f1 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-DOXYGEN Version 1.2.15_20020421
+DOXYGEN Version 1.2.15_20020430
 
 Please read INSTALL for compilation instructions.
 
@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives.
 
 Enjoy,
 
-Dimitri van Heesch (dimitri@stack.nl) (21 April 2002)
+Dimitri van Heesch (dimitri@stack.nl) (30 April 2002)
diff --git a/VERSION b/VERSION
index 2bbf466..219834b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.15-20020421
+1.2.15-20020430
diff --git a/addon/doxmlparser/include/doxmlintf.h b/addon/doxmlparser/include/doxmlintf.h
index becbe78..5c051dd 100644
--- a/addon/doxmlparser/include/doxmlintf.h
+++ b/addon/doxmlparser/include/doxmlintf.h
@@ -681,11 +681,11 @@ class IFile : public ICompound
   public:
     virtual IGraph *includeDependencyGraph() const = 0;
     virtual IGraph *includedByDependencyGraph() const = 0;
+    virtual IDocProgramListing *source() const = 0;
 
     // file:
     //  includes()
     //  includedBy()
-    //  IDocProgramListing *source()
     //  ICompound *innerNamespaces()
     //  ICompoundIterator *innerClasses()
 };
diff --git a/addon/doxmlparser/src/compoundhandler.cpp b/addon/doxmlparser/src/compoundhandler.cpp
index 59d4cd9..b6c6235 100644
--- a/addon/doxmlparser/src/compoundhandler.cpp
+++ b/addon/doxmlparser/src/compoundhandler.cpp
@@ -190,7 +190,6 @@ CompoundHandler::CompoundHandler(const QString &xmlDir)
   addStartHandler("innerclass",this,&CompoundHandler::startInnerClass);
   addEndHandler("innerclass");
 
-
 }
 
 CompoundHandler::~CompoundHandler()
@@ -461,3 +460,8 @@ ICompoundIterator *CompoundHandler::nestedClasses() const
   return new CompoundIdIterator(m_mainHandler,m_innerClasses);
 }
 
+IDocProgramListing *CompoundHandler::source() const
+{
+  return m_programListing;
+}
+
diff --git a/addon/doxmlparser/src/compoundhandler.h b/addon/doxmlparser/src/compoundhandler.h
index b331bec..bc725e3 100644
--- a/addon/doxmlparser/src/compoundhandler.h
+++ b/addon/doxmlparser/src/compoundhandler.h
@@ -123,6 +123,7 @@ class CompoundHandler : public IClass,
     // IFile implementation
     IGraph *includeDependencyGraph() const; 
     IGraph *includedByDependencyGraph() const;
+    IDocProgramListing *source() const;
     
   private:
     QList<RelatedCompound>  m_superClasses;
@@ -147,6 +148,7 @@ class CompoundHandler : public IClass,
     GraphHandler           *m_includeDependencyGraph;
     GraphHandler           *m_includedByDependencyGraph;
     QList<QString>          m_innerClasses;
+    ProgramListingHandler  *m_source;
 
 };
 
diff --git a/addon/doxmlparser/src/dochandler.cpp b/addon/doxmlparser/src/dochandler.cpp
index f21c90f..6a37f7a 100644
--- a/addon/doxmlparser/src/dochandler.cpp
+++ b/addon/doxmlparser/src/dochandler.cpp
@@ -627,7 +627,7 @@ void RefHandler::startRef(const QXmlAttributes& attrib)
 {
   m_parent->setDelegate(this);
   m_refId = attrib.value("refid");
-  m_refId = attrib.value("external");
+  m_extId = attrib.value("external");
   ASSERT(attrib.value("kindref")=="compound" || 
          attrib.value("kindref")=="member");
   m_targetKind = attrib.value("kindref")=="compound" ?  Compound : Member;
diff --git a/addon/doxmlparser/src/doxmlintf.h b/addon/doxmlparser/src/doxmlintf.h
index becbe78..5c051dd 100644
--- a/addon/doxmlparser/src/doxmlintf.h
+++ b/addon/doxmlparser/src/doxmlintf.h
@@ -681,11 +681,11 @@ class IFile : public ICompound
   public:
     virtual IGraph *includeDependencyGraph() const = 0;
     virtual IGraph *includedByDependencyGraph() const = 0;
+    virtual IDocProgramListing *source() const = 0;
 
     // file:
     //  includes()
     //  includedBy()
-    //  IDocProgramListing *source()
     //  ICompound *innerNamespaces()
     //  ICompoundIterator *innerClasses()
 };
diff --git a/addon/doxmlparser/test/main.cpp b/addon/doxmlparser/test/main.cpp
index a6b867d..31beab8 100644
--- a/addon/doxmlparser/test/main.cpp
+++ b/addon/doxmlparser/test/main.cpp
@@ -588,6 +588,9 @@ int main(int argc,char **argv)
 
       printf("==== included by dependency graph ==== \n");
       DumpGraph(file->includedByDependencyGraph());
+
+      printf("==== source ====\n");
+      DumpDoc(file->source(),0);
     }
     
     comp->release();
diff --git a/configure b/configure
index d7e33f5..ab3a078 100755
--- a/configure
+++ b/configure
@@ -27,7 +27,7 @@ f_prefix=/usr
 f_insttool=NO
 f_english=NO
 f_wizard=NO
-f_langs=nl,se,cz,fr,it,de,jp,es,fi,ru,hr,pl,pt,hu,kr,ro,si,cn,no,br,dk,sk,ua,gr
+f_langs=nl,se,cz,fr,it,de,jp,es,fi,ru,hr,pl,pt,hu,kr,ro,si,cn,no,br,dk,sk,ua,gr,tw
 
 while test -n "$1";  do
   case $1 in
@@ -412,11 +412,11 @@ EOF
   fi
 fi
 
-if test "$f_platform" = "win32-g++"; then
-  cat >> .tmakeconfig <<EOF
-    TMAKE_LFLAGS += -D_WIN32
-EOF
-fi
+#if test "$f_platform" = "win32-g++"; then
+#  cat >> .tmakeconfig <<EOF
+#    TMAKE_LFLAGS += -D_WIN32
+#EOF
+#fi
 
 if test "$f_english" = YES; then
   cat >> .tmakeconfig <<EOF
@@ -483,7 +483,7 @@ echo -n "  Generating src/lang_cfg.h..."
 echo $f_langs | $f_perl -e '@l=split(/,/,<STDIN>); 
         chomp @l; 
 	@allowed=(NL,SE,CZ,FR,IT,DE,JP,ES,FI,RU,HR,PL,PT,HU,KR,RO,SI,CN,NO,BR,
-		  DK,SK,UA,GR);
+		  DK,SK,UA,GR,TW);
 	foreach my $elem (@l){ 
 	     $elem =~ tr/a-z/A-Z/;
 	     $r=0;
diff --git a/doc/docblocks.doc b/doc/docblocks.doc
index 49a2f5f..9cb89e0 100644
--- a/doc/docblocks.doc
+++ b/doc/docblocks.doc
@@ -18,34 +18,154 @@
 
 \subsection specialblock Special documentation blocks
 
-The following types of special documentation blocks are supported by doxygen:
-<ul>
-<li>The Qt style, where special documentation blocks look like:
+A special documentation block is a C or C++ comment block with some 
+additional markings, so doxygen knows it is a piece of documentation that
+needs to end up in the generated documentation. 
+
+For each code item there are two types of descriptions, which together
+form the documentation: a \e brief description and \e detailed
+description, both are optional. 
+Having more than one brief or detailed description however, is 
+not allowed. 
+
+As the name suggest, a brief description is
+a short one-liner, whereas the detailed description provides longer, 
+more detailed documentation.
+
+There are several ways to mark a comment block as a detailed description:
+<ol>
+<li> You can use the JavaDoc style, which consist of a C-style comment
+block starting with two *'s, like this:
+
+\verbatim
+/**
+ * ... text ...
+ */
+\endverbatim
+
+<li> or you can use the Qt style and add an exclamation mark (!) 
+after the opening of a C-style comment block, as shown in this example:
+
 \verbatim
 /*!
-  ... text ...
+ * ... text ...
+ */
+\endverbatim
+
+In both cases the intermediate *'s are optional, so
+
+\verbatim
+/*!
+ ... text ...
 */
-\endverbatim and the one line version:
+\endverbatim
+
+is also valid.
+
+<li> A third alternative is to use a block of at least two C++ comment 
+lines, where the first starts with an additional slash or an 
+exclamation mark. Here are examples of the two cases:
+
+\verbatim
+///
+// ... text ...
+//
+\endverbatim
+
+or
+
 \verbatim
-//! ... one line of text ...
+//!
+// ... text ...
+//
 \endverbatim
-<li>The JavaDoc style, where special documentation blocks look like:
+
+<li>
+
+One could also repeat the special markers for each line as shown in
+the following examples:
+
 \verbatim
-/**
- * ... text ...
+/// 
+/// ... text ....
+///
+\endverbatim
+
+or 
+
+\verbatim
+//!
+//! ... text ...
+//!
+\endverbatim
+
+</ol>
+
+For the brief description there are also several posibilities:
+<ol>
+<li>One could use the \ref cmdbrief "\brief" command with one of the 
+above comment blocks. This command ends at the end of a paragraph, 
+so the detailed description follows after an empty line.
+
+Here is an example:
+
+\verbatim
+/*! \brief Brief description.
+ *         Brief description continued.
+ *
+ *  Detailed description starts here.
  */
-\endverbatim and the one line version:
+\endverbatim
+
+<li>If \ref cfg_javadoc_autobrief "JAVADOC_AUTOBRIEF" is set to YES in the configuration file, 
+    then using JavaDoc style comment
+    blocks will automatically start a brief description which ends at the
+    first dot. Here is an example:
+
 \verbatim
-/// ... one line of text ...
+/** Brief description which ends at this dot. Details follow
+ *  here.
+ */
 \endverbatim
-</ul>
 
-Doxygen only allows one brief and one detailed description. If there is
-one brief description before a declaration and one before a
-definition, only the one before the \e declaration will be used. If
-the same situation occurs for a detailed description,
-the one before the \e definition is preferred and the one before the
-declaration will be ignored.
+<li>A third option is to use a special C++ style comment which does not 
+    span more than one line. Here are two examples:
+\verbatim
+/// Brief description.
+/** Detailed description. */
+\endverbatim
+
+or
+
+\verbatim
+//! Brief descripion.
+
+//! Detailed description 
+//! starts here.
+\endverbatim
+
+Note the blank line in the last example, which is required to separate the 
+brief description from the block containing the detailed description.
+
+</ol>
+
+As you can see doxygen is quite flexible. The following however is
+not legal
+
+\verbatim
+//! Brief description, which is
+//! really a detailed description since it spans multiple lines.
+/*! Oops, another detailed description!
+ */
+\endverbatim
+
+because doxygen only allows one brief and one detailed description. 
+
+Furthermore, if there is one brief description before a declaration 
+and one before a definition of a code item, only the one before 
+the \e declaration will be used. If the same situation occurs for a 
+detailed description, the one before the \e definition is preferred 
+and the one before the declaration will be ignored.
 
 Here is an example of a documented piece of C++ code using the Qt style:
 \verbinclude qtstyle.cpp
@@ -54,10 +174,10 @@ Here is an example of a documented piece of C++ code using the Qt style:
  for the corresponding HTML documentation that is generated by doxygen.
  \endhtmlonly
 
-The one-line comments should contain a brief description, 
+The one-line comments contain a brief description, 
 whereas the multi-line comment blocks contain a more detailed description.
-Note that consecutive one-line comments are merged together in one brief 
-description. The brief descriptions are included in the member overview of a 
+
+The brief descriptions are included in the member overview of a 
 class, namespace or file and are printed using a small italic font 
 (this description can be hidden by setting 
 \ref cfg_brief_member_desc "BRIEF_MEMBER_DESC" to \c NO in 
@@ -95,25 +215,82 @@ implementer of the members more direct access to the documentation.
 As a compromise the brief description could be placed before the
 declaration and the detailed description before the member definition.
 
-\par Note:
-Each entity can only have \e one brief and \e one detailed description. If you
-specify more than one comment block of the same type, only one will be used,
-and all others are ignored!
+\subsection memberdoc Documenting members afterwards
+
+If you want to document the members of a file, struct, union, class, or enum,
+and you want to put the documentation for these members inside the compound,
+it is sometimes desired to place the documentation block after the member 
+instead of before. For this purpose you should put an additional \< marker
+in the comment block.
+
+Here are some examples:
+\verbatim
+int var; /*!< Detailed description after the member */
+\endverbatim
+This block can be used to put a Qt style detailed 
+documentation block \e after a member. Other ways to do the
+same are:
+\verbatim
+int var; /**< Detailed description after the member */
+\endverbatim
+or 
+\verbatim
+int var; //!< Detailed description after the member
+         //!< 
+\endverbatim
+or 
+\verbatim
+int var; ///< Detailed description after the member
+         ///< 
+\endverbatim
+
+Most often one only wants to put a brief description after a member.
+This is done as follows:
+\verbatim
+int var; //!< Brief description after the member
+\endverbatim
+or
+\verbatim
+int var; ///< Brief description after the member
+\endverbatim
+
+Note that these blocks have the same structure and meaning as the 
+special comment blocks in the previous section 
+only the \< indicates that the member is 
+located in front of the block instead of after the block.
+
+Here is an example of the use of these comment blocks:
+\verbinclude afterdoc.h
+ \htmlonly
+ Click <a href="$(DOXYGEN_DOCDIR)/examples/afterdoc/html/class_test.html">here</a>
+ for the corresponding HTML documentation that is generated by doxygen.
+ \endhtmlonly
+
+\warning These blocks can only be used to document \e members and \e parameters.
+         They cannot be used to document files, classes, unions, structs,
+         groups, namespaces and enums themselves. Furthermore, the structural 
+         commands mentioned in the next section 
+         (like <code>\\class</code>) are ignored inside these comment blocks.
 
-\subsection structuralcommands Structural commands
+\subsection structuralcommands Documentation at other places
 
 So far we have assumed that the documentation blocks are always located in 
 front of the declaration or definition of a file, class or namespace or in
-front of one of its members. 
-Although this is often comfortable, it may sometimes be better to put the 
-documentation somewhere else. For some types of documentation blocks (like file
-documentation) this is even required. Doxygen allows you to put your
-documentation blocks practically anywhere (the exception is inside the body 
-of a function or inside a normal C style comment block), as long as you put a 
-structural command inside the documentation block.
+front or after one of its members. 
+Although this is often comfortable, there may sometimes be reasons to put the 
+documentation somewhere else. For documenting a file this is even 
+required since there is no such thing as "in front of a file". 
+Doxygen allows you to put your documentation blocks practically 
+anywhere (the exception is inside the body of a function or inside a 
+normal C style comment block). 
+
+The price you pay for not putting the
+documentation block before (or after) an item is the need to put a  
+structural command inside the documentation block, which leads to some
+duplication of information.
 
 Structural commands (like all other commands) start with a backslash 
-(<tt>\\</tt>), or an at-sign (<tt>\@</tt>) in JavaDoc style, 
+(<tt>\\</tt>), or an at-sign (<tt>\@</tt>) if you prefer JavaDoc style, 
 followed by a command name and one or more parameters.
 For instance, if you want to document the class \c Test in the example
 above, you could have also put the following documentation block somewhere
@@ -138,16 +315,17 @@ Other structural commands are:
 <li>\c \def to document a \#define.
 <li>\c \file to document a file.
 <li>\c \namespace to document a namespace.
+<li>\c \package to document a Java package.
+<li>\c \interface to document an IDL interface.
 </ul>
-See section \ref commands for detailed information about these and other 
-commands. Note that the documentation block belonging to a file 
-should always contain a structural command.
+See section \ref commands for detailed information about these and many other 
+commands. 
 
 To document a member of a C++ class, you must also document the class 
-itself. The same holds for namespaces. To document a global C function, typedef, 
-enum or preprocessor definition you must first document the file that 
-contains it (usually this will be a header file, because that file contains 
-the information that is exported to other source files).
+itself. The same holds for namespaces. To document a global C function, 
+typedef, enum or preprocessor definition you must first document the file 
+that contains it (usually this will be a header file, because that file 
+contains the information that is exported to other source files).
 
 Let's repeat that, because it is often overlooked:
 to document global objects (functions, typedefs, enum, macros, etc), you
@@ -163,55 +341,15 @@ using structural commands:
  for the corresponding HTML documentation that is generated by doxygen.
  \endhtmlonly
 
-\par Note:
-  Because each comment block in the example above contains a structural command, all
-  the comment blocks could be moved to another location or input file 
-  (the source file for instance), without affecting the generated 
-  documentation. The disadvantage of this approach is that prototypes are
-  duplicated, so all changes have to be made twice!
-
-\subsection memberdoc Documenting compound members.
-
-If you want to document the members of a file, struct, union, class, or enum,
-and you want to put the documentation for these members inside the compound,
-it is sometimes desired to place the documentation block after the member 
-instead of before. For this purpose doxygen has the following 
-additional comment blocks:
-\verbatim
-/*!< ... */
-\endverbatim
-This block can be used to put a Qt style detailed 
-documentation block after a member.
-The one line brief description looks as follows:
-\verbatim
-//!< ...
-\endverbatim
-There are also JavaDoc versions for detailed documentation:
-\verbatim
-/**< ... */
-\endverbatim
-(where the first sentence is the brief description 
-if \c JAVADOC_AUTOBRIEF is set to \c YES)
-and there is a separate brief description as well:
-\verbatim
-///< ... 
-\endverbatim
-Note that these blocks have the same structure and meaning as the 
-special comment blocks above only the \< indicates that the member is 
-located in front of the block instead of after the block.
-
-Here is an example of the use of these comment blocks:
-\verbinclude afterdoc.h
- \htmlonly
- Click <a href="$(DOXYGEN_DOCDIR)/examples/afterdoc/html/class_test.html">here</a>
- for the corresponding HTML documentation that is generated by doxygen.
- \endhtmlonly
-
-\warning These blocks can only be used to document \e members and \e parameters.
-         They cannot be used to document files, classes, unions, structs,
-         groups, namespaces and enums themselves. Furthermore, the structural 
-         commands mentioned in the previous section 
-         (like <code>\\class</code>) are ignored inside these comment blocks.
+ Because each comment block in the example above contains a structural command, all
+ the comment blocks could be moved to another location or input file 
+ (the source file for instance), without affecting the generated 
+ documentation. The disadvantage of this approach is that prototypes are
+ duplicated, so all changes have to be made twice! Because of this you
+ should first consider if this is really needed, and avoid structural
+ commands if possible. I often receive examples that contain \\fn command
+ in comment blocks which are place in front of a function. This is clearly
+ a case where the \\fn command is redundant and will only lead to problems.
 
 \htmlonly
 Go to the <a href="lists.html">next</a> section or return to the
diff --git a/doc/language.doc b/doc/language.doc
index 10a7082..58a92ec 100644
--- a/doc/language.doc
+++ b/doc/language.doc
@@ -25,13 +25,14 @@ Doxygen has built-in support for multiple languages. This means
 that the text fragments that doxygen generates can be produced in
 languages other than English (the default) at configuration time.
 
-Currently (version 1.2.14-20020317), 25 languages 
+Currently (version 1.2.15-20020421), 26 languages 
 are supported (sorted alphabetically): 
-Brazilian Portuguese, Chinese, Croatian, Czech, Danish, 
-Dutch, English, Finnish, French, German, 
-Greek, Hungarian, Italian, Japanese, Korean, 
-Norwegian, Polish, Portuguese, Romanian, Russian, 
-Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+Brazilian Portuguese, Chinese, Chinesetraditional, Croatian, Czech, 
+Danish, Dutch, English, Finnish, French, 
+German, Greek, Hungarian, Italian, Japanese, 
+Korean, Norwegian, Polish, Portuguese, Romanian, 
+Russian, Slovak, Slovene, Spanish, Swedish, 
+and Ukrainian.
 
 The table of information related to the supported languages follows.
 It is sorted by language alphabetically.  The <b>Status</b> column
@@ -63,6 +64,12 @@ when the translator was updated.
       <TD>1.2.13</TD>
   </TR>
   <TR BGCOLOR="#ffffff">
+      <TD>Chinesetraditional</TD>  
+      <TD>Gary Lee</TD>
+      <TD>garylee@NOSPAM.ecosine.com.tw</TD>
+      <TD>up-to-date</TD>
+  </TR>
+  <TR BGCOLOR="#ffffff">
       <TD>Croatian</TD>  
       <TD>Boris Bralo</TD>
       <TD>boris.bralo@NOSPAM.zg.tel.hr</TD>
@@ -180,7 +187,7 @@ when the translator was updated.
       <TD>Slovene</TD>  
       <TD>Matjaz Ostroversnik</TD>
       <TD>matjaz.ostroversnik@NOSPAM.zrs-tk.si</TD>
-      <TD>1.2.13</TD>
+      <TD>up-to-date</TD>
   </TR>
   <TR BGCOLOR="#ffffff">
       <TD>Spanish</TD>  
@@ -216,6 +223,8 @@ when the translator was updated.
   Chinese & Wei Liu & {\tt liuwei@asiainfo.com} & 1.2.13 \\
    & Wang Weihan & {\tt wangweihan@capinfo.com.cn} &  \\
   \hline
+  Chinesetraditional & Gary Lee & {\tt garylee@ecosine.com.tw} & up-to-date \\
+  \hline
   Croatian & Boris Bralo & {\tt boris.bralo@zg.tel.hr} & up-to-date \\
   \hline
   Czech & Petr P\v{r}ikryl & {\tt prikrylp@skil.cz} & up-to-date \\
@@ -257,7 +266,7 @@ when the translator was updated.
   \hline
   Slovak & Stanislav Kudl\'{a}\v{c} & {\tt skudlac@pobox.sk} & 1.2.13 \\
   \hline
-  Slovene & Matjaz Ostroversnik & {\tt matjaz.ostroversnik@zrs-tk.si} & 1.2.13 \\
+  Slovene & Matjaz Ostroversnik & {\tt matjaz.ostroversnik@zrs-tk.si} & up-to-date \\
   \hline
   Spanish & Francisco Oltra Thennet & {\tt foltra@puc.cl} & 1.2.7 \\
   \hline
diff --git a/doc/maintainers.txt b/doc/maintainers.txt
index 488573d..5f2ec0c 100644
--- a/doc/maintainers.txt
+++ b/doc/maintainers.txt
@@ -8,6 +8,9 @@ Chinese
 Wei Liu: liuwei@asiainfo.com
 Wang Weihan: wangweihan@capinfo.com.cn
 
+ChineseTraditional
+Gary Lee: garylee@ecosine.com.tw
+
 Croatian
 Boris Bralo: boris.bralo@zg.tel.hr
 
diff --git a/libpng/libpng.pro.in b/libpng/libpng.pro.in
index 5b731e3..34bfd32 100644
--- a/libpng/libpng.pro.in
+++ b/libpng/libpng.pro.in
@@ -46,6 +46,7 @@ SOURCES		= adler32.c \
 		  uncompr.c \
 		  zutil.c
 win32:INCLUDEPATH          += .
+win32-g++:TMAKE_CFLAGS     += -D__CYGWIN__ -DALL_STATIC
 DESTDIR                    =  ../lib
 TARGET                     =  png
 OBJECTS_DIR                =  ../objects
diff --git a/packages/rpm/doxygen.spec b/packages/rpm/doxygen.spec
index 3902a67..c468fe6 100644
--- a/packages/rpm/doxygen.spec
+++ b/packages/rpm/doxygen.spec
@@ -1,6 +1,6 @@
 Summary: A documentation system for C/C++.
 Name: doxygen
-Version: 1.2.15_20020421
+Version: 1.2.15_20020430
 Release: 1
 Epoch: 1
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
diff --git a/qtools/qtools.pro.in b/qtools/qtools.pro.in
index 57fc1ab..74776ef 100644
--- a/qtools/qtools.pro.in
+++ b/qtools/qtools.pro.in
@@ -74,5 +74,6 @@ win32:SOURCES +=  qfile_win32.cpp \
 INCLUDEPATH = .
 TMAKE_CXXFLAGS += -DQT_NO_CODECS -DQT_LITE_UNICODE
 win32:TMAKE_CXXFLAGS += -DQT_NODLL
+win32-g++:TMAKE_CXXFLAGS += -D_WIN32 -D__CYGWIN__ -DALL_STATIC
 OBJECTS_DIR = ../objects
 DESTDIR = ../lib
diff --git a/src/bufstr.h b/src/bufstr.h
index 9281d3e..21257c0 100644
--- a/src/bufstr.h
+++ b/src/bufstr.h
@@ -33,7 +33,7 @@ class BufStr : public QCString
       {
         QCString::resize(size()+spareRoom);
       }
-      data()[offset++]=c;
+      QCString::data()[offset++]=c;
     }
     void addArray(const char *a,int len)
     {
@@ -41,7 +41,7 @@ class BufStr : public QCString
       {
         QCString::resize(size()+len+spareRoom);
       }
-      memcpy(data()+offset,a,len);
+      memcpy(QCString::data()+offset,a,len);
       offset+=len;
     }
     uint curPos() { return offset; }
diff --git a/src/code.l b/src/code.l
index 9d6f285..878cda9 100644
--- a/src/code.l
+++ b/src/code.l
@@ -24,6 +24,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <qregexp.h>
+#include <qdir.h>
 
 #include "qtbc.h"
 #include "scanner.h"
@@ -1044,10 +1045,36 @@ TYPEKW  ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
 <ReadInclude>[^\n\"\>]+/(">"|"\"")  	{
 					  //FileInfo *f;
 					  bool ambig;
-                                          FileDef *fd;
+					  bool found=FALSE;
+                                          FileDef *fd=0;
 					  if ((fd=findFileDef(Doxygen::inputNameDict,yytext,ambig)) &&
 					      fd->isLinkable())
 					  {
+					    if (ambig) // multiple input files match the name
+					    {
+					      //printf("===== yes %s is ambigious\n",yytext);
+					      QCString name = convertToQCString(QDir::cleanDirPath(yytext));
+					      if (!name.isEmpty() && g_sourceFileDef)
+					      {
+					        FileName *fn = Doxygen::inputNameDict->find(name);
+						FileNameIterator fni(*fn);
+						// for each include name
+						for (fni.toFirst();!found && (fd=fni.current());++fni)
+						{
+						  // see if this source file actually includes the file
+						  found = g_sourceFileDef->isIncluded(fd->absFilePath());
+						  //printf("      include file %s found=%d\n",fd->absFilePath().data(),found);
+						}
+					      }
+					    }
+					    else // not ambiguous
+					    {
+					      found = TRUE;
+					    }
+					  }
+					  if (found)
+					  {
+					    //printf("      include file %s found=%d\n",fd->absFilePath().data(),found);
 					    g_code->writeCodeLink(fd->getReference(),fd->getOutputFileBase(),0,yytext);
 					  }
 					  else
diff --git a/src/commentcnv.h b/src/commentcnv.h
new file mode 100644
index 0000000..41cd661
--- /dev/null
+++ b/src/commentcnv.h
@@ -0,0 +1,26 @@
+/*****************************************************************************
+ *
+ * 
+ *
+ * Copyright (C) 1997-2002 by Dimitri van 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 _COMMENTCNV_H
+#define _COMMNETCNV_H
+
+class BufStr;
+
+extern void convertCppComments(BufStr *inBuf,BufStr *outBuf);
+
+#endif
+
diff --git a/src/commentcnv.l b/src/commentcnv.l
new file mode 100644
index 0000000..d2da72c
--- /dev/null
+++ b/src/commentcnv.l
@@ -0,0 +1,185 @@
+/*****************************************************************************
+ *
+ * 
+ *
+ * Copyright (C) 1997-2002 by Dimitri van 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.
+ *
+ */
+
+%{
+
+#define YY_NEVER_INTERACTIVE 1
+  
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "bufstr.h"
+
+static BufStr *g_inBuf;
+static BufStr *g_outBuf;
+static int     g_inBufPos;
+
+static void replaceCommentMarker(const char *s,int len)
+{
+  const char *p=s;
+  char c;
+  // copy blanks
+  while ((c=*p) && (c==' ' || c=='\t' || c=='\n')) 
+  {
+    g_outBuf->addChar(c);
+    p++;
+  }
+  // replace start of comment marker by spaces
+  while ((c=*p) && (c=='/' || c=='!')) 
+  {
+    g_outBuf->addChar(' ');
+    p++;
+    if (*p=='<') // comment-after-item marker 
+    { 
+      g_outBuf->addChar(' '); 
+      p++; 
+    }
+    if (c=='!') // end after first !
+    {
+      break;
+    }
+  }
+  // copy comment line to output
+  g_outBuf->addArray(p,len-(p-s));
+}
+
+static inline void copyToOutput(const char *s,int len)
+{
+  g_outBuf->addArray(s,len);
+}
+
+#undef  YY_INPUT
+#define YY_INPUT(buf,result,max_size) result=yyread(buf,max_size);
+
+static int yyread(char *buf,int max_size)
+{
+  int bytesInBuf = g_inBuf->curPos()-g_inBufPos;
+  int bytesToCopy = QMIN(max_size,bytesInBuf);
+  memcpy(buf,g_inBuf->data()+g_inBufPos,bytesToCopy);
+  g_inBufPos+=bytesToCopy;
+  return bytesToCopy;
+}
+
+%}
+
+%option noyywrap
+%option nounput
+
+%x Scan
+%x SkipString
+%x SComment
+%x CComment
+%x Verbatim
+
+%%
+
+<Scan>[^\"\/\n\\]*                 { /* eat anything that is not " / or \n */ 
+                                     copyToOutput(yytext,yyleng); 
+				   }
+<Scan>"\""                         { /* start of a string */ 
+                                     copyToOutput(yytext,yyleng); 
+				     BEGIN(SkipString); 
+                                   }
+<Scan>\n                           { /* new line */ 
+                                     copyToOutput(yytext,yyleng); 
+                                   }
+<Scan>("//!"|"///").*\n/[ \t]*"//" { /* start C++ style special comment block */
+                                     copyToOutput("/*!",3); 
+				     copyToOutput(yytext+3,yyleng-3); 
+				     BEGIN(SComment); 
+                                   }
+<Scan>"//".*\n			   { /* one line C++ comment */ 
+  				     copyToOutput(yytext,yyleng); 
+				   }
+<Scan>"/*"			   { /* start of a C comment */
+                                     copyToOutput(yytext,yyleng); 
+				     BEGIN(CComment); 
+                                   }
+<Scan>"\\verbatim"		   { /* start of a verbatim block */
+                                     copyToOutput(yytext,yyleng); 
+                                     BEGIN(Verbatim);
+                                   }
+<Scan>.                            { /* any other character */
+                                     copyToOutput(yytext,yyleng); 
+                                   }
+<Verbatim>"\\endverbatim"          { /* end of verbatim block */
+                                     copyToOutput(yytext,yyleng);
+				     BEGIN(Scan);
+                                   }
+<Verbatim>[^\\\n]*		   { /* any character not a backslash or new line */
+                                     copyToOutput(yytext,yyleng); 
+                                   }
+<Verbatim>\n			   { /* new line in verbatim block */
+                                     copyToOutput(yytext,yyleng); 
+                                   }
+<Verbatim>.			   { /* any other character */
+                                     copyToOutput(yytext,yyleng); 
+                                   }
+<SkipString>\\.                    { /* escaped character in string */
+                                     copyToOutput(yytext,yyleng); 
+                                   }
+<SkipString>"\""       	           { /* end of string */ 
+                                     copyToOutput(yytext,yyleng); 
+				     BEGIN(Scan); 
+                                   }
+<SkipString>.                      { /* any other string character */ 
+                                     copyToOutput(yytext,yyleng); 
+                                   }
+<SkipString>\n                     { /* new line inside string (illegal for some compilers) */ 
+                                     copyToOutput(yytext,yyleng); 
+                                   }
+<CComment>[^*\n]*	           { /* anything that is not a '*' */ 
+                                     copyToOutput(yytext,yyleng); 
+                                   }
+<CComment>"*"+[^*/\n]*             { /* stars without slashes */
+                                     copyToOutput(yytext,yyleng); 
+                                   }
+<CComment>\n                       { /* new line in comment */
+                                     copyToOutput(yytext,yyleng); 
+                                   }
+<CComment>"*"+"/"                  { /* end of C comment */
+                                     copyToOutput(yytext,yyleng); 
+				     BEGIN(Scan); 
+                                   }
+<SComment>^[ \t]*"//".*/\n	   { /* second line of special comment */
+                                     replaceCommentMarker(yytext,yyleng); 
+                                   }
+<SComment>\n[ \t]*"//".*/\n	   { /* other line of special comment */
+                                     replaceCommentMarker(yytext,yyleng); 
+                                   }
+<SComment>\n			   { /* end of special comment */
+                                     copyToOutput(" */",3); 
+				     copyToOutput(yytext,yyleng); 
+				     BEGIN(Scan); 
+                                   }
+
+%%
+
+void convertCppComments(BufStr *inBuf,BufStr *outBuf)
+{
+  g_inBuf    = inBuf;
+  g_outBuf   = outBuf;
+  g_inBufPos = 0;
+  BEGIN(Scan);
+  yylex();
+}
+
+//----------------------------------------------------------------------------
+extern "C" { // some bogus code to keep the compiler happy
+    void commentcnvYYdummy() { yy_flex_realloc(0,0); } 
+}
+
diff --git a/src/config.l b/src/config.l
index 05b9b19..c3409d8 100644
--- a/src/config.l
+++ b/src/config.l
@@ -1247,9 +1247,10 @@ void Config::create()
                     "documentation generated by doxygen is written. Doxygen will use this \n"
                     "information to generate all constant output in the proper language. \n"
                     "The default language is English, other supported languages are: \n"
-		    "Brazilian, Chinese, Croatian, Czech, Danish, Dutch, Finnish, French, \n"
-		    "German, Greek, Hungarian, Italian, Japanese, Korean, Norwegian, Polish, \n"
-		    "Portuguese, Romanian, Russian, Slovak, Slovene, Spanish and Swedish.\n",
+		    "Brazilian, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, \n"
+		    "Finnish, French, German, Greek, Hungarian, Italian, Japanese, Korean, \n"
+		    "Norwegian, Polish, Portuguese, Romanian, Russian, Slovak, Slovene, \n"
+		    "Spanish, Swedish and Ukrainian.\n",
 		    "English"
                    );
 #ifdef LANG_BR
@@ -1258,6 +1259,9 @@ void Config::create()
 #ifdef LANG_CN
   ce->addValue("Chinese");
 #endif
+#ifdef LANG_TW
+  ce->addValue("Chinese-Traditional");
+#endif
 #ifdef LANG_HR
   ce->addValue("Croatian");
 #endif
diff --git a/src/defargs.l b/src/defargs.l
index d736369..b88ef13 100644
--- a/src/defargs.l
+++ b/src/defargs.l
@@ -261,16 +261,37 @@ ID	[a-z_A-Z][a-z_A-Z0-9]*
 					    //printf("g_curArgTypeName=`%s' i=%d\n",g_curArgTypeName.data(),i);
 					    Argument *a = new Argument; 
 					    a->attrib = g_curArgAttrib.copy();
-					    if (i>=0 && g_curArgTypeName.at(i)!=':')
+					    //printf("a->type=%s a->name=%s i=%d l=%d\n",
+					    //	a->type.data(),a->name.data(),i,l);
+					    a->array.resize(0);
+					    if (i==l-1 && g_curArgTypeName.at(i)==')') // function argument
+					    {
+					      int bi=g_curArgTypeName.find('(');
+					      int fi=bi-1;
+					      //printf("func arg fi=%d\n",fi);
+					      while (fi>=0 && isId(g_curArgTypeName.at(fi))) fi--;
+					      if (fi>=0)
+					      {
+					        a->type  = g_curArgTypeName.left(fi+1);
+					        a->name  = g_curArgTypeName.mid(fi+1,bi-fi-1);
+						a->array = g_curArgTypeName.right(l-bi);
+					      }
+					      else
+					      {
+						a->type = g_curArgTypeName;
+					      }
+					    }
+					    else if (i>=0 && g_curArgTypeName.at(i)!=':')
 					    { // type contains a name
 					      a->type = removeRedundantWhiteSpace(g_curArgTypeName.left(i+1));
-					      a->name = g_curArgTypeName.right(g_curArgTypeName.length()-i-1);
+					      a->name = g_curArgTypeName.right(l-i-1);
 					    }
 					    else // assume only the type was specified, try to determine name later 
 					    {
 					      a->type = removeRedundantWhiteSpace(g_curArgTypeName);  
 					    }
-					    a->array  = removeRedundantWhiteSpace(g_curArgArray);
+					    //printf("a->type=%s a->name=%s a->array=%s\n",a->type.data(),a->name.data());
+					    a->array  += removeRedundantWhiteSpace(g_curArgArray);
 					    a->defval = g_curArgDefValue.copy();
 					    a->docs   = g_curArgDocs.stripWhiteSpace();
 					    //printf("Argument `%s' `%s' adding docs=`%s'\n",a->type.data(),a->name.data(),a->docs.data());
diff --git a/src/dot.cpp b/src/dot.cpp
index 6ed5daa..c421c2c 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -1470,7 +1470,7 @@ void DotInclDepGraph::buildGraph(DotNode *n,FileDef *fd,int distance)
     if (bfd)
     {
       in  = bfd->absFilePath();  
-      doc = bfd->isLinkableInProject();
+      doc = bfd->isLinkable();
       src = bfd->generateSourceFile();
     }
     if (doc || src)
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 499564e..5824c07 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -60,6 +60,7 @@
 #include "page.h"
 #include "packagedef.h"
 #include "bufstr.h"
+#include "commentcnv.h"
 
 #if defined(_MSC_VER) || defined(__BORLANDC__)
 #define popen _popen
@@ -1073,6 +1074,13 @@ static void findUsingDeclarations(Entry *root)
       } while (scopeOffset>=0 && usingCd==0);
 
       //printf("%s -> %p\n",root->name.data(),usingCd);
+      if (usingCd==0) // definition not in the input => add an artificial class
+      {
+        usingCd = new ClassDef(
+                     "<generated>",1,
+                     root->name,ClassDef::Class);
+        Doxygen::hiddenClasses.append(root->name,usingCd);
+      }
 
       // add the namespace the correct scope
       if (usingCd)
@@ -1758,8 +1766,6 @@ void addMethodToClass(Entry *root,ClassDef *cd,
   {
     mn = new MemberName(name);
     mn->append(md);
-    //Doxygen::memberNameDict.insert(name,mn);
-    //Doxygen::memberNameList.append(mn);
     Doxygen::memberNameSDict.append(name,mn);
   }
 
@@ -1873,9 +1879,11 @@ static void buildFunctionList(Entry *root)
             QCString nsName,rnsName;
             if (nd)  nsName  = nd->name().copy();
             if (rnd) rnsName = rnd->name().copy();
+            NamespaceList *unl = fd ? fd->getUsedNamespaces() : 0;
+            ClassList     *ucl = fd ? fd->getUsedClasses() : 0;
             //printf("matching arguments for %s\n",md->name().data());
             if ( 
-                matchArguments(md->argumentList(),root->argList,0,nsName)
+                matchArguments(md->argumentList(),root->argList,0,nsName,FALSE,unl,ucl)
                )
             {
               //printf("match!\n");
@@ -2043,8 +2051,6 @@ static void buildFunctionList(Entry *root)
           {
             mn = new MemberName(name);
             mn->append(md);
-            //Doxygen::functionNameDict.insert(name,mn);
-            //Doxygen::functionNameList.append(mn);
             Doxygen::functionNameSDict.append(name,mn);
           }
           addMemberToGroups(root,md);
@@ -3139,7 +3145,9 @@ static void computeClassRelations()
     if ((cd==0 || (!cd->hasDocumentation() && !cd->isReference())) && 
         bName.right(2)!="::")
     {
-      if (!root->name.isEmpty() && root->name[0]!='@')
+      if (!root->name.isEmpty() && root->name[0]!='@' &&
+          (guessSection(root->fileName)==Entry::HEADER_SEC || Config_getBool("EXTRACT_LOCAL_CLASSES"))
+         )
         warn_undoc(
                    root->fileName,root->startLine,
                    "Warning: Compound %s is not documented.",
@@ -3572,6 +3580,7 @@ static bool findGlobalMember(Entry *root,
       FileDef *fd=findFileDef(Doxygen::inputNameDict,root->fileName,ambig);
       //printf("File %s\n",fd ? fd->name().data() : "<none>");
       NamespaceList *nl = fd ? fd->getUsedNamespaces() : 0;
+      ClassList *cl     = fd ? fd->getUsedClasses()    : 0;
       //printf("NamespaceList %p\n",nl);
 
       // search in the list of namespaces that are imported via a 
@@ -3589,7 +3598,7 @@ static bool findGlobalMember(Entry *root,
         bool matching=
           (md->argumentList()==0 && root->argList->count()==0) ||
           md->isVariable() || md->isTypedef() || /* in case of function pointers */
-          matchArguments(md->argumentList(),root->argList,0,nsName);
+          matchArguments(md->argumentList(),root->argList,0,nsName,FALSE,nl,cl);
 
         // for static members we also check if the comment block was found in 
         // the same file. This is needed because static members with the same
@@ -6280,26 +6289,31 @@ static void readFiles(BufStr &output)
 
     int fileNameSize=fileName.length();
 
+    BufStr tempBuf(10000);
+
     // add begin filename marker
-    output.addChar(0x06);
+    tempBuf.addChar(0x06);
     // copy filename
-    output.addArray(fileName.data(),fileNameSize);
+    tempBuf.addArray(fileName.data(),fileNameSize);
     
     // add end filename marker
-    output.addChar(0x06);
-    output.addChar('\n');
+    tempBuf.addChar(0x06);
+    tempBuf.addChar('\n');
     if (Config_getBool("ENABLE_PREPROCESSING"))
     {
       msg("Preprocessing %s...\n",s->data());
-      preprocessFile(fileName,output);
+      preprocessFile(fileName,tempBuf);
     }
     else
     {
       msg("Reading %s...\n",s->data());
-      copyAndFilterFile(fileName,output);
+      copyAndFilterFile(fileName,tempBuf);
     }
 
-    output.addChar('\n'); /* to prevent problems under Windows ? */
+    tempBuf.addChar('\n'); /* to prevent problems under Windows ? */
+
+    convertCppComments(&tempBuf,&output);
+    //output.addArray(tempBuf.data(),tempBuf.curPos());
 
     s=inputFiles.next();
     //printf("-------> adding new line\n");
@@ -6989,6 +7003,10 @@ void parseInput()
     s=excludeList.next();
   }
 
+  /**************************************************************************
+   *             Determine Input Files                                      *
+   **************************************************************************/
+
   msg("Reading input files...\n");
   QDict<void> *killDict = new QDict<void>(10007);
   int inputSize=0;
@@ -7079,6 +7097,25 @@ void parseInput()
     }
     s=aliasList.next();
   }
+
+  /**************************************************************************
+   *             Handle Tag Files                                           *
+   **************************************************************************/
+
+  Entry *root=new Entry;
+  msg("Reading tag files\n");
+  
+  QStrList &tagFileList = Config_getList("TAGFILES");
+  s=tagFileList.first();
+  while (s)
+  {
+    readTagFile(root,s);
+    s=tagFileList.next();
+  }
+  
+  /**************************************************************************
+   *             Read Input Files                                           *
+   **************************************************************************/
   
   BufStr input(inputSize+1); // Add one byte extra for \0 termination
 
@@ -7201,25 +7238,8 @@ void parseInput()
     readFormulaRepository();
   }
   
-  Entry *root=new Entry;
   root->program=input;
 
-
-  /**************************************************************************
-   *             Handle Tag Files                                           *
-   **************************************************************************/
-
-  msg("Reading tag files\n");
-  
-  QStrList &tagFileList = Config_getList("TAGFILES");
-  s=tagFileList.first();
-  while (s)
-  {
-    readTagFile(root,s);
-    s=tagFileList.next();
-  }
-  
-  
   /**************************************************************************
    *             Gather information                                         * 
    **************************************************************************/
diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in
index 75ffd35..dbb006f 100644
--- a/src/doxygen.pro.in
+++ b/src/doxygen.pro.in
@@ -26,6 +26,7 @@ win32-msvc:TMAKE_LFLAGS    += /LIBPATH:..\lib
 win32-borland:LIBS         += qtools.lib png.lib doxygen.lib doxycfg.lib shell32.lib 
 win32-borland:TMAKE_LFLAGS += -L..\lib -L$(BCB)\lib\psdk
 win32:TMAKE_CXXFLAGS       += -DQT_NODLL
+win32-g++:TMAKE_CXXFLAGS   += -D_WIN32 -D__CYGWIN__ -DALL_STATIC
 INCLUDEPATH                += ../qtools ../libpng .
 DESTDIR                    =  ../bin
 TARGET                     =  doxygen
diff --git a/src/doxytag.pro.in b/src/doxytag.pro.in
index 090ec81..3016535 100644
--- a/src/doxytag.pro.in
+++ b/src/doxytag.pro.in
@@ -27,6 +27,7 @@ win32-msvc:TMAKE_LFLAGS    += /LIBPATH:..\lib
 win32-borland:LIBS         += qtools.lib shell32.lib
 win32-borland:TMAKE_LFLAGS += -L..\lib -L$(BCB)\lib\psdk
 win32:TMAKE_CXXFLAGS       += -DQT_NODLL
+win32-g++:TMAKE_CXXFLAGS   += -D_WIN32
 INCLUDEPATH                += ../qtools
 OBJECTS_DIR                =  ../objects
 TARGET                     =  ../bin/doxytag
diff --git a/src/filedef.cpp b/src/filedef.cpp
index 7e4a2c1..177cfa6 100644
--- a/src/filedef.cpp
+++ b/src/filedef.cpp
@@ -126,7 +126,9 @@ void FileDef::writeDocumentation(OutputList &ol)
     Doxygen::tagFile << "  <compound kind=\"file\">" << endl;
     Doxygen::tagFile << "    <name>" << convertToXML(name()) << "</name>" << endl;
     Doxygen::tagFile << "    <path>" << convertToXML(getPath()) << "</path>" << endl;
-    Doxygen::tagFile << "    <filename>" << convertToXML(getOutputFileBase()) << htmlFileExtension << "</filename>" << endl;
+    Doxygen::tagFile << "    <filename>" 
+                     << convertToXML(getOutputFileBase()) 
+                     << "</filename>" << endl;
   }
   
   ol.startTextBlock();
@@ -186,9 +188,21 @@ void FileDef::writeDocumentation(OutputList &ol)
       // Here we use the include file name as it appears in the file.
       // we could also we the name as it is used within doxygen,
       // then we should have used fd->docName() instead of ii->includeName
-      if (fd && fd->isLinkable() && fd->generateSourceFile())
+      if (fd && fd->isLinkable())
       {
-        ol.writeObjectLink(fd->getReference(),fd->includeName(),0,ii->includeName);
+        ol.writeObjectLink(fd->getReference(),
+            fd->generateSourceFile() ? fd->includeName() : fd->getOutputFileBase(),
+            0,ii->includeName);
+        if (!Config_getString("GENERATE_TAGFILE").isEmpty() && !fd->isReference()) 
+        {
+          const char *locStr = (ii->local || isIDLorJava) ? "yes" : "no";
+          Doxygen::tagFile << "    <includes id=\"" 
+                           << convertToXML(fd->getOutputFileBase()) 
+                           << "\" local=\"" << locStr << "\">" 
+                           << convertToXML(ii->includeName)
+                           << "</includes>" 
+                           << endl;
+        }
       }
       else
       {
@@ -623,6 +637,12 @@ void FileDef::addIncludedByDependency(FileDef *fd,const char *incName,bool local
   }
 }
 
+bool FileDef::isIncluded(const QCString &name) const
+{
+  if (name.isEmpty()) return FALSE;
+  return includeDict->find(name)!=0;
+}
+
 bool FileDef::generateSourceFile() const 
 { 
   QCString extension = name().right(4);
diff --git a/src/filedef.h b/src/filedef.h
index 52be3f6..4841d1c 100644
--- a/src/filedef.h
+++ b/src/filedef.h
@@ -117,6 +117,7 @@ class FileDef : public Definition
     {
       return isLinkableInProject() || isReference();
     }
+    bool isIncluded(const QCString &name) const;
 
     void writeDocumentation(OutputList &ol);
     void writeSource(OutputList &ol);
diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
index f179449..71941b5 100644
--- a/src/htmlhelp.cpp
+++ b/src/htmlhelp.cpp
@@ -26,6 +26,7 @@
 #include "htmlhelp.h"
 #include "config.h"
 #include "message.h"
+#include "doxygen.h"
 
 //----------------------------------------------------------------------------
 
@@ -176,7 +177,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t)
       if (level2.isEmpty())
       {
         t << "  <LI><OBJECT type=\"text/sitemap\">";
-        t << "<param name=\"Local\" value=\"" << f->url << ".html";
+        t << "<param name=\"Local\" value=\"" << f->url << htmlFileExtension;
         if (!f->anchor.isEmpty()) t << "#" << f->anchor;  
         t << "\">";
         t << "<param name=\"Name\" value=\"" << level1 << "\">"
@@ -187,7 +188,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t)
         if (f->link)
         {
           t << "  <LI><OBJECT type=\"text/sitemap\">";
-          t << "<param name=\"Local\" value=\"" << f->url << ".html\">";
+          t << "<param name=\"Local\" value=\"" << f->url << htmlFileExtension << "\">";
           t << "<param name=\"Name\" value=\"" << level1 << "\">"
                "</OBJECT>\n";
         }
@@ -213,7 +214,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t)
     if (level2Started)
     {
       t << "    <LI><OBJECT type=\"text/sitemap\">";
-      t << "<param name=\"Local\" value=\"" << f->url << ".html";
+      t << "<param name=\"Local\" value=\"" << f->url << htmlFileExtension;
       if (!f->anchor.isEmpty()) t << "#" << f->anchor;  
       t << "\">";
       t << "<param name=\"Name\" value=\"" << level2 << "\">"
@@ -307,8 +308,8 @@ void HtmlHelp::createProjectFile()
     t.setEncoding(QTextStream::Latin1);
 #endif
 
-    QCString indexName="index.html";
-    if (Config_getBool("GENERATE_TREEVIEW")) indexName="main.html";
+    QCString indexName="index"+htmlFileExtension;
+    if (Config_getBool("GENERATE_TREEVIEW")) indexName="main"+htmlFileExtension;
     t << "[OPTIONS]\n"
          "Compatibility=1.1\n"
          "Full-text search=Yes\n"
@@ -417,7 +418,7 @@ void HtmlHelp::addContentsItem(bool isDir,
   cts << "<param name=\"Name\" value=\"" << name << "\">";
   if (ref)      // made ref optional param - KPW
   {
-    cts << "<param name=\"Local\" value=\"" << ref << ".html";
+    cts << "<param name=\"Local\" value=\"" << ref << htmlFileExtension;
     if (anchor) cts << "#" << anchor;  
     cts << "\">";
   }
diff --git a/src/instdox.cpp b/src/instdox.cpp
index 3e480dc..cd803cd 100644
--- a/src/instdox.cpp
+++ b/src/instdox.cpp
@@ -117,7 +117,7 @@ void writeInstallScript()
     t << "if ( ! @files ) {\n";
     t << "  if (opendir(D,\".\")) {\n";
     t << "    foreach $file ( readdir(D) ) {\n";
-    t << "      $match = \".html\";\n";
+    t << "      $match = \"" << Config_getString("HTML_FILE_EXTENSION") << "\";\n";
     t << "      next if ( $file =~ /^\\.\\.?$/ );\n";
     t << "      ($file =~ /$match/) && (push @files, $file);\n";
     t << "      ($file =~ \"tree.js\") && (push @files, $file);\n";
diff --git a/src/lang_cfg.h b/src/lang_cfg.h
index 4e6639b..8c54688 100644
--- a/src/lang_cfg.h
+++ b/src/lang_cfg.h
@@ -22,3 +22,4 @@
 #define LANG_SK
 #define LANG_UA
 #define LANG_GR
+#define LANG_TW
diff --git a/src/language.cpp b/src/language.cpp
index 06c3d11..7c9494a 100644
--- a/src/language.cpp
+++ b/src/language.cpp
@@ -76,6 +76,9 @@
 #ifdef LANG_CN
 #include "translator_cn.h"
 #endif
+#ifdef LANG_TW
+#include "translator_tw.h"
+#endif
 #ifdef LANG_NO
 #include "translator_no.h"
 #endif
@@ -218,6 +221,12 @@ bool setTranslator(const char *langName)
     theTranslator=new TranslatorChinese;
   }
 #endif
+#ifdef LANG_TW
+  else if (L_EQUAL("chinese-traditional"))
+  {
+    theTranslator=new TranslatorChinesetraditional;
+  }
+#endif
 #ifdef LANG_NO
   else if (L_EQUAL("norwegian"))
   {
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index f851e19..4ecc4d1 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -1393,7 +1393,8 @@ void LatexGenerator::docify(const char *str)
   static bool isKorean        = theTranslator->idLanguage()=="korean";
   static bool isRussian       = theTranslator->idLanguage()=="russian";
   static bool isUkrainian     = theTranslator->idLanguage()=="ukrainian";
-  static bool isChinese       = theTranslator->idLanguage()=="chinese";
+  static bool isChinese       = theTranslator->idLanguage()=="chinese" || 
+                                theTranslator->idLanguage()=="chinese-traditional";
   static bool isLatin2        = theTranslator->idLanguageCharset()=="iso-8859-2";
   static bool isGreek         = theTranslator->idLanguage()=="greek";
   if (str)
diff --git a/src/libdoxycfg.pro.in b/src/libdoxycfg.pro.in
index 98ea518..2455a5b 100644
--- a/src/libdoxycfg.pro.in
+++ b/src/libdoxycfg.pro.in
@@ -19,6 +19,7 @@ CONFIG       =	console warn_on staticlib $extraopts
 HEADERS      =  config.h	
 SOURCES      =	config.cpp 
 win32:TMAKE_CXXFLAGS       += -DQT_NODLL
+win32-g++:TMAKE_CXXFLAGS   += -D_WIN32 -D__CYGWIN__ -DALL_STATIC
 INCLUDEPATH                += ../qtools
 win32:INCLUDEPATH          += .
 DESTDIR                    =  ../lib
diff --git a/src/libdoxygen.pro.in b/src/libdoxygen.pro.in
index 2d4cf8d..796ce76 100644
--- a/src/libdoxygen.pro.in
+++ b/src/libdoxygen.pro.in
@@ -20,6 +20,7 @@ HEADERS      =	bufstr.h \
                 classdef.h \
                 classlist.h \
                 code.h \
+		commentcnv.h \
 		constexp.h \
 		cppvalue.h \
 		debug.h \
@@ -100,6 +101,7 @@ SOURCES      =	ce_lex.cpp \
 		classdef.cpp \
 		classlist.cpp \
 		code.cpp \
+		commentcnv.cpp \
 		cppvalue.cpp \
 		debug.cpp \
                 defgen.cpp \
@@ -150,6 +152,7 @@ SOURCES      =	ce_lex.cpp \
 
 win32:TMAKE_CXXFLAGS       += -DQT_NODLL 
 win32-msvc:TMAKE_CXXFLAGS  += -Zm200
+win32-g++:TMAKE_CXXFLAGS   += -D_WIN32 -D__CYGWIN__ -DALL_STATIC
 INCLUDEPATH                += ../qtools
 INCLUDEPATH                += ../libpng
 win32:INCLUDEPATH          += .
diff --git a/src/libdoxygen.t b/src/libdoxygen.t
index ac3bc82..da0e45c 100644
--- a/src/libdoxygen.t
+++ b/src/libdoxygen.t
@@ -62,6 +62,9 @@ sub GenerateDep {
 #$ GenerateDep("doc.cpp","doc.l");
 	$(LEX) -PdocYY -t doc.l >doc.cpp
 
+#$ GenerateDep("commentcnv.cpp","commentcnv.l");
+	$(LEX) -PcommentcnvYY -t commentcnv.l >commentcnv.cpp
+
 #$ GenerateDep("ce_lex.cpp","constexp.l","ce_parse.h");
 	$(LEX) -PcppExpYY -t constexp.l >ce_lex.cpp 
 
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index 3d70b3a..d84c54f 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -37,6 +37,9 @@
 //#define DBG_RTF(x) x;
 #define DBG_RTF(x)
 
+// used for table column width calculation
+#define PAGEWIDTH 8748
+
 const int indentLevels = 10;
 
 struct ListItemInfo
@@ -121,6 +124,7 @@ void RTFGenerator::append(const OutputGenerator *g)
   //insideTabbing=insideTabbing || ((RTFGenerator *)g)->insideTabbing;
   m_listLevel=((RTFGenerator *)g)->m_listLevel;
   m_omitParagraph=((RTFGenerator *)g)->m_omitParagraph;
+  m_columnNumbers=((RTFGenerator *)g)->m_columnNumbers;
   //printf("RTFGenerator::append(%s) insideTabbing=%s\n", g->getContents().data(),
   //    insideTabbing ? "TRUE" : "FALSE" );
 }
@@ -1641,6 +1645,59 @@ void RTFGenerator::endSubsubsection()
 //  t << "}";
 //}
 
+void RTFGenerator::startTable(bool,int colNumbers) 
+{
+  m_columnNumbers=colNumbers;
+  t<<"\\par\n";
+}
+
+void RTFGenerator::endTable(bool hasCaption) 
+{ 
+  if (!hasCaption) 
+    t << "\n\\pard \\widctlpar\\intbl\\adjustright\n{\\row }\n"; 
+  t << "\\pard\n" << endl; 
+}
+
+void  RTFGenerator::startCaption() 
+{
+  endTableRow();
+  t<<"\\trowd \\trgaph108\\trleft-108\\trbrdrt\\brdrs\\brdrw10 \\trbrdrl\\brdrs\\brdrw10 \\trbrdrb\\brdrs\\brdrw10 \\trbrdrr\\brdrs\\brdrw10 \\trbrdrh\\brdrs\\brdrw10 \\trbrdrv\\brdrs\\brdrw10"<<endl;
+  t<<"\\clvertalt\\clbrdrt\\brdrs\\brdrw10 \\clbrdrl\\brdrs\\brdrw10 \\clbrdrb\\brdrs\\brdrw10 \\clbrdrr \\brdrs\\brdrw10 \\cltxlrtb \\cellx"<<PAGEWIDTH<<"\\pard \\qc\\nowidctlpar\\widctlpar\\intbl\\adjustright "<<endl;
+  nextTableColumn();
+}
+
+void  RTFGenerator::endCaption() 
+{
+  endTableColumn();
+  endTableRow();
+}
+
+void RTFGenerator::nextTableRow() 
+{  
+  unsigned long columnWidth=PAGEWIDTH/m_columnNumbers;
+  t<<"\\trowd \\trgaph108\\trleft-108\\trbrdrt\\brdrs\\brdrw10 \\trbrdrl\\brdrs\\brdrw10 \\trbrdrb\\brdrs\\brdrw10 \\trbrdrr\\brdrs\\brdrw10 \\trbrdrh\\brdrs\\brdrw10 \\trbrdrv\\brdrs\\brdrw10 "<<endl;
+  for (int i=1;i<=m_columnNumbers;i++) 
+  {
+    t<<"\\clvertalt\\clbrdrt\\brdrs\\brdrw10 \\clbrdrl\\brdrs\\brdrw10 \\clbrdrb\\brdrs\\brdrw10 \\clbrdrr \\brdrs\\brdrw10 \\cltxlrtb \\cellx"<<i*columnWidth<<endl;
+  }
+  t<<"\\pard \\widctlpar\\intbl\\adjustright\n{";
+}
+ 
+void RTFGenerator::endTableRow() 
+{ 
+  t<<"\n\\pard \\widctlpar\\intbl\\adjustright\n{\\row }\n";
+}
+ 
+void RTFGenerator::nextTableColumn() 
+{
+  t<<"{ ";
+}
+
+void RTFGenerator::endTableColumn() 
+{ 
+  t<<" \\cell }";
+}
+
 void RTFGenerator::startTextLink(const char *f,const char *anchor)
 {
   if (Config_getBool("RTF_HYPERLINKS"))
diff --git a/src/rtfgen.h b/src/rtfgen.h
index ddf6e7b..afa2df6 100644
--- a/src/rtfgen.h
+++ b/src/rtfgen.h
@@ -154,14 +154,14 @@ class RTFGenerator : public OutputGenerator
     void endSubscript()     { t << "}"; }
     void startSuperscript() { t << "{\\super " << endl;}
     void endSuperscript()   { t << "}"; }
-    void startTable(bool,int)   { /* not implemented */ }
-    void endTable(bool)         { /* not implemented */ }
-    void startCaption()     { /* not implemented */ }
-    void endCaption()       { /* not implemented */ }
-    void nextTableRow()     { /* not implemented */ }
-    void endTableRow()      { /* not implemented */ }
-    void nextTableColumn()  { /* not implemented */ }
-    void endTableColumn()   { /* not implemented */ }
+    void startTable(bool,int);
+    void endTable(bool);
+    void startCaption();
+    void endCaption();
+    void nextTableRow();
+    void endTableRow();
+    void nextTableColumn();
+    void endTableColumn();
     void writeCopyright()    { t << "\251"; }
     void writeQuote()        { t << "\""; }
     void writeUmlaut(char c);
@@ -268,6 +268,7 @@ class RTFGenerator : public OutputGenerator
     bool m_bstartedBody;  // has startbody been called yet?
     int  m_listLevel; // // RTF does not really have a addative indent...manually set list level.
     bool m_omitParagraph; // should a the next paragraph command be ignored?
+    int  m_columnNumbers; // number of columns in a table
 
     void beginRTFDocument();
     void beginRTFChapter();
diff --git a/src/scanner.l b/src/scanner.l
index 27c94ec..8bfa406 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -3770,10 +3770,12 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
   					}
 <SkipSection>"//"|"*/"			  					
 <ClassDoc,Doc,JavaDoc,AfterDoc,PageDoc,ExampleDoc>{CMD}"elseif"/[^a-z_A-Z0-9] {
-                                          // previous section enabled => absorb else
+                                          // previous section enabled => skip now
+  					  depthIf=1;
+  					  BEGIN(SkipSection);
   					}
 <ClassDoc,Doc,JavaDoc,AfterDoc,PageDoc,ExampleDoc>{CMD}"else"/[^a-z_A-Z0-9] {
-                                          // section was enable => skip now
+                                          // section was enabled => skip now
   					  depthIf=1;
   					  BEGIN(SkipSection);
   					}
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index d3c85ba..c40a442 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -91,11 +91,19 @@ class TagPackageInfo
     QStringList classList;
 };
 
+class TagIncludeInfo
+{
+  public:
+    QString id;
+    QString name;
+    bool isLocal;
+};
+
 /*! Container for file specific info that can be read from a tagfile */
 class TagFileInfo
 {
   public:
-    TagFileInfo() { members.setAutoDelete(TRUE); }
+    TagFileInfo() { members.setAutoDelete(TRUE); includes.setAutoDelete(TRUE); }
     QString name;
     QString path;
     QString filename;
@@ -103,6 +111,7 @@ class TagFileInfo
     QList<TagMemberInfo> members;
     QStringList classList;
     QStringList namespaceList;
+    QList<TagIncludeInfo> includes;
 };
 
 /*! Container for group specific info that can be read from a tagfile */
@@ -431,6 +440,25 @@ class TagFileParser : public QXmlDefaultHandler
         err("Error: Unexpected tag `base' found\n");
       }
     }
+    void startIncludes(const QXmlAttributes& attrib )
+    {
+      if (m_state==InFile && m_curFile)
+      {
+        m_curIncludes = new TagIncludeInfo;
+        m_curIncludes->id = attrib.value("id");
+        m_curIncludes->isLocal = attrib.value("local")=="yes" ? TRUE : FALSE;
+        m_curFile->includes.append(m_curIncludes);
+      }
+      else
+      {
+        err("Error: Unexpected tag `includes' found\n");
+      }
+      m_curString="";
+    }
+    void endIncludes()
+    {
+      m_curIncludes->name = m_curString;
+    }
     void endTemplateArg()
     {
       if (m_state==InClass && m_curClass)
@@ -541,6 +569,7 @@ class TagFileParser : public QXmlDefaultHandler
       m_startElementHandlers.insert("name",        new StartElementHandler(this,&TagFileParser::startStringValue));
       m_startElementHandlers.insert("base",        new StartElementHandler(this,&TagFileParser::startBase));
       m_startElementHandlers.insert("filename",    new StartElementHandler(this,&TagFileParser::startStringValue));
+      m_startElementHandlers.insert("includes",    new StartElementHandler(this,&TagFileParser::startIncludes));
       m_startElementHandlers.insert("path",        new StartElementHandler(this,&TagFileParser::startStringValue));
       m_startElementHandlers.insert("anchor",      new StartElementHandler(this,&TagFileParser::startStringValue));
       m_startElementHandlers.insert("arglist",     new StartElementHandler(this,&TagFileParser::startStringValue));
@@ -560,6 +589,7 @@ class TagFileParser : public QXmlDefaultHandler
       m_endElementHandlers.insert("name",        new EndElementHandler(this,&TagFileParser::endName));
       m_endElementHandlers.insert("base",        new EndElementHandler(this,&TagFileParser::endBase));
       m_endElementHandlers.insert("filename",    new EndElementHandler(this,&TagFileParser::endFilename));
+      m_endElementHandlers.insert("includes",    new EndElementHandler(this,&TagFileParser::endIncludes));
       m_endElementHandlers.insert("path",        new EndElementHandler(this,&TagFileParser::endPath));
       m_endElementHandlers.insert("anchor",      new EndElementHandler(this,&TagFileParser::endAnchor));
       m_endElementHandlers.insert("arglist",     new EndElementHandler(this,&TagFileParser::endArglist));
@@ -612,6 +642,7 @@ class TagFileParser : public QXmlDefaultHandler
     }
     void dump();
     void buildLists(Entry *root);
+    void addIncludes();
     
   private:
     void buildMemberList(Entry *ce,QList<TagMemberInfo> &members);
@@ -631,6 +662,7 @@ class TagFileParser : public QXmlDefaultHandler
     TagGroupInfo              *m_curGroup;
     TagPageInfo               *m_curPage;
     TagMemberInfo             *m_curMember;
+    TagIncludeInfo            *m_curIncludes;
     QCString                   m_curString;
     QString                    m_tagName;
     State                      m_state;
@@ -752,6 +784,13 @@ void TagFileParser::dump()
       msg("    anchor: `%s'\n",md->anchor.data());
       msg("    arglist: `%s'\n",md->arglist.data());
     }
+
+    QListIterator<TagIncludeInfo> mii(fd->includes);
+    TagIncludeInfo *ii;
+    for (;(ii=mii.current());++mii)
+    {
+      msg("  includes id: %s name: %s\n",ii->id.data(),ii->name.data());
+    }
   }
 
   //============== GROUPS
@@ -1113,6 +1152,44 @@ void TagFileParser::buildLists(Entry *root)
   }
 }
 
+void TagFileParser::addIncludes()
+{
+  TagFileInfo *tfi = m_tagFileFiles.first();
+  while (tfi)
+  {
+    FileName *fn = Doxygen::inputNameDict->find(tfi->name);
+    if (fn)
+    {
+      FileNameIterator fni(*fn);
+      FileDef *fd;
+      for (;(fd=fni.current());++fni)
+      {
+        if (fd->getPath()==QCString(m_tagName+":"+tfi->path))
+        {
+          QListIterator<TagIncludeInfo> mii(tfi->includes);
+          TagIncludeInfo *ii;
+          for (;(ii=mii.current());++mii)
+          {
+            FileName *ifn = Doxygen::inputNameDict->find(ii->name);
+            FileNameIterator ifni(*ifn);
+            FileDef *ifd;
+            for (;(ifd=ifni.current());++ifni)
+            {
+              printf("ifd->getOutputFileBase()=%s ii->id=%s\n",
+                      ifd->getOutputFileBase().data(),ii->id.data());
+              if (ifd->getOutputFileBase()==QCString(ii->id))
+              {
+                fd->addIncludeDependency(ifd,ii->name,ii->isLocal);
+              }
+            }
+          }
+        }
+      } 
+    }
+    tfi = m_tagFileFiles.next();
+  }
+}
+
 void parseTagFile(Entry *root,const char *fullName,const char *tagName)
 {
   QFileInfo fi(fullName);
@@ -1126,5 +1203,6 @@ void parseTagFile(Entry *root,const char *fullName,const char *tagName)
   reader.setErrorHandler( &errorHandler );
   reader.parse( source );
   handler.buildLists(root);
+  handler.addIncludes();
 }
 
diff --git a/src/translator_jp.h b/src/translator_jp.h
index 1d7fe84..2e995a5 100644
--- a/src/translator_jp.h
+++ b/src/translator_jp.h
@@ -1,39 +1,37 @@
 /******************************************************************************
-*
-*
-*
-* Copyright (C) 1997-2000 by Dimitri van 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.
-*
-*/
+ *
+ *
+ *
+ * Copyright (C) 1997-2000 by Dimitri van 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.
+ *
+ */
 
 /*
-* translator_jp.h
-*
-* 1.2.5)
-* First Translation
-*      by Kenji Nagamatsu
-* 1.2.12)
-* Update and Shift-Jis(_WIN32)
-*      by Ryunosuke Sato (30-Dec-2001)
-*/
+ * translator_jp.h
+ *
+ * 1.2.5)
+ * First Translation
+ *      by Kenji Nagamatsu
+ * 1.2.12)
+ * Update and Shift-Jis(_WIN32)
+ *      by Ryunosuke Sato (30-Dec-2001)
+ */
 
 #ifndef TRANSLATOR_JP_H
 #define TRANSLATOR_JP_H
 
 class TranslatorJapanese : public Translator
 {
-private:
+ private:
   /*! The decode() can change euc into sjis */
   inline QCString decode(const QCString & sInput)
     {
@@ -48,7 +46,7 @@ private:
     { return "japanese"; }
     virtual QCString latexLanguageSupportCommand()
       {
-    return "";
+	return "";
       }
     /*! returns the name of the package that is included by LaTeX */
     virtual QCString idLanguageCharset()
@@ -60,8 +58,7 @@ private:
 #endif
     }
 
-    /*! used in the compound documentation before a list of related 
-functions. */
+    /*! used in the compound documentation before a list of related functions. */
     virtual QCString trRelatedFunctions()
     { return decode("楮洘允月楮醒"); }
 
@@ -69,18 +66,17 @@ functions. */
     virtual QCString trRelatedSubscript()
     { return decode("﹋仇木日反丟件田楮醒匹卅中仇午卞鏜啦﹌"); }
 
-    /*! header that is put before the detailed description of files, classes 
-and namespaces. */
+    /*! header that is put before the detailed description of files, classes and namespaces. */
     virtual QCString trDetailedDescription()
     { return decode("荸濩"); }
 
     /*! header that is put before the list of typedefs. */
     virtual QCString trMemberTypedefDocumentation()
-      { return decode("Typedef丟件田及荸濩"); }
+    { return decode("Typedef 丟件田及荸濩"); }
 
     /*! header that is put before the list of enumerations. */
     virtual QCString trMemberEnumerationDocumentation()
-    { return decode("Enum丟件田及荸濩"); }
+    { return decode("Enum 丟件田及荸濩"); }
 
     /*! header that is put before the list of member functions. */
     virtual QCString trMemberFunctionDocumentation()
@@ -90,13 +86,13 @@ and namespaces. */
     virtual QCString trMemberDataDocumentation()
     {
       if( Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-    {
-      return decode("厭瞻蟲及荸濩");
-    }
+	{
+	  return decode("厭瞻蟲及荸濩");
+	}
       else
-    {
-      return decode("丟件田及荸濩");
-    }
+	{
+	  return decode("丟件田及荸濩");
+	}
     }
 
     /*! this is the text of a link put after brief descriptions. */
@@ -105,20 +101,19 @@ and namespaces. */
 
     /*! put in the class documentation */
     virtual QCString trListOfAllMembers()
-    { return decode("丟件田域厖"); }
+    { return decode("允屯化及丟件田域厖"); }
 
     /*! used as the title of the "list of all members" page of a class */
     virtual QCString trMemberList()
     { return decode("丟件田域厖"); }
 
-    /*! this is the first part of a sentence that is followed by a class 
-name */
+    /*! this is the first part of a sentence that is followed by a class name */
     virtual QCString trThisIsTheListOfAllMembers()
-    { return decode("仇木反丟件田及域厖匹允﹝"); }
+    { return decode("仇木反蟈丟件田及域厖匹允﹝"); }
 
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
-    { return decode("煤噩丟件田手允屯化殖氏匹中引允﹝"); }
+    { return decode("煤噩丟件田手殖氏匹中引允﹝"); }
 
     /*! this is put at the author sections at the bottom of man pages.
      *  parameter s is name of the project name.
@@ -126,7 +121,7 @@ name */
     virtual QCString trGeneratedAutomatically(const char *s)
     { QCString result;
       if (s) result=(QCString)s+decode("及");
-      result+=decode("末□旦井日 Doxygen 互戲嶽仄引仄凶﹝");
+      result+=decode("末□旦井日 Doxygen 卞方曰戲嶽仄引仄凶﹝");
       return result;
     }
 
@@ -136,7 +131,7 @@ name */
 
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
-    { return decode("Enum襖"); }
+    { return decode("Enum 襖"); }
 
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
@@ -154,55 +149,51 @@ name */
     virtual QCString trClassHierarchy()
     { return decode("弁仿旦閉遽"); }
 
-    /*! This is put above each page as a link to the list of annotated 
-classes */
+    /*! This is put above each page as a link to the list of annotated classes */
     virtual QCString trCompoundList()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-    {
-      return decode("犯□正厭瞻");
-    }
+	{
+	  return decode("犯□正厭瞻");
+	}
       else
-    {
-      return decode("厭嶽");
-    }
+	{
+	  return decode("厭嶽");
+	}
     }
 
-    /*! This is put above each page as a link to the list of documented 
-files */
+    /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
     { return decode("白央奶伙域厖"); }
 
-    /*! This is put above each page as a link to the list of all verbatim 
-headers */
+    /*! This is put above each page as a link to the list of all verbatim headers */
     virtual QCString trHeaderFiles()
     { return decode("目永母白央奶伙"); }
 
-    /*! This is put above each page as a link to all members of compounds. 
-*/
+    /*! This is put above each page as a link to all members of compounds. */
     virtual QCString trCompoundMembers()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-    {
-      return decode("犯□正白奴□伙玉");
-    }
+	{
+	  return decode("犯□正白奴□伙玉");
+	}
       else
-    {
-      return decode("厭嶽丟件田");
-    }
+	{
+	  return decode("厭嶽丟件田");
+	}
     }
 
     /*! This is put above each page as a link to all members of files. */
     virtual QCString trFileMembers()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-    {
-      return decode("弘伕□田伙");
-    }
+	{
+	  return decode("弘伕□田伙");
+	}
       else
-    {
-      return decode("白央奶伙丟件田");
-    }
+	{
+	  return decode("白央奶伙丟件田");
+	}
     }
     /*! This is put above each page as a link to all related pages. */
     virtual QCString trRelatedPages()
@@ -234,13 +225,13 @@ headers */
     virtual QCString trCompoundListDescription()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-    {
-      return decode("犯□正厭瞻及荸濩匹允﹝");
-    }
+	{
+	  return decode("犯□正厭瞻及荸濩匹允﹝");
+	}
       else
-    {
-      return decode("弁仿旦﹜厭瞻蟲﹜隋迕蟲﹜奶件正白尼□旦及荸濩匹允﹝");
-    }
+	{
+	  return decode("弁仿旦﹜厭瞻蟲﹜隋迕蟲﹜奶件正白尼□旦及荸濩匹允﹝");
+	}
     }
 
     /*! This is an introduction to the page with all class members. */
@@ -248,15 +239,15 @@ headers */
     {
       QCString result=decode("仇木反");
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-    {
-      result+=decode("白奴□伙玉及域厖匹公木冗木");
-      if (extractAll) result+=decode("互簞仄化中月厭瞻蟲/隋迕蟲");
-    }
+	{
+	  result+=decode("白奴□伙玉及域厖匹公木冗木");
+	  if (extractAll) result+=decode("互簞仄化中月厭瞻蟲/隋迕蟲");
+	}
       else
-    {
-      result+=decode("弁仿旦丟件田及域厖匹﹜公木冗木");
-      if (extractAll) result+=decode("互簞仄化中月弁仿旦");
-    }
+	{
+	  result+=decode("弁仿旦丟件田及域厖匹﹜公木冗木");
+	  if (extractAll) result+=decode("互簞仄化中月弁仿旦");
+	}
       result+=decode("及荸濩尺伉件弁仄化中引允﹝");
       return result;
     }
@@ -266,20 +257,18 @@ headers */
     {
       QCString result=decode("仇木反");
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-    {
-      result+=decode("楮醒﹜庍醒﹜穴弁伕﹜Typedef爛聒﹜Enum爛聒及");
-    }
+	{
+	  result+=decode("楮醒﹜庍醒﹜穴弁伕﹜昫街滇﹜滇爛聒及");
+	}
       else
-    {
-      result+=decode("白央奶伙丟件田及");
-    }
-      
-result+=decode("域厖匹允﹝公木冗木互簞仄化中月白央奶伙及荸濩尺伉件弁仄化中引允﹝");
+	{
+	  result+=decode("白央奶伙丟件田及");
+	}
+      result+=decode("域厖匹允﹝公木冗木互簞仄化中月白央奶伙及荸濩尺伉件弁仄化中引允﹝");
       return result;
     }
 
-    /*! This is an introduction to the page with the list of all header 
-files. */
+    /*! This is an introduction to the page with the list of all header files. */
     virtual QCString trHeaderFilesDescription()
     { return decode("API毛厭嶽允月目永母白央奶伙匹允﹝"); }
 
@@ -287,13 +276,11 @@ files. */
     virtual QCString trExamplesDescription()
     { return decode("允屯化及拺及域厖匹允﹝"); }
 
-    /*! This is an introduction to the page with the list of related pages 
-*/
+    /*! This is an introduction to the page with the list of related pages */
     virtual QCString trRelatedPagesDescription()
     { return decode("楮洘矢□斥及域厖匹允﹝"); }
 
-    /*! This is an introduction to the page with the list of class/file 
-groups */
+    /*! This is an introduction to the page with the list of class/file groups */
     virtual QCString trModulesDescription()
     { return decode("允屯化及乒斥亙□伙及域厖匹允﹝"); }
 
@@ -328,13 +315,13 @@ groups */
     virtual QCString trCompoundIndex()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-    {
-      return decode("犯□正厭瞻綢婁");
-    }
+	{
+	  return decode("犯□正厭瞻綢婁");
+	}
       else
-    {
-      return decode("厭嶽綢婁");
-    }
+	{
+	  return decode("厭嶽綢婁");
+	}
     }
 
     /*! This is used in LaTeX as the title of the chapter with the
@@ -355,13 +342,13 @@ groups */
     virtual QCString trClassDocumentation()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-    {
-      return decode("犯□正厭瞻及荸濩");
-    }
+	{
+	  return decode("犯□正厭瞻及荸濩");
+	}
       else
-    {
-      return decode("弁仿旦及荸濩");
-    }
+	{
+	  return decode("弁仿旦及荸濩");
+	}
     }
 
     /*! This is used in LaTeX as the title of the chapter containing
@@ -402,13 +389,13 @@ groups */
      *  list of typedefs
      */
     virtual QCString trTypedefs()
-    { return decode("Typedef爛聒"); }
+    { return decode("滇爛聒"); }
 
     /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     virtual QCString trEnumerations()
-    { return decode("Enum爛聒"); }
+    { return decode("昫街滇"); }
 
     /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
@@ -426,50 +413,44 @@ groups */
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
-      { return decode("Enum襖"); }
+      { return decode("昫街襖"); }
     /*! This is used in the documentation of a file before the list of
      *  documentation blocks for defines
      */
     virtual QCString trDefineDocumentation()
     { return decode("穴弁伕爛聒及荸濩"); }
 
-    /*! This is used in the documentation of a file/namespace before the 
-list
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
     { return decode("楮醒皿伕玄正奶皿及荸濩"); }
 
-    /*! This is used in the documentation of a file/namespace before the 
-list
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
-    { return decode("Typedef爛聒及荸濩"); }
+    { return decode("滇爛聒及荸濩"); }
 
-    /*! This is used in the documentation of a file/namespace before the 
-list
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
-    { return decode("Enum爛聒及荸濩"); }
+    { return decode("昫街滇及荸濩"); }
 
-    /*! This is used in the documentation of a file/namespace before the 
-list
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
-    { return decode("Enum襖及荸濩"); }
+    { return decode("昫街襖及荸濩"); }
 
-    /*! This is used in the documentation of a file/namespace before the 
-list
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
     { return decode("楮醒及荸濩"); }
 
-    /*! This is used in the documentation of a file/namespace before the 
-list
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
@@ -481,13 +462,13 @@ list
     virtual QCString trCompounds()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-    {
-      return decode("犯□正厭瞻");
-    }
+	{
+	  return decode("犯□正厭瞻");
+	}
       else
-    {
-      return decode("厭嶽");
-    }
+	{
+	  return decode("厭嶽");
+	}
     }
     /*! This is used in the standard footer of each page and indicates when
      *  the page was generated
@@ -499,8 +480,7 @@ list
       result+=(QCString)date+decode("卞戲嶽今木引仄凶﹝");
       return result;
     }
-    /*! This is part of the sentence used in the standard footer of each 
-page.
+    /*! This is part of the sentence used in the standard footer of each page.
      */
     virtual QCString trWrittenBy()
     {
@@ -510,7 +490,7 @@ page.
     /*! this text is put before a class diagram */
     virtual QCString trClassDiagram(const char *clName)
     {
-      return (QCString)clName+decode("及煤噩弘仿白");
+      return (QCString)clName+decode("卞覆允月煤噩弘仿白");
     }
 
     /*! this text is generated when the \\internal command is used. */
@@ -519,8 +499,7 @@ page.
 
     /*! this text is generated when the \\reimp command is used. */
     virtual QCString trReimplementedForInternalReasons()
-    { return 
-decode("ま朿讀卅咥苀卞方曰瘋撢隸今木引仄凶互﹜API卞反排黍仄引六氏﹝");
+    { return decode("ま朿讀卅咥苀卞方曰瘋撢隸今木引仄凶互﹜API卞反排黍仄引六氏﹝");
     }
 
     /*! this text is generated when the \\warning command is used. */
@@ -539,10 +518,6 @@ decode("ま朿讀卅咥苀卞方曰瘋撢隸今木引仄凶互﹜API卞反排黍仄引六氏﹝");
     virtual QCString trDate()
     { return decode("ゥ尥"); }
 
-    /*! this text is generated when the \\author command is used. */
-    virtual QCString trAuthors()
-    { return decode("綜樊"); }
-
     /*! this text is generated when the \\return command is used. */
     virtual QCString trReturns()
     { return decode("枑曰襖"); }
@@ -561,14 +536,13 @@ decode("ま朿讀卅咥苀卞方曰瘋撢隸今木引仄凶互﹜API卞反排黍仄引六氏﹝");
 
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
-    { return decode(""); }
+    { return decode("綜嶽“"); }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used as the title of page containing all the index of all 
-namespaces. */
+    /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
     { return decode("抩蟆塢棉域厖"); }
 
@@ -584,7 +558,7 @@ namespaces. */
      *  friends of a class
      */
     virtual QCString trFriends()
-    { return decode("Friend楮醒"); }
+    { return decode("白伊件玉"); }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
@@ -594,7 +568,7 @@ namespaces. */
      * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
-    { return decode("楮洘允月楮醒及荸濩"); }
+    { return decode("白伊件玉午楮洘允月楮醒及荸濩"); }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
@@ -612,8 +586,7 @@ namespaces. */
         case ClassDef::Struct:     result+=decode("厭瞻蟲 "); break;
         case ClassDef::Union:      result+=decode("隋迕蟲 "); break;
         case ClassDef::Interface:  result+=decode("奶件正白尼□旦"); break;
-        case ClassDef::Exception:  result+=decode("拺陸"); break; 
-//TODO:fixme
+        case ClassDef::Exception:  result+=decode("拺陸"); break; //TODO:fixme
       }
       if (isTemplate) result+=decode(" 氾件皿伊□玄");
       result+=(QCString)clName+decode(" 及荸濩");
@@ -630,32 +603,31 @@ namespaces. */
     /*! used as the title of the HTML page of a namespace */
     virtual QCString trNamespaceReference(const char *namespaceName)
     {
-      QCString result=decode("抩蟆塢棉 ")+(QCString)namespaceName+decode(" 
-及荸濩");
+      QCString result=decode("抩蟆塢棉 ")+(QCString)namespaceName+decode(" 及荸濩");
       return result;
     }
 
     /* these are for the member sections of a class, struct or union */
     virtual QCString trPublicMembers()
-    { return decode("Public 丟末永玉"); }
+    { return decode("Public 丟件田"); }
     virtual QCString trPublicSlots()
     { return decode("Public 旦伕永玄"); }
     virtual QCString trSignals()
     { return decode("扑弘瓜伙"); }
     virtual QCString trStaticPublicMembers()
-    { return decode("Static Public 丟末永玉"); }
+    { return decode("Static Public 丟件田"); }
     virtual QCString trProtectedMembers()
-    { return decode("Protected 丟末永玉"); }
+    { return decode("Protected 丟件田"); }
     virtual QCString trProtectedSlots()
     { return decode("Protected 旦伕永玄"); }
     virtual QCString trStaticProtectedMembers()
-    { return decode("Static Protected 丟末永玉"); }
+    { return decode("Static Protected 丟件田"); }
     virtual QCString trPrivateMembers()
-    { return decode("Private 丟末永玉"); }
+    { return decode("Private 丟件田"); }
     virtual QCString trPrivateSlots()
     { return decode("Private 旦伕永玄"); }
     virtual QCString trStaticPrivateMembers()
-    { return decode("Static Private 丟末永玉"); }
+    { return decode("Static Private 丟件田"); }
 
     /*! this function is used to produce a comma-separated list of items.
      *  use generateMarker(i) to indicate where item i should be put.
@@ -714,20 +686,19 @@ namespaces. */
       return trWriteList(numEntries)+decode("匹瘋爛聒今木化中引允﹝");
     }
 
-    /*! This is put above each page as a link to all members of namespaces. 
-*/
+    /*! This is put above each page as a link to all members of namespaces. */
     virtual QCString trNamespaceMembers()
     { return decode("抩蟆塢棉丟件田"); }
 
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
     {
-    QCString result=decode("仇木反");
+	QCString result=decode("仇木反");
       result+=decode("抩蟆塢棉及域厖匹允﹝公木冗木");
       if (extractAll)
-      result+=decode("及抩蟆塢棉及荸濩");
+	  result+=decode("及抩蟆塢棉及荸濩");
       else
-      result+=decode("互簞仄化中月抩蟆塢棉");
+	  result+=decode("互簞仄化中月抩蟆塢棉");
       result+=decode("尺伉件弁仄化中引允﹝");
       return result;
     }
@@ -771,8 +742,7 @@ namespaces. */
         case ClassDef::Struct:     result+=decode("厭瞻蟲"); break;
         case ClassDef::Union:      result+=decode("隋迕蟲"); break;
         case ClassDef::Interface:  result+=decode("奶件正白尼□旦"); break;
-        case ClassDef::Exception:  result+=decode("拺陸"); break; 
-//TODO:fixme
+        case ClassDef::Exception:  result+=decode("拺陸"); break; //TODO:fixme
       }
       result+=decode("及荸濩反慼及白央奶伙井日戲嶽今木引仄凶:");
       return result;
@@ -782,7 +752,7 @@ namespaces. */
      * list.
      */
     virtual QCString trAlphabeticalList()
-    { return decode("域厖  [失伙白央矛永玄賜]"); }
+    { return decode("失伙白央矛永玄賜域厖"); }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990901
@@ -841,21 +811,19 @@ namespaces. */
     /*! this text is put before an include dependency graph */
     virtual QCString trInclDepGraph(const char *fName)
     {
-    return (QCString)fName+decode("及奶件弁伙□玉匙繡楮溢豭");
+	return (QCString)fName+decode("及奶件弁伙□玉匙繡楮溢豭");
     }
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
       return decode("戊件旦玄仿弁正午犯旦玄仿弁正及荸濩");
     }
-    /*! Used in the file documentation to point to the corresponding 
-sources. */
+    /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
     {
       return decode("末□旦戊□玉毛葦月﹝");
     }
-    /*! Used in the file sources to point to the corresponding 
-documentation. */
+    /*! Used in the file sources to point to the corresponding documentation. */
     virtual QCString trGotoDocumentation()
     {
       return decode("荸濩毛葦月﹝");
@@ -883,7 +851,7 @@ documentation. */
     /*! Text used the source code in the file index */
     virtual QCString trCode()
     {
-      return decode("末□旦戊□玉");
+      return decode("戊□玉");
     }
     virtual QCString trGraphicalHierarchy()
     {
@@ -912,18 +880,18 @@ documentation. */
     }
     virtual QCString trPublicTypes()
     {
-      return decode("Public 滇");
+      return decode("跤釩滇");
     }
     virtual QCString trPublicAttribs()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-    {
-      return decode("犯□正白奴□伙玉");
-    }
+	{
+	  return decode("犯□正白奴□伙玉");
+	}
       else
-    {
-      return decode("Public 簞嶺");
-    }
+	{
+	  return decode("Public 簞嶺");
+	}
     }
     virtual QCString trStaticPublicAttribs()
     {
@@ -961,12 +929,12 @@ documentation. */
     /*! Used as a marker that is put before a todo item */
     virtual QCString trTodo()
     {
-      return decode("Todo");
+      return decode("TODO");
     }
     /*! Used as the header of the todo list */
     virtual QCString trTodoList()
     {
-      return decode("Todo域厖");
+      return decode("TODO域厖");
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -987,7 +955,7 @@ documentation. */
     }
     virtual QCString trInclByDepGraph()
     {
-    return decode("仇及弘仿白反﹜升及白央奶伙井日躂濤/棉濤讀卞"
+	return decode("仇及弘仿白反﹜升及白央奶伙井日躂濤﹜棉濤讀卞"
              "奶件弁伙□玉今木化中月井毛憎仄化中引允﹝");
     }
     virtual QCString trSince()
@@ -1008,8 +976,7 @@ documentation. */
     virtual QCString trLegendDocs()
     {
       return
-        decode("仇及矢□斥匹反﹜doxygen 
-匹戲嶽今木凶弘仿白毛升及方丹卞心凶日方中井毛"
+        decode("仇及矢□斥匹反﹜doxygen 匹戲嶽今木凶弘仿白毛升及方丹卞心凶日方中井毛"
         "濩抸仄引允﹝<p>\n"
         "慼及拺毛嗶尹化心引允﹝\n"
         "\\code\n"
@@ -1037,23 +1004,19 @@ documentation. */
         "    Used *m_usedClass;\n"
         "};\n"
         "\\endcode\n"
-        "澀爛白央奶伙醱匹﹜正弘 \\c MAX_DOT_GRAPH_HEIGHT 互 200 
-卞本永玄今木凶"
+        "澀爛白央奶伙醱匹﹜正弘 \\c MAX_DOT_GRAPH_HEIGHT 互 200 卞本永玄今木凶"
         "樺寧﹜慼及方丹卅弘仿白午卅曰引允﹝"
-        "<p><center><img 
-src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
         "<p>\n"
         "曉及弘仿白ま及示永弁旦卞反慼及方丹卅啦怗互丐曰引允﹝\n"
         "<ul>\n"
-        
-"<li>幕仁巖曰勾少今木凶示永弁旦反﹜仇及弘仿白卞覆殺允月厭瞻蟲支弁仿旦毛"
+        "<li>幕仁巖曰勾少今木凶示永弁旦反﹜仇及弘仿白卞覆殺允月厭瞻蟲支弁仿旦毛"
         "刓仄引允﹝\n"
         "<li>幕珂及示永弁旦反玉平亙丟件玄互丐月厭瞻蟲支弁仿旦毛刓仄引允﹝\n"
-        
-"<li>野縉及珂及示永弁旦反玉平亙丟件玄互卅中厭瞻蟲支弁仿旦毛刓仄引允﹝\n"
+        "<li>野縉及珂及示永弁旦反玉平亙丟件玄互卅中厭瞻蟲支弁仿旦毛刓仄引允﹝\n"
         "<li>氈珂及示永弁旦反玉平亙丟件玄互丐月厭瞻蟲支弁仿旦毛刓仄引允互﹜"
-      "隙爛今木凶扔奶朮卞璋引日卅中凶戶卞煤噩’抁殖楮溢毛允屯化豭憎允月"
-      "仇午互匹五卅井勻凶仇午毛憎仄引允﹝"
+	  "隙爛今木凶扔奶朮卞璋引日卅中凶戶卞煤噩’抁殖楮溢毛允屯化豭憎允月"
+	  "仇午互匹五卅井勻凶仇午毛憎仄引允﹝"
         "</ul>\n"
         "泫執卞反慼及方丹卅啦怗互丐曰引允﹝\n"
         "<ul>\n"
@@ -1061,8 +1024,8 @@ src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
         "<li>恦及泫執反 protected 煤噩楮溢毛憎仄引允﹝\n"
         "<li>氈及泫執反 private 煤噩楮溢毛憎仄引允﹝\n"
         "<li>餌及г瞬泫執反﹜公及弁仿旦互職及弁仿旦卞殖引木化中凶曰﹜"
-      "厙迕今木化中月仇午毛憎仄引允﹝引凶﹜泫執互隙仄化中月弁仿旦支厭瞻蟲毛"
-      "升及庍醒匹失弁本旦匹五月井毛泫執及仿矛伙午仄化憎仄化中引允﹝\n"
+	  "厙迕今木化中月仇午毛憎仄引允﹝引凶﹜泫執互隙仄化中月弁仿旦支厭瞻蟲毛"
+	  "升及庍醒匹失弁本旦匹五月井毛泫執及仿矛伙午仄化憎仄化中引允﹝\n"
         "</ul>\n");
     }
     /*! text for the link to the legend page */
@@ -1093,7 +1056,7 @@ src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
     /*! Used as a section header for KDE-2 IDL methods */
     virtual QCString trDCOPMethods()
     {
-      return decode("DCOP 丟末永玉");
+      return decode("DCOP丟末永玉");
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1119,19 +1082,19 @@ src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
     /*! Used for Java interfaces in the summary section of Java packages */
     virtual QCString trInterfaces()
     {
-      return decode("奶件正白尼□旦");
+      return decode("奶件正□白尼□旦");
     }
     /*! Used for Java classes in the summary section of Java packages */
     virtual QCString trClasses()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-    {
-      return decode("犯□正厭瞻");
-    }
+	{
+	  return decode("犯□正厭瞻");
+	}
       else
-    {
-      return decode("弁仿旦");
-    }
+	{
+	  return decode("弁仿旦");
+	}
     }
     /*! Used as the title of a Java package */
     virtual QCString trPackage(const char *name)
@@ -1186,8 +1149,7 @@ src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
 
     /*! Used as ansicpg for RTF file
      *
-     * The following table shows the correlation of Charset name, Charset 
-Value and
+     * The following table shows the correlation of Charset name, Charset Value and
      * <pre>
      * Codepage number:
      * Charset Name       Charset Value(hex)  Codepage number
@@ -1360,7 +1322,7 @@ Value and
      */
     virtual QCString trImplementedFromList(int numEntries)
     {
-      return trWriteList(numEntries)+decode("毛撢隸仄化中引允")+".";
+      return trWriteList(numEntries)+decode("卞撢隸今木化中引允")+".";
     }
 
     /*! used in member documentation blocks to produce a list of
@@ -1368,9 +1330,8 @@ Value and
      */
     virtual QCString trImplementedInList(int numEntries)
     {
-      return trWriteList(numEntries)+decode("匹撢隸今木化中引允")+".";
+      return trWriteList(numEntries)+decode("毛撢隸仄化中引允")+".";
     }
 
 };
 #endif
-
diff --git a/src/translator_tw.h b/src/translator_tw.h
new file mode 100644
index 0000000..abd798a
--- /dev/null
+++ b/src/translator_tw.h
@@ -0,0 +1,1378 @@
+/******************************************************************************
+ *
+ * 
+ *
+ * Copyright (C) 1997-2002 by Dimitri van 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 TRANSLATOR_TW_H
+#define TRANSLATOR_TW_H
+
+// When defining a translator class for the new language, follow
+// the description in the documentation.  One of the steps says
+// that you should copy the translator_en.h (this) file to your
+// translator_xx.h new file.  Your new language should use the
+// Translator class as the base class.  This means that you need to
+// implement exactly the same (pure virtual) methods as the
+// TranslatorEnglish does.  Because of this, it is a good idea to
+// start with the copy of TranslatorEnglish and replace the strings
+// one by one.
+//
+// It is not necessary to include "translator.h" or
+// "translator_adapter.h" here.  The files are included in the
+// language.cpp correctly.  Not including any of the mentioned
+// files frees the maintainer from thinking about whether the
+// first, the second, or both files should be included or not, and
+// why.  This holds namely for localized translators because their
+// base class is changed occasionaly to adapter classes when the
+// Translator class changes the interface, or back to the
+// Translator class (by the local maintainer) when the localized
+// translator is made up-to-date again.
+
+class TranslatorChinesetraditional : public Translator
+{
+  public:
+
+    // --- Language control methods -------------------
+    
+    /*! Used for identification of the language. The identification 
+     * should not be translated. It should be replaced by the name 
+     * of the language in English using lower-case characters only
+     * (e.g. "czech", "japanese", "russian", etc.). It should be equal to 
+     * the identification used in language.cpp.
+     */
+    virtual QCString idLanguage()
+    { return "chinese-traditional"; }
+    
+    /*! Used to get the LaTeX command(s) for the language support. 
+     *  This method should return string with commands that switch
+     *  LaTeX to the desired language.  For example 
+     *  <pre>"\\usepackage[german]{babel}\n"
+     *  </pre>
+     *  or
+     *  <pre>"\\usepackage{polski}\n"
+     *  "\\usepackage[latin2]{inputenc}\n"
+     *  "\\usepackage[T1]{fontenc}\n"
+     *  </pre>
+     * 
+     * The English LaTeX does not use such commands.  Because of this
+     * the empty string is returned in this implementation.
+     */
+    virtual QCString latexLanguageSupportCommand()
+    {
+      return "";
+    }
+
+    /*! return the language charset. This will be used for the HTML output */
+    virtual QCString idLanguageCharset()
+    {
+      return "big5";
+    }
+
+    // --- Language translation methods -------------------
+
+    /*! used in the compound documentation before a list of related functions. */
+    virtual QCString trRelatedFunctions()
+    { return "相關函式"; }
+
+    /*! subscript for the related functions. */
+    virtual QCString trRelatedSubscript()
+    { return "(註：這些不是成員函式)"; }
+
+    /*! header that is put before the detailed description of files, classes and namespaces. */
+    virtual QCString trDetailedDescription()
+    { return "詳細描述"; }
+
+    /*! header that is put before the list of typedefs. */
+    virtual QCString trMemberTypedefDocumentation()
+    { return "型態定義成員說明文件"; }
+    
+    /*! header that is put before the list of enumerations. */
+    virtual QCString trMemberEnumerationDocumentation()
+    { return "列舉型態成員說明文件"; }
+    
+    /*! header that is put before the list of member functions. */
+    virtual QCString trMemberFunctionDocumentation()
+    { return "函式成員說明文件"; }
+    
+    /*! header that is put before the list of member attributes. */
+    virtual QCString trMemberDataDocumentation()
+    { 
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "欄位說明文件"; 
+      }
+      else
+      {
+        return "資料成員說明文件"; 
+      }
+    }
+
+    /*! this is the text of a link put after brief descriptions. */
+    virtual QCString trMore() 
+    { return "更多..."; }
+
+    /*! put in the class documentation */
+    virtual QCString trListOfAllMembers()
+    { return "全部成員列表"; }
+
+    /*! used as the title of the "list of all members" page of a class */
+    virtual QCString trMemberList()
+    { return "成員列表"; }
+
+    /*! this is the first part of a sentence that is followed by a class name */
+    virtual QCString trThisIsTheListOfAllMembers()
+    { return "完整成員列表，類別為"; }
+
+    /*! this is the remainder of the sentence after the class name */
+    virtual QCString trIncludingInheritedMembers()
+    { return ", 包含所有繼承的成員"; }
+    
+    /*! this is put at the author sections at the bottom of man pages.
+     *  parameter s is name of the project name.
+     */
+    virtual QCString trGeneratedAutomatically(const char *s)
+    { QCString result="本文件由Doxygen";
+      if (s) result+=(QCString)" 自 "+s;
+      result+=" 的原始碼中自動產生."; 
+      return result;
+    }
+
+    /*! put after an enum name in the list of all members */
+    virtual QCString trEnumName()
+    { return "列舉型態名稱"; }
+    
+    /*! put after an enum value in the list of all members */
+    virtual QCString trEnumValue()
+    { return "列舉值"; }
+    
+    /*! put after an undocumented member in the list of all members */
+    virtual QCString trDefinedIn()
+    { return "被定義於"; }
+
+    // quick reference sections
+
+    /*! This is put above each page as a link to the list of all groups of 
+     *  compounds or files (see the \\group command).
+     */
+    virtual QCString trModules()
+    { return "模組"; }
+    
+    /*! This is put above each page as a link to the class hierarchy */
+    virtual QCString trClassHierarchy()
+    { return "類別階層"; }
+    
+    /*! This is put above each page as a link to the list of annotated classes */
+    virtual QCString trCompoundList()
+    { 
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "資料結構";
+      }
+      else
+      {
+        return "複合列表"; 
+      }
+    }
+    
+    /*! This is put above each page as a link to the list of documented files */
+    virtual QCString trFileList()
+    { return "檔案列表"; }
+
+    /*! This is put above each page as a link to the list of all verbatim headers */
+    virtual QCString trHeaderFiles()
+    { return "標頭檔案"; }
+
+    /*! This is put above each page as a link to all members of compounds. */
+    virtual QCString trCompoundMembers()
+    { 
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "資料欄位"; 
+      }
+      else
+      {
+        return "複合成員"; 
+      }
+    }
+
+    /*! This is put above each page as a link to all members of files. */
+    virtual QCString trFileMembers()
+    { 
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "全域資料"; 
+      }
+      else
+      {
+        return "檔案成員"; 
+      }
+    }
+
+    /*! This is put above each page as a link to all related pages. */
+    virtual QCString trRelatedPages()
+    { return "相關頁面"; }
+
+    /*! This is put above each page as a link to all examples. */
+    virtual QCString trExamples()
+    { return "範例"; }
+
+    /*! This is put above each page as a link to the search engine. */
+    virtual QCString trSearch()
+    { return "搜尋"; }
+
+    /*! This is an introduction to the class hierarchy. */
+    virtual QCString trClassHierarchyDescription()
+    { return "這個繼承列表經過簡略的字母排序: ";
+    }
+
+    /*! This is an introduction to the list with all files. */
+    virtual QCString trFileListDescription(bool extractAll)
+    {
+      QCString result="這是附帶簡略說明";
+      if (!extractAll) result+="且經過文件化";
+      result+="的檔案列表:";
+      return result;
+    }
+
+    /*! This is an introduction to the annotated compound list. */
+    virtual QCString trCompoundListDescription()
+    { 
+      
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "這是附帶簡略說明的資料結構:"; 
+      }
+      else
+      {
+        return "這是附帶簡略說明的類別，結構，"
+               "聯合型態(unions)及介面(interfaces):"; 
+      }
+    }
+
+    /*! This is an introduction to the page with all class members. */
+    virtual QCString trCompoundMembersDescription(bool extractAll)
+    {
+      QCString result="這是全部";
+      if (!extractAll)
+      {
+        result+="文件化過";
+      }
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        result+="結構及聯合型態欄位";
+      }
+      else
+      {
+        result+="類別成員";
+      }
+      result+=", 並且帶有連結至";
+      if (extractAll) 
+      {
+        if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+        {
+          result+="每個欄位的結構/聯合型態說明文件:";
+        }
+        else
+        {
+          result+="每個成員的類別說明文件:";
+        }
+      }
+      else 
+      {
+        if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+        {
+          result+="這些結構/聯合型態是屬於:";
+        }
+        else
+        {
+          result+="這些類別是屬於:";
+        }
+      }
+      return result;
+    }
+
+    /*! This is an introduction to the page with all file members. */
+    virtual QCString trFileMembersDescription(bool extractAll)
+    {
+      QCString result="這是全部";
+      if (!extractAll) result+="文件化的";
+      
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        result+="函式，變數，定義，列舉，及型態定義";
+      }
+      else
+      {
+        result+="檔案成員";
+      }
+      result+="，並且帶有連結至";
+      if (extractAll) 
+        result+="這些檔案所屬:";
+      else 
+        result+="說明文件:";
+      return result;
+    }
+
+    /*! This is an introduction to the page with the list of all header files. */
+    virtual QCString trHeaderFilesDescription()
+    { return "組成API的標頭檔:"; }
+
+    /*! This is an introduction to the page with the list of all examples */
+    virtual QCString trExamplesDescription()
+    { return "所有範例列表:"; }
+
+    /*! This is an introduction to the page with the list of related pages */
+    virtual QCString trRelatedPagesDescription()
+    { return "所有相關文件頁面列表:"; }
+
+    /*! This is an introduction to the page with the list of class/file groups */
+    virtual QCString trModulesDescription()
+    { return "所有模組列表:"; }
+
+    /*! This sentences is used in the annotated class/file lists if no brief
+     * description is given. 
+     */
+    virtual QCString trNoDescriptionAvailable()
+    { return "沒有可用的說明描述"; }
+    
+    // index titles (the project name is prepended for these) 
+
+
+    /*! This is used in HTML as the title of index.html. */
+    virtual QCString trDocumentation()
+    { return "說明文件"; }
+
+    /*! This is used in LaTeX as the title of the chapter with the 
+     * index of all groups.
+     */
+    virtual QCString trModuleIndex()
+    { return "模組索引"; }
+
+    /*! This is used in LaTeX as the title of the chapter with the 
+     * class hierarchy.
+     */
+    virtual QCString trHierarchicalIndex()
+    { return "階層索引"; }
+
+    /*! This is used in LaTeX as the title of the chapter with the 
+     * annotated compound index.
+     */
+    virtual QCString trCompoundIndex()
+    {
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      { 
+        return "資料結構索引";
+      }
+      else
+      {
+        return "複合索引"; 
+      }
+    }
+
+    /*! This is used in LaTeX as the title of the chapter with the
+     * list of all files.
+     */
+    virtual QCString trFileIndex() 
+    { return "檔案索引"; }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all groups.
+     */
+    virtual QCString trModuleDocumentation()
+    { return "模組說明文件"; }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all classes, structs and unions.
+     */
+    virtual QCString trClassDocumentation()
+    { 
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "資料結構說明文件"; 
+      }
+      else
+      {
+        return "類別說明文件"; 
+      }
+    }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all files.
+     */
+    virtual QCString trFileDocumentation()
+    { return "檔案說明文件"; }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all examples.
+     */
+    virtual QCString trExampleDocumentation()
+    { return "範例說明文件"; }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all related pages.
+     */
+    virtual QCString trPageDocumentation()
+    { return "頁面說明文件"; }
+
+    /*! This is used in LaTeX as the title of the document */
+    virtual QCString trReferenceManual()
+    { return "參考手冊"; }
+    
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of defines
+     */
+    virtual QCString trDefines()
+    { return "定義"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of function prototypes
+     */
+    virtual QCString trFuncProtos()
+    { return "函式原型"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of typedefs
+     */
+    virtual QCString trTypedefs()
+    { return "型態定義"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of enumerations
+     */
+    virtual QCString trEnumerations()
+    { return "列舉型態"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of (global) functions
+     */
+    virtual QCString trFunctions()
+    { return "函式"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of (global) variables
+     */
+    virtual QCString trVariables()
+    { return "變數"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of (global) variables
+     */
+    virtual QCString trEnumerationValues()
+    { return "列舉值"; }
+    
+    /*! This is used in the documentation of a file before the list of
+     *  documentation blocks for defines
+     */
+    virtual QCString trDefineDocumentation()
+    { return "定義巨集說明文件"; }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for function prototypes
+     */
+    virtual QCString trFunctionPrototypeDocumentation()
+    { return "函式原型說明文件"; }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for typedefs
+     */
+    virtual QCString trTypedefDocumentation()
+    { return "型態定義說明文件"; }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for enumeration types
+     */
+    virtual QCString trEnumerationTypeDocumentation()
+    { return "列舉型態說明文件"; }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for enumeration values
+     */
+    virtual QCString trEnumerationValueDocumentation()
+    { return "列舉值說明文件"; }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for functions
+     */
+    virtual QCString trFunctionDocumentation()
+    { return "函式說明文件"; }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for variables
+     */
+    virtual QCString trVariableDocumentation()
+    { return "變數說明文件"; }
+
+    /*! This is used in the documentation of a file/namespace/group before 
+     *  the list of links to documented compounds
+     */
+    virtual QCString trCompounds()
+    { 
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "資料結構"; 
+      }
+      else
+      {
+        return "複合項目"; 
+      }
+    }
+
+    /*! This is used in the standard footer of each page and indicates when 
+     *  the page was generated 
+     */
+    virtual QCString trGeneratedAt(const char *date,const char *projName)
+    { 
+      QCString result=(QCString)"產生日期:"+date;
+      if (projName) result+=(QCString)", 專案:"+projName;
+      result+=(QCString)", 產生器:";
+      return result;
+    }
+    /*! This is part of the sentence used in the standard footer of each page.
+     */
+    virtual QCString trWrittenBy()
+    {
+      return "撰寫人:";
+    }
+
+    /*! this text is put before a class diagram */
+    virtual QCString trClassDiagram(const char *clName)
+    {
+      return (QCString)"類別"+clName+"的繼承圖:";
+    }
+    
+    /*! this text is generated when the \\internal command is used. */
+    virtual QCString trForInternalUseOnly()
+    { return "僅供內部使用."; }
+
+    /*! this text is generated when the \\reimp command is used. */
+    virtual QCString trReimplementedForInternalReasons()
+    { return "因內部原因重新實作; 不影響API."; }
+
+    /*! this text is generated when the \\warning command is used. */
+    virtual QCString trWarning()
+    { return "警告"; }
+
+    /*! this text is generated when the \\bug command is used. */
+    virtual QCString trBugsAndLimitations()
+    { return "臭蟲及限制"; }
+
+    /*! this text is generated when the \\version command is used. */
+    virtual QCString trVersion()
+    { return "版本"; }
+
+    /*! this text is generated when the \\date command is used. */
+    virtual QCString trDate()
+    { return "日期"; }
+
+    /*! this text is generated when the \\return command is used. */
+    virtual QCString trReturns()
+    { return "傳回值"; }
+
+    /*! this text is generated when the \\sa command is used. */
+    virtual QCString trSeeAlso()
+    { return "參閱\"; }
+
+    /*! this text is generated when the \\param command is used. */
+    virtual QCString trParameters()
+    { return "參數"; }
+
+    /*! this text is generated when the \\exception command is used. */
+    virtual QCString trExceptions()
+    { return "例外"; }
+    
+    /*! this text is used in the title page of a LaTeX document. */
+    virtual QCString trGeneratedBy()
+    { return "產生者:"; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990307
+//////////////////////////////////////////////////////////////////////////
+    
+    /*! used as the title of page containing all the index of all namespaces. */
+    virtual QCString trNamespaceList()
+    { return "命名空間(name space)列表"; }
+
+    /*! used as an introduction to the namespace list */
+    virtual QCString trNamespaceListDescription(bool extractAll)
+    {
+      QCString result="這是所有附帶簡略說明的";
+      if (!extractAll) result+="文件化的";
+      result+="命名空間(namespaces):";
+      return result;
+    }
+
+    /*! used in the class documentation as a header before the list of all
+     *  friends of a class
+     */
+    virtual QCString trFriends()
+    { return "類別朋友(Friends)"; }
+    
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990405
+//////////////////////////////////////////////////////////////////////////
+    
+    /*! used in the class documentation as a header before the list of all
+     * related classes 
+     */
+    virtual QCString trRelatedFunctionDocumentation()
+    { return "類別朋友及相關函式說明文件"; }
+    
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990425
+//////////////////////////////////////////////////////////////////////////
+
+    /*! used as the title of the HTML page of a class/struct/union */
+    virtual QCString trCompoundReference(const char *clName,
+                                    ClassDef::CompoundType compType,
+                                    bool isTemplate)
+    {
+      QCString result=(QCString)clName+" ";
+      switch(compType)
+      {
+        case ClassDef::Class:      result+=" 類別"; break;
+        case ClassDef::Struct:     result+=" 結構"; break;
+        case ClassDef::Union:      result+=" 聯合"; break;
+        case ClassDef::Interface:  result+=" 介面"; break;
+        case ClassDef::Exception:  result+=" 例外"; break;
+      }
+      if (isTemplate) result+=" 樣版";
+      result+=" 參考";
+      return result;
+    }
+
+    /*! used as the title of the HTML page of a file */
+    virtual QCString trFileReference(const char *fileName)
+    {
+      QCString result=fileName;
+      result+=" 檔案參考文件"; 
+      return result;
+    }
+
+    /*! used as the title of the HTML page of a namespace */
+    virtual QCString trNamespaceReference(const char *namespaceName)
+    {
+      QCString result=namespaceName;
+      result+=" 命名空間(Namespace)參考文件";
+      return result;
+    }
+    
+    virtual QCString trPublicMembers()
+    { return "公開方法(Public Methods)"; }
+    virtual QCString trPublicSlots()
+    { return "公開插槽(Public Slots)"; }
+    virtual QCString trSignals()
+    { return "訊號(Signals)"; }
+    virtual QCString trStaticPublicMembers()
+    { return "靜態公開方法(Static Public Methods)"; }
+    virtual QCString trProtectedMembers()
+    { return "保護方法(Protected Methods)"; }
+    virtual QCString trProtectedSlots()
+    { return "保護插槽(Protected Slots)"; }
+    virtual QCString trStaticProtectedMembers()
+    { return "靜態保護方法(Static Protected Methods)"; }
+    virtual QCString trPrivateMembers()
+    { return "私有方法(Private Methods)"; }
+    virtual QCString trPrivateSlots()
+    { return "私有插槽(Private Slots)"; }
+    virtual QCString trStaticPrivateMembers()
+    { return "靜態私有方法(Static Private Methods)"; }
+    
+    /*! this function is used to produce a comma-separated list of items.
+     *  use generateMarker(i) to indicate where item i should be put.
+     */
+    virtual QCString trWriteList(int numEntries)
+    {
+      QCString result;
+      int i;
+      // the inherits list contain `numEntries' classes
+      for (i=0;i<numEntries;i++) 
+      {
+        // use generateMarker to generate placeholders for the class links!
+        result+=generateMarker(i); // generate marker for entry i in the list 
+                                   // (order is left to right)
+        
+        if (i!=numEntries-1)  // not the last entry, so we need a separator
+        {
+          if (i<numEntries-2) // not the fore last entry 
+            result+=", ";
+          else                // the fore last entry
+            result+=", 及 ";
+        }
+      }
+      return result; 
+    }
+    
+    /*! used in class documentation to produce a list of base classes,
+     *  if class diagrams are disabled.
+     */
+    virtual QCString trInheritsList(int numEntries)
+    {
+      return "繼承自 "+trWriteList(numEntries)+".";
+    }
+
+    /*! used in class documentation to produce a list of super classes,
+     *  if class diagrams are disabled.
+     */
+    virtual QCString trInheritedByList(int numEntries)
+    {
+      return "被 "+trWriteList(numEntries)+"繼承.";
+    }
+
+    /*! used in member documentation blocks to produce a list of 
+     *  members that are hidden by this one.
+     */
+    virtual QCString trReimplementedFromList(int numEntries)
+    {
+      return "依據"+trWriteList(numEntries)+"重新實作.";
+    }
+
+    /*! used in member documentation blocks to produce a list of
+     *  all member that overwrite the implementation of this member.
+     */
+    virtual QCString trReimplementedInList(int numEntries)
+    {
+      return "在"+trWriteList(numEntries)+"重新實作.";
+    }
+
+    /*! This is put above each page as a link to all members of namespaces. */
+    virtual QCString trNamespaceMembers()
+    { return "命名空間(Namespace)成員"; }
+
+    /*! This is an introduction to the page with all namespace members */
+    virtual QCString trNamespaceMemberDescription(bool extractAll)
+    { 
+      QCString result="此處列表為所有 ";
+      if (!extractAll) result+="文件化的 ";
+      result+="命名空間(namespace)成員，並且附帶連結至 ";
+      if (extractAll) 
+        result+="每個成員的說明文件:";
+      else 
+        result+="該命名空間所屬之處:";
+      return result;
+    }
+    /*! This is used in LaTeX as the title of the chapter with the 
+     *  index of all namespaces.
+     */
+    virtual QCString trNamespaceIndex()
+    { return "命名空間(Namespace)索引"; }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all namespaces.
+     */
+    virtual QCString trNamespaceDocumentation()
+    { return "命名空間(Namespace)說明文件"; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990522
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This is used in the documentation before the list of all
+     *  namespaces in a file.
+     */
+    virtual QCString trNamespaces()
+    { return "命名空間(Namespaces)"; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990728
+//////////////////////////////////////////////////////////////////////////
+
+    /*! 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 single)
+    { // here s is one of " Class", " Struct" or " Union"
+      // single is true implies a single file
+      QCString result=(QCString)"此";
+      switch(compType)
+      {
+        case ClassDef::Class:      result+="類別(class)"; break;
+        case ClassDef::Struct:     result+="結構(structure)"; break;
+        case ClassDef::Union:      result+="聯合(union)"; break;
+        case ClassDef::Interface:  result+="介面(interface)"; break;
+        case ClassDef::Exception:  result+="例外(exception)"; break;
+      }
+      result+=" 文件是由下列檔案中產生";
+      if (single) result+=":"; else result+=":";
+      return result;
+    }
+
+    /*! This is in the (quick) index as a link to the alphabetical compound
+     * list.
+     */
+    virtual QCString trAlphabeticalList()
+    { return "字母順序列表"; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990901
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This is used as the heading text for the retval command. */
+    virtual QCString trReturnValues()
+    { return "傳回值"; }
+
+    /*! This is in the (quick) index as a link to the main page (index.html)
+     */
+    virtual QCString trMainPage()
+    { return "主頁面"; }
+
+    /*! This is used in references to page that are put in the LaTeX 
+     *  documentation. It should be an abbreviation of the word page.
+     */
+    virtual QCString trPageAbbreviation()
+    { return "p."; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-991003
+//////////////////////////////////////////////////////////////////////////
+
+    virtual QCString trSources()
+    {
+      return "原始碼";
+    }
+    virtual QCString trDefinedAtLineInSourceFile()
+    {
+      return "定義在 @1 檔案之第 @0 行.";
+    }
+    virtual QCString trDefinedInSourceFile()
+    {
+      return "定義在 @0 檔.";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-991205
+//////////////////////////////////////////////////////////////////////////
+
+    virtual QCString trDeprecated()
+    {
+      return "過時";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.0.0
+//////////////////////////////////////////////////////////////////////////
+
+    /*! this text is put before a collaboration diagram */
+    virtual QCString trCollaborationDiagram(const char *clName)
+    {
+      return (QCString)""+clName+"的合作圖:";
+    }
+    /*! this text is put before an include dependency graph */
+    virtual QCString trInclDepGraph(const char *fName)
+    {
+      return (QCString)""+fName+"的包含相依圖:";
+    }
+    /*! header that is put before the list of constructor/destructors. */
+    virtual QCString trConstructorDocumentation()
+    {
+      return "建構子與解構子說明文件"; 
+    }
+    /*! Used in the file documentation to point to the corresponding sources. */
+    virtual QCString trGotoSourceCode()
+    {
+      return "查看本檔案的原始碼.";
+    }
+    /*! Used in the file sources to point to the corresponding documentation. */
+    virtual QCString trGotoDocumentation()
+    {
+      return "查看本檔案說明文件.";
+    }
+    /*! Text for the \\pre command */
+    virtual QCString trPrecondition()
+    {
+      return "前置條件";
+    }
+    /*! Text for the \\post command */
+    virtual QCString trPostcondition()
+    {
+      return "後置條件";
+    }
+    /*! Text for the \\invariant command */
+    virtual QCString trInvariant()
+    {
+      return "常數";
+    }
+    /*! Text shown before a multi-line variable/enum initialization */
+    virtual QCString trInitialValue()
+    {
+      return "初值:";
+    }
+    /*! Text used the source code in the file index */
+    virtual QCString trCode()
+    {
+      return "程式碼";
+    }
+    virtual QCString trGraphicalHierarchy()
+    {
+      return "圖形化之類別階層";
+    }
+    virtual QCString trGotoGraphicalHierarchy()
+    {
+      return "查看圖形化之類別階層";
+    }
+    virtual QCString trGotoTextualHierarchy()
+    {
+      return "查看文字化之類別階層";
+    }
+    virtual QCString trPageIndex()
+    {
+      return "頁面索引";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.1.0
+//////////////////////////////////////////////////////////////////////////
+    
+    virtual QCString trNote()
+    {
+      return "註";
+    }
+    virtual QCString trPublicTypes()
+    {
+      return "公開型態";
+    }
+    virtual QCString trPublicAttribs()
+    {
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "資料欄位";
+      }
+      else
+      {
+        return "公開屬性";
+      }
+    }
+    virtual QCString trStaticPublicAttribs()
+    {
+      return "靜態公開屬性";
+    }
+    virtual QCString trProtectedTypes()
+    {
+      return "保護型態";
+    }
+    virtual QCString trProtectedAttribs()
+    {
+      return "保護屬性";
+    }
+    virtual QCString trStaticProtectedAttribs()
+    {
+      return "靜態保護屬性";
+    }
+    virtual QCString trPrivateTypes()
+    {
+      return "私有型態";
+    }
+    virtual QCString trPrivateAttribs()
+    {
+      return "私有屬性";
+    }
+    virtual QCString trStaticPrivateAttribs()
+    {
+      return "靜態私有屬性";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.1.3
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a marker that is put before a \\todo item */
+    virtual QCString trTodo()
+    {
+      return "待辦事項";
+    }
+    /*! Used as the header of the todo list */
+    virtual QCString trTodoList()
+    {
+      return "待辦事項列表";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.1.4
+//////////////////////////////////////////////////////////////////////////
+
+    virtual QCString trReferencedBy()
+    {
+      return "被參考於";
+    }
+    virtual QCString trRemarks()
+    {
+      return "備註";
+    }
+    virtual QCString trAttention()
+    {
+      return "注意";
+    }
+    virtual QCString trInclByDepGraph()
+    {
+      return "本圖顯示出哪些檔案直接或間接include本檔 "
+             ":";
+    }
+    virtual QCString trSince()
+    {
+      return "自";
+    }
+    
+//////////////////////////////////////////////////////////////////////////
+// new since 1.1.5
+//////////////////////////////////////////////////////////////////////////
+
+    /*! title of the graph legend page */
+    virtual QCString trLegendTitle()
+    {
+      return "圖示";
+    }
+    /*! page explaining how the dot graph's should be interpreted 
+     *  The %A in the text below are to prevent link to classes called "A".
+     */
+    virtual QCString trLegendDocs()
+    {
+      return 
+        "本頁解釋如何解譯這些由doxygen所產生的圖示 "
+        ".<p>\n"
+        "請看下面範例:\n"
+        "\\code\n"
+        "/*! 因為截斷的不可見類別 */\n"
+        "class Invisible { };\n\n"
+        "/*! 截斷的類別, 繼承關係被隱藏 */\n"
+        "class Truncated : public Invisible { };\n\n"
+        "/* 未經過doxygen註解處理過的類別 */\n"
+        "class Undocumented { };\n\n"
+        "/*! 經過公開(Public)繼承的類別 */\n"
+        "class PublicBase : public Truncated { };\n\n"
+        "/*! 一個樣版類別 */\n"
+        "template<class T> class Templ { };\n\n"
+        "/*! 使用保護(Protected)繼承的類別 */\n"
+        "class ProtectedBase { };\n\n"
+        "/*! 使用私有(Private)繼承的類別 */\n"
+        "class PrivateBase { };\n\n"
+        "/*! 由被繼承類別所使用的類別 */\n"
+        "class Used { };\n\n"
+        "/*! 由數個其他類別所繼承來的超類別(Super Class) */\n"
+        "class Inherited : public PublicBase,\n"
+        "                  protected ProtectedBase,\n"
+        "                  private PrivateBase,\n"
+        "                  public Undocumented\n"
+        "                  public Templ<int>\n"
+        "{\n"
+        "  private:\n"
+        "    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>\n"
+        "上圖中的各區塊意義如下:\n"
+        "<ul>\n"
+        "<li>%A 填滿黑色的區塊代表產生這個圖示的類別或結構 "
+        ".\n"
+        "<li>%A 黑邊的區塊代表文件化過的結構或類別.\n"
+        "<li>%A 灰邊的區塊代表未經文件化的結構或是類別.\n"
+        "<li>%A 紅邊的區塊代表文件化的結構或是類別，"
+        "這些結構或類別的繼承或包含關係不會全部顯示. %A 圖示 "
+        "若無法塞入指定的邊界中將會被截斷.\n"
+        "</ul>\n"
+        "箭頭具有下面的意義:\n"
+        "<ul>\n"
+        "<li>%A 深藍色箭頭用來代表兩個類別間的公開繼承 "
+        "關係.\n"
+        "<li>%A 深綠色箭頭代表保護繼承.\n"
+        "<li>%A 深紅色箭頭代表私有繼承.\n"
+        "<li>%A 紫色箭頭用來表示類別被另一個包含或是使用."
+        "箭頭上標示著可存取該類別或是結構的對應變數"
+        ".\n"
+        "<li>%A 黃色箭頭代表樣版實體與樣版類別之間的關係。"
+        "箭頭上標記著樣版實體上的參數"
+        ".\n"
+        "</ul>\n";
+    }
+    /*! text for the link to the legend page */
+    virtual QCString trLegend()
+    {
+      return "圖示";
+    }
+    
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.0
+//////////////////////////////////////////////////////////////////////////
+    
+    /*! Used as a marker that is put before a test item */
+    virtual QCString trTest()
+    {
+      return "測試項目";
+    }
+    /*! Used as the header of the test list */
+    virtual QCString trTestList()
+    {
+      return "測試項目列表";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.1
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a section header for KDE-2 IDL methods */
+    virtual QCString trDCOPMethods()
+    {
+      return "DCOP方法";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.2
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a section header for IDL properties */
+    virtual QCString trProperties()
+    {
+      return "屬性(properties)";
+    }
+    /*! Used as a section header for IDL property documentation */
+    virtual QCString trPropertyDocumentation()
+    {
+      return "屬性(property)說明文件";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.4
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used for Java interfaces in the summary section of Java packages */
+    virtual QCString trInterfaces()
+    {
+      return "介面";
+    }
+    /*! Used for Java classes in the summary section of Java packages */
+    virtual QCString trClasses()
+    {
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "資料結構";
+      }
+      else
+      {
+        return "類別";
+      }
+    }
+    /*! Used as the title of a Java package */
+    virtual QCString trPackage(const char *name)
+    {
+      return (QCString)"Package "+name;
+    }
+    /*! Title of the package index page */
+    virtual QCString trPackageList()
+    {
+      return "Package列表";
+    }
+    /*! The description of the package index page */
+    virtual QCString trPackageListDescription()
+    {
+      return "此處為Package的概略說明(如果有的話):";
+    }
+    /*! The link name in the Quick links header for each page */
+    virtual QCString trPackages()
+    {
+      return "Packages";
+    }
+    /*! Used as a chapter title for Latex & RTF output */
+    virtual QCString trPackageDocumentation()
+    {
+      return "Package說明文件";
+    }
+    /*! Text shown before a multi-line define */
+    virtual QCString trDefineValue()
+    {
+      return "值:";
+    }
+    
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.5
+//////////////////////////////////////////////////////////////////////////
+    
+    /*! Used as a marker that is put before a \\bug item */
+    virtual QCString trBug()
+    {
+      return "臭蟲";
+    }
+    /*! Used as the header of the bug list */
+    virtual QCString trBugList()
+    {
+      return "臭蟲列表";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.6
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as ansicpg for RTF file 
+     * 
+     * The following table shows the correlation of Charset name, Charset Value and 
+     * <pre>
+     * Codepage number:
+     * Charset Name       Charset Value(hex)  Codepage number
+     * ------------------------------------------------------
+     * DEFAULT_CHARSET           1 (x01)
+     * SYMBOL_CHARSET            2 (x02)
+     * OEM_CHARSET             255 (xFF)
+     * ANSI_CHARSET              0 (x00)            1252
+     * RUSSIAN_CHARSET         204 (xCC)            1251
+     * EE_CHARSET              238 (xEE)            1250
+     * GREEK_CHARSET           161 (xA1)            1253
+     * TURKISH_CHARSET         162 (xA2)            1254
+     * BALTIC_CHARSET          186 (xBA)            1257
+     * HEBREW_CHARSET          177 (xB1)            1255
+     * ARABIC _CHARSET         178 (xB2)            1256
+     * SHIFTJIS_CHARSET        128 (x80)             932
+     * HANGEUL_CHARSET         129 (x81)             949
+     * GB2313_CHARSET          134 (x86)             936
+     * CHINESEBIG5_CHARSET     136 (x88)             950
+     * </pre>
+     * 
+     */
+    virtual QCString trRTFansicp()
+    {
+      return "950";
+    }
+    
+
+    /*! Used as ansicpg for RTF fcharset 
+     *  \see trRTFansicp() for a table of possible values.
+     */
+    virtual QCString trRTFCharSet()
+    {
+      return "136";
+    }
+
+    /*! Used as header RTF general index */
+    virtual QCString trRTFGeneralIndex()
+    {
+      return "索引";
+    }
+   
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trClass(bool /*first_capital*/, bool /*singular*/)
+    { 
+      return QCString("類別");
+    }
+
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trFile(bool /*first_capital*/, bool /*singular*/)
+    { 
+      return QCString("檔案");
+    }
+
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trNamespace(bool /*first_capital*/, bool /*singular*/)
+    { 
+      return QCString("命名空間");
+    }
+
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trGroup(bool /*first_capital*/, bool /*singular*/)
+    { 
+      return QCString("群組");
+    }
+
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trPage(bool /*first_capital*/, bool /*singular*/)
+    { 
+      return QCString("頁面");
+    }
+
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trMember(bool /*first_capital*/, bool /*singular*/)
+    { 
+      return QCString("成員");
+    }
+   
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trField(bool /*first_capital*/, bool /*singular*/)
+    { 
+      return QCString("欄位");
+    }
+
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trGlobal(bool /*first_capital*/, bool /*singular*/)
+    { 
+      return QCString("全域");
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.7
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This text is generated when the \\author command is used and
+     *  for the author section in man pages. */
+    virtual QCString trAuthor(bool /*first_capital*/, bool /*singular*/)
+    {                                                                         
+      return QCString("作者");
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.11
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This text is put before the list of members referenced by a member
+     */
+    virtual QCString trReferences()
+    {
+      return "參考";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.13
+//////////////////////////////////////////////////////////////////////////
+
+    /*! used in member documentation blocks to produce a list of 
+     *  members that are implemented by this one.
+     */
+    virtual QCString trImplementedFromList(int numEntries)
+    {
+      return "實作 "+trWriteList(numEntries)+".";
+    }
+
+    /*! used in member documentation blocks to produce a list of
+     *  all members that implement this abstract member.
+     */
+    virtual QCString trImplementedInList(int numEntries)
+    {
+      return "實作於 "+trWriteList(numEntries)+".";
+    }
+
+};
+
+#endif
diff --git a/src/util.cpp b/src/util.cpp
index 66d87bf..d55b53d 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1332,9 +1332,11 @@ static bool matchArgument(const Argument *srcA,const Argument *dstA,
                    NamespaceList *usingNamespaces,
                    ClassList *usingClasses)
 {
-  //printf("match argument start %s:%s <-> %s:%s\n",
+  //printf("match argument start %s:%s <-> %s:%s using nsp=%p class=%p\n",
   //    srcA->type.data(),srcA->name.data(),
-  //    dstA->type.data(),dstA->name.data());
+  //    dstA->type.data(),dstA->name.data(),
+  //    usingNamespaces,
+  //    usingClasses);
 
   // TODO: resolve any typedefs names that are part of srcA->type
   //       before matching. This should use className and namespaceName