From 62d3c6501af58ceb48ce8e56327d07ad69e79374 Mon Sep 17 00:00:00 2001 From: dimitri Date: Tue, 30 Apr 2002 17:51:14 +0000 Subject: Release-1.2.15-20020430 --- INSTALL | 4 +- README | 4 +- VERSION | 2 +- addon/doxmlparser/include/doxmlintf.h | 2 +- addon/doxmlparser/src/compoundhandler.cpp | 6 +- addon/doxmlparser/src/compoundhandler.h | 2 + addon/doxmlparser/src/dochandler.cpp | 2 +- addon/doxmlparser/src/doxmlintf.h | 2 +- addon/doxmlparser/test/main.cpp | 3 + configure | 14 +- doc/docblocks.doc | 318 +++++-- doc/language.doc | 25 +- doc/maintainers.txt | 3 + libpng/libpng.pro.in | 1 + packages/rpm/doxygen.spec | 2 +- qtools/qtools.pro.in | 1 + src/bufstr.h | 4 +- src/code.l | 29 +- src/commentcnv.h | 26 + src/commentcnv.l | 185 ++++ src/config.l | 10 +- src/defargs.l | 27 +- src/dot.cpp | 2 +- src/doxygen.cpp | 82 +- src/doxygen.pro.in | 1 + src/doxytag.pro.in | 1 + src/filedef.cpp | 26 +- src/filedef.h | 1 + src/htmlhelp.cpp | 13 +- src/instdox.cpp | 2 +- src/lang_cfg.h | 1 + src/language.cpp | 9 + src/latexgen.cpp | 3 +- src/libdoxycfg.pro.in | 1 + src/libdoxygen.pro.in | 3 + src/libdoxygen.t | 3 + src/rtfgen.cpp | 57 ++ src/rtfgen.h | 17 +- src/scanner.l | 6 +- src/tagreader.cpp | 80 +- src/translator_jp.h | 385 ++++---- src/translator_tw.h | 1378 +++++++++++++++++++++++++++++ src/util.cpp | 6 +- 43 files changed, 2357 insertions(+), 392 deletions(-) create mode 100644 src/commentcnv.h create mode 100644 src/commentcnv.l create mode 100644 src/translator_tw.h 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 m_superClasses; @@ -147,6 +148,7 @@ class CompoundHandler : public IClass, GraphHandler *m_includeDependencyGraph; GraphHandler *m_includedByDependencyGraph; QList 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 <> .tmakeconfig <> .tmakeconfig <); 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: -
    -
  • 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: +
      +
    1. You can use the JavaDoc style, which consist of a C-style comment +block starting with two *'s, like this: + +\verbatim +/** + * ... text ... + */ +\endverbatim + +
    2. 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. + +
    3. 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 -
    4. The JavaDoc style, where special documentation blocks look like: + +
    5. + +One could also repeat the special markers for each line as shown in +the following examples: + \verbatim -/** - * ... text ... +/// +/// ... text .... +/// +\endverbatim + +or + +\verbatim +//! +//! ... text ... +//! +\endverbatim + +
    + +For the brief description there are also several posibilities: +
      +
    1. 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 + +
    2. 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 -
-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. +
  • 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. + + + +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 here + 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 \\class) 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 -(\\), or an at-sign (\@) in JavaDoc style, +(\\), or an at-sign (\@) 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:
  • \c \def to document a \#define.
  • \c \file to document a file.
  • \c \namespace to document a namespace. +
  • \c \package to document a Java package. +
  • \c \interface to document an IDL interface. -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 here - 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 \\class) 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 next 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 Status column @@ -63,6 +64,12 @@ when the translator was updated. 1.2.13 + Chinesetraditional + Gary Lee + garylee@NOSPAM.ecosine.com.tw + up-to-date + + Croatian Boris Bralo boris.bralo@NOSPAM.zg.tel.hr @@ -180,7 +187,7 @@ when the translator was updated. Slovene Matjaz Ostroversnik matjaz.ostroversnik@NOSPAM.zrs-tk.si - 1.2.13 + up-to-date Spanish @@ -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 #include #include +#include #include "qtbc.h" #include "scanner.h" @@ -1044,10 +1045,36 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned" [^\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 +#include + +#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 + +%% + +[^\"\/\n\\]* { /* eat anything that is not " / or \n */ + copyToOutput(yytext,yyleng); + } +"\"" { /* start of a string */ + copyToOutput(yytext,yyleng); + BEGIN(SkipString); + } +\n { /* new line */ + copyToOutput(yytext,yyleng); + } +("//!"|"///").*\n/[ \t]*"//" { /* start C++ style special comment block */ + copyToOutput("/*!",3); + copyToOutput(yytext+3,yyleng-3); + BEGIN(SComment); + } +"//".*\n { /* one line C++ comment */ + copyToOutput(yytext,yyleng); + } +"/*" { /* start of a C comment */ + copyToOutput(yytext,yyleng); + BEGIN(CComment); + } +"\\verbatim" { /* start of a verbatim block */ + copyToOutput(yytext,yyleng); + BEGIN(Verbatim); + } +. { /* any other character */ + copyToOutput(yytext,yyleng); + } +"\\endverbatim" { /* end of verbatim block */ + copyToOutput(yytext,yyleng); + BEGIN(Scan); + } +[^\\\n]* { /* any character not a backslash or new line */ + copyToOutput(yytext,yyleng); + } +\n { /* new line in verbatim block */ + copyToOutput(yytext,yyleng); + } +. { /* any other character */ + copyToOutput(yytext,yyleng); + } +\\. { /* escaped character in string */ + copyToOutput(yytext,yyleng); + } +"\"" { /* end of string */ + copyToOutput(yytext,yyleng); + BEGIN(Scan); + } +. { /* any other string character */ + copyToOutput(yytext,yyleng); + } +\n { /* new line inside string (illegal for some compilers) */ + copyToOutput(yytext,yyleng); + } +[^*\n]* { /* anything that is not a '*' */ + copyToOutput(yytext,yyleng); + } +"*"+[^*/\n]* { /* stars without slashes */ + copyToOutput(yytext,yyleng); + } +\n { /* new line in comment */ + copyToOutput(yytext,yyleng); + } +"*"+"/" { /* end of C comment */ + copyToOutput(yytext,yyleng); + BEGIN(Scan); + } +^[ \t]*"//".*/\n { /* second line of special comment */ + replaceCommentMarker(yytext,yyleng); + } +\n[ \t]*"//".*/\n { /* other line of special comment */ + replaceCommentMarker(yytext,yyleng); + } +\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( + "",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() : ""); 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 *killDict = new QDict(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 << " " << endl; Doxygen::tagFile << " " << convertToXML(name()) << "" << endl; Doxygen::tagFile << " " << convertToXML(getPath()) << "" << endl; - Doxygen::tagFile << " " << convertToXML(getOutputFileBase()) << htmlFileExtension << "" << endl; + Doxygen::tagFile << " " + << convertToXML(getOutputFileBase()) + << "" << 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 << " getOutputFileBase()) + << "\" local=\"" << locStr << "\">" + << convertToXML(ii->includeName) + << "" + << 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 << "
  • "; - t << "url << ".html"; + t << "url << htmlFileExtension; if (!f->anchor.isEmpty()) t << "#" << f->anchor; t << "\">"; t << "" @@ -187,7 +188,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t) if (f->link) { t << "
  • "; - t << "url << ".html\">"; + t << "url << htmlFileExtension << "\">"; t << "" "\n"; } @@ -213,7 +214,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t) if (level2Started) { t << "
  • "; - t << "url << ".html"; + t << "url << htmlFileExtension; if (!f->anchor.isEmpty()) t << "#" << f->anchor; t << "\">"; t << "" @@ -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 << ""; if (ref) // made ref optional param - KPW { - 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"<"//"|"*/" {CMD}"elseif"/[^a-z_A-Z0-9] { - // previous section enabled => absorb else + // previous section enabled => skip now + depthIf=1; + BEGIN(SkipSection); } {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 members; QStringList classList; QStringList namespaceList; + QList 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 &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 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 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(" 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(" /*! 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 ¤ÇÀ¸À®¤µ¤ì¤¿¥°¥é¥Õ¤ò¤É¤Î¤è¤¦¤Ë¤ß¤¿¤é¤è¤¤¤«¤ò" "ÀâÌÀ¤·¤Þ¤¹¡£

    \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 ¤Ë¥»¥Ã¥È¤µ¤ì¤¿" "¾ì¹ç¡¢¼¡¤Î¤è¤¦¤Ê¥°¥é¥Õ¤È¤Ê¤ê¤Þ¤¹¡£" - "

    \n" + "

    \n" "

    \n" "¾å¤Î¥°¥é¥ÕÆâ¤Î¥Ü¥Ã¥¯¥¹¤Ë¤Ï¼¡¤Î¤è¤¦¤Ê°ÕÌ£¤¬¤¢¤ê¤Þ¤¹¡£\n" "

      \n" - -"
    • ¹õ¤¯Åɤê¤Ä¤Ö¤µ¤ì¤¿¥Ü¥Ã¥¯¥¹¤Ï¡¢¤³¤Î¥°¥é¥Õ¤ËÂбþ¤¹¤ë¹½Â¤ÂΤ䥯¥é¥¹¤ò" + "
    • ¹õ¤¯Åɤê¤Ä¤Ö¤µ¤ì¤¿¥Ü¥Ã¥¯¥¹¤Ï¡¢¤³¤Î¥°¥é¥Õ¤ËÂбþ¤¹¤ë¹½Â¤ÂΤ䥯¥é¥¹¤ò" "ɽ¤·¤Þ¤¹¡£\n" "
    • ¹õÏȤΥܥ寥¹¤Ï¥É¥­¥å¥á¥ó¥È¤¬¤¢¤ë¹½Â¤ÂΤ䥯¥é¥¹¤òɽ¤·¤Þ¤¹¡£\n" - -"
    • ³¥¿§¤ÎÏȤΥܥ寥¹¤Ï¥É¥­¥å¥á¥ó¥È¤¬¤Ê¤¤¹½Â¤ÂΤ䥯¥é¥¹¤òɽ¤·¤Þ¤¹¡£\n" + "
    • ³¥¿§¤ÎÏȤΥܥ寥¹¤Ï¥É¥­¥å¥á¥ó¥È¤¬¤Ê¤¤¹½Â¤ÂΤ䥯¥é¥¹¤òɽ¤·¤Þ¤¹¡£\n" "
    • ÀÖÏȤΥܥ寥¹¤Ï¥É¥­¥å¥á¥ó¥È¤¬¤¢¤ë¹½Â¤ÂΤ䥯¥é¥¹¤òɽ¤·¤Þ¤¹¤¬¡¢" - "»ØÄꤵ¤ì¤¿¥µ¥¤¥º¤Ë¼ý¤Þ¤é¤Ê¤¤¤¿¤á¤Ë·Ñ¾µ¡¦Êñ´Þ´Ø·¸¤ò¤¹¤Ù¤Æ¿Þ¼¨¤¹¤ë" - "¤³¤È¤¬¤Ç¤­¤Ê¤«¤Ã¤¿¤³¤È¤ò¼¨¤·¤Þ¤¹¡£" + "»ØÄꤵ¤ì¤¿¥µ¥¤¥º¤Ë¼ý¤Þ¤é¤Ê¤¤¤¿¤á¤Ë·Ñ¾µ¡¦Êñ´Þ´Ø·¸¤ò¤¹¤Ù¤Æ¿Þ¼¨¤¹¤ë" + "¤³¤È¤¬¤Ç¤­¤Ê¤«¤Ã¤¿¤³¤È¤ò¼¨¤·¤Þ¤¹¡£" "
    \n" "Ìð°õ¤Ë¤Ï¼¡¤Î¤è¤¦¤Ê°ÕÌ£¤¬¤¢¤ê¤Þ¤¹¡£\n" "
      \n" @@ -1061,8 +1024,8 @@ src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\">\n" "
    • ÎФÎÌð°õ¤Ï protected ·Ñ¾µ´Ø·¸¤ò¼¨¤·¤Þ¤¹¡£\n" "
    • ÀÖ¤ÎÌð°õ¤Ï private ·Ñ¾µ´Ø·¸¤ò¼¨¤·¤Þ¤¹¡£\n" "
    • »ç¤ÎÇËÀþÌð°õ¤Ï¡¢¤½¤Î¥¯¥é¥¹¤¬Â¾¤Î¥¯¥é¥¹¤Ë´Þ¤Þ¤ì¤Æ¤¤¤¿¤ê¡¢" - "ÍøÍѤµ¤ì¤Æ¤¤¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£¤Þ¤¿¡¢Ìð°õ¤¬»Ø¤·¤Æ¤¤¤ë¥¯¥é¥¹¤ä¹½Â¤ÂΤò" - "¤É¤ÎÊÑ¿ô¤Ç¥¢¥¯¥»¥¹¤Ç¤­¤ë¤«¤òÌð°õ¤Î¥é¥Ù¥ë¤È¤·¤Æ¼¨¤·¤Æ¤¤¤Þ¤¹¡£\n" + "ÍøÍѤµ¤ì¤Æ¤¤¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£¤Þ¤¿¡¢Ìð°õ¤¬»Ø¤·¤Æ¤¤¤ë¥¯¥é¥¹¤ä¹½Â¤ÂΤò" + "¤É¤ÎÊÑ¿ô¤Ç¥¢¥¯¥»¥¹¤Ç¤­¤ë¤«¤òÌð°õ¤Î¥é¥Ù¥ë¤È¤·¤Æ¼¨¤·¤Æ¤¤¤Þ¤¹¡£\n" "
    \n"); } /*! text for the link to the legend page */ @@ -1093,7 +1056,7 @@ src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\">\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")+"\">\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")+"\">\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 * 
          * 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 
