diff options
Diffstat (limited to 'src')
140 files changed, 715 insertions, 495 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 9ce2734..e791c61 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -2,7 +2,7 @@ # # # -# Copyright (C) 1997-2001 by Dimitri van Heesch. +# 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 diff --git a/src/bufstr.h b/src/bufstr.h index b771c03..9281d3e 100644 --- a/src/bufstr.h +++ b/src/bufstr.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/classdef.cpp b/src/classdef.cpp index 762f8aa..5ea540f 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -179,6 +179,18 @@ void ClassDef::addMembersToMemberGroup() ::addMembersToMemberGroup(&friends,memberGroupSDict,this); ::addMembersToMemberGroup(&related,memberGroupSDict,this); ::addMembersToMemberGroup(&properties,memberGroupSDict,this); + + // add members inside sections to their groups + MemberGroupSDict::Iterator mgli(*memberGroupSDict); + MemberGroup *mg; + for (;(mg=mgli.current());++mgli) + { + if (mg->allMembersInSameSection() && m_subGrouping) + { + //printf("addToDeclarationSection(%s)\n",mg->header().data()); + mg->addToDeclarationSection(); + } + } } // adds new member definition to the class @@ -722,7 +734,7 @@ void ClassDef::writeDocumentation(OutputList &ol) } ol.writeSynopsis(); - if (m_incInfo) + if (m_incInfo && Config_getBool("SHOW_INCLUDE_FILES")) { QCString nm=m_incInfo->includeName.isEmpty() ? (m_incInfo->fileDef ? @@ -992,7 +1004,7 @@ void ClassDef::writeDocumentation(OutputList &ol) else // add this group to the corresponding member section { //printf("addToDeclarationSection(%s)\n",mg->header().data()); - mg->addToDeclarationSection(); + //mg->addToDeclarationSection(); } } @@ -1299,8 +1311,10 @@ void ClassDef::writeMemberList(OutputList &ol) ol.writeString("</td>"); memberWritten=TRUE; } - else if (!Config_getBool("HIDE_UNDOC_MEMBERS")) // no documentation, - // generate link to the class instead. + else if (!Config_getBool("HIDE_UNDOC_MEMBERS") && + (md->protection()!=Private || Config_getBool("EXTRACT_PRIVATE") || md->isFriend()) + ) // no documentation, + // generate link to the class instead. { //ol.writeListItem(); ol.writeString(" <tr bgcolor=\"#f0f0f0\"><td>"); diff --git a/src/classdef.h b/src/classdef.h index 507a915..360b98d 100644 --- a/src/classdef.h +++ b/src/classdef.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/classlist.cpp b/src/classlist.cpp index c78a3f5..f28281c 100644 --- a/src/classlist.cpp +++ b/src/classlist.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/classlist.h b/src/classlist.h index 23c247e..877fa03 100644 --- a/src/classlist.h +++ b/src/classlist.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -646,11 +646,15 @@ static void generateClassOrGlobalLink(OutputDocInterface &ol,char *clName,int *c writeMultiLineCodeLink(ol,d->getReference(),d->getOutputFileBase(),md->getBodyAnchor(),clName); if (g_currentMemberDef) { - if (Config_getBool("REFERENCED_BY_RELATION") && g_currentMemberDef->isFunction()) + if (Config_getBool("REFERENCED_BY_RELATION") && + (g_currentMemberDef->isFunction() || g_currentMemberDef->isSlot()) + ) { md->addSourceReferencedBy(g_currentMemberDef); } - if (Config_getBool("REFERENCES_RELATION") && g_currentMemberDef->isFunction()) + if (Config_getBool("REFERENCES_RELATION") && + (g_currentMemberDef->isFunction() || g_currentMemberDef->isSlot()) + ) { g_currentMemberDef->addSourceReferences(md); } @@ -710,11 +714,15 @@ static bool getLink(const char *className, if (g_currentDefinition && g_currentMemberDef && md!=g_currentMemberDef && g_insideBody) { - if (Config_getBool("REFERENCED_BY_RELATION") && g_currentMemberDef->isFunction()) + if (Config_getBool("REFERENCED_BY_RELATION") && + (g_currentMemberDef->isFunction() || g_currentMemberDef->isSlot()) + ) { md->addSourceReferencedBy(g_currentMemberDef); } - if (Config_getBool("REFERENCES_RELATION") && g_currentMemberDef->isFunction()) + if (Config_getBool("REFERENCES_RELATION") && + (g_currentMemberDef->isFunction() || g_currentMemberDef->isSlot()) + ) { g_currentMemberDef->addSourceReferences(md); } diff --git a/src/config.l b/src/config.l index 466f1d1..cce57b9 100644 --- a/src/config.l +++ b/src/config.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -31,7 +31,6 @@ #include <qstack.h> #include "config.h" -#include "lang_cfg.h" #include "version.h" #undef Config_getString @@ -1045,6 +1044,7 @@ void Config::check() filePatternList.append("*.hpp"); filePatternList.append("*.h++"); filePatternList.append("*.idl"); + filePatternList.append("*.odl"); } // add default pattern if needed @@ -1602,8 +1602,8 @@ void Config::create() "FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp \n" "and *.h) to filter out the source-files in the directories. If left \n" "blank the following patterns are tested: \n" - "*.c *.cc *.cxx *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp \n" - "*.h++ *.idl \n" + "*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp \n" + "*.h++ *.idl *.odl\n" ); cb = addBool( "RECURSIVE", @@ -1618,6 +1618,12 @@ void Config::create() "excluded from the INPUT source files. This way you can easily exclude a \n" "subdirectory from a directory tree whose root is specified with the INPUT tag. \n" ); + cb = addBool( + "EXCLUDE_SYMLINKS", + "The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories \n" + "that are symbolic links (a Unix filesystem feature) are excluded from the input. \n", + FALSE + ); cl->setWidgetType(ConfigList::FileAndDir); cl = addList( "EXCLUDE_PATTERNS", @@ -2134,6 +2140,13 @@ void Config::create() "will be listed. \n", FALSE ); + cb = addBool( + "EXTERNAL_GROUPS", + "If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed \n" + "in the modules index. If set to NO, only the current project's groups will \n" + "be listed. \n", + TRUE + ); cs = addString( "PERL_PATH", "The PERL_PATH should be the absolute path and name of the perl script \n" diff --git a/src/constexp.h b/src/constexp.h index 6f230f9..818dbaf 100644 --- a/src/constexp.h +++ b/src/constexp.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/constexp.l b/src/constexp.l index a1bf69e..0135e3a 100644 --- a/src/constexp.l +++ b/src/constexp.l @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/cppvalue.cpp b/src/cppvalue.cpp index 55373a8..642ae2d 100644 --- a/src/cppvalue.cpp +++ b/src/cppvalue.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/cppvalue.h b/src/cppvalue.h index def31c9..e216bda 100644 --- a/src/cppvalue.h +++ b/src/cppvalue.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/debug.cpp b/src/debug.cpp index 6ec6d7c..4afbfb1 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/debug.h b/src/debug.h index 9fbced0..b78b98f 100644 --- a/src/debug.h +++ b/src/debug.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/declinfo.h b/src/declinfo.h index 0b183d7..f6fa2c5 100644 --- a/src/declinfo.h +++ b/src/declinfo.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/declinfo.l b/src/declinfo.l index d06f824..ddcde3c 100644 --- a/src/declinfo.l +++ b/src/declinfo.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/defargs.h b/src/defargs.h index 7bfae61..d1452cb 100644 --- a/src/defargs.h +++ b/src/defargs.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/defargs.l b/src/defargs.l index c238123..d736369 100644 --- a/src/defargs.l +++ b/src/defargs.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/defgen.cpp b/src/defgen.cpp index 5620d9c..c0cfa23 100644 --- a/src/defgen.cpp +++ b/src/defgen.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/defgen.h b/src/defgen.h index 7fd7641..2348342 100644 --- a/src/defgen.h +++ b/src/defgen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/define.cpp b/src/define.cpp index f010a9b..f3148b0 100644 --- a/src/define.cpp +++ b/src/define.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/define.h b/src/define.h index 2715450..5f2a413 100644 --- a/src/define.h +++ b/src/define.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/definition.cpp b/src/definition.cpp index 1125569..3942edf 100644 --- a/src/definition.cpp +++ b/src/definition.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -416,7 +416,7 @@ void Definition::writeSourceRefList(OutputList &ol,const char *scopeName, { ol.docify(name); } - if (md->isFunction()) ol.docify("()"); + if (md->isFunction() && md->isSlot()) ol.docify("()"); } index=newIndex+matchLen; } diff --git a/src/definition.h b/src/definition.h index fed4c52..6f384e9 100644 --- a/src/definition.h +++ b/src/definition.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/diagram.cpp b/src/diagram.cpp index 9b82bd4..e04719c 100644 --- a/src/diagram.cpp +++ b/src/diagram.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/diagram.h b/src/diagram.h index 7b8182e..1dddd96 100644 --- a/src/diagram.h +++ b/src/diagram.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/dot.cpp b/src/dot.cpp index 5f1b080..7cefcda 100644 --- a/src/dot.cpp +++ b/src/dot.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 11c43b7..a4ff869 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -5221,6 +5221,7 @@ static void buildPageList(Entry *root) { if (root->section == Entry::PAGEDOC_SEC) { + //printf("buildPageList %s\n",root->name.data()); if (!root->name.isEmpty()) { addRelatedPage(root); @@ -6038,6 +6039,7 @@ static int readDir(QFileInfo *fi, err("Error: source %s is not a readable file or directory... skipping.\n",cfi->absFilePath().data()); } else if (cfi->isFile() && + (!Config_getBool("EXCLUDE_SYMLINKS") || !cfi->isSymLink()) && (patList==0 || patternMatch(cfi,patList)) && !patternMatch(cfi,exclPatList)) { @@ -6069,6 +6071,7 @@ static int readDir(QFileInfo *fi, if (resultDict) resultDict->insert(cfi->absFilePath(),rs); } else if (recursive && + (!Config_getBool("EXCLUDE_SYMLINKS") || !cfi->isSymLink()) && cfi->isDir() && cfi->fileName()!="." && cfi->fileName()!="..") { @@ -6150,40 +6153,45 @@ static int readFileOrDirectory(const char *s, { err("Error: source %s is not a readable file or directory... skipping.\n",s); } - else if (fi.isFile()) + else if (!Config_getBool("EXCLUDE_SYMLINKS") || !fi.isSymLink()) { - totalSize+=fi.size()+fi.absFilePath().length()+4; //readFile(&fi,fiList,input); - //fiList->inSort(new FileInfo(fi)); - QCString name=convertToQCString(fi.fileName()); - //printf("New file %s\n",name.data()); - if (fnDict) + if (fi.isFile()) { - FileDef *fd=new FileDef(fi.dirPath(TRUE)+"/",name); - FileName *fn=0; - if (!name.isEmpty() && (fn=(*fnDict)[name])) + totalSize+=fi.size()+fi.absFilePath().length()+4; //readFile(&fi,fiList,input); + //fiList->inSort(new FileInfo(fi)); + QCString name=convertToQCString(fi.fileName()); + //printf("New file %s\n",name.data()); + if (fnDict) { - fn->append(fd); + FileDef *fd=new FileDef(fi.dirPath(TRUE)+"/",name); + FileName *fn=0; + if (!name.isEmpty() && (fn=(*fnDict)[name])) + { + fn->append(fd); + } + else + { + fn = new FileName(fi.absFilePath(),name); + fn->append(fd); + if (fnList) fnList->inSort(fn); + fnDict->insert(name,fn); + } } - else + QCString *rs=0; + if (resultList || resultDict) { - fn = new FileName(fi.absFilePath(),name); - fn->append(fd); - if (fnList) fnList->inSort(fn); - fnDict->insert(name,fn); + rs=new QCString(fi.absFilePath()); } + if (resultList) resultList->append(rs); + if (resultDict) resultDict->insert(fi.absFilePath(),rs); } - QCString *rs=0; - if (resultList || resultDict) + else if (fi.isDir()) // readable dir { - rs=new QCString(fi.absFilePath()); + totalSize+=readDir(&fi,fnList,fnDict,exclDict,patList, + exclPatList,resultList,resultDict,errorIfNotExist, + recursive); } - if (resultList) resultList->append(rs); - if (resultDict) resultDict->insert(fi.absFilePath(),rs); } - else if (fi.isDir()) // readable dir - totalSize+=readDir(&fi,fnList,fnDict,exclDict,patList, - exclPatList,resultList,resultDict,errorIfNotExist, - recursive); } } return totalSize; @@ -6226,7 +6234,7 @@ static void readFormulaRepository() static void usage(const char *name) { - msg("Doxygen version %s\nCopyright Dimitri van Heesch 1997-2001\n\n",versionString); + msg("Doxygen version %s\nCopyright Dimitri van Heesch 1997-2002\n\n",versionString); msg("You can use doxygen in a number of ways:\n\n"); msg("1) Use doxygen to generate a template configuration file:\n"); msg(" %s [-s] -g [configName]\n\n",name); diff --git a/src/doxygen.h b/src/doxygen.h index af3d208..3357c7d 100644 --- a/src/doxygen.h +++ b/src/doxygen.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in index 30e8ace..0e63924 100644 --- a/src/doxygen.pro.in +++ b/src/doxygen.pro.in @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2001 by Dimitri van Heesch. +# 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 diff --git a/src/doxysearch.cpp b/src/doxysearch.cpp index 90ac247..4ec3ae7 100644 --- a/src/doxysearch.cpp +++ b/src/doxysearch.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/doxytag.l b/src/doxytag.l index 1afe949..288c945 100644 --- a/src/doxytag.l +++ b/src/doxytag.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -505,7 +505,7 @@ void parseFileOrDir(const char *fileName) void usage(const char *name) { - fprintf(stderr,"Doxytag version %s\nCopyright Dimitri van Heesch 1997-2001\n\n", + fprintf(stderr,"Doxytag version %s\nCopyright Dimitri van Heesch 1997-2002\n\n", versionString); fprintf(stderr," Generates a tag file and/or a search index for a set of HTML files\n\n"); fprintf(stderr,"Usage: %s [-t tag_file] [-s index_file] [ html_file [html_file...] ]\n",name); diff --git a/src/entry.cpp b/src/entry.cpp index 26113aa..848ece9 100644 --- a/src/entry.cpp +++ b/src/entry.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/entry.h b/src/entry.h index 08ed956..3e52b82 100644 --- a/src/entry.h +++ b/src/entry.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/example.h b/src/example.h index 4c0ab15..81a1b21 100644 --- a/src/example.h +++ b/src/example.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/filedef.cpp b/src/filedef.cpp index 144f8c6..d2a2a84 100644 --- a/src/filedef.cpp +++ b/src/filedef.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/filedef.h b/src/filedef.h index fc0bdb7..52be3f6 100644 --- a/src/filedef.h +++ b/src/filedef.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/filename.cpp b/src/filename.cpp index 7a8cdf8..9b7e5b2 100644 --- a/src/filename.cpp +++ b/src/filename.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/filename.h b/src/filename.h index 15d5334..0a0a7a5 100644 --- a/src/filename.h +++ b/src/filename.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/formula.cpp b/src/formula.cpp index 96d2137..32e16ba 100644 --- a/src/formula.cpp +++ b/src/formula.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/formula.h b/src/formula.h index 2c2fd51..f703ee9 100644 --- a/src/formula.h +++ b/src/formula.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/gifenc.cpp b/src/gifenc.cpp index cdc1481..6a06465 100644 --- a/src/gifenc.cpp +++ b/src/gifenc.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/gifenc.h b/src/gifenc.h index 2ec1d7b..cfeacae 100644 --- a/src/gifenc.h +++ b/src/gifenc.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/groupdef.cpp b/src/groupdef.cpp index 2886f73..67408a3 100644 --- a/src/groupdef.cpp +++ b/src/groupdef.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/groupdef.h b/src/groupdef.h index a9402b0..a7d81d5 100644 --- a/src/groupdef.h +++ b/src/groupdef.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index 97752a2..6d7982a 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -31,36 +31,68 @@ #include "language.h" #include "htmlhelp.h" -#define GROUP_COLOR "#ff8080" +// #define GROUP_COLOR "#ff8080" //#define DBG_HTML(x) x; #define DBG_HTML(x) + +/* + changed default stylesheet, startIndexKey(), startIndexValue() + 02 jan 2002, jh +*/ + static const char *defaultStyleSheet = - "H1 { text-align: center; }\n" - "CAPTION { font-weight: bold }\n" - "A.qindex {}\n" - "A.qindexRef {}\n" - "A.el { text-decoration: none; font-weight: bold }\n" - "A.elRef { font-weight: bold }\n" - "A.code { text-decoration: none; font-weight: normal; color: #4444ee }\n" - "A.codeRef { font-weight: normal; color: #4444ee }\n" - "A:hover { text-decoration: none; background-color: #f2f2ff }\n" - "DL.el { margin-left: -1cm }\n" - "DIV.fragment { width: 100%; border: none; background-color: #eeeeee }\n" - "DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px }\n" - "TD.md { background-color: #f2f2ff; font-weight: bold; }\n" - "TD.mdname1 { background-color: #f2f2ff; font-weight: bold; color: #602020; }\n" - "TD.mdname { background-color: #f2f2ff; font-weight: bold; color: #602020; width: 600px; }\n" - "DIV.groupHeader { margin-left: 16px; margin-top: 12px; margin-bottom: 6px; font-weight: bold }\n" - "DIV.groupText { margin-left: 16px; font-style: italic; font-size: smaller }\n" - "FONT.keyword { color: #008000 }\n" - "FONT.keywordtype { color: #604020 }\n" - "FONT.keywordflow { color: #e08000 }\n" - "FONT.comment { color: #800000 }\n" - "FONT.preprocessor { color: #806020 }\n" - "FONT.stringliteral { color: #002080 }\n" - "FONT.charliteral { color: #008080 }\n"; +"H1 { text-align: center; }\n" +"CAPTION { font-weight: bold }\n" +"A.qindex {}\n" +"A.qindexRef {}\n" +"A.el { text-decoration: none; font-weight: bold }\n" +"A.elRef { font-weight: bold }\n" +"A.code { text-decoration: none; font-weight: normal; color: #4444ee }\n" +"A.codeRef { font-weight: normal; color: #4444ee }\n" +"A:hover { text-decoration: none; background-color: #f2f2ff }\n" +"DL.el { margin-left: -1cm }\n" +"DIV.fragment { width: 100%; border: none; background-color: #eeeeee }\n" +"DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px }\n" +"TD.md { background-color: #f2f2ff; font-weight: bold; }\n" +"TD.mdname1 { background-color: #f2f2ff; font-weight: bold; color: #602020; }\n" +"TD.mdname { background-color: #f2f2ff; font-weight: bold; color: #602020; width: 600px; }\n" +"DIV.groupHeader { margin-left: 16px; margin-top: 12px; margin-bottom: 6px; font-weight: bold }\n" +"DIV.groupText { margin-left: 16px; font-style: italic; font-size: smaller }\n" +"BODY { background: white }\n" +"TD.indexkey { \n" +" background-color: #eeeeff; \n" +" font-weight: bold; \n" +" padding-right : 10px; \n" +" padding-top : 2px; \n" +" padding-left : 10px; \n" +" padding-bottom : 2px; \n" +" margin-left : 0px; \n" +" margin-right : 0px; \n" +" margin-top : 2px; \n" +" margin-bottom : 2px \n" +"}\n" +"TD.indexvalue { \n" +" background-color: #eeeeff; \n" +" font-style: italic; \n" +" padding-right : 10px; \n" +" padding-top : 2px; \n" +" padding-left : 10px; \n" +" padding-bottom : 2px; \n" +" margin-left : 0px; \n" +" margin-right : 0px; \n" +" margin-top : 2px; \n" +" margin-bottom : 2px \n" +"}\n" +"FONT.keyword { color: #008000 }\n" +"FONT.keywordtype { color: #604020 }\n" +"FONT.keywordflow { color: #e08000 }\n" +"FONT.comment { color: #800000 }\n" +"FONT.preprocessor { color: #806020 }\n" +"FONT.stringliteral { color: #002080 }\n" +"FONT.charliteral { color: #008080 }\n"; + static QCString g_header; static QCString g_footer; @@ -131,7 +163,7 @@ static void writeDefaultHeaderFile(QTextStream &t,const char *title, t << cssfi.fileName(); } t << "\" rel=\"stylesheet\" type=\"text/css\">\n" - "</head><body bgcolor=\"#ffffff\">\n"; + "</head><body>\n"; } @@ -154,7 +186,7 @@ void HtmlGenerator::writeFooterFile(QFile &file) << "align=\"middle\" border=0 width=110 height=53>\n" << "</a> $doxygenversion " << theTranslator->trWrittenBy() << " <a href=\"mailto:dimitri@stack.nl\">Dimitri van Heesch</a>,\n" - << " © 1997-2001</small></address>\n" + << " © 1997-2002</small></address>\n" << "</body>\n" << "</html>\n"; } @@ -247,7 +279,7 @@ void HtmlGenerator::writeFooter(int part,bool external) default: if (g_footer.isEmpty()) t << " <a href=\"mailto:dimitri@stack.nl\">Dimitri van Heesch</a>,\n © " - "1997-2001</small></address>\n</body>\n</html>\n"; + "1997-2002</small></address>\n</body>\n</html>\n"; break; } @@ -614,7 +646,7 @@ void HtmlGenerator::startClassDiagram() void HtmlGenerator::endClassDiagram(ClassDiagram &d, const char *fileName,const char *name) { - t << ":\n<p><center><img src=\"" + t << "\n<p><center><img src=\"" << fileName << ".gif\" usemap=\"#" << name << "_map\"" << " border=\"0\"></center>" << endl << "<map name=\"" << name << "_map\">" << endl; @@ -812,7 +844,8 @@ void HtmlGenerator::endIndexList() void HtmlGenerator::startIndexKey() { - t << " <tr bgcolor=\"#f0f0f0\"><td>"; + // inserted 'class = ...', 02 jan 2002, jh + t << " <tr><td class=\"indexkey\">"; } void HtmlGenerator::endIndexKey() @@ -822,7 +855,8 @@ void HtmlGenerator::endIndexKey() void HtmlGenerator::startIndexValue(bool) { - t << "<td>"; + // inserted 'class = ...', 02 jan 2002, jh + t << "<td class=\"indexvalue\">"; } void HtmlGenerator::endIndexValue(const char *,bool) diff --git a/src/htmlgen.h b/src/htmlgen.h index 33ff992..9f9d216 100644 --- a/src/htmlgen.h +++ b/src/htmlgen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp index ee2863c..fce5ec8 100644 --- a/src/htmlhelp.cpp +++ b/src/htmlhelp.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/htmlhelp.h b/src/htmlhelp.h index 319e25d..3e85494 100644 --- a/src/htmlhelp.h +++ b/src/htmlhelp.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/image.cpp b/src/image.cpp index bbbcfc8..ba66438 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/image.h b/src/image.h index 8cd1e65..f5efe91 100644 --- a/src/image.h +++ b/src/image.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/index.cpp b/src/index.cpp index 02c8f92..aab89db 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/index.h b/src/index.h index 412dffe..383b5dd 100644 --- a/src/index.h +++ b/src/index.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/instdox.cpp b/src/instdox.cpp index 56ab915..3e480dc 100644 --- a/src/instdox.cpp +++ b/src/instdox.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/instdox.h b/src/instdox.h index 179b1db..a6b2a73 100644 --- a/src/instdox.h +++ b/src/instdox.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/language.cpp b/src/language.cpp index 5f27716..06c3d11 100644 --- a/src/language.cpp +++ b/src/language.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/language.h b/src/language.h index 11840cb..9c5ffc9 100644 --- a/src/language.h +++ b/src/language.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/latexgen.cpp b/src/latexgen.cpp index 49469de..85a9bdf 100644 --- a/src/latexgen.cpp +++ b/src/latexgen.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -408,11 +408,11 @@ void LatexGenerator::writeStyleSheetFile(QFile &f) t << theTranslator->trGeneratedAt( dateToString(TRUE), projectName ); t << " doxygen " << theTranslator->trWrittenBy() << " "; - t << "Dimitri van Heesch \\copyright~1997-2001"; + t << "Dimitri van Heesch \\copyright~1997-2002"; writeDefaultStyleSheetPart2(t); t << theTranslator->trGeneratedAt( dateToString(TRUE), projectName ); t << " doxygen " << theTranslator->trWrittenBy() << " "; - t << "Dimitri van Heesch \\copyright~1997-2001"; + t << "Dimitri van Heesch \\copyright~1997-2002"; writeDefaultStyleSheetPart3(t); } @@ -824,14 +824,14 @@ void LatexGenerator::writeStyleInfo(int part) break; case 2: { - t << " Dimitri van Heesch \\copyright~1997-2001"; + t << " Dimitri van Heesch \\copyright~1997-2002"; t << "}]{}\n"; writeDefaultStyleSheetPart2(t); } break; case 4: { - t << " Dimitri van Heesch \\copyright~1997-2001"; + t << " Dimitri van Heesch \\copyright~1997-2002"; writeDefaultStyleSheetPart3(t); endPlainFile(); } @@ -1176,7 +1176,7 @@ void LatexGenerator::addIndexItem(const char *s1,const char *s2) t << "}"; if (s2) { - t << "!" << s2 << "@{"; + t << "!" << escapeLabelName(s2) << "@{"; docify(s2); t << "}"; } diff --git a/src/latexgen.h b/src/latexgen.h index ac6a68b..679f81e 100644 --- a/src/latexgen.h +++ b/src/latexgen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/libdoxycfg.pro.in b/src/libdoxycfg.pro.in index 33e3acc..98ea518 100644 --- a/src/libdoxycfg.pro.in +++ b/src/libdoxycfg.pro.in @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2001 by Dimitri van Heesch. +# 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 diff --git a/src/libdoxycfg.t b/src/libdoxycfg.t index 7219648..568fdbc 100644 --- a/src/libdoxycfg.t +++ b/src/libdoxycfg.t @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2001 by Dimitri van Heesch. +# 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 diff --git a/src/libdoxygen.pro.in b/src/libdoxygen.pro.in index 14914f9..430f865 100644 --- a/src/libdoxygen.pro.in +++ b/src/libdoxygen.pro.in @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2001 by Dimitri van Heesch. +# 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 diff --git a/src/libdoxygen.t b/src/libdoxygen.t index 82fea0e..ac3bc82 100644 --- a/src/libdoxygen.t +++ b/src/libdoxygen.t @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2001 by Dimitri van Heesch. +# 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 diff --git a/src/logos.cpp b/src/logos.cpp index 43d7b46..293f1bd 100644 --- a/src/logos.cpp +++ b/src/logos.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/logos.h b/src/logos.h index 71019f8..33732cf 100644 --- a/src/logos.h +++ b/src/logos.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/main.cpp b/src/main.cpp index 1c33296..082c0d7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/mangen.cpp b/src/mangen.cpp index 3864ee7..c6d7b9f 100644 --- a/src/mangen.cpp +++ b/src/mangen.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/mangen.h b/src/mangen.h index f3d2a2b..3abc90c 100644 --- a/src/mangen.h +++ b/src/mangen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/memberdef.cpp b/src/memberdef.cpp index a72add2..2d84e97 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -1305,7 +1305,15 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, { ol.newParagraph(); - QCString reimplFromLine = theTranslator->trReimplementedFromList(1); + QCString reimplFromLine; + if (bmd->virtualness()!=Pure && bcd->compoundType()!=ClassDef::Interface) + { + reimplFromLine = theTranslator->trReimplementedFromList(1); + } + else + { + reimplFromLine = theTranslator->trImplementedFromList(1); + } int markerPos = reimplFromLine.find("@0"); if (markerPos!=-1) // should always pass this. { @@ -1359,7 +1367,10 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, { // count the members that directly inherit from md and for // which the member and class are visible in the docs. - if ( bmd->isLinkable() && bcd->isLinkable() ) count++; + if ( bmd->isLinkable() && bcd->isLinkable() ) + { + count++; + } } if (count>0) { @@ -1367,8 +1378,15 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, // write the list of classes that overwrite this member ol.newParagraph(); - QCString reimplInLine = - theTranslator->trReimplementedInList(count); + QCString reimplInLine; + if (virt==Pure || (classDef && classDef->compoundType()==ClassDef::Interface)) + { + reimplInLine = theTranslator->trImplementedInList(count); + } + else + { + reimplInLine = theTranslator->trReimplementedInList(count); + } static QRegExp marker("@[0-9]+"); int index=0,newIndex,matchLen; // now replace all markers in reimplInLine with links to the classes diff --git a/src/memberdef.h b/src/memberdef.h index 362a82d..008de3f 100644 --- a/src/memberdef.h +++ b/src/memberdef.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/membergroup.cpp b/src/membergroup.cpp index 086a9f8..e053b2a 100644 --- a/src/membergroup.cpp +++ b/src/membergroup.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/membergroup.h b/src/membergroup.h index 6eba22b..ee15dea 100644 --- a/src/membergroup.h +++ b/src/membergroup.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/memberlist.cpp b/src/memberlist.cpp index fdffc33..0e3ab0f 100644 --- a/src/memberlist.cpp +++ b/src/memberlist.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/memberlist.h b/src/memberlist.h index c0b6b17..dc93cc7 100644 --- a/src/memberlist.h +++ b/src/memberlist.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/membername.cpp b/src/membername.cpp index a250988..156e52c 100644 --- a/src/membername.cpp +++ b/src/membername.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/membername.h b/src/membername.h index 3eabfe8..a5700fd 100644 --- a/src/membername.h +++ b/src/membername.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/message.cpp b/src/message.cpp index 285f1c3..1f04dea 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/message.h b/src/message.h index ed47fa2..0822f23 100644 --- a/src/message.h +++ b/src/message.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp index 89584ba..323bb85 100644 --- a/src/namespacedef.cpp +++ b/src/namespacedef.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/namespacedef.h b/src/namespacedef.h index 0e3b510..5ee62ed 100644 --- a/src/namespacedef.h +++ b/src/namespacedef.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/outputgen.cpp b/src/outputgen.cpp index c8a9393..1b5dcea 100644 --- a/src/outputgen.cpp +++ b/src/outputgen.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/outputgen.h b/src/outputgen.h index 1b060e8..cd5c237 100644 --- a/src/outputgen.h +++ b/src/outputgen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/outputlist.cpp b/src/outputlist.cpp index 7611b6a..df9751f 100644 --- a/src/outputlist.cpp +++ b/src/outputlist.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/outputlist.h b/src/outputlist.h index d96feb7..22f0e46 100644 --- a/src/outputlist.h +++ b/src/outputlist.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/packagedef.cpp b/src/packagedef.cpp index 7fd00eb..afd8709 100644 --- a/src/packagedef.cpp +++ b/src/packagedef.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/packagedef.h b/src/packagedef.h index 945b229..0f1ba81 100644 --- a/src/packagedef.h +++ b/src/packagedef.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -1569,6 +1569,10 @@ BN [ \t\r\n] g_argDict->insert(argName,new int(g_defArgs)); g_defArgs++; } +<DefineText>"/**"|"/*!" { + g_defText+=yytext; + g_defLitText+=yytext; + } <DefineText>"/*" { outputChar('/');outputChar('*'); g_defText+=' '; @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/reflist.cpp b/src/reflist.cpp index 377ae41..b927969 100644 --- a/src/reflist.cpp +++ b/src/reflist.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/reflist.h b/src/reflist.h index 837cb0a..692e108 100644 --- a/src/reflist.h +++ b/src/reflist.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp index 1d992a4..85cc771 100644 --- a/src/rtfgen.cpp +++ b/src/rtfgen.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Parker Waechter & Dimitri van Heesch. + * Copyright (C) 1997-2002 by Parker Waechter & Dimitri van Heesch. * * Style sheet additions by Alexander Bartolich * diff --git a/src/rtfgen.h b/src/rtfgen.h index 81633a6..396653c 100644 --- a/src/rtfgen.h +++ b/src/rtfgen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Parker Waechter & Dimitri van Heesch. + * Copyright (C) 1997-2002 by Parker Waechter & Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/scanner.h b/src/scanner.h index 007dc5b..80efb9a 100644 --- a/src/scanner.h +++ b/src/scanner.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/scanner.l b/src/scanner.l index e70d3da..1e6acd2 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -1926,7 +1926,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) <FuncFuncType>. { current->type += *yytext; } -<FindMembers>"("/{BN}*{ID}{BN}*"*" { // for catching typedef void (__stdcall *f)() like definitions +<FindMembers>"("/{BN}*{ID}{BN}*"*"{BN}*{ID}*")(" { // for catching typedef void (__stdcall *f)() like definitions if (current->type.left(7)=="typedef" && current->bodyLine==-1) // the bodyLine check is to prevent this guard to be true more than once { @@ -2813,8 +2813,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) current->doc+=yytext; BEGIN( tmpDocType ); } -<JavaDoc>"<"({TABLE}|{UL}|{OL}|{DL}){ATTR}|{P}">" { // end brief upon encountering any of these - //current->doc+=yytext; +<JavaDoc>"<"({TABLE}|{UL}|{OL}|{DL}|{P}){ATTR}">" { // end brief upon encountering any of these int i; for (i=yyleng-1;i>=0;i--) { @@ -4045,7 +4044,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) current->brief+=yytext; } } -<DefLineDoc,LineDoc,ClassDoc,Doc>"/*" { current->doc += yytext; } +<DefLineDoc,LineDoc,ClassDoc,PageDoc,ExampleDoc,Doc>"/*"|"//" { current->doc += yytext; } <SkipCxxComment>.*/\n { BEGIN( lastCContext ) ; } diff --git a/src/searchindex.cpp b/src/searchindex.cpp index 5567f4e..fa3600d 100644 --- a/src/searchindex.cpp +++ b/src/searchindex.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/searchindex.h b/src/searchindex.h index 214de6e..e93709f 100644 --- a/src/searchindex.h +++ b/src/searchindex.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/section.h b/src/section.h index 90ac2d4..ce7683d 100644 --- a/src/section.h +++ b/src/section.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/sortdict.h b/src/sortdict.h index 7675724..be4652c 100644 --- a/src/sortdict.h +++ b/src/sortdict.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/suffixtree.cpp b/src/suffixtree.cpp index 242fa9c..d247f4d 100644 --- a/src/suffixtree.cpp +++ b/src/suffixtree.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/suffixtree.h b/src/suffixtree.h index 7aa8dc9..4d0f6a3 100644 --- a/src/suffixtree.h +++ b/src/suffixtree.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/tagreader.cpp b/src/tagreader.cpp index 5f35a6d..d3c85ba 100644 --- a/src/tagreader.cpp +++ b/src/tagreader.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -1072,23 +1072,26 @@ void TagFileParser::buildLists(Entry *root) tpgi = m_tagFilePackages.next(); } - // build group list - TagGroupInfo *tgi = m_tagFileGroups.first(); - while (tgi) + // build group list, but only if config file says to include it + if (Config_getBool("EXTERNAL_GROUPS")) { - Entry *ge = new Entry; - ge->section = Entry::GROUPDOC_SEC; - ge->name = tgi->name; - ge->type = tgi->title; - addDocAnchors(ge,tgi->docAnchors); - TagInfo *ti = new TagInfo; - ti->tagName = m_tagName; - ti->fileName = tgi->filename; - ge->tagInfo = ti; - - buildMemberList(ge,tgi->members); - root->addSubEntry(ge); - tgi = m_tagFileGroups.next(); + TagGroupInfo *tgi = m_tagFileGroups.first(); + while (tgi) + { + Entry *ge = new Entry; + ge->section = Entry::GROUPDOC_SEC; + ge->name = tgi->name; + ge->type = tgi->title; + addDocAnchors(ge,tgi->docAnchors); + TagInfo *ti = new TagInfo; + ti->tagName = m_tagName; + ti->fileName = tgi->filename; + ge->tagInfo = ti; + + buildMemberList(ge,tgi->members); + root->addSubEntry(ge); + tgi = m_tagFileGroups.next(); + } } // build page list diff --git a/src/tagreader.h b/src/tagreader.h index a9c7afd..8a62504 100644 --- a/src/tagreader.h +++ b/src/tagreader.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/translator.cpp b/src/translator.cpp index 00b15b8..2ecbad9 100644 --- a/src/translator.cpp +++ b/src/translator.cpp @@ -266,6 +266,6 @@ QCString Translator::JapaneseEucToSjis( const QCString & sInput ) } } - return result.local8Bit(); + return result.latin1(); } diff --git a/src/translator.h b/src/translator.h index 725c288..6398ca4 100644 --- a/src/translator.h +++ b/src/translator.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -364,6 +364,13 @@ class Translator virtual QCString trReferences() = 0; +////////////////////////////////////////////////////////////////////////// +// new since 1.2.13 +////////////////////////////////////////////////////////////////////////// + + virtual QCString trImplementedFromList(int numEntries) = 0; + virtual QCString trImplementedInList(int numEntries) = 0; + }; #endif diff --git a/src/translator_adapter.h b/src/translator_adapter.h index a103405..932cfe3 100644 --- a/src/translator_adapter.h +++ b/src/translator_adapter.h @@ -37,16 +37,28 @@ class TranslatorAdapterBase : public Translator * \sa createUpdateNeededMessage() */ virtual QCString updateNeededMessage() = 0; + +}; + +class TranslatorAdapter_1_2_13 : public TranslatorAdapterBase +{ + public: + virtual QCString updateNeededMessage() + { return createUpdateNeededMessage(idLanguage(),"release 1.2.13"); } + + virtual QCString trImplementedFromList(int numEntries) + { return english.trImplementedFromList(numEntries); } + + virtual QCString trImplementedInList(int numEntries) + { return english.trImplementedInList(numEntries); } }; -class TranslatorAdapter_1_2_11 : public TranslatorAdapterBase +class TranslatorAdapter_1_2_11 : public TranslatorAdapter_1_2_13 { public: virtual QCString updateNeededMessage() { return createUpdateNeededMessage(idLanguage(),"release 1.2.11"); } - // Put new adapter methods below... - // virtual QCString trReferences() { return english.trReferences(); } diff --git a/src/translator_br.h b/src/translator_br.h index dca4523..d8e668f 100644 --- a/src/translator_br.h +++ b/src/translator_br.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -21,7 +21,7 @@ #ifndef TRANSLATOR_BR_H #define TRANSLATOR_BR_H -class TranslatorBrazilian: public Translator +class TranslatorBrazilian: public TranslatorAdapter_1_2_13 { public: diff --git a/src/translator_cn.h b/src/translator_cn.h index 7d9ebe0..eba9f12 100644 --- a/src/translator_cn.h +++ b/src/translator_cn.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -18,15 +18,13 @@ #ifndef TRANSLATOR_CN_H #define TRANSLATOR_CN_H -#include "translator_adapter.h" - /*! If you want insert a space whenever Chinese meets English charactors, set CN_SPC to " ", else null. */ #define CN_SPC -class TranslatorChinese : public TranslatorAdapter_1_2_11 +class TranslatorChinese : public TranslatorAdapter_1_2_13 { public: /*! Used for identification of the language. The identification @@ -54,17 +52,9 @@ class TranslatorChinese : public TranslatorAdapter_1_2_11 */ virtual QCString latexLanguageSupportCommand() { - QCString result(latexBabelPackage()); - if (!result.isEmpty()) - { - result = "\\usepackage{" + result; - result += "}\n"; - } - return result; + return ""; } - virtual QCString latexBabelPackage() - { return "CJK"; } /*! return the language charset. This will be used for the HTML output */ virtual QCString idLanguageCharset() @@ -158,9 +148,6 @@ class TranslatorChinese : public TranslatorAdapter_1_2_11 // quick reference sections - virtual QCString trVerbatimText(const char *f) - { return (QCString)"ÕâÊÇÍ·Îļþ"CN_SPC+f+CN_SPC"µÄÔ´´úÂë¡£"; } - /*! This is put above each page as a link to the list of all groups of * compounds or files (see the \\group command). */ @@ -384,8 +371,6 @@ class TranslatorChinese : public TranslatorAdapter_1_2_11 virtual QCString trEnumerationValues() { return "ö¾ÙÖµ"; } - virtual QCString trAuthor() - { return "×÷Õß"; } virtual QCString trDefineDocumentation() { return "ºê¶¨ÒåÎĵµ"; } @@ -416,9 +401,6 @@ class TranslatorChinese : public TranslatorAdapter_1_2_11 } } - virtual QCString trFiles() - { return "Îļþ"; } - virtual QCString trGeneratedAt(const char *date,const char *projName) { QCString result=(QCString)"Generated at "+date; @@ -456,9 +438,6 @@ class TranslatorChinese : public TranslatorAdapter_1_2_11 virtual QCString trDate() { return "ÈÕÆÚ"; } - virtual QCString trAuthors() - { return "×÷Õß"; } - virtual QCString trReturns() { return "·µ»Ø"; } @@ -1289,6 +1268,16 @@ class TranslatorChinese : public TranslatorAdapter_1_2_11 return "×÷Õß"; } +////////////////////////////////////////////////////////////////////////// +// new since 1.2.11 +////////////////////////////////////////////////////////////////////////// + + /*! This text is put before the list of members referenced by a member + */ + virtual QCString trReferences() + { + return "²Î¿¼"; + } }; #endif diff --git a/src/translator_cz.h b/src/translator_cz.h index 5972f42..987a8ed 100644 --- a/src/translator_cz.h +++ b/src/translator_cz.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -151,7 +151,7 @@ // probably slightly faster. -class TranslatorCzech : public Translator +class TranslatorCzech : public TranslatorAdapter_1_2_13 { private: /*! The decode() inline assumes the source written in the diff --git a/src/translator_de.h b/src/translator_de.h index 8df6c33..082ac9d 100644 --- a/src/translator_de.h +++ b/src/translator_de.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -66,7 +66,7 @@ #ifndef TRANSLATOR_DE_H #define TRANSLATOR_DE_H -class TranslatorGerman : public Translator +class TranslatorGerman : public TranslatorAdapter_1_2_13 { public: diff --git a/src/translator_dk.h b/src/translator_dk.h index 9eda890..5f5b447 100644 --- a/src/translator_dk.h +++ b/src/translator_dk.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/translator_en.h b/src/translator_en.h index e07b51f..9ad7221 100644 --- a/src/translator_en.h +++ b/src/translator_en.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -1372,6 +1372,26 @@ class TranslatorEnglish : public Translator return "References"; } +////////////////////////////////////////////////////////////////////////// +// new since 1.2.13 +////////////////////////////////////////////////////////////////////////// + + /*! used in member documentation blocks to produce a list of + * members that are implemented by this one. + */ + virtual QCString trImplementedFromList(int numEntries) + { + return "Implements "+trWriteList(numEntries)+"."; + } + + /*! used in member documentation blocks to produce a list of + * all members that implementation this member. + */ + virtual QCString trImplementedInList(int numEntries) + { + return "Implemented in "+trWriteList(numEntries)+"."; + } + }; #endif diff --git a/src/translator_es.h b/src/translator_es.h index 7da4ebe..f5cec24 100644 --- a/src/translator_es.h +++ b/src/translator_es.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/translator_fi.h b/src/translator_fi.h index ba836a0..635589b 100644 --- a/src/translator_fi.h +++ b/src/translator_fi.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/translator_fr.h b/src/translator_fr.h index 584995b..375afbc 100644 --- a/src/translator_fr.h +++ b/src/translator_fr.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -37,7 +37,7 @@ #ifndef TRANSLATOR_FR_H #define TRANSLATOR_FR_H -class TranslatorFrench : public Translator +class TranslatorFrench : public TranslatorAdapter_1_2_13 { public: QCString idLanguage() diff --git a/src/translator_gr.h b/src/translator_gr.h index ba07ac7..11befec 100644 --- a/src/translator_gr.h +++ b/src/translator_gr.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/translator_hr.h b/src/translator_hr.h index e985734..603d766 100644 --- a/src/translator_hr.h +++ b/src/translator_hr.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -48,7 +48,7 @@ #ifndef TRANSLATOR_HR_H #define TRANSLATOR_HR_H -class TranslatorCroatian : public Translator +class TranslatorCroatian : public TranslatorAdapter_1_2_13 { private: /*! to avoid macro redefinition from translator_cz.h */ diff --git a/src/translator_hu.h b/src/translator_hu.h index ee8d343..86895bd 100644 --- a/src/translator_hu.h +++ b/src/translator_hu.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/translator_it.h b/src/translator_it.h index a4933e9..9472dab 100644 --- a/src/translator_it.h +++ b/src/translator_it.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -61,7 +61,7 @@ #ifndef TRANSLATOR_IT_H #define TRANSLATOR_IT_H -class TranslatorItalian : public Translator +class TranslatorItalian : public TranslatorAdapter_1_2_13 { public: diff --git a/src/translator_jp.h b/src/translator_jp.h index 5c240f1..0dbfc90 100644 --- a/src/translator_jp.h +++ b/src/translator_jp.h @@ -29,7 +29,7 @@ #ifndef TRANSLATOR_JP_H #define TRANSLATOR_JP_H -class TranslatorJapanese : public Translator +class TranslatorJapanese : public TranslatorAdapter_1_2_13 { private: /*! The decode() can change euc into sjis */ @@ -52,7 +52,7 @@ class TranslatorJapanese : public Translator virtual QCString idLanguageCharset() { #ifdef _WIN32 - return "ShiftJIS"; + return "Shift_JIS"; #else return "euc-jp"; #endif @@ -101,15 +101,15 @@ class TranslatorJapanese : public Translator /*! 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("¥á¥ó¥Ð¥ê¥¹¥È"); } + { return decode("¥á¥ó¥Ð°ìÍ÷"); } /*! 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() @@ -120,9 +120,9 @@ class TranslatorJapanese : public Translator */ virtual QCString trGeneratedAutomatically(const char *s) { QCString result; - if (s) result=(QCString)s+"¤Î"; - result+="¥½¡¼¥¹¥³¡¼¥É¤«¤é Doxygen ¤¬¼«Æ°Åª¤ËÀ¸À®¤·¤Þ¤·¤¿¡£"; - return decode(result); + if (s) result=(QCString)s+decode("¤Î"); + result+=decode("¥½¡¼¥¹¤«¤é Doxygen ¤¬À¸À®¤·¤Þ¤·¤¿¡£"); + return result; } /*! put after an enum name in the list of all members */ @@ -135,7 +135,7 @@ class TranslatorJapanese : public Translator /*! put after an undocumented member in the list of all members */ virtual QCString trDefinedIn() - { return decode("¼¡¤ÇÄêµÁ¤µ¤ì¤Þ¤·¤¿¡£"); } + { return decode("¼¡¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"); } // quick reference sections @@ -164,7 +164,7 @@ class TranslatorJapanese : public Translator /*! This is put above each page as a link to the list of documented files */ virtual QCString trFileList() - { return decode("¥Õ¥¡¥¤¥ë¥ê¥¹¥È"); } + { return decode("¥Õ¥¡¥¤¥ë°ìÍ÷"); } /*! This is put above each page as a link to the list of all verbatim headers */ virtual QCString trHeaderFiles() @@ -209,17 +209,16 @@ class TranslatorJapanese : public Translator /*! This is an introduction to the class hierarchy. */ virtual QCString trClassHierarchyDescription() - { return decode("¤³¤Î·Ñ¾µ¥ê¥¹¥È¤Ï¤ª¤ª¤Þ¤«¤Ë¤Ï¥½¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢" - "¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤Ç´°Á´¤Ë¥½¡¼¥È¤µ¤ì¤Æ¤Ï¤¤¤Þ¤»¤ó¡£"); + { return decode("¤³¤Î·Ñ¾µ°ìÍ÷¤Ï¤ª¤ª¤Þ¤«¤Ë¤Ï¥½¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢" + "´°Á´¤Ë¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤Ç¥½¡¼¥È¤µ¤ì¤Æ¤Ï¤¤¤Þ¤»¤ó¡£"); } /*! This is an introduction to the list with all files. */ - virtual QCString trFileListDescription(bool extractAll) + virtual QCString trFileListDescription(bool /*extractAll*/) { - QCString result="¤³¤Î¥ê¥¹¥È¤Ï¡¢"; - if (!extractAll) result+="¥É¥¥å¥á¥ó¥È²½¤µ¤ì¡¢"; - result+="´Ê°×ÀâÌÀ¤ò»ý¤Ä¥Õ¥¡¥¤¥ë¤¹¤Ù¤Æ¤Î¥ê¥¹¥È¤Ç¤¹¡£"; - return decode(result); + QCString result=decode("¤³¤ì¤Ï"); + result+=decode("¥Õ¥¡¥¤¥ë°ìÍ÷¤Ç¤¹¡£"); + return result; } /*! This is an introduction to the annotated compound list. */ @@ -227,49 +226,46 @@ class TranslatorJapanese : public Translator { 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. */ virtual QCString trCompoundMembersDescription(bool extractAll) { - QCString result="¤³¤ì¤Ï"; - if (!extractAll) result+="¥É¥¥å¥á¥ó¥È²½¤µ¤ì¤¿"; + QCString result=decode("¤³¤ì¤Ï"); if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - result+="¥Õ¥£¡¼¥ë¥É¤¹¤Ù¤Æ¤Î¥ê¥¹¥È¤Ç¡¢¤½¤ì¤¾¤ì"; - if (extractAll) result+="¤¬Â°¤·¤Æ¤¤¤ë¹½Â¤ÂÎ/¶¦ÍÑÂÎ"; + result+=decode("¥Õ¥£¡¼¥ë¥É¤Î°ìÍ÷¤Ç¤½¤ì¤¾¤ì"); + if (extractAll) result+=decode("¤¬Â°¤·¤Æ¤¤¤ë¹½Â¤ÂÎ/¶¦ÍÑÂÎ"); } else { - result+="¥¯¥é¥¹¥á¥ó¥Ð¤¹¤Ù¤Æ¤Î¥ê¥¹¥È¤Ç¡¢¤½¤ì¤¾¤ì"; - if (extractAll) result+="¤¬Â°¤·¤Æ¤¤¤ë¥¯¥é¥¹"; + result+=decode("¥¯¥é¥¹¥á¥ó¥Ð¤Î°ìÍ÷¤Ç¡¢¤½¤ì¤¾¤ì"); + if (extractAll) result+=decode("¤¬Â°¤·¤Æ¤¤¤ë¥¯¥é¥¹"); } - result+="¤Î²òÀâ¤Ø¤Î¥ê¥ó¥¯¤¬Ä¥¤é¤ì¤Æ¤¤¤Þ¤¹¡£"; - return decode(result); + result+=decode("¤Î²òÀâ¤Ø¥ê¥ó¥¯¤·¤Æ¤¤¤Þ¤¹¡£"); + return result; } /*! This is an introduction to the page with all file members. */ - virtual QCString trFileMembersDescription(bool extractAll) + virtual QCString trFileMembersDescription(bool /*extractAll*/) { - QCString result="¤³¤ì¤Ï"; - if (!extractAll) result+="¥É¥¥å¥á¥ó¥È²½¤µ¤ì¤¿"; + QCString result=decode("¤³¤ì¤Ï"); if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - result+="´Ø¿ô¡¢ÊÑ¿ô¡¢¥Þ¥¯¥í¡¢Îóµó·¿¡¢·¿ÄêµÁ¤Î¥ê¥¹¥È¤Ç¡¢¤½¤ì¤¾¤ì"; + result+=decode("´Ø¿ô¡¢ÊÑ¿ô¡¢¥Þ¥¯¥í¡¢Îóµó·¿¡¢·¿ÄêµÁ¤Î"); } else { - result+="¥Õ¥¡¥¤¥ë¥á¥ó¥Ð¤¹¤Ù¤Æ¤Î¥ê¥¹¥È¤Ç¡¢¤½¤ì¤¾¤ì"; + result+=decode("¥Õ¥¡¥¤¥ë¥á¥ó¥Ð¤Î"); } - if (extractAll) result+="¤¬Â°¤·¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë"; - result+="¤Î²òÀâ¤Ø¤Î¥ê¥ó¥¯¤¬Ä¥¤é¤ì¤Æ¤¤¤Þ¤¹¡£"; - return decode(result); + result+=decode("°ìÍ÷¤Ç¤¹¡£¤½¤ì¤¾¤ì¤¬Â°¤·¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î²òÀâ¤Ø¥ê¥ó¥¯¤·¤Æ¤¤¤Þ¤¹¡£"); + return result; } /*! This is an introduction to the page with the list of all header files. */ @@ -278,15 +274,15 @@ class TranslatorJapanese : public Translator /*! This is an introduction to the page with the list of all examples */ virtual QCString trExamplesDescription() - { return decode("¤¹¤Ù¤Æ¤ÎÎã¤Î¥ê¥¹¥È¤Ç¤¹¡£"); } + { return decode("¤¹¤Ù¤Æ¤ÎÎã¤Î°ìÍ÷¤Ç¤¹¡£"); } /*! This is an introduction to the page with the list of related pages */ virtual QCString trRelatedPagesDescription() - { return decode("´ØÏ¢¤¹¤ë¥É¥¥å¥á¥ó¥È¥Ú¡¼¥¸¤¹¤Ù¤Æ¤Î¥ê¥¹¥È¤Ç¤¹¡£"); } + { return decode("´ØÏ¢¥Ú¡¼¥¸¤Î°ìÍ÷¤Ç¤¹¡£"); } /*! This is an introduction to the page with the list of class/file groups */ virtual QCString trModulesDescription() - { return decode("¤¹¤Ù¤Æ¤Î¥â¥¸¥å¡¼¥ë¤Î¥ê¥¹¥È¤Ç¤¹¡£"); } + { return decode("¤¹¤Ù¤Æ¤Î¥â¥¸¥å¡¼¥ë¤Î°ìÍ÷¤Ç¤¹¡£"); } /*! This sentences is used in the annotated class/file lists if no brief * description is given. @@ -480,9 +476,9 @@ class TranslatorJapanese : public Translator virtual QCString trGeneratedAt(const char *date,const char *projName) { QCString result; - if (projName) result+=(QCString)projName+"¤ËÂФ·¤Æ"; - result+=(QCString)date+"¤ËÀ¸À®¤µ¤ì¤Þ¤·¤¿¡£"; - return decode(result); + if (projName) result+=(QCString)projName+decode("¤ËÂФ·¤Æ"); + result+=(QCString)date+decode("¤ËÀ¸À®¤µ¤ì¤Þ¤·¤¿¡£"); + return result; } /*! This is part of the sentence used in the standard footer of each page. */ @@ -494,7 +490,7 @@ class TranslatorJapanese : public Translator /*! this text is put before a class diagram */ virtual QCString trClassDiagram(const char *clName) { - return decode((QCString)clName+"¤ËÂФ¹¤ë·Ñ¾µ¥°¥é¥Õ"); + return (QCString)clName+decode("¤ËÂФ¹¤ë·Ñ¾µ¥°¥é¥Õ"); } /*! this text is generated when the \\internal command is used. */ @@ -552,15 +548,14 @@ class TranslatorJapanese : public Translator /*! used as the title of page containing all the index of all namespaces. */ virtual QCString trNamespaceList() - { return decode("̾Á°¶õ´Ö¥ê¥¹¥È"); } + { return decode("̾Á°¶õ´Ö°ìÍ÷"); } /*! used as an introduction to the namespace list */ - virtual QCString trNamespaceListDescription(bool extractAll) + virtual QCString trNamespaceListDescription(bool /*extractAll*/) { - QCString result="¤³¤Î¥ê¥¹¥È¤Ï¡¢´Ê°×ÀâÌÀ¤ò»ý¤Ä¤¹¤Ù¤Æ¤Î"; - if (!extractAll) result+="¥É¥¥å¥á¥ó¥È²½¤µ¤ì¤¿"; - result+="̾Á°¶õ´Ö¤Î¥ê¥¹¥È¤Ç¤¹¡£"; - return decode(result); + QCString result=decode(""); + result+=decode("̾Á°¶õ´Ö¤Î°ìÍ÷¤Ç¤¹¡£"); + return result; } /*! used in the class documentation as a header before the list of all @@ -591,29 +586,29 @@ class TranslatorJapanese : public Translator QCString result=""; switch(compType) { - case ClassDef::Class: result+="¥¯¥é¥¹ "; break; - case ClassDef::Struct: result+="¹½Â¤ÂÎ "; break; - case ClassDef::Union: result+="¶¦ÍÑÂÎ "; break; - case ClassDef::Interface: result+="¥¤¥ó¥¿¥Õ¥§¡¼¥¹"; break; - case ClassDef::Exception: result+="Îã³°"; break; //TODO:fixme + case ClassDef::Class: result+=decode("¥¯¥é¥¹ "); break; + 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 } - if (isTemplate) result+=" ¥Æ¥ó¥×¥ì¡¼¥È"; - result+=(QCString)clName+" ¤Î²òÀâ"; - return decode(result); + if (isTemplate) result+=decode(" ¥Æ¥ó¥×¥ì¡¼¥È"); + result+=(QCString)clName+decode(" ¤Î²òÀâ"); + return result; } /*! used as the title of the HTML page of a file */ virtual QCString trFileReference(const char *fileName) { - QCString result="¥Õ¥¡¥¤¥ë "+(QCString)fileName+" ¤Î²òÀâ"; - return decode(result); + QCString result=decode("")+(QCString)fileName+decode(" ¤Î²òÀâ"); + return result; } /*! used as the title of the HTML page of a namespace */ virtual QCString trNamespaceReference(const char *namespaceName) { - QCString result="̾Á°¶õ´Ö "+(QCString)namespaceName+" ¤Î²òÀâ"; - return decode(result); + QCString result=decode("̾Á°¶õ´Ö ")+(QCString)namespaceName+decode(" ¤Î²òÀâ"); + return result; } /* these are for the member sections of a class, struct or union */ @@ -655,12 +650,12 @@ class TranslatorJapanese : public Translator if (i!=numEntries-1) // not the last entry, so we need a separator { if (i<numEntries-2) // not the fore last entry - result+=", "; + result+=decode(", "); else // the fore last entry - result+=", ¤È "; + result+=decode(", ¤È "); } } - return decode(result); + return result; } /*! used in class documentation to produce a list of base classes, @@ -668,7 +663,7 @@ class TranslatorJapanese : public Translator */ virtual QCString trInheritsList(int numEntries) { - return decode(trWriteList(numEntries)+"¤ò·Ñ¾µ¤·¤Æ¤¤¤Þ¤¹¡£"); + return trWriteList(numEntries)+decode("¤ò·Ñ¾µ¤·¤Æ¤¤¤Þ¤¹¡£"); } /*! used in class documentation to produce a list of super classes, @@ -676,7 +671,7 @@ class TranslatorJapanese : public Translator */ virtual QCString trInheritedByList(int numEntries) { - return decode(trWriteList(numEntries)+"¤Ë·Ñ¾µ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"); + return trWriteList(numEntries)+decode("¤Ë·Ñ¾µ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"); } /*! used in member documentation blocks to produce a list of @@ -684,7 +679,7 @@ class TranslatorJapanese : public Translator */ virtual QCString trReimplementedFromList(int numEntries) { - return decode(trWriteList(numEntries)+"¤òºÆÄêµÁ¤·¤Æ¤¤¤Þ¤¹¡£"); + return trWriteList(numEntries)+decode("¤òºÆÄêµÁ¤·¤Æ¤¤¤Þ¤¹¡£"); } /*! used in member documentation blocks to produce a list of @@ -692,7 +687,7 @@ class TranslatorJapanese : public Translator */ virtual QCString trReimplementedInList(int numEntries) { - return decode(trWriteList(numEntries)+"¤ÇºÆÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"); + return trWriteList(numEntries)+decode("¤ÇºÆÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"); } /*! This is put above each page as a link to all members of namespaces. */ @@ -702,15 +697,14 @@ class TranslatorJapanese : public Translator /*! This is an introduction to the page with all namespace members */ virtual QCString trNamespaceMemberDescription(bool extractAll) { - QCString result="¤³¤ì¤Ï"; - if (!extractAll) result+="¥É¥¥å¥á¥ó¥È²½¤µ¤ì¤¿"; - result+="̾Á°¶õ´Ö¤¹¤Ù¤Æ¤Î¥ê¥¹¥È¤Ç¡¢¤½¤ì¤¾¤ì"; + QCString result=decode("¤³¤ì¤Ï"); + result+=decode("̾Á°¶õ´Ö¤Î°ìÍ÷¤Ç¤¹¡£¤½¤ì¤¾¤ì"); if (extractAll) - result+="¡¢Ì¾Á°¶õ´Ö¤Î²òÀâ"; + result+=decode("¤Î̾Á°¶õ´Ö¤Î²òÀâ"); else - result+="¤¬Â°¤·¤Æ¤¤¤ë̾Á°¶õ´Ö"; - result+="¤Ø¤Î¥ê¥ó¥¯¤¬Ä¥¤é¤ì¤Æ¤¤¤Þ¤¹¡£"; - return decode(result); + result+=decode("¤¬Â°¤·¤Æ¤¤¤ë̾Á°¶õ´Ö"); + result+=decode("¤Ø¥ê¥ó¥¯¤·¤Æ¤¤¤Þ¤¹¡£"); + return result; } /*! This is used in LaTeX as the title of the chapter with the * index of all namespaces. @@ -745,24 +739,24 @@ class TranslatorJapanese : public Translator bool) { // here s is one of " Class", " Struct" or " Union" // single is true implies a single file - QCString result=(QCString)"¤³¤Î"; + QCString result=(QCString)decode("¤³¤Î"); switch(compType) { - case ClassDef::Class: result+="¥¯¥é¥¹"; break; - case ClassDef::Struct: result+="¹½Â¤ÂÎ"; break; - case ClassDef::Union: result+="¶¦ÍÑÂÎ"; break; - case ClassDef::Interface: result+="¥¤¥ó¥¿¥Õ¥§¡¼¥¹"; break; - case ClassDef::Exception: result+="Îã³°"; break; //TODO:fixme + case ClassDef::Class: result+=decode("¥¯¥é¥¹"); break; + 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 } - result+="¤Î²òÀâ¤Ï¼¡¤Î¥Õ¥¡¥¤¥ë¤«¤éÀ¸À®¤µ¤ì¤Þ¤·¤¿:"; - return decode(result); + result+=decode("¤Î²òÀâ¤Ï¼¡¤Î¥Õ¥¡¥¤¥ë¤«¤éÀ¸À®¤µ¤ì¤Þ¤·¤¿:"); + return result; } /*! This is in the (quick) index as a link to the alphabetical compound * list. */ virtual QCString trAlphabeticalList() - { return decode("¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¥ê¥¹¥È"); } + { return decode("¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç°ìÍ÷"); } ////////////////////////////////////////////////////////////////////////// // new since 0.49-990901 @@ -793,11 +787,11 @@ class TranslatorJapanese : public Translator } virtual QCString trDefinedAtLineInSourceFile() { - return decode("¥Õ¥¡¥¤¥ë @1 ¤Î @0 ¹Ô¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"); + return decode(" @1 ¤Î @0 ¹Ô¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"); } virtual QCString trDefinedInSourceFile() { - return decode("¥Õ¥¡¥¤¥ë @0 ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"); + return decode(" @0 ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"); } ////////////////////////////////////////////////////////////////////////// @@ -816,12 +810,12 @@ class TranslatorJapanese : public Translator /*! this text is put before a collaboration diagram */ virtual QCString trCollaborationDiagram(const char *clName) { - return decode((QCString)clName+"¤Î¥³¥é¥Ü¥ì¡¼¥·¥ç¥ó¿Þ"); + return (QCString)clName+decode("¤Î¥³¥é¥Ü¥ì¡¼¥·¥ç¥ó¿Þ"); } /*! this text is put before an include dependency graph */ virtual QCString trInclDepGraph(const char *fName) { - return decode((QCString)fName+"¤Î¥¤¥ó¥¯¥ë¡¼¥É°Í¸´Ø·¸¿Þ"); + return (QCString)fName+decode("¤Î¥¤¥ó¥¯¥ë¡¼¥É°Í¸´Ø·¸¿Þ"); } /*! header that is put before the list of constructor/destructors. */ virtual QCString trConstructorDocumentation() @@ -831,12 +825,12 @@ class TranslatorJapanese : public Translator /*! Used in the file documentation to point to the corresponding sources. */ virtual QCString trGotoSourceCode() { - return decode("¤³¤Î¥Õ¥¡¥¤¥ë¤Î¥½¡¼¥¹¥³¡¼¥É¤ò¸«¤ë¡£"); + return decode("¥½¡¼¥¹¥³¡¼¥É¤ò¸«¤ë¡£"); } /*! Used in the file sources to point to the corresponding documentation. */ virtual QCString trGotoDocumentation() { - return decode("¤³¤Î¥Õ¥¡¥¤¥ë¤Î²òÀâ¤ò¸«¤ë¡£"); + return decode("²òÀâ¤ò¸«¤ë¡£"); } /*! Text for the \\pre command */ virtual QCString trPrecondition() @@ -873,7 +867,7 @@ class TranslatorJapanese : public Translator } virtual QCString trGotoTextualHierarchy() { - return decode("¥¯¥é¥¹³¬ÁØ¿Þ(¥Æ¥¥¹¥È)¤ò¸«¤ë¡£"); + return decode("¥¯¥é¥¹³¬ÁØ¿Þ¤ò¸«¤ë¡£"); } virtual QCString trPageIndex() { @@ -944,7 +938,7 @@ class TranslatorJapanese : public Translator /*! Used as the header of the todo list */ virtual QCString trTodoList() { - return decode("TODO¥ê¥¹¥È"); + return decode("TODO°ìÍ÷"); } ////////////////////////////////////////////////////////////////////////// @@ -953,7 +947,7 @@ class TranslatorJapanese : public Translator virtual QCString trReferencedBy() { - return decode("»²¾È°ÌÃÖ"); + return decode("¸Æ½Ð"); } virtual QCString trRemarks() { @@ -965,7 +959,7 @@ class TranslatorJapanese : public Translator } virtual QCString trInclByDepGraph() { - return decode("¤³¤Î¥°¥é¥Õ¤Ï¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤¬¤É¤Î¥Õ¥¡¥¤¥ë¤«¤éľÀÜ¡¢´ÖÀÜŪ¤Ë" + return decode("¤³¤Î¥°¥é¥Õ¤Ï¡¢¤É¤Î¥Õ¥¡¥¤¥ë¤«¤éľÀÜ¡¢´ÖÀÜŪ¤Ë" "¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤Æ¤¤¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£"); } virtual QCString trSince() @@ -1056,7 +1050,7 @@ class TranslatorJapanese : public Translator /*! Used as the header of the test list */ virtual QCString trTestList() { - return decode("¥Æ¥¹¥È¥ê¥¹¥È"); + return decode("¥Æ¥¹¥È°ìÍ÷"); } ////////////////////////////////////////////////////////////////////////// @@ -1109,17 +1103,17 @@ class TranslatorJapanese : public Translator /*! Used as the title of a Java package */ virtual QCString trPackage(const char *name) { - return decode((QCString)"¥Ñ¥Ã¥±¡¼¥¸ "+name); + return (QCString)decode("¥Ñ¥Ã¥±¡¼¥¸ ")+name; } /*! Title of the package index page */ virtual QCString trPackageList() { - return decode("¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È"); + return decode("¥Ñ¥Ã¥±¡¼¥¸°ìÍ÷"); } /*! The description of the package index page */ virtual QCString trPackageListDescription() { - return decode("´Ê°×ÀâÌÀ¤ò»ý¤Ä¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¡£"); + return decode("¤³¤ì¤Ï¥Ñ¥Ã¥±¡¼¥¸°ìÍ÷¤Ç¤¹¡£"); } /*! The link name in the Quick links header for each page */ virtual QCString trPackages() @@ -1150,7 +1144,7 @@ class TranslatorJapanese : public Translator /*! Used as the header of the bug list */ virtual QCString trBugList() { - return decode("¥Ð¥°¤Î¥ê¥¹¥È"); + return decode("¥Ð¥°°ìÍ÷"); } ////////////////////////////////////////////////////////////////////////// @@ -1210,8 +1204,8 @@ class TranslatorJapanese : public Translator { first_capital = first_capital; singular = singular; - QCString result("¥¯¥é¥¹"); - return decode(result); + QCString result(decode("¥¯¥é¥¹")); + return result; } /*! This is used for translation of the word that will possibly @@ -1222,8 +1216,8 @@ class TranslatorJapanese : public Translator { first_capital = first_capital; singular = singular; - QCString result("¥Õ¥¡¥¤¥ë"); - return decode(result); + QCString result(decode("¥Õ¥¡¥¤¥ë")); + return result; } /*! This is used for translation of the word that will possibly @@ -1234,8 +1228,8 @@ class TranslatorJapanese : public Translator { first_capital = first_capital; singular = singular; - QCString result("̾Á°¶õ´Ö"); - return decode(result); + QCString result(decode("̾Á°¶õ´Ö")); + return result; } /*! This is used for translation of the word that will possibly @@ -1246,8 +1240,8 @@ class TranslatorJapanese : public Translator { first_capital = first_capital; singular = singular; - QCString result("¥°¥ë¡¼¥×"); - return decode(result); + QCString result(decode("¥°¥ë¡¼¥×")); + return result; } /*! This is used for translation of the word that will possibly @@ -1258,8 +1252,8 @@ class TranslatorJapanese : public Translator { first_capital = first_capital; singular = singular; - QCString result("¥Ú¡¼¥¸"); - return decode(result); + QCString result(decode("¥Ú¡¼¥¸")); + return result; } /*! This is used for translation of the word that will possibly @@ -1270,8 +1264,8 @@ class TranslatorJapanese : public Translator { first_capital = first_capital; singular = singular; - QCString result("¥á¥ó¥Ð"); - return decode(result); + QCString result(decode("¥á¥ó¥Ð")); + return result; } /*! This is used for translation of the word that will possibly @@ -1282,8 +1276,8 @@ class TranslatorJapanese : public Translator { first_capital = first_capital; singular = singular; - QCString result("¥Õ¥£¡¼¥ë¥É"); - return decode(result); + QCString result(decode("¥Õ¥£¡¼¥ë¥É")); + return result; } /*! This is used for translation of the word that will possibly @@ -1294,8 +1288,8 @@ class TranslatorJapanese : public Translator { first_capital = first_capital; singular = singular; - QCString result("¥°¥í¡¼¥Ð¥ë"); - return decode(result); + QCString result(decode("¥°¥í¡¼¥Ð¥ë")); + return result; } ////////////////////////////////////////////////////////////////////////// @@ -1308,8 +1302,8 @@ class TranslatorJapanese : public Translator { first_capital = first_capital; singular = singular; - QCString result("ºî¼Ô"); - return decode(result); + QCString result(decode("ºî¼Ô")); + return result; } ////////////////////////////////////////////////////////////////////////// @@ -1325,8 +1319,4 @@ class TranslatorJapanese : public Translator }; - - - - #endif diff --git a/src/translator_kr.h b/src/translator_kr.h index 53f250d..67951f7 100644 --- a/src/translator_kr.h +++ b/src/translator_kr.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -20,7 +20,7 @@ #include "translator_adapter.h" -class TranslatorKorean : public Translator +class TranslatorKorean : public TranslatorAdapter_1_2_13 { public: diff --git a/src/translator_nl.h b/src/translator_nl.h index c757351..f2348cb 100644 --- a/src/translator_nl.h +++ b/src/translator_nl.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -218,7 +218,7 @@ class TranslatorDutch : public Translator QCString trForInternalUseOnly() { return "Alleen voor intern gebruik."; } QCString trReimplementedForInternalReasons() - { return "Om interne rederene opnieuwd geïmplemented; " + { return "Om interne redenen opnieuwd geïmplemented; " "de API wordt er niet door beïnvloed."; } QCString trWarning() @@ -975,6 +975,21 @@ class TranslatorDutch : public Translator return "Gebruikt"; } + /*! used in member documentation blocks to produce a list of + * members that are implemented by this one. + */ + virtual QCString trImplementedFromList(int numEntries) + { + return "Implementeert "+trWriteList(numEntries)+"."; + } + + /*! used in member documentation blocks to produce a list of + * all members that implementation this member. + */ + virtual QCString trImplementedInList(int numEntries) + { + return "Wordt geïmplementeerd door "+trWriteList(numEntries)+"."; + } }; #endif diff --git a/src/translator_no.h b/src/translator_no.h index b25c106..a3bfa71 100644 --- a/src/translator_no.h +++ b/src/translator_no.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/translator_pl.h b/src/translator_pl.h index c1246e4..cda5cd7 100644 --- a/src/translator_pl.h +++ b/src/translator_pl.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/translator_pt.h b/src/translator_pt.h index 05ade1a..8680caf 100644 --- a/src/translator_pt.h +++ b/src/translator_pt.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -31,7 +31,7 @@ #ifndef TRANSLATOR_PT_H #define TRANSLATOR_PT_H -class TranslatorPortuguese : public Translator +class TranslatorPortuguese : public TranslatorAdapter_1_2_13 { public: diff --git a/src/translator_ro.h b/src/translator_ro.h index 11c0cee..d53350b 100644 --- a/src/translator_ro.h +++ b/src/translator_ro.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/translator_ru.h b/src/translator_ru.h index 524a395..49c24dc 100644 --- a/src/translator_ru.h +++ b/src/translator_ru.h @@ -50,7 +50,7 @@ #ifndef TRANSLATOR_RU_H #define TRANSLATOR_RU_H -class TranslatorRussian : public Translator +class TranslatorRussian : public TranslatorAdapter_1_2_13 { private: /*! The Decode() inline assumes the source written in the @@ -1358,15 +1358,6 @@ class TranslatorRussian : public Translator return decode(result); } - /*! This text is generated when the \\requirements command is used - */ - virtual QCString trRequirements(bool first_capital, bool singular) - { - QCString result((first_capital ? "ôÒÅÂÏ×ÁÎÉ" : "ÔÒÅÂÏ×ÁÎÉ")); - if (!singular) result+="Ñ"; else result+="Å"; - return decode(result); - } - ////////////////////////////////////////////////////////////////////////// // new since 1.2.11 ////////////////////////////////////////////////////////////////////////// diff --git a/src/translator_se.h b/src/translator_se.h index 741b817..e69cdd9 100644 --- a/src/translator_se.h +++ b/src/translator_se.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/translator_si.h b/src/translator_si.h index ea073b5..cbc273d 100644 --- a/src/translator_si.h +++ b/src/translator_si.h @@ -21,7 +21,7 @@ #define TRANSLATOR_SI_H -class TranslatorSlovene : public Translator +class TranslatorSlovene : public TranslatorAdapter_1_2_13 { public: QCString idLanguage() diff --git a/src/translator_sk.h b/src/translator_sk.h index dfdfe3b..99f8ee2 100644 --- a/src/translator_sk.h +++ b/src/translator_sk.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -23,7 +23,7 @@ #ifndef TRANSLATOR_SK_H #define TRANSLATOR_SK_H -class TranslatorSlovak : public Translator +class TranslatorSlovak : public TranslatorAdapter_1_2_13 { private: /*! The Decode() inline assumes the source written in the diff --git a/src/util.cpp b/src/util.cpp index 25b00e4..5e20126 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -499,7 +499,7 @@ ClassDef *getResolvedClass( subst=newSubst; // strip * and & from n int ip=subst.length()-1; - while (subst.at(ip)=='*' || subst.at(ip)=='&' || subst.at(ip)==' ') ip--; + while (ip>=0 && subst.at(ip)=='*' || subst.at(ip)=='&' || subst.at(ip)==' ') ip--; subst=subst.left(ip+1); //printf(" getResolvedClass `%s'->`%s'\n",name.data(),subst.data()); @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/version.h b/src/version.h index fef5707..600735b 100644 --- a/src/version.h +++ b/src/version.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp index 049e3d5..86fb548 100644 --- a/src/xmlgen.cpp +++ b/src/xmlgen.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 @@ -32,6 +32,7 @@ #include "code.h" #include "page.h" #include "filename.h" +#include "version.h" #include <qdir.h> #include <qfile.h> @@ -997,7 +998,7 @@ static void writeMemberReference(QTextStream &t,Definition *def,MemberDef *rmd,c } } -static void generateXMLForMember(MemberDef *md,QTextStream &t,Definition *def) +static void generateXMLForMember(MemberDef *md,QTextStream &ti,QTextStream &t,Definition *def) { // + declaration/definition arg lists @@ -1015,6 +1016,9 @@ static void generateXMLForMember(MemberDef *md,QTextStream &t,Definition *def) if (md->memberType()==MemberDef::EnumValue) return; + ti << " <member id=\"" << md->getOutputFileBase() + << "_1" << md->anchor() << "\">" << md->name() << "</member>" << endl; + QCString scopeName; if (md->getClassDef()) scopeName=md->getClassDef()->name(); @@ -1250,7 +1254,7 @@ static void generateXMLForMember(MemberDef *md,QTextStream &t,Definition *def) t << " </memberdef>" << endl; } -static void generateXMLSection(Definition *d,QTextStream &t, +static void generateXMLSection(Definition *d,QTextStream &ti,QTextStream &t, MemberList *ml,const char *kind,const char *header=0) { if (ml->count()==0) return; // empty list @@ -1264,13 +1268,12 @@ static void generateXMLSection(Definition *d,QTextStream &t, MemberDef *md; for (mli.toFirst();(md=mli.current());++mli) { - generateXMLForMember(md,t,d); + generateXMLForMember(md,ti,t,d); } t << " </sectiondef>" << endl; } - -static void generateXMLForClass(ClassDef *cd,QTextStream &t) +static void generateXMLForClass(ClassDef *cd,QTextStream &ti) { // + brief description // + detailed description @@ -1292,6 +1295,21 @@ static void generateXMLForClass(ClassDef *cd,QTextStream &t) if (cd->name().find('@')!=-1) return; // skip anonymous compounds. if (cd->templateMaster()!=0) return; // skip generated template instances. + ti << " <compound id=\"" << cd->getOutputFileBase() + << "\"><name>" << cd->name() << "</name>" << endl; + + QCString outputDirectory = Config_getString("OUTPUT_DIRECTORY"); + QCString fileName=outputDirectory+"/xml/"+cd->getOutputFileBase()+".xml"; + QFile f(fileName); + if (!f.open(IO_WriteOnly)) + { + err("Cannot open file %s for writing!\n",fileName.data()); + return; + } + QTextStream t(&f); + + t << "<?xml version='1.0' encoding='ISO-8859-1' standalone='yes'?>" << endl; + t << "<doxygen version=\"" << versionString << "\">" << endl; t << " <compounddef id=\"" << cd->getOutputFileBase() << "\" kind=\"" << cd->compoundTypeString() << "\">" << endl; @@ -1364,32 +1382,32 @@ static void generateXMLForClass(ClassDef *cd,QTextStream &t) MemberGroup *mg; for (;(mg=mgli.current());++mgli) { - generateXMLSection(cd,t,mg->members(),"user-defined",mg->header()); + generateXMLSection(cd,ti,t,mg->members(),"user-defined",mg->header()); } - generateXMLSection(cd,t,&cd->pubTypes,"public-type"); - generateXMLSection(cd,t,&cd->pubMembers,"public-func"); - generateXMLSection(cd,t,&cd->pubAttribs,"public-attrib"); - generateXMLSection(cd,t,&cd->pubSlots,"public-slot"); - generateXMLSection(cd,t,&cd->signals,"signal"); - generateXMLSection(cd,t,&cd->dcopMethods,"dcop-func"); - generateXMLSection(cd,t,&cd->properties,"property"); - generateXMLSection(cd,t,&cd->pubStaticMembers,"public-static-func"); - generateXMLSection(cd,t,&cd->pubStaticAttribs,"public-static-attrib"); - generateXMLSection(cd,t,&cd->proTypes,"protected-type"); - generateXMLSection(cd,t,&cd->proMembers,"protected-func"); - generateXMLSection(cd,t,&cd->proAttribs,"protected-attrib"); - generateXMLSection(cd,t,&cd->proSlots,"protected-slot"); - generateXMLSection(cd,t,&cd->proStaticMembers,"protected-static-func"); - generateXMLSection(cd,t,&cd->proStaticAttribs,"protected-static-attrib"); - generateXMLSection(cd,t,&cd->priTypes,"private-type"); - generateXMLSection(cd,t,&cd->priMembers,"private-func"); - generateXMLSection(cd,t,&cd->priAttribs,"private-attrib"); - generateXMLSection(cd,t,&cd->priSlots,"private-slot"); - generateXMLSection(cd,t,&cd->priStaticMembers,"private-static-func"); - generateXMLSection(cd,t,&cd->priStaticAttribs,"private-static-attrib"); - generateXMLSection(cd,t,&cd->friends,"signal"); - generateXMLSection(cd,t,&cd->related,"related"); + generateXMLSection(cd,ti,t,&cd->pubTypes,"public-type"); + generateXMLSection(cd,ti,t,&cd->pubMembers,"public-func"); + generateXMLSection(cd,ti,t,&cd->pubAttribs,"public-attrib"); + generateXMLSection(cd,ti,t,&cd->pubSlots,"public-slot"); + generateXMLSection(cd,ti,t,&cd->signals,"signal"); + generateXMLSection(cd,ti,t,&cd->dcopMethods,"dcop-func"); + generateXMLSection(cd,ti,t,&cd->properties,"property"); + generateXMLSection(cd,ti,t,&cd->pubStaticMembers,"public-static-func"); + generateXMLSection(cd,ti,t,&cd->pubStaticAttribs,"public-static-attrib"); + generateXMLSection(cd,ti,t,&cd->proTypes,"protected-type"); + generateXMLSection(cd,ti,t,&cd->proMembers,"protected-func"); + generateXMLSection(cd,ti,t,&cd->proAttribs,"protected-attrib"); + generateXMLSection(cd,ti,t,&cd->proSlots,"protected-slot"); + generateXMLSection(cd,ti,t,&cd->proStaticMembers,"protected-static-func"); + generateXMLSection(cd,ti,t,&cd->proStaticAttribs,"protected-static-attrib"); + generateXMLSection(cd,ti,t,&cd->priTypes,"private-type"); + generateXMLSection(cd,ti,t,&cd->priMembers,"private-func"); + generateXMLSection(cd,ti,t,&cd->priAttribs,"private-attrib"); + generateXMLSection(cd,ti,t,&cd->priSlots,"private-slot"); + generateXMLSection(cd,ti,t,&cd->priStaticMembers,"private-static-func"); + generateXMLSection(cd,ti,t,&cd->priStaticAttribs,"private-static-attrib"); + generateXMLSection(cd,ti,t,&cd->friends,"friend"); + generateXMLSection(cd,ti,t,&cd->related,"related"); t << " <briefdescription>" << endl; writeXMLDocBlock(t,cd->getDefFileName(),cd->getDefLine(),cd->name(),0,cd->briefDescription()); @@ -1421,9 +1439,12 @@ static void generateXMLForClass(ClassDef *cd,QTextStream &t) } t << "/>" << endl; t << " </compounddef>" << endl; + t << "</doxygen>" << endl; + + ti << " </compound>" << endl; } -static void generateXMLForNamespace(NamespaceDef *nd,QTextStream &t) +static void generateXMLForNamespace(NamespaceDef *nd,QTextStream &ti) { // + contained class definitions // + contained namespace definitions @@ -1435,6 +1456,22 @@ static void generateXMLForNamespace(NamespaceDef *nd,QTextStream &t) // - files containing (parts of) the namespace definition if (nd->isReference()) return; // skip external references + + ti << " <compound id=\"" << nd->getOutputFileBase() + << "\"><name>" << nd->name() << "</name>" << endl; + + QCString outputDirectory = Config_getString("OUTPUT_DIRECTORY"); + QCString fileName=outputDirectory+"/xml/"+nd->getOutputFileBase()+".xml"; + QFile f(fileName); + if (!f.open(IO_WriteOnly)) + { + err("Cannot open file %s for writing!\n",fileName.data()); + return; + } + QTextStream t(&f); + + t << "<?xml version='1.0' encoding='ISO-8859-1' standalone='yes'?>" << endl; + t << "<doxygen version=\"" << versionString << "\">" << endl; t << " <compounddef id=\"" << nd->getOutputFileBase() << "\" kind=\"namespace\">" << endl; t << " <compoundname>"; @@ -1467,15 +1504,15 @@ static void generateXMLForNamespace(NamespaceDef *nd,QTextStream &t) MemberGroup *mg; for (;(mg=mgli.current());++mgli) { - generateXMLSection(nd,t,mg->members(),"user-defined",mg->header()); + generateXMLSection(nd,ti,t,mg->members(),"user-defined",mg->header()); } - generateXMLSection(nd,t,&nd->decDefineMembers,"define"); - generateXMLSection(nd,t,&nd->decProtoMembers,"prototype"); - generateXMLSection(nd,t,&nd->decTypedefMembers,"typedef"); - generateXMLSection(nd,t,&nd->decEnumMembers,"enum"); - generateXMLSection(nd,t,&nd->decFuncMembers,"func"); - generateXMLSection(nd,t,&nd->decVarMembers,"var"); + generateXMLSection(nd,ti,t,&nd->decDefineMembers,"define"); + generateXMLSection(nd,ti,t,&nd->decProtoMembers,"prototype"); + generateXMLSection(nd,ti,t,&nd->decTypedefMembers,"typedef"); + generateXMLSection(nd,ti,t,&nd->decEnumMembers,"enum"); + generateXMLSection(nd,ti,t,&nd->decFuncMembers,"func"); + generateXMLSection(nd,ti,t,&nd->decVarMembers,"var"); t << " <briefdescription>" << endl; writeXMLDocBlock(t,nd->getDefFileName(),nd->getDefLine(),0,0,nd->briefDescription()); @@ -1487,9 +1524,12 @@ static void generateXMLForNamespace(NamespaceDef *nd,QTextStream &t) << nd->getDefFileName() << "\" line=\"" << nd->getDefLine() << "\"/>" << endl; t << " </compounddef>" << endl; + t << "</doxygen>" << endl; + + ti << " </compound>" << endl; } -static void generateXMLForFile(FileDef *fd,QTextStream &t) +static void generateXMLForFile(FileDef *fd,QTextStream &ti) { // + includes files // + includedby files @@ -1507,6 +1547,21 @@ static void generateXMLForFile(FileDef *fd,QTextStream &t) if (fd->isReference()) return; // skip external references + ti << " <compound id=\"" << fd->getOutputFileBase() + << "\"><name>" << fd->name() << "</name>" << endl; + + QCString outputDirectory = Config_getString("OUTPUT_DIRECTORY"); + QCString fileName=outputDirectory+"/xml/"+fd->getOutputFileBase()+".xml"; + QFile f(fileName); + if (!f.open(IO_WriteOnly)) + { + err("Cannot open file %s for writing!\n",fileName.data()); + return; + } + QTextStream t(&f); + + t << "<?xml version='1.0' encoding='ISO-8859-1' standalone='yes'?>" << endl; + t << "<doxygen version=\"" << versionString << "\">" << endl; t << " <compounddef id=\"" << fd->getOutputFileBase() << "\" kind=\"file\">" << endl; t << " <compoundname>"; @@ -1583,15 +1638,15 @@ static void generateXMLForFile(FileDef *fd,QTextStream &t) MemberGroup *mg; for (;(mg=mgli.current());++mgli) { - generateXMLSection(fd,t,mg->members(),"user-defined",mg->header()); + generateXMLSection(fd,ti,t,mg->members(),"user-defined",mg->header()); } - generateXMLSection(fd,t,&fd->decDefineMembers,"define"); - generateXMLSection(fd,t,&fd->decProtoMembers,"prototype"); - generateXMLSection(fd,t,&fd->decTypedefMembers,"typedef"); - generateXMLSection(fd,t,&fd->decEnumMembers,"enum"); - generateXMLSection(fd,t,&fd->decFuncMembers,"func"); - generateXMLSection(fd,t,&fd->decVarMembers,"var"); + generateXMLSection(fd,ti,t,&fd->decDefineMembers,"define"); + generateXMLSection(fd,ti,t,&fd->decProtoMembers,"prototype"); + generateXMLSection(fd,ti,t,&fd->decTypedefMembers,"typedef"); + generateXMLSection(fd,ti,t,&fd->decEnumMembers,"enum"); + generateXMLSection(fd,ti,t,&fd->decFuncMembers,"func"); + generateXMLSection(fd,ti,t,&fd->decVarMembers,"var"); t << " <briefdescription>" << endl; writeXMLDocBlock(t,fd->getDefFileName(),fd->getDefLine(),0,0,fd->briefDescription()); @@ -1604,9 +1659,12 @@ static void generateXMLForFile(FileDef *fd,QTextStream &t) t << " </programlisting>" << endl; t << " <location file=\"" << fd->getDefFileName() << "\"/>" << endl; t << " </compounddef>" << endl; + t << "</doxygen>" << endl; + + ti << " </compound>" << endl; } -static void generateXMLForGroup(GroupDef *gd,QTextStream &t) +static void generateXMLForGroup(GroupDef *gd,QTextStream &ti) { // + members // + member groups @@ -1620,6 +1678,23 @@ static void generateXMLForGroup(GroupDef *gd,QTextStream &t) // + brief description // + detailed description + if (gd->isReference()) return; // skip external references + + ti << " <compound id=\"" << gd->getOutputFileBase() + << "\"><name>" << gd->name() << "</name>" << endl; + + QCString outputDirectory = Config_getString("OUTPUT_DIRECTORY"); + QCString fileName=outputDirectory+"/xml/"+gd->getOutputFileBase()+".xml"; + QFile f(fileName); + if (!f.open(IO_WriteOnly)) + { + err("Cannot open file %s for writing!\n",fileName.data()); + return; + } + + QTextStream t(&f); + t << "<?xml version='1.0' encoding='ISO-8859-1' standalone='yes'?>" << endl; + t << "<doxygen version=\"" << versionString << "\">" << endl; t << " <compounddef id=\"" << gd->getOutputFileBase() << "\" kind=\"group\">" << endl; t << " <compoundname>" << convertToXML(gd->name()) << "</compoundname>" << endl; @@ -1674,15 +1749,15 @@ static void generateXMLForGroup(GroupDef *gd,QTextStream &t) MemberGroup *mg; for (;(mg=mgli.current());++mgli) { - generateXMLSection(gd,t,mg->members(),"user-defined",mg->header()); + generateXMLSection(gd,ti,t,mg->members(),"user-defined",mg->header()); } - generateXMLSection(gd,t,&gd->decDefineMembers,"define"); - generateXMLSection(gd,t,&gd->decProtoMembers,"prototype"); - generateXMLSection(gd,t,&gd->decTypedefMembers,"typedef"); - generateXMLSection(gd,t,&gd->decEnumMembers,"enum"); - generateXMLSection(gd,t,&gd->decFuncMembers,"func"); - generateXMLSection(gd,t,&gd->decVarMembers,"var"); + generateXMLSection(gd,ti,t,&gd->decDefineMembers,"define"); + generateXMLSection(gd,ti,t,&gd->decProtoMembers,"prototype"); + generateXMLSection(gd,ti,t,&gd->decTypedefMembers,"typedef"); + generateXMLSection(gd,ti,t,&gd->decEnumMembers,"enum"); + generateXMLSection(gd,ti,t,&gd->decFuncMembers,"func"); + generateXMLSection(gd,ti,t,&gd->decVarMembers,"var"); t << " <briefdescription>" << endl; writeXMLDocBlock(t,gd->getDefFileName(),gd->getDefLine(),0,0,gd->briefDescription()); @@ -1691,14 +1766,34 @@ static void generateXMLForGroup(GroupDef *gd,QTextStream &t) writeXMLDocBlock(t,gd->getDefFileName(),gd->getDefLine(),0,0,gd->documentation()); t << " </detaileddescription>" << endl; t << " </compounddef>" << endl; + t << "</doxygen>" << endl; + + ti << " </compound>" << endl; } -static void generateXMLForPage(PageInfo *pi,QTextStream &t) +static void generateXMLForPage(PageInfo *pi,QTextStream &ti) { // + name // + title // + documentation + if (pi->isReference()) return; + + ti << " <compound id=\"" << pi->getOutputFileBase() + << "\"><name>" << pi->name << "</name>" << endl; + + QCString outputDirectory = Config_getString("OUTPUT_DIRECTORY"); + QCString fileName=outputDirectory+"/xml/"+pi->getOutputFileBase()+".xml"; + QFile f(fileName); + if (!f.open(IO_WriteOnly)) + { + err("Cannot open file %s for writing!\n",fileName.data()); + return; + } + + QTextStream t(&f); + t << "<?xml version='1.0' encoding='ISO-8859-1' standalone='yes'?>" << endl; + t << "<doxygen version=\"" << versionString << "\">" << endl; t << " <compounddef id=\""; if (Config_getBool("CASE_SENSE_NAMES")) t << pi->name; else t << pi->name.lower(); t << "\" kind=\"page\">" << endl; @@ -1712,6 +1807,9 @@ static void generateXMLForPage(PageInfo *pi,QTextStream &t) writeXMLDocBlock(t,pi->defFileName,pi->defLine,0,0,pi->doc); t << " </detaileddescription>" << endl; t << " </compounddef>" << endl; + t << "</doxygen>" << endl; + + ti << " </compound>" << endl; } void generateXML() @@ -1769,7 +1867,7 @@ void generateXML() return; } - QCString fileName=outputDirectory+"/xml/doxygen.xml"; + QCString fileName=outputDirectory+"/xml/index.xml"; QFile f(fileName); if (!f.open(IO_WriteOnly)) { @@ -1779,48 +1877,45 @@ void generateXML() QTextStream t(&f); t << "<?xml version='1.0' encoding='ISO-8859-1' standalone='yes'?>" << endl; //t << "<!DOCTYPE doxygen SYSTEM \"doxygen.dtd\">" << endl; - t << "<doxygen>" << endl; - if (Doxygen::classSDict.count()+Doxygen::inputNameList.count()>0) + t << "<doxygen version=\"" << versionString << "\">" << endl; + //t << " <compoundlist>" << endl; + ClassSDict::Iterator cli(Doxygen::classSDict); + ClassDef *cd; + for (cli.toFirst();(cd=cli.current());++cli) { - //t << " <compoundlist>" << endl; - ClassSDict::Iterator cli(Doxygen::classSDict); - ClassDef *cd; - for (cli.toFirst();(cd=cli.current());++cli) - { - generateXMLForClass(cd,t); - } - NamespaceSDict::Iterator nli(Doxygen::namespaceSDict); - NamespaceDef *nd; - for (nli.toFirst();(nd=nli.current());++nli) - { - generateXMLForNamespace(nd,t); - } - FileNameListIterator fnli(Doxygen::inputNameList); - FileName *fn; - for (;(fn=fnli.current());++fnli) - { - FileNameIterator fni(*fn); - FileDef *fd; - for (;(fd=fni.current());++fni) - { - generateXMLForFile(fd,t); - } - } - GroupSDict::Iterator gli(Doxygen::groupSDict); - GroupDef *gd; - for (;(gd=gli.current());++gli) - { - generateXMLForGroup(gd,t); - } - PageSDict::Iterator pdi(*Doxygen::pageSDict); - PageInfo *pi=0; - for (pdi.toFirst();(pi=pdi.current());++pdi) + generateXMLForClass(cd,t); + } + NamespaceSDict::Iterator nli(Doxygen::namespaceSDict); + NamespaceDef *nd; + for (nli.toFirst();(nd=nli.current());++nli) + { + generateXMLForNamespace(nd,t); + } + FileNameListIterator fnli(Doxygen::inputNameList); + FileName *fn; + for (;(fn=fnli.current());++fnli) + { + FileNameIterator fni(*fn); + FileDef *fd; + for (;(fd=fni.current());++fni) { - generateXMLForPage(pi,t); + generateXMLForFile(fd,t); } - - //t << " </compoundlist>" << endl; } + GroupSDict::Iterator gli(Doxygen::groupSDict); + GroupDef *gd; + for (;(gd=gli.current());++gli) + { + generateXMLForGroup(gd,t); + } + PageSDict::Iterator pdi(*Doxygen::pageSDict); + PageInfo *pi=0; + for (pdi.toFirst();(pi=pdi.current());++pdi) + { + generateXMLForPage(pi,t); + } + + //t << " </compoundlist>" << endl; t << "</doxygen>" << endl; } diff --git a/src/xmlgen.h b/src/xmlgen.h index c762d29..3a76e0e 100644 --- a/src/xmlgen.h +++ b/src/xmlgen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2001 by Dimitri van Heesch. + * 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 |