diff options
Diffstat (limited to 'src')
35 files changed, 866 insertions, 451 deletions
@@ -1994,6 +1994,11 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP} <Body>{KEYWORD}/([^a-z_A-Z0-9]) { startFontClass("keyword"); codifyLines(yytext); + if (QCString(yytext)=="typedef") + { + addType(); + g_name+=yytext; + } endFontClass(); } <Body>{KEYWORD}/{B}* { diff --git a/src/commentscan.l b/src/commentscan.l index 0ea11ed..225706b 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -43,6 +43,7 @@ #include "membergroup.h" #include "reflist.h" #include "code.h" +#include "debug.h" // forward declarations static void handleBrief(const QCString &); @@ -602,9 +603,19 @@ static inline void setOutput(OutputContext ctx) switch(inContext) { case OutputDoc: + if (current->docFile.isEmpty()) + { + current->docFile = yyFileName; + current->docLine = yyLineNr; + } pOutputString = ¤t->doc; break; case OutputBrief: + if (current->briefFile.isEmpty()) + { + current->briefFile = yyFileName; + current->briefLine = yyLineNr; + } pOutputString = ¤t->brief; break; case OutputXRef: @@ -667,8 +678,7 @@ OL [oO][lL] DL [dD][lL] IMG [iI][mM][gG] HR [hH][rR] -CODE [cC][oO][dD][eE] -DETAILEDHTML {PRE}|{UL}|{TABLE}|{OL}|{DL}|{P}|[Hh][1-6]|{IMG}|{HR}|{CODE} +DETAILEDHTML {PRE}|{UL}|{TABLE}|{OL}|{DL}|{P}|[Hh][1-6]|{IMG}|{HR} BN [ \t\n\r] BL [ \t\r]*"\n" B [ \t] @@ -1421,7 +1431,7 @@ SCOPENAME "$"?(({ID}?{BN}*"::"{BN}*)*)((~{BN}*)?{ID}) BEGIN( Comment ); } } -<SkipGuardedSection>{CMD}"else"/{NW}] { +<SkipGuardedSection>{CMD}"else"/{NW} { if (guards.isEmpty()) { warn(yyFileName,yyLineNr, @@ -2011,18 +2021,16 @@ bool parseCommentBlock(/* in,out */ Entry *curEntry, { //fprintf(stderr,"parseCommentBlock() isBrief=%d isJavaDocStyle=%d lineNr=%d\n", // isBrief,isJavaDocStyle,lineNr); + initParser(); guards.setAutoDelete(TRUE); guards.clear(); - //current_root = rootEntry; current = curEntry; - //previous = prevEntry; inputString = comment; if (inputString==0) return FALSE; // avoid empty strings inputPosition = 0; yyLineNr = lineNr; yyFileName = fileName; - //inBody = foundInBody; protection = prot; needNewEntry = FALSE; xrefKind = XRef_None; @@ -2040,11 +2048,20 @@ bool parseCommentBlock(/* in,out */ Entry *curEntry, warn(yyFileName,yyLineNr,"Documentation block ended in the middle of a conditional section!"); } + // strip any leading/trailing whitespace + current->doc=current->doc.stripWhiteSpace(); + if (current->section==Entry::FILEDOC_SEC && current->doc.isEmpty()) { // to allow a comment block with just a @file command. current->doc="\n\n"; } + + Debug::print(Debug::CommentScan,0,"CommentScanner\n%s:%d\n" + "input=[%s]\nbrief=[%s]\ndocs=[%s]\n------------\n", + fileName.data(),lineNr,comment.data(), + current->brief.data(),current->doc.data() + ); checkFormula(); prot = protection; diff --git a/src/compound.xsd b/src/compound.xsd index bdbf498..367fdd0 100644 --- a/src/compound.xsd +++ b/src/compound.xsd @@ -548,12 +548,11 @@ </xsd:sequence> </xsd:complexType> - <xsd:complexType name="docParamName"> - <xsd:simpleContent> - <xsd:extension base="xsd:string"> - <xsd:attribute name="direction" type="DoxParamDir" use="optional" /> - </xsd:extension> - </xsd:simpleContent> + <xsd:complexType name="docParamName" mixed="true"> + <xsd:sequence> + <xsd:element name="ref" type="refTextType" minOccurs="0" maxOccurs="1" /> + </xsd:sequence> + <xsd:attribute name="direction" type="DoxParamDir" use="optional" /> </xsd:complexType> <xsd:complexType name="docXRefSectType"> diff --git a/src/compound_xsd.h b/src/compound_xsd.h index a938f18..7766410 100644 --- a/src/compound_xsd.h +++ b/src/compound_xsd.h @@ -548,12 +548,11 @@ " </xsd:sequence>\n" " </xsd:complexType>\n" "\n" -" <xsd:complexType name=\"docParamName\">\n" -" <xsd:simpleContent>\n" -" <xsd:extension base=\"xsd:string\">\n" -" <xsd:attribute name=\"direction\" type=\"DoxParamDir\" use=\"optional\" />\n" -" </xsd:extension>\n" -" </xsd:simpleContent>\n" +" <xsd:complexType name=\"docParamName\" mixed=\"true\">\n" +" <xsd:sequence>\n" +" <xsd:element name=\"ref\" type=\"refTextType\" minOccurs=\"0\" maxOccurs=\"1\" />\n" +" </xsd:sequence>\n" +" <xsd:attribute name=\"direction\" type=\"DoxParamDir\" use=\"optional\" />\n" " </xsd:complexType>\n" "\n" " <xsd:complexType name=\"docXRefSectType\">\n" diff --git a/src/debug.cpp b/src/debug.cpp index 8d5e53a..d9438f7 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -18,9 +18,61 @@ #include <stdarg.h> #include <stdio.h> +#include <qdict.h> + #include "qtbc.h" #include "debug.h" +//------------------------------------------------------------------------ + +struct LabelMap +{ + const char *name; + Debug::DebugMask event; +}; + +static LabelMap s_labels[] = +{ + { "findmembers", Debug::FindMembers }, + { "functions", Debug::Functions }, + { "variables", Debug::Variables }, + { "preprocessor", Debug::Preprocessor }, + { "classes", Debug::Classes }, + { "commentcnv", Debug::CommentCnv }, + { "commentscan", Debug::CommentScan }, + { "validate", Debug::Validate }, + { "printtree", Debug::PrintTree }, + { "time", Debug::Time }, + { "extcmd", Debug::ExtCmd }, + { 0, (Debug::DebugMask)0 } +}; + +class LabelMapper +{ + public: + LabelMapper() : m_map(17) + { + m_map.setAutoDelete(TRUE); + LabelMap *p = s_labels; + while (p->name) + { + m_map.insert(p->name,new Debug::DebugMask(p->event)); + p++; + } + } + Debug::DebugMask *find(const char *s) const + { + if (s==0) return 0; + return m_map.find(s); + } + private: + QDict<Debug::DebugMask> m_map; +}; + +static LabelMapper g_labelMapper; + +//------------------------------------------------------------------------ + Debug::DebugMask Debug::curMask = Debug::Quiet; int Debug::curPrio = 0; @@ -38,29 +90,8 @@ void Debug::print(DebugMask mask,int prio,const char *fmt,...) static int labelToEnumValue(const char *l) { QCString label=l; - label=label.lower(); - if (label=="findmembers") - return Debug::FindMembers; - else if (label=="functions") - return Debug::Functions; - else if (label=="variables") - return Debug::Variables; - else if (label=="preprocessor") - return Debug::Preprocessor; - else if (label=="classes") - return Debug::Classes; - else if (label=="commentcnv") - return Debug::CommentCnv; - else if (label=="validate") - return Debug::Validate; - else if (label=="printtree") - return Debug::PrintTree; - else if (label=="time") - return Debug::Time; - else if (label=="extcmd") - return Debug::ExtCmd; - else - return 0; + Debug::DebugMask *event = g_labelMapper.find(label.lower()); + if (event) return *event; else return 0; } void Debug::setFlag(const char *lab) @@ -82,3 +113,4 @@ bool Debug::isFlagSet(DebugMask mask) { return (curMask & mask)!=0; } + diff --git a/src/debug.h b/src/debug.h index b52d916..f446396 100644 --- a/src/debug.h +++ b/src/debug.h @@ -29,10 +29,11 @@ class Debug Preprocessor = 0x00000008, Classes = 0x00000010, CommentCnv = 0x00000020, - Validate = 0x00000040, - PrintTree = 0x00000080, - Time = 0x00000100, - ExtCmd = 0x00000200 + CommentScan = 0x00000040, + Validate = 0x00000080, + PrintTree = 0x00000100, + Time = 0x00000200, + ExtCmd = 0x00000400 }; static void print(DebugMask mask,int prio,const char *fmt,...); static void setFlag(const char *label); diff --git a/src/declinfo.h b/src/declinfo.h index 2527efc..267dba4 100644 --- a/src/declinfo.h +++ b/src/declinfo.h @@ -22,6 +22,7 @@ #include <stdio.h> extern void parseFuncDecl(const QCString &decl, + bool objC, QCString &clName, QCString &type, QCString &name, diff --git a/src/declinfo.l b/src/declinfo.l index b3a296e..2160021 100644 --- a/src/declinfo.l +++ b/src/declinfo.l @@ -48,6 +48,7 @@ static int sharpCount; static bool classTempListFound; static bool funcTempListFound; static QCString exceptionString; +static bool insideObjC; static void addType() { @@ -117,6 +118,16 @@ ID ([a-z_A-Z][a-z_A-Z0-9]*)|(@[0-9]+) name += yytext; BEGIN(Operator); } +<Start>{ID}{B}*"("{B}*{ID}{B}*")" { // Objective-C class categories + if (!insideObjC) + { + REJECT; + } + else + { + name += yytext; + } + } <Start>(~{B}*)?{ID}/({B}*"["{B}*"]")* { // the []'s are for Java, // the / was add to deal with multi- // dimensional C++ arrays like A[][15] @@ -213,7 +224,7 @@ ID ([a-z_A-Z][a-z_A-Z0-9]*)|(@[0-9]+) /*@ ---------------------------------------------------------------------------- */ -void parseFuncDecl(const QCString &decl,QCString &cl,QCString &t, +void parseFuncDecl(const QCString &decl,bool objC,QCString &cl,QCString &t, QCString &n,QCString &a,QCString &ftl,QCString &exc) { inputString = decl; @@ -222,6 +233,7 @@ void parseFuncDecl(const QCString &decl,QCString &cl,QCString &t, inputPosition = 0; classTempListFound = FALSE; funcTempListFound = FALSE; + insideObjC = objC; scope.resize(0); className.resize(0); classTempList.resize(0); diff --git a/src/definition.cpp b/src/definition.cpp index b1b103e..5fb5092 100644 --- a/src/definition.cpp +++ b/src/definition.cpp @@ -217,10 +217,10 @@ void Definition::setDocumentation(const char *d,const char *docFile,int docLine, void Definition::setBriefDescription(const char *b,const char *briefFile,int briefLine) { if (b==0) return; - //printf("Definition::setBriefDescription(%s,%s,%d)\n",b,briefFile,briefLine); + //fprintf(stderr,"Definition::setBriefDescription(%s,%s,%d)\n",b,briefFile,briefLine); m_brief=QCString(b).stripWhiteSpace(); int bl=m_brief.length(); - if (bl>0) // add puntuation if needed + if (bl>0) // add punctuation if needed { switch(m_brief.at(bl-1)) { diff --git a/src/docparser.cpp b/src/docparser.cpp index 3641caa..66b0203 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -41,9 +41,16 @@ #include "searchindex.h" #include "language.h" +// debug off #define DBG(x) do {} while(0) + +// debug to stdout //#define DBG(x) printf x +// debug to stderr +//#define myprintf(x...) fprintf(stderr,x) +//#define DBG(x) myprintf x + #define INTERNAL_ASSERT(x) do {} while(0) //#define INTERNAL_ASSERT(x) if (!(x)) DBG(("INTERNAL_ASSERT(%s) failed retval=0x%x: file=%s line=%d\n",#x,retval,__FILE__,__LINE__)); @@ -3347,7 +3354,8 @@ int DocParamList::parse(const QString &cmdName) g_hasReturnCommand=TRUE; checkArgumentName(g_token->name,FALSE); } - m_params.append(g_token->name); + //m_params.append(g_token->name); + handleLinkedWord(this,m_params); tok=doctokenizerYYlex(); } doctokenizerYYsetStatePara(); diff --git a/src/docparser.h b/src/docparser.h index 37a2036..e647e84 100644 --- a/src/docparser.h +++ b/src/docparser.h @@ -206,7 +206,7 @@ class DocLinkedWord : public DocNode const QString &ref,const QString &file, const QString &anchor); QString word() const { return m_word; } - Kind kind() const { return Kind_Word; } + Kind kind() const { return Kind_LinkedWord; } DocNode *parent() const { return m_parent; } QString file() const { return m_file; } QString relPath() const { return m_relPath; } @@ -993,7 +993,8 @@ class DocParamList : public DocNode virtual ~DocParamList() { delete m_paragraph; } Kind kind() const { return Kind_ParamList; } DocNode *parent() const { return m_parent; } - const QStrList ¶meters() { return m_params; } + //const QStrList ¶meters() { return m_params; } + const QList<DocNode> ¶meters() { return m_params; } DocParamSect::Type type() const { return m_type; } DocParamSect::Direction direction() const { return m_dir; } void markFirst(bool b=TRUE) { m_isFirst=b; } @@ -1011,7 +1012,8 @@ class DocParamList : public DocNode private: DocNode * m_parent; DocPara * m_paragraph; - QStrList m_params; + //QStrList m_params; + QList<DocNode> m_params; DocParamSect::Type m_type; DocParamSect::Direction m_dir; bool m_isFirst; diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 3db9682..7a0ab82 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -1909,7 +1909,7 @@ static void buildVarList(Entry *root) } } - QCString scope,name=root->name.copy(); + QCString scope,name=removeRedundantWhiteSpace(root->name); // find the scope of this variable Entry *p = root->parent; @@ -1939,7 +1939,7 @@ static void buildVarList(Entry *root) addVariableToClass(root, // entry cd, // class to add member to MemberDef::Friend, // type of member - root->name, // name of the member + name, // name of the member FALSE, // from Anonymous scope 0, // anonymous member Public, // protection @@ -1986,11 +1986,12 @@ static void buildVarList(Entry *root) if (!scope.isEmpty() && !name.isEmpty() && (cd=getClass(scope))) { - // TODO: clean up this mess! MemberDef *md=0; -#if 0 + // if cd is an annonymous scope we insert the member - // into a non-annonymous scope as well. + // into a non-annonymous scope as well. This is needed to + // be able to refer to it using \var or \fn + //int indentDepth=0; int si=scope.find('@'); //int anonyScopes = 0; @@ -2019,14 +2020,16 @@ static void buildVarList(Entry *root) ); added=TRUE; } - else // annonymous scope inside namespace or file => put variable in the global scope + else // anonymous scope inside namespace or file => put variable in the global scope { - md=addVariableToFile(root,mtype,pScope,name,TRUE,0); + if (mtype==MemberDef::Variable) + { + md=addVariableToFile(root,mtype,pScope,name,TRUE,0); + } added=TRUE; } } } -#endif //printf("name=`%s' scope=%s scope.right=%s indentDepth=%d anonyScopes=%d\n", // name.data(),scope.data(), // scope.right(scope.length()-si).data(), @@ -2266,7 +2269,8 @@ static void buildFunctionList(Entry *root) int te=rname.find('>'); if (ts==-1 || te==-1) { - isMember=TRUE; + NamespaceDef *nd = Doxygen::namespaceSDict.find(rname.left(memIndex)); + isMember=nd==0; } else { @@ -2289,11 +2293,12 @@ static void buildFunctionList(Entry *root) addMethodToClass(root,cd,rname,isFriend); } else if (root->parent && - !((root->parent->section & Entry::COMPOUND_MASK) || root->parent->section==Entry::OBJCIMPL_SEC) && + !((root->parent->section & Entry::COMPOUND_MASK) + || root->parent->section==Entry::OBJCIMPL_SEC + ) && !isMember && (root->relates.isEmpty() || root->relatesDup) && - root->type.left(7)!="extern " && - root->type.left(8)!="typedef " + root->type.left(7)!="extern " && root->type.left(8)!="typedef " ) // no member => unrelated function { @@ -4341,10 +4346,10 @@ static void findMember(Entry *root, Debug::print(Debug::FindMembers,0, "findMember(root=%p,funcDecl=`%s',related=`%s',overload=%d," "isFunc=%d mGrpId=%d tArgList=%p (#=%d) " - "memSpec=%d\n", + "memSpec=%d isObjC=%d\n", root,funcDecl.data(),root->relates.data(),overloaded,isFunc,root->mGrpId, root->tArgLists,root->tArgLists ? root->tArgLists->count() : 0, - root->memSpec + root->memSpec,root->objc ); QCString scopeName; @@ -4427,7 +4432,7 @@ static void findMember(Entry *root, else { // extract information from the declarations - parseFuncDecl(funcDecl,scopeName,funcType,funcName, + parseFuncDecl(funcDecl,root->objc,scopeName,funcType,funcName, funcArgs,funcTempList,exceptions ); } @@ -4648,6 +4653,11 @@ static void findMember(Entry *root, if (!namespaceName.isEmpty()) nd=getResolvedNamespace(namespaceName); ClassDef *tcd=findClassDefinition(fd,nd,scopeName); + if (tcd==0 && stripAnonymousNamespaceScope(cd->name())==scopeName) + { + // don't be fooled by anonymous scopes + tcd=cd; + } //printf("Looking for %s inside nd=%s result=%p\n", // scopeName.data(),nd?nd->name().data():"<none>",tcd); @@ -5179,6 +5189,16 @@ static void findMember(Entry *root, Doxygen::memberNameSDict.append(funcName,mn); } } + if (root->relatesDup) + { + if (!findGlobalMember(root,namespaceName,funcName,funcTempList,funcArgs,funcDecl)) + { + warn(root->fileName,root->startLine, + "Warning: Cannot determine file/namespace for relatedalso function\n%s", + fullFuncDecl.data() + ); + } + } } else { @@ -6124,7 +6144,7 @@ static void generateClassDocs() writeHierarchicalIndex(*outputList); msg("Generating member index...\n"); - writeMemberIndex(*outputList); + writeClassMemberIndex(*outputList); if (Doxygen::exampleSDict->count()>0) { @@ -7196,9 +7216,12 @@ static bool patternMatch(QFileInfo *fi,QStrList *patList) bool found=FALSE; if (patList) { - char *pattern=patList->first(); - while (pattern && !found) + QCString pattern=patList->first(); + while (!pattern.isEmpty() && !found) { + int i=pattern.find('='); + if (i!=-1) pattern=pattern.left(i); // strip of the extension specific filter name + //printf("Matching `%s' against pattern `%s'\n",fi->fileName().data(),pattern); #if defined(_WIN32) // windows QRegExp re(pattern,FALSE,TRUE); // case insensitive match diff --git a/src/formula.cpp b/src/formula.cpp index ac05dc7..07c6bb4 100644 --- a/src/formula.cpp +++ b/src/formula.cpp @@ -103,7 +103,9 @@ void FormulaList::generateBitmaps(const char *path) { //printf("Running latex...\n"); //system("latex _formulas.tex </dev/null >/dev/null"); - if (iSystem("latex","_formulas.tex")!=0) + QCString latexCmd = Config_getString("LATEX_CMD_NAME"); + if (latexCmd.isEmpty()) latexCmd="latex"; + if (iSystem(latexCmd,"_formulas.tex")!=0) { err("Problems running latex. Check your installation or look for typos in _formulas.tex!\n"); formulaError=TRUE; diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index 33de0e3..370f6a7 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -903,13 +903,22 @@ void HtmlDocVisitor::visitPre(DocParamList *pl) m_t << "]</tt> "; } m_t << "</td><td valign=\"top\"><em>"; - QStrListIterator li(pl->parameters()); - const char *s; + //QStrListIterator li(pl->parameters()); + //const char *s; + QListIterator<DocNode> li(pl->parameters()); + DocNode *param; bool first=TRUE; - for (li.toFirst();(s=li.current());++li) + for (li.toFirst();(param=li.current());++li) { if (!first) m_t << ","; else first=FALSE; - filter(s); + if (param->kind()==DocNode::Kind_Word) + { + visit((DocWord*)param); + } + else if (param->kind()==DocNode::Kind_LinkedWord) + { + visit((DocLinkedWord*)param); + } } m_t << "</em> </td><td>"; } diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index 1bea909..a435d61 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -57,7 +57,7 @@ static const char *defaultStyleSheet = " font-size: 120%;\n" "}\n" "H3 {\n" -" font-size: 110%;\n" +" font-size: 100%;\n" "}\n" "CAPTION { font-weight: bold }\n" "DIV.qindex {\n" @@ -126,7 +126,7 @@ static const char *defaultStyleSheet = "DL.el { margin-left: -1cm }\n" ".fragment {\n" " font-family: Fixed, monospace;\n" -" font-size: 90%;\n" +" font-size: 95%;\n" "}\n" "PRE.fragment {\n" " border: 1px solid #CCCCCC;\n" diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp index 3b9be87..0bd6f0c 100644 --- a/src/htmlhelp.cpp +++ b/src/htmlhelp.cpp @@ -37,6 +37,7 @@ struct IndexField QCString url; QCString anchor; bool link; + bool reversed; }; class IndexFieldList : public QList<IndexField> @@ -72,7 +73,8 @@ class HtmlHelpIndex HtmlHelpIndex(); ~HtmlHelpIndex(); void addItem(const char *first,const char *second, - const char *url, const char *anchor,bool hasLink); + const char *url, const char *anchor, + bool hasLink,bool reversed); void writeFields(QTextStream &t); private: IndexFieldList *list; @@ -104,9 +106,12 @@ HtmlHelpIndex::~HtmlHelpIndex() * \param anchor the anchor of the documentation within the page. * \param hasLink if true, the url (without anchor) can be used in the * level1 item, when writing the header of a list of level2 items. + * \param reversed TRUE if level1 is the member name and level2 the compound + * name. */ void HtmlHelpIndex::addItem(const char *level1,const char *level2, - const char *url,const char *anchor,bool hasLink) + const char *url,const char *anchor,bool hasLink, + bool reversed) { QCString key = level1; if (level2) key+= (QCString)"?" + level2; @@ -115,10 +120,11 @@ void HtmlHelpIndex::addItem(const char *level1,const char *level2, //printf(">>>>>>>>> HtmlHelpIndex::addItem(%s,%s,%s,%s)\n", // level1,level2,url,anchor); IndexField *f = new IndexField; - f->name = key; - f->url = url; - f->anchor = anchor; - f->link = hasLink; + f->name = key; + f->url = url; + f->anchor = anchor; + f->link = hasLink; + f->reversed = reversed; list->inSort(f); dict->insert(key,f); } @@ -199,7 +205,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t) { t << " <LI><OBJECT type=\"text/sitemap\">"; t << "<param name=\"Local\" value=\"" << f->url << Doxygen::htmlFileExtension; - if (!f->anchor.isEmpty()) t << "#" << f->anchor; + if (!f->anchor.isEmpty() && f->reversed) t << "#" << f->anchor; t << "\">"; t << "<param name=\"Name\" value=\"" << level1 << "\">" "</OBJECT>\n"; @@ -210,7 +216,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t) { t << " <LI><OBJECT type=\"text/sitemap\">"; t << "<param name=\"Local\" value=\"" << f->url << Doxygen::htmlFileExtension; - if (!f->anchor.isEmpty()) t << "#" << f->anchor; + if (!f->anchor.isEmpty() && f->reversed) t << "#" << f->anchor; t << "\">"; t << "<param name=\"Name\" value=\"" << level1 << "\">" "</OBJECT>\n"; @@ -245,6 +251,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t) } lastLevel1 = level1.copy(); } + if (level2Started) t << " </UL>" << endl; } //---------------------------------------------------------------------------- @@ -551,7 +558,7 @@ void HtmlHelp::addContentsItem(bool isDir, void HtmlHelp::addIndexItem(const char *level1, const char *level2, const char *ref, const char *anchor) { - index->addItem(level1,level2,ref,anchor,TRUE); - index->addItem(level2,level1,ref,anchor,TRUE); + index->addItem(level1,level2,ref,anchor,TRUE,FALSE); + index->addItem(level2,level1,ref,anchor,TRUE,TRUE); } diff --git a/src/index.cpp b/src/index.cpp index ae64403..a270a1b 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -92,7 +92,6 @@ void countDataStructures() static void startIndexHierarchy(OutputList &ol,int level) { - // UGLY HACK! ol.pushGeneratorState(); ol.disable(OutputGenerator::Man); ol.disable(OutputGenerator::Html); @@ -106,7 +105,6 @@ static void startIndexHierarchy(OutputList &ol,int level) static void endIndexHierarchy(OutputList &ol,int level) { - // UGLY HACK! ol.pushGeneratorState(); ol.disable(OutputGenerator::Man); ol.disable(OutputGenerator::Html); @@ -1695,7 +1693,7 @@ void writeQuickMemberIndex(OutputList &ol,bool *charUsed,int page, //---------------------------------------------------------------------------- -static void writeMemberIndexFiltered(OutputList &ol, ClassMemberHighlight hl) +static void writeClassMemberIndexFiltered(OutputList &ol, ClassMemberHighlight hl) { if (documentedClassMembers[hl]==0) return; @@ -1791,31 +1789,34 @@ static void writeMemberIndexFiltered(OutputList &ol, ClassMemberHighlight hl) ol.popGeneratorState(); } -void writeMemberIndex(OutputList &ol) +void writeClassMemberIndex(OutputList &ol) { - writeMemberIndexFiltered(ol,CMHL_All); - writeMemberIndexFiltered(ol,CMHL_Functions); - writeMemberIndexFiltered(ol,CMHL_Variables); - writeMemberIndexFiltered(ol,CMHL_Typedefs); - writeMemberIndexFiltered(ol,CMHL_Enums); - writeMemberIndexFiltered(ol,CMHL_EnumValues); - writeMemberIndexFiltered(ol,CMHL_Properties); - writeMemberIndexFiltered(ol,CMHL_Events); - writeMemberIndexFiltered(ol,CMHL_Related); - - QCString title = theTranslator->trCompoundMembers(); - bool &generateHtml = Config_getBool("GENERATE_HTML") ; - bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP"); - bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW"); - if (hasHtmlHelp) - { - HtmlHelp *htmlHelp = HtmlHelp::getInstance(); - htmlHelp->addContentsItem(FALSE,title,"functions"); - } - if (hasFtvHelp) - { - FTVHelp *ftvHelp = FTVHelp::getInstance(); - ftvHelp->addContentsItem(FALSE,0,"functions",0,title); + writeClassMemberIndexFiltered(ol,CMHL_All); + writeClassMemberIndexFiltered(ol,CMHL_Functions); + writeClassMemberIndexFiltered(ol,CMHL_Variables); + writeClassMemberIndexFiltered(ol,CMHL_Typedefs); + writeClassMemberIndexFiltered(ol,CMHL_Enums); + writeClassMemberIndexFiltered(ol,CMHL_EnumValues); + writeClassMemberIndexFiltered(ol,CMHL_Properties); + writeClassMemberIndexFiltered(ol,CMHL_Events); + writeClassMemberIndexFiltered(ol,CMHL_Related); + + if (documentedClassMembers[CMHL_All]>0) + { + QCString title = theTranslator->trCompoundMembers(); + bool &generateHtml = Config_getBool("GENERATE_HTML") ; + bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP"); + bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW"); + if (hasHtmlHelp) + { + HtmlHelp *htmlHelp = HtmlHelp::getInstance(); + htmlHelp->addContentsItem(FALSE,title,"functions"); + } + if (hasFtvHelp) + { + FTVHelp *ftvHelp = FTVHelp::getInstance(); + ftvHelp->addContentsItem(FALSE,0,"functions",0,title); + } } } @@ -2193,19 +2194,22 @@ void writeFileMemberIndex(OutputList &ol) writeFileMemberIndexFiltered(ol,FMHL_EnumValues); writeFileMemberIndexFiltered(ol,FMHL_Defines); - QCString title = theTranslator->trFileMembers(); - bool &generateHtml = Config_getBool("GENERATE_HTML") ; - bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP"); - bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW"); - if (hasHtmlHelp) + if (documentedFileMembers[FMHL_All]>0) { - HtmlHelp *htmlHelp = HtmlHelp::getInstance(); - htmlHelp->addContentsItem(FALSE,title,"globals"); - } - if (hasFtvHelp) - { - FTVHelp *ftvHelp = FTVHelp::getInstance(); - ftvHelp->addContentsItem(FALSE,0,"globals",0,title); + QCString title = theTranslator->trFileMembers(); + bool &generateHtml = Config_getBool("GENERATE_HTML") ; + bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP"); + bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW"); + if (hasHtmlHelp) + { + HtmlHelp *htmlHelp = HtmlHelp::getInstance(); + htmlHelp->addContentsItem(FALSE,title,"globals"); + } + if (hasFtvHelp) + { + FTVHelp *ftvHelp = FTVHelp::getInstance(); + ftvHelp->addContentsItem(FALSE,0,"globals",0,title); + } } } @@ -2309,19 +2313,22 @@ void writeNamespaceMemberIndex(OutputList &ol) writeNamespaceMemberIndexFiltered(ol,NMHL_Enums); writeNamespaceMemberIndexFiltered(ol,NMHL_EnumValues); - QCString title = theTranslator->trNamespaceMembers(); - bool &generateHtml = Config_getBool("GENERATE_HTML") ; - bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP"); - bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW"); - if (hasHtmlHelp) - { - HtmlHelp *htmlHelp = HtmlHelp::getInstance(); - htmlHelp->addContentsItem(FALSE,title,"namespacemembers"); - } - if (hasFtvHelp) + if (documentedNamespaceMembers[NMHL_All]>0) { - FTVHelp *ftvHelp = FTVHelp::getInstance(); - ftvHelp->addContentsItem(FALSE,0,"namespacemembers",0,title); + QCString title = theTranslator->trNamespaceMembers(); + bool &generateHtml = Config_getBool("GENERATE_HTML") ; + bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP"); + bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW"); + if (hasHtmlHelp) + { + HtmlHelp *htmlHelp = HtmlHelp::getInstance(); + htmlHelp->addContentsItem(FALSE,title,"namespacemembers"); + } + if (hasFtvHelp) + { + FTVHelp *ftvHelp = FTVHelp::getInstance(); + ftvHelp->addContentsItem(FALSE,0,"namespacemembers",0,title); + } } } diff --git a/src/index.h b/src/index.h index cb782c4..89b8179 100644 --- a/src/index.h +++ b/src/index.h @@ -49,24 +49,28 @@ void writeIndex(OutputList &ol); void writeHierarchicalIndex(OutputList &ol); void writeAlphabeticalIndex(OutputList &ol); void writeClassHierarchy(OutputList &ol); -void writeFileIndex(OutputList &ol); -void writeSourceIndex(OutputList &ol); void writeAnnotatedIndex(OutputList &ol); void writeAnnotatedClassList(OutputList &ol); -void writeMemberIndex(OutputList &ol); void writeMemberList(OutputList &ol,bool useSections); + +void writeSourceIndex(OutputList &ol); void writeHeaderIndex(OutputList &ol); void writeHeaderFileList(OutputList &ol); + void writeExampleIndex(OutputList &ol); void writePageIndex(OutputList &ol); -void writeFileMemberIndex(OutputList &ol); +void writeFileIndex(OutputList &ol); +void writeNamespaceIndex(OutputList &ol); void writeGroupIndex(OutputList &ol); void writeDirIndex(OutputList &ol); -void writeNamespaceIndex(OutputList &ol); +void writePackageIndex(OutputList &ol); + +void writeClassMemberIndex(OutputList &ol); +void writeFileMemberIndex(OutputList &ol); void writeNamespaceMemberIndex(OutputList &ol); + void writeGraphicalClassHierarchy(OutputList &ol); void writeGraphInfo(OutputList &ol); -void writePackageIndex(OutputList &ol); void countDataStructures(); diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp index ab2ee83..8cbefc0 100644 --- a/src/latexdocvisitor.cpp +++ b/src/latexdocvisitor.cpp @@ -909,14 +909,23 @@ void LatexDocVisitor::visitPre(DocParamList *pl) m_t << "} "; } m_t << "{\\em "; - QStrListIterator li(pl->parameters()); - const char *s; + //QStrListIterator li(pl->parameters()); + //const char *s; + QListIterator<DocNode> li(pl->parameters()); + DocNode *param; bool first=TRUE; - for (li.toFirst();(s=li.current());++li) + for (li.toFirst();(param=li.current());++li) { if (!first) m_t << ","; else first=FALSE; m_insideItem=TRUE; - filter(s); + if (param->kind()==DocNode::Kind_Word) + { + visit((DocWord*)param); + } + else if (param->kind()==DocNode::Kind_LinkedWord) + { + visit((DocLinkedWord*)param); + } m_insideItem=FALSE; } m_t << "}]"; diff --git a/src/mandocvisitor.cpp b/src/mandocvisitor.cpp index 0d731fb..e600709 100644 --- a/src/mandocvisitor.cpp +++ b/src/mandocvisitor.cpp @@ -804,13 +804,22 @@ void ManDocVisitor::visitPre(DocParamList *pl) { if (m_hide) return; m_t << "\\fI"; - QStrListIterator li(pl->parameters()); - const char *s; + //QStrListIterator li(pl->parameters()); + //const char *s; + QListIterator<DocNode> li(pl->parameters()); + DocNode *param; bool first=TRUE; - for (li.toFirst();(s=li.current());++li) + for (li.toFirst();(param=li.current());++li) { if (!first) m_t << ","; else first=FALSE; - m_t << s; + if (param->kind()==DocNode::Kind_Word) + { + visit((DocWord*)param); + } + else if (param->kind()==DocNode::Kind_LinkedWord) + { + visit((DocLinkedWord*)param); + } } m_t << "\\fP "; } diff --git a/src/pagedef.cpp b/src/pagedef.cpp index b54a937..ec16276 100644 --- a/src/pagedef.cpp +++ b/src/pagedef.cpp @@ -59,7 +59,7 @@ void PageDef::writeDocumentation(OutputList &ol) startFile(ol,pageName,pageName,title()); - if (getOuterScope()!=Doxygen::globalScope) + if (getOuterScope()!=Doxygen::globalScope && !Config_getBool("DISABLE_INDEX")) { getOuterScope()->writeNavigationPath(ol); } diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp index 902b0b1..e501428 100644 --- a/src/perlmodgen.cpp +++ b/src/perlmodgen.cpp @@ -1165,10 +1165,21 @@ void PerlModDocVisitor::visitPre(DocParamList *pl) leaveText(); m_output.openHash() .openList("parameters"); - QStrListIterator li(pl->parameters()); - const char *s; - for (li.toFirst();(s=li.current());++li) + //QStrListIterator li(pl->parameters()); + //const char *s; + QListIterator<DocNode> li(pl->parameters()); + DocNode *param; + for (li.toFirst();(param=li.current());++li) { + QCString s; + if (param->kind()==DocNode::Kind_Word) + { + s = ((DocWord*)param)->word(); + } + else if (param->kind()==DocNode::Kind_LinkedWord) + { + s = ((DocLinkedWord*)param)->word(); + } m_output.openHash() .addFieldQuotedString("name", s) .closeHash(); diff --git a/src/printdocvisitor.h b/src/printdocvisitor.h index 863cfec..2cdd390 100644 --- a/src/printdocvisitor.h +++ b/src/printdocvisitor.h @@ -547,12 +547,23 @@ class PrintDocVisitor : public DocVisitor void visitPre(DocParamList *pl) { indent_pre(); - QStrListIterator sli(pl->parameters()); - const char *s; + //QStrListIterator sli(pl->parameters()); + QListIterator<DocNode> sli(pl->parameters()); + //const char *s; + DocNode *param; printf("<parameters>"); - for (sli.toFirst();(s=sli.current());++sli) + for (sli.toFirst();(param=sli.current());++sli) { - printf("<param>%s</param>",s); + printf("<param>"); + if (param->kind()==DocNode::Kind_Word) + { + visit((DocWord*)param); + } + else if (param->kind()==DocNode::Kind_LinkedWord) + { + visit((DocLinkedWord*)param); + } + printf("</param>"); } printf("\n"); } diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp index 7ce804b..58046b1 100644 --- a/src/rtfdocvisitor.cpp +++ b/src/rtfdocvisitor.cpp @@ -1150,13 +1150,22 @@ void RTFDocVisitor::visitPre(DocParamList *pl) if (m_hide) return; DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocParamList)}\n"); m_t << "{\\i "; - QStrListIterator li(pl->parameters()); - const char *s; + //QStrListIterator li(pl->parameters()); + //const char *s; + QListIterator<DocNode> li(pl->parameters()); + DocNode *param; bool first=TRUE; - for (li.toFirst();(s=li.current());++li) + for (li.toFirst();(param=li.current());++li) { if (!first) m_t << ","; else first=FALSE; - filter(s); + if (param->kind()==DocNode::Kind_Word) + { + visit((DocWord*)param); + } + else if (param->kind()==DocNode::Kind_LinkedWord) + { + visit((DocLinkedWord*)param); + } } m_t << "} "; m_lastIsPara=TRUE; diff --git a/src/scanner.l b/src/scanner.l index 9617c42..c68e351 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -213,6 +213,7 @@ static void initParser() lastDefGroup.groupname.resize(0); insideFormula = FALSE; insideCode=FALSE; + previous = 0; } static void initEntry() @@ -225,6 +226,7 @@ static void initEntry() current->mGrpId = memberGroupId; current->relates = memberGroupRelates.copy(); current->inside = memberGroupInside.copy(); + current->objc = insideObjC; if (!autoGroupStack.isEmpty()) { //printf("Appending group %s\n",autoGroupStack.top()->groupname.data()); @@ -1133,6 +1135,7 @@ IDLATTR ("["[^\]]*"]"){BN}* current->bodyLine = yyLineNr; current->section = Entry::FUNCTION_SEC; current->protection = protection = Public ; + current->objc = TRUE; current->virt = Virtual; current->stat=yytext[0]=='+'; current->mtype = mtype = Method; @@ -2141,7 +2144,10 @@ IDLATTR ("["[^\]]*"]"){BN}* <FindMembers,FindFields>("//"([!/]?){B}*{CMD}"{")|("/*"([!*]?){B}*{CMD}"{") { #ifdef COMMENTSCAN Entry *tmp = current; - current = previous; + if (previous) + { + current = previous; + } handleGroupStartCommand(current->name); current = tmp; initEntry(); @@ -2749,7 +2755,7 @@ IDLATTR ("["[^\]]*"]"){BN}* unput(';'); BEGIN( MemberSpec ) ; } -<MemberSpec>([*&]*{BN}*)*{ID}("["[a-z_A-Z0-9]*"]")* { // the [] part could be improved. +<MemberSpec>([*&]*{BN}*)*{ID}("["[^\]\n]*"]")* { // the [] part could be improved. lineCount(); int i=0,l=yyleng,j; while (i<l && (!isId(yytext[i]))) i++; @@ -6405,7 +6411,7 @@ static void parseCompounds(Entry *rt) setContext(); yyLineNr = ce->startLine ; insideObjC = ce->objc; - //printf("---> Inner block starts at line %d\n",yyLineNr); + //printf("---> Inner block starts at line %d objC=%d\n",yyLineNr,insideObjC); //current->reset(); if (current) delete current; current = new Entry; @@ -6621,6 +6627,7 @@ void handleGroupStartCommand(const char *header) void handleGroupEndCommand() { endGroup(); + previous=0; } diff --git a/src/translator_br.h b/src/translator_br.h index 807ed9d..0cca480 100644 --- a/src/translator_br.h +++ b/src/translator_br.h @@ -12,9 +12,11 @@ * * Brazilian Portuguese version by * Fabio "FJTC" Jun Takada Chino <jun-chino at uol.com.br> - * Version: 1.3.8 (2004/06/30) + * Version: 1.4.1 (2005/03/20) * * History: + * 1.4.1 + * - Method trOverloadText() added. * 1.3.9 * - Updated to Doxygen 1.3.9 * 1.3.8 @@ -34,7 +36,7 @@ #ifndef TRANSLATOR_BR_H #define TRANSLATOR_BR_H -class TranslatorBrazilian : public TranslatorAdapter_1_4_1 +class TranslatorBrazilian : public Translator { public: @@ -1597,5 +1599,19 @@ class TranslatorBrazilian : public TranslatorAdapter_1_4_1 if (!singular) result+="s"; return result; } +////////////////////////////////////////////////////////////////////////// +// new since 1.4.1 +////////////////////////////////////////////////////////////////////////// + + /*! This text is added to the documentation when the \\overload command + * is used for a overloaded function. + */ + virtual QCString trOverloadText() + { + return "Este um mtodo provido por convenincia. " + "Ele difere do mtodo acima apenas na lista de " + "argumentos que devem ser utilizados."; + } + }; #endif diff --git a/src/translator_ca.h b/src/translator_ca.h index ebcc259..6ef3fa8 100644 --- a/src/translator_ca.h +++ b/src/translator_ca.h @@ -39,7 +39,7 @@ // Translator class (by the local maintainer) when the localized // translator is made up-to-date again. -class TranslatorCatalan : public TranslatorAdapter_1_2_17 +class TranslatorCatalan : public TranslatorAdapter_1_4_1 { public: @@ -87,40 +87,40 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! subscript for the related functions. */ virtual QCString trRelatedSubscript() - { return "(Remarcar que aquestes funcions no sn funcions membre.)"; } + { return "(Remarcar que aquestes funcions no són funcions membre.)"; } /*! header that is put before the detailed description of files, classes and namespaces. */ virtual QCString trDetailedDescription() - { return "Descripci detallada"; } + { return "Descripció Detallada"; } /*! header that is put before the list of typedefs. */ virtual QCString trMemberTypedefDocumentation() - { return "Documentaci de les Definicions de Tipus membre"; } + { return "Documentació de les Definicions de Tipus Membre"; } /*! header that is put before the list of enumerations. */ virtual QCString trMemberEnumerationDocumentation() - { return "Documentaci de les Enumeracions membre"; } + { return "Documentació de les Enumeracions Membre"; } /*! header that is put before the list of member functions. */ virtual QCString trMemberFunctionDocumentation() - { return "Documentaci de les Funcions membre"; } + { return "Documentació de les Funcions Membre"; } /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - return "Documentaci dels camps"; + return "Documentació dels Camps"; } else { - return "Documentaci de les dades membre"; + return "Documentació de les Dades Membre"; } } /*! this is the text of a link put after brief descriptions. */ virtual QCString trMore() - { return "Ms..."; } + { return "Més..."; } /*! put in the class documentation */ virtual QCString trListOfAllMembers() @@ -128,11 +128,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! used as the title of the "list of all members" page of a class */ virtual QCString trMemberList() - { return "Llista dels membres"; } + { return "Llista dels Membres"; } /*! this is the first part of a sentence that is followed by a class name */ virtual QCString trThisIsTheListOfAllMembers() - { return "Aquesta s la llista complerta dels membres de "; } + { return "Aquesta és la llista complerta dels membres de "; } /*! this is the remainder of the sentence after the class name */ virtual QCString trIncludingInheritedMembers() @@ -142,7 +142,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 * parameter s is name of the project name. */ virtual QCString trGeneratedAutomatically(const char *s) - { QCString result="Generat automticament per Doxygen"; + { QCString result="Generat automàticament per Doxygen"; if (s) result+=(QCString)" per a "+s; result+=" a partir del codi font."; return result; @@ -166,7 +166,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 * compounds or files (see the \\group command). */ virtual QCString trModules() - { return "Mduls"; } + { return "Mòduls"; } /*! This is put above each page as a link to the class hierarchy */ virtual QCString trClassHierarchy() @@ -181,28 +181,28 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 } else { - return "Llistes Compostes"; + return "Llista de Classes"; } } /*! This is put above each page as a link to the list of documented files */ virtual QCString trFileList() - { return "Llista dels arxius"; } + { return "Llista dels Fitxers"; } /*! This is put above each page as a link to the list of all verbatim headers */ virtual QCString trHeaderFiles() - { return "Fitxers d'encapalaments"; } + { return "Fitxers d'encapçalaments"; } /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - return "Camps de dades"; + return "Camps de Dades"; } else { - return "Membres compostos"; + return "Membres de Classes"; } } @@ -215,13 +215,13 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 } else { - return "Arxius membres"; + return "Membres de Fitxers"; } } /*! This is put above each page as a link to all related pages. */ virtual QCString trRelatedPages() - { return "Pgines relacionades"; } + { return "Pàgines Relacionades"; } /*! This is put above each page as a link to all examples. */ virtual QCString trExamples() @@ -233,14 +233,14 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! This is an introduction to the class hierarchy. */ virtual QCString trClassHierarchyDescription() - { return "Aquesta llista d'herncia est ordenada toscament, " - "per no completa, de forma alfabtica:"; + { return "Aquesta llista d'herència està ordenada toscament, " + "però no completa, de forma alfabètica:"; } /*! This is an introduction to the list with all files. */ virtual QCString trFileListDescription(bool extractAll) { - QCString result="Aquesta s la llista de tots els arxius "; + QCString result="Aquesta és la llista de tots els fitxers "; if (!extractAll) result+="documentats "; result+="acompanyats amb breus descripcions:"; return result; @@ -252,19 +252,19 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - return "Aquestes sn les estructures de dades acompanyades amb breus descripcions:"; + return "Aquestes són les estructures de dades acompanyades amb breus descripcions:"; } else { - return "Aquestes sn les classes, estructures, " - "unions i interfcies acompnyades amb breus descripcions:"; + return "Aquestes són les classes, estructures, " + "unions i interfícies acompanyades amb breus descripcions:"; } } /*! This is an introduction to the page with all class members. */ virtual QCString trCompoundMembersDescription(bool extractAll) { - QCString result="Aquesta s la llista de tots els "; + QCString result="Aquesta és la llista de tots els "; if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { result+="camps d'estructures i unions"; @@ -275,29 +275,29 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 } if (!extractAll) { - result+="documentats "; + result+=" documentats"; } - result+=" amb enllaos a "; + result+=" amb enllaços a "; if (!extractAll) { if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - result+="la documentaci de l'estructura/uni per a cada camp:"; + result+="la documentació de l'estructura/unió per a cada camp:"; } else { - result+="la documentaci de la classe per a cada membre:"; + result+="la documentació de la classe per a cada membre:"; } } else { if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - result+="les estructures/unions que pertanyen a:"; + result+="les estructures/unions a que pertanyen:"; } else { - result+="les classes que pertanyen:"; + result+="les classes a que pertanyen:"; } } return result; @@ -305,65 +305,65 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! This is an introduction to the page with all file members. */ virtual QCString trFileMembersDescription(bool extractAll) { - QCString result="Aquesta s la llista de "; + QCString result="Aquesta és la llista de "; if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { result+="totes les funcions, variables, definicions, enumeracions, i definicions de tipus"; - if (!extractAll) result+="documentades "; + if (!extractAll) result+=" documentades"; } else { - result+="tots els membres de l'arxiu"; - if (!extractAll) result+="documentat "; + result+="tots els membres de fitxers"; + if (!extractAll) result+=" documentats"; } - result+=" amb enllaos "; + result+=" amb enllaços "; if (extractAll) - result+="als arxius als quals corresponen:"; + result+="als fitxers als quals corresponen:"; else - result+="a la documentaci:"; + result+="a la documentació:"; return result; } /*! This is an introduction to the page with the list of all header files. */ virtual QCString trHeaderFilesDescription() - { return "Aquesta s la llista d'arxius d'encapalament que ofereix l'API:"; } + { return "Aquests són els fitxers d'encapçalament que constitueixen l'API:"; } /*! This is an introduction to the page with the list of all examples */ virtual QCString trExamplesDescription() - { return "Aquesta s la llista de tots els exemples:"; } + { return "Aquesta és la llista de tots els exemples:"; } /*! This is an introduction to the page with the list of related pages */ virtual QCString trRelatedPagesDescription() - { return "Aquesta s la llista de totes les pgines de documentaci associades:"; } + { return "Aquesta és la llista de totes les pàgines de documentació associades:"; } /*! This is an introduction to the page with the list of class/file groups */ virtual QCString trModulesDescription() - { return "Aquesta s la llista de mduls:"; } + { return "Aquesta és la llista de mòduls:"; } /*! This sentences is used in the annotated class/file lists if no brief * description is given. */ virtual QCString trNoDescriptionAvailable() - { return "No hi ha cap descripci disponible"; } + { return "No hi ha cap descripció disponible"; } // index titles (the project name is prepended for these) /*! This is used in HTML as the title of index.html. */ virtual QCString trDocumentation() - { return "Documentaci"; } + { return ": Documentació"; } /*! This is used in LaTeX as the title of the chapter with the * index of all groups. */ virtual QCString trModuleIndex() - { return "ndex de Mduls"; } + { return "Índex de Mòduls"; } /*! This is used in LaTeX as the title of the chapter with the * class hierarchy. */ virtual QCString trHierarchicalIndex() - { return "ndex Jerrquic"; } + { return "Índex Jeràrquic"; } /*! This is used in LaTeX as the title of the chapter with the * annotated compound index. @@ -372,11 +372,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 { if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - return "ndex d'Estructures de Dades"; + return "Índex d'Estructures de Dades"; } else { - return "ndex Compost"; + return "Índex de Classes"; } } @@ -384,13 +384,13 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 * list of all files. */ virtual QCString trFileIndex() - { return "ndex d'Arxius"; } + { return "Índex de Fitxers"; } /*! This is used in LaTeX as the title of the chapter containing * the documentation of all groups. */ virtual QCString trModuleDocumentation() - { return "Documentaci dels mduls"; } + { return "Documentació dels Mòduls"; } /*! This is used in LaTeX as the title of the chapter containing * the documentation of all classes, structs and unions. @@ -399,11 +399,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 { if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - return "Documentaci de les Estructures de Dades"; + return "Documentació de les Estructures de Dades"; } else { - return "Documentaci de les Classes"; + return "Documentació de les Classes"; } } @@ -411,23 +411,23 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 * the documentation of all files. */ virtual QCString trFileDocumentation() - { return "Documentaci dels Arxius"; } + { return "Documentació dels Fitxers"; } /*! This is used in LaTeX as the title of the chapter containing * the documentation of all examples. */ virtual QCString trExampleDocumentation() - { return "Documentaci dels Exemples"; } + { return "Documentació dels Exemples"; } /*! This is used in LaTeX as the title of the chapter containing * the documentation of all related pages. */ virtual QCString trPageDocumentation() - { return "Documentaci de les pgines"; } + { return "Documentació de les Pàgines"; } /*! This is used in LaTeX as the title of the document */ virtual QCString trReferenceManual() - { return "Manual de Referncia"; } + { return "Manual de Referència"; } /*! This is used in the documentation of a file as a header before the * list of defines @@ -475,43 +475,43 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 * documentation blocks for defines */ virtual QCString trDefineDocumentation() - { return "Documentaci de les Definicions"; } + { return "Documentació de les Definicions"; } /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for function prototypes */ virtual QCString trFunctionPrototypeDocumentation() - { return "Documentaci de les Funcions Prototipus"; } + { return "Documentació de les Funcions Prototipus"; } /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for typedefs */ virtual QCString trTypedefDocumentation() - { return "Documentaci de les Definicions de Tipus"; } + { return "Documentació de les Definicions de Tipus"; } /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for enumeration types */ virtual QCString trEnumerationTypeDocumentation() - { return "Documentaci dels Tipus de les Enumeracions"; } + { return "Documentació dels Tipus de les Enumeracions"; } /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for enumeration values */ virtual QCString trEnumerationValueDocumentation() - { return "Documentaci dels Valors de les Enumeracions"; } + { return "Documentació dels Valors de les Enumeracions"; } /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for functions */ virtual QCString trFunctionDocumentation() - { return "Documentaci de les Funcions"; } + { return "Documentació de les Funcions"; } /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for variables */ virtual QCString trVariableDocumentation() - { return "Documentaci de les Variables"; } + { return "Documentació de les Variables"; } /*! This is used in the documentation of a file/namespace/group before * the list of links to documented compounds @@ -524,7 +524,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 } else { - return "Compostos"; + return "Classes"; } } @@ -548,12 +548,12 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! this text is put before a class diagram */ virtual QCString trClassDiagram(const char *clName) { - return (QCString)"Diagrama d'Herncia per a "+clName+":"; + return (QCString)"Diagrama d'Herència per a "+clName+":"; } /*! this text is generated when the \\internal command is used. */ virtual QCString trForInternalUseOnly() - { return "Tan sols per a s intern."; } + { return "Tan sols per a ús intern."; } /*! this text is generated when the \\reimp command is used. */ virtual QCString trReimplementedForInternalReasons() @@ -561,7 +561,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! this text is generated when the \\warning command is used. */ virtual QCString trWarning() - { return "Atenci"; } + { return "Atenció"; } /*! this text is generated when the \\bug command is used. */ virtual QCString trBugsAndLimitations() @@ -569,7 +569,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! this text is generated when the \\version command is used. */ virtual QCString trVersion() - { return "Versi"; } + { return "Versió"; } /*! this text is generated when the \\date command is used. */ virtual QCString trDate() @@ -581,11 +581,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! this text is generated when the \\sa command is used. */ virtual QCString trSeeAlso() - { return "Mireu tamb"; } + { return "Mireu també"; } /*! this text is generated when the \\param command is used. */ virtual QCString trParameters() - { return "Parmetres"; } + { return "Paràmetres"; } /*! this text is generated when the \\exception command is used. */ virtual QCString trExceptions() @@ -606,7 +606,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! used as an introduction to the namespace list */ virtual QCString trNamespaceListDescription(bool extractAll) { - QCString result="Aquests sn tots els espais de noms "; + QCString result="Aquests són tots els espais de noms "; if (!extractAll) result+="documentats "; result+="amb breus descripcions:"; return result; @@ -626,7 +626,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 * related classes */ virtual QCString trRelatedFunctionDocumentation() - { return "Documentaci de funcions amigues i relacionades"; } + { return "Documentació de funcions amigues i relacionades"; } ////////////////////////////////////////////////////////////////////////// // new since 0.49-990425 @@ -637,16 +637,16 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ClassDef::CompoundType compType, bool isTemplate) { - QCString result="Referncia de la"; + QCString result="Referència de"; switch(compType) { - case ClassDef::Class: result+=" Classe "; break; - case ClassDef::Struct: result+=" Estructura "; break; - case ClassDef::Union: result+=" Uni "; break; - case ClassDef::Interface: result+=" Interfcie "; break; - case ClassDef::Protocol: result+=" Protocol "; break; // translate me! - case ClassDef::Category: result+=" Category "; break; // translate me! - case ClassDef::Exception: result+=" Excepci "; break; + case ClassDef::Class: result+=" la Classe "; break; + case ClassDef::Struct: result+=" l'Estructura "; break; + case ClassDef::Union: result+=" la Unió "; break; + case ClassDef::Interface: result+=" la Interfície "; break; + case ClassDef::Protocol: result+="l Protocol "; break; + case ClassDef::Category: result+=" la Categoria "; break; + case ClassDef::Exception: result+=" l'Excepció "; break; } if (isTemplate) result+="Template "; result+=(QCString)clName; @@ -656,7 +656,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! used as the title of the HTML page of a file */ virtual QCString trFileReference(const char *fileName) { - QCString result="Referncia de l'Arxiu "; + QCString result="Referència del Fitxer "; result+=fileName; return result; } @@ -664,31 +664,31 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! used as the title of the HTML page of a namespace */ virtual QCString trNamespaceReference(const char *namespaceName) { - QCString result="Referncia de l'Espai de Noms "; + QCString result="Referència de l'Espai de Noms "; result+=namespaceName; return result; } virtual QCString trPublicMembers() - { return "Mtodes pblics"; } + { return "Mètodes públics"; } virtual QCString trPublicSlots() - { return "Slots pblics"; } + { return "Slots públics"; } virtual QCString trSignals() { return "Senyals"; } virtual QCString trStaticPublicMembers() - { return "Mtodes Pblics Esttics"; } + { return "Mètodes Públics Estàtics"; } virtual QCString trProtectedMembers() - { return "Mtodes Protegits"; } + { return "Mètodes Protegits"; } virtual QCString trProtectedSlots() { return "Slots Protegits"; } virtual QCString trStaticProtectedMembers() - { return "Mtodes Protegits Esttics"; } + { return "Mètodes Protegits Estàtics"; } virtual QCString trPrivateMembers() - { return "Mtodes Privats"; } + { return "Mètodes Privats"; } virtual QCString trPrivateSlots() { return "Slots Privats"; } virtual QCString trStaticPrivateMembers() - { return "Mtodes Privats Esttics"; } + { return "Mètodes Privats Estàtics"; } /*! this function is used to produce a comma-separated list of items. * use generateMarker(i) to indicate where item i should be put. @@ -720,7 +720,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 */ virtual QCString trInheritsList(int numEntries) { - return "Hereda "+trWriteList(numEntries)+"."; + return "Hereta de "+trWriteList(numEntries)+"."; } /*! used in class documentation to produce a list of super classes, @@ -728,7 +728,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 */ virtual QCString trInheritedByList(int numEntries) { - return "Heredat per "+trWriteList(numEntries)+"."; + return "Heretat per "+trWriteList(numEntries)+"."; } /*! used in member documentation blocks to produce a list of @@ -754,11 +754,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! This is an introduction to the page with all namespace members */ virtual QCString trNamespaceMemberDescription(bool extractAll) { - QCString result="Aquesta s la llista de tots els membres de l'espai de noms "; + QCString result="Aquesta és la llista de tots els membres de l'espai de noms "; if (!extractAll) result+="documentats "; - result+="amb enllaos a "; + result+="amb enllaços a "; if (extractAll) - result+="la documentaci de l'espai de noms de cada membre:"; + result+="la documentació de l'espai de noms de cada membre:"; else result+="l'espai de noms al qual corresponen:"; return result; @@ -767,13 +767,13 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 * index of all namespaces. */ virtual QCString trNamespaceIndex() - { return "ndex d'Espais de Noms"; } + { return "Índex d'Espais de Noms"; } /*! This is used in LaTeX as the title of the chapter containing * the documentation of all namespaces. */ virtual QCString trNamespaceDocumentation() - { return "Documentaci de l'Espai de Noms"; } + { return "Documentació de l'Espai de Noms"; } ////////////////////////////////////////////////////////////////////////// // new since 0.49-990522 @@ -796,22 +796,22 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 bool single) { // here s is one of " Class", " Struct" or " Union" // single is true implies a single file - QCString result=(QCString)"La documentaci d'aquesta "; + QCString result=(QCString)"La documentació d'aquest"; switch(compType) { - case ClassDef::Class: result+="classe"; break; - case ClassDef::Struct: result+="estructura"; break; - case ClassDef::Union: result+="uni"; break; - case ClassDef::Interface: result+="interfcie"; break; - case ClassDef::Protocol: result+="protocol"; break; // translate me! - case ClassDef::Category: result+="category"; break; // translate me! - case ClassDef::Exception: result+="excepci"; break; + case ClassDef::Class: result+="a classe"; break; + case ClassDef::Struct: result+="a estructura"; break; + case ClassDef::Union: result+="a unió"; break; + case ClassDef::Interface: result+="a interfície"; break; + case ClassDef::Protocol: result+=" protocol"; break; + case ClassDef::Category: result+="a categoria"; break; + case ClassDef::Exception: result+="a excepció"; break; } result+=" es va generar a partir del"; if (!single) result+="s"; - result+=" segent"; + result+=" següent"; if (!single) result+="s"; - result+=" arxiu"; + result+=" fitxer"; if (!single) result+="s:"; else result+=":"; return result; } @@ -820,7 +820,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 * list. */ virtual QCString trAlphabeticalList() - { return "Llista Alfabtica"; } + { return "Llista Alfabètica"; } ////////////////////////////////////////////////////////////////////////// // new since 0.49-990901 @@ -833,7 +833,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! This is in the (quick) index as a link to the main page (index.html) */ virtual QCString trMainPage() - { return "Pgina principal"; } + { return "Pàgina principal"; } /*! This is used in references to page that are put in the LaTeX * documentation. It should be an abbreviation of the word page. @@ -851,11 +851,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 } virtual QCString trDefinedAtLineInSourceFile() { - return "Definici a la lnia @0 de l'arxiu @1."; + return "Definició a la línia @0 del fitxer @1."; } virtual QCString trDefinedInSourceFile() { - return "Definici a l'arxiu @0."; + return "Definició al fitxer @0."; } ////////////////////////////////////////////////////////////////////////// @@ -874,37 +874,37 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! this text is put before a collaboration diagram */ virtual QCString trCollaborationDiagram(const char *clName) { - return (QCString)"Diagrama de collaboraci per a "+clName+":"; + return (QCString)"Diagrama de col·laboració per a "+clName+":"; } /*! this text is put before an include dependency graph */ virtual QCString trInclDepGraph(const char *fName) { - return (QCString)"Inclou el graf de dependncies per a "+fName+":"; + return (QCString)"Inclou el graf de dependències per a "+fName+":"; } /*! header that is put before the list of constructor/destructors. */ virtual QCString trConstructorDocumentation() { - return "Documentaci del Constructor i el Destructor"; + return "Documentació del Constructor i el Destructor"; } /*! Used in the file documentation to point to the corresponding sources. */ virtual QCString trGotoSourceCode() { - return "Veure el codi d'aquest arxiu."; + return "Veure el codi d'aquest fitxer."; } /*! Used in the file sources to point to the corresponding documentation. */ virtual QCString trGotoDocumentation() { - return "Veure la documentaci d'aquest fitxer."; + return "Veure la documentació d'aquest fitxer."; } /*! Text for the \\pre command */ virtual QCString trPrecondition() { - return "Precondici"; + return "Precondició"; } /*! Text for the \\post command */ virtual QCString trPostcondition() { - return "Postcondici"; + return "Postcondició"; } /*! Text for the \\invariant command */ virtual QCString trInvariant() @@ -923,11 +923,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 } virtual QCString trGraphicalHierarchy() { - return "Jerarquia Grfica de la Classe"; + return "Jerarquia Gràfica de la Classe"; } virtual QCString trGotoGraphicalHierarchy() { - return "Veure la jerarquia grfica de la classe"; + return "Veure la jerarquia gràfica de la classe"; } virtual QCString trGotoTextualHierarchy() { @@ -935,7 +935,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 } virtual QCString trPageIndex() { - return "Pgina ndex"; + return "Índex de Pàgines"; } ////////////////////////////////////////////////////////////////////////// @@ -948,7 +948,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 } virtual QCString trPublicTypes() { - return "Tipus Pblics"; + return "Tipus Públics"; } virtual QCString trPublicAttribs() { @@ -958,12 +958,12 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 } else { - return "Atributs Pblics"; + return "Atributs Públics"; } } virtual QCString trStaticPublicAttribs() { - return "Atributs Pblics Esttics"; + return "Atributs Públics Estàtics"; } virtual QCString trProtectedTypes() { @@ -975,7 +975,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 } virtual QCString trStaticProtectedAttribs() { - return "Atributs Protegits Esttics"; + return "Atributs Protegits Estàtics"; } virtual QCString trPrivateTypes() { @@ -987,7 +987,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 } virtual QCString trStaticPrivateAttribs() { - return "Atributs Privats Esttics"; + return "Atributs Privats Estàtics"; } ////////////////////////////////////////////////////////////////////////// @@ -1019,12 +1019,12 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 } virtual QCString trAttention() { - return "Atenci"; + return "Atenció"; } virtual QCString trInclByDepGraph() { - return "Aquest grfic mostra quins arxius inclouen, " - "de forma directa o indirecta, aquest arxiu:"; + return "Aquest gràfic mostra quins fitxers inclouen, " + "de forma directa o indirecta, aquest fitxer:"; } virtual QCString trSince() { @@ -1038,7 +1038,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! title of the graph legend page */ virtual QCString trLegendTitle() { - return "Llegenda del Grfic"; + return "Llegenda del Gràfic"; } /*! page explaining how the dot graph's should be interpreted * The %A in the text below are to prevent link to classes called "A". @@ -1046,22 +1046,22 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 virtual QCString trLegendDocs() { return - "Aquesta pgina explica com s'interpreten els grfics generats per doxygen.<p>\n" + "Aquesta pàgina explica com s'interpreten els gràfics generats per doxygen.<p>\n" "Considera aquest exemple:\n" "\\code\n" "/*! Classe invisible per culpa del retall */\n" "class Invisible { };\n\n" - "/*! Classe truncada, l'herncia est amagada */\n" + "/*! Classe truncada, l'herència està amagada */\n" "class Truncated : public Invisible { };\n\n" "/* Classe no documentada amb comentaris doxygen */\n" "class Undocumented { };\n\n" - "/*! Classe heredada amb herncia pblica */\n" + "/*! Classe heredada amb herència pública */\n" "class PublicBase : public Truncated { };\n\n" "/*! Una classe Template */\n" "template<class T> class Templ { };\n\n" - "/*! Classe heredada utilitzant herncia protegida */\n" + "/*! Classe heredada utilitzant herència protegida */\n" "class ProtectedBase { };\n\n" - "/*! Classe heredada utiltzant herncia privada */\n" + "/*! Classe heredada utiltzant herència privada */\n" "class PrivateBase { };\n\n" "/*! Classe usada per la classe heretada */\n" "class Used { };\n\n" @@ -1076,26 +1076,26 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 " Used *m_usedClass;\n" "};\n" "\\endcode\n" - "Si l'etiqueta \\c MAX_DOT_GRAPH_HEIGHT est igualada a 24a0 al fitxer de configuraci, resultar el grfic segent:" + "Si l'etiqueta \\c MAX_DOT_GRAPH_HEIGHT està igualada a 24a0 al fitxer de configuració, resultarà el gràfic següent:" "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" "<p>\n" - "Les caixes del grfic superior tenen aquesta interpretaci:\n" + "Les caixes del gràfic superior tenen aquesta interpretació:\n" "<ul>\n" - "<li>Una caixa negra plena represent l'estructura o classe per la qual el grfic s'ha generat.\n" + "<li>Una caixa negra plena represent l'estructura o classe per la qual el gràfic s'ha generat.\n" "<li>Una caixa de vora negra representa una estructura o classe documentada.\n" "<li>Una caixa de vora verda representa una estructura o classe indocumentada.\n" "<li>Una caixa de vora vermalla representa una estructura o classe documentada de la qual " - "no es mostren totes les relacions d'herncia/inclusi. Un grfic s truncat si no s'ajusta als lmits.\n" + "no es mostren totes les relacions d'herència/inclusió. Un gràfic és truncat si no s'ajusta als límits.\n" "</ul>\n" "Les sagetes tenen aquest significat:\n" "<ul>\n" - "<li>Una sageta blau fosc remarca una relaci d'herncia de tipus pblica entre dues classes.\n" - "<li>Una sageta verd fosc remarca una relaci d'herncia de tipus protegida entre dues classes.\n" - "<li>Una sageta roig fosc remarca una relaci d'herncia de tipus privada entre dues classes.\n" - "<li>Una sageta puntejada de color porpra indica que una classe s continguda o usada per una altra classe." - " La sageta s'etiqueta amb la variable o variables a travs de les quals la classe o estructura apuntada s accessible.\n" - "<li>Una sageta puntejada de color groc indica la relaci entre una instncia template i la classe template de qu ha set instanciada." - " La sageta s'etiqueta amb els parmetres template de la instncia.\n" + "<li>Una sageta blau fosc remarca una relació d'herència de tipus pública entre dues classes.\n" + "<li>Una sageta verd fosc remarca una relació d'herència de tipus protegida entre dues classes.\n" + "<li>Una sageta roig fosc remarca una relació d'herència de tipus privada entre dues classes.\n" + "<li>Una sageta puntejada de color porpra indica que una classe és continguda o usada per una altra classe." + " La sageta s'etiqueta amb la variable o variables a través de les quals la classe o estructura apuntada és accessible.\n" + "<li>Una sageta puntejada de color groc indica la relació entre una instància template i la classe template de què ha set instanciada." + " La sageta s'etiqueta amb els paràmetres template de la instància.\n" "</ul>\n"; } /*! text for the link to the legend page */ @@ -1126,7 +1126,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! Used as a section header for KDE-2 IDL methods */ virtual QCString trDCOPMethods() { - return "Mtodes DCOP"; + return "Mètodes DCOP"; } ////////////////////////////////////////////////////////////////////////// @@ -1141,7 +1141,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! Used as a section header for IDL property documentation */ virtual QCString trPropertyDocumentation() { - return "Documentaci de les Propietats"; + return "Documentació de les Propietats"; } ////////////////////////////////////////////////////////////////////////// @@ -1151,7 +1151,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! Used for Java interfaces in the summary section of Java packages */ virtual QCString trInterfaces() { - return "Interfcies"; + return "Interfícies"; } /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() @@ -1178,7 +1178,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! The description of the package index page */ virtual QCString trPackageListDescription() { - return "Aquesta s la llista de paquets, amb una breu descripci (si se'n disposa):"; + return "Aquesta és la llista de paquets, amb una breu descripció (si se'n disposa):"; } /*! The link name in the Quick links header for each page */ virtual QCString trPackages() @@ -1188,7 +1188,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! Used as a chapter title for Latex & RTF output */ virtual QCString trPackageDocumentation() { - return "Documentaci dels Paquets"; + return "Documentació dels Paquets"; } /*! Text shown before a multi-line define */ virtual QCString trDefineValue() @@ -1257,7 +1257,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 /*! Used as header RTF general index */ virtual QCString trRTFGeneralIndex() { - return "ndex"; + return "Índex"; } /*! This is used for translation of the word that will possibly @@ -1277,7 +1277,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 */ virtual QCString trFile(bool first_capital, bool singular) { - QCString result((first_capital ? "Arxiu" : "arxiu")); + QCString result((first_capital ? "Fitxer" : "fitxer")); if (!singular) result+="s"; return result; } @@ -1310,7 +1310,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 */ virtual QCString trPage(bool first_capital, bool singular) { - QCString result((first_capital ? "Pgin" : "pgin")); + QCString result((first_capital ? "Pàgin" : "pàgin")); if (!singular) result+="es"; else result+="a"; return result; } @@ -1369,7 +1369,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 */ virtual QCString trReferences() { - return "Referncies"; + return "Referències"; } ////////////////////////////////////////////////////////////////////////// @@ -1403,6 +1403,199 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 { return "Taula de Continguts"; } + +////////////////////////////////////////////////////////////////////////// +// new since 1.2.17 +////////////////////////////////////////////////////////////////////////// + + /*! Used as the header of the list of item that have been + * flagged deprecated + */ + virtual QCString trDeprecatedList() + { + return "Llista d'Antiquats"; + } + +////////////////////////////////////////////////////////////////////////// +// new since 1.2.18 +////////////////////////////////////////////////////////////////////////// + + /*! Used as a header for declaration section of the events found in + * a C# program + */ + virtual QCString trEvents() + { + return "Esdeveniments"; + } + /*! Header used for the documentation section of a class' events. */ + virtual QCString trEventDocumentation() + { + return "Documentació dels Esdeveniments"; + } + +////////////////////////////////////////////////////////////////////////// +// new since 1.3 +////////////////////////////////////////////////////////////////////////// + + /*! Used as a heading for a list of Java class types with package scope. + */ + virtual QCString trPackageTypes() + { + return "Tipus de paquets"; + } + /*! Used as a heading for a list of Java class functions with package + * scope. + */ + virtual QCString trPackageMembers() + { + return "Funcions de Paquet"; + } + /*! Used as a heading for a list of static Java class functions with + * package scope. + */ + virtual QCString trStaticPackageMembers() + { + return "Funcions Estàtiques de Paquet"; + } + /*! Used as a heading for a list of Java class variables with package + * scope. + */ + virtual QCString trPackageAttribs() + { + return "Atributs de Paquet"; + } + /*! Used as a heading for a list of static Java class variables with + * package scope. + */ + virtual QCString trStaticPackageAttribs() + { + return "Atributs Estàtics de Paquet"; + } + +////////////////////////////////////////////////////////////////////////// +// new since 1.3.1 +////////////////////////////////////////////////////////////////////////// + + /*! Used in the quick index of a class/file/namespace member list page + * to link to the unfiltered list of all members. + */ + virtual QCString trAll() + { + return "Tot"; + } + /*! Put in front of the call graph for a function. */ + virtual QCString trCallGraph() + { + return "Gràfic de crides d'aquesta funció:"; + } + +////////////////////////////////////////////////////////////////////////// +// new since 1.3.3 +////////////////////////////////////////////////////////////////////////// + + /*! When the search engine is enabled this text is put in the header + * of each page before the field where one can enter the text to search + * for. + */ + virtual QCString trSearchForIndex() + { + return "Buscar"; + } + /*! This string is used as the title for the page listing the search + * results. + */ + virtual QCString trSearchResultsTitle() + { + return "Resultats de la Búsqueda"; + } + /*! This string is put just before listing the search results. The + * text can be different depending on the number of documents found. + * Inside the text you can put the special marker $num to insert + * the number representing the actual number of search results. + * The @a numDocuments parameter can be either 0, 1 or 2, where the + * value 2 represents 2 or more matches. HTML markup is allowed inside + * the returned string. + */ + virtual QCString trSearchResults(int numDocuments) + { + if (numDocuments==0) + { + return "No s'ha trobat cap document."; + } + else if (numDocuments==1) + { + return "Trobat <b>1</b> document."; + } + else + { + return "Trobats <b>$num</b> documents. " + "Mostrant els millors resultats primer."; + } + } + /*! This string is put before the list of matched words, for each search + * result. What follows is the list of words that matched the query. + */ + virtual QCString trSearchMatches() + { + return "Resultats:"; + } + +////////////////////////////////////////////////////////////////////////// +// new since 1.3.8 +////////////////////////////////////////////////////////////////////////// + + /*! This is used in HTML as the title of page with source code for file filename + */ + virtual QCString trSourceFile(QCString& filename) + { + return "Fitxer de Codi " + filename; + } + +////////////////////////////////////////////////////////////////////////// +// new since 1.3.9 +////////////////////////////////////////////////////////////////////////// + + /*! This is used as the name of the chapter containing the directory + * hierarchy. + */ + virtual QCString trDirIndex() + { return "Jerarquia de Directoris"; } + + /*! This is used as the name of the chapter containing the documentation + * of the directories. + */ + virtual QCString trDirDocumentation() + { return "Documentació dels Directoris"; } + + /*! This is used as the title of the directory index and also in the + * Quick links of a HTML page, to link to the directory hierarchy. + */ + virtual QCString trDirectories() + { return "Directoris"; } + + /*! This returns a sentences that introduces the directory hierarchy. + * and the fact that it is sorted alphabetically per level + */ + virtual QCString trDirDescription() + { return "Aquesta jerarquia de directoris està ordenada toscament, " + "però no completa, de forma alfabètica:"; + } + + /*! This returns the title of a directory page. The name of the + * directory is passed via \a dirName. + */ + virtual QCString trDirReference(const char *dirName) + { QCString result="Referència del Directori "; result+=dirName; return result; } + + /*! This returns the word directory with or without starting capital + * (\a first_capital) and in sigular or plural form (\a singular). + */ + virtual QCString trDir(bool first_capital, bool singular) + { + QCString result((first_capital ? "Directori" : "directori")); + if (!singular) result+="s"; + return result; + } }; #endif diff --git a/src/translator_de.h b/src/translator_de.h index e3335ab..7a5488b 100644 --- a/src/translator_de.h +++ b/src/translator_de.h @@ -96,13 +96,16 @@ // - added a dash after (file, ...) names and in front of description // - changed "Eigenschaften" to "Propertys" (yeah, not ..."ies") // +// 2005/03/20 Jens Seidel (jensseidel@users.sourceforge.net) +// - Updated for "new since 1.4.1" version +// // Todo: // - see FIXME #ifndef TRANSLATOR_DE_H #define TRANSLATOR_DE_H -class TranslatorGerman : public TranslatorAdapter_1_4_1 +class TranslatorGerman : public Translator { public: @@ -1645,7 +1648,7 @@ class TranslatorGerman : public TranslatorAdapter_1_4_1 { return "Verzeichnisdokumentation"; } /*! This is used as the title of the directory index and also in the - * Quick links of a HTML page, to link to the directory hierarchy. + * Quick links of an HTML page, to link to the directory hierarchy. */ virtual QCString trDirectories() { return "Verzeichnisse"; } @@ -1674,6 +1677,20 @@ class TranslatorGerman : public TranslatorAdapter_1_4_1 return result; } +////////////////////////////////////////////////////////////////////////// +// new since 1.4.1 +////////////////////////////////////////////////////////////////////////// + + /*! This text is added to the documentation when the \\overload command + * is used for a overloaded function. + */ + virtual QCString trOverloadText() + { + return "Dies ist eine berladene Methode, die der Bequemlichkeit " + "wegen bereitgestellt wird. Sie unterscheidet sich von der " + "obigen Funktion nur in den Argumenten die sie untersttzt."; + } + }; #endif diff --git a/src/translator_en.h b/src/translator_en.h index ca1ff03..0f41e51 100644 --- a/src/translator_en.h +++ b/src/translator_en.h @@ -1573,7 +1573,7 @@ class TranslatorEnglish : public Translator { return "Directory Documentation"; } /*! This is used as the title of the directory index and also in the - * Quick links of a HTML page, to link to the directory hierarchy. + * Quick links of an HTML page, to link to the directory hierarchy. */ virtual QCString trDirectories() { return "Directories"; } diff --git a/src/translator_hr.h b/src/translator_hr.h index ef4fce6..735f483 100644 --- a/src/translator_hr.h +++ b/src/translator_hr.h @@ -62,11 +62,14 @@ // 2005/02/28 // - Removed obsolete (unused) methods // +// 2005/03/21 +// - Added strings for 1.4.1 +// #ifndef TRANSLATOR_HR_H #define TRANSLATOR_HR_H -class TranslatorCroatian : public TranslatorAdapter_1_4_1 +class TranslatorCroatian : public Translator { private: /*! to avoid macro redefinition from translator_cz.h */ @@ -1237,6 +1240,20 @@ class TranslatorCroatian : public TranslatorAdapter_1_4_1 if (!singular) result+="i"; return result; } +////////////////////////////////////////////////////////////////////////// +// new since 1.4.1 +////////////////////////////////////////////////////////////////////////// + + /*! This text is added to the documentation when the \\overload command + * is used for a overloaded function. + */ + virtual QCString trOverloadText() + { + return decode("Ovo je preoptereena funkcija (overload). " + "Razlikuje se od navedene metode " + "samo po vrsti argumenata koje prihvata."); + } + }; #endif diff --git a/src/translator_it.h b/src/translator_it.h index 04cbc06..73f8e95 100644 --- a/src/translator_it.h +++ b/src/translator_it.h @@ -19,6 +19,8 @@ * * Revision history * + * 2005/03: translated new items used since version 1.4.1 + * removed unused methods listed in Petr Prikryl February 28 translator report * 2004/09: translated new items used since version 1.3.9 * 2004/06: translated new items used since version 1.3.8 * 2003/11: translated new items used since version 1.3.3 @@ -28,7 +30,7 @@ * 2002/08: translated new items used since version 1.2.17 * 2002/07: translated new items used since version 1.2.16 * 2002/06: modified trRelatedPagesDescription() method - * correct typo in trInclByDepGraph() method + * corrected typo in trInclByDepGraph() method * 2002/01: translated new items used since version 1.2.13 * updated e-mail address * 2001/11: corrected the translation fixing the issues reported by the translator.pl script @@ -72,7 +74,7 @@ #ifndef TRANSLATOR_IT_H #define TRANSLATOR_IT_H -class TranslatorItalian : public TranslatorAdapter_1_4_1 +class TranslatorItalian : public Translator { public: @@ -212,10 +214,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 QCString trFileList() { return "Lista dei file"; } - /*! This is put above each page as a link to the list of all verbatim headers */ - QCString trHeaderFiles() - { return "Lista dei file header"; } - /*! This is put above each page as a link to all members of compounds. */ QCString trCompoundMembers() { @@ -333,10 +331,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 return result; } - /*! This is an introduction to the page with the list of all header files. */ - QCString trHeaderFilesDescription() - { return "Questi sono gli header file che compongono l'API:"; } - /*! This is an introduction to the page with the list of all examples */ QCString trExamplesDescription() { return "Questa la lista di tutti gli esempi:"; } @@ -349,15 +343,8 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 QCString trModulesDescription() { return "Questa la lista di tutti i moduli:"; } - /*! This sentences is used in the annotated class/file lists if no brief - * description is given. - */ - QCString trNoDescriptionAvailable() - { return "Descrizione non disponibile"; } - // index titles (the project name is prepended for these) - /*! This is used in HTML as the title of index.html. */ QCString trDocumentation() { return "Documentazione"; } @@ -496,12 +483,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 { return "Documentazione dei tipi enumerati"; } /*! This is used in the documentation of a file/namespace before the list - * of documentation blocks for enumeration values - */ - QCString trEnumerationValueDocumentation() - { return "Documentazione dei valori dei tipi enumerati"; } - - /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for functions */ QCString trFunctionDocumentation() @@ -555,18 +536,10 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 QCString trForInternalUseOnly() { return "Solo per uso interno."; } - /*! this text is generated when the \\reimp command is used. */ - QCString trReimplementedForInternalReasons() - { return "Reimplementato per motivi interni; l'API non stata modificata.";} - /*! this text is generated when the \\warning command is used. */ QCString trWarning() { return "Avvertimento"; } - /*! this text is generated when the \\bug command is used. */ - QCString trBugsAndLimitations() - { return "Bug e limitazioni"; } - /*! this text is generated when the \\version command is used. */ QCString trVersion() { return "Versione"; } @@ -846,10 +819,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 // new since 0.49-991003 ////////////////////////////////////////////////////////////////////////// - QCString trSources() - { - return "Sorgenti"; - } QCString trDefinedAtLineInSourceFile() { return "Definizione alla linea @0 del file @1."; @@ -1142,11 +1111,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 // new since 1.2.4 ////////////////////////////////////////////////////////////////////////// - /*! Used for Java interfaces in the summary section of Java packages */ - virtual QCString trInterfaces() - { - return "Interfacce"; - } /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { @@ -1179,11 +1143,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 { return "Package"; } - /*! Used as a chapter title for Latex & RTF output */ - virtual QCString trPackageDocumentation() - { - return "Documentazione dei package"; - } /*! Text shown before a multi-line define */ virtual QCString trDefineValue() { @@ -1295,17 +1254,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 * be followed by a single name or by a list of names * of the category. */ - virtual QCString trField(bool first_capital, bool singular) - { - QCString result((first_capital ? "Camp" : "camp")); - result+=(singular ? "o" : "i"); - return result; - } - - /*! This is used for translation of the word that will possibly - * be followed by a single name or by a list of names - * of the category. - */ virtual QCString trGlobal(bool first_capital, bool singular) { QCString result((first_capital ? "Global" : "global")); @@ -1562,6 +1510,20 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 return result; } +////////////////////////////////////////////////////////////////////////// +// new since 1.4.1 +////////////////////////////////////////////////////////////////////////// + + /*! This text is added to the documentation when the \\overload command + * is used for a overloaded function. + */ + virtual QCString trOverloadText() + { + return "Questa una funzione membro sovraccaricata (overloaded), " + "fornita per comodit. Differisce dalla funzione di cui sopra" + "unicamente per gli argomenti passati."; + } + }; #endif diff --git a/src/translator_kr.h b/src/translator_kr.h index 96b08e1..2d6a1dd 100644 --- a/src/translator_kr.h +++ b/src/translator_kr.h @@ -51,24 +51,43 @@ // // Update: // -// 2004.12.22 (SooYoung Jung: jung5000@gmail.com) -// - LaTex and RTF were not generated correctly. -// Corrected trRTFansicp and trRTFCharSet. -// It was wrong. -// - Adapting 1.3.9 and added "new since 1.3.9" -// - ؼ ߸ κ ҳ ־ .. +// 2004.12.22 (SooYoung Jung: jung5000 at gmail.com) +// - LaTex and RTF were not generated correctly. +// Corrected trRTFansicp and trRTFCharSet. +// It was wrong. +// - Adapting 1.3.9 and added "new since 1.3.9" +// - ؼ ߸ κ ҳ ־ .. +// +// 2005.02.11 (SooYoung Jung: jung5000 at gmail.com) +// - Ǽ ߰Ǿ decode Լ +// +// 2005.03.11 (SooYoung Jung: jung5000 at gmail.com) +// - Adapting 1.4.1 +// - Ϻ ȵ κ (Translated little bit of untranslated part) +// - Removed following +// Obsolete methods (should be removed, never used): +// virtual QCString trHeaderFilesDescription() +// virtual QCString trField(bool first_capital, bool singular) +// virtual QCString trPackageDocumentation() +// virtual QCString trSources() +// virtual QCString trReimplementedForInternalReasons() +// virtual QCString trInterfaces() +// virtual QCString trHeaderFiles() +// virtual QCString trBugsAndLimitations() +// virtual QCString trEnumerationValueDocumentation() +// virtual QCString trNoDescriptionAvailable() // class TranslatorKorean : public TranslatorAdapter_1_4_1 { private: - /*! The decode() can change euc into sjis */ + // guess, unnecessary for Korean language inline QCString decode(const QCString & sInput) { if (Config_getBool("USE_WINDOWS_ENCODING")) { - return JapaneseEucToSjis(sInput); + return sInput; } else { @@ -182,7 +201,7 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 virtual QCString trGeneratedAutomatically(const char *s) { QCString result=""; if (s) result+=(QCString)s+" "; - result += "source ڵ Doxygen ڵ "; + result += "ҽ ڵ Doxygen ڵ "; return result; } @@ -229,8 +248,8 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 { return " "; } //" ", " Ʈ" /*! This is put above each page as a link to the list of all verbatim headers */ - virtual QCString trHeaderFiles() - { return " "; } + // virtual QCString trHeaderFiles() + // { return " "; } /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() @@ -337,8 +356,8 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 } /*! This is an introduction to the page with the list of all header files. */ - virtual QCString trHeaderFilesDescription() - { return " API ϴ Դϴ."; } + // virtual QCString trHeaderFilesDescription() + // { return " API ϴ Դϴ."; } /*! This is an introduction to the page with the list of all examples */ virtual QCString trExamplesDescription() @@ -355,8 +374,8 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 /*! This sentences is used in the annotated class/file lists if no brief * description is given. */ - virtual QCString trNoDescriptionAvailable() - { return " ϴ."; } + // virtual QCString trNoDescriptionAvailable() + // { return " ϴ."; } // index titles (the project name is prepended for these) @@ -492,8 +511,8 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for enumeration values */ - virtual QCString trEnumerationValueDocumentation() - { return " ȭ"; } + // virtual QCString trEnumerationValueDocumentation() + // { return " ȭ"; } /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for functions @@ -514,11 +533,11 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 { if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - return "Data Structures"; + return " "; } else { - return "Classes"; + return "Ŭ"; } } @@ -550,16 +569,16 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 { return " 븸 "; } /*! this text is generated when the \\reimp command is used. */ - virtual QCString trReimplementedForInternalReasons() - { return " 籸: API ʾҴ."; } + // virtual QCString trReimplementedForInternalReasons() + // { return " 籸: API ʾҴ."; } /*! this text is generated when the \\warning command is used. */ virtual QCString trWarning() { return ""; } /*! this text is generated when the \\bug command is used. */ - virtual QCString trBugsAndLimitations() - { return " Ѱ"; } + // virtual QCString trBugsAndLimitations() + // { return " Ѱ"; } /*! this text is generated when the \\version command is used. */ virtual QCString trVersion() @@ -639,8 +658,8 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 case ClassDef::Struct: result+=" ü"; break; case ClassDef::Union: result+=" ü"; break; case ClassDef::Interface: result+=" ̽"; break; - case ClassDef::Protocol: result+=" protocol"; break; // translate me! - case ClassDef::Category: result+=" category"; break; // translate me! + case ClassDef::Protocol: result+=" "; break; + case ClassDef::Category: result+=" īװ"; break; case ClassDef::Exception: result+=" "; break; } if (isTemplate) result+=" ø"; @@ -838,10 +857,10 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 // new since 0.49-991003 ////////////////////////////////////////////////////////////////////////// - virtual QCString trSources() - { - return "ó"; - } + // virtual QCString trSources() + // { + // return "ó"; + // } virtual QCString trDefinedAtLineInSourceFile() { return "@1 @0 ° ο "; @@ -1016,13 +1035,12 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 } virtual QCString trInclByDepGraph() { - // TODO: Need to be translated. -ryk11/22/01. - return "This graph shows which files directly or " - "indirectly include this file:"; + return " Ǵ " + "(include) Ÿ:"; } virtual QCString trSince() { - return "Since"; // TODO: Need to be translated. -ryk11/22/01. + return ": "; // TODO: Need to be translated. -ryk11/22/01. } ////////////////////////////////////////////////////////////////////////// @@ -1155,12 +1173,12 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 /*! Used as a section header for IDL properties */ virtual QCString trProperties() { - return "properties"; // TODO: Need to be translated. -ryk11/22/01. + return "Ӽ"; } /*! Used as a section header for IDL property documentation */ virtual QCString trPropertyDocumentation() { - return "property ȭ"; // TODO: Need to be translated. -ryk11/22/01. + return "Ӽ ȭ"; } ////////////////////////////////////////////////////////////////////////// @@ -1168,52 +1186,51 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 ////////////////////////////////////////////////////////////////////////// /*! Used for Java interfaces in the summary section of Java packages */ - virtual QCString trInterfaces() - { - return "̽"; // TODO: Need to be translated. -ryk11/22/01. - } + // virtual QCString trInterfaces() + // { + // return "̽"; + // } /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - return " "; // TODO: Need to be translated. -ryk11/22/01. + return " "; } else { - return "Ŭ"; // TODO: Need to be translated. -ryk11/22/01. + return "Ŭ"; } } /*! Used as the title of a Java package */ virtual QCString trPackage(const char *name) { - return (QCString)"Ű "+name; // TODO: Need to be translated. -ryk11/22/01. + return (QCString)"Ű "+name; } /*! Title of the package index page */ virtual QCString trPackageList() { - return "Ű "; // TODO: Need to be translated. -ryk11/22/01. + return "Ű "; } /*! The description of the package index page */ virtual QCString trPackageListDescription() { - //Here are the packages with brief descriptions (if available):"; // TODO: Need to be translated. -ryk11/22/01. return " Ű̴."; } /*! The link name in the Quick links header for each page */ virtual QCString trPackages() { - return "Ű"; // TODO: Need to be translated. -ryk11/22/01. + return "Ű"; } /*! Used as a chapter title for Latex & RTF output */ - virtual QCString trPackageDocumentation() - { - return "Ű ȭ"; // TODO: Need to be translated. -ryk11/22/01. - } + // virtual QCString trPackageDocumentation() + // { + // return "Ű ȭ"; + // } /*! Text shown before a multi-line define */ virtual QCString trDefineValue() { - return ":"; // TODO: Need to be translated. -ryk11/22/01. + return ":"; } ////////////////////////////////////////////////////////////////////////// @@ -1223,12 +1240,12 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 /*! Used as a marker that is put before a \\bug item */ virtual QCString trBug() { - return ""; // TODO: Need to be translated. -ryk11/22/01. + return ""; } /*! Used as the header of the bug list */ virtual QCString trBugList() { - return " "; // TODO: Need to be translated. -ryk11/22/01. + return " "; } ////////////////////////////////////////////////////////////////////////// @@ -1350,12 +1367,12 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 * be followed by a single name or by a list of names * of the category. */ - virtual QCString trField(bool first_capital, bool singular) - { - QCString result((first_capital ? "ʵ" : "ʵ")); - if (!singular) result+=""; - return result; // TODO: Need to be translated. -ryk11/22/01. - } + // virtual QCString trField(bool first_capital, bool singular) + // { + // QCString result((first_capital ? "ʵ" : "ʵ")); + // if (!singular) result+=""; + // return result; // TODO: Need to be translated. -ryk11/22/01. + // } /*! This is used for translation of the word that will possibly * be followed by a single name or by a list of names diff --git a/src/util.cpp b/src/util.cpp index dafc068..368fe50 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1388,7 +1388,7 @@ void linkifyText(const TextGeneratorIntf &out,Definition *scope, bool keepSpaces) { //printf("`%s'\n",text); - static QRegExp regExp("[a-z_A-Z][a-z_A-Z0-9.:]*"); + static QRegExp regExp("[a-z_A-Z][~a-z_A-Z0-9.:]*"); QCString txtStr=text; int strLen = txtStr.length(); //printf("linkifyText scope=%s fileScope=%s strtxt=%s strlen=%d\n", @@ -1718,7 +1718,7 @@ QCString getFileFilter(const char* name) // compare the file name to the filter pattern list QStrListIterator sli(filterList); char* filterStr; - for(sli.toFirst(); (filterStr = sli.current()); ++sli) + for (sli.toFirst(); (filterStr = sli.current()); ++sli) { QCString fs = filterStr; int i_equals=fs.find('='); @@ -4256,7 +4256,7 @@ QCString convertToHtml(const char *s) /*! Returns the standard string that is generated when the \\overload * command is used. */ -const char *getOverloadDocs() +QCString getOverloadDocs() { return theTranslator->trOverloadText(); //"This is an overloaded member function, " @@ -180,7 +180,7 @@ QCString stripScope(const char *name); int iSystem(const char *command,const char *args,bool isBatchFile=FALSE); QCString convertToHtml(const char *s); QCString convertToXML(const char *s); -const char * getOverloadDocs(); +QCString getOverloadDocs(); void addMembersToMemberGroup(MemberList *ml, MemberGroupSDict *memberGroupSDict, Definition *context); diff --git a/src/xmldocvisitor.cpp b/src/xmldocvisitor.cpp index 178a0aa..6ff9ac1 100644 --- a/src/xmldocvisitor.cpp +++ b/src/xmldocvisitor.cpp @@ -767,9 +767,11 @@ void XmlDocVisitor::visitPre(DocParamList *pl) if (m_hide) return; m_t << "<parameteritem>" << endl; m_t << "<parameternamelist>" << endl; - QStrListIterator li(pl->parameters()); - const char *s; - for (li.toFirst();(s=li.current());++li) + //QStrListIterator li(pl->parameters()); + //const char *s; + QListIterator<DocNode> li(pl->parameters()); + DocNode *param; + for (li.toFirst();(param=li.current());++li) { m_t << "<parametername"; if (pl->direction()!=DocParamSect::Unspecified) @@ -790,7 +792,14 @@ void XmlDocVisitor::visitPre(DocParamList *pl) m_t << "\""; } m_t << ">"; - filter(s); + if (param->kind()==DocNode::Kind_Word) + { + visit((DocWord*)param); + } + else if (param->kind()==DocNode::Kind_LinkedWord) + { + visit((DocLinkedWord*)param); + } m_t << "</parametername>" << endl; } m_t << "</parameternamelist>" << endl; |