From fd9cdfaba64f942f4eb481ac9feb1564115f9f92 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sun, 4 Aug 2002 20:55:47 +0000 Subject: Release-1.2.17-20020804 --- INSTALL | 4 +- README | 4 +- VERSION | 2 +- doc/autolink.doc | 12 +- doc/commands.doc | 625 ++++----- doc/config.doc | 330 +++-- doc/diagrams.doc | 6 +- doc/docblocks.doc | 30 +- doc/doxysearch_usage.doc | 5 +- doc/faq.doc | 2 +- doc/grouping.doc | 8 +- doc/history.doc | 30 +- doc/htmlcmds.doc | 158 +-- doc/index.doc | 6 +- doc/install.doc | 34 +- doc/installdox_usage.doc | 2 +- doc/language.doc | 51 +- doc/language.tpl | 31 +- doc/lists.doc | 2 +- doc/preprocessing.doc | 4 +- doc/starting.doc | 6 +- packages/rpm/doxygen.spec | 2 +- src/Makefile.in | 2 +- src/classdef.cpp | 6 +- src/classlist.cpp | 2 +- src/cmdmapper.cpp | 214 +++ src/cmdmapper.h | 164 +++ src/debug.cpp | 17 +- src/debug.h | 4 +- src/definition.cpp | 6 + src/doc.l | 57 +- src/docparser.cpp | 3037 ++++++++++++++++++++++++++++++++++++++++ src/docparser.h | 900 ++++++++++++ src/doctokenizer.h | 127 ++ src/doctokenizer.l | 577 ++++++++ src/docvisitor.h | 151 ++ src/doxygen.cpp | 4 +- src/filedef.cpp | 6 +- src/groupdef.cpp | 16 +- src/htmlgen.cpp | 33 +- src/htmlgen.h | 7 +- src/index.cpp | 20 +- src/latexgen.cpp | 38 +- src/latexgen.h | 7 +- src/libdoxygen.pro.in | 8 + src/libdoxygen.t | 3 + src/mangen.cpp | 26 +- src/mangen.h | 7 +- src/memberdef.cpp | 18 +- src/memberdef.h | 2 +- src/memberlist.cpp | 2 +- src/namespacedef.cpp | 8 +- src/outputgen.h | 8 +- src/outputlist.cpp | 2 + src/outputlist.h | 15 +- src/packagedef.cpp | 4 +- src/pngenc.cpp | 2 + src/printdocvisitor.h | 598 ++++++++ src/rtfgen.cpp | 38 +- src/rtfgen.h | 7 +- src/scanner.l | 53 +- src/section.h | 3 +- src/translator_br.h | 20 +- src/translator_cz.h | 18 +- src/translator_hr.h | 12 +- src/translator_pt.h | 18 +- src/translator_ru.h | 13 +- src/translator_sk.h | 46 +- src/util.cpp | 4 +- src/xmlgen.cpp | 28 +- tmake/lib/linux-g++/tmake.conf | 2 +- 71 files changed, 6891 insertions(+), 823 deletions(-) create mode 100644 src/cmdmapper.cpp create mode 100644 src/cmdmapper.h create mode 100644 src/docparser.cpp create mode 100644 src/docparser.h create mode 100644 src/doctokenizer.h create mode 100644 src/doctokenizer.l create mode 100644 src/docvisitor.h create mode 100644 src/printdocvisitor.h diff --git a/INSTALL b/INSTALL index e1b6612..e5e99fa 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ -DOXYGEN Version 1.2.17 +DOXYGEN Version 1.2.17-20020804 Please read the installation section of the manual for instructions. -------- -Dimitri van Heesch (28 July 2002) +Dimitri van Heesch (04 August 2002) diff --git a/README b/README index 8599141..967ac22 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -DOXYGEN Version 1.2.17 +DOXYGEN Version 1.2.17_20020804 Please read INSTALL for compilation instructions. @@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives. Enjoy, -Dimitri van Heesch (dimitri@stack.nl) (28 July 2002) +Dimitri van Heesch (dimitri@stack.nl) (04 August 2002) diff --git a/VERSION b/VERSION index b66183a..07b9071 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.17 +1.2.17-20020804 diff --git a/doc/autolink.doc b/doc/autolink.doc index 94b28d4..c7f9ba7 100644 --- a/doc/autolink.doc +++ b/doc/autolink.doc @@ -30,12 +30,12 @@ The next sections show how to generate links to the various documented entities in a source file. - \subsection linkurl Links to web pages and mail addresses + \section linkurl Links to web pages and mail addresses Doxygen will automatically replace any URLs and mail addresses found in the documentation by links (in HTML). - \subsection linkclass Links to classes. + \section linkclass Links to classes. All words in the documentation that correspond to a documented class will automatically be replaced by a link to the page containing the @@ -43,14 +43,14 @@ that corresponds to a documented class is replaced by a link you should put a \% in front of the word. - \subsection linkfile Links to files. + \section linkfile Links to files. All words that contain a dot (.) that is not the last character in the word are considered to be file names. If the word is indeed the name of a documented input file, a link will automatically be created to the documentation of that file. - \subsection linkfunc Links to functions. + \section linkfunc Links to functions. Links to functions are created if one of the following patterns is encountered: @@ -90,7 +90,7 @@ that matches the pattern. - \subsection linkother Links to variables, typedefs, enum types, enum values and defines. + \section linkother Links to variables, typedefs, enum types, enum values and defines. All of these entities can be linked to in the same way as described in the previous section. For sake of clarity it is advised to only use @@ -103,7 +103,7 @@ for the corresponding HTML documentation that is generated by Doxygen. \endhtmlonly - \subsection resolving typedefs. + \section resolving typedefs. Typedefs that involve classes, structs and unions, like \verbatim diff --git a/doc/commands.doc b/doc/commands.doc index 5ceb1df..0a6a352 100644 --- a/doc/commands.doc +++ b/doc/commands.doc @@ -14,9 +14,9 @@ * input used in their production; they are not affected by this license. * */ -/*! \page commands +/*! \page commands Special Commands -\section commands Special Commands +\section cmd_intro Introduction All commands in the documentation start with a backslash (\\) or an at-sign (\@). If you prefer you can replace all commands starting with a @@ -25,7 +25,7 @@ backslash below, by their counterparts that start with an at-sign. Some commands have one or more arguments. Each argument has a certain range: \n"); + } + } + void visitPre(DocAutoListItem *) + { + indent_pre(); + printf("
  • \n"); + } + void visitPost(DocAutoListItem *) + { + indent_post(); + printf("
    • \n"); + } + void visitPre(DocPara *) + { + indent_pre(); + printf("\n"); + } + void visitPost(DocPara *) + { + indent_post(); + printf("\n"); + } + void visitPre(DocRoot *) + { + indent_pre(); + printf("\n"); + } + void visitPost(DocRoot *) + { + indent_post(); + printf("\n"); + } + void visitPre(DocSimpleSect *s) + { + indent_pre(); + printf("parameters()); + const char *s; + bool first=TRUE; + for (li.toFirst();(s=li.current());++li) + { + if (!first) printf(","); else first=FALSE; + printf("%s",s); + } + printf("]"); + } + break; + case DocSimpleSect::RetVal: + { + printf("retval["); + QStrListIterator li(s->parameters()); + const char *s; + bool first=TRUE; + for (li.toFirst();(s=li.current());++li) + { + if (!first) printf(","); else first=FALSE; + printf("%s",s); + } + printf("]"); + } + break; + case DocSimpleSect::Exception: printf("exception"); break; + { + printf("exception["); + QStrListIterator li(s->parameters()); + const char *s; + bool first=TRUE; + for (li.toFirst();(s=li.current());++li) + { + if (!first) printf(","); else first=FALSE; + printf("%s",s); + } + printf("]"); + } + break; + case DocSimpleSect::Unknown: printf("unknown"); break; + } + printf(">\n"); + } + void visitPost(DocSimpleSect *) + { + indent_post(); + printf("\n"); + } + void visitPre(DocTitle *) + { + indent_pre(); + printf("\n"); + } + void visitPost(DocTitle *) + { + indent_post(); + printf("\n"); + } + void visitPre(DocSimpleList *) + { + indent_pre(); + printf("
      \n"); + } + void visitPost(DocSimpleList *) + { + indent_post(); + printf("
    \n"); + } + void visitPre(DocSimpleListItem *) + { + indent_pre(); + printf("
  • \n"); + } + void visitPost(DocSimpleListItem *) + { + indent_post(); + printf("
    • \n"); + } + void visitPre(DocSection *s) + { + indent_pre(); + printf("\n",s->level()); + } + void visitPost(DocSection *s) + { + indent_post(); + printf("\n",s->level()); + } + void visitPre(DocHtmlList *s) + { + indent_pre(); + if (s->type()==DocHtmlList::Ordered) printf("
      \n"); else printf("
        \n"); + } + void visitPost(DocHtmlList *s) + { + indent_post(); + if (s->type()==DocHtmlList::Ordered) printf("
    \n"); else printf("\n"); + } + void visitPre(DocHtmlListItem *) + { + indent_pre(); + printf("
  • \n"); + } + void visitPost(DocHtmlListItem *) + { + indent_post(); + printf("
    • \n"); + } + void visitPre(DocHtmlPre *) + { + indent_pre(); + printf("
    \n");
+      m_insidePre=TRUE;
+    }
+    void visitPost(DocHtmlPre *) 
+    {
+      m_insidePre=FALSE;
+      indent_post();
+      printf("
    \n"); + } + void visitPre(DocHtmlDescList *) + { + indent_pre(); + printf("
    \n"); + } + void visitPost(DocHtmlDescList *) + { + indent_post(); + printf("
    \n"); + } + void visitPre(DocHtmlDescTitle *) + { + indent_pre(); + printf("
    \n"); + } + void visitPost(DocHtmlDescTitle *) + { + indent_post(); + printf("
    \n"); + } + void visitPre(DocHtmlDescData *) + { + indent_pre(); + printf("
    \n"); + } + void visitPost(DocHtmlDescData *) + { + indent_post(); + printf("
    \n"); + } + void visitPre(DocHtmlTable *t) + { + indent_pre(); + printf("\n", + t->numRows(),t->numCols()); + } + void visitPost(DocHtmlTable *) + { + indent_post(); + printf("
    \n"); + } + void visitPre(DocHtmlRow *) + { + indent_pre(); + printf("\n"); + } + void visitPost(DocHtmlRow *) + { + indent_post(); + printf("\n"); + } + void visitPre(DocHtmlCell *c) + { + indent_pre(); + printf("\n",c->isHeading()?'h':'d'); + } + void visitPost(DocHtmlCell *c) + { + indent_post(); + printf("\n",c->isHeading()?'h':'d'); + } + void visitPre(DocHtmlCaption *) + { + indent_pre(); + printf("\n"); + } + void visitPost(DocHtmlCaption *) + { + indent_post(); + printf("\n"); + } + void visitPre(DocIndexEntry *) + { + indent_pre(); + printf("\n"); + } + void visitPost(DocIndexEntry *) + { + indent_post(); + printf("\n"); + } + void visitPre(DocInternal *) + { + indent_pre(); + printf("\n"); + } + void visitPost(DocInternal *) + { + indent_post(); + printf("\n"); + } + void visitPre(DocHRef *href) + { + indent_pre(); + printf("\n",href->url().data()); + } + void visitPost(DocHRef *) + { + indent_post(); + printf("\n"); + } + void visitPre(DocHtmlHeader *header) + { + indent_pre(); + printf("\n",header->level()); + } + void visitPost(DocHtmlHeader *header) + { + indent_post(); + printf("\n",header->level()); + } + void visitPre(DocImage *img) + { + indent_pre(); + printf("\n",img->name().data()); + } + void visitPost(DocImage *) + { + indent_post(); + printf("\n"); + } + void visitPre(DocDotFile *df) + { + indent_pre(); + printf("\n",df->name().data()); + } + void visitPost(DocDotFile *) + { + indent_post(); + printf("\n"); + } + void visitPre(DocLink *lnk) + { + indent_pre(); + printf("\n",lnk->target().data()); + } + void visitPost(DocLink *) + { + indent_post(); + printf("\n"); + } + void visitPre(DocRef *ref) + { + indent_pre(); + printf("\n",ref->target().data()); + } + void visitPost(DocRef *) + { + indent_post(); + printf("\n"); + } + void visitPre(DocSecRefItem *ref) + { + indent_pre(); + printf("\n",ref->target().data()); + } + void visitPost(DocSecRefItem *) + { + indent_post(); + printf("\n"); + } + void visitPre(DocSecRefList *) + { + indent_pre(); + printf("\n"); + } + void visitPost(DocSecRefList *) + { + indent_post(); + printf("\n"); + } + void visitPre(DocLanguage *l) + { + indent_pre(); + printf("\n",l->id().data()); + } + void visitPost(DocLanguage *) + { + indent_post(); + printf("\n"); + } + + private: + // helper functions + void indent() + { + if (m_needsEnter) printf("\n"); + for (int i=0;ireference; - // make table of contents entry - t << "{\\tc\\tcl3 \\v "; - docify(title); - t << "}" << endl; - } - else - { - // set style - t << Rtf_Style["Heading2"]->reference; - // make table of contents entry - t << "{\\tc\\tcl2 \\v "; - docify(title); - t << "}" << endl; - } + int num=4; + switch(type) + { + case SectionInfo::Page: num=2; break; + case SectionInfo::Section: num=3; break; + case SectionInfo::Subsection: num=4; break; + default: ASSERT(0); break; + } + QCString heading; + heading.sprintf("Heading%d",num); + // set style + t << Rtf_Style[heading]->reference; + // make table of contents entry + t << "{\\tc\\tcl" << num << " \\v "; + docify(title); + t << "}" << endl; } -void RTFGenerator::endSection(const char *lab,bool) +void RTFGenerator::endSection(const char *lab,SectionInfo::SectionType) { DBG_RTF(t << "{\\comment (endSection)}" << endl) newParagraph(); diff --git a/src/rtfgen.h b/src/rtfgen.h index 7c6640a..8a41391 100644 --- a/src/rtfgen.h +++ b/src/rtfgen.h @@ -183,8 +183,8 @@ class RTFGenerator : public OutputGenerator void endParamList(); void endDescTitle(); void writeDescItem(); - void startSection(const char *,const char *,bool); - void endSection(const char *,bool); + void startSection(const char *,const char *,SectionInfo::SectionType); + void endSection(const char *,SectionInfo::SectionType); void writeSectionRef(const char *,const char *,const char *,const char *); void writeSectionRefItem(const char *,const char *,const char *); //void writeSectionRefAnchor(const char *,const char *,const char *); @@ -251,6 +251,9 @@ class RTFGenerator : public OutputGenerator void startLatexOnly() {} void endLatexOnly() {} + void startSectionRefList() {} + void endSectionRefList() {} + static bool preProcessFileInplace(const char *path,const char *name); private: diff --git a/src/scanner.l b/src/scanner.l index 468e1ad..e1930cc 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -485,7 +485,7 @@ static int yyread(char *buf,int max_size) /* start command character */ CMD ("\\"|"@") -SECTIONCMD {CMD}("image"|"author"|"internal"|"version"|"date"|"deprecated"|"param"|"exception"|"return"[s]?|"retval"|"bug"|"warning"|"par"|"sa"|"see"|"pre"|"post"|"invariant"|"note"|"remark"[s]?|"todo"|"test"|"ingroup"|"latexonly"|"htmlonly"|"{"|"verbatim"|"dotfile"|"defgroup"|"addtogroup"|"weakgroup") +SECTIONCMD {CMD}("image"|"author"|"internal"|"version"|"date"|"deprecated"|"param"|"exception"|"return"[s]?|"retval"|"bug"|"warning"|"par"|"sa"|"see"|"pre"|"post"|"invariant"|"note"|"remark"[s]?|"todo"|"test"|"ingroup"|"latexonly"|"htmlonly"|"{"|"verbatim"|"dotfile"|"defgroup"|"addtogroup"|"weakgroup")|("<"{PRE}">") BN [ \t\n\r] BL [ \t\r]*"\n" B [ \t] @@ -2956,6 +2956,8 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) } "//!" { current->brief.resize(0); + current->briefFile=yyFileName; + current->briefLine=yyLineNr; tmpDocType=-1; lastDocContext = YY_START; if (current_root->section & Entry::SCOPE_MASK) @@ -2970,6 +2972,8 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) } "///"/[^/] { current->brief.resize(0); + current->briefFile=yyFileName; + current->briefLine=yyLineNr; tmpDocType=-1; lastDocContext = YY_START; if (current_root->section & Entry::SCOPE_MASK) @@ -3416,12 +3420,14 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) "Warning: missing argument after " "\\page." ); + current->doc+="\n"; yyLineNr++; BEGIN( Doc ); } .*"\n" { yyLineNr++; current->args = yytext; + current->doc+="\n"; BEGIN( PageDoc ); } {SCOPEID} { @@ -3594,7 +3600,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) {LABELID} { sectionLabel=yytext; addSection(); - current->doc += "\\anchor "+sectionLabel+"\n"; + current->doc += "\\anchor "+sectionLabel+" "; BEGIN(lastAnchorContext); } {LABELID} { @@ -3605,7 +3611,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) [^\n*]*/"\n" { sectionTitle+=yytext; sectionTitle=sectionTitle.stripWhiteSpace(); - current->doc += "\\section "+sectionLabel+"\n"; + current->doc += "\\section "+sectionLabel+" "; addSection(); BEGIN(PageDoc); } @@ -3643,7 +3649,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) "//" { current->doc += yytext; } "//" { current->brief += yytext; } ("\\\\"|"@@")"f"[$\[\]] { - current->doc += &yytext[1]; + current->doc += yytext; } {CMD}"f$" { lastFormulaContext = YY_START; @@ -3727,6 +3733,12 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) BEGIN( BugParam ); } else if (YY_START==ClassDocBrief && + lastBriefContext==DeprecatedParam) + { + unput('/');unput('*'); // make sure we have something to read + BEGIN( DeprecatedParam ); + } + else if (YY_START==ClassDocBrief && lastBriefContext==Doc) { current->doc += "\n\n"; @@ -3757,16 +3769,16 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) "" { BEGIN( PageDoc ); } /* escaped versions of the conditional commands (for putting them in the docs) */ -{CMD}{CMD}"if"/[^a-z_A-Z0-9] { current->doc+=&yytext[1]; } -{CMD}{CMD}"ifnot"/[^a-z_A-Z0-9] { current->doc+=&yytext[1]; } -{CMD}{CMD}"elseif"/[^a-z_A-Z0-9] { current->doc+=&yytext[1]; } -{CMD}{CMD}"else"/[^a-z_A-Z0-9] { current->doc+=&yytext[1]; } -{CMD}{CMD}"endif"/[^a-z_A-Z0-9] { current->doc+=&yytext[1]; } -{CMD}{CMD}"if"/[^a-z_A-Z0-9] { current->brief+=&yytext[1]; } -{CMD}{CMD}"ifnot"/[^a-z_A-Z0-9] { current->brief+=&yytext[1]; } -{CMD}{CMD}"elseif"/[^a-z_A-Z0-9] { current->brief+=&yytext[1]; } -{CMD}{CMD}"else"/[^a-z_A-Z0-9] { current->brief+=&yytext[1]; } -{CMD}{CMD}"endif"/[^a-z_A-Z0-9] { current->brief+=&yytext[1]; } +{CMD}{CMD}"if"/[^a-z_A-Z0-9] { current->doc+=yytext; } +{CMD}{CMD}"ifnot"/[^a-z_A-Z0-9] { current->doc+=yytext; } +{CMD}{CMD}"elseif"/[^a-z_A-Z0-9] { current->doc+=yytext; } +{CMD}{CMD}"else"/[^a-z_A-Z0-9] { current->doc+=yytext; } +{CMD}{CMD}"endif"/[^a-z_A-Z0-9] { current->doc+=yytext; } +{CMD}{CMD}"if"/[^a-z_A-Z0-9] { current->brief+=yytext; } +{CMD}{CMD}"ifnot"/[^a-z_A-Z0-9] { current->brief+=yytext; } +{CMD}{CMD}"elseif"/[^a-z_A-Z0-9] { current->brief+=yytext; } +{CMD}{CMD}"else"/[^a-z_A-Z0-9] { current->brief+=yytext; } +{CMD}{CMD}"endif"/[^a-z_A-Z0-9] { current->brief+=yytext; } /* conditional commands */ {CMD}"if"{B}+ { @@ -3897,7 +3909,8 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) if (!current->doc.isEmpty()) current->doc+="

    "; if (lastBriefContext==TodoParam || lastBriefContext==TestParam || - lastBriefContext==BugParam + lastBriefContext==BugParam || + lastBriefContext==DeprecatedParam ) { unput('\n'); @@ -3939,6 +3952,16 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) unput('\n'); // make sure we have something to read BEGIN( BugParam ); } + else if + (lastBriefContext==DeprecatedParam && + (slStartContext==LineDoc || + slStartContext==AfterDocLine + ) + ) + { + unput('\n'); // make sure we have something to read + BEGIN( DeprecatedParam ); + } else { current->brief += " "; diff --git a/src/section.h b/src/section.h index ce7683d..7868036 100644 --- a/src/section.h +++ b/src/section.h @@ -25,10 +25,11 @@ #include "sortdict.h" class Definition; +class PageInfo; struct SectionInfo { - enum SectionType { Section, Subsection, Anchor }; + enum SectionType { Page, Section, Subsection, Anchor }; SectionInfo(const char *l,const char *t,SectionType st,const char *r=0) { label=l; title=t; type=st; ref=r; definition=0; pageRef=0; generated=FALSE; } ~SectionInfo() {} diff --git a/src/translator_br.h b/src/translator_br.h index e361f6b..f5e65e1 100644 --- a/src/translator_br.h +++ b/src/translator_br.h @@ -13,9 +13,11 @@ * Brazilian Portuguese version by * Fabio "FJTC" Jun Takada Chino * http://www.icmc.sc.usp.br/~chino - * Version: 1.2.17 (2002/07/10) + * Version: 1.2.18 (2002/07/30) * * History: + * 1.2.18 (2002/07/30): + * - Updated to Doxygen 1.2.18 * 1.2.17 (2002/07/10): * - Updated to Doxygen 1.2.17. * 1.2.13.2 (2002/05/10): @@ -25,7 +27,7 @@ #ifndef TRANSLATOR_BR_H #define TRANSLATOR_BR_H -class TranslatorBrazilian: public TranslatorAdapter_1_2_17 +class TranslatorBrazilian: public Translator { public: @@ -804,7 +806,7 @@ class TranslatorBrazilian: public TranslatorAdapter_1_2_17 * This note is for brazilians only. * Esta é uma boa tradução para "deprecated"? */ - return "Descontinuada"; + return "Descontinuado(a)"; } ////////////////////////////////////////////////////////////////////////// @@ -1348,5 +1350,17 @@ class TranslatorBrazilian: public TranslatorAdapter_1_2_17 return "Conteúdo"; } +////////////////////////////////////////////////////////////////////////// +// new since 1.2.17 +////////////////////////////////////////////////////////////////////////// + + /*! Used as the header of the list of item that have been + * flagged deprecated + */ + virtual QCString trDeprecatedList() + { + return "Lista de Descontinuados(as)"; + } + }; #endif diff --git a/src/translator_cz.h b/src/translator_cz.h index f997bda..25eb4a5 100644 --- a/src/translator_cz.h +++ b/src/translator_cz.h @@ -141,6 +141,9 @@ // 2002/07/08 (my birthday! ;) // - The new trRTFTableOfContents() implemented. // +// 2002/07/29 +// - The new trDeprecatedList() implemented. +// // Todo // ---- // - The trReimplementedFromList() should pass the kind of the @@ -160,7 +163,7 @@ // probably slightly faster. -class TranslatorCzech : public TranslatorAdapter_1_2_17 +class TranslatorCzech : public Translator { private: /*! The decode() inline assumes the source written in the @@ -1517,9 +1520,20 @@ class TranslatorCzech : public TranslatorAdapter_1_2_17 */ virtual QCString trRTFTableOfContents() { - return "Obsah"; + return decode("Obsah"); } +////////////////////////////////////////////////////////////////////////// +// new since 1.2.17 +////////////////////////////////////////////////////////////////////////// + + /*! Used as the header of the list of item that have been + * flagged deprecated + */ + virtual QCString trDeprecatedList() + { + return decode("Seznam zastaralých prvkù"); + } }; #endif // TRANSLATOR_CZ_H diff --git a/src/translator_hr.h b/src/translator_hr.h index c53326a..13eaa7f 100644 --- a/src/translator_hr.h +++ b/src/translator_hr.h @@ -50,7 +50,7 @@ #ifndef TRANSLATOR_HR_H #define TRANSLATOR_HR_H -class TranslatorCroatian : public TranslatorAdapter_1_2_17 +class TranslatorCroatian : public Translator { private: /*! to avoid macro redefinition from translator_cz.h */ @@ -1051,7 +1051,17 @@ class TranslatorCroatian : public TranslatorAdapter_1_2_17 { return decode("Sadr¾aj"); } +////////////////////////////////////////////////////////////////////////// +// new since 1.2.17 +////////////////////////////////////////////////////////////////////////// + /*! Used as the header of the list of item that have been + * flagged deprecated + */ + virtual QCString trDeprecatedList() + { + return "Popis zastarjelih metoda"; + } }; #endif diff --git a/src/translator_pt.h b/src/translator_pt.h index 02d6916..a3a3903 100644 --- a/src/translator_pt.h +++ b/src/translator_pt.h @@ -14,11 +14,13 @@ * input used in their production; they are not affected by this license. * * The translation into Portuguese was provided by - * Rui Godinho Lopes + * Rui Godinho Lopes * http://www.ruilopes.com * * VERSION HISTORY * --------------- + * 006 30 july 2002 + * ! Updated for doxygen v1.2.17 * 005 10 july 2002 * ! Updated for doxygen v1.2.16 * 004 03 march 2002 @@ -36,7 +38,7 @@ #ifndef TRANSLATOR_PT_H #define TRANSLATOR_PT_H -class TranslatorPortuguese : public TranslatorAdapter_1_2_17 +class TranslatorPortuguese : public Translator { public: @@ -1382,6 +1384,18 @@ class TranslatorPortuguese : public TranslatorAdapter_1_2_17 return "Índice"; } +////////////////////////////////////////////////////////////////////////// +// new since 1.2.17 +////////////////////////////////////////////////////////////////////////// + + /*! Used as the header of the list of item that have been + * flagged deprecated + */ + virtual QCString trDeprecatedList() + { + return "Lista de Deprecados"; + } + }; #endif diff --git a/src/translator_ru.h b/src/translator_ru.h index 172a3e6..903caac 100644 --- a/src/translator_ru.h +++ b/src/translator_ru.h @@ -50,7 +50,7 @@ #ifndef TRANSLATOR_RU_H #define TRANSLATOR_RU_H -class TranslatorRussian : public TranslatorAdapter_1_2_17 +class TranslatorRussian : public Translator { private: /*! The Decode() inline assumes the source written in the @@ -1406,6 +1406,17 @@ class TranslatorRussian : public TranslatorAdapter_1_2_17 return decode("ïÇÌÁ×ÌÅÎÉÅ"); } +////////////////////////////////////////////////////////////////////////// +// new since 1.2.17 +////////////////////////////////////////////////////////////////////////// + + /*! Used as the header of the list of item that have been + * flagged deprecated + */ + virtual QCString trDeprecatedList() + { + return decode( "óÐÉÓÏË ÕÓÔÁÒÅ×ÛÉÈ ÏÐÒÅÄÅÌÅÎÉÊ É ÏÐÉÓÁÎÉÊ" ); + } }; #endif diff --git a/src/translator_sk.h b/src/translator_sk.h index 3092514..e85d286 100644 --- a/src/translator_sk.h +++ b/src/translator_sk.h @@ -23,7 +23,7 @@ #ifndef TRANSLATOR_SK_H #define TRANSLATOR_SK_H -class TranslatorSlovak : public TranslatorAdapter_1_2_13 +class TranslatorSlovak : public Translator { private: /*! The Decode() inline assumes the source written in the @@ -1342,6 +1342,50 @@ class TranslatorSlovak : public TranslatorAdapter_1_2_13 { return Decode("Odkazuje sa na"); } + +////////////////////////////////////////////////////////////////////////// +// new since 1.2.13 +////////////////////////////////////////////////////////////////////////// + + /*! used in member documentation blocks to produce a list of + * members that are implemented by this one. + */ + virtual QCString trImplementedFromList(int numEntries) + { + return "Implementuje " + trWriteList(numEntries) + "."; + } + + /*! used in member documentation blocks to produce a list of + * all members that implement this member. + */ + virtual QCString trImplementedInList(int numEntries) + { + return Decode("Implementované v " + trWriteList(numEntries) + "."); + } + +////////////////////////////////////////////////////////////////////////// +// new since 1.2.16 +////////////////////////////////////////////////////////////////////////// + + /*! used in RTF documentation as a heading for the Table + * of Contents. + */ + virtual QCString trRTFTableOfContents() + { + return "Obsah"; + } + +////////////////////////////////////////////////////////////////////////// +// new since 1.2.17 +////////////////////////////////////////////////////////////////////////// + + /*! Used as the header of the list of item that have been + * flagged deprecated + */ + virtual QCString trDeprecatedList() + { + return "Zastarané metódy"; + } }; #endif // TRANSLATOR_SK_H diff --git a/src/util.cpp b/src/util.cpp index 7a48266..5b0ed19 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -3453,7 +3453,7 @@ void addRelatedPage(const char *name,const QCString &ptitle, // a page name is a label as well! SectionInfo *si=new SectionInfo( - pi->name,pi->title,SectionInfo::Section,pi->reference); + pi->name,pi->title,SectionInfo::Page,pi->reference); if (gd) { si->fileName=gd->getOutputFileBase(); @@ -3501,7 +3501,7 @@ void addRefItem(const QList *sli, QCString doc(1000); doc += "

    \\anchor "; doc += item->listAnchor; - doc += "\n"; + doc += " "; doc += prefix; doc += " \\_internalref "; doc += name; diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp index 8d8f78f..0eb94d2 100644 --- a/src/xmlgen.cpp +++ b/src/xmlgen.cpp @@ -544,21 +544,33 @@ class XMLGenerator : public OutputDocInterface docify(url); m_t << ""; } - void startSection(const char *id,const char *,bool subsection) + void startSection(const char *id,const char *,SectionInfo::SectionType type) { XML_DB(("(startSection)\n")); endParMode(); m_t << ""; startNestedPar(); m_inParStack.top() = TRUE; } - void endSection(const char *,bool subsection) + void endSection(const char *,SectionInfo::SectionType type) { XML_DB(("(endSection)\n")); m_t << ""; m_inParStack.top() = FALSE; endNestedPar(); @@ -875,6 +887,14 @@ class XMLGenerator : public OutputDocInterface XML_DB(("(endLatexOnly)\n")); m_t << "" << endl; } + void startSectionRefList() + { + XML_DB(("(startSectionRefList)\n")); + } + void endSectionRefList() + { + XML_DB(("(endSectionRefList)\n")); + } // Generator specific functions diff --git a/tmake/lib/linux-g++/tmake.conf b/tmake/lib/linux-g++/tmake.conf index 3537b39..c063a01 100755 --- a/tmake/lib/linux-g++/tmake.conf +++ b/tmake/lib/linux-g++/tmake.conf @@ -38,7 +38,7 @@ TMAKE_LINK = g++ TMAKE_LINK_SHLIB = g++ TMAKE_LFLAGS = TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = +TMAKE_LFLAGS_DEBUG = -g TMAKE_LFLAGS_SHLIB = -shared TMAKE_LFLAGS_SONAME = -Wl,-soname, -- cgit v0.12