+     *  
    "\\usepackage[german]{babel}\n"
+     *  
    
+     *  or
+     *  
    "\\usepackage{polski}\n"
+     *  "\\usepackage[latin2]{inputenc}\n"
+     *  "\\usepackage[T1]{fontenc}\n"
+     *  
    
+     * 
+     * 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 "(µù¡G³o¨Ç¤£¬O¦¨­û¨ç¦¡)"; }
+
+    /*! header that is put before the detailed description of files, classes and namespaces. */
+    virtual QCString trDetailedDescription()
+    { return "¸Ô²Ó´y­z"; }
+
+    /*! header that is put before the list of typedefs. */
+    virtual QCString trMemberTypedefDocumentation()
+    { return "«¬ºA©w¸q¦¨­û»¡©ú¤å¥ó"; }
+    
+    /*! header that is put before the list of enumerations. */
+    virtual QCString trMemberEnumerationDocumentation()
+    { return "¦CÁ|«¬ºA¦¨­û»¡©ú¤å¥ó"; }
+    
+    /*! 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 "§ó¦h..."; }
+
+    /*! put in the class documentation */
+    virtual QCString trListOfAllMembers()
+    { return "¥þ³¡¦¨­û¦Cªí"; }
+
+    /*! used as the title of the "list of all members" page of a class */
+    virtual QCString trMemberList()
+    { return "¦¨­û¦Cªí"; }
+
+    /*! this is the first part of a sentence that is followed by a class name */
+    virtual QCString trThisIsTheListOfAllMembers()
+    { return "§¹¾ã¦¨­û¦Cªí¡AÃþ§O¬°"; }
+
+    /*! this is the remainder of the sentence after the class name */
+    virtual QCString trIncludingInheritedMembers()
+    { return ", ¥]§t©Ò¦³Ä~©Óªº¦¨­û"; }
+    
+    /*! 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+=" ªº­ì©l½X¤¤¦Û°Ê²£¥Í."; 
+      return result;
+    }
+
+    /*! put after an enum name in the list of all members */
+    virtual QCString trEnumName()
+    { return "¦CÁ|«¬ºA¦WºÙ"; }
+    
+    /*! put after an enum value in the list of all members */
+    virtual QCString trEnumValue()
+    { return "¦CÁ|­È"; }
+    
+    /*! put after an undocumented member in the list of all members */
+    virtual QCString trDefinedIn()
+    { return "³Q©w¸q©ó"; }
+
+    // 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 "Ãþ§O¶¥¼h"; }
+    
+    /*! 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 "¸ê®Æµ²ºc";
+      }
+      else
+      {
+        return "½Æ¦X¦Cªí"; 
+      }
+    }
+    
+    /*! This is put above each page as a link to the list of documented files */
+    virtual QCString trFileList()
+    { return "ÀɮצCªí"; }
+
+    /*! This is put above each page as a link to the list of all verbatim headers */
+    virtual QCString trHeaderFiles()
+    { return "¼ÐÀYÀÉ®×"; }
+
+    /*! 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 "½Æ¦X¦¨­û"; 
+      }
+    }
+
+    /*! 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 "½d¨Ò"; }
+
+    /*! This is put above each page as a link to the search engine. */
+    virtual QCString trSearch()
+    { return "·j´M"; }
+
+    /*! This is an introduction to the class hierarchy. */
+    virtual QCString trClassHierarchyDescription()
+    { return "³o­ÓÄ~©Ó¦Cªí¸g¹L²²¤ªº¦r¥À±Æ§Ç: ";
+    }
+
+    /*! This is an introduction to the list with all files. */
+    virtual QCString trFileListDescription(bool extractAll)
+    {
+      QCString result="³o¬Oªþ±a²²¤»¡©ú";
+      if (!extractAll) result+="¥B¸g¹L¤å¥ó¤Æ";
+      result+="ªºÀɮצCªí:";
+      return result;
+    }
+
+    /*! This is an introduction to the annotated compound list. */
+    virtual QCString trCompoundListDescription()
+    { 
+      
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "³o¬Oªþ±a²²¤»¡©úªº¸ê®Æµ²ºc:"; 
+      }
+      else
+      {
+        return "³o¬Oªþ±a²²¤»¡©úªºÃþ§O¡Aµ²ºc¡A"
+               "Áp¦X«¬ºA(unions)¤Î¤¶­±(interfaces):"; 
+      }
+    }
+
+    /*! This is an introduction to the page with all class members. */
+    virtual QCString trCompoundMembersDescription(bool extractAll)
+    {
+      QCString result="³o¬O¥þ³¡";
+      if (!extractAll)
+      {
+        result+="¤å¥ó¤Æ¹L";
+      }
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        result+="µ²ºc¤ÎÁp¦X«¬ºAÄæ¦ì";
+      }
+      else
+      {
+        result+="Ãþ§O¦¨­û";
+      }
+      result+=", ¨Ã¥B±a¦³³sµ²¦Ü";
+      if (extractAll) 
+      {
+        if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+        {
+          result+="¨C­ÓÄæ¦ìªºµ²ºc/Áp¦X«¬ºA»¡©ú¤å¥ó:";
+        }
+        else
+        {
+          result+="¨C­Ó¦¨­ûªºÃþ§O»¡©ú¤å¥ó:";
+        }
+      }
+      else 
+      {
+        if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+        {
+          result+="³o¨Çµ²ºc/Áp¦X«¬ºA¬OÄÝ©ó:";
+        }
+        else
+        {
+          result+="³o¨ÇÃþ§O¬OÄÝ©ó:";
+        }
+      }
+      return result;
+    }
+
+    /*! This is an introduction to the page with all file members. */
+    virtual QCString trFileMembersDescription(bool extractAll)
+    {
+      QCString result="³o¬O¥þ³¡";
+      if (!extractAll) result+="¤å¥ó¤Æªº";
+      
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        result+="¨ç¦¡¡AÅܼơA©w¸q¡A¦CÁ|¡A¤Î«¬ºA©w¸q";
+      }
+      else
+      {
+        result+="Àɮצ¨­û";
+      }
+      result+="¡A¨Ã¥B±a¦³³sµ²¦Ü";
+      if (extractAll) 
+        result+="³o¨ÇÀɮשÒÄÝ:";
+      else 
+        result+="»¡©ú¤å¥ó:";
+      return result;
+    }
+
+    /*! This is an introduction to the page with the list of all header files. */
+    virtual QCString trHeaderFilesDescription()
+    { return "²Õ¦¨APIªº¼ÐÀYÀÉ:"; }
+
+    /*! This is an introduction to the page with the list of all examples */
+    virtual QCString trExamplesDescription()
+    { return "©Ò¦³½d¨Ò¦Cªí:"; }
+
+    /*! This is an introduction to the page with the list of related pages */
+    virtual QCString trRelatedPagesDescription()
+    { return "©Ò¦³¬ÛÃö¤å¥ó­¶­±¦Cªí:"; }
+
+    /*! This is an introduction to the page with the list of class/file groups */
+    virtual QCString trModulesDescription()
+    { return "©Ò¦³¼Ò²Õ¦Cªí:"; }
+
+    /*! This sentences is used in the annotated class/file lists if no brief
+     * description is given. 
+     */
+    virtual QCString trNoDescriptionAvailable()
+    { return "¨S¦³¥i¥Îªº»¡©ú´y­z"; }
+    
+    // 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 "¶¥¼h¯Á¤Þ"; }
+
+    /*! 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 "¸ê®Æµ²ºc¯Á¤Þ";
+      }
+      else
+      {
+        return "½Æ¦X¯Á¤Þ"; 
+      }
+    }
+
+    /*! 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 "¸ê®Æµ²ºc»¡©ú¤å¥ó"; 
+      }
+      else
+      {
+        return "Ãþ§O»¡©ú¤å¥ó"; 
+      }
+    }
+
+    /*! 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 "½d¨Ò»¡©ú¤å¥ó"; }
+
+    /*! 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 "°Ñ¦Ò¤â¥U"; }
+    
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of defines
+     */
+    virtual QCString trDefines()
+    { return "©w¸q"; }
+
+    /*! 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 "«¬ºA©w¸q"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of enumerations
+     */
+    virtual QCString trEnumerations()
+    { return "¦CÁ|«¬ºA"; }
+
+    /*! 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 "¦CÁ|­È"; }
+    
+    /*! This is used in the documentation of a file before the list of
+     *  documentation blocks for defines
+     */
+    virtual QCString trDefineDocumentation()
+    { return "©w¸q¥¨¶°»¡©ú¤å¥ó"; }
+
+    /*! 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 "«¬ºA©w¸q»¡©ú¤å¥ó"; }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for enumeration types
+     */
+    virtual QCString trEnumerationTypeDocumentation()
+    { return "¦CÁ|«¬ºA»¡©ú¤å¥ó"; }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for enumeration values
+     */
+    virtual QCString trEnumerationValueDocumentation()
+    { return "¦CÁ|­È»¡©ú¤å¥ó"; }
+
+    /*! 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 "¸ê®Æµ²ºc"; 
+      }
+      else
+      {
+        return "½Æ¦X¶µ¥Ø"; 
+      }
+    }
+
+    /*! 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)", ±M®×:"+projName;
+      result+=(QCString)", ²£¥Í¾¹:";
+      return result;
+    }
+    /*! This is part of the sentence used in the standard footer of each page.
+     */
+    virtual QCString trWrittenBy()
+    {
+      return "¼¶¼g¤H:";
+    }
+
+    /*! this text is put before a class diagram */
+    virtual QCString trClassDiagram(const char *clName)
+    {
+      return (QCString)"Ãþ§O"+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 "¦]¤º³¡­ì¦]­«·s¹ê§@; ¤£¼vÅTAPI."; }
+
+    /*! this text is generated when the \\warning command is used. */
+    virtual QCString trWarning()
+    { return "ĵ§i"; }
+
+    /*! 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 "©R¦WªÅ¶¡(name space)¦Cªí"; }
+
+    /*! used as an introduction to the namespace list */
+    virtual QCString trNamespaceListDescription(bool extractAll)
+    {
+      QCString result="³o¬O©Ò¦³ªþ±a²²¤»¡©úªº";
+      if (!extractAll) result+="¤å¥ó¤Æªº";
+      result+="©R¦WªÅ¶¡(namespaces):";
+      return result;
+    }
+
+    /*! used in the class documentation as a header before the list of all
+     *  friends of a class
+     */
+    virtual QCString trFriends()
+    { return "Ãþ§OªB¤Í(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 "Ãþ§OªB¤Í¤Î¬ÛÃö¨ç¦¡»¡©ú¤å¥ó"; }
+    
+//////////////////////////////////////////////////////////////////////////
+// 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+=" Ãþ§O"; break;
+        case ClassDef::Struct:     result+=" µ²ºc"; break;
+        case ClassDef::Union:      result+=" Áp¦X"; 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+=" ©R¦WªÅ¶¡(Namespace)°Ñ¦Ò¤å¥ó";
+      return result;
+    }
+    
+    virtual QCString trPublicMembers()
+    { return "¤½¶}¤èªk(Public Methods)"; }
+    virtual QCString trPublicSlots()
+    { return "¤½¶}´¡¼Ñ(Public Slots)"; }
+    virtual QCString trSignals()
+    { return "°T¸¹(Signals)"; }
+    virtual QCString trStaticPublicMembers()
+    { return "ÀRºA¤½¶}¤èªk(Static Public Methods)"; }
+    virtual QCString trProtectedMembers()
+    { return "«OÅ@¤èªk(Protected Methods)"; }
+    virtual QCString trProtectedSlots()
+    { return "«OÅ@´¡¼Ñ(Protected Slots)"; }
+    virtual QCString trStaticProtectedMembers()
+    { return "ÀRºA«OÅ@¤èªk(Static Protected Methods)"; }
+    virtual QCString trPrivateMembers()
+    { return "¨p¦³¤èªk(Private Methods)"; }
+    virtual QCString trPrivateSlots()
+    { return "¨p¦³´¡¼Ñ(Private Slots)"; }
+    virtual QCString trStaticPrivateMembers()
+    { return "ÀRºA¨p¦³¤èªk(